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 800549549 for ; Mon, 23 Jul 2012 05:25:15 +0000 (UTC) Received: (qmail 86679 invoked by uid 500); 23 Jul 2012 05:25:15 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 86521 invoked by uid 500); 23 Jul 2012 05:25:15 -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 86503 invoked by uid 99); 23 Jul 2012 05:25:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jul 2012 05:25:14 +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; Mon, 23 Jul 2012 05:25:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D99AA238890D for ; Mon, 23 Jul 2012 05:24:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1364502 - in /hbase/branches/0.94/src: main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java Date: Mon, 23 Jul 2012 05:24:52 -0000 To: commits@hbase.apache.org From: larsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120723052452.D99AA238890D@eris.apache.org> Author: larsh Date: Mon Jul 23 05:24:52 2012 New Revision: 1364502 URL: http://svn.apache.org/viewvc?rev=1364502&view=rev Log: HBASE-5659 TestAtomicOperation.testMultiRowMutationMultiThreads is still failing occasionally Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=1364502&r1=1364501&r2=1364502&view=diff ============================================================================== --- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original) +++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Mon Jul 23 05:24:52 2012 @@ -469,7 +469,7 @@ class StoreScanner extends NonLazyKeyVal if (this.heap == null && this.lastTop != null) { resetScannerStack(this.lastTop); if (this.heap.peek() == null - || store.comparator.compare(this.lastTop, this.heap.peek()) != 0) { + || store.comparator.compareRows(this.lastTop, this.heap.peek()) != 0) { LOG.debug("Storescanner.peek() is changed where before = " + this.lastTop.toString() + ",and after = " + this.heap.peek()); this.lastTop = null; Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java?rev=1364502&r1=1364501&r2=1364502&view=diff ============================================================================== --- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java (original) +++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java Mon Jul 23 05:24:52 2012 @@ -255,7 +255,7 @@ public class TestAtomicOperation extends LOG.info("Starting test testRowMutationMultiThreads"); initHRegion(tableName, getName(), fam1); - // create 100 threads, each will alternate between adding and + // create 10 threads, each will alternate between adding and // removing a column int numThreads = 10; int opsPerThread = 500; @@ -339,10 +339,10 @@ public class TestAtomicOperation extends LOG.info("Starting test testMultiRowMutationMultiThreads"); initHRegion(tableName, getName(), fam1); - // create 100 threads, each will alternate between adding and + // create 10 threads, each will alternate between adding and // removing a column int numThreads = 10; - int opsPerThread = 1000; + int opsPerThread = 500; AtomicOperation[] all = new AtomicOperation[numThreads]; AtomicLong timeStamps = new AtomicLong(0);