Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 B24491789D for ; Wed, 8 Apr 2015 05:07:20 +0000 (UTC) Received: (qmail 9370 invoked by uid 500); 8 Apr 2015 05:07:20 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 9321 invoked by uid 500); 8 Apr 2015 05:07:20 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 9312 invoked by uid 99); 8 Apr 2015 05:07:20 -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; Wed, 08 Apr 2015 05:07:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4EB96E17FA; Wed, 8 Apr 2015 05:07:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ramkrishna@apache.org To: commits@hbase.apache.org Message-Id: <23ca80a7ef3c44a3a292be97f435d4c9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-13370 - PE tool could give option for using Explicit Column Tracker which leads to seeks (Ram) Date: Wed, 8 Apr 2015 05:07:20 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/0.98 7b68ca446 -> 11fc5d65c HBASE-13370 - PE tool could give option for using Explicit Column Tracker which leads to seeks (Ram) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/11fc5d65 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/11fc5d65 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/11fc5d65 Branch: refs/heads/0.98 Commit: 11fc5d65c0899167079003677873df42bf02ac58 Parents: 7b68ca4 Author: ramkrishna Authored: Wed Apr 8 10:36:29 2015 +0530 Committer: ramkrishna Committed: Wed Apr 8 10:36:29 2015 +0530 ---------------------------------------------------------------------- .../hadoop/hbase/PerformanceEvaluation.java | 33 ++++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/11fc5d65/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java index 014caf9..ffa5150 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -506,6 +506,7 @@ public class PerformanceEvaluation extends Configured implements Tool { this.blockEncoding = that.blockEncoding; this.filterAll = that.filterAll; this.bloomType = that.bloomType; + this.addColumns = that.addColumns; } public boolean nomapred = false; @@ -527,6 +528,7 @@ public class PerformanceEvaluation extends Configured implements Tool { public Compression.Algorithm compression = Compression.Algorithm.NONE; public BloomType bloomType = BloomType.ROW; public DataBlockEncoding blockEncoding = DataBlockEncoding.NONE; + boolean addColumns = true; } /* @@ -630,7 +632,9 @@ public class PerformanceEvaluation extends Configured implements Tool { void testRow(final int i) throws IOException { Scan scan = new Scan(getRandomRow(this.rand, opts.totalRows)); FilterList list = new FilterList(); - scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + if (opts.addColumns) { + scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + } if (opts.filterAll) { list.addFilter(new FilterAllFilter()); } @@ -662,7 +666,9 @@ public class PerformanceEvaluation extends Configured implements Tool { if (opts.filterAll) { scan.setFilter(new FilterAllFilter()); } - scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + if (opts.addColumns) { + scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + } ResultScanner s = this.table.getScanner(scan); int count = 0; for (Result rr; (rr = s.next()) != null;) { @@ -762,7 +768,9 @@ public class PerformanceEvaluation extends Configured implements Tool { void testRow(final int i) throws IOException { if (i % everyN == 0) { Get get = new Get(getRandomRow(this.rand, opts.totalRows)); - get.addColumn(FAMILY_NAME, QUALIFIER_NAME); + if (opts.addColumns) { + get.addColumn(FAMILY_NAME, QUALIFIER_NAME); + } if (opts.filterAll) { get.setFilter(new FilterAllFilter()); } @@ -870,7 +878,9 @@ public class PerformanceEvaluation extends Configured implements Tool { if (this.testScanner == null) { Scan scan = new Scan(format(opts.startRow)); scan.setCaching(30); - scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + if (opts.addColumns) { + scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + } if (opts.filterAll) { scan.setFilter(new FilterAllFilter()); } @@ -889,7 +899,9 @@ public class PerformanceEvaluation extends Configured implements Tool { @Override void testRow(final int i) throws IOException { Get get = new Get(format(i)); - get.addColumn(FAMILY_NAME, QUALIFIER_NAME); + if (opts.addColumns) { + get.addColumn(FAMILY_NAME, QUALIFIER_NAME); + } if (opts.filterAll) { get.setFilter(new FilterAllFilter()); } @@ -957,7 +969,9 @@ public class PerformanceEvaluation extends Configured implements Tool { list.addFilter(new FilterAllFilter()); } Scan scan = new Scan(); - scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + if (opts.addColumns) { + scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + } scan.setFilter(list); return scan; } @@ -1124,6 +1138,7 @@ public class PerformanceEvaluation extends Configured implements Tool { System.err.println(" Note: -D properties will be applied to the conf used. "); System.err.println(" For example: "); System.err.println(" -Dmapred.output.compress=true"); + System.err.println(" addColumns Adds columns to scans/gets explicitly. Default: true"); System.err.println(" -Dmapreduce.task.timeout=60000"); System.err.println(); System.err.println("Command:"); @@ -1274,6 +1289,12 @@ public class PerformanceEvaluation extends Configured implements Tool { continue; } + final String addColumns = "--addColumns="; + if (cmd.startsWith(addColumns)) { + opts.addColumns = Boolean.parseBoolean(cmd.substring(addColumns.length())); + continue; + } + Class cmdClass = determineCommandClass(cmd); if (cmdClass != null) { opts.numClientThreads = getNumClients(i + 1, args);