Repository: kylin Updated Branches: refs/heads/master 7955b093d -> 6707cfa40
KYLIN-1726 overwrite job jar for BuildCubeWithStream Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6707cfa4 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6707cfa4 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6707cfa4 Branch: refs/heads/master Commit: 6707cfa40f262a5de165b7e23db27d33a415e8c8 Parents: 7955b09 Author: Hongbin Ma <mahong...@apache.org> Authored: Sun Sep 18 15:20:43 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Sun Sep 18 15:20:43 2016 +0800 ---------------------------------------------------------------------- .../kylin/provision/BuildCubeWithStream.java | 29 ++++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/6707cfa4/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java index 7a4aa19..3a16411 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java @@ -18,6 +18,14 @@ package org.apache.kylin.provision; +import java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.List; +import java.util.TimeZone; +import java.util.UUID; + import org.I0Itec.zkclient.ZkConnection; import org.apache.commons.lang3.StringUtils; import org.apache.kafka.common.requests.MetadataResponse; @@ -33,7 +41,6 @@ import org.apache.kylin.engine.streaming.StreamingConfig; import org.apache.kylin.engine.streaming.StreamingManager; import org.apache.kylin.job.DeployUtil; import org.apache.kylin.job.engine.JobEngineConfig; -import org.apache.kylin.job.exception.SchedulerException; import org.apache.kylin.job.execution.AbstractExecutable; import org.apache.kylin.job.execution.DefaultChainedExecutable; import org.apache.kylin.job.execution.ExecutableState; @@ -48,14 +55,6 @@ import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.List; -import java.util.TimeZone; -import java.util.UUID; - /** * for streaming cubing case "test_streaming_table" */ @@ -73,6 +72,7 @@ public class BuildCubeWithStream { public void before() throws Exception { //deployEnv(); + DeployUtil.overrideJobJarLocations(); final KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv(); jobService = ExecutableManager.getInstance(kylinConfig); @@ -100,7 +100,7 @@ public class BuildCubeWithStream { startEmbeddedKafka(topicName, brokerConfig); } - private void startEmbeddedKafka(String topicName, BrokerConfig brokerConfig){ + private void startEmbeddedKafka(String topicName, BrokerConfig brokerConfig) { //Start mock Kakfa String zkConnectionStr = "sandbox:2181"; ZkConnection zkConnection = new ZkConnection(zkConnectionStr); @@ -112,10 +112,9 @@ public class BuildCubeWithStream { kafkaServer.waitTopicUntilReady(topicName); MetadataResponse.TopicMetadata topicMetadata = kafkaServer.fetchTopicMeta(topicName); - Assert.assertEquals(topicName,topicMetadata.topic()); + Assert.assertEquals(topicName, topicMetadata.topic()); } - private void generateStreamData(long startTime, long endTime, int numberOfRecords) throws IOException { Kafka10DataLoader dataLoader = new Kafka10DataLoader(kafkaConfig); DeployUtil.prepareTestDataForStreamingCube(startTime, endTime, numberOfRecords, cubeName, dataLoader); @@ -217,7 +216,7 @@ public class BuildCubeWithStream { HBaseMetadataTestCase.staticCleanupTestMetadata(); } - public void after(){ + public void after() { kafkaServer.stop(); DefaultScheduler.destroyInstance(); } @@ -259,8 +258,8 @@ public class BuildCubeWithStream { protected int cleanupOldStorage() throws Exception { String[] args = { "--delete", "true" }; -// KapStorageCleanupCLI cli = new KapStorageCleanupCLI(); -// cli.execute(args); + // KapStorageCleanupCLI cli = new KapStorageCleanupCLI(); + // cli.execute(args); return 0; }