This is an automated email from the ASF dual-hosted git repository. shengkai pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
from fd673a2f462 [FLINK-33974] Implement the Sink transformation depending on the new SinkV2 interfaces add e345ffb453a [FLINK-34049][table] Refactor classes related to window TVF aggregation to prepare for non-aligned windows (#24068) No new revisions were added by this update. Summary of changes: .../PythonStreamGroupWindowAggregateOperator.java | 14 +- ...PythonGroupWindowAggregateFunctionOperator.java | 12 +- ...ghPythonStreamGroupWindowAggregateOperator.java | 4 +- ...thonStreamGroupWindowAggregateOperatorTest.java | 2 +- ...onGroupWindowAggregateFunctionOperatorTest.java | 10 +- .../logical/SliceAttachedWindowingStrategy.java | 2 +- .../exec/common/CommonExecWindowTableFunction.java | 6 +- .../stream/StreamExecGlobalWindowAggregate.java | 2 +- .../stream/StreamExecGroupWindowAggregate.java | 4 +- .../stream/StreamExecLocalWindowAggregate.java | 2 +- .../StreamExecPythonGroupWindowAggregate.java | 44 +++--- .../exec/stream/StreamExecWindowAggregate.java | 4 +- .../exec/stream/StreamExecWindowAggregateBase.java | 4 +- .../plan/utils/WindowTableFunctionUtil.java | 10 +- .../codegen/agg/AggsHandlerCodeGenerator.scala | 4 +- .../planner/plan/utils/WindowEmitStrategy.scala | 2 +- .../window/LocalSlicingWindowAggOperator.java | 4 +- .../window/SlicingWindowAggOperatorBuilder.java | 14 +- .../window/buffers/RecordsWindowBuffer.java | 6 +- .../aggregate/window/buffers/WindowBuffer.java | 4 +- .../aggregate/window/combines/AggCombiner.java | 10 +- .../window/combines/GlobalAggCombiner.java | 10 +- .../window/combines/LocalAggCombiner.java | 2 +- ...r.java => AbstractSliceWindowAggProcessor.java} | 133 +++------------- .../processors/AbstractWindowAggProcessor.java | 173 +++++---------------- .../processors/SliceSharedWindowAggProcessor.java | 9 +- .../SliceUnsharedWindowAggProcessor.java | 4 +- .../RowTimeWindowDeduplicateOperatorBuilder.java | 6 +- .../RowTimeDeduplicateRecordsCombiner.java | 10 +- .../RowTimeWindowDeduplicateProcessor.java | 11 +- .../operators/join/window/WindowJoinOperator.java | 9 +- .../rank/window/WindowRankOperatorBuilder.java | 6 +- .../rank/window/combines/TopNRecordsCombiner.java | 10 +- .../window/processors/WindowRankProcessor.java | 11 +- .../runtime/operators/window/MergeCallback.java | 43 +++++ .../assigners/CountSlidingWindowAssigner.java | 10 +- .../assigners/CountTumblingWindowAssigner.java | 10 +- .../assigners/CumulativeWindowAssigner.java | 6 +- .../assigners/GroupWindowAssigner.java} | 15 +- .../assigners/InternalTimeWindowAssigner.java | 2 +- .../assigners/MergingWindowAssigner.java | 24 +-- .../assigners/PanedWindowAssigner.java | 4 +- .../assigners/SessionWindowAssigner.java | 17 +- .../assigners/SlidingWindowAssigner.java | 6 +- .../assigners/TumblingWindowAssigner.java | 16 +- .../internal/GeneralWindowProcessFunction.java | 12 +- .../internal/InternalWindowProcessFunction.java | 10 +- .../internal/MergingWindowProcessFunction.java | 4 +- .../internal/MergingWindowSet.java | 7 +- .../internal/PanedWindowProcessFunction.java | 4 +- .../operator}/AggregateWindowOperator.java | 17 +- .../operator}/TableAggregateWindowOperator.java | 17 +- .../{ => groupwindow/operator}/WindowOperator.java | 35 +++-- .../operator}/WindowOperatorBuilder.java | 34 ++-- .../triggers/ElementTriggers.java | 2 +- .../triggers/EventTimeTriggers.java | 2 +- .../triggers/ProcessingTimeTriggers.java | 2 +- .../window/{ => groupwindow}/triggers/Trigger.java | 8 +- .../{ => groupwindow}/triggers/WindowTrigger.java | 7 +- .../window/{ => tvf}/combines/RecordsCombiner.java | 6 +- .../{slicing => tvf/common}/ClockService.java | 2 +- .../window/tvf/common/WindowAssigner.java | 41 +++++ .../common/WindowOperatorBase.java} | 74 ++++----- .../common/WindowProcessor.java} | 8 +- .../common}/WindowTimerService.java | 2 +- .../common/WindowTimerServiceBase.java} | 27 +--- .../operator}/WindowTableFunctionOperator.java | 11 +- .../window/{ => tvf}/slicing/SliceAssigner.java | 14 +- .../window/{ => tvf}/slicing/SliceAssigners.java | 13 +- .../{ => tvf}/slicing/SliceSharedAssigner.java | 25 +-- .../{ => tvf}/slicing/SliceUnsharedAssigner.java | 2 +- .../window/tvf/slicing/SlicingWindowOperator.java | 63 ++++++++ .../slicing/SlicingWindowProcessor.java} | 14 +- .../slicing/SlicingWindowTimerServiceImpl.java} | 31 +--- .../window/{ => tvf}/state/StateKeyContext.java | 2 +- .../window/{ => tvf}/state/WindowListState.java | 2 +- .../window/{ => tvf}/state/WindowMapState.java | 2 +- .../window/{ => tvf}/state/WindowState.java | 2 +- .../window/{ => tvf}/state/WindowValueState.java | 2 +- .../window/SlicingWindowAggOperatorTest.java | 6 +- .../RowTimeWindowDeduplicateOperatorTest.java | 2 +- .../rank/window/WindowRankOperatorTest.java | 2 +- .../assigners/CumulativeWindowAssignerTest.java | 2 +- .../assigners/SessionWindowAssignerTest.java | 23 ++- .../assigners/SlidingWindowAssignerTest.java | 2 +- .../assigners/TumblingWindowAssignerTest.java | 2 +- .../internal}/MergingWindowSetTest.java | 18 ++- .../operator}/WindowOperatorContractTest.java | 30 ++-- .../operator}/WindowOperatorTest.java | 19 ++- .../{ => groupwindow}/triggers/TriggersTest.java | 2 +- .../operator}/WindowTableFunctionOperatorTest.java | 13 +- .../slicing/CumulativeSliceAssignerTest.java | 2 +- .../slicing/HoppingSliceAssignerTest.java | 2 +- .../{ => tvf}/slicing/SliceAssignerTestBase.java | 7 +- .../slicing/TumblingSliceAssignerTest.java | 2 +- .../slicing/WindowedSliceAssignerTest.java | 2 +- 96 files changed, 630 insertions(+), 721 deletions(-) copy flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/{AbstractWindowAggProcessor.java => AbstractSliceWindowAggProcessor.java} (55%) create mode 100644 flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/MergeCallback.java rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/CountSlidingWindowAssigner.java (89%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/CountTumblingWindowAssigner.java (86%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/CumulativeWindowAssigner.java (96%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{assigners/WindowAssigner.java => groupwindow/assigners/GroupWindowAssigner.java} (77%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/InternalTimeWindowAssigner.java (93%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/MergingWindowAssigner.java (68%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/PanedWindowAssigner.java (94%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/SessionWindowAssigner.java (86%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/SlidingWindowAssigner.java (96%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/TumblingWindowAssigner.java (86%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/internal/GeneralWindowProcessFunction.java (88%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/internal/InternalWindowProcessFunction.java (95%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/internal/MergingWindowProcessFunction.java (97%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/internal/MergingWindowSet.java (96%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/internal/PanedWindowProcessFunction.java (95%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow/operator}/AggregateWindowOperator.java (92%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow/operator}/TableAggregateWindowOperator.java (87%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow/operator}/WindowOperator.java (94%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow/operator}/WindowOperatorBuilder.java (91%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/triggers/ElementTriggers.java (98%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/triggers/EventTimeTriggers.java (99%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/triggers/ProcessingTimeTriggers.java (99%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/triggers/Trigger.java (96%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/triggers/WindowTrigger.java (87%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/combines/RecordsCombiner.java (93%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{slicing => tvf/common}/ClockService.java (95%) create mode 100644 flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/common/WindowAssigner.java rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{slicing/SlicingWindowOperator.java => tvf/common/WindowOperatorBase.java} (82%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{slicing/SlicingWindowProcessor.java => tvf/common/WindowProcessor.java} (95%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{slicing => tvf/common}/WindowTimerService.java (96%) copy flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{slicing/WindowTimerServiceImpl.java => tvf/common/WindowTimerServiceBase.java} (58%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf/operator}/WindowTableFunctionOperator.java (91%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/slicing/SliceAssigner.java (87%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/slicing/SliceAssigners.java (97%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/slicing/SliceSharedAssigner.java (76%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/slicing/SliceUnsharedAssigner.java (94%) create mode 100644 flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/slicing/SlicingWindowOperator.java copy flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{state/StateKeyContext.java => tvf/slicing/SlicingWindowProcessor.java} (70%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{slicing/WindowTimerServiceImpl.java => tvf/slicing/SlicingWindowTimerServiceImpl.java} (66%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/state/StateKeyContext.java (93%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/state/WindowListState.java (97%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/state/WindowMapState.java (98%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/state/WindowState.java (93%) rename flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/state/WindowValueState.java (96%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/CumulativeWindowAssignerTest.java (99%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/SessionWindowAssignerTest.java (88%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/SlidingWindowAssignerTest.java (99%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/assigners/TumblingWindowAssignerTest.java (97%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow/internal}/MergingWindowSetTest.java (96%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow/operator}/WindowOperatorContractTest.java (90%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow/operator}/WindowOperatorTest.java (99%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => groupwindow}/triggers/TriggersTest.java (98%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => tvf/operator}/WindowTableFunctionOperatorTest.java (96%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/slicing/CumulativeSliceAssignerTest.java (99%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/slicing/HoppingSliceAssignerTest.java (99%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/slicing/SliceAssignerTestBase.java (93%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/slicing/TumblingSliceAssignerTest.java (99%) rename flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/{ => tvf}/slicing/WindowedSliceAssignerTest.java (99%)