Skip to content

Spark 4.1: Use table IDs in scan equals/hashCode #15363

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
aokolnychyi merged 1 commit into from
Feb 19, 2026
Merged

Spark 4.1: Use table IDs in scan equals/hashCode #15363

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
2 changes: 2 additions & 0 deletions spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatchQueryScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ public boolean equals(Object o) {

SparkBatchQueryScan that = (SparkBatchQueryScan) o;
return table().name().equals(that.table().name())
&& Objects.equals(table().uuid(), that.table().uuid())
&& Objects.equals(branch(), that.branch())
&& readSchema().equals(that.readSchema()) // compare Spark schemas to ignore field ids
&& filtersDesc().equals(that.filtersDesc())
Expand All @@ -268,6 +269,7 @@ && runtimeFiltersDesc().equals(that.runtimeFiltersDesc())
public int hashCode() {
return Objects.hash(
table().name(),
table().uuid(),
branch(),
readSchema(),
filtersDesc(),
Expand Down
4 changes: 3 additions & 1 deletion spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/source/SparkChangelogScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ public boolean equals(Object o) {

SparkChangelogScan that = (SparkChangelogScan) o;
return table.name().equals(that.table.name())
&& Objects.equals(table.uuid(), that.table.uuid())
&& readSchema().equals(that.readSchema()) // compare Spark schemas to ignore field IDs
&& filtersDesc().equals(that.filtersDesc())
&& Objects.equals(startSnapshotId, that.startSnapshotId)
Expand All @@ -156,7 +157,8 @@ && filtersDesc().equals(that.filtersDesc())

@Override
public int hashCode() {
return Objects.hash(table.name(), readSchema(), filtersDesc(), startSnapshotId, endSnapshotId);
return Objects.hash(
table.name(), table.uuid(), readSchema(), filtersDesc(), startSnapshotId, endSnapshotId);
}

private String filtersDesc() {
Expand Down
8 changes: 7 additions & 1 deletion spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/source/SparkCopyOnWriteScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ public boolean equals(Object o) {

SparkCopyOnWriteScan that = (SparkCopyOnWriteScan) o;
return table().name().equals(that.table().name())
&& Objects.equals(table().uuid(), that.table().uuid())
&& readSchema().equals(that.readSchema()) // compare Spark schemas to ignore field ids
&& filtersDesc().equals(that.filtersDesc())
&& Objects.equals(snapshotId(), that.snapshotId())
Expand All @@ -170,7 +171,12 @@ && filtersDesc().equals(that.filtersDesc())
@Override
public int hashCode() {
return Objects.hash(
table().name(), readSchema(), filtersDesc(), snapshotId(), filteredLocations);
table().name(),
table().uuid(),
readSchema(),
filtersDesc(),
snapshotId(),
filteredLocations);
}

@Override
Expand Down
9 changes: 8 additions & 1 deletion spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/source/SparkStagedScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ public boolean equals(Object other) {

SparkStagedScan that = (SparkStagedScan) other;
return table().name().equals(that.table().name())
&& Objects.equals(table().uuid(), that.table().uuid())
&& Objects.equals(taskSetId, that.taskSetId)
&& readSchema().equals(that.readSchema())
&& splitSize == that.splitSize
Expand All @@ -101,7 +102,13 @@ && readSchema().equals(that.readSchema())
@Override
public int hashCode() {
return Objects.hash(
table().name(), taskSetId, readSchema(), splitSize, splitLookback, openFileCost);
table().name(),
table().uuid(),
taskSetId,
readSchema(),
splitSize,
splitLookback,
openFileCost);
}

@Override
Expand Down