Repository: kylin Updated Branches: refs/heads/master bc040a9dd -> 8826e1ded
KYLIN-3277 Automatically remove the blank at the end of lines in properties files Signed-off-by: Billy Liu <billy...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8826e1de Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8826e1de Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8826e1de Branch: refs/heads/master Commit: 8826e1dedf33b7a6df7ea0615b5ec66736807419 Parents: bc040a9 Author: GuangYaoLee92 <1012461...@qq.com> Authored: Thu Feb 8 16:17:13 2018 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Thu Feb 8 17:14:59 2018 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfig.java | 2 +- .../test/java/org/apache/kylin/common/KylinConfigTest.java | 9 +++++++++ examples/test_case_data/localmeta/kylin.properties | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8826e1de/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java index 8872f45..959bc14 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java @@ -302,7 +302,7 @@ public class KylinConfig extends KylinConfigBase { OrderedProperties orderedProperties = buildSiteOrderedProps(); for (Map.Entry<String, String> each : orderedProperties.entrySet()) { - conf.put(each.getKey(), each.getValue()); + conf.put(each.getKey(), each.getValue().trim()); } return conf; http://git-wip-us.apache.org/repos/asf/kylin/blob/8826e1de/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java b/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java index 045ecb4..8ed1b42 100644 --- a/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/KylinConfigTest.java @@ -131,4 +131,13 @@ public class KylinConfigTest extends HotLoadKylinPropertiesTestCase { String hdfsWorkingDirectory = conf.getHdfsWorkingDirectory(); assertTrue(hdfsWorkingDirectory.startsWith("file:/")); } + + @Test + public void testUnexpectedBlankInPro() { + KylinConfig conf = KylinConfig.getInstanceFromEnv(); + Map<String, String> override = conf.getPropertiesByPrefix("kylin.engine.mr.config-override."); + assertEquals(2, override.size()); + String s = override.get("test2"); + assertEquals("test2", s); + } } http://git-wip-us.apache.org/repos/asf/kylin/blob/8826e1de/examples/test_case_data/localmeta/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties index 1e3f2ff..dede8ab 100644 --- a/examples/test_case_data/localmeta/kylin.properties +++ b/examples/test_case_data/localmeta/kylin.properties @@ -136,7 +136,7 @@ kylin.security.saml.context-path=/kylin # for tests kylin.test.bcc.new.key=some-value kylin.engine.mr.config-override.test1=test1 -kylin.engine.mr.config-override.test2=test2 +kylin.engine.mr.config-override.test2=test2 kylin.job.lock=org.apache.kylin.job.lock.MockJobLockDup kylin.job.lock=org.apache.kylin.job.lock.MockJobLock
