This is an automated email from the ASF dual-hosted git repository. lzljs3620320 pushed a commit to branch release-1.0 in repository https://gitbox.apache.org/repos/asf/paimon.git
commit b7cdb3da43007eacc1c01c3cbf03bac4bf3eb3c0 Author: JingsongLi <[email protected]> AuthorDate: Fri Jan 24 14:30:19 2025 +0800 [hotfix] Fix compile errors from cherry-pick --- .../java/org/apache/paimon/format/parquet/ParquetReaderFactory.java | 5 +++-- .../apache/paimon/format/parquet/newreader/ParquetColumnVector.java | 2 +- .../format/parquet/newreader/ParquetVectorUpdaterFactory.java | 6 ------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetReaderFactory.java b/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetReaderFactory.java index 0cf0a30127..0eb3f189dd 100644 --- a/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetReaderFactory.java +++ b/paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetReaderFactory.java @@ -153,14 +153,15 @@ public class ParquetReaderFactory implements FormatReaderFactory { new ParquetFileReader( ParquetInputFile.fromPath(context.fileIO(), context.filePath()), builder.build(), - context.selection()); + context.fileIndex()); MessageType fileSchema = reader.getFileMetaData().getSchema(); MessageType requestedSchema = clipParquetSchema(fileSchema); reader.setRequestedSchema(requestedSchema); WritableColumnVector[] writableVectors = createWritableVectors(requestedSchema); MessageColumnIO columnIO = new ColumnIOFactory().getColumnIO(requestedSchema); - List<ParquetField> fields = buildFieldsList(readFields, columnIO); + List<ParquetField> fields = + buildFieldsList(projectedType.getFields(), projectedType.getFieldNames(), columnIO); return new VectorizedParquetRecordReader( context.filePath(), reader, fileSchema, fields, writableVectors, batchSize); diff --git a/paimon-format/src/main/java/org/apache/paimon/format/parquet/newreader/ParquetColumnVector.java b/paimon-format/src/main/java/org/apache/paimon/format/parquet/newreader/ParquetColumnVector.java index 84e95b4c6a..8d8ed6466d 100644 --- a/paimon-format/src/main/java/org/apache/paimon/format/parquet/newreader/ParquetColumnVector.java +++ b/paimon-format/src/main/java/org/apache/paimon/format/parquet/newreader/ParquetColumnVector.java @@ -154,7 +154,7 @@ public class ParquetColumnVector { child.assemble(); } assembleCollection(); - } else if (type == DataTypeRoot.ROW || type == DataTypeRoot.VARIANT) { + } else if (type == DataTypeRoot.ROW) { for (ParquetColumnVector child : children) { child.assemble(); } diff --git a/paimon-format/src/main/java/org/apache/paimon/format/parquet/newreader/ParquetVectorUpdaterFactory.java b/paimon-format/src/main/java/org/apache/paimon/format/parquet/newreader/ParquetVectorUpdaterFactory.java index f59f691f8f..d40740b8e2 100644 --- a/paimon-format/src/main/java/org/apache/paimon/format/parquet/newreader/ParquetVectorUpdaterFactory.java +++ b/paimon-format/src/main/java/org/apache/paimon/format/parquet/newreader/ParquetVectorUpdaterFactory.java @@ -53,7 +53,6 @@ import org.apache.paimon.types.TimestampType; import org.apache.paimon.types.TinyIntType; import org.apache.paimon.types.VarBinaryType; import org.apache.paimon.types.VarCharType; -import org.apache.paimon.types.VariantType; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.Dictionary; @@ -220,11 +219,6 @@ public class ParquetVectorUpdaterFactory { }; } - @Override - public UpdaterFactory visit(VariantType variantType) { - throw new RuntimeException("Variant type is not supported"); - } - @Override public UpdaterFactory visit(ArrayType arrayType) { throw new RuntimeException("Array type is not supported");
