Skip to content
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

Core: Update variant class visibility #12105

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Core: Update variant class visibility #12105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68069b4
Core: Update variant class visibility.
rdblue Jan 14, 2025
98cc7b4
Fix ShreddedObject#nameSet and update tests.
rdblue Jan 27, 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
Prev Previous commit
Fix ShreddedObject#nameSet and update tests.
  • Loading branch information
@rdblue
rdblue committed Jan 27, 2025
commit 98cc7b4de0fdc6ffd56ef59585f8b9c1da20a8f9
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/iceberg/variants/ShreddedObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ private Set<String> nameSet() {
Iterables.addAll(names, unshredded.fieldNames());
}

names.removeAll(removedFields);

return names;
}

Expand Down
12 changes: 6 additions & 6 deletions core/src/test/java/org/apache/iceberg/variants/TestShreddedObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,13 @@ public void testPartiallyShreddedObjectReplacement() {

// replace field c with a new value
partial.put("c", Variants.ofIsoDate("2024-10-12"));
assertThat(partial.numFields()).isEqualTo(3);

partial.remove("b");
assertThat(partial.numFields()).isEqualTo(2);

assertThat(partial.get("a")).isInstanceOf(VariantPrimitive.class);
assertThat(partial.get("a").asPrimitive().get()).isEqualTo(34);
assertThat(partial.get("b")).isInstanceOf(VariantPrimitive.class);
assertThat(partial.get("b").asPrimitive().get()).isEqualTo("iceberg");
assertThat(partial.get("c")).isInstanceOf(VariantPrimitive.class);
assertThat(partial.get("c").type()).isEqualTo(Variants.PhysicalType.DATE);
assertThat(partial.get("c").asPrimitive().get())
Expand Down Expand Up @@ -178,6 +180,7 @@ public void testPartiallyShreddedObjectSerializationMinimalBuffer() {

// replace field c with a new value
partial.put("c", Variants.ofIsoDate("2024-10-12"));
partial.remove("b");

VariantValue value = roundTripMinimalBuffer(partial, metadata);

Expand All @@ -186,8 +189,6 @@ public void testPartiallyShreddedObjectSerializationMinimalBuffer() {

assertThat(actual.get("a")).isInstanceOf(VariantPrimitive.class);
assertThat(actual.get("a").asPrimitive().get()).isEqualTo(34);
assertThat(actual.get("b")).isInstanceOf(VariantPrimitive.class);
assertThat(actual.get("b").asPrimitive().get()).isEqualTo("iceberg");
assertThat(actual.get("c")).isInstanceOf(VariantPrimitive.class);
assertThat(actual.get("c").type()).isEqualTo(Variants.PhysicalType.DATE);
assertThat(actual.get("c").asPrimitive().get())
Expand All @@ -201,6 +202,7 @@ public void testPartiallyShreddedObjectSerializationLargeBuffer() {

// replace field c with a new value
partial.put("c", Variants.ofIsoDate("2024-10-12"));
partial.remove("b");

VariantValue value = roundTripLargeBuffer(partial, metadata);

Expand All @@ -209,8 +211,6 @@ public void testPartiallyShreddedObjectSerializationLargeBuffer() {

assertThat(actual.get("a")).isInstanceOf(VariantPrimitive.class);
assertThat(actual.get("a").asPrimitive().get()).isEqualTo(34);
assertThat(actual.get("b")).isInstanceOf(VariantPrimitive.class);
assertThat(actual.get("b").asPrimitive().get()).isEqualTo("iceberg");
assertThat(actual.get("c")).isInstanceOf(VariantPrimitive.class);
assertThat(actual.get("c").type()).isEqualTo(Variants.PhysicalType.DATE);
assertThat(actual.get("c").asPrimitive().get())
Expand Down