Remove duplicated isEqualFunction in FunctionResolution

Author: hantangwangd

presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/properties/EquivalenceClassProperty.java

@@ -196,7 +196,7 @@ public EquivalenceClassProperty addPredicate(RowExpression predicate, FunctionRe
     private static boolean isVariableEqualVariableOrConstant(FunctionResolution functionResolution, RowExpression expression)
     {
         if (expression instanceof CallExpression
-                && functionResolution.isEqualFunction(((CallExpression) expression).getFunctionHandle())
+                && functionResolution.isEqualsFunction(((CallExpression) expression).getFunctionHandle())
                 && ((CallExpression) expression).getArguments().size() == 2) {
             RowExpression e1 = ((CallExpression) expression).getArguments().get(0);
             RowExpression e2 = ((CallExpression) expression).getArguments().get(1);

presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/ReorderJoins.java

@@ -443,7 +443,7 @@ JoinCondition extractJoinConditions(List<RowExpression> joinPredicates,
 
             for (RowExpression predicate : joinPredicates) {
                 if (predicate instanceof CallExpression
-                        && functionResolution.isEqualFunction(((CallExpression) predicate).getFunctionHandle())
+                        && functionResolution.isEqualsFunction(((CallExpression) predicate).getFunctionHandle())
                         && ((CallExpression) predicate).getArguments().size() == 2) {
                     RowExpression argument0 = ((CallExpression) predicate).getArguments().get(0);
                     RowExpression argument1 = ((CallExpression) predicate).getArguments().get(1);

presto-main-base/src/main/java/com/facebook/presto/sql/planner/optimizations/PushdownSubfields.java

@@ -686,7 +686,7 @@ else if (((LambdaDefinitionExpression) call.getArguments().get(1)).getBody() ins
                         if (functionResolution.isArrayContainsFunction(callExpression.getFunctionHandle())) {
                             return extractSubfieldsFromArray((ConstantExpression) callExpression.getArguments().get(0), mapVariable);
                         }
-                        else if (functionResolution.isEqualFunction(callExpression.getFunctionHandle())) {
+                        else if (functionResolution.isEqualsFunction(callExpression.getFunctionHandle())) {
                             ConstantExpression mapKey;
                             if (callExpression.getArguments().get(0) instanceof ConstantExpression) {
                                 mapKey = (ConstantExpression) callExpression.getArguments().get(0);
@@ -1091,7 +1091,7 @@ else if (lambdaDefinitionExpression.getBody() instanceof CallExpression) {
                     return callExpression.getArguments().get(0) instanceof ConstantExpression && callExpression.getArguments().get(1) instanceof VariableReferenceExpression
                             && ((VariableReferenceExpression) callExpression.getArguments().get(1)).getName().equals(lambdaDefinitionExpression.getArguments().get(0));
                 }
-                else if (functionResolution.isEqualFunction(callExpression.getFunctionHandle())) {
+                else if (functionResolution.isEqualsFunction(callExpression.getFunctionHandle())) {
                     return (callExpression.getArguments().get(0) instanceof VariableReferenceExpression
                             && ((VariableReferenceExpression) callExpression.getArguments().get(0)).getName().equals(lambdaDefinitionExpression.getArguments().get(0))
                             && callExpression.getArguments().get(1) instanceof ConstantExpression)

presto-main-base/src/main/java/com/facebook/presto/sql/relational/FunctionResolution.java

@@ -275,8 +275,7 @@ public boolean isComparisonFunction(FunctionHandle functionHandle)
 
     public boolean isEqualsFunction(FunctionHandle functionHandle)
     {
-        Optional<OperatorType> operatorType = functionAndTypeResolver.getFunctionMetadata(functionHandle).getOperatorType();
-        return operatorType.isPresent() && operatorType.get().getOperator().equals(EQUAL.getOperator());
+        return functionAndTypeResolver.getFunctionMetadata(functionHandle).getOperatorType().map(EQUAL::equals).orElse(false);
     }
 
     @Override
@@ -406,11 +405,6 @@ public FunctionHandle approximateSetFunction(Type valueType)
         return functionAndTypeResolver.lookupFunction("approx_set", fromTypes(valueType));
     }
 
-    public boolean isEqualFunction(FunctionHandle functionHandle)
-    {
-        return functionAndTypeResolver.getFunctionMetadata(functionHandle).getOperatorType().map(EQUAL::equals).orElse(false);
-    }
-
     public boolean isArrayContainsFunction(FunctionHandle functionHandle)
     {
         return functionAndTypeResolver.getFunctionMetadata(functionHandle).getName().equals(functionAndTypeResolver.qualifyObjectName(QualifiedName.of("contains")));