Skip to content

Core: Fix delete file index with non equality column filter lost equlity delete files #4311

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

Closed
xloya wants to merge 7 commits into from
Closed

Core: Fix delete file index with non equality column filter lost equlity delete files #4311

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ce7fe9
fix filter eq delete
Mar 10, 2022
1c66dd1
modify test method name
Mar 11, 2022
9a8a7c9
fix ut
Mar 11, 2022
80a0b4d
fix
Mar 11, 2022
c5c5364
fix code style
Mar 11, 2022
f6d6848
fix code style
Mar 14, 2022
2026205
fix style
Mar 14, 2022
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
1 change: 0 additions & 1 deletion core/src/main/java/org/apache/iceberg/DeleteFileIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,6 @@ private Iterable<CloseableIterable<ManifestEntry<DeleteFile>>> deleteManifestRea
matchingManifests,
manifest ->
ManifestFiles.readDeleteManifest(manifest, io, specsById)
.filterRows(dataFilter)
.filterPartitions(partitionFilter)
.filterPartitions(partitionSet)
.caseSensitive(caseSensitive)
Expand Down
31 changes: 0 additions & 31 deletions core/src/test/java/org/apache/iceberg/TestOverwriteWithValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,37 +893,6 @@ public void testConcurrentConflictingEqualityDeletes() {
overwrite::commit);
}

@Test
public void testConcurrentNonConflictingEqualityDeletes() {

@rdblue rdblue Mar 13, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is invalid about this test? It is suspicious that it is removed.

Assume.assumeTrue(formatVersion == 2);

Assert.assertNull("Should be empty table", table.currentSnapshot());

table.newAppend()
.appendFile(FILE_DAY_2)
.appendFile(FILE_DAY_2_ANOTHER_RANGE)
.commit();

Snapshot firstSnapshot = table.currentSnapshot();

OverwriteFiles overwrite = table.newOverwrite()
.deleteFile(FILE_DAY_2)
.addFile(FILE_DAY_2_MODIFIED)
.validateFromSnapshot(firstSnapshot.snapshotId())
.conflictDetectionFilter(EXPRESSION_DAY_2_ID_RANGE)
.validateNoConflictingData()
.validateNoConflictingDeletes();

table.newRowDelta()
.addDeletes(FILE_DAY_2_ANOTHER_RANGE_EQ_DELETES)
.commit();

overwrite.commit();

validateTableFiles(table, FILE_DAY_2_ANOTHER_RANGE, FILE_DAY_2_MODIFIED);
validateTableDeleteFiles(table, FILE_DAY_2_ANOTHER_RANGE_EQ_DELETES);
}

@Test
public void testOverwriteByFilterInheritsConflictDetectionFilter() {
Assume.assumeTrue(formatVersion == 2);
Expand Down
28 changes: 28 additions & 0 deletions flink/v1.14/flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,34 @@ public void testInsertIntoPartition() throws Exception {
}
}

@Test
public void testInsertWithUpsertAndScanFilterWithNonEqualityField() {
Assume.assumeTrue(format == FileFormat.PARQUET);
String tableName = "test_insert";

Map<String, String> tableProps = ImmutableMap.of(
"write.format.default", format.name(),
TableProperties.FORMAT_VERSION, "2",
TableProperties.UPSERT_ENABLED, "true"
);

sql("CREATE TABLE %s(id INT NOT NULL, dt DATE, PRIMARY KEY (id) NOT ENFORCED) PARTITIONED BY (id) WITH %s",
tableName, toWithClause(tableProps));

// insert data set
sql("INSERT INTO %s VALUES " +
"(1, to_date('2021-01-01','yyyy-MM-dd'))", tableName);
Comment thread
xloya marked this conversation as resolved.
Outdated

sql("INSERT INTO %s VALUES " +
"(1, to_date('2022-01-01','yyyy-MM-dd'))", tableName);

List<Row> rows = sql("SELECT * FROM %s WHERE dt < '2022-01-01'", tableName);

Assert.assertEquals("rows should be 0", 0, rows.size());

sql("DROP TABLE IF EXISTS %s.%s", flinkDatabase, tableName);
}

@Test
public void testHashDistributeMode() throws Exception {
String tableName = "test_hash_distribution_mode";
Expand Down