Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0200517AA5 for ; Mon, 8 Feb 2016 06:56:48 +0000 (UTC) Received: (qmail 26100 invoked by uid 500); 8 Feb 2016 06:56:47 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 25961 invoked by uid 500); 8 Feb 2016 06:56:47 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 25940 invoked by uid 99); 8 Feb 2016 06:56:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Feb 2016 06:56:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8EECFDFAFF; Mon, 8 Feb 2016 06:56:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Date: Mon, 08 Feb 2016 06:56:49 -0000 Message-Id: <7261f57b0c8f4cdab0a84382e71cd37b@git.apache.org> In-Reply-To: <64ea5aa110e54beb83f41e973989e2a6@git.apache.org> References: <64ea5aa110e54beb83f41e973989e2a6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/master Commit: ec92a8a705dfec076a93454e1042645d466758f0 Parents: dfd8a31 Author: stack Authored: Sun Feb 7 22:56:40 2016 -0800 Committer: stack 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 cellSetIt; private Iterator 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;