incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [50/50] [abbrv] git commit: Merge branch 'master' into blur-console-v2
Date Wed, 13 Nov 2013 03:31:09 GMT
Merge branch 'master' into blur-console-v2


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/ac584ad1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ac584ad1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ac584ad1

Branch: refs/heads/blur-console-v2
Commit: ac584ad1c33a52d0d73892afa6ac686e9c8f13e7
Parents: e53983c f8f7aef
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Tue Nov 12 22:30:03 2013 -0500
Committer: Chris Rohr <crohr@nearinfinity.com>
Committed: Tue Nov 12 22:30:03 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   72 +
 .../blur/manager/AliasBlurFilterCache.java      |  213 ++
 .../apache/blur/manager/BlurFilterCache.java    |   44 +-
 .../blur/manager/DefaultBlurFilterCache.java    |   29 +-
 .../org/apache/blur/manager/IndexManager.java   |  126 +-
 .../apache/blur/manager/QueryParserUtil.java    |   29 +-
 .../clusterstatus/ZookeeperClusterStatus.java   |  117 +-
 .../indexserver/DistributedIndexServer.java     |    8 +-
 .../MasterBasedDistributedLayoutFactory.java    |   11 +-
 .../blur/manager/results/LazyBlurResult.java    |    4 +
 .../apache/blur/manager/status/QueryStatus.java |    2 +-
 .../blur/manager/writer/BlurIndexReadOnly.java  |   74 +
 .../blur/manager/writer/BlurNRTIndex.java       |    1 +
 .../manager/writer/TransactionRecorder.java     |   41 -
 .../apache/blur/server/BlurServerContext.java   |   62 +
 .../blur/server/ControllerServerContext.java    |   22 +-
 .../apache/blur/server/FilteredBlurServer.java  |  200 ++
 .../apache/blur/server/ShardServerContext.java  |   20 +-
 .../server/example/DisableTableAdminServer.java |   95 +
 .../blur/thrift/BlurControllerServer.java       |  141 +-
 .../org/apache/blur/thrift/BlurShardServer.java |   30 +-
 .../blur/thrift/ThriftBlurControllerServer.java |    4 +-
 .../blur/thrift/ThriftBlurShardServer.java      |   53 +-
 .../java/org/apache/blur/utils/BlurUtil.java    |   42 +-
 .../test/java/org/apache/blur/MiniCluster.java  |    2 +-
 .../blur/manager/AliasBlurFilterCacheTest.java  |  123 +
 .../apache/blur/manager/IndexManagerTest.java   |   56 +-
 .../ZookeeperClusterStatusTest.java             |   14 +-
 .../blur/manager/writer/IndexImporterTest.java  |   35 +-
 .../org/apache/blur/thrift/BlurClusterTest.java |   46 +-
 .../utils/TableShardCountCollapserTest.java     |    3 +-
 blur-core/src/test/resources/log4j.xml          |    2 +-
 .../mapreduce/lib/BlurOutputFormatTest.java     |    4 +-
 .../apache/blur/analysis/BaseFieldManager.java  |   37 +-
 .../org/apache/blur/analysis/FieldManager.java  |   12 +
 .../blur/analysis/FieldTypeDefinition.java      |    2 +
 .../type/CustomFieldTypeDefinition.java         |   11 +
 .../type/FieldLessFieldTypeDefinition.java      |    5 +
 .../type/NumericFieldTypeDefinition.java        |    7 +-
 .../type/StoredFieldTypeDefinition.java         |    5 +
 .../type/StringFieldTypeDefinition.java         |   11 +-
 .../analysis/type/TextFieldTypeDefinition.java  |   50 +-
 .../org/apache/blur/filter/FilterCache.java     |    4 +
 .../org/apache/blur/filter/IndexFileBitSet.java |   21 +-
 .../blur/lucene/search/BlurQueryParser.java     |   92 +-
 .../blur/analysis/BaseFieldManagerTest.java     |   51 +-
 .../blur/lucene/search/SuperParserTest.java     |    8 +
 .../blur/shell/AddColumnDefinitionCommand.java  |    6 +-
 .../main/java/org/apache/blur/shell/Main.java   |   74 +-
 .../apache/blur/shell/SchemaTableCommand.java   |   22 +-
 .../blur/store/blockcache/BlockDirectory.java   |    7 +-
 .../store/blockcache_v2/CacheIndexInput.java    |    7 +-
 .../store/blockcache_v2/CacheIndexOutput.java   |    7 +-
 .../apache/blur/store/buffer/BufferStore.java   |  138 +-
 .../store/buffer/ReusedBufferedIndexInput.java  |    7 +-
 .../store/buffer/ReusedBufferedIndexOutput.java |    7 +-
 .../org/apache/blur/store/buffer/Store.java     |   25 +
 .../blur/store/BaseDirectoryTestSuite.java      |    4 +-
 .../blur/store/CacheDirectoryTestSuite.java     |    3 +-
 .../store/blockcache/BlockDirectoryTest.java    |    3 +-
 .../store/blockcache_v2/CacheDirectoryTest.java |    3 +-
 .../blockcache_v2/CacheIndexInputTest.java      |    5 +-
 .../blockcache_v2/CacheIndexOutputTest.java     |    3 +-
 .../java/org/apache/blur/thrift/BlurClient.java |   75 +-
 .../org/apache/blur/thrift/generated/Blur.java  | 2864 ++++++++++++++----
 .../org/apache/blur/thrift/generated/User.java  |  596 ++++
 .../blur/thrift/util/SimpleFacetingExample.java |   61 +
 blur-util/generate_docs.sh                      |   19 +
 .../java/org/apache/blur/BlurConfiguration.java |   25 +-
 .../blur/doc/CreateBlurServerSetupHtmlPage.java |  114 +
 .../apache/blur/metrics/MetricsConstants.java   |    4 +-
 .../org/apache/blur/utils/BlurConstants.java    |    7 +
 .../apache/blur/zookeeper/WatchChildren.java    |    1 -
 .../src/main/resources/blur-default.properties  |   21 +-
 .../src/main/scripts/interface/Blur.thrift      |   30 +
 .../main/scripts/interface/gen-html/Blur.html   |   30 +-
 .../main/scripts/interface/gen-html/index.html  |    3 +
 .../org/apache/blur/thrift/generated/Blur.java  | 2864 ++++++++++++++----
 .../org/apache/blur/thrift/generated/User.java  |  596 ++++
 .../src/main/scripts/interface/gen-js/Blur.js   |  839 +++--
 .../main/scripts/interface/gen-js/Blur_types.js |   98 +
 .../scripts/interface/gen-perl/Blur/Blur.pm     |  776 +++--
 .../scripts/interface/gen-perl/Blur/Types.pm    |  104 +
 .../src/main/scripts/interface/gen-rb/blur.rb   |  110 +
 .../main/scripts/interface/gen-rb/blur_types.rb |   22 +
 docs/Blur.html                                  |   30 +-
 docs/cluster-setup.base.html                    |  354 +++
 docs/cluster-setup.html                         |  231 +-
 docs/data-model.html                            |   10 +-
 docs/using-blur.base.html                       |   31 +
 docs/using-blur.html                            |   39 +
 91 files changed, 9962 insertions(+), 2354 deletions(-)
----------------------------------------------------------------------



Mime
View raw message