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 6bc9fee..771f4c0 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 @@ -543,36 +543,36 @@ public class PerformanceEvaluation extends Configured implements Tool { * This makes tracking all these arguments a little easier. */ static class TestOptions { - String cmdName = null; - boolean nomapred = false; - boolean filterAll = false; - int startRow = 0; - float size = 1.0f; - int perClientRunRows = DEFAULT_ROWS_PER_GB; - int numClientThreads = 1; - int totalRows = DEFAULT_ROWS_PER_GB; - float sampleRate = 1.0f; - double traceRate = 0.0; - String tableName = TABLE_NAME; - boolean flushCommits = true; - boolean writeToWAL = true; - boolean autoFlush = false; - boolean oneCon = false; - boolean useTags = false; - int noOfTags = 1; - boolean reportLatency = false; - int multiGet = 0; - int randomSleep = 0; - boolean inMemoryCF = false; - int presplitRegions = 0; - int replicas = HTableDescriptor.DEFAULT_REGION_REPLICATION; - String splitPolicy = null; - Compression.Algorithm compression = Compression.Algorithm.NONE; - BloomType bloomType = BloomType.ROW; - DataBlockEncoding blockEncoding = DataBlockEncoding.NONE; - boolean valueRandom = false; - int valueSize = DEFAULT_VALUE_LENGTH; - int period = (this.perClientRunRows / 10) == 0? perClientRunRows: perClientRunRows / 10; + public String cmdName = null; + public boolean nomapred = false; + public boolean filterAll = false; + public int startRow = 0; + public float size = 1.0f; + public int perClientRunRows = DEFAULT_ROWS_PER_GB; + public int numClientThreads = 1; + public int totalRows = DEFAULT_ROWS_PER_GB; + public float sampleRate = 1.0f; + public double traceRate = 0.0; + public String tableName = TABLE_NAME; + public boolean flushCommits = true; + public boolean writeToWAL = true; + public boolean autoFlush = false; + public boolean oneCon = false; + public boolean useTags = false; + public int noOfTags = 1; + public boolean reportLatency = false; + public int multiGet = 0; + public int randomSleep = 0; + public boolean inMemoryCF = false; + public int presplitRegions = 0; + public int replicas = HTableDescriptor.DEFAULT_REGION_REPLICATION; + public String splitPolicy = null; + public Compression.Algorithm compression = Compression.Algorithm.NONE; + public BloomType bloomType = BloomType.ROW; + public DataBlockEncoding blockEncoding = DataBlockEncoding.NONE; + public boolean valueRandom = false; + public int valueSize = DEFAULT_VALUE_LENGTH; + public int period = (this.perClientRunRows / 10) == 0? perClientRunRows: perClientRunRows / 10; public TestOptions() {} @@ -608,110 +608,6 @@ public class PerformanceEvaluation extends Configured implements Tool { this.period = that.period; this.randomSleep = that.randomSleep; } - - public boolean isNomapred() { - return nomapred; - } - - public boolean isFilterAll() { - return filterAll; - } - - public int getStartRow() { - return startRow; - } - - public float getSize() { - return size; - } - - public int getPerClientRunRows() { - return perClientRunRows; - } - - public int getNumClientThreads() { - return numClientThreads; - } - - public int getTotalRows() { - return totalRows; - } - - public float getSampleRate() { - return sampleRate; - } - - public double getTraceRate() { - return traceRate; - } - - public String getTableName() { - return tableName; - } - - public boolean isFlushCommits() { - return flushCommits; - } - - public boolean isWriteToWAL() { - return writeToWAL; - } - - public boolean isAutoFlush() { - return autoFlush; - } - - public boolean isUseTags() { - return useTags; - } - - public int getNoOfTags() { - return noOfTags; - } - - public boolean isReportLatency() { - return reportLatency; - } - - public int getMultiGet() { - return multiGet; - } - - public boolean isInMemoryCF() { - return inMemoryCF; - } - - public int getPresplitRegions() { - return presplitRegions; - } - - public Compression.Algorithm getCompression() { - return compression; - } - - public DataBlockEncoding getBlockEncoding() { - return blockEncoding; - } - - public boolean isValueRandom() { - return valueRandom; - } - - public int getValueSize() { - return valueSize; - } - - public int getPeriod() { - return period; - } - - public BloomType getBloomType() { - return bloomType; - } - - public boolean isOneCon() { - return oneCon; - } } /* @@ -1615,7 +1511,7 @@ public class PerformanceEvaluation extends Configured implements Tool { continue; } - final String bloomFilter = "--bloomFilter"; + final String bloomFilter = "--bloomFilter="; if (cmd.startsWith(bloomFilter)) { opts.bloomType = BloomType.valueOf(cmd.substring(bloomFilter.length())); continue;