incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [6/6] git commit: Merge branch 'softlink'
Date Sun, 22 Sep 2013 00:08:07 GMT
Merge branch 'softlink'


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

Branch: refs/heads/master
Commit: cde28869be7ace1d0b39425f05a0e5b2c875a6b1
Parents: 0ee2462 1cdb7fc
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Sat Sep 21 20:07:38 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Sat Sep 21 20:07:38 2013 -0400

----------------------------------------------------------------------
 .../blur/manager/writer/BlurIndexReader.java    |   1 -
 .../manager/writer/SharedMergeScheduler.java    |   8 +-
 .../blur/thrift/ThriftBlurControllerServer.java |  22 +-
 .../blur/thrift/ThriftBlurShardServer.java      |  48 ++-
 .../org/apache/blur/thrift/ThriftServer.java    |  51 +--
 .../test/java/org/apache/blur/MiniCluster.java  | 242 +++++++-----
 .../ZookeeperClusterStatusTest.java             |  90 ++---
 .../blur/manager/indexserver/SafeModeTest.java  |  29 +-
 .../manager/writer/BlurIndexReaderTest.java     |   1 +
 .../manager/writer/TransactionRecorderTest.java |  38 +-
 .../org/apache/blur/thrift/BlurClusterTest.java |  64 ++--
 .../apache/blur/lucene/warmup/IndexWarmup.java  |  63 ++--
 .../cachevalue/UnsafeCacheValue.java            |   2 +-
 .../apache/blur/store/hdfs/HdfsDirectory.java   | 294 ++++++---------
 .../apache/blur/store/hdfs/HdfsIndexInput.java  | 107 ++++++
 .../apache/blur/store/hdfs/MetricsGroup.java    |  35 ++
 .../blur/store/hdfs/SoftlinkHdfsDirectory.java  | 201 ++++++++++
 .../blur/store/BaseDirectoryTestSuite.java      | 375 +++++++++++++++++++
 .../blur/store/CacheDirectoryTestSuite.java     |  69 ++++
 .../store/CacheDirectoryTestSuiteOffHeap.java   |  33 ++
 .../store/CacheDirectoryTestSuiteOnHeap.java    |  33 ++
 .../apache/blur/store/HdfsDirectoryTest.java    | 206 ----------
 .../blur/store/HdfsDirectoryTestSuite.java      |  41 ++
 .../store/SoftlinkHdfsDirectoryTestSuite.java   |  43 +++
 .../blur/store/blockcache/BlockCacheTest.java   |   4 +-
 .../blockcache_v2/CacheIndexInputTest.java      |   2 +
 .../blockcache_v2/CacheIndexOutputTest.java     |   3 +
 .../transport/TNonblockingServerSocket.java     |  20 +-
 28 files changed, 1471 insertions(+), 654 deletions(-)
----------------------------------------------------------------------



Mime
View raw message