diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java index b085b3e..97c2c36 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java @@ -1909,8 +1909,19 @@ public class Bytes implements Comparable { diffBI = diffBI.add(BigInteger.ONE); } final BigInteger splitsBI = BigInteger.valueOf(num + 1); + //when diffBI < splitBI, use an additional byte to increase diffBI if(diffBI.compareTo(splitsBI) < 0) { - return null; + byte[] aPaddedAdditional = new byte[aPadded.length+1]; + byte[] bPaddedAdditional = new byte[bPadded.length+1]; + for (int i = 0; i < aPadded.length; i++){ + aPaddedAdditional[i] = aPadded[i]; + } + for (int j = 0; j < bPadded.length; j++){ + bPaddedAdditional[j] = bPadded[j]; + } + aPaddedAdditional[aPadded.length] = 0; + bPaddedAdditional[bPadded.length] = 0; + return iterateOnSplits(aPaddedAdditional, bPaddedAdditional, inclusive, num); } final BigInteger intervalBI; try { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java index c55f946..432c4b3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java @@ -208,6 +208,9 @@ public class TestRegionSplitter { xFF, xFF, xFF}, lastRow); assertArrayEquals(splitPoint, new byte[] {(byte)0xef, xFF, xFF, xFF, xFF, xFF, xFF, xFF}); + + splitPoint = splitter.split(new byte[] {'a', 'a', 'a'}, new byte[] {'a', 'a', 'b'}); + assertArrayEquals(splitPoint, new byte[] {'a', 'a', 'a', (byte)0x80 }); } @Test @@ -228,7 +231,7 @@ public class TestRegionSplitter { assertTrue(splitFailsPrecondition(algo, "\\xAA", "\\xAA")); // range error assertFalse(splitFailsPrecondition(algo, "\\x00", "\\x02", 3)); // should be fine assertFalse(splitFailsPrecondition(algo, "\\x00", "\\x0A", 11)); // should be fine - assertTrue(splitFailsPrecondition(algo, "\\x00", "\\x0A", 12)); // too granular + assertFalse(splitFailsPrecondition(algo, "\\x00", "\\x0A", 12)); // should be fine } private boolean splitFailsPrecondition(SplitAlgorithm algo) {