Return-Path: X-Original-To: apmail-incubator-sqoop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-sqoop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B41179C0D for ; Fri, 27 Jan 2012 22:01:58 +0000 (UTC) Received: (qmail 69657 invoked by uid 500); 27 Jan 2012 22:01:58 -0000 Delivered-To: apmail-incubator-sqoop-commits-archive@incubator.apache.org Received: (qmail 69616 invoked by uid 500); 27 Jan 2012 22:01:58 -0000 Mailing-List: contact sqoop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sqoop-dev@incubator.apache.org Delivered-To: mailing list sqoop-commits@incubator.apache.org Received: (qmail 69604 invoked by uid 99); 27 Jan 2012 22:01:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jan 2012 22:01:57 +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, 27 Jan 2012 22:01:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D189D2388860; Fri, 27 Jan 2012 22:01:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1236903 - /incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/BaseSqoopTool.java Date: Fri, 27 Jan 2012 22:01:34 -0000 To: sqoop-commits@incubator.apache.org From: blee@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120127220134.D189D2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: blee Date: Fri Jan 27 22:01:34 2012 New Revision: 1236903 URL: http://svn.apache.org/viewvc?rev=1236903&view=rev Log: SQOOP-422. Throw an exception when --direct and hbase* options are used together Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/BaseSqoopTool.java Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/BaseSqoopTool.java URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/BaseSqoopTool.java?rev=1236903&r1=1236902&r2=1236903&view=diff ============================================================================== --- incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/BaseSqoopTool.java (original) +++ incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/BaseSqoopTool.java Fri Jan 27 22:01:34 2012 @@ -949,6 +949,10 @@ public abstract class BaseSqoopTool exte "Both --hbase-table and --column-family must be set together." + HELP_STR); } + if (options.getHBaseTable() != null && options.isDirect()) { + throw new InvalidOptionsException("Direct import is incompatible with " + + "HBase. Please remove parameter --direct"); + } } /**