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
commit 344477b923e54dc25955d1ae517d002abd8250d3
Author: Dawid Wysakowicz <dwysakow...@apache.org>
AuthorDate: Tue Feb 11 10:49:36 2020 +0100
[FLINK-16033][table-api] Updated a test to use java expression dsl
---
.../batch/table/JavaTableEnvironmentITCase.java | 27 +++++++++++-----------
1 file changed, 14 insertions(+), 13 deletions(-)
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 177cf1a..e362027 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
@@ -52,6 +52,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
+import static org.apache.flink.table.api.Expressions.$;
import static org.junit.Assert.assertTrue;
/**
@@ -103,7 +104,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
tableEnv.registerDataSet(tableName, ds);
Table t = tableEnv.scan(tableName);
- Table result = t.select("f0, f1");
+ Table result = t.select($("f0"), $("f1"));
DataSet<Row> resultSet = tableEnv.toDataSet(result, Row.class);
List<Row> results = resultSet.collect();
@@ -123,7 +124,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
tableEnv.registerDataSet(tableName, ds, "a, b, c");
Table t = tableEnv.scan(tableName);
- Table result = t.select("a, b, c");
+ Table result = t.select($("a"), $("b"), $("c"));
DataSet<Row> resultSet = tableEnv.toDataSet(result, Row.class);
List<Row> results = resultSet.collect();
@@ -168,7 +169,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
DataSet<Tuple3<Integer, Long, String>> ds =
CollectionDataSets.get3TupleDataSet(env);
Table t = tableEnv.fromDataSet(ds);
tableEnv.registerTable(tableName, t);
- Table result = tableEnv.scan(tableName).select("f0,
f1").filter("f0 > 7");
+ Table result = tableEnv.scan(tableName).select($("f0"),
$("f1")).filter($("f0").isGreater(7));
DataSet<Row> resultSet = tableEnv.toDataSet(result, Row.class);
List<Row> results = resultSet.collect();
@@ -196,7 +197,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
Table table = tableEnv
.fromDataSet(CollectionDataSets.get3TupleDataSet(env),
"a, b, c")
- .select("a, b, c");
+ .select($("a"), $("b"), $("c"));
DataSet<Row> ds = tableEnv.toDataSet(table, Row.class);
List<Row> results = ds.collect();
@@ -236,7 +237,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
Table table = tableEnv
.fromDataSet(CollectionDataSets.get3TupleDataSet(env),
"a, b, c")
- .select("a, b, c");
+ .select($("a"), $("b"), $("c"));
TypeInformation<?> ti = new TupleTypeInfo<Tuple3<Integer, Long,
String>>(
BasicTypeInfo.INT_TYPE_INFO,
@@ -268,7 +269,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
Table table = tableEnv
.fromDataSet(env.fromCollection(data), "q, w, e, r")
- .select("q as a, w as b, e as c, r as d");
+ .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();
@@ -293,7 +294,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
"salary AS c, " +
"name AS d," +
"roles as e")
- .select("a, b, c, d, e");
+ .select($("a"), $("b"), $("c"), $("d"), $("e"));
DataSet<Row> ds = tableEnv.toDataSet(table, Row.class);
List<Row> results = ds.collect();
@@ -344,7 +345,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
Table table = tableEnv
.fromDataSet(env.fromCollection(data), "name AS d")
- .select("d");
+ .select($("d"));
DataSet<Row> ds = tableEnv.toDataSet(table, Row.class);
List<Row> results = ds.collect();
@@ -371,7 +372,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
"age AS b, " +
"salary AS c, " +
"name AS d")
- .select("a, b, c, d");
+ .select($("a"), $("b"), $("c"), $("d"));
DataSet<Row> ds = tableEnv.toDataSet(table, Row.class);
List<Row> results = ds.collect();
@@ -399,7 +400,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
"salary AS c, " +
"name AS d," +
"roles AS e")
- .select("a, b, c, d, e");
+ .select($("a"), $("b"), $("c"), $("d"), $("e"));
DataSet<SmallPojo2> ds = tableEnv.toDataSet(table,
SmallPojo2.class);
List<SmallPojo2> results = ds.collect();
@@ -426,7 +427,7 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
"age AS b, " +
"salary AS c, " +
"name AS d")
- .select("a, b, c, d");
+ .select($("a"), $("b"), $("c"), $("d"));
DataSet<PrivateSmallPojo2> ds = tableEnv.toDataSet(table,
PrivateSmallPojo2.class);
List<PrivateSmallPojo2> results = ds.collect();
@@ -457,8 +458,8 @@ public class JavaTableEnvironmentITCase extends
TableProgramsCollectionTestBase
"age AS b, " +
"generic AS c, " +
"generic2 AS d")
- .select("a, b, c, c as c2, d")
- .select("a, b, c, c === c2, d");
+ .select($("a"), $("b"), $("c"), $("c").as("c2"), $("d"))
+ .select($("a"), $("b"), $("c"),
$("c").isEqual($("c2")), $("d"));
DataSet<Row> ds = tableEnv.toDataSet(table, Row.class);
List<Row> results = ds.collect();
