Skip to content

Core: Minor refactoring of PartitionsTable #6975

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
jackye1995 merged 3 commits into from
Mar 21, 2023
Merged

Core: Minor refactoring of PartitionsTable #6975

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de3774c
Core: Minor refactoring of PartitionsTable
ajantha-bhat Mar 1, 2023
66f0836
reword column docs
ajantha-bhat Mar 2, 2023
039dea2
Update case for docs
ajantha-bhat Mar 6, 2023
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
24 changes: 13 additions & 11 deletions core/src/main/java/org/apache/iceberg/PartitionsTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ public class PartitionsTable extends BaseMetadataTable {
this.schema =
new Schema(
Types.NestedField.required(1, "partition", Partitioning.partitionType(table)),
Types.NestedField.required(2, "record_count", Types.LongType.get()),
Types.NestedField.required(3, "file_count", Types.IntegerType.get()),
Types.NestedField.required(4, "spec_id", Types.IntegerType.get()));
Types.NestedField.required(4, "spec_id", Types.IntegerType.get()),

@jackye1995 jackye1995 Mar 2, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I am not sure about the column order, it feels odd to me to have IDs in 1,4,2,3 order. But that's just personal preference.

@ajantha-bhat ajantha-bhat Mar 2, 2023 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

we have discussed this here
#6661 (comment)

I think @RussellSpitzer and @szehon-ho agree that there is no impact from column re-ordering.
Spec-id in the middle really looks odd when we add other counters. I don't want to change the field id and break the compatibility.

Types.NestedField.required(
2, "record_count", Types.LongType.get(), "count of records in data files"),
Types.NestedField.required(
3, "file_count", Types.IntegerType.get(), "count of data files"));

@rdblue rdblue Mar 5, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The docs should use sentence case.

}

@Override
Expand Down Expand Up @@ -77,7 +79,7 @@ private DataTask task(StaticTableScan scan) {
schema(),
scan.schema(),
partitions,
root -> StaticDataTask.Row.of(root.recordCount, root.fileCount));
root -> StaticDataTask.Row.of(root.dataRecordCount, root.dataFileCount));

@rdblue rdblue Mar 5, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't see much value in these renames, but it's okay with me.

} else {
return StaticDataTask.of(
io().newInputFile(table().operations().current().metadataFileLocation()),
Expand All @@ -90,7 +92,7 @@ private DataTask task(StaticTableScan scan) {

private static StaticDataTask.Row convertPartition(Partition partition) {
return StaticDataTask.Row.of(
partition.key, partition.recordCount, partition.fileCount, partition.specId);
partition.key, partition.specId, partition.dataRecordCount, partition.dataFileCount);
}

private static Iterable<Partition> partitions(Table table, StaticTableScan scan) {
Expand Down Expand Up @@ -220,20 +222,20 @@ Iterable<Partition> all() {

static class Partition {
private final StructLike key;
private long recordCount;
private int fileCount;
private int specId;
private long dataRecordCount;
private int dataFileCount;

Partition(StructLike key) {
this.key = key;
this.recordCount = 0;
this.fileCount = 0;
this.specId = 0;
this.dataRecordCount = 0;
this.dataFileCount = 0;
}

void update(DataFile file) {
this.recordCount += file.recordCount();
this.fileCount += 1;
this.dataRecordCount += file.recordCount();
this.dataFileCount += 1;
this.specId = file.specId();
}
}
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/apache/iceberg/TestMetadataTableScans.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,8 @@ public void testPartitionsTableScanWithProjection() {

Table partitionsTable = new PartitionsTable(table);
Types.StructType expected =
new Schema(required(3, "file_count", Types.IntegerType.get())).asStruct();
new Schema(required(3, "file_count", Types.IntegerType.get(), "count of data files"))

@rdblue rdblue Mar 5, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Docs should use sentence case here as well.

.asStruct();

TableScan scanWithProjection = partitionsTable.newScan().select("file_count");
Assert.assertEquals(expected, scanWithProjection.schema().asStruct());
Expand Down
4 changes: 2 additions & 2 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 @@ -1234,8 +1234,8 @@ public void testUnpartitionedPartitionsTable() {

Types.StructType expectedSchema =
Types.StructType.of(
required(2, "record_count", Types.LongType.get()),
required(3, "file_count", Types.IntegerType.get()));
required(2, "record_count", Types.LongType.get(), "count of records in data files"),
required(3, "file_count", Types.IntegerType.get(), "count of data files"));

Table partitionsTable = loadTable(tableIdentifier, "partitions");

Expand Down
4 changes: 2 additions & 2 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 @@ -1232,8 +1232,8 @@ public void testUnpartitionedPartitionsTable() {

Types.StructType expectedSchema =
Types.StructType.of(
required(2, "record_count", Types.LongType.get()),
required(3, "file_count", Types.IntegerType.get()));
required(2, "record_count", Types.LongType.get(), "count of records in data files"),
required(3, "file_count", Types.IntegerType.get(), "count of data files"));

Table partitionsTable = loadTable(tableIdentifier, "partitions");

Expand Down
4 changes: 2 additions & 2 deletions ...v3.2/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 @@ -1249,8 +1249,8 @@ public void testUnpartitionedPartitionsTable() {

Types.StructType expectedSchema =
Types.StructType.of(
required(2, "record_count", Types.LongType.get()),
required(3, "file_count", Types.IntegerType.get()));
required(2, "record_count", Types.LongType.get(), "count of records in data files"),
required(3, "file_count", Types.IntegerType.get(), "count of data files"));

Table partitionsTable = loadTable(tableIdentifier, "partitions");

Expand Down
4 changes: 2 additions & 2 deletions ...v3.3/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 @@ -1252,8 +1252,8 @@ public void testUnpartitionedPartitionsTable() {

Types.StructType expectedSchema =
Types.StructType.of(
required(2, "record_count", Types.LongType.get()),
required(3, "file_count", Types.IntegerType.get()));
required(2, "record_count", Types.LongType.get(), "count of records in data files"),
required(3, "file_count", Types.IntegerType.get(), "count of data files"));

Table partitionsTable = loadTable(tableIdentifier, "partitions");

Expand Down