You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2018/11/08 09:56:25 UTC
[flink] branch master updated: [FLINK-10770] [table] Ensure calling
open/close of generated functions
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new c8b2ee2 [FLINK-10770] [table] Ensure calling open/close of generated functions
c8b2ee2 is described below
commit c8b2ee27d80b1437dd65a9327da65c251febd736
Author: jrthe42 <jr...@gmail.com>
AuthorDate: Sat Nov 3 21:24:57 2018 +0800
[FLINK-10770] [table] Ensure calling open/close of generated functions
This closes #7014.
---
.../apache/flink/table/runtime/CRowMapRunner.scala | 7 +++++
.../table/runtime/CRowOutputProcessRunner.scala | 7 +++++
.../flink/table/runtime/FlatJoinRunner.scala | 7 +++++
.../org/apache/flink/table/runtime/MapRunner.scala | 7 +++++
.../flink/table/runtime/MapSideJoinRunner.scala | 7 +++++
.../runtime/OutputRowtimeProcessFunction.scala | 3 ++
.../flink/table/runtime/join/NonWindowJoin.scala | 11 +++++--
.../runtime/join/TemporalProcessTimeJoin.scala | 10 +++++++
.../table/runtime/join/TemporalRowtimeJoin.scala | 34 ++++++++++++++--------
.../table/runtime/join/TimeBoundedStreamJoin.scala | 7 +++++
.../runtime/match/IterativeConditionRunner.scala | 1 +
.../match/PatternSelectFunctionRunner.scala | 1 +
.../runtime/outerJoinGroupReduceRunners.scala | 7 +++++
.../flink/table/runtime/outerJoinRunners.scala | 7 +++++
.../utils/userDefinedScalarFunctions.scala | 3 ++
.../table/runtime/batch/table/JoinITCase.scala | 8 ++++-
.../table/runtime/stream/table/JoinITCase.scala | 8 ++++-
17 files changed, 119 insertions(+), 16 deletions(-)
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowMapRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowMapRunner.scala
index 54bac60..cb451b9 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowMapRunner.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowMapRunner.scala
@@ -18,6 +18,7 @@
package org.apache.flink.table.runtime
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.functions.{MapFunction, RichMapFunction}
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.ResultTypeQueryable
@@ -46,6 +47,8 @@ class CRowMapRunner[OUT](
val clazz = compile(getRuntimeContext.getUserCodeClassLoader, name, code)
LOG.debug("Instantiating MapFunction.")
function = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(function, getRuntimeContext)
+ FunctionUtils.openFunction(function, parameters)
}
override def map(in: CRow): OUT = {
@@ -53,4 +56,8 @@ class CRowMapRunner[OUT](
}
override def getProducedType: TypeInformation[OUT] = returnType
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(function)
+ }
}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowOutputProcessRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowOutputProcessRunner.scala
index 600b898..ebef577 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowOutputProcessRunner.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/CRowOutputProcessRunner.scala
@@ -18,6 +18,7 @@
package org.apache.flink.table.runtime
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.ResultTypeQueryable
import org.apache.flink.configuration.Configuration
@@ -49,6 +50,8 @@ class CRowOutputProcessRunner(
val clazz = compile(getRuntimeContext.getUserCodeClassLoader, name, code)
LOG.debug("Instantiating ProcessFunction.")
function = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(function, getRuntimeContext)
+ FunctionUtils.openFunction(function, parameters)
this.cRowWrapper = new CRowWrappingCollector()
this.cRowWrapper.setChange(true)
@@ -68,4 +71,8 @@ class CRowOutputProcessRunner(
}
override def getProducedType: TypeInformation[CRow] = returnType
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(function)
+ }
}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala
index 0bf6569..26ed962 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/FlatJoinRunner.scala
@@ -18,6 +18,7 @@
package org.apache.flink.table.runtime
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.functions.{FlatJoinFunction, RichFlatJoinFunction}
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.ResultTypeQueryable
@@ -42,10 +43,16 @@ class FlatJoinRunner[IN1, IN2, OUT](
val clazz = compile(getRuntimeContext.getUserCodeClassLoader, name, code)
LOG.debug("Instantiating FlatJoinFunction.")
function = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(function, getRuntimeContext)
+ FunctionUtils.openFunction(function, parameters)
}
override def join(first: IN1, second: IN2, out: Collector[OUT]): Unit =
function.join(first, second, out)
override def getProducedType: TypeInformation[OUT] = returnType
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(function)
+ }
}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala
index 00d18ec..7f56ffe 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapRunner.scala
@@ -18,6 +18,7 @@
package org.apache.flink.table.runtime
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.functions.{MapFunction, RichMapFunction}
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.ResultTypeQueryable
@@ -41,10 +42,16 @@ class MapRunner[IN, OUT](
val clazz = compile(getRuntimeContext.getUserCodeClassLoader, name, code)
LOG.debug("Instantiating MapFunction.")
function = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(function, getRuntimeContext)
+ FunctionUtils.openFunction(function, parameters)
}
override def map(in: IN): OUT =
function.map(in)
override def getProducedType: TypeInformation[OUT] = returnType
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(function)
+ }
}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala
index 5f5a2cc..f15aaa6 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/MapSideJoinRunner.scala
@@ -18,6 +18,7 @@
package org.apache.flink.table.runtime
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.functions.{FlatJoinFunction, RichFlatMapFunction}
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.ResultTypeQueryable
@@ -43,6 +44,8 @@ abstract class MapSideJoinRunner[IN1, IN2, SINGLE_IN, MULTI_IN, OUT](
val clazz = compile(getRuntimeContext.getUserCodeClassLoader, name, code)
LOG.debug("Instantiating FlatJoinFunction.")
function = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(function, getRuntimeContext)
+ FunctionUtils.openFunction(function, parameters)
broadcastSet = retrieveBroadcastSet
}
@@ -56,4 +59,8 @@ abstract class MapSideJoinRunner[IN1, IN2, SINGLE_IN, MULTI_IN, OUT](
}
override def getProducedType: TypeInformation[OUT] = returnType
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(function)
+ }
}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/OutputRowtimeProcessFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/OutputRowtimeProcessFunction.scala
index 3eaeea3..c964a4b 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/OutputRowtimeProcessFunction.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/OutputRowtimeProcessFunction.scala
@@ -55,4 +55,7 @@ class OutputRowtimeProcessFunction[OUT](
out.collect(function.map(in))
}
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(function)
+ }
}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowJoin.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowJoin.scala
index 0fe2e39..c59f4c2 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowJoin.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/NonWindowJoin.scala
@@ -18,6 +18,7 @@
package org.apache.flink.table.runtime.join
import org.apache.flink.api.common.functions.FlatJoinFunction
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.state.{MapState, MapStateDescriptor, ValueState, ValueStateDescriptor}
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.tuple.{Tuple2 => JTuple2}
@@ -77,14 +78,16 @@ abstract class NonWindowJoin(
protected var curProcessTime: Long = _
override def open(parameters: Configuration): Unit = {
- LOG.debug(s"Compiling JoinFunction: $genJoinFuncName \n\n " +
- s"Code:\n$genJoinFuncCode")
+ LOG.debug(s"Compiling JoinFunction: $genJoinFuncName \n\n Code:\n$genJoinFuncCode")
val clazz = compile(
getRuntimeContext.getUserCodeClassLoader,
genJoinFuncName,
genJoinFuncCode)
+ LOG.debug("Instantiating JoinFunction.")
joinFunction = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(joinFunction, getRuntimeContext)
+ FunctionUtils.openFunction(joinFunction, parameters)
// initialize left and right state, the first element of tuple2 indicates how many rows of
// this row, while the second element represents the expired time of this row.
@@ -291,4 +294,8 @@ abstract class NonWindowJoin(
joinFunction.join(otherSideRow, inputRow, cRowWrapper)
}
}
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(joinFunction)
+ }
}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalProcessTimeJoin.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalProcessTimeJoin.scala
index 175af91..7a8bb61 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalProcessTimeJoin.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalProcessTimeJoin.scala
@@ -18,8 +18,10 @@
package org.apache.flink.table.runtime.join
import org.apache.flink.api.common.functions.FlatJoinFunction
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.state.{ValueState, ValueStateDescriptor}
import org.apache.flink.api.common.typeinfo.TypeInformation
+import org.apache.flink.configuration.Configuration
import org.apache.flink.streaming.api.operators.{AbstractStreamOperator, TimestampedCollector, TwoInputStreamOperator}
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord
import org.apache.flink.table.api.StreamQueryConfig
@@ -51,12 +53,16 @@ class TemporalProcessTimeJoin(
protected var joinFunction: FlatJoinFunction[Row, Row, Row] = _
override def open(): Unit = {
+ LOG.debug(s"Compiling FlatJoinFunction: $genJoinFuncName \n\n Code:\n$genJoinFuncCode")
val clazz = compile(
getRuntimeContext.getUserCodeClassLoader,
genJoinFuncName,
genJoinFuncCode)
+ LOG.debug("Instantiating FlatJoinFunction.")
joinFunction = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(joinFunction, getRuntimeContext)
+ FunctionUtils.openFunction(joinFunction, new Configuration())
val rightStateDescriptor = new ValueStateDescriptor[Row]("right", rightType)
rightState = getRuntimeContext.getState(rightStateDescriptor)
@@ -86,4 +92,8 @@ class TemporalProcessTimeJoin(
rightState.clear()
}
}
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(joinFunction)
+ }
}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalRowtimeJoin.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalRowtimeJoin.scala
index 17f8e1a..66b60d4 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalRowtimeJoin.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TemporalRowtimeJoin.scala
@@ -22,8 +22,10 @@ import java.util
import java.util.{Comparator, Optional}
import org.apache.flink.api.common.functions.FlatJoinFunction
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.state._
import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation}
+import org.apache.flink.configuration.Configuration
import org.apache.flink.runtime.state.{VoidNamespace, VoidNamespaceSerializer}
import org.apache.flink.streaming.api.SimpleTimerService
import org.apache.flink.streaming.api.operators._
@@ -115,12 +117,16 @@ class TemporalRowtimeJoin(
private var joinFunction: FlatJoinFunction[Row, Row, Row] = _
override def open(): Unit = {
+ LOG.debug(s"Compiling FlatJoinFunction: $genJoinFuncName \n\n Code:\n$genJoinFuncCode")
val clazz = compile(
getRuntimeContext.getUserCodeClassLoader,
genJoinFuncName,
genJoinFuncCode)
+ LOG.debug("Instantiating FlatJoinFunction.")
joinFunction = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(joinFunction, getRuntimeContext)
+ FunctionUtils.openFunction(joinFunction, new Configuration())
nextLeftIndex = getRuntimeContext.getState(
new ValueStateDescriptor[JLong](NEXT_LEFT_INDEX_STATE_NAME, BasicTypeInfo.LONG_TYPE_INFO))
@@ -159,6 +165,22 @@ class TemporalRowtimeJoin(
registerSmallestTimer(rowTime) // Timer to clean up the state
}
+ override def onProcessingTime(timer: InternalTimer[Any, VoidNamespace]): Unit = {
+ throw new IllegalStateException("This should never happen")
+ }
+
+ override def onEventTime(timer: InternalTimer[Any, VoidNamespace]): Unit = {
+ registeredTimer.clear()
+ val lastUnprocessedTime = emitResultAndCleanUpState(timerService.currentWatermark())
+ if (lastUnprocessedTime < Long.MaxValue) {
+ registerTimer(lastUnprocessedTime)
+ }
+ }
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(joinFunction)
+ }
+
private def registerSmallestTimer(timestamp: Long): Unit = {
val currentRegisteredTimer = registeredTimer.value()
if (currentRegisteredTimer == null) {
@@ -175,18 +197,6 @@ class TemporalRowtimeJoin(
timerService.registerEventTimeTimer(timestamp)
}
- override def onProcessingTime(timer: InternalTimer[Any, VoidNamespace]): Unit = {
- throw new IllegalStateException("This should never happen")
- }
-
- override def onEventTime(timer: InternalTimer[Any, VoidNamespace]): Unit = {
- registeredTimer.clear()
- val lastUnprocessedTime = emitResultAndCleanUpState(timerService.currentWatermark())
- if (lastUnprocessedTime < Long.MaxValue) {
- registerTimer(lastUnprocessedTime)
- }
- }
-
/**
* @return a row time of the oldest unprocessed probe record or Long.MaxValue, if all records
* have been processed.
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TimeBoundedStreamJoin.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TimeBoundedStreamJoin.scala
index a44bdef..ae7ca6a 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TimeBoundedStreamJoin.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/join/TimeBoundedStreamJoin.scala
@@ -22,6 +22,7 @@ import java.util
import java.util.{List => JList}
import org.apache.flink.api.common.functions.FlatJoinFunction
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.state._
import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation}
import org.apache.flink.api.java.operators.join.JoinType
@@ -110,6 +111,8 @@ abstract class TimeBoundedStreamJoin(
genJoinFuncCode)
LOG.debug("Instantiating JoinFunction.")
joinFunction = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(joinFunction, getRuntimeContext)
+ FunctionUtils.openFunction(joinFunction, config)
joinCollector = new EmitAwareCollector()
joinCollector.setCRowChange(true)
@@ -378,6 +381,10 @@ abstract class TimeBoundedStreamJoin(
}
}
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(joinFunction)
+ }
+
/**
* Calculate the expiration time with the given operator time and relative window size.
*
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/IterativeConditionRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/IterativeConditionRunner.scala
index fc6755e..15b9d37 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/IterativeConditionRunner.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/IterativeConditionRunner.scala
@@ -43,6 +43,7 @@ class IterativeConditionRunner(
val clazz = compile(Thread.currentThread().getContextClassLoader, name, code)
LOG.debug("Instantiating IterativeCondition.")
function = clazz.newInstance()
+ // TODO add logic for opening and closing the function once it can be a RichFunction
}
override def filter(value: Row, ctx: IterativeCondition.Context[Row]): Boolean = {
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/PatternSelectFunctionRunner.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/PatternSelectFunctionRunner.scala
index 6433522..c92cd38 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/PatternSelectFunctionRunner.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/match/PatternSelectFunctionRunner.scala
@@ -48,6 +48,7 @@ class PatternSelectFunctionRunner(
val clazz = compile(Thread.currentThread().getContextClassLoader, name, code)
LOG.debug("Instantiating PatternSelectFunction.")
function = clazz.newInstance()
+ // TODO add logic for opening and closing the function once it can be a RichFunction
}
override def flatSelect(
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinGroupReduceRunners.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinGroupReduceRunners.scala
index 9b0f08e..23ad51a 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinGroupReduceRunners.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinGroupReduceRunners.scala
@@ -19,6 +19,7 @@ package org.apache.flink.table.runtime
import java.lang.Iterable
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.functions.{JoinFunction, RichGroupReduceFunction}
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.configuration.Configuration
@@ -41,6 +42,12 @@ abstract class OuterJoinGroupReduceRunner(
val clazz = compile(getRuntimeContext.getUserCodeClassLoader, name, code)
LOG.debug("Instantiating JoinFunction.")
function = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(function, getRuntimeContext)
+ FunctionUtils.openFunction(function, config)
+ }
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(function)
}
}
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinRunners.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinRunners.scala
index a9e0211..fd3b46f 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinRunners.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/outerJoinRunners.scala
@@ -20,6 +20,7 @@ package org.apache.flink.table.runtime
import java.lang.{Boolean => JBool}
+import org.apache.flink.api.common.functions.util.FunctionUtils
import org.apache.flink.api.common.functions.{JoinFunction, RichFlatJoinFunction}
import org.apache.flink.api.common.typeinfo.TypeInformation
import org.apache.flink.api.java.typeutils.ResultTypeQueryable
@@ -45,9 +46,15 @@ abstract class OuterJoinRunner(
val clazz = compile(getRuntimeContext.getUserCodeClassLoader, name, code)
LOG.debug("Instantiating FlatJoinFunction.")
function = clazz.newInstance()
+ FunctionUtils.setFunctionRuntimeContext(function, getRuntimeContext)
+ FunctionUtils.openFunction(function, parameters)
}
override def getProducedType: TypeInformation[Row] = returnType
+
+ override def close(): Unit = {
+ FunctionUtils.closeFunction(function)
+ }
}
/**
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/userDefinedScalarFunctions.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/userDefinedScalarFunctions.scala
index 6d02afc..912bb04 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/userDefinedScalarFunctions.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/userDefinedScalarFunctions.scala
@@ -290,6 +290,9 @@ object Func19 extends ScalarFunction {
}
+/**
+ * A scalar function that always returns TRUE if opened correctly.
+ */
class Func20 extends ScalarFunction {
private var permitted: Boolean = false
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/JoinITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/JoinITCase.scala
index b7d349c..2dbe1cd 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/JoinITCase.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/batch/table/JoinITCase.scala
@@ -26,6 +26,7 @@ import org.apache.flink.api.scala.util.CollectionDataSets
import org.apache.flink.table.api.TableEnvironment
import org.apache.flink.table.api.scala._
import org.apache.flink.table.expressions.Literal
+import org.apache.flink.table.expressions.utils.Func20
import org.apache.flink.table.runtime.utils.TableProgramsClusterTestBase
import org.apache.flink.table.runtime.utils.TableProgramsTestBase.TableConfigMode
import org.apache.flink.table.utils.TableFunc2
@@ -53,7 +54,12 @@ class JoinITCase(
val ds1 = CollectionDataSets.getSmall3TupleDataSet(env).toTable(tEnv, 'a, 'b, 'c)
val ds2 = CollectionDataSets.get5TupleDataSet(env).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
- val joinT = ds1.join(ds2).where('b === 'e).select('c, 'g)
+ val testOpenCall = new Func20
+
+ val joinT = ds1.join(ds2)
+ .where('b === 'e)
+ .where(testOpenCall('a + 'd))
+ .select('c, 'g)
val expected = "Hi,Hallo\n" + "Hello,Hallo Welt\n" + "Hello world,Hallo Welt\n"
val results = joinT.toDataSet[Row].collect()
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/JoinITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/JoinITCase.scala
index 197a039..7060d4d 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/JoinITCase.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/JoinITCase.scala
@@ -27,6 +27,7 @@ import org.junit.Assert._
import org.junit.Test
import org.apache.flink.api.common.time.Time
import org.apache.flink.api.common.typeinfo.TypeInformation
+import org.apache.flink.table.expressions.utils.Func20
import org.apache.flink.table.expressions.{Literal, Null}
import org.apache.flink.table.functions.aggfunctions.CountAggFunction
import org.apache.flink.table.runtime.utils.JavaUserDefinedAggFunctions.{CountDistinct, WeightedAvg}
@@ -225,7 +226,12 @@ class JoinITCase extends StreamingWithStateTestBase {
val ds1 = StreamTestData.getSmall3TupleDataStream(env).toTable(tEnv, 'a, 'b, 'c)
val ds2 = StreamTestData.get5TupleDataStream(env).toTable(tEnv, 'd, 'e, 'f, 'g, 'h)
- val joinT = ds1.join(ds2).where('b === 'e).select('c, 'g)
+ val testOpenCall = new Func20
+
+ val joinT = ds1.join(ds2)
+ .where('b === 'e)
+ .where(testOpenCall('a + 'd))
+ .select('c, 'g)
val expected = Seq("Hi,Hallo", "Hello,Hallo Welt", "Hello world,Hallo Welt")
val results = joinT.toRetractStream[Row]