Delegate getType methods to TypeRegistry

Author: martint

presto-main/src/main/java/io/prestosql/metadata/Metadata.java

@@ -404,15 +404,9 @@ public interface Metadata
 
     Type getType(TypeSignature signature);
 
-    default Type fromSqlType(String sqlType)
-    {
-        return getType(TypeSignature.parseTypeSignature(sqlType)); // TODO: use SQL parser
-    }
+    Type fromSqlType(String sqlType);
 
-    default Type getType(TypeId id)
-    {
-        return getType(TypeSignature.parseTypeSignature(id.getId()));
-    }
+    Type getType(TypeId id);
 
     default Type getParameterizedType(String baseTypeName, List<TypeSignatureParameter> typeParameters)
     {

presto-main/src/main/java/io/prestosql/metadata/MetadataManager.java

@@ -83,6 +83,7 @@
 import io.prestosql.spi.statistics.TableStatisticsMetadata;
 import io.prestosql.spi.type.ParametricType;
 import io.prestosql.spi.type.Type;
+import io.prestosql.spi.type.TypeId;
 import io.prestosql.spi.type.TypeNotFoundException;
 import io.prestosql.spi.type.TypeSignature;
 import io.prestosql.sql.analyzer.FeaturesConfig;
@@ -1211,6 +1212,18 @@ public Type getType(TypeSignature signature)
         return typeRegistry.getType(new InternalTypeManager(this), signature);
     }
 
+    @Override
+    public Type fromSqlType(String sqlType)
+    {
+        return typeRegistry.fromSqlType(new InternalTypeManager(this), sqlType);
+    }
+
+    @Override
+    public Type getType(TypeId id)
+    {
+        return typeRegistry.getType(new InternalTypeManager(this), id);
+    }
+
     @Override
     public Collection<Type> getTypes()
     {

presto-main/src/main/java/io/prestosql/metadata/TypeRegistry.java

@@ -19,6 +19,7 @@
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import io.prestosql.spi.type.ParametricType;
 import io.prestosql.spi.type.Type;
+import io.prestosql.spi.type.TypeId;
 import io.prestosql.spi.type.TypeManager;
 import io.prestosql.spi.type.TypeNotFoundException;
 import io.prestosql.spi.type.TypeParameter;
@@ -58,6 +59,7 @@
 import static io.prestosql.spi.type.TimestampType.TIMESTAMP;
 import static io.prestosql.spi.type.TimestampWithTimeZoneType.TIMESTAMP_WITH_TIME_ZONE;
 import static io.prestosql.spi.type.TinyintType.TINYINT;
+import static io.prestosql.spi.type.TypeSignature.parseTypeSignature;
 import static io.prestosql.spi.type.VarbinaryType.VARBINARY;
 import static io.prestosql.type.ArrayParametricType.ARRAY;
 import static io.prestosql.type.CodePointsType.CODE_POINTS;
@@ -155,6 +157,17 @@ public Type getType(TypeManager typeManager, TypeSignature signature)
         return type;
     }
 
+    public Type getType(TypeManager typeManager, TypeId id)
+    {
+        // TODO: ID should be encoded in a more canonical form than SQL
+        return fromSqlType(typeManager, id.getId());
+    }
+
+    public Type fromSqlType(TypeManager typeManager, String sqlType)
+    {
+        return getType(typeManager, parseTypeSignature(sqlType)); // TODO: use SQL parser
+    }
+
     private Type instantiateParametricType(TypeManager typeManager, TypeSignature signature)
     {
         List<TypeParameter> parameters = new ArrayList<>();

presto-main/src/main/java/io/prestosql/type/InternalTypeManager.java

@@ -19,6 +19,7 @@
 import io.prestosql.spi.function.OperatorType;
 import io.prestosql.spi.type.ParametricType;
 import io.prestosql.spi.type.Type;
+import io.prestosql.spi.type.TypeId;
 import io.prestosql.spi.type.TypeManager;
 import io.prestosql.spi.type.TypeSignature;
 import io.prestosql.spi.type.TypeSignatureParameter;
@@ -51,6 +52,18 @@ public Type getType(TypeSignature signature)
         return metadata.getType(signature);
     }
 
+    @Override
+    public Type fromSqlType(String type)
+    {
+        return metadata.fromSqlType(type);
+    }
+
+    @Override
+    public Type getType(TypeId id)
+    {
+        return metadata.getType(id);
+    }
+
     @Override
     public Type getParameterizedType(String baseTypeName, List<TypeSignatureParameter> typeParameters)
     {

presto-main/src/test/java/io/prestosql/execution/TestCreateTableTask.java

@@ -21,6 +21,7 @@
 import io.prestosql.metadata.Catalog;
 import io.prestosql.metadata.CatalogManager;
 import io.prestosql.metadata.ColumnPropertyManager;
+import io.prestosql.metadata.MetadataManager;
 import io.prestosql.metadata.QualifiedObjectName;
 import io.prestosql.metadata.TableHandle;
 import io.prestosql.metadata.TablePropertyManager;
@@ -31,6 +32,7 @@
 import io.prestosql.spi.connector.ConnectorCapabilities;
 import io.prestosql.spi.connector.ConnectorTableMetadata;
 import io.prestosql.spi.type.Type;
+import io.prestosql.spi.type.TypeId;
 import io.prestosql.spi.type.TypeSignature;
 import io.prestosql.sql.tree.ColumnDefinition;
 import io.prestosql.sql.tree.CreateTable;
@@ -44,7 +46,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.Function;
 
 import static com.google.common.collect.Sets.immutableEnumSet;
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
@@ -183,7 +184,7 @@ public void testCreateWithUnsupportedConnectorThrowsWhenNotNull()
     private static class MockMetadata
             extends AbstractMockMetadata
     {
-        private final Function<TypeSignature, Type> typeLookup;
+        private final MetadataManager metadata;
         private final TablePropertyManager tablePropertyManager;
         private final ColumnPropertyManager columnPropertyManager;
         private final CatalogName catalogHandle;
@@ -200,7 +201,7 @@ public MockMetadata(
             this.columnPropertyManager = requireNonNull(columnPropertyManager, "columnPropertyManager is null");
             this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
             this.connectorCapabilities = requireNonNull(immutableEnumSet(connectorCapabilities), "connectorCapabilities is null");
-            this.typeLookup = createTestMetadataManager()::getType;
+            this.metadata = createTestMetadataManager();
         }
 
         @Override
@@ -227,7 +228,19 @@ public ColumnPropertyManager getColumnPropertyManager()
         @Override
         public Type getType(TypeSignature signature)
         {
-            return typeLookup.apply(signature);
+            return metadata.getType(signature);
+        }
+
+        @Override
+        public Type getType(TypeId id)
+        {
+            return metadata.getType(id);
+        }
+
+        @Override
+        public Type fromSqlType(String sqlType)
+        {
+            return metadata.fromSqlType(sqlType);
         }
 
         @Override

presto-main/src/test/java/io/prestosql/metadata/AbstractMockMetadata.java

@@ -51,6 +51,7 @@
 import io.prestosql.spi.statistics.TableStatisticsMetadata;
 import io.prestosql.spi.type.ParametricType;
 import io.prestosql.spi.type.Type;
+import io.prestosql.spi.type.TypeId;
 import io.prestosql.spi.type.TypeSignature;
 import io.prestosql.sql.analyzer.TypeSignatureProvider;
 import io.prestosql.sql.planner.PartitioningHandle;
@@ -503,6 +504,18 @@ public Type getType(TypeSignature signature)
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Type fromSqlType(String sqlType)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Type getType(TypeId id)
+    {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void verifyComparableOrderableContract()
     {

presto-main/src/test/java/io/prestosql/sql/planner/TestEffectivePredicateExtractor.java

@@ -38,6 +38,7 @@
 import io.prestosql.spi.predicate.Domain;
 import io.prestosql.spi.predicate.TupleDomain;
 import io.prestosql.spi.type.Type;
+import io.prestosql.spi.type.TypeId;
 import io.prestosql.spi.type.TypeSignature;
 import io.prestosql.sql.analyzer.TypeSignatureProvider;
 import io.prestosql.sql.parser.SqlParser;
@@ -139,6 +140,17 @@ public Type getType(TypeSignature signature)
             return delegate.getType(signature);
         }
 
+        public Type fromSqlType(String sqlType)
+        {
+            return delegate.fromSqlType(sqlType);
+        }
+
+        @Override
+        public Type getType(TypeId id)
+        {
+            return delegate.getType(id);
+        }
+
         @Override
         public ResolvedFunction resolveFunction(QualifiedName name, List<TypeSignatureProvider> parameterTypes)
         {

presto-spi/src/main/java/io/prestosql/spi/type/TypeManager.java

@@ -20,8 +20,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import static io.prestosql.spi.type.TypeSignature.parseTypeSignature;
-
 public interface TypeManager
 {
     /**
@@ -34,18 +32,12 @@ public interface TypeManager
     /**
      * Gets a type given it's SQL representation
      */
-    default Type fromSqlType(String type)
-    {
-        return getType(parseTypeSignature(type)); // TODO: use SQL parser
-    }
+    Type fromSqlType(String type);
 
     /**
      * Gets the type with the give (opaque) id
      */
-    default Type getType(TypeId id)
-    {
-        return getType(parseTypeSignature(id.getId()));
-    }
+    Type getType(TypeId id);
 
     /**
      * Gets the type with the specified base type and the given parameters.

presto-spi/src/test/java/io/prestosql/spi/type/TestingTypeManager.java

@@ -45,6 +45,23 @@ public Type getType(TypeSignature signature)
         throw new TypeNotFoundException(signature);
     }
 
+    @Override
+    public Type fromSqlType(String type)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Type getType(TypeId id)
+    {
+        for (Type type : getTypes()) {
+            if (type.getTypeId().equals(id)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("Type not found: " + id);
+    }
+
     @Override
     public Type getParameterizedType(String baseTypeName, List<TypeSignatureParameter> typeParameters)
     {