You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/05/23 02:00:23 UTC
incubator-kylin git commit: add kylin.properties.override to ease
config override in dev env
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8.0 20f78fb22 -> 3ca8f3282
add kylin.properties.override to ease config override in 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/3ca8f328
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/3ca8f328
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/3ca8f328
Branch: refs/heads/0.8.0
Commit: 3ca8f3282b70fee70b39b83eb7f073bbfc73ba72
Parents: 20f78fb
Author: Yang Li <li...@apache.org>
Authored: Sat May 23 08:00:08 2015 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sat May 23 08:00:08 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/common/KylinConfig.java | 17 +++++++++++++++++
.../java/org/apache/kylin/cube/cuboid/Cuboid.java | 4 ++++
examples/.gitignore | 2 +-
examples/test_case_data/sandbox/.gitignore | 2 ++
4 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3ca8f328/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 7de6137..2158872 100644
--- a/common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -579,6 +579,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) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3ca8f328/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java b/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
index c3cf716..2dd147b 100644
--- a/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
+++ b/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
@@ -93,6 +93,10 @@ public class Cuboid implements Comparable<Cuboid> {
return cube.getRowkey().getFullMask();
}
+ public static Cuboid getBaseCuboid(CubeDesc cube) {
+ return findById(cube, getBaseCuboidId(cube));
+ }
+
// Breadth-First-Search
private static long translateToValidCuboid(CubeDesc cube, long cuboidID) {
if (Cuboid.isValid(cube, cuboidID)) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3ca8f328/examples/.gitignore
----------------------------------------------------------------------
diff --git a/examples/.gitignore b/examples/.gitignore
index 91fe24e..6b44a32 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -1,2 +1,2 @@
-/yadesk00.remote*
+/yadesk00*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3ca8f328/examples/test_case_data/sandbox/.gitignore
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/.gitignore b/examples/test_case_data/sandbox/.gitignore
new file mode 100644
index 0000000..5c501e0
--- /dev/null
+++ b/examples/test_case_data/sandbox/.gitignore
@@ -0,0 +1,2 @@
+kylin.properties.override
+