Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 37432200B45 for ; Fri, 15 Jul 2016 17:31:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 35DB7160A61; Fri, 15 Jul 2016 15:31:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7DB1A160A57 for ; Fri, 15 Jul 2016 17:31:44 +0200 (CEST) Received: (qmail 40396 invoked by uid 500); 15 Jul 2016 15:31:43 -0000 Mailing-List: contact commits-help@fluo.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fluo.incubator.apache.org Delivered-To: mailing list commits@fluo.incubator.apache.org Received: (qmail 40387 invoked by uid 99); 15 Jul 2016 15:31:43 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 15:31:43 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 2F841C06F1 for ; Fri, 15 Jul 2016 15:31:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id MlDGGnKoK2Kk for ; Fri, 15 Jul 2016 15:31:42 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 161975FD70 for ; Fri, 15 Jul 2016 15:31:41 +0000 (UTC) Received: (qmail 40383 invoked by uid 99); 15 Jul 2016 15:31:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 15:31:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4E9F0E5720; Fri, 15 Jul 2016 15:31:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@fluo.incubator.apache.org Date: Fri, 15 Jul 2016 15:31:43 -0000 Message-Id: <8e862e595e97440d973c6c307b4a390a@git.apache.org> In-Reply-To: <93195a94adfc4f7a9303fef6f85e44f9@git.apache.org> References: <93195a94adfc4f7a9303fef6f85e44f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-fluo git commit: Merge branch 'fluo-639' archived-at: Fri, 15 Jul 2016 15:31:45 -0000 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 Authored: Fri Jul 15 11:27:53 2016 -0400 Committer: Keith Turner 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(-) ----------------------------------------------------------------------