Remove legacy connector API

prestodb · Oct 24, 2016 · eefa499 · eefa499
1 parent c1affd7
commit eefa499
Show file tree

Hide file tree

Showing 34 changed files with 1 addition and 2,365 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/connector/ConnectorManager.java b/presto-main/src/main/java/com/facebook/presto/connector/ConnectorManager.java
@@ -46,7 +46,6 @@
 import com.facebook.presto.split.RecordPageSourceProvider;
 import com.facebook.presto.split.SplitManager;
 import com.facebook.presto.sql.planner.NodePartitioningManager;
-import com.facebook.presto.transaction.LegacyTransactionConnectorFactory;
 import com.facebook.presto.transaction.TransactionManager;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -295,18 +294,13 @@ private synchronized void removeConnectorInternal(ConnectorId connectorId)
 
     private Connector createConnector(ConnectorId connectorId, ConnectorFactory factory, Map<String, String> properties)
     {
-        Class<?> factoryClass = factory.getClass();
-        if (factory instanceof LegacyTransactionConnectorFactory) {
-            factoryClass = ((LegacyTransactionConnectorFactory) factory).getConnectorFactory().getClass();
-        }
-
         ConnectorContext context = new ConnectorContextInstance(
                 new ConnectorAwareNodeManager(nodeManager, nodeInfo.getEnvironment(), connectorId),
                 typeManager,
                 pageSorter,
                 pageIndexerFactory);
 
-        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(factoryClass.getClassLoader())) {
+        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(factory.getClass().getClassLoader())) {
             return factory.create(connectorId.getCatalogName(), properties, context);
         }
     }

diff --git a/presto-main/src/main/java/com/facebook/presto/security/LegacyConnectorAccessControl.java b/presto-main/src/main/java/com/facebook/presto/security/LegacyConnectorAccessControl.java
diff --git a/presto-main/src/main/java/com/facebook/presto/server/PluginManager.java b/presto-main/src/main/java/com/facebook/presto/server/PluginManager.java
@@ -28,7 +28,6 @@
 import com.facebook.presto.spi.security.SystemAccessControlFactory;
 import com.facebook.presto.spi.type.ParametricType;
 import com.facebook.presto.spi.type.Type;
-import com.facebook.presto.transaction.LegacyTransactionConnectorFactory;
 import com.facebook.presto.type.TypeRegistry;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
@@ -194,11 +193,6 @@ public void installPlugin(Plugin plugin)
             typeRegistry.addParametricType(parametricType);
         }
 
-        for (com.facebook.presto.spi.ConnectorFactory connectorFactory : plugin.getLegacyConnectorFactories()) {
-            log.info("Registering legacy connector %s", connectorFactory.getName());
-            connectorManager.addConnectorFactory(new LegacyTransactionConnectorFactory(connectorFactory));
-        }
-
         for (ConnectorFactory connectorFactory : plugin.getConnectorFactories()) {
             log.info("Registering connector %s", connectorFactory.getName());
             connectorManager.addConnectorFactory(connectorFactory);

diff --git a/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java b/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java
@@ -74,8 +74,6 @@
 import com.facebook.presto.operator.ForExchange;
 import com.facebook.presto.operator.index.IndexJoinLookupStats;
 import com.facebook.presto.server.remotetask.HttpLocationFactory;
-import com.facebook.presto.spi.ConnectorPageSinkProvider;
-import com.facebook.presto.spi.ConnectorPageSourceProvider;
 import com.facebook.presto.spi.ConnectorSplit;
 import com.facebook.presto.spi.PageIndexerFactory;
 import com.facebook.presto.spi.PageSorter;
@@ -303,12 +301,10 @@ protected void setup(Binder binder)
         // data stream provider
         binder.bind(PageSourceManager.class).in(Scopes.SINGLETON);
         binder.bind(PageSourceProvider.class).to(PageSourceManager.class).in(Scopes.SINGLETON);
-        newSetBinder(binder, ConnectorPageSourceProvider.class);
 
         // page sink provider
         binder.bind(PageSinkManager.class).in(Scopes.SINGLETON);
         binder.bind(PageSinkProvider.class).to(PageSinkManager.class).in(Scopes.SINGLETON);
-        newSetBinder(binder, ConnectorPageSinkProvider.class);
 
         // metadata
         binder.bind(StaticCatalogStore.class).in(Scopes.SINGLETON);

diff --git a/presto-main/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java b/presto-main/src/main/java/com/facebook/presto/testing/LocalQueryRunner.java
@@ -139,7 +139,6 @@
 import com.facebook.presto.sql.tree.StartTransaction;
 import com.facebook.presto.sql.tree.Statement;
 import com.facebook.presto.testing.PageConsumerOperator.PageConsumerOutputFactory;
-import com.facebook.presto.transaction.LegacyTransactionConnectorFactory;
 import com.facebook.presto.transaction.TransactionManager;
 import com.facebook.presto.transaction.TransactionManagerConfig;
 import com.facebook.presto.type.TypeRegistry;
@@ -418,14 +417,6 @@ public void createCatalog(String catalogName, ConnectorFactory connectorFactory,
         connectorManager.createConnection(catalogName, connectorFactory.getName(), properties);
     }
 
-    @Deprecated
-    public void createCatalog(String catalogName, com.facebook.presto.spi.ConnectorFactory connectorFactory, Map<String, String> properties)
-    {
-        nodeManager.addCurrentNodeConnector(new ConnectorId(catalogName));
-        connectorManager.addConnectorFactory(new LegacyTransactionConnectorFactory(connectorFactory));
-        connectorManager.createConnection(catalogName, connectorFactory.getName(), properties);
-    }
-
     @Override
     public void installPlugin(Plugin plugin)
     {

diff --git a/presto-main/src/main/java/com/facebook/presto/transaction/LegacyConnectorIndexProvider.java b/presto-main/src/main/java/com/facebook/presto/transaction/LegacyConnectorIndexProvider.java