karuppayya commented on code in PR #10288: URL: https://github.com/apache/iceberg/pull/10288#discussion_r1629953709
########## spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/actions/AnalyzeTableSparkAction.java: ########## @@ -0,0 +1,157 @@ +/* + * 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.iceberg.spark.actions; + +import java.io.IOException; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import org.apache.iceberg.StatisticsFile; +import org.apache.iceberg.Table; +import org.apache.iceberg.actions.AnalyzeTable; +import org.apache.iceberg.actions.ImmutableAnalyzeTable; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.puffin.StandardBlobTypes; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.spark.JobGroupInfo; +import org.apache.iceberg.types.Type; +import org.apache.iceberg.types.Types; +import org.apache.spark.sql.SparkSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Computes the statistic of the given columns and stores it as Puffin files. */ +public class AnalyzeTableSparkAction extends BaseSparkAction<AnalyzeTableSparkAction> + implements AnalyzeTable { + + private static final Logger LOG = LoggerFactory.getLogger(AnalyzeTableSparkAction.class); + private final Table table; + private Set<String> columnsToBeAnalyzed = ImmutableSet.of(); + private Set<String> statsToBecollected = + Sets.newHashSet(StandardBlobTypes.APACHE_DATASKETCHES_THETA_V1); + private Long snapshotId; + + AnalyzeTableSparkAction(SparkSession spark, Table table) { + super(spark); + this.table = table; + } + + @Override + protected AnalyzeTableSparkAction self() { + return this; + } + + @Override + public Result execute() { + String desc = String.format("Analyzing table %s", table.name()); + JobGroupInfo info = newJobGroupInfo("ANALYZE-TABLE", desc); + return withJobGroupInfo(info, this::doExecute); + } + + private Result doExecute() { + LOG.info("Starting the analysis of {}", table.name()); + List<AnalysisResult> analysisResults = + statsToBecollected.stream() + .map( + statsName -> { + switch (statsName) { + case StandardBlobTypes.APACHE_DATASKETCHES_THETA_V1: + return generateNDVAndCommit(); + default: + return ImmutableAnalyzeTable.AnalysisResult.builder() + .statsName(statsName) + .statsCollected(false) + .addAllErrors(Lists.newArrayList("Stats type not supported")) + .build(); + } + }) + .collect(Collectors.toList()); + return ImmutableAnalyzeTable.Result.builder().analysisResults(analysisResults).build(); + } + + private boolean analyzeableTypes(Set<String> columns) { + return columns.stream() + .anyMatch( + columnName -> { + Types.NestedField field = table.schema().findField(columnName); + if (field == null) { + throw new ValidationException("No column with %s name in the table", columnName); + } + Type type = field.type(); + return type.isListType() + || type.isMapType() + || type.isNestedType() + || type.isStructType(); + }); + } + + private AnalysisResult generateNDVAndCommit() { + try { + + if (snapshotId == null) { + snapshotId = table.currentSnapshot().snapshotId(); Review Comment: If the snapshot id is not explicitly specified, then we would want to analyze the table at the point when `execute` is invoked? ########## spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/actions/AnalyzeTableSparkAction.java: ########## @@ -0,0 +1,157 @@ +/* + * 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.iceberg.spark.actions; + +import java.io.IOException; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import org.apache.iceberg.StatisticsFile; +import org.apache.iceberg.Table; +import org.apache.iceberg.actions.AnalyzeTable; +import org.apache.iceberg.actions.ImmutableAnalyzeTable; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.puffin.StandardBlobTypes; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.spark.JobGroupInfo; +import org.apache.iceberg.types.Type; +import org.apache.iceberg.types.Types; +import org.apache.spark.sql.SparkSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Computes the statistic of the given columns and stores it as Puffin files. */ +public class AnalyzeTableSparkAction extends BaseSparkAction<AnalyzeTableSparkAction> + implements AnalyzeTable { + + private static final Logger LOG = LoggerFactory.getLogger(AnalyzeTableSparkAction.class); + private final Table table; + private Set<String> columnsToBeAnalyzed = ImmutableSet.of(); + private Set<String> statsToBecollected = + Sets.newHashSet(StandardBlobTypes.APACHE_DATASKETCHES_THETA_V1); Review Comment: I have fixed this now ########## spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/actions/NDVSketchGenerator.java: ########## @@ -0,0 +1,184 @@ +/* + * 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.iceberg.spark.actions; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; +import org.apache.datasketches.theta.CompactSketch; +import org.apache.datasketches.theta.SetOperationBuilder; +import org.apache.datasketches.theta.UpdateSketch; +import org.apache.iceberg.GenericBlobMetadata; +import org.apache.iceberg.GenericStatisticsFile; +import org.apache.iceberg.HasTableOperations; +import org.apache.iceberg.StatisticsFile; +import org.apache.iceberg.Table; +import org.apache.iceberg.TableOperations; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.puffin.Blob; +import org.apache.iceberg.puffin.Puffin; +import org.apache.iceberg.puffin.PuffinWriter; +import org.apache.iceberg.puffin.StandardBlobTypes; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.types.Types; +import org.apache.spark.api.java.JavaPairRDD; +import org.apache.spark.api.java.function.Function2; +import org.apache.spark.api.java.function.PairFlatMapFunction; +import org.apache.spark.sql.Dataset; +import org.apache.spark.sql.Row; +import org.apache.spark.sql.SparkSession; +import scala.Tuple2; + +public class NDVSketchGenerator { + + private NDVSketchGenerator() {} + + static StatisticsFile generateNDV( + SparkSession spark, Table table, long snapshotId, String... columnsToBeAnalyzed) + throws IOException { + List<String> columnList; + if (columnsToBeAnalyzed == null || columnsToBeAnalyzed.length == 0) { + columnList = + table.schema().columns().stream() + .map(Types.NestedField::name) + .collect(Collectors.toList()); + } else { + columnList = Lists.newArrayList(columnsToBeAnalyzed); + } + Iterator<Tuple2<String, ThetaSketchJavaSerializable>> tuple2Iterator = + computeNDVSketches(spark, table.name(), snapshotId, columnList); + Map<String, ThetaSketchJavaSerializable> sketchMap = Maps.newHashMap(); + + tuple2Iterator.forEachRemaining(tuple -> sketchMap.put(tuple._1, tuple._2)); + return writeToPuffin(table, columnList, sketchMap); + } + + private static StatisticsFile writeToPuffin( + Table table, List<String> columns, Map<String, ThetaSketchJavaSerializable> sketchMap) + throws IOException { + int columnSizes = columns.size(); + TableOperations operations = ((HasTableOperations) table).operations(); + FileIO fileIO = ((HasTableOperations) table).operations().io(); + String path = operations.metadataFileLocation(String.format("%s.stats", UUID.randomUUID())); + OutputFile outputFile = fileIO.newOutputFile(path); + try (PuffinWriter writer = + Puffin.write(outputFile).createdBy("Spark DistinctCountProcedure").build()) { + for (int i = 0; i < columnSizes; i++) { + writer.add( + new Blob( + StandardBlobTypes.APACHE_DATASKETCHES_THETA_V1, + ImmutableList.of(table.schema().findField(columns.get(i)).fieldId()), + table.currentSnapshot().snapshotId(), + table.currentSnapshot().sequenceNumber(), + ByteBuffer.wrap(sketchMap.get(columns.get(i)).getSketch().toByteArray()), + null, + ImmutableMap.of())); + } + writer.finish(); + + return new GenericStatisticsFile( + table.currentSnapshot().snapshotId(), + path, + writer.fileSize(), + writer.footerSize(), + writer.writtenBlobsMetadata().stream() + .map(GenericBlobMetadata::from) + .collect(ImmutableList.toImmutableList())); + + } catch (IOException e) { + throw e; + } + } + + static Iterator<Tuple2<String, ThetaSketchJavaSerializable>> computeNDVSketches( + SparkSession spark, String tableName, long snapshotId, List<String> columns) { + String sql = + String.format( + "select %s from %s VERSION AS OF %d", String.join(",", columns), tableName, snapshotId); + Dataset<Row> data = spark.sql(sql); + final JavaPairRDD<String, String> pairs = + data.javaRDD() + .mapPartitionsToPair( + (PairFlatMapFunction<Iterator<Row>, String, String>) + input -> { + final List<Tuple2<String, String>> list = Lists.newArrayList(); + while (input.hasNext()) { + final Row row = input.next(); + int size = row.size(); + for (int i = 0; i < size; i++) { + list.add(new Tuple2<>(columns.get(i), row.get(i).toString())); + } + } + return list.iterator(); + }); + + final JavaPairRDD<String, ThetaSketchJavaSerializable> sketches = + pairs.aggregateByKey( + new ThetaSketchJavaSerializable(), + 1, // number of partitions Review Comment: This code was just copied from [datasketches example](https://datasketches.apache.org/docs/Theta/ThetaSparkExample.html). This value is used in the [HashPartitioner](https://github.com/apache/spark/blob/master/core/src/main/scala/org/apache/spark/rdd/PairRDDFunctions.scala#L186) behind the scenes. Should we set it to `spark.sql.shuffle.partitions`? -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
