flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject [2/3] flink git commit: [hotfix] [docs] Synchronize the Table API and SQL documentation of time-windowed joins.
Date Tue, 24 Oct 2017 18:29:05 GMT
[hotfix] [docs] Synchronize the Table API and SQL documentation of time-windowed joins.

This closes #4874.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7da886a6
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7da886a6
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7da886a6

Branch: refs/heads/master
Commit: 7da886a666ab2dcfcf4c0c69a04cd6ee34f7e4fc
Parents: 2a63815
Author: Xingcan Cui <xingcanc@gmail.com>
Authored: Fri Oct 20 22:52:52 2017 +0800
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Tue Oct 24 20:28:46 2017 +0200

----------------------------------------------------------------------
 docs/dev/table/sql.md      | 10 +++++-----
 docs/dev/table/tableApi.md |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/7da886a6/docs/dev/table/sql.md
----------------------------------------------------------------------
diff --git a/docs/dev/table/sql.md b/docs/dev/table/sql.md
index 8a86f72..0eef48b 100644
--- a/docs/dev/table/sql.md
+++ b/docs/dev/table/sql.md
@@ -400,15 +400,15 @@ FROM Orders LEFT JOIN Product ON Orders.productId = Product.id
       <td>
         <p><b>Note:</b> Time-windowed joins are a subset of regular joins
that can be processed in a streaming fashion.</p>
 
-        <p>A time-windowed join requires a special join condition that bounds the time
on both sides. This can be done by either two appropriate range predicates (<code> &lt;,
&lt;=, &gt;=, &gt;</code>) or a <code>BETWEEN</code> predicate
that compares the <a href="streaming.html#time-attributes">time attributes</a>
of both input tables. The following rules apply for time predicates:
+        <p>A time-windowed join requires at least one equi-join predicate and a special
join 
+        condition that bounds the time on both sides. Such a condition can be defined by
two appropriate range predicates (<code>&lt;, &lt;=, &gt;=, &gt;</code>)
or a <code>BETWEEN</code> predicate (which is not available in Table API yet)
that compares the <a href="streaming.html#time-attributes">time attributes</a>
of both input tables. The following rules apply for time predicates:
           <ul>
-            <li>Time predicates must compare time attributes of both input tables.</li>
-            <li>Time predicates must compare only time attributes of the same type,
i.e., processing time with processing time or event time with event time.</li>
-            <li>Only range predicates are valid time predicates.</li>
+            <li>The time attribute of a table must be compared to a bounded interval
on a time attribute of the opposite table.</li>
+            <li>The compared time attributes must be of the same type, i.e., both are
processing time or event time.</li>
           </ul>
         </p>
 
-        <p><b>Note:</b> Currently, only <code>INNER</code>
joins are supported.</p>
+        <p><b>Note:</b> Currently, only <code>INNER</code>
time-windowed joins are supported.</p>
 
 {% highlight sql %}
 SELECT *

http://git-wip-us.apache.org/repos/asf/flink/blob/7da886a6/docs/dev/table/tableApi.md
----------------------------------------------------------------------
diff --git a/docs/dev/table/tableApi.md b/docs/dev/table/tableApi.md
index 9380025..07b301d 100644
--- a/docs/dev/table/tableApi.md
+++ b/docs/dev/table/tableApi.md
@@ -527,9 +527,9 @@ Table fullOuterResult = left.fullOuterJoin(right, "a = d").select("a,
b, e");
       <td>
         <p><b>Note:</b> Time-windowed joins are a subset of regular joins
that can be processed in a streaming fashion.</p>
 
-        <p>A time-windowed join requires an equi-join predicate and a special join
condition that bounds the time on both sides. Such a condition can be defined by two appropriate
range predicates (<code> &lt;, &lt;=, &gt;=, &gt;</code>) that
compare the <a href="streaming.html#time-attributes">time attributes</a> of both
input tables. The following rules apply for time predicates:
+        <p>A time-windowed join requires at least one equi-join predicate and a special
join condition that bounds the time on both sides. Such a condition can be defined by two
appropriate range predicates (<code>&lt;, &lt;=, &gt;=, &gt;</code>)
or a <code>BETWEEN</code> predicate (which is not available in Table API yet)
that compares the <a href="streaming.html#time-attributes">time attributes</a>
of both input tables. The following rules apply for time predicates:
           <ul>
-            <li>The time attribute of a stream must be compared to a bounded interval
on a time attribute of the opposite stream.</li>
+            <li>The time attribute of a table must be compared to a bounded interval
on a time attribute of the opposite table.</li>
             <li>The compared time attributes must be of the same type, i.e., both are
processing time or event time.</li>
           </ul>
         </p>
@@ -644,9 +644,9 @@ val fullOuterResult = left.fullOuterJoin(right, 'a === 'd).select('a,
'b, 'e)
       <td>
         <p><b>Note:</b> Time-windowed joins are a subset of regular joins
that can be processed in a streaming fashion.</p>
 
-        <p>A time-windowed join requires an equi-join predicate and a special join
condition that bounds the time on both sides. Such a condition can be defined by two appropriate
range predicates (<code> &lt;, &lt;=, &gt;=, &gt;</code>) that
compare the <a href="streaming.html#time-attributes">time attributes</a> of both
input tables. The following rules apply for time predicates:
+        <p>A time-windowed join requires at least one equi-join predicate and a special
join condition that bounds the time on both sides. Such a condition can be defined by two
appropriate range predicates (<code>&lt;, &lt;=, &gt;=, &gt;</code>)
or a <code>BETWEEN</code> predicate (which is not available in Table API yet)
that compares the <a href="streaming.html#time-attributes">time attributes</a>
of both input tables. The following rules apply for time predicates:
           <ul>
-            <li>The time attribute of a stream must be compared to a bounded interval
on a time attribute of the opposite stream.</li>
+            <li>The time attribute of a table must be compared to a bounded interval
on a time attribute of the opposite table.</li>
             <li>The compared time attributes must be of the same type, i.e., both are
processing time or event time.</li>
           </ul>
         </p>


Mime
View raw message