From 37979282fe13ca9ed65557c359158be68cb7d5cb Mon Sep 17 00:00:00 2001 From: jisookim0513 Date: Tue, 21 Oct 2014 00:09:19 -0700 Subject: [PATCH] enabled ansi-quote in mysql; insert statement should now work --- .../io/druid/common/config/ConfigManager.java | 4 +-- .../MetadataStorageConnector.java | 2 +- .../MetadataStorageConnectorConfig.java | 2 +- .../MetadataStorageTablesConfig.java | 2 +- .../guice/JacksonConfigManagerModule.java | 4 +-- .../MetadataStorageUpdaterJobSpec.java | 2 +- .../indexer/HadoopIngestionSpecTest.java | 2 +- .../overlord/MetadataTaskStorage.java | 4 +-- .../indexing/overlord/TaskLifecycleTest.java | 2 +- .../druid/storage/mysql/MySQLConnector.java | 15 ++++++-- .../mysql/MySQLMetadataStorageModule.java | 34 +++++++++---------- .../storage/postgres/PostgreSQLConnector.java | 6 ++-- .../PostgresMetadataStorageModule.java | 34 +++++++++---------- .../DerbyConnectionFactory.java | 2 +- .../{metadata => db}/DerbyConnector.java | 2 +- .../DerbyMetadataRuleManager.java | 2 +- .../DerbyMetadataRuleManagerProvider.java | 2 +- .../DerbyMetadataSegmentManager.java | 10 ++---- .../IndexerSQLMetadataStorageCoordinator.java | 2 +- .../{metadata => db}/MetadataRuleManager.java | 2 +- .../MetadataRuleManagerConfig.java | 2 +- .../MetadataRuleManagerProvider.java | 2 +- .../MetadataSegmentManager.java | 2 +- .../MetadataSegmentManagerConfig.java | 2 +- .../MetadataSegmentManagerProvider.java | 2 +- .../MetadataSegmentPublisherProvider.java | 2 +- .../SQLMetadataConnector.java | 2 +- .../SQLMetadataRuleManager.java | 2 +- .../SQLMetadataRuleManagerProvider.java | 2 +- .../SQLMetadataSegmentManager.java | 2 +- .../SQLMetadataSegmentManagerProvider.java | 2 +- .../SQLMetadataSegmentPublisher.java | 2 +- .../SQLMetadataSegmentPublisherProvider.java | 2 +- .../SQLMetadataStorageActionHandler.java | 2 +- .../SegmentPublisherProvider.java | 2 +- .../DerbyMetadataStorageDruidModule.java | 31 ++++++++--------- .../druid/guice/MetadataDbConfigModule.java | 8 ++--- .../guice/NoopSegmentPublisherProvider.java | 2 +- .../server/bridge/BridgeZkCoordinator.java | 2 +- .../server/coordinator/DruidCoordinator.java | 4 +-- .../DruidCoordinatorRuntimeParams.java | 2 +- .../helper/DruidCoordinatorRuleRunner.java | 2 +- .../http/BackwardsCompatibleInfoResource.java | 4 +-- .../java/io/druid/server/http/DBResource.java | 2 +- .../server/http/DatasourcesResource.java | 2 +- .../io/druid/server/http/InfoResource.java | 4 +-- .../io/druid/server/http/RulesResource.java | 2 +- .../MetadataSegmentManagerTest.java | 2 +- .../server/bridge/DruidClusterBridgeTest.java | 2 +- .../DruidCoordinatorBalancerProfiler.java | 2 +- .../DruidCoordinatorRuleRunnerTest.java | 2 +- .../coordinator/DruidCoordinatorTest.java | 2 +- .../src/main/java/io/druid/cli/CliBridge.java | 6 ++-- .../java/io/druid/cli/CliCoordinator.java | 12 +++---- .../main/java/io/druid/cli/CliOverlord.java | 2 +- .../src/main/java/io/druid/cli/CliPeon.java | 2 +- .../main/java/io/druid/cli/CreateTables.java | 6 ++-- 57 files changed, 136 insertions(+), 132 deletions(-) rename common/src/main/java/io/druid/{metadata => db}/MetadataStorageConnector.java (98%) rename common/src/main/java/io/druid/{metadata => db}/MetadataStorageConnectorConfig.java (98%) rename common/src/main/java/io/druid/{metadata => db}/MetadataStorageTablesConfig.java (99%) rename server/src/main/java/io/druid/{metadata => db}/DerbyConnectionFactory.java (98%) rename server/src/main/java/io/druid/{metadata => db}/DerbyConnector.java (99%) rename server/src/main/java/io/druid/{metadata => db}/DerbyMetadataRuleManager.java (98%) rename server/src/main/java/io/druid/{metadata => db}/DerbyMetadataRuleManagerProvider.java (98%) rename server/src/main/java/io/druid/{metadata => db}/DerbyMetadataSegmentManager.java (98%) rename server/src/main/java/io/druid/{metadata => db}/IndexerSQLMetadataStorageCoordinator.java (99%) rename server/src/main/java/io/druid/{metadata => db}/MetadataRuleManager.java (97%) rename server/src/main/java/io/druid/{metadata => db}/MetadataRuleManagerConfig.java (97%) rename server/src/main/java/io/druid/{metadata => db}/MetadataRuleManagerProvider.java (97%) rename server/src/main/java/io/druid/{metadata => db}/MetadataSegmentManager.java (98%) rename server/src/main/java/io/druid/{metadata => db}/MetadataSegmentManagerConfig.java (97%) rename server/src/main/java/io/druid/{metadata => db}/MetadataSegmentManagerProvider.java (97%) rename server/src/main/java/io/druid/{metadata => db}/MetadataSegmentPublisherProvider.java (97%) rename server/src/main/java/io/druid/{metadata => db}/SQLMetadataConnector.java (99%) rename server/src/main/java/io/druid/{metadata => db}/SQLMetadataRuleManager.java (99%) rename server/src/main/java/io/druid/{metadata => db}/SQLMetadataRuleManagerProvider.java (98%) rename server/src/main/java/io/druid/{metadata => db}/SQLMetadataSegmentManager.java (99%) rename server/src/main/java/io/druid/{metadata => db}/SQLMetadataSegmentManagerProvider.java (98%) rename server/src/main/java/io/druid/{metadata => db}/SQLMetadataSegmentPublisher.java (99%) rename server/src/main/java/io/druid/{metadata => db}/SQLMetadataSegmentPublisherProvider.java (98%) rename server/src/main/java/io/druid/{metadata => db}/SQLMetadataStorageActionHandler.java (99%) rename server/src/main/java/io/druid/{metadata => db}/SegmentPublisherProvider.java (98%) rename server/src/test/java/io/druid/{metadata => db}/MetadataSegmentManagerTest.java (99%) diff --git a/common/src/main/java/io/druid/common/config/ConfigManager.java b/common/src/main/java/io/druid/common/config/ConfigManager.java index 094d579aad0..c846d6edce2 100644 --- a/common/src/main/java/io/druid/common/config/ConfigManager.java +++ b/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; diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageConnector.java b/common/src/main/java/io/druid/db/MetadataStorageConnector.java similarity index 98% rename from common/src/main/java/io/druid/metadata/MetadataStorageConnector.java rename to common/src/main/java/io/druid/db/MetadataStorageConnector.java index 095fd8de380..5b1712d5054 100644 --- a/common/src/main/java/io/druid/metadata/MetadataStorageConnector.java +++ b/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; /** */ diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java b/common/src/main/java/io/druid/db/MetadataStorageConnectorConfig.java similarity index 98% rename from common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java rename to common/src/main/java/io/druid/db/MetadataStorageConnectorConfig.java index 3b094c420e8..c07683e0c7c 100644 --- a/common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java +++ b/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; diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageTablesConfig.java b/common/src/main/java/io/druid/db/MetadataStorageTablesConfig.java similarity index 99% rename from common/src/main/java/io/druid/metadata/MetadataStorageTablesConfig.java rename to common/src/main/java/io/druid/db/MetadataStorageTablesConfig.java index 3e56acca95a..f5364294300 100644 --- a/common/src/main/java/io/druid/metadata/MetadataStorageTablesConfig.java +++ b/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; diff --git a/common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java b/common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java index 67552d82cf7..52f49eb34b1 100644 --- a/common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java +++ b/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; /** */ diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java b/indexing-hadoop/src/main/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java index 4d58693b22c..539eacd62b0 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java +++ b/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; /** */ diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecTest.java b/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecTest.java index 0b7e1bf3e71..3ecb4c7b76a 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecTest.java +++ b/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; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/MetadataTaskStorage.java b/indexing-service/src/main/java/io/druid/indexing/overlord/MetadataTaskStorage.java index f2571faf437..a3bfc4eb8a1 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/MetadataTaskStorage.java +++ b/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; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java index 4b8c4c63b45..1bce828c79c 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java +++ b/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; diff --git a/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLConnector.java b/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLConnector.java index 3925bbff83e..0b7c96d4b0f 100644 --- a/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLConnector.java +++ b/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() + { + @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) diff --git a/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLMetadataStorageModule.java b/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLMetadataStorageModule.java index 377e584a957..bc733108250 100644 --- a/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLMetadataStorageModule.java +++ b/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; diff --git a/postgres-storage/src/main/java/io/druid/storage/postgres/PostgreSQLConnector.java b/postgres-storage/src/main/java/io/druid/storage/postgres/PostgreSQLConnector.java index 426ee35ece3..fd36ec172c0 100644 --- a/postgres-storage/src/main/java/io/druid/storage/postgres/PostgreSQLConnector.java +++ b/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; diff --git a/postgres-storage/src/main/java/io/druid/storage/postgres/PostgresMetadataStorageModule.java b/postgres-storage/src/main/java/io/druid/storage/postgres/PostgresMetadataStorageModule.java index 7329f5e2294..70e4c29481a 100644 --- a/postgres-storage/src/main/java/io/druid/storage/postgres/PostgresMetadataStorageModule.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/DerbyConnectionFactory.java b/server/src/main/java/io/druid/db/DerbyConnectionFactory.java similarity index 98% rename from server/src/main/java/io/druid/metadata/DerbyConnectionFactory.java rename to server/src/main/java/io/druid/db/DerbyConnectionFactory.java index 75f10f6f067..34c0c08b4ae 100644 --- a/server/src/main/java/io/druid/metadata/DerbyConnectionFactory.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/DerbyConnector.java b/server/src/main/java/io/druid/db/DerbyConnector.java similarity index 99% rename from server/src/main/java/io/druid/metadata/DerbyConnector.java rename to server/src/main/java/io/druid/db/DerbyConnector.java index 749b412fbde..8079cce9b32 100644 --- a/server/src/main/java/io/druid/metadata/DerbyConnector.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/DerbyMetadataRuleManager.java b/server/src/main/java/io/druid/db/DerbyMetadataRuleManager.java similarity index 98% rename from server/src/main/java/io/druid/metadata/DerbyMetadataRuleManager.java rename to server/src/main/java/io/druid/db/DerbyMetadataRuleManager.java index 1a9036f29dc..e8ba102fc2a 100644 --- a/server/src/main/java/io/druid/metadata/DerbyMetadataRuleManager.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/DerbyMetadataRuleManagerProvider.java b/server/src/main/java/io/druid/db/DerbyMetadataRuleManagerProvider.java similarity index 98% rename from server/src/main/java/io/druid/metadata/DerbyMetadataRuleManagerProvider.java rename to server/src/main/java/io/druid/db/DerbyMetadataRuleManagerProvider.java index 767efb32411..88015b014e8 100644 --- a/server/src/main/java/io/druid/metadata/DerbyMetadataRuleManagerProvider.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/DerbyMetadataSegmentManager.java b/server/src/main/java/io/druid/db/DerbyMetadataSegmentManager.java similarity index 98% rename from server/src/main/java/io/druid/metadata/DerbyMetadataSegmentManager.java rename to server/src/main/java/io/druid/db/DerbyMetadataSegmentManager.java index 3e3acedcacb..00036c0d3d7 100644 --- a/server/src/main/java/io/druid/metadata/DerbyMetadataSegmentManager.java +++ b/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> 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); } } diff --git a/server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/io/druid/db/IndexerSQLMetadataStorageCoordinator.java similarity index 99% rename from server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java rename to server/src/main/java/io/druid/db/IndexerSQLMetadataStorageCoordinator.java index adbb4346e88..d35ed8e3693 100644 --- a/server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/MetadataRuleManager.java b/server/src/main/java/io/druid/db/MetadataRuleManager.java similarity index 97% rename from server/src/main/java/io/druid/metadata/MetadataRuleManager.java rename to server/src/main/java/io/druid/db/MetadataRuleManager.java index ad2c7d592a2..2ce79b1eb4c 100644 --- a/server/src/main/java/io/druid/metadata/MetadataRuleManager.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/MetadataRuleManagerConfig.java b/server/src/main/java/io/druid/db/MetadataRuleManagerConfig.java similarity index 97% rename from server/src/main/java/io/druid/metadata/MetadataRuleManagerConfig.java rename to server/src/main/java/io/druid/db/MetadataRuleManagerConfig.java index cb57aea105c..59ad91e1105 100644 --- a/server/src/main/java/io/druid/metadata/MetadataRuleManagerConfig.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/MetadataRuleManagerProvider.java b/server/src/main/java/io/druid/db/MetadataRuleManagerProvider.java similarity index 97% rename from server/src/main/java/io/druid/metadata/MetadataRuleManagerProvider.java rename to server/src/main/java/io/druid/db/MetadataRuleManagerProvider.java index e7e230792b3..cf99cf6c0c6 100644 --- a/server/src/main/java/io/druid/metadata/MetadataRuleManagerProvider.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/MetadataSegmentManager.java b/server/src/main/java/io/druid/db/MetadataSegmentManager.java similarity index 98% rename from server/src/main/java/io/druid/metadata/MetadataSegmentManager.java rename to server/src/main/java/io/druid/db/MetadataSegmentManager.java index e528066d1c3..8fb4309be07 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSegmentManager.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/MetadataSegmentManagerConfig.java b/server/src/main/java/io/druid/db/MetadataSegmentManagerConfig.java similarity index 97% rename from server/src/main/java/io/druid/metadata/MetadataSegmentManagerConfig.java rename to server/src/main/java/io/druid/db/MetadataSegmentManagerConfig.java index ddcc702d810..d377b200c93 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSegmentManagerConfig.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/MetadataSegmentManagerProvider.java b/server/src/main/java/io/druid/db/MetadataSegmentManagerProvider.java similarity index 97% rename from server/src/main/java/io/druid/metadata/MetadataSegmentManagerProvider.java rename to server/src/main/java/io/druid/db/MetadataSegmentManagerProvider.java index 056612bfdcb..fa5456fa0ac 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSegmentManagerProvider.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/MetadataSegmentPublisherProvider.java b/server/src/main/java/io/druid/db/MetadataSegmentPublisherProvider.java similarity index 97% rename from server/src/main/java/io/druid/metadata/MetadataSegmentPublisherProvider.java rename to server/src/main/java/io/druid/db/MetadataSegmentPublisherProvider.java index fe14b5ab1e1..015fd002792 100644 --- a/server/src/main/java/io/druid/metadata/MetadataSegmentPublisherProvider.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataConnector.java b/server/src/main/java/io/druid/db/SQLMetadataConnector.java similarity index 99% rename from server/src/main/java/io/druid/metadata/SQLMetadataConnector.java rename to server/src/main/java/io/druid/db/SQLMetadataConnector.java index 0ab71be5cd7..5189b498ebb 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataConnector.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataRuleManager.java b/server/src/main/java/io/druid/db/SQLMetadataRuleManager.java similarity index 99% rename from server/src/main/java/io/druid/metadata/SQLMetadataRuleManager.java rename to server/src/main/java/io/druid/db/SQLMetadataRuleManager.java index 9df151c8651..0b348f33ece 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataRuleManager.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataRuleManagerProvider.java b/server/src/main/java/io/druid/db/SQLMetadataRuleManagerProvider.java similarity index 98% rename from server/src/main/java/io/druid/metadata/SQLMetadataRuleManagerProvider.java rename to server/src/main/java/io/druid/db/SQLMetadataRuleManagerProvider.java index 3633c484615..411fa93dc03 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataRuleManagerProvider.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentManager.java b/server/src/main/java/io/druid/db/SQLMetadataSegmentManager.java similarity index 99% rename from server/src/main/java/io/druid/metadata/SQLMetadataSegmentManager.java rename to server/src/main/java/io/druid/db/SQLMetadataSegmentManager.java index dd7ad824e3a..c9f7832d7b0 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentManager.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentManagerProvider.java b/server/src/main/java/io/druid/db/SQLMetadataSegmentManagerProvider.java similarity index 98% rename from server/src/main/java/io/druid/metadata/SQLMetadataSegmentManagerProvider.java rename to server/src/main/java/io/druid/db/SQLMetadataSegmentManagerProvider.java index 0508c81bef5..add1aface92 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentManagerProvider.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java b/server/src/main/java/io/druid/db/SQLMetadataSegmentPublisher.java similarity index 99% rename from server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java rename to server/src/main/java/io/druid/db/SQLMetadataSegmentPublisher.java index 34aab6d433b..c5aae87348a 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisherProvider.java b/server/src/main/java/io/druid/db/SQLMetadataSegmentPublisherProvider.java similarity index 98% rename from server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisherProvider.java rename to server/src/main/java/io/druid/db/SQLMetadataSegmentPublisherProvider.java index fe8664e017f..d7d3b41d474 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisherProvider.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java b/server/src/main/java/io/druid/db/SQLMetadataStorageActionHandler.java similarity index 99% rename from server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java rename to server/src/main/java/io/druid/db/SQLMetadataStorageActionHandler.java index b47408ba76c..4f7830b9e95 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java +++ b/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; diff --git a/server/src/main/java/io/druid/metadata/SegmentPublisherProvider.java b/server/src/main/java/io/druid/db/SegmentPublisherProvider.java similarity index 98% rename from server/src/main/java/io/druid/metadata/SegmentPublisherProvider.java rename to server/src/main/java/io/druid/db/SegmentPublisherProvider.java index 049d2482f0e..264b6407f8a 100644 --- a/server/src/main/java/io/druid/metadata/SegmentPublisherProvider.java +++ b/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; diff --git a/server/src/main/java/io/druid/guice/DerbyMetadataStorageDruidModule.java b/server/src/main/java/io/druid/guice/DerbyMetadataStorageDruidModule.java index f75173833c3..bc80fc42fec 100644 --- a/server/src/main/java/io/druid/guice/DerbyMetadataStorageDruidModule.java +++ b/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; diff --git a/server/src/main/java/io/druid/guice/MetadataDbConfigModule.java b/server/src/main/java/io/druid/guice/MetadataDbConfigModule.java index 2a660d20d96..cf3a18e1ac2 100644 --- a/server/src/main/java/io/druid/guice/MetadataDbConfigModule.java +++ b/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 { diff --git a/server/src/main/java/io/druid/guice/NoopSegmentPublisherProvider.java b/server/src/main/java/io/druid/guice/NoopSegmentPublisherProvider.java index 2ef6fc6987f..f4fd26ed409 100644 --- a/server/src/main/java/io/druid/guice/NoopSegmentPublisherProvider.java +++ b/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; diff --git a/server/src/main/java/io/druid/server/bridge/BridgeZkCoordinator.java b/server/src/main/java/io/druid/server/bridge/BridgeZkCoordinator.java index 343391b5b28..fd3a0b63d1e 100644 --- a/server/src/main/java/io/druid/server/bridge/BridgeZkCoordinator.java +++ b/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; diff --git a/server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java b/server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java index 310ccf1979a..d4fe6297a72 100644 --- a/server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java +++ b/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; diff --git a/server/src/main/java/io/druid/server/coordinator/DruidCoordinatorRuntimeParams.java b/server/src/main/java/io/druid/server/coordinator/DruidCoordinatorRuntimeParams.java index 1556ec410e1..f7fdba96bf1 100644 --- a/server/src/main/java/io/druid/server/coordinator/DruidCoordinatorRuntimeParams.java +++ b/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; diff --git a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java b/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java index 03869810e85..3b3a36f0fe2 100644 --- a/server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java +++ b/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; diff --git a/server/src/main/java/io/druid/server/http/BackwardsCompatibleInfoResource.java b/server/src/main/java/io/druid/server/http/BackwardsCompatibleInfoResource.java index 412d7c8321d..2ac0c145d4d 100644 --- a/server/src/main/java/io/druid/server/http/BackwardsCompatibleInfoResource.java +++ b/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; diff --git a/server/src/main/java/io/druid/server/http/DBResource.java b/server/src/main/java/io/druid/server/http/DBResource.java index 34bfd3059c2..625126b39bf 100644 --- a/server/src/main/java/io/druid/server/http/DBResource.java +++ b/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; diff --git a/server/src/main/java/io/druid/server/http/DatasourcesResource.java b/server/src/main/java/io/druid/server/http/DatasourcesResource.java index da240f8cb3f..62cae442880 100644 --- a/server/src/main/java/io/druid/server/http/DatasourcesResource.java +++ b/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; diff --git a/server/src/main/java/io/druid/server/http/InfoResource.java b/server/src/main/java/io/druid/server/http/InfoResource.java index 56d309fe73c..d4da10ee810 100644 --- a/server/src/main/java/io/druid/server/http/InfoResource.java +++ b/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; diff --git a/server/src/main/java/io/druid/server/http/RulesResource.java b/server/src/main/java/io/druid/server/http/RulesResource.java index 03996463077..f797e4305d0 100644 --- a/server/src/main/java/io/druid/server/http/RulesResource.java +++ b/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; diff --git a/server/src/test/java/io/druid/metadata/MetadataSegmentManagerTest.java b/server/src/test/java/io/druid/db/MetadataSegmentManagerTest.java similarity index 99% rename from server/src/test/java/io/druid/metadata/MetadataSegmentManagerTest.java rename to server/src/test/java/io/druid/db/MetadataSegmentManagerTest.java index 62017c15c3e..42c50903353 100644 --- a/server/src/test/java/io/druid/metadata/MetadataSegmentManagerTest.java +++ b/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; diff --git a/server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java b/server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java index 27f41493536..bd242768798 100644 --- a/server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java +++ b/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; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java index 8010974d40c..99d92216410 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java +++ b/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; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java index d8cad235a68..bf79631f046 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java +++ b/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; diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java index 42eb36be50b..e294d14ebad 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java +++ b/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; diff --git a/services/src/main/java/io/druid/cli/CliBridge.java b/services/src/main/java/io/druid/cli/CliBridge.java index 27cf0020fb2..150872cea08 100644 --- a/services/src/main/java/io/druid/cli/CliBridge.java +++ b/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; diff --git a/services/src/main/java/io/druid/cli/CliCoordinator.java b/services/src/main/java/io/druid/cli/CliCoordinator.java index 5b714818733..7af7590a75c 100644 --- a/services/src/main/java/io/druid/cli/CliCoordinator.java +++ b/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; diff --git a/services/src/main/java/io/druid/cli/CliOverlord.java b/services/src/main/java/io/druid/cli/CliOverlord.java index 63e88e8a712..e4ee9410072 100644 --- a/services/src/main/java/io/druid/cli/CliOverlord.java +++ b/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; diff --git a/services/src/main/java/io/druid/cli/CliPeon.java b/services/src/main/java/io/druid/cli/CliPeon.java index 0c9a74dfa3b..a3a136dd78c 100644 --- a/services/src/main/java/io/druid/cli/CliPeon.java +++ b/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; diff --git a/services/src/main/java/io/druid/cli/CreateTables.java b/services/src/main/java/io/druid/cli/CreateTables.java index 1611559fc5e..dc689d4fed8 100644 --- a/services/src/main/java/io/druid/cli/CreateTables.java +++ b/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;