Repository: kylin Updated Branches: refs/heads/master 05f35f0e4 -> 530365131
minor, fix cubedesc and datamodeldesc UT Signed-off-by: lidongsjtu <lid...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/53036513 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/53036513 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/53036513 Branch: refs/heads/master Commit: 5303651316ee6911e312130624534315267ef99a Parents: 05f35f0 Author: Roger Shi <rogershijich...@hotmail.com> Authored: Tue Dec 13 13:03:22 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Tue Dec 13 13:05:51 2016 +0800 ---------------------------------------------------------------------- core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java | 1 - core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java | 1 + .../main/java/org/apache/kylin/metadata/model/DataModelDesc.java | 1 - .../java/org/apache/kylin/metadata/model/DataModelDescTest.java | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/53036513/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 6088bb4..f6b68af 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 @@ -1129,7 +1129,6 @@ public class CubeDesc extends RootPersistentEntity implements IEngineAware { newCubeDesc.setAggregationGroups(cubeDesc.getAggregationGroups()); newCubeDesc.setOverrideKylinProps(cubeDesc.getOverrideKylinProps()); newCubeDesc.setConfig((KylinConfigExt) cubeDesc.getConfig()); - newCubeDesc.setLastModified(cubeDesc.getLastModified()); newCubeDesc.setPartitionOffsetStart(cubeDesc.getPartitionOffsetStart()); newCubeDesc.updateRandomUuid(); return newCubeDesc; http://git-wip-us.apache.org/repos/asf/kylin/blob/53036513/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 78cf222..1daa748 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 @@ -262,6 +262,7 @@ public class CubeDescTest extends LocalFileMetadataTestCase { // uuid is different, set to equals for json comparison copyDesc.setUuid(desc.getUuid()); + copyDesc.setLastModified(desc.getLastModified()); String descStr = JsonUtil.writeValueAsIndentString(desc); String copyStr = JsonUtil.writeValueAsIndentString(copyDesc); http://git-wip-us.apache.org/repos/asf/kylin/blob/53036513/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java index 99636d7..0be240e 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java @@ -526,7 +526,6 @@ public class DataModelDesc extends RootPersistentEntity { copy.filterCondition = orig.filterCondition; copy.partitionDesc = PartitionDesc.getCopyOf(orig.getPartitionDesc()); copy.capacity = orig.capacity; - copy.lastModified = orig.lastModified; copy.updateRandomUuid(); return copy; } http://git-wip-us.apache.org/repos/asf/kylin/blob/53036513/core-metadata/src/test/java/org/apache/kylin/metadata/model/DataModelDescTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/metadata/model/DataModelDescTest.java b/core-metadata/src/test/java/org/apache/kylin/metadata/model/DataModelDescTest.java index 15bd29c..0cfa1f4 100644 --- a/core-metadata/src/test/java/org/apache/kylin/metadata/model/DataModelDescTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/metadata/model/DataModelDescTest.java @@ -47,6 +47,7 @@ public class DataModelDescTest extends LocalFileMetadataTestCase { // uuid is different, set to equals for json comparison copyDesc.setUuid(desc.getUuid()); + copyDesc.setLastModified(desc.getLastModified()); String descStr = JsonUtil.writeValueAsIndentString(desc); String copyStr = JsonUtil.writeValueAsIndentString(copyDesc);
