Skip to content

Core: Add list/map block sizes #10973

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

Closed
Fokko wants to merge 3 commits into from
Closed

Core: Add list/map block sizes #10973

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
8a99307
Core: Add list/map block sizes
Fokko Aug 20, 2024
48452cc
Merge branch 'main' of github.com:apache/iceberg into fd-encode-list-…
Fokko Feb 10, 2025
e3a6967
Move other to the `blockingDirectBinaryEncoder`
Fokko Feb 10, 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
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/avro/AvroEncoderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static <T> byte[] encode(T datum, Schema avroSchema) throws IOException {
dataOut.writeUTF(avroSchema.toString());

// Encode the datum with avro schema.
BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(out, null);
BinaryEncoder encoder = EncoderFactory.get().blockingDirectBinaryEncoder(out, null);
DatumWriter<T> writer = new GenericAvroWriter<>(avroSchema);
writer.write(datum, encoder);
encoder.flush();
Expand Down
3 changes: 3 additions & 0 deletions core/src/main/java/org/apache/iceberg/avro/AvroFileAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.avro.file.CodecFactory;
import org.apache.avro.file.DataFileWriter;
import org.apache.avro.io.DatumWriter;
import org.apache.avro.io.EncoderFactory;
import org.apache.iceberg.Metrics;
import org.apache.iceberg.MetricsConfig;
import org.apache.iceberg.exceptions.RuntimeIOException;
Expand Down Expand Up @@ -113,6 +114,8 @@ private static <D> DataFileWriter<D> newAvroWriter(
writer.setMeta(entry.getKey(), entry.getValue());
}

writer.setEncoder(b -> EncoderFactory.get().blockingDirectBinaryEncoder(b, null));
Copy link
Contributor

@namrathamyske namrathamyske Oct 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also do it here:

iceberg/core/src/main/java/org/apache/iceberg/data/avro/IcebergEncoder.java

Line 101 in f4b36a5

BinaryEncoder encoder = EncoderFactory.get().directBinaryEncoder(stream, ENCODER.get());
and

iceberg/core/src/main/java/org/apache/iceberg/avro/AvroEncoderUtil.java

Line 57 in f4b36a5

BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(out, null);


return writer.create(schema, stream);
}
}
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/data/avro/IcebergEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public ByteBuffer encode(D datum) throws IOException {

@Override
public void encode(D datum, OutputStream stream) throws IOException {
BinaryEncoder encoder = EncoderFactory.get().directBinaryEncoder(stream, ENCODER.get());
BinaryEncoder encoder = EncoderFactory.get().blockingDirectBinaryEncoder(stream, ENCODER.get());
ENCODER.set(encoder);
writer.write(datum, encoder);
encoder.flush();
Expand Down
Loading