Index: src/contrib/hbase/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java =================================================================== --- src/contrib/hbase/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java (revision 592918) +++ src/contrib/hbase/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java (working copy) @@ -25,6 +25,7 @@ import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; +import java.util.Formatter; import java.util.List; import java.util.Random; import java.util.TreeMap; @@ -78,7 +79,7 @@ Logger.getLogger(PerformanceEvaluation.class.getName()); private static final int ROW_LENGTH = 1000; - private static final int ONE_GB = 1024 * 1024 * 1000; + private static final int ONE_GB = 1024 * 1024 * 100; private static final int ROWS_PER_GB = ONE_GB / ROW_LENGTH; static final Text COLUMN_NAME = new Text(COLUMN_FAMILY + "data"); @@ -293,6 +294,7 @@ protected HBaseAdmin admin; protected HTable table; protected volatile HBaseConfiguration conf; + private Formatter formatter = new Formatter(); Test(final HBaseConfiguration conf, final int startRow, final int perClientRunRows, final int totalRows, final Status status) { @@ -366,10 +368,14 @@ } Text getRandomRow() { - return new Text(Integer.toString(this.rand.nextInt(Integer.MAX_VALUE) % + return new Text(format(this.rand.nextInt(Integer.MAX_VALUE) % this.totalRows)); } + public Text format(final int i) { + return new Text(String.format("%010d", Integer.valueOf(i))); + } + /* * Test for individual row. * @param i Row index. @@ -439,7 +445,7 @@ void testSetup() throws IOException { super.testSetup(); this.testScanner = table.obtainScanner(new Text[] {COLUMN_NAME}, - new Text(Integer.toString(this.startRow))); + format(this.startRow)); } @Override @@ -471,7 +477,11 @@ @Override void testRow(final int i) throws IOException { - table.get(new Text(Integer.toString(i)), COLUMN_NAME); + long start = System.currentTimeMillis(); + //table.get(format(i)), COLUMN_NAME); + table.getRow(format(i)); + long stop = System.currentTimeMillis(); + System.out.println(i + " , " + (stop - start)); } @Override @@ -488,7 +498,7 @@ @Override void testRow(final int i) throws IOException { - long lockid = table.startUpdate(new Text(Integer.toString(i))); + long lockid = table.startUpdate(format(i)); table.put(lockid, COLUMN_NAME, generateValue()); table.commit(lockid); } Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java (revision 592918) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java (working copy) @@ -1100,7 +1100,7 @@ } results.put(new Text(readcol), readval.get()); readval = new ImmutableBytesWritable(); - } else if(key.getRow().compareTo(readkey.getRow()) > 0) { + } else if(key.getRow().compareTo(readkey.getRow()) < 0) { break; } Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java (revision 592918) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java (working copy) @@ -1453,7 +1453,7 @@ "hbase.master is set to 'local' mode"); } else { Constructor c = - regionServerClass.getConstructor(Configuration.class); + regionServerClass.getConstructor(HBaseConfiguration.class); HRegionServer hrs = c.newInstance(conf); Thread t = new Thread(hrs); t.setName("regionserver" + hrs.server.getListenerAddress()); Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java (revision 592918) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java (working copy) @@ -3063,7 +3063,7 @@ (new LocalHBaseCluster(conf)).startup(); } else { Constructor c = - masterClass.getConstructor(Configuration.class); + masterClass.getConstructor(HBaseConfiguration.class); HMaster master = c.newInstance(conf); master.start(); }