Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 82838 invoked from network); 6 Nov 2007 20:48:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Nov 2007 20:48:51 -0000 Received: (qmail 66343 invoked by uid 500); 6 Nov 2007 20:48:39 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 66319 invoked by uid 500); 6 Nov 2007 20:48:39 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 66310 invoked by uid 99); 6 Nov 2007 20:48:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Nov 2007 12:48:39 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Nov 2007 20:48:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 08C811A983E; Tue, 6 Nov 2007 12:48:30 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r592551 - in /lucene/hadoop/trunk/src/contrib/hbase: CHANGES.txt src/java/org/apache/hadoop/hbase/HBaseAdmin.java src/java/org/apache/hadoop/hbase/HTableDescriptor.java src/test/org/apache/hadoop/hbase/TestMasterAdmin.java Date: Tue, 06 Nov 2007 20:48:28 -0000 To: hadoop-commits@lucene.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071106204830.08C811A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Tue Nov 6 12:48:27 2007 New Revision: 592551 URL: http://svn.apache.org/viewvc?rev=592551&view=rev Log: HADOOP-2156 BufferUnderflowException for un-named HTableDescriptors Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseAdmin.java lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTableDescriptor.java lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=592551&r1=592550&r2=592551&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original) +++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Tue Nov 6 12:48:27 2007 @@ -27,6 +27,7 @@ the test more deterministic and getting META reassigned was problematic. HADOOP-2155 Method expecting HBaseConfiguration throws NPE when given Configuration + HADOOP-2156 BufferUnderflowException for un-named HTableDescriptors IMPROVEMENTS HADOOP-2401 Add convenience put method that takes writable Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseAdmin.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseAdmin.java?rev=592551&r1=592550&r2=592551&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseAdmin.java (original) +++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseAdmin.java Tue Nov 6 12:48:27 2007 @@ -112,7 +112,6 @@ */ public void createTable(HTableDescriptor desc) throws IOException { - createTableAsync(desc); // Wait for new table to come on-line @@ -134,15 +133,12 @@ */ public void createTableAsync(HTableDescriptor desc) throws IOException { - if (this.master == null) { throw new MasterNotRunningException("master has been shut down"); } - checkReservedTableName(desc.getName()); try { this.master.createTable(desc); - } catch (RemoteException e) { throw RemoteExceptionHandler.decodeRemoteException(e); } @@ -492,10 +488,12 @@ * @throws IllegalArgumentException - if the table name is reserved */ protected void checkReservedTableName(Text tableName) { + if (tableName == null || tableName.getLength() <= 0) { + throw new IllegalArgumentException("Null or empty table name"); + } if(tableName.charAt(0) == '-' || tableName.charAt(0) == '.' || tableName.find(",") != -1) { - throw new IllegalArgumentException(tableName + " is a reserved table name"); } } @@ -507,4 +505,4 @@ return metaservers.get((metaservers.containsKey(tableName)) ? tableName : metaservers.headMap(tableName).lastKey()); } -} +} \ No newline at end of file Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTableDescriptor.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=592551&r1=592550&r2=592551&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTableDescriptor.java (original) +++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTableDescriptor.java Tue Nov 6 12:48:27 2007 @@ -74,7 +74,11 @@ families.put(family.getName(), family); } - /** Constructs an empty object */ + /** + * Constructs an empty object. + * For deserializing an HTableDescriptor instance only. + * @see #HTableDescriptor(String) + */ public HTableDescriptor() { this.name = new Text(); this.families = new TreeMap(); Modified: lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java?rev=592551&r1=592550&r2=592551&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java (original) +++ lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java Tue Nov 6 12:48:27 2007 @@ -41,6 +41,15 @@ /** @throws Exception */ public void testMasterAdmin() throws Exception { admin = new HBaseAdmin(conf); + // Add test that exception is thrown if descriptor is without a table name. + // HADOOP-2156. + boolean exception = false; + try { + admin.createTable(new HTableDescriptor()); + } catch (IllegalArgumentException e) { + exception = true; + } + assertTrue(exception); admin.createTable(testDesc); admin.disableTable(testDesc.getName()); @@ -68,4 +77,4 @@ admin.deleteColumn(testDesc.getName(), new Text("col2:")); admin.deleteTable(testDesc.getName()); } -} +} \ No newline at end of file