From 796b558ddcfc6959279a48c13d1063a1f0c77b1b Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Tue, 7 Apr 2026 11:54:15 +0900 Subject: [PATCH] Replace deprecated Type.getTypeParameters usage --- .../main/java/io/trino/metadata/SignatureBinder.java | 12 ++++++------ .../java/io/trino/util/variant/RowVariantWriter.java | 2 +- .../main/java/io/trino/util/variant/VariantUtil.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/trino-main/src/main/java/io/trino/metadata/SignatureBinder.java b/core/trino-main/src/main/java/io/trino/metadata/SignatureBinder.java index c1b70f4deeae..c19130a9eeb1 100644 --- a/core/trino-main/src/main/java/io/trino/metadata/SignatureBinder.java +++ b/core/trino-main/src/main/java/io/trino/metadata/SignatureBinder.java @@ -606,10 +606,10 @@ private boolean canCast(Type fromType, Type toType) if (fromType instanceof UnknownType || toType instanceof UnknownType) { return true; } - if (fromType instanceof RowType) { - if (toType instanceof RowType) { - List fromTypeParameters = fromType.getTypeParameters(); - List toTypeParameters = toType.getTypeParameters(); + if (fromType instanceof RowType fromRowType) { + if (toType instanceof RowType toRowType) { + List fromTypeParameters = fromRowType.getFieldTypes(); + List toTypeParameters = toRowType.getFieldTypes(); if (fromTypeParameters.size() != toTypeParameters.size()) { return false; } @@ -626,9 +626,9 @@ private boolean canCast(Type fromType, Type toType) } return false; } - if (toType instanceof RowType) { + if (toType instanceof RowType toRowType) { if (isRecursiveCastToRow(fromType)) { - return toType.getTypeParameters().stream() + return toRowType.getFieldTypes().stream() .allMatch(toTypeParameter -> canCast(fromType, toTypeParameter)); } } diff --git a/core/trino-main/src/main/java/io/trino/util/variant/RowVariantWriter.java b/core/trino-main/src/main/java/io/trino/util/variant/RowVariantWriter.java index 5386cdb574ad..fa974c07585e 100644 --- a/core/trino-main/src/main/java/io/trino/util/variant/RowVariantWriter.java +++ b/core/trino-main/src/main/java/io/trino/util/variant/RowVariantWriter.java @@ -64,7 +64,7 @@ final class RowVariantWriter ImmutableList.Builder> writersInWriteOrder = ImmutableList.builderWithExpectedSize(fieldCount); for (int fieldIndex : writeOrder) { - Type fieldType = type.getTypeParameters().get(fieldIndex); + Type fieldType = type.getFieldTypes().get(fieldIndex); fieldNamesInWriteOrder.add(fieldNames.get(fieldIndex)); fieldTypesInWriteOrder.add(fieldType); diff --git a/core/trino-main/src/main/java/io/trino/util/variant/VariantUtil.java b/core/trino-main/src/main/java/io/trino/util/variant/VariantUtil.java index 0f65bc3b2024..89c56adc8a42 100644 --- a/core/trino-main/src/main/java/io/trino/util/variant/VariantUtil.java +++ b/core/trino-main/src/main/java/io/trino/util/variant/VariantUtil.java @@ -162,7 +162,7 @@ public static boolean canCastToVariant(Type type) canCastToVariant(mapType.getValueType()); } if (type instanceof RowType rowType) { - return rowType.getTypeParameters().stream().allMatch(VariantUtil::canCastToVariant); + return rowType.getFieldTypes().stream().allMatch(VariantUtil::canCastToVariant); } return false; } @@ -196,7 +196,7 @@ public static boolean canCastFromVariant(Type type) return mapType.getKeyType() instanceof VarcharType && canCastFromVariant(mapType.getValueType()); } if (type instanceof RowType rowType) { - return rowType.getTypeParameters().stream().allMatch(VariantUtil::canCastFromVariant); + return rowType.getFieldTypes().stream().allMatch(VariantUtil::canCastFromVariant); } return false; }