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 9DD76DCE5 for ; Thu, 30 Aug 2012 21:13:54 +0000 (UTC) Received: (qmail 5602 invoked by uid 500); 30 Aug 2012 21:13:54 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 5564 invoked by uid 500); 30 Aug 2012 21:13:54 -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 5556 invoked by uid 99); 30 Aug 2012 21:13:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Aug 2012 21:13:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Aug 2012 21:13:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 57FEB23888FD for ; Thu, 30 Aug 2012 21:13:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1379152 - in /hbase/trunk/hbase-server/src: main/java/org/apache/hadoop/hbase/regionserver/HRegion.java test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Date: Thu, 30 Aug 2012 21:13:08 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120830211308.57FEB23888FD@eris.apache.org> Author: stack Date: Thu Aug 30 21:13:07 2012 New Revision: 1379152 URL: http://svn.apache.org/viewvc?rev=1379152&view=rev Log: HBASE-6689 HRegion.increment comment nits Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1379152&r1=1379151&r2=1379152&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Thu Aug 30 21:13:07 2012 @@ -4842,7 +4842,7 @@ public class HRegion implements HeapSize now, Bytes.toBytes(amount)); kvs.add(newKV); - // Append update to WAL + // Prepare WAL updates if (writeToWAL) { if (walEdits == null) { walEdits = new WALEdit(); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=1379152&r1=1379151&r2=1379152&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Thu Aug 30 21:13:07 2012 @@ -3662,7 +3662,7 @@ public class TestHRegion extends HBaseTe this.region = initHRegion(tableName, method, conf, family); final HRegion region = this.region; final AtomicBoolean incrementDone = new AtomicBoolean(false); - Runnable reader = new Runnable() { + Runnable flusher = new Runnable() { @Override public void run() { while (!incrementDone.get()) { @@ -3680,7 +3680,7 @@ public class TestHRegion extends HBaseTe int incCounter = 100; long expected = threadNum * incCounter; Thread[] incrementers = new Thread[threadNum]; - Thread flushThread = new Thread(reader); + Thread flushThread = new Thread(flusher); for (int i = 0; i < threadNum; i++) { incrementers[i] = new Thread(new Incrementer(this.region, incCounter)); incrementers[i].start();