Skip to content

Commit f25b1b4

Browse files
committed
Remove redundant type qualifications for NestedField and PrimitiveType
1 parent 76c61d6 commit f25b1b4

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUtil.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
import org.apache.iceberg.io.LocationProvider;
7676
import org.apache.iceberg.types.Type.PrimitiveType;
7777
import org.apache.iceberg.types.TypeUtil;
78-
import org.apache.iceberg.types.Types;
7978
import org.apache.iceberg.types.Types.NestedField;
8079
import org.apache.iceberg.types.Types.StructType;
8180

@@ -481,19 +480,19 @@ public static Map<PartitionField, Integer> getIdentityPartitions(PartitionSpec p
481480
return columns.buildOrThrow();
482481
}
483482

484-
public static List<Types.NestedField> primitiveFields(Schema schema)
483+
public static List<NestedField> primitiveFields(Schema schema)
485484
{
486485
return primitiveFields(schema.columns())
487486
.collect(toImmutableList());
488487
}
489488

490-
private static Stream<Types.NestedField> primitiveFields(List<NestedField> nestedFields)
489+
private static Stream<NestedField> primitiveFields(List<NestedField> nestedFields)
491490
{
492491
return nestedFields.stream()
493492
.flatMap(IcebergUtil::primitiveFields);
494493
}
495494

496-
private static Stream<Types.NestedField> primitiveFields(NestedField nestedField)
495+
private static Stream<NestedField> primitiveFields(NestedField nestedField)
497496
{
498497
org.apache.iceberg.types.Type type = nestedField.type();
499498
if (type.isPrimitiveType()) {
@@ -502,7 +501,7 @@ private static Stream<Types.NestedField> primitiveFields(NestedField nestedField
502501

503502
if (type.isNestedType()) {
504503
return primitiveFields(type.asNestedType().fields())
505-
.map(field -> Types.NestedField.from(field).withName(nestedField.name() + "." + field.name()).build());
504+
.map(field -> NestedField.from(field).withName(nestedField.name() + "." + field.name()).build());
506505
}
507506

508507
throw new IllegalStateException("Unsupported field type: " + nestedField);
@@ -1253,11 +1252,11 @@ public static Optional<IcebergPartitionColumn> getPartitionColumnType(List<Parti
12531252

12541253
public static List<org.apache.iceberg.types.Type> partitionTypes(
12551254
List<PartitionField> partitionFields,
1256-
Map<Integer, org.apache.iceberg.types.Type.PrimitiveType> idToPrimitiveTypeMapping)
1255+
Map<Integer, PrimitiveType> idToPrimitiveTypeMapping)
12571256
{
12581257
ImmutableList.Builder<org.apache.iceberg.types.Type> partitionTypeBuilder = ImmutableList.builder();
12591258
for (PartitionField partitionField : partitionFields) {
1260-
org.apache.iceberg.types.Type.PrimitiveType sourceType = idToPrimitiveTypeMapping.get(partitionField.sourceId());
1259+
PrimitiveType sourceType = idToPrimitiveTypeMapping.get(partitionField.sourceId());
12611260
org.apache.iceberg.types.Type type = partitionField.transform().getResultType(sourceType);
12621261
partitionTypeBuilder.add(type);
12631262
}

0 commit comments

Comments
 (0)