Merge branch '0.1.5-blur-64' into 0.1.5
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/ed6a0f0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ed6a0f0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ed6a0f0f Branch: refs/heads/0.1.5 Commit: ed6a0f0ff893b3c0b2829ec009de394ed45e92b5 Parents: 349e8aa bc1e033 Author: Aaron McCurry <[email protected]> Authored: Wed Apr 10 23:10:47 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Wed Apr 10 23:10:47 2013 -0400 ---------------------------------------------------------------------- .../org/apache/blur/analysis/BlurAnalyzer.java | 437 --------------- .../org/apache/blur/analysis/DoubleAnalyzer.java | 83 --- .../org/apache/blur/analysis/FloatAnalyzer.java | 86 --- .../org/apache/blur/analysis/IntegerAnalyzer.java | 101 ---- .../org/apache/blur/analysis/LongAnalyzer.java | 101 ---- .../blur/lucene/search/AbstractWrapperQuery.java | 76 --- .../org/apache/blur/lucene/search/FacetQuery.java | 200 ------- .../apache/blur/lucene/search/FairSimilarity.java | 61 -- .../apache/blur/lucene/search/IterablePaging.java | 227 -------- .../apache/blur/lucene/search/PagingCollector.java | 116 ---- .../blur/lucene/search/StopExecutionCollector.java | 67 --- .../org/apache/blur/lucene/search/SuperParser.java | 245 -------- .../org/apache/blur/lucene/search/SuperQuery.java | 276 --------- .../java/org/apache/blur/manager/IndexManager.java | 40 +- .../org/apache/blur/manager/QueryParserUtil.java | 11 +- .../java/org/apache/blur/server/TableContext.java | 5 +- .../java/org/apache/blur/thrift/TableAdmin.java | 5 + .../apache/blur/thrift/ThriftBlurShardServer.java | 3 +- .../java/org/apache/blur/thrift/ThriftServer.java | 4 + .../src/test/java/org/apache/blur/MiniCluster.java | 35 +- .../org/apache/blur/analysis/BlurAnalyzerTest.java | 133 ----- .../apache/blur/analysis/DoubleAnalyzerTest.java | 95 ---- .../apache/blur/analysis/FloatAnalyzerTest.java | 95 ---- .../apache/blur/analysis/IntegerAnalyzerTest.java | 106 ---- .../org/apache/blur/analysis/LongAnalyzerTest.java | 107 ---- .../apache/blur/lucene/search/FacetQueryTest.java | 105 ---- .../apache/blur/lucene/search/SuperParserTest.java | 236 -------- .../org/apache/blur/manager/IndexManagerTest.java | 102 ++++- .../apache/blur/search/RandomSuperQueryTest.java | 157 ------ .../org/apache/blur/search/SuperQueryTest.java | 204 ------- .../apache/blur/search/TestingPagingCollector.java | 84 --- .../org/apache/blur/analysis/BlurAnalyzer.java | 437 +++++++++++++++ .../org/apache/blur/analysis/DoubleAnalyzer.java | 83 +++ .../org/apache/blur/analysis/FloatAnalyzer.java | 86 +++ .../org/apache/blur/analysis/IntegerAnalyzer.java | 101 ++++ .../org/apache/blur/analysis/LongAnalyzer.java | 101 ++++ .../apache/blur/lucene/search/FairSimilarity.java | 61 ++ .../apache/blur/lucene/search/IterablePaging.java | 227 ++++++++ .../apache/blur/lucene/search/PagingCollector.java | 116 ++++ .../org/apache/blur/lucene/search/ScoreType.java | 22 - .../org/apache/blur/lucene/search/SuperParser.java | 251 ++++++++- .../org/apache/blur/lucene/search/SuperQuery.java | 1 + .../blur/lucene/serializer/ProtoSerializer.java | 2 +- .../blur/lucene/serializer/SuperQueryWritable.java | 2 +- .../java/org/apache/blur/util/BlurConstants.java | 28 + .../org/apache/blur/analysis/BlurAnalyzerTest.java | 133 +++++ .../apache/blur/analysis/DoubleAnalyzerTest.java | 95 ++++ .../apache/blur/analysis/FloatAnalyzerTest.java | 95 ++++ .../apache/blur/analysis/IntegerAnalyzerTest.java | 106 ++++ .../org/apache/blur/analysis/LongAnalyzerTest.java | 107 ++++ .../blur/lucene/search/RandomSuperQueryTest.java | 152 +++++ .../apache/blur/lucene/search/SuperParserTest.java | 213 +++++++- .../apache/blur/lucene/search/SuperQueryTest.java | 199 +++++++ .../blur/lucene/search/TestingPagingCollector.java | 84 +++ .../apache/blur/search/RandomSuperQueryTest.java | 2 +- .../org/apache/blur/search/SuperQueryTest.java | 2 +- .../apache/blur/search/TestingPagingCollector.java | 84 +++ 57 files changed, 2916 insertions(+), 3477 deletions(-) ----------------------------------------------------------------------
