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

[Managed Iceberg] Cleanup SerializedDataFile; use ByteBuffer instead #32821

Closed
wants to merge 3 commits into from
Closed

[Managed Iceberg] Cleanup SerializedDataFile; use ByteBuffer instead #32821

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
dbfdd66
switch to byte buffer
ahmedabu98 Oct 16, 2024
d4facdc
trigger xlang io postcommits
ahmedabu98 Oct 16, 2024
ab1cd6a
Merge branch 'master' of https://github.com/ahmedabu98/beam into useb…
ahmedabu98 Nov 5, 2024
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: 1 addition & 1 deletion .github/trigger_files/IO_Iceberg_Integration_Tests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run",
"modification": 4
"modification": 3
}
44 changes: 8 additions & 36 deletions sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/SerializableDataFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import com.google.auto.value.AutoValue;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.beam.sdk.schemas.AutoValueSchema;
Expand Down Expand Up @@ -74,9 +73,9 @@ public static Builder builder() {

abstract @Nullable Map<Integer, Long> getNanValueCounts();

abstract @Nullable Map<Integer, byte[]> getLowerBounds();
abstract @Nullable Map<Integer, ByteBuffer> getLowerBounds();

abstract @Nullable Map<Integer, byte[]> getUpperBounds();
abstract @Nullable Map<Integer, ByteBuffer> getUpperBounds();

@AutoValue.Builder
abstract static class Builder {
Expand Down Expand Up @@ -104,9 +103,9 @@ abstract static class Builder {

abstract Builder setNanValueCounts(Map<Integer, Long> nanValueCounts);

abstract Builder setLowerBounds(@Nullable Map<Integer, byte[]> lowerBounds);
abstract Builder setLowerBounds(@Nullable Map<Integer, ByteBuffer> lowerBounds);

abstract Builder setUpperBounds(@Nullable Map<Integer, byte[]> upperBounds);
abstract Builder setUpperBounds(@Nullable Map<Integer, ByteBuffer> upperBounds);

abstract SerializableDataFile build();
}
Expand All @@ -129,8 +128,8 @@ static SerializableDataFile from(DataFile f, PartitionKey key) {
.setValueCounts(f.valueCounts())
.setNullValueCounts(f.nullValueCounts())
.setNanValueCounts(f.nanValueCounts())
.setLowerBounds(toByteArrayMap(f.lowerBounds()))
.setUpperBounds(toByteArrayMap(f.upperBounds()))
.setLowerBounds(f.lowerBounds())
.setUpperBounds(f.upperBounds())
.build();
}

Expand All @@ -155,8 +154,8 @@ DataFile createDataFile(PartitionSpec partitionSpec) {
getValueCounts(),
getNullValueCounts(),
getNanValueCounts(),
toByteBufferMap(getLowerBounds()),
toByteBufferMap(getUpperBounds()));
getLowerBounds(),
getUpperBounds());

return DataFiles.builder(partitionSpec)
.withFormat(FileFormat.fromString(getFileFormat()))
Expand All @@ -168,31 +167,4 @@ DataFile createDataFile(PartitionSpec partitionSpec) {
.withSplitOffsets(getSplitOffsets())
.build();
}

// ByteBuddyUtils has trouble converting Map value type ByteBuffer
// to byte[] and back to ByteBuffer, so we perform these conversions manually
// TODO(https://github.com/apache/beam/issues/32701)
private static @Nullable Map<Integer, byte[]> toByteArrayMap(
@Nullable Map<Integer, ByteBuffer> input) {
if (input == null) {
return null;
}
Map<Integer, byte[]> output = new HashMap<>(input.size());
for (Map.Entry<Integer, ByteBuffer> e : input.entrySet()) {
output.put(e.getKey(), e.getValue().array());
}
return output;
}

private static @Nullable Map<Integer, ByteBuffer> toByteBufferMap(
@Nullable Map<Integer, byte[]> input) {
if (input == null) {
return null;
}
Map<Integer, ByteBuffer> output = new HashMap<>(input.size());
for (Map.Entry<Integer, byte[]> e : input.entrySet()) {
output.put(e.getKey(), ByteBuffer.wrap(e.getValue()));
}
return output;
}
}
Loading