You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2016/07/25 13:47:37 UTC
flink git commit: [FLINK-4244] [docs] Field names for union operator
do not have to be equal
Repository: flink
Updated Branches:
refs/heads/master b6f9308c9 -> 588830aaa
[FLINK-4244] [docs] Field names for union operator do not have to be equal
This closes #2280.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/588830aa
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/588830aa
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/588830aa
Branch: refs/heads/master
Commit: 588830aaaa9470bf36a0c9011fe07d1a9c48368f
Parents: b6f9308
Author: Jark Wu <wu...@alibaba-inc.com>
Authored: Thu Jul 21 23:25:44 2016 +0800
Committer: twalthr <tw...@apache.org>
Committed: Mon Jul 25 15:47:07 2016 +0200
----------------------------------------------------------------------
docs/apis/table.md | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/588830aa/docs/apis/table.md
----------------------------------------------------------------------
diff --git a/docs/apis/table.md b/docs/apis/table.md
index 817a84a..cf9133c 100644
--- a/docs/apis/table.md
+++ b/docs/apis/table.md
@@ -404,8 +404,6 @@ This section gives a brief overview of the available operators. You can find mor
<div class="codetabs" markdown="1">
<div data-lang="java" markdown="1">
-<br/>
-
<table class="table table-bordered">
<thead>
<tr>
@@ -515,7 +513,7 @@ Table result = left.fullOuterJoin(right, "a = d").select("a, b, e");
<tr>
<td><strong>Union</strong></td>
<td>
- <p>Similar to a SQL UNION clause. Unions two tables with duplicate records removed. Both tables must have identical schema, i.e., field names and types.</p>
+ <p>Similar to a SQL UNION clause. Unions two tables with duplicate records removed. Both tables must have identical field types.</p>
{% highlight java %}
Table left = tableEnv.fromDataSet(ds1, "a, b, c");
Table right = tableEnv.fromDataSet(ds2, "a, b, c");
@@ -527,7 +525,7 @@ Table result = left.union(right);
<tr>
<td><strong>UnionAll</strong></td>
<td>
- <p>Similar to a SQL UNION ALL clause. Unions two tables. Both tables must have identical schema, i.e., field names and types.</p>
+ <p>Similar to a SQL UNION ALL clause. Unions two tables. Both tables must have identical field types.</p>
{% highlight java %}
Table left = tableEnv.fromDataSet(ds1, "a, b, c");
Table right = tableEnv.fromDataSet(ds2, "a, b, c");
@@ -611,7 +609,6 @@ Table result = in.orderBy("a.asc");
</div>
<div data-lang="scala" markdown="1">
-<br />
<table class="table table-bordered">
<thead>
@@ -722,7 +719,7 @@ val result = left.fullOuterJoin(right, 'a === 'd).select('a, 'b, 'e)
<tr>
<td><strong>Union</strong></td>
<td>
- <p>Similar to a SQL UNION clause. Unions two tables with duplicate records removed, both tables must have identical schema(field names and types).</p>
+ <p>Similar to a SQL UNION clause. Unions two tables with duplicate records removed, both tables must have identical field types.</p>
{% highlight scala %}
val left = ds1.toTable(tableEnv, 'a, 'b, 'c);
val right = ds2.toTable(tableEnv, 'a, 'b, 'c);
@@ -734,7 +731,7 @@ val result = left.union(right);
<tr>
<td><strong>UnionAll</strong></td>
<td>
- <p>Similar to a SQL UNION ALL clause. Unions two tables, both tables must have identical schema(field names and types).</p>
+ <p>Similar to a SQL UNION ALL clause. Unions two tables, both tables must have identical field types.</p>
{% highlight scala %}
val left = ds1.toTable(tableEnv, 'a, 'b, 'c);
val right = ds2.toTable(tableEnv, 'a, 'b, 'c);