[kylin] branch 2.4.x updated: KYLIN-3500 fix dumplicated tablename at createSqoopToFlatHiveStep when use jdbc datasource

[shaofengshi]

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch 2.4.x
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/2.4.x by this push:
     new 459b982  KYLIN-3500 fix dumplicated tablename at 
createSqoopToFlatHiveStep  when use jdbc datasource
459b982 is described below

commit 459b982faf584be02318bc045b662573701718b1
Author: ZhansShaoxiong <shaoxiong0...@gmail.com>
AuthorDate: Mon Aug 20 14:21:47 2018 +0800

    KYLIN-3500 fix dumplicated tablename at createSqoopToFlatHiveStep  when use 
jdbc datasource
---
 .../java/org/apache/kylin/source/jdbc/JdbcHiveMRInput.java   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcHiveMRInput.java 
b/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcHiveMRInput.java
index fcdb516..553a2a1 100644
--- 
a/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcHiveMRInput.java
+++ 
b/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcHiveMRInput.java
@@ -184,15 +184,11 @@ public class JdbcHiveMRInput extends HiveMRInput {
                 }
             }
 
-            //related to 
"kylin.engine.mr.config-override.mapreduce.job.queuename"
-            String queueName = getSqoopJobQueueName(config);
-            String cmd = String.format("%s/sqoop import 
-Dorg.apache.sqoop.splitter.allow_text_splitter=true "
-                    + generateSqoopConfigArgString()
+            String cmd = String.format("%s/sqoop import" + 
generateSqoopConfigArgString()
                     + "--connect \"%s\" --driver %s --username %s --password 
%s --query \"%s AND \\$CONDITIONS\" "
-                    + "--target-dir %s/%s --split-by %s.%s --boundary-query 
\"%s\" --null-string '' "
+                    + "--target-dir %s/%s --split-by %s --boundary-query 
\"%s\" --null-string '' "
                     + "--fields-terminated-by '%s' --num-mappers %d", 
sqoopHome, connectionUrl, driverClass, jdbcUser,
-                    jdbcPass, selectSql, jobWorkingDir, hiveTable, splitTable, 
splitColumn, bquery, filedDelimiter,
-                    mapperNum);
+                    jdbcPass, selectSql, jobWorkingDir, hiveTable, 
splitColumn, bquery, filedDelimiter, mapperNum);
             logger.debug(String.format("sqoop cmd:%s", cmd));
             CmdStep step = new CmdStep();
             step.setCmd(cmd);
@@ -212,7 +208,7 @@ public class JdbcHiveMRInput extends HiveMRInput {
             config.putAll(SourceConfigurationUtil.loadSqoopConfiguration());
             config.putAll(kylinConfig.getSqoopConfigOverride());
 
-            StringBuilder args = new StringBuilder();
+            StringBuilder args = new StringBuilder(" 
-Dorg.apache.sqoop.splitter.allow_text_splitter=true ");
             for (Map.Entry<String, String> entry : config.entrySet()) {
                 args.append(" -D" + entry.getKey() + "=" + entry.getValue() + 
" ");
             }