This is an automated email from the ASF dual-hosted git repository. mergebot-role pushed a commit to branch mergebot in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit d3e95bd946bfc9790ff9b362097d0e2fee80962c Author: melissa <[email protected]> AuthorDate: Tue Dec 12 16:30:32 2017 -0800 Fix broken SQL branch links --- src/contribute/work-in-progress.md | 1 - src/documentation/dsls/sql.md | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/contribute/work-in-progress.md b/src/contribute/work-in-progress.md index da8bda5..c7ab539 100644 --- a/src/contribute/work-in-progress.md +++ b/src/contribute/work-in-progress.md @@ -29,6 +29,5 @@ Current branches include: | [JStorm Runner]({{ site.baseurl }}/documentation/runners/jstorm) | [jstorm-runner](https://github.com/apache/beam/tree/jstorm-runner) | [runner-jstorm](https://issues.apache.org/jira/browse/BEAM/component/12332477) | [BEAM-1899](https://issues.apache.org/jira/browse/BEAM-1899) | | MapReduce Runner | [mr-runner](https://github.com/apache/beam/tree/mr-runner) | [runner-mapreduce](https://issues.apache.org/jira/browse/BEAM/component/12333013) | [BEAM-165](https://issues.apache.org/jira/browse/BEAM-165) | | Tez Runner | [tez-runner](https://github.com/apache/beam/tree/tez-runner) | [runner-tez](https://issues.apache.org/jira/browse/BEAM/component/12333014) | [BEAM-2709](https://issues.apache.org/jira/browse/BEAM-2709) | -| Beam SQL DSL | [DSL_SQL](https://github.com/apache/beam/tree/DSL_SQL) | [dsl-sql](https://issues.apache.org/jira/browse/BEAM/component/12332480) | [BEAM-301](https://issues.apache.org/jira/browse/BEAM-301) | | Go SDK | [go-sdk](https://github.com/apache/beam/tree/go-sdk) | [sdk-go](https://issues.apache.org/jira/browse/BEAM/component/12333564) | [BEAM-2083](https://issues.apache.org/jira/browse/BEAM-2083) | {:.table} diff --git a/src/documentation/dsls/sql.md b/src/documentation/dsls/sql.md index 6fd26a0..2f6fafc 100644 --- a/src/documentation/dsls/sql.md +++ b/src/documentation/dsls/sql.md @@ -12,8 +12,6 @@ permalink: /documentation/dsls/sql/ This page describes the implementation of Beam SQL, and how to simplify a Beam pipeline with DSL APIs. -> Note: Beam SQL hasn't been merged to master branch yet (being developed with branch [DSL_SQL](https://github.com/apache/beam/tree/DSL_SQL)), but is coming soon. - ## 1. Overview {#overview} SQL is a well-adopted standard to process data with concise syntax. With DSL APIs (currently available only in Java), now `PCollection`s can be queried with standard SQL statements, like a regular table. The DSL APIs leverage [Apache Calcite](http://calcite.apache.org/) to parse and optimize SQL queries, then translate into a composite Beam `PTransform`. In this way, both SQL and normal Beam `PTransform`s can be mixed in the same pipeline. @@ -108,7 +106,7 @@ Once you have a `PCollection<BeamRecord>` in hand, you may use the `BeamSql` API 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. -[BeamSqlExample](https://github.com/apache/beam/blob/DSL_SQL/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlExample.java) in the code repository shows basic usage of both APIs. +[BeamSqlExample](https://github.com/apache/beam/blob/master/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlExample.java) in the code repository shows basic usage of both APIs. ## 3. Functionality in Beam SQL {#functionality} Just as the unified model for both bounded and unbounded data in Beam, SQL DSL provides the same functionalities for bounded and unbounded `PCollection` as well. Here's the supported SQL grammar supported in [BNF](http://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form)-like form. An `UnsupportedOperationException` is thrown for unsupported features. -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
