You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/05/05 00:53:20 UTC
[1/7] hbase git commit: HBASE-20517 Fix PerformanceEvaluation
'column' parameter
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 <ap...@apache.org>
Authored: Thu May 3 16:25:17 2018 -0700
Committer: Andrew Purtell <ap...@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);
}
[5/7] hbase git commit: HBASE-20517 Fix PerformanceEvaluation
'column' parameter
Posted by ap...@apache.org.
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/489120af
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/489120af
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/489120af
Branch: refs/heads/branch-1.4
Commit: 489120afb65f4587e06c270cc5fa746b87bd5df0
Parents: f6dd195
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu May 3 16:27:23 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 4 17:24:41 2018 -0700
----------------------------------------------------------------------
.../hadoop/hbase/PerformanceEvaluation.java | 31 +++++++++++++++-----
1 file changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/489120af/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 85d3613..60d6cb6 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);
}
[6/7] hbase git commit: HBASE-20517 Fix PerformanceEvaluation
'column' parameter
Posted by ap...@apache.org.
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/b6bb5211
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b6bb5211
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b6bb5211
Branch: refs/heads/branch-1.3
Commit: b6bb5211026d3419e6ee24da2ce44d9c92287f84
Parents: 62a3434
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu May 3 16:27:23 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 4 17:24:45 2018 -0700
----------------------------------------------------------------------
.../hadoop/hbase/PerformanceEvaluation.java | 31 +++++++++++++++-----
1 file changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b6bb5211/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 b68b61a..faf52d0 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
@@ -133,7 +133,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;
@@ -1189,7 +1188,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);
}
@@ -1227,7 +1229,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);
}
@@ -1327,7 +1332,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);
}
@@ -1422,7 +1430,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);
}
@@ -1555,7 +1566,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());
@@ -1635,7 +1649,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/7] hbase git commit: HBASE-20517 Fix PerformanceEvaluation
'column' parameter
Posted by ap...@apache.org.
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/7df8e5e4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7df8e5e4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7df8e5e4
Branch: refs/heads/branch-2
Commit: 7df8e5e4a77426fa5ff9064e3a16a15b6b7fe0c0
Parents: de71cb5
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu May 3 16:25:17 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 4 17:24:21 2018 -0700
----------------------------------------------------------------------
.../hadoop/hbase/PerformanceEvaluation.java | 46 +++++++++++++++-----
1 file changed, 36 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7df8e5e4/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 95d363f..a0d5572 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);
}
[7/7] hbase git commit: HBASE-20517 Fix PerformanceEvaluation
'column' parameter
Posted by ap...@apache.org.
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/a275e863
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a275e863
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a275e863
Branch: refs/heads/branch-1.2
Commit: a275e863124e979745bea493c578c1f9deb400be
Parents: 1519dc0
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu May 3 16:27:23 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 4 17:24:49 2018 -0700
----------------------------------------------------------------------
.../hadoop/hbase/PerformanceEvaluation.java | 31 +++++++++++++++-----
1 file changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a275e863/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 0f12cc7..eea5257 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
@@ -133,7 +133,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;
@@ -1203,7 +1202,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);
}
@@ -1241,7 +1243,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);
}
@@ -1341,7 +1346,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);
}
@@ -1436,7 +1444,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);
}
@@ -1569,7 +1580,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());
@@ -1649,7 +1663,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);
}
[3/7] hbase git commit: HBASE-20517 Fix PerformanceEvaluation
'column' parameter
Posted by ap...@apache.org.
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/3c4fadae
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3c4fadae
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3c4fadae
Branch: refs/heads/branch-2.0
Commit: 3c4fadae4257ff5078d2cc247efc938ea0d350ee
Parents: d1c729b
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu May 3 16:25:17 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 4 17:24:30 2018 -0700
----------------------------------------------------------------------
.../hadoop/hbase/PerformanceEvaluation.java | 46 +++++++++++++++-----
1 file changed, 36 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3c4fadae/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 95d363f..a0d5572 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);
}
[4/7] hbase git commit: HBASE-20517 Fix PerformanceEvaluation
'column' parameter
Posted by ap...@apache.org.
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/fd24083e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fd24083e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fd24083e
Branch: refs/heads/branch-1
Commit: fd24083e26a2d49e30009bb2b3b26f0095f99c77
Parents: e793e7c
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu May 3 16:27:23 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 4 17:24:38 2018 -0700
----------------------------------------------------------------------
.../hadoop/hbase/PerformanceEvaluation.java | 31 +++++++++++++++-----
1 file changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fd24083e/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 85d3613..60d6cb6 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);
}