Skip to content

Fix the partition field id when appending a field to the V2 spec. #2083

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
rdblue merged 1 commit into from
Jan 13, 2021
Merged

Fix the partition field id when appending a field to the V2 spec. #2083

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
3 changes: 2 additions & 1 deletion core/src/main/java/org/apache/iceberg/BaseUpdatePartitionSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ class BaseUpdatePartitionSpec implements UpdatePartitionSpec {
this.schema = spec.schema();
this.nameToField = indexSpecByName(spec);
this.transformToField = indexSpecByTransform(spec);
this.lastAssignedPartitionId = spec.fields().stream().mapToInt(PartitionField::fieldId).max().orElse(999);
this.lastAssignedPartitionId =
base.specs().stream().mapToInt(PartitionSpec::lastAssignedFieldId).max().orElse(999);

spec.fields().stream()
.filter(field -> field.transform() instanceof UnknownTransform)
Expand Down
22 changes: 22 additions & 0 deletions core/src/test/java/org/apache/iceberg/TestTableUpdatePartitionSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,4 +196,26 @@ public void testAddAndRemoveField() {
.build(), table.spec());
Assert.assertEquals(1001, table.spec().lastAssignedFieldId());
}

@Test
public void testAddAfterLastFieldRemoved() {
table.updateSpec()
.removeField("data_bucket")
.commit();

table.updateSpec()
.addField(bucket("id", 8))
.commit();

V1Assert.assertEquals("Should add a new id bucket", PartitionSpec.builderFor(table.schema())
.withSpecId(2)
.alwaysNull("data", "data_bucket")
.bucket("id", 8, "id_bucket_8")
.build(), table.spec());
V2Assert.assertEquals("Should add a new id bucket", PartitionSpec.builderFor(table.schema())
.withSpecId(2)
.add(1, 1001, "id_bucket_8", "bucket[8]")
.build(), table.spec());
Assert.assertEquals(1001, table.spec().lastAssignedFieldId());
}
}