Skip to content

Core: Fix AvroEncoderUtil header error printing literal %02X #17125

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

Open
anxkhn wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −3
Open

Core: Fix AvroEncoderUtil header error printing literal %02X #17125

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
6 changes: 3 additions & 3 deletions 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 @@ -23,6 +23,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.Locale;
import org.apache.avro.LogicalTypes;
import org.apache.avro.Schema;
import org.apache.avro.io.BinaryDecoder;
Expand Down Expand Up @@ -73,9 +74,8 @@ public static <T> T decode(byte[] data) throws IOException {
byte header1 = dataInput.readByte();
Preconditions.checkState(
header0 == MAGIC_BYTES[0] && header1 == MAGIC_BYTES[1],
"Unrecognized header bytes: 0x%02X 0x%02X",
header0,
header1);
"%s",
String.format(Locale.ROOT, "Unrecognized header bytes: 0x%02X 0x%02X", header0, header1));

// Read avro schema
Schema avroSchema = new Schema.Parser().parse(dataInput.readUTF());
Expand Down
9 changes: 9 additions & 0 deletions core/src/test/java/org/apache/iceberg/avro/TestAvroEncoderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.iceberg.avro;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import java.io.IOException;
import java.util.List;
Expand All @@ -27,6 +28,7 @@
import org.apache.avro.generic.GenericData;
import org.apache.iceberg.data.DataTestBase;
import org.apache.iceberg.types.Type;
import org.junit.jupiter.api.Test;

public class TestAvroEncoderUtil extends DataTestBase {
@Override
Expand Down Expand Up @@ -68,4 +70,11 @@ protected void writeAndValidate(org.apache.iceberg.Schema schema) throws IOExcep
assertThat(record.toString()).isEqualTo(expectedRecord.toString());
}
}

@Test
public void decodeRejectsUnrecognizedHeaderBytes() {
assertThatThrownBy(() -> AvroEncoderUtil.decode(new byte[] {(byte) 0x10, (byte) 0x20}))
.isInstanceOf(IllegalStateException.class)
.hasMessage("Unrecognized header bytes: 0x10 0x20");
}
}
Loading