diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/ColumnChunkMetadata.java b/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/ColumnChunkMetadata.java index c104ac921130..22ca3133bdb2 100644 --- a/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/ColumnChunkMetadata.java +++ b/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/ColumnChunkMetadata.java @@ -55,7 +55,7 @@ public static ColumnChunkMetadata get( PrimitiveTypeName type, CompressionCodecName codec, Set encodings, - Statistics statistics, + Statistics statistics, long firstDataPage, long dictionaryPageOffset, long valueCount, @@ -74,7 +74,7 @@ public static ColumnChunkMetadata get( CompressionCodecName codec, EncodingStats encodingStats, Set encodings, - Statistics statistics, + Statistics statistics, long firstDataPage, long dictionaryPageOffset, long valueCount, @@ -91,7 +91,7 @@ public static ColumnChunkMetadata get( CompressionCodecName codec, EncodingStats encodingStats, Set encodings, - Statistics statistics, + Statistics statistics, long firstDataPage, long dictionaryPageOffset, long valueCount, @@ -186,7 +186,7 @@ public ColumnPath getPath() public PrimitiveTypeName getType() { decryptIfNeeded(); - return properties.getType(); + return properties.getPrimitiveType().getPrimitiveTypeName(); } public PrimitiveType getPrimitiveType() @@ -205,7 +205,7 @@ public PrimitiveType getPrimitiveType() public abstract long getTotalSize(); - public abstract Statistics getStatistics(); + public abstract Statistics getStatistics(); public IndexReference getColumnIndexReference() { diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/IntColumnChunkMetadata.java b/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/IntColumnChunkMetadata.java index a609723e611c..baeda553897a 100644 --- a/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/IntColumnChunkMetadata.java +++ b/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/IntColumnChunkMetadata.java @@ -30,7 +30,7 @@ class IntColumnChunkMetadata private final int valueCount; private final int totalSize; private final int totalUncompressedSize; - private final Statistics statistics; + private final Statistics statistics; IntColumnChunkMetadata( ColumnPath path, @@ -38,7 +38,7 @@ class IntColumnChunkMetadata CompressionCodecName codec, EncodingStats encodingStats, Set encodings, - Statistics statistics, + Statistics statistics, long firstDataPage, long dictionaryPageOffset, long valueCount, @@ -98,7 +98,7 @@ public long getTotalSize() } @Override - public Statistics getStatistics() + public Statistics getStatistics() { return statistics; } diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/LongColumnChunkMetadata.java b/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/LongColumnChunkMetadata.java index 2396db53ad83..8bf6c5615bbe 100644 --- a/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/LongColumnChunkMetadata.java +++ b/lib/trino-parquet/src/main/java/io/trino/parquet/metadata/LongColumnChunkMetadata.java @@ -30,7 +30,7 @@ class LongColumnChunkMetadata private final long valueCount; private final long totalSize; private final long totalUncompressedSize; - private final Statistics statistics; + private final Statistics statistics; LongColumnChunkMetadata( ColumnPath path, @@ -38,7 +38,7 @@ class LongColumnChunkMetadata CompressionCodecName codec, EncodingStats encodingStats, Set encodings, - Statistics statistics, + Statistics statistics, long firstDataPageOffset, long dictionaryPageOffset, long valueCount, @@ -85,7 +85,7 @@ public long getTotalSize() } @Override - public Statistics getStatistics() + public Statistics getStatistics() { return statistics; } diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/TrinoValuesWriterFactory.java b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/TrinoValuesWriterFactory.java index c234224b985d..f23bab4b0c0d 100644 --- a/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/TrinoValuesWriterFactory.java +++ b/lib/trino-parquet/src/main/java/io/trino/parquet/writer/valuewriter/TrinoValuesWriterFactory.java @@ -57,7 +57,7 @@ public ValuesWriter newValuesWriter(ColumnDescriptor descriptor, Optional bloomFilter) { // dictionary encoding was not enabled in PARQUET 1.0 - return createBloomFilterValuesWriter(new FixedLenByteArrayPlainValuesWriter(path.getTypeLength(), parquetProperties.getInitialSlabSize(), parquetProperties.getPageSizeThreshold(), parquetProperties.getAllocator()), bloomFilter); + return createBloomFilterValuesWriter(new FixedLenByteArrayPlainValuesWriter(path.getPrimitiveType().getTypeLength(), parquetProperties.getInitialSlabSize(), parquetProperties.getPageSizeThreshold(), parquetProperties.getAllocator()), bloomFilter); } private ValuesWriter getBinaryValuesWriter(ColumnDescriptor path, Optional bloomFilter) @@ -125,7 +125,7 @@ private static DictionaryValuesWriter dictionaryWriter(ColumnDescriptor path, Pa case FLOAT -> new DictionaryValuesWriter.PlainFloatDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), dataPageEncoding, dictPageEncoding, properties.getAllocator()); case FIXED_LEN_BYTE_ARRAY -> - new DictionaryValuesWriter.PlainFixedLenArrayDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), path.getTypeLength(), dataPageEncoding, dictPageEncoding, properties.getAllocator()); + new DictionaryValuesWriter.PlainFixedLenArrayDictionaryValuesWriter(properties.getDictionaryPageSizeThreshold(), path.getPrimitiveType().getTypeLength(), dataPageEncoding, dictPageEncoding, properties.getAllocator()); }; }