incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [27/27] git commit: Merge branch 'master' into blur-console-v2
Date Wed, 16 Oct 2013 03:33:10 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/3357a4f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/3357a4f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/3357a4f9

Branch: refs/heads/blur-console-v2
Commit: 3357a4f921235a5a8e8e3b2e73777a186dd11ad2
Parents: fe4f054 515b09a
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Tue Oct 15 23:32:22 2013 -0400
Committer: Chris Rohr <crohr@nearinfinity.com>
Committed: Tue Oct 15 23:32:22 2013 -0400

----------------------------------------------------------------------
 .../org/apache/blur/manager/IndexManager.java   |  27 +-
 .../org/apache/blur/manager/IndexServer.java    |  49 +-
 .../manager/clusterstatus/ClusterStatus.java    |   6 +-
 .../clusterstatus/ZookeeperClusterStatus.java   |  18 +-
 .../clusterstatus/ZookeeperPathConstants.java   |   8 +
 .../AbstractDistributedIndexServer.java         | 131 +++++
 .../indexserver/AbstractIndexServer.java        |   2 +
 .../indexserver/DistributedIndexServer.java     | 537 +++++++------------
 .../indexserver/DistributedLayoutFactory.java   |  26 +
 .../DistributedLayoutFactoryImpl.java           |  42 ++
 .../manager/indexserver/LocalIndexServer.java   |  24 +-
 .../MasterBasedDistributedLayoutFactory.java    | 269 ++++++++++
 .../manager/indexserver/MasterBasedLeveler.java | 158 ++++++
 .../blur/manager/status/QueryStatusManager.java |   4 +-
 .../blur/manager/writer/IndexImporter.java      |  11 +-
 .../manager/writer/SharedMergeScheduler.java    |   7 +-
 .../blur/thrift/BlurControllerServer.java       |  57 +-
 .../java/org/apache/blur/thrift/TableAdmin.java |  14 +-
 .../blur/thrift/ThriftBlurControllerServer.java |   9 +-
 .../blur/thrift/ThriftBlurShardServer.java      | 119 ++--
 .../org/apache/blur/thrift/ThriftServer.java    |  33 ++
 .../org/apache/blur/utils/CreateGarbage.java    |   4 +-
 .../java/org/apache/blur/utils/GCAction.java    |  25 +
 .../java/org/apache/blur/utils/GCWatcher.java   | 256 ++-------
 .../org/apache/blur/utils/GCWatcherJdk6.java    | 242 +++++++++
 .../org/apache/blur/utils/GCWatcherJdk7.java    | 162 ++++++
 .../apache/blur/manager/IndexManagerTest.java   |   5 +
 ...MasterBasedDistributedLayoutFactoryTest.java | 187 +++++++
 .../org/apache/blur/thrift/BlurClusterTest.java |  18 +-
 blur-gui/pom.xml                                |  19 +
 .../blur/mapreduce/lib/BlurOutputFormat.java    |  73 +--
 .../blur/mapreduce/lib/CopyRateDirectory.java   |   8 +-
 .../type/CustomFieldTypeDefinition.java         |  60 ++-
 .../apache/blur/analysis/type/ExampleType.java  | 110 ++++
 ...lPointVectorStrategyFieldTypeDefinition.java |  10 -
 .../blur/shell/DiscoverFileBufferSizeUtil.java  | 328 +++++++++++
 .../main/java/org/apache/blur/shell/Main.java   |   1 +
 .../blur/store/BlockCacheDirectoryFactory.java  |   5 +-
 .../store/BlockCacheDirectoryFactoryV1.java     |  60 ++-
 .../store/BlockCacheDirectoryFactoryV2.java     |  43 +-
 .../blur/store/blockcache_v2/BaseCache.java     |  41 +-
 .../apache/blur/store/blockcache_v2/Cache.java  |  59 +-
 .../store/blockcache_v2/CacheIndexInput.java    |  76 ++-
 .../blur/store/blockcache_v2/CacheValue.java    |   6 +
 .../store/blockcache_v2/FileNameBlockSize.java  |  24 -
 .../apache/blur/store/blockcache_v2/Quiet.java  |  21 +
 .../apache/blur/store/blockcache_v2/Size.java   |  22 +
 .../cachevalue/BaseCacheValue.java              |  44 ++
 .../cachevalue/ByteArrayCacheValue.java         |   3 +-
 .../cachevalue/UnsafeCacheValue.java            |  11 +-
 .../blur/store/BaseDirectoryTestSuite.java      | 283 +++++++++-
 .../blur/store/CacheDirectoryTestSuite.java     |  36 +-
 .../blur/store/HdfsDirectoryTestSuite.java      |   5 +-
 .../store/SoftlinkHdfsDirectoryTestSuite.java   |   5 +-
 .../store/blockcache_v2/CacheDirectoryTest.java |  24 +-
 .../blockcache_v2/CacheIndexInputTest.java      |  67 ++-
 blur-thrift/pom.xml                             |  24 +
 .../org/apache/blur/utils/BlurConstants.java    |  11 +-
 .../blur/zookeeper/ZooKeeperLockManager.java    |   2 +-
 .../src/main/resources/blur-default.properties  |  31 +-
 docs/cluster-setup.html                         |  35 +-
 docs/data-model.html                            | 137 +++++
 docs/getting-started.html                       |  23 +-
 docs/using-blur.html                            |  16 +
 pom.xml                                         |   1 +
 65 files changed, 3241 insertions(+), 933 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/3357a4f9/pom.xml
----------------------------------------------------------------------


Mime
View raw message