This is an automated email from the ASF dual-hosted git repository. cwylie pushed a commit to branch 0.15.1-incubating in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
commit 4404e07cde5a1f595f38b9d5edcada3b8c7aaf8b Author: Clint Wylie <[email protected]> AuthorDate: Tue Jul 23 16:47:38 2019 -0700 fix backport --- .../apache/druid/sql/calcite/CalciteQueryTest.java | 45 +--------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java index f4bc6ae..c8335ff 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java @@ -68,6 +68,7 @@ import org.apache.druid.query.topn.TopNQueryBuilder; import org.apache.druid.segment.column.ValueType; import org.apache.druid.sql.calcite.expression.DruidExpression; import org.apache.druid.sql.calcite.filtration.Filtration; +import org.apache.druid.sql.calcite.planner.Calcites; import org.apache.druid.sql.calcite.rel.CannotBuildQueryException; import org.apache.druid.sql.calcite.util.CalciteTests; import org.hamcrest.CoreMatchers; @@ -7686,50 +7687,6 @@ public class CalciteQueryTest extends BaseCalciteQueryTest } @Test - public void testTimestampDiff() throws Exception - { - testQuery( - "SELECT TIMESTAMPDIFF(DAY, TIMESTAMP '1999-01-01 00:00:00', __time), \n" - + "TIMESTAMPDIFF(DAY, __time, DATE '2001-01-01'), \n" - + "TIMESTAMPDIFF(HOUR, TIMESTAMP '1999-12-31 01:00:00', __time), \n" - + "TIMESTAMPDIFF(MINUTE, TIMESTAMP '1999-12-31 23:58:03', __time), \n" - + "TIMESTAMPDIFF(SECOND, TIMESTAMP '1999-12-31 23:59:03', __time), \n" - + "TIMESTAMPDIFF(MONTH, TIMESTAMP '1999-11-01 00:00:00', __time), \n" - + "TIMESTAMPDIFF(YEAR, TIMESTAMP '1996-11-01 00:00:00', __time), \n" - + "TIMESTAMPDIFF(QUARTER, TIMESTAMP '1996-10-01 00:00:00', __time), \n" - + "TIMESTAMPDIFF(WEEK, TIMESTAMP '1998-10-01 00:00:00', __time) \n" - + "FROM druid.foo\n" - + "LIMIT 2", - ImmutableList.of( - newScanQueryBuilder() - .dataSource(CalciteTests.DATASOURCE1) - .intervals(querySegmentSpec(Filtration.eternity())) - .virtualColumns( - expressionVirtualColumn("v0", "div((\"__time\" - 915148800000),86400000)", ValueType.LONG), - expressionVirtualColumn("v1", "div((978307200000 - \"__time\"),86400000)", ValueType.LONG), - expressionVirtualColumn("v2", "div((\"__time\" - 946602000000),3600000)", ValueType.LONG), - expressionVirtualColumn("v3", "div((\"__time\" - 946684683000),60000)", ValueType.LONG), - expressionVirtualColumn("v4", "div((\"__time\" - 946684743000),1000)", ValueType.LONG), - expressionVirtualColumn("v5", "subtract_months(\"__time\",941414400000,'UTC')", ValueType.LONG), - expressionVirtualColumn("v6", "div(subtract_months(\"__time\",846806400000,'UTC'),12)", ValueType.LONG), - expressionVirtualColumn("v7", "div(subtract_months(\"__time\",844128000000,'UTC'),3)", ValueType.LONG), - expressionVirtualColumn("v8", "div(div((\"__time\" - 907200000000),1000),604800)", ValueType.LONG) - ) - .columns("v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8") - .limit(2) - .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST) - .context(QUERY_CONTEXT_DEFAULT) - .build() - - ), - ImmutableList.of( - new Object[]{365, 366, 23, 1, 57, 2, 3, 13, 65}, - new Object[]{366, 365, 47, 1441, 86457, 2, 3, 13, 65} - ) - ); - } - - @Test public void testTimestampCeil() throws Exception { testQuery( --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
