Repository: flink Updated Branches: refs/heads/master 1ce10c877 -> 6bc6b225e
http://git-wip-us.apache.org/repos/asf/flink/blob/6bc6b225/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java index e84c906..dece295 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/table/api/java/batch/TableEnvironmentITCase.java @@ -56,8 +56,7 @@ public class TableEnvironmentITCase extends TableProgramsCollectionTestBase { @Parameterized.Parameters(name = "Table config = {0}") public static Collection<Object[]> parameters() { return Arrays.asList(new Object[][] { - { TableProgramsTestBase.DEFAULT() }, - { TableProgramsTestBase.EFFICIENT() } + { TableProgramsTestBase.DEFAULT() } }); } @@ -265,8 +264,8 @@ public class TableEnvironmentITCase extends TableProgramsCollectionTestBase { data.add(new Tuple4<>("Test me", 4, 3.33, "Hello world")); Table table = tableEnv - .fromDataSet(env.fromCollection(data), "a, b, c, d") - .select("a, b, c, d"); + .fromDataSet(env.fromCollection(data), "q, w, e, r") + .select("q as a, w as b, e as c, r as d"); DataSet<SmallPojo2> ds = tableEnv.toDataSet(table, SmallPojo2.class); List<SmallPojo2> results = ds.collect(); http://git-wip-us.apache.org/repos/asf/flink/blob/6bc6b225/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableEnvironmentITCase.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableEnvironmentITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableEnvironmentITCase.scala index 2b00cc9..6cbe834 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableEnvironmentITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/TableEnvironmentITCase.scala @@ -261,8 +261,8 @@ object TableEnvironmentITCase { @Parameterized.Parameters(name = "Table config = {0}") def parameters(): util.Collection[Array[java.lang.Object]] = { Seq[Array[AnyRef]]( - Array(TableProgramsTestBase.DEFAULT), - Array(TableProgramsTestBase.EFFICIENT)).asJava + Array(TableProgramsTestBase.DEFAULT) + ).asJava } } http://git-wip-us.apache.org/repos/asf/flink/blob/6bc6b225/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/TableProgramsTestBase.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/TableProgramsTestBase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/TableProgramsTestBase.scala index a699068..586d716 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/TableProgramsTestBase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/scala/batch/utils/TableProgramsTestBase.scala @@ -21,7 +21,7 @@ package org.apache.flink.table.api.scala.batch.utils import java.util import org.apache.flink.table.api.TableConfig -import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.{EFFICIENT, NO_NULL, TableConfigMode} +import org.apache.flink.table.api.scala.batch.utils.TableProgramsTestBase.{NO_NULL, TableConfigMode} import org.apache.flink.test.util.MultipleProgramsTestBase import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.junit.runners.Parameterized @@ -38,8 +38,6 @@ class TableProgramsTestBase( tableConfigMode match { case NO_NULL => conf.setNullCheck(false) - case EFFICIENT => - conf.setEfficientTypeUsage(true) case _ => // keep default } conf @@ -47,11 +45,10 @@ class TableProgramsTestBase( } object TableProgramsTestBase { - case class TableConfigMode(nullCheck: Boolean, efficientTypes: Boolean) + case class TableConfigMode(nullCheck: Boolean) - val DEFAULT = TableConfigMode(nullCheck = true, efficientTypes = false) - val NO_NULL = TableConfigMode(nullCheck = false, efficientTypes = false) - val EFFICIENT = TableConfigMode(nullCheck = false, efficientTypes = true) + val DEFAULT = TableConfigMode(nullCheck = true) + val NO_NULL = TableConfigMode(nullCheck = false) @Parameterized.Parameters(name = "Table config = {0}") def parameters(): util.Collection[Array[java.lang.Object]] = { http://git-wip-us.apache.org/repos/asf/flink/blob/6bc6b225/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala index 8555632..b4327ec 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/utils/ExpressionTestBase.scala @@ -95,7 +95,7 @@ abstract class ExpressionTestBase { val generator = new CodeGenerator(config, false, typeInfo) // cast expressions to String - val stringTestExprs = testExprs.map(expr => relBuilder.cast(expr._1, VARCHAR)).toSeq + val stringTestExprs = testExprs.map(expr => relBuilder.cast(expr._1, VARCHAR)) // generate code val resultType = new RowTypeInfo(Seq.fill(testExprs.size)(STRING_TYPE_INFO): _*) @@ -110,16 +110,16 @@ abstract class ExpressionTestBase { |return ${genExpr.resultTerm}; |""".stripMargin - val genFunc = generator.generateFunction[MapFunction[Any, String]]( + val genFunc = generator.generateFunction[MapFunction[Any, Row], Row]( "TestFunction", - classOf[MapFunction[Any, String]], + classOf[MapFunction[Any, Row]], bodyCode, - resultType.asInstanceOf[TypeInformation[Any]]) + resultType) // compile and evaluate - val clazz = new TestCompiler[MapFunction[Any, String]]().compile(genFunc) + val clazz = new TestCompiler[MapFunction[Any, Row], Row]().compile(genFunc) val mapper = clazz.newInstance() - val result = mapper.map(testData).asInstanceOf[Row] + val result = mapper.map(testData) // compare testExprs @@ -211,8 +211,8 @@ abstract class ExpressionTestBase { // ---------------------------------------------------------------------------------------------- // TestCompiler that uses current class loader - class TestCompiler[T <: Function] extends Compiler[T] { - def compile(genFunc: GeneratedFunction[T]): Class[T] = + class TestCompiler[F <: Function, T <: Any] extends Compiler[F] { + def compile(genFunc: GeneratedFunction[F, T]): Class[F] = compile(getClass.getClassLoader, genFunc.name, genFunc.code) } }
