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 DD2811018F for ; Sat, 23 Nov 2013 01:41:56 +0000 (UTC) Received: (qmail 19049 invoked by uid 500); 23 Nov 2013 01:41:56 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 18866 invoked by uid 500); 23 Nov 2013 01:41:55 -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 18491 invoked by uid 99); 23 Nov 2013 01:41:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Nov 2013 01:41:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A780A902A9A; Sat, 23 Nov 2013 01:41:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sat, 23 Nov 2013 01:42:10 -0000 Message-Id: In-Reply-To: <05f71fc0259046c792a7f8a2460da513@git.apache.org> References: <05f71fc0259046c792a7f8a2460da513@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/19] git commit: ACCUMULO-1854 Remove unnecessary arguments from methods ACCUMULO-1854 Remove unnecessary arguments from methods Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8dd3ae4b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8dd3ae4b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8dd3ae4b Branch: refs/heads/1.5.1-SNAPSHOT Commit: 8dd3ae4b1d614182f26d382d3d16956726d26702 Parents: 7311481 Author: Josh Elser Authored: Thu Nov 21 20:18:16 2013 -0500 Committer: Josh Elser Committed: Fri Nov 22 15:17:58 2013 -0500 ---------------------------------------------------------------------- .../core/client/mapreduce/InputFormatBase.java | 34 ++++++-------------- 1 file changed, 10 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8dd3ae4b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java ---------------------------------------------------------------------- diff --git a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java index 40e09a1..bd90b8c 100644 --- a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java +++ b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java @@ -1057,25 +1057,18 @@ public abstract class InputFormatBase extends InputFormat { } } - // Apply the configured iterators from the job to the scanner - /** - * @deprecated Use {@link #setupIterators(Configuration,Scanner)} instead - */ - protected void setupIterators(TaskAttemptContext attempt, Scanner scanner, List iterators, List options) - throws AccumuloException { - setupIterators(attempt.getConfiguration(), scanner, iterators, options); - } - /** * Apply the configured iterators from the configuration to the scanner. * - * @param conf - * the Hadoop configuration object * @param scanner * the scanner to configure + * @param iterators + * the iterators to configure on the scanner + * @param options + * options for each configured iterator * @throws AccumuloException */ - protected void setupIterators(Configuration conf, Scanner scanner, List iterators, List options) + protected void setupIterators(Scanner scanner, List iterators, List options) throws AccumuloException { Map scanIterators = new HashMap(); @@ -1091,21 +1084,14 @@ public abstract class InputFormatBase extends InputFormat { } /** - * @deprecated Use {@link #setupMaxVersions(Configuration,Scanner)} instead - */ - protected void setupMaxVersions(TaskAttemptContext attempt, Scanner scanner, int maxVersions) { - setupMaxVersions(attempt.getConfiguration(), scanner, maxVersions); - } - - /** * If maxVersions has been set, configure a {@link VersioningIterator} at priority 0 for this scanner. * - * @param conf - * the Hadoop configuration object * @param scanner * the scanner to configure + * @param maxVersions + * the number of versions to return */ - protected void setupMaxVersions(Configuration conf, Scanner scanner, int maxVersions) { + protected void setupMaxVersions(Scanner scanner, int maxVersions) { // Check to make sure its a legit value if (maxVersions >= 1) { IteratorSetting vers = new IteratorSetting(0, "vers", VersioningIterator.class); @@ -1222,13 +1208,13 @@ public abstract class InputFormatBase extends InputFormat { log.info("Using local iterators"); scanner = new ClientSideIteratorScanner(scanner); } - setupMaxVersions(conf, scanner, maxVersions); + setupMaxVersions(scanner, maxVersions); if (rowRegex != null || colfRegex != null || colqRegex != null || valueRegex != null) { IteratorSetting is = new IteratorSetting(50, RegExFilter.class); RegExFilter.setRegexs(is, rowRegex, colfRegex, colqRegex, valueRegex, false); scanner.addScanIterator(is); } - setupIterators(conf, scanner, iterators, options); + setupIterators(scanner, iterators, options); } catch (Exception e) { throw new IOException(e); }