mirror of https://github.com/apache/druid.git
Merge branch 'local-index' into fix-examples
This commit is contained in:
commit
216bed9c36
|
@ -20,7 +20,7 @@
|
|||
package io.druid.indexing.common.index;
|
||||
|
||||
/**
|
||||
* Objects that can be registered with a {@link EventReceivingChatHandlerProvider} and provide http endpoints for indexing-related
|
||||
* Objects that can be registered with a {@link ServiceAnnouncingChatHandlerProvider} and provide http endpoints for indexing-related
|
||||
* objects. This interface is empty because it only exists to signal intent. The actual http endpoints are provided
|
||||
* through JAX-RS annotations on the {@link ChatHandler} objects.
|
||||
*/
|
||||
|
|
|
@ -25,8 +25,6 @@ import com.google.common.base.Optional;
|
|||
*/
|
||||
public interface ChatHandlerProvider
|
||||
{
|
||||
public String getType();
|
||||
|
||||
public void register(final String key, ChatHandler handler);
|
||||
|
||||
public void unregister(final String key);
|
||||
|
|
|
@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit;
|
|||
|
||||
/**
|
||||
* Builds firehoses that accept events through the {@link EventReceiver} interface. Can also register these
|
||||
* firehoses with an {@link EventReceivingChatHandlerProvider}.
|
||||
* firehoses with an {@link ServiceAnnouncingChatHandlerProvider}.
|
||||
*/
|
||||
@JsonTypeName("receiver")
|
||||
public class EventReceiverFirehoseFactory implements FirehoseFactory
|
||||
|
@ -84,8 +84,9 @@ public class EventReceiverFirehoseFactory implements FirehoseFactory
|
|||
final EventReceiverFirehose firehose = new EventReceiverFirehose();
|
||||
|
||||
if (chatHandlerProvider.isPresent()) {
|
||||
log.info("Found chathandler with type[%s]", chatHandlerProvider.get().getType());
|
||||
log.info("Found chathandler of class[%s]", chatHandlerProvider.get().getClass().getName());
|
||||
chatHandlerProvider.get().register(serviceName, firehose);
|
||||
chatHandlerProvider.get().register(serviceName.replaceAll(".*:", ""), firehose); // rolf
|
||||
} else {
|
||||
log.info("No chathandler detected");
|
||||
}
|
||||
|
|
|
@ -25,12 +25,6 @@ import com.google.common.base.Optional;
|
|||
*/
|
||||
public class NoopChatHandlerProvider implements ChatHandlerProvider
|
||||
{
|
||||
@Override
|
||||
public String getType()
|
||||
{
|
||||
return "noop";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void register(String key, ChatHandler handler)
|
||||
{
|
||||
|
|
|
@ -35,16 +35,16 @@ import java.util.concurrent.ConcurrentMap;
|
|||
* allows anyone with a reference to this object to obtain a particular {@link ChatHandler}. An embedded
|
||||
* {@link ServiceAnnouncer} will be used to advertise handlers on this host.
|
||||
*/
|
||||
public class EventReceivingChatHandlerProvider implements ChatHandlerProvider
|
||||
public class ServiceAnnouncingChatHandlerProvider implements ChatHandlerProvider
|
||||
{
|
||||
private static final Logger log = new Logger(EventReceivingChatHandlerProvider.class);
|
||||
private static final Logger log = new Logger(ServiceAnnouncingChatHandlerProvider.class);
|
||||
|
||||
private final DruidNode node;
|
||||
private final ServiceAnnouncer serviceAnnouncer;
|
||||
private final ConcurrentMap<String, ChatHandler> handlers;
|
||||
|
||||
@Inject
|
||||
public EventReceivingChatHandlerProvider(
|
||||
public ServiceAnnouncingChatHandlerProvider(
|
||||
@Self DruidNode node,
|
||||
ServiceAnnouncer serviceAnnouncer
|
||||
)
|
|
@ -45,8 +45,9 @@ import io.druid.indexing.common.actions.RemoteTaskActionClientFactory;
|
|||
import io.druid.indexing.common.actions.TaskActionClientFactory;
|
||||
import io.druid.indexing.common.config.TaskConfig;
|
||||
import io.druid.indexing.common.index.ChatHandlerProvider;
|
||||
import io.druid.indexing.common.index.EventReceivingChatHandlerProvider;
|
||||
import io.druid.indexing.common.index.ServiceAnnouncingChatHandlerProvider;
|
||||
import io.druid.indexing.common.index.NoopChatHandlerProvider;
|
||||
import io.druid.indexing.common.index.ServiceAnnouncingChatHandlerProvider;
|
||||
import io.druid.indexing.coordinator.TaskRunner;
|
||||
import io.druid.indexing.coordinator.ThreadPoolTaskRunner;
|
||||
import io.druid.indexing.worker.executor.ChatHandlerResource;
|
||||
|
@ -104,8 +105,8 @@ public class CliPeon extends GuiceRunnable
|
|||
final MapBinder<String, ChatHandlerProvider> handlerProviderBinder = PolyBind.optionBinder(
|
||||
binder, Key.get(ChatHandlerProvider.class)
|
||||
);
|
||||
handlerProviderBinder.addBinding("receiver")
|
||||
.to(EventReceivingChatHandlerProvider.class).in(LazySingleton.class);
|
||||
handlerProviderBinder.addBinding("announce")
|
||||
.to(ServiceAnnouncingChatHandlerProvider.class).in(LazySingleton.class);
|
||||
handlerProviderBinder.addBinding("noop")
|
||||
.to(NoopChatHandlerProvider.class).in(LazySingleton.class);
|
||||
|
||||
|
|
Loading…
Reference in New Issue