You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2016/12/22 07:07:59 UTC
kylin git commit: KYLIN-2293 refactor KylinConfigBase to remove the
test-related hard code
Repository: kylin
Updated Branches:
refs/heads/master 642981746 -> d337ab1fd
KYLIN-2293 refactor KylinConfigBase to remove the test-related hard code
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d337ab1f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d337ab1f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d337ab1f
Branch: refs/heads/master
Commit: d337ab1fd9aa6d2b063aa0c4a9bdc369ea0eef7b
Parents: 6429817
Author: Billy Liu <bi...@apache.org>
Authored: Thu Dec 22 15:07:52 2016 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Thu Dec 22 15:07:52 2016 +0800
----------------------------------------------------------------------
.../apache/kylin/common/KylinConfigBase.java | 39 --------------------
.../kylin/common/util/MailServiceTest.java | 2 +-
.../org/apache/kylin/cube/CubeManagerTest.java | 4 +-
.../kylin/dict/AppendTrieDictionaryTest.java | 30 ++++++---------
.../kylin/provision/BuildCubeWithEngine.java | 4 +-
5 files changed, 17 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/d337ab1f/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 168e5b5..da93388 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
@@ -240,11 +240,6 @@ abstract public class KylinConfigBase implements Serializable {
return Integer.parseInt(getOptional("kylin.dictionary.append-version-ttl", "259200000"));
}
- // for test
- public void setAppendDictEntrySize(int entrySize) {
- setProperty("kylin.dictionary.append-entry-size", String.valueOf(entrySize));
- }
-
public int getCachedSnapshotMaxEntrySize() {
return Integer.parseInt(getOptional("kylin.snapshot.max-cache-entry", "500"));
}
@@ -298,10 +293,6 @@ abstract public class KylinConfigBase implements Serializable {
return Integer.parseInt(getOptional("kylin.cube.max-building-segments", "10"));
}
- public void setMaxBuildingSegments(int maxBuildingSegments) {
- setProperty("kylin.cube.max-building-segments", String.valueOf(maxBuildingSegments));
- }
-
// ============================================================================
// JOB
// ============================================================================
@@ -322,10 +313,6 @@ abstract public class KylinConfigBase implements Serializable {
return Boolean.parseBoolean(getOptional("kylin.job.use-remote-cli"));
}
- public void setRunAsRemoteCommand(String v) {
- setProperty("kylin.job.use-remote-cli", v);
- }
-
public int getRemoteHadoopCliPort() {
return Integer.parseInt(getOptional("kylin.job.remote-cli-port", "22"));
}
@@ -334,26 +321,14 @@ abstract public class KylinConfigBase implements Serializable {
return getOptional("kylin.job.remote-cli-hostname");
}
- public void setRemoteHadoopCliHostname(String v) {
- setProperty("kylin.job.remote-cli-hostname", v);
- }
-
public String getRemoteHadoopCliUsername() {
return getOptional("kylin.job.remote-cli-username");
}
- public void setRemoteHadoopCliUsername(String v) {
- setProperty("kylin.job.remote-cli-username", v);
- }
-
public String getRemoteHadoopCliPassword() {
return getOptional("kylin.job.remote-cli-password");
}
- public void setRemoteHadoopCliPassword(String v) {
- setProperty("kylin.job.remote-cli-password", v);
- }
-
public String getCliWorkingDir() {
return getOptional("kylin.job.remote-cli-working-dir");
}
@@ -381,10 +356,6 @@ abstract public class KylinConfigBase implements Serializable {
return Boolean.parseBoolean(getOptional("kylin.job.notification-enabled", "false"));
}
- public void setMailEnabled(boolean enable) {
- setProperty("kylin.job.notification-enabled", "" + enable);
- }
-
public String getMailHost() {
return getOptional("kylin.job.notification-mail-host", "");
}
@@ -525,11 +496,6 @@ abstract public class KylinConfigBase implements Serializable {
return getOptional("kylin.storage.url");
}
- // for test only
- public void setStorageUrl(String storageUrl) {
- setProperty("kylin.storage.url", storageUrl);
- }
-
public String getHBaseClusterFs() {
return getOptional("kylin.storage.hbase.cluster-fs", "");
}
@@ -585,11 +551,6 @@ abstract public class KylinConfigBase implements Serializable {
return Integer.parseInt(getOptional("kylin.storage.hbase.max-region-count", "500"));
}
- // for test only
- public void setHBaseHFileSizeGB(float size) {
- setProperty("kylin.storage.hbase.hfile-size-gb", String.valueOf(size));
- }
-
public float getHBaseHFileSizeGB() {
return Float.parseFloat(getOptional("kylin.storage.hbase.hfile-size-gb", "2.0"));
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/d337ab1f/core-common/src/test/java/org/apache/kylin/common/util/MailServiceTest.java
----------------------------------------------------------------------
diff --git a/core-common/src/test/java/org/apache/kylin/common/util/MailServiceTest.java b/core-common/src/test/java/org/apache/kylin/common/util/MailServiceTest.java
index f0d5e4f..5e1ffc4 100644
--- a/core-common/src/test/java/org/apache/kylin/common/util/MailServiceTest.java
+++ b/core-common/src/test/java/org/apache/kylin/common/util/MailServiceTest.java
@@ -51,8 +51,8 @@ public class MailServiceTest extends LocalFileMetadataTestCase {
boolean sent = sendTestEmail(mailservice);
assert sent;
+ System.setProperty("kylin.job.notification-enabled", "false");
// set kylin.job.notification-enabled=false, and run again, this time should be no mail delivered
- config.setMailEnabled(false);
mailservice = new MailService(config);
sent = sendTestEmail(mailservice);
assert !sent;
http://git-wip-us.apache.org/repos/asf/kylin/blob/d337ab1f/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java
----------------------------------------------------------------------
diff --git a/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java b/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java
index 0266067..33dac96 100644
--- a/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java
+++ b/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java
@@ -131,7 +131,7 @@ public class CubeManagerTest extends LocalFileMetadataTestCase {
public void testConcurrentBuildAndMerge() throws Exception {
CubeManager mgr = CubeManager.getInstance(getTestConfig());
CubeInstance cube = mgr.getCube("test_kylin_cube_with_slr_empty");
- getTestConfig().setMaxBuildingSegments(10);
+ System.setProperty("kylin.cube.max-building-segments", "10");
// no segment at first
assertEquals(0, cube.getSegments().size());
@@ -186,8 +186,8 @@ public class CubeManagerTest extends LocalFileMetadataTestCase {
@Test
public void testConcurrentMergeAndMerge() throws Exception {
+ System.setProperty("kylin.cube.max-building-segments", "10");
CubeManager mgr = CubeManager.getInstance(getTestConfig());
- getTestConfig().setMaxBuildingSegments(10);
CubeInstance cube = mgr.getCube("test_kylin_cube_with_slr_empty");
// no segment at first
http://git-wip-us.apache.org/repos/asf/kylin/blob/d337ab1f/core-dictionary/src/test/java/org/apache/kylin/dict/AppendTrieDictionaryTest.java
----------------------------------------------------------------------
diff --git a/core-dictionary/src/test/java/org/apache/kylin/dict/AppendTrieDictionaryTest.java b/core-dictionary/src/test/java/org/apache/kylin/dict/AppendTrieDictionaryTest.java
index 0776599..a5ed6f8 100644
--- a/core-dictionary/src/test/java/org/apache/kylin/dict/AppendTrieDictionaryTest.java
+++ b/core-dictionary/src/test/java/org/apache/kylin/dict/AppendTrieDictionaryTest.java
@@ -43,37 +43,31 @@ import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.kylin.common.KylinConfig;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
/**
* Created by sunyerui on 16/4/28.
*/
-public class AppendTrieDictionaryTest {
+public class AppendTrieDictionaryTest extends LocalFileMetadataTestCase {
public static final String BASE_DIR = "/tmp/kylin_append_dict";
public static final String RESOURCE_DIR = "/dict/append_dict_test";
- @BeforeClass
- public static void setUp() {
- KylinConfig.destroyInstance();
- System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/localmeta");
- KylinConfig config = KylinConfig.getInstanceFromEnv();
- config.setAppendDictEntrySize(50000);
- config.setProperty("kylin.env.hdfs-working-dir", BASE_DIR);
+ @Before
+ public void setUp() {
+ staticCreateTestMetadata();
+ System.setProperty("kylin.dictionary.append-entry-size", "50000");
+ System.setProperty("kylin.env.hdfs-working-dir", BASE_DIR);
}
- @AfterClass
- public static void tearDown() {
- cleanup();
- }
-
-// @After
- public void afterTest() {
+ @After
+ public void after() {
cleanup();
+ staticCleanupTestMetadata();
}
public static void cleanup() {
http://git-wip-us.apache.org/repos/asf/kylin/blob/d337ab1f/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
----------------------------------------------------------------------
diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
index 31a5cee..1c7c64d 100644
--- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
+++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
@@ -168,10 +168,10 @@ public class BuildCubeWithEngine {
public void build() throws Exception {
DeployUtil.prepareTestDataForNormalCubes("ci_left_join_model");
- KylinConfig.getInstanceFromEnv().setHBaseHFileSizeGB(1.0f);
+ System.setProperty("kylin.storage.hbase.hfile-size-gb", "1.0f");
testInner();
testLeft();
- KylinConfig.getInstanceFromEnv().setHBaseHFileSizeGB(0.0f);
+ System.setProperty("kylin.storage.hbase.hfile-size-gb", "0.0f");
}
protected ExecutableState waitForJob(String jobId) {