You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/06/07 07:00:56 UTC

svn commit: r1347391 - in /hbase/branches/0.92: CHANGES.txt src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java

Author: stack
Date: Thu Jun  7 05:00:55 2012
New Revision: 1347391

URL: http://svn.apache.org/viewvc?rev=1347391&view=rev
Log:
HBASE-6182 TestStoreFile fails with jdk1.7

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1347391&r1=1347390&r2=1347391&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Thu Jun  7 05:00:55 2012
@@ -82,6 +82,7 @@ Release 0.92.2 - Unreleased
    HBASE-6158  Data loss if the words 'merges' or 'splits' are used as Column Family name
    HBASE-6160  META entries from daughters can be deleted before parent entries
                (Enis Soztutar)
+   HBASE-6182  TestStoreFile fails with jdk1.7 (Jimmy Xiang)
 
   IMPROVEMENTS
    HBASE-5592  Make it easier to get a table from shell (Ben West)

Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1347391&r1=1347390&r2=1347391&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java Thu Jun  7 05:00:55 2012
@@ -340,7 +340,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());
@@ -432,7 +432,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());
@@ -603,7 +603,7 @@ public class TestStoreFile extends HBase
         StoreFile.BloomType.NONE);
     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);