Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-blur
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/448ff877 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/448ff877 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/448ff877 Branch: refs/heads/0.3.0-lucene-upgrade Commit: 448ff877c266bf603735083ed59434ba4d063a64 Parents: 15320a4 609763b Author: Rahul Challapalli <[email protected]> Authored: Sat Oct 26 23:30:44 2013 -0700 Committer: Rahul Challapalli <[email protected]> Committed: Sat Oct 26 23:30:44 2013 -0700 ---------------------------------------------------------------------- .../apache/blur/manager/BlurFilterCache.java | 32 +++++- .../blur/manager/DefaultBlurFilterCache.java | 5 + .../org/apache/blur/manager/IndexManager.java | 100 ++++++++----------- .../blur/thrift/ThriftBlurShardServer.java | 23 +++-- .../apache/blur/manager/IndexManagerTest.java | 19 ++-- .../apache/blur/analysis/BaseFieldManager.java | 27 ++++- .../org/apache/blur/analysis/FieldManager.java | 2 + .../blur/lucene/search/BlurQueryParser.java | 82 +++++++-------- .../blur/analysis/BaseFieldManagerTest.java | 51 +++++++++- .../blur/lucene/search/SuperParserTest.java | 8 ++ .../org/apache/blur/utils/BlurConstants.java | 1 + 11 files changed, 222 insertions(+), 128 deletions(-) ----------------------------------------------------------------------
