Skip to content

Commit bed467a

Browse files
SongChujunebyhr
authored andcommitted
Remove redundant type qualifications for NestedField and PrimitiveType
1 parent 89ac392 commit bed467a

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
@@ -80,7 +80,6 @@
8080
import org.apache.iceberg.io.LocationProvider;
8181
import org.apache.iceberg.types.Type.PrimitiveType;
8282
import org.apache.iceberg.types.TypeUtil;
83-
import org.apache.iceberg.types.Types;
8483
import org.apache.iceberg.types.Types.NestedField;
8584
import org.apache.iceberg.types.Types.StructType;
8685

@@ -486,19 +485,19 @@ public static Map<PartitionField, Integer> getIdentityPartitions(PartitionSpec p
486485
return columns.buildOrThrow();
487486
}
488487

489-
public static List<Types.NestedField> primitiveFields(Schema schema)
488+
public static List<NestedField> primitiveFields(Schema schema)
490489
{
491490
return primitiveFields(schema.columns())
492491
.collect(toImmutableList());
493492
}
494493

495-
private static Stream<Types.NestedField> primitiveFields(List<NestedField> nestedFields)
494+
private static Stream<NestedField> primitiveFields(List<NestedField> nestedFields)
496495
{
497496
return nestedFields.stream()
498497
.flatMap(IcebergUtil::primitiveFields);
499498
}
500499

501-
private static Stream<Types.NestedField> primitiveFields(NestedField nestedField)
500+
private static Stream<NestedField> primitiveFields(NestedField nestedField)
502501
{
503502
org.apache.iceberg.types.Type type = nestedField.type();
504503
if (type.isPrimitiveType()) {
@@ -507,7 +506,7 @@ private static Stream<Types.NestedField> primitiveFields(NestedField nestedField
507506

508507
if (type.isNestedType()) {
509508
return primitiveFields(type.asNestedType().fields())
510-
.map(field -> Types.NestedField.from(field).withName(nestedField.name() + "." + field.name()).build());
509+
.map(field -> NestedField.from(field).withName(nestedField.name() + "." + field.name()).build());
511510
}
512511

513512
throw new IllegalStateException("Unsupported field type: " + nestedField);
@@ -1258,11 +1257,11 @@ public static Optional<IcebergPartitionColumn> getPartitionColumnType(List<Parti
12581257

12591258
public static List<org.apache.iceberg.types.Type> partitionTypes(
12601259
List<PartitionField> partitionFields,
1261-
Map<Integer, org.apache.iceberg.types.Type.PrimitiveType> idToPrimitiveTypeMapping)
1260+
Map<Integer, PrimitiveType> idToPrimitiveTypeMapping)
12621261
{
12631262
ImmutableList.Builder<org.apache.iceberg.types.Type> partitionTypeBuilder = ImmutableList.builder();
12641263
for (PartitionField partitionField : partitionFields) {
1265-
org.apache.iceberg.types.Type.PrimitiveType sourceType = idToPrimitiveTypeMapping.get(partitionField.sourceId());
1264+
PrimitiveType sourceType = idToPrimitiveTypeMapping.get(partitionField.sourceId());
12661265
org.apache.iceberg.types.Type type = partitionField.transform().getResultType(sourceType);
12671266
partitionTypeBuilder.add(type);
12681267
}

0 commit comments

Comments
 (0)