From commits-return-940-apmail-sqoop-commits-archive=sqoop.apache.org@sqoop.apache.org Thu May 2 00:10:36 2013 Return-Path: X-Original-To: apmail-sqoop-commits-archive@www.apache.org Delivered-To: apmail-sqoop-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 A933EFB52 for ; Thu, 2 May 2013 00:10:36 +0000 (UTC) Received: (qmail 91178 invoked by uid 500); 2 May 2013 00:10:36 -0000 Delivered-To: apmail-sqoop-commits-archive@sqoop.apache.org Received: (qmail 91121 invoked by uid 500); 2 May 2013 00:10:36 -0000 Mailing-List: contact commits-help@sqoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sqoop.apache.org Delivered-To: mailing list commits@sqoop.apache.org Received: (qmail 91112 invoked by uid 99); 2 May 2013 00:10:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 00:10:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A8D918856DA; Thu, 2 May 2013 00:10:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jarcec@apache.org To: commits@sqoop.apache.org Message-Id: <8801426edb1c4707a881ef2fb1f7d8a2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: SQOOP-1024: GenericJdbcConnectorUpgrader must ignore inputs which may not exist in old version Date: Thu, 2 May 2013 00:10:35 +0000 (UTC) Updated Branches: refs/heads/sqoop2 4f318755d -> 810724860 SQOOP-1024: GenericJdbcConnectorUpgrader must ignore inputs which may not exist in old version (Hari Shreedharan via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/81072486 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/81072486 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/81072486 Branch: refs/heads/sqoop2 Commit: 810724860869d46d7d21b1116cea2ba993d6c37e Parents: 4f31875 Author: Jarek Jarcec Cecho Authored: Wed May 1 17:09:57 2013 -0700 Committer: Jarek Jarcec Cecho Committed: Wed May 1 17:09:57 2013 -0700 ---------------------------------------------------------------------- .../jdbc/GenericJdbcConnectorMetadataUpgrader.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/81072486/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcConnectorMetadataUpgrader.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcConnectorMetadataUpgrader.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcConnectorMetadataUpgrader.java index cd461f4..864426c 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcConnectorMetadataUpgrader.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcConnectorMetadataUpgrader.java @@ -18,6 +18,8 @@ */ package org.apache.sqoop.connector.jdbc; +import org.apache.log4j.Logger; +import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.spi.MetadataUpgrader; import org.apache.sqoop.model.MConnectionForms; import org.apache.sqoop.model.MForm; @@ -30,6 +32,9 @@ import java.util.List; import java.util.Map; public class GenericJdbcConnectorMetadataUpgrader extends MetadataUpgrader { + private static final Logger LOG = + Logger.getLogger(GenericJdbcConnectorMetadataUpgrader.class); + /* * For now, there is no real upgrade. So copy all data over, * set the validation messages and error messages to be the same as for the @@ -62,8 +67,13 @@ public class GenericJdbcConnectorMetadataUpgrader extends MetadataUpgrader { List> inputs = form.getInputs(); MForm originalForm = formMap.get(form.getName()); for (MInput input : inputs) { - MInput originalInput = originalForm.getInput(input.getName()); - input.setValue(originalInput.getValue()); + try { + MInput originalInput = originalForm.getInput(input.getName()); + input.setValue(originalInput.getValue()); + } catch (SqoopException ex) { + LOG.warn("Input: " + input.getName() + " not present in old " + + "connector. So it will not be transferred by the upgrader."); + } } } }