You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/02/09 00:14:11 UTC
[31/32] hbase git commit: HBASE-15158 Change order in which we do
write pipeline operations; do all under row locks
HBASE-15158 Change order in which we do write pipeline operations; do all under row locks
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ec92a8a7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ec92a8a7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ec92a8a7
Branch: refs/heads/hbase-12439
Commit: ec92a8a705dfec076a93454e1042645d466758f0
Parents: dfd8a31
Author: stack <st...@apache.org>
Authored: Sun Feb 7 22:56:40 2016 -0800
Committer: stack <st...@apache.org>
Committed: Sun Feb 7 22:56:40 2016 -0800
----------------------------------------------------------------------
.../hbase/regionserver/DefaultMemStore.java | 7 +-
.../hadoop/hbase/regionserver/HRegion.java | 2216 +++++++-----------
.../hbase/regionserver/wal/FSWALEntry.java | 5 +-
.../hadoop/hbase/regionserver/wal/HLogKey.java | 4 +-
.../hadoop/hbase/regionserver/wal/WALUtil.java | 96 +-
.../org/apache/hadoop/hbase/wal/WALKey.java | 185 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 12 +-
7 files changed, 1063 insertions(+), 1462 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ec92a8a7/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
index 2984754..f61d871 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
@@ -457,7 +457,6 @@ public class DefaultMemStore implements MemStore {
* This is called under row lock, so Get operations will still see updates
* atomically. Scans will only see each KeyValue update as atomic.
*
- * @param cells
* @param readpoint readpoint below which we can safely remove duplicate KVs
* @return change in memstore size
*/
@@ -578,7 +577,7 @@ public class DefaultMemStore implements MemStore {
// last iterated Cells for cellSet and snapshot (to restore iterator state after reseek)
private Cell cellSetItRow = null;
private Cell snapshotItRow = null;
-
+
// iterator based scanning.
private Iterator<Cell> cellSetIt;
private Iterator<Cell> snapshotIt;
@@ -593,7 +592,7 @@ public class DefaultMemStore implements MemStore {
// The allocator and snapshot allocator at the time of creating this scanner
volatile MemStoreLAB allocatorAtCreation;
volatile MemStoreLAB snapshotAllocatorAtCreation;
-
+
// A flag represents whether could stop skipping Cells for MVCC
// if have encountered the next row. Only used for reversed scan
private boolean stopSkippingCellsIfNextRow = false;
@@ -806,7 +805,7 @@ public class DefaultMemStore implements MemStore {
this.cellSetIt = null;
this.snapshotIt = null;
-
+
if (allocatorAtCreation != null) {
this.allocatorAtCreation.decScannerCount();
this.allocatorAtCreation = null;