Remove CatalogHandle from SPI

core/trino-main/src/main/java/io/trino/FullConnectorSession.java

@@ -14,9 +14,9 @@
 package io.trino;
 
 import com.google.common.collect.ImmutableMap;
+import io.trino.connector.CatalogHandle;
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.spi.TrinoException;
-import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.security.ConnectorIdentity;
 import io.trino.spi.type.TimeZoneKey;

core/trino-main/src/main/java/io/trino/Session.java

@@ -23,12 +23,12 @@
 import io.airlift.units.Duration;
 import io.opentelemetry.api.trace.Span;
 import io.trino.client.ProtocolHeaders;
+import io.trino.connector.CatalogHandle;
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.security.AccessControl;
 import io.trino.security.SecurityContext;
 import io.trino.spi.QueryId;
 import io.trino.spi.TrinoException;
-import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.CatalogSchemaName;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.security.Identity;

core/trino-main/src/main/java/io/trino/connector/CatalogConnector.java

@@ -13,10 +13,9 @@
  */
 package io.trino.connector;
 
+import io.trino.connector.CatalogHandle.CatalogHandleType;
 import io.trino.metadata.Catalog;
 import io.trino.spi.catalog.CatalogProperties;
-import io.trino.spi.connector.CatalogHandle;
-import io.trino.spi.connector.CatalogHandle.CatalogHandleType;
 import io.trino.spi.connector.ConnectorName;
 
 import java.util.Optional;

core/trino-main/src/main/java/io/trino/connector/CatalogFactory.java

@@ -15,7 +15,6 @@
 
 import com.google.errorprone.annotations.ThreadSafe;
 import io.trino.spi.catalog.CatalogProperties;
-import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.spi.connector.ConnectorName;

core/trino-spi/src/main/java/io/trino/spi/connector/CatalogHandle.java → core/trino-main/src/main/java/io/trino/connector/CatalogHandle.java

@@ -11,19 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.spi.connector;
+package io.trino.connector;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.trino.spi.catalog.CatalogName;
+import io.trino.spi.connector.CatalogVersion;
 
 import java.util.Objects;
 
-import static io.airlift.slice.SizeOf.estimatedSizeOf;
 import static io.airlift.slice.SizeOf.instanceSize;
-import static io.trino.spi.connector.CatalogHandle.CatalogHandleType.INFORMATION_SCHEMA;
-import static io.trino.spi.connector.CatalogHandle.CatalogHandleType.NORMAL;
-import static io.trino.spi.connector.CatalogHandle.CatalogHandleType.SYSTEM;
+import static io.trino.connector.CatalogHandle.CatalogHandleType.INFORMATION_SCHEMA;
+import static io.trino.connector.CatalogHandle.CatalogHandleType.NORMAL;
+import static io.trino.connector.CatalogHandle.CatalogHandleType.SYSTEM;
 import static java.util.Locale.ROOT;
 import static java.util.Objects.requireNonNull;
 
@@ -166,66 +166,4 @@ public boolean isInternal()
             return internal;
         }
     }
-
-    public static final class CatalogVersion
-    {
-        private static final int INSTANCE_SIZE = instanceSize(CatalogVersion.class);
-
-        private final String version;
-
-        /**
-         * Version of a catalog.
-         */
-        @JsonCreator
-        public CatalogVersion(String version)
-        {
-            requireNonNull(version, "version is null");
-            if (version.isEmpty()) {
-                throw new IllegalArgumentException("version is empty");
-            }
-            for (int i = 0; i < version.length(); i++) {
-                if (!isAllowedCharacter(version.charAt(i))) {
-                    throw new IllegalArgumentException("invalid version: " + version);
-                }
-            }
-
-            this.version = version;
-        }
-
-        private static boolean isAllowedCharacter(char c)
-        {
-            return ('0' <= c && c <= '9') ||
-                    ('a' <= c && c <= 'z') ||
-                    c == '_' ||
-                    c == '-';
-        }
-
-        @Override
-        public boolean equals(Object other)
-        {
-            if (this == other) {
-                return true;
-            }
-            return other instanceof CatalogVersion that &&
-                    version.equals(that.version);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return version.hashCode();
-        }
-
-        @JsonValue
-        @Override
-        public String toString()
-        {
-            return version;
-        }
-
-        public long getRetainedSizeInBytes()
-        {
-            return INSTANCE_SIZE + estimatedSizeOf(version);
-        }
-    }
 }

core/trino-main/src/main/java/io/trino/connector/CatalogPruneTask.java

@@ -29,7 +29,6 @@
 import io.trino.node.AllNodes;
 import io.trino.node.InternalNode;
 import io.trino.node.InternalNodeManager;
-import io.trino.spi.connector.CatalogHandle;
 import io.trino.transaction.TransactionManager;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;

core/trino-main/src/main/java/io/trino/connector/CatalogServiceProvider.java

@@ -13,7 +13,6 @@
  */
 package io.trino.connector;
 
-import io.trino.spi.connector.CatalogHandle;
 import jakarta.validation.constraints.NotNull;
 
 import static com.google.common.base.Preconditions.checkArgument;

core/trino-main/src/main/java/io/trino/connector/ConnectorCatalogServiceProvider.java

@@ -13,8 +13,6 @@
  */
 package io.trino.connector;
 
-import io.trino.spi.connector.CatalogHandle;
-
 import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkArgument;

core/trino-main/src/main/java/io/trino/connector/ConnectorContextInstance.java

@@ -19,7 +19,6 @@
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.PageSorter;
 import io.trino.spi.VersionEmbedder;
-import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.MetadataProvider;
 import io.trino.spi.type.TypeManager;
@@ -37,10 +36,8 @@ public class ConnectorContextInstance
     private final MetadataProvider metadataProvider;
     private final PageSorter pageSorter;
     private final PageIndexerFactory pageIndexerFactory;
-    private final CatalogHandle catalogHandle;
 
     public ConnectorContextInstance(
-            CatalogHandle catalogHandle,
             OpenTelemetry openTelemetry,
             Tracer tracer,
             NodeManager nodeManager,
@@ -58,7 +55,6 @@ public ConnectorContextInstance(
         this.metadataProvider = requireNonNull(metadataProvider, "metadataProvider is null");
         this.pageSorter = requireNonNull(pageSorter, "pageSorter is null");
         this.pageIndexerFactory = requireNonNull(pageIndexerFactory, "pageIndexerFactory is null");
-        this.catalogHandle = requireNonNull(catalogHandle, "catalogHandle is null");
     }
 
     @Override
@@ -73,12 +69,6 @@ public Tracer getTracer()
         return tracer;
     }
 
-    @Override
-    public CatalogHandle getCatalogHandle()
-    {
-        return catalogHandle;
-    }
-
     @Override
     public NodeManager getNodeManager()
     {

core/trino-main/src/main/java/io/trino/connector/ConnectorServices.java

@@ -22,7 +22,6 @@
 import io.trino.metadata.CatalogTableFunctions;
 import io.trino.metadata.CatalogTableProcedures;
 import io.trino.spi.classloader.ThreadContextClassLoader;
-import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorCapabilities;

core/trino-main/src/main/java/io/trino/connector/ConnectorServicesProvider.java

@@ -15,7 +15,6 @@
 
 import io.trino.Session;
 import io.trino.spi.catalog.CatalogProperties;
-import io.trino.spi.connector.CatalogHandle;
 
 import java.util.List;
 import java.util.Set;

core/trino-main/src/main/java/io/trino/connector/CoordinatorDynamicCatalogManager.java

@@ -28,8 +28,7 @@
 import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.catalog.CatalogProperties;
 import io.trino.spi.catalog.CatalogStore;
-import io.trino.spi.connector.CatalogHandle;
-import io.trino.spi.connector.CatalogHandle.CatalogVersion;
+import io.trino.spi.connector.CatalogVersion;
 import io.trino.spi.connector.ConnectorName;
 import jakarta.annotation.PreDestroy;
 
@@ -52,11 +51,11 @@
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static io.trino.connector.CatalogHandle.createRootCatalogHandle;
 import static io.trino.metadata.Catalog.failedCatalog;
 import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
 import static io.trino.spi.StandardErrorCode.CATALOG_NOT_AVAILABLE;
 import static io.trino.spi.StandardErrorCode.CATALOG_NOT_FOUND;
-import static io.trino.spi.connector.CatalogHandle.createRootCatalogHandle;
 import static io.trino.util.Executors.executeUntilFailure;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -139,16 +138,16 @@ public void loadInitialCatalogs()
                                 CatalogProperties catalog = null;
                                 try {
                                     catalog = storedCatalog.loadProperties();
-                                    verify(catalog.catalogHandle().getCatalogName().equals(storedCatalog.name()), "Catalog name does not match catalog handle");
+                                    verify(catalog.name().equals(storedCatalog.name()), "Catalog name does not match catalog properties");
                                     CatalogConnector newCatalog = catalogFactory.createCatalog(catalog);
                                     activeCatalogs.put(storedCatalog.name(), newCatalog.getCatalog());
-                                    allCatalogs.put(catalog.catalogHandle(), newCatalog);
+                                    allCatalogs.put(newCatalog.getCatalogHandle(), newCatalog);
                                     log.debug("-- Added catalog %s using connector %s --", storedCatalog.name(), catalog.connectorName());
                                 }
                                 catch (Throwable e) {
-                                    CatalogHandle catalogHandle = catalog != null ? catalog.catalogHandle() : createRootCatalogHandle(storedCatalog.name(), new CatalogVersion("failed"));
+                                    CatalogVersion catalogVersion = catalog != null ? catalog.version() : new CatalogVersion("failed");
                                     ConnectorName connectorName = catalog != null ? catalog.connectorName() : new ConnectorName("unknown");
-                                    activeCatalogs.put(storedCatalog.name(), failedCatalog(storedCatalog.name(), catalogHandle, connectorName));
+                                    activeCatalogs.put(storedCatalog.name(), failedCatalog(storedCatalog.name(), catalogVersion, connectorName));
                                     log.error(e, "-- Failed to load catalog %s using connector %s --", storedCatalog.name(), connectorName);
                                 }
                                 return null;
@@ -184,7 +183,7 @@ public Set<CatalogHandle> getActiveCatalogs()
     public void ensureCatalogsLoaded(Session session, List<CatalogProperties> catalogs)
     {
         List<CatalogProperties> missingCatalogs = catalogs.stream()
-                .filter(catalog -> !allCatalogs.containsKey(catalog.catalogHandle()))
+                .filter(catalog -> !allCatalogs.containsKey(createRootCatalogHandle(catalog.name(), catalog.version())))
                 .collect(toImmutableList());
 
         if (!missingCatalogs.isEmpty()) {
@@ -274,8 +273,8 @@ public void createCatalog(CatalogName catalogName, ConnectorName connectorName,
 
             // get or create catalog for the handle
             CatalogConnector catalog = allCatalogs.computeIfAbsent(
-                    catalogProperties.catalogHandle(),
-                    handle -> catalogFactory.createCatalog(catalogProperties));
+                    createRootCatalogHandle(catalogName, catalogProperties.version()),
+                    _ -> catalogFactory.createCatalog(catalogProperties));
             catalogStore.addOrReplaceCatalog(catalogProperties);
             activeCatalogs.put(catalogName, catalog.getCatalog());
 

core/trino-main/src/main/java/io/trino/connector/DefaultCatalogFactory.java

@@ -29,9 +29,9 @@
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.PageSorter;
 import io.trino.spi.VersionEmbedder;
+import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.catalog.CatalogProperties;
 import io.trino.spi.classloader.ThreadContextClassLoader;
-import io.trino.spi.connector.CatalogHandle;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
@@ -46,8 +46,9 @@
 import java.util.concurrent.ConcurrentMap;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.trino.spi.connector.CatalogHandle.createInformationSchemaCatalogHandle;
-import static io.trino.spi.connector.CatalogHandle.createSystemTablesCatalogHandle;
+import static io.trino.connector.CatalogHandle.createInformationSchemaCatalogHandle;
+import static io.trino.connector.CatalogHandle.createRootCatalogHandle;
+import static io.trino.connector.CatalogHandle.createSystemTablesCatalogHandle;
 import static java.util.Objects.requireNonNull;
 
 @ThreadSafe
@@ -119,14 +120,14 @@ public CatalogConnector createCatalog(CatalogProperties catalogProperties)
         ConnectorFactory connectorFactory = connectorFactories.get(catalogProperties.connectorName());
         checkArgument(connectorFactory != null, "No factory for connector '%s'. Available factories: %s", catalogProperties.connectorName(), connectorFactories.keySet());
 
+        CatalogHandle catalogHandle = createRootCatalogHandle(catalogProperties.name(), catalogProperties.version());
         Connector connector = createConnector(
-                catalogProperties.catalogHandle().getCatalogName().toString(),
-                catalogProperties.catalogHandle(),
+                catalogProperties.name(),
                 connectorFactory,
                 secretsResolver.getResolvedConfiguration(catalogProperties.properties()));
 
         return createCatalog(
-                catalogProperties.catalogHandle(),
+                catalogHandle,
                 catalogProperties.connectorName(),
                 connector,
                 Optional.of(catalogProperties));
@@ -140,7 +141,7 @@ public CatalogConnector createCatalog(CatalogHandle catalogHandle, ConnectorName
 
     private CatalogConnector createCatalog(CatalogHandle catalogHandle, ConnectorName connectorName, Connector connector, Optional<CatalogProperties> catalogProperties)
     {
-        Tracer tracer = createTracer(catalogHandle);
+        Tracer tracer = createTracer(catalogHandle.getCatalogName());
 
         ConnectorServices catalogConnector = new ConnectorServices(tracer, catalogHandle, connector);
 
@@ -181,16 +182,11 @@ private CatalogConnector createCatalog(CatalogHandle catalogHandle, ConnectorNam
                 catalogProperties);
     }
 
-    private Connector createConnector(
-            String catalogName,
-            CatalogHandle catalogHandle,
-            ConnectorFactory connectorFactory,
-            Map<String, String> properties)
+    private Connector createConnector(CatalogName catalogName, ConnectorFactory connectorFactory, Map<String, String> properties)
     {
         ConnectorContext context = new ConnectorContextInstance(
-                catalogHandle,
                 openTelemetry,
-                createTracer(catalogHandle),
+                createTracer(catalogName),
                 new DefaultNodeManager(currentNode, nodeManager, schedulerIncludeCoordinator),
                 versionEmbedder,
                 typeManager,
@@ -199,12 +195,13 @@ private Connector createConnector(
                 pageIndexerFactory);
 
         try (ThreadContextClassLoader _ = new ThreadContextClassLoader(connectorFactory.getClass().getClassLoader())) {
-            return connectorFactory.create(catalogName, properties, context);
+            // TODO: connector factory should take CatalogName
+            return connectorFactory.create(catalogName.toString(), properties, context);
         }
     }
 
-    private Tracer createTracer(CatalogHandle catalogHandle)
+    private Tracer createTracer(CatalogName catalogName)
     {
-        return openTelemetry.getTracer("trino.catalog." + catalogHandle.getCatalogName());
+        return openTelemetry.getTracer("trino.catalog." + catalogName);
     }
 }