hbase git commit: HBASE-15133 Data loss after compaction when a row has more than Integer.MAX_VALUE columns (Toshihiro Suzuki)

[ap...@apache.org]

Repository: hbase
Updated Branches:
  refs/heads/0.98 e7afd3f96 -> e18b62cb9


HBASE-15133 Data loss after compaction when a row has more than Integer.MAX_VALUE columns (Toshihiro Suzuki)


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

Branch: refs/heads/0.98
Commit: e18b62cb9d5f522d1f86fe9af17f747677e32c19
Parents: e7afd3f
Author: tedyu <yu...@gmail.com>
Authored: Fri Jan 22 02:41:02 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Feb 9 23:52:27 2016 -0800

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/regionserver/StoreScanner.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e18b62cb/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index e30bf59..fc034ed 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -59,7 +59,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
   protected KeyValueHeap heap;
   protected boolean cacheBlocks;
 
-  protected int countPerRow = 0;
+  protected long countPerRow = 0;
   protected int storeLimit = -1;
   protected int storeOffset = 0;