dianfu commented on a change in pull request #14322: URL: https://github.com/apache/flink/pull/14322#discussion_r539045210
########## File path: flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/AbstractPythonStreamAggregateOperator.java ########## @@ -0,0 +1,399 @@ +/* + * 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.runtime.operators.python.aggregate; + +import org.apache.flink.annotation.VisibleForTesting; +import org.apache.flink.api.common.state.ValueState; +import org.apache.flink.api.common.state.ValueStateDescriptor; +import org.apache.flink.api.common.typeinfo.Types; +import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; +import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; +import org.apache.flink.core.memory.DataInputViewStreamWrapper; +import org.apache.flink.core.memory.DataOutputViewStreamWrapper; +import org.apache.flink.core.memory.ManagedMemoryUseCase; +import org.apache.flink.fnexecution.v1.FlinkFnApi; +import org.apache.flink.python.PythonFunctionRunner; +import org.apache.flink.python.PythonOptions; +import org.apache.flink.runtime.state.VoidNamespace; +import org.apache.flink.runtime.state.VoidNamespaceSerializer; +import org.apache.flink.streaming.api.SimpleTimerService; +import org.apache.flink.streaming.api.TimerService; +import org.apache.flink.streaming.api.operators.InternalTimer; +import org.apache.flink.streaming.api.operators.Triggerable; +import org.apache.flink.streaming.api.operators.python.AbstractOneInputPythonFunctionOperator; +import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; +import org.apache.flink.table.data.GenericRowData; +import org.apache.flink.table.data.RowData; +import org.apache.flink.table.data.UpdatableRowData; +import org.apache.flink.table.planner.plan.utils.KeySelectorUtil; +import org.apache.flink.table.runtime.functions.CleanupState; +import org.apache.flink.table.runtime.keyselector.RowDataKeySelector; +import org.apache.flink.table.runtime.operators.python.utils.StreamRecordRowDataWrappingCollector; +import org.apache.flink.table.runtime.runners.python.beam.BeamTableStatefulPythonFunctionRunner; +import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; +import org.apache.flink.table.runtime.typeutils.PythonTypeUtils; +import org.apache.flink.table.types.logical.BigIntType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.table.types.logical.TinyIntType; +import org.apache.flink.util.Preconditions; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static org.apache.flink.table.runtime.typeutils.PythonTypeUtils.toProtoType; + +/** + * Base class for {@link PythonStreamGroupAggregateOperator} and {@link PythonStreamGroupTableAggregateOperator}. + */ +public abstract class AbstractPythonStreamAggregateOperator Review comment: @Internal ########## File path: flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/PythonStreamGroupAggregateOperator.java ########## @@ -19,397 +19,64 @@ package org.apache.flink.table.runtime.operators.python.aggregate; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.state.ValueState; -import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.Configuration; -import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; -import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; -import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputViewStreamWrapper; -import org.apache.flink.core.memory.ManagedMemoryUseCase; import org.apache.flink.fnexecution.v1.FlinkFnApi; -import org.apache.flink.python.PythonFunctionRunner; -import org.apache.flink.python.PythonOptions; -import org.apache.flink.runtime.state.VoidNamespace; -import org.apache.flink.runtime.state.VoidNamespaceSerializer; -import org.apache.flink.streaming.api.SimpleTimerService; -import org.apache.flink.streaming.api.TimerService; -import org.apache.flink.streaming.api.operators.InternalTimer; -import org.apache.flink.streaming.api.operators.Triggerable; -import org.apache.flink.streaming.api.operators.python.AbstractOneInputPythonFunctionOperator; import org.apache.flink.streaming.api.utils.PythonOperatorUtils; -import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.table.data.GenericRowData; -import org.apache.flink.table.data.RowData; -import org.apache.flink.table.data.UpdatableRowData; import org.apache.flink.table.functions.python.PythonAggregateFunctionInfo; import org.apache.flink.table.functions.python.PythonEnv; -import org.apache.flink.table.planner.plan.utils.KeySelectorUtil; import org.apache.flink.table.planner.typeutils.DataViewUtils; -import org.apache.flink.table.runtime.functions.CleanupState; -import org.apache.flink.table.runtime.keyselector.RowDataKeySelector; -import org.apache.flink.table.runtime.operators.python.utils.StreamRecordRowDataWrappingCollector; -import org.apache.flink.table.runtime.runners.python.beam.BeamTableStatefulPythonFunctionRunner; -import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; -import org.apache.flink.table.runtime.typeutils.PythonTypeUtils; -import org.apache.flink.table.types.logical.BigIntType; import org.apache.flink.table.types.logical.RowType; -import org.apache.flink.table.types.logical.TinyIntType; -import org.apache.flink.util.Preconditions; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import static org.apache.flink.table.runtime.typeutils.PythonTypeUtils.toProtoType; /** - * The Python AggregateFunction operator for the blink planner. + * The Python AggregateFunction operator for the blink planner. */ -public class PythonStreamGroupAggregateOperator - extends AbstractOneInputPythonFunctionOperator<RowData, RowData> - implements Triggerable<RowData, VoidNamespace>, CleanupState { +public class PythonStreamGroupAggregateOperator extends AbstractPythonStreamAggregateOperator { Review comment: @Internal ########## File path: flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/PythonStreamGroupTableAggregateOperator.java ########## @@ -0,0 +1,82 @@ +/* + * 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.runtime.operators.python.aggregate; + +import org.apache.flink.annotation.VisibleForTesting; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.fnexecution.v1.FlinkFnApi; +import org.apache.flink.streaming.api.utils.PythonOperatorUtils; +import org.apache.flink.table.functions.python.PythonAggregateFunctionInfo; +import org.apache.flink.table.functions.python.PythonEnv; +import org.apache.flink.table.planner.typeutils.DataViewUtils; +import org.apache.flink.table.types.logical.RowType; + +/** + * The Python TableAggregateFunction operator for the blink planner. + */ Review comment: @Internal ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
