Merge pull request #389 from ClibMouse/I3169

kashwy · web-flow · commit bc8d583e15ad · 2023-09-04T22:15:22.000-04:00
Fix 3169 - Converted aggregate function after parsing in Make-series
diff --git a/src/Parsers/Kusto/ParserKQLMakeSeries.cpp b/src/Parsers/Kusto/ParserKQLMakeSeries.cpp
@@ -107,6 +107,8 @@ void ParserKQLMakeSeries ::parseSingleAggregationColumn(AggregationColumns & agg
         default_value = getExprFromToken(String(begin->begin, end->end), pos.max_depth);
     }
 
+    auto converted_aggregation_fun = getExprFromToken(aggregation_fun, pos.max_depth);
+
     auto agg_fun = String(agg_start_pos->begin, agg_start_pos->end);
     String tmp_alias;
     if (allowed_aggregation.contains(agg_fun))
@@ -141,7 +143,7 @@ void ParserKQLMakeSeries ::parseSingleAggregationColumn(AggregationColumns & agg
 
     if (alias.empty())
         alias = tmp_alias;
-    aggregation_columns.emplace_back(alias, aggregation_fun, column, default_value);
+    aggregation_columns.emplace_back(alias, converted_aggregation_fun, column, default_value);
 }
 
 bool ParserKQLMakeSeries ::parseAggregationColumns(AggregationColumns & aggregation_columns, Pos & pos)
diff --git a/src/Parsers/tests/KQL/gtest_KQL_MakeSeries.cpp b/src/Parsers/tests/KQL/gtest_KQL_MakeSeries.cpp
@@ -26,17 +26,21 @@ INSTANTIATE_TEST_SUITE_P(ParserKQLQuery_MakeSeries, ParserTest,
             "make_series_test_table |  make-series avg(Price+1)  on Purchase from datetime(2016-09-10)  to datetime(2016-09-13) step 1d by Supplier, Fruit | order by Supplier, Fruit;",
             "SELECT *\nFROM\n(\n    SELECT\n        Supplier,\n        Fruit,\n        zipped.1 AS Purchase,\n        zipped.2 AS avg_\n    FROM\n    (\n        SELECT\n            toUInt64(min(Purchase_ali)) AS low,\n            toUInt64(max(Purchase_ali)) + 86400 AS high,\n            arraySort(arrayZip(Purchase, avg_)) AS zipped,\n            Supplier,\n            Fruit,\n            arrayConcat(groupArray(avg__ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS avg_,\n            arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n        FROM\n        (\n            SELECT\n                Supplier,\n                Fruit,\n                avg(Price + 1) AS avg__ali,\n                toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) * 86400) AS Purchase_ali\n            FROM make_series_test_table\n            WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n            GROUP BY\n                Supplier,\n                Fruit,\n                Purchase_ali\n            ORDER BY Purchase_ali ASC\n        )\n        GROUP BY\n            Supplier,\n            Fruit\n    )\n)\nORDER BY\n    Supplier DESC NULLS LAST,\n    Fruit DESC NULLS LAST"
         },
+        {
+            "make_series_test_table |  make-series dcount(Price+1)  on Purchase from datetime(2016-09-10)  to datetime(2016-09-13) step 1d by Supplier, Fruit | order by Supplier, Fruit;",
+            "SELECT *\nFROM\n(\n    SELECT\n        Supplier,\n        Fruit,\n        zipped.1 AS Purchase,\n        zipped.2 AS dcount_\n    FROM\n    (\n        SELECT\n            toUInt64(min(Purchase_ali)) AS low,\n            toUInt64(max(Purchase_ali)) + 86400 AS high,\n            arraySort(arrayZip(Purchase, dcount_)) AS zipped,\n            Supplier,\n            Fruit,\n            arrayConcat(groupArray(dcount__ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS dcount_,\n            arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n        FROM\n        (\n            SELECT\n                Supplier,\n                Fruit,\n                uniqCombined64(14)(Price + 1) AS dcount__ali,\n                toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) * 86400) AS Purchase_ali\n            FROM make_series_test_table\n            WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n            GROUP BY\n                Supplier,\n                Fruit,\n                Purchase_ali\n            ORDER BY Purchase_ali ASC\n        )\n        GROUP BY\n            Supplier,\n            Fruit\n    )\n)\nORDER BY\n    Supplier DESC NULLS LAST,\n    Fruit DESC NULLS LAST"
+        },
         {
             "make_series_test_table |  make-series avg(Price+1)+1  on Purchase from datetime(2016-09-10)  to datetime(2016-09-13) step 1d by Supplier, Fruit | order by Supplier, Fruit",
             "SELECT *\nFROM\n(\n    SELECT\n        Supplier,\n        Fruit,\n        zipped.1 AS Purchase,\n        zipped.2 AS avg_\n    FROM\n    (\n        SELECT\n            toUInt64(min(Purchase_ali)) AS low,\n            toUInt64(max(Purchase_ali)) + 86400 AS high,\n            arraySort(arrayZip(Purchase, avg_)) AS zipped,\n            Supplier,\n            Fruit,\n            arrayConcat(groupArray(avg__ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS avg_,\n            arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n        FROM\n        (\n            SELECT\n                Supplier,\n                Fruit,\n                avg(Price + 1) + 1 AS avg__ali,\n                toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) * 86400) AS Purchase_ali\n            FROM make_series_test_table\n            WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n            GROUP BY\n                Supplier,\n                Fruit,\n                Purchase_ali\n            ORDER BY Purchase_ali ASC\n        )\n        GROUP BY\n            Supplier,\n            Fruit\n    )\n)\nORDER BY\n    Supplier DESC NULLS LAST,\n    Fruit DESC NULLS LAST"
         },
         {
             "make_series_test_table |  make-series ceiling(avg(Price+1)+1) on Purchase from datetime(2016-09-10)  to datetime(2016-09-13) step 1d by Supplier, Fruit | order by Supplier, Fruit",
-            "SELECT *\nFROM\n(\n    SELECT\n        Supplier,\n        Fruit,\n        zipped.1 AS Purchase,\n        zipped.2 AS Column1\n    FROM\n    (\n        SELECT\n            toUInt64(min(Purchase_ali)) AS low,\n            toUInt64(max(Purchase_ali)) + 86400 AS high,\n            arraySort(arrayZip(Purchase, Column1)) AS zipped,\n            Supplier,\n            Fruit,\n            arrayConcat(groupArray(Column1_ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS Column1,\n            arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n        FROM\n        (\n            SELECT\n                Supplier,\n                Fruit,\n                ceiling(avg(Price + 1) + 1) AS Column1_ali,\n                toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) * 86400) AS Purchase_ali\n            FROM make_series_test_table\n            WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n            GROUP BY\n                Supplier,\n                Fruit,\n                Purchase_ali\n            ORDER BY Purchase_ali ASC\n        )\n        GROUP BY\n            Supplier,\n            Fruit\n    )\n)\nORDER BY\n    Supplier DESC NULLS LAST,\n    Fruit DESC NULLS LAST"
+            "SELECT *\nFROM\n(\n    SELECT\n        Supplier,\n        Fruit,\n        zipped.1 AS Purchase,\n        zipped.2 AS Column1\n    FROM\n    (\n        SELECT\n            toUInt64(min(Purchase_ali)) AS low,\n            toUInt64(max(Purchase_ali)) + 86400 AS high,\n            arraySort(arrayZip(Purchase, Column1)) AS zipped,\n            Supplier,\n            Fruit,\n            arrayConcat(groupArray(Column1_ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS Column1,\n            arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n        FROM\n        (\n            SELECT\n                Supplier,\n                Fruit,\n                ceil(avg(Price + 1) + 1) AS Column1_ali,\n                toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) * 86400) AS Purchase_ali\n            FROM make_series_test_table\n            WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n            GROUP BY\n                Supplier,\n                Fruit,\n                Purchase_ali\n            ORDER BY Purchase_ali ASC\n        )\n        GROUP BY\n            Supplier,\n            Fruit\n    )\n)\nORDER BY\n    Supplier DESC NULLS LAST,\n    Fruit DESC NULLS LAST"
         },
         {
             "make_series_test_table |  make-series ceiling(avg(Price+1)+1) default = strlen('123')+1.5 on Purchase from datetime(2016-09-10)  to datetime(2016-09-13) step 1d by Supplier, Fruit | order by Supplier, Fruit;",
-            "SELECT *\nFROM\n(\n    SELECT\n        Supplier,\n        Fruit,\n        zipped.1 AS Purchase,\n        zipped.2 AS Column1\n    FROM\n    (\n        SELECT\n            toUInt64(min(Purchase_ali)) AS low,\n            toUInt64(max(Purchase_ali)) + 86400 AS high,\n            arraySort(arrayZip(Purchase, Column1)) AS zipped,\n            Supplier,\n            Fruit,\n            arrayConcat(groupArray(Column1_ali) AS ga, arrayMap(x -> (lengthUTF8('123') + 1.5), range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS Column1,\n            arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n        FROM\n        (\n            SELECT\n                Supplier,\n                Fruit,\n                ceiling(avg(Price + 1) + 1) AS Column1_ali,\n                toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) * 86400) AS Purchase_ali\n            FROM make_series_test_table\n            WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n            GROUP BY\n                Supplier,\n                Fruit,\n                Purchase_ali\n            ORDER BY Purchase_ali ASC\n        )\n        GROUP BY\n            Supplier,\n            Fruit\n    )\n)\nORDER BY\n    Supplier DESC NULLS LAST,\n    Fruit DESC NULLS LAST"
+            "SELECT *\nFROM\n(\n    SELECT\n        Supplier,\n        Fruit,\n        zipped.1 AS Purchase,\n        zipped.2 AS Column1\n    FROM\n    (\n        SELECT\n            toUInt64(min(Purchase_ali)) AS low,\n            toUInt64(max(Purchase_ali)) + 86400 AS high,\n            arraySort(arrayZip(Purchase, Column1)) AS zipped,\n            Supplier,\n            Fruit,\n            arrayConcat(groupArray(Column1_ali) AS ga, arrayMap(x -> (lengthUTF8('123') + 1.5), range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS Column1,\n            arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n        FROM\n        (\n            SELECT\n                Supplier,\n                Fruit,\n                ceil(avg(Price + 1) + 1) AS Column1_ali,\n                toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) * 86400) AS Purchase_ali\n            FROM make_series_test_table\n            WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n            GROUP BY\n                Supplier,\n                Fruit,\n                Purchase_ali\n            ORDER BY Purchase_ali ASC\n        )\n        GROUP BY\n            Supplier,\n            Fruit\n    )\n)\nORDER BY\n    Supplier DESC NULLS LAST,\n    Fruit DESC NULLS LAST"
         },
         {
             "make_series_test_table |  make-series avg(Price) on Purchase from datetime(2016-09-10)+1d  to datetime(2016-09-13)+1d step 1d by Supplier, Fruit | order by Supplier, Fruit",

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,8 @@ void ParserKQLMakeSeries ::parseSingleAggregationColumn(AggregationColumns & agg`
`107`	`107`	`default_value = getExprFromToken(String(begin->begin, end->end), pos.max_depth);`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ auto converted_aggregation_fun = getExprFromToken(aggregation_fun, pos.max_depth);`
	`111`	`+`
`110`	`112`	`auto agg_fun = String(agg_start_pos->begin, agg_start_pos->end);`
`111`	`113`	`String tmp_alias;`
`112`	`114`	`if (allowed_aggregation.contains(agg_fun))`
`@@ -141,7 +143,7 @@ void ParserKQLMakeSeries ::parseSingleAggregationColumn(AggregationColumns & agg`
`141`	`143`
`142`	`144`	`if (alias.empty())`
`143`	`145`	`alias = tmp_alias;`
`144`		`- aggregation_columns.emplace_back(alias, aggregation_fun, column, default_value);`
	`146`	`+ aggregation_columns.emplace_back(alias, converted_aggregation_fun, column, default_value);`
`145`	`147`	`}`
`146`	`148`
`147`	`149`	`bool ParserKQLMakeSeries ::parseAggregationColumns(AggregationColumns & aggregation_columns, Pos & pos)`
Original file line number	Diff line number	Diff line change
`@@ -26,17 +26,21 @@ INSTANTIATE_TEST_SUITE_P(ParserKQLQuery_MakeSeries, ParserTest,`
`26`	`26`	`"make_series_test_table \| make-series avg(Price+1) on Purchase from datetime(2016-09-10) to datetime(2016-09-13) step 1d by Supplier, Fruit \| order by Supplier, Fruit;",`
`27`	`27`	"SELECT \nFROM\n(\n SELECT\n Supplier,\n Fruit,\n zipped.1 AS Purchase,\n zipped.2 AS avg_\n FROM\n (\n SELECT\n toUInt64(min(Purchase_ali)) AS low,\n toUInt64(max(Purchase_ali)) + 86400 AS high,\n arraySort(arrayZip(Purchase, avg_)) AS zipped,\n Supplier,\n Fruit,\n arrayConcat(groupArray(avg__ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS avg_,\n arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n FROM\n (\n SELECT\n Supplier,\n Fruit,\n avg(Price + 1) AS avg__ali,\n toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) 86400) AS Purchase_ali\n FROM make_series_test_table\n WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n GROUP BY\n Supplier,\n Fruit,\n Purchase_ali\n ORDER BY Purchase_ali ASC\n )\n GROUP BY\n Supplier,\n Fruit\n )\n)\nORDER BY\n Supplier DESC NULLS LAST,\n Fruit DESC NULLS LAST"
`28`	`28`	`},`
	`29`	`+ {`
	`30`	`+ "make_series_test_table \| make-series dcount(Price+1) on Purchase from datetime(2016-09-10) to datetime(2016-09-13) step 1d by Supplier, Fruit \| order by Supplier, Fruit;",`
	`31`	+ "SELECT \nFROM\n(\n SELECT\n Supplier,\n Fruit,\n zipped.1 AS Purchase,\n zipped.2 AS dcount_\n FROM\n (\n SELECT\n toUInt64(min(Purchase_ali)) AS low,\n toUInt64(max(Purchase_ali)) + 86400 AS high,\n arraySort(arrayZip(Purchase, dcount_)) AS zipped,\n Supplier,\n Fruit,\n arrayConcat(groupArray(dcount__ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS dcount_,\n arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n FROM\n (\n SELECT\n Supplier,\n Fruit,\n uniqCombined64(14)(Price + 1) AS dcount__ali,\n toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) 86400) AS Purchase_ali\n FROM make_series_test_table\n WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n GROUP BY\n Supplier,\n Fruit,\n Purchase_ali\n ORDER BY Purchase_ali ASC\n )\n GROUP BY\n Supplier,\n Fruit\n )\n)\nORDER BY\n Supplier DESC NULLS LAST,\n Fruit DESC NULLS LAST"
	`32`	`+ },`
`29`	`33`	`{`
`30`	`34`	`"make_series_test_table \| make-series avg(Price+1)+1 on Purchase from datetime(2016-09-10) to datetime(2016-09-13) step 1d by Supplier, Fruit \| order by Supplier, Fruit",`
`31`	`35`	"SELECT \nFROM\n(\n SELECT\n Supplier,\n Fruit,\n zipped.1 AS Purchase,\n zipped.2 AS avg_\n FROM\n (\n SELECT\n toUInt64(min(Purchase_ali)) AS low,\n toUInt64(max(Purchase_ali)) + 86400 AS high,\n arraySort(arrayZip(Purchase, avg_)) AS zipped,\n Supplier,\n Fruit,\n arrayConcat(groupArray(avg__ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS avg_,\n arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n FROM\n (\n SELECT\n Supplier,\n Fruit,\n avg(Price + 1) + 1 AS avg__ali,\n toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) 86400) AS Purchase_ali\n FROM make_series_test_table\n WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n GROUP BY\n Supplier,\n Fruit,\n Purchase_ali\n ORDER BY Purchase_ali ASC\n )\n GROUP BY\n Supplier,\n Fruit\n )\n)\nORDER BY\n Supplier DESC NULLS LAST,\n Fruit DESC NULLS LAST"
`32`	`36`	`},`
`33`	`37`	`{`
`34`	`38`	`"make_series_test_table \| make-series ceiling(avg(Price+1)+1) on Purchase from datetime(2016-09-10) to datetime(2016-09-13) step 1d by Supplier, Fruit \| order by Supplier, Fruit",`
`35`		- "SELECT \nFROM\n(\n SELECT\n Supplier,\n Fruit,\n zipped.1 AS Purchase,\n zipped.2 AS Column1\n FROM\n (\n SELECT\n toUInt64(min(Purchase_ali)) AS low,\n toUInt64(max(Purchase_ali)) + 86400 AS high,\n arraySort(arrayZip(Purchase, Column1)) AS zipped,\n Supplier,\n Fruit,\n arrayConcat(groupArray(Column1_ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS Column1,\n arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n FROM\n (\n SELECT\n Supplier,\n Fruit,\n ceiling(avg(Price + 1) + 1) AS Column1_ali,\n toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) 86400) AS Purchase_ali\n FROM make_series_test_table\n WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n GROUP BY\n Supplier,\n Fruit,\n Purchase_ali\n ORDER BY Purchase_ali ASC\n )\n GROUP BY\n Supplier,\n Fruit\n )\n)\nORDER BY\n Supplier DESC NULLS LAST,\n Fruit DESC NULLS LAST"
	`39`	+ "SELECT \nFROM\n(\n SELECT\n Supplier,\n Fruit,\n zipped.1 AS Purchase,\n zipped.2 AS Column1\n FROM\n (\n SELECT\n toUInt64(min(Purchase_ali)) AS low,\n toUInt64(max(Purchase_ali)) + 86400 AS high,\n arraySort(arrayZip(Purchase, Column1)) AS zipped,\n Supplier,\n Fruit,\n arrayConcat(groupArray(Column1_ali) AS ga, arrayMap(x -> 0, range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS Column1,\n arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n FROM\n (\n SELECT\n Supplier,\n Fruit,\n ceil(avg(Price + 1) + 1) AS Column1_ali,\n toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) 86400) AS Purchase_ali\n FROM make_series_test_table\n WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n GROUP BY\n Supplier,\n Fruit,\n Purchase_ali\n ORDER BY Purchase_ali ASC\n )\n GROUP BY\n Supplier,\n Fruit\n )\n)\nORDER BY\n Supplier DESC NULLS LAST,\n Fruit DESC NULLS LAST"
`36`	`40`	`},`
`37`	`41`	`{`
`38`	`42`	`"make_series_test_table \| make-series ceiling(avg(Price+1)+1) default = strlen('123')+1.5 on Purchase from datetime(2016-09-10) to datetime(2016-09-13) step 1d by Supplier, Fruit \| order by Supplier, Fruit;",`
`39`		- "SELECT \nFROM\n(\n SELECT\n Supplier,\n Fruit,\n zipped.1 AS Purchase,\n zipped.2 AS Column1\n FROM\n (\n SELECT\n toUInt64(min(Purchase_ali)) AS low,\n toUInt64(max(Purchase_ali)) + 86400 AS high,\n arraySort(arrayZip(Purchase, Column1)) AS zipped,\n Supplier,\n Fruit,\n arrayConcat(groupArray(Column1_ali) AS ga, arrayMap(x -> (lengthUTF8('123') + 1.5), range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS Column1,\n arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n FROM\n (\n SELECT\n Supplier,\n Fruit,\n ceiling(avg(Price + 1) + 1) AS Column1_ali,\n toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) 86400) AS Purchase_ali\n FROM make_series_test_table\n WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n GROUP BY\n Supplier,\n Fruit,\n Purchase_ali\n ORDER BY Purchase_ali ASC\n )\n GROUP BY\n Supplier,\n Fruit\n )\n)\nORDER BY\n Supplier DESC NULLS LAST,\n Fruit DESC NULLS LAST"
	`43`	+ "SELECT \nFROM\n(\n SELECT\n Supplier,\n Fruit,\n zipped.1 AS Purchase,\n zipped.2 AS Column1\n FROM\n (\n SELECT\n toUInt64(min(Purchase_ali)) AS low,\n toUInt64(max(Purchase_ali)) + 86400 AS high,\n arraySort(arrayZip(Purchase, Column1)) AS zipped,\n Supplier,\n Fruit,\n arrayConcat(groupArray(Column1_ali) AS ga, arrayMap(x -> (lengthUTF8('123') + 1.5), range(0, toUInt32(if((length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga)) < 0, 0, length(range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))) - length(ga))), 1))) AS Column1,\n arrayDistinct(arrayConcat(groupArray(toDateTime64(Purchase_ali - 0, 9, 'UTC')), arrayMap(x -> toDateTime64(x - 0, 9, 'UTC'), range(toUInt64(toDateTime64('2016-09-10', 9, 'UTC')), toUInt64(toDateTime64('2016-09-13', 9, 'UTC')), toUInt64(86400))))) AS Purchase\n FROM\n (\n SELECT\n Supplier,\n Fruit,\n ceil(avg(Price + 1) + 1) AS Column1_ali,\n toFloat64(toDateTime64('2016-09-10', 9, 'UTC')) + (toInt64((toFloat64(toDateTime64(Purchase, 9, 'UTC')) - toFloat64(toDateTime64('2016-09-10', 9, 'UTC'))) / 86400) 86400) AS Purchase_ali\n FROM make_series_test_table\n WHERE (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) >= toUInt64(toDateTime64('2016-09-10', 9, 'UTC'))) AND (toInt64(toFloat64(toDateTime64(Purchase, 9, 'UTC'))) < toUInt64(toDateTime64('2016-09-13', 9, 'UTC')))\n GROUP BY\n Supplier,\n Fruit,\n Purchase_ali\n ORDER BY Purchase_ali ASC\n )\n GROUP BY\n Supplier,\n Fruit\n )\n)\nORDER BY\n Supplier DESC NULLS LAST,\n Fruit DESC NULLS LAST"
`40`	`44`	`},`
`41`	`45`	`{`
`42`	`46`	`"make_series_test_table \| make-series avg(Price) on Purchase from datetime(2016-09-10)+1d to datetime(2016-09-13)+1d step 1d by Supplier, Fruit \| order by Supplier, Fruit",`