Remove hand-rolled type signature parser

trinodb · Jun 1, 2020 · fca04a2 · fca04a2
1 parent f1b8c60
commit fca04a2
Show file tree

Hide file tree

Showing 21 changed files with 95 additions and 341 deletions.
diff --git a/presto-main/src/main/java/io/prestosql/metadata/ResolvedFunction.java b/presto-main/src/main/java/io/prestosql/metadata/ResolvedFunction.java
@@ -18,8 +18,8 @@
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableSet;
-import io.prestosql.operator.TypeSignatureParser;
 import io.prestosql.spi.type.TypeSignature;
+import io.prestosql.sql.analyzer.TypeSignatureTranslator;
 import io.prestosql.sql.tree.QualifiedName;
 
 import java.util.ArrayList;
@@ -94,9 +94,9 @@ private static Signature decodeSimpleSignature(String encodedSignature)
         List<String> parts = Splitter.on('|').splitToList(encodedSignature);
         checkArgument(parts.size() >= 2, "Expected encoded signature to contain at least 2 parts: %s", encodedSignature);
         String name = parts.get(0);
-        TypeSignature returnType = TypeSignatureParser.parseTypeSignature(parts.get(1), ImmutableSet.of());
+        TypeSignature returnType = TypeSignatureTranslator.parseTypeSignature(parts.get(1), ImmutableSet.of());
         List<TypeSignature> argumentTypes = parts.subList(2, parts.size()).stream()
-                .map(part -> TypeSignatureParser.parseTypeSignature(part, ImmutableSet.of()))
+                .map(part -> TypeSignatureTranslator.parseTypeSignature(part, ImmutableSet.of()))
                 .collect(toImmutableList());
         return new Signature(name, returnType, argumentTypes);
     }

diff --git a/presto-main/src/main/java/io/prestosql/operator/TypeSignatureParser.java b/presto-main/src/main/java/io/prestosql/operator/TypeSignatureParser.java
diff --git a/presto-main/src/main/java/io/prestosql/operator/aggregation/AggregationImplementation.java b/presto-main/src/main/java/io/prestosql/operator/aggregation/AggregationImplementation.java
@@ -50,7 +50,6 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static io.prestosql.operator.TypeSignatureParser.parseTypeSignature;
 import static io.prestosql.operator.aggregation.AggregationMetadata.ParameterMetadata.ParameterType.BLOCK_INDEX;
 import static io.prestosql.operator.aggregation.AggregationMetadata.ParameterMetadata.ParameterType.NULLABLE_BLOCK_INPUT_CHANNEL;
 import static io.prestosql.operator.aggregation.AggregationMetadata.ParameterMetadata.ParameterType.STATE;
@@ -62,6 +61,7 @@
 import static io.prestosql.operator.annotations.ImplementationDependency.getImplementationDependencyAnnotation;
 import static io.prestosql.operator.annotations.ImplementationDependency.isImplementationDependencyAnnotation;
 import static io.prestosql.operator.annotations.ImplementationDependency.validateImplementationDependencyAnnotation;
+import static io.prestosql.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 import static io.prestosql.util.Reflection.methodHandle;
 import static java.util.Objects.requireNonNull;
 

diff --git a/presto-main/src/main/java/io/prestosql/operator/annotations/FunctionsParserHelper.java b/presto-main/src/main/java/io/prestosql/operator/annotations/FunctionsParserHelper.java
@@ -54,7 +54,6 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
-import static io.prestosql.operator.TypeSignatureParser.parseTypeSignature;
 import static io.prestosql.operator.annotations.ImplementationDependency.isImplementationDependencyAnnotation;
 import static io.prestosql.spi.function.OperatorType.EQUAL;
 import static io.prestosql.spi.function.OperatorType.GREATER_THAN;
@@ -66,6 +65,7 @@
 import static io.prestosql.spi.function.OperatorType.LESS_THAN_OR_EQUAL;
 import static io.prestosql.spi.function.OperatorType.NOT_EQUAL;
 import static io.prestosql.spi.function.OperatorType.XX_HASH_64;
+import static io.prestosql.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 import static java.lang.String.CASE_INSENSITIVE_ORDER;
 
 public final class FunctionsParserHelper

diff --git a/presto-main/src/main/java/io/prestosql/operator/annotations/ImplementationDependency.java b/presto-main/src/main/java/io/prestosql/operator/annotations/ImplementationDependency.java
@@ -40,8 +40,8 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static io.prestosql.operator.TypeSignatureParser.parseTypeSignature;
 import static io.prestosql.operator.annotations.FunctionsParserHelper.containsImplementationDependencyAnnotation;
+import static io.prestosql.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 
 public interface ImplementationDependency
 {

diff --git a/...to-main/src/main/java/io/prestosql/operator/annotations/TypeImplementationDependency.java b/...to-main/src/main/java/io/prestosql/operator/annotations/TypeImplementationDependency.java
@@ -22,7 +22,7 @@
 import java.util.Objects;
 
 import static io.prestosql.metadata.SignatureBinder.applyBoundVariables;
-import static io.prestosql.operator.TypeSignatureParser.parseTypeSignature;
+import static io.prestosql.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 import static java.util.Objects.requireNonNull;
 
 public final class TypeImplementationDependency

diff --git a/presto-main/src/main/java/io/prestosql/operator/scalar/Re2JCastToRegexpFunction.java b/presto-main/src/main/java/io/prestosql/operator/scalar/Re2JCastToRegexpFunction.java
@@ -25,12 +25,12 @@
 
 import java.lang.invoke.MethodHandle;
 
-import static io.prestosql.operator.TypeSignatureParser.parseTypeSignature;
 import static io.prestosql.operator.scalar.ScalarFunctionImplementation.ArgumentProperty.valueTypeArgumentProperty;
 import static io.prestosql.operator.scalar.ScalarFunctionImplementation.NullConvention.RETURN_NULL_ON_NULL;
 import static io.prestosql.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static io.prestosql.spi.function.OperatorType.CAST;
 import static io.prestosql.spi.type.Chars.padSpaces;
+import static io.prestosql.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 import static io.prestosql.type.Re2JRegexpType.RE2J_REGEXP_SIGNATURE;
 import static io.prestosql.util.Reflection.methodHandle;
 import static java.lang.invoke.MethodHandles.insertArguments;

diff --git a/...rc/main/java/io/prestosql/operator/scalar/annotations/ParametricScalarImplementation.java b/...rc/main/java/io/prestosql/operator/scalar/annotations/ParametricScalarImplementation.java
@@ -63,7 +63,6 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
 import static io.prestosql.operator.ParametricFunctionHelpers.bindDependencies;
-import static io.prestosql.operator.TypeSignatureParser.parseTypeSignature;
 import static io.prestosql.operator.annotations.FunctionsParserHelper.containsImplementationDependencyAnnotation;
 import static io.prestosql.operator.annotations.FunctionsParserHelper.containsLegacyNullable;
 import static io.prestosql.operator.annotations.FunctionsParserHelper.createTypeVariableConstraints;
@@ -82,6 +81,7 @@
 import static io.prestosql.operator.scalar.ScalarFunctionImplementation.NullConvention.RETURN_NULL_ON_NULL;
 import static io.prestosql.operator.scalar.ScalarFunctionImplementation.NullConvention.USE_NULL_FLAG;
 import static io.prestosql.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_ERROR;
+import static io.prestosql.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 import static io.prestosql.util.Failures.checkCondition;
 import static io.prestosql.util.Reflection.constructorMethodHandle;
 import static io.prestosql.util.Reflection.methodHandle;

diff --git a/presto-main/src/main/java/io/prestosql/operator/window/WindowAnnotationsParser.java b/presto-main/src/main/java/io/prestosql/operator/window/WindowAnnotationsParser.java
@@ -27,7 +27,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.prestosql.metadata.Signature.typeVariable;
-import static io.prestosql.operator.TypeSignatureParser.parseTypeSignature;
+import static io.prestosql.sql.analyzer.TypeSignatureTranslator.parseTypeSignature;
 
 public final class WindowAnnotationsParser
 {