RussellSpitzer commented on code in PR #4560:
URL: https://github.com/apache/iceberg/pull/4560#discussion_r852266976
##########
core/src/main/java/org/apache/iceberg/PartitionsTable.java:
##########
@@ -93,16 +94,38 @@ 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);
- PartitionMap partitions = new
PartitionMap(scan.table().spec().partitionType());
+ PartitionMap partitions = new
PartitionMap(Partitioning.partitionType(table));
for (FileScanTask task : tasks) {
- partitions.get(task.file().partition()).update(task.file());
+ PartitionData original = (PartitionData) task.file().partition();
+ PartitionData normalized = normalizePartition(original,
Partitioning.partitionType(table));
+ partitions.get(normalized).update(task.file());
}
return partitions.all();
}
+ private static PartitionData normalizePartition(PartitionData partition,
Types.StructType newSchema) {
+ Preconditions.checkArgument(partition.getPartitionType().fields().size()
== partition.size(),
+ "Partition values must match size");
+ Map<Integer, Object> fieldIdToValues = Maps.newHashMap();
+ int originalPartitionIndex = 0;
+ for (Types.NestedField f : partition.getPartitionType().fields()) {
+ fieldIdToValues.put(f.fieldId(), partition.get(originalPartitionIndex));
+ originalPartitionIndex++;
+ }
+
+ PartitionData result = new PartitionData(newSchema);
+
+ int finalPartitionIndex = 0;
Review Comment:
normalizedPartitionIndex (or normalizedIndex)
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
