Repository: kylin Updated Branches: refs/heads/KYLIN-1971 293eb85b6 -> ab23cc242
tmp Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ab23cc24 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ab23cc24 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ab23cc24 Branch: refs/heads/KYLIN-1971 Commit: ab23cc2424c488d860c4727abd2a187aefd7d6e5 Parents: 293eb85 Author: Yang Li <liy...@apache.org> Authored: Thu Oct 27 07:58:16 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Thu Oct 27 07:58:16 2016 +0800 ---------------------------------------------------------------------- .../storage/hbase/common/coprocessor/CoprocessorRowType.java | 3 +++ .../storage/hbase/cube/v1/coprocessor/observer/RowTypeTest.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ab23cc24/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 f1e26f5..7314fc4 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 @@ -73,6 +73,7 @@ public class CoprocessorRowType { for (int i = 0; i < n; i++) { BytesUtil.writeAsciiString(o.columns[i].getTable(), out); BytesUtil.writeAsciiString(o.columns[i].getName(), out); + BytesUtil.writeAsciiString(o.columns[i].getDatatype(), out); BytesUtil.writeVInt(o.columnSizes[i], out); } } @@ -86,11 +87,13 @@ public class CoprocessorRowType { for (int i = 0; i < n; i++) { String tableName = BytesUtil.readAsciiString(in); String colName = BytesUtil.readAsciiString(in); + String datatype = BytesUtil.readAsciiString(in); TableDesc table = new TableDesc(); table.setName(tableName); ColumnDesc col = new ColumnDesc(); col.setTable(table); col.setName(colName); + col.setDatatype(datatype); col.init(table); cols[i] = col.getRef(); http://git-wip-us.apache.org/repos/asf/kylin/blob/ab23cc24/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/RowTypeTest.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/RowTypeTest.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/RowTypeTest.java index ba4b86a..364be9a 100644 --- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/RowTypeTest.java +++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/cube/v1/coprocessor/observer/RowTypeTest.java @@ -18,6 +18,7 @@ package org.apache.kylin.storage.hbase.cube.v1.coprocessor.observer; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.Arrays; @@ -60,7 +61,9 @@ public class RowTypeTest extends LocalFileMetadataTestCase { byte[] bytes = CoprocessorRowType.serialize(rowType); CoprocessorRowType copy = CoprocessorRowType.deserialize(bytes); - assertTrue(Arrays.equals(rowType.columns, copy.columns)); assertTrue(Arrays.equals(rowType.columnSizes, copy.columnSizes)); + for (int i = 0; i < rowType.columns.length; i++) { + assertEquals(rowType.columns[i].getColumnDesc(), copy.columns[i].getColumnDesc()); + } } }
