enabled ansi-quote in mysql; insert statement should now work

common/src/main/java/io/druid/common/config/ConfigManager.java

@@ -27,8 +27,8 @@ import com.metamx.common.concurrent.ScheduledExecutors;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
 import com.metamx.common.logger.Logger;
-import io.druid.metadata.MetadataStorageConnector;
-import io.druid.metadata.MetadataStorageTablesConfig;
+import io.druid.db.MetadataStorageConnector;
+import io.druid.db.MetadataStorageTablesConfig;
 import org.joda.time.Duration;
 
 import java.util.Arrays;

common/src/main/java/io/druid/db/MetadataStorageConnector.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 /**
  */

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

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

common/src/main/java/io/druid/db/MetadataStorageTablesConfig.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java

@@ -27,8 +27,8 @@ import com.metamx.common.lifecycle.Lifecycle;
 import io.druid.common.config.ConfigManager;
 import io.druid.common.config.ConfigManagerConfig;
 import io.druid.common.config.JacksonConfigManager;
-import io.druid.metadata.MetadataStorageConnector;
-import io.druid.metadata.MetadataStorageTablesConfig;
+import io.druid.db.MetadataStorageConnector;
+import io.druid.db.MetadataStorageTablesConfig;
 
 /**
  */

indexing-hadoop/src/main/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java

@@ -21,7 +21,7 @@ package io.druid.indexer.updater;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Supplier;
-import io.druid.metadata.MetadataStorageConnectorConfig;
+import io.druid.db.MetadataStorageConnectorConfig;
 
 /**
  */

indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecTest.java

@@ -22,7 +22,7 @@ package io.druid.indexer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
-import io.druid.metadata.MetadataStorageConnectorConfig;
+import io.druid.db.MetadataStorageConnectorConfig;
 import io.druid.indexer.partitions.PartitionsSpec;
 import io.druid.indexer.partitions.RandomPartitionsSpec;
 import io.druid.indexer.partitions.SingleDimensionPartitionsSpec;

indexing-service/src/main/java/io/druid/indexing/overlord/MetadataTaskStorage.java

@@ -32,8 +32,8 @@ import com.google.inject.Inject;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
 import com.metamx.emitter.EmittingLogger;
-import io.druid.metadata.MetadataStorageConnector;
-import io.druid.metadata.MetadataStorageTablesConfig;
+import io.druid.db.MetadataStorageConnector;
+import io.druid.db.MetadataStorageTablesConfig;
 import io.druid.indexing.common.TaskLock;
 import io.druid.indexing.common.TaskStatus;
 import io.druid.indexing.common.actions.TaskAction;

indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java

@@ -42,7 +42,7 @@ import io.druid.data.input.FirehoseFactory;
 import io.druid.data.input.InputRow;
 import io.druid.data.input.MapBasedInputRow;
 import io.druid.data.input.impl.InputRowParser;
-import io.druid.metadata.IndexerSQLMetadataStorageCoordinator;
+import io.druid.db.IndexerSQLMetadataStorageCoordinator;
 import io.druid.granularity.QueryGranularity;
 import io.druid.indexing.common.SegmentLoaderFactory;
 import io.druid.indexing.common.TaskLock;

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

@@ -22,9 +22,9 @@ package io.druid.storage.mysql;
 import com.google.common.base.Supplier;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
-import io.druid.metadata.MetadataStorageConnectorConfig;
-import io.druid.metadata.MetadataStorageTablesConfig;
-import io.druid.metadata.SQLMetadataConnector;
+import io.druid.db.MetadataStorageConnectorConfig;
+import io.druid.db.MetadataStorageTablesConfig;
+import io.druid.db.SQLMetadataConnector;
 import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.Handle;
 import org.skife.jdbi.v2.IDBI;
@@ -43,6 +43,15 @@ public class MySQLConnector extends SQLMetadataConnector
   {
     super(config, dbTables);
     this.dbi = new DBI(getDatasource());
+    dbi.withHandle(new HandleCallback<Void>()
+                   {
+                     @Override
+                     public Void withHandle(Handle handle) throws Exception
+                     {
+                       handle.createStatement("SET sql_mode='ANSI_QUOTES'").execute();
+                       return null;
+                     }
+                   });
   }
 
   public void createTable(final IDBI dbi, final String tableName, final String sql)

mysql-storage/src/main/java/io/druid/storage/mysql/MySQLMetadataStorageModule.java

@@ -23,23 +23,23 @@ import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import com.google.inject.Key;
 import com.google.inject.Provides;
-import io.druid.metadata.IndexerSQLMetadataStorageCoordinator;
-import io.druid.metadata.MetadataRuleManager;
-import io.druid.metadata.MetadataRuleManagerProvider;
-import io.druid.metadata.MetadataSegmentManager;
-import io.druid.metadata.MetadataSegmentManagerProvider;
-import io.druid.metadata.MetadataSegmentPublisherProvider;
-import io.druid.metadata.MetadataStorageConnector;
-import io.druid.metadata.MetadataStorageConnectorConfig;
-import io.druid.metadata.MetadataStorageTablesConfig;
-import io.druid.metadata.SQLMetadataConnector;
-import io.druid.metadata.SQLMetadataRuleManager;
-import io.druid.metadata.SQLMetadataRuleManagerProvider;
-import io.druid.metadata.SQLMetadataSegmentManager;
-import io.druid.metadata.SQLMetadataSegmentManagerProvider;
-import io.druid.metadata.SQLMetadataSegmentPublisher;
-import io.druid.metadata.SQLMetadataSegmentPublisherProvider;
-import io.druid.metadata.SQLMetadataStorageActionHandler;
+import io.druid.db.IndexerSQLMetadataStorageCoordinator;
+import io.druid.db.MetadataRuleManager;
+import io.druid.db.MetadataRuleManagerProvider;
+import io.druid.db.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManagerProvider;
+import io.druid.db.MetadataSegmentPublisherProvider;
+import io.druid.db.MetadataStorageConnector;
+import io.druid.db.MetadataStorageConnectorConfig;
+import io.druid.db.MetadataStorageTablesConfig;
+import io.druid.db.SQLMetadataConnector;
+import io.druid.db.SQLMetadataRuleManager;
+import io.druid.db.SQLMetadataRuleManagerProvider;
+import io.druid.db.SQLMetadataSegmentManager;
+import io.druid.db.SQLMetadataSegmentManagerProvider;
+import io.druid.db.SQLMetadataSegmentPublisher;
+import io.druid.db.SQLMetadataSegmentPublisherProvider;
+import io.druid.db.SQLMetadataStorageActionHandler;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.LazySingleton;
 import io.druid.guice.PolyBind;

postgres-storage/src/main/java/io/druid/storage/postgres/PostgreSQLConnector.java

@@ -22,9 +22,9 @@ package io.druid.storage.postgres;
 import com.google.common.base.Supplier;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
-import io.druid.metadata.MetadataStorageConnectorConfig;
-import io.druid.metadata.MetadataStorageTablesConfig;
-import io.druid.metadata.SQLMetadataConnector;
+import io.druid.db.MetadataStorageConnectorConfig;
+import io.druid.db.MetadataStorageTablesConfig;
+import io.druid.db.SQLMetadataConnector;
 import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.Handle;
 import org.skife.jdbi.v2.IDBI;

postgres-storage/src/main/java/io/druid/storage/postgres/PostgresMetadataStorageModule.java

@@ -23,23 +23,23 @@ import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import com.google.inject.Key;
 import com.google.inject.Provides;
-import io.druid.metadata.IndexerSQLMetadataStorageCoordinator;
-import io.druid.metadata.MetadataRuleManager;
-import io.druid.metadata.MetadataRuleManagerProvider;
-import io.druid.metadata.MetadataSegmentManager;
-import io.druid.metadata.MetadataSegmentManagerProvider;
-import io.druid.metadata.MetadataSegmentPublisherProvider;
-import io.druid.metadata.MetadataStorageConnector;
-import io.druid.metadata.MetadataStorageConnectorConfig;
-import io.druid.metadata.MetadataStorageTablesConfig;
-import io.druid.metadata.SQLMetadataConnector;
-import io.druid.metadata.SQLMetadataRuleManager;
-import io.druid.metadata.SQLMetadataRuleManagerProvider;
-import io.druid.metadata.SQLMetadataSegmentManager;
-import io.druid.metadata.SQLMetadataSegmentManagerProvider;
-import io.druid.metadata.SQLMetadataSegmentPublisher;
-import io.druid.metadata.SQLMetadataSegmentPublisherProvider;
-import io.druid.metadata.SQLMetadataStorageActionHandler;
+import io.druid.db.IndexerSQLMetadataStorageCoordinator;
+import io.druid.db.MetadataRuleManager;
+import io.druid.db.MetadataRuleManagerProvider;
+import io.druid.db.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManagerProvider;
+import io.druid.db.MetadataSegmentPublisherProvider;
+import io.druid.db.MetadataStorageConnector;
+import io.druid.db.MetadataStorageConnectorConfig;
+import io.druid.db.MetadataStorageTablesConfig;
+import io.druid.db.SQLMetadataConnector;
+import io.druid.db.SQLMetadataRuleManager;
+import io.druid.db.SQLMetadataRuleManagerProvider;
+import io.druid.db.SQLMetadataSegmentManager;
+import io.druid.db.SQLMetadataSegmentManagerProvider;
+import io.druid.db.SQLMetadataSegmentPublisher;
+import io.druid.db.SQLMetadataSegmentPublisherProvider;
+import io.druid.db.SQLMetadataStorageActionHandler;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.LazySingleton;
 import io.druid.guice.PolyBind;

server/src/main/java/io/druid/db/DerbyConnectionFactory.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.google.api.client.repackaged.com.google.common.base.Throwables;
 import org.skife.jdbi.v2.tweak.ConnectionFactory;

server/src/main/java/io/druid/db/DerbyConnector.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.google.api.client.repackaged.com.google.common.base.Throwables;
 import com.google.common.base.Supplier;

server/src/main/java/io/druid/db/DerbyMetadataRuleManager.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

server/src/main/java/io/druid/db/DerbyMetadataRuleManagerProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Supplier;

server/src/main/java/io/druid/db/DerbyMetadataSegmentManager.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Supplier;
@@ -64,10 +64,6 @@ public class DerbyMetadataSegmentManager extends SQLMetadataSegmentManager
   private final AtomicReference<ConcurrentHashMap<String, DruidDataSource>> dataSources;
   private final IDBI dbi;
 
-  private volatile ScheduledExecutorService exec;
-
-  private volatile boolean started = false;
-
   @Inject
   public DerbyMetadataSegmentManager(
       ObjectMapper jsonMapper,
@@ -189,7 +185,7 @@ public class DerbyMetadataSegmentManager extends SQLMetadataSegmentManager
   public void poll()
   {
     try {
-      if (!started) {
+      if (!isStarted()) {
         return;
       }
 
@@ -267,7 +263,7 @@ public class DerbyMetadataSegmentManager extends SQLMetadataSegmentManager
       }
 
       synchronized (lock) {
-        if (started) {
+        if (isStarted()) {
           dataSources.set(newDataSources);
         }
       }

server/src/main/java/io/druid/db/IndexerSQLMetadataStorageCoordinator.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Function;
 import com.google.common.base.Throwables;

server/src/main/java/io/druid/db/MetadataRuleManager.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import io.druid.server.coordinator.rules.Rule;
 

server/src/main/java/io/druid/db/MetadataRuleManagerConfig.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.Period;

server/src/main/java/io/druid/db/MetadataRuleManagerProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.google.inject.Provider;
 

server/src/main/java/io/druid/db/MetadataSegmentManager.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import io.druid.client.DruidDataSource;
 

server/src/main/java/io/druid/db/MetadataSegmentManagerConfig.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.Period;

server/src/main/java/io/druid/db/MetadataSegmentManagerProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.google.inject.Provider;
 

server/src/main/java/io/druid/db/MetadataSegmentPublisherProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import io.druid.segment.realtime.SegmentPublisher;
 

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

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.google.common.base.Supplier;
 import com.metamx.common.ISE;

server/src/main/java/io/druid/db/SQLMetadataRuleManager.java

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

server/src/main/java/io/druid/db/SQLMetadataRuleManagerProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Supplier;

server/src/main/java/io/druid/db/SQLMetadataSegmentManager.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Supplier;

server/src/main/java/io/druid/db/SQLMetadataSegmentManagerProvider.java

@@ -18,7 +18,7 @@
  */
 
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Supplier;

server/src/main/java/io/druid/db/SQLMetadataSegmentPublisher.java

@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;

server/src/main/java/io/druid/db/SQLMetadataSegmentPublisherProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.databind.ObjectMapper;

server/src/main/java/io/druid/db/SQLMetadataStorageActionHandler.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Throwables;

server/src/main/java/io/druid/db/SegmentPublisherProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

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

@@ -23,22 +23,21 @@ import com.google.inject.Binder;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Provides;
-import io.druid.metadata.DerbyMetadataRuleManager;
-import io.druid.metadata.DerbyMetadataRuleManagerProvider;
-import io.druid.metadata.SQLMetadataRuleManagerProvider;
-import io.druid.metadata.DerbyMetadataSegmentManager;
-import io.druid.metadata.SQLMetadataSegmentManagerProvider;
-import io.druid.metadata.IndexerSQLMetadataStorageCoordinator;
-import io.druid.metadata.MetadataRuleManager;
-import io.druid.metadata.MetadataSegmentManager;
-import io.druid.metadata.MetadataSegmentManagerProvider;
-import io.druid.metadata.MetadataStorageConnector;
-import io.druid.metadata.MetadataSegmentPublisherProvider;
-import io.druid.metadata.MetadataRuleManagerProvider;
-import io.druid.metadata.DerbyConnector;
-import io.druid.metadata.SQLMetadataStorageActionHandler;
-import io.druid.metadata.SQLMetadataSegmentPublisher;
-import io.druid.metadata.SQLMetadataSegmentPublisherProvider;
+import io.druid.db.DerbyMetadataRuleManager;
+import io.druid.db.DerbyMetadataRuleManagerProvider;
+import io.druid.db.DerbyMetadataSegmentManager;
+import io.druid.db.SQLMetadataSegmentManagerProvider;
+import io.druid.db.IndexerSQLMetadataStorageCoordinator;
+import io.druid.db.MetadataRuleManager;
+import io.druid.db.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManagerProvider;
+import io.druid.db.MetadataStorageConnector;
+import io.druid.db.MetadataSegmentPublisherProvider;
+import io.druid.db.MetadataRuleManagerProvider;
+import io.druid.db.DerbyConnector;
+import io.druid.db.SQLMetadataStorageActionHandler;
+import io.druid.db.SQLMetadataSegmentPublisher;
+import io.druid.db.SQLMetadataSegmentPublisherProvider;
 import io.druid.indexer.SQLMetadataStorageUpdaterJobHandler;
 import io.druid.indexer.MetadataStorageUpdaterJobHandler;
 import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator;

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

@@ -21,10 +21,10 @@ package io.druid.guice;
 
 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.MetadataStorageTablesConfig;
+import io.druid.db.MetadataStorageConnectorConfig;
+import io.druid.db.MetadataRuleManagerConfig;
+import io.druid.db.MetadataSegmentManagerConfig;
+import io.druid.db.MetadataStorageTablesConfig;
 
 public class MetadataDbConfigModule implements Module
 {

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

@@ -19,7 +19,7 @@
 
 package io.druid.guice;
 
-import io.druid.metadata.SegmentPublisherProvider;
+import io.druid.db.SegmentPublisherProvider;
 import io.druid.segment.realtime.NoopSegmentPublisher;
 import io.druid.segment.realtime.SegmentPublisher;
 

server/src/main/java/io/druid/server/bridge/BridgeZkCoordinator.java

@@ -25,7 +25,7 @@ import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
 import io.druid.client.ServerView;
 import io.druid.concurrent.Execs;
-import io.druid.metadata.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManager;
 import io.druid.segment.loading.SegmentLoaderConfig;
 import io.druid.segment.realtime.SegmentPublisher;
 import io.druid.server.coordination.BaseZkCoordinator;

server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java

@@ -50,8 +50,8 @@ import io.druid.collections.CountingMap;
 import io.druid.common.config.JacksonConfigManager;
 import io.druid.concurrent.Execs;
 import io.druid.curator.discovery.ServiceAnnouncer;
-import io.druid.metadata.MetadataRuleManager;
-import io.druid.metadata.MetadataSegmentManager;
+import io.druid.db.MetadataRuleManager;
+import io.druid.db.MetadataSegmentManager;
 import io.druid.guice.ManageLifecycle;
 import io.druid.guice.annotations.Self;
 import io.druid.segment.IndexIO;

server/src/main/java/io/druid/server/coordinator/DruidCoordinatorRuntimeParams.java

@@ -24,7 +24,7 @@ import com.google.common.collect.Sets;
 import com.metamx.common.guava.Comparators;
 import com.metamx.emitter.service.ServiceEmitter;
 import io.druid.client.DruidDataSource;
-import io.druid.metadata.MetadataRuleManager;
+import io.druid.db.MetadataRuleManager;
 import io.druid.timeline.DataSegment;
 import org.joda.time.DateTime;
 

server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java

@@ -20,7 +20,7 @@
 package io.druid.server.coordinator.helper;
 
 import com.metamx.emitter.EmittingLogger;
-import io.druid.metadata.MetadataRuleManager;
+import io.druid.db.MetadataRuleManager;
 import io.druid.server.coordinator.CoordinatorStats;
 import io.druid.server.coordinator.DruidCluster;
 import io.druid.server.coordinator.DruidCoordinator;

server/src/main/java/io/druid/server/http/BackwardsCompatibleInfoResource.java

@@ -23,8 +23,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
 import io.druid.client.InventoryView;
 import io.druid.client.indexing.IndexingServiceClient;
-import io.druid.metadata.MetadataRuleManager;
-import io.druid.metadata.MetadataSegmentManager;
+import io.druid.db.MetadataRuleManager;
+import io.druid.db.MetadataSegmentManager;
 import io.druid.server.coordinator.DruidCoordinator;
 
 import javax.annotation.Nullable;

server/src/main/java/io/druid/server/http/DBResource.java

@@ -24,7 +24,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import io.druid.client.DruidDataSource;
-import io.druid.metadata.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManager;
 import io.druid.timeline.DataSegment;
 
 import javax.ws.rs.GET;

server/src/main/java/io/druid/server/http/DatasourcesResource.java

@@ -33,7 +33,7 @@ import io.druid.client.DruidDataSource;
 import io.druid.client.DruidServer;
 import io.druid.client.InventoryView;
 import io.druid.client.indexing.IndexingServiceClient;
-import io.druid.metadata.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManager;
 import io.druid.timeline.DataSegment;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;

server/src/main/java/io/druid/server/http/InfoResource.java

@@ -33,8 +33,8 @@ import io.druid.client.DruidDataSource;
 import io.druid.client.DruidServer;
 import io.druid.client.InventoryView;
 import io.druid.client.indexing.IndexingServiceClient;
-import io.druid.metadata.MetadataRuleManager;
-import io.druid.metadata.MetadataSegmentManager;
+import io.druid.db.MetadataRuleManager;
+import io.druid.db.MetadataSegmentManager;
 import io.druid.server.coordinator.DruidCoordinator;
 import io.druid.server.coordinator.rules.LoadRule;
 import io.druid.server.coordinator.rules.Rule;

server/src/main/java/io/druid/server/http/RulesResource.java

@@ -20,7 +20,7 @@
 package io.druid.server.http;
 
 import com.google.inject.Inject;
-import io.druid.metadata.MetadataRuleManager;
+import io.druid.db.MetadataRuleManager;
 import io.druid.server.coordinator.rules.Rule;
 
 import javax.ws.rs.Consumes;

server/src/test/java/io/druid/db/MetadataSegmentManagerTest.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.metadata;
+package io.druid.db;
 
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Maps;

server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java

@@ -29,7 +29,7 @@ import io.druid.client.DruidServer;
 import io.druid.client.ServerView;
 import io.druid.curator.PotentiallyGzippedCompressionProvider;
 import io.druid.curator.announcement.Announcer;
-import io.druid.metadata.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManager;
 import io.druid.jackson.DefaultObjectMapper;
 import io.druid.segment.loading.SegmentLoaderConfig;
 import io.druid.segment.realtime.SegmentPublisher;

server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java

@@ -29,7 +29,7 @@ import com.metamx.emitter.EmittingLogger;
 import com.metamx.emitter.service.ServiceEmitter;
 import io.druid.client.DruidServer;
 import io.druid.client.ImmutableDruidServer;
-import io.druid.metadata.MetadataRuleManager;
+import io.druid.db.MetadataRuleManager;
 import io.druid.server.coordinator.helper.DruidCoordinatorRuleRunner;
 import io.druid.server.coordinator.rules.PeriodLoadRule;
 import io.druid.server.coordinator.rules.Rule;

server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java

@@ -29,7 +29,7 @@ import com.metamx.emitter.EmittingLogger;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceEventBuilder;
 import io.druid.client.DruidServer;
-import io.druid.metadata.MetadataRuleManager;
+import io.druid.db.MetadataRuleManager;
 import io.druid.segment.IndexIO;
 import io.druid.server.coordinator.helper.DruidCoordinatorRuleRunner;
 import io.druid.server.coordinator.rules.IntervalDropRule;

server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java

@@ -27,7 +27,7 @@ import io.druid.client.ImmutableDruidServer;
 import io.druid.client.SingleServerInventoryView;
 import io.druid.curator.discovery.NoopServiceAnnouncer;
 import io.druid.curator.inventory.InventoryManagerConfig;
-import io.druid.metadata.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManager;
 import io.druid.server.DruidNode;
 import io.druid.server.coordination.DruidServerMetadata;
 import io.druid.server.initialization.ZkPathsConfig;

services/src/main/java/io/druid/cli/CliBridge.java

@@ -13,9 +13,9 @@ import io.druid.curator.PotentiallyGzippedCompressionProvider;
 import io.druid.curator.announcement.Announcer;
 import io.druid.curator.discovery.ServerDiscoveryFactory;
 import io.druid.curator.discovery.ServerDiscoverySelector;
-import io.druid.metadata.MetadataSegmentManager;
-import io.druid.metadata.MetadataSegmentManagerConfig;
-import io.druid.metadata.MetadataSegmentManagerProvider;
+import io.druid.db.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManagerConfig;
+import io.druid.db.MetadataSegmentManagerProvider;
 import io.druid.guice.ConfigProvider;
 import io.druid.guice.Jerseys;
 import io.druid.guice.JsonConfigProvider;

services/src/main/java/io/druid/cli/CliCoordinator.java

@@ -29,12 +29,12 @@ import com.metamx.common.concurrent.ScheduledExecutorFactory;
 import com.metamx.common.logger.Logger;
 import io.airlift.command.Command;
 import io.druid.client.indexing.IndexingServiceClient;
-import io.druid.metadata.MetadataRuleManager;
-import io.druid.metadata.MetadataRuleManagerConfig;
-import io.druid.metadata.MetadataRuleManagerProvider;
-import io.druid.metadata.MetadataSegmentManager;
-import io.druid.metadata.MetadataSegmentManagerConfig;
-import io.druid.metadata.MetadataSegmentManagerProvider;
+import io.druid.db.MetadataRuleManager;
+import io.druid.db.MetadataRuleManagerConfig;
+import io.druid.db.MetadataRuleManagerProvider;
+import io.druid.db.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManagerConfig;
+import io.druid.db.MetadataSegmentManagerProvider;
 import io.druid.guice.ConfigProvider;
 import io.druid.guice.Jerseys;
 import io.druid.guice.JsonConfigProvider;

services/src/main/java/io/druid/cli/CliOverlord.java

@@ -31,7 +31,7 @@ import com.google.inject.servlet.GuiceFilter;
 import com.google.inject.util.Providers;
 import com.metamx.common.logger.Logger;
 import io.airlift.command.Command;
-import io.druid.metadata.IndexerSQLMetadataStorageCoordinator;
+import io.druid.db.IndexerSQLMetadataStorageCoordinator;
 import io.druid.guice.IndexingServiceFirehoseModule;
 import io.druid.guice.IndexingServiceModuleHelper;
 import io.druid.guice.IndexingServiceTaskLogsModule;

services/src/main/java/io/druid/cli/CliPeon.java

@@ -31,7 +31,7 @@ import com.metamx.common.logger.Logger;
 import io.airlift.command.Arguments;
 import io.airlift.command.Command;
 import io.airlift.command.Option;
-import io.druid.metadata.IndexerSQLMetadataStorageCoordinator;
+import io.druid.db.IndexerSQLMetadataStorageCoordinator;
 import io.druid.guice.Binders;
 import io.druid.guice.IndexingServiceFirehoseModule;
 import io.druid.guice.Jerseys;

services/src/main/java/io/druid/cli/CreateTables.java

@@ -27,9 +27,9 @@ import com.google.inject.Module;
 import com.metamx.common.logger.Logger;
 import io.airlift.command.Command;
 import io.airlift.command.Option;
-import io.druid.metadata.MetadataStorageConnector;
-import io.druid.metadata.MetadataStorageConnectorConfig;
-import io.druid.metadata.MetadataStorageTablesConfig;
+import io.druid.db.MetadataStorageConnector;
+import io.druid.db.MetadataStorageConnectorConfig;
+import io.druid.db.MetadataStorageTablesConfig;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.annotations.Self;
 import io.druid.server.DruidNode;