You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/08/06 06:59:05 UTC
[3/3] incubator-kylin git commit: clean up
clean up
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/34859242
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/34859242
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/34859242
Branch: refs/heads/0.7-staging
Commit: 34859242a85a3339b0b4a0b6235bfdb64c8c92ff
Parents: 62e737e
Author: honma <ho...@ebay.com>
Authored: Thu Aug 6 12:41:29 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Thu Aug 6 12:41:29 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/common/KylinConfig.java | 8 --
.../apache/kylin/job/SampleCubeSetupTest.java | 85 --------------------
.../apache/kylin/metadata/kylin_env.properties | 22 -----
pom.xml | 3 -
4 files changed, 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/34859242/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 d6aa492..b6d594c 100644
--- a/common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -109,14 +109,6 @@ public class KylinConfig {
public static final String HIVE_URL = "hive.url";
/**
- * Key string to specify the kylin evn: prod, dev, qa
- */
- public static final String KYLIN_ENV = "KYLIN_ENV";
- /**
- * Default Kylin conf path
- */
- public static final String KYLIN_CONF_DEFAULT = "/etc/kylin";
- /**
* Kylin properties file
*/
public static final String KYLIN_CONF_PROPERTIES_FILE = "kylin.properties";
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/34859242/job/src/test/java/org/apache/kylin/job/SampleCubeSetupTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/SampleCubeSetupTest.java b/job/src/test/java/org/apache/kylin/job/SampleCubeSetupTest.java
deleted file mode 100644
index aeb327f..0000000
--- a/job/src/test/java/org/apache/kylin/job/SampleCubeSetupTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-package org.apache.kylin.job;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.common.util.ClassUtil;
-import org.apache.kylin.common.util.HBaseMetadataTestCase;
-import org.apache.kylin.cube.CubeInstance;
-import org.apache.kylin.cube.CubeManager;
-import org.apache.kylin.job.engine.JobEngineConfig;
-import org.codehaus.plexus.util.FileUtils;
-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 SampleCubeSetupTest extends HBaseMetadataTestCase {
-
- @Before
- public void before() throws Exception {
-
- 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 {
- ClassUtil.addClasspath(new File(path).getAbsolutePath());
- } catch (Exception e) {
- System.out.println(e.getLocalizedMessage());
- System.out.println(e.getStackTrace());
- }
- }
- }
- }
- }
-
- @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/34859242/metadata/src/test/resources/org/apache/kylin/metadata/kylin_env.properties
----------------------------------------------------------------------
diff --git a/metadata/src/test/resources/org/apache/kylin/metadata/kylin_env.properties b/metadata/src/test/resources/org/apache/kylin/metadata/kylin_env.properties
deleted file mode 100644
index 98e3008..0000000
--- a/metadata/src/test/resources/org/apache/kylin/metadata/kylin_env.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-PROD=/etc/kylin
-QA=/etc/kylin
-DEV=/etc/kylin
-
-YADEV=hbase:yadesk00:2181:/hbase-unsecure
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/34859242/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 28ba7bb..8e118b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -632,7 +632,6 @@
<excludes>
<exclude>**/BuildCubeWithEngineTest.java</exclude>
<exclude>**/BuildIIWithEngineTest.java</exclude>
- <exclude>**/SampleCubeSetupTest.java</exclude>
<exclude>**/KylinQueryTest.java</exclude>
<exclude>**/SnapshotManagerTest.java</exclude>
<exclude>**/HiveTableReaderTest.java</exclude>
@@ -694,7 +693,6 @@
<excludes>
<exclude>**/BuildCubeWithEngineTest.java</exclude>
<exclude>**/BuildIIWithEngineTest.java</exclude>
- <exclude>**/SampleCubeSetupTest.java</exclude>
<exclude>**/KylinQueryTest.java</exclude>
</excludes>
<systemProperties>
@@ -761,7 +759,6 @@
<excludes>
<exclude>**/BuildCubeWithEngineTest.java</exclude>
<exclude>**/BuildIIWithEngineTest.java</exclude>
- <exclude>**/SampleCubeSetupTest.java</exclude>
<exclude>**/KylinQueryTest.java</exclude>
<exclude>**/SnapshotManagerTest.java</exclude>
<exclude>**/HiveTableReaderTest.java</exclude>