Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 054CF200CD4 for ; Sat, 29 Jul 2017 22:53:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 03B89164A73; Sat, 29 Jul 2017 20:53:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4773F164A6F for ; Sat, 29 Jul 2017 22:53:02 +0200 (CEST) Received: (qmail 34130 invoked by uid 500); 29 Jul 2017 20:53:01 -0000 Mailing-List: contact commits-help@gobblin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@gobblin.incubator.apache.org Delivered-To: mailing list commits@gobblin.incubator.apache.org Received: (qmail 34121 invoked by uid 99); 29 Jul 2017 20:53:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Jul 2017 20:53:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 64D3CE361C; Sat, 29 Jul 2017 20:53:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: abti@apache.org To: commits@gobblin.apache.org Message-Id: <835c202bca144846886be08de1885729@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-gobblin git commit: [GOBBLIN-175] Escape string in hive query for avro2orc conversion Date: Sat, 29 Jul 2017 20:53:01 +0000 (UTC) archived-at: Sat, 29 Jul 2017 20:53:03 -0000 Repository: incubator-gobblin Updated Branches: refs/heads/master 11646563a -> 9b68773e0 [GOBBLIN-175] Escape string in hive query for avro2orc conversion Closes #2029 from aditya1105/avro2orc Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/9b68773e Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/9b68773e Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/9b68773e Branch: refs/heads/master Commit: 9b68773e0384f75f523203ff46178f183c51a485 Parents: 1164656 Author: aditya1105 Authored: Sat Jul 29 13:52:55 2017 -0700 Committer: Abhishek Tiwari Committed: Sat Jul 29 13:52:55 2017 -0700 ---------------------------------------------------------------------- .../hive/query/HiveAvroORCQueryGenerator.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/9b68773e/gobblin-data-management/src/main/java/gobblin/data/management/conversion/hive/query/HiveAvroORCQueryGenerator.java ---------------------------------------------------------------------- diff --git a/gobblin-data-management/src/main/java/gobblin/data/management/conversion/hive/query/HiveAvroORCQueryGenerator.java b/gobblin-data-management/src/main/java/gobblin/data/management/conversion/hive/query/HiveAvroORCQueryGenerator.java index 850ee4d..023e060 100644 --- a/gobblin-data-management/src/main/java/gobblin/data/management/conversion/hive/query/HiveAvroORCQueryGenerator.java +++ b/gobblin-data-management/src/main/java/gobblin/data/management/conversion/hive/query/HiveAvroORCQueryGenerator.java @@ -511,7 +511,7 @@ public class HiveAvroORCQueryGenerator { if (hiveColumns.isPresent()) { hiveColumns.get().put(name, type); } - columns.append(String.format(" `%s` %s COMMENT '%s'", name, type, comment)); + columns.append(String.format(" `%s` %s COMMENT '%s'", name, type, escapeStringForHive(comment))); } return columns.toString(); @@ -848,7 +848,7 @@ public class HiveAvroORCQueryGenerator { ddl.add(String.format("USE %s%n", finalDbName)); ddl.add(String.format("ALTER TABLE `%s` CHANGE COLUMN %s %s %s COMMENT '%s'", finalTableName, evolvedColumn.getKey(), evolvedColumn.getKey(), evolvedColumn.getValue(), - destinationField.getComment())); + escapeStringForHive(destinationField.getComment()))); } found = true; break; @@ -1101,4 +1101,16 @@ public class HiveAvroORCQueryGenerator { return String.format("'%s'", value); } }; + + private static String escapeStringForHive(String st) { + char backslash = '\\'; + char singleQuote = '\''; + char semicolon = ';'; + String escapedSingleQuote = String.valueOf(backslash) + String.valueOf(singleQuote); + String escapedSemicolon = String.valueOf(backslash) + String.valueOf(semicolon); + + st = st.replace(String.valueOf(singleQuote), escapedSingleQuote) + .replace(String.valueOf(semicolon), escapedSemicolon); + return st; + } }