svn commit: r767332 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/client/Scanner.java src/java/org/apache/hadoop/hbase/io/hfile/HFile.java

[st...@apache.org]

Author: stack
Date: Tue Apr 21 23:55:26 2009
New Revision: 767332

URL: http://svn.apache.org/viewvc?rev=767332&view=rev
Log:
HBASE-1334 .META. region running into hfile errors

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scanner.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=767332&r1=767331&r2=767332&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Apr 21 23:55:26 2009
@@ -80,6 +80,7 @@
    HBASE-1330  binary keys broken on trunk (Ryan Rawson via Stack)
    HBASE-1332  regionserver carrying .META. starts sucking all cpu, drives load
                up - infinite loop? (Ryan Rawson via Stack)
+   HBASE-1334  .META. region running into hfile errors (Ryan Rawson via Stack)
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scanner.java?rev=767332&r1=767331&r2=767332&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scanner.java Tue Apr 21 23:55:26 2009
@@ -45,7 +45,7 @@
    * @return Between zero and <param>nbRows</param> RowResults
    * @throws IOException
    */
-  public RowResult[] next(int nbRows) throws IOException;
+  public RowResult [] next(int nbRows) throws IOException;
   
   /**
    * Closes the scanner and releases any resources it has allocated

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java?rev=767332&r1=767331&r2=767332&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java Tue Apr 21 23:55:26 2009
@@ -1167,7 +1167,9 @@
           return false; // key is before the start of the file.
 
         // Question: does this block begin with 'key'?
-        if (this.reader.comparator.compare(reader.blockIndex.blockKeys[b], key) == 0) {
+        if (this.reader.comparator.compare(reader.blockIndex.blockKeys[b],
+            0, reader.blockIndex.blockKeys[b].length,
+            key, offset, length) == 0) {
           // Ok the key we're interested in is the first of the block, so go back one.
           if (b == 0) {
             // we have a 'problem', the key we want is the first of the file.