Remove deprecated getInfo API involving LayoutHandle

trinodb · Jan 13, 2022 · 76d7141 · 76d7141
1 parent d058c8a
commit 76d7141
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 31 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java b/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java
@@ -540,17 +540,6 @@ public Optional<Object> getInfo(Session session, TableHandle handle)
         CatalogName catalogName = handle.getCatalogName();
         ConnectorMetadata metadata = getMetadata(session, catalogName);
 
-        if (usesLegacyTableLayouts(session, handle)) {
-            ConnectorTableLayoutHandle layoutHandle = handle.getLayout()
-                    .orElseGet(() -> getLayout(session, handle, Constraint.alwaysTrue(), Optional.empty())
-                            .get()
-                            .getNewTableHandle()
-                            .getLayout()
-                            .get());
-
-            return metadata.getInfo(layoutHandle);
-        }
-
         return metadata.getInfo(handle.getConnectorHandle());
     }
 

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java
@@ -247,17 +247,6 @@ default ConnectorTableMetadata getTableMetadata(ConnectorSession session, Connec
         throw new TrinoException(GENERIC_INTERNAL_ERROR, "ConnectorMetadata getTableHandle() is implemented without getTableMetadata()");
     }
 
-    /**
-     * Return the connector-specific metadata for the specified table layout. This is the object that is passed to the event listener framework.
-     *
-     * @throws RuntimeException if table handle is no longer valid
-     */
-    @Deprecated
-    default Optional<Object> getInfo(ConnectorTableLayoutHandle layoutHandle)
-    {
-        return Optional.empty();
-    }
-
     default Optional<Object> getInfo(ConnectorTableHandle table)
     {
         return Optional.empty();
@@ -1021,7 +1010,6 @@ default List<GrantInfo> listTablePrivileges(ConnectorSession session, SchemaTabl
      * connectors are required to implement the following methods:
      * <ul>
      * <li>{@link #getTableProperties(ConnectorSession session, ConnectorTableHandle table)}</li>
-     * <li>{@link #getInfo(ConnectorTableHandle table)} </li>
      * </ul>
      */
     default boolean usesLegacyTableLayouts()

diff --git a/...lkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java b/...lkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java
@@ -286,14 +286,6 @@ public ConnectorTableMetadata getTableMetadata(ConnectorSession session, Connect
         }
     }
 
-    @Override
-    public Optional<Object> getInfo(ConnectorTableLayoutHandle table)
-    {
-        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getInfo(table);
-        }
-    }
-
     @Override
     public Optional<Object> getInfo(ConnectorTableHandle table)
     {