Skip to content

Core: Add content and delete file counts to manifest tables #4764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aokolnychyi merged 3 commits into from
May 16, 2022
Merged

Core: Add content and delete file counts to manifest tables #4764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91f505c
Core: Add content and delete file counts to manifest tables
aokolnychyi May 12, 2022
a81cc8e
Add test for Spark 3.2
aokolnychyi May 14, 2022
b24e65d
Cover older Spark versions
aokolnychyi May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/src/main/java/org/apache/iceberg/AllManifestsTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,17 @@
*/
public class AllManifestsTable extends BaseMetadataTable {
private static final Schema MANIFEST_FILE_SCHEMA = new Schema(
Types.NestedField.required(14, "content", Types.IntegerType.get()),
Copy link
Contributor Author

@aokolnychyi aokolnychyi May 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using fresh IDs but adding columns in places where they make sense instead of adding to the end.

Types.NestedField.required(1, "path", Types.StringType.get()),
Types.NestedField.required(2, "length", Types.LongType.get()),
Types.NestedField.optional(3, "partition_spec_id", Types.IntegerType.get()),
Types.NestedField.optional(4, "added_snapshot_id", Types.LongType.get()),
Types.NestedField.optional(5, "added_data_files_count", Types.IntegerType.get()),
Types.NestedField.optional(6, "existing_data_files_count", Types.IntegerType.get()),
Types.NestedField.optional(7, "deleted_data_files_count", Types.IntegerType.get()),
Types.NestedField.required(15, "added_delete_files_count", Types.IntegerType.get()),
Copy link
Contributor Author

@aokolnychyi aokolnychyi May 13, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we did this initially, we'd probably just have one set of counts with generic names but this is public and widely used.

Types.NestedField.required(16, "existing_delete_files_count", Types.IntegerType.get()),
Types.NestedField.required(17, "deleted_delete_files_count", Types.IntegerType.get()),
Types.NestedField.optional(8, "partition_summaries", Types.ListType.ofRequired(9, Types.StructType.of(
Types.NestedField.required(10, "contains_null", Types.BooleanType.get()),
Types.NestedField.required(11, "contains_nan", Types.BooleanType.get()),
Expand Down
14 changes: 11 additions & 3 deletions core/src/main/java/org/apache/iceberg/ManifestsTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,17 @@
*/
public class ManifestsTable extends BaseMetadataTable {
private static final Schema SNAPSHOT_SCHEMA = new Schema(
Types.NestedField.required(14, "content", Types.IntegerType.get()),
Types.NestedField.required(1, "path", Types.StringType.get()),
Types.NestedField.required(2, "length", Types.LongType.get()),
Types.NestedField.required(3, "partition_spec_id", Types.IntegerType.get()),
Types.NestedField.required(4, "added_snapshot_id", Types.LongType.get()),
Types.NestedField.required(5, "added_data_files_count", Types.IntegerType.get()),
Types.NestedField.required(6, "existing_data_files_count", Types.IntegerType.get()),
Types.NestedField.required(7, "deleted_data_files_count", Types.IntegerType.get()),
Types.NestedField.required(15, "added_delete_files_count", Types.IntegerType.get()),
Types.NestedField.required(16, "existing_delete_files_count", Types.IntegerType.get()),
Types.NestedField.required(17, "deleted_delete_files_count", Types.IntegerType.get()),
Types.NestedField.required(8, "partition_summaries", Types.ListType.ofRequired(9, Types.StructType.of(
Types.NestedField.required(10, "contains_null", Types.BooleanType.get()),
Types.NestedField.optional(11, "contains_nan", Types.BooleanType.get()),
Expand Down Expand Up @@ -92,13 +96,17 @@ private class ManifestsTableScan extends StaticTableScan {

static StaticDataTask.Row manifestFileToRow(PartitionSpec spec, ManifestFile manifest) {
return StaticDataTask.Row.of(
manifest.content().id(),
manifest.path(),
manifest.length(),
manifest.partitionSpecId(),
manifest.snapshotId(),
manifest.addedFilesCount(),
manifest.existingFilesCount(),
manifest.deletedFilesCount(),
manifest.content() == ManifestContent.DATA ? manifest.addedFilesCount() : 0,
manifest.content() == ManifestContent.DATA ? manifest.existingFilesCount() : 0,
manifest.content() == ManifestContent.DATA ? manifest.deletedFilesCount() : 0,
manifest.content() == ManifestContent.DELETES ? manifest.addedFilesCount() : 0,
manifest.content() == ManifestContent.DELETES ? manifest.existingFilesCount() : 0,
manifest.content() == ManifestContent.DELETES ? manifest.deletedFilesCount() : 0,
partitionSummariesToRows(spec, manifest.partitions())
);
}
Expand Down
28 changes: 20 additions & 8 deletions ...v2.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import static org.apache.iceberg.ManifestContent.DATA;
import static org.apache.iceberg.ManifestContent.DELETES;
import static org.apache.iceberg.types.Types.NestedField.optional;
import static org.apache.iceberg.types.Types.NestedField.required;

Expand Down Expand Up @@ -895,13 +897,18 @@ public void testManifestsTable() {
GenericRecordBuilder summaryBuilder = new GenericRecordBuilder(AvroSchemaUtil.convert(
manifestTable.schema().findType("partition_summaries.element").asStructType(), "partition_summary"));
List<GenericData.Record> expected = Lists.transform(table.currentSnapshot().allManifests(), manifest ->
builder.set("path", manifest.path())
builder
.set("content", manifest.content().id())
.set("path", manifest.path())
.set("length", manifest.length())
.set("partition_spec_id", manifest.partitionSpecId())
.set("added_snapshot_id", manifest.snapshotId())
.set("added_data_files_count", manifest.addedFilesCount())
.set("existing_data_files_count", manifest.existingFilesCount())
.set("deleted_data_files_count", manifest.deletedFilesCount())
.set("added_data_files_count", manifest.content() == DATA ? manifest.addedFilesCount() : 0)
.set("existing_data_files_count", manifest.content() == DATA ? manifest.existingFilesCount() : 0)
.set("deleted_data_files_count", manifest.content() == DATA ? manifest.deletedFilesCount() : 0)
.set("added_delete_files_count", manifest.content() == DELETES ? manifest.addedFilesCount() : 0)
.set("existing_delete_files_count", manifest.content() == DELETES ? manifest.existingFilesCount() : 0)
.set("deleted_delete_files_count", manifest.content() == DELETES ? manifest.deletedFilesCount() : 0)
.set("partition_summaries", Lists.transform(manifest.partitions(), partition ->
summaryBuilder
.set("contains_null", true)
Expand Down Expand Up @@ -1010,13 +1017,18 @@ public void testAllManifestsTable() {
GenericRecordBuilder summaryBuilder = new GenericRecordBuilder(AvroSchemaUtil.convert(
manifestTable.schema().findType("partition_summaries.element").asStructType(), "partition_summary"));
List<GenericData.Record> expected = Lists.newArrayList(Iterables.transform(manifests, manifest ->
builder.set("path", manifest.path())
builder
.set("content", manifest.content().id())
.set("path", manifest.path())
.set("length", manifest.length())
.set("partition_spec_id", manifest.partitionSpecId())
.set("added_snapshot_id", manifest.snapshotId())
.set("added_data_files_count", manifest.addedFilesCount())
.set("existing_data_files_count", manifest.existingFilesCount())
.set("deleted_data_files_count", manifest.deletedFilesCount())
.set("added_data_files_count", manifest.content() == DATA ? manifest.addedFilesCount() : 0)
.set("existing_data_files_count", manifest.content() == DATA ? manifest.existingFilesCount() : 0)
.set("deleted_data_files_count", manifest.content() == DATA ? manifest.deletedFilesCount() : 0)
.set("added_delete_files_count", manifest.content() == DELETES ? manifest.addedFilesCount() : 0)
.set("existing_delete_files_count", manifest.content() == DELETES ? manifest.existingFilesCount() : 0)
.set("deleted_delete_files_count", manifest.content() == DELETES ? manifest.deletedFilesCount() : 0)
.set("partition_summaries", Lists.transform(manifest.partitions(), partition ->
summaryBuilder
.set("contains_null", false)
Expand Down
28 changes: 20 additions & 8 deletions ...v3.0/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import static org.apache.iceberg.ManifestContent.DATA;
import static org.apache.iceberg.ManifestContent.DELETES;
import static org.apache.iceberg.types.Types.NestedField.optional;
import static org.apache.iceberg.types.Types.NestedField.required;

Expand Down Expand Up @@ -896,13 +898,18 @@ public void testManifestsTable() {
GenericRecordBuilder summaryBuilder = new GenericRecordBuilder(AvroSchemaUtil.convert(
manifestTable.schema().findType("partition_summaries.element").asStructType(), "partition_summary"));
List<GenericData.Record> expected = Lists.transform(table.currentSnapshot().allManifests(), manifest ->
builder.set("path", manifest.path())
builder
.set("content", manifest.content().id())
.set("path", manifest.path())
.set("length", manifest.length())
.set("partition_spec_id", manifest.partitionSpecId())
.set("added_snapshot_id", manifest.snapshotId())
.set("added_data_files_count", manifest.addedFilesCount())
.set("existing_data_files_count", manifest.existingFilesCount())
.set("deleted_data_files_count", manifest.deletedFilesCount())
.set("added_data_files_count", manifest.content() == DATA ? manifest.addedFilesCount() : 0)
.set("existing_data_files_count", manifest.content() == DATA ? manifest.existingFilesCount() : 0)
.set("deleted_data_files_count", manifest.content() == DATA ? manifest.deletedFilesCount() : 0)
.set("added_delete_files_count", manifest.content() == DELETES ? manifest.addedFilesCount() : 0)
.set("existing_delete_files_count", manifest.content() == DELETES ? manifest.existingFilesCount() : 0)
.set("deleted_delete_files_count", manifest.content() == DELETES ? manifest.deletedFilesCount() : 0)
.set("partition_summaries", Lists.transform(manifest.partitions(), partition ->
summaryBuilder
.set("contains_null", true)
Expand Down Expand Up @@ -1011,13 +1018,18 @@ public void testAllManifestsTable() {
GenericRecordBuilder summaryBuilder = new GenericRecordBuilder(AvroSchemaUtil.convert(
manifestTable.schema().findType("partition_summaries.element").asStructType(), "partition_summary"));
List<GenericData.Record> expected = Lists.newArrayList(Iterables.transform(manifests, manifest ->
builder.set("path", manifest.path())
builder
.set("content", manifest.content().id())
.set("path", manifest.path())
.set("length", manifest.length())
.set("partition_spec_id", manifest.partitionSpecId())
.set("added_snapshot_id", manifest.snapshotId())
.set("added_data_files_count", manifest.addedFilesCount())
.set("existing_data_files_count", manifest.existingFilesCount())
.set("deleted_data_files_count", manifest.deletedFilesCount())
.set("added_data_files_count", manifest.content() == DATA ? manifest.addedFilesCount() : 0)
.set("existing_data_files_count", manifest.content() == DATA ? manifest.existingFilesCount() : 0)
.set("deleted_data_files_count", manifest.content() == DATA ? manifest.deletedFilesCount() : 0)
.set("added_delete_files_count", manifest.content() == DELETES ? manifest.addedFilesCount() : 0)
.set("existing_delete_files_count", manifest.content() == DELETES ? manifest.existingFilesCount() : 0)
.set("deleted_delete_files_count", manifest.content() == DELETES ? manifest.deletedFilesCount() : 0)
.set("partition_summaries", Lists.transform(manifest.partitions(), partition ->
summaryBuilder
.set("contains_null", false)
Expand Down
28 changes: 20 additions & 8 deletions ...v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import static org.apache.iceberg.ManifestContent.DATA;
import static org.apache.iceberg.ManifestContent.DELETES;
import static org.apache.iceberg.types.Types.NestedField.optional;
import static org.apache.iceberg.types.Types.NestedField.required;

Expand Down Expand Up @@ -896,13 +898,18 @@ public void testManifestsTable() {
GenericRecordBuilder summaryBuilder = new GenericRecordBuilder(AvroSchemaUtil.convert(
manifestTable.schema().findType("partition_summaries.element").asStructType(), "partition_summary"));
List<GenericData.Record> expected = Lists.transform(table.currentSnapshot().allManifests(), manifest ->
builder.set("path", manifest.path())
builder
.set("content", manifest.content().id())
.set("path", manifest.path())
.set("length", manifest.length())
.set("partition_spec_id", manifest.partitionSpecId())
.set("added_snapshot_id", manifest.snapshotId())
.set("added_data_files_count", manifest.addedFilesCount())
.set("existing_data_files_count", manifest.existingFilesCount())
.set("deleted_data_files_count", manifest.deletedFilesCount())
.set("added_data_files_count", manifest.content() == DATA ? manifest.addedFilesCount() : 0)
.set("existing_data_files_count", manifest.content() == DATA ? manifest.existingFilesCount() : 0)
.set("deleted_data_files_count", manifest.content() == DATA ? manifest.deletedFilesCount() : 0)
.set("added_delete_files_count", manifest.content() == DELETES ? manifest.addedFilesCount() : 0)
.set("existing_delete_files_count", manifest.content() == DELETES ? manifest.existingFilesCount() : 0)
.set("deleted_delete_files_count", manifest.content() == DELETES ? manifest.deletedFilesCount() : 0)
.set("partition_summaries", Lists.transform(manifest.partitions(), partition ->
summaryBuilder
.set("contains_null", true)
Expand Down Expand Up @@ -1011,13 +1018,18 @@ public void testAllManifestsTable() {
GenericRecordBuilder summaryBuilder = new GenericRecordBuilder(AvroSchemaUtil.convert(
manifestTable.schema().findType("partition_summaries.element").asStructType(), "partition_summary"));
List<GenericData.Record> expected = Lists.newArrayList(Iterables.transform(manifests, manifest ->
builder.set("path", manifest.path())
builder
.set("content", manifest.content().id())
.set("path", manifest.path())
.set("length", manifest.length())
.set("partition_spec_id", manifest.partitionSpecId())
.set("added_snapshot_id", manifest.snapshotId())
.set("added_data_files_count", manifest.addedFilesCount())
.set("existing_data_files_count", manifest.existingFilesCount())
.set("deleted_data_files_count", manifest.deletedFilesCount())
.set("added_data_files_count", manifest.content() == DATA ? manifest.addedFilesCount() : 0)
.set("existing_data_files_count", manifest.content() == DATA ? manifest.existingFilesCount() : 0)
.set("deleted_data_files_count", manifest.content() == DATA ? manifest.deletedFilesCount() : 0)
.set("added_delete_files_count", manifest.content() == DELETES ? manifest.addedFilesCount() : 0)
.set("existing_delete_files_count", manifest.content() == DELETES ? manifest.existingFilesCount() : 0)
.set("deleted_delete_files_count", manifest.content() == DELETES ? manifest.deletedFilesCount() : 0)
.set("partition_summaries", Lists.transform(manifest.partitions(), partition ->
summaryBuilder
.set("contains_null", false)
Expand Down
Loading