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 DEDF2DD85 for ; Mon, 22 Oct 2012 22:58:46 +0000 (UTC) Received: (qmail 788 invoked by uid 500); 22 Oct 2012 22:58:46 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 754 invoked by uid 500); 22 Oct 2012 22:58:46 -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 747 invoked by uid 99); 22 Oct 2012 22:58:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2012 22:58:46 +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, 22 Oct 2012 22:58:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8033223888FD for ; Mon, 22 Oct 2012 22:58:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1401116 - /hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java Date: Mon, 22 Oct 2012 22:58:02 -0000 To: commits@hbase.apache.org From: apurtell@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121022225802.8033223888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apurtell Date: Mon Oct 22 22:58:02 2012 New Revision: 1401116 URL: http://svn.apache.org/viewvc?rev=1401116&view=rev Log: HBASE-6583. Enhance LoadTestTool to automatically create column families if not present (Sergey Shelukhin) Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java?rev=1401116&r1=1401115&r2=1401116&view=diff ============================================================================== --- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java (original) +++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java Mon Oct 22 22:58:02 2012 @@ -155,6 +155,10 @@ public class LoadTestTool extends Abstra admin.disableTable(tableName); for (byte[] cf : columnFamilies) { HColumnDescriptor columnDesc = tableDesc.getFamily(cf); + boolean isNewCf = columnDesc == null; + if (isNewCf) { + columnDesc = new HColumnDescriptor(cf); + } if (bloomType != null) { columnDesc.setBloomFilterType(bloomType); } @@ -165,7 +169,11 @@ public class LoadTestTool extends Abstra columnDesc.setDataBlockEncoding(dataBlockEncodingAlgo); columnDesc.setEncodeOnDisk(!encodeInCacheOnly); } - admin.modifyColumn(tableName, columnDesc); + if (isNewCf) { + admin.addColumn(tableName, columnDesc); + } else { + admin.modifyColumn(tableName, columnDesc); + } } LOG.info("Enabling table " + Bytes.toString(tableName)); admin.enableTable(tableName);