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 2015/09/21 04:16:19 UTC
[13/13] incubator-kylin git commit: Remove hardcoded “hdp.version” from codes;
Remove hardcoded “hdp.version” from codes;
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/0e978308
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/0e978308
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/0e978308
Branch: refs/heads/KYLIN-943
Commit: 0e978308d2b3d69236aa7f9861bf20823c97add5
Parents: b913aef
Author: shaofengshi <sh...@apache.org>
Authored: Mon Sep 21 10:14:37 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Sep 21 10:14:37 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java | 2 +-
.../test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java | 2 +-
.../test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java | 2 +-
.../test/java/org/apache/kylin/job/BuildIIWithEngineTest.java | 2 +-
.../test/java/org/apache/kylin/job/BuildIIWithStreamTest.java | 2 +-
.../java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java | 2 +-
.../org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java | 2 +-
pom.xml | 4 ----
.../apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java | 2 +-
9 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0e978308/assembly/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java b/assembly/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
index d24cc79..de60504 100644
--- a/assembly/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
+++ b/assembly/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
@@ -78,7 +78,7 @@ public class BuildCubeWithSparkTest {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
- System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
+ //System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0e978308/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java b/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
index b2b46c1..d6d9738 100644
--- a/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
+++ b/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
@@ -85,7 +85,7 @@ public class BuildCubeWithEngineTest {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
- System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
+ //System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0e978308/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java b/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
index b02b2f2..e52cd7b 100644
--- a/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
+++ b/assembly/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
@@ -74,7 +74,7 @@ public class BuildCubeWithStreamTest {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
- System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
+ //System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0e978308/assembly/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java b/assembly/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
index fecb106..a824cf5 100644
--- a/assembly/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
+++ b/assembly/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
@@ -93,7 +93,7 @@ public class BuildIIWithEngineTest {
public static void beforeClass() throws Exception {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
- System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
+ //System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0e978308/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java b/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
index 5ca3b29..5609f0e 100644
--- a/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
+++ b/assembly/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
@@ -94,7 +94,7 @@ public class BuildIIWithStreamTest {
public static void beforeClass() throws Exception {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
- System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
+ //System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0e978308/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java b/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
index 7f12069..9d3000e 100644
--- a/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
+++ b/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
@@ -45,7 +45,7 @@ public class DeployLocalMetaToRemoteTest {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
- System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
+ //System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0e978308/assembly/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java b/assembly/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
index 6a615cb..739f35a 100644
--- a/assembly/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
+++ b/assembly/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
@@ -60,7 +60,7 @@ public class ITKafkaBasedIIStreamBuilderTest {
@BeforeClass
public static void beforeClass() throws Exception {
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
- System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
+ //System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0e978308/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 74587cb..9403fb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -701,10 +701,6 @@
<name>useSandbox</name>
<value>true</value>
</property>
- <property>
- <name>hdp.version</name>
- <value>2.2.4.2-2</value>
- </property>
</systemProperties>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0e978308/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java
index 21a6e43..ac9d0c2 100644
--- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java
+++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java
@@ -41,7 +41,7 @@ public class SandboxMetastoreCLI {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
- System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
+ //System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
if (args.length < 2) {
printUsage();