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/09/01 06:52:54 UTC
incubator-kylin git commit: test 9
Repository: incubator-kylin
Updated Branches:
refs/heads/KYLIN-956-2 0f5ef74c1 -> b94948934
test 9
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/b9494893
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b9494893
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b9494893
Branch: refs/heads/KYLIN-956-2
Commit: b949489342451a42168150037724dc2de4ac4733
Parents: 0f5ef74
Author: honma <ho...@ebay.com>
Authored: Tue Sep 1 12:54:38 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Tue Sep 1 12:54:38 2015 +0800
----------------------------------------------------------------------
bin/setenv.sh | 4 ++--
conf/kylin.properties | 2 +-
.../apache/kylin/engine/spark/BuildCubeWithSparkTest.java | 9 +--------
examples/test_case_data/localmeta/kylin.properties | 2 +-
examples/test_case_data/sandbox/kylin.properties | 2 +-
.../java/org/apache/kylin/job/BuildCubeWithEngineTest.java | 7 -------
.../java/org/apache/kylin/job/BuildCubeWithStreamTest.java | 8 --------
.../java/org/apache/kylin/job/BuildIIWithEngineTest.java | 8 --------
.../java/org/apache/kylin/job/BuildIIWithStreamTest.java | 9 +--------
.../org/apache/kylin/job/DeployLocalMetaToRemoteTest.java | 7 -------
.../apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java | 7 -------
server/src/main/java/org/apache/kylin/rest/DebugTomcat.java | 6 ------
.../kylin/storage/hbase/steps/SandboxMetastoreCLI.java | 7 -------
13 files changed, 7 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/bin/setenv.sh
----------------------------------------------------------------------
diff --git a/bin/setenv.sh b/bin/setenv.sh
index 5acb287..f4cce2d 100755
--- a/bin/setenv.sh
+++ b/bin/setenv.sh
@@ -18,7 +18,7 @@ then
echo "KYLIN_JVM_SETTINGS is ${KYLIN_JVM_SETTINGS}"
KYLIN_EXTRA_START_OPTS="${KYLIN_JVM_SETTINGS} ${KYLIN_EXTRA_START_OPTS}"
else
- echo "KYLIN_JVM_SETTINGS is not set, using default jvm settings"
+ echo "KYLIN_JVM_SETTINGS is not set, using default jvm settings: ${KYLIN_JVM_SETTINGS}"
fi
if [ ! -z "${KYLIN_DEBUG_SETTINGS}" ]
@@ -34,5 +34,5 @@ then
echo "KYLIN_LD_LIBRARY_SETTINGS is ${KYLIN_LD_LIBRARY_SETTINGS}"
KYLIN_EXTRA_START_OPTS="${KYLIN_LD_LIBRARY_SETTINGS} ${KYLIN_EXTRA_START_OPTS}"
else
- echo "KYLIN_LD_LIBRARY_SETTINGS is not set, Usually it's okay unless you want to enable LZO compression, etc. "
+ echo "KYLIN_LD_LIBRARY_SETTINGS is not set, Usually it's okay unless you want to specify your own native path"
fi
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/conf/kylin.properties b/conf/kylin.properties
index aca5ede..4f71495 100644
--- a/conf/kylin.properties
+++ b/conf/kylin.properties
@@ -45,7 +45,7 @@ kylin.job.hive.database.for.intermediatetable=default
kylin.job.cubing.inMem=true
#default compression codec for htable,snappy,lzo,gzip,lz4
-kylin.hbase.default.compression.codec=snappy
+kylin.hbase.default.compression.codec=gzip
#the percentage of the sampling, default 25%
kylin.job.cubing.inMem.sampling.percent=25
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
----------------------------------------------------------------------
diff --git a/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java b/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
index 5593f4b..d24cc79 100644
--- a/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
+++ b/engine-spark/src/test/java/org/apache/kylin/engine/spark/BuildCubeWithSparkTest.java
@@ -21,7 +21,6 @@ package org.apache.kylin.engine.spark;
import static org.junit.Assert.assertEquals;
import java.io.File;
-import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.TimeZone;
@@ -80,12 +79,6 @@ public class BuildCubeWithSparkTest {
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("java.library.path", ":/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64:/usr/hdp/2.2.4.2-2/hadoop/lib/native");
- //http://blog.cedarsoft.com/2010/11/setting-java-library-path-programmatically
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
-
}
@Before
@@ -128,7 +121,7 @@ public class BuildCubeWithSparkTest {
waitForJob(cubingJob.getId());
assertEquals(ExecutableState.SUCCEED, jobService.getOutput(cubingJob.getId()).getState());
}
-
+
private void clearSegment(String cubeName) throws Exception {
CubeInstance cube = cubeManager.getCube(cubeName);
// remove all existing segments
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/examples/test_case_data/localmeta/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties
index 6240862..bdd6113 100644
--- a/examples/test_case_data/localmeta/kylin.properties
+++ b/examples/test_case_data/localmeta/kylin.properties
@@ -37,7 +37,7 @@ kylin.job.concurrent.max.limit=10
kylin.job.yarn.app.rest.check.interval.seconds=10
#default compression codec for htable,snappy,lzo,gzip,lz4
-kylin.hbase.default.compression.codec=snappy
+kylin.hbase.default.compression.codec=gzip
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/examples/test_case_data/sandbox/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties
index ef0c288..ce599ea 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -49,7 +49,7 @@ kylin.job.hbase.region.cut.large=50
kylin.job.yarn.app.rest.check.interval.seconds=10
#default compression codec for htable,snappy,lzo,gzip,lz4
-kylin.hbase.default.compression.codec=snappy
+kylin.hbase.default.compression.codec=gzip
## Config for Restful APP ##
# database connection settings:
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
index f53e312..2156574 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
@@ -21,7 +21,6 @@ package org.apache.kylin.job;
import static org.junit.Assert.assertEquals;
import java.io.File;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.List;
@@ -87,12 +86,6 @@ public class BuildCubeWithEngineTest {
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("java.library.path", ":/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64:/usr/hdp/2.2.4.2-2/hadoop/lib/native");
- //http://blog.cedarsoft.com/2010/11/setting-java-library-path-programmatically
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java b/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
index 8e48a76..87b684e 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
@@ -36,7 +36,6 @@ package org.apache.kylin.job;
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Field;
import java.util.UUID;
import org.apache.hadoop.util.ToolRunner;
@@ -76,13 +75,6 @@ public class BuildCubeWithStreamTest {
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("java.library.path", ":/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64:/usr/hdp/2.2.4.2-2/hadoop/lib/native");
- //http://blog.cedarsoft.com/2010/11/setting-java-library-path-programmatically
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
-
-
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
index 6761a28..ff88667 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
@@ -21,7 +21,6 @@ package org.apache.kylin.job;
import static org.junit.Assert.assertEquals;
import java.io.File;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.List;
@@ -95,12 +94,6 @@ public class BuildIIWithEngineTest {
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("java.library.path", ":/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64:/usr/hdp/2.2.4.2-2/hadoop/lib/native");
- //http://blog.cedarsoft.com/2010/11/setting-java-library-path-programmatically
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
-
}
@Before
@@ -244,7 +237,6 @@ public class BuildIIWithEngineTest {
return exitCode;
}
-
public static void main(String[] args) throws Exception {
BuildIIWithEngineTest instance = new BuildIIWithEngineTest();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
index 9be5fa7..e3a12ea 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
@@ -38,7 +38,6 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Comparator;
@@ -96,12 +95,6 @@ public class BuildIIWithStreamTest {
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("java.library.path", ":/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64:/usr/hdp/2.2.4.2-2/hadoop/lib/native");
- //http://blog.cedarsoft.com/2010/11/setting-java-library-path-programmatically
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
-
}
@Before
@@ -127,7 +120,7 @@ public class BuildIIWithStreamTest {
JobEngineConfig jobEngineConfig = new JobEngineConfig(kylinConfig);
final String uuid = UUID.randomUUID().toString();
final String dropTableHql = JoinedFlatTable.generateDropTableStatement(intermediateTableDesc);
- final String createTableHql = JoinedFlatTable.generateCreateTableStatement(intermediateTableDesc, JobBuilderSupport.getJobWorkingDir(jobEngineConfig,uuid));
+ final String createTableHql = JoinedFlatTable.generateCreateTableStatement(intermediateTableDesc, JobBuilderSupport.getJobWorkingDir(jobEngineConfig, uuid));
String insertDataHqls;
try {
insertDataHqls = JoinedFlatTable.generateInsertDataStatement(intermediateTableDesc, jobEngineConfig);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java b/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
index 863bfcc..7f12069 100644
--- a/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
+++ b/job/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java
@@ -19,7 +19,6 @@
package org.apache.kylin.job;
import java.io.File;
-import java.lang.reflect.Field;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,12 +46,6 @@ public class DeployLocalMetaToRemoteTest {
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("java.library.path", ":/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64:/usr/hdp/2.2.4.2-2/hadoop/lib/native");
- //http://blog.cedarsoft.com/2010/11/setting-java-library-path-programmatically
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
-
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java b/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
index 0e977f9..6a615cb 100644
--- a/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
+++ b/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
@@ -35,7 +35,6 @@
package org.apache.kylin.job;
import java.io.File;
-import java.lang.reflect.Field;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.util.AbstractKylinTestCase;
@@ -62,12 +61,6 @@ public class ITKafkaBasedIIStreamBuilderTest {
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("java.library.path", ":/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64:/usr/hdp/2.2.4.2-2/hadoop/lib/native");
- //http://blog.cedarsoft.com/2010/11/setting-java-library-path-programmatically
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
-
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
index 6087fb0..7484742 100644
--- a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
+++ b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
@@ -49,12 +49,6 @@ public class DebugTomcat {
if (System.getProperty("hdp.version") == null)
System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
- System.setProperty("java.library.path", ":/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64:/usr/hdp/2.2.4.2-2/hadoop/lib/native");
- //http://blog.cedarsoft.com/2010/11/setting-java-library-path-programmatically
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
-
// workaround for job submission from win to linux -- https://issues.apache.org/jira/browse/MAPREDUCE-4052
if (Shell.WINDOWS) {
{
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b9494893/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 2184d32..21a6e43 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
@@ -19,7 +19,6 @@
package org.apache.kylin.storage.hbase.steps;
import java.io.File;
-import java.lang.reflect.Field;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -43,12 +42,6 @@ public class SandboxMetastoreCLI {
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("java.library.path", ":/usr/hdp/2.2.4.2-2/hadoop/lib/native/Linux-amd64-64:/usr/hdp/2.2.4.2-2/hadoop/lib/native");
- //http://blog.cedarsoft.com/2010/11/setting-java-library-path-programmatically
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
-
if (args.length < 2) {
printUsage();