From 9af7a50b4c220517536feae2b3aa6359d4b9c717 Mon Sep 17 00:00:00 2001 From: GuangYaoLee92 <1012461549@qq.com> Date: Thu, 8 Feb 2018 16:17:13 +0800 Subject: [PATCH] KYLIN-3277 Automatically remove the blank at the end of lines in properties files --- .../src/main/java/org/apache/kylin/common/KylinConfig.java | 2 +- .../src/test/java/org/apache/kylin/common/KylinConfigTest.java | 9 +++++++++ examples/test_case_data/localmeta/kylin.properties | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) 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 8872f45c2..959bc1426 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 each : orderedProperties.entrySet()) { - conf.put(each.getKey(), each.getValue()); + conf.put(each.getKey(), each.getValue().trim()); } return conf; 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 045ecb4af..8ed1b42dd 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 override = conf.getPropertiesByPrefix("kylin.engine.mr.config-override."); + assertEquals(2, override.size()); + String s = override.get("test2"); + assertEquals("test2", s); + } } diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties index 1e3f2ff72..dede8ab0c 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 -- 2.15.1.windows.2