You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ma...@apache.org on 2017/03/20 20:41:49 UTC

sqoop git commit: SQOOP-3157: Improve regex introduced in [SQOOP-3152] thus not causing column mapping and AVRO issues

Repository: sqoop
Updated Branches:
  refs/heads/trunk e280b47ea -> 690541533


SQOOP-3157: Improve regex introduced in [SQOOP-3152] thus not causing
column mapping and AVRO issues

(Attila Szabo)


Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/69054153
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/69054153
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/69054153

Branch: refs/heads/trunk
Commit: 6905415332c0061ada2e66405ea06cadf23dd7a0
Parents: e280b47
Author: Attila Szabo <ma...@apache.org>
Authored: Mon Mar 20 21:40:49 2017 +0100
Committer: Attila Szabo <ma...@apache.org>
Committed: Mon Mar 20 21:40:49 2017 +0100

----------------------------------------------------------------------
 src/java/org/apache/sqoop/SqoopOptions.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/69054153/src/java/org/apache/sqoop/SqoopOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/sqoop/SqoopOptions.java b/src/java/org/apache/sqoop/SqoopOptions.java
index c3f4604..801942e 100644
--- a/src/java/org/apache/sqoop/SqoopOptions.java
+++ b/src/java/org/apache/sqoop/SqoopOptions.java
@@ -1350,8 +1350,8 @@ public class SqoopOptions implements Cloneable {
 
       try {
         output.put(
-            URLDecoder.decode(details[0].replace("#", ","), "UTF-8"),
-            URLDecoder.decode(details[1].replace("#", ","), "UTF-8"));
+            URLDecoder.decode(details[0].replaceAll("\\(([0-9]+)#([0-9]+)\\)", "($1,$2)"), "UTF-8"),
+            URLDecoder.decode(details[1].replaceAll("\\(([0-9]+)#([0-9]+)\\)", "($1,$2)"), "UTF-8"));
       } catch (UnsupportedEncodingException e) {
         throw new IllegalArgumentException("Encoding not supported. "
             + "Column mapping should be UTF-8 encoding.");