mirror of https://github.com/apache/druid.git
require default predicate in ServerInventoryViews
This commit is contained in:
parent
f32aee7804
commit
ea7eaba735
|
@ -21,6 +21,7 @@ package io.druid.client;
|
|||
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.google.api.client.repackaged.com.google.common.base.Preconditions;
|
||||
import com.google.common.base.Predicate;
|
||||
import com.google.common.base.Predicates;
|
||||
import com.google.common.collect.MapMaker;
|
||||
|
@ -66,11 +67,8 @@ public class BatchServerInventoryView extends ServerInventoryView<Set<DataSegmen
|
|||
new TypeReference<Set<DataSegment>>(){}
|
||||
);
|
||||
|
||||
if(defaultFilter != null) {
|
||||
this.defaultFilter = defaultFilter;
|
||||
} else {
|
||||
this.defaultFilter = Predicates.alwaysTrue();
|
||||
}
|
||||
Preconditions.checkNotNull(defaultFilter);
|
||||
this.defaultFilter = defaultFilter;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -21,7 +21,9 @@ package io.druid.client;
|
|||
|
||||
import com.fasterxml.jackson.annotation.JacksonInject;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.google.common.base.Predicates;
|
||||
import io.druid.server.initialization.ZkPathsConfig;
|
||||
import io.druid.timeline.DataSegment;
|
||||
import org.apache.curator.framework.CuratorFramework;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
@ -45,6 +47,6 @@ public class BatchServerInventoryViewProvider implements ServerInventoryViewProv
|
|||
@Override
|
||||
public BatchServerInventoryView get()
|
||||
{
|
||||
return new BatchServerInventoryView(zkPaths, curator, jsonMapper, null);
|
||||
return new BatchServerInventoryView(zkPaths, curator, jsonMapper, Predicates.<DataSegment>alwaysTrue());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -21,7 +21,9 @@ package io.druid.client;
|
|||
|
||||
import com.fasterxml.jackson.annotation.JacksonInject;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.google.common.base.Predicates;
|
||||
import io.druid.server.initialization.ZkPathsConfig;
|
||||
import io.druid.timeline.DataSegment;
|
||||
import org.apache.curator.framework.CuratorFramework;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
@ -45,6 +47,6 @@ public class SingleServerInventoryProvider implements ServerInventoryViewProvide
|
|||
@Override
|
||||
public ServerInventoryView get()
|
||||
{
|
||||
return new SingleServerInventoryView(zkPaths, curator, jsonMapper, null);
|
||||
return new SingleServerInventoryView(zkPaths, curator, jsonMapper, Predicates.<DataSegment>alwaysTrue());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -21,10 +21,10 @@ package io.druid.client;
|
|||
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.google.api.client.repackaged.com.google.common.base.Preconditions;
|
||||
import com.google.common.base.Predicate;
|
||||
import com.google.common.base.Predicates;
|
||||
import com.google.common.collect.MapMaker;
|
||||
import com.google.common.collect.Sets;
|
||||
import com.google.inject.Inject;
|
||||
import com.metamx.emitter.EmittingLogger;
|
||||
import io.druid.guice.ManageLifecycle;
|
||||
|
@ -33,8 +33,6 @@ import io.druid.server.initialization.ZkPathsConfig;
|
|||
import io.druid.timeline.DataSegment;
|
||||
import org.apache.curator.framework.CuratorFramework;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
import java.util.concurrent.Executor;
|
||||
|
||||
|
@ -65,11 +63,9 @@ public class SingleServerInventoryView extends ServerInventoryView<DataSegment>
|
|||
new TypeReference<DataSegment>(){}
|
||||
);
|
||||
|
||||
if(defaultFilter != null) {
|
||||
this.defaultFilter = defaultFilter;
|
||||
} else {
|
||||
this.defaultFilter = Predicates.alwaysTrue();
|
||||
} }
|
||||
Preconditions.checkNotNull(defaultFilter);
|
||||
this.defaultFilter = defaultFilter;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected DruidServer addInnerInventory(
|
||||
|
|
|
@ -146,7 +146,7 @@ public class BatchServerInventoryViewTest
|
|||
},
|
||||
cf,
|
||||
jsonMapper,
|
||||
null
|
||||
Predicates.<DataSegment>alwaysTrue()
|
||||
);
|
||||
|
||||
batchServerInventoryView.start();
|
||||
|
|
Loading…
Reference in New Issue