Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-10997 Add a modulo argument to PE to constrain the key range; REVERT 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1590864 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2014-04-29 04:38:10 +00:00
parent d77f9291cb
commit a825ca179b
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
View File

@ -489,7 +489,6 @@ public class PerformanceEvaluation extends Configured implements Tool {
this.perClientRunRows = that.perClientRunRows; this.perClientRunRows = that.perClientRunRows;
this.numClientThreads = that.numClientThreads; this.numClientThreads = that.numClientThreads;
this.totalRows = that.totalRows; this.totalRows = that.totalRows;
this.modulo = that.modulo;
this.sampleRate = that.sampleRate; this.sampleRate = that.sampleRate;
this.tableName = that.tableName; this.tableName = that.tableName;
this.flushCommits = that.flushCommits; this.flushCommits = that.flushCommits;
@ -513,7 +512,6 @@ public class PerformanceEvaluation extends Configured implements Tool {
public int perClientRunRows = ROWS_PER_GB; public int perClientRunRows = ROWS_PER_GB;
public int numClientThreads = 1; public int numClientThreads = 1;
public int totalRows = ROWS_PER_GB; public int totalRows = ROWS_PER_GB;
public int modulo = -1;
public float sampleRate = 1.0f; public float sampleRate = 1.0f;
public String tableName = TABLE_NAME; public String tableName = TABLE_NAME;
public boolean flushCommits = true; public boolean flushCommits = true;
@ -686,7 +684,7 @@ public class PerformanceEvaluation extends Configured implements Tool {
@Override @Override
void testRow(final int i) throws IOException { void testRow(final int i) throws IOException {
Scan scan = new Scan(getRandomRow(this.rand, opts.modulo)); Scan scan = new Scan(getRandomRow(this.rand, opts.totalRows));
FilterList list = new FilterList(); FilterList list = new FilterList();
scan.addColumn(FAMILY_NAME, QUALIFIER_NAME); scan.addColumn(FAMILY_NAME, QUALIFIER_NAME);
if (opts.filterAll) { if (opts.filterAll) {
@ -807,7 +805,7 @@ public class PerformanceEvaluation extends Configured implements Tool {
@Override @Override
void testRow(final int i) throws IOException { void testRow(final int i) throws IOException {
Get get = new Get(getRandomRow(this.rand, opts.modulo)); Get get = new Get(getRandomRow(this.rand, opts.totalRows));
get.addColumn(FAMILY_NAME, QUALIFIER_NAME); get.addColumn(FAMILY_NAME, QUALIFIER_NAME);
if (opts.filterAll) { if (opts.filterAll) {
get.setFilter(new FilterAllFilter()); get.setFilter(new FilterAllFilter());
@ -847,7 +845,7 @@ public class PerformanceEvaluation extends Configured implements Tool {
@Override @Override
void testRow(final int i) throws IOException { void testRow(final int i) throws IOException {
byte[] row = getRandomRow(this.rand, opts.modulo); byte[] row = getRandomRow(this.rand, opts.totalRows);
Put put = new Put(row); Put put = new Put(row);
byte[] value = generateData(this.rand, VALUE_LENGTH); byte[] value = generateData(this.rand, VALUE_LENGTH);
if (opts.useTags) { if (opts.useTags) {
@ -1044,8 +1042,8 @@ public class PerformanceEvaluation extends Configured implements Tool {
return b; return b;
} }
static byte [] getRandomRow(final Random random, final int modulo) { static byte [] getRandomRow(final Random random, final int totalRows) {
return format(random.nextInt(Integer.MAX_VALUE) % modulo); return format(random.nextInt(Integer.MAX_VALUE) % totalRows);
} }
static long runOneClient(final Class<? extends Test> cmd, Configuration conf, TestOptions opts, static long runOneClient(final Class<? extends Test> cmd, Configuration conf, TestOptions opts,
@ -1111,7 +1109,6 @@ public class PerformanceEvaluation extends Configured implements Tool {
System.err.println(" rows Rows each client runs. Default: One million"); System.err.println(" rows Rows each client runs. Default: One million");
System.err.println(" size Total size in GiB. Mutually exclusive with --rows. " + System.err.println(" size Total size in GiB. Mutually exclusive with --rows. " +
"Default: 1.0."); "Default: 1.0.");
System.err.println(" modulo Modulo we use dividing random. Default: Clients x rows");
System.err.println(" sampleRate Execute test on a sample of total " + System.err.println(" sampleRate Execute test on a sample of total " +
"rows. Only supported by randomRead. Default: 1.0"); "rows. Only supported by randomRead. Default: 1.0");
System.err.println(" table Alternate table name. Default: 'TestTable'"); System.err.println(" table Alternate table name. Default: 'TestTable'");
@ -1287,12 +1284,6 @@ public class PerformanceEvaluation extends Configured implements Tool {
continue; continue;
} }
final String modulo = "--modulo=";
if (cmd.startsWith(modulo)) {
opts.modulo = Integer.parseInt(cmd.substring(modulo.length()));
continue;
}
final String size = "--size="; final String size = "--size=";
if (cmd.startsWith(size)) { if (cmd.startsWith(size)) {
opts.size = Float.parseFloat(cmd.substring(size.length())); opts.size = Float.parseFloat(cmd.substring(size.length()));
@ -1315,7 +1306,6 @@ public class PerformanceEvaluation extends Configured implements Tool {
opts.totalRows = opts.perClientRunRows * opts.numClientThreads; opts.totalRows = opts.perClientRunRows * opts.numClientThreads;
opts.size = opts.totalRows / ROWS_PER_GB; opts.size = opts.totalRows / ROWS_PER_GB;
} }
if (opts.modulo == DEFAULT_OPTS.modulo) opts.modulo = opts.totalRows;
runTest(cmdClass, opts); runTest(cmdClass, opts);
errCode = 0; errCode = 0;
break; break;