Updated Branches: refs/heads/master e3c58aeb5 -> 9daa5dc27
Removing unused properties. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/7a3735ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/7a3735ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/7a3735ef Branch: refs/heads/master Commit: 7a3735ef038d9a4e61a4c684b8b03404a6052ded Parents: e3c58ae Author: Aaron McCurry <[email protected]> Authored: Thu Jun 13 21:30:43 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Thu Jun 13 21:30:43 2013 -0400 ---------------------------------------------------------------------- .../apache/blur/thrift/BlurControllerServer.java | 18 ------------------ .../blur/thrift/ThriftBlurControllerServer.java | 6 ------ .../java/org/apache/blur/utils/BlurConstants.java | 2 -- .../src/main/resources/blur-default.properties | 2 -- 4 files changed, 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a3735ef/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java index da0c6fd..ecdccc7 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java @@ -115,8 +115,6 @@ public class BlurControllerServer extends TableAdmin implements Iface { private BlurPartitioner _blurPartitioner = new BlurPartitioner(); private String _nodeName; private int _remoteFetchCount = 100; - private long _maxTimeToLive = TimeUnit.MINUTES.toMillis(1); - private int _maxQueryCacheElements = 128; private BlurQueryChecker _queryChecker; private AtomicBoolean _running = new AtomicBoolean(); @@ -842,22 +840,6 @@ public class BlurControllerServer extends TableAdmin implements Iface { _remoteFetchCount = remoteFetchCount; } - public long getMaxTimeToLive() { - return _maxTimeToLive; - } - - public void setMaxTimeToLive(long maxTimeToLive) { - _maxTimeToLive = maxTimeToLive; - } - - public int getMaxQueryCacheElements() { - return _maxQueryCacheElements; - } - - public void setMaxQueryCacheElements(int maxQueryCacheElements) { - _maxQueryCacheElements = maxQueryCacheElements; - } - public void setQueryChecker(BlurQueryChecker queryChecker) { _queryChecker = queryChecker; } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a3735ef/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java index f418156..5780d27 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java @@ -18,8 +18,6 @@ package org.apache.blur.thrift; */ import static org.apache.blur.utils.BlurConstants.BLUR_CONTROLLER_BIND_ADDRESS; import static org.apache.blur.utils.BlurConstants.BLUR_CONTROLLER_BIND_PORT; -import static org.apache.blur.utils.BlurConstants.BLUR_CONTROLLER_CACHE_MAX_QUERYCACHE_ELEMENTS; -import static org.apache.blur.utils.BlurConstants.BLUR_CONTROLLER_CACHE_MAX_TIMETOLIVE; import static org.apache.blur.utils.BlurConstants.BLUR_CONTROLLER_HOSTNAME; import static org.apache.blur.utils.BlurConstants.BLUR_CONTROLLER_REMOTE_FETCH_COUNT; import static org.apache.blur.utils.BlurConstants.BLUR_CONTROLLER_RETRY_DEFAULT_DELAY; @@ -39,8 +37,6 @@ import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_BIND_PORT; import static org.apache.blur.utils.BlurConstants.BLUR_ZOOKEEPER_CONNECTION; import static org.apache.blur.utils.BlurUtil.quietClose; -import java.util.concurrent.TimeUnit; - import org.apache.blur.BlurConfiguration; import org.apache.blur.concurrent.SimpleUncaughtExceptionHandler; import org.apache.blur.concurrent.ThreadWatcher; @@ -102,8 +98,6 @@ public class ThriftBlurControllerServer extends ThriftServer { controllerServer.setZookeeper(zooKeeper); controllerServer.setNodeName(nodeName); controllerServer.setRemoteFetchCount(configuration.getInt(BLUR_CONTROLLER_REMOTE_FETCH_COUNT, 100)); - controllerServer.setMaxQueryCacheElements(configuration.getInt(BLUR_CONTROLLER_CACHE_MAX_QUERYCACHE_ELEMENTS, 128)); - controllerServer.setMaxTimeToLive(configuration.getLong(BLUR_CONTROLLER_CACHE_MAX_TIMETOLIVE, TimeUnit.MINUTES.toMillis(1))); controllerServer.setQueryChecker(queryChecker); controllerServer.setThreadCount(configuration.getInt(BLUR_CONTROLLER_SERVER_REMOTE_THREAD_COUNT, 64)); controllerServer.setMaxFetchRetries(configuration.getInt(BLUR_CONTROLLER_RETRY_MAX_FETCH_RETRIES, 3)); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a3735ef/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java ---------------------------------------------------------------------- diff --git a/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java b/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java index 5b901d3..e929f83 100644 --- a/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java +++ b/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java @@ -69,8 +69,6 @@ public class BlurConstants { public static final String BLUR_CONTROLLER_SERVER_THRIFT_THREAD_COUNT = "blur.controller.server.thrift.thread.count"; public static final String BLUR_CONTROLLER_SERVER_REMOTE_THREAD_COUNT = "blur.controller.server.remote.thread.count"; - public static final String BLUR_CONTROLLER_CACHE_MAX_TIMETOLIVE = "blur.controller.cache.max.timetolive"; - public static final String BLUR_CONTROLLER_CACHE_MAX_QUERYCACHE_ELEMENTS = "blur.controller.cache.max.querycache.elements"; public static final String BLUR_CONTROLLER_REMOTE_FETCH_COUNT = "blur.controller.remote.fetch.count"; public static final String BLUR_CONTROLLER_RETRY_MAX_MUTATE_RETRIES = "blur.controller.retry.max.mutate.retries"; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a3735ef/blur-util/src/main/resources/blur-default.properties ---------------------------------------------------------------------- diff --git a/blur-util/src/main/resources/blur-default.properties b/blur-util/src/main/resources/blur-default.properties index 75f9be9..0412786 100644 --- a/blur-util/src/main/resources/blur-default.properties +++ b/blur-util/src/main/resources/blur-default.properties @@ -39,8 +39,6 @@ blur.controller.bind.port=40010 blur.controller.server.thrift.thread.count=32 blur.controller.server.remote.thread.count=64 blur.controller.remote.fetch.count=100 -blur.controller.cache.max.querycache.elements=128 -blur.controller.cache.max.timetolive=60000 blur.controller.retry.max.fetch.retries=3 blur.controller.retry.max.mutate.retries=3
