Merge branch 'lucene_3_6_1'
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/b0ef5264 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/b0ef5264 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/b0ef5264 Branch: refs/heads/master Commit: b0ef5264d860f925a4e823d35a4836c5f732c7c1 Parents: 9cd32ca 5223449 Author: Aaron McCurry <[email protected]> Authored: Wed Aug 22 08:03:09 2012 -0400 Committer: Aaron McCurry <[email protected]> Committed: Wed Aug 22 08:03:09 2012 -0400 ---------------------------------------------------------------------- .../nearinfinity/blur/manager/IndexManager.java | 103 ++++- .../clusterstatus/ZookeeperClusterStatus.java | 47 +- .../indexserver/DefaultBlurIndexWarmup.java | 12 +- .../indexserver/DistributedIndexServer.java | 20 +- .../blur/manager/indexserver/LocalIndexServer.java | 7 +- .../blur/manager/writer/AbstractBlurIndex.java | 10 +- .../blur/manager/writer/BlurIndexReader.java | 6 +- .../blur/manager/writer/BlurNRTIndex.java | 132 ++--- .../manager/writer/DirectoryReferenceCounter.java | 1 + .../blur/manager/writer/TransactionRecorder.java | 10 +- .../manager/writer/lucene/SnapshotIndexReader.java | 12 +- .../writer/lucene/SoftDeleteIndexReader.java | 12 +- .../blur/manager/writer/nrt/NRTManager.java | 410 --------------- .../blur/manager/writer/nrt/SearcherManager.java | 261 --------- .../blur/thrift/BlurControllerServer.java | 2 +- .../nearinfinity/blur/thrift/BlurShardServer.java | 9 +- .../com/nearinfinity/blur/utils/PrimeDocCache.java | 6 +- .../java/com/nearinfinity/blur/MiniCluster.java | 23 +- .../blur/manager/IndexManagerTest.java | 10 +- .../blur/manager/writer/BlurNRTIndexTest.java | 20 +- .../blur/search/RandomSuperQueryTest.java | 3 +- .../nearinfinity/blur/search/SuperQueryTest.java | 11 +- .../nearinfinity/blur/thrift/BlurClusterTest.java | 76 +++ .../nearinfinity/blur/mapreduce/BlurReducer.java | 12 +- .../blur/mapreduce/BufferedDirectory.java | 1 + .../blur/mapreduce/ProgressableDirectory.java | 1 + src/blur-store/pom.xml | 2 +- .../nearinfinity/blur/index/DirectIODirectory.java | 79 --- .../nearinfinity/blur/lucene/EscapeRewrite.java | 201 +++----- .../blur/store/blockcache/BlockDirectory.java | 22 +- .../compressed/CompressedFieldDataDirectory.java | 22 +- .../blur/store/hdfs/HdfsDirectory.java | 68 +--- .../blur/store/hdfs/HdfsFileReader.java | 9 +- .../apache/lucene/index/WarmUpByFieldBounds.java | 13 +- .../blur/store/BenchmarkDirectory.java | 16 +- .../blur/store/BenchmarkDirectoryNrt.java | 23 +- .../blur/store/blockcache/BlockDirectoryTest.java | 5 +- .../CompressedFieldDataDirectoryTest.java | 13 +- .../blur/thrift/BlurClientManager.java | 1 + .../apache/lucene/lucene-core/3.5.0.lm/lm.patch | 165 ------ .../lucene-core/3.5.0.lm/lucene-core-3.5.0.lm.jar | Bin 1466283 -> 0 bytes .../lucene-core/3.6.1.lm/lucene-core-3.6.1.lm.jar | Bin 0 -> 1538596 bytes .../lucene-core/3.6.1.lm/lucene_3.6.1.lm.patch | 367 +++++++++++++ 43 files changed, 859 insertions(+), 1364 deletions(-) ----------------------------------------------------------------------
