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 2016/05/24 05:17:53 UTC
kylin git commit: KYLIN-1725 Fix UT failures
Repository: kylin
Updated Branches:
refs/heads/master f079800a2 -> 1c6fb899b
KYLIN-1725 Fix UT failures
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1c6fb899
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1c6fb899
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1c6fb899
Branch: refs/heads/master
Commit: 1c6fb899bb80a8208c4e3d897edb2eada3f5b62b
Parents: f079800
Author: lidongsjtu <li...@apache.org>
Authored: Tue May 24 13:17:41 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Tue May 24 13:17:41 2016 +0800
----------------------------------------------------------------------
.../inmemcubing/ConcurrentDiskStoreTest.java | 15 ++++++++++++++-
.../kylin/cube/inmemcubing/MemDiskStoreTest.java | 15 ++++++++++++++-
.../gridtable/AggregationCacheSpillTest.java | 19 +++++++++++++------
.../kylin/gridtable/SimpleGridTableTest.java | 15 ++++++++++++++-
.../kylin/gridtable/SimpleInvertedIndexTest.java | 15 ++++++++++++++-
.../kylin/metadata/measure/MeasureCodecTest.java | 18 ++++++++++++++++--
6 files changed, 85 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/1c6fb899/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/ConcurrentDiskStoreTest.java
----------------------------------------------------------------------
diff --git a/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/ConcurrentDiskStoreTest.java b/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/ConcurrentDiskStoreTest.java
index 9a1029c..c81efe1 100644
--- a/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/ConcurrentDiskStoreTest.java
+++ b/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/ConcurrentDiskStoreTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.List;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.gridtable.GTBuilder;
import org.apache.kylin.gridtable.GTInfo;
import org.apache.kylin.gridtable.GTRecord;
@@ -29,13 +30,25 @@ import org.apache.kylin.gridtable.GTScanRequest;
import org.apache.kylin.gridtable.GridTable;
import org.apache.kylin.gridtable.IGTScanner;
import org.apache.kylin.gridtable.UnitTestSupport;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
-public class ConcurrentDiskStoreTest {
+public class ConcurrentDiskStoreTest extends LocalFileMetadataTestCase {
final GTInfo info = UnitTestSupport.advancedInfo();
final List<GTRecord> data = UnitTestSupport.mockupData(info, 1000000); // converts to about 34 MB data
+ @BeforeClass
+ public static void setUp() throws Exception {
+ staticCreateTestMetadata();
+ }
+
+ @AfterClass
+ public static void after() throws Exception {
+ staticCleanupTestMetadata();
+ }
+
@Test
public void testSingleThreadRead() throws IOException, InterruptedException {
long start = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/kylin/blob/1c6fb899/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/MemDiskStoreTest.java
----------------------------------------------------------------------
diff --git a/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/MemDiskStoreTest.java b/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/MemDiskStoreTest.java
index ff6a2ba..c01dc72 100644
--- a/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/MemDiskStoreTest.java
+++ b/core-cube/src/test/java/org/apache/kylin/cube/inmemcubing/MemDiskStoreTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.List;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.common.util.MemoryBudgetController;
import org.apache.kylin.gridtable.GTBuilder;
import org.apache.kylin.gridtable.GTInfo;
@@ -30,14 +31,26 @@ import org.apache.kylin.gridtable.GTScanRequest;
import org.apache.kylin.gridtable.GridTable;
import org.apache.kylin.gridtable.IGTScanner;
import org.apache.kylin.gridtable.UnitTestSupport;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
-public class MemDiskStoreTest {
+public class MemDiskStoreTest extends LocalFileMetadataTestCase {
final MemoryBudgetController budgetCtrl = new MemoryBudgetController(20);
final GTInfo info = UnitTestSupport.advancedInfo();
final List<GTRecord> data = UnitTestSupport.mockupData(info, 1000000); // converts to about 34 MB data
+ @BeforeClass
+ public static void setUp() throws Exception {
+ staticCreateTestMetadata();
+ }
+
+ @AfterClass
+ public static void after() throws Exception {
+ staticCleanupTestMetadata();
+ }
+
@Test
public void testSingleThreadWriteRead() throws IOException {
long start = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/kylin/blob/1c6fb899/core-cube/src/test/java/org/apache/kylin/gridtable/AggregationCacheSpillTest.java
----------------------------------------------------------------------
diff --git a/core-cube/src/test/java/org/apache/kylin/gridtable/AggregationCacheSpillTest.java b/core-cube/src/test/java/org/apache/kylin/gridtable/AggregationCacheSpillTest.java
index 73e4908..569432b 100644
--- a/core-cube/src/test/java/org/apache/kylin/gridtable/AggregationCacheSpillTest.java
+++ b/core-cube/src/test/java/org/apache/kylin/gridtable/AggregationCacheSpillTest.java
@@ -18,8 +18,7 @@
package org.apache.kylin.gridtable;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.math.BigDecimal;
@@ -27,7 +26,9 @@ import java.util.Iterator;
import java.util.List;
import org.apache.kylin.common.util.ImmutableBitSet;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.metadata.datatype.LongMutable;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -36,23 +37,29 @@ import com.google.common.collect.Lists;
/**
* Created by dongli on 12/16/15.
*/
-public class AggregationCacheSpillTest {
-
+public class AggregationCacheSpillTest extends LocalFileMetadataTestCase {
final static int DATA_CARDINALITY = 40000;
final static int DATA_REPLICATION = 2;
+ final static List<GTRecord> TEST_DATA = Lists.newArrayListWithCapacity(DATA_CARDINALITY * DATA_REPLICATION);
- final static GTInfo INFO = UnitTestSupport.hllInfo();
- final static List<GTRecord> TEST_DATA = Lists.newArrayListWithCapacity(DATA_CARDINALITY * DATA_REPLICATION);;
+ static GTInfo INFO;
@BeforeClass
public static void beforeClass() {
+ staticCreateTestMetadata();
System.setProperty("log4j.configuration", "kylin-log4j.properties");
+ INFO = UnitTestSupport.hllInfo();
final List<GTRecord> data = UnitTestSupport.mockupHllData(INFO, DATA_CARDINALITY);
for (int i = 0; i < DATA_REPLICATION; i++)
TEST_DATA.addAll(data);
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ staticCleanupTestMetadata();
+ }
+
@Test
public void testAggregationCacheSpill() throws IOException {
IGTScanner inputScanner = new IGTScanner() {
http://git-wip-us.apache.org/repos/asf/kylin/blob/1c6fb899/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleGridTableTest.java
----------------------------------------------------------------------
diff --git a/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleGridTableTest.java b/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleGridTableTest.java
index 0b3d98b..5ab2a1a 100644
--- a/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleGridTableTest.java
+++ b/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleGridTableTest.java
@@ -24,11 +24,24 @@ import java.math.BigDecimal;
import java.util.List;
import org.apache.kylin.common.util.ImmutableBitSet;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.gridtable.memstore.GTSimpleMemStore;
import org.apache.kylin.metadata.datatype.LongMutable;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
-public class SimpleGridTableTest {
+public class SimpleGridTableTest extends LocalFileMetadataTestCase {
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ staticCreateTestMetadata();
+ }
+
+ @AfterClass
+ public static void after() throws Exception {
+ staticCleanupTestMetadata();
+ }
@Test
public void testBasics() throws IOException {
http://git-wip-us.apache.org/repos/asf/kylin/blob/1c6fb899/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleInvertedIndexTest.java
----------------------------------------------------------------------
diff --git a/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleInvertedIndexTest.java b/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleInvertedIndexTest.java
index 02fbecc..e381d82 100644
--- a/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleInvertedIndexTest.java
+++ b/core-cube/src/test/java/org/apache/kylin/gridtable/SimpleInvertedIndexTest.java
@@ -25,6 +25,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import org.apache.kylin.common.util.ByteArray;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.metadata.datatype.DataType;
import org.apache.kylin.metadata.datatype.LongMutable;
import org.apache.kylin.metadata.datatype.StringSerializer;
@@ -35,17 +36,29 @@ import org.apache.kylin.metadata.filter.LogicalTupleFilter;
import org.apache.kylin.metadata.filter.TupleFilter;
import org.apache.kylin.metadata.filter.TupleFilter.FilterOperatorEnum;
import org.apache.kylin.metadata.model.TblColRef;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import com.google.common.collect.Lists;
-public class SimpleInvertedIndexTest {
+public class SimpleInvertedIndexTest extends LocalFileMetadataTestCase {
GTInfo info;
GTInvertedIndex index;
ArrayList<CompareTupleFilter> basicFilters = Lists.newArrayList();
ArrayList<ConciseSet> basicResults = Lists.newArrayList();
+ @BeforeClass
+ public static void setUp() throws Exception {
+ staticCreateTestMetadata();
+ }
+
+ @AfterClass
+ public static void after() throws Exception {
+ staticCleanupTestMetadata();
+ }
+
public SimpleInvertedIndexTest() {
info = UnitTestSupport.advancedInfo();
http://git-wip-us.apache.org/repos/asf/kylin/blob/1c6fb899/core-cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java
----------------------------------------------------------------------
diff --git a/core-cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java b/core-cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java
index 3f728b9..c42e86a 100644
--- a/core-cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java
+++ b/core-cube/src/test/java/org/apache/kylin/metadata/measure/MeasureCodecTest.java
@@ -23,20 +23,34 @@ import static org.junit.Assert.*;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
+import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.measure.BufferedMeasureEncoder;
import org.apache.kylin.measure.bitmap.BitmapCounter;
import org.apache.kylin.measure.hllc.HyperLogLogPlusCounter;
+import org.apache.kylin.measure.topn.TopNCounterSerializer;
+import org.apache.kylin.metadata.datatype.DataType;
import org.apache.kylin.metadata.datatype.DoubleMutable;
import org.apache.kylin.metadata.datatype.LongMutable;
import org.apache.kylin.metadata.model.FunctionDesc;
import org.apache.kylin.metadata.model.MeasureDesc;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
*
*/
-public class MeasureCodecTest {
-
+public class MeasureCodecTest extends LocalFileMetadataTestCase {
+ @BeforeClass
+ public static void setUp() throws Exception {
+ staticCreateTestMetadata();
+ }
+
+ @AfterClass
+ public static void after() throws Exception {
+ staticCleanupTestMetadata();
+ }
+
@Test
public void basicTest() {
MeasureDesc descs[] = new MeasureDesc[] { measure("double"), measure("long"), measure