HBASE-6182 TestStoreFile fails with jdk1.7; REAPPLIED

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1347400 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-06-07 05:38:01 +00:00
parent 7407ec5def
commit d2d3122865
1 changed files with 3 additions and 3 deletions

View File

@ -369,7 +369,7 @@ public class TestStoreFile extends HBaseTestCase {
int falseNeg = 0; int falseNeg = 0;
for (int i = 0; i < 2000; i++) { for (int i = 0; i < 2000; i++) {
String row = String.format(localFormatter, i); String row = String.format(localFormatter, i);
TreeSet<byte[]> columns = new TreeSet<byte[]>(); TreeSet<byte[]> columns = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR);
columns.add("family:col".getBytes()); columns.add("family:col".getBytes());
Scan scan = new Scan(row.getBytes(),row.getBytes()); Scan scan = new Scan(row.getBytes(),row.getBytes());
@ -528,7 +528,7 @@ public class TestStoreFile extends HBaseTestCase {
for (int j = 0; j < colCount*2; ++j) { // column qualifiers for (int j = 0; j < colCount*2; ++j) { // column qualifiers
String row = String.format(localFormatter, i); String row = String.format(localFormatter, i);
String col = String.format(localFormatter, j); String col = String.format(localFormatter, j);
TreeSet<byte[]> columns = new TreeSet<byte[]>(); TreeSet<byte[]> columns = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR);
columns.add(("col" + col).getBytes()); columns.add(("col" + col).getBytes());
Scan scan = new Scan(row.getBytes(),row.getBytes()); Scan scan = new Scan(row.getBytes(),row.getBytes());
@ -712,7 +712,7 @@ public class TestStoreFile extends HBaseTestCase {
StoreFile.BloomType.NONE, NoOpDataBlockEncoder.INSTANCE); StoreFile.BloomType.NONE, NoOpDataBlockEncoder.INSTANCE);
StoreFile.Reader reader = hsf.createReader(); StoreFile.Reader reader = hsf.createReader();
StoreFileScanner scanner = reader.getStoreFileScanner(false, false); StoreFileScanner scanner = reader.getStoreFileScanner(false, false);
TreeSet<byte[]> columns = new TreeSet<byte[]>(); TreeSet<byte[]> columns = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR);
columns.add(qualifier); columns.add(qualifier);
scan.setTimeRange(20, 100); scan.setTimeRange(20, 100);