Merge branch 'apache-blur-0.2' into blur-289
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/3e470036 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/3e470036 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/3e470036 Branch: refs/heads/apache-blur-0.2 Commit: 3e470036b654575a220ef62902d7f002f5416e3f Parents: 09fb701 4e35bdd Author: Rahul Challapalli <[email protected]> Authored: Tue Oct 29 23:24:40 2013 -0700 Committer: Rahul Challapalli <[email protected]> Committed: Tue Oct 29 23:24:40 2013 -0700 ---------------------------------------------------------------------- .../apache/blur/manager/BlurFilterCache.java | 12 +- .../blur/manager/DefaultBlurFilterCache.java | 163 ++++++++++++++++++- .../apache/blur/manager/QueryParserUtil.java | 29 +++- .../blur/thrift/ThriftBlurShardServer.java | 8 +- .../manager/DefaultBlurFilterCacheTest.java | 123 ++++++++++++++ .../org/apache/blur/filter/FilterCache.java | 4 + .../org/apache/blur/utils/BlurConstants.java | 2 + 7 files changed, 325 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
