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/03/03 10:59:15 UTC
[11/23] incubator-kylin git commit: revise SampleCubeSetup
revise SampleCubeSetup
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6c84f5a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6c84f5a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6c84f5a0
Branch: refs/heads/master
Commit: 6c84f5a0342da2e9e717ad099a94f72a94940dbb
Parents: 2326403
Author: honma <ho...@ebay.com>
Authored: Wed Feb 11 13:59:49 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Wed Feb 11 13:59:49 2015 +0800
----------------------------------------------------------------------
.../test/java/com/kylinolap/job/DeployUtil.java | 8 +-
.../kylinolap/job/SampleCubeSetupAsTest.java | 67 ++++++++++++++++
.../com/kylinolap/job/SampleCubeSetupTest.java | 80 --------------------
sandbox_deploy.sh | 2 +-
4 files changed, 69 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6c84f5a0/job/src/test/java/com/kylinolap/job/DeployUtil.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/com/kylinolap/job/DeployUtil.java b/job/src/test/java/com/kylinolap/job/DeployUtil.java
index ecedfda..56e1a7c 100644
--- a/job/src/test/java/com/kylinolap/job/DeployUtil.java
+++ b/job/src/test/java/com/kylinolap/job/DeployUtil.java
@@ -1,10 +1,6 @@
package com.kylinolap.job;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.hbase.util.Pair;
@@ -21,9 +17,7 @@ import com.kylinolap.common.util.CliCommandExecutor;
import com.kylinolap.cube.CubeInstance;
import com.kylinolap.cube.CubeManager;
import com.kylinolap.cube.dataGen.FactTableGenerator;
-import com.kylinolap.job.engine.JobEngineConfig;
import com.kylinolap.job.hadoop.hive.SqlHiveDataTypeMapping;
-import com.kylinolap.job.tools.LZOSupportnessChecker;
import com.kylinolap.metadata.MetadataManager;
import com.kylinolap.metadata.model.schema.ColumnDesc;
import com.kylinolap.metadata.model.schema.TableDesc;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6c84f5a0/job/src/test/java/com/kylinolap/job/SampleCubeSetupAsTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/com/kylinolap/job/SampleCubeSetupAsTest.java b/job/src/test/java/com/kylinolap/job/SampleCubeSetupAsTest.java
new file mode 100644
index 0000000..b67a12b
--- /dev/null
+++ b/job/src/test/java/com/kylinolap/job/SampleCubeSetupAsTest.java
@@ -0,0 +1,67 @@
+package com.kylinolap.job;
+
+import java.io.File;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.kylinolap.common.KylinConfig;
+import com.kylinolap.common.util.ClasspathUtil;
+import com.kylinolap.cube.CubeInstance;
+import com.kylinolap.cube.CubeManager;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Created by honma on 9/24/14.
+ * <p/>
+ * This class is only used for building a sample cube in the one-line deployment tool.
+ */
+public class SampleCubeSetupAsTest {
+
+ @Before
+ public void init() throws Exception {
+ try {
+ testConnectivity();
+ } catch (Exception e) {
+ System.out.println("Failed to connect to remote CLI with given password");
+ throw e;
+ }
+
+ String confPaths = System.getenv("KYLIN_HBASE_CONF_PATH");
+ System.out.println("The conf paths is " + confPaths);
+ if (confPaths != null) {
+ String[] paths = confPaths.split(":");
+ for (String path : paths) {
+ if (!StringUtils.isEmpty(path)) {
+ try {
+ ClasspathUtil.addClasspath(new File(path).getAbsolutePath());
+ } catch (Exception e) {
+ System.out.println(e.getLocalizedMessage());
+ System.out.println(e.getStackTrace());
+ }
+ }
+ }
+ }
+ }
+
+ private void testConnectivity() throws Exception {
+ KylinConfig cfg = KylinConfig.getInstanceFromEnv();
+ cfg.getCliCommandExecutor().execute("echo hello");
+ }
+
+ @Test
+ public void prepareCubesAsTest() throws Exception {
+ DeployUtil.initCliWorkDir();
+ DeployUtil.deployMetadata();
+ DeployUtil.deployJobJars();
+ DeployUtil.prepareTestData("inner", "test_kylin_cube_with_slr_empty");
+
+ // remove all other cubes to keep it clean
+ CubeManager cubeManager = CubeManager.getInstance(KylinConfig.getInstanceFromEnv());
+ for (CubeInstance cubeInstance : cubeManager.listAllCubes()) {
+ if (!cubeInstance.getName().equalsIgnoreCase("test_kylin_cube_without_slr_empty") && !cubeInstance.getName().equalsIgnoreCase("test_kylin_cube_with_slr_empty"))
+ cubeManager.dropCube(cubeInstance.getName(), false);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6c84f5a0/job/src/test/java/com/kylinolap/job/SampleCubeSetupTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/com/kylinolap/job/SampleCubeSetupTest.java b/job/src/test/java/com/kylinolap/job/SampleCubeSetupTest.java
deleted file mode 100644
index 92d3bb1..0000000
--- a/job/src/test/java/com/kylinolap/job/SampleCubeSetupTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.kylinolap.job;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.codehaus.plexus.util.FileUtils;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.kylinolap.common.KylinConfig;
-import com.kylinolap.common.util.ClasspathUtil;
-import com.kylinolap.common.util.HBaseMetadataTestCase;
-import com.kylinolap.cube.CubeInstance;
-import com.kylinolap.cube.CubeManager;
-import com.kylinolap.job.engine.JobEngineConfig;
-
-/**
- * Created by honma on 9/24/14.
- * <p/>
- * This class is only used for building a sample cube in the one-line deployment tool.
- */
-public class SampleCubeSetupTest extends HBaseMetadataTestCase {
-
- @Before
- public void before() throws Exception {
-
- try {
- this.testConnectivity();
- } catch (Exception e) {
- System.out.println("Failed to connect to remote CLI with given password");
- throw e;
- }
-
- String confPaths = System.getenv("KYLIN_HBASE_CONF_PATH");
- System.out.println("The conf paths is " + confPaths);
- if (confPaths != null) {
- String[] paths = confPaths.split(":");
- for (String path : paths) {
- if (!StringUtils.isEmpty(path)) {
- try {
- ClasspathUtil.addClasspath(new File(path).getAbsolutePath());
- } catch (Exception e) {
- System.out.println(e.getLocalizedMessage());
- System.out.println(e.getStackTrace());
- }
- }
- }
- }
- }
-
- private void testConnectivity() throws Exception {
- KylinConfig cfg = KylinConfig.getInstanceFromEnv();
- cfg.getCliCommandExecutor().execute("echo hello");
- }
-
- @Test
- public void testCubes() throws Exception {
- DeployUtil.initCliWorkDir();
- DeployUtil.deployMetadata();
- DeployUtil.deployJobJars();
- deployJobConfToEtc();
- DeployUtil.prepareTestData("inner", "test_kylin_cube_with_slr_empty");
-
- // remove all other cubes to keep it clean
- CubeManager cubeManager = CubeManager.getInstance(KylinConfig.getInstanceFromEnv());
- for (CubeInstance cubeInstance : cubeManager.listAllCubes()) {
- if (!cubeInstance.getName().equalsIgnoreCase("test_kylin_cube_without_slr_empty") && !cubeInstance.getName().equalsIgnoreCase("test_kylin_cube_with_slr_empty"))
- cubeManager.dropCube(cubeInstance.getName(), false);
- }
-
- }
-
- private void deployJobConfToEtc() throws IOException {
- File src = new File(SANDBOX_TEST_DATA, JobEngineConfig.HADOOP_JOB_CONF_FILENAME + ".xml");
- File dst = new File("/etc/kylin", src.getName());
- FileUtils.copyFile(src, dst);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6c84f5a0/sandbox_deploy.sh
----------------------------------------------------------------------
diff --git a/sandbox_deploy.sh b/sandbox_deploy.sh
index 5f68026..022145f 100755
--- a/sandbox_deploy.sh
+++ b/sandbox_deploy.sh
@@ -138,7 +138,7 @@ cat examples/test_case_data/sandbox/kylin.properties | \
sed -e "s/${DEFAULT_CHECK_URL}/${NEW_CHECK_URL_PREFIX}${HOSTNAME}/g" | \
sed -e "s/${DEFAULT_SERVER_LIST}/${NEW_SERVER_LIST_PREFIX}${HOSTNAME}/g" > /etc/kylin/kylin.properties
-
+cat examples/test_case_data/sandbox/kylin_job_conf.xml > /etc/kylin/kylin_job_conf.xml
# 1. generate synthetic fact table(test_kylin_fact) data and dump it into hive
# 2. create empty cubes on these data, ready to be built