[#10717] fix(trino-connector): Enable multi-metalake support for Trino 469+

Remove the supportCatalogNameWithMetalake and getTrinoCatalogName
overrides in the Trino 469-472 and 473-478 factories so they inherit
the default true from the base factory, fixing the startup exception
when gravitino.use-single-metalake=false on Trino 469+.

For connector versions where multi-metalake mode is not supported
(currently 452-468), log a warning instead of throwing; DROP CATALOG
and some other operations may fail on those versions.

Enable and adapt the MultiMetalake integration test for 469-472 and
473-478, and document which versions support multi-metalake mode.

Author: sachinnn99

docs/trino-connector/configuration.md

@@ -16,11 +16,14 @@ license: "This software is licensed under the Apache License version 2."
 | gravitino.trino.skip-version-validation     | boolean | false                 | The `gravitino.trino.skip-version-validation` defines whether to skip Trino version validation. Gravitino supports Trino versions between 435 and 478. If this option is `true`, unsupported Trino versions can still be used, but compatibility is not guaranteed.                                                 | No       | 1.0.0         |
 | gravitino.client.                           | string  | (none)                | The configuration key prefix for the Gravitino client config.                                                                                                                                                                                                                                                       | No       | 1.0.0         |
 | gravitino.trino.skip-catalog-patterns       | string  | (none)                | The `gravitino.trino.skip-catalog-patterns` defines a comma-separated list of catalog name regex patterns that should be excluded from loading. For example, `test_.*, .*_tmp` excludes all catalogs starting with `test_` or ending with `_tmp`.                                                                   | No       | 1.2.0         |
+| gravitino.use-single-metalake               | boolean | true                  | If `true`, only one metalake is used and catalogs are identified by `<catalog_name>`. If `false`, multi-metalake mode is enabled and catalogs are identified by `<metalake_name>.<catalog_name>`. | No       | 1.2.0         |
 
 To configure the Gravitino client, use properties prefixed with `gravitino.client.`. These properties will directly passed to the Gravitino client.
 
 **Note:** Invalid configuration properties will result in exceptions. Please see [Gravitino Java client configurations](../how-to-use-gravitino-client.md#gravitino-java-client-configuration) for more support client configuration.
 
+Multi-metalake mode (`gravitino.use-single-metalake=false`) is supported on Trino connector versions 435-451 and 469-478. On versions 452-468, a warning is logged and the connector initializes, but the mode is not fully supported and some operations may fail.
+
 ## Authentication
 
 The Gravitino Trino connector supports authenticating to the Gravitino server using Simple, OAuth, and Kerberos authentication. For detailed authentication configuration, please refer to [Trino Connector Authentication](./authentication.md).

trino-connector/trino-connector-452-468/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnectorFactory452.java

@@ -39,11 +39,6 @@ protected int getMaxSupportTrinoSpiVersion() {
     return 468;
   }
 
-  @Override
-  protected String getTrinoCatalogName(String metalake, String catalog) {
-    return "\"" + metalake + "." + catalog + "\"";
-  }
-
   @Override
   protected boolean supportCatalogNameWithMetalake() {
     return false;

trino-connector/trino-connector-469-472/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnectorFactory469.java

@@ -39,16 +39,6 @@ protected int getMaxSupportTrinoSpiVersion() {
     return 472;
   }
 
-  @Override
-  protected String getTrinoCatalogName(String metalake, String catalog) {
-    return "\"" + metalake + "." + catalog + "\"";
-  }
-
-  @Override
-  protected boolean supportCatalogNameWithMetalake() {
-    return false;
-  }
-
   @Override
   protected GravitinoConnector createConnector(CatalogConnectorContext connectorContext) {
     return new GravitinoConnector469(connectorContext);

trino-connector/trino-connector-469-472/src/test/java/TestGravitinoConnector469.java

@@ -26,7 +26,6 @@
 import org.apache.gravitino.trino.connector.GravitinoPlugin469;
 import org.apache.gravitino.trino.connector.TestGravitinoConnector;
 import org.apache.gravitino.trino.connector.TestGravitinoConnectorWithMetalakeCatalogName;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 
 public class TestGravitinoConnector469 {
@@ -45,7 +44,6 @@ protected DistributedQueryRunner createTrinoQueryRunner() throws Exception {
   }
 
   @Nested
-  @Disabled
   class MultiMetalake extends TestGravitinoConnectorWithMetalakeCatalogName {
     @Override
     protected GravitinoPlugin createGravitinoPlugin(GravitinoAdminClient client) {

trino-connector/trino-connector-473-478/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnectorFactory478.java

@@ -39,16 +39,6 @@ protected int getMaxSupportTrinoSpiVersion() {
     return 478;
   }
 
-  @Override
-  protected String getTrinoCatalogName(String metalake, String catalog) {
-    return "\"" + metalake + "." + catalog + "\"";
-  }
-
-  @Override
-  protected boolean supportCatalogNameWithMetalake() {
-    return false;
-  }
-
   @Override
   protected GravitinoConnector createConnector(CatalogConnectorContext connectorContext) {
     return new GravitinoConnector478(connectorContext);

trino-connector/trino-connector-473-478/src/test/java/org/apache/gravitino/trino/connector/TestGravitinoConnector478.java

@@ -23,7 +23,6 @@
 import io.trino.Session;
 import io.trino.testing.DistributedQueryRunner;
 import org.apache.gravitino.client.GravitinoAdminClient;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 
 public class TestGravitinoConnector478 {
@@ -42,7 +41,6 @@ protected DistributedQueryRunner createTrinoQueryRunner() throws Exception {
   }
 
   @Nested
-  @Disabled
   class MultiMetalake extends TestGravitinoConnectorWithMetalakeCatalogName {
     @Override
     protected GravitinoPlugin createGravitinoPlugin(GravitinoAdminClient client) {
@@ -54,5 +52,15 @@ protected DistributedQueryRunner createTrinoQueryRunner() throws Exception {
       Session session = testSessionBuilder().setCatalog("gravitino").build();
       return DistributedQueryRunner.builder(session).setWorkerCount(0).build();
     }
+
+    @Override
+    protected String getTrinoCliCatalogName(String metalake, String catalog) {
+      return metalake + "." + catalog;
+    }
+
+    @Override
+    protected String getTrinoSqlCatalogName(String metalakeName, String catalogName) {
+      return "\"" + metalakeName + "." + catalogName + "\"";
+    }
   }
 }

trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnectorFactory.java

@@ -161,11 +161,11 @@ private void checkTrinoSpiVersion(ConnectorContext context, GravitinoConfig conf
 
     // check catalog name with metalake are supported in this trino version
     if (!config.singleMetalakeMode() && !supportCatalogNameWithMetalake()) {
-      String errmsg =
-          String.format(
-              "The trino-connector-%s-%s does not support catalog name with metalake.",
-              getMinSupportTrinoSpiVersion(), getMaxSupportTrinoSpiVersion());
-      throw new TrinoException(GravitinoErrorCode.GRAVITINO_UNSUPPORTED_TRINO_VERSION, errmsg);
+      LOG.warn(
+          "The trino-connector-{}-{} does not fully support catalog name with metalake. "
+              + "The DROP CATALOG operation may not work correctly in multi-metalake mode.",
+          getMinSupportTrinoSpiVersion(),
+          getMaxSupportTrinoSpiVersion());
     }
 
     // skip version validation