Merge branch 'apache-blur-0.2' of https://git-wip-us.apache.org/repos/asf/incubator-blur into apache-blur-0.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/88a9ace9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/88a9ace9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/88a9ace9 Branch: refs/heads/apache-blur-0.2 Commit: 88a9ace9712f8c2ab2122c458aa7ba601dfc6a17 Parents: 275106d 911fee9 Author: Chris Rohr <[email protected]> Authored: Tue Dec 10 19:41:24 2013 -0500 Committer: Chris Rohr <[email protected]> Committed: Tue Dec 10 19:41:24 2013 -0500 ---------------------------------------------------------------------- .../org/apache/blur/manager/IndexManager.java | 67 +++-- .../indexserver/DistributedIndexServer.java | 4 +- .../indexserver/DistributedLayoutFactory.java | 2 +- .../indexserver/LayoutMissingException.java | 21 ++ .../MasterBasedDistributedLayoutFactory.java | 14 +- .../results/BlurResultIterableSearcher.java | 8 +- .../blur/manager/writer/BlurIndexReader.java | 4 +- .../blur/manager/writer/BlurNRTIndex.java | 4 +- .../blur/thrift/BlurControllerServer.java | 16 +- .../org/apache/blur/thrift/BlurShardServer.java | 5 + .../java/org/apache/blur/thrift/TableAdmin.java | 2 +- .../java/org/apache/blur/utils/BlurUtil.java | 246 ++++++++++++++----- .../blur/utils/TableShardCountCollapser.java | 3 +- .../lucene/index/BaseCompositeReaderUtil.java | 35 +++ .../apache/blur/manager/IndexManagerTest.java | 18 +- ...MasterBasedDistributedLayoutFactoryTest.java | 12 +- .../org/apache/blur/utils/BlurUtilsTest.java | 132 +++++----- .../org/apache/blur/mapreduce/BlurReducer.java | 11 +- .../blur/mapreduce/lib/BlurOutputFormat.java | 3 +- .../mapreduce/lib/ProgressableDirectory.java | 4 +- .../org/apache/blur/filter/FilterCacheTest.java | 8 +- .../org/apache/blur/index/ExitableReader.java | 4 + .../apache/blur/lucene/codec/Blur021Codec.java | 1 - .../apache/blur/lucene/codec/Blur022Codec.java | 156 ++++++++++++ .../lucene/codec/Blur022SegmentInfoFormat.java | 50 ++++ .../lucene/codec/Blur022SegmentInfoReader.java | 76 ++++++ .../lucene/codec/Blur022SegmentInfoWriter.java | 80 ++++++ .../lucene/codec/Blur022StoredFieldsFormat.java | 107 ++++++++ .../blur/lucene/codec/CachedDecompressor.java | 72 ++++++ .../org/apache/blur/lucene/codec/Testing.java | 37 --- .../refcounter/DirectoryReferenceCounter.java | 6 +- .../blur/lucene/warmup/ThrottledIndexInput.java | 224 +++++++++-------- .../blur/lucene/warmup/TraceableIndexInput.java | 2 +- .../blur/store/blockcache/BlockDirectory.java | 2 +- .../store/blockcache_v2/CacheIndexInput.java | 2 +- .../apache/blur/store/hdfs/HdfsIndexInput.java | 5 +- .../services/org.apache.lucene.codecs.Codec | 3 +- .../blur/lucene/codec/Blur022CodecTest.java | 202 +++++++++++++++ .../org/apache/blur/utils/BlurConstants.java | 7 +- .../src/main/resources/blur-default.properties | 6 + docs/cluster-setup.html | 4 +- docs/using-blur.html | 12 + 42 files changed, 1327 insertions(+), 350 deletions(-) ----------------------------------------------------------------------
