You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/08/05 01:18:12 UTC

svn commit: r1510356 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Author: tedyu
Date: Sun Aug  4 23:18:11 2013
New Revision: 1510356

URL: http://svn.apache.org/r1510356
Log:
HBASE-9115 Addendum for server side fix (Ted Yu and Lars)


Modified:
    hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
    hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java?rev=1510356&r1=1510355&r2=1510356&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java (original)
+++ hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java Sun Aug  4 23:18:11 2013
@@ -113,12 +113,7 @@ public class Append extends Mutation {
     // http://stackoverflow.com/questions/6474784/java-using-generics-with-lists-and-interfaces
     List<KeyValue> l = (List<KeyValue>)list;
     // find where the new entry should be placed in the List
-    int idx = 0;
-    for (KeyValue keyval : l) {
-      if (Bytes.compareTo(kv.getQualifier(), keyval.getQualifier()) < 0) break;
-      idx ++;
-    }
-    l.add(idx, kv);
+    l.add(kv);
     this.familyMap.put(family, list);
     return this;
   }

Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1510356&r1=1510355&r2=1510356&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Sun Aug  4 23:18:11 2013
@@ -4695,6 +4695,7 @@ public class HRegion implements HeapSize
             Store store = stores.get(family.getKey());
             List<KeyValue> kvs = new ArrayList<KeyValue>(family.getValue().size());
   
+            Collections.sort((List<KeyValue>)family.getValue(), store.getComparator());
             // Get previous values for all columns in this family
             Get get = new Get(row);
             for (Cell cell : family.getValue()) {