Skip to content

lambda type coercion [Test - Do Not Review] #26192

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

Draft
Dilli-Babu-Godari wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

lambda type coercion [Test - Do Not Review] #26192

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
140 changes: 127 additions & 13 deletions presto-main-base/src/main/java/com/facebook/presto/metadata/SignatureBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,29 @@ private boolean appendConstraintSolversForArguments(ImmutableList.Builder<TypeCo
}

for (int i = 0; i < formalTypeSignatures.size(); i++) {
if (!appendTypeRelationshipConstraintSolver(resultBuilder, formalTypeSignatures.get(i), actualTypes.get(i), allowCoercion)) {
TypeSignature formalTypeSignature = formalTypeSignatures.get(i);
TypeSignatureProvider actualType = actualTypes.get(i);
// Always allow coercion for function types
boolean effectiveAllowCoercion = allowCoercion;
if (FunctionType.NAME.equals(formalTypeSignature.getBase()) || (!actualType.hasDependency() && actualType.getTypeSignature().getBase().equals(FunctionType.NAME))) {
effectiveAllowCoercion = true;
}
if (!appendTypeRelationshipConstraintSolver(resultBuilder, formalTypeSignature, actualType, effectiveAllowCoercion)) {
return false;
}
}

return appendConstraintSolvers(resultBuilder, formalTypeSignatures, actualTypes, allowCoercion);
// Always allow coercion for function types
boolean effectiveAllowCoercion = allowCoercion;
for (int i = 0; i < formalTypeSignatures.size(); i++) {
TypeSignature formalTypeSignature = formalTypeSignatures.get(i);
TypeSignatureProvider actualType = actualTypes.get(i);
if (FunctionType.NAME.equals(formalTypeSignature.getBase()) || (!actualType.hasDependency() && actualType.getTypeSignature().getBase().equals(FunctionType.NAME))) {
effectiveAllowCoercion = true;
break;
}
}
return appendConstraintSolvers(resultBuilder, formalTypeSignatures, actualTypes, effectiveAllowCoercion);
}

private boolean appendConstraintSolvers(
Expand All @@ -284,7 +301,14 @@ private boolean appendConstraintSolvers(
return false;
}
for (int i = 0; i < formalTypeSignatures.size(); i++) {
if (!appendConstraintSolvers(resultBuilder, formalTypeSignatures.get(i), actualTypes.get(i), allowCoercion)) {
TypeSignature formalTypeSignature = formalTypeSignatures.get(i);
TypeSignatureProvider actualType = actualTypes.get(i);
// Always allow coercion for function types
boolean effectiveAllowCoercion = allowCoercion;
if (FunctionType.NAME.equals(formalTypeSignature.getBase()) || (!actualType.hasDependency() && actualType.getTypeSignature().getBase().equals(FunctionType.NAME))) {
effectiveAllowCoercion = true;
}
if (!appendConstraintSolvers(resultBuilder, formalTypeSignature, actualType, effectiveAllowCoercion)) {
return false;
}
}
Expand Down Expand Up @@ -353,16 +377,21 @@ private boolean appendConstraintSolvers(
formalTypeParameterTypeSignatures.add(typeSignature.get());
}

// Always allow coercion for function types
boolean effectiveAllowCoercion = allowCoercion;
if (FunctionType.NAME.equals(formalTypeSignature.getBase()) || (actualTypeSignatureProvider.getTypeSignature().getBase().equals(FunctionType.NAME))) {
effectiveAllowCoercion = true;
}
return appendConstraintSolvers(
resultBuilder,
formalTypeParameterTypeSignatures.build(),
actualTypeParametersTypeSignatureProvider,
allowCoercion && isCovariantTypeBase(formalTypeSignature.getBase()));
effectiveAllowCoercion || (allowCoercion && isCovariantTypeBase(formalTypeSignature.getBase())));
}

private static boolean isCovariantTypeBase(String typeBase)
{
return typeBase.equals(StandardTypes.ARRAY) || typeBase.equals(StandardTypes.MAP);
return typeBase.equals(StandardTypes.ARRAY) || typeBase.equals(StandardTypes.MAP) || typeBase.equals(FunctionType.NAME);
}

private Set<String> typeVariablesOf(TypeSignature typeSignature)
Expand Down Expand Up @@ -529,9 +558,45 @@ private static List<TypeSignature> expandVarargFormalTypeSignature(List<TypeSign
}
return builder.build();
}

private boolean satisfiesCoercion(boolean allowCoercion, Type fromType, TypeSignature toTypeSignature)
{
// Special handling for function types
if (allowCoercion && fromType instanceof FunctionType && FunctionType.NAME.equals(toTypeSignature.getBase())) {
FunctionType fromFunctionType = (FunctionType) fromType;
try {
Type toType = functionAndTypeManager.getType(toTypeSignature);
if (!(toType instanceof FunctionType)) {
return false;
}
FunctionType toFunctionType = (FunctionType) toType;
// Check if argument types match exactly
List<Type> fromArgumentTypes = fromFunctionType.getArgumentTypes();
List<Type> toArgumentTypes = toFunctionType.getArgumentTypes();
if (fromArgumentTypes.size() != toArgumentTypes.size()) {
return false;
}
for (int i = 0; i < fromArgumentTypes.size(); i++) {
if (!fromArgumentTypes.get(i).equals(toArgumentTypes.get(i))) {
return false;
}
}
// Check if return type can be coerced
Type fromReturnType = fromFunctionType.getReturnType();
Type toReturnType = toFunctionType.getReturnType();
// Special handling for numeric types
String fromBase = fromReturnType.getTypeSignature().getBase();
String toBase = toReturnType.getTypeSignature().getBase();
// Allow coercion between numeric types
if ((fromBase.equals("integer") || fromBase.equals("bigint") || fromBase.equals("smallint")) && (toBase.equals("integer") || toBase.equals("bigint") || toBase.equals("smallint"))) {
return true;
}
// Use the general type coercion mechanism for other types
return functionAndTypeManager.canCoerce(fromReturnType, toReturnType);
}
catch (UnknownTypeException e) {
return false;
}
}
if (allowCoercion) {
try {
return functionAndTypeManager.canCoerce(fromType, functionAndTypeManager.getType(toTypeSignature));
Expand Down Expand Up @@ -756,9 +821,55 @@ public SolverReturnStatus update(BoundVariables.Builder bindings)
TypeSignature actualLambdaTypeSignature;
if (!typeSignatureProvider.hasDependency()) {
actualLambdaTypeSignature = typeSignatureProvider.getTypeSignature();
if (!FunctionType.NAME.equals(actualLambdaTypeSignature.getBase()) || !getLambdaArgumentTypeSignatures(actualLambdaTypeSignature).equals(toTypeSignatures(lambdaArgumentTypes.get()))) {
if (!FunctionType.NAME.equals(actualLambdaTypeSignature.getBase())) {
return SolverReturnStatus.UNSOLVABLE;
}
// Check if argument types match or can be coerced
List<TypeSignature> actualArgumentTypeSignatures = getLambdaArgumentTypeSignatures(actualLambdaTypeSignature);
List<TypeSignature> expectedArgumentTypeSignatures = toTypeSignatures(lambdaArgumentTypes.get());
if (actualArgumentTypeSignatures.size() != expectedArgumentTypeSignatures.size()) {
return SolverReturnStatus.UNSOLVABLE;
}
for (int i = 0; i < actualArgumentTypeSignatures.size(); i++) {
TypeSignature actualArgSignature = actualArgumentTypeSignatures.get(i);
TypeSignature expectedArgSignature = expectedArgumentTypeSignatures.get(i);

// For function arguments, we need exact matches
if (!actualArgSignature.equals(expectedArgSignature)) {
// But allow different function types if they have compatible return types
if (FunctionType.NAME.equals(actualArgSignature.getBase()) &&
FunctionType.NAME.equals(expectedArgSignature.getBase())) {
// For function types, check if argument types match exactly
List<TypeSignature> actualFnArgTypes = getLambdaArgumentTypeSignatures(actualArgSignature);
List<TypeSignature> expectedFnArgTypes = getLambdaArgumentTypeSignatures(expectedArgSignature);

if (actualFnArgTypes.size() != expectedFnArgTypes.size()) {
return SolverReturnStatus.UNSOLVABLE;
}

for (int j = 0; j < actualFnArgTypes.size(); j++) {
if (!actualFnArgTypes.get(j).equals(expectedFnArgTypes.get(j))) {
return SolverReturnStatus.UNSOLVABLE;
}
}

// Check if return types are compatible
Type actualReturnType = functionAndTypeManager.getType(
actualArgSignature.getTypeOrNamedTypeParametersAsTypeSignatures().get(
actualArgSignature.getTypeOrNamedTypeParametersAsTypeSignatures().size() - 1));
Type expectedReturnType = functionAndTypeManager.getType(
expectedArgSignature.getTypeOrNamedTypeParametersAsTypeSignatures().get(
expectedArgSignature.getTypeOrNamedTypeParametersAsTypeSignatures().size() - 1));

if (!functionAndTypeManager.canCoerce(actualReturnType, expectedReturnType)) {
return SolverReturnStatus.UNSOLVABLE;
}
}
else {
return SolverReturnStatus.UNSOLVABLE;
}
}
}
}
else {
actualLambdaTypeSignature = typeSignatureProvider.getTypeSignature(lambdaArgumentTypes.get());
Expand All @@ -767,16 +878,14 @@ public SolverReturnStatus update(BoundVariables.Builder bindings)
}
verify(getLambdaArgumentTypeSignatures(actualLambdaTypeSignature).equals(toTypeSignatures(lambdaArgumentTypes.get())));
}

Type actualLambdaType = functionAndTypeManager.getType(actualLambdaTypeSignature);
Type actualReturnType = ((FunctionType) actualLambdaType).getReturnType();

ImmutableList.Builder<TypeConstraintSolver> constraintsBuilder = ImmutableList.builder();
// Coercion on function type is not supported yet.
if (!appendTypeRelationshipConstraintSolver(constraintsBuilder, formalLambdaReturnTypeSignature, new TypeSignatureProvider(actualReturnType.getTypeSignature()), false)) {
// Always allow coercion on function type return values
if (!appendTypeRelationshipConstraintSolver(constraintsBuilder, formalLambdaReturnTypeSignature, new TypeSignatureProvider(actualReturnType.getTypeSignature()), true)) {
return SolverReturnStatus.UNSOLVABLE;
}
if (!appendConstraintSolvers(constraintsBuilder, formalLambdaReturnTypeSignature, new TypeSignatureProvider(actualReturnType.getTypeSignature()), allowCoercion)) {
if (!appendConstraintSolvers(constraintsBuilder, formalLambdaReturnTypeSignature, new TypeSignatureProvider(actualReturnType.getTypeSignature()), true)) {
return SolverReturnStatus.UNSOLVABLE;
}
SolverReturnStatusMerger statusMerger = new SolverReturnStatusMerger();
Expand Down Expand Up @@ -830,12 +939,17 @@ private boolean appendTypeRelationshipConstraintSolver(
}
Set<String> typeVariables = typeVariablesOf(formalTypeSignature);
Set<String> longVariables = longVariablesOf(formalTypeSignature);
// Always allow coercion for function types
boolean effectiveAllowCoercion = allowCoercion;
if (FunctionType.NAME.equals(formalTypeSignature.getBase()) || (actualTypeSignatureProvider.getTypeSignature().getBase().equals(FunctionType.NAME))) {
effectiveAllowCoercion = true;
}
resultBuilder.add(new TypeRelationshipConstraintSolver(
formalTypeSignature,
typeVariables,
longVariables,
functionAndTypeManager.getType(actualTypeSignatureProvider.getTypeSignature()),
allowCoercion));
effectiveAllowCoercion));
return true;
}

Expand Down
Loading
Loading