incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [21/30] git commit: Merge branch 'master' into blur-console-v2
Date Thu, 07 Nov 2013 02:41:44 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/288aa8e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/288aa8e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/288aa8e0

Branch: refs/heads/blur-console-v2
Commit: 288aa8e0e9022aae0808e8db206c8e58f98dae18
Parents: 5663ec3 8424d1e
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Wed Oct 23 20:49:08 2013 -0400
Committer: Chris Rohr <crohr@nearinfinity.com>
Committed: Wed Oct 23 20:49:08 2013 -0400

----------------------------------------------------------------------
 .../indexserver/CloseableExecutorService.java   |   4 +
 .../indexserver/DistributedIndexServer.java     |  85 ++++----
 .../manager/indexserver/LocalIndexServer.java   |  14 +-
 .../blur/manager/writer/BlurIndexCloser.java    |   7 +-
 .../blur/manager/writer/BlurIndexReader.java    |   2 +
 .../blur/manager/writer/BlurIndexRefresher.java |  15 +-
 .../blur/manager/writer/BlurNRTIndex.java       | 103 ++++-----
 .../blur/manager/writer/IndexImporter.java      |  30 ++-
 .../manager/writer/SharedMergeScheduler.java    |  23 +-
 .../manager/writer/TransactionRecorder.java     |  14 +-
 .../blur/thrift/ThriftBlurShardServer.java      |   6 +-
 .../org/apache/blur/utils/GCWatcherJdk7.java    |  20 +-
 .../blur/utils/TableShardCountCollapser.java    |   8 +-
 .../manager/writer/BlurIndexReaderTest.java     |  12 +-
 .../blur/manager/writer/BlurNRTIndexTest.java   |  10 +-
 .../writer/DirectoryReferenceCounterTest.java   |   6 +-
 .../org/apache/blur/mapreduce/BlurReducer.java  |   3 +
 .../blur/mapreduce/lib/BlurOutputFormat.java    |   2 +
 .../org/apache/blur/filter/FilterCache.java     | 136 ++++++++++++
 .../org/apache/blur/filter/IndexFileBitSet.java | 106 ++++++++++
 .../blur/filter/IndexFileBitSetIterator.java    | 177 ++++++++++++++++
 .../apache/blur/filter/IndexInputLongArray.java |  40 ++++
 .../org/apache/blur/filter/FilterCacheTest.java | 131 ++++++++++++
 .../apache/blur/filter/IndexFileBitSetTest.java |  78 +++++++
 .../apache/blur/lucene/codec/Blur021Codec.java  | 125 +++++++++++
 .../lucene/codec/Blur021LiveDocsFormat.java     |  48 +++++
 .../org/apache/blur/lucene/codec/Testing.java   |  37 ++++
 .../refcounter/DirectoryReferenceCounter.java   | 129 +++++-------
 .../refcounter/DirectoryReferenceFileGC.java    |   7 +-
 .../store/refcounter/IndexInputCloser.java      |  94 ---------
 .../store/refcounter/IndexInputReference.java   |  79 +++++++
 .../apache/blur/lucene/warmup/IndexWarmup.java  |   5 +-
 .../blur/store/BlockCacheDirectoryFactory.java  |   4 +-
 .../store/BlockCacheDirectoryFactoryV1.java     |   5 +-
 .../store/BlockCacheDirectoryFactoryV2.java     | 118 +++++++++--
 .../blur/store/blockcache_v2/BaseCache.java     | 208 +++++++++++++++++--
 .../apache/blur/store/blockcache_v2/Cache.java  |   3 +-
 .../store/blockcache_v2/CacheDirectory.java     |  40 +++-
 .../store/blockcache_v2/CacheIndexInput.java    | 208 ++++++++++++++-----
 .../store/blockcache_v2/CacheIndexOutput.java   |   3 +-
 .../blur/store/blockcache_v2/CacheValue.java    |  35 ++++
 .../store/blockcache_v2/FileNameFilter.java     |   2 +-
 .../apache/blur/store/blockcache_v2/Quiet.java  |   2 +-
 .../apache/blur/store/blockcache_v2/Size.java   |   2 +-
 .../cachevalue/BaseCacheValue.java              |  17 ++
 .../cachevalue/ByteArrayCacheValue.java         |  12 ++
 .../cachevalue/UnsafeCacheValue.java            |  32 ++-
 .../services/org.apache.lucene.codecs.Codec     |  16 ++
 .../blur/store/BaseDirectoryTestSuite.java      |   5 +-
 .../blur/store/CacheDirectoryTestSuite.java     |  27 ++-
 .../blur/store/HdfsDirectoryTestSuite.java      |   5 +
 .../store/SoftlinkHdfsDirectoryTestSuite.java   |   5 +
 .../store/blockcache_v2/CacheDirectoryTest.java |  21 +-
 .../blockcache_v2/CacheIndexInputTest.java      |   5 +
 .../apache/blur/thrift/BlurClientManager.java   |   2 +-
 .../java/org/apache/blur/thrift/ClientPool.java | 125 +++++++++--
 .../apache/blur/metrics/MetricsConstants.java   |   5 +
 .../org/apache/blur/utils/BlurConstants.java    |  19 +-
 .../src/main/resources/blur-default.properties  |  34 +++
 59 files changed, 2049 insertions(+), 467 deletions(-)
----------------------------------------------------------------------



Mime
View raw message