This is an automated email from the ASF dual-hosted git repository.

mergebot-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/beam-site.git

commit bc530c0bff9dccfbeba99863ece2bc1a3264d895
Author: Mergebot <merge...@apache.org>
AuthorDate: Wed Dec 13 18:49:12 2017 +0000

    Prepare repository for deployment.
---
 content/contribute/work-in-progress/index.html | 6 ------
 content/documentation/dsls/sql/index.html      | 6 +-----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/content/contribute/work-in-progress/index.html 
b/content/contribute/work-in-progress/index.html
index 00558e4..694c400 100644
--- a/content/contribute/work-in-progress/index.html
+++ b/content/contribute/work-in-progress/index.html
@@ -190,12 +190,6 @@
       <td><a 
href="https://issues.apache.org/jira/browse/BEAM-2709";>BEAM-2709</a></td>
     </tr>
     <tr>
-      <td>Beam SQL DSL</td>
-      <td><a 
href="https://github.com/apache/beam/tree/DSL_SQL";>DSL_SQL</a></td>
-      <td><a 
href="https://issues.apache.org/jira/browse/BEAM/component/12332480";>dsl-sql</a></td>
-      <td><a 
href="https://issues.apache.org/jira/browse/BEAM-301";>BEAM-301</a></td>
-    </tr>
-    <tr>
       <td>Go SDK</td>
       <td><a href="https://github.com/apache/beam/tree/go-sdk";>go-sdk</a></td>
       <td><a 
href="https://issues.apache.org/jira/browse/BEAM/component/12333564";>sdk-go</a></td>
diff --git a/content/documentation/dsls/sql/index.html 
b/content/documentation/dsls/sql/index.html
index 5b8130f..8aec773 100644
--- a/content/documentation/dsls/sql/index.html
+++ b/content/documentation/dsls/sql/index.html
@@ -153,10 +153,6 @@
 
 <p>This page describes the implementation of Beam SQL, and how to simplify a 
Beam pipeline with DSL APIs.</p>
 
-<blockquote>
-  <p>Note: Beam SQL hasn’t been merged to master branch yet (being developed 
with branch <a href="https://github.com/apache/beam/tree/DSL_SQL";>DSL_SQL</a>), 
but is coming soon.</p>
-</blockquote>
-
 <h2 id="overview">1. Overview</h2>
 
 <p>SQL is a well-adopted standard to process data with concise syntax. With 
DSL APIs (currently available only in Java), now <code 
class="highlighter-rouge">PCollection</code>s can be queried with standard SQL 
statements, like a regular table. The DSL APIs leverage <a 
href="http://calcite.apache.org/";>Apache Calcite</a> to parse and optimize SQL 
queries, then translate into a composite Beam <code 
class="highlighter-rouge">PTransform</code>. In this way, both SQL and normal 
Beam <code cla [...]
@@ -261,7 +257,7 @@ PCollection&lt;BeamRecord&gt; output = namesAndFoods.apply(
 
 <p>Both methods wrap the back-end details of parsing/validation/assembling, 
and deliver a Beam SDK style API that can express simple TABLE_FILTER queries 
up to complex queries containing JOIN/GROUP_BY etc.</p>
 
-<p><a 
href="https://github.com/apache/beam/blob/DSL_SQL/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlExample.java";>BeamSqlExample</a>
 in the code repository shows basic usage of both APIs.</p>
+<p><a 
href="https://github.com/apache/beam/blob/master/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlExample.java";>BeamSqlExample</a>
 in the code repository shows basic usage of both APIs.</p>
 
 <h2 id="functionality">3. Functionality in Beam SQL</h2>
 <p>Just as the unified model for both bounded and unbounded data in Beam, SQL 
DSL provides the same functionalities for bounded and unbounded <code 
class="highlighter-rouge">PCollection</code> as well. Here’s the supported SQL 
grammar supported in <a 
href="http://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form";>BNF</a>-like form. 
An <code class="highlighter-rouge">UnsupportedOperationException</code> is 
thrown for unsupported features.</p>

-- 
To stop receiving notification emails like this one, please contact
"commits@beam.apache.org" <commits@beam.apache.org>.

Reply via email to