Minor cleanups

presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java

@@ -1745,7 +1745,7 @@ private static OptionalInt min(OptionalInt left, OptionalInt right)
     }
 
     @Override
-    public ConnectorTableLayoutHandle getAlternativeLayoutHandle(ConnectorSession session, ConnectorTableLayoutHandle tableLayoutHandle, ConnectorPartitioningHandle partitioningHandle)
+    public ConnectorTableLayoutHandle makeCompatiblePartitioning(ConnectorSession session, ConnectorTableLayoutHandle tableLayoutHandle, ConnectorPartitioningHandle partitioningHandle)
     {
         HiveTableLayoutHandle hiveLayoutHandle = (HiveTableLayoutHandle) tableLayoutHandle;
         HivePartitioningHandle hivePartitioningHandle = (HivePartitioningHandle) partitioningHandle;

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

@@ -84,7 +84,7 @@ public interface Metadata
      * the original partitioning handle associated with the provided table layout handle,
      * as promised by {@link #getCommonPartitioning}.
      */
-    TableLayoutHandle getAlternativeLayoutHandle(Session session, TableLayoutHandle tableLayoutHandle, PartitioningHandle partitioningHandle);
+    TableLayoutHandle makeCompatiblePartitioning(Session session, TableLayoutHandle tableLayoutHandle, PartitioningHandle partitioningHandle);
 
     /**
      * Return a partitioning handle which the connector can transparently convert both {@code left} and {@code right} into.

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

@@ -404,15 +404,15 @@ public TableLayout getLayout(Session session, TableLayoutHandle handle)
     }
 
     @Override
-    public TableLayoutHandle getAlternativeLayoutHandle(Session session, TableLayoutHandle tableLayoutHandle, PartitioningHandle partitioningHandle)
+    public TableLayoutHandle makeCompatiblePartitioning(Session session, TableLayoutHandle tableLayoutHandle, PartitioningHandle partitioningHandle)
     {
         checkArgument(partitioningHandle.getConnectorId().isPresent(), "Expect partitioning handle from connector, got system partitioning handle");
         ConnectorId connectorId = partitioningHandle.getConnectorId().get();
         checkArgument(connectorId.equals(tableLayoutHandle.getConnectorId()), "ConnectorId of tableLayoutHandle and partitioningHandle does not match");
         CatalogMetadata catalogMetadata = getCatalogMetadata(session, connectorId);
         ConnectorMetadata metadata = catalogMetadata.getMetadataFor(connectorId);
         ConnectorTransactionHandle transaction = catalogMetadata.getTransactionHandleFor(connectorId);
-        ConnectorTableLayoutHandle newTableLayoutHandle = metadata.getAlternativeLayoutHandle(session.toConnectorSession(connectorId), tableLayoutHandle.getConnectorHandle(), partitioningHandle.getConnectorHandle());
+        ConnectorTableLayoutHandle newTableLayoutHandle = metadata.makeCompatiblePartitioning(session.toConnectorSession(connectorId), tableLayoutHandle.getConnectorHandle(), partitioningHandle.getConnectorHandle());
         return new TableLayoutHandle(connectorId, transaction, newTableLayoutHandle);
     }
 

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

@@ -44,11 +44,6 @@ public TableLayout(TableLayoutHandle handle, ConnectorTableLayout layout)
         this.layout = layout;
     }
 
-    public ConnectorId getConnectorId()
-    {
-        return handle.getConnectorId();
-    }
-
     public Optional<List<ColumnHandle>> getColumns()
     {
         return layout.getColumns();

presto-main/src/main/java/io/prestosql/sql/planner/PlanFragmenter.java

@@ -760,7 +760,7 @@ public PlanNode visitTableScan(TableScanNode node, RewriteContext<Void> context)
                 return node;
             }
 
-            TableLayoutHandle newTableLayoutHandle = metadata.getAlternativeLayoutHandle(session, node.getLayout().get(), fragmentPartitioningHandle);
+            TableLayoutHandle newTableLayoutHandle = metadata.makeCompatiblePartitioning(session, node.getLayout().get(), fragmentPartitioningHandle);
             return new TableScanNode(
                     node.getId(),
                     node.getTable(),

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

@@ -126,7 +126,7 @@ public TableLayout getLayout(Session session, TableLayoutHandle handle)
     }
 
     @Override
-    public TableLayoutHandle getAlternativeLayoutHandle(Session session, TableLayoutHandle tableLayoutHandle, PartitioningHandle partitioningHandle)
+    public TableLayoutHandle makeCompatiblePartitioning(Session session, TableLayoutHandle tableLayoutHandle, PartitioningHandle partitioningHandle)
     {
         throw new UnsupportedOperationException();
     }

presto-spi/src/main/java/io/prestosql/spi/connector/ConnectorMetadata.java

@@ -99,9 +99,9 @@ List<ConnectorTableLayoutResult> getTableLayouts(
      * the original partitioning handle associated with the provided table layout handle,
      * as promised by {@link #getCommonPartitioningHandle}.
      */
-    default ConnectorTableLayoutHandle getAlternativeLayoutHandle(ConnectorSession session, ConnectorTableLayoutHandle tableLayoutHandle, ConnectorPartitioningHandle partitioningHandle)
+    default ConnectorTableLayoutHandle makeCompatiblePartitioning(ConnectorSession session, ConnectorTableLayoutHandle tableLayoutHandle, ConnectorPartitioningHandle partitioningHandle)
     {
-        throw new PrestoException(GENERIC_INTERNAL_ERROR, "ConnectorMetadata getCommonPartitioningHandle() is implemented without getAlternativeLayout()");
+        throw new PrestoException(GENERIC_INTERNAL_ERROR, "ConnectorMetadata getCommonPartitioningHandle() is implemented without makeCompatiblePartitioning()");
     }
 
     /**

presto-spi/src/main/java/io/prestosql/spi/connector/classloader/ClassLoaderSafeConnectorMetadata.java

@@ -94,10 +94,10 @@ public Optional<ConnectorPartitioningHandle> getCommonPartitioningHandle(Connect
     }
 
     @Override
-    public ConnectorTableLayoutHandle getAlternativeLayoutHandle(ConnectorSession session, ConnectorTableLayoutHandle tableLayoutHandle, ConnectorPartitioningHandle partitioningHandle)
+    public ConnectorTableLayoutHandle makeCompatiblePartitioning(ConnectorSession session, ConnectorTableLayoutHandle tableLayoutHandle, ConnectorPartitioningHandle partitioningHandle)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            return delegate.getAlternativeLayoutHandle(session, tableLayoutHandle, partitioningHandle);
+            return delegate.makeCompatiblePartitioning(session, tableLayoutHandle, partitioningHandle);
         }
     }