accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/3] accumulo git commit: Merge branch 'ACCUMULO-4187' of github:shawnwalker/accumulo
Date Tue, 19 Apr 2016 17:51:56 GMT
Merge branch 'ACCUMULO-4187' of github:shawnwalker/accumulo


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

Branch: refs/heads/master
Commit: c8e6fe7495496a5e6601b523df381aa086f6510b
Parents: 4f45908 783314c
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Apr 19 13:50:48 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Apr 19 13:50:48 2016 -0400

----------------------------------------------------------------------
 .../core/client/impl/OfflineIterator.java       |   2 +-
 .../client/mapred/AccumuloFileOutputFormat.java |   2 +-
 .../mapreduce/AccumuloFileOutputFormat.java     |   2 +-
 .../core/client/mock/MockTableOperations.java   |   2 +-
 .../org/apache/accumulo/core/conf/Property.java |   2 +
 .../accumulo/core/file/BloomFilterLayer.java    |   4 +-
 .../core/file/DispatchingFileFactory.java       |  25 +--
 .../accumulo/core/file/FileOperations.java      |  16 +-
 .../file/blockfile/impl/CachableBlockFile.java  |  53 ++++--
 .../core/file/map/MapFileOperations.java        |  20 +--
 .../accumulo/core/file/rfile/CreateEmpty.java   |   4 +-
 .../core/file/rfile/RFileOperations.java        |  31 ++--
 .../accumulo/core/file/rfile/SplitLarge.java    |   4 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java |  99 +++++-----
 .../bcfile/BoundedRangeFileInputStream.java     | 154 ----------------
 .../streams/BoundedRangeFileInputStream.java    | 152 ++++++++++++++++
 .../streams/PositionedDataOutputStream.java     |  35 ++++
 .../core/file/streams/PositionedOutput.java     |  26 +++
 .../core/file/streams/PositionedOutputs.java    |  68 +++++++
 .../file/streams/RateLimitedInputStream.java    |  69 +++++++
 .../file/streams/RateLimitedOutputStream.java   |  57 ++++++
 .../file/streams/SeekableDataInputStream.java   |  46 +++++
 .../core/util/ratelimit/GuavaRateLimiter.java   |  63 +++++++
 .../core/util/ratelimit/NullRateLimiter.java    |  33 ++++
 .../core/util/ratelimit/RateLimiter.java        |  27 +++
 .../ratelimit/SharedRateLimiterFactory.java     | 180 +++++++++++++++++++
 .../client/mock/MockTableOperationsTest.java    |   2 +-
 .../core/file/BloomFilterLayerLookupTest.java   |   4 +-
 .../accumulo/core/file/FileOperationsTest.java  |   2 +-
 .../core/file/rfile/CreateCompatTestFile.java   |   2 +-
 .../core/file/rfile/MultiLevelIndexTest.java    |   3 +-
 .../accumulo/core/file/rfile/RFileTest.java     |   3 +-
 .../core/file/streams/MockRateLimiter.java      |  38 ++++
 .../streams/RateLimitedInputStreamTest.java     |  69 +++++++
 .../streams/RateLimitedOutputStreamTest.java    |  56 ++++++
 .../accumulo/server/client/BulkImporter.java    |   2 +-
 .../apache/accumulo/server/init/Initialize.java |   2 +-
 .../apache/accumulo/server/util/FileUtil.java   |  10 +-
 .../server/client/BulkImporterTest.java         |   2 +-
 .../apache/accumulo/tserver/FileManager.java    |   2 +-
 .../apache/accumulo/tserver/InMemoryMap.java    |   4 +-
 .../apache/accumulo/tserver/TabletServer.java   |  29 ++-
 .../compaction/MajorCompactionRequest.java      |   2 +-
 .../accumulo/tserver/tablet/Compactor.java      |   9 +-
 .../accumulo/tserver/tablet/MinorCompactor.java |  11 ++
 .../apache/accumulo/tserver/tablet/Tablet.java  |  18 +-
 .../accumulo/tserver/tablet/TabletData.java     |   2 +-
 .../accumulo/test/BulkImportMonitoringIT.java   |   2 +-
 .../accumulo/test/CompactionRateLimitingIT.java |  81 +++++++++
 .../apache/accumulo/test/CreateRandomRFile.java |   2 +-
 .../accumulo/test/GenerateSequentialRFile.java  |   2 +-
 .../apache/accumulo/test/GetFileInfoBulkIT.java |   2 +-
 .../org/apache/accumulo/test/ShellServerIT.java |   4 +-
 .../org/apache/accumulo/test/TestIngest.java    |   3 +-
 .../accumulo/test/functional/BulkFileIT.java    |   6 +-
 .../test/mapred/AccumuloFileOutputFormatIT.java |   2 +-
 .../mapreduce/AccumuloFileOutputFormatIT.java   |   2 +-
 .../performance/metadata/FastBulkImportIT.java  |   2 +-
 .../performance/scan/CollectTabletStats.java    |   4 +-
 .../accumulo/test/proxy/SimpleProxyBase.java    |   2 +-
 .../test/randomwalk/bulk/BulkPlusOne.java       |   2 +-
 .../test/randomwalk/concurrent/BulkImport.java  |   5 +-
 .../test/randomwalk/security/TableOp.java       |   2 +-
 63 files changed, 1253 insertions(+), 318 deletions(-)
----------------------------------------------------------------------



Mime
View raw message