KYLIN-3070 give a better method name for jdbc delimeter
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fab517b9 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fab517b9 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fab517b9 Branch: refs/heads/master Commit: fab517b951fdcc7cd2f74f38f3f2e6991bcfada0 Parents: 9df8572 Author: shaofengshi <shaofeng...@apache.org> Authored: Sat Dec 9 22:34:57 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Sat Dec 9 22:34:57 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ++-- .../main/java/org/apache/kylin/source/jdbc/JdbcHiveMRInput.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/fab517b9/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index d0cc3be..66805df 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -664,7 +664,7 @@ abstract public class KylinConfigBase implements Serializable { } public String getFlatTableStorageFormat() { - return this.getOptional("kylin.source.hive.flat-table-storage-format", "SEQUENCEFILE").toUpperCase(); + return this.getOptional("kylin.source.hive.flat-table-storage-format", "SEQUENCEFILE"); } public String getFlatTableFieldDelimiter() { @@ -768,7 +768,7 @@ abstract public class KylinConfigBase implements Serializable { return Integer.parseInt(getOptional("kylin.source.jdbc.sqoop-mapper-num", "4")); } - public String getSourceFieldDelimiter() { + public String getJdbcSourceFieldDelimiter() { return getOptional("kylin.source.jdbc.field-delimiter", "|"); } http://git-wip-us.apache.org/repos/asf/kylin/blob/fab517b9/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcHiveMRInput.java ---------------------------------------------------------------------- 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 0bfc145..d05f14e 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 @@ -67,7 +67,7 @@ public class JdbcHiveMRInput extends HiveMRInput { private AbstractExecutable createFlatHiveTableFromFiles(String hiveInitStatements, String jobWorkingDir) { final String dropTableHql = JoinedFlatTable.generateDropTableStatement(flatDesc); - String filedDelimiter = getConfig().getSourceFieldDelimiter(); + String filedDelimiter = getConfig().getJdbcSourceFieldDelimiter(); // Sqoop does not support exporting SEQUENSEFILE to Hive now SQOOP-869 final String createTableHql = JoinedFlatTable.generateCreateTableStatement(flatDesc, jobWorkingDir, "TEXTFILE", filedDelimiter); @@ -153,7 +153,7 @@ public class JdbcHiveMRInput extends HiveMRInput { String jdbcUser = config.getJdbcSourceUser(); String jdbcPass = config.getJdbcSourcePass(); String sqoopHome = config.getSqoopHome(); - String filedDelimiter = config.getSourceFieldDelimiter(); + String filedDelimiter = config.getJdbcSourceFieldDelimiter(); int mapperNum = config.getSqoopMapperNum(); String bquery = String.format("SELECT min(%s), max(%s) FROM %s.%s", splitColumn, splitColumn, splitDatabase,
