dianfu commented on code in PR #29652:
URL: https://github.com/apache/flink/pull/29652#discussion_r4534543602
##########
flink-python/pyflink/table/tests/test_async_scalar_function.py:
##########
@@ -205,6 +205,32 @@ async def async_add_suffix(value: str) -> str:
"+I[test, prefix_TEST, PREFIX_TEST_suffix]"
])
+ def test_projection_order(self):
Review Comment:
I think we could remove this test case. The plan test is enough.
##########
flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/rules/logical/PythonAsyncCalcProjectionTest.java:
##########
@@ -0,0 +1,130 @@
+/*
+ * 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.rules.logical;
+
+import org.apache.flink.table.api.DataTypes;
+import org.apache.flink.table.api.Schema;
+import
org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.AsyncPythonScalarFunction;
+import
org.apache.flink.table.planner.runtime.utils.JavaUserDefinedScalarFunctions.PythonScalarFunction;
+import org.apache.flink.table.planner.utils.JavaTableTestUtil;
+import org.apache.flink.table.planner.utils.TableTestBase;
+
+import org.junit.jupiter.api.Test;
+
+/** Tests projection ordering after splitting Python async calls. */
+class PythonAsyncCalcProjectionTest extends TableTestBase {
+
+ @Test
+ void testStreamingSyncPythonFunctionBeforeAsyncPythonFunction() {
Review Comment:
I guess it's not necessary to test each of these cases for both
streaming/batch cases.
##########
flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/RemoteCalcReorderProjectionRule.java:
##########
@@ -0,0 +1,73 @@
+/*
+ * 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.rules.logical;
+
+import org.apache.flink.table.planner.plan.nodes.logical.FlinkLogicalCalc;
+import
org.apache.flink.table.planner.plan.optimize.program.FlinkRuleSetProgram;
+
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.rex.RexCall;
+import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.rex.RexProgram;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Enforces that {@link RexInputRef} projections precede {@link RexCall}
projections in a {@link
+ * FlinkLogicalCalc} containing remote calls. This rule assumes that
non-remote calls have already
+ * been split into separate calcs.
+ *
+ * <p>{@link RemoteCalcRewriteProjectionRule} moves expressions other than
{@link RexInputRef} and
+ * {@link RexCall} out of the remote calc and also establishes this projection
order. Subsequent
+ * optimizations, such as async calc splitting, can disrupt that order. This
rule restores the
+ * required order after those optimizations.
+ *
+ * <p>A distinct rule is needed because {@link FlinkRuleSetProgram}
de-duplicates equal rules.
+ * Re-registering {@link RemoteCalcRewriteProjectionRule}, already applied
before async splitting,
+ * would not schedule another pass.
+ */
+public class RemoteCalcReorderProjectionRule extends
RemoteCalcRewriteProjectionRule {
Review Comment:
Could we reuse RemoteCalcRewriteProjectionRule with a distinct description
for this second pass, instead of introducing a separate rule class?
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
