Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@locus.apache.org Received: (qmail 32425 invoked from network); 15 Aug 2008 19:04:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Aug 2008 19:04:23 -0000 Received: (qmail 37849 invoked by uid 500); 15 Aug 2008 19:04:22 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 37810 invoked by uid 500); 15 Aug 2008 19:04:22 -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 37801 invoked by uid 99); 15 Aug 2008 19:04:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2008 12:04:22 -0700 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; Fri, 15 Aug 2008 19:03:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 05BD123889A0; Fri, 15 Aug 2008 12:03:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r686324 - in /hadoop/hbase/branches/0.2: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Date: Fri, 15 Aug 2008 19:03:32 -0000 To: hbase-commits@hadoop.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080815190333.05BD123889A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Fri Aug 15 12:03:31 2008 New Revision: 686324 URL: http://svn.apache.org/viewvc?rev=686324&view=rev Log: HBASE-833 Doing an insert with an unknown family throws a NPE in HRS Modified: hadoop/hbase/branches/0.2/CHANGES.txt hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Modified: hadoop/hbase/branches/0.2/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.2/CHANGES.txt?rev=686324&r1=686323&r2=686324&view=diff ============================================================================== --- hadoop/hbase/branches/0.2/CHANGES.txt (original) +++ hadoop/hbase/branches/0.2/CHANGES.txt Fri Aug 15 12:03:31 2008 @@ -25,6 +25,7 @@ (Jean-Daniel Cryans via Stack) HBASE-831 committing BatchUpdate with no row should complain (Andrew Purtell via Jim Kellerman) + HBASE-833 Doing an insert with an unknown family throws a NPE in HRS IMPROVEMENTS HBASE-801 When a table haven't disable, shell could response in a "user Modified: hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=686324&r1=686323&r2=686324&view=diff ============================================================================== --- hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original) +++ hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Fri Aug 15 12:03:31 2008 @@ -54,6 +54,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HMsg; import org.apache.hadoop.hbase.HRegionInfo; @@ -1158,15 +1159,18 @@ batchUpdate.iterator(); iter.hasNext();) { BatchOperation operation = iter.next(); - int maxLength = - desc.getFamily(HStoreKey.getFamily(operation.getColumn())). - getMaxValueLength(); - if(operation.getValue() != null) - if(operation.getValue().length > maxLength) { - throw new IOException("Value in column " + - Bytes.toString(operation.getColumn()) + " is too long. " + - operation.getValue().length + " instead of " + maxLength); + if (operation.getValue() != null) { + HColumnDescriptor fam = + desc.getFamily(HStoreKey.getFamily(operation.getColumn())); + if (fam != null) { + int maxLength = fam.getMaxValueLength(); + if (operation.getValue().length > maxLength) { + throw new IOException("Value in column " + + Bytes.toString(operation.getColumn()) + " is too long. " + + operation.getValue().length + " instead of " + maxLength); + } } + } } }