Skip to content

Parquet: Fix Variant conversion in default Avro writer #17944

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
2dmurali wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −0
Open

Parquet: Fix Variant conversion in default Avro writer #17944

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
4 changes: 4 additions & 0 deletions parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.TypeUtil;
import org.apache.iceberg.variants.Variant;

class ParquetAvro {

Expand Down Expand Up @@ -220,6 +221,9 @@ public <T> Conversion<T> getConversionByClass(
}
} else if ("uuid".equals(logicalType.getName())) {
return (Conversion<T>) uuidConversion;
} else if ("variant".equals(logicalType.getName())
&& Variant.class.isAssignableFrom(datumClass)) {
return (Conversion<T>) variantConversion;
}
return super.getConversionByClass(datumClass, logicalType);
}
Expand Down
28 changes: 28 additions & 0 deletions parquet/src/test/java/org/apache/iceberg/parquet/TestParquet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import org.apache.iceberg.avro.AvroSchemaUtil;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.data.parquet.GenericParquetWriter;
import org.apache.iceberg.data.parquet.InternalReader;
import org.apache.iceberg.expressions.Expression;
import org.apache.iceberg.io.CloseableIterable;
import org.apache.iceberg.io.FileAppender;
Expand All @@ -73,6 +74,8 @@
import org.apache.iceberg.util.Pair;
import org.apache.iceberg.util.RandomUtil;
import org.apache.iceberg.variants.Variant;
import org.apache.iceberg.variants.VariantTestUtil;
import org.apache.iceberg.variants.Variants;
import org.apache.parquet.avro.AvroParquetWriter;
import org.apache.parquet.column.Encoding;
import org.apache.parquet.column.statistics.Statistics;
Expand Down Expand Up @@ -602,6 +605,31 @@ public void testAvroWriterRejectsVariantType() {
.hasMessage("Avro writer does not support variant types");
}

@Test
void writesVariantWithDefaultAvroWriter() throws IOException {
Schema schema = new Schema(required(1, "v", Types.VariantType.get()));
GenericData.Record record =
new GenericData.Record(AvroSchemaUtil.convert(schema.asStruct(), "table"));
Variant expected = Variant.of(Variants.emptyMetadata(), Variants.of(34));
record.put("v", expected);

File file = createTempFile(temp);
try (FileAppender<GenericData.Record> writer =
Parquet.write(Files.localOutput(file)).schema(schema).build()) {
writer.add(record);
}

try (CloseableIterable<Record> rows =
Parquet.read(Files.localInput(file))
.project(schema)
.createReaderFunc(fileSchema -> InternalReader.create(schema, fileSchema))
.build()) {
Variant actual = (Variant) getOnlyElement(rows).get(0);
VariantTestUtil.assertEqual(expected.metadata(), actual.metadata());
VariantTestUtil.assertEqual(expected.value(), actual.value());
}
}

@Test
public void adaptiveBloomFilterSizingShrinksFile() throws IOException {
// when PARQUET_BLOOM_FILTER_ADAPTIVE_ENABLED is not set (the default), the writer
Expand Down
Loading