Index: src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java (revision 1532436) +++ src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java (working copy) @@ -668,7 +668,7 @@ this.lock.readLock().lock(); try { return Collections.singletonList( - new MemStoreScanner()); + new MemStoreScanner(MultiVersionConsistencyControl.getThreadReadPoint())); } finally { this.lock.readLock().unlock(); } @@ -716,6 +716,7 @@ // the pre-calculated KeyValue to be returned by peek() or next() private KeyValue theNext; + private long readPoint; /* Some notes... @@ -738,16 +739,15 @@ the adds to kvset in the MemStoreScanner. */ - MemStoreScanner() { + MemStoreScanner(long readPoint) { super(); + this.readPoint = readPoint; kvsetAtCreation = kvset; snapshotAtCreation = snapshot; } private KeyValue getNext(Iterator it) { - long readPoint = MultiVersionConsistencyControl.getThreadReadPoint(); - KeyValue v = null; try { while (it.hasNext()) {