Skip to content

REST: Fix serde of tasks with multiple deletes #14573

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

Merged
singhpk234 merged 3 commits into from
Nov 13, 2025
Merged

REST: Fix serde of tasks with multiple deletes #14573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de96300
REST: Fix serde of tasks with multiple deletes
sfc-gh-prsingh Nov 12, 2025
5f3ea49
Address review feedback
sfc-gh-prsingh Nov 13, 2025
0a393ab
Address review feedbacks
sfc-gh-prsingh Nov 13, 2025
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
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/rest/TableScanResponseParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static void serializeScanTasks(
gen.writeArrayFieldStart(DELETE_FILES);
for (int i = 0; i < deleteFiles.size(); i++) {
DeleteFile deleteFile = deleteFiles.get(i);
deleteFilePathToIndex.put(String.valueOf(deleteFile.path()), i);
deleteFilePathToIndex.put(deleteFile.location(), i);
ContentFileParser.toJson(deleteFiles.get(i), specsById.get(deleteFile.specId()), gen);
}

Expand All @@ -105,11 +105,11 @@ public static void serializeScanTasks(

if (fileScanTasks != null) {
gen.writeArrayFieldStart(FILE_SCAN_TASKS);
Set<Integer> deleteFileReferences = Sets.newHashSet();
for (FileScanTask fileScanTask : fileScanTasks) {
Set<Integer> deleteFileReferences = Sets.newHashSet();
Comment thread
amogh-jahagirdar marked this conversation as resolved.
if (deleteFiles != null) {
for (DeleteFile taskDelete : fileScanTask.deletes()) {
deleteFileReferences.add(deleteFilePathToIndex.get(taskDelete.path().toString()));
deleteFileReferences.add(deleteFilePathToIndex.get(taskDelete.location()));
}
}

Expand Down
8 changes: 4 additions & 4 deletions core/src/test/java/org/apache/iceberg/TestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ public class TestBase {
.withPartitionPath("data_bucket=0")
.withRecordCount(1)
.build();
static final DataFile FILE_B =
public static final DataFile FILE_B =
DataFiles.builder(SPEC)
.withPath("/path/to/data-b.parquet")
.withFileSizeInBytes(10)
.withPartitionPath("data_bucket=1") // easy way to set partition data for now
.withRecordCount(1)
.withSplitOffsets(ImmutableList.of(1L))
.build();
static final DeleteFile FILE_B_DELETES =
public static final DeleteFile FILE_B_DELETES =
FileMetadata.deleteFileBuilder(SPEC)
.ofPositionDeletes()
.withPath("/path/to/data-b-deletes.parquet")
Expand All @@ -138,15 +138,15 @@ public class TestBase {
.withContentOffset(4)
.withContentSizeInBytes(6)
.build();
static final DataFile FILE_C =
public static final DataFile FILE_C =
DataFiles.builder(SPEC)
.withPath("/path/to/data-c.parquet")
.withFileSizeInBytes(10)
.withPartitionPath("data_bucket=2") // easy way to set partition data for now
.withRecordCount(1)
.withSplitOffsets(ImmutableList.of(2L, 8L))
.build();
static final DeleteFile FILE_C2_DELETES =
public static final DeleteFile FILE_C2_DELETES =
FileMetadata.deleteFileBuilder(SPEC)
.ofEqualityDeletes(1)
.withPath("/path/to/data-c-deletes.parquet")
Expand Down
131 changes: 131 additions & 0 deletions core/src/test/java/org/apache/iceberg/rest/responses/TestPlanTableScanResponseParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@

import static org.apache.iceberg.TestBase.FILE_A;
import static org.apache.iceberg.TestBase.FILE_A_DELETES;
import static org.apache.iceberg.TestBase.FILE_B;
import static org.apache.iceberg.TestBase.FILE_B_DELETES;
import static org.apache.iceberg.TestBase.FILE_C;
import static org.apache.iceberg.TestBase.FILE_C2_DELETES;
import static org.apache.iceberg.TestBase.PARTITION_SPECS_BY_ID;
import static org.apache.iceberg.TestBase.SCHEMA;
import static org.apache.iceberg.TestBase.SPEC;
Expand Down Expand Up @@ -265,6 +269,133 @@ public void roundTripSerdeWithValidStatusAndFileScanTasks() {
assertThat(PlanTableScanResponseParser.toJson(copyResponse)).isEqualTo(expectedToJson);
}

@Test
public void multipleTasksWithDifferentDeleteFilesDontAccumulateReferences() {
ResidualEvaluator residualEvaluator =
ResidualEvaluator.of(SPEC, Expressions.alwaysTrue(), true);

// Create three tasks, each with its own distinct delete file
FileScanTask taskA =
new BaseFileScanTask(
FILE_A,
new DeleteFile[] {FILE_A_DELETES},
SchemaParser.toJson(SCHEMA),
PartitionSpecParser.toJson(SPEC),
residualEvaluator);

FileScanTask taskB =
new BaseFileScanTask(
FILE_B,
new DeleteFile[] {FILE_B_DELETES},
SchemaParser.toJson(SCHEMA),
PartitionSpecParser.toJson(SPEC),
residualEvaluator);

FileScanTask taskC =
new BaseFileScanTask(
FILE_C,
new DeleteFile[] {FILE_C2_DELETES},
SchemaParser.toJson(SCHEMA),
PartitionSpecParser.toJson(SPEC),
residualEvaluator);

PlanTableScanResponse response =
PlanTableScanResponse.builder()
.withPlanStatus(PlanStatus.COMPLETED)
.withFileScanTasks(List.of(taskA, taskB, taskC))
.withDeleteFiles(List.of(FILE_A_DELETES, FILE_B_DELETES, FILE_C2_DELETES))
.withSpecsById(PARTITION_SPECS_BY_ID)
.build();

String expectedJson =
"{\n"
+ " \"plan-status\" : \"completed\",\n"
+ " \"delete-files\" : [ {\n"
+ " \"spec-id\" : 0,\n"
+ " \"content\" : \"POSITION_DELETES\",\n"
+ " \"file-path\" : \"/path/to/data-a-deletes.parquet\",\n"
+ " \"file-format\" : \"PARQUET\",\n"
+ " \"partition\" : {\n"
+ " \"1000\" : 0\n"
+ " },\n"
+ " \"file-size-in-bytes\" : 10,\n"
+ " \"record-count\" : 1\n"
+ " }, {\n"
+ " \"spec-id\" : 0,\n"
+ " \"content\" : \"POSITION_DELETES\",\n"
+ " \"file-path\" : \"/path/to/data-b-deletes.parquet\",\n"
+ " \"file-format\" : \"PARQUET\",\n"
+ " \"partition\" : {\n"
+ " \"1000\" : 1\n"
+ " },\n"
+ " \"file-size-in-bytes\" : 10,\n"
+ " \"record-count\" : 1\n"
+ " }, {\n"
+ " \"spec-id\" : 0,\n"
+ " \"content\" : \"EQUALITY_DELETES\",\n"
+ " \"file-path\" : \"/path/to/data-c-deletes.parquet\",\n"
+ " \"file-format\" : \"PARQUET\",\n"
+ " \"partition\" : {\n"
+ " \"1000\" : 2\n"
+ " },\n"
+ " \"file-size-in-bytes\" : 10,\n"
+ " \"record-count\" : 1,\n"
+ " \"equality-ids\" : [ 1 ],\n"
+ " \"sort-order-id\" : 0\n"
+ " } ],\n"
+ " \"file-scan-tasks\" : [ {\n"
+ " \"data-file\" : {\n"
+ " \"spec-id\" : 0,\n"
+ " \"content\" : \"DATA\",\n"
+ " \"file-path\" : \"/path/to/data-a.parquet\",\n"
+ " \"file-format\" : \"PARQUET\",\n"
+ " \"partition\" : {\n"
+ " \"1000\" : 0\n"
+ " },\n"
+ " \"file-size-in-bytes\" : 10,\n"
+ " \"record-count\" : 1,\n"
+ " \"sort-order-id\" : 0\n"
+ " },\n"
+ " \"delete-file-references\" : [ 0 ],\n"
+ " \"residual-filter\" : true\n"
+ " }, {\n"
+ " \"data-file\" : {\n"
+ " \"spec-id\" : 0,\n"
+ " \"content\" : \"DATA\",\n"
+ " \"file-path\" : \"/path/to/data-b.parquet\",\n"
+ " \"file-format\" : \"PARQUET\",\n"
+ " \"partition\" : {\n"
+ " \"1000\" : 1\n"
+ " },\n"
+ " \"file-size-in-bytes\" : 10,\n"
+ " \"record-count\" : 1,\n"
+ " \"split-offsets\" : [ 1 ],\n"
+ " \"sort-order-id\" : 0\n"
+ " },\n"
+ " \"delete-file-references\" : [ 1 ],\n"
+ " \"residual-filter\" : true\n"
+ " }, {\n"
+ " \"data-file\" : {\n"
+ " \"spec-id\" : 0,\n"
+ " \"content\" : \"DATA\",\n"
+ " \"file-path\" : \"/path/to/data-c.parquet\",\n"
+ " \"file-format\" : \"PARQUET\",\n"
+ " \"partition\" : {\n"
+ " \"1000\" : 2\n"
+ " },\n"
+ " \"file-size-in-bytes\" : 10,\n"
+ " \"record-count\" : 1,\n"
+ " \"split-offsets\" : [ 2, 8 ],\n"
+ " \"sort-order-id\" : 0\n"
+ " },\n"
+ " \"delete-file-references\" : [ 2 ],\n"
+ " \"residual-filter\" : true\n"
+ " } ]\n"
+ "}";
String json = PlanTableScanResponseParser.toJson(response, true);
assertThat(json).isEqualTo(expectedJson);
}

@Test
public void roundTripSerdeWithoutDeleteFiles() {
ResidualEvaluator residualEvaluator =
Expand Down