Skip to content

[fix](test) Align two UT assertions with current master behavior #67404

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

Open
bosswnx wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −3
Open

[fix](test) Align two UT assertions with current master behavior #67404

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
7 changes: 5 additions & 2 deletions ...ceberg/src/test/java/org/apache/doris/connector/iceberg/IcebergWritePlanProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,8 +1724,11 @@ public void planMergePreservesExplicitlyEmptyReadAcrossConcurrentFirstAppend() {
providerFor(ops.table, ctx).planWrite(new WriteSession(txn),
new WriteHandle(emptyPinnedHandle).writeOperation(WriteOperation.MERGE));

Assertions.assertNull(txn.getBaseSnapshotId(),
"an explicitly empty read must leave RowDelta validation unbounded across the first append");
// #66348: an explicitly pinned -1 (the empty-table generation) stays on baseSnapshotId as an
// OCC fence — the RowDelta commit validates from the pinned generation, so a concurrent first
// append in the read->begin-write window is detected at commit instead of being silently allowed.
Assertions.assertEquals(Long.valueOf(-1L), txn.getBaseSnapshotId(),
"an explicitly empty read must stay an OCC fence across a concurrent first append");
}

// ───────────────────────────── MERGE sink (TIcebergMergeSink) ─────────────────────────────
Expand Down
7 changes: 6 additions & 1 deletion fe/fe-core/src/test/java/org/apache/doris/common/PropertyAnalyzerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,12 @@ public void testAnalyzePartitionInvertedIndexFileStorageFormat() throws Analysis
properties.put(PropertyAnalyzer.PROPERTIES_PARTITION_INVERTED_INDEX_STORAGE_FORMAT, "V1");
AnalysisException v1Exception = Assertions.assertThrows(AnalysisException.class,
() -> PropertyAnalyzer.analyzePartitionInvertedIndexFileStorageFormat(properties));
Assertions.assertTrue(v1Exception.getMessage().contains("only supports V2, V3 and SNII"));
// #64522 blocks V1 inside analyzeInvertedIndexFileStorageFormat ("deprecated ... use V2") before
// the partition-level check ("only supports V2, V3 and SNII") can run; either message rejects V1.
Assertions.assertTrue(v1Exception.getMessage().contains("only supports V2, V3 and SNII")
|| v1Exception.getMessage().contains(
"Inverted index V1 is deprecated and no longer allowed"),
"V1 must be rejected, got: " + v1Exception.getMessage());

properties.put(PropertyAnalyzer.PROPERTIES_PARTITION_INVERTED_INDEX_STORAGE_FORMAT, "SNII");
Config.enable_partition_inverted_index_storage_format_rollout = false;
Expand Down