You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/06/08 19:15:01 UTC
[46/50] [abbrv] incubator-kylin git commit: minor,
KylinConfig read kylin.properties.override, to ease dev env
minor, KylinConfig read kylin.properties.override,to ease dev env
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/d2ae5035
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d2ae5035
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d2ae5035
Branch: refs/heads/master
Commit: d2ae5035f5666e82a7957322d2b4da838168d0ab
Parents: 14141e0
Author: Yang Li <li...@apache.org>
Authored: Sat Jun 6 21:34:43 2015 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sat Jun 6 21:34:43 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/common/KylinConfig.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d2ae5035/common/src/main/java/org/apache/kylin/common/KylinConfig.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/KylinConfig.java b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
index b21e63b..08a4d66 100644
--- a/common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -563,6 +563,23 @@ public class KylinConfig {
logger.error("fail to locate kylin.properties");
throw new RuntimeException("fail to locate kylin.properties");
}
+
+ File overrideFile = new File (propFile.getParentFile(), propFile.getName() + ".override");
+ if (overrideFile.exists()) {
+ try {
+ PropertiesConfiguration conf = new PropertiesConfiguration();
+ conf.load(propFile);
+ PropertiesConfiguration override = new PropertiesConfiguration();
+ override.load(overrideFile);
+ conf.copy(override);
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ conf.save(bout);
+ return new ByteArrayInputStream(bout.toByteArray());
+ } catch (ConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
try {
return new FileInputStream(propFile);
} catch (FileNotFoundException e) {