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 4269DDF5E for ; Fri, 19 Oct 2012 17:59:14 +0000 (UTC) Received: (qmail 39273 invoked by uid 500); 19 Oct 2012 17:59:14 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 39240 invoked by uid 500); 19 Oct 2012 17:59:14 -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 39232 invoked by uid 99); 19 Oct 2012 17:59:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Oct 2012 17:59: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; Fri, 19 Oct 2012 17:59:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8E83A23888FE for ; Fri, 19 Oct 2012 17:58:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1400196 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java Date: Fri, 19 Oct 2012 17:58:27 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121019175827.8E83A23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tedyu Date: Fri Oct 19 17:58:27 2012 New Revision: 1400196 URL: http://svn.apache.org/viewvc?rev=1400196&view=rev Log: HBASE-6583 Enhance Hbase load test tool to automatically create column families if not present (Sergey Shelukhin) Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java?rev=1400196&r1=1400195&r2=1400196&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java Fri Oct 19 17:58:27 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);