hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject [35/50] [abbrv] hbase git commit: HBASE-17897 StripeStoreFileManager#nonOpenRowCompare use the wrong comparison function
Date Mon, 17 Apr 2017 20:55:14 GMT
HBASE-17897 StripeStoreFileManager#nonOpenRowCompare use the wrong comparison function


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cf3215d3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cf3215d3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cf3215d3

Branch: refs/heads/hbase-12439
Commit: cf3215d343d5c412735f51c68dc3686087736a86
Parents: 23249eb
Author: CHIA-PING TSAI <chia7712@gmail.com>
Authored: Mon Apr 10 17:03:47 2017 +0800
Committer: Chia-Ping Tsai <chia7712@gmail.com>
Committed: Wed Apr 12 11:54:42 2017 +0800

----------------------------------------------------------------------
 .../hadoop/hbase/regionserver/StripeStoreFileManager.java      | 2 +-
 .../hadoop/hbase/regionserver/TestStripeStoreFileManager.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/cf3215d3/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java
index 4a719f3..ef86e2f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.java
@@ -562,7 +562,7 @@ public class StripeStoreFileManager
    */
   private final int nonOpenRowCompare(byte[] k1, byte[] k2) {
     assert !isOpen(k1) && !isOpen(k2);
-    return cellComparator.compareRows(new KeyOnlyKeyValue(k1), k2, 0, k2.length);
+    return Bytes.compareTo(k1, k2);
   }
 
   private final int nonOpenRowCompare(Cell k1, byte[] k2) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/cf3215d3/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java
index a6ce270..ca13263 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java
@@ -58,9 +58,9 @@ public class TestStripeStoreFileManager {
   private static final Path CFDIR = HStore.getStoreHomedir(BASEDIR, "region", Bytes.toBytes("cf"));
 
   private static final byte[] KEY_A = Bytes.toBytes("aaa");
-  private static final byte[] KEY_B = Bytes.toBytes("bbb");
-  private static final byte[] KEY_C = Bytes.toBytes("ccc");
-  private static final byte[] KEY_D = Bytes.toBytes("ddd");
+  private static final byte[] KEY_B = Bytes.toBytes("aab");
+  private static final byte[] KEY_C = Bytes.toBytes("aac");
+  private static final byte[] KEY_D = Bytes.toBytes("aad");
 
   private static final KeyValue KV_A = new KeyValue(KEY_A, 0L);
   private static final KeyValue KV_B = new KeyValue(KEY_B, 0L);


Mime
View raw message