Repository: kylin Updated Branches: refs/heads/KYLIN-1726 3e081b3fb -> 5987979cc
KYLIN-1726 fix CI Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5987979c Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5987979c Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5987979c Branch: refs/heads/KYLIN-1726 Commit: 5987979cc9034ba55e3717dc31f1d2cf1009350a Parents: 3e081b3 Author: shaofengshi <shaofeng...@apache.org> Authored: Fri Sep 23 16:45:28 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Fri Sep 23 16:45:28 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/job/streaming/Kafka10DataLoader.java | 2 +- .../test/java/org/apache/kylin/query/ITKylinQueryTest.java | 3 +++ .../src/test/java/org/apache/kylin/query/KylinTestBase.java | 7 ++++--- pom.xml | 2 +- .../main/java/org/apache/kylin/source/kafka/KafkaMRInput.java | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/5987979c/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java ---------------------------------------------------------------------- diff --git a/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java b/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java index 2b299cc..8c548be 100644 --- a/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java +++ b/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java @@ -65,7 +65,7 @@ public class Kafka10DataLoader extends StreamDataLoader { props.put("retry.backoff.ms", "1000"); KafkaProducer producer = KafkaClient.getKafkaProducer(brokerList, props); - for (int i = 0; i < messages.size(); ++i) { + for (int i = 0; i < messages.size(); i++) { ProducerRecord<String, String> keyedMessage = new ProducerRecord<String, String>(clusterConfig.getTopic(), String.valueOf(i), messages.get(i)); producer.send(keyedMessage); } http://git-wip-us.apache.org/repos/asf/kylin/blob/5987979c/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java index 2417d68..379c916 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java @@ -24,6 +24,7 @@ import java.io.File; import java.sql.SQLException; import java.util.List; import java.util.Map; +import java.util.TimeZone; import org.apache.commons.lang3.StringUtils; import org.apache.kylin.common.KylinConfig; @@ -65,6 +66,8 @@ public class ITKylinQueryTest extends KylinTestBase { RemoveBlackoutRealizationsRule.blackList.add("CUBE[name=test_kylin_cube_with_view_left_join_empty]"); RemoveBlackoutRealizationsRule.blackList.add("CUBE[name=test_kylin_cube_with_view_inner_join_empty]"); + + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); } @AfterClass http://git-wip-us.apache.org/repos/asf/kylin/blob/5987979c/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java b/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java index 294750e..3436d4b 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java @@ -194,7 +194,7 @@ public class KylinTestBase { sb.append(resultTable.getTableMetaData().getColumns()[i].getColumnName()); sb.append("-"); sb.append(resultTable.getTableMetaData().getColumns()[i].getDataType()); - sb.append("\t"); + sb.append(","); columns[i] = resultTable.getTableMetaData().getColumns()[i].getColumnName(); } sb.append("\n"); @@ -202,7 +202,8 @@ public class KylinTestBase { for (int i = 0; i < resultTable.getRowCount(); i++) { for (int j = 0; j < columns.length; j++) { sb.append(resultTable.getValue(i, columns[j])); - sb.append("\t"); + if (j < columns.length - 1) + sb.append(","); } sb.append("\n"); } @@ -586,7 +587,7 @@ public class KylinTestBase { //setup cube conn File olapTmp = OLAPSchemaFactory.createTempOLAPJson(ProjectInstance.DEFAULT_PROJECT_NAME, config); Properties props = new Properties(); - props.setProperty(OLAPQuery.PROP_SCAN_THRESHOLD, "10001"); + props.setProperty(OLAPQuery.PROP_SCAN_THRESHOLD, "20001"); cubeConnection = DriverManager.getConnection("jdbc:calcite:model=" + olapTmp.getAbsolutePath(), props); //setup h2 http://git-wip-us.apache.org/repos/asf/kylin/blob/5987979c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2be4231..ea3bb67 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ <antlr.version>3.4</antlr.version> <junit.version>4.12</junit.version> <mrunit.version>1.1.0</mrunit.version> - <dbunit.version>2.5.2</dbunit.version> + <dbunit.version>2.5.3</dbunit.version> <h2.version>1.4.192</h2.version> <jetty.version>9.3.10.v20160621</jetty.version> http://git-wip-us.apache.org/repos/asf/kylin/blob/5987979c/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java ---------------------------------------------------------------------- diff --git a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java index a5f678f..729719a 100644 --- a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java +++ b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java @@ -118,7 +118,7 @@ public class KafkaMRInput implements IMRInput { } } Text text = (Text) mapperInput; - ByteBuffer buffer = ByteBuffer.wrap(text.getBytes(), 0, text.getLength()).slice(); + ByteBuffer buffer = ByteBuffer.wrap(text.getBytes(), 0, text.getLength()); StreamingMessage streamingMessage = streamingParser.parse(buffer); return streamingMessage.getData().toArray(new String[streamingMessage.getData().size()]); }
