Index: src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 1330051) +++ src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -1066,7 +1066,7 @@ return createMultiRegions(getConfiguration(), table, columnFamily); } - public static final byte[][] KEYS = { + public static final byte[][] TEST_KEYS = { HConstants.EMPTY_BYTE_ARRAY, Bytes.toBytes("bbb"), Bytes.toBytes("ccc"), Bytes.toBytes("ddd"), Bytes.toBytes("eee"), Bytes.toBytes("fff"), Bytes.toBytes("ggg"), Bytes.toBytes("hhh"), @@ -1077,6 +1077,7 @@ Bytes.toBytes("uuu"), Bytes.toBytes("vvv"), Bytes.toBytes("www"), Bytes.toBytes("xxx"), Bytes.toBytes("yyy") }; + public static final byte[][] KEYS = Arrays.copyOfRange(TEST_KEYS, 1, TEST_KEYS.length); /** * Creates many regions names "aaa" to "zzz". @@ -1089,7 +1090,7 @@ public int createMultiRegions(final Configuration c, final HTable table, final byte[] columnFamily) throws IOException { - return createMultiRegions(c, table, columnFamily, KEYS); + return createMultiRegions(c, table, columnFamily, TEST_KEYS); } /** Index: src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (revision 1330051) +++ src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (working copy) @@ -150,12 +150,12 @@ final byte [] tableName = Bytes.toBytes("t"); Result [] results = new Result [] { Mocking.getMetaTableRowResult( - new HRegionInfo(tableName, HConstants.EMPTY_START_ROW, HBaseTestingUtility.KEYS[1]), + new HRegionInfo(tableName, HConstants.EMPTY_START_ROW, HBaseTestingUtility.TEST_KEYS[1]), rs2.getServerName()), Mocking.getMetaTableRowResult( - new HRegionInfo(tableName, HBaseTestingUtility.KEYS[1], HBaseTestingUtility.KEYS[2]), + new HRegionInfo(tableName, HBaseTestingUtility.TEST_KEYS[1], HBaseTestingUtility.TEST_KEYS[2]), rs2.getServerName()), - Mocking.getMetaTableRowResult(new HRegionInfo(tableName, HBaseTestingUtility.KEYS[2], + Mocking.getMetaTableRowResult(new HRegionInfo(tableName, HBaseTestingUtility.TEST_KEYS[2], HConstants.EMPTY_END_ROW), rs2.getServerName()) }; Index: src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java (revision 1330051) +++ src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java (working copy) @@ -53,7 +53,7 @@ new HBaseTestingUtility(); private static final byte [] TABLENAME = Bytes.toBytes("t"); private static final byte [] FAMILY = Bytes.toBytes("f"); - private static final int COUNT_OF_REGIONS = HBaseTestingUtility.KEYS.length; + private static final int COUNT_OF_REGIONS = HBaseTestingUtility.TEST_KEYS.length; /** * Spin up a cluster with a bunch of regions on it. @@ -66,7 +66,7 @@ HTableDescriptor htd = new HTableDescriptor(TABLENAME); htd.addFamily(new HColumnDescriptor(FAMILY)); TEST_UTIL.createMultiRegionsInMeta(TEST_UTIL.getConfiguration(), htd, - HBaseTestingUtility.KEYS); + HBaseTestingUtility.TEST_KEYS); // Make a mark for the table in the filesystem. FileSystem fs = FileSystem.get(TEST_UTIL.getConfiguration()); FSTableDescriptors. Index: src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java (revision 1330051) +++ src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java (working copy) @@ -74,7 +74,7 @@ } private static byte[][] makeKeys() { - byte [][] starterKeys = HBaseTestingUtility.KEYS; + byte [][] starterKeys = HBaseTestingUtility.TEST_KEYS; // Create a "non-uniform" test set with the following characteristics: // a) Unequal number of keys per region