You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by dw...@apache.org on 2020/05/08 18:15:33 UTC
[flink] branch master updated: [FLINK-17570] Fix recursive call in
BatchTableEnvironment#fromValues
This is an automated email from the ASF dual-hosted git repository.
dwysakowicz 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 571c089 [FLINK-17570] Fix recursive call in BatchTableEnvironment#fromValues
571c089 is described below
commit 571c0892fa30a34751b575c10b78472eed8849e2
Author: Dawid Wysakowicz <dw...@apache.org>
AuthorDate: Fri May 8 11:29:09 2020 +0200
[FLINK-17570] Fix recursive call in BatchTableEnvironment#fromValues
---
.../org/apache/flink/table/api/internal/TableEnvImpl.scala | 4 ++--
.../runtime/batch/table/JavaTableEnvironmentITCase.java | 13 +++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/internal/TableEnvImpl.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/internal/TableEnvImpl.scala
index 4c6cbd4..5cedcee 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/internal/TableEnvImpl.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/internal/TableEnvImpl.scala
@@ -1161,14 +1161,14 @@ abstract class TableEnvImpl(
val exprs = values.asScala
.map(ApiExpressionUtils.objectToExpression)
.toArray
- fromValues(exprs)
+ fromValues(exprs: _*)
}
override def fromValues(rowType: DataType, values: JIterable[_]): Table = {
val exprs = values.asScala
.map(ApiExpressionUtils.objectToExpression)
.toArray
- fromValues(rowType, exprs)
+ fromValues(rowType, exprs: _*)
}
/** Returns the [[FlinkRelBuilder]] of this TableEnvironment. */
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java
index dc88480..1d808a4 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/batch/table/JavaTableEnvironmentITCase.java
@@ -470,6 +470,19 @@ public class JavaTableEnvironmentITCase extends TableProgramsCollectionTestBase
compareResultAsText(results, expected);
}
+ @Test
+ public void testFromValues() throws Exception {
+ ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+ BatchTableEnvironment tableEnv = BatchTableEnvironment.create(env, config());
+
+ Table table = tableEnv.fromValues(1L, 2L, 3L)
+ .select($("*"));
+
+ List<Row> results = tableEnv.toDataSet(table, Row.class).collect();
+ String expected = "1\n2\n3\n";
+ compareResultAsText(results, expected);
+ }
+
@Test(expected = ValidationException.class)
public void testGenericRow() throws Exception {
ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();