Repository: kylin Updated Branches: refs/heads/KYLIN-1971 106193411 -> 40c80a9bc
tmp Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/40c80a9b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/40c80a9b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/40c80a9b Branch: refs/heads/KYLIN-1971 Commit: 40c80a9bcf5ab9ca39bd53f0138e900e409b9aaa Parents: 1061934 Author: Yang Li <liy...@apache.org> Authored: Sat Oct 22 20:11:33 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Sat Oct 22 20:11:33 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/gridtable/GTUtil.java | 4 +- .../apache/kylin/metadata/model/ColumnDesc.java | 10 ----- .../apache/kylin/metadata/model/TblColRef.java | 11 +++++ .../apache/kylin/storage/StorageMockUtils.java | 17 ++++---- .../storage/gtrecord/DictGridTableTest.java | 16 +++---- .../storage/translate/ColumnValueRangeTest.java | 22 +--------- .../source/kafka/TimedJsonStreamParserTest.java | 44 ++++++-------------- .../common/coprocessor/CoprocessorRowType.java | 2 +- .../hbase/common/FuzzyValueCombinationTest.java | 4 +- .../TimeConditionLiteralsReplacerTest.java | 4 +- .../common/coprocessor/FilterBaseTest.java | 11 ++--- .../observer/AggregateRegionObserverTest.java | 5 +-- 12 files changed, 50 insertions(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/core-cube/src/main/java/org/apache/kylin/gridtable/GTUtil.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/gridtable/GTUtil.java b/core-cube/src/main/java/org/apache/kylin/gridtable/GTUtil.java index 8d310a3..a4e574c 100644 --- a/core-cube/src/main/java/org/apache/kylin/gridtable/GTUtil.java +++ b/core-cube/src/main/java/org/apache/kylin/gridtable/GTUtil.java @@ -31,7 +31,6 @@ import org.apache.kylin.metadata.filter.ConstantTupleFilter; import org.apache.kylin.metadata.filter.IFilterCodeSystem; import org.apache.kylin.metadata.filter.TupleFilter; import org.apache.kylin.metadata.filter.TupleFilterSerializer; -import org.apache.kylin.metadata.model.ColumnDesc; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.model.TblColRef; @@ -42,8 +41,7 @@ public class GTUtil { static final TableDesc MOCKUP_TABLE = TableDesc.mockup("GT_MOCKUP_TABLE"); static TblColRef tblColRef(int col, String datatype) { - ColumnDesc desc = ColumnDesc.mockup(MOCKUP_TABLE, col + 1, "" + col, datatype); - return desc.getRef(); + return TblColRef.mockup(MOCKUP_TABLE, col + 1, "" + col, datatype); } public static byte[] serializeGTFilter(TupleFilter gtFilter, GTInfo info) { http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java index d131b92..1b19b50 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ColumnDesc.java @@ -36,16 +36,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; @JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE) public class ColumnDesc implements Serializable { - public static ColumnDesc mockup(TableDesc table, int oneBasedColumnIndex, String name, String datatype) { - ColumnDesc desc = new ColumnDesc(); - String id = "" + oneBasedColumnIndex; - desc.setId(id); - desc.setName(name); - desc.setDatatype(datatype); - desc.init(table); - return desc; - } - @JsonProperty("id") private String id; @JsonProperty("name") http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java index 0f3f70d..7209d5e 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java @@ -61,6 +61,17 @@ public class TblColRef implements Serializable { return colRef; } + // for test only + public static TblColRef mockup(TableDesc table, int oneBasedColumnIndex, String name, String datatype) { + ColumnDesc desc = new ColumnDesc(); + String id = "" + oneBasedColumnIndex; + desc.setId(id); + desc.setName(name); + desc.setDatatype(datatype); + desc.init(table); + return new TblColRef(desc); + } + // ============================================================================ private TableRef table; http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/core-storage/src/test/java/org/apache/kylin/storage/StorageMockUtils.java ---------------------------------------------------------------------- diff --git a/core-storage/src/test/java/org/apache/kylin/storage/StorageMockUtils.java b/core-storage/src/test/java/org/apache/kylin/storage/StorageMockUtils.java index 6e54899..456e768 100644 --- a/core-storage/src/test/java/org/apache/kylin/storage/StorageMockUtils.java +++ b/core-storage/src/test/java/org/apache/kylin/storage/StorageMockUtils.java @@ -28,7 +28,6 @@ import org.apache.kylin.metadata.filter.CompareTupleFilter; import org.apache.kylin.metadata.filter.ConstantTupleFilter; import org.apache.kylin.metadata.filter.LogicalTupleFilter; import org.apache.kylin.metadata.filter.TupleFilter; -import org.apache.kylin.metadata.model.ColumnDesc; import org.apache.kylin.metadata.model.FunctionDesc; import org.apache.kylin.metadata.model.ParameterDesc; import org.apache.kylin.metadata.model.TableDesc; @@ -61,14 +60,12 @@ public class StorageMockUtils { List<TblColRef> groups = new ArrayList<TblColRef>(); TableDesc t1 = TableDesc.mockup("DEFAULT.TEST_KYLIN_FACT"); - ColumnDesc c1 = ColumnDesc.mockup(t1, 2, "CAL_DT", "date"); - TblColRef cf1 = c1.getRef(); - groups.add(cf1); + TblColRef c1 = TblColRef.mockup(t1, 2, "CAL_DT", "date"); + groups.add(c1); TableDesc t2 = TableDesc.mockup("DEFAULT.TEST_CATEGORY_GROUPINGS"); - ColumnDesc c2 = ColumnDesc.mockup(t2, 14, "META_CATEG_NAME", "string"); - TblColRef cf2 = c2.getRef(); - groups.add(cf2); + TblColRef c2 = TblColRef.mockup(t2, 14, "META_CATEG_NAME", "string"); + groups.add(c2); return groups; } @@ -77,7 +74,7 @@ public class StorageMockUtils { List<FunctionDesc> functions = new ArrayList<FunctionDesc>(); TableDesc t1 = TableDesc.mockup("DEFAULT.TEST_KYLIN_FACT"); - TblColRef priceCol = ColumnDesc.mockup(t1, 7, "PRICE", "decimal(19,4)").getRef(); + TblColRef priceCol = TblColRef.mockup(t1, 7, "PRICE", "decimal(19,4)"); FunctionDesc f1 = new FunctionDesc(); f1.setExpression("SUM"); @@ -96,8 +93,8 @@ public class StorageMockUtils { List<FunctionDesc> functions = new ArrayList<FunctionDesc>(); TableDesc t1 = TableDesc.mockup("DEFAULT.TEST_KYLIN_FACT"); - TblColRef priceCol = ColumnDesc.mockup(t1, 7, "PRICE", "decimal(19,4)").getRef(); - TblColRef sellerCol = ColumnDesc.mockup(t1, 9, "SELLER_ID", "bigint").getRef(); + TblColRef priceCol = TblColRef.mockup(t1, 7, "PRICE", "decimal(19,4)"); + TblColRef sellerCol = TblColRef.mockup(t1, 9, "SELLER_ID", "bigint"); FunctionDesc f1 = new FunctionDesc(); f1.setExpression("SUM"); http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java ---------------------------------------------------------------------- diff --git a/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java b/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java index 0cdfa7e..d40eb08 100644 --- a/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java +++ b/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java @@ -360,8 +360,8 @@ public class DictGridTableTest extends LocalFileMetadataTestCase { GTInfo info = table.getInfo(); TableDesc extTable = TableDesc.mockup("ext"); - TblColRef extColA = ColumnDesc.mockup(extTable, 1, "A", "timestamp").getRef(); - TblColRef extColB = ColumnDesc.mockup(extTable, 2, "B", "integer").getRef(); + TblColRef extColA = TblColRef.mockup(extTable, 1, "A", "timestamp"); + TblColRef extColB = TblColRef.mockup(extTable, 2, "B", "integer"); CompareTupleFilter fComp1 = compare(extColA, FilterOperatorEnum.GT, "2015-01-14"); CompareTupleFilter fComp2 = compare(extColB, FilterOperatorEnum.EQ, "10"); @@ -380,8 +380,8 @@ public class DictGridTableTest extends LocalFileMetadataTestCase { GTInfo info = table.getInfo(); TableDesc extTable = TableDesc.mockup("ext"); - TblColRef extColA = ColumnDesc.mockup(extTable, 1, "A", "timestamp").getRef(); - TblColRef extColB = ColumnDesc.mockup(extTable, 2, "B", "integer").getRef(); + TblColRef extColA = TblColRef.mockup(extTable, 1, "A", "timestamp"); + TblColRef extColB = TblColRef.mockup(extTable, 2, "B", "integer"); CompareTupleFilter fComp1 = compare(extColA, FilterOperatorEnum.GT, "2015-01-14"); CompareTupleFilter fComp2 = compare(extColB, FilterOperatorEnum.LT, "9"); @@ -401,8 +401,8 @@ public class DictGridTableTest extends LocalFileMetadataTestCase { GTInfo info = table.getInfo(); TableDesc extTable = TableDesc.mockup("ext"); - TblColRef extColA = ColumnDesc.mockup(extTable, 1, "A", "timestamp").getRef(); - TblColRef extColB = ColumnDesc.mockup(extTable, 2, "B", "integer").getRef(); + TblColRef extColA = TblColRef.mockup(extTable, 1, "A", "timestamp"); + TblColRef extColB = TblColRef.mockup(extTable, 2, "B", "integer"); CompareTupleFilter fComp1 = compare(extColA, FilterOperatorEnum.GT, "2015-01-14"); CompareTupleFilter fComp2 = compare(extColB, FilterOperatorEnum.LTE, "9"); @@ -422,8 +422,8 @@ public class DictGridTableTest extends LocalFileMetadataTestCase { GTInfo info = table.getInfo(); TableDesc extTable = TableDesc.mockup("ext"); - TblColRef extColA = ColumnDesc.mockup(extTable, 1, "A", "timestamp").getRef(); - TblColRef extColB = ColumnDesc.mockup(extTable, 2, "B", "integer").getRef(); + TblColRef extColA = TblColRef.mockup(extTable, 1, "A", "timestamp"); + TblColRef extColB = TblColRef.mockup(extTable, 2, "B", "integer"); CompareTupleFilter fComp1 = compare(extColA, FilterOperatorEnum.GT, "2015-01-14"); CompareTupleFilter fComp2 = compare(extColB, FilterOperatorEnum.IN, "9", "10", "15"); http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/core-storage/src/test/java/org/apache/kylin/storage/translate/ColumnValueRangeTest.java ---------------------------------------------------------------------- diff --git a/core-storage/src/test/java/org/apache/kylin/storage/translate/ColumnValueRangeTest.java b/core-storage/src/test/java/org/apache/kylin/storage/translate/ColumnValueRangeTest.java index 36d9ea6..0e7e91f 100644 --- a/core-storage/src/test/java/org/apache/kylin/storage/translate/ColumnValueRangeTest.java +++ b/core-storage/src/test/java/org/apache/kylin/storage/translate/ColumnValueRangeTest.java @@ -30,7 +30,6 @@ import org.apache.kylin.common.util.LocalFileMetadataTestCase; import org.apache.kylin.dict.StringBytesConverter; import org.apache.kylin.dict.TrieDictionaryBuilder; import org.apache.kylin.metadata.filter.TupleFilter.FilterOperatorEnum; -import org.apache.kylin.metadata.model.ColumnDesc; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.model.TblColRef; import org.junit.AfterClass; @@ -121,24 +120,7 @@ public class ColumnValueRangeTest extends LocalFileMetadataTestCase { } public static TblColRef mockupTblColRef() { - TableDesc t = mockupTableDesc("table_a"); - ColumnDesc c = mockupColumnDesc(t, 1, "col_1", "string"); - return c.getRef(); - } - - private static TableDesc mockupTableDesc(String tableName) { - TableDesc mockup = new TableDesc(); - mockup.setName(tableName); - return mockup; - } - - private static ColumnDesc mockupColumnDesc(TableDesc table, int oneBasedColumnIndex, String name, String datatype) { - ColumnDesc desc = new ColumnDesc(); - String id = "" + oneBasedColumnIndex; - desc.setId(id); - desc.setName(name); - desc.setDatatype(datatype); - desc.init(table); - return desc; + TableDesc t = TableDesc.mockup("table_a"); + return TblColRef.mockup(t, 1, "col_1", "string"); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/source-kafka/src/test/java/org/apache/kylin/source/kafka/TimedJsonStreamParserTest.java ---------------------------------------------------------------------- diff --git a/source-kafka/src/test/java/org/apache/kylin/source/kafka/TimedJsonStreamParserTest.java b/source-kafka/src/test/java/org/apache/kylin/source/kafka/TimedJsonStreamParserTest.java index f92a24e..230ff00 100644 --- a/source-kafka/src/test/java/org/apache/kylin/source/kafka/TimedJsonStreamParserTest.java +++ b/source-kafka/src/test/java/org/apache/kylin/source/kafka/TimedJsonStreamParserTest.java @@ -17,32 +17,28 @@ */ package org.apache.kylin.source.kafka; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.Assert.assertEquals; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; -import com.fasterxml.jackson.databind.type.MapType; -import com.fasterxml.jackson.databind.type.SimpleType; import org.apache.commons.lang3.StringUtils; +import org.apache.kylin.common.util.LocalFileMetadataTestCase; import org.apache.kylin.common.util.StreamingMessage; -import org.apache.kylin.metadata.model.ColumnDesc; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.model.TblColRef; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import java.util.List; -import java.util.HashMap; -import java.util.ArrayList; - -import static org.junit.Assert.assertEquals; - -import org.apache.kylin.common.util.LocalFileMetadataTestCase; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.MapType; +import com.fasterxml.jackson.databind.type.SimpleType; public class TimedJsonStreamParserTest extends LocalFileMetadataTestCase { @@ -139,28 +135,12 @@ public class TimedJsonStreamParserTest extends LocalFileMetadataTestCase { } private static List<TblColRef> mockupTblColRefList() { - TableDesc t = mockupTableDesc("table_a"); + TableDesc t = TableDesc.mockup("table_a"); List<TblColRef> list = new ArrayList<>(); for (int i = 0; i < userNeedColNames.length; i++) { - ColumnDesc c = mockupColumnDesc(t, i, userNeedColNames[i], "string"); - list.add(c.getRef()); + TblColRef c = TblColRef.mockup(t, i, userNeedColNames[i], "string"); + list.add(c); } return list; } - - private static TableDesc mockupTableDesc(String tableName) { - TableDesc mockup = new TableDesc(); - mockup.setName(tableName); - return mockup; - } - - private static ColumnDesc mockupColumnDesc(TableDesc table, int oneBasedColumnIndex, String name, String datatype) { - ColumnDesc desc = new ColumnDesc(); - String id = "" + oneBasedColumnIndex; - desc.setId(id); - desc.setName(name); - desc.setDatatype(datatype); - desc.init(table); - return desc; - } } http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/CoprocessorRowType.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/CoprocessorRowType.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/CoprocessorRowType.java index d47bf61..f1e26f5 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/CoprocessorRowType.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/CoprocessorRowType.java @@ -36,9 +36,9 @@ import com.google.common.collect.Maps; /** * @author yangli9 */ +@Deprecated // used by v1 HBase coprocessor public class CoprocessorRowType { - //for observer public static CoprocessorRowType fromCuboid(CubeSegment seg, Cuboid cuboid) { List<TblColRef> colList = cuboid.getColumns(); http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/FuzzyValueCombinationTest.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/FuzzyValueCombinationTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/FuzzyValueCombinationTest.java index e516bc2..14c14ba 100644 --- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/FuzzyValueCombinationTest.java +++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/FuzzyValueCombinationTest.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Set; import org.apache.kylin.common.util.LocalFileMetadataTestCase; -import org.apache.kylin.metadata.model.ColumnDesc; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.model.TblColRef; import org.apache.kylin.storage.translate.FuzzyValueCombination; @@ -67,8 +66,7 @@ public class FuzzyValueCombinationTest extends LocalFileMetadataTestCase { } private static TblColRef col(int i, TableDesc t) { - ColumnDesc col = ColumnDesc.mockup(t, i, "Col" + i, "string"); - return col.getRef(); + return TblColRef.mockup(t, i, "Col" + i, "string"); } @Test http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/TimeConditionLiteralsReplacerTest.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/TimeConditionLiteralsReplacerTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/TimeConditionLiteralsReplacerTest.java index 29e83b7..63f8961 100644 --- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/TimeConditionLiteralsReplacerTest.java +++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/TimeConditionLiteralsReplacerTest.java @@ -25,7 +25,6 @@ import org.apache.kylin.metadata.filter.ConstantTupleFilter; import org.apache.kylin.metadata.filter.TimeConditionLiteralsReplacer; import org.apache.kylin.metadata.filter.TupleFilter; import org.apache.kylin.metadata.filter.TupleFilterSerializer; -import org.apache.kylin.metadata.model.ColumnDesc; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.model.TblColRef; import org.apache.kylin.storage.hbase.common.coprocessor.FilterBaseTest; @@ -38,8 +37,7 @@ public class TimeConditionLiteralsReplacerTest extends FilterBaseTest { @Test public void basicTest() { TableDesc t1 = TableDesc.mockup("DEFAULT.TEST_KYLIN_FACT"); - ColumnDesc c1 = ColumnDesc.mockup(t1, 2, "CAL_DT", "date"); - TblColRef column = c1.getRef(); + TblColRef column = TblColRef.mockup(t1, 2, "CAL_DT", "date"); CompareTupleFilter compareFilter = new CompareTupleFilter(TupleFilter.FilterOperatorEnum.EQ); ColumnTupleFilter columnFilter = new ColumnTupleFilter(column); http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/coprocessor/FilterBaseTest.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/coprocessor/FilterBaseTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/coprocessor/FilterBaseTest.java index 1310478..d016e4f 100644 --- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/coprocessor/FilterBaseTest.java +++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/common/coprocessor/FilterBaseTest.java @@ -38,7 +38,6 @@ import org.apache.kylin.metadata.filter.LogicalTupleFilter; import org.apache.kylin.metadata.filter.StringCodeSystem; import org.apache.kylin.metadata.filter.TupleFilter; import org.apache.kylin.metadata.filter.TupleFilter.FilterOperatorEnum; -import org.apache.kylin.metadata.model.ColumnDesc; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.model.TblColRef; import org.apache.kylin.metadata.tuple.Tuple; @@ -71,14 +70,12 @@ public class FilterBaseTest extends LocalFileMetadataTestCase { List<TblColRef> groups = new ArrayList<TblColRef>(); TableDesc t1 = TableDesc.mockup("DEFAULT.TEST_KYLIN_FACT"); - ColumnDesc c1 = ColumnDesc.mockup(t1, 2, "CAL_DT", "string"); - TblColRef cf1 = c1.getRef(); - groups.add(cf1); + TblColRef c1 = TblColRef.mockup(t1, 2, "CAL_DT", "string"); + groups.add(c1); TableDesc t2 = TableDesc.mockup("DEFAULT.TEST_CATEGORY_GROUPINGS"); - ColumnDesc c2 = ColumnDesc.mockup(t2, 14, "META_CATEG_NAME", "string"); - TblColRef cf2 = c2.getRef(); - groups.add(cf2); + TblColRef c2 = TblColRef.mockup(t2, 14, "META_CATEG_NAME", "string"); + groups.add(c2); return groups; } http://git-wip-us.apache.org/repos/asf/kylin/blob/40c80a9b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/AggregateRegionObserverTest.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/AggregateRegionObserverTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/AggregateRegionObserverTest.java index 390930a..c25b690 100644 --- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/AggregateRegionObserverTest.java +++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/AggregateRegionObserverTest.java @@ -36,11 +36,10 @@ import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.Type; import org.apache.hadoop.hbase.regionserver.RegionScanner; import org.apache.kylin.common.util.Bytes; +import org.apache.kylin.gridtable.StorageSideBehavior; import org.apache.kylin.metadata.datatype.LongMutable; -import org.apache.kylin.metadata.model.ColumnDesc; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.model.TblColRef; -import org.apache.kylin.gridtable.StorageSideBehavior; import org.apache.kylin.storage.hbase.common.coprocessor.CoprocessorFilter; import org.apache.kylin.storage.hbase.common.coprocessor.CoprocessorProjector; import org.apache.kylin.storage.hbase.common.coprocessor.CoprocessorRowType; @@ -207,7 +206,7 @@ public class AggregateRegionObserverTest { } private TblColRef newCol(int i, String name, TableDesc t) { - return ColumnDesc.mockup(t, i, name, null).getRef(); + return TblColRef.mockup(t, i, name, null); } public static class MockupRegionScanner implements RegionScanner {
