[24/50] [abbrv] carbondata git commit: [CARBONDATA-2082] Timeseries pre-aggregate table should support the blank space
[CARBONDATA-2082] Timeseries pre-aggregate table should support the blank space Timeseries pre-aggregate table should support the blank space, including:event_time,different franularity This closes #1902 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/a9a0201b Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/a9a0201b Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/a9a0201b Branch: refs/heads/branch-1.3 Commit: a9a0201b468505c79d1881607fb0673ee588d85a Parents: d3b228f Author: xubo245 <601450...@qq.com> Authored: Thu Feb 1 15:32:36 2018 +0800 Committer: kumarvishal Committed: Fri Feb 2 18:38:44 2018 +0530 -- .../timeseries/TestTimeSeriesCreateTable.scala | 76 .../datamap/CarbonCreateDataMapCommand.scala| 17 +++-- .../command/timeseries/TimeSeriesUtil.scala | 11 ++- 3 files changed, 92 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/carbondata/blob/a9a0201b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala -- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala index b63fd53..f3bbcaf 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala @@ -368,6 +368,82 @@ class TestTimeSeriesCreateTable extends QueryTest with BeforeAndAfterAll { assert(e.getMessage.contains("identifier matching regex")) } + test("test timeseries create table 33: support event_time and granularity key with space") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +sql( + s"""CREATE DATAMAP agg1_month ON TABLE mainTable + |USING '$timeSeries' + |DMPROPERTIES ( + | ' event_time '='dataTime', + | ' MONTH_GRANULARITY '='1') + |AS SELECT dataTime, SUM(age) FROM mainTable + |GROUP BY dataTime +""".stripMargin) +checkExistence(sql("SHOW DATAMAP ON TABLE maintable"), true, "maintable_agg1_month") +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") + } + + + test("test timeseries create table 34: support event_time value with space") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +sql( + s"""CREATE DATAMAP agg1_month ON TABLE mainTable + |USING '$timeSeries' + |DMPROPERTIES ( + | 'event_time '=' dataTime', + | 'MONTH_GRANULARITY '='1') + |AS SELECT dataTime, SUM(age) FROM mainTable + |GROUP BY dataTime +""".stripMargin) +checkExistence(sql("SHOW DATAMAP ON TABLE maintable"), true, "maintable_agg1_month") +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") + } + + test("test timeseries create table 35: support granularity value with space") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +sql( + s"""CREATE DATAMAP agg1_month ON TABLE mainTable + |USING '$timeSeries' + |DMPROPERTIES ( + | 'event_time '='dataTime', + | 'MONTH_GRANULARITY '=' 1') + |AS SELECT dataTime, SUM(age) FROM mainTable + |GROUP BY dataTime +""".stripMargin) +checkExistence(sql("SHOW DATAMAP ON TABLE maintable"), true, "maintable_agg1_month") +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") + } + + test("test timeseries create table 36: support event_time and granularity value with space") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +sql( + s""" + | CREATE DATAMAP agg1_month ON TABLE mainTable + | USING '$timeSeries' + | DMPROPERTIES ( + | 'EVENT_TIME'='dataTime ', + | 'MONTH_GRANULARITY'=' 1 ') + | AS SELECT dataTime, SUM(age) FROM mainTable + | GROUP BY dataTime +""".stripMargin) +checkExistence(sql("SHOW DATAMAP ON TABLE maintable"), true, "maintable_agg1_month") + } + + test("test timeseries create table 37: unsupport event_time error value") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +intercept[NullPointerException] { + sql( +s"""CREATE DATAMAP agg1_month ON TABLE mainTable USING '$timeSeries' + |DMPROPERTIES ( + | 'event_time'='data Tim
carbondata git commit: [CARBONDATA-2082] Timeseries pre-aggregate table should support the blank space
Repository: carbondata Updated Branches: refs/heads/master d3b228fb8 -> a9a0201b4 [CARBONDATA-2082] Timeseries pre-aggregate table should support the blank space Timeseries pre-aggregate table should support the blank space, including:event_time,different franularity This closes #1902 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/a9a0201b Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/a9a0201b Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/a9a0201b Branch: refs/heads/master Commit: a9a0201b468505c79d1881607fb0673ee588d85a Parents: d3b228f Author: xubo245 <601450...@qq.com> Authored: Thu Feb 1 15:32:36 2018 +0800 Committer: kumarvishal Committed: Fri Feb 2 18:38:44 2018 +0530 -- .../timeseries/TestTimeSeriesCreateTable.scala | 76 .../datamap/CarbonCreateDataMapCommand.scala| 17 +++-- .../command/timeseries/TimeSeriesUtil.scala | 11 ++- 3 files changed, 92 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/carbondata/blob/a9a0201b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala -- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala index b63fd53..f3bbcaf 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/timeseries/TestTimeSeriesCreateTable.scala @@ -368,6 +368,82 @@ class TestTimeSeriesCreateTable extends QueryTest with BeforeAndAfterAll { assert(e.getMessage.contains("identifier matching regex")) } + test("test timeseries create table 33: support event_time and granularity key with space") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +sql( + s"""CREATE DATAMAP agg1_month ON TABLE mainTable + |USING '$timeSeries' + |DMPROPERTIES ( + | ' event_time '='dataTime', + | ' MONTH_GRANULARITY '='1') + |AS SELECT dataTime, SUM(age) FROM mainTable + |GROUP BY dataTime +""".stripMargin) +checkExistence(sql("SHOW DATAMAP ON TABLE maintable"), true, "maintable_agg1_month") +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") + } + + + test("test timeseries create table 34: support event_time value with space") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +sql( + s"""CREATE DATAMAP agg1_month ON TABLE mainTable + |USING '$timeSeries' + |DMPROPERTIES ( + | 'event_time '=' dataTime', + | 'MONTH_GRANULARITY '='1') + |AS SELECT dataTime, SUM(age) FROM mainTable + |GROUP BY dataTime +""".stripMargin) +checkExistence(sql("SHOW DATAMAP ON TABLE maintable"), true, "maintable_agg1_month") +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") + } + + test("test timeseries create table 35: support granularity value with space") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +sql( + s"""CREATE DATAMAP agg1_month ON TABLE mainTable + |USING '$timeSeries' + |DMPROPERTIES ( + | 'event_time '='dataTime', + | 'MONTH_GRANULARITY '=' 1') + |AS SELECT dataTime, SUM(age) FROM mainTable + |GROUP BY dataTime +""".stripMargin) +checkExistence(sql("SHOW DATAMAP ON TABLE maintable"), true, "maintable_agg1_month") +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") + } + + test("test timeseries create table 36: support event_time and granularity value with space") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +sql( + s""" + | CREATE DATAMAP agg1_month ON TABLE mainTable + | USING '$timeSeries' + | DMPROPERTIES ( + | 'EVENT_TIME'='dataTime ', + | 'MONTH_GRANULARITY'=' 1 ') + | AS SELECT dataTime, SUM(age) FROM mainTable + | GROUP BY dataTime +""".stripMargin) +checkExistence(sql("SHOW DATAMAP ON TABLE maintable"), true, "maintable_agg1_month") + } + + test("test timeseries create table 37: unsupport event_time error value") { +sql("DROP DATAMAP IF EXISTS agg1_month ON TABLE maintable") +intercept[NullPointerException] { + sql( +s"""CREATE DATAMAP agg1_month ON TABLE mainTable USIN