You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2018/11/28 05:44:03 UTC
[GitHub] asfgit closed pull request #7179: [hotfix] [table][tests] (follow
up) Moves the overload test case to UserDefinedScalarFunctionTest
asfgit closed pull request #7179: [hotfix] [table][tests] (follow up) Moves the overload test case to UserDefinedScalarFunctionTest
URL: https://github.com/apache/flink/pull/7179
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala
index dbfe5f6c02a..153434438b4 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/UserDefinedScalarFunctionTest.scala
@@ -27,7 +27,7 @@ import org.apache.flink.types.Row
import org.apache.flink.table.api.{Types, ValidationException}
import org.apache.flink.table.runtime.utils.JavaUserDefinedScalarFunctions._
import org.apache.flink.table.api.scala._
-import org.apache.flink.table.expressions.utils.{ExpressionTestBase, _}
+import org.apache.flink.table.expressions.utils.{ExpressionTestBase, GraduatedStudent, _}
import org.apache.flink.table.functions.ScalarFunction
import org.junit.Test
import java.lang.{Boolean => JBoolean}
@@ -200,6 +200,18 @@ class UserDefinedScalarFunctionTest extends ExpressionTestBase {
"Func8('a', 'a')",
"Func8('a', 'a')",
"c")
+
+ testAllApis(
+ Func21('f15),
+ "Func21(f15)",
+ "Func21(f15)",
+ "student#Bob")
+
+ testAllApis(
+ Func22('f16),
+ "Func22(f16)",
+ "Func22(f16)",
+ "student#Bob")
}
@Test
@@ -377,7 +389,7 @@ class UserDefinedScalarFunctionTest extends ExpressionTestBase {
// ----------------------------------------------------------------------------------------------
override def testData: Any = {
- val testData = new Row(15)
+ val testData = new Row(17)
testData.setField(0, 42)
testData.setField(1, "Test")
testData.setField(2, null)
@@ -397,6 +409,8 @@ class UserDefinedScalarFunctionTest extends ExpressionTestBase {
true.asInstanceOf[JBoolean],
Row.of(1.asInstanceOf[Integer], 2.asInstanceOf[Integer], 3.asInstanceOf[Integer]))
)
+ testData.setField(15, new GraduatedStudent("Bob"))
+ testData.setField(16, Array(new GraduatedStudent("Bob")))
testData
}
@@ -416,7 +430,9 @@ class UserDefinedScalarFunctionTest extends ExpressionTestBase {
Types.BYTE,
Types.SHORT,
Types.FLOAT,
- Types.ROW(Types.INT, Types.BOOLEAN, Types.ROW(Types.INT, Types.INT, Types.INT))
+ Types.ROW(Types.INT, Types.BOOLEAN, Types.ROW(Types.INT, Types.INT, Types.INT)),
+ TypeInformation.of(classOf[GraduatedStudent]),
+ TypeInformation.of(classOf[Array[GraduatedStudent]])
).asInstanceOf[TypeInformation[Any]]
}
@@ -443,6 +459,8 @@ class UserDefinedScalarFunctionTest extends ExpressionTestBase {
"Func16" -> Func16,
"Func17" -> Func17,
"Func19" -> Func19,
+ "Func21" -> Func21,
+ "Func22" -> Func22,
"JavaFunc0" -> new JavaFunc0,
"JavaFunc1" -> new JavaFunc1,
"JavaFunc2" -> new JavaFunc2,
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/CalcITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/CalcITCase.scala
index e433742fb67..d5ed85c5a13 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/CalcITCase.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/table/CalcITCase.scala
@@ -350,62 +350,4 @@ class CalcITCase extends AbstractTestBase {
"{9=Comment#3}")
assertEquals(expected.sorted, StreamITCase.testResults.sorted)
}
-
- @Test
- def testOverload(): Unit = {
- val env = StreamExecutionEnvironment.getExecutionEnvironment
- val tEnv = TableEnvironment.getTableEnvironment(env)
-
- StreamITCase.testResults = mutable.MutableList()
-
- val testData = new mutable.MutableList[GraduatedStudent]
- testData.+=(new GraduatedStudent("Jack#22"))
- testData.+=(new GraduatedStudent("John#19"))
- testData.+=(new GraduatedStudent("Anna#44"))
- testData.+=(new GraduatedStudent("nosharp"))
-
- val t = env.fromCollection(testData).toTable(tEnv).as('a)
-
- val result = t.select(Func21('a))
-
- result.addSink(new StreamITCase.StringSink[Row])
- env.execute()
-
- val expected = mutable.MutableList(
- "student#Jack#22",
- "student#John#19",
- "student#Anna#44",
- "student#nosharp"
- )
- assertEquals(expected.sorted, StreamITCase.testResults.sorted)
- }
-
- @Test
- def testOverloadWithArray(): Unit = {
- val env = StreamExecutionEnvironment.getExecutionEnvironment
- val tEnv = TableEnvironment.getTableEnvironment(env)
-
- StreamITCase.testResults = mutable.MutableList()
-
- val testData = new mutable.MutableList[Array[GraduatedStudent]]
- testData.+=(Array(new GraduatedStudent("Jack#22")))
- testData.+=(Array(new GraduatedStudent("John#19")))
- testData.+=(Array(new GraduatedStudent("Anna#44")))
- testData.+=(Array(new GraduatedStudent("nosharp")))
-
- val t = env.fromCollection(testData).toTable(tEnv).as('a)
-
- val result = t.select(Func22('a))
-
- result.addSink(new StreamITCase.StringSink[Row])
- env.execute()
-
- val expected = mutable.MutableList(
- "student#Jack#22",
- "student#John#19",
- "student#Anna#44",
- "student#nosharp"
- )
- assertEquals(expected.sorted, StreamITCase.testResults.sorted)
- }
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services