incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [05/21] git commit: Merge branch 'master' into blur-0.2.4-parcel
Date Tue, 11 Aug 2015 18:01:38 GMT
Merge branch 'master' into blur-0.2.4-parcel


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

Branch: refs/heads/master
Commit: de8a98b9ea5815df5bef1838ca28695135c14fe8
Parents: d854bed 2b31cd8
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon Jun 29 13:41:28 2015 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon Jun 29 13:41:28 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/blur/hive/BlurSerDe.java    |  12 +-
 .../org/apache/blur/hive/BlurSerDeTest.java     |   2 +-
 .../blur/mapreduce/lib/update/Driver.java       |   8 +-
 .../store/BlockCacheDirectoryFactoryV2.java     |  62 +++--
 .../blur/store/blockcache_v2/BaseCache.java     |  46 +++-
 .../apache/blur/store/blockcache_v2/Cache.java  |  16 ++
 .../store/blockcache_v2/CacheIndexInput.java    |  22 +-
 .../blockcache_v2/DirectIndexInputCache.java    |  51 ++++
 .../store/blockcache_v2/IndexInputCache.java    |  49 ++++
 .../store/blockcache_v2/LRUIndexInputCache.java |  48 ++++
 .../blur/store/blockcache_v2/MeterWrapper.java  | 145 +++++++++++
 .../blur/store/blockcache_v2/PooledCache.java   |   6 +
 .../blur/store/hdfs/FSInputFileHandle.java      | 183 ++++++++++++++
 .../apache/blur/store/hdfs/HdfsDirectory.java   | 245 +------------------
 .../apache/blur/store/hdfs/HdfsIndexInput.java  |  30 +--
 .../blur/store/hdfs/SequentialReadControl.java  |   8 +-
 .../blur/store/BaseDirectoryTestSuite.java      |  29 +++
 .../blur/store/CacheDirectoryTestSuite.java     |  11 +-
 .../blur/store/blockcache_v2/BaseCacheTest.java |  10 +-
 .../CacheDirectoryLoadUnloadTest.java           |   9 +-
 .../store/blockcache_v2/CacheDirectoryTest.java |  10 +-
 .../blockcache_v2/CacheIndexInputTest.java      |   5 +
 .../store/blockcache_v2/MeterWrapperTest.java   |  66 +++++
 .../store/blockcache_v2/NoIndexInputCache.java  |  38 +++
 .../store/hdfs/HdfsDirectoryResourceTest.java   |  41 ++--
 .../org/apache/blur/utils/BlurConstants.java    |   6 +-
 .../src/main/resources/blur-default.properties  |   6 +
 .../apache/blur/utils/BlurConstantsTest.java    |  11 +-
 28 files changed, 841 insertions(+), 334 deletions(-)
----------------------------------------------------------------------



Mime
View raw message