svn commit: r1416726 - in /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver: TestStore.java TestStoreFile.java

[li...@apache.org]

Author: liyin
Date: Mon Dec  3 23:25:31 2012
New Revision: 1416726

URL: http://svn.apache.org/viewvc?rev=1416726&view=rev
Log:
[HBASE-6181] Fix TestStoreFile fail on JDK7

Author: adela

Summary:
When running under JDK7 we get the following failures:
org.apache.hadoop.hbase.regionserver.TestStoreFile.testBloomEdgeCases
org.apache.hadoop.hbase.regionserver.TestStoreFile.testBloomFilter
org.apache.hadoop.hbase.regionserver.TestStoreFile.testBloomTypes
org.apache.hadoop.hbase.regionserver.TestStoreFile.testMultipleTimestamps
(fix ported from jira)

Test Plan: tested under jdk6 and jdk7, test passed

Reviewers: liyintang, kannan

Reviewed By: liyintang

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D644576

Task ID: 1928247

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java?rev=1416726&r1=1416725&r2=1416726&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java Mon Dec  3 23:25:31 2012
@@ -429,7 +429,7 @@ public class TestStore extends TestCase 
     get.setMaxVersions(); // all versions.
     List<KeyValue> results = new ArrayList<KeyValue>();
 
-    NavigableSet<byte[]> cols = new TreeSet<byte[]>();
+    NavigableSet<byte[]> cols = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR);
     cols.add(qf1);
 
     results = HBaseTestingUtility.getFromStoreFile(store, get);

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1416726&r1=1416725&r2=1416726&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java Mon Dec  3 23:25:31 2012
@@ -382,7 +382,7 @@ public class TestStoreFile extends HBase
     int falseNeg = 0;
     for (int i = 0; i < 2000; 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());
 
       Scan scan = new Scan(row.getBytes(),row.getBytes());
@@ -534,7 +534,7 @@ public class TestStoreFile extends HBase
         for (int j = 0; j < colCount*2; ++j) {   // column qualifiers
           String row = String.format(localFormatter, i);
           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());
 
           Scan scan = new Scan(row.getBytes(),row.getBytes());
@@ -706,7 +706,7 @@ public class TestStoreFile extends HBase
         StoreFile.BloomType.NONE, NoOpDataBlockEncoder.INSTANCE);
     StoreFile.Reader reader = hsf.createReader();
     StoreFileScanner scanner = reader.getStoreFileScanner(false, false);
-    TreeSet<byte[]> columns = new TreeSet<byte[]>();
+    TreeSet<byte[]> columns = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR);
     columns.add(qualifier);
 
     scan.setTimeRange(20, 100);