Repository: kylin Updated Branches: refs/heads/master 73ec4a4c2 -> 9410b015b
KYLIN-2195 fix test Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9410b015 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9410b015 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9410b015 Branch: refs/heads/master Commit: 9410b015bfac9543106927afda323a375658b0fc Parents: 73ec4a4 Author: Li Yang <[email protected]> Authored: Wed Nov 16 11:25:02 2016 +0800 Committer: Li Yang <[email protected]> Committed: Wed Nov 16 11:25:02 2016 +0800 ---------------------------------------------------------------------- .../common/BackwardCompatibilityConfig.java | 20 ++++++++++---------- .../apache/kylin/common/KylinConfigBase.java | 8 ++++---- .../org/apache/kylin/common/KylinConfigExt.java | 4 ++-- .../apache/kylin/common/KylinConfigTest.java | 9 +++------ 4 files changed, 19 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9410b015/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java b/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java index 0ca6f6d..93c834e 100644 --- a/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java +++ b/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java @@ -35,20 +35,20 @@ import com.google.common.collect.Maps; public class BackwardCompatibilityConfig { private static final Logger logger = LoggerFactory.getLogger(BackwardCompatibilityConfig.class); - static InputStream bccTestInput = null; private final Map<String, String> old2new = Maps.newConcurrentMap(); public BackwardCompatibilityConfig() { - InputStream is; - if (bccTestInput == null) { - // normal - is = Thread.currentThread().getContextClassLoader().getResourceAsStream("kylin-backward-compatibility.properties"); - } else { - // for test - is = bccTestInput; - bccTestInput = null; - } + InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("kylin-backward-compatibility.properties"); + init(is); + } + + // for test + BackwardCompatibilityConfig(InputStream is) { + init(is); + } + + private void init(InputStream is) { if (is == null) return; http://git-wip-us.apache.org/repos/asf/kylin/blob/9410b015/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 c116814..6d9eef4 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 @@ -62,7 +62,7 @@ abstract public class KylinConfigBase implements Serializable { } // backward compatibility check happens when properties is loaded or updated - static final BackwardCompatibilityConfig CBC = new BackwardCompatibilityConfig(); + static BackwardCompatibilityConfig BCC = new BackwardCompatibilityConfig(); // ============================================================================ @@ -73,7 +73,7 @@ abstract public class KylinConfigBase implements Serializable { } public KylinConfigBase(Properties props) { - this.properties = CBC.check(props); + this.properties = BCC.check(props); } final protected String getOptional(String prop) { @@ -131,11 +131,11 @@ abstract public class KylinConfigBase implements Serializable { */ final public void setProperty(String key, String value) { logger.info("Kylin Config was updated with " + key + " : " + value); - properties.setProperty(CBC.check(key), value); + properties.setProperty(BCC.check(key), value); } final protected void reloadKylinConfig(Properties properties) { - this.properties = CBC.check(properties); + this.properties = BCC.check(properties); } // ============================================================================ http://git-wip-us.apache.org/repos/asf/kylin/blob/9410b015/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java index 7a4f4aa..287b390 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java @@ -44,13 +44,13 @@ public class KylinConfigExt extends KylinConfig { throw new IllegalArgumentException(); } this.base = base; - this.overrides = CBC.check(overrides); + this.overrides = BCC.check(overrides); } private KylinConfigExt(KylinConfigExt ext, Map<String, String> overrides) { super(ext.base.getAllProperties()); this.base = ext.base; - this.overrides = CBC.check(overrides); + this.overrides = BCC.check(overrides); } protected String getOptional(String prop, String dft) { http://git-wip-us.apache.org/repos/asf/kylin/blob/9410b015/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 99d0a43..b0bf375 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 @@ -36,12 +36,9 @@ import com.google.common.collect.Maps; public class KylinConfigTest extends LocalFileMetadataTestCase { @BeforeClass - static public void initBccTestInput() { - try { - BackwardCompatibilityConfig.bccTestInput = new FileInputStream(new File(LOCALMETA_TEST_DATA, "kylin-backward-compatibility.properties")); - } catch (FileNotFoundException e) { - throw new RuntimeException(e); - } + static public void initBccTestInput() throws FileNotFoundException { + FileInputStream is = new FileInputStream(new File(LOCALMETA_TEST_DATA, "kylin-backward-compatibility.properties")); + KylinConfigBase.BCC = new BackwardCompatibilityConfig(is); } @Before
