You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/08/22 09:22:42 UTC
[15/17] kylin git commit: KYLIN-2801 fix UT
KYLIN-2801 fix UT
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fe156781
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fe156781
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fe156781
Branch: refs/heads/2.1.x
Commit: fe156781dbd3dee4c191e4e0e36bd07af0e79496
Parents: f7999bf
Author: Hongbin Ma <ma...@apache.org>
Authored: Tue Aug 22 15:32:01 2017 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Tue Aug 22 15:33:38 2017 +0800
----------------------------------------------------------------------
.../DefaultPartitionConditionBuilderTest.java | 33 +++++++++++++++-----
.../kylin/engine/mr/SortedColumnReaderTest.java | 17 ++++++++--
2 files changed, 41 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/fe156781/core-metadata/src/test/java/org/apache/kylin/metadata/model/DefaultPartitionConditionBuilderTest.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/test/java/org/apache/kylin/metadata/model/DefaultPartitionConditionBuilderTest.java b/core-metadata/src/test/java/org/apache/kylin/metadata/model/DefaultPartitionConditionBuilderTest.java
index 1b610ca..907e0e5 100644
--- a/core-metadata/src/test/java/org/apache/kylin/metadata/model/DefaultPartitionConditionBuilderTest.java
+++ b/core-metadata/src/test/java/org/apache/kylin/metadata/model/DefaultPartitionConditionBuilderTest.java
@@ -19,11 +19,24 @@
package org.apache.kylin.metadata.model;
import org.apache.kylin.common.util.DateFormat;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class DefaultPartitionConditionBuilderTest {
+public class DefaultPartitionConditionBuilderTest extends LocalFileMetadataTestCase {
+
+ @Before
+ public void setup() throws Exception {
+ this.createTestMetadata();
+ }
+
+ @After
+ public void after() throws Exception {
+ this.cleanupTestMetadata();
+ }
+
private PartitionDesc.DefaultPartitionConditionBuilder partitionConditionBuilder;
@Before
@@ -38,8 +51,10 @@ public class DefaultPartitionConditionBuilderTest {
partitionDesc.setPartitionDateColumnRef(col);
partitionDesc.setPartitionDateColumn(col.getCanonicalName());
partitionDesc.setPartitionDateFormat("yyyy-MM-dd");
- String condition = partitionConditionBuilder.buildDateRangeCondition(partitionDesc, DateFormat.stringToMillis("2016-02-22"), DateFormat.stringToMillis("2016-02-23"));
- Assert.assertEquals("UNKNOWN_ALIAS.DATE_COLUMN >= '2016-02-22' AND UNKNOWN_ALIAS.DATE_COLUMN < '2016-02-23'", condition);
+ String condition = partitionConditionBuilder.buildDateRangeCondition(partitionDesc,
+ DateFormat.stringToMillis("2016-02-22"), DateFormat.stringToMillis("2016-02-23"));
+ Assert.assertEquals("UNKNOWN_ALIAS.DATE_COLUMN >= '2016-02-22' AND UNKNOWN_ALIAS.DATE_COLUMN < '2016-02-23'",
+ condition);
}
@Test
@@ -49,7 +64,8 @@ public class DefaultPartitionConditionBuilderTest {
partitionDesc.setPartitionTimeColumnRef(col);
partitionDesc.setPartitionTimeColumn(col.getCanonicalName());
partitionDesc.setPartitionTimeFormat("HH");
- String condition = partitionConditionBuilder.buildDateRangeCondition(partitionDesc, DateFormat.stringToMillis("2016-02-22 00:00:00"), DateFormat.stringToMillis("2016-02-23 01:00:00"));
+ String condition = partitionConditionBuilder.buildDateRangeCondition(partitionDesc,
+ DateFormat.stringToMillis("2016-02-22 00:00:00"), DateFormat.stringToMillis("2016-02-23 01:00:00"));
Assert.assertEquals("UNKNOWN_ALIAS.HOUR_COLUMN >= '00' AND UNKNOWN_ALIAS.HOUR_COLUMN < '01'", condition);
}
@@ -64,8 +80,11 @@ public class DefaultPartitionConditionBuilderTest {
partitionDesc.setPartitionTimeColumnRef(col2);
partitionDesc.setPartitionTimeColumn(col2.getCanonicalName());
partitionDesc.setPartitionTimeFormat("H");
- String condition = partitionConditionBuilder.buildDateRangeCondition(partitionDesc, DateFormat.stringToMillis("2016-02-22 00:00:00"), DateFormat.stringToMillis("2016-02-23 01:00:00"));
- Assert.assertEquals("((UNKNOWN_ALIAS.DATE_COLUMN = '2016-02-22' AND UNKNOWN_ALIAS.HOUR_COLUMN >= '0') OR (UNKNOWN_ALIAS.DATE_COLUMN > '2016-02-22')) AND ((UNKNOWN_ALIAS.DATE_COLUMN = '2016-02-23' AND UNKNOWN_ALIAS.HOUR_COLUMN < '1') OR (UNKNOWN_ALIAS.DATE_COLUMN < '2016-02-23'))", condition);
+ String condition = partitionConditionBuilder.buildDateRangeCondition(partitionDesc,
+ DateFormat.stringToMillis("2016-02-22 00:00:00"), DateFormat.stringToMillis("2016-02-23 01:00:00"));
+ Assert.assertEquals(
+ "((UNKNOWN_ALIAS.DATE_COLUMN = '2016-02-22' AND UNKNOWN_ALIAS.HOUR_COLUMN >= '0') OR (UNKNOWN_ALIAS.DATE_COLUMN > '2016-02-22')) AND ((UNKNOWN_ALIAS.DATE_COLUMN = '2016-02-23' AND UNKNOWN_ALIAS.HOUR_COLUMN < '1') OR (UNKNOWN_ALIAS.DATE_COLUMN < '2016-02-23'))",
+ condition);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/kylin/blob/fe156781/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java b/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java
index 39c5bac..346a3ef 100644
--- a/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java
+++ b/engine-mr/src/test/java/org/apache/kylin/engine/mr/SortedColumnReaderTest.java
@@ -31,19 +31,32 @@ import java.util.Comparator;
import java.util.Random;
import java.util.UUID;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.dict.ByteComparator;
import org.apache.kylin.dict.BytesConverter;
import org.apache.kylin.dict.IDictionaryValueEnumerator;
import org.apache.kylin.dict.StringBytesConverter;
import org.apache.kylin.dict.TableColumnValueEnumerator;
import org.apache.kylin.metadata.datatype.DataType;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
/**
* Created by xiefan on 16-11-14.
*/
-public class SortedColumnReaderTest {
+public class SortedColumnReaderTest extends LocalFileMetadataTestCase {
+
+ @Before
+ public void setup() throws Exception {
+ this.createTestMetadata();
+ }
+
+ @After
+ public void after() throws Exception {
+ this.cleanupTestMetadata();
+ }
@Test
public void testReadStringMultiFile() throws Exception {
@@ -297,7 +310,7 @@ public class SortedColumnReaderTest {
}
return result;
}
-
+
private String qualify(String path) {
String absolutePath = new File(path).getAbsolutePath();
if (absolutePath.startsWith("/"))