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 2009/04/20 09:10:46 UTC

svn commit: r766600 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/KeyValue.java

Author: stack
Date: Mon Apr 20 07:10:45 2009
New Revision: 766600

URL: http://svn.apache.org/viewvc?rev=766600&view=rev
Log:
HBASE-1330 binary keys broken on trunk

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=766600&r1=766599&r2=766600&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Apr 20 07:10:45 2009
@@ -77,6 +77,7 @@
    HBASE-1202  getRow does not always work when specifying number of versions
    HBASE-1324  hbase-1234 broke testget2 unit test (and broke the build)
    HBASE-1321  hbase-1234 broke TestCompaction; fix and reenable
+   HBASE-1330  binary keys broken on trunk (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/KeyValue.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java?rev=766600&r1=766599&r2=766600&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java Mon Apr 20 07:10:45 2009
@@ -612,10 +612,14 @@
   public byte [] getKey() {
     int keylength = getKeyLength();
     byte [] key = new byte[keylength];
-    System.arraycopy(getBuffer(), ROW_OFFSET, key, 0, keylength);
+    System.arraycopy(getBuffer(), getKeyOffset(), key, 0, keylength);
     return key;
   }
 
+  public String getKeyString() {
+    return Bytes.toString(getBuffer(), getKeyOffset(), getKeyLength());
+  }
+
   /**
    * @return Key offset in backing buffer..
    */
@@ -943,6 +947,11 @@
     public KeyComparator getRawComparator() {
       return this.rawcomparator;
     }
+
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+      return new RootComparator();
+    }
   }
 
   /**
@@ -955,6 +964,11 @@
     public KeyComparator getRawComparator() {
       return this.rawcomparator;
     }
+
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+      return new MetaComparator();
+    }
   }
 
   /**