Skip to content

[FLINK-23119][python] Fix the issue that the exception that General Python UDAF is unsupported is not thrown in Compile Stage #16254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HuangXingBo wants to merge 1 commit into from
Closed

[FLINK-23119][python] Fix the issue that the exception that General Python UDAF is unsupported is not thrown in Compile Stage #16254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...flink/table/planner/plan/rules/physical/batch/BatchPhysicalPythonWindowAggregateRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ public boolean matches(RelOptRuleCall call) {
boolean existJavaFunction =
aggCalls.stream().anyMatch(x -> !PythonUtil.isPythonAggregate(x, null));
if (existPandasFunction || existGeneralPythonFunction) {
if (existJavaFunction) {
if (existGeneralPythonFunction) {
throw new TableException(
"Python UDAF and Java/Scala UDAF cannot be used together.");
"non-Pandas UDAFs are not supported in batch mode currently.");
}
if (existPandasFunction && existGeneralPythonFunction) {
if (existJavaFunction) {
throw new TableException(
"Pandas UDAF and non-Pandas UDAF cannot be used together.");
"Python UDAF and Java/Scala UDAF cannot be used together.");
}
return true;
} else {
Expand Down
6 changes: 3 additions & 3 deletions ...apache/flink/table/planner/plan/rules/physical/batch/BatchPhysicalOverAggregateRule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ class BatchPhysicalOverAggregateRule
.map(_._2)
.exists(_.map(_._1).exists(!isPythonAggregate(_)))
if (existPandasFunction || existGeneralPythonFunction) {
if (existGeneralPythonFunction) {
throw new TableException("non-Pandas UDAFs are not supported in batch mode currently.")
}
if (existJavaFunction) {
throw new TableException("Python UDAF and Java/Scala UDAF cannot be used together.")
}
if (existPandasFunction && existGeneralPythonFunction) {
throw new TableException("Pandas UDAF and non-Pandas UDAF cannot be used together.")
}
}
overWindowAgg = if (existJavaFunction) {
new BatchPhysicalOverAggregate(
Expand Down
17 changes: 16 additions & 1 deletion ...cala/org/apache/flink/table/planner/plan/batch/table/PythonGroupWindowAggregateTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package org.apache.flink.table.planner.plan.batch.table

import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.PandasAggregateFunction
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.{PandasAggregateFunction, TestPythonAggregateFunction}
import org.apache.flink.table.planner.utils.TableTestBase

import org.junit.Test
Expand Down Expand Up @@ -101,4 +101,19 @@ class PythonGroupWindowAggregateTest extends TableTestBase {

util.verifyExecPlan(resultTable)
}

@Test(expected = classOf[TableException])
def testGeneralEventTimeTumblingGroupWindowOverTime(): Unit = {
val util = batchTestUtil()
val sourceTable = util.addTableSource[(Int, Long, Int, Long)](
"MyTable", 'a, 'b, 'c, 'rowtime.rowtime)
val func = new TestPythonAggregateFunction

val resultTable = sourceTable
.window(Tumble over 5.millis on 'rowtime as 'w)
.groupBy('w, 'b)
.select('b, 'w.start,'w.end, func('a, 'c))

util.verifyExecPlan(resultTable)
}
}
21 changes: 20 additions & 1 deletion ...scala/org/apache/flink/table/planner/plan/batch/table/PythonOverWindowAggregateTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package org.apache.flink.table.planner.plan.batch.table

import org.apache.flink.api.scala._
import org.apache.flink.table.api._
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.PandasAggregateFunction
import org.apache.flink.table.planner.runtime.utils.JavaUserDefinedAggFunctions.{PandasAggregateFunction, TestPythonAggregateFunction}
import org.apache.flink.table.planner.utils.TableTestBase
import org.junit.Test

Expand Down Expand Up @@ -63,4 +63,23 @@ class PythonOverWindowAggregateTest extends TableTestBase {

util.verifyExecPlan(resultTable)
}

@Test(expected = classOf[TableException])
def testGeneralRangeOverWindowAggregate(): Unit = {
val util = batchTestUtil()
val sourceTable = util.addTableSource[(Int, Long, Int, Long)](
"MyTable", 'a, 'b, 'c, 'rowtime.rowtime)
val func = new TestPythonAggregateFunction

val resultTable = sourceTable
.window(
Over
partitionBy 'b
orderBy 'rowtime
preceding UNBOUNDED_RANGE
as 'w)
.select('b, func('a, 'c) over 'w)

util.verifyExecPlan(resultTable)
}
}