You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by kt...@apache.org on 2016/07/15 15:31:43 UTC
[3/3] incubator-fluo git commit: Merge branch 'fluo-639'
Merge branch 'fluo-639'
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/bf15cef6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/bf15cef6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/bf15cef6
Branch: refs/heads/master
Commit: bf15cef613357fe9bf62076a44dd96c4fe4fed54
Parents: add0fd4 2337478
Author: Keith Turner <kt...@apache.org>
Authored: Fri Jul 15 11:27:53 2016 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Jul 15 11:27:53 2016 -0400
----------------------------------------------------------------------
.../apache/fluo/api/client/SnapshotBase.java | 43 +++-
.../fluo/api/client/scanner/CellScanner.java | 25 ++
.../fluo/api/client/scanner/ColumnScanner.java | 30 +++
.../fluo/api/client/scanner/RowScanner.java | 23 ++
.../api/client/scanner/RowScannerBuilder.java | 26 ++
.../fluo/api/client/scanner/ScannerBuilder.java | 61 +++++
.../fluo/api/config/ScannerConfiguration.java | 98 --------
.../org/apache/fluo/api/data/ColumnValue.java | 76 ++++++
.../fluo/api/iterator/ColumnIterator.java | 31 ---
.../apache/fluo/api/iterator/RowIterator.java | 30 ---
.../apache/fluo/cluster/runner/AppRunner.java | 107 ++++----
.../apache/fluo/cluster/runner/ScanTest.java | 8 +-
.../fluo/core/impl/ColumnIteratorImpl.java | 90 -------
.../apache/fluo/core/impl/RowIteratorImpl.java | 77 ------
.../apache/fluo/core/impl/SnapshotScanner.java | 244 +++++++++++--------
.../apache/fluo/core/impl/TransactionImpl.java | 61 +++--
.../fluo/core/impl/scanner/CellScannerImpl.java | 57 +++++
.../core/impl/scanner/ColumnScannerImpl.java | 71 ++++++
.../fluo/core/impl/scanner/RowScannerImpl.java | 50 ++++
.../core/impl/scanner/ScannerBuilderImpl.java | 90 +++++++
.../fluo/core/log/TracingTransaction.java | 9 +-
.../core/config/ScannerConfigurationTest.java | 92 -------
.../org/apache/fluo/integration/ITBase.java | 21 +-
.../org/apache/fluo/integration/ITBaseImpl.java | 1 +
.../fluo/integration/TestTransaction.java | 7 +-
.../apache/fluo/integration/impl/FluoIT.java | 31 +--
.../apache/fluo/integration/impl/ScannerIT.java | 217 +++++++++++++++++
.../fluo/integration/impl/StochasticBankIT.java | 24 +-
.../integration/impl/WeakNotificationIT.java | 21 +-
.../apache/fluo/integration/impl/WorkerIT.java | 17 +-
.../fluo/mapreduce/FluoEntryInputFormat.java | 45 ++--
.../fluo/mapreduce/FluoRowInputFormat.java | 37 +--
32 files changed, 1080 insertions(+), 740 deletions(-)
----------------------------------------------------------------------