incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [4/6] git commit: Merge branch '0.2.1' into merge_blockcache_v2
Date Thu, 19 Sep 2013 13:07:47 GMT
Merge branch '0.2.1' into merge_blockcache_v2

Conflicts:
	blur-mapred/src/test/java/org/apache/blur/mapreduce/lib/BlurOutputFormatTest.java


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

Branch: refs/heads/master
Commit: 6a5d05226b72c0fae946809c820edfedc8dbc22b
Parents: 2646567 562537d
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu Sep 19 08:43:28 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu Sep 19 08:43:28 2013 -0400

----------------------------------------------------------------------
 blur-core/pom.xml                               |   2 +-
 .../blur/thrift/ThriftBlurShardServer.java      | 101 ++++-----
 blur-gui/pom.xml                                |   2 +-
 blur-jdbc/pom.xml                               |   2 +-
 blur-mapred/pom.xml                             |   2 +-
 .../mapreduce/lib/BlurOutputFormatTest.java     |   2 +-
 blur-query/pom.xml                              |   2 +-
 blur-shell/pom.xml                              |   2 +-
 blur-store/pom.xml                              |   2 +-
 .../store/BlockCacheDirectoryFactoryV2.java     |  70 +++++++
 .../blur/store/blockcache_v2/BaseCache.java     | 210 +++++++++++++++++++
 .../apache/blur/store/blockcache_v2/Cache.java  | 138 ++++++++++++
 .../store/blockcache_v2/CacheDirectory.java     | 147 +++++++++++++
 .../store/blockcache_v2/CacheIndexInput.java    | 174 +++++++++++++++
 .../store/blockcache_v2/CacheIndexOutput.java   | 138 ++++++++++++
 .../blur/store/blockcache_v2/CacheKey.java      |  89 ++++++++
 .../blur/store/blockcache_v2/CacheValue.java    |  93 ++++++++
 .../store/blockcache_v2/FileNameBlockSize.java  |  24 +++
 .../store/blockcache_v2/FileNameFilter.java     |  24 +++
 .../cachevalue/BaseCacheValue.java              |  83 ++++++++
 .../cachevalue/ByteArrayCacheValue.java         |  55 +++++
 .../cachevalue/UnsafeCacheValue.java            | 106 ++++++++++
 .../store/blockcache_v2/CacheDirectoryTest.java | 147 +++++++++++++
 .../blockcache_v2/CacheIndexInputTest.java      | 206 ++++++++++++++++++
 .../blockcache_v2/CacheIndexOutputTest.java     | 101 +++++++++
 .../cachevalue/ByteArrayCacheValueTest.java     |  68 ++++++
 .../cachevalue/UnsafeCacheValueTest.java        |  68 ++++++
 blur-thrift/pom.xml                             |   2 +-
 blur-util/pom.xml                               |   2 +-
 contrib/blur-console/blur-agent/pom.xml         |  12 +-
 distribution/pom.xml                            |   2 +-
 pom.xml                                         |   2 +-
 32 files changed, 2000 insertions(+), 78 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message