Merge branch 'master' into blur-384-random-port-cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/1ff3e3c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/1ff3e3c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/1ff3e3c1 Branch: refs/heads/blur-384-random-port-cleanup Commit: 1ff3e3c1ceee7ecdcfc0d137b7223fae0b1994a9 Parents: 6da9be3 52645de Author: Chris Rohr <[email protected]> Authored: Sun Oct 26 13:54:42 2014 -0400 Committer: Chris Rohr <[email protected]> Committed: Sun Oct 26 13:54:42 2014 -0400 ---------------------------------------------------------------------- .../apache/blur/command/TableCopyCommand.java | 178 +++++++ .../org/apache/blur/command/TermsCommand.java | 17 +- .../blur/command/example/UsingTermCommand.java | 6 +- .../services/org.apache.blur.command.Commands | 3 +- .../apache/blur/command/DocFreqCommandTest.java | 4 - .../blur/command/IntegrationTestSuite.java | 4 +- .../blur/command/TermsCommandIntTests.java | 4 +- .../apache/blur/command/TermsCommandTest.java | 41 +- .../apache/blur/command/ArgumentOverlay.java | 8 +- .../apache/blur/command/BaseCommandManager.java | 109 ++-- .../org/apache/blur/command/BlurObject.java | 32 ++ .../apache/blur/command/BlurObjectSerDe.java | 210 ++++++++ .../org/apache/blur/command/CommandRunner.java | 43 +- .../blur/command/CommandStatusStateEnum.java | 21 + .../org/apache/blur/command/CommandUtil.java | 63 ++- .../blur/command/ControllerClusterContext.java | 7 +- .../org/apache/blur/command/ResponseFuture.java | 72 +++ .../blur/command/ShardCommandManager.java | 5 - .../clusterstatus/ZookeeperClusterStatus.java | 4 +- .../manager/indexserver/BlurIndexWarmup.java | 88 ---- .../indexserver/DefaultBlurIndexWarmup.java | 166 ------ .../indexserver/DistributedIndexServer.java | 48 +- .../manager/indexserver/LocalIndexServer.java | 4 +- .../blur/manager/indexserver/SafeMode.java | 2 +- .../apache/blur/manager/writer/BlurIndex.java | 3 +- .../blur/manager/writer/BlurIndexReadOnly.java | 2 +- .../manager/writer/BlurIndexReaderWarmer.java | 60 --- .../manager/writer/BlurIndexSimpleWriter.java | 12 +- .../org/apache/blur/server/TableContext.java | 26 +- .../blur/thrift/BlurControllerServer.java | 9 +- .../org/apache/blur/thrift/BlurShardServer.java | 28 +- .../blur/thrift/ThriftBlurShardServer.java | 20 +- .../ReconnectWhileCommandIsRunningIntTests.java | 39 ++ .../blur/command/ShardCommandManagerTest.java | 12 +- .../indexserver/DefaultBlurIndexWarmupTest.java | 162 ------ .../writer/BlurIndexSimpleWriterTest.java | 5 +- .../blur/manager/writer/IndexImporterTest.java | 2 +- .../org/apache/blur/command/test1/howto.txt | 1 + .../blur/mapreduce/lib/CsvBlurDriver.java | 10 +- .../blur/mapreduce/lib/CsvBlurDriverTest.java | 18 + .../mapreduce/lib/GenericBlurRecordWriter.java | 4 +- .../blur/lucene/search/IterablePaging.java | 6 +- .../blur/lucene/search/PrimeDocCache.java | 1 + .../shell/ExecutePlatformCommandCommand.java | 205 ++++++++ .../main/java/org/apache/blur/shell/Main.java | 5 +- .../apache/blur/lucene/warmup/IndexTracer.java | 141 ------ .../blur/lucene/warmup/IndexTracerResult.java | 218 -------- .../apache/blur/lucene/warmup/IndexWarmup.java | 502 ------------------- .../apache/blur/lucene/warmup/NotSupported.java | 28 -- .../blur/lucene/warmup/ThrottledIndexInput.java | 164 ------ .../blur/lucene/warmup/TraceableDirectory.java | 152 ------ .../blur/lucene/warmup/TraceableIndexInput.java | 93 ---- .../blur/store/BlockCacheDirectoryFactory.java | 3 +- .../store/BlockCacheDirectoryFactoryV1.java | 5 + .../store/BlockCacheDirectoryFactoryV2.java | 5 + .../blur/store/blockcache_v2/BaseCache.java | 11 +- .../store/blockcache_v2/CacheDirectory.java | 6 +- .../store/blockcache_v2/CacheIndexInput.java | 160 ++++-- .../store/blockcache_v2/CacheIndexOutput.java | 2 - .../blur/store/blockcache_v2/CacheValue.java | 34 +- .../store/blockcache_v2/EvictionException.java | 23 + .../cachevalue/BaseCacheValue.java | 40 +- .../cachevalue/ByteArrayCacheValue.java | 1 + .../cachevalue/DetachableCacheValue.java | 57 +-- .../cachevalue/UnsafeCacheValue.java | 23 +- .../blur/store/hdfs_v2/HdfsKeyValueStore.java | 7 + .../blur/lucene/warmup/IndexWarmupTest.java | 183 ------- .../blur/lucene/warmup/SlowAccessDirectory.java | 149 ------ .../blockcache_v2/CacheIndexInputTest.java | 6 +- .../cachevalue/ByteArrayCacheValueTest.java | 5 +- .../cachevalue/UnsafeCacheValueTest.java | 9 +- .../java/org/apache/blur/thrift/BlurClient.java | 104 +++- .../java/org/apache/blur/thrift/ClientPool.java | 150 +++--- .../java/org/apache/blur/thrift/Connection.java | 8 +- .../blur/thrift/util/ListControllers.java | 40 ++ .../org/apache/blur/utils/BlurConstants.java | 8 +- .../src/main/resources/blur-default.properties | 24 +- contrib/blur-hive/pom.xml | 170 +++++++ .../blur/hive/BlurHiveOutputCommitter.java | 71 +++ .../apache/blur/hive/BlurHiveOutputFormat.java | 77 +++ .../apache/blur/hive/BlurHiveParitioner.java | 69 +++ .../blur/hive/BlurHiveStorageHandler.java | 67 +++ .../blur/hive/BlurObjectInspectorGenerator.java | 144 ++++++ .../java/org/apache/blur/hive/BlurSerDe.java | 135 +++++ .../org/apache/blur/hive/BlurSerializer.java | 223 ++++++++ .../apache/blur/hive/NullHiveInputFormat.java | 74 +++ .../java/org/apache/blur/hive/CreateData.java | 51 ++ .../java/org/apache/blur/hive/RunHiveTest.java | 27 + contrib/blur-hive/src/test/java/test.hive | 89 ++++ 89 files changed, 2724 insertions(+), 2603 deletions(-) ----------------------------------------------------------------------
