RussellSpitzer commented on code in PR #4560:
URL: https://github.com/apache/iceberg/pull/4560#discussion_r855528486
##########
core/src/main/java/org/apache/iceberg/PartitionsTable.java:
##########
@@ -93,16 +96,77 @@ private static StaticDataTask.Row
convertPartition(Partition partition) {
return StaticDataTask.Row.of(partition.key, partition.recordCount,
partition.fileCount, partition.specId);
}
- private static Iterable<Partition> partitions(StaticTableScan scan) {
+ private static Iterable<Partition> partitions(Table table, StaticTableScan
scan) {
CloseableIterable<FileScanTask> tasks = planFiles(scan);
+ Types.StructType normalizedPartitionType =
Partitioning.partitionType(table);
+ PartitionMap partitions = new PartitionMap();
+
+ LoadingCache<Integer, Integer[]> originalPartitionFieldPositionsBySpec =
Caffeine.newBuilder().build(specId ->
+ originalPositions(table, specId, normalizedPartitionType));
+ LoadingCache<Pair<PartitionData, Integer>, PartitionData>
normalizedPartitions = Caffeine.newBuilder().build(
+ pData -> normalizePartition(pData, normalizedPartitionType,
originalPartitionFieldPositionsBySpec));
- PartitionMap partitions = new
PartitionMap(scan.table().spec().partitionType());
for (FileScanTask task : tasks) {
- partitions.get(task.file().partition()).update(task.file());
+ PartitionData original = (PartitionData) task.file().partition();
+ int specId = task.spec().specId();
+ PartitionData normalized = normalizedPartitions.get(Pair.of(original,
specId));
+ partitions.get(normalized).update(task.file());
}
return partitions.all();
}
+ /**
+ * Returns an array of original partition field positions, indexed by
normalized partition field positions
+ */
+ private static Integer[] originalPositions(Table table,
Review Comment:
I think if we make this non-static we can just rely on the table coming from
this class
--
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
