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/4af23498 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4af23498 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4af23498 Branch: refs/heads/master Commit: 4af23498a7d834665460ce5df79f148f7ad859f1 Parents: 03d71dd 61a7de4 Author: Keith Turner <ke...@deenlo.com> Authored: Thu Jun 2 11:05:07 2016 -0400 Committer: Keith Turner <ke...@deenlo.com> Committed: Thu Jun 2 11:05:07 2016 -0400 ---------------------------------------------------------------------- .../client/admin/NewTableConfiguration.java | 14 +- .../core/client/admin/TableOperations.java | 4 +- .../core/client/impl/OfflineIterator.java | 14 +- .../client/mapred/AccumuloFileOutputFormat.java | 25 +- .../mapreduce/AccumuloFileOutputFormat.java | 27 +- .../accumulo/core/client/rfile/FSConfArgs.java | 47 ++ .../accumulo/core/client/rfile/RFile.java | 275 ++++++++ .../core/client/rfile/RFileScanner.java | 330 ++++++++++ .../core/client/rfile/RFileScannerBuilder.java | 148 +++++ .../accumulo/core/client/rfile/RFileSource.java | 44 ++ .../accumulo/core/client/rfile/RFileWriter.java | 236 +++++++ .../core/client/rfile/RFileWriterBuilder.java | 148 +++++ .../accumulo/core/client/sample/Sampler.java | 1 - .../accumulo/core/file/FileOperations.java | 59 +- .../apache/accumulo/core/file/rfile/RFile.java | 2 +- .../core/file/rfile/RFileOperations.java | 45 +- .../accumulo/core/iterators/IteratorUtil.java | 15 + .../sample/impl/SamplerConfigurationImpl.java | 12 + .../accumulo/core/util/LocalityGroupUtil.java | 2 + .../accumulo/core/client/rfile/RFileTest.java | 647 +++++++++++++++++++ .../accumulo/core/file/rfile/RFileTest.java | 10 +- .../accumulo/tserver/tablet/ScanDataSource.java | 13 +- 22 files changed, 2012 insertions(+), 106 deletions(-) ----------------------------------------------------------------------
