gaborkaszab commented on code in PR #11216:
URL: https://github.com/apache/iceberg/pull/11216#discussion_r1967808710
##########
core/src/test/java/org/apache/iceberg/TestTables.java:
##########
@@ -79,17 +79,7 @@ public static TestTable create(
PartitionSpec spec,
SortOrder sortOrder,
int formatVersion) {
- TestTableOperations ops = new TestTableOperations(name, temp);
- if (ops.current() != null) {
- throw new AlreadyExistsException("Table %s already exists at location:
%s", name, temp);
- }
-
- ops.commit(
- null,
- newTableMetadata(
- schema, spec, sortOrder, temp.toString(), ImmutableMap.of(),
formatVersion));
-
- return new TestTable(ops, name);
+ return createTable(temp, name, schema, spec, formatVersion,
ImmutableMap.of(), sortOrder, null);
Review Comment:
You moved the implementation of these create functions into a common place
that is a nice refactor. However, I see one create() function above at L55 that
still has this same implementation body that seems redundant. Can't you also
replace that with a function call to the common implementation?
##########
data/src/main/java/org/apache/iceberg/data/PartitionStatsHandler.java:
##########
@@ -0,0 +1,286 @@
+/*
+ * 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.data;
+
+import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT;
+import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT_DEFAULT;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.UUID;
+import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.HasTableOperations;
+import org.apache.iceberg.ImmutableGenericPartitionStatisticsFile;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.PartitionStatisticsFile;
+import org.apache.iceberg.PartitionStats;
+import org.apache.iceberg.PartitionStatsUtil;
+import org.apache.iceberg.Partitioning;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.SnapshotRef;
+import org.apache.iceberg.StructLike;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.avro.Avro;
+import org.apache.iceberg.avro.InternalReader;
+import org.apache.iceberg.data.parquet.InternalWriter;
+import org.apache.iceberg.io.CloseableIterable;
+import org.apache.iceberg.io.DataWriter;
+import org.apache.iceberg.io.InputFile;
+import org.apache.iceberg.io.OutputFile;
+import org.apache.iceberg.parquet.Parquet;
+import
org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.types.Types.IntegerType;
+import org.apache.iceberg.types.Types.LongType;
+import org.apache.iceberg.types.Types.NestedField;
+import org.apache.iceberg.types.Types.StructType;
+import org.apache.iceberg.util.SnapshotUtil;
+
+/**
+ * Computes, writes and reads the {@link PartitionStatisticsFile}. Uses
generic readers and writers
+ * to support writing and reading of the stats in table default format.
+ */
+public class PartitionStatsHandler {
+
+ private PartitionStatsHandler() {}
+
+ public enum Column {
+ PARTITION(0),
+ SPEC_ID(1),
+ DATA_RECORD_COUNT(2),
+ DATA_FILE_COUNT(3),
+ TOTAL_DATA_FILE_SIZE_IN_BYTES(4),
+ POSITION_DELETE_RECORD_COUNT(5),
+ POSITION_DELETE_FILE_COUNT(6),
+ EQUALITY_DELETE_RECORD_COUNT(7),
+ EQUALITY_DELETE_FILE_COUNT(8),
+ TOTAL_RECORD_COUNT(9),
+ LAST_UPDATED_AT(10),
+ LAST_UPDATED_SNAPSHOT_ID(11);
+
+ private final int id;
+
+ Column(int id) {
+ this.id = id;
+ }
+
+ public int id() {
+ return id;
+ }
+ }
+
+ /**
+ * Generates the partition stats file schema based on a combined partition
type which considers
+ * all specs in a table.
+ *
+ * @param unifiedPartitionType unified partition schema type. Could be
calculated by {@link
+ * Partitioning#partitionType(Table)}.
+ * @return a schema that corresponds to the provided unified partition type.
+ */
+ public static Schema schema(StructType unifiedPartitionType) {
+ Preconditions.checkState(!unifiedPartitionType.fields().isEmpty(), "Table
must be partitioned");
+ return new Schema(
+ NestedField.required(1, Column.PARTITION.name(), unifiedPartitionType),
+ NestedField.required(2, Column.SPEC_ID.name(), IntegerType.get()),
+ NestedField.required(3, Column.DATA_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.required(4, Column.DATA_FILE_COUNT.name(),
IntegerType.get()),
+ NestedField.required(5, Column.TOTAL_DATA_FILE_SIZE_IN_BYTES.name(),
LongType.get()),
+ NestedField.optional(6, Column.POSITION_DELETE_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.optional(7, Column.POSITION_DELETE_FILE_COUNT.name(),
IntegerType.get()),
+ NestedField.optional(8, Column.EQUALITY_DELETE_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.optional(9, Column.EQUALITY_DELETE_FILE_COUNT.name(),
IntegerType.get()),
+ NestedField.optional(10, Column.TOTAL_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.optional(11, Column.LAST_UPDATED_AT.name(),
LongType.get()),
+ NestedField.optional(12, Column.LAST_UPDATED_SNAPSHOT_ID.name(),
LongType.get()));
+ }
+
+ /**
+ * Computes and writes the {@link PartitionStatisticsFile} for a given
table's current snapshot.
+ *
+ * @param table The {@link Table} for which the partition statistics is
computed.
+ * @return {@link PartitionStatisticsFile} for the current snapshot, or null
if no statistics are
+ * present.
+ */
+ public static PartitionStatisticsFile computeAndWriteStatsFile(Table table)
throws IOException {
+ return computeAndWriteStatsFile(table, SnapshotRef.MAIN_BRANCH);
+ }
+
+ /**
+ * Computes and writes the {@link PartitionStatisticsFile} for a given table
and branch.
+ *
+ * @param table The {@link Table} for which the partition statistics is
computed.
+ * @param branch A branch information to select the required snapshot.
+ * @return {@link PartitionStatisticsFile} for the given branch, or null if
no statistics are
+ * present.
+ */
+ public static PartitionStatisticsFile computeAndWriteStatsFile(Table table,
String branch)
+ throws IOException {
+ Snapshot currentSnapshot = SnapshotUtil.latestSnapshot(table, branch);
+ if (currentSnapshot == null) {
+ Preconditions.checkArgument(
+ branch == null || branch.equals(SnapshotRef.MAIN_BRANCH),
+ "Couldn't find the snapshot for the branch %s",
+ branch);
+ return null;
+ }
+
+ Collection<PartitionStats> stats = PartitionStatsUtil.computeStats(table,
currentSnapshot);
+ if (stats.isEmpty()) {
+ return null;
+ }
+
+ StructType partitionType = Partitioning.partitionType(table);
+ List<PartitionStats> sortedStats = PartitionStatsUtil.sortStats(stats,
partitionType);
+ return writePartitionStatsFile(
+ table, currentSnapshot.snapshotId(), schema(partitionType),
sortedStats);
+ }
+
+ @VisibleForTesting
+ static PartitionStatisticsFile writePartitionStatsFile(
+ Table table, long snapshotId, Schema dataSchema,
Iterable<PartitionStats> records)
+ throws IOException {
+ FileFormat fileFormat =
+ FileFormat.fromString(
+ table.properties().getOrDefault(DEFAULT_FILE_FORMAT,
DEFAULT_FILE_FORMAT_DEFAULT));
+
+ OutputFile outputFile = newPartitionStatsFile(table, fileFormat,
snapshotId);
+
+ try (DataWriter<StructLike> writer = dataWriter(dataSchema, outputFile,
fileFormat)) {
+ records.iterator().forEachRemaining(writer::write);
+ }
+
+ return ImmutableGenericPartitionStatisticsFile.builder()
+ .snapshotId(snapshotId)
+ .path(outputFile.location())
+ .fileSizeInBytes(outputFile.toInputFile().getLength())
+ .build();
+ }
+
+ /**
+ * Reads partition statistics from the specified {@link InputFile} using
given schema.
+ *
+ * @param schema The {@link Schema} of the partition statistics file.
+ * @param inputFile An {@link InputFile} pointing to the partition stats
file.
+ */
+ public static CloseableIterable<PartitionStats> readPartitionStatsFile(
+ Schema schema, InputFile inputFile) {
+ CloseableIterable<StructLike> records = dataReader(schema, inputFile);
+ return CloseableIterable.transform(records,
PartitionStatsHandler::recordToPartitionStats);
+ }
+
+ private static OutputFile newPartitionStatsFile(
+ Table table, FileFormat fileFormat, long snapshotId) {
+ Preconditions.checkArgument(
+ table instanceof HasTableOperations,
+ "Table must have operations to retrieve metadata location");
+
+ return table
+ .io()
+ .newOutputFile(
+ ((HasTableOperations) table)
+ .operations()
+ .metadataFileLocation(
+ fileFormat.addExtension(
+ String.format(
+ Locale.ROOT, "partition-stats-%d-%s", snapshotId,
UUID.randomUUID()))));
+ }
+
+ private static DataWriter<StructLike> dataWriter(
+ Schema dataSchema, OutputFile outputFile, FileFormat fileFormat) throws
IOException {
+ switch (fileFormat) {
+ case PARQUET:
+ return Parquet.writeData(outputFile)
+ .schema(dataSchema)
+ .createWriterFunc(InternalWriter::create)
+ .overwrite()
+ .withSpec(PartitionSpec.unpartitioned())
+ .build();
+ case AVRO:
+ return Avro.writeData(outputFile)
+ .schema(dataSchema)
+ .createWriterFunc(org.apache.iceberg.avro.InternalWriter::create)
+ .overwrite()
Review Comment:
See above: stat file names are expected to be unique, we shouldn't overwrite
any existing files.
##########
data/src/main/java/org/apache/iceberg/data/PartitionStatsHandler.java:
##########
@@ -0,0 +1,286 @@
+/*
+ * 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.data;
+
+import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT;
+import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT_DEFAULT;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.UUID;
+import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.HasTableOperations;
+import org.apache.iceberg.ImmutableGenericPartitionStatisticsFile;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.PartitionStatisticsFile;
+import org.apache.iceberg.PartitionStats;
+import org.apache.iceberg.PartitionStatsUtil;
+import org.apache.iceberg.Partitioning;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.SnapshotRef;
+import org.apache.iceberg.StructLike;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.avro.Avro;
+import org.apache.iceberg.avro.InternalReader;
+import org.apache.iceberg.data.parquet.InternalWriter;
+import org.apache.iceberg.io.CloseableIterable;
+import org.apache.iceberg.io.DataWriter;
+import org.apache.iceberg.io.InputFile;
+import org.apache.iceberg.io.OutputFile;
+import org.apache.iceberg.parquet.Parquet;
+import
org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.types.Types.IntegerType;
+import org.apache.iceberg.types.Types.LongType;
+import org.apache.iceberg.types.Types.NestedField;
+import org.apache.iceberg.types.Types.StructType;
+import org.apache.iceberg.util.SnapshotUtil;
+
+/**
+ * Computes, writes and reads the {@link PartitionStatisticsFile}. Uses
generic readers and writers
+ * to support writing and reading of the stats in table default format.
+ */
+public class PartitionStatsHandler {
+
+ private PartitionStatsHandler() {}
+
+ public enum Column {
+ PARTITION(0),
+ SPEC_ID(1),
+ DATA_RECORD_COUNT(2),
+ DATA_FILE_COUNT(3),
+ TOTAL_DATA_FILE_SIZE_IN_BYTES(4),
+ POSITION_DELETE_RECORD_COUNT(5),
+ POSITION_DELETE_FILE_COUNT(6),
+ EQUALITY_DELETE_RECORD_COUNT(7),
+ EQUALITY_DELETE_FILE_COUNT(8),
+ TOTAL_RECORD_COUNT(9),
+ LAST_UPDATED_AT(10),
+ LAST_UPDATED_SNAPSHOT_ID(11);
+
+ private final int id;
+
+ Column(int id) {
+ this.id = id;
+ }
+
+ public int id() {
+ return id;
+ }
+ }
+
+ /**
+ * Generates the partition stats file schema based on a combined partition
type which considers
+ * all specs in a table.
+ *
+ * @param unifiedPartitionType unified partition schema type. Could be
calculated by {@link
+ * Partitioning#partitionType(Table)}.
+ * @return a schema that corresponds to the provided unified partition type.
+ */
+ public static Schema schema(StructType unifiedPartitionType) {
+ Preconditions.checkState(!unifiedPartitionType.fields().isEmpty(), "Table
must be partitioned");
+ return new Schema(
+ NestedField.required(1, Column.PARTITION.name(), unifiedPartitionType),
+ NestedField.required(2, Column.SPEC_ID.name(), IntegerType.get()),
+ NestedField.required(3, Column.DATA_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.required(4, Column.DATA_FILE_COUNT.name(),
IntegerType.get()),
+ NestedField.required(5, Column.TOTAL_DATA_FILE_SIZE_IN_BYTES.name(),
LongType.get()),
+ NestedField.optional(6, Column.POSITION_DELETE_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.optional(7, Column.POSITION_DELETE_FILE_COUNT.name(),
IntegerType.get()),
+ NestedField.optional(8, Column.EQUALITY_DELETE_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.optional(9, Column.EQUALITY_DELETE_FILE_COUNT.name(),
IntegerType.get()),
+ NestedField.optional(10, Column.TOTAL_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.optional(11, Column.LAST_UPDATED_AT.name(),
LongType.get()),
+ NestedField.optional(12, Column.LAST_UPDATED_SNAPSHOT_ID.name(),
LongType.get()));
+ }
+
+ /**
+ * Computes and writes the {@link PartitionStatisticsFile} for a given
table's current snapshot.
+ *
+ * @param table The {@link Table} for which the partition statistics is
computed.
+ * @return {@link PartitionStatisticsFile} for the current snapshot, or null
if no statistics are
+ * present.
+ */
+ public static PartitionStatisticsFile computeAndWriteStatsFile(Table table)
throws IOException {
+ return computeAndWriteStatsFile(table, SnapshotRef.MAIN_BRANCH);
+ }
+
+ /**
+ * Computes and writes the {@link PartitionStatisticsFile} for a given table
and branch.
+ *
+ * @param table The {@link Table} for which the partition statistics is
computed.
+ * @param branch A branch information to select the required snapshot.
+ * @return {@link PartitionStatisticsFile} for the given branch, or null if
no statistics are
+ * present.
+ */
+ public static PartitionStatisticsFile computeAndWriteStatsFile(Table table,
String branch)
+ throws IOException {
+ Snapshot currentSnapshot = SnapshotUtil.latestSnapshot(table, branch);
+ if (currentSnapshot == null) {
+ Preconditions.checkArgument(
+ branch == null || branch.equals(SnapshotRef.MAIN_BRANCH),
+ "Couldn't find the snapshot for the branch %s",
+ branch);
+ return null;
+ }
+
+ Collection<PartitionStats> stats = PartitionStatsUtil.computeStats(table,
currentSnapshot);
+ if (stats.isEmpty()) {
+ return null;
+ }
+
+ StructType partitionType = Partitioning.partitionType(table);
+ List<PartitionStats> sortedStats = PartitionStatsUtil.sortStats(stats,
partitionType);
+ return writePartitionStatsFile(
+ table, currentSnapshot.snapshotId(), schema(partitionType),
sortedStats);
+ }
+
+ @VisibleForTesting
+ static PartitionStatisticsFile writePartitionStatsFile(
+ Table table, long snapshotId, Schema dataSchema,
Iterable<PartitionStats> records)
+ throws IOException {
+ FileFormat fileFormat =
+ FileFormat.fromString(
+ table.properties().getOrDefault(DEFAULT_FILE_FORMAT,
DEFAULT_FILE_FORMAT_DEFAULT));
+
+ OutputFile outputFile = newPartitionStatsFile(table, fileFormat,
snapshotId);
+
+ try (DataWriter<StructLike> writer = dataWriter(dataSchema, outputFile,
fileFormat)) {
+ records.iterator().forEachRemaining(writer::write);
+ }
+
+ return ImmutableGenericPartitionStatisticsFile.builder()
+ .snapshotId(snapshotId)
+ .path(outputFile.location())
+ .fileSizeInBytes(outputFile.toInputFile().getLength())
+ .build();
+ }
+
+ /**
+ * Reads partition statistics from the specified {@link InputFile} using
given schema.
+ *
+ * @param schema The {@link Schema} of the partition statistics file.
+ * @param inputFile An {@link InputFile} pointing to the partition stats
file.
+ */
+ public static CloseableIterable<PartitionStats> readPartitionStatsFile(
+ Schema schema, InputFile inputFile) {
+ CloseableIterable<StructLike> records = dataReader(schema, inputFile);
+ return CloseableIterable.transform(records,
PartitionStatsHandler::recordToPartitionStats);
+ }
+
+ private static OutputFile newPartitionStatsFile(
+ Table table, FileFormat fileFormat, long snapshotId) {
+ Preconditions.checkArgument(
+ table instanceof HasTableOperations,
+ "Table must have operations to retrieve metadata location");
+
+ return table
+ .io()
+ .newOutputFile(
+ ((HasTableOperations) table)
+ .operations()
+ .metadataFileLocation(
+ fileFormat.addExtension(
+ String.format(
+ Locale.ROOT, "partition-stats-%d-%s", snapshotId,
UUID.randomUUID()))));
Review Comment:
I think this is the way to follow, however, we should somehow raise
awareness that the approach to update both the table stats and partition stats
can produce orphan files within the table folder. I think we should keep
pinging the ongoing conversation on dev@ about this because with this approach
we could easily flood the folder with orphan files and when we drop the table
these files will remain.
##########
data/src/main/java/org/apache/iceberg/data/PartitionStatsHandler.java:
##########
@@ -0,0 +1,281 @@
+/*
+ * 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.data;
+
+import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT;
+import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT_DEFAULT;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.HasTableOperations;
+import org.apache.iceberg.ImmutableGenericPartitionStatisticsFile;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.PartitionStatisticsFile;
+import org.apache.iceberg.PartitionStats;
+import org.apache.iceberg.PartitionStatsUtil;
+import org.apache.iceberg.Partitioning;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.StructLike;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.avro.Avro;
+import org.apache.iceberg.avro.InternalReader;
+import org.apache.iceberg.data.parquet.InternalWriter;
+import org.apache.iceberg.io.CloseableIterable;
+import org.apache.iceberg.io.DataWriter;
+import org.apache.iceberg.io.InputFile;
+import org.apache.iceberg.io.OutputFile;
+import org.apache.iceberg.parquet.Parquet;
+import
org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.types.Types.IntegerType;
+import org.apache.iceberg.types.Types.LongType;
+import org.apache.iceberg.types.Types.NestedField;
+import org.apache.iceberg.types.Types.StructType;
+import org.apache.iceberg.util.SnapshotUtil;
+
+/**
+ * Computes, writes and reads the {@link PartitionStatisticsFile}. Uses
generic readers and writers
+ * to support writing and reading of the stats in table default format.
+ */
+public class PartitionStatsHandler {
+
+ private PartitionStatsHandler() {}
+
+ public enum Column {
+ PARTITION(0),
+ SPEC_ID(1),
+ DATA_RECORD_COUNT(2),
+ DATA_FILE_COUNT(3),
+ TOTAL_DATA_FILE_SIZE_IN_BYTES(4),
+ POSITION_DELETE_RECORD_COUNT(5),
+ POSITION_DELETE_FILE_COUNT(6),
+ EQUALITY_DELETE_RECORD_COUNT(7),
+ EQUALITY_DELETE_FILE_COUNT(8),
+ TOTAL_RECORD_COUNT(9),
+ LAST_UPDATED_AT(10),
+ LAST_UPDATED_SNAPSHOT_ID(11);
+
+ private final int id;
+
+ Column(int id) {
+ this.id = id;
+ }
+
+ public int id() {
+ return id;
+ }
+ }
+
+ /**
+ * Generates the partition stats file schema based on a given partition type.
+ *
+ * <p>Note: Provide the unified partition schema type as mentioned in the
spec.
+ *
+ * @param partitionType unified partition schema type.
+ * @return a schema that corresponds to the provided unified partition type.
+ */
+ public static Schema schema(StructType partitionType) {
+ Preconditions.checkState(!partitionType.fields().isEmpty(), "Table must be
partitioned");
+ return new Schema(
+ NestedField.required(1, Column.PARTITION.name(), partitionType),
+ NestedField.required(2, Column.SPEC_ID.name(), IntegerType.get()),
+ NestedField.required(3, Column.DATA_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.required(4, Column.DATA_FILE_COUNT.name(),
IntegerType.get()),
+ NestedField.required(5, Column.TOTAL_DATA_FILE_SIZE_IN_BYTES.name(),
LongType.get()),
+ NestedField.optional(6, Column.POSITION_DELETE_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.optional(7, Column.POSITION_DELETE_FILE_COUNT.name(),
IntegerType.get()),
+ NestedField.optional(8, Column.EQUALITY_DELETE_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.optional(9, Column.EQUALITY_DELETE_FILE_COUNT.name(),
IntegerType.get()),
+ NestedField.optional(10, Column.TOTAL_RECORD_COUNT.name(),
LongType.get()),
+ NestedField.optional(11, Column.LAST_UPDATED_AT.name(),
LongType.get()),
+ NestedField.optional(12, Column.LAST_UPDATED_SNAPSHOT_ID.name(),
LongType.get()));
+ }
+
+ /**
+ * Computes and writes the {@link PartitionStatisticsFile} for a given
table's current snapshot.
+ *
+ * @param table The {@link Table} for which the partition statistics is
computed.
+ * @return {@link PartitionStatisticsFile} for the current snapshot, or null
if no statistics are
+ * present.
+ */
+ public static PartitionStatisticsFile computeAndWriteStatsFile(Table table)
throws IOException {
+ return computeAndWriteStatsFile(table, null);
+ }
+
+ /**
+ * Computes and writes the {@link PartitionStatisticsFile} for a given table
and branch.
+ *
+ * @param table The {@link Table} for which the partition statistics is
computed.
+ * @param branch A branch information to select the required snapshot.
+ * @return {@link PartitionStatisticsFile} for the given branch, or null if
no statistics are
+ * present.
+ */
+ public static PartitionStatisticsFile computeAndWriteStatsFile(Table table,
String branch)
+ throws IOException {
+ Snapshot currentSnapshot = SnapshotUtil.latestSnapshot(table, branch);
+ if (currentSnapshot == null) {
+ Preconditions.checkArgument(
+ branch == null, "Couldn't find the snapshot for the branch %s",
branch);
+ return null;
+ }
+
+ StructType partitionType = Partitioning.partitionType(table);
+ Collection<PartitionStats> stats = PartitionStatsUtil.computeStats(table,
currentSnapshot);
+ if (stats.isEmpty()) {
+ return null;
+ }
+
+ List<PartitionStats> sortedStats = PartitionStatsUtil.sortStats(stats,
partitionType);
+ return writePartitionStatsFile(
+ table, currentSnapshot.snapshotId(), schema(partitionType),
sortedStats.iterator());
+ }
+
+ @VisibleForTesting
+ static PartitionStatisticsFile writePartitionStatsFile(
+ Table table, long snapshotId, Schema dataSchema,
Iterator<PartitionStats> records)
+ throws IOException {
+ OutputFile outputFile = newPartitionStatsFile(table, snapshotId);
+
+ try (DataWriter<StructLike> writer = dataWriter(dataSchema, outputFile)) {
+ records.forEachRemaining(writer::write);
+ }
+
+ return ImmutableGenericPartitionStatisticsFile.builder()
+ .snapshotId(snapshotId)
+ .path(outputFile.location())
+ .fileSizeInBytes(outputFile.toInputFile().getLength())
+ .build();
+ }
+
+ /**
+ * Reads partition statistics from the specified {@link InputFile} using
given schema.
+ *
+ * @param schema The {@link Schema} of the partition statistics file.
+ * @param inputFile An {@link InputFile} pointing to the partition stats
file.
+ */
+ public static CloseableIterable<PartitionStats> readPartitionStatsFile(
+ Schema schema, InputFile inputFile) {
+ CloseableIterable<StructLike> records = dataReader(schema, inputFile);
+ return CloseableIterable.transform(records,
PartitionStatsHandler::recordToPartitionStats);
+ }
+
+ private static FileFormat fileFormat(String fileLocation) {
+ return
FileFormat.fromString(fileLocation.substring(fileLocation.lastIndexOf(".") +
1));
+ }
+
+ private static OutputFile newPartitionStatsFile(Table table, long
snapshotId) {
+ Preconditions.checkArgument(
+ table instanceof HasTableOperations,
+ "Table must have operations to retrieve metadata location");
+ FileFormat fileFormat =
+ fileFormat(
+ table.properties().getOrDefault(DEFAULT_FILE_FORMAT,
DEFAULT_FILE_FORMAT_DEFAULT));
+ return table
+ .io()
+ .newOutputFile(
+ ((HasTableOperations) table)
+ .operations()
+ .metadataFileLocation(
+ fileFormat.addExtension(
+ String.format(Locale.ROOT, "partition-stats-%d",
snapshotId))));
+ }
+
+ private static DataWriter<StructLike> dataWriter(Schema dataSchema,
OutputFile outputFile)
+ throws IOException {
+ FileFormat fileFormat = fileFormat(outputFile.location());
+ switch (fileFormat) {
+ case PARQUET:
+ return Parquet.writeData(outputFile)
+ .schema(dataSchema)
+ .createWriterFunc(InternalWriter::create)
+ .overwrite()
Review Comment:
Thanks! Shouldn't we also remove the `.overwrite()` call for the writer
here? In case we assume the stat files have unique name we shouldn't allow
overwriting anything that shares the same name.
--
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
