Remove unused FunctionInvoker contructor argument

trinodb · Sep 4, 2022 · 95f033f · 95f033f
1 parent ff71d41
commit 95f033f
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 20 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/metadata/FunctionInvoker.java b/core/trino-main/src/main/java/io/trino/metadata/FunctionInvoker.java
@@ -27,10 +27,10 @@ public class FunctionInvoker
     private final Optional<MethodHandle> instanceFactory;
     private final List<Class<?>> lambdaInterfaces;
 
-    public FunctionInvoker(MethodHandle methodHandle, Optional<MethodHandle> instanceFactory)
+    public FunctionInvoker(MethodHandle methodHandle)
     {
         this.methodHandle = requireNonNull(methodHandle, "methodHandle is null");
-        this.instanceFactory = requireNonNull(instanceFactory, "instanceFactory is null");
+        this.instanceFactory = Optional.empty();
         this.lambdaInterfaces = ImmutableList.of();
     }
 

diff --git a/...-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedFirstOperator.java b/...-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedFirstOperator.java
@@ -23,7 +23,6 @@
 import io.trino.spi.type.TypeSignature;
 
 import java.lang.invoke.MethodHandle;
-import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_FIRST;
 import static io.trino.spi.type.IntegerType.INTEGER;
@@ -54,7 +53,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         Type type = boundSignature.getArgumentType(0);
         return invocationConvention -> {
             MethodHandle methodHandle = typeOperators.getComparisonUnorderedFirstOperator(type, invocationConvention);
-            return new FunctionInvoker(methodHandle, Optional.empty());
+            return new FunctionInvoker(methodHandle);
         };
     }
 }
diff --git a/...o-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedLastOperator.java b/...o-main/src/main/java/io/trino/operator/scalar/GenericComparisonUnorderedLastOperator.java
@@ -23,7 +23,6 @@
 import io.trino.spi.type.TypeSignature;
 
 import java.lang.invoke.MethodHandle;
-import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.COMPARISON_UNORDERED_LAST;
 import static io.trino.spi.type.IntegerType.INTEGER;
@@ -54,7 +53,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         Type type = boundSignature.getArgumentType(0);
         return invocationConvention -> {
             MethodHandle methodHandle = typeOperators.getComparisonUnorderedLastOperator(type, invocationConvention);
-            return new FunctionInvoker(methodHandle, Optional.empty());
+            return new FunctionInvoker(methodHandle);
         };
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericDistinctFromOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericDistinctFromOperator.java
@@ -23,7 +23,6 @@
 import io.trino.spi.type.TypeSignature;
 
 import java.lang.invoke.MethodHandle;
-import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.IS_DISTINCT_FROM;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -55,7 +54,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         Type type = boundSignature.getArgumentType(0);
         return invocationConvention -> {
             MethodHandle methodHandle = typeOperators.getDistinctFromOperator(type, invocationConvention);
-            return new FunctionInvoker(methodHandle, Optional.empty());
+            return new FunctionInvoker(methodHandle);
         };
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericEqualOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericEqualOperator.java
@@ -23,7 +23,6 @@
 import io.trino.spi.type.TypeSignature;
 
 import java.lang.invoke.MethodHandle;
-import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.EQUAL;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -55,7 +54,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         Type type = boundSignature.getArgumentType(0);
         return invocationConvention -> {
             MethodHandle methodHandle = typeOperators.getEqualOperator(type, invocationConvention);
-            return new FunctionInvoker(methodHandle, Optional.empty());
+            return new FunctionInvoker(methodHandle);
         };
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericHashCodeOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericHashCodeOperator.java
@@ -23,7 +23,6 @@
 import io.trino.spi.type.TypeSignature;
 
 import java.lang.invoke.MethodHandle;
-import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.HASH_CODE;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -53,7 +52,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         Type type = boundSignature.getArgumentType(0);
         return invocationConvention -> {
             MethodHandle methodHandle = typeOperators.getHashCodeOperator(type, invocationConvention);
-            return new FunctionInvoker(methodHandle, Optional.empty());
+            return new FunctionInvoker(methodHandle);
         };
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericIndeterminateOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericIndeterminateOperator.java
@@ -23,7 +23,6 @@
 import io.trino.spi.type.TypeSignature;
 
 import java.lang.invoke.MethodHandle;
-import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.INDETERMINATE;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -54,7 +53,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         Type type = boundSignature.getArgumentType(0);
         return invocationConvention -> {
             MethodHandle methodHandle = typeOperators.getIndeterminateOperator(type, invocationConvention);
-            return new FunctionInvoker(methodHandle, Optional.empty());
+            return new FunctionInvoker(methodHandle);
         };
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOperator.java
@@ -23,7 +23,6 @@
 import io.trino.spi.type.TypeSignature;
 
 import java.lang.invoke.MethodHandle;
-import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.LESS_THAN;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -54,7 +53,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         Type type = boundSignature.getArgumentType(0);
         return invocationConvention -> {
             MethodHandle methodHandle = typeOperators.getLessThanOperator(type, invocationConvention);
-            return new FunctionInvoker(methodHandle, Optional.empty());
+            return new FunctionInvoker(methodHandle);
         };
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOrEqualOperator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericLessThanOrEqualOperator.java
@@ -23,7 +23,6 @@
 import io.trino.spi.type.TypeSignature;
 
 import java.lang.invoke.MethodHandle;
-import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
 import static io.trino.spi.type.BooleanType.BOOLEAN;
@@ -54,7 +53,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         Type type = boundSignature.getArgumentType(0);
         return invocationConvention -> {
             MethodHandle methodHandle = typeOperators.getLessThanOrEqualOperator(type, invocationConvention);
-            return new FunctionInvoker(methodHandle, Optional.empty());
+            return new FunctionInvoker(methodHandle);
         };
     }
 }
diff --git a/core/trino-main/src/main/java/io/trino/operator/scalar/GenericXxHash64Operator.java b/core/trino-main/src/main/java/io/trino/operator/scalar/GenericXxHash64Operator.java
@@ -23,7 +23,6 @@
 import io.trino.spi.type.TypeSignature;
 
 import java.lang.invoke.MethodHandle;
-import java.util.Optional;
 
 import static io.trino.spi.function.OperatorType.XX_HASH_64;
 import static io.trino.spi.type.BigintType.BIGINT;
@@ -53,7 +52,7 @@ protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature)
         Type type = boundSignature.getArgumentType(0);
         return invocationConvention -> {
             MethodHandle methodHandle = typeOperators.getXxHash64Operator(type, invocationConvention);
-            return new FunctionInvoker(methodHandle, Optional.empty());
+            return new FunctionInvoker(methodHandle);
         };
     }
 }