Skip to content

branch-4.2: [fix](fe) Skip table snapshot resolution for external views (#69836) #70292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hubgeter wants to merge 1 commit into
base: branch-4.2
Choose a base branch
from
Draft

branch-4.2: [fix](fe) Skip table snapshot resolution for external views (#69836) #70292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,11 @@ synchronized boolean isValidRelatedTable(Table table) {
public MvccSnapshot loadSnapshot(Optional<TableSnapshot> tableSnapshot, Optional<TableScanParams> scanParams) {
return withMissingTableRepair(() -> {
if (isView()) {
// View expansion cannot apply relation scan parameters to the base tables.
if (scanParams.isPresent()) {
throw new UnsupportedOperationException(
"view not supported with scan params: @" + scanParams.get().getParamType());
}
return new EmptyMvccSnapshot();
} else {
return new IcebergMvccSnapshot(IcebergUtils.getSnapshotCacheValue(
Expand Down
70 changes: 70 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/datasource/iceberg/IcebergExternalTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.doris.datasource.iceberg;

import org.apache.doris.analysis.TableScanParams;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.PartitionItem;
import org.apache.doris.catalog.PartitionKey;
Expand All @@ -26,6 +27,8 @@
import org.apache.doris.common.Pair;
import org.apache.doris.common.security.authentication.ExecutionAuthenticator;
import org.apache.doris.datasource.metacache.MetaCache;
import org.apache.doris.datasource.mvcc.EmptyMvccSnapshot;
import org.apache.doris.datasource.mvcc.MvccSnapshot;
import org.apache.doris.qe.ConnectContext;

import com.google.common.collect.Lists;
Expand All @@ -45,6 +48,8 @@
import org.mockito.MockitoAnnotations;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -73,6 +78,71 @@ public void setUp() {
mockCatalog = Mockito.mock(IcebergExternalCatalog.class);
}

@Test
public void testViewSnapshotDoesNotUseTableMetadata() {
IcebergExternalDatabase database = Mockito.mock(IcebergExternalDatabase.class);
IcebergExternalTable view = Mockito.spy(
new IcebergExternalTable(10L, "view", "view", mockCatalog, database));
Mockito.doReturn(true).when(view).isView();
Mockito.clearInvocations(mockCatalog);
MvccSnapshot fence = new EmptyMvccSnapshot();
try (MockedStatic<IcebergUtils> utils = Mockito.mockStatic(IcebergUtils.class)) {
List<MvccSnapshot> snapshots = Arrays.asList(
view.loadSnapshot(Optional.empty(), Optional.empty()),
view.loadSnapshot(Optional.empty(), Optional.empty(), Optional.empty()),
view.loadSnapshot(Optional.empty(), Optional.empty(), Optional.of(fence)),
view.loadLatestSnapshotFence());
for (MvccSnapshot snapshot : snapshots) {
Assertions.assertInstanceOf(EmptyMvccSnapshot.class, snapshot);
}
utils.verifyNoInteractions();
}
Mockito.verifyNoInteractions(mockCatalog, icebergTable);
}

@Test
public void testViewSnapshotRejectsScanParamsWithoutTableMetadata() {
IcebergExternalDatabase database = Mockito.mock(IcebergExternalDatabase.class);
IcebergExternalTable view = Mockito.spy(
new IcebergExternalTable(10L, "view", "view", mockCatalog, database));
Mockito.doReturn(true).when(view).isView();
Mockito.clearInvocations(mockCatalog);
MvccSnapshot fence = new EmptyMvccSnapshot();
Map<String, String> incrementalParams = Maps.newHashMap();
incrementalParams.put("startSnapshotId", "1");
incrementalParams.put("endSnapshotId", "5");
List<TableScanParams> selectors = Arrays.asList(
new TableScanParams(TableScanParams.BRANCH,
Collections.emptyMap(), Collections.singletonList("b1")),
new TableScanParams(TableScanParams.BRANCH,
Collections.singletonMap(TableScanParams.PARAMS_NAME, "b1"), Collections.emptyList()),
new TableScanParams(TableScanParams.TAG,
Collections.emptyMap(), Collections.singletonList("t1")),
new TableScanParams(TableScanParams.TAG,
Collections.singletonMap(TableScanParams.PARAMS_NAME, "t1"), Collections.emptyList()),
new TableScanParams(TableScanParams.INCREMENTAL_READ, incrementalParams, Collections.emptyList()),
new TableScanParams(TableScanParams.OPTIONS,
Collections.singletonMap("scan.snapshot-id", "7"), Collections.emptyList()));

try (MockedStatic<IcebergUtils> utils = Mockito.mockStatic(IcebergUtils.class)) {
for (TableScanParams selector : selectors) {
List<UnsupportedOperationException> errors = Arrays.asList(
Assertions.assertThrows(UnsupportedOperationException.class,
() -> view.loadSnapshot(Optional.empty(), Optional.of(selector))),
Assertions.assertThrows(UnsupportedOperationException.class,
() -> view.loadSnapshot(Optional.empty(), Optional.of(selector), Optional.empty())),
Assertions.assertThrows(UnsupportedOperationException.class,
() -> view.loadSnapshot(Optional.empty(), Optional.of(selector), Optional.of(fence))));
for (UnsupportedOperationException error : errors) {
Assertions.assertEquals("view not supported with scan params: @" + selector.getParamType(),
error.getMessage());
}
}
utils.verifyNoInteractions();
}
Mockito.verifyNoInteractions(mockCatalog, icebergTable);
}

@Test
public void testSelectViewTextMissingRepairsLookup() {
verifyMissingViewRead(IcebergExternalTable::getViewText, false);
Expand Down
Loading