From 33876809760c593091d93989933babab1d32c3e8 Mon Sep 17 00:00:00 2001 From: Jihoon Son Date: Fri, 2 Jun 2017 17:12:40 +0900 Subject: [PATCH] Rename FiniteAppenderatorDriver to AppenderatorDriver --- .../druid/indexing/kafka/KafkaIndexTask.java | 8 +++--- .../druid/indexing/common/task/IndexTask.java | 8 +++--- ...torDriver.java => AppenderatorDriver.java} | 8 +++--- .../AppenderatorDriverAddResult.java | 2 +- ...t.java => AppenderatorDriverFailTest.java} | 26 +++++++++---------- ...rTest.java => AppenderatorDriverTest.java} | 6 ++--- 6 files changed, 29 insertions(+), 29 deletions(-) rename server/src/main/java/io/druid/segment/realtime/appenderator/{FiniteAppenderatorDriver.java => AppenderatorDriver.java} (98%) rename server/src/test/java/io/druid/segment/realtime/appenderator/{FiniteAppenderatorDriverFailTest.java => AppenderatorDriverFailTest.java} (94%) rename server/src/test/java/io/druid/segment/realtime/appenderator/{FiniteAppenderatorDriverTest.java => AppenderatorDriverTest.java} (99%) diff --git a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTask.java b/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTask.java index 07e0ae7464b4..6ffb6009fae7 100644 --- a/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTask.java +++ b/extensions-core/kafka-indexing-service/src/main/java/io/druid/indexing/kafka/KafkaIndexTask.java @@ -65,9 +65,9 @@ import io.druid.segment.realtime.FireDepartmentMetrics; import io.druid.segment.realtime.RealtimeMetricsMonitor; import io.druid.segment.realtime.appenderator.Appenderator; +import io.druid.segment.realtime.appenderator.AppenderatorDriver; import io.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; import io.druid.segment.realtime.appenderator.Appenderators; -import io.druid.segment.realtime.appenderator.FiniteAppenderatorDriver; import io.druid.segment.realtime.appenderator.SegmentsAndMetadata; import io.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; import io.druid.segment.realtime.firehose.ChatHandler; @@ -282,7 +282,7 @@ public TaskStatus run(final TaskToolbox toolbox) throws Exception try ( final Appenderator appenderator0 = newAppenderator(fireDepartmentMetrics, toolbox); - final FiniteAppenderatorDriver driver = newDriver(appenderator0, toolbox, fireDepartmentMetrics); + final AppenderatorDriver driver = newDriver(appenderator0, toolbox, fireDepartmentMetrics); final KafkaConsumer consumer = newConsumer() ) { toolbox.getDataSegmentServerAnnouncer().announce(); @@ -871,13 +871,13 @@ private Appenderator newAppenderator(FireDepartmentMetrics metrics, TaskToolbox ); } - private FiniteAppenderatorDriver newDriver( + private AppenderatorDriver newDriver( final Appenderator appenderator, final TaskToolbox toolbox, final FireDepartmentMetrics metrics ) { - return new FiniteAppenderatorDriver( + return new AppenderatorDriver( appenderator, new ActionBasedSegmentAllocator(toolbox.getTaskActionClient(), dataSchema), toolbox.getSegmentHandoffNotifierFactory(), diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java index 6a826d860545..f6774843ee7c 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java @@ -77,7 +77,7 @@ import io.druid.segment.realtime.appenderator.AppenderatorConfig; import io.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; import io.druid.segment.realtime.appenderator.Appenderators; -import io.druid.segment.realtime.appenderator.FiniteAppenderatorDriver; +import io.druid.segment.realtime.appenderator.AppenderatorDriver; import io.druid.segment.realtime.appenderator.SegmentAllocator; import io.druid.segment.realtime.appenderator.SegmentIdentifier; import io.druid.segment.realtime.appenderator.SegmentsAndMetadata; @@ -400,7 +400,7 @@ public SegmentIdentifier allocate(DateTime timestamp, String sequenceName, Strin try ( final Appenderator appenderator = newAppenderator(fireDepartmentMetrics, toolbox, dataSchema); - final FiniteAppenderatorDriver driver = newDriver( + final AppenderatorDriver driver = newDriver( appenderator, toolbox, segmentAllocator, @@ -543,14 +543,14 @@ private Appenderator newAppenderator(FireDepartmentMetrics metrics, TaskToolbox ); } - private FiniteAppenderatorDriver newDriver( + private AppenderatorDriver newDriver( final Appenderator appenderator, final TaskToolbox toolbox, final SegmentAllocator segmentAllocator, final FireDepartmentMetrics metrics ) { - return new FiniteAppenderatorDriver( + return new AppenderatorDriver( appenderator, segmentAllocator, new NoopSegmentHandoffNotifierFactory(), // don't wait for handoff since we don't serve queries diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/FiniteAppenderatorDriver.java b/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriver.java similarity index 98% rename from server/src/main/java/io/druid/segment/realtime/appenderator/FiniteAppenderatorDriver.java rename to server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriver.java index 10c9c4cdb388..710f1f655df2 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/FiniteAppenderatorDriver.java +++ b/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriver.java @@ -64,7 +64,7 @@ import java.util.stream.Collectors; /** - * A FiniteAppenderatorDriver drives an Appenderator to index a finite stream of data. This class does not help you + * A AppenderatorDriver drives an Appenderator to index a finite stream of data. This class does not help you * index unbounded streams. All handoff is done at the end of indexing. * * This class helps with doing things that Appenderators don't, including deciding which segments to use (with a @@ -74,9 +74,9 @@ * Note that the commit metadata stored by this class via the underlying Appenderator is not the same metadata as * you pass in. It's wrapped in some extra metadata needed by the driver. */ -public class FiniteAppenderatorDriver implements Closeable +public class AppenderatorDriver implements Closeable { - private static final Logger log = new Logger(FiniteAppenderatorDriver.class); + private static final Logger log = new Logger(AppenderatorDriver.class); private final Appenderator appenderator; private final SegmentAllocator segmentAllocator; @@ -111,7 +111,7 @@ public class FiniteAppenderatorDriver implements Closeable * @param objectMapper object mapper, used for serde of commit metadata * @param metrics Firedepartment metrics */ - public FiniteAppenderatorDriver( + public AppenderatorDriver( Appenderator appenderator, SegmentAllocator segmentAllocator, SegmentHandoffNotifierFactory handoffNotifierFactory, diff --git a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java b/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java index 6d0ee1b5e581..3ce1f2816b9a 100644 --- a/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java +++ b/server/src/main/java/io/druid/segment/realtime/appenderator/AppenderatorDriverAddResult.java @@ -25,7 +25,7 @@ import javax.annotation.Nullable; /** - * Result of {@link FiniteAppenderatorDriver#add(InputRow, String, Supplier)}. It contains the identifier of the + * Result of {@link AppenderatorDriver#add(InputRow, String, Supplier)}. It contains the identifier of the * segment which the InputRow is added to and the number of rows in that segment. */ public class AppenderatorDriverAddResult diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/FiniteAppenderatorDriverFailTest.java b/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorDriverFailTest.java similarity index 94% rename from server/src/test/java/io/druid/segment/realtime/appenderator/FiniteAppenderatorDriverFailTest.java rename to server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorDriverFailTest.java index 489a1ed2864c..1203fcfa2f71 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/FiniteAppenderatorDriverFailTest.java +++ b/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorDriverFailTest.java @@ -39,9 +39,9 @@ import io.druid.query.SegmentDescriptor; import io.druid.segment.incremental.IndexSizeExceededException; import io.druid.segment.realtime.FireDepartmentMetrics; -import io.druid.segment.realtime.appenderator.FiniteAppenderatorDriverTest.TestCommitterSupplier; -import io.druid.segment.realtime.appenderator.FiniteAppenderatorDriverTest.TestSegmentAllocator; -import io.druid.segment.realtime.appenderator.FiniteAppenderatorDriverTest.TestSegmentHandoffNotifierFactory; +import io.druid.segment.realtime.appenderator.AppenderatorDriverTest.TestCommitterSupplier; +import io.druid.segment.realtime.appenderator.AppenderatorDriverTest.TestSegmentAllocator; +import io.druid.segment.realtime.appenderator.AppenderatorDriverTest.TestSegmentHandoffNotifierFactory; import io.druid.timeline.DataSegment; import org.hamcrest.CoreMatchers; import org.joda.time.DateTime; @@ -65,7 +65,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -public class FiniteAppenderatorDriverFailTest +public class AppenderatorDriverFailTest { private static final String DATA_SOURCE = "foo"; private static final ObjectMapper OBJECT_MAPPER = new DefaultObjectMapper(); @@ -91,7 +91,7 @@ public class FiniteAppenderatorDriverFailTest SegmentAllocator allocator; TestSegmentHandoffNotifierFactory segmentHandoffNotifierFactory; - FiniteAppenderatorDriver driver; + AppenderatorDriver driver; @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -117,7 +117,7 @@ public void testFailDuringPersist() throws IOException, InterruptedException, Ti { expectedException.expect(TimeoutException.class); - driver = new FiniteAppenderatorDriver( + driver = new AppenderatorDriver( createPersistFailAppenderator(), allocator, segmentHandoffNotifierFactory, @@ -139,7 +139,7 @@ public void testFailDuringPersist() throws IOException, InterruptedException, Ti } driver.publish( - FiniteAppenderatorDriverTest.makeOkPublisher(), + AppenderatorDriverTest.makeOkPublisher(), committerSupplier.get(), ImmutableList.of("dummy") ).get(PUBLISH_TIMEOUT, TimeUnit.MILLISECONDS); @@ -151,7 +151,7 @@ public void testInterruptDuringPush() throws IOException, InterruptedException, expectedException.expect(ExecutionException.class); expectedException.expectCause(CoreMatchers.instanceOf(InterruptedException.class)); - driver = new FiniteAppenderatorDriver( + driver = new AppenderatorDriver( createPushInterruptAppenderator(), allocator, segmentHandoffNotifierFactory, @@ -173,7 +173,7 @@ public void testInterruptDuringPush() throws IOException, InterruptedException, } driver.publish( - FiniteAppenderatorDriverTest.makeOkPublisher(), + AppenderatorDriverTest.makeOkPublisher(), committerSupplier.get(), ImmutableList.of("dummy") ).get(PUBLISH_TIMEOUT, TimeUnit.MILLISECONDS); @@ -184,7 +184,7 @@ public void testFailDuringPush() throws IOException, InterruptedException, Timeo { expectedException.expect(TimeoutException.class); - driver = new FiniteAppenderatorDriver( + driver = new AppenderatorDriver( createPushFailAppenderator(), allocator, segmentHandoffNotifierFactory, @@ -206,7 +206,7 @@ public void testFailDuringPush() throws IOException, InterruptedException, Timeo } driver.publish( - FiniteAppenderatorDriverTest.makeOkPublisher(), + AppenderatorDriverTest.makeOkPublisher(), committerSupplier.get(), ImmutableList.of("dummy") ).get(PUBLISH_TIMEOUT, TimeUnit.MILLISECONDS); @@ -221,7 +221,7 @@ public void testFailDuringDrop() throws IOException, InterruptedException, Timeo "Fail test while dropping segment[foo_2000-01-01T00:00:00.000Z_2000-01-01T01:00:00.000Z_abc123]" ); - driver = new FiniteAppenderatorDriver( + driver = new AppenderatorDriver( createDropFailAppenderator(), allocator, segmentHandoffNotifierFactory, @@ -243,7 +243,7 @@ public void testFailDuringDrop() throws IOException, InterruptedException, Timeo } final SegmentsAndMetadata published = driver.publish( - FiniteAppenderatorDriverTest.makeOkPublisher(), + AppenderatorDriverTest.makeOkPublisher(), committerSupplier.get(), ImmutableList.of("dummy") ).get(PUBLISH_TIMEOUT, TimeUnit.MILLISECONDS); diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/FiniteAppenderatorDriverTest.java b/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorDriverTest.java similarity index 99% rename from server/src/test/java/io/druid/segment/realtime/appenderator/FiniteAppenderatorDriverTest.java rename to server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorDriverTest.java index 9357a051d5d8..e0864804504c 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/FiniteAppenderatorDriverTest.java +++ b/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorDriverTest.java @@ -64,7 +64,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -public class FiniteAppenderatorDriverTest +public class AppenderatorDriverTest { private static final String DATA_SOURCE = "foo"; private static final String VERSION = "abc123"; @@ -95,7 +95,7 @@ public class FiniteAppenderatorDriverTest SegmentAllocator allocator; AppenderatorTester appenderatorTester; TestSegmentHandoffNotifierFactory segmentHandoffNotifierFactory; - FiniteAppenderatorDriver driver; + AppenderatorDriver driver; @Before public void setUp() @@ -103,7 +103,7 @@ public void setUp() appenderatorTester = new AppenderatorTester(MAX_ROWS_IN_MEMORY); allocator = new TestSegmentAllocator(DATA_SOURCE, Granularities.HOUR); segmentHandoffNotifierFactory = new TestSegmentHandoffNotifierFactory(); - driver = new FiniteAppenderatorDriver( + driver = new AppenderatorDriver( appenderatorTester.getAppenderator(), allocator, segmentHandoffNotifierFactory,