Repository: hbase Updated Branches: refs/heads/branch-1 e793e7c30 -> fd24083e2 refs/heads/branch-1.2 1519dc05b -> a275e8631 refs/heads/branch-1.3 62a3434b9 -> b6bb52110 refs/heads/branch-1.4 f6dd195d0 -> 489120afb refs/heads/branch-2 de71cb591 -> 7df8e5e4a refs/heads/branch-2.0 d1c729b5c -> 3c4fadae4 refs/heads/master 87f5b5f34 -> 78ffd7ace
HBASE-20517 Fix PerformanceEvaluation 'column' parameter Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/78ffd7ac Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/78ffd7ac Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/78ffd7ac Branch: refs/heads/master Commit: 78ffd7ace61d983e42c6766fb743831a6ce2fc62 Parents: 87f5b5f Author: Andrew Purtell <apurt...@apache.org> Authored: Thu May 3 16:25:17 2018 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Fri May 4 17:24:17 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/PerformanceEvaluation.java | 46 +++++++++++++++----- 1 file changed, 36 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/78ffd7ac/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java index 5a63ef4..25a1d3c 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -139,7 +139,6 @@ public class PerformanceEvaluation extends Configured implements Tool { public static final String TABLE_NAME = "TestTable"; public static final byte[] FAMILY_NAME = Bytes.toBytes("info"); public static final byte [] COLUMN_ZERO = Bytes.toBytes("" + 0); - public static final byte [] QUALIFIER_NAME = COLUMN_ZERO; public static final int DEFAULT_VALUE_LENGTH = 1000; public static final int ROW_LENGTH = 26; @@ -1341,7 +1340,10 @@ public class PerformanceEvaluation extends Configured implements Tool { } Get get = new Get(getRandomRow(this.rand, opts.totalRows)); if (opts.addColumns) { - get.addColumn(FAMILY_NAME, QUALIFIER_NAME); + for (int column = 0; column < opts.columns; column++) { + byte [] qualifier = column == 0? COLUMN_ZERO: Bytes.toBytes("" + column); + get.addColumn(FAMILY_NAME, qualifier); + } } else { get.addFamily(FAMILY_NAME); } @@ -1466,7 +1468,10 @@ public class PerformanceEvaluation extends Configured implements Tool { .setCacheBlocks(opts.cacheBlocks).setAsyncPrefetch(opts.asyncPrefetch) .setReadType(opts.scanReadType); if (opts.addColumns) { - scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + for (int column = 0; column < opts.columns; column++) { + byte [] qualifier = column == 0? COLUMN_ZERO: Bytes.toBytes("" + column); + scan.addColumn(FAMILY_NAME, qualifier); + } } else { scan.addFamily(FAMILY_NAME); } @@ -1489,7 +1494,10 @@ public class PerformanceEvaluation extends Configured implements Tool { void testRow(final int i) throws IOException, InterruptedException { Get get = new Get(format(i)); if (opts.addColumns) { - get.addColumn(FAMILY_NAME, QUALIFIER_NAME); + for (int column = 0; column < opts.columns; column++) { + byte [] qualifier = column == 0? COLUMN_ZERO: Bytes.toBytes("" + column); + get.addColumn(FAMILY_NAME, qualifier); + } } if (opts.filterAll) { get.setFilter(new FilterAllFilter()); @@ -1572,7 +1580,10 @@ public class PerformanceEvaluation extends Configured implements Tool { .setAsyncPrefetch(opts.asyncPrefetch).setReadType(opts.scanReadType); FilterList list = new FilterList(); if (opts.addColumns) { - scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + for (int column = 0; column < opts.columns; column++) { + byte [] qualifier = column == 0? COLUMN_ZERO: Bytes.toBytes("" + column); + scan.addColumn(FAMILY_NAME, qualifier); + } } else { scan.addFamily(FAMILY_NAME); } @@ -1612,7 +1623,10 @@ public class PerformanceEvaluation extends Configured implements Tool { scan.setFilter(new FilterAllFilter()); } if (opts.addColumns) { - scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + for (int column = 0; column < opts.columns; column++) { + byte [] qualifier = column == 0? COLUMN_ZERO: Bytes.toBytes("" + column); + scan.addColumn(FAMILY_NAME, qualifier); + } } else { scan.addFamily(FAMILY_NAME); } @@ -1712,7 +1726,10 @@ public class PerformanceEvaluation extends Configured implements Tool { } Get get = new Get(getRandomRow(this.rand, opts.totalRows)); if (opts.addColumns) { - get.addColumn(FAMILY_NAME, QUALIFIER_NAME); + for (int column = 0; column < opts.columns; column++) { + byte [] qualifier = column == 0? COLUMN_ZERO: Bytes.toBytes("" + column); + get.addColumn(FAMILY_NAME, qualifier); + } } else { get.addFamily(FAMILY_NAME); } @@ -1809,7 +1826,10 @@ public class PerformanceEvaluation extends Configured implements Tool { .setCacheBlocks(opts.cacheBlocks).setAsyncPrefetch(opts.asyncPrefetch) .setReadType(opts.scanReadType); if (opts.addColumns) { - scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + for (int column = 0; column < opts.columns; column++) { + byte [] qualifier = column == 0? COLUMN_ZERO: Bytes.toBytes("" + column); + scan.addColumn(FAMILY_NAME, qualifier); + } } else { scan.addFamily(FAMILY_NAME); } @@ -1944,7 +1964,10 @@ public class PerformanceEvaluation extends Configured implements Tool { void testRow(final int i) throws IOException { Get get = new Get(format(i)); if (opts.addColumns) { - get.addColumn(FAMILY_NAME, QUALIFIER_NAME); + for (int column = 0; column < opts.columns; column++) { + byte [] qualifier = column == 0? COLUMN_ZERO: Bytes.toBytes("" + column); + get.addColumn(FAMILY_NAME, qualifier); + } } if (opts.filterAll) { get.setFilter(new FilterAllFilter()); @@ -2025,7 +2048,10 @@ public class PerformanceEvaluation extends Configured implements Tool { Scan scan = new Scan().setCaching(opts.caching).setCacheBlocks(opts.cacheBlocks) .setAsyncPrefetch(opts.asyncPrefetch).setReadType(opts.scanReadType); if (opts.addColumns) { - scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); + for (int column = 0; column < opts.columns; column++) { + byte [] qualifier = column == 0? COLUMN_ZERO: Bytes.toBytes("" + column); + scan.addColumn(FAMILY_NAME, qualifier); + } } else { scan.addFamily(FAMILY_NAME); }
