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 2017/02/16 00:52:52 UTC
[04/17] kylin git commit: minor,
add setKylinConfigInEnvIfMissing(string)
minor, add setKylinConfigInEnvIfMissing(string)
Signed-off-by: Hongbin Ma <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e2ff7842
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e2ff7842
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e2ff7842
Branch: refs/heads/master-hbase0.98
Commit: e2ff7842ef9e89f5c0e1ca955f0d0b20db7699f8
Parents: ab657d1
Author: Roger Shi <ro...@hotmail.com>
Authored: Tue Feb 14 16:52:31 2017 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Tue Feb 14 17:33:00 2017 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/common/KylinConfig.java | 6 ++++++
.../hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java | 6 +-----
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/e2ff7842/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 c7a18c6..e8127ec 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
@@ -171,6 +171,12 @@ public class KylinConfig extends KylinConfigBase {
}
}
+ public static void setKylinConfigInEnvIfMissing(String propsInStr) throws IOException {
+ Properties props = new Properties();
+ props.load(new StringReader(propsInStr));
+ setKylinConfigInEnvIfMissing(props);
+ }
+
public static KylinConfig createKylinConfig(String propsInStr) throws IOException {
Properties props = new Properties();
props.load(new StringReader(propsInStr));
http://git-wip-us.apache.org/repos/asf/kylin/blob/e2ff7842/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
index e18ff0d..be89caa 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java
@@ -20,14 +20,12 @@ package org.apache.kylin.storage.hbase.cube.v2.coprocessor.endpoint;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.StringReader;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.Iterator;
import java.util.List;
-import java.util.Properties;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.ArrayUtils;
@@ -241,9 +239,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement
// if user change kylin.properties on kylin server, need to manually redeploy coprocessor jar to update KylinConfig of Env.
String serverPropString = request.getKylinProperties();
- Properties serverProp = new Properties();
- serverProp.load(new StringReader(serverPropString));
- KylinConfig.setKylinConfigInEnvIfMissing(serverProp);
+ KylinConfig.setKylinConfigInEnvIfMissing(serverPropString);
KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv();
debugGitTag = region.getTableDesc().getValue(IRealizationConstants.HTableGitTag);