Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2EBD110326 for ; Tue, 8 Oct 2013 23:42:40 +0000 (UTC) Received: (qmail 81275 invoked by uid 500); 8 Oct 2013 23:42:40 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 81216 invoked by uid 500); 8 Oct 2013 23:42:40 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 81209 invoked by uid 99); 8 Oct 2013 23:42:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Oct 2013 23:42:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9A2048B2741; Tue, 8 Oct 2013 23:42:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Message-Id: <4d017ecb86ae44e6881c293a99e76c98@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-1566 the missing link Date: Tue, 8 Oct 2013 23:42:39 +0000 (UTC) Updated Branches: refs/heads/ACCUMULO-1566 ff95c7147 -> b4bd20432 ACCUMULO-1566 the missing link Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b4bd2043 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4bd2043 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b4bd2043 Branch: refs/heads/ACCUMULO-1566 Commit: b4bd204320632b598bee047c620f2e45cc7caef9 Parents: ff95c71 Author: Keith Turner Authored: Tue Oct 8 19:42:32 2013 -0400 Committer: Keith Turner Committed: Tue Oct 8 19:42:32 2013 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/client/impl/ScannerIterator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4bd2043/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java index e9d1412..b202d3a 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java @@ -145,7 +145,7 @@ public class ScannerIterator implements Iterator> { } scanState = new ScanState(instance, credentials, tableId, authorizations, new Range(range), options.fetchedColumns, size, options.serverSideIteratorList, - options.serverSideIteratorOptions, isolated); + options.serverSideIteratorOptions, isolated, readaheadThreshold); // If we want to start readahead immediately, don't wait for hasNext to be called if (0l == readaheadThreshold) {