Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@minotaur.apache.org Received: (qmail 59220 invoked from network); 14 Sep 2009 16:01:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Sep 2009 16:01:03 -0000 Received: (qmail 36397 invoked by uid 500); 14 Sep 2009 16:01:02 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 36346 invoked by uid 500); 14 Sep 2009 16:01:02 -0000 Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hbase-dev@hadoop.apache.org Delivered-To: mailing list hbase-commits@hadoop.apache.org Received: (qmail 36337 invoked by uid 99); 14 Sep 2009 16:01:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Sep 2009 16:01:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 14 Sep 2009 16:00:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 43A702388876; Mon, 14 Sep 2009 16:00:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r814714 - in /hadoop/hbase/trunk: CHANGES.txt src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java src/java/org/apache/hadoop/hbase/client/Result.java Date: Mon, 14 Sep 2009 16:00:38 -0000 To: hbase-commits@hadoop.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090914160038.43A702388876@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Mon Sep 14 16:00:37 2009 New Revision: 814714 URL: http://svn.apache.org/viewvc?rev=814714&view=rev Log: HBASE-1836 test of indexed hbase broken Modified: hadoop/hbase/trunk/CHANGES.txt hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java Modified: hadoop/hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=814714&r1=814713&r2=814714&view=diff ============================================================================== --- hadoop/hbase/trunk/CHANGES.txt (original) +++ hadoop/hbase/trunk/CHANGES.txt Mon Sep 14 16:00:37 2009 @@ -21,6 +21,7 @@ HBASE-1740 ICV has a subtle race condition only visible under high load HBASE-1808 [stargate] fix how columns are specified for scanners HBASE-1828 CompareFilters are broken from client-side + HBASE-1836 test of indexed hbase broken IMPROVEMENTS HBASE-1760 Cleanup TODOs in HTable Modified: hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java?rev=814714&r1=814713&r2=814714&view=diff ============================================================================== --- hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java (original) +++ hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java Mon Sep 14 16:00:37 2009 @@ -260,9 +260,11 @@ if (result == null || result.raw() == null) { return currentColumnValues; } - - for(KeyValue kv : result.list()) { - currentColumnValues.put(kv.getColumn(), kv.getValue()); + List list = result.list(); + if (list != null) { + for(KeyValue kv : result.list()) { + currentColumnValues.put(kv.getColumn(), kv.getValue()); + } } return currentColumnValues; } Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java?rev=814714&r1=814713&r2=814714&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java Mon Sep 14 16:00:37 2009 @@ -139,7 +139,7 @@ if(this.kvs == null) { readFields(); } - return Arrays.asList(sorted()); + return isEmpty()? null: Arrays.asList(sorted()); } /**