You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/05/26 13:15:47 UTC
[1/2] kylin git commit: KYLIN-1717 add param for cluster name
Repository: kylin
Updated Branches:
refs/heads/master 61c9e3601 -> c79c59f88
KYLIN-1717 add param for cluster name
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c79c59f8
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c79c59f8
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c79c59f8
Branch: refs/heads/master
Commit: c79c59f887f7e1c86b8b0ca762f6b9d068ffbc47
Parents: bced887
Author: shaofengshi <sh...@apache.org>
Authored: Thu May 26 21:14:57 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu May 26 21:15:17 2016 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/common/KylinConfigBase.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/c79c59f8/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 efacbfb..2ffb219 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
@@ -383,6 +383,15 @@ abstract public class KylinConfigBase implements Serializable {
return getOptionalStringArray("kylin.rest.servers", new String[0]);
}
+ public String getClusterName() {
+ return this.getOptional("kylin.cluster.name", getMetadataUrlPrefix());
+ }
+
+ public void setClusterName(String clusterName) {
+ setProperty("kylin.cluster.name", clusterName);
+ }
+
+
public int getWorkersPerServer() {
//for sequence sql use
return Integer.parseInt(getOptional("kylin.rest.workers.per.server", "1"));
[2/2] kylin git commit: a bug in KylinConfig.writeOverrideProperties
Posted by sh...@apache.org.
a bug in KylinConfig.writeOverrideProperties
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/bced8874
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/bced8874
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/bced8874
Branch: refs/heads/master
Commit: bced8874818013abe9b1ac917e95e9e26bf4500e
Parents: 61c9e36
Author: shaofengshi <sh...@apache.org>
Authored: Thu May 26 14:55:21 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu May 26 21:15:17 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/common/KylinConfig.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/bced8874/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 43841a2..580edd8 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
@@ -349,7 +349,8 @@ public class KylinConfig extends KylinConfigBase {
PrintWriter pw = null;
try {
pw = new PrintWriter(overrideFile);
- for (Enumeration e = override.propertyNames(); e.hasMoreElements();) {
+ Enumeration e = override.propertyNames();
+ while (e.hasMoreElements()) {
String key = (String) e.nextElement();
pw.println(key + "=" + override.getProperty(key));
}