diff --git a/client/src/main/java/com/metamx/druid/BaseNode.java b/client/src/main/java/com/metamx/druid/BaseNode.java index 7e75ea38347..dc45cd6eef8 100644 --- a/client/src/main/java/com/metamx/druid/BaseNode.java +++ b/client/src/main/java/com/metamx/druid/BaseNode.java @@ -30,7 +30,7 @@ import com.metamx.common.lifecycle.LifecycleStart; import com.metamx.common.lifecycle.LifecycleStop; import com.metamx.common.logger.Logger; import com.metamx.druid.http.RequestLogger; -import com.metamx.druid.index.v1.serde.ComplexMetricRegistererer; +import com.metamx.druid.index.v1.serde.Registererer; import com.metamx.druid.initialization.Initialization; import com.metamx.druid.initialization.ServerConfig; import com.metamx.druid.initialization.ZkClientConfig; @@ -174,7 +174,7 @@ public abstract class BaseNode } @SuppressWarnings("unchecked") - public T registerComplexMetric(ComplexMetricRegistererer registererer) + public T registerHandler(Registererer registererer) { registererer.register(); return (T) this; diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java b/index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java index 75352a25137..719b2350bbf 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java @@ -36,12 +36,10 @@ import org.joda.time.Interval; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.nio.channels.FileChannel; import java.util.Map; /** diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricRegistererer.java b/index-common/src/main/java/com/metamx/druid/index/v1/serde/Registererer.java similarity index 88% rename from index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricRegistererer.java rename to index-common/src/main/java/com/metamx/druid/index/v1/serde/Registererer.java index c0dcade7ed9..f560dfdc1e6 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricRegistererer.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/serde/Registererer.java @@ -20,14 +20,14 @@ package com.metamx.druid.index.v1.serde; /** - * This is a "factory" interface for registering complex metrics in the system. It exists because I'm unaware of + * This is a "factory" interface for registering handlers in the system. It exists because I'm unaware of * another way to register the complex serdes in the MR jobs that run on Hadoop. As such, instances of this interface * must be instantiatable via a no argument default constructor (the MR jobs on Hadoop use reflection to instantiate * instances). * * The name is not a typo, I felt that it needed an extra "er" to make the pronunciation that much more difficult. */ -public interface ComplexMetricRegistererer +public interface Registererer { public void register(); } diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java index f907f2f5add..2b689c71706 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java @@ -41,6 +41,7 @@ import com.metamx.druid.http.GuiceServletConfig; import com.metamx.druid.http.RedirectFilter; import com.metamx.druid.http.RedirectInfo; import com.metamx.druid.http.StatusServlet; +import com.metamx.druid.index.v1.serde.Registererer; import com.metamx.druid.initialization.Initialization; import com.metamx.druid.initialization.ServerConfig; import com.metamx.druid.initialization.ServiceDiscoveryConfig; @@ -182,6 +183,12 @@ public class IndexerCoordinatorNode this.taskRunnerFactory = taskRunnerFactory; } + public IndexerCoordinatorNode registerHandler(Registererer registererer) + { + registererer.register(); + return this; + } + public void init() throws Exception { scheduledExecutorFactory = ScheduledExecutors.createFactory(lifecycle); diff --git a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java index 67e1e2e089f..210a55bcf5f 100644 --- a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java +++ b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java @@ -29,6 +29,7 @@ import com.metamx.common.lifecycle.LifecycleStart; import com.metamx.common.lifecycle.LifecycleStop; import com.metamx.common.logger.Logger; import com.metamx.druid.http.StatusServlet; +import com.metamx.druid.index.v1.serde.Registererer; import com.metamx.druid.initialization.CuratorConfig; import com.metamx.druid.initialization.Initialization; import com.metamx.druid.initialization.ServerConfig; @@ -147,6 +148,12 @@ public class WorkerNode return this; } + public WorkerNode registerHandler(Registererer registererer) + { + registererer.register(); + return this; + } + public void init() throws Exception { initializeEmitter();