accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [27/27] accumulo git commit: Merge branch '1.8'
Date Fri, 27 May 2016 20:15:21 GMT
Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 9703234d443b7c0d104613cb9ec9524dc5810ebe
Parents: f3b9d19 85ff374
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri May 27 16:14:34 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri May 27 16:14:34 2016 -0400

----------------------------------------------------------------------
 .../core/client/ClientSideIteratorScanner.java  |   2 +-
 .../accumulo/core/client/ScannerBase.java       |   2 +-
 .../client/admin/NewTableConfiguration.java     |   1 +
 .../core/client/admin/SamplerConfiguration.java |  90 --------------
 .../core/client/admin/TableOperations.java      |   1 +
 .../client/impl/BaseIteratorEnvironment.java    |   2 +-
 .../core/client/impl/OfflineIterator.java       |   2 +-
 .../core/client/impl/ScannerOptions.java        |   2 +-
 .../core/client/impl/TableOperationsImpl.java   |   2 +-
 .../core/client/impl/ThriftScanner.java         |   2 +-
 .../core/client/mapred/AbstractInputFormat.java |   2 +-
 .../client/mapred/AccumuloFileOutputFormat.java |   2 +-
 .../core/client/mapred/InputFormatBase.java     |   2 +-
 .../client/mapreduce/AbstractInputFormat.java   |   2 +-
 .../mapreduce/AccumuloFileOutputFormat.java     |   2 +-
 .../core/client/mapreduce/InputFormatBase.java  |   2 +-
 .../core/client/mapreduce/InputTableConfig.java |   2 +-
 .../core/client/mapreduce/RangeInputSplit.java  |   2 +-
 .../lib/impl/FileOutputConfigurator.java        |   2 +-
 .../mapreduce/lib/impl/InputConfigurator.java   |   2 +-
 .../core/client/mock/MockScannerBase.java       |   2 +-
 .../core/client/mock/MockTableOperations.java   |   2 +-
 .../core/client/sample/AbstractHashSampler.java | 119 ++++++++++++++++++
 .../core/client/sample/RowColumnSampler.java    | 118 ++++++++++++++++++
 .../accumulo/core/client/sample/RowSampler.java |  49 ++++++++
 .../accumulo/core/client/sample/Sampler.java    |  56 +++++++++
 .../client/sample/SamplerConfiguration.java     |  94 ++++++++++++++
 .../apache/accumulo/core/file/rfile/RFile.java  |   4 +-
 .../core/file/rfile/RFileOperations.java        |   2 +-
 .../core/iterators/IteratorEnvironment.java     |   2 +-
 .../core/iterators/system/SampleIterator.java   |   4 +-
 .../core/sample/AbstractHashSampler.java        | 108 ----------------
 .../accumulo/core/sample/RowColumnSampler.java  | 124 -------------------
 .../apache/accumulo/core/sample/RowSampler.java |  49 --------
 .../apache/accumulo/core/sample/Sampler.java    |  57 ---------
 .../core/sample/impl/DataoutputHasher.java      | 108 ++++++++++++++++
 .../sample/impl/SamplerConfigurationImpl.java   |   2 +-
 .../core/sample/impl/SamplerFactory.java        |   2 +-
 .../client/impl/TableOperationsHelperTest.java  |   2 +-
 .../mapred/AccumuloFileOutputFormatTest.java    |   4 +-
 .../mapreduce/AccumuloFileOutputFormatTest.java |   4 +-
 .../accumulo/core/file/rfile/RFileTest.java     |   6 +-
 .../core/iterators/SortedMapIteratorTest.java   |   4 +-
 docs/src/main/resources/examples/README.sample  |   6 +-
 .../examples/simple/sample/SampleExample.java   |   4 +-
 .../shard/CutoffIntersectingIterator.java       |   4 +-
 .../accumulo/examples/simple/shard/Query.java   |   2 +-
 .../environments/SimpleIteratorEnvironment.java |   2 +-
 .../monitor/servlets/trace/NullScanner.java     |   2 +-
 .../apache/accumulo/tserver/InMemoryMap.java    |   2 +-
 .../tserver/TabletIteratorEnvironment.java      |   2 +-
 .../tserver/session/MultiScanSession.java       |   2 +-
 .../accumulo/tserver/tablet/ScanDataSource.java |   2 +-
 .../accumulo/tserver/tablet/ScanOptions.java    |   2 +-
 .../apache/accumulo/tserver/tablet/Tablet.java  |   2 +-
 .../accumulo/tserver/InMemoryMapTest.java       |   6 +-
 .../accumulo/shell/commands/ScanCommand.java    |   2 +-
 .../java/org/apache/accumulo/test/SampleIT.java |   5 +-
 .../test/mapred/AccumuloFileOutputFormatIT.java |   4 +-
 .../test/mapred/AccumuloInputFormatIT.java      |   4 +-
 .../mapreduce/AccumuloFileOutputFormatIT.java   |   4 +-
 .../test/mapreduce/AccumuloInputFormatIT.java   |   4 +-
 62 files changed, 614 insertions(+), 495 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9703234d/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9703234d/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9703234d/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9703234d/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------


Mime
View raw message