minor, skip column family ordering check for compatibility
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/05610dee Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/05610dee Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/05610dee Branch: refs/heads/master Commit: 05610dee7990d819a615efe57e8f9782948ee36f Parents: 1e35990 Author: Roger Shi <rogershijich...@hotmail.com> Authored: Wed Dec 13 12:04:02 2017 +0800 Committer: Roger Shi <rogershijich...@gmail.com> Committed: Wed Dec 13 14:16:02 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/cube/model/CubeDesc.java | 7 +++++-- .../test/java/org/apache/kylin/cube/CubeDescTest.java | 14 -------------- 2 files changed, 5 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/05610dee/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java index efb9c59..32578ed 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java @@ -1039,8 +1039,11 @@ public class CubeDesc extends RootPersistentEntity implements IEngineAware { checkState(!measureSet.contains(colMeasureRefs[i]), "measure (%s) duplicates", colMeasureRefs[i]); measureSet.add(colMeasureRefs[i]); - checkState(measureIndex[i] > lastMeasureIndex, "measure (%s) is not in order", colMeasureRefs[i]); - lastMeasureIndex = measureIndex[i]; + if (storageType > IStorageAware.ID_SHARDED_HBASE) { + checkState(measureIndex[i] > lastMeasureIndex, "measure (%s) is not in order", + colMeasureRefs[i]); + lastMeasureIndex = measureIndex[i]; + } checkEachMeasureExist.set(measureIndex[i]); } http://git-wip-us.apache.org/repos/asf/kylin/blob/05610dee/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java ---------------------------------------------------------------------- diff --git a/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java b/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java index 36ac5c3..29152fe 100644 --- a/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java +++ b/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java @@ -322,20 +322,6 @@ public class CubeDescTest extends LocalFileMetadataTestCase { } @Test - public void testBadInit13() throws Exception { - thrown.expect(IllegalStateException.class); - CubeDesc cubeDesc = CubeDescManager.getInstance(getTestConfig()).getCubeDesc(CUBE_WITH_SLR_DESC); - MeasureDesc measureForTransCnt = cubeDesc.getMeasures().get(3); - Assert.assertEquals(measureForTransCnt.getName(), "TRANS_CNT"); - thrown.expectMessage("measure (" + measureForTransCnt.getName() + ") is not in order"); - HBaseColumnDesc colDesc = new HBaseColumnDesc(); - colDesc.setQualifier("M"); - colDesc.setMeasureRefs(new String[] { "GMV_SUM", "GMV_MIN", "GMV_MAX", "ITEM_COUNT_SUM", "TRANS_CNT" }); - cubeDesc.getHbaseMapping().getColumnFamily()[0].getColumns()[0] = colDesc; - cubeDesc.initMeasureReferenceToColumnFamily(); - } - - @Test public void testBadInit14() throws Exception { thrown.expect(IllegalStateException.class); CubeDesc cubeDesc = CubeDescManager.getInstance(getTestConfig()).getCubeDesc(CUBE_WITH_SLR_DESC);
