SQOOP-3157: Improve regex introduced in [SQOOP-3152] thus not causing
column mapping and AVRO issues
(Attila Szabo)
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 @@
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.");
