Merge branch 'master' of git://github.com/nearinfinity/blur
Conflicts:
src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/87986f32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/87986f32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/87986f32
Branch: refs/heads/master
Commit: 87986f32ec1cb113ad021f743d42e11d524768d6
Parents: 71ab7cd 3f29c70
Author: gbarton <[email protected]>
Authored: Tue Aug 28 22:25:49 2012 -0400
Committer: gbarton <[email protected]>
Committed: Tue Aug 28 22:25:49 2012 -0400
----------------------------------------------------------------------
.../nearinfinity/blur/analysis/BlurAnalyzer.java | 30 ++-
.../nearinfinity/blur/analysis/FieldConverter.java | 9 +
.../blur/analysis/FieldConverterUtil.java | 66 ++++++
.../nearinfinity/blur/analysis/LongAnalyzer.java | 47 ++++
.../blur/manager/writer/TransactionRecorder.java | 2 +
.../blur/thrift/ThriftBlurShardServer.java | 19 +-
.../nearinfinity/blur/utils/RowIndexWriter.java | 2 +
.../java/com/nearinfinity/blur/MiniCluster.java | 1 -
.../blur/analysis/LongAnalyzerTest.java | 62 ++++++
.../blur/manager/IndexManagerTest.java | 86 ++++++--
.../com/nearinfinity/blur/demo/SampleProgram.java | 168 +++++++++++++++
.../blur/mapreduce/lib/BlurRecordWriter.java | 20 ++-
.../blur/store/blockcache/BlockCache.java | 64 +++---
.../blur/store/blockcache/BlockCacheLocation.java | 10 +-
.../blur/store/BenchmarkDirectory.java | 8 +-
.../blur/store/BenchmarkDirectoryNrt.java | 8 +-
.../blur/testsuite/LoadDataContinuously.java | 27 ++-
.../testsuite/RandomSearchTableContinuously.java | 7 +-
18 files changed, 537 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/87986f32/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
----------------------------------------------------------------------
diff --cc
src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
index d98606c,6b1d07f..ab2a489
---
a/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
+++
b/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java
@@@ -16,32 -16,6 +16,31 @@@
package com.nearinfinity.blur.thrift;
- import static com.nearinfinity.blur.utils.BlurConstants.*;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_CONTROLLER_BIND_PORT;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_GUI_CONTROLLER_PORT;
+import static com.nearinfinity.blur.utils.BlurConstants.BLUR_GUI_SHARD_PORT;
+import static com.nearinfinity.blur.utils.BlurConstants.BLUR_CLUSTER_NAME;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_INDEXMANAGER_SEARCH_THREAD_COUNT;
+import static com.nearinfinity.blur.utils.BlurConstants.BLUR_MAX_CLAUSE_COUNT;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_BIND_ADDRESS;
+import static com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_BIND_PORT;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_BLOCKCACHE_DIRECT_MEMORY_ALLOCATION;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_BLOCKCACHE_SLAB_COUNT;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_CACHE_MAX_QUERYCACHE_ELEMENTS;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_CACHE_MAX_TIMETOLIVE;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_DATA_FETCH_THREAD_COUNT;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_FILTER_CACHE_CLASS;
+import static com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_HOSTNAME;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_INDEX_WARMUP_CLASS;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_OPENER_THREAD_COUNT;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_SAFEMODEDELAY;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_SERVER_THRIFT_THREAD_COUNT;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_TIME_BETWEEN_COMMITS;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_TIME_BETWEEN_REFRESHS;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_ZOOKEEPER_CONNECTION;
+import static
com.nearinfinity.blur.utils.BlurConstants.BLUR_ZOOKEEPER_SYSTEM_TIME_TOLERANCE;
+import static com.nearinfinity.blur.utils.BlurUtil.quietClose;
+
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration;
