Update for Bootstrap and LifeCycleManager changes

trinodb · Sep 17, 2019 · 38c4326 · 38c4326
1 parent 2eda92a
commit 38c4326
Show file tree

Hide file tree

Showing 64 changed files with 269 additions and 592 deletions.
diff --git a/presto-accumulo/src/main/java/io/prestosql/plugin/accumulo/AccumuloConnector.java b/presto-accumulo/src/main/java/io/prestosql/plugin/accumulo/AccumuloConnector.java
@@ -140,11 +140,6 @@ public List<PropertyMetadata<?>> getSessionProperties()
     @Override
     public final void shutdown()
     {
-        try {
-            lifeCycleManager.stop();
-        }
-        catch (Exception e) {
-            LOG.error(e, "Error shutting down connector");
-        }
+        lifeCycleManager.stop();
     }
 }
diff --git a/presto-accumulo/src/main/java/io/prestosql/plugin/accumulo/AccumuloConnectorFactory.java b/presto-accumulo/src/main/java/io/prestosql/plugin/accumulo/AccumuloConnectorFactory.java
@@ -23,7 +23,6 @@
 
 import java.util.Map;
 
-import static com.google.common.base.Throwables.throwIfUnchecked;
 import static java.util.Objects.requireNonNull;
 
 public class AccumuloConnectorFactory
@@ -44,19 +43,17 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
         requireNonNull(config, "requiredConfig is null");
         requireNonNull(context, "context is null");
 
-        try {
-            Bootstrap app = new Bootstrap(new JsonModule(), new AccumuloModule(context.getTypeManager()));
-            Injector injector = app
-                    .strictConfig()
-                    .doNotInitializeLogging()
-                    .setRequiredConfigurationProperties(config)
-                    .initialize();
-            return injector.getInstance(AccumuloConnector.class);
-        }
-        catch (Exception e) {
-            throwIfUnchecked(e);
-            throw new RuntimeException(e);
-        }
+        Bootstrap app = new Bootstrap(
+                new JsonModule(),
+                new AccumuloModule(context.getTypeManager()));
+
+        Injector injector = app
+                .strictConfig()
+                .doNotInitializeLogging()
+                .setRequiredConfigurationProperties(config)
+                .initialize();
+
+        return injector.getInstance(AccumuloConnector.class);
     }
 
     @Override

diff --git a/presto-atop/pom.xml b/presto-atop/pom.xml
@@ -47,11 +47,6 @@
             <artifactId>bootstrap</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>

diff --git a/presto-atop/src/main/java/io/prestosql/plugin/atop/AtopConnector.java b/presto-atop/src/main/java/io/prestosql/plugin/atop/AtopConnector.java
@@ -14,7 +14,6 @@
 package io.prestosql.plugin.atop;
 
 import io.airlift.bootstrap.LifeCycleManager;
-import io.airlift.log.Logger;
 import io.prestosql.spi.connector.Connector;
 import io.prestosql.spi.connector.ConnectorAccessControl;
 import io.prestosql.spi.connector.ConnectorMetadata;
@@ -30,8 +29,6 @@
 public class AtopConnector
         implements Connector
 {
-    private static final Logger log = Logger.get(AtopConnector.class);
-
     private final LifeCycleManager lifeCycleManager;
     private final AtopMetadata metadata;
     private final AtopSplitManager splitManager;
@@ -86,11 +83,6 @@ public ConnectorAccessControl getAccessControl()
     @Override
     public final void shutdown()
     {
-        try {
-            lifeCycleManager.stop();
-        }
-        catch (Exception e) {
-            log.error(e, "Error shutting down connector");
-        }
+        lifeCycleManager.stop();
     }
 }
diff --git a/presto-atop/src/main/java/io/prestosql/plugin/atop/AtopConnectorFactory.java b/presto-atop/src/main/java/io/prestosql/plugin/atop/AtopConnectorFactory.java
@@ -27,7 +27,6 @@
 
 import java.util.Map;
 
-import static com.google.common.base.Throwables.throwIfUnchecked;
 import static io.airlift.configuration.ConditionalModule.installModuleIf;
 import static java.util.Objects.requireNonNull;
 
@@ -88,9 +87,5 @@ public Connector create(String catalogName, Map<String, String> requiredConfig,
 
             return injector.getInstance(AtopConnector.class);
         }
-        catch (Exception e) {
-            throwIfUnchecked(e);
-            throw new RuntimeException(e);
-        }
     }
 }
diff --git a/presto-base-jdbc/src/main/java/io/prestosql/plugin/jdbc/JdbcConnector.java b/presto-base-jdbc/src/main/java/io/prestosql/plugin/jdbc/JdbcConnector.java
@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableSet;
 import io.airlift.bootstrap.LifeCycleManager;
-import io.airlift.log.Logger;
 import io.prestosql.spi.connector.Connector;
 import io.prestosql.spi.connector.ConnectorAccessControl;
 import io.prestosql.spi.connector.ConnectorCapabilities;
@@ -47,8 +46,6 @@
 public class JdbcConnector
         implements Connector
 {
-    private static final Logger log = Logger.get(JdbcConnector.class);
-
     private final LifeCycleManager lifeCycleManager;
     private final JdbcMetadataFactory jdbcMetadataFactory;
     private final JdbcSplitManager jdbcSplitManager;
@@ -159,12 +156,7 @@ public List<PropertyMetadata<?>> getSessionProperties()
     @Override
     public final void shutdown()
     {
-        try {
-            lifeCycleManager.stop();
-        }
-        catch (Exception e) {
-            log.error(e, "Error shutting down connector");
-        }
+        lifeCycleManager.stop();
     }
 
     @Override

diff --git a/presto-base-jdbc/src/main/java/io/prestosql/plugin/jdbc/JdbcConnectorFactory.java b/presto-base-jdbc/src/main/java/io/prestosql/plugin/jdbc/JdbcConnectorFactory.java
@@ -30,7 +30,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.common.base.Throwables.throwIfUnchecked;
 import static java.util.Objects.requireNonNull;
 
 public class JdbcConnectorFactory
@@ -82,9 +81,5 @@ public Connector create(String catalogName, Map<String, String> requiredConfig,
 
             return injector.getInstance(JdbcConnector.class);
         }
-        catch (Exception e) {
-            throwIfUnchecked(e);
-            throw new RuntimeException(e);
-        }
     }
 }
diff --git a/...o-base-jdbc/src/test/java/io/prestosql/plugin/jdbc/credential/TestCredentialProvider.java b/...o-base-jdbc/src/test/java/io/prestosql/plugin/jdbc/credential/TestCredentialProvider.java
@@ -27,7 +27,6 @@ public class TestCredentialProvider
 {
     @Test
     public void testInlineCredentialProvider()
-            throws Exception
     {
         Map<String, String> properties = ImmutableMap.of(
                 "connection-url", "jdbc:h2:mem:config",
@@ -41,7 +40,6 @@ public void testInlineCredentialProvider()
 
     @Test
     public void testFileCredentialProvider()
-            throws Exception
     {
         Map<String, String> properties = ImmutableMap.of(
                 "connection-url", "jdbc:h2:mem:config",
@@ -53,8 +51,7 @@ public void testFileCredentialProvider()
         assertEquals(credentialProvider.getConnectionPassword(Optional.empty()).get(), "password_for_user_from_file");
     }
 
-    private CredentialProvider getCredentialProvider(Map<String, String> properties)
-            throws Exception
+    private static CredentialProvider getCredentialProvider(Map<String, String> properties)
     {
         return new Bootstrap(ImmutableList.of(new CredentialProviderModule()))
                 .setOptionalConfigurationProperties(properties)

diff --git a/...e-jdbc/src/test/java/io/prestosql/plugin/jdbc/credential/TestExtraCredentialProvider.java b/...e-jdbc/src/test/java/io/prestosql/plugin/jdbc/credential/TestExtraCredentialProvider.java
@@ -28,7 +28,6 @@ public class TestExtraCredentialProvider
 {
     @Test
     public void testUserNameOverwritten()
-            throws Exception
     {
         Map<String, String> properties = ImmutableMap.of(
                 "connection-url", "jdbc:h2:mem:config",
@@ -44,7 +43,6 @@ public void testUserNameOverwritten()
 
     @Test
     public void testPasswordOverwritten()
-            throws Exception
     {
         Map<String, String> properties = ImmutableMap.of(
                 "connection-url", "jdbc:h2:mem:config",
@@ -60,7 +58,6 @@ public void testPasswordOverwritten()
 
     @Test
     public void testCredentialsOverwritten()
-            throws Exception
     {
         Map<String, String> properties = ImmutableMap.of(
                 "connection-url", "jdbc:h2:mem:config",
@@ -77,7 +74,6 @@ public void testCredentialsOverwritten()
 
     @Test
     public void testCredentialsNotOverwritten()
-            throws Exception
     {
         Map<String, String> properties = ImmutableMap.of(
                 "connection-url", "jdbc:h2:mem:config",
@@ -96,8 +92,7 @@ public void testCredentialsNotOverwritten()
         assertEquals(credentialProvider.getConnectionPassword(jdbcIdentity).get(), "default_password");
     }
 
-    private CredentialProvider getCredentialProvider(Map<String, String> properties)
-            throws Exception
+    private static CredentialProvider getCredentialProvider(Map<String, String> properties)
     {
         return new Bootstrap(ImmutableList.of(new CredentialProviderModule()))
                 .setRequiredConfigurationProperties(properties)

diff --git a/presto-cassandra/src/main/java/io/prestosql/plugin/cassandra/CassandraConnector.java b/presto-cassandra/src/main/java/io/prestosql/plugin/cassandra/CassandraConnector.java
@@ -14,7 +14,6 @@
 package io.prestosql.plugin.cassandra;
 
 import io.airlift.bootstrap.LifeCycleManager;
-import io.airlift.log.Logger;
 import io.prestosql.spi.connector.Connector;
 import io.prestosql.spi.connector.ConnectorMetadata;
 import io.prestosql.spi.connector.ConnectorPageSinkProvider;
@@ -35,8 +34,6 @@
 public class CassandraConnector
         implements Connector
 {
-    private static final Logger log = Logger.get(CassandraConnector.class);
-
     private final LifeCycleManager lifeCycleManager;
     private final CassandraMetadata metadata;
     private final CassandraSplitManager splitManager;
@@ -107,11 +104,6 @@ public List<PropertyMetadata<?>> getSessionProperties()
     @Override
     public final void shutdown()
     {
-        try {
-            lifeCycleManager.stop();
-        }
-        catch (Exception e) {
-            log.error(e, "Error shutting down connector");
-        }
+        lifeCycleManager.stop();
     }
 }
diff --git a/presto-cassandra/src/main/java/io/prestosql/plugin/cassandra/CassandraConnectorFactory.java b/presto-cassandra/src/main/java/io/prestosql/plugin/cassandra/CassandraConnectorFactory.java
@@ -25,7 +25,6 @@
 
 import java.util.Map;
 
-import static com.google.common.base.Throwables.throwIfUnchecked;
 import static java.util.Objects.requireNonNull;
 
 public class CassandraConnectorFactory
@@ -48,22 +47,16 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
     {
         requireNonNull(config, "config is null");
 
-        try {
-            Bootstrap app = new Bootstrap(
-                    new MBeanModule(),
-                    new JsonModule(),
-                    new CassandraClientModule(),
-                    new MBeanServerModule());
+        Bootstrap app = new Bootstrap(
+                new MBeanModule(),
+                new JsonModule(),
+                new CassandraClientModule(),
+                new MBeanServerModule());
 
-            Injector injector = app.strictConfig().doNotInitializeLogging()
-                    .setRequiredConfigurationProperties(config)
-                    .initialize();
+        Injector injector = app.strictConfig().doNotInitializeLogging()
+                .setRequiredConfigurationProperties(config)
+                .initialize();
 
-            return injector.getInstance(CassandraConnector.class);
-        }
-        catch (Exception e) {
-            throwIfUnchecked(e);
-            throw new RuntimeException(e);
-        }
+        return injector.getInstance(CassandraConnector.class);
     }
 }
diff --git a/presto-elasticsearch/src/main/java/io/prestosql/elasticsearch/ElasticsearchConnector.java b/presto-elasticsearch/src/main/java/io/prestosql/elasticsearch/ElasticsearchConnector.java
@@ -14,7 +14,6 @@
 package io.prestosql.elasticsearch;
 
 import io.airlift.bootstrap.LifeCycleManager;
-import io.airlift.log.Logger;
 import io.prestosql.spi.connector.Connector;
 import io.prestosql.spi.connector.ConnectorMetadata;
 import io.prestosql.spi.connector.ConnectorRecordSetProvider;
@@ -31,8 +30,6 @@
 public class ElasticsearchConnector
         implements Connector
 {
-    private static final Logger LOG = Logger.get(ElasticsearchConnector.class);
-
     private final LifeCycleManager lifeCycleManager;
     private final ElasticsearchMetadata metadata;
     private final ElasticsearchSplitManager splitManager;
@@ -79,11 +76,6 @@ public ConnectorRecordSetProvider getRecordSetProvider()
     @Override
     public final void shutdown()
     {
-        try {
-            lifeCycleManager.stop();
-        }
-        catch (Exception e) {
-            LOG.error(e, "Error shutting down connector");
-        }
+        lifeCycleManager.stop();
     }
 }
diff --git a/...elasticsearch/src/main/java/io/prestosql/elasticsearch/ElasticsearchConnectorFactory.java b/...elasticsearch/src/main/java/io/prestosql/elasticsearch/ElasticsearchConnectorFactory.java
@@ -51,25 +51,20 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
         requireNonNull(catalogName, "catalogName is null");
         requireNonNull(config, "config is null");
 
-        try {
-            Bootstrap app = new Bootstrap(
-                    new JsonModule(),
-                    new ElasticsearchConnectorModule(),
-                    binder -> {
-                        binder.bind(TypeManager.class).toInstance(context.getTypeManager());
-                        binder.bind(NodeManager.class).toInstance(context.getNodeManager());
-                        binder.bind(ElasticsearchTableDescriptionProvider.class).in(Scopes.SINGLETON);
-                    });
+        Bootstrap app = new Bootstrap(
+                new JsonModule(),
+                new ElasticsearchConnectorModule(),
+                binder -> {
+                    binder.bind(TypeManager.class).toInstance(context.getTypeManager());
+                    binder.bind(NodeManager.class).toInstance(context.getNodeManager());
+                    binder.bind(ElasticsearchTableDescriptionProvider.class).in(Scopes.SINGLETON);
+                });
 
-            Injector injector = app.strictConfig()
-                    .doNotInitializeLogging()
-                    .setRequiredConfigurationProperties(config)
-                    .initialize();
+        Injector injector = app.strictConfig()
+                .doNotInitializeLogging()
+                .setRequiredConfigurationProperties(config)
+                .initialize();
 
-            return injector.getInstance(ElasticsearchConnector.class);
-        }
-        catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        return injector.getInstance(ElasticsearchConnector.class);
     }
 }