You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ja...@apache.org on 2019/12/28 03:50:39 UTC
[flink] branch release-1.9 updated:
[FLINK-15413][table-planner-blink] Fix ScalarOperatorsTest failed in travis
(#10708)
This is an automated email from the ASF dual-hosted git repository.
jark pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.9 by this push:
new 025aca8 [FLINK-15413][table-planner-blink] Fix ScalarOperatorsTest failed in travis (#10708)
025aca8 is described below
commit 025aca82a541d838101d14de5190111597c6db83
Author: Jark Wu <ja...@apache.org>
AuthorDate: Sat Dec 28 11:50:12 2019 +0800
[FLINK-15413][table-planner-blink] Fix ScalarOperatorsTest failed in travis (#10708)
---
.../planner/expressions/TemporalTypesTest.scala | 2 +-
.../expressions/utils/ExpressionTestBase.scala | 25 ----------------------
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/TemporalTypesTest.scala b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/TemporalTypesTest.scala
index 4e1bb8d..8f102d4 100644
--- a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/TemporalTypesTest.scala
+++ b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/TemporalTypesTest.scala
@@ -803,7 +803,7 @@ class TemporalTypesTest extends ExpressionTestBase {
cases.foreach {
caseExpr =>
- testSqlNullable(caseExpr)
+ testSqlApi(caseExpr, "null")
}
}
diff --git a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/utils/ExpressionTestBase.scala b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/utils/ExpressionTestBase.scala
index 02cc054..5a82577 100644
--- a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/utils/ExpressionTestBase.scala
+++ b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/planner/expressions/utils/ExpressionTestBase.scala
@@ -26,14 +26,12 @@ import org.apache.flink.configuration.Configuration
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
import org.apache.flink.table.api.internal.TableEnvironmentImpl
import org.apache.flink.table.api.java.internal.StreamTableEnvironmentImpl
-import org.apache.flink.table.api.scala._
import org.apache.flink.table.api.{EnvironmentSettings, TableConfig}
import org.apache.flink.table.dataformat.{BaseRow, BinaryRow, DataFormatConverters}
import org.apache.flink.table.expressions.{Expression, ExpressionParser}
import org.apache.flink.table.functions.ScalarFunction
import org.apache.flink.table.planner.codegen.{CodeGeneratorContext, ExprCodeGenerator, FunctionCodeGenerator}
import org.apache.flink.table.planner.delegation.PlannerBase
-import org.apache.flink.table.planner.expressions.ExpressionBuilder
import org.apache.flink.table.runtime.types.TypeInfoLogicalTypeConverter.fromTypeInfoToLogicalType
import org.apache.flink.table.types.DataType
import org.apache.flink.table.types.logical.{RowType, VarCharType}
@@ -215,10 +213,6 @@ abstract class ExpressionTestBase {
addTableApiTestExpr(expr, expected)
addTableApiTestExpr(exprString, expected)
addSqlTestExpr(sqlExpr, expected)
- if (expected == nullable) {
- testTableNullable(expr, exprString)
- testSqlNullable(sqlExpr)
- }
}
def testTableApi(
@@ -227,9 +221,6 @@ abstract class ExpressionTestBase {
expected: String): Unit = {
addTableApiTestExpr(expr, expected)
addTableApiTestExpr(exprString, expected)
- if (expected == nullable) {
- testTableNullable(expr, exprString)
- }
}
private def addTableApiTestExpr(tableApiString: String, expected: String): Unit = {
@@ -243,26 +234,10 @@ abstract class ExpressionTestBase {
addTestExpr(relNode, expected, tableApiExpr.asSummaryString())
}
- def testSqlNullable(nullUdf: String): Unit = {
- addSqlTestExpr(
- s"CASE WHEN ($nullUdf) is null THEN '$nullable' ELSE '$notNullable' END", nullable)
- }
-
def testSqlApi(
sqlExpr: String,
expected: String): Unit = {
addSqlTestExpr(sqlExpr, expected)
- if (expected == nullable) {
- testSqlNullable(sqlExpr)
- }
- }
-
- def testTableNullable(nullExpr: Expression, nullExprString: String): Unit = {
- val retExpr = ExpressionBuilder.ifThenElse(nullExpr.isNull, nullable, notNullable)
- addTableApiTestExpr(retExpr, nullable)
- val retStrExpr = ifThenElse(
- ExpressionParser.parseExpression(nullExprString).isNull, nullable, notNullable)
- addTableApiTestExpr(retStrExpr, nullable)
}
def testData: Row