svn commit: r1578672 - /hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java

[tedyu]

Author: tedyu
Date: Tue Mar 18 00:02:14 2014
New Revision: 1578672

URL: http://svn.apache.org/r1578672
Log:
HBASE-10778 Unique keys accounting in MultiThreadedReader is incorrect


Modified:
    
hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java

Modified: 
hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java?rev=1578672&r1=1578671&r2=1578672&view=diff
==============================================================================
--- 
hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java
 (original)
+++ 
hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedReader.java
 Tue Mar 18 00:02:14 2014
@@ -180,8 +180,8 @@ public class MultiThreadedReader extends
       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
             readingRandomKeyStartIndex = numKeys;
           }
           numKeys++;
-        } while (numKeys < batchSize);
+        } while (numKeys < batchSize && curKey < endKey && !aborted);
 
         if (numKeys > 0) { //meaning there is some key to read
           readKey(keysForThisReader);