Merge commit '69e89b866529459324ab88ee9a1dee89f75853fe' into kap-2.4.x
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/61041d74 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/61041d74 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/61041d74 Branch: refs/heads/2.1.x Commit: 61041d746a74f567513cd9e68e32d5890e7ac764 Parents: f365c55 69e89b8 Author: Hongbin Ma <mahong...@apache.org> Authored: Tue Aug 22 17:19:09 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Tue Aug 22 17:19:09 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/common/KylinVersion.java | 2 +- .../apache/kylin/common/KylinVersionTest.java | 4 +- pom.xml | 1 + .../kylin/source/kafka/DateTimeParser.java | 62 +++++++++ .../org/apache/kylin/tool/CubeMigrationCLI.java | 131 +++++++------------ webapp/app/js/controllers/cubeAdvanceSetting.js | 5 + webapp/app/js/controllers/cubeEdit.js | 52 -------- webapp/app/js/controllers/cubeMeasures.js | 7 - 8 files changed, 118 insertions(+), 146 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/61041d74/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java ---------------------------------------------------------------------- diff --cc core-common/src/main/java/org/apache/kylin/common/KylinVersion.java index c6913fc,960bafe..8d8c0b0 --- a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java @@@ -211,4 -201,4 +211,4 @@@ public class KylinVersion implements Co } } --} ++} http://git-wip-us.apache.org/repos/asf/kylin/blob/61041d74/core-common/src/test/java/org/apache/kylin/common/KylinVersionTest.java ---------------------------------------------------------------------- diff --cc core-common/src/test/java/org/apache/kylin/common/KylinVersionTest.java index 6e903c8,96b3189..f654db2 --- a/core-common/src/test/java/org/apache/kylin/common/KylinVersionTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/KylinVersionTest.java @@@ -37,21 -37,4 +37,21 @@@ public class KylinVersionTest Assert.assertEquals(1, ver1.minor); Assert.assertEquals(0, ver1.revision); } + + @Test + public void testToString() { + KylinVersion ver1 = new KylinVersion("2.1.7.321"); + Assert.assertEquals(2, ver1.major); + Assert.assertEquals(1, ver1.minor); + Assert.assertEquals(7, ver1.revision); + Assert.assertEquals(321, ver1.internal); + Assert.assertEquals("2.1.7.321", ver1.toString()); + } - ++ + @Test + public void testCompare() { + Assert.assertEquals(true, KylinVersion.isBefore200("1.9.9")); + Assert.assertEquals(false, KylinVersion.isBefore200("2.0.0")); + Assert.assertEquals(true, new KylinVersion("2.1.0").compareTo(new KylinVersion("2.1.0.123")) < 0); + } - } + }
