Remove ConnectorOutputHandleResolver

The functionality is now in ConnectorHandleResolver.

presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraClientModule.java

@@ -57,7 +57,6 @@ public void configure(Binder binder)
  binder.bind(CassandraTokenSplitManager.class).in(Scopes.SINGLETON);
  binder.bind(CassandraRecordSetProvider.class).in(Scopes.SINGLETON);
  binder.bind(CassandraHandleResolver.class).in(Scopes.SINGLETON);
- binder.bind(CassandraConnectorOutputHandleResolver.class).in(Scopes.SINGLETON);
  binder.bind(CassandraConnectorRecordSinkProvider.class).in(Scopes.SINGLETON);
 
  binder.bind(CassandraThriftConnectionFactory.class).in(Scopes.SINGLETON);

presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraConnector.java

@@ -17,7 +17,6 @@
 import com.facebook.presto.spi.ConnectorHandleResolver;
 import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorOutputHandleResolver;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
 import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
@@ -34,40 +33,41 @@ public class CassandraConnector
  private final ConnectorRecordSetProvider recordSetProvider;
  private final CassandraHandleResolver handleResolver;
  private final CassandraConnectorRecordSinkProvider recordSinkProvider;
- private final CassandraConnectorOutputHandleResolver outputHandleResolver;
 
  @Inject
  public CassandraConnector(
  CassandraMetadata metadata,
  CassandraSplitManager splitManager,
  CassandraRecordSetProvider recordSetProvider,
  CassandraHandleResolver handleResolver,
- CassandraConnectorRecordSinkProvider recordSinkProvider,
- CassandraConnectorOutputHandleResolver outputHandleResolver)
+ CassandraConnectorRecordSinkProvider recordSinkProvider)
  {
  this.metadata = checkNotNull(metadata, "metadata is null");
  this.splitManager = checkNotNull(splitManager, "splitManager is null");
  this.recordSetProvider = checkNotNull(recordSetProvider, "recordSetProvider is null");
  this.handleResolver = checkNotNull(handleResolver, "handleResolver is null");
  this.recordSinkProvider = checkNotNull(recordSinkProvider, "recordSinkProvider is null");
- this.outputHandleResolver = checkNotNull(outputHandleResolver, "outputHandleResolver is null");
  }
 
+ @Override
  public ConnectorMetadata getMetadata()
  {
  return metadata;
  }
 
+ @Override
  public ConnectorSplitManager getSplitManager()
  {
  return splitManager;
  }
 
+ @Override
  public ConnectorRecordSetProvider getRecordSetProvider()
  {
  return recordSetProvider;
  }
 
+ @Override
  public ConnectorHandleResolver getHandleResolver()
  {
  return handleResolver;
@@ -79,12 +79,6 @@ public ConnectorRecordSinkProvider getRecordSinkProvider()
  return recordSinkProvider;
  }
 
- @Override
- public ConnectorOutputHandleResolver getOutputHandleResolver()
- {
- return outputHandleResolver;
- }
-
  @Override
  public ConnectorIndexResolver getIndexResolver()
  {

presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraHandleResolver.java

@@ -16,6 +16,7 @@
 import com.facebook.presto.spi.ConnectorColumnHandle;
 import com.facebook.presto.spi.ConnectorHandleResolver;
 import com.facebook.presto.spi.ConnectorIndexHandle;
+import com.facebook.presto.spi.ConnectorOutputTableHandle;
 import com.facebook.presto.spi.ConnectorSplit;
 import com.facebook.presto.spi.ConnectorTableHandle;
 import com.google.common.base.Objects;
@@ -59,6 +60,12 @@ public boolean canHandle(ConnectorIndexHandle indexHandle)
  return false;
  }
 
+ @Override
+ public boolean canHandle(ConnectorOutputTableHandle tableHandle)
+ {
+ return (tableHandle instanceof CassandraOutputTableHandle) && ((CassandraOutputTableHandle) tableHandle).getConnectorId().equals(connectorId);
+ }
+
  @Override
  public Class<? extends ConnectorTableHandle> getTableHandleClass()
  {
@@ -83,6 +90,12 @@ public Class<? extends ConnectorIndexHandle> getIndexHandleClass()
  throw new UnsupportedOperationException();
  }
 
+ @Override
+ public Class<? extends ConnectorOutputTableHandle> getOutputTableHandleClass()
+ {
+ return CassandraOutputTableHandle.class;
+ }
+
  @Override
  public String toString()
  {

presto-example-http/src/main/java/com/facebook/presto/example/ExampleConnector.java

@@ -17,7 +17,6 @@
 import com.facebook.presto.spi.ConnectorHandleResolver;
 import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorOutputHandleResolver;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
 import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
@@ -77,12 +76,6 @@ public ConnectorRecordSinkProvider getRecordSinkProvider()
  throw new UnsupportedOperationException();
  }
 
- @Override
- public ConnectorOutputHandleResolver getOutputHandleResolver()
- {
- throw new UnsupportedOperationException();
- }
-
  @Override
  public ConnectorIndexResolver getIndexResolver()
  {

presto-example-http/src/main/java/com/facebook/presto/example/ExampleHandleResolver.java

@@ -16,6 +16,7 @@
 import com.facebook.presto.spi.ConnectorColumnHandle;
 import com.facebook.presto.spi.ConnectorHandleResolver;
 import com.facebook.presto.spi.ConnectorIndexHandle;
+import com.facebook.presto.spi.ConnectorOutputTableHandle;
 import com.facebook.presto.spi.ConnectorSplit;
 import com.facebook.presto.spi.ConnectorTableHandle;
 
@@ -58,6 +59,12 @@ public boolean canHandle(ConnectorIndexHandle indexHandle)
  return false;
  }
 
+ @Override
+ public boolean canHandle(ConnectorOutputTableHandle tableHandle)
+ {
+ return false;
+ }
+
  @Override
  public Class<? extends ConnectorTableHandle> getTableHandleClass()
  {
@@ -81,4 +88,10 @@ public Class<? extends ConnectorIndexHandle> getIndexHandleClass()
  {
  throw new UnsupportedOperationException();
  }
+
+ @Override
+ public Class<? extends ConnectorOutputTableHandle> getOutputTableHandleClass()
+ {
+ throw new UnsupportedOperationException();
+ }
 }

presto-hive/src/main/java/com/facebook/presto/hive/HiveClient.java

@@ -22,7 +22,6 @@
 import com.facebook.presto.spi.ConnectorHandleResolver;
 import com.facebook.presto.spi.ConnectorIndexHandle;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorOutputHandleResolver;
 import com.facebook.presto.spi.ConnectorOutputTableHandle;
 import com.facebook.presto.spi.ConnectorPartition;
 import com.facebook.presto.spi.ConnectorPartitionResult;
@@ -134,7 +133,7 @@
 
 @SuppressWarnings("deprecation")
 public class HiveClient
- implements ConnectorMetadata, ConnectorSplitManager, ConnectorRecordSetProvider, ConnectorRecordSinkProvider, ConnectorHandleResolver, ConnectorOutputHandleResolver
+ implements ConnectorMetadata, ConnectorSplitManager, ConnectorRecordSetProvider, ConnectorRecordSinkProvider, ConnectorHandleResolver
 {
  static {
  HadoopNative.requireHadoopNative();

presto-hive/src/main/java/com/facebook/presto/hive/HiveConnector.java

@@ -17,7 +17,6 @@
 import com.facebook.presto.spi.ConnectorHandleResolver;
 import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorOutputHandleResolver;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
 import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
@@ -32,22 +31,19 @@ public class HiveConnector
  private final ConnectorRecordSetProvider recordSetProvider;
  private final ConnectorRecordSinkProvider recordSinkProvider;
  private final ConnectorHandleResolver handleResolver;
- private final ConnectorOutputHandleResolver outputHandleResolver;
 
  public HiveConnector(
  ConnectorMetadata metadata,
  ConnectorSplitManager splitManager,
  ConnectorRecordSetProvider recordSetProvider,
  ConnectorRecordSinkProvider recordSinkProvider,
- ConnectorHandleResolver handleResolver,
- ConnectorOutputHandleResolver outputHandleResolver)
+ ConnectorHandleResolver handleResolver)
  {
  this.metadata = checkNotNull(metadata, "metadata is null");
  this.splitManager = checkNotNull(splitManager, "splitManager is null");
  this.recordSetProvider = checkNotNull(recordSetProvider, "recordSetProvider is null");
  this.recordSinkProvider = checkNotNull(recordSinkProvider, "recordSinkProvider is null");
  this.handleResolver = checkNotNull(handleResolver, "handleResolver is null");
- this.outputHandleResolver = checkNotNull(outputHandleResolver, "outputHandleResolver is null");
  }
 
  @Override
@@ -80,12 +76,6 @@ public ConnectorHandleResolver getHandleResolver()
  return handleResolver;
  }
 
- @Override
- public ConnectorOutputHandleResolver getOutputHandleResolver()
- {
- return outputHandleResolver;
- }
-
  @Override
  public ConnectorIndexResolver getIndexResolver()
  {

presto-hive/src/main/java/com/facebook/presto/hive/HiveConnectorFactory.java

@@ -18,7 +18,6 @@
 import com.facebook.presto.spi.ConnectorFactory;
 import com.facebook.presto.spi.classloader.ClassLoaderSafeConnectorHandleResolver;
 import com.facebook.presto.spi.classloader.ClassLoaderSafeConnectorMetadata;
-import com.facebook.presto.spi.classloader.ClassLoaderSafeConnectorOutputHandleResolver;
 import com.facebook.presto.spi.classloader.ClassLoaderSafeConnectorRecordSetProvider;
 import com.facebook.presto.spi.classloader.ClassLoaderSafeConnectorRecordSinkProvider;
 import com.facebook.presto.spi.classloader.ClassLoaderSafeConnectorSplitManager;
@@ -107,8 +106,7 @@ public void configure(Binder binder)
  new ClassLoaderSafeConnectorSplitManager(hiveClient, classLoader),
  new ClassLoaderSafeConnectorRecordSetProvider(hiveClient, classLoader),
  new ClassLoaderSafeConnectorRecordSinkProvider(hiveClient, classLoader),
- new ClassLoaderSafeConnectorHandleResolver(hiveClient, classLoader),
- new ClassLoaderSafeConnectorOutputHandleResolver(hiveClient, classLoader));
+ new ClassLoaderSafeConnectorHandleResolver(hiveClient, classLoader));
  }
  catch (Exception e) {
  throw Throwables.propagate(e);

presto-main/src/main/java/com/facebook/presto/connector/ConnectorManager.java

@@ -13,20 +13,18 @@
  */
 package com.facebook.presto.connector;
 
-import com.facebook.presto.index.IndexManager;
 import com.facebook.presto.connector.informationSchema.InformationSchemaDataStreamProvider;
 import com.facebook.presto.connector.informationSchema.InformationSchemaMetadata;
 import com.facebook.presto.connector.informationSchema.InformationSchemaSplitManager;
+import com.facebook.presto.index.IndexManager;
 import com.facebook.presto.metadata.HandleResolver;
 import com.facebook.presto.metadata.MetadataManager;
-import com.facebook.presto.metadata.OutputTableHandleResolver;
 import com.facebook.presto.operator.RecordSinkManager;
 import com.facebook.presto.spi.Connector;
 import com.facebook.presto.spi.ConnectorFactory;
 import com.facebook.presto.spi.ConnectorHandleResolver;
 import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorOutputHandleResolver;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
 import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
@@ -59,7 +57,6 @@ public class ConnectorManager
 
  private final RecordSinkManager recordSinkManager;
  private final HandleResolver handleResolver;
- private final OutputTableHandleResolver outputTableHandleResolver;
  private final NodeManager nodeManager;
 
  private final ConcurrentMap<String, ConnectorFactory> connectorFactories = new ConcurrentHashMap<>();
@@ -73,7 +70,6 @@ public ConnectorManager(MetadataManager metadataManager,
  IndexManager indexManager,
  RecordSinkManager recordSinkManager,
  HandleResolver handleResolver,
- OutputTableHandleResolver outputTableHandleResolver,
  Map<String, ConnectorFactory> connectorFactories,
  Map<String, Connector> globalConnectors,
  NodeManager nodeManager)
@@ -84,7 +80,6 @@ public ConnectorManager(MetadataManager metadataManager,
  this.indexManager = indexManager;
  this.recordSinkManager = recordSinkManager;
  this.handleResolver = handleResolver;
- this.outputTableHandleResolver = outputTableHandleResolver;
  this.nodeManager = nodeManager;
  this.connectorFactories.putAll(connectorFactories);
 
@@ -171,14 +166,6 @@ private void addConnector(@Nullable String catalogName, String connectorId, Conn
  catch (UnsupportedOperationException ignored) {
  }
 
- ConnectorOutputHandleResolver connectorOutputHandleResolver = null;
- try {
- connectorOutputHandleResolver = connector.getOutputHandleResolver();
- checkNotNull(connectorOutputHandleResolver, "Connector %s returned a null output handle resolver", connectorId);
- }
- catch (UnsupportedOperationException ignored) {
- }
-
  ConnectorIndexResolver indexResolver = null;
  try {
  indexResolver = connector.getIndexResolver();
@@ -209,10 +196,6 @@ private void addConnector(@Nullable String catalogName, String connectorId, Conn
  recordSinkManager.addConnectorRecordSinkProvider(connectorId, connectorRecordSinkProvider);
  }
 
- if (connectorOutputHandleResolver != null) {
- outputTableHandleResolver.addHandleResolver(connectorId, connectorOutputHandleResolver);
- }
-
  if (indexResolver != null) {
  indexManager.addIndexResolver(connectorId, indexResolver);
  }

presto-main/src/main/java/com/facebook/presto/connector/informationSchema/InformationSchemaHandleResolver.java

@@ -16,6 +16,7 @@
 import com.facebook.presto.spi.ConnectorColumnHandle;
 import com.facebook.presto.spi.ConnectorHandleResolver;
 import com.facebook.presto.spi.ConnectorIndexHandle;
+import com.facebook.presto.spi.ConnectorOutputTableHandle;
 import com.facebook.presto.spi.ConnectorSplit;
 import com.facebook.presto.spi.ConnectorTableHandle;
 
@@ -46,6 +47,12 @@ public boolean canHandle(ConnectorIndexHandle indexHandle)
  return false;
  }
 
+ @Override
+ public boolean canHandle(ConnectorOutputTableHandle tableHandle)
+ {
+ return false;
+ }
+
  @Override
  public Class<? extends ConnectorTableHandle> getTableHandleClass()
  {
@@ -69,4 +76,10 @@ public Class<? extends ConnectorIndexHandle> getIndexHandleClass()
  {
  throw new UnsupportedOperationException();
  }
+
+ @Override
+ public Class<? extends ConnectorOutputTableHandle> getOutputTableHandleClass()
+ {
+ throw new UnsupportedOperationException();
+ }
 }