Merge pull request apache#836 from metamx/fix-derby

Fix derby

common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java

@@ -29,24 +29,40 @@ public class MetadataStorageConnectorConfig
   private boolean createTables = true;
 
   @JsonProperty
-  private String connectURI = null;
+  private String host = "localhost";
 
   @JsonProperty
-  private String user = null;
+  private int port = 1527;
 
   @JsonProperty
-  private String password = null;
+  private String connectURI;
+
+  @JsonProperty
+  private String user = null;
 
   @JsonProperty
-  private String validationQuery = "SELECT 1";
+  private String password = null;
 
   public boolean isCreateTables()
   {
     return createTables;
   }
 
+  public String getHost()
+  {
+    return host;
+  }
+
+  public int getPort()
+  {
+    return port;
+  }
+
   public String getConnectURI()
   {
+    if (connectURI == null) {
+      return String.format("jdbc:derby://%s:%s/druid;create=true", host, port);
+    }
     return connectURI;
   }
 
@@ -60,20 +76,14 @@ public String getPassword()
     return password;
   }
 
-  public String getValidationQuery()
-  {
-    return validationQuery;
-  }
-
   @Override
   public String toString()
   {
     return "DbConnectorConfig{" +
            "createTables=" + createTables +
-           ", connectURI='" + connectURI + '\'' +
+           ", connectURI='" + getConnectURI() + '\'' +
            ", user='" + user + '\'' +
            ", password=****" +
-           ", validationQuery='" + validationQuery + '\'' +
            '}';
   }
 }

mysql-metadata-storage/src/main/java/io/druid/metadata/storage/mysql/MySQLConnector.java

@@ -72,7 +72,7 @@ protected String getSerialType()
   }
 
   @Override
-  protected boolean tableExists(Handle handle, String tableName)
+  public boolean tableExists(Handle handle, String tableName)
   {
     return !handle.createQuery("SHOW tables LIKE :tableName")
                   .bind("tableName", tableName)

postgresql-metadata-storage/src/main/java/io/druid/metadata/storage/postgresql/PostgreSQLConnector.java

@@ -65,7 +65,7 @@ protected String getSerialType()
   }
 
   @Override
-  protected boolean tableExists(final Handle handle, final String tableName)
+  public boolean tableExists(final Handle handle, final String tableName)
   {
     return !handle.createQuery(
         "SELECT tablename FROM pg_catalog.pg_tables WHERE schemaname = 'public' AND tablename LIKE :tableName"

server/src/main/java/io/druid/guice/MetadataDbConfigModule.java → server/src/main/java/io/druid/guice/MetadataConfigModule.java

@@ -21,12 +21,12 @@
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
-import io.druid.metadata.MetadataStorageConnectorConfig;
 import io.druid.metadata.MetadataRuleManagerConfig;
 import io.druid.metadata.MetadataSegmentManagerConfig;
+import io.druid.metadata.MetadataStorageConnectorConfig;
 import io.druid.metadata.MetadataStorageTablesConfig;
 
-public class MetadataDbConfigModule implements Module
+public class MetadataConfigModule implements Module
 {
   @Override
   public void configure(Binder binder)

server/src/main/java/io/druid/guice/SQLMetadataStorageDruidModule.java

@@ -34,6 +34,8 @@
 import io.druid.metadata.MetadataSegmentPublisher;
 import io.druid.metadata.MetadataSegmentPublisherProvider;
 import io.druid.metadata.MetadataStorageConnector;
+import io.druid.metadata.MetadataStorageProvider;
+import io.druid.metadata.NoopMetadataStorageProvider;
 import io.druid.metadata.SQLMetadataConnector;
 import io.druid.metadata.SQLMetadataRuleManager;
 import io.druid.metadata.SQLMetadataRuleManagerProvider;
@@ -62,6 +64,13 @@ public void createBindingChoices(Binder binder, String defaultPropertyValue)
     PolyBind.createChoiceWithDefault(
         binder, PROPERTY, Key.get(MetadataStorageConnector.class), null, defaultPropertyValue
     );
+    PolyBind.createChoiceWithDefault(
+        binder,
+        PROPERTY,
+        Key.get(MetadataStorageProvider.class),
+        Key.get(NoopMetadataStorageProvider.class),
+        defaultPropertyValue
+    );
     PolyBind.createChoiceWithDefault(
         binder, PROPERTY, Key.get(SQLMetadataConnector.class), null, defaultPropertyValue
     );

server/src/main/java/io/druid/initialization/Initialization.java

@@ -36,7 +36,7 @@
 import io.druid.curator.discovery.DiscoveryModule;
 import io.druid.guice.AWSModule;
 import io.druid.guice.AnnouncerModule;
-import io.druid.guice.DerbyMetadataStorageDruidModule;
+import io.druid.metadata.storage.derby.DerbyMetadataStorageDruidModule;
 import io.druid.guice.DruidProcessingModule;
 import io.druid.guice.DruidSecondaryModule;
 import io.druid.guice.ExtensionsConfig;
@@ -45,7 +45,7 @@
 import io.druid.guice.JacksonConfigManagerModule;
 import io.druid.guice.LifecycleModule;
 import io.druid.guice.LocalDataStorageDruidModule;
-import io.druid.guice.MetadataDbConfigModule;
+import io.druid.guice.MetadataConfigModule;
 import io.druid.guice.ParsersModule;
 import io.druid.guice.QueryRunnerFactoryModule;
 import io.druid.guice.QueryableModule;
@@ -333,7 +333,7 @@ public static Injector makeInjectorWithModules(final Injector baseInjector, Iter
         new QueryRunnerFactoryModule(),
         new DiscoveryModule(),
         new ServerViewModule(),
-        new MetadataDbConfigModule(),
+        new MetadataConfigModule(),
         new DerbyMetadataStorageDruidModule(),
         new JacksonConfigManagerModule(),
         new IndexingServiceDiscoveryModule(),

server/src/main/java/io/druid/metadata/MetadataStorage.java

@@ -0,0 +1,20 @@
+package io.druid.metadata;
+
+import com.metamx.common.lifecycle.LifecycleStart;
+import com.metamx.common.lifecycle.LifecycleStop;
+import io.druid.guice.ManageLifecycle;
+
+public abstract class MetadataStorage
+{
+  @LifecycleStart
+  public void start()
+  {
+    // do nothing
+  }
+
+  @LifecycleStop
+  public void stop()
+  {
+    // do nothing
+  }
+}

server/src/main/java/io/druid/metadata/MetadataStorageProvider.java

@@ -0,0 +1,26 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2014  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.metadata;
+
+import com.google.inject.Provider;
+
+public interface MetadataStorageProvider extends Provider<MetadataStorage>
+{
+}

server/src/main/java/io/druid/metadata/DerbyConnectionFactory.java → server/src/main/java/io/druid/metadata/NoopMetadataStorageProvider.java

@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ * Copyright (C) 2014  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,29 +19,11 @@
 
 package io.druid.metadata;
 
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
-import org.skife.jdbi.v2.tweak.ConnectionFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-public class DerbyConnectionFactory implements ConnectionFactory
+public class NoopMetadataStorageProvider implements MetadataStorageProvider
 {
-  final private String dbName;
-
-  public DerbyConnectionFactory(String dbName) {
-    this.dbName = dbName;
-  }
-
-  public Connection openConnection() throws SQLException {
-    final String nsURL=String.format("jdbc:derby://localhost:1527/%s;create=true", dbName);
-    try {
-      Class.forName("org.apache.derby.jdbc.ClientDriver");
-    } catch (Exception e) {
-      throw Throwables.propagate(e);
-    }
-
-    return DriverManager.getConnection(nsURL);
+  @Override
+  public MetadataStorage get()
+  {
+    return new MetadataStorage() {};
   }
 }

server/src/main/java/io/druid/metadata/SQLMetadataConnector.java

@@ -75,7 +75,9 @@ protected String getPayloadType() {
    */
   protected abstract String getSerialType();
 
-  protected abstract boolean tableExists(Handle handle, final String tableName);
+  public String getValidationQuery() { return "SELECT 1"; }
+
+  public abstract boolean tableExists(Handle handle, final String tableName);
 
   protected boolean isTransientException(Throwable e) {
     return false;
@@ -367,7 +369,7 @@ protected BasicDataSource getDatasource()
     String uri = connectorConfig.getConnectURI();
     dataSource.setUrl(uri);
 
-    dataSource.setValidationQuery(connectorConfig.getValidationQuery());
+    dataSource.setValidationQuery(getValidationQuery());
     dataSource.setTestOnBorrow(true);
 
     return dataSource;

server/src/main/java/io/druid/metadata/DerbyConnector.java → server/src/main/java/io/druid/metadata/storage/derby/DerbyConnector.java

@@ -17,17 +17,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.metadata.storage.derby;
 
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
 import com.google.common.base.Supplier;
 import com.google.inject.Inject;
-import org.apache.derby.drda.NetworkServerControl;
+import io.druid.metadata.MetadataStorageConnectorConfig;
+import io.druid.metadata.MetadataStorageTablesConfig;
+import io.druid.metadata.SQLMetadataConnector;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.Handle;
-import org.skife.jdbi.v2.tweak.ConnectionFactory;
-
-import java.net.InetAddress;
 
 public class DerbyConnector extends SQLMetadataConnector
 {
@@ -37,17 +36,27 @@ public class DerbyConnector extends SQLMetadataConnector
   @Inject
   public DerbyConnector(Supplier<MetadataStorageConnectorConfig> config, Supplier<MetadataStorageTablesConfig> dbTables)
   {
-    this(config, dbTables, new DBI(getConnectionFactory("druidDerbyDb")));
+    super(config, dbTables);
+
+    final BasicDataSource datasource = getDatasource();
+    datasource.setDriverClassLoader(getClass().getClassLoader());
+    datasource.setDriverClassName("org.apache.derby.jdbc.ClientDriver");
+
+    this.dbi = new DBI(datasource);
   }
 
-  public DerbyConnector(Supplier<MetadataStorageConnectorConfig> config, Supplier<MetadataStorageTablesConfig> dbTables, DBI dbi)
+  public DerbyConnector(
+      Supplier<MetadataStorageConnectorConfig> config,
+      Supplier<MetadataStorageTablesConfig> dbTables,
+      DBI dbi
+  )
   {
     super(config, dbTables);
     this.dbi = dbi;
   }
 
   @Override
-  protected boolean tableExists(Handle handle, String tableName)
+  public boolean tableExists(Handle handle, String tableName)
   {
     return !handle.createQuery("select * from SYS.SYSTABLES where tablename = :tableName")
                   .bind("tableName", tableName.toUpperCase())
@@ -64,14 +73,6 @@ protected String getSerialType()
   @Override
   public DBI getDBI() { return dbi; }
 
-  private static ConnectionFactory getConnectionFactory(String dbName)
-  {
-    try {
-      NetworkServerControl server = new NetworkServerControl(InetAddress.getByName("localhost"),1527);
-      server.start(null);
-    } catch (Exception e) {
-      throw Throwables.propagate(e);
-    }
-    return new DerbyConnectionFactory(dbName);
-  }
+  @Override
+  public String getValidationQuery() { return "VALUES 1"; }
 }