Merge branch 'master' into 0.2.0-newtypesystem
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/91c5f1d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/91c5f1d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/91c5f1d9 Branch: refs/heads/0.2.0-newtypesystem Commit: 91c5f1d9e9d3326c82ef3e2809a2f52e069a28e4 Parents: a7a296b 9b5e1f5 Author: Aaron McCurry <[email protected]> Authored: Mon Jul 1 20:23:39 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Mon Jul 1 20:23:39 2013 -0400 ---------------------------------------------------------------------- .../org/apache/blur/manager/IndexManager.java | 79 +++++-- .../manager/results/BlurResultIterable.java | 4 +- .../results/BlurResultIterableClient.java | 22 +- .../results/BlurResultIterableMultiple.java | 27 ++- .../results/BlurResultIterableSearcher.java | 42 ++-- .../results/BlurResultIterableSimple.java | 8 +- .../BlurResultPeekableIteratorComparator.java | 6 +- .../results/MergerBlurResultIterable.java | 3 +- .../blur/manager/results/PeekableIterator.java | 52 ++--- .../apache/blur/manager/status/QueryStatus.java | 44 ++-- .../blur/manager/status/QueryStatusManager.java | 19 ++ .../blur/thrift/BlurControllerServer.java | 19 +- .../org/apache/blur/thrift/BlurShardServer.java | 4 +- .../java/org/apache/blur/thrift/TableAdmin.java | 24 +-- .../blur/thrift/ThriftBlurShardServer.java | 3 + .../utils/BlurExecutorCompletionService.java | 6 +- .../java/org/apache/blur/utils/BlurUtil.java | 26 ++- .../java/org/apache/blur/utils/Converter.java | 4 +- .../java/org/apache/blur/utils/GCWatcher.java | 26 ++- .../apache/blur/utils/IterableConverter.java | 37 ++-- .../apache/blur/utils/IteratorConverter.java | 23 +-- .../apache/blur/manager/IndexManagerTest.java | 41 +++- ...lurResultPeekableIteratorComparatorTest.java | 27 ++- .../results/MultipleBlurResultIterableTest.java | 8 +- .../manager/results/PeekableIteratorTest.java | 9 +- .../org/apache/blur/thrift/BlurClusterTest.java | 122 +++++++++++ .../org/apache/blur/mapreduce/BlurReducer.java | 32 ++- .../blur/lucene/search/IterablePaging.java | 56 +++-- .../blur/lucene/search/SlowCollector.java | 60 ++++++ .../lucene/search/StopExecutionCollector.java | 4 +- .../apache/blur/lucene/search/SuperQuery.java | 2 +- .../blur/lucene/serializer/ProtoSerializer.java | 2 +- .../lucene/serializer/SuperQueryWritable.java | 2 +- .../blur/lucene/search/FacetQueryTest.java | 3 +- .../lucene/search/RandomSuperQueryTest.java | 1 - .../blur/lucene/search/SuperQueryTest.java | 2 - .../lucene/search/TestingPagingCollector.java | 13 +- .../blur/search/RandomSuperQueryTest.java | 152 -------------- .../org/apache/blur/search/SuperQueryTest.java | 205 ------------------- .../blur/search/TestingPagingCollector.java | 84 -------- .../org/apache/blur/index/ExitableReader.java | 2 +- .../java/org/apache/blur/thrift/BException.java | 3 +- .../blur/thrift/generated/BlurException.java | 124 ++++++++++- .../apache/blur/thrift/generated/ErrorType.java | 70 +++++++ .../blur/thrift/generated/QueryState.java | 5 +- .../org/apache/blur/utils/BlurIterable.java | 7 + .../org/apache/blur/utils/BlurIterator.java | 26 +++ .../src/main/scripts/interface/Blur.thrift | 14 +- .../main/scripts/interface/gen-html/Blur.html | 10 + .../main/scripts/interface/gen-html/index.html | 1 + .../blur/thrift/generated/BlurException.java | 124 ++++++++++- .../apache/blur/thrift/generated/ErrorType.java | 70 +++++++ .../blur/thrift/generated/QueryState.java | 5 +- .../main/scripts/interface/gen-js/Blur_types.js | 25 ++- .../scripts/interface/gen-perl/Blur/Types.pm | 23 ++- .../main/scripts/interface/gen-rb/blur_types.rb | 21 +- 56 files changed, 1115 insertions(+), 718 deletions(-) ----------------------------------------------------------------------
