dawidwys commented on code in PR #23886: URL: https://github.com/apache/flink/pull/23886#discussion_r1543023465
########## flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest.java: ########## @@ -1,528 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.flink.table.planner.plan.nodes.exec.stream; - -import org.apache.flink.table.api.TableConfig; -import org.apache.flink.table.api.TableEnvironment; -import org.apache.flink.table.api.config.OptimizerConfigOptions; -import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.ConcatDistinctAggFunction; -import org.apache.flink.table.planner.utils.StreamTableTestUtil; -import org.apache.flink.table.planner.utils.TableTestBase; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** Test json serialization/deserialization for window aggregate. */ -class WindowAggregateJsonPlanTest extends TableTestBase { - - private StreamTableTestUtil util; - private TableEnvironment tEnv; - - @BeforeEach - void setup() { - util = streamTestUtil(TableConfig.getDefault()); - tEnv = util.getTableEnv(); - - String insertOnlyTableDdl = - "CREATE TABLE MyTable (\n" - + " a INT,\n" - + " b BIGINT,\n" - + " c VARCHAR,\n" - + " `rowtime` AS TO_TIMESTAMP(c),\n" - + " proctime as PROCTIME(),\n" - + " WATERMARK for `rowtime` AS `rowtime` - INTERVAL '1' SECOND\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(insertOnlyTableDdl); - - String changelogTableDdl = - "CREATE TABLE MyCDCTable (\n" - + " a INT,\n" - + " b BIGINT,\n" - + " c VARCHAR,\n" - + " `rowtime` AS TO_TIMESTAMP(c),\n" - + " proctime as PROCTIME(),\n" - + " WATERMARK for `rowtime` AS `rowtime` - INTERVAL '1' SECOND\n" - + ") WITH (\n" - + " 'connector' = 'values',\n" - + " 'changelog-mode' = 'I,UA,UB,D')\n"; - tEnv.executeSql(changelogTableDdl); - } - - @Test - void testEventTimeTumbleWindow() { - tEnv.createFunction("concat_distinct_agg", ConcatDistinctAggFunction.class); - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_start TIMESTAMP(3),\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT,\n" - + " distinct_cnt BIGINT,\n" - + " concat_distinct STRING\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_start,\n" - + " window_end,\n" - + " COUNT(*),\n" - + " SUM(a),\n" - + " COUNT(DISTINCT c),\n" - + " concat_distinct_agg(c)\n" - + "FROM TABLE(\n" - + " TUMBLE(TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '5' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeTumbleWindowWithCDCSource() { - tEnv.createFunction("concat_distinct_agg", ConcatDistinctAggFunction.class); - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_start TIMESTAMP(3),\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT,\n" - + " distinct_cnt BIGINT,\n" - + " concat_distinct STRING\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_start,\n" - + " window_end,\n" - + " COUNT(*),\n" - + " SUM(a),\n" - + " COUNT(DISTINCT c),\n" - + " concat_distinct_agg(c)\n" - + "FROM TABLE(\n" - + " TUMBLE(TABLE MyCDCTable, DESCRIPTOR(rowtime), INTERVAL '5' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeTumbleWindowWithOffset() { - tEnv.createFunction("concat_distinct_agg", ConcatDistinctAggFunction.class); - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_start TIMESTAMP(3),\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT,\n" - + " distinct_cnt BIGINT,\n" - + " concat_distinct STRING\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_start,\n" - + " window_end,\n" - + " COUNT(*),\n" - + " SUM(a),\n" - + " COUNT(DISTINCT c),\n" - + " concat_distinct_agg(c)\n" - + "FROM TABLE(\n" - + " TUMBLE(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '5' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeTumbleWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(*)\n" - + "FROM TABLE(\n" - + " TUMBLE(TABLE MyTable, DESCRIPTOR(proctime), INTERVAL '15' MINUTE))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeTumbleWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(*)\n" - + "FROM TABLE(\n" - + " TUMBLE(TABLE MyCDCTable, DESCRIPTOR(proctime), INTERVAL '15' MINUTE))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeHopWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '5' SECOND, INTERVAL '10' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeHopWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(TABLE MyCDCTable, DESCRIPTOR(rowtime), INTERVAL '5' SECOND, INTERVAL '10' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeHopWindowWithOffset() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '10' SECOND,\n" - + " INTERVAL '5' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeHopWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(TABLE MyTable, DESCRIPTOR(proctime), INTERVAL '5' MINUTE, INTERVAL '10' MINUTE))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeHopWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(TABLE MyCDCTable, DESCRIPTOR(proctime), INTERVAL '5' MINUTE, INTERVAL '10' MINUTE))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeCumulateWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeCumulateWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyCDCTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeCumulateWindowWithOffset() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeCumulateWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(proctime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeCumulateWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyCDCTable,\n" - + " DESCRIPTOR(proctime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testDistinctSplitEnabled() { - tEnv.getConfig() - .set(OptimizerConfigOptions.TABLE_OPTIMIZER_DISTINCT_AGG_SPLIT_ENABLED, true); - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " a bigint,\n" - + " window_start timestamp(3),\n" - + " window_end timestamp(3),\n" - + " cnt_star bigint,\n" - + " sum_b bigint,\n" - + " cnt_distinct_c bigint\n" - + ") with (\n" - + " 'connector' = 'values',\n" - + " 'sink-insert-only' = 'false',\n" - + " 'table-sink-class' = 'DEFAULT')"; - tEnv.executeSql(sinkTableDdl); - - util.verifyJsonPlan( - "insert into MySink select a, " - + " window_start, " - + " window_end, " - + " count(*), " - + " sum(b), " - + " count(distinct c) AS uv " - + "FROM TABLE (" - + " CUMULATE(TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '10' MINUTE, INTERVAL '1' HOUR)) " - + "GROUP BY a, window_start, window_end"); - } - - @Test - void testProcTimeSessionWindowWithoutPartitionKey() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " window_end,\n" - + " COUNT(*)\n" - + "FROM TABLE(\n" - + " SESSION(TABLE MyTable, DESCRIPTOR(proctime), INTERVAL '15' MINUTE))\n" - + "GROUP BY window_start, window_end"); - } - - @Test - void testProcTimeSessionWindowWithPartitionKey() { Review Comment: I think I put the comment on a wrong line. I see we test in `WindowAggregateJsonPlanTest`: 1. `SESSION(TABLE MyTable PARTITION BY b, DESCRIPTOR(rowtime), INTERVAL '15' MINUTE))` 2. `SESSION(TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '15' MINUTE) I couldn't find 2 in new tests. ########## flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest.java: ########## @@ -1,528 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.flink.table.planner.plan.nodes.exec.stream; - -import org.apache.flink.table.api.TableConfig; -import org.apache.flink.table.api.TableEnvironment; -import org.apache.flink.table.api.config.OptimizerConfigOptions; -import org.apache.flink.table.planner.plan.utils.JavaUserDefinedAggFunctions.ConcatDistinctAggFunction; -import org.apache.flink.table.planner.utils.StreamTableTestUtil; -import org.apache.flink.table.planner.utils.TableTestBase; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** Test json serialization/deserialization for window aggregate. */ -class WindowAggregateJsonPlanTest extends TableTestBase { - - private StreamTableTestUtil util; - private TableEnvironment tEnv; - - @BeforeEach - void setup() { - util = streamTestUtil(TableConfig.getDefault()); - tEnv = util.getTableEnv(); - - String insertOnlyTableDdl = - "CREATE TABLE MyTable (\n" - + " a INT,\n" - + " b BIGINT,\n" - + " c VARCHAR,\n" - + " `rowtime` AS TO_TIMESTAMP(c),\n" - + " proctime as PROCTIME(),\n" - + " WATERMARK for `rowtime` AS `rowtime` - INTERVAL '1' SECOND\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(insertOnlyTableDdl); - - String changelogTableDdl = - "CREATE TABLE MyCDCTable (\n" - + " a INT,\n" - + " b BIGINT,\n" - + " c VARCHAR,\n" - + " `rowtime` AS TO_TIMESTAMP(c),\n" - + " proctime as PROCTIME(),\n" - + " WATERMARK for `rowtime` AS `rowtime` - INTERVAL '1' SECOND\n" - + ") WITH (\n" - + " 'connector' = 'values',\n" - + " 'changelog-mode' = 'I,UA,UB,D')\n"; - tEnv.executeSql(changelogTableDdl); - } - - @Test - void testEventTimeTumbleWindow() { - tEnv.createFunction("concat_distinct_agg", ConcatDistinctAggFunction.class); - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_start TIMESTAMP(3),\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT,\n" - + " distinct_cnt BIGINT,\n" - + " concat_distinct STRING\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_start,\n" - + " window_end,\n" - + " COUNT(*),\n" - + " SUM(a),\n" - + " COUNT(DISTINCT c),\n" - + " concat_distinct_agg(c)\n" - + "FROM TABLE(\n" - + " TUMBLE(TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '5' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeTumbleWindowWithCDCSource() { - tEnv.createFunction("concat_distinct_agg", ConcatDistinctAggFunction.class); - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_start TIMESTAMP(3),\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT,\n" - + " distinct_cnt BIGINT,\n" - + " concat_distinct STRING\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_start,\n" - + " window_end,\n" - + " COUNT(*),\n" - + " SUM(a),\n" - + " COUNT(DISTINCT c),\n" - + " concat_distinct_agg(c)\n" - + "FROM TABLE(\n" - + " TUMBLE(TABLE MyCDCTable, DESCRIPTOR(rowtime), INTERVAL '5' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeTumbleWindowWithOffset() { - tEnv.createFunction("concat_distinct_agg", ConcatDistinctAggFunction.class); - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_start TIMESTAMP(3),\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT,\n" - + " distinct_cnt BIGINT,\n" - + " concat_distinct STRING\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_start,\n" - + " window_end,\n" - + " COUNT(*),\n" - + " SUM(a),\n" - + " COUNT(DISTINCT c),\n" - + " concat_distinct_agg(c)\n" - + "FROM TABLE(\n" - + " TUMBLE(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '5' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeTumbleWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(*)\n" - + "FROM TABLE(\n" - + " TUMBLE(TABLE MyTable, DESCRIPTOR(proctime), INTERVAL '15' MINUTE))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeTumbleWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(*)\n" - + "FROM TABLE(\n" - + " TUMBLE(TABLE MyCDCTable, DESCRIPTOR(proctime), INTERVAL '15' MINUTE))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeHopWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '5' SECOND, INTERVAL '10' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeHopWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(TABLE MyCDCTable, DESCRIPTOR(rowtime), INTERVAL '5' SECOND, INTERVAL '10' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeHopWindowWithOffset() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '10' SECOND,\n" - + " INTERVAL '5' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeHopWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(TABLE MyTable, DESCRIPTOR(proctime), INTERVAL '5' MINUTE, INTERVAL '10' MINUTE))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeHopWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " HOP(TABLE MyCDCTable, DESCRIPTOR(proctime), INTERVAL '5' MINUTE, INTERVAL '10' MINUTE))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeCumulateWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeCumulateWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyCDCTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testEventTimeCumulateWindowWithOffset() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT,\n" - + " sum_a INT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " window_end,\n" - + " COUNT(c),\n" - + " SUM(a)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(rowtime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeCumulateWindow() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyTable,\n" - + " DESCRIPTOR(proctime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testProcTimeCumulateWindowWithCDCSource() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " b BIGINT,\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " b,\n" - + " COUNT(c)\n" - + "FROM TABLE(\n" - + " CUMULATE(\n" - + " TABLE MyCDCTable,\n" - + " DESCRIPTOR(proctime),\n" - + " INTERVAL '5' SECOND,\n" - + " INTERVAL '15' SECOND))\n" - + "GROUP BY b, window_start, window_end"); - } - - @Test - void testDistinctSplitEnabled() { - tEnv.getConfig() - .set(OptimizerConfigOptions.TABLE_OPTIMIZER_DISTINCT_AGG_SPLIT_ENABLED, true); - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " a bigint,\n" - + " window_start timestamp(3),\n" - + " window_end timestamp(3),\n" - + " cnt_star bigint,\n" - + " sum_b bigint,\n" - + " cnt_distinct_c bigint\n" - + ") with (\n" - + " 'connector' = 'values',\n" - + " 'sink-insert-only' = 'false',\n" - + " 'table-sink-class' = 'DEFAULT')"; - tEnv.executeSql(sinkTableDdl); - - util.verifyJsonPlan( - "insert into MySink select a, " - + " window_start, " - + " window_end, " - + " count(*), " - + " sum(b), " - + " count(distinct c) AS uv " - + "FROM TABLE (" - + " CUMULATE(TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '10' MINUTE, INTERVAL '1' HOUR)) " - + "GROUP BY a, window_start, window_end"); - } - - @Test - void testProcTimeSessionWindowWithoutPartitionKey() { - String sinkTableDdl = - "CREATE TABLE MySink (\n" - + " window_end TIMESTAMP(3),\n" - + " cnt BIGINT\n" - + ") WITH (\n" - + " 'connector' = 'values')\n"; - tEnv.executeSql(sinkTableDdl); - util.verifyJsonPlan( - "insert into MySink select\n" - + " window_end,\n" - + " COUNT(*)\n" - + "FROM TABLE(\n" - + " SESSION(TABLE MyTable, DESCRIPTOR(proctime), INTERVAL '15' MINUTE))\n" - + "GROUP BY window_start, window_end"); - } - - @Test - void testProcTimeSessionWindowWithPartitionKey() { Review Comment: I think I put the comment on a wrong line. I see we test in `WindowAggregateJsonPlanTest`: 1. `SESSION(TABLE MyTable PARTITION BY b, DESCRIPTOR(rowtime), INTERVAL '15' MINUTE))` 2. `SESSION(TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '15' MINUTE)` I couldn't find 2 in new tests. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
