You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2014/06/28 02:31:22 UTC
[36/49] git commit: HBASE-10778 Unique keys accounting in
MultiThreadedReader is incorrect
HBASE-10778 Unique keys accounting in MultiThreadedReader is incorrect
git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-10070@1578672 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f09ab44c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f09ab44c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f09ab44c
Branch: refs/heads/master
Commit: f09ab44cc689e30d56da13ec39d150afa8b63ee9
Parents: ffabf9b
Author: Zhihong Yu <te...@apache.org>
Authored: Tue Mar 18 00:02:14 2014 +0000
Committer: Enis Soztutar <en...@apache.org>
Committed: Fri Jun 27 16:39:39 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/util/MultiThreadedReader.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f09ab44c/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java
index df0d3f8..cc87800 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java
@@ -180,8 +180,8 @@ public class MultiThreadedReader extends MultiThreadedAction
startTimeMs = System.currentTimeMillis();
curKey = startKey;
long [] keysForThisReader = new long[batchSize];
- int readingRandomKeyStartIndex = -1;
while (curKey < endKey && !aborted) {
+ int readingRandomKeyStartIndex = -1;
int numKeys = 0;
// if multiGet, loop until we have the number of keys equal to the batch size
do {
@@ -204,7 +204,7 @@ public class MultiThreadedReader extends MultiThreadedAction
readingRandomKeyStartIndex = numKeys;
}
numKeys++;
- } while (numKeys < batchSize);
+ } while (numKeys < batchSize && curKey < endKey && !aborted);
if (numKeys > 0) { //meaning there is some key to read
readKey(keysForThisReader);