From 41b1bd079e5a4b0ce0f7454e318e827774f7e15c Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Thu, 3 May 2018 16:27:23 -0700 Subject: [PATCH] HBASE-20517 Fix PerformanceEvaluation 'column' parameter --- .../apache/hadoop/hbase/PerformanceEvaluation.java | 31 +++++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) 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 85d3613939..60d6cb6227 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 @@ -135,7 +135,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; @@ -1207,7 +1206,10 @@ public class PerformanceEvaluation extends Configured implements Tool { scan.setCaching(opts.caching); 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); } @@ -1245,7 +1247,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); } @@ -1345,7 +1350,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); } @@ -1440,7 +1448,10 @@ public class PerformanceEvaluation extends Configured implements Tool { Scan scan = new Scan(format(opts.startRow)); scan.setCaching(opts.caching); 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); } @@ -1573,7 +1584,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()); @@ -1653,7 +1667,10 @@ public class PerformanceEvaluation extends Configured implements Tool { Scan scan = new Scan(); scan.setCaching(opts.caching); 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); } -- 2.16.3