the-other-tim-brown commented on code in PR #669: URL: https://github.com/apache/incubator-xtable/pull/669#discussion_r2018792072
########## xtable-core/src/main/java/org/apache/xtable/parquet/ParquetStatsExtractor.java: ########## @@ -0,0 +1,139 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.xtable.parquet; + +import org.apache.xtable.model.schema.InternalSchema; + +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.TreeSet; +import java.util.Optional; + +import org.apache.xtable.model.stat.PartitionValue; +import org.apache.xtable.model.stat.ColumnStat; +import org.apache.xtable.model.stat.Range; +import lombok.Builder; +import lombok.Value; +import org.apache.xtable.model.storage.InternalDataFile; +import org.apache.hadoop.fs.*; +import org.apache.parquet.column.ColumnDescriptor; +import org.apache.parquet.column.Encoding; +import org.apache.parquet.column.statistics.Statistics; +import org.apache.parquet.hadoop.metadata.BlockMetaData; +import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; +import org.apache.parquet.hadoop.metadata.ParquetMetadata; +import org.apache.parquet.schema.MessageType; +import org.apache.xtable.model.storage.FileFormat; +import org.apache.xtable.model.config.InputPartitionFields; +import org.apache.hadoop.conf.Configuration; + +@Value +@Builder +public class ParquetStatsExtractor { + + private static final ParquetStatsExtractor INSTANCE = null; // new ParquetStatsExtractor(); + @Builder.Default + private static final ParquetPartitionValueExtractor partitionExtractor = + ParquetPartitionValueExtractor.getInstance(); + @Builder.Default + private static final ParquetSchemaExtractor schemaExtractor = + ParquetSchemaExtractor.getInstance(); + @Builder.Default + private static final ParquetMetadataExtractor parquetMetadataExtractor = + ParquetMetadataExtractor.getInstance(); + + private final InputPartitionFields partitions; + + public static ParquetStatsExtractor getInstance() { + return INSTANCE; + } + + public static List<ColumnStat> getColumnStatsForaFile(ParquetMetadata footer) { + return getStatsForaFile(footer).values().stream() + .flatMap(List::stream) + .collect(Collectors.toList()); + } + private Optional<Long> getMaxFromColumnStats(List<ColumnStat> columnStats) { + return columnStats.stream() + .filter(entry -> entry.getField().getParentPath() == null) + .map(ColumnStat::getNumValues) + .filter(numValues -> numValues > 0) + .max(Long::compareTo); + } + + + public static Map<ColumnDescriptor, List<ColumnStat>> getStatsForaFile(ParquetMetadata footer) { + List<ColumnStat> colStat = new ArrayList<ColumnStat>(); + Map<ColumnDescriptor, List<ColumnStat>> columnDescStats = new HashMap<>(); + for (BlockMetaData blockMetaData : footer.getBlocks()) { + MessageType schema = parquetMetadataExtractor.getSchema(footer); + List<ColumnChunkMetaData> columns = blockMetaData.getColumns(); + columnDescStats = + columns + .stream() + .collect(Collectors.groupingBy(columnMetaData -> schema.getColumnDescription(columnMetaData.getPath().toArray()), + Collectors.mapping(columnMetaData ->ColumnStat.builder() + .numValues(columnMetaData.getValueCount()) + .totalSize(columnMetaData.getTotalSize()) + .range(Range.vector(columnMetaData.getStatistics().genericGetMin(), columnMetaData.getStatistics().genericGetMax())) + .build(), Collectors.toList()))); + } + return columnDescStats; + } + + private InputPartitionFields initPartitionInfo() { + return partitions; + } + + private InternalDataFile toInternalDataFile( + Configuration hadoopConf, Path parentPath) throws java.io.IOException { + FileStatus file = null; + List<PartitionValue> partitionValues = null; + ParquetMetadata footer = null; + List<ColumnStat> columnStatsForAFile = null; + try { + FileSystem fs = FileSystem.get(hadoopConf); + file = fs.getFileStatus(parentPath); + InputPartitionFields partitionInfo = initPartitionInfo(); + footer = parquetMetadataExtractor.readParquetMetadata(hadoopConf, parentPath); + MessageType schema = parquetMetadataExtractor.getSchema(footer); + columnStatsForAFile = getColumnStatsForaFile(footer); + partitionValues = partitionExtractor.createPartitionValues( + partitionExtractor.extractPartitionValues( + partitionInfo)); + } catch (java.io.IOException e) { + Review Comment: This should throw an exception since it would be an unexpected state. ########## xtable-core/src/main/java/org/apache/xtable/parquet/ParquetStatsExtractor.java: ########## @@ -0,0 +1,139 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.xtable.parquet; + +import org.apache.xtable.model.schema.InternalSchema; + +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.TreeSet; +import java.util.Optional; + +import org.apache.xtable.model.stat.PartitionValue; +import org.apache.xtable.model.stat.ColumnStat; +import org.apache.xtable.model.stat.Range; +import lombok.Builder; +import lombok.Value; +import org.apache.xtable.model.storage.InternalDataFile; +import org.apache.hadoop.fs.*; +import org.apache.parquet.column.ColumnDescriptor; +import org.apache.parquet.column.Encoding; +import org.apache.parquet.column.statistics.Statistics; +import org.apache.parquet.hadoop.metadata.BlockMetaData; +import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; +import org.apache.parquet.hadoop.metadata.ParquetMetadata; +import org.apache.parquet.schema.MessageType; +import org.apache.xtable.model.storage.FileFormat; +import org.apache.xtable.model.config.InputPartitionFields; +import org.apache.hadoop.conf.Configuration; + +@Value +@Builder +public class ParquetStatsExtractor { + + private static final ParquetStatsExtractor INSTANCE = null; // new ParquetStatsExtractor(); + @Builder.Default + private static final ParquetPartitionValueExtractor partitionExtractor = + ParquetPartitionValueExtractor.getInstance(); + @Builder.Default + private static final ParquetSchemaExtractor schemaExtractor = + ParquetSchemaExtractor.getInstance(); + @Builder.Default + private static final ParquetMetadataExtractor parquetMetadataExtractor = + ParquetMetadataExtractor.getInstance(); + + private final InputPartitionFields partitions; + + public static ParquetStatsExtractor getInstance() { + return INSTANCE; + } + + public static List<ColumnStat> getColumnStatsForaFile(ParquetMetadata footer) { + return getStatsForaFile(footer).values().stream() + .flatMap(List::stream) + .collect(Collectors.toList()); + } + private Optional<Long> getMaxFromColumnStats(List<ColumnStat> columnStats) { + return columnStats.stream() + .filter(entry -> entry.getField().getParentPath() == null) + .map(ColumnStat::getNumValues) + .filter(numValues -> numValues > 0) + .max(Long::compareTo); + } + + + public static Map<ColumnDescriptor, List<ColumnStat>> getStatsForaFile(ParquetMetadata footer) { + List<ColumnStat> colStat = new ArrayList<ColumnStat>(); + Map<ColumnDescriptor, List<ColumnStat>> columnDescStats = new HashMap<>(); + for (BlockMetaData blockMetaData : footer.getBlocks()) { + MessageType schema = parquetMetadataExtractor.getSchema(footer); + List<ColumnChunkMetaData> columns = blockMetaData.getColumns(); + columnDescStats = + columns + .stream() + .collect(Collectors.groupingBy(columnMetaData -> schema.getColumnDescription(columnMetaData.getPath().toArray()), + Collectors.mapping(columnMetaData ->ColumnStat.builder() + .numValues(columnMetaData.getValueCount()) + .totalSize(columnMetaData.getTotalSize()) + .range(Range.vector(columnMetaData.getStatistics().genericGetMin(), columnMetaData.getStatistics().genericGetMax())) + .build(), Collectors.toList()))); + } + return columnDescStats; + } + + private InputPartitionFields initPartitionInfo() { + return partitions; + } + + private InternalDataFile toInternalDataFile( + Configuration hadoopConf, Path parentPath) throws java.io.IOException { + FileStatus file = null; + List<PartitionValue> partitionValues = null; + ParquetMetadata footer = null; + List<ColumnStat> columnStatsForAFile = null; + try { + FileSystem fs = FileSystem.get(hadoopConf); + file = fs.getFileStatus(parentPath); + InputPartitionFields partitionInfo = initPartitionInfo(); + footer = parquetMetadataExtractor.readParquetMetadata(hadoopConf, parentPath); + MessageType schema = parquetMetadataExtractor.getSchema(footer); + columnStatsForAFile = getColumnStatsForaFile(footer); + partitionValues = partitionExtractor.createPartitionValues( + partitionExtractor.extractPartitionValues( + partitionInfo)); Review Comment: Can you create a single method that the user can call to extract the values into the `List<PartitionValue>` to simplify this a bit. It will make the unit test mocking a little simpler as well. ########## xtable-core/src/main/java/org/apache/xtable/parquet/ParquetStatsExtractor.java: ########## @@ -0,0 +1,139 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.xtable.parquet; + +import org.apache.xtable.model.schema.InternalSchema; + +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.TreeSet; +import java.util.Optional; + +import org.apache.xtable.model.stat.PartitionValue; +import org.apache.xtable.model.stat.ColumnStat; +import org.apache.xtable.model.stat.Range; +import lombok.Builder; +import lombok.Value; +import org.apache.xtable.model.storage.InternalDataFile; +import org.apache.hadoop.fs.*; +import org.apache.parquet.column.ColumnDescriptor; +import org.apache.parquet.column.Encoding; +import org.apache.parquet.column.statistics.Statistics; +import org.apache.parquet.hadoop.metadata.BlockMetaData; +import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; +import org.apache.parquet.hadoop.metadata.ParquetMetadata; +import org.apache.parquet.schema.MessageType; +import org.apache.xtable.model.storage.FileFormat; +import org.apache.xtable.model.config.InputPartitionFields; +import org.apache.hadoop.conf.Configuration; + +@Value +@Builder +public class ParquetStatsExtractor { + + private static final ParquetStatsExtractor INSTANCE = null; // new ParquetStatsExtractor(); + @Builder.Default + private static final ParquetPartitionValueExtractor partitionExtractor = + ParquetPartitionValueExtractor.getInstance(); + @Builder.Default + private static final ParquetSchemaExtractor schemaExtractor = + ParquetSchemaExtractor.getInstance(); + @Builder.Default + private static final ParquetMetadataExtractor parquetMetadataExtractor = + ParquetMetadataExtractor.getInstance(); + + private final InputPartitionFields partitions; + + public static ParquetStatsExtractor getInstance() { + return INSTANCE; + } + + public static List<ColumnStat> getColumnStatsForaFile(ParquetMetadata footer) { + return getStatsForaFile(footer).values().stream() + .flatMap(List::stream) + .collect(Collectors.toList()); + } + private Optional<Long> getMaxFromColumnStats(List<ColumnStat> columnStats) { + return columnStats.stream() + .filter(entry -> entry.getField().getParentPath() == null) + .map(ColumnStat::getNumValues) + .filter(numValues -> numValues > 0) + .max(Long::compareTo); + } + + + public static Map<ColumnDescriptor, List<ColumnStat>> getStatsForaFile(ParquetMetadata footer) { + List<ColumnStat> colStat = new ArrayList<ColumnStat>(); + Map<ColumnDescriptor, List<ColumnStat>> columnDescStats = new HashMap<>(); + for (BlockMetaData blockMetaData : footer.getBlocks()) { + MessageType schema = parquetMetadataExtractor.getSchema(footer); + List<ColumnChunkMetaData> columns = blockMetaData.getColumns(); + columnDescStats = + columns + .stream() + .collect(Collectors.groupingBy(columnMetaData -> schema.getColumnDescription(columnMetaData.getPath().toArray()), + Collectors.mapping(columnMetaData ->ColumnStat.builder() + .numValues(columnMetaData.getValueCount()) + .totalSize(columnMetaData.getTotalSize()) + .range(Range.vector(columnMetaData.getStatistics().genericGetMin(), columnMetaData.getStatistics().genericGetMax())) Review Comment: Inside of the [Range javadocs](https://github.com/apache/incubator-xtable/blob/main/xtable-api/src/main/java/org/apache/xtable/model/stat/Range.java#L44) there are some expectations for the value's type. Let's make sure there are tests asserting these values are being populating according to these expectations. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
