From 1872b8f979855b6e13b51c41bd21a122c8fd709f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Fri, 31 Oct 2014 14:49:07 -0700 Subject: [PATCH] make it easier to test --- .../druid/indexing/overlord/TaskLifecycleTest.java | 3 +++ .../IndexerSQLMetadataStorageCoordinator.java | 14 +++++++------- .../metadata/SQLMetadataSegmentPublisher.java | 6 ++++-- 3 files changed, 14 insertions(+), 9 deletions(-) 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..2ce72d6a0e1 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 @@ -64,6 +64,7 @@ import io.druid.indexing.common.task.Task; import io.druid.indexing.common.task.TaskResource; import io.druid.indexing.overlord.config.TaskQueueConfig; import io.druid.jackson.DefaultObjectMapper; +import io.druid.metadata.SQLMetadataConnector; import io.druid.query.aggregation.AggregatorFactory; import io.druid.query.aggregation.DoubleSumAggregatorFactory; import io.druid.segment.indexing.granularity.UniformGranularitySpec; @@ -86,6 +87,8 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.skife.jdbi.v2.DBI; +import org.skife.jdbi.v2.Handle; import java.io.File; import java.io.IOException; diff --git a/server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java index 2e754c9426e..daa5433c55b 100644 --- a/server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java +++ b/server/src/main/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinator.java @@ -58,7 +58,7 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor private final ObjectMapper jsonMapper; private final MetadataStorageTablesConfig dbTables; - private final IDBI dbi; + private final SQLMetadataConnector connector; @Inject public IndexerSQLMetadataStorageCoordinator( @@ -69,13 +69,13 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor { this.jsonMapper = jsonMapper; this.dbTables = dbTables; - this.dbi = connector.getDBI(); + this.connector = connector; } public List getUsedSegmentsForInterval(final String dataSource, final Interval interval) throws IOException { - final VersionedIntervalTimeline timeline = dbi.withHandle( + final VersionedIntervalTimeline timeline = connector.getDBI().withHandle( new HandleCallback>() { @Override @@ -140,7 +140,7 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor */ public Set announceHistoricalSegments(final Set segments) throws IOException { - return dbi.inTransaction( + return connector.getDBI().inTransaction( new TransactionCallback>() { @Override @@ -227,7 +227,7 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor public void updateSegmentMetadata(final Set segments) throws IOException { - dbi.inTransaction( + connector.getDBI().inTransaction( new TransactionCallback() { @Override @@ -245,7 +245,7 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor public void deleteSegments(final Set segments) throws IOException { - dbi.inTransaction( + connector.getDBI().inTransaction( new TransactionCallback() { @Override @@ -288,7 +288,7 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor public List getUnusedSegmentsForInterval(final String dataSource, final Interval interval) { - List matchingSegments = dbi.withHandle( + List matchingSegments = connector.getDBI().withHandle( new HandleCallback>() { @Override diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java b/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java index 208b2869919..1e4afb55715 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java +++ b/server/src/main/java/io/druid/metadata/SQLMetadataSegmentPublisher.java @@ -28,6 +28,7 @@ import io.druid.segment.realtime.SegmentPublisher; import io.druid.timeline.DataSegment; import io.druid.timeline.partition.NoneShardSpec; import org.joda.time.DateTime; +import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.IDBI; import org.skife.jdbi.v2.tweak.HandleCallback; @@ -42,7 +43,7 @@ public class SQLMetadataSegmentPublisher implements SegmentPublisher private final ObjectMapper jsonMapper; private final MetadataStorageTablesConfig config; - private final IDBI dbi; + private final SQLMetadataConnector connector; private final String statement; @Inject @@ -54,7 +55,7 @@ public class SQLMetadataSegmentPublisher implements SegmentPublisher { this.jsonMapper = jsonMapper; this.config = config; - this.dbi = connector.getDBI(); + this.connector = connector; this.statement = String.format( "INSERT INTO %s (id, dataSource, created_date, start, \"end\", partitioned, version, used, payload) " + "VALUES (:id, :dataSource, :created_date, :start, :end, :partitioned, :version, :used, :payload)", @@ -66,6 +67,7 @@ public class SQLMetadataSegmentPublisher implements SegmentPublisher public void publishSegment(final DataSegment segment) throws IOException { try { + final DBI dbi = connector.getDBI(); List> exists = dbi.withHandle( new HandleCallback>>() {