Skip to content

Replace deprecated Type.getTypeParameters usage #29004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebyhr merged 1 commit into from
Apr 7, 2026
Merged

Replace deprecated Type.getTypeParameters usage #29004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions core/trino-main/src/main/java/io/trino/metadata/SignatureBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Type> fromTypeParameters = fromType.getTypeParameters();
List<Type> toTypeParameters = toType.getTypeParameters();
if (fromType instanceof RowType fromRowType) {
if (toType instanceof RowType toRowType) {
List<Type> fromTypeParameters = fromRowType.getFieldTypes();
List<Type> toTypeParameters = toRowType.getFieldTypes();
if (fromTypeParameters.size() != toTypeParameters.size()) {
return false;
}
Expand All @@ -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));
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/trino-main/src/main/java/io/trino/util/variant/RowVariantWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ final class RowVariantWriter
ImmutableList.Builder<Optional<VariantWriter>> 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);

Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/main/java/io/trino/util/variant/VariantUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down