Simplify Hive metastore creation and use

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

@@ -300,9 +300,8 @@ public Session beginTransactionId(TransactionId transactionId, TransactionManage
             if (catalogProperties.isEmpty()) {
                 continue;
             }
-            CatalogName catalog = transactionManager.getOptionalCatalogMetadata(transactionId, catalogName)
-                    .orElseThrow(() -> new TrinoException(NOT_FOUND, "Session property catalog does not exist: " + catalogName))
-                    .getCatalogName();
+            CatalogName catalog = transactionManager.getCatalogName(transactionId, catalogName)
+                    .orElseThrow(() -> new TrinoException(NOT_FOUND, "Session property catalog does not exist: " + catalogName));
 
             validateCatalogProperties(Optional.of(transactionId), accessControl, catalog, catalogProperties);
             connectorProperties.put(catalogName, catalogProperties);
@@ -312,7 +311,7 @@ public Session beginTransactionId(TransactionId transactionId, TransactionManage
         for (Entry<String, SelectedRole> entry : identity.getCatalogRoles().entrySet()) {
             String catalogName = entry.getKey();
             SelectedRole role = entry.getValue();
-            if (transactionManager.getOptionalCatalogMetadata(transactionId, catalogName).isEmpty()) {
+            if (transactionManager.getCatalogName(transactionId, catalogName).isEmpty()) {
                 throw new TrinoException(NOT_FOUND, "Catalog for role does not exist: " + catalogName);
             }
             if (role.getType() == SelectedRole.Type.ROLE) {

core/trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaConnector.java

@@ -18,6 +18,7 @@
 import io.trino.security.AccessControl;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
+import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
@@ -50,7 +51,7 @@ public ConnectorTransactionHandle beginTransaction(TransactionId transactionId,
     }
 
     @Override
-    public ConnectorMetadata getMetadata(ConnectorTransactionHandle transactionHandle)
+    public ConnectorMetadata getMetadata(ConnectorSession session, ConnectorTransactionHandle transactionHandle)
     {
         return metadata;
     }

core/trino-main/src/main/java/io/trino/connector/system/GlobalSystemConnector.java

@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import io.trino.spi.connector.ConnectorMetadata;
+import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.procedure.Procedure;
@@ -47,7 +48,7 @@ public ConnectorTransactionHandle beginTransaction(TransactionId transactionId,
     }
 
     @Override
-    public ConnectorMetadata getMetadata(ConnectorTransactionHandle transactionHandle)
+    public ConnectorMetadata getMetadata(ConnectorSession session, ConnectorTransactionHandle transactionHandle)
     {
         return new ConnectorMetadata() {};
     }

core/trino-main/src/main/java/io/trino/connector/system/SystemConnector.java

@@ -16,6 +16,7 @@
 import io.trino.metadata.InternalNodeManager;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorPageSourceProvider;
+import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.connector.SystemTable;
@@ -66,7 +67,7 @@ public ConnectorTransactionHandle beginTransaction(TransactionId transactionId,
     }
 
     @Override
-    public ConnectorMetadata getMetadata(ConnectorTransactionHandle transactionHandle)
+    public ConnectorMetadata getMetadata(ConnectorSession session, ConnectorTransactionHandle transactionHandle)
     {
         return metadata;
     }

core/trino-main/src/main/java/io/trino/metadata/CatalogMetadata.java

@@ -24,6 +24,7 @@
 
 import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.collect.Sets.immutableEnumSet;
@@ -34,28 +35,28 @@ public class CatalogMetadata
     private static final String INFORMATION_SCHEMA_NAME = "information_schema";
 
     private final CatalogName catalogName;
-    private final ConnectorMetadata metadata;
+    private final Function<Session, ConnectorMetadata> metadata;
     private final ConnectorTransactionHandle transactionHandle;
 
     private final CatalogName informationSchemaId;
-    private final ConnectorMetadata informationSchema;
+    private final Function<Session, ConnectorMetadata> informationSchema;
     private final ConnectorTransactionHandle informationSchemaTransactionHandle;
 
     private final CatalogName systemTablesId;
-    private final ConnectorMetadata systemTables;
+    private final Function<Session, ConnectorMetadata> systemTables;
     private final ConnectorTransactionHandle systemTablesTransactionHandle;
     private final SecurityManagement securityManagement;
     private final Set<ConnectorCapabilities> connectorCapabilities;
 
     public CatalogMetadata(
             CatalogName catalogName,
-            ConnectorMetadata metadata,
+            Function<Session, ConnectorMetadata> metadata,
             ConnectorTransactionHandle transactionHandle,
             CatalogName informationSchemaId,
-            ConnectorMetadata informationSchema,
+            Function<Session, ConnectorMetadata> informationSchema,
             ConnectorTransactionHandle informationSchemaTransactionHandle,
             CatalogName systemTablesId,
-            ConnectorMetadata systemTables,
+            Function<Session, ConnectorMetadata> systemTables,
             ConnectorTransactionHandle systemTablesTransactionHandle,
             SecurityManagement securityManagement,
             Set<ConnectorCapabilities> connectorCapabilities)
@@ -78,21 +79,21 @@ public CatalogName getCatalogName()
         return catalogName;
     }
 
-    public ConnectorMetadata getMetadata()
+    public ConnectorMetadata getMetadata(Session session)
     {
-        return metadata;
+        return metadata.apply(session);
     }
 
-    public ConnectorMetadata getMetadataFor(CatalogName catalogName)
+    public ConnectorMetadata getMetadataFor(Session session, CatalogName catalogName)
     {
         if (catalogName.equals(this.catalogName)) {
-            return metadata;
+            return metadata.apply(session);
         }
         if (catalogName.equals(informationSchemaId)) {
-            return informationSchema;
+            return informationSchema.apply(session);
         }
         if (catalogName.equals(systemTablesId)) {
-            return systemTables;
+            return systemTables.apply(session);
         }
         throw new IllegalArgumentException("Unknown connector id: " + catalogName);
     }
@@ -125,7 +126,7 @@ public CatalogName getConnectorId(Session session, QualifiedObjectName table)
             return informationSchemaId;
         }
 
-        if (systemTables.getTableHandle(session.toConnectorSession(systemTablesId), table.asSchemaTableName()) != null) {
+        if (systemTables.apply(session).getTableHandle(session.toConnectorSession(systemTablesId), table.asSchemaTableName()) != null) {
             return systemTablesId;
         }