Updated Branches: refs/heads/0.2-dev 3540bd29e -> 1c0508084
Merge branch '0.2-dev' of https://git-wip-us.apache.org/repos/asf/incubator-blur into 0.2-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/1c050808 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/1c050808 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/1c050808 Branch: refs/heads/0.2-dev Commit: 1c05080846f1adece520f2f977b32af892231eda Parents: a545ae7 3540bd2 Author: twilliams <[email protected]> Authored: Sat Feb 2 21:02:47 2013 -0500 Committer: twilliams <[email protected]> Committed: Sat Feb 2 21:02:47 2013 -0500 ---------------------------------------------------------------------- .../org/apache/blur/analysis/FieldManager.java | 76 ++++++-------- .../blur/analysis/IndexableFieldFactory.java | 17 +++- .../apache/blur/lucene/search/QueryConverter.java | 16 +++ .../blur/lucene/search/QueryConverterImpl.java | 16 +++ .../org/apache/blur/lucene/search/ScoreType.java | 16 +++ .../manager/clusterstatus/BaseClusterStatus.java | 25 ++++- .../clusterstatus/SimpleZKClusterStatus.java | 16 +++ .../org/apache/blur/manager/stats/LoadFactor.java | 1 - .../blur/manager/stats/MergerTableStats.java | 7 +- .../org/apache/blur/manager/writer/BlurIndex.java | 8 ++ .../java/org/apache/blur/server/Configurable.java | 31 +++--- .../java/org/apache/blur/server/Configured.java | 16 +++ .../apache/blur/server/QueryStatusContainer.java | 16 +++ .../java/org/apache/blur/server/ShardContext.java | 16 +++ .../java/org/apache/blur/server/TableLayout.java | 18 +++- .../apache/blur/thrift/AbstractThriftServer.java | 8 +- .../java/org/apache/blur/utils/BlurConstants.java | 3 +- .../blur/utils/BlurExecutorCompletionService.java | 1 - .../org/apache/blur/utils/BlurValidations.java | 6 +- .../main/java/org/apache/blur/utils/ForkJoin.java | 1 - .../java/org/apache/blur/utils/PrimeDocCache.java | 11 +- .../utils/ResetableDocumentStoredFieldVisitor.java | 31 +++--- .../org/apache/blur/utils/RowDocumentUtil.java | 1 - .../apache/blur/utils/ThriftLuceneConversion.java | 16 +++ 24 files changed, 268 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1c050808/src/blur-core/src/main/java/org/apache/blur/thrift/AbstractThriftServer.java ----------------------------------------------------------------------
