You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by gi...@apache.org on 2019/05/20 21:20:19 UTC

[beam] branch asf-site updated: Publishing website 2019/05/20 21:20:08 at commit 7a65876

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

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


The following commit(s) were added to refs/heads/asf-site by this push:
     new bff452b  Publishing website 2019/05/20 21:20:08 at commit 7a65876
bff452b is described below

commit bff452bece17d4eead1d6d3f10c0bd34eaa21854
Author: jenkins <bu...@apache.org>
AuthorDate: Mon May 20 21:20:08 2019 +0000

    Publishing website 2019/05/20 21:20:08 at commit 7a65876
---
 .../dsls/sql/aggregate-functions/index.html        |  371 +-----
 .../{ => calcite}/aggregate-functions/index.html   |   43 +-
 .../dsls/sql/{ => calcite}/data-types/index.html   |   40 +-
 .../dsls/sql/{ => calcite}/lexical/index.html      |   40 +-
 .../dsls/sql/{ => calcite}/overview/index.html     |  116 +-
 .../{select => calcite/query-syntax}/index.html    |   55 +-
 .../sql/{ => calcite}/scalar-functions/index.html  |   43 +-
 .../dsls/sql/create-external-table/index.html      |  814 +-----------
 .../documentation/dsls/sql/create-table/index.html |    8 +-
 .../documentation/dsls/sql/data-types/index.html   |  417 +-----
 .../create-external-table/index.html               |   45 +-
 .../dsls/sql/{ => extensions}/joins/index.html     |   45 +-
 .../dsls/sql/{ => extensions}/set/index.html       |   43 +-
 .../user-defined-functions/index.html              |   56 +-
 .../windowing-and-triggering/index.html            |   37 +-
 .../documentation/dsls/sql/lexical/index.html      | 1385 +-------------------
 .../documentation/dsls/sql/overview/index.html     |   67 +-
 .../dsls/sql/scalar-functions/index.html           |  708 +---------
 .../documentation/dsls/sql/set/index.html          |  380 +-----
 .../documentation/dsls/sql/shell/index.html        |   31 +-
 .../dsls/sql/statements/create-table/index.html    |    8 +-
 .../documentation/dsls/sql/select}/index.html      |    8 +-
 .../dsls/sql/user-defined-functions/index.html     |  443 +------
 .../documentation/dsls/sql/walkthrough/index.html  |   29 +-
 .../dsls/sql/windowing-and-triggering/index.html   |  388 +-----
 .../sdks/feature-comparison/index.html             |   29 +-
 .../documentation/sdks/go/index.html               |   29 +-
 .../sdks/java-dependencies/index.html              |   29 +-
 .../documentation/sdks/java-extensions/index.html  |   29 +-
 .../documentation/sdks/java-thirdparty/index.html  |   29 +-
 .../documentation/sdks/java/euphoria/index.html    |   29 +-
 .../documentation/sdks/java/index.html             |   29 +-
 .../sdks/java/testing/nexmark/index.html           |   29 +-
 .../sdks/python-dependencies/index.html            |   29 +-
 .../sdks/python-pipeline-dependencies/index.html   |   29 +-
 .../documentation/sdks/python-streaming/index.html |   29 +-
 .../sdks/python-type-safety/index.html             |   29 +-
 .../documentation/sdks/python/index.html           |   29 +-
 38 files changed, 733 insertions(+), 5264 deletions(-)

diff --git a/website/generated-content/documentation/dsls/sql/aggregate-functions/index.html b/website/generated-content/documentation/dsls/sql/aggregate-functions/index.html
index 2f45c76..b24ab87 100644
--- a/website/generated-content/documentation/dsls/sql/aggregate-functions/index.html
+++ b/website/generated-content/documentation/dsls/sql/aggregate-functions/index.html
@@ -1,365 +1,10 @@
 <!DOCTYPE html>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<html lang="en">
-  <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Aggregate functions</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
-">
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
-  <link rel="stylesheet" href="/css/site.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script src="/js/language-switch.js"></script>
-  <script src="/js/fix-menu.js"></script>
-  <script src="/js/section-nav.js"></script>
-  <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/aggregate-functions/" data-proofer-ignore>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-73650088-1', 'auto');
-    ga('send', 'pageview');
-  </script>
-</head>
-
-  <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<nav class="header navbar navbar-fixed-top">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-    </div>
-
-    <div class="navbar-mask closed"></div>
-
-    <div id="navbar" class="navbar-container closed">
-      <ul class="nav navbar-nav">
-        <li>
-          <a href="/get-started/beam-overview/">Get Started</a>
-        </li>
-        <li>
-          <a href="/documentation/">Documentation</a>
-        </li>
-        <li>
-          <a href="/documentation/sdks/java/">Languages</a>
-        </li>
-        <li>
-          <a href="/documentation/runners/capability-matrix/">RUNNERS</a>
-        </li>
-        <li>
-          <a href="/roadmap/">Roadmap</a>
-        </li>
-        <li>
-          <a href="/contribute/">Contribute</a>
-        </li>
-        <li>
-          <a href="/community/contact-us/">Community</a>
-        </li>
-        <li><a href="/blog">Blog</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather_small.png" alt="Apache Logo" style="height:20px;"><span class="caret"></span></a>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="http://www.apache.org/">ASF Homepage</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</a></li>
-            <li><a href="http://www.apache.org/security/">Security</a></li>
-            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-            <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
-          </ul>
-        </li>
-        <li>
-          <!--
-            data-proofer-ignore disables link checking from website test automation.
-            GitHub links will not resolve until the markdown source is available on the master branch.
-            New pages would fail validation during development / PR test automation.
-          -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/aggregate-functions.md" data-proofer-ignore>
-            <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
-          </a>
-        </li>
-      </ul>
-    </div>
-</nav>
-
-    <div class="clearfix container-main-content">
-      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
-        <span class="section-nav-back glyphicon glyphicon-menu-left"></span>
-        <nav>
-          <ul class="section-nav-list" data-section-nav>
-            <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<li><span class="section-nav-list-main-title">Languages</span></li>
-
-<li>
-  <span class="section-nav-list-title">Java</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/java/">Java SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/" target="_blank">Java SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/java-dependencies/">Java SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/java-extensions/">Java SDK extensions</a></li>
-    <li><a href="/documentation/sdks/java-thirdparty/">Java 3rd party extensions</a></li>
-    <li><a href="/documentation/sdks/java/testing/nexmark/">Nexmark benchmark suite</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Python</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/python/">Python SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/pydoc/2.12.0/" target="_blank">Python SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/python-dependencies/">Python SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/python-streaming/">Python streaming pipelines</a></li>
-    <li><a href="/documentation/sdks/python-type-safety/">Ensuring Python type safety</a></li>
-    <li><a href="/documentation/sdks/python-pipeline-dependencies/">Managing pipeline dependencies</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Go</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/go/">Go SDK overview</a></li>
-    <li><a href="https://godoc.org/github.com/apache/beam/sdks/go/pkg/beam" target="_blank">Go SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">SQL</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/dsls/sql/overview/">Overview</a></li>
-    <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
-    <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
-    <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
-
-      <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
-      </ul>
-    </li>
-  </ul>
-</li>
-
-          </ul>
-        </nav>
-      </div>
-
-      <nav class="page-nav clearfix" data-offset-top="90" data-offset-bottom="500">
-        <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-
-
-
-
-      </nav>
-
-      <div class="body__contained body__section-nav">
-        <!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<h1 id="beam-sql-aggregate-functions">Beam SQL: Aggregate functions</h1>
-
-<p>Beam SQL has implemented the following built-in functions See also <a href="http://calcite.apache.org/docs/reference.html#operators-and-functions">Calcite
-SQL’s operators and functions
-reference</a></p>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Operator syntax</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>COUNT(*)</td>
-      <td>Returns the number of input rows</td>
-    </tr>
-    <tr>
-      <td>AVG(numeric)</td>
-      <td>Returns the average (arithmetic mean) of numeric across all input values</td>
-    </tr>
-    <tr>
-      <td>SUM(numeric)</td>
-      <td>Returns the sum of numeric across all input values</td>
-    </tr>
-    <tr>
-      <td>MAX(value)</td>
-      <td>Returns the maximum value of value across all input values</td>
-    </tr>
-    <tr>
-      <td>MIN(value)</td>
-      <td>Returns the minimum value of value across all input values</td>
-    </tr>
-  </tbody>
-</table>
-
-      </div>
-    </div>
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<footer class="footer">
-  <div class="footer__contained">
-    <div class="footer__cols">
-      <div class="footer__cols__col">
-        <div class="footer__cols__col__logo">
-          <img src="/images/beam_logo_circle.svg" class="footer__logo" alt="Beam logo">
-        </div>
-        <div class="footer__cols__col__logo">
-          <img src="/images/apache_logo_circle.svg" class="footer__logo" alt="Apache logo">
-        </div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Start</div>
-        <div class="footer__cols__col__link"><a href="/get-started/beam-overview/">Overview</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-java/">Quickstart (Java)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-py/">Quickstart (Python)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-go/">Quickstart (Go)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/downloads/">Downloads</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Docs</div>
-        <div class="footer__cols__col__link"><a href="/documentation/programming-guide/">Concepts</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/pipelines/design-your-pipeline/">Pipelines</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/runners/capability-matrix/">Runners</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Community</div>
-        <div class="footer__cols__col__link"><a href="/contribute/">Contribute</a></div>
-        <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam" target="_blank">Team<img src="/images/external-link-icon.png"
-                                                                                                                                width="14" height="14"
-                                                                                                                                alt="External link."></a></div>
-        <div class="footer__cols__col__link"><a href="/contribute/presentation-materials/">Media</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Resources</div>
-        <div class="footer__cols__col__link"><a href="/blog/">Blog</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/support/">Support</a></div>
-        <div class="footer__cols__col__link"><a href="https://github.com/apache/beam">GitHub</a></div>
-      </div>
-    </div>
-  </div>
-  <div class="footer__bottom">
-    &copy;
-    <a href="http://www.apache.org">The Apache Software Foundation</a>
-    | <a href="/privacy_policy">Privacy Policy</a>
-    | <a href="/feed.xml">RSS Feed</a>
-    <br><br>
-    Apache Beam, Apache, Beam, the Beam logo, and the Apache feather logo are
-    either registered trademarks or trademarks of The Apache Software
-    Foundation. All other products or name brands are trademarks of their
-    respective holders, including The Apache Software Foundation.
-  </div>
-</footer>
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/aggregate-functions/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/calcite/aggregate-functions/">
+<h1>Redirecting…</h1>
+<a href="https://beam.apache.org/documentation/dsls/sql/calcite/aggregate-functions/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/calcite/aggregate-functions/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/aggregate-functions/index.html b/website/generated-content/documentation/dsls/sql/calcite/aggregate-functions/index.html
similarity index 90%
copy from website/generated-content/documentation/dsls/sql/aggregate-functions/index.html
copy to website/generated-content/documentation/dsls/sql/calcite/aggregate-functions/index.html
index 2f45c76..6a82249 100644
--- a/website/generated-content/documentation/dsls/sql/aggregate-functions/index.html
+++ b/website/generated-content/documentation/dsls/sql/calcite/aggregate-functions/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Aggregate functions</title>
+  <title>Beam SQL aggregate functions for Calcite</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/aggregate-functions/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/aggregate-functions/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/aggregate-functions.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/calcite/aggregate-functions.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -256,11 +263,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="beam-sql-aggregate-functions">Beam SQL: Aggregate functions</h1>
+<h1 id="beam-sql-aggregate-functions-calcite">Beam SQL aggregate functions (Calcite)</h1>
+
+<p>This page documents built-in functions supported by Beam SQL when using Apache Calcite.</p>
 
-<p>Beam SQL has implemented the following built-in functions See also <a href="http://calcite.apache.org/docs/reference.html#operators-and-functions">Calcite
+<p>See also <a href="http://calcite.apache.org/docs/reference.html#operators-and-functions">Calcite
 SQL’s operators and functions
-reference</a></p>
+reference</a>.</p>
 
 <table class="table">
   <thead>
diff --git a/website/generated-content/documentation/dsls/sql/data-types/index.html b/website/generated-content/documentation/dsls/sql/calcite/data-types/index.html
similarity index 91%
copy from website/generated-content/documentation/dsls/sql/data-types/index.html
copy to website/generated-content/documentation/dsls/sql/calcite/data-types/index.html
index 945d48a..a00c4b9 100644
--- a/website/generated-content/documentation/dsls/sql/data-types/index.html
+++ b/website/generated-content/documentation/dsls/sql/calcite/data-types/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Data Types</title>
+  <title>Beam SQL data types for Calcite</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/data-types/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/data-types/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/data-types.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/calcite/data-types.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -256,10 +263,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="beam-sql-data-types">Beam SQL Data Types</h1>
+<h1 id="beam-sql-data-types-calcite">Beam SQL data types (Calcite)</h1>
 
 <p>Beam SQL supports standard SQL scalar data types as well as extensions
-including arrays, maps, and nested rows.</p>
+including arrays, maps, and nested rows. This page documents supported
+data types in Beam SQL when using Apache Calcite.</p>
 
 <p>In Beam Java, these types are mapped to Java types large enough to hold the
 full range of values.</p>
diff --git a/website/generated-content/documentation/dsls/sql/lexical/index.html b/website/generated-content/documentation/dsls/sql/calcite/lexical/index.html
similarity index 95%
copy from website/generated-content/documentation/dsls/sql/lexical/index.html
copy to website/generated-content/documentation/dsls/sql/calcite/lexical/index.html
index 5f2611d..8fea939 100644
--- a/website/generated-content/documentation/dsls/sql/lexical/index.html
+++ b/website/generated-content/documentation/dsls/sql/calcite/lexical/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Lexical Structure</title>
+  <title>Beam SQL lexical structure for Calcite</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/lexical/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/lexical/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/lexical-structure.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/calcite/lexical-structure.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -280,12 +287,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="beam-sql-lexical-structure">Beam SQL Lexical Structure</h1>
+<h1 id="beam-sql-lexical-structure-calcite">Beam SQL lexical structure (Calcite)</h1>
 
 <p>A Beam SQL statement comprises a series of tokens. Tokens include
 <em>identifiers,</em> <em>quoted identifiers, literals</em>, <em>keywords</em>, <em>operators</em>,
 and <em>special characters</em>. Tokens can be separated by whitespace (space,
-backspace, tab, newline) or comments.</p>
+backspace, tab, newline) or comments. This page documents Beam SQL’s
+lexical structure when using Apache Calcite.</p>
 
 <h2 id="identifiers">Identifiers</h2>
 
diff --git a/website/generated-content/documentation/dsls/sql/overview/index.html b/website/generated-content/documentation/dsls/sql/calcite/overview/index.html
similarity index 66%
copy from website/generated-content/documentation/dsls/sql/overview/index.html
copy to website/generated-content/documentation/dsls/sql/calcite/overview/index.html
index b2fee47..993eaa2 100644
--- a/website/generated-content/documentation/dsls/sql/overview/index.html
+++ b/website/generated-content/documentation/dsls/sql/calcite/overview/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Overview</title>
+  <title>Beam SQL in Calcite: Overview</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/overview/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/overview/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/overview.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/calcite/overview.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -237,6 +244,12 @@
 
 
 
+<ul class="nav">
+  <li><a href="#query-syntax">Query syntax</a></li>
+  <li><a href="#lexical-structure">Lexical structure</a></li>
+  <li><a href="#data-types">Data types</a></li>
+  <li><a href="#functions-and-operators">Functions and operators</a></li>
+</ul>
 
 
       </nav>
@@ -255,31 +268,62 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
+<h1 id="calcite-support-overview">Calcite support overview</h1>
 
-<h1 id="beam-sql-overview">Beam SQL: Overview</h1>
-
-<p>Beam SQL allows a Beam user (currently only available in Beam Java) to query
-bounded and unbounded <code class="highlighter-rouge">PCollections</code> with SQL statements. Your SQL query
-is translated to a <code class="highlighter-rouge">PTransform</code>, an encapsulated segment of a Beam pipeline.
-You can freely mix SQL <code class="highlighter-rouge">PTransforms</code> and other <code class="highlighter-rouge">PTransforms</code> in your pipeline.</p>
-
-<p>There are three main things you will need to know to use SQL in your pipeline:</p>
-
-<ul>
-  <li><a href="http://calcite.apache.org">Apache Calcite</a>: a widespread SQL dialect used in
+<p><a href="http://calcite.apache.org">Apache Calcite</a> is a widespread SQL dialect used in
 big data processing with some streaming enhancements. Calcite provides the
-basic dialect underlying Beam SQL. We have added additional extensions to
-make it easy to leverage Beam’s unified batch/streaming model and support
-for complex data types.</li>
-  <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/index.html?org/apache/beam/sdk/extensions/sql/SqlTransform.html">SqlTransform</a>: 
-the interface for creating <code class="highlighter-rouge">PTransforms</code> from SQL queries.</li>
-  <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/index.html?org/apache/beam/sdk/values/Row.html">Row</a>:
-the type of elements that Beam SQL operates on. A <code class="highlighter-rouge">PCollection&lt;Row&gt;</code> plays the role of a table.</li>
-</ul>
-
-<p>The <a href="/documentation/dsls/sql/walkthrough">SQL pipeline walkthrough</a> works through how you use
-these.</p>
+basic dialect underlying Beam SQL.</p>
 
+<p>We have added additional extensions to
+make it easy to leverage Beam’s unified batch/streaming model and support
+for complex data types.</p>
+
+<h2 id="query-syntax">Query syntax</h2>
+<p>Query statements scan one or more tables or expressions and return the computed result rows.
+The <a href="/documentation/dsls/sql/calcite/query-syntax">Query syntax</a> page describes Beam SQL’s syntax for queries when using Apache Calcite.</p>
+
+<h2 id="lexical-structure">Lexical structure</h2>
+<p>A Beam SQL statement comprises a series of tokens. 
+The <a href="/documentation/dsls/sql/calcite/lexical">Lexical structure</a> page documents Beam SQL’s lexical structure when using Apache Calcite.</p>
+
+<h2 id="data-types">Data types</h2>
+<p>Beam SQL supports standard SQL scalar data types as well as extensions including arrays, maps, and nested rows.
+Read about supported <a href="/documentation/dsls/sql/calcite/data-types">data types</a> in Beam SQL when using Apache Calcite.</p>
+
+<h2 id="functions-and-operators">Functions and operators</h2>
+<p>The following table summarizes Apache Calcite operators and functions supported by Beam SQL.</p>
+
+<table class="table-bordered table-striped">
+  <tr><th>Operators and functions</th><th>Beam SQL support status</th></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#operator-precedence">Operator precedence</a></td><td>Yes</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#comparison-operators">Comparison operators</a></td><td class="style1">See Beam SQL <a href="/documentation/dsls/sql/calcite/scalar-functions/#comparison-functions-and-operators">scalar functions</a></td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#logical-operators">Logical operators</a></td><td>See Beam SQL <a href="/documentation/dsls/sql/calcite/scalar-functions/#logical-functions-and-operators">scalar functions</a></td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#arithmetic-operators-and-functions">Arithmetic operators and functions</a></td><td>See Beam SQL <a href="/documentation/dsls/sql/calcite/scalar-functions/#arithmetic-expressions">scalar functions</a></td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#character-string-operators-and-functions">Character string operators and functions</a></td><td>See Beam SQL <a href="/documentation/dsls/sql/calcite/scalar-functions/#string-functions">scalar functions</a></td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#binary-string-operators-and-functions">Binary string operators and functions</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#datetime-functions">Date/time functions</a></td><td>See Beam SQL <a href="/documentation/dsls/sql/calcite/scalar-functions/#date-functions">scalar functions</a></td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#system-functions">System functions</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#conditional-functions-and-operators">Conditional functions and operators</a></td><td>See Beam SQL <a href="/documentation/dsls/sql/calcite/scalar-functions/#conditional-functions">scalar functions</a></td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#type-conversion">Type conversion</a></td><td>Yes</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#value-constructors">Value constructors</a></td><td>No, except array</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#collection-functions">Collection functions</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#period-predicates">Period predicates</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#jdbc-function-escape">JDBC function escape</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#aggregate-functions">Aggregate functions</a></td>
+<td>See Beam SQL extension <a href="/documentation/dsls/sql/calcite/aggregate-functions/">aggregate functions</a></td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#window-functions">Window functions</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#grouping-functions">Grouping functions</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#grouped-window-functions">Grouped window functions</a></td><td>See Beam SQL extension <a href="/documentation/dsls/sql/windowing-and-triggering/">windowing and triggering</a></td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#grouped-auxiliary-functions">Grouped auxiliary functions</a></td><td>Yes, except SESSION_END</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#spatial-functions">Spatial functions</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#geometry-creation-functions-3d">Geometry creation functions (3D)</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#geometry-predicates">Geometry predicates</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#json-functions">JSON functions</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#user-defined-functions">User-defined functions</a></td>
+<td>See Beam SQL extension <a href="/documentation/dsls/sql/user-defined-functions/">user-defined functions</a>. You cannot call functions with <a href="http://calcite.apache.org/docs/reference.html#calling-functions-with-named-and-optional-parameters">named and optional parameters</a>.</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#match_recognize">MATCH_RECOGNIZE</a></td><td>No</td></tr>
+<tr><td><a href="http://calcite.apache.org/docs/reference.html#ddl-extensions">DDL Extensions</a></td><td>See Beam SQL extension <a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></td></tr>
+</table>
 
       </div>
     </div>
diff --git a/website/generated-content/documentation/dsls/sql/select/index.html b/website/generated-content/documentation/dsls/sql/calcite/query-syntax/index.html
similarity index 96%
rename from website/generated-content/documentation/dsls/sql/select/index.html
rename to website/generated-content/documentation/dsls/sql/calcite/query-syntax/index.html
index 5b3ba48..eab1beb 100644
--- a/website/generated-content/documentation/dsls/sql/select/index.html
+++ b/website/generated-content/documentation/dsls/sql/calcite/query-syntax/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: SELECT Statement</title>
+  <title>Beam SQL query syntax for Calcite</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/select/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/query-syntax/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/select.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/calcite/query-syntax.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -325,23 +332,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="select">SELECT</h1>
+<h1 id="beam-sql-query-syntax-calcite">Beam SQL query syntax (Calcite)</h1>
 
-<p>The main functionality of Beam SQL is the <code class="highlighter-rouge">SELECT</code> statement. This is how you
-query and join data. The operations supported are a subset of
-<a href="http://calcite.apache.org/docs/reference.html#grammar">Apache Calcite SQL</a>.</p>
+<p>Query statements scan one or more tables or expressions and return the computed
+result rows. This page documents Beam SQL’s syntax for queries when using Apache Calcite.</p>
 
 <p>Generally, the semantics of queries is standard. Please see the following
 sections to learn about extensions for supporting Beam’s unified
 batch/streaming model:</p>
 
 <ul>
-  <li><a href="/documentation/dsls/sql/joins">Joins</a></li>
+  <li><a href="/documentation/dsls/sql/extensions/joins">Joins</a></li>
   <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing &amp; Triggering</a></li>
 </ul>
 
-<p>Query statements scan one or more tables or expressions and return the computed
-result rows. This topic describes the syntax for SQL queries in Beam.</p>
+<p>The main functionality of Beam SQL is the <code class="highlighter-rouge">SELECT</code> statement. This is how you
+query and join data. The operations supported are a subset of
+<a href="http://calcite.apache.org/docs/reference.html#grammar">Apache Calcite SQL</a>.</p>
 
 <h2 id="sql-syntax">SQL Syntax</h2>
 
@@ -525,7 +532,7 @@ SELECT * FROM beam.Roster;
 
 <h4 id="join">join</h4>
 
-<p>See <a href="#join-types">JOIN Types</a> below and <a href="/documentation/dsls/sql/joins">Joins</a>.</p>
+<p>See <a href="#join-types">JOIN Types</a> below and <a href="/documentation/dsls/sql/extensions/joins">Joins</a>.</p>
 
 <h4 id="select_1">select</h4>
 
@@ -594,7 +601,7 @@ FROM
 
 <h2 id="join-types">JOIN types</h2>
 
-<p>Also see <a href="/documentation/dsls/sql/joins">Joins</a>.</p>
+<p>Also see <a href="/documentation/dsls/sql/extensions/joins">Joins</a>.</p>
 
 <h3 id="syntax_1">Syntax</h3>
 
@@ -648,7 +655,7 @@ if there’s non-global window applied.</p>
 row in the other <code class="highlighter-rouge">from_item</code>, the row will return with NULLs for all columns
 from the other <code class="highlighter-rouge">from_item</code>.</p>
 
-<p>Also see <a href="/documentation/dsls/sql/joins">Joins</a>.</p>
+<p>Also see <a href="/documentation/dsls/sql/extensions/joins">Joins</a>.</p>
 
 <h3 id="left-outer-join">LEFT [OUTER] JOIN</h3>
 
diff --git a/website/generated-content/documentation/dsls/sql/scalar-functions/index.html b/website/generated-content/documentation/dsls/sql/calcite/scalar-functions/index.html
similarity index 93%
copy from website/generated-content/documentation/dsls/sql/scalar-functions/index.html
copy to website/generated-content/documentation/dsls/sql/calcite/scalar-functions/index.html
index dc32597..c8b6289 100644
--- a/website/generated-content/documentation/dsls/sql/scalar-functions/index.html
+++ b/website/generated-content/documentation/dsls/sql/calcite/scalar-functions/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Scalar functions</title>
+  <title>Beam SQL scalar functions in Calcite</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/scalar-functions/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/scalar-functions/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/scalar-functions.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/calcite/scalar-functions.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -265,11 +272,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="beam-sql-scalar-functions">Beam SQL: Scalar functions</h1>
+<h1 id="beam-sql-scalar-functions-calcite">Beam SQL scalar functions (Calcite)</h1>
+
+<p>This page documents built-in functions supported by Beam SQL when using Apache Calcite.</p>
 
-<p>Beam SQL has implemented the following built-in functions See also <a href="http://calcite.apache.org/docs/reference.html#operators-and-functions">Calcite
+<p>See also <a href="http://calcite.apache.org/docs/reference.html#operators-and-functions">Calcite
 SQL’s operators and functions
-reference</a></p>
+reference</a>.</p>
 
 <h2 id="comparison-functions-and-operators">Comparison functions and operators</h2>
 
diff --git a/website/generated-content/documentation/dsls/sql/create-external-table/index.html b/website/generated-content/documentation/dsls/sql/create-external-table/index.html
index 8bc5a6e..690eeb3 100644
--- a/website/generated-content/documentation/dsls/sql/create-external-table/index.html
+++ b/website/generated-content/documentation/dsls/sql/create-external-table/index.html
@@ -1,808 +1,10 @@
 <!DOCTYPE html>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<html lang="en">
-  <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: CREATE EXTERNAL TABLE Statement</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
-">
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
-  <link rel="stylesheet" href="/css/site.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script src="/js/language-switch.js"></script>
-  <script src="/js/fix-menu.js"></script>
-  <script src="/js/section-nav.js"></script>
-  <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/create-external-table/" data-proofer-ignore>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-73650088-1', 'auto');
-    ga('send', 'pageview');
-  </script>
-</head>
-
-  <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<nav class="header navbar navbar-fixed-top">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-    </div>
-
-    <div class="navbar-mask closed"></div>
-
-    <div id="navbar" class="navbar-container closed">
-      <ul class="nav navbar-nav">
-        <li>
-          <a href="/get-started/beam-overview/">Get Started</a>
-        </li>
-        <li>
-          <a href="/documentation/">Documentation</a>
-        </li>
-        <li>
-          <a href="/documentation/sdks/java/">Languages</a>
-        </li>
-        <li>
-          <a href="/documentation/runners/capability-matrix/">RUNNERS</a>
-        </li>
-        <li>
-          <a href="/roadmap/">Roadmap</a>
-        </li>
-        <li>
-          <a href="/contribute/">Contribute</a>
-        </li>
-        <li>
-          <a href="/community/contact-us/">Community</a>
-        </li>
-        <li><a href="/blog">Blog</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather_small.png" alt="Apache Logo" style="height:20px;"><span class="caret"></span></a>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="http://www.apache.org/">ASF Homepage</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</a></li>
-            <li><a href="http://www.apache.org/security/">Security</a></li>
-            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-            <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
-          </ul>
-        </li>
-        <li>
-          <!--
-            data-proofer-ignore disables link checking from website test automation.
-            GitHub links will not resolve until the markdown source is available on the master branch.
-            New pages would fail validation during development / PR test automation.
-          -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/create-external-table.md" data-proofer-ignore>
-            <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
-          </a>
-        </li>
-      </ul>
-    </div>
-</nav>
-
-    <div class="clearfix container-main-content">
-      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
-        <span class="section-nav-back glyphicon glyphicon-menu-left"></span>
-        <nav>
-          <ul class="section-nav-list" data-section-nav>
-            <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<li><span class="section-nav-list-main-title">Languages</span></li>
-
-<li>
-  <span class="section-nav-list-title">Java</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/java/">Java SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/" target="_blank">Java SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/java-dependencies/">Java SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/java-extensions/">Java SDK extensions</a></li>
-    <li><a href="/documentation/sdks/java-thirdparty/">Java 3rd party extensions</a></li>
-    <li><a href="/documentation/sdks/java/testing/nexmark/">Nexmark benchmark suite</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Python</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/python/">Python SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/pydoc/2.12.0/" target="_blank">Python SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/python-dependencies/">Python SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/python-streaming/">Python streaming pipelines</a></li>
-    <li><a href="/documentation/sdks/python-type-safety/">Ensuring Python type safety</a></li>
-    <li><a href="/documentation/sdks/python-pipeline-dependencies/">Managing pipeline dependencies</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Go</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/go/">Go SDK overview</a></li>
-    <li><a href="https://godoc.org/github.com/apache/beam/sdks/go/pkg/beam" target="_blank">Go SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">SQL</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/dsls/sql/overview/">Overview</a></li>
-    <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
-    <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
-    <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
-
-      <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
-      </ul>
-    </li>
-  </ul>
-</li>
-
-          </ul>
-        </nav>
-      </div>
-
-      <nav class="page-nav clearfix" data-offset-top="90" data-offset-bottom="500">
-        <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-
-
-<ul class="nav">
-  <li><a href="#syntax">Syntax</a></li>
-  <li><a href="#bigquery">BigQuery</a>
-    <ul>
-      <li><a href="#syntax-1">Syntax</a></li>
-      <li><a href="#read-mode">Read Mode</a></li>
-      <li><a href="#write-mode">Write Mode</a></li>
-      <li><a href="#schema">Schema</a></li>
-      <li><a href="#example">Example</a></li>
-    </ul>
-  </li>
-  <li><a href="#pubsub">Pub/Sub</a>
-    <ul>
-      <li><a href="#syntax-2">Syntax</a></li>
-      <li><a href="#read-mode-1">Read Mode</a></li>
-      <li><a href="#write-mode-1">Write Mode</a></li>
-      <li><a href="#schema-1">Schema</a></li>
-      <li><a href="#supported-payload">Supported Payload</a></li>
-      <li><a href="#example-1">Example</a></li>
-    </ul>
-  </li>
-  <li><a href="#kafka">Kafka</a>
-    <ul>
-      <li><a href="#syntax-3">Syntax</a></li>
-      <li><a href="#read-mode-2">Read Mode</a></li>
-      <li><a href="#write-mode-2">Write Mode</a></li>
-      <li><a href="#supported-payload-1">Supported Payload</a></li>
-      <li><a href="#schema-2">Schema</a></li>
-    </ul>
-  </li>
-  <li><a href="#text">Text</a>
-    <ul>
-      <li><a href="#syntax-4">Syntax</a></li>
-      <li><a href="#read-mode-3">Read Mode</a></li>
-      <li><a href="#write-mode-3">Write Mode</a></li>
-      <li><a href="#supported-payload-2">Supported Payload</a></li>
-      <li><a href="#schema-3">Schema</a></li>
-      <li><a href="#example-2">Example</a></li>
-    </ul>
-  </li>
-</ul>
-
-
-      </nav>
-
-      <div class="body__contained body__section-nav">
-        <!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<h1 id="create-external-table">CREATE EXTERNAL TABLE</h1>
-
-<p>Beam SQL’s <code class="highlighter-rouge">CREATE EXTERNAL TABLE</code> statement registers a virtual table that maps to an
-<a href="/documentation/io/built-in/">external storage system</a>.
-For some storage systems, <code class="highlighter-rouge">CREATE EXTERNAL TABLE</code> does not create a physical table until
-a write occurs. After the physical table exists, you can access the table with
-the <code class="highlighter-rouge">SELECT</code>, <code class="highlighter-rouge">JOIN</code>, and <code class="highlighter-rouge">INSERT INTO</code> statements.</p>
-
-<p>The <code class="highlighter-rouge">CREATE EXTERNAL TABLE</code> statement includes a schema and extended clauses.</p>
-
-<h2 id="syntax">Syntax</h2>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>CREATE EXTERNAL TABLE [ IF NOT EXISTS ] tableName (tableElement [, tableElement ]*)
-TYPE type
-[LOCATION location]
-[TBLPROPERTIES tblProperties]
-
-simpleType: TINYINT | SMALLINT | INTEGER | BIGINT | FLOAT | DOUBLE | DECIMAL | BOOLEAN | DATE | TIME | TIMESTAMP | CHAR | VARCHAR
-
-fieldType: simpleType | MAP&lt;simpleType, fieldType&gt; | ARRAY&lt;fieldType&gt; | ROW&lt;tableElement [, tableElement ]*&gt;
-
-tableElement: columnName fieldType [ NOT NULL ]
-</code></pre>
-</div>
-
-<ul>
-  <li><code class="highlighter-rouge">IF NOT EXISTS</code>: Optional. If the table is already registered, Beam SQL
-ignores the statement instead of returning an error.</li>
-  <li><code class="highlighter-rouge">tableName</code>: The case sensitive name of the table to create and register,
-specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>.
-The table name does not need to match the name in the underlying data
-storage system.</li>
-  <li><code class="highlighter-rouge">tableElement</code>: <code class="highlighter-rouge">columnName</code> <code class="highlighter-rouge">fieldType</code> <code class="highlighter-rouge">[ NOT NULL ]</code>
-    <ul>
-      <li><code class="highlighter-rouge">columnName</code>: The case sensitive name of the column, specified as a
-backtick_quoted_expression.</li>
-      <li><code class="highlighter-rouge">fieldType</code>: The field’s type, specified as one of the following types:
-        <ul>
-          <li><code class="highlighter-rouge">simpleType</code>: <code class="highlighter-rouge">TINYINT</code>, <code class="highlighter-rouge">SMALLINT</code>, <code class="highlighter-rouge">INTEGER</code>, <code class="highlighter-rouge">BIGINT</code>, <code class="highlighter-rouge">FLOAT</code>,
-<code class="highlighter-rouge">DOUBLE</code>, <code class="highlighter-rouge">DECIMAL</code>, <code class="highlighter-rouge">BOOLEAN</code>, <code class="highlighter-rouge">DATE</code>, <code class="highlighter-rouge">TIME</code>, <code class="highlighter-rouge">TIMESTAMP</code>, <code class="highlighter-rouge">CHAR</code>,
-<code class="highlighter-rouge">VARCHAR</code></li>
-          <li><code class="highlighter-rouge">MAP&lt;simpleType, fieldType&gt;</code></li>
-          <li><code class="highlighter-rouge">ARRAY&lt;fieldType&gt;</code></li>
-          <li><code class="highlighter-rouge">ROW&lt;tableElement [, tableElement ]*&gt;</code></li>
-        </ul>
-      </li>
-      <li><code class="highlighter-rouge">NOT NULL</code>: Optional. Indicates that the column is not nullable.</li>
-    </ul>
-  </li>
-  <li><code class="highlighter-rouge">type</code>: The I/O transform that backs the virtual table, specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>
-with one of the following values:
-    <ul>
-      <li><code class="highlighter-rouge">bigquery</code></li>
-      <li><code class="highlighter-rouge">pubsub</code></li>
-      <li><code class="highlighter-rouge">kafka</code></li>
-      <li><code class="highlighter-rouge">text</code></li>
-    </ul>
-  </li>
-  <li><code class="highlighter-rouge">location</code>: The I/O specific location of the underlying table, specified as
-a <a href="/documentation/dsls/sql/lexical/#string-literals">String
-Literal</a>.
-See the I/O specific sections for <code class="highlighter-rouge">location</code> format requirements.</li>
-  <li><code class="highlighter-rouge">tblProperties</code>: The I/O specific quoted key value JSON object with extra
-configuration, specified as a <a href="/documentation/dsls/sql/lexical/#string-literals">String
-Literal</a>.
-See the I/O specific sections for <code class="highlighter-rouge">tblProperties</code> format requirements.</li>
-</ul>
-
-<h2 id="bigquery">BigQuery</h2>
-
-<h3 id="syntax-1">Syntax</h3>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>CREATE EXTERNAL TABLE [ IF NOT EXISTS ] tableName (tableElement [, tableElement ]*)
-TYPE bigquery
-LOCATION '[PROJECT_ID]:[DATASET].[TABLE]'
-</code></pre>
-</div>
-
-<ul>
-  <li><code class="highlighter-rouge">LOCATION:</code>Location of the table in the BigQuery CLI format.
-    <ul>
-      <li><code class="highlighter-rouge">PROJECT_ID</code>: ID of the Google Cloud Project</li>
-      <li><code class="highlighter-rouge">DATASET</code>: BigQuery Dataset ID</li>
-      <li><code class="highlighter-rouge">TABLE</code>: BigQuery Table ID within the Dataset</li>
-    </ul>
-  </li>
-</ul>
-
-<h3 id="read-mode">Read Mode</h3>
-
-<p>Beam SQL supports reading columns with simple types (<code class="highlighter-rouge">simpleType</code>) and arrays of simple
-types (<code class="highlighter-rouge">ARRAY&lt;simpleType&gt;</code>).</p>
-
-<h3 id="write-mode">Write Mode</h3>
-
-<p>if the table does not exist, Beam creates the table specified in location when
-the first record is written. If the table does exist, the specified columns must
-match the existing table.</p>
-
-<h3 id="schema">Schema</h3>
-
-<p>Schema-related errors will cause the pipeline to crash. The Map type is not
-supported. Beam SQL types map to <a href="https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types">BigQuery Standard SQL
-types</a>
-as follows:</p>
-
-<table>
-  <tr>
-   <td>Beam SQL Type
-   </td>
-   <td>BigQuery Standard SQL Type
-   </td>
-  </tr>
-  <tr>
-   <td>TINYINT, SMALLINT, INTEGER, BIGINT &nbsp;
-   </td>
-   <td>INT64
-   </td>
-  </tr>
-  <tr>
-   <td>FLOAT, DOUBLE, DECIMAL
-   </td>
-   <td>FLOAT64
-   </td>
-  </tr>
-  <tr>
-   <td>BOOLEAN
-   </td>
-   <td>BOOL
-   </td>
-  </tr>
-  <tr>
-   <td>DATE
-   </td>
-   <td>DATE
-   </td>
-  </tr>
-  <tr>
-   <td>TIME
-   </td>
-   <td>TIME
-   </td>
-  </tr>
-  <tr>
-   <td>TIMESTAMP
-   </td>
-   <td>TIMESTAMP
-   </td>
-  </tr>
-  <tr>
-   <td>CHAR, VARCHAR
-   </td>
-   <td>STRING
-   </td>
-  </tr>
-  <tr>
-   <td>MAP
-   </td>
-   <td>(not supported)
-   </td>
-  </tr>
-  <tr>
-   <td>ARRAY
-   </td>
-   <td>ARRAY
-   </td>
-  </tr>
-  <tr>
-   <td>ROW
-   </td>
-   <td>STRUCT
-   </td>
-  </tr>
-</table>
-
-<h3 id="example">Example</h3>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>CREATE EXTERNAL TABLE users (id INTEGER, username VARCHAR)
-TYPE bigquery
-LOCATION 'testing-integration:apache.users'
-</code></pre>
-</div>
-
-<h2 id="pubsub">Pub/Sub</h2>
-
-<h3 id="syntax-2">Syntax</h3>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>CREATE EXTERNAL TABLE [ IF NOT EXISTS ] tableName
-  (
-   event_timestamp TIMESTAMP,
-   attributes MAP&lt;VARCHAR, VARCHAR&gt;,
-   payload ROW&lt;tableElement [, tableElement ]*&gt;
-  )
-TYPE pubsub
-LOCATION 'projects/[PROJECT]/topics/[TOPIC]'
-TBLPROPERTIES '{"timestampAttributeKey": "key", "deadLetterQueue": "projects/[PROJECT]/topics/[TOPIC]"}'
-</code></pre>
-</div>
-
-<ul>
-  <li><code class="highlighter-rouge">event_timestamp</code>: The event timestamp associated with the Pub/Sub message
-by PubsubIO. It can be one of the following:
-    <ul>
-      <li>Message publish time, which is provided by Pub/Sub. This is the default
-value if no extra configuration is provided.</li>
-      <li>A timestamp specified in one of the user-provided message attributes.
-The attribute key is configured by the <code class="highlighter-rouge">timestampAttributeKey</code> field of
-the <code class="highlighter-rouge">tblProperties</code> blob. The value of the attribute should conform to
-the <a href="https://beam.apache.org/releases/javadoc/2.4.0/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.Read.html#withTimestampAttribute-java.lang.String-">requirements of
-PubsubIO</a>,
-which is either millis since Unix epoch or <a href="https://www.ietf.org/rfc/rfc3339.txt">RFC 339
-</a>date string.</li>
-    </ul>
-  </li>
-  <li><code class="highlighter-rouge">attributes</code>: The user-provided attributes map from the Pub/Sub message;</li>
-  <li><code class="highlighter-rouge">payload</code>: The schema of the JSON payload of the Pub/Sub message. No other
-payload formats are currently supported by Beam SQL. If a record can’t be
-unmarshalled, the record is written to the topic specified in the
-<code class="highlighter-rouge">deadLeaderQueue</code> field of the <code class="highlighter-rouge">tblProperties</code> blob. If no dead-letter queue
-is specified in this case, an exception is thrown and the pipeline will
-crash.</li>
-  <li><code class="highlighter-rouge">LOCATION</code>:
-    <ul>
-      <li><code class="highlighter-rouge">PROJECT</code>: ID of the Google Cloud Project</li>
-      <li><code class="highlighter-rouge">TOPIC</code>: The Pub/Sub topic name. A subscription will be created
-automatically, but the subscription is not cleaned up automatically.
-Specifying an existing subscription is not supported.</li>
-    </ul>
-  </li>
-  <li><code class="highlighter-rouge">TBLPROPERTIES</code>:
-    <ul>
-      <li><code class="highlighter-rouge">timestampAttributeKey</code>: Optional. The key which contains the event
-timestamp associated with the Pub/Sub message. If not specified, the
-message publish timestamp is used as an event timestamp for
-windowing/watermarking.</li>
-      <li><code class="highlighter-rouge">deadLetterQueue</code>: The topic into which messages are written if the
-payload was not parsed. If not specified, an exception is thrown for
-parsing failures.</li>
-    </ul>
-  </li>
-</ul>
-
-<h3 id="read-mode-1">Read Mode</h3>
-
-<p>PubsubIO is currently limited to read access only.</p>
-
-<h3 id="write-mode-1">Write Mode</h3>
-
-<p>Not supported. PubSubIO is currently limited to read access only in Beam SQL.</p>
-
-<h3 id="schema-1">Schema</h3>
-
-<p>Pub/Sub messages have metadata associated with them, and you can reference this
-metadata in your queries. For each message, Pub/Sub exposes its publish time and
-a map of user-provided attributes in addition to the payload (unstructured in
-the general case). This information must be preserved and accessible from the
-SQL statements. Currently, this means that PubsubIO tables require you to
-declare a special set of columns, as shown below.</p>
-
-<h3 id="supported-payload">Supported Payload</h3>
-
-<ul>
-  <li>JSON Objects
-    <ul>
-      <li>Beam only supports querying messages with payload containing JSON
-objects. Beam attempts to parse JSON to match the schema of the
-<code class="highlighter-rouge">payload</code> field.</li>
-    </ul>
-  </li>
-</ul>
-
-<h3 id="example-1">Example</h3>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>CREATE EXTERNAL TABLE locations (event_timestamp TIMESTAMP, attributes MAP&lt;VARCHAR, VARCHAR&gt;, payload ROW&lt;id INTEGER, location VARCHAR&gt;)
-TYPE pubsub
-LOCATION 'projects/testing-integration/topics/user-location'
-</code></pre>
-</div>
-
-<h2 id="kafka">Kafka</h2>
-
-<p>KafkaIO is experimental in Beam SQL.</p>
-
-<h3 id="syntax-3">Syntax</h3>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>CREATE EXTERNAL TABLE [ IF NOT EXISTS ] tableName (tableElement [, tableElement ]*)
-TYPE kafka
-LOCATION 'kafka://localhost:2181/brokers'
-TBLPROPERTIES '{"bootstrap.servers":"localhost:9092", "topics": ["topic1", "topic2"]}'
-</code></pre>
-</div>
-
-<ul>
-  <li><code class="highlighter-rouge">LOCATION</code>: The Kafka topic URL.</li>
-  <li><code class="highlighter-rouge">TBLPROPERTIES</code>:
-    <ul>
-      <li><code class="highlighter-rouge">bootstrap.servers</code>: Optional. Allows you to specify the bootstrap
-server.</li>
-      <li><code class="highlighter-rouge">topics</code>: Optional. Allows you to specify specific topics.</li>
-    </ul>
-  </li>
-</ul>
-
-<h3 id="read-mode-2">Read Mode</h3>
-
-<p>Read Mode supports reading from a topic.</p>
-
-<h3 id="write-mode-2">Write Mode</h3>
-
-<p>Write Mode supports writing to a topic.</p>
-
-<h3 id="supported-payload-1">Supported Payload</h3>
-
-<ul>
-  <li>CSV
-    <ul>
-      <li>Beam parses the messages, attempting to parse fields according to the
-types specified in the schema.</li>
-    </ul>
-  </li>
-</ul>
-
-<h3 id="schema-2">Schema</h3>
-
-<p>Only simple types are supported.</p>
-
-<h2 id="text">Text</h2>
-
-<p>TextIO is experimental in Beam SQL. Read Mode and Write Mode do not currently
-access the same underlying data.</p>
-
-<h3 id="syntax-4">Syntax</h3>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>CREATE EXTERNAL TABLE [ IF NOT EXISTS ] tableName (tableElement [, tableElement ]*)
-TYPE text
-LOCATION '/home/admin/orders'
-TBLPROPERTIES '{"format: "Excel"}'
-</code></pre>
-</div>
-
-<ul>
-  <li><code class="highlighter-rouge">LOCATION</code>: The path to the file for Read Mode. The prefix for Write Mode.</li>
-  <li><code class="highlighter-rouge">TBLPROPERTIES</code>:
-    <ul>
-      <li><code class="highlighter-rouge">format</code>: Optional. Allows you to specify the CSV Format, which controls
-the field delimeter, quote character, record separator, and other properties.
-See the following table:</li>
-    </ul>
-  </li>
-</ul>
-
-<table class="table-bordered">
-  <thead>
-    <tr>
-      <th>Value for <code class="highlighter-rouge">format</code></th>
-      <th>Field delimiter</th>
-      <th>Quote</th>
-      <th>Record separator</th>
-      <th>Ignore empty lines?</th>
-      <th>Allow missing column names?</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><code class="highlighter-rouge">default</code></td>
-      <td><code class="highlighter-rouge">,</code></td>
-      <td><code class="highlighter-rouge">"</code></td>
-      <td><code class="highlighter-rouge">\r\n</code></td>
-      <td>Yes</td>
-      <td>No</td>
-    </tr>
-    <tr>
-      <td><code class="highlighter-rouge">rfc4180</code></td>
-      <td><code class="highlighter-rouge">,</code></td>
-      <td><code class="highlighter-rouge">"</code></td>
-      <td><code class="highlighter-rouge">\r\n</code></td>
-      <td>No</td>
-      <td>No</td>
-    </tr>
-    <tr>
-      <td><code class="highlighter-rouge">excel</code></td>
-      <td><code class="highlighter-rouge">,</code></td>
-      <td><code class="highlighter-rouge">"</code></td>
-      <td><code class="highlighter-rouge">\r\n</code></td>
-      <td>No</td>
-      <td>Yes</td>
-    </tr>
-    <tr>
-      <td><code class="highlighter-rouge">tdf</code></td>
-      <td><code class="highlighter-rouge">\t</code></td>
-      <td><code class="highlighter-rouge">"</code></td>
-      <td><code class="highlighter-rouge">\r\n</code></td>
-      <td>Yes</td>
-      <td>No</td>
-    </tr>
-    <tr>
-      <td><code class="highlighter-rouge">mysql</code></td>
-      <td><code class="highlighter-rouge">\t</code></td>
-      <td>none</td>
-      <td><code class="highlighter-rouge">\n</code></td>
-      <td>No</td>
-      <td>No</td>
-    </tr>
-  </tbody>
-</table>
-
-<h3 id="read-mode-3">Read Mode</h3>
-
-<p>Read Mode supports reading from a file.</p>
-
-<h3 id="write-mode-3">Write Mode</h3>
-
-<p>Write Mode supports writing to a set of files. TextIO creates file on writes.</p>
-
-<h3 id="supported-payload-2">Supported Payload</h3>
-
-<ul>
-  <li>CSV
-    <ul>
-      <li>Beam parses the messages, attempting to parse fields according to the
-types specified in the schema using org.apache.commons.csv.</li>
-    </ul>
-  </li>
-</ul>
-
-<h3 id="schema-3">Schema</h3>
-
-<p>Only simple types are supported.</p>
-
-<h3 id="example-2">Example</h3>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>CREATE EXTERNAL TABLE orders (id INTEGER, price INTEGER)
-TYPE text
-LOCATION '/home/admin/orders'
-</code></pre>
-</div>
-
-      </div>
-    </div>
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<footer class="footer">
-  <div class="footer__contained">
-    <div class="footer__cols">
-      <div class="footer__cols__col">
-        <div class="footer__cols__col__logo">
-          <img src="/images/beam_logo_circle.svg" class="footer__logo" alt="Beam logo">
-        </div>
-        <div class="footer__cols__col__logo">
-          <img src="/images/apache_logo_circle.svg" class="footer__logo" alt="Apache logo">
-        </div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Start</div>
-        <div class="footer__cols__col__link"><a href="/get-started/beam-overview/">Overview</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-java/">Quickstart (Java)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-py/">Quickstart (Python)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-go/">Quickstart (Go)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/downloads/">Downloads</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Docs</div>
-        <div class="footer__cols__col__link"><a href="/documentation/programming-guide/">Concepts</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/pipelines/design-your-pipeline/">Pipelines</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/runners/capability-matrix/">Runners</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Community</div>
-        <div class="footer__cols__col__link"><a href="/contribute/">Contribute</a></div>
-        <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam" target="_blank">Team<img src="/images/external-link-icon.png"
-                                                                                                                                width="14" height="14"
-                                                                                                                                alt="External link."></a></div>
-        <div class="footer__cols__col__link"><a href="/contribute/presentation-materials/">Media</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Resources</div>
-        <div class="footer__cols__col__link"><a href="/blog/">Blog</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/support/">Support</a></div>
-        <div class="footer__cols__col__link"><a href="https://github.com/apache/beam">GitHub</a></div>
-      </div>
-    </div>
-  </div>
-  <div class="footer__bottom">
-    &copy;
-    <a href="http://www.apache.org">The Apache Software Foundation</a>
-    | <a href="/privacy_policy">Privacy Policy</a>
-    | <a href="/feed.xml">RSS Feed</a>
-    <br><br>
-    Apache Beam, Apache, Beam, the Beam logo, and the Apache feather logo are
-    either registered trademarks or trademarks of The Apache Software
-    Foundation. All other products or name brands are trademarks of their
-    respective holders, including The Apache Software Foundation.
-  </div>
-</footer>
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/">
+<h1>Redirecting…</h1>
+<a href="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/create-table/index.html b/website/generated-content/documentation/dsls/sql/create-table/index.html
index d1ba0da..690eeb3 100644
--- a/website/generated-content/documentation/dsls/sql/create-table/index.html
+++ b/website/generated-content/documentation/dsls/sql/create-table/index.html
@@ -2,9 +2,9 @@
 <html lang="en-US">
 <meta charset="utf-8">
 <title>Redirecting…</title>
-<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/create-external-table/">
-<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/create-external-table/">
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/">
 <h1>Redirecting…</h1>
-<a href="https://beam.apache.org/documentation/dsls/sql/create-external-table/">Click here if you are not redirected.</a>
-<script>location="https://beam.apache.org/documentation/dsls/sql/create-external-table/"</script>
+<a href="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/data-types/index.html b/website/generated-content/documentation/dsls/sql/data-types/index.html
index 945d48a..e76e977 100644
--- a/website/generated-content/documentation/dsls/sql/data-types/index.html
+++ b/website/generated-content/documentation/dsls/sql/data-types/index.html
@@ -1,411 +1,10 @@
 <!DOCTYPE html>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<html lang="en">
-  <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Data Types</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
-">
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
-  <link rel="stylesheet" href="/css/site.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script src="/js/language-switch.js"></script>
-  <script src="/js/fix-menu.js"></script>
-  <script src="/js/section-nav.js"></script>
-  <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/data-types/" data-proofer-ignore>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-73650088-1', 'auto');
-    ga('send', 'pageview');
-  </script>
-</head>
-
-  <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<nav class="header navbar navbar-fixed-top">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-    </div>
-
-    <div class="navbar-mask closed"></div>
-
-    <div id="navbar" class="navbar-container closed">
-      <ul class="nav navbar-nav">
-        <li>
-          <a href="/get-started/beam-overview/">Get Started</a>
-        </li>
-        <li>
-          <a href="/documentation/">Documentation</a>
-        </li>
-        <li>
-          <a href="/documentation/sdks/java/">Languages</a>
-        </li>
-        <li>
-          <a href="/documentation/runners/capability-matrix/">RUNNERS</a>
-        </li>
-        <li>
-          <a href="/roadmap/">Roadmap</a>
-        </li>
-        <li>
-          <a href="/contribute/">Contribute</a>
-        </li>
-        <li>
-          <a href="/community/contact-us/">Community</a>
-        </li>
-        <li><a href="/blog">Blog</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather_small.png" alt="Apache Logo" style="height:20px;"><span class="caret"></span></a>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="http://www.apache.org/">ASF Homepage</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</a></li>
-            <li><a href="http://www.apache.org/security/">Security</a></li>
-            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-            <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
-          </ul>
-        </li>
-        <li>
-          <!--
-            data-proofer-ignore disables link checking from website test automation.
-            GitHub links will not resolve until the markdown source is available on the master branch.
-            New pages would fail validation during development / PR test automation.
-          -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/data-types.md" data-proofer-ignore>
-            <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
-          </a>
-        </li>
-      </ul>
-    </div>
-</nav>
-
-    <div class="clearfix container-main-content">
-      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
-        <span class="section-nav-back glyphicon glyphicon-menu-left"></span>
-        <nav>
-          <ul class="section-nav-list" data-section-nav>
-            <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<li><span class="section-nav-list-main-title">Languages</span></li>
-
-<li>
-  <span class="section-nav-list-title">Java</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/java/">Java SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/" target="_blank">Java SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/java-dependencies/">Java SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/java-extensions/">Java SDK extensions</a></li>
-    <li><a href="/documentation/sdks/java-thirdparty/">Java 3rd party extensions</a></li>
-    <li><a href="/documentation/sdks/java/testing/nexmark/">Nexmark benchmark suite</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Python</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/python/">Python SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/pydoc/2.12.0/" target="_blank">Python SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/python-dependencies/">Python SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/python-streaming/">Python streaming pipelines</a></li>
-    <li><a href="/documentation/sdks/python-type-safety/">Ensuring Python type safety</a></li>
-    <li><a href="/documentation/sdks/python-pipeline-dependencies/">Managing pipeline dependencies</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Go</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/go/">Go SDK overview</a></li>
-    <li><a href="https://godoc.org/github.com/apache/beam/sdks/go/pkg/beam" target="_blank">Go SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">SQL</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/dsls/sql/overview/">Overview</a></li>
-    <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
-    <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
-    <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
-
-      <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
-      </ul>
-    </li>
-  </ul>
-</li>
-
-          </ul>
-        </nav>
-      </div>
-
-      <nav class="page-nav clearfix" data-offset-top="90" data-offset-bottom="500">
-        <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-
-
-
-
-      </nav>
-
-      <div class="body__contained body__section-nav">
-        <!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<h1 id="beam-sql-data-types">Beam SQL Data Types</h1>
-
-<p>Beam SQL supports standard SQL scalar data types as well as extensions
-including arrays, maps, and nested rows.</p>
-
-<p>In Beam Java, these types are mapped to Java types large enough to hold the
-full range of values.</p>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>SQL Type</th>
-      <th>Description</th>
-      <th>Java class</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>TINYINT</td>
-      <td>1 byte signed integer in range -128 to 127</td>
-      <td>java.lang.Byte</td>
-    </tr>
-    <tr>
-      <td>SMALLINT</td>
-      <td>2 byte signed integer in range -32768 to 32767</td>
-      <td>java.lang.Short</td>
-    </tr>
-    <tr>
-      <td>INTEGER</td>
-      <td>4 byte signed integer in range -2147483648 to 2147483647</td>
-      <td>java.lang.Integer</td>
-    </tr>
-    <tr>
-      <td>BIGINT</td>
-      <td>8 byte signed integer in range -9223372036854775808 to 9223372036854775807</td>
-      <td>java.lang.Long</td>
-    </tr>
-    <tr>
-      <td>FLOAT</td>
-      <td>4 byte floating point</td>
-      <td>java.lang.Float</td>
-    </tr>
-    <tr>
-      <td>DOUBLE</td>
-      <td>8 byte floating point</td>
-      <td>java.lang.Double</td>
-    </tr>
-    <tr>
-      <td>DECIMAL</td>
-      <td>Arbitrary precision decimal value</td>
-      <td>java.math.BigDecimal</td>
-    </tr>
-    <tr>
-      <td>VARCHAR</td>
-      <td>Arbitrary length string</td>
-      <td>java.lang.String</td>
-    </tr>
-    <tr>
-      <td>TIMESTAMP</td>
-      <td>Millisecond precision timestamp</td>
-      <td>org.joda.ReadableInstant</td>
-    </tr>
-    <tr>
-      <td>ARRAY<type></type></td>
-      <td>Ordered list of values</td>
-      <td>java.util.List</td>
-    </tr>
-    <tr>
-      <td>MAP&lt;type, type&gt;</td>
-      <td>Finite unordered map</td>
-      <td>java.util.Map</td>
-    </tr>
-    <tr>
-      <td>ROW<fields></fields></td>
-      <td>Nested row</td>
-      <td>org.apache.beam.sdk.values.Row</td>
-    </tr>
-  </tbody>
-</table>
-
-<p>See also the <a href="http://calcite.apache.org/docs/reference.html#data-types">documentation for Calcite SQL’s data
-types</a></p>
-
-      </div>
-    </div>
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<footer class="footer">
-  <div class="footer__contained">
-    <div class="footer__cols">
-      <div class="footer__cols__col">
-        <div class="footer__cols__col__logo">
-          <img src="/images/beam_logo_circle.svg" class="footer__logo" alt="Beam logo">
-        </div>
-        <div class="footer__cols__col__logo">
-          <img src="/images/apache_logo_circle.svg" class="footer__logo" alt="Apache logo">
-        </div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Start</div>
-        <div class="footer__cols__col__link"><a href="/get-started/beam-overview/">Overview</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-java/">Quickstart (Java)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-py/">Quickstart (Python)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-go/">Quickstart (Go)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/downloads/">Downloads</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Docs</div>
-        <div class="footer__cols__col__link"><a href="/documentation/programming-guide/">Concepts</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/pipelines/design-your-pipeline/">Pipelines</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/runners/capability-matrix/">Runners</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Community</div>
-        <div class="footer__cols__col__link"><a href="/contribute/">Contribute</a></div>
-        <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam" target="_blank">Team<img src="/images/external-link-icon.png"
-                                                                                                                                width="14" height="14"
-                                                                                                                                alt="External link."></a></div>
-        <div class="footer__cols__col__link"><a href="/contribute/presentation-materials/">Media</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Resources</div>
-        <div class="footer__cols__col__link"><a href="/blog/">Blog</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/support/">Support</a></div>
-        <div class="footer__cols__col__link"><a href="https://github.com/apache/beam">GitHub</a></div>
-      </div>
-    </div>
-  </div>
-  <div class="footer__bottom">
-    &copy;
-    <a href="http://www.apache.org">The Apache Software Foundation</a>
-    | <a href="/privacy_policy">Privacy Policy</a>
-    | <a href="/feed.xml">RSS Feed</a>
-    <br><br>
-    Apache Beam, Apache, Beam, the Beam logo, and the Apache feather logo are
-    either registered trademarks or trademarks of The Apache Software
-    Foundation. All other products or name brands are trademarks of their
-    respective holders, including The Apache Software Foundation.
-  </div>
-</footer>
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/data-types/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/calcite/data-types/">
+<h1>Redirecting…</h1>
+<a href="https://beam.apache.org/documentation/dsls/sql/calcite/data-types/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/calcite/data-types/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/create-external-table/index.html b/website/generated-content/documentation/dsls/sql/extensions/create-external-table/index.html
similarity index 94%
copy from website/generated-content/documentation/dsls/sql/create-external-table/index.html
copy to website/generated-content/documentation/dsls/sql/extensions/create-external-table/index.html
index 8bc5a6e..a6253b2 100644
--- a/website/generated-content/documentation/dsls/sql/create-external-table/index.html
+++ b/website/generated-content/documentation/dsls/sql/extensions/create-external-table/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: CREATE EXTERNAL TABLE Statement</title>
+  <title>Beam SQL extension: CREATE EXTERNAL TABLE Statement</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/create-external-table/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/create-external-table.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/extensions/create-external-table.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -297,7 +304,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="create-external-table">CREATE EXTERNAL TABLE</h1>
+<h1 id="beam-sql-extensions-create-external-table">Beam SQL extensions: CREATE EXTERNAL TABLE</h1>
 
 <p>Beam SQL’s <code class="highlighter-rouge">CREATE EXTERNAL TABLE</code> statement registers a virtual table that maps to an
 <a href="/documentation/io/built-in/">external storage system</a>.
@@ -327,7 +334,7 @@ tableElement: columnName fieldType [ NOT NULL ]
 ignores the statement instead of returning an error.</li>
   <li><code class="highlighter-rouge">tableName</code>: The case sensitive name of the table to create and register,
 specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>.
+<a href="/documentation/dsls/sql/calcite/lexical#identifiers">Identifier</a>.
 The table name does not need to match the name in the underlying data
 storage system.</li>
   <li><code class="highlighter-rouge">tableElement</code>: <code class="highlighter-rouge">columnName</code> <code class="highlighter-rouge">fieldType</code> <code class="highlighter-rouge">[ NOT NULL ]</code>
@@ -348,7 +355,7 @@ backtick_quoted_expression.</li>
     </ul>
   </li>
   <li><code class="highlighter-rouge">type</code>: The I/O transform that backs the virtual table, specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>
+<a href="/documentation/dsls/sql/calcite/lexical/#identifiers">Identifier</a>
 with one of the following values:
     <ul>
       <li><code class="highlighter-rouge">bigquery</code></li>
@@ -358,11 +365,11 @@ with one of the following values:
     </ul>
   </li>
   <li><code class="highlighter-rouge">location</code>: The I/O specific location of the underlying table, specified as
-a <a href="/documentation/dsls/sql/lexical/#string-literals">String
+a <a href="/documentation/dsls/sql/calcite/lexical/#string-literals">String
 Literal</a>.
 See the I/O specific sections for <code class="highlighter-rouge">location</code> format requirements.</li>
   <li><code class="highlighter-rouge">tblProperties</code>: The I/O specific quoted key value JSON object with extra
-configuration, specified as a <a href="/documentation/dsls/sql/lexical/#string-literals">String
+configuration, specified as a <a href="/documentation/dsls/sql/calcite/lexical/#string-literals">String
 Literal</a>.
 See the I/O specific sections for <code class="highlighter-rouge">tblProperties</code> format requirements.</li>
 </ul>
diff --git a/website/generated-content/documentation/dsls/sql/joins/index.html b/website/generated-content/documentation/dsls/sql/extensions/joins/index.html
similarity index 92%
rename from website/generated-content/documentation/dsls/sql/joins/index.html
rename to website/generated-content/documentation/dsls/sql/extensions/joins/index.html
index a75b484..b36a83c 100644
--- a/website/generated-content/documentation/dsls/sql/joins/index.html
+++ b/website/generated-content/documentation/dsls/sql/extensions/joins/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Joins</title>
+  <title>Beam SQL extensions: Joins</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/joins/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/joins/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/joins.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/extensions/joins.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -261,7 +268,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="beam-sql-joins">Beam SQL: Joins</h1>
+<h1 id="beam-sql-extensions-joins">Beam SQL extensions: Joins</h1>
 
 <p>Supported <code class="highlighter-rouge">JOIN</code> types in Beam SQL:</p>
 <ul>
@@ -319,13 +326,7 @@ strategies remain unchanged.</p>
 <h2 id="join-unbounded-bounded">Unbounded JOIN Bounded</h2>
 
 <p>For this type of <code class="highlighter-rouge">JOIN</code> bounded input is treated as a side-input by the
-implementation.</p>
-
-<p>This means that</p>
-
-<ul>
-  <li>window/trigger is inherented from upstreams, which should be consistent</li>
-</ul>
+implementation. This means that window/trigger is inherented from upstreams.</p>
 
 
       </div>
diff --git a/website/generated-content/documentation/dsls/sql/set/index.html b/website/generated-content/documentation/dsls/sql/extensions/set/index.html
similarity index 90%
copy from website/generated-content/documentation/dsls/sql/set/index.html
copy to website/generated-content/documentation/dsls/sql/extensions/set/index.html
index e19fd78..ebb2ebb 100644
--- a/website/generated-content/documentation/dsls/sql/set/index.html
+++ b/website/generated-content/documentation/dsls/sql/extensions/set/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: SET and RESET Statement</title>
+  <title>Beam SQL extensions: SET and RESET Statement</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/set/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/set/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/set.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/extensions/set.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -260,7 +267,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="set-and-reset-pipeline-options">SET and RESET Pipeline Options</h1>
+<h1 id="beam-sql-extensions-set-and-reset-pipeline-options">Beam SQL extensions: SET and RESET Pipeline Options</h1>
 
 <p>Beam SQL’s <code class="highlighter-rouge">SET</code> and <code class="highlighter-rouge">RESET</code> statements allow the user to <a href="/documentation/programming-guide/#configuring-pipeline-options">configure Pipeline
 Options</a>
@@ -277,9 +284,9 @@ applications on the command line in the <code class="highlighter-rouge">--&lt;op
 
 <ul>
   <li><code class="highlighter-rouge">option</code>: The case sensitive name of the Pipeline Option, specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>.</li>
+<a href="/documentation/dsls/sql/calcite/lexical/#identifiers">Identifier</a>.</li>
   <li><code class="highlighter-rouge">value</code>: The case sensitive value of the Pipeline Option, specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>.
+<a href="/documentation/dsls/sql/calcite/lexical/#identifiers">Identifier</a>.
 For flag options that have no value on the command line, use <code class="highlighter-rouge">true</code>.</li>
 </ul>
 
@@ -291,7 +298,7 @@ For flag options that have no value on the command line, use <code class="highli
 
 <ul>
   <li><code class="highlighter-rouge">option</code>: The case sensitive name of the Pipeline Option, specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>.</li>
+<a href="/documentation/dsls/sql/calcite/lexical#identifiers">Identifier</a>.</li>
 </ul>
 
 <h2 id="common-options">Common Options</h2>
diff --git a/website/generated-content/documentation/dsls/sql/user-defined-functions/index.html b/website/generated-content/documentation/dsls/sql/extensions/user-defined-functions/index.html
similarity index 90%
copy from website/generated-content/documentation/dsls/sql/user-defined-functions/index.html
copy to website/generated-content/documentation/dsls/sql/extensions/user-defined-functions/index.html
index a8e8831..e186259 100644
--- a/website/generated-content/documentation/dsls/sql/user-defined-functions/index.html
+++ b/website/generated-content/documentation/dsls/sql/extensions/user-defined-functions/index.html
@@ -28,7 +28,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: User-defined functions</title>
+  <title>Beam SQL extensions: User-defined functions</title>
   <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
 ">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/user-defined-functions/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/user-defined-functions/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/user-defined-functions.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/extensions/user-defined-functions.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -238,8 +245,8 @@
 
 
 <ul class="nav">
-  <li><a href="#create-and-specify-user-defined-function-udf">Create and specify User Defined Function (UDF)</a></li>
-  <li><a href="#create-and-specify-user-defined-aggregate-function-udaf">Create and specify User Defined Aggregate Function (UDAF)</a></li>
+  <li><a href="#create-and-specify-a-user-defined-function-udf">Create and specify a User Defined Function (UDF)</a></li>
+  <li><a href="#create-and-specify-a-user-defined-aggregate-function-udaf">Create and specify a User Defined Aggregate Function (UDAF)</a></li>
 </ul>
 
 
@@ -260,17 +267,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="beam-sql-user-defined-functions">Beam SQL: User-defined functions</h1>
+<h1 id="beam-sql-extensions-user-defined-functions">Beam SQL extensions: User-defined functions</h1>
 
 <p>If Beam SQL does not have a scalar function or aggregate function to meet your
 needs, they can be authored in Java and invoked in your SQL query. These
 are commonly called UDF (for scalar functions) and UDAFs (for aggregate functions).</p>
 
-<h2 id="create-and-specify-user-defined-function-udf">Create and specify User Defined Function (UDF)</h2>
+<h2 id="create-and-specify-a-user-defined-function-udf">Create and specify a User Defined Function (UDF)</h2>
+
+<p>A UDF can be the following:</p>
+<ul>
+  <li>Any Java method that takes zero or more scalar fields and
+returns one scalar value.</li>
+  <li>A <code class="highlighter-rouge">SerializableFunction</code>.</li>
+</ul>
 
-<p>A UDF can be 1) any Java method that takes zero or more scalar fields and
-return one scalar value, or 2) a <code class="highlighter-rouge">SerializableFunction</code>. Below is an example of
-UDF and how to use it in DSL:</p>
+<p>Below is an example of UDF and how to use it in DSL:</p>
 
 <div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="cm">/**
  * A example UDF for test.
@@ -311,7 +323,7 @@ UDF and how to use it in DSL:</p>
 </code></pre>
 </div>
 
-<h2 id="create-and-specify-user-defined-aggregate-function-udaf">Create and specify User Defined Aggregate Function (UDAF)</h2>
+<h2 id="create-and-specify-a-user-defined-aggregate-function-udaf">Create and specify a User Defined Aggregate Function (UDAF)</h2>
 
 <p>Beam SQL can accept a <code class="highlighter-rouge">CombineFn</code> as UDAF. Registration is similar to the UDF
 example above:</p>
diff --git a/website/generated-content/documentation/dsls/sql/windowing-and-triggering/index.html b/website/generated-content/documentation/dsls/sql/extensions/windowing-and-triggering/index.html
similarity index 91%
copy from website/generated-content/documentation/dsls/sql/windowing-and-triggering/index.html
copy to website/generated-content/documentation/dsls/sql/extensions/windowing-and-triggering/index.html
index 1937f9d..8dc9a14 100644
--- a/website/generated-content/documentation/dsls/sql/windowing-and-triggering/index.html
+++ b/website/generated-content/documentation/dsls/sql/extensions/windowing-and-triggering/index.html
@@ -39,7 +39,7 @@
   <script src="/js/fix-menu.js"></script>
   <script src="/js/section-nav.js"></script>
   <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/windowing-and-triggering/" data-proofer-ignore>
+  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/windowing-and-triggering/" data-proofer-ignore>
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
@@ -125,7 +125,7 @@
             GitHub links will not resolve until the markdown source is available on the master branch.
             New pages would fail validation during development / PR test automation.
           -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/windowing-and-triggering.md" data-proofer-ignore>
+          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/extensions/windowing-and-triggering.md" data-proofer-ignore>
             <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
           </a>
         </li>
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -256,7 +263,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="beam-sql-windowing-and-triggering">Beam SQL: Windowing and triggering</h1>
+<h1 id="beam-sql-extensions-windowing-and-triggering">Beam SQL extensions: Windowing and triggering</h1>
 
 <p>You can use Beam’s windowing semantics in two ways:</p>
 
@@ -307,7 +314,7 @@ rows.</p>
   </li>
 </ul>
 
-<p><strong>Note:</strong> when no windowing function is specified in the query, then windowing strategy of the input <code class="highlighter-rouge">PCollections</code> is unchanged by the SQL query. If windowing function is specified in the query, then the windowing function of the <code class="highlighter-rouge">PCollection</code> is updated accordingly, but trigger stays unchanged.</p>
+<p><strong>Note:</strong> When no windowing function is specified in the query, then windowing strategy of the input <code class="highlighter-rouge">PCollections</code> is unchanged by the SQL query. If windowing function is specified in the query, then the windowing function of the <code class="highlighter-rouge">PCollection</code> is updated accordingly, but trigger stays unchanged.</p>
 
 
       </div>
diff --git a/website/generated-content/documentation/dsls/sql/lexical/index.html b/website/generated-content/documentation/dsls/sql/lexical/index.html
index 5f2611d..358f7a4 100644
--- a/website/generated-content/documentation/dsls/sql/lexical/index.html
+++ b/website/generated-content/documentation/dsls/sql/lexical/index.html
@@ -1,1379 +1,10 @@
 <!DOCTYPE html>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<html lang="en">
-  <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Lexical Structure</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
-">
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
-  <link rel="stylesheet" href="/css/site.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script src="/js/language-switch.js"></script>
-  <script src="/js/fix-menu.js"></script>
-  <script src="/js/section-nav.js"></script>
-  <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/lexical/" data-proofer-ignore>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-73650088-1', 'auto');
-    ga('send', 'pageview');
-  </script>
-</head>
-
-  <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<nav class="header navbar navbar-fixed-top">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-    </div>
-
-    <div class="navbar-mask closed"></div>
-
-    <div id="navbar" class="navbar-container closed">
-      <ul class="nav navbar-nav">
-        <li>
-          <a href="/get-started/beam-overview/">Get Started</a>
-        </li>
-        <li>
-          <a href="/documentation/">Documentation</a>
-        </li>
-        <li>
-          <a href="/documentation/sdks/java/">Languages</a>
-        </li>
-        <li>
-          <a href="/documentation/runners/capability-matrix/">RUNNERS</a>
-        </li>
-        <li>
-          <a href="/roadmap/">Roadmap</a>
-        </li>
-        <li>
-          <a href="/contribute/">Contribute</a>
-        </li>
-        <li>
-          <a href="/community/contact-us/">Community</a>
-        </li>
-        <li><a href="/blog">Blog</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather_small.png" alt="Apache Logo" style="height:20px;"><span class="caret"></span></a>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="http://www.apache.org/">ASF Homepage</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</a></li>
-            <li><a href="http://www.apache.org/security/">Security</a></li>
-            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-            <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
-          </ul>
-        </li>
-        <li>
-          <!--
-            data-proofer-ignore disables link checking from website test automation.
-            GitHub links will not resolve until the markdown source is available on the master branch.
-            New pages would fail validation during development / PR test automation.
-          -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/lexical-structure.md" data-proofer-ignore>
-            <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
-          </a>
-        </li>
-      </ul>
-    </div>
-</nav>
-
-    <div class="clearfix container-main-content">
-      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
-        <span class="section-nav-back glyphicon glyphicon-menu-left"></span>
-        <nav>
-          <ul class="section-nav-list" data-section-nav>
-            <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<li><span class="section-nav-list-main-title">Languages</span></li>
-
-<li>
-  <span class="section-nav-list-title">Java</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/java/">Java SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/" target="_blank">Java SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/java-dependencies/">Java SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/java-extensions/">Java SDK extensions</a></li>
-    <li><a href="/documentation/sdks/java-thirdparty/">Java 3rd party extensions</a></li>
-    <li><a href="/documentation/sdks/java/testing/nexmark/">Nexmark benchmark suite</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Python</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/python/">Python SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/pydoc/2.12.0/" target="_blank">Python SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/python-dependencies/">Python SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/python-streaming/">Python streaming pipelines</a></li>
-    <li><a href="/documentation/sdks/python-type-safety/">Ensuring Python type safety</a></li>
-    <li><a href="/documentation/sdks/python-pipeline-dependencies/">Managing pipeline dependencies</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Go</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/go/">Go SDK overview</a></li>
-    <li><a href="https://godoc.org/github.com/apache/beam/sdks/go/pkg/beam" target="_blank">Go SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">SQL</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/dsls/sql/overview/">Overview</a></li>
-    <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
-    <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
-    <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
-
-      <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
-      </ul>
-    </li>
-  </ul>
-</li>
-
-          </ul>
-        </nav>
-      </div>
-
-      <nav class="page-nav clearfix" data-offset-top="90" data-offset-bottom="500">
-        <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-
-
-<ul class="nav">
-  <li><a href="#identifiers">Identifiers</a></li>
-  <li><a href="#literals">Literals</a>
-    <ul>
-      <li><a href="#string-literals">String Literals</a></li>
-      <li><a href="#integer-literals">Integer Literals</a></li>
-      <li><a href="#floating-point-literals">Floating Point Literals</a></li>
-      <li><a href="#array-literals">Array Literals</a></li>
-      <li><a href="#struct-literals">Struct Literals</a></li>
-      <li><a href="#date-literals">Date Literals</a></li>
-      <li><a href="#time-literals">Time Literals</a></li>
-      <li><a href="#timestamp-literals">Timestamp literals</a></li>
-    </ul>
-  </li>
-  <li><a href="#case-sensitivity">Case Sensitivity</a></li>
-  <li><a href="#reserved-keywords">Reserved Keywords</a></li>
-  <li><a href="#terminating-semicolons">Terminating Semicolons</a></li>
-  <li><a href="#comments">Comments</a>
-    <ul>
-      <li><a href="#single-line-comments">Single line comments</a></li>
-      <li><a href="#multiline-comments">Multiline comments</a></li>
-    </ul>
-  </li>
-</ul>
-
-
-      </nav>
-
-      <div class="body__contained body__section-nav">
-        <!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<h1 id="beam-sql-lexical-structure">Beam SQL Lexical Structure</h1>
-
-<p>A Beam SQL statement comprises a series of tokens. Tokens include
-<em>identifiers,</em> <em>quoted identifiers, literals</em>, <em>keywords</em>, <em>operators</em>,
-and <em>special characters</em>. Tokens can be separated by whitespace (space,
-backspace, tab, newline) or comments.</p>
-
-<h2 id="identifiers">Identifiers</h2>
-
-<p>Identifiers are names that are associated with columns, tables, and
-other database objects.</p>
-
-<p>Identifiers must begin with a letter or an underscore. Subsequent
-characters can be letters, numbers, or underscores. Quoted identifiers
-are identifiers enclosed by backtick (<code class="highlighter-rouge">`</code>) characters and can contain
-any character, such as spaces or symbols. However, quoted identifiers
-cannot be empty. <a href="#reserved-keywords">Reserved Keywords</a> can only be used
-as identifiers if enclosed by backticks.</p>
-
-<p>Syntax (defined here as a regular expression):</p>
-
-<p><code class="highlighter-rouge">[A-Za-z_][A-Za-z_0-9]*</code></p>
-
-<p>Examples:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>Customers5
-_dataField1
-ADGROUP
-</code></pre>
-</div>
-
-<p>Invalid examples:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>5Customers
-_dataField!
-GROUP
-</code></pre>
-</div>
-
-<p><code class="highlighter-rouge">5Customers</code> begins with a number, not a letter or underscore.
-<code class="highlighter-rouge">_dataField!</code> contains the special character “!” which is not a letter,
-number, or underscore. <code class="highlighter-rouge">GROUP</code> is a reserved keyword, and therefore
-cannot be used as an identifier without being enclosed by backtick
-characters.</p>
-
-<p>Both identifiers and quoted identifiers are case insensitive, with some
-nuances. See <a href="#case-sensitivity">Case Sensitivity</a> for further details.</p>
-
-<p>Quoted identifiers have the same escape sequences as string literals,
-defined below.</p>
-
-<h2 id="literals">Literals</h2>
-
-<p>A literal represents a constant value of a built-in data type. Some, but
-not all, data types can be expressed as literals.</p>
-
-<h3 id="string-literals">String Literals</h3>
-
-<p>Both string and bytes literals must be <em>quoted</em> with single
-(<code class="highlighter-rouge">'</code>) quotation mark.</p>
-
-<p><strong>Quoted literals:</strong></p>
-
-<table>
-<thead>
-<tr>
-<th>Literal</th>
-<th>Examples</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Quoted string</td>
-<td><ul><li><code>'it''s'</code></li><li><code>'Title: "Boy"'</code></li></ul></td>
-<td>Quoted strings enclosed by single (<code>'</code>) quotes can contain unescaped double (<code>"</code>) quotes. <br />Two quotation marks (<code>''</code>) is the escape sequence.<br />Quoted strings can contain newlines.</td>
-</tr>
-</tbody>
-</table>
-
-<h3 id="integer-literals">Integer Literals</h3>
-
-<p>Integer literals are either a sequence of decimal digits (0 through 9).
-Integers can be prefixed by “<code class="highlighter-rouge">+</code>” or “<code class="highlighter-rouge">-</code>” to represent positive and
-negative values, respectively.</p>
-
-<p>Examples:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>123
--123
-</code></pre>
-</div>
-
-<p>An integer literal is interpreted as an <code class="highlighter-rouge">BIGINT</code>.</p>
-
-<h3 id="floating-point-literals">Floating Point Literals</h3>
-
-<p>Syntax options:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>[+-]DIGITS.[DIGITS][e[+-]DIGITS]
-[DIGITS].DIGITS[e[+-]DIGITS]
-DIGITSe[+-]DIGITS
-</code></pre>
-</div>
-
-<p><code class="highlighter-rouge">DIGITS</code> represents one or more decimal numbers (0 through 9) and <code class="highlighter-rouge">e</code>
-represents the exponent marker (e or E).</p>
-
-<p>Examples:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>123.456e-67
-.1E4
-58.
-4e2
-</code></pre>
-</div>
-
-<p>Numeric literals that contain either a decimal point or an exponent
-marker are presumed to be type double.</p>
-
-<p>Implicit coercion of floating point literals to float type is possible
-if the value is within the valid float range.</p>
-
-<p>There is no literal representation of NaN or infinity.</p>
-
-<h3 id="array-literals">Array Literals</h3>
-
-<p>Array literals are a comma-separated lists of elements enclosed in
-square brackets prefixed with the <code class="highlighter-rouge">ARRAY</code> keyword.</p>
-
-<p>Examples:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>ARRAY[1, 2, 3]
-ARRAY['x', 'y', 'xy']
-</code></pre>
-</div>
-
-<h3 id="struct-literals">Struct Literals</h3>
-
-<p>Syntax:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>(elem[, elem...])
-</code></pre>
-</div>
-
-<p>where <code class="highlighter-rouge">elem</code> is an element in the struct. <code class="highlighter-rouge">elem</code> must be a literal data
-type, not an expression or column name.</p>
-
-<p>The output type is an anonymous struct type (structs are not named
-types) with anonymous fields with types matching the types of the input
-expressions.</p>
-
-<table>
-<thead>
-<tr>
-<th>Example</th>
-<th>Output Type</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>(1, 2, 3)</code></td>
-<td><code>STRUCT&lt;BIGINT,BIGINT,BIGINT&gt;</code></td>
-</tr>
-<tr>
-<td><code>(1, 'abc')</code></td>
-<td><code>STRUCT&lt;BIGINT,STRING&gt;</code></td>
-</tr>
-</tbody>
-</table>
-
-<h3 id="date-literals">Date Literals</h3>
-
-<p>Syntax:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>DATE 'YYYY-M[M]-D[D]'
-</code></pre>
-</div>
-
-<p>Date literals contain the <code class="highlighter-rouge">DATE</code> keyword followed by a string literal
-that conforms to the canonical date format, enclosed in single quotation
-marks. Date literals support a range between the years 1 and 9999,
-inclusive. Dates outside of this range are invalid.</p>
-
-<p>For example, the following date literal represents September 27, 2014:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>DATE '2014-09-27'
-</code></pre>
-</div>
-
-<p>String literals in canonical date format also implicitly coerce to DATE
-type when used where a DATE-type expression is expected. For example, in
-the query</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>SELECT * FROM foo WHERE date_col = "2014-09-27"
-</code></pre>
-</div>
-
-<p>the string literal <code class="highlighter-rouge">"2014-09-27"</code> will be coerced to a date literal.</p>
-
-<h3 id="time-literals">Time Literals</h3>
-
-<p>Syntax:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>TIME '[H]H:[M]M:[S]S[.DDDDDD]]'
-</code></pre>
-</div>
-
-<p>TIME literals contain the <code class="highlighter-rouge">TIME</code> keyword and a string literal that
-conforms to the canonical time format, enclosed in single quotation
-marks.</p>
-
-<p>For example, the following time represents 12:30 p.m.:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>TIME '12:30:00.45'
-</code></pre>
-</div>
-
-<h3 id="timestamp-literals">Timestamp literals</h3>
-
-<p>Syntax:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>TIMESTAMP 'YYYY-[M]M-[D]D [[H]H:[M]M:[S]S[.DDDDDD]]'
-</code></pre>
-</div>
-
-<p>Timestamp literals contain the <code class="highlighter-rouge">TIMESTAMP</code> keyword and a string literal
-that conforms to the canonical timestamp format, enclosed in single
-quotation marks.</p>
-
-<p>Timestamp literals support a range between the years 1 and 9999,
-inclusive. Timestamps outside of this range are invalid.</p>
-
-<p>For example, the following timestamp represents 12:30 p.m. on September
-27, 2014:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>TIMESTAMP '2014-09-27 12:30:00.45'
-</code></pre>
-</div>
-
-<h2 id="case-sensitivity">Case Sensitivity</h2>
-
-<p>Beam SQL follows these rules for case sensitivity:</p>
-
-<table>
-<thead>
-<tr>
-<th>Category</th>
-<th>Case Sensitive?</th>
-<th>Notes</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Keywords</td>
-<td>No</td>
-<td></td>
-</tr>
-<tr>
-<td>Function names</td>
-<td>No</td>
-<td></td>
-</tr>
-<tr>
-<td>Table names</td>
-<td>Yes</td>
-<td></td>
-</tr>
-<tr>
-<td>Column names</td>
-<td>Yes</td>
-<td></td>
-</tr>
-<tr>
-<td>String values</td>
-<td>Yes</td>
-<td></td>
-</tr>
-<tr>
-<td>String comparisons</td>
-<td>Yes</td>
-<td></td>
-</tr>
-<tr>
-<td>Aliases within a query</td>
-<td>No</td>
-<td></td>
-</tr>
-<tr>
-<td>Regular expression matching</td>
-<td>See Notes</td>
-<td>Regular expression matching is case sensitive by default, unless the expression itself specifies that it should be case insensitive.</td>
-</tr>
-<tr>
-<td><code>LIKE</code> matching</td>
-<td>Yes</td>
-<td>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-
-<h2 id="reserved-keywords">Reserved Keywords</h2>
-
-<p>Keywords are a group of tokens that have special meaning in the Beam SQL
-language, and have the following characteristics:</p>
-
-<ul>
-  <li>Keywords cannot be used as identifiers unless enclosed by backtick
-(`) characters.</li>
-  <li>Keywords are case insensitive.</li>
-</ul>
-
-<p>Beam SQL has the following reserved keywords.</p>
-
-<table style="table-layout: fixed; width: 110%">
-<tbody>
-<tr>
-<td>
-A<br />
-ABS<br />
-ABSOLUTE<br />
-ACTION<br />
-ADA<br />
-ADD<br />
-ADMIN<br />
-AFTER<br />
-ALL<br />
-ALLOCATE<br />
-ALLOW<br />
-ALTER<br />
-ALWAYS<br />
-AND<br />
-ANY<br />
-APPLY<br />
-ARE<br />
-ARRAY<br />
-ARRAY_MAX_CARDINALITY<br />
-AS<br />
-ASC<br />
-ASENSITIVE<br />
-ASSERTION<br />
-ASSIGNMENT<br />
-ASYMMETRIC<br />
-AT<br />
-ATOMIC<br />
-ATTRIBUTE<br />
-ATTRIBUTES<br />
-AUTHORIZATION<br />
-AVG<br />
-BEFORE<br />
-BEGIN<br />
-BEGIN_FRAME<br />
-BEGIN_PARTITION<br />
-BERNOULLI<br />
-BETWEEN<br />
-BIGINT<br />
-BINARY<br />
-BIT<br />
-BLOB<br />
-BOOLEAN<br />
-BOTH<br />
-BREADTH<br />
-BY<br />
-C<br />
-CALL<br />
-CALLED<br />
-CARDINALITY<br />
-CASCADE<br />
-CASCADED<br />
-CASE<br />
-CAST<br />
-CATALOG<br />
-CATALOG_NAME<br />
-CEIL<br />
-CEILING<br />
-CENTURY<br />
-CHAIN<br />
-CHAR<br />
-CHAR_LENGTH<br />
-CHARACTER<br />
-CHARACTER_LENGTH<br />
-CHARACTER_SET_CATALOG<br />
-CHARACTER_SET_NAME<br />
-CHARACTER_SET_SCHEMA<br />
-CHARACTERISTICS<br />
-CHARACTERS<br />
-CHECK<br />
-CLASSIFIER<br />
-CLASS_ORIGIN<br />
-CLOB<br />
-CLOSE<br />
-COALESCE<br />
-COBOL<br />
-COLLATE<br />
-COLLATION<br />
-COLLATION_CATALOG<br />
-COLLATION_NAME<br />
-COLLATION_SCHEMA<br />
-COLLECT<br />
-COLUMN<br />
-COLUMN_NAME<br />
-COMMAND_FUNCTION<br />
-COMMAND_FUNCTION_CODE<br />
-COMMENT<br />
-COMMIT<br />
-COMMITTED<br />
-CONDITION<br />
-CONDITION_NUMBER<br />
-CONNECT<br />
-CONNECTION<br />
-CONNECTION_NAME<br />
-CONSTRAINT<br />
-CONSTRAINT_CATALOG<br />
-CONSTRAINT_NAME<br />
-CONSTRAINT_SCHEMA<br />
-CONSTRAINTS<br />
-CONSTRUCTOR<br />
-CONTAINS<br />
-CONTINUE<br />
-CONVERT<br />
-CORR<br />
-CORRESPONDING<br />
-COUNT<br />
-COVAR_POP<br />
-COVAR_SAMP<br />
-CREATE<br />
-CROSS<br />
-CUBE<br />
-CUME_DIST<br />
-CURRENT<br />
-CURRENT_CATALOG<br />
-CURRENT_DATE<br />
-CURRENT_DEFAULT_TRANSFORM_GROUP<br />
-CURRENT_PATH<br />
-CURRENT_ROLE<br />
-CURRENT_ROW<br />
-CURRENT_SCHEMA<br />
-CURRENT_TIME<br />
-CURRENT_TIMESTAMP<br />
-CURRENT_TRANSFORM_GROUP_FOR_TYPE<br />
-CURRENT_USER<br />
-CURSOR<br />
-CURSOR_NAME<br />
-CYCLE<br />
-DATA<br />
-DATABASE<br />
-DATE<br />
-DATETIME_INTERVAL_CODE<br />
-DATETIME_INTERVAL_PRECISION<br />
-DAY<br />
-DEALLOCATE<br />
-DEC<br />
-DECADE<br />
-DECIMAL<br />
-DECLARE<br />
-DEFAULT<br />
-DEFAULTS<br />
-DEFERRABLE<br />
-DEFERRED<br />
-DEFINE<br />
-DEFINED<br />
-DEFINER<br />
-DEGREE<br />
-DELETE<br />
-DENSE_RANK<br />
-DEPTH<br />
-DEREF<br />
-DERIVED<br />
-DESC<br />
-DESCRIBE<br />
-DESCRIPTION<br />
-DESCRIPTOR<br />
-DETERMINISTIC<br />
-DIAGNOSTICS<br />
-DISALLOW<br />
-DISCONNECT<br />
-DISPATCH<br />
-DISTINCT<br />
-DOMAIN<br />
-DOUBLE<br />
-DOW<br />
-DOY<br />
-DROP<br />
-DYNAMIC<br />
-DYNAMIC_FUNCTION<br />
-DYNAMIC_FUNCTION_CODE<br />
-EACH<br />
-ELEMENT<br />
-ELSE<br />
-EMPTY<br />
-END<br />
-END-EXEC<br />
-END_FRAME<br />
-END_PARTITION<br />
-EPOCH<br />
-EQUALS<br />
-ESCAPE<br />
-EVERY<br />
-EXCEPT<br />
-EXCEPTION<br />
-EXCLUDE<br />
-EXCLUDING<br />
-EXEC<br />
-EXECUTE<br />
-EXISTS<br />
-EXP<br />
-EXPLAIN<br />
-EXTEND<br />
-EXTERNAL<br />
-EXTRACT<br />
-FALSE<br />
-FETCH<br />
-FILTER<br />
-FINAL<br />
-FIRST<br />
-FIRST_VALUE<br />
-FLOAT<br />
-FLOOR<br />
-FOLLOWING<br />
-FOR<br />
-FOREIGN<br />
-FORTRAN<br />
-FOUND<br />
-FRAC_SECOND<br />
-FRAME_ROW<br />
-FREE<br />
-FROM<br />
-FULL<br />
-FUNCTION<br />
-FUSION<br />
-G<br />
-GENERAL<br />
-GENERATED<br />
-GEOMETRY<br />
-GET<br />
-GLOBAL<br />
-GO<br />
-GOTO<br />
-GRANT<br />
-GRANTED<br />
-GROUP<br />
-GROUPING<br />
-GROUPS<br />
-HAVING<br />
-HIERARCHY<br />
-HOLD<br />
-HOUR<br />
-IDENTITY<br />
-IF<br />
-IMMEDIATE<br />
-IMMEDIATELY<br />
-IMPLEMENTATION<br />
-IMPORT<br />
-IN<br />
-INCLUDING<br />
-INCREMENT<br />
-INDICATOR<br />
-INITIAL<br />
-INITIALLY<br />
-INNER<br />
-INOUT<br />
-INPUT<br />
-INSENSITIVE<br />
-INSERT<br />
-INSTANCE<br />
-INSTANTIABLE<br />
-INT<br />
-INTEGER<br />
-INTERSECT<br />
-INTERSECTION<br />
-INTERVAL<br />
-INTO<br />
-INVOKER<br />
-IS<br />
-ISOLATION<br />
-JAVA<br />
-JOIN<br />
-JSON<br />
-K<br />
-KEY<br />
-KEY_MEMBER<br />
-KEY_TYPE<br />
-LABEL<br />
-LAG<br />
-LANGUAGE<br />
-LARGE<br />
-LAST<br />
-LAST_VALUE<br />
-LATERAL<br />
-LEAD<br />
-LEADING<br />
-LEFT<br />
-LENGTH<br />
-LEVEL<br />
-LIBRARY<br />
-LIKE<br />
-LIKE_REGEX<br />
-LIMIT<br />
-LN<br />
-LOCAL<br />
-LOCALTIME<br />
-LOCALTIMESTAMP<br />
-LOCATION<br />
-LOCATOR<br />
-LOWER<br />
-M<br />
-MAP<br />
-MATCH<br />
-MATCHED<br />
-MATCHES<br />
-MATCH_NUMBER<br />
-MATCH_RECOGNIZE<br />
-MAX<br />
-MAXVALUE<br />
-MEASURES<br />
-MEMBER<br />
-MERGE<br />
-MESSAGE_LENGTH<br />
-MESSAGE_OCTET_LENGTH<br />
-MESSAGE_TEXT<br />
-METHOD<br />
-MICROSECOND<br />
-MILLENNIUM<br />
-MIN<br />
-MINUTE<br />
-MINVALUE<br />
-MOD<br />
-MODIFIES<br />
-MODULE<br />
-MONTH<br />
-MORE<br />
-MULTISET<br />
-MUMPS<br />
-NAME<br />
-NAMES<br />
-NATIONAL<br />
-NATURAL<br />
-NCHAR<br />
-NCLOB<br />
-NESTING<br />
-</td>
-<td>
-NEW<br />
-NEXT<br />
-NO<br />
-NONE<br />
-NORMALIZE<br />
-NORMALIZED<br />
-NOT<br />
-NTH_VALUE<br />
-NTILE<br />
-NULL<br />
-NULLABLE<br />
-NULLIF<br />
-NULLS<br />
-NUMBER<br />
-NUMERIC<br />
-OBJECT<br />
-OCCURRENCES_REGEX<br />
-OCTET_LENGTH<br />
-OCTETS<br />
-OF<br />
-OFFSET<br />
-OLD<br />
-OMIT<br />
-ON<br />
-ONE<br />
-ONLY<br />
-OPEN<br />
-OPTION<br />
-OPTIONS<br />
-OR<br />
-ORDER<br />
-ORDERING<br />
-ORDINALITY<br />
-OTHERS<br />
-OUT<br />
-OUTER<br />
-OUTPUT<br />
-OVER<br />
-OVERLAPS<br />
-OVERLAY<br />
-OVERRIDING<br />
-PAD<br />
-PARAMETER<br />
-PARAMETER_MODE<br />
-PARAMETER_NAME<br />
-PARAMETER_ORDINAL_POSITION<br />
-PARAMETER_SPECIFIC_CATALOG<br />
-PARAMETER_SPECIFIC_NAME<br />
-PARAMETER_SPECIFIC_SCHEMA<br />
-PARTIAL<br />
-PARTITION<br />
-PASCAL<br />
-PASSTHROUGH<br />
-PAST<br />
-PATH<br />
-PATTERN<br />
-PER<br />
-PERCENT<br />
-PERCENTILE_CONT<br />
-PERCENTILE_DISC<br />
-PERCENT_RANK<br />
-PERIOD<br />
-PERMUTE<br />
-PLACING<br />
-PLAN<br />
-PLI<br />
-PORTION<br />
-POSITION<br />
-POSITION_REGEX<br />
-POWER<br />
-PRECEDES<br />
-PRECEDING<br />
-PRECISION<br />
-PREPARE<br />
-PRESERVE<br />
-PREV<br />
-PRIMARY<br />
-PRIOR<br />
-PRIVILEGES<br />
-PROCEDURE<br />
-PUBLIC<br />
-QUARTER<br />
-RANGE<br />
-RANK<br />
-READ<br />
-READS<br />
-REAL<br />
-RECURSIVE<br />
-REF<br />
-REFERENCES<br />
-REFERENCING<br />
-REGR_AVGX<br />
-REGR_AVGY<br />
-REGR_COUNT<br />
-REGR_INTERCEPT<br />
-REGR_R2<br />
-REGR_SLOPE<br />
-REGR_SXX<br />
-REGR_SXY<br />
-REGR_SYY<br />
-RELATIVE<br />
-RELEASE<br />
-REPEATABLE<br />
-REPLACE<br />
-RESET<br />
-RESTART<br />
-RESTRICT<br />
-RESULT<br />
-RETURN<br />
-RETURNED_CARDINALITY<br />
-RETURNED_LENGTH<br />
-RETURNED_OCTET_LENGTH<br />
-RETURNED_SQLSTATE<br />
-RETURNS<br />
-REVOKE<br />
-RIGHT<br />
-ROLE<br />
-ROLLBACK<br />
-ROLLUP<br />
-ROUTINE<br />
-ROUTINE_CATALOG<br />
-ROUTINE_NAME<br />
-ROUTINE_SCHEMA<br />
-ROW<br />
-ROW_COUNT<br />
-ROW_NUMBER<br />
-ROWS<br />
-RUNNING<br />
-SAVEPOINT<br />
-SCALE<br />
-SCHEMA<br />
-SCHEMA_NAME<br />
-SCOPE<br />
-SCOPE_CATALOGS<br />
-SCOPE_NAME<br />
-SCOPE_SCHEMA<br />
-SCROLL<br />
-SEARCH<br />
-SECOND<br />
-SECTION<br />
-SECURITY<br />
-SEEK<br />
-SELECT<br />
-SELF<br />
-SENSITIVE<br />
-SEQUENCE<br />
-SERIALIZABLE<br />
-SERVER<br />
-SERVER_NAME<br />
-SESSION<br />
-SESSION_USER<br />
-SET<br />
-SETS<br />
-MINUS<br />
-SHOW<br />
-SIMILAR<br />
-SIMPLE<br />
-SIZE<br />
-SKIP<br />
-SMALLINT<br />
-SOME<br />
-SOURCE<br />
-SPACE<br />
-SPECIFIC<br />
-SPECIFIC_NAME<br />
-SPECIFICTYPE<br />
-SQL<br />
-SQLEXCEPTION<br />
-SQLSTATE<br />
-SQLWARNING<br />
-SQL_BIGINT<br />
-SQL_BINARY<br />
-SQL_BIT<br />
-SQL_BLOB<br />
-SQL_BOOLEAN<br />
-SQL_CHAR<br />
-SQL_CLOB<br />
-SQL_DATE<br />
-SQL_DECIMAL<br />
-SQL_DOUBLE<br />
-SQL_FLOAT<br />
-SQL_INTEGER<br />
-SQL_INTERVAL_DAY<br />
-SQL_INTERVAL_DAY_TO_HOUR<br />
-SQL_INTERVAL_DAY_TO_MINUTE<br />
-SQL_INTERVAL_DAY_TO_SECOND<br />
-SQL_INTERVAL_HOUR<br />
-SQL_INTERVAL_HOUR_TO_MINUTE<br />
-SQL_INTERVAL_HOUR_TO_SECOND<br />
-SQL_INTERVAL_MINUTE<br />
-SQL_INTERVAL_MINUTE_TO_SECOND<br />
-SQL_INTERVAL_MONTH<br />
-SQL_INTERVAL_SECOND<br />
-SQL_INTERVAL_YEAR<br />
-SQL_INTERVAL_YEAR_TO_MONTH<br />
-SQL_LONGVARBINARY<br />
-SQL_LONGVARCHAR<br />
-SQL_LONGVARNCHAR<br />
-SQL_NCHAR<br />
-SQL_NCLOB<br />
-SQL_NUMERIC<br />
-SQL_NVARCHAR<br />
-SQL_REAL<br />
-SQL_SMALLINT<br />
-SQL_TIME<br />
-SQL_TIMESTAMP<br />
-SQL_TINYINT<br />
-SQL_TSI_DAY<br />
-SQL_TSI_FRAC_SECOND<br />
-SQL_TSI_HOUR<br />
-SQL_TSI_MICROSECOND<br />
-SQL_TSI_MINUTE<br />
-SQL_TSI_MONTH<br />
-SQL_TSI_QUARTER<br />
-SQL_TSI_SECOND<br />
-SQL_TSI_WEEK<br />
-SQL_TSI_YEAR<br />
-SQL_VARBINARY<br />
-SQL_VARCHAR<br />
-SQRT<br />
-START<br />
-STATE<br />
-STATEMENT<br />
-STATIC<br />
-STDDEV_POP<br />
-STDDEV_SAMP<br />
-STREAM<br />
-STRUCTURE<br />
-STYLE<br />
-SUBCLASS_ORIGIN<br />
-SUBMULTISET<br />
-SUBSET<br />
-SUBSTITUTE<br />
-SUBSTRING<br />
-SUBSTRING_REGEX<br />
-SUCCEEDS<br />
-SUM<br />
-SYMMETRIC<br />
-SYSTEM<br />
-SYSTEM_TIME<br />
-SYSTEM_USER<br />
-TABLE<br />
-TABLE_NAME<br />
-TABLESAMPLE<br />
-TBLPROPERTIES<br />
-TEMPORARY<br />
-THEN<br />
-TIES<br />
-TIME<br />
-TIMESTAMP<br />
-TIMESTAMPADD<br />
-TIMESTAMPDIFF<br />
-TIMEZONE_HOUR<br />
-TIMEZONE_MINUTE<br />
-TINYINT<br />
-TO<br />
-TOP_LEVEL_COUNT<br />
-TRAILING<br />
-TRANSACTION<br />
-TRANSACTIONS_ACTIVE<br />
-TRANSACTIONS_COMMITTED<br />
-TRANSACTIONS_ROLLED_BACK<br />
-TRANSFORM<br />
-TRANSFORMS<br />
-TRANSLATE<br />
-TRANSLATE_REGEX<br />
-TRANSLATION<br />
-TREAT<br />
-TRIGGER<br />
-TRIGGER_CATALOG<br />
-TRIGGER_NAME<br />
-TRIGGER_SCHEMA<br />
-TRIM<br />
-TRIM_ARRAY<br />
-TRUE<br />
-TRUNCATE<br />
-TYPE<br />
-UESCAPE<br />
-UNBOUNDED<br />
-UNCOMMITTED<br />
-UNDER<br />
-UNION<br />
-UNIQUE<br />
-UNKNOWN<br />
-UNNAMED<br />
-UNNEST<br />
-UPDATE<br />
-UPPER<br />
-UPSERT<br />
-USAGE<br />
-USER<br />
-USER_DEFINED_TYPE_CATALOG<br />
-USER_DEFINED_TYPE_CODE<br />
-USER_DEFINED_TYPE_NAME<br />
-USER_DEFINED_TYPE_SCHEMA<br />
-USING<br />
-VALUE<br />
-VALUES<br />
-VALUE_OF<br />
-VAR_POP<br />
-VAR_SAMP<br />
-VARBINARY<br />
-VARCHAR<br />
-VARYING<br />
-VERSION<br />
-VERSIONING<br />
-VIEW<br />
-WEEK<br />
-WHEN<br />
-WHENEVER<br />
-WHERE<br />
-WIDTH_BUCKET<br />
-WINDOW<br />
-WITH<br />
-WITHIN<br />
-WITHOUT<br />
-WORK<br />
-WRAPPER<br />
-WRITE<br />
-XML<br />
-YEAR<br />
-ZONE<br />
-</td>
-</tr>
-</tbody>
-</table>
-
-<h2 id="terminating-semicolons">Terminating Semicolons</h2>
-
-<p>Statements can optionally use a terminating semicolon (<code class="highlighter-rouge">;</code>) in the
-context of a query string submitted through an Application Programming
-Interface (API). Some interactive tools require statements to have a
-terminating semicolon. In a request containing multiple statements,
-statements must be separated by semicolons, but the semicolon is
-optional for the final statement.</p>
-
-<h2 id="comments">Comments</h2>
-
-<p>Comments are sequences of characters that are ignored by the parser.
-Beam SQL supports the following types of comments.</p>
-
-<h3 id="single-line-comments">Single line comments</h3>
-
-<p>Single line comments are supported by prepending <code class="highlighter-rouge">--</code> before the comment.</p>
-
-<p><strong>Examples</strong></p>
-
-<p><code class="highlighter-rouge">SELECT x FROM T; --x is a field and T is a table</code></p>
-
-<p>Comment includes all characters from the ‘<code class="highlighter-rouge">--</code>’ sequence to the end of
-the line. You can optionally add a space after the ‘<code class="highlighter-rouge">--</code>’.</p>
-
-<h3 id="multiline-comments">Multiline comments</h3>
-
-<p>Multiline comments are supported by enclosing the comment using
-<code class="highlighter-rouge">/* &lt;comment&gt; */</code>.</p>
-
-<p><strong>Example:</strong></p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>SELECT x FROM T /* x is a field and T is a table */
-WHERE x = 3;
-</code></pre>
-</div>
-
-<p><strong>Invalid example:</strong></p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>SELECT x FROM T /* comment starts here
-                /* comment ends on this line */
-                this line is not considered a comment */
-WHERE x = 3;
-</code></pre>
-</div>
-
-<p>Comment includes all characters, including newlines, enclosed by the
-first occurrence of ‘<code class="highlighter-rouge">/*</code>’ and the first subsequent occurrence of
-‘<code class="highlighter-rouge">*/</code>’. Nested comments are not supported. The second example contains a
-nested comment that renders the query invalid.</p>
-
-<blockquote>
-  <p>Portions of this page are modifications based on work created and
-<a href="https://developers.google.com/terms/site-policies">shared by Google</a>
-and used according to terms described in the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons 3.0
-Attribution License</a>.</p>
-</blockquote>
-
-      </div>
-    </div>
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<footer class="footer">
-  <div class="footer__contained">
-    <div class="footer__cols">
-      <div class="footer__cols__col">
-        <div class="footer__cols__col__logo">
-          <img src="/images/beam_logo_circle.svg" class="footer__logo" alt="Beam logo">
-        </div>
-        <div class="footer__cols__col__logo">
-          <img src="/images/apache_logo_circle.svg" class="footer__logo" alt="Apache logo">
-        </div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Start</div>
-        <div class="footer__cols__col__link"><a href="/get-started/beam-overview/">Overview</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-java/">Quickstart (Java)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-py/">Quickstart (Python)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-go/">Quickstart (Go)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/downloads/">Downloads</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Docs</div>
-        <div class="footer__cols__col__link"><a href="/documentation/programming-guide/">Concepts</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/pipelines/design-your-pipeline/">Pipelines</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/runners/capability-matrix/">Runners</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Community</div>
-        <div class="footer__cols__col__link"><a href="/contribute/">Contribute</a></div>
-        <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam" target="_blank">Team<img src="/images/external-link-icon.png"
-                                                                                                                                width="14" height="14"
-                                                                                                                                alt="External link."></a></div>
-        <div class="footer__cols__col__link"><a href="/contribute/presentation-materials/">Media</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Resources</div>
-        <div class="footer__cols__col__link"><a href="/blog/">Blog</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/support/">Support</a></div>
-        <div class="footer__cols__col__link"><a href="https://github.com/apache/beam">GitHub</a></div>
-      </div>
-    </div>
-  </div>
-  <div class="footer__bottom">
-    &copy;
-    <a href="http://www.apache.org">The Apache Software Foundation</a>
-    | <a href="/privacy_policy">Privacy Policy</a>
-    | <a href="/feed.xml">RSS Feed</a>
-    <br><br>
-    Apache Beam, Apache, Beam, the Beam logo, and the Apache feather logo are
-    either registered trademarks or trademarks of The Apache Software
-    Foundation. All other products or name brands are trademarks of their
-    respective holders, including The Apache Software Foundation.
-  </div>
-</footer>
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/lexical/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/calcite/lexical/">
+<h1>Redirecting…</h1>
+<a href="https://beam.apache.org/documentation/dsls/sql/calcite/lexical/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/calcite/lexical/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/overview/index.html b/website/generated-content/documentation/dsls/sql/overview/index.html
index b2fee47..ff14b42 100644
--- a/website/generated-content/documentation/dsls/sql/overview/index.html
+++ b/website/generated-content/documentation/dsls/sql/overview/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -237,6 +244,12 @@
 
 
 
+<ul class="nav">
+  <li><a href="#walkthrough">Walkthrough</a></li>
+  <li><a href="#shell">Shell</a></li>
+  <li><a href="#apache-calcite-dialect">Apache Calcite dialect</a></li>
+  <li><a href="#beam-sql-extensions">Beam SQL extensions</a></li>
+</ul>
 
 
       </nav>
@@ -256,30 +269,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<h1 id="beam-sql-overview">Beam SQL: Overview</h1>
+<h1 id="beam-sql-overview">Beam SQL overview</h1>
 
 <p>Beam SQL allows a Beam user (currently only available in Beam Java) to query
 bounded and unbounded <code class="highlighter-rouge">PCollections</code> with SQL statements. Your SQL query
 is translated to a <code class="highlighter-rouge">PTransform</code>, an encapsulated segment of a Beam pipeline.
 You can freely mix SQL <code class="highlighter-rouge">PTransforms</code> and other <code class="highlighter-rouge">PTransforms</code> in your pipeline.</p>
 
-<p>There are three main things you will need to know to use SQL in your pipeline:</p>
+<p><a href="http://calcite.apache.org">Apache Calcite</a> is a widespread SQL dialect used in
+big data processing with some streaming enhancements. Calcite provides the
+basic dialect underlying Beam SQL.</p>
+
+<p>There are two additional concepts you need to know to use SQL in your pipeline:</p>
 
 <ul>
-  <li><a href="http://calcite.apache.org">Apache Calcite</a>: a widespread SQL dialect used in
-big data processing with some streaming enhancements. Calcite provides the
-basic dialect underlying Beam SQL. We have added additional extensions to
-make it easy to leverage Beam’s unified batch/streaming model and support
-for complex data types.</li>
-  <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/index.html?org/apache/beam/sdk/extensions/sql/SqlTransform.html">SqlTransform</a>: 
-the interface for creating <code class="highlighter-rouge">PTransforms</code> from SQL queries.</li>
+  <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/index.html?org/apache/beam/sdk/extensions/sql/SqlTransform.html">SqlTransform</a>: the interface for creating <code class="highlighter-rouge">PTransforms</code> from SQL queries.</li>
   <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/index.html?org/apache/beam/sdk/values/Row.html">Row</a>:
 the type of elements that Beam SQL operates on. A <code class="highlighter-rouge">PCollection&lt;Row&gt;</code> plays the role of a table.</li>
 </ul>
 
-<p>The <a href="/documentation/dsls/sql/walkthrough">SQL pipeline walkthrough</a> works through how you use
-these.</p>
+<h2 id="walkthrough">Walkthrough</h2>
+<p>The <a href="/documentation/dsls/sql/walkthrough">SQL pipeline walkthrough</a> works through how to use Beam SQL with example code.</p>
 
+<h2 id="shell">Shell</h2>
+<p>The Beam SQL shell allows you to write pipelines as SQL queries without using the Java SDK. 
+The <a href="/documentation/dsls/sql/shell">Shell page</a> describes how to work with the interactive Beam SQL shell.</p>
+
+<h2 id="apache-calcite-dialect">Apache Calcite dialect</h2>
+<p>The <a href="/documentation/dsls/sql/calcite/overview">Calcite overview</a> summarizes Apache Calcite operators,
+functions, syntax, and data types supported by Beam SQL.</p>
+
+<h2 id="beam-sql-extensions">Beam SQL extensions</h2>
+<p>Beam SQL has additional <a href="/documentation/dsls/sql/extensions/create-external-table">extensions</a> to
+make it easy to leverage Beam’s unified batch/streaming model and support
+for complex data types.</p>
 
       </div>
     </div>
diff --git a/website/generated-content/documentation/dsls/sql/scalar-functions/index.html b/website/generated-content/documentation/dsls/sql/scalar-functions/index.html
index dc32597..d5b6669 100644
--- a/website/generated-content/documentation/dsls/sql/scalar-functions/index.html
+++ b/website/generated-content/documentation/dsls/sql/scalar-functions/index.html
@@ -1,702 +1,10 @@
 <!DOCTYPE html>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<html lang="en">
-  <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: Scalar functions</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
-">
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
-  <link rel="stylesheet" href="/css/site.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script src="/js/language-switch.js"></script>
-  <script src="/js/fix-menu.js"></script>
-  <script src="/js/section-nav.js"></script>
-  <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/scalar-functions/" data-proofer-ignore>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-73650088-1', 'auto');
-    ga('send', 'pageview');
-  </script>
-</head>
-
-  <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<nav class="header navbar navbar-fixed-top">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-    </div>
-
-    <div class="navbar-mask closed"></div>
-
-    <div id="navbar" class="navbar-container closed">
-      <ul class="nav navbar-nav">
-        <li>
-          <a href="/get-started/beam-overview/">Get Started</a>
-        </li>
-        <li>
-          <a href="/documentation/">Documentation</a>
-        </li>
-        <li>
-          <a href="/documentation/sdks/java/">Languages</a>
-        </li>
-        <li>
-          <a href="/documentation/runners/capability-matrix/">RUNNERS</a>
-        </li>
-        <li>
-          <a href="/roadmap/">Roadmap</a>
-        </li>
-        <li>
-          <a href="/contribute/">Contribute</a>
-        </li>
-        <li>
-          <a href="/community/contact-us/">Community</a>
-        </li>
-        <li><a href="/blog">Blog</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather_small.png" alt="Apache Logo" style="height:20px;"><span class="caret"></span></a>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="http://www.apache.org/">ASF Homepage</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</a></li>
-            <li><a href="http://www.apache.org/security/">Security</a></li>
-            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-            <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
-          </ul>
-        </li>
-        <li>
-          <!--
-            data-proofer-ignore disables link checking from website test automation.
-            GitHub links will not resolve until the markdown source is available on the master branch.
-            New pages would fail validation during development / PR test automation.
-          -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/scalar-functions.md" data-proofer-ignore>
-            <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
-          </a>
-        </li>
-      </ul>
-    </div>
-</nav>
-
-    <div class="clearfix container-main-content">
-      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
-        <span class="section-nav-back glyphicon glyphicon-menu-left"></span>
-        <nav>
-          <ul class="section-nav-list" data-section-nav>
-            <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<li><span class="section-nav-list-main-title">Languages</span></li>
-
-<li>
-  <span class="section-nav-list-title">Java</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/java/">Java SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/" target="_blank">Java SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/java-dependencies/">Java SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/java-extensions/">Java SDK extensions</a></li>
-    <li><a href="/documentation/sdks/java-thirdparty/">Java 3rd party extensions</a></li>
-    <li><a href="/documentation/sdks/java/testing/nexmark/">Nexmark benchmark suite</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Python</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/python/">Python SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/pydoc/2.12.0/" target="_blank">Python SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/python-dependencies/">Python SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/python-streaming/">Python streaming pipelines</a></li>
-    <li><a href="/documentation/sdks/python-type-safety/">Ensuring Python type safety</a></li>
-    <li><a href="/documentation/sdks/python-pipeline-dependencies/">Managing pipeline dependencies</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Go</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/go/">Go SDK overview</a></li>
-    <li><a href="https://godoc.org/github.com/apache/beam/sdks/go/pkg/beam" target="_blank">Go SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">SQL</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/dsls/sql/overview/">Overview</a></li>
-    <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
-    <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
-    <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
-
-      <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
-      </ul>
-    </li>
-  </ul>
-</li>
-
-          </ul>
-        </nav>
-      </div>
-
-      <nav class="page-nav clearfix" data-offset-top="90" data-offset-bottom="500">
-        <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-
-
-<ul class="nav">
-  <li><a href="#comparison-functions-and-operators">Comparison functions and operators</a></li>
-  <li><a href="#logical-functions-and-operators">Logical functions and operators</a></li>
-  <li><a href="#arithmetic-expressions">Arithmetic expressions</a></li>
-  <li><a href="#math-functions">Math functions</a></li>
-  <li><a href="#date-functions">Date functions</a></li>
-  <li><a href="#string-functions">String functions</a></li>
-  <li><a href="#conditional-functions">Conditional functions</a></li>
-</ul>
-
-
-      </nav>
-
-      <div class="body__contained body__section-nav">
-        <!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<h1 id="beam-sql-scalar-functions">Beam SQL: Scalar functions</h1>
-
-<p>Beam SQL has implemented the following built-in functions See also <a href="http://calcite.apache.org/docs/reference.html#operators-and-functions">Calcite
-SQL’s operators and functions
-reference</a></p>
-
-<h2 id="comparison-functions-and-operators">Comparison functions and operators</h2>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Operator syntax</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>value1 = value2</td>
-      <td>Equals</td>
-    </tr>
-    <tr>
-      <td>value1 &lt;&gt; value2</td>
-      <td>Not equal</td>
-    </tr>
-    <tr>
-      <td>value1 &gt; value2</td>
-      <td>Greater than</td>
-    </tr>
-    <tr>
-      <td>value1 &gt;= value2</td>
-      <td>Greater than or equal</td>
-    </tr>
-    <tr>
-      <td>value1 &lt; value2</td>
-      <td>Less than</td>
-    </tr>
-    <tr>
-      <td>value1 &lt;= value2</td>
-      <td>Less than or equal</td>
-    </tr>
-    <tr>
-      <td>value IS NULL</td>
-      <td>Whether value is null</td>
-    </tr>
-    <tr>
-      <td>value IS NOT NULL</td>
-      <td>Whether value is not null</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2 id="logical-functions-and-operators">Logical functions and operators</h2>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Operator syntax</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>boolean1 OR boolean2</td>
-      <td>Whether boolean1 is TRUE or boolean2 is TRUE</td>
-    </tr>
-    <tr>
-      <td>boolean1 AND boolean2</td>
-      <td>Whether boolean1 and boolean2 are both TRUE</td>
-    </tr>
-    <tr>
-      <td>NOT boolean</td>
-      <td>Whether boolean is not TRUE; returns UNKNOWN if boolean is UNKNOWN</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2 id="arithmetic-expressions">Arithmetic expressions</h2>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Operator syntax</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>numeric1 + numeric2</td>
-      <td>Returns numeric1 plus numeric2</td>
-    </tr>
-    <tr>
-      <td>numeric1 - numeric2</td>
-      <td>Returns numeric1 minus numeric2</td>
-    </tr>
-    <tr>
-      <td>numeric1 * numeric2</td>
-      <td>Returns numeric1 multiplied by numeric2</td>
-    </tr>
-    <tr>
-      <td>numeric1 / numeric2</td>
-      <td>Returns numeric1 divided by numeric2</td>
-    </tr>
-    <tr>
-      <td>MOD(numeric, numeric)</td>
-      <td>Returns the remainder (modulus) of numeric1 divided by numeric2. The result is negative only if numeric1 is negative</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2 id="math-functions">Math functions</h2>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Operator syntax</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>ABS(numeric)</td>
-      <td>Returns the absolute value of numeric</td>
-    </tr>
-    <tr>
-      <td>SQRT(numeric)</td>
-      <td>Returns the square root of numeric</td>
-    </tr>
-    <tr>
-      <td>LN(numeric)</td>
-      <td>Returns the natural logarithm (base e) of numeric</td>
-    </tr>
-    <tr>
-      <td>LOG10(numeric)</td>
-      <td>Returns the base 10 logarithm of numeric</td>
-    </tr>
-    <tr>
-      <td>EXP(numeric)</td>
-      <td>Returns e raised to the power of numeric</td>
-    </tr>
-    <tr>
-      <td>ACOS(numeric)</td>
-      <td>Returns the arc cosine of numeric</td>
-    </tr>
-    <tr>
-      <td>ASIN(numeric)</td>
-      <td>Returns the arc sine of numeric</td>
-    </tr>
-    <tr>
-      <td>ATAN(numeric)</td>
-      <td>Returns the arc tangent of numeric</td>
-    </tr>
-    <tr>
-      <td>COT(numeric)</td>
-      <td>Returns the cotangent of numeric</td>
-    </tr>
-    <tr>
-      <td>DEGREES(numeric)</td>
-      <td>Converts numeric from radians to degrees</td>
-    </tr>
-    <tr>
-      <td>RADIANS(numeric)</td>
-      <td>Converts numeric from degrees to radians</td>
-    </tr>
-    <tr>
-      <td>SIGN(numeric)</td>
-      <td>Returns the signum of numeric</td>
-    </tr>
-    <tr>
-      <td>SIN(numeric)</td>
-      <td>Returns the sine of numeric</td>
-    </tr>
-    <tr>
-      <td>TAN(numeric)</td>
-      <td>Returns the tangent of numeric</td>
-    </tr>
-    <tr>
-      <td>ROUND(numeric1, numeric2)</td>
-      <td>Rounds numeric1 to numeric2 places right to the decimal point</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2 id="date-functions">Date functions</h2>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Operator syntax</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>LOCALTIME</td>
-      <td>Returns the current date and time in the session time zone in a value of datatype TIME</td>
-    </tr>
-    <tr>
-      <td>LOCALTIME(precision)</td>
-      <td>Returns the current date and time in the session time zone in a value of datatype TIME, with precision digits of precision</td>
-    </tr>
-    <tr>
-      <td>LOCALTIMESTAMP</td>
-      <td>Returns the current date and time in the session time zone in a value of datatype TIMESTAMP</td>
-    </tr>
-    <tr>
-      <td>LOCALTIMESTAMP(precision)</td>
-      <td>Returns the current date and time in the session time zone in a value of datatype TIMESTAMP, with precision digits of precision</td>
-    </tr>
-    <tr>
-      <td>CURRENT_TIME</td>
-      <td>Returns the current time in the session time zone, in a value of datatype TIMESTAMP WITH TIME ZONE</td>
-    </tr>
-    <tr>
-      <td>CURRENT_DATE</td>
-      <td>Returns the current date in the session time zone, in a value of datatype DATE</td>
-    </tr>
-    <tr>
-      <td>CURRENT_TIMESTAMP</td>
-      <td>Returns the current date and time in the session time zone, in a value of datatype TIMESTAMP WITH TIME ZONE</td>
-    </tr>
-    <tr>
-      <td>EXTRACT(timeUnit FROM datetime)</td>
-      <td>Extracts and returns the value of a specified datetime field from a datetime value expression</td>
-    </tr>
-    <tr>
-      <td>FLOOR(datetime TO timeUnit)</td>
-      <td>Rounds datetime down to timeUnit</td>
-    </tr>
-    <tr>
-      <td>CEIL(datetime TO timeUnit)</td>
-      <td>Rounds datetime up to timeUnit</td>
-    </tr>
-    <tr>
-      <td>YEAR(date)</td>
-      <td>Equivalent to EXTRACT(YEAR FROM date). Returns an integer.</td>
-    </tr>
-    <tr>
-      <td>QUARTER(date)</td>
-      <td>Equivalent to EXTRACT(QUARTER FROM date). Returns an integer between 1 and 4.</td>
-    </tr>
-    <tr>
-      <td>MONTH(date)</td>
-      <td>Equivalent to EXTRACT(MONTH FROM date). Returns an integer between 1 and 12.</td>
-    </tr>
-    <tr>
-      <td>WEEK(date)</td>
-      <td>Equivalent to EXTRACT(WEEK FROM date). Returns an integer between 1 and 53.</td>
-    </tr>
-    <tr>
-      <td>DAYOFYEAR(date)</td>
-      <td>Equivalent to EXTRACT(DOY FROM date). Returns an integer between 1 and 366.</td>
-    </tr>
-    <tr>
-      <td>DAYOFMONTH(date)</td>
-      <td>Equivalent to EXTRACT(DAY FROM date). Returns an integer between 1 and 31.</td>
-    </tr>
-    <tr>
-      <td>DAYOFWEEK(date)</td>
-      <td>Equivalent to EXTRACT(DOW FROM date). Returns an integer between 1 and 7.</td>
-    </tr>
-    <tr>
-      <td>HOUR(date)</td>
-      <td>Equivalent to EXTRACT(HOUR FROM date). Returns an integer between 0 and 23.</td>
-    </tr>
-    <tr>
-      <td>MINUTE(date)</td>
-      <td>Equivalent to EXTRACT(MINUTE FROM date). Returns an integer between 0 and 59.</td>
-    </tr>
-    <tr>
-      <td>SECOND(date)</td>
-      <td>Equivalent to EXTRACT(SECOND FROM date). Returns an integer between 0 and 59.</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2 id="string-functions">String functions</h2>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Operator syntax</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>string || string</td>
-      <td>Concatenates two character strings</td>
-    </tr>
-    <tr>
-      <td>CHAR_LENGTH(string)</td>
-      <td>Returns the number of characters in a character string</td>
-    </tr>
-    <tr>
-      <td>CHARACTER_LENGTH(string)</td>
-      <td>As CHAR_LENGTH(string)</td>
-    </tr>
-    <tr>
-      <td>UPPER(string)</td>
-      <td>Returns a character string converted to upper case</td>
-    </tr>
-    <tr>
-      <td>LOWER(string)</td>
-      <td>Returns a character string converted to lower case</td>
-    </tr>
-    <tr>
-      <td>POSITION(string1 IN string2)</td>
-      <td>Returns the position of the first occurrence of string1 in string2</td>
-    </tr>
-    <tr>
-      <td>POSITION(string1 IN string2 FROM integer)</td>
-      <td>Returns the position of the first occurrence of string1 in string2 starting at a given point (not standard SQL)</td>
-    </tr>
-    <tr>
-      <td>TRIM( { BOTH | LEADING | TRAILING } string1 FROM string2)</td>
-      <td>Removes the longest string containing only the characters in string1 from the start/end/both ends of string1</td>
-    </tr>
-    <tr>
-      <td>OVERLAY(string1 PLACING string2 FROM integer [ FOR integer2 ])</td>
-      <td>Replaces a substring of string1 with string2</td>
-    </tr>
-    <tr>
-      <td>SUBSTRING(string FROM integer)</td>
-      <td>Returns a substring of a character string starting at a given point</td>
-    </tr>
-    <tr>
-      <td>SUBSTRING(string FROM integer FOR integer)</td>
-      <td>Returns a substring of a character string starting at a given point with a given length</td>
-    </tr>
-    <tr>
-      <td>INITCAP(string)</td>
-      <td>Returns string with the first letter of each word converter to upper case and the rest to lower case. Words are sequences of alphanumeric characters separated by non-alphanumeric characters.</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2 id="conditional-functions">Conditional functions</h2>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Operator syntax</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>CASE value <br />WHEN value1 [, value11 ]* THEN result1 <br />[ WHEN valueN [, valueN1 ]* THEN resultN ]* <br />[ ELSE resultZ ] <br />END</td>
-      <td>Simple case</td>
-    </tr>
-    <tr>
-      <td>CASE <br />WHEN condition1 THEN result1 <br />[ WHEN conditionN THEN resultN ]* <br />[ ELSE resultZ ] <br />END</td>
-      <td>Searched case</td>
-    </tr>
-    <tr>
-      <td>NULLIF(value, value)</td>
-      <td>Returns NULL if the values are the same. For example, NULLIF(5, 5) returns NULL; NULLIF(5, 0) returns 5.</td>
-    </tr>
-    <tr>
-      <td>COALESCE(value, value [, value ]*)</td>
-      <td>Provides a value if the first value is null. For example, COALESCE(NULL, 5) returns 5.</td>
-    </tr>
-  </tbody>
-</table>
-
-      </div>
-    </div>
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<footer class="footer">
-  <div class="footer__contained">
-    <div class="footer__cols">
-      <div class="footer__cols__col">
-        <div class="footer__cols__col__logo">
-          <img src="/images/beam_logo_circle.svg" class="footer__logo" alt="Beam logo">
-        </div>
-        <div class="footer__cols__col__logo">
-          <img src="/images/apache_logo_circle.svg" class="footer__logo" alt="Apache logo">
-        </div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Start</div>
-        <div class="footer__cols__col__link"><a href="/get-started/beam-overview/">Overview</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-java/">Quickstart (Java)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-py/">Quickstart (Python)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-go/">Quickstart (Go)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/downloads/">Downloads</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Docs</div>
-        <div class="footer__cols__col__link"><a href="/documentation/programming-guide/">Concepts</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/pipelines/design-your-pipeline/">Pipelines</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/runners/capability-matrix/">Runners</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Community</div>
-        <div class="footer__cols__col__link"><a href="/contribute/">Contribute</a></div>
-        <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam" target="_blank">Team<img src="/images/external-link-icon.png"
-                                                                                                                                width="14" height="14"
-                                                                                                                                alt="External link."></a></div>
-        <div class="footer__cols__col__link"><a href="/contribute/presentation-materials/">Media</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Resources</div>
-        <div class="footer__cols__col__link"><a href="/blog/">Blog</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/support/">Support</a></div>
-        <div class="footer__cols__col__link"><a href="https://github.com/apache/beam">GitHub</a></div>
-      </div>
-    </div>
-  </div>
-  <div class="footer__bottom">
-    &copy;
-    <a href="http://www.apache.org">The Apache Software Foundation</a>
-    | <a href="/privacy_policy">Privacy Policy</a>
-    | <a href="/feed.xml">RSS Feed</a>
-    <br><br>
-    Apache Beam, Apache, Beam, the Beam logo, and the Apache feather logo are
-    either registered trademarks or trademarks of The Apache Software
-    Foundation. All other products or name brands are trademarks of their
-    respective holders, including The Apache Software Foundation.
-  </div>
-</footer>
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/scalar-functions/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/calcite/scalar-functions/">
+<h1>Redirecting…</h1>
+<a href="https://beam.apache.org/documentation/dsls/sql/calcite/scalar-functions/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/calcite/scalar-functions/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/set/index.html b/website/generated-content/documentation/dsls/sql/set/index.html
index e19fd78..d759e7c 100644
--- a/website/generated-content/documentation/dsls/sql/set/index.html
+++ b/website/generated-content/documentation/dsls/sql/set/index.html
@@ -1,374 +1,10 @@
 <!DOCTYPE html>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<html lang="en">
-  <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: SET and RESET Statement</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
-">
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
-  <link rel="stylesheet" href="/css/site.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script src="/js/language-switch.js"></script>
-  <script src="/js/fix-menu.js"></script>
-  <script src="/js/section-nav.js"></script>
-  <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/set/" data-proofer-ignore>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-73650088-1', 'auto');
-    ga('send', 'pageview');
-  </script>
-</head>
-
-  <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<nav class="header navbar navbar-fixed-top">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-    </div>
-
-    <div class="navbar-mask closed"></div>
-
-    <div id="navbar" class="navbar-container closed">
-      <ul class="nav navbar-nav">
-        <li>
-          <a href="/get-started/beam-overview/">Get Started</a>
-        </li>
-        <li>
-          <a href="/documentation/">Documentation</a>
-        </li>
-        <li>
-          <a href="/documentation/sdks/java/">Languages</a>
-        </li>
-        <li>
-          <a href="/documentation/runners/capability-matrix/">RUNNERS</a>
-        </li>
-        <li>
-          <a href="/roadmap/">Roadmap</a>
-        </li>
-        <li>
-          <a href="/contribute/">Contribute</a>
-        </li>
-        <li>
-          <a href="/community/contact-us/">Community</a>
-        </li>
-        <li><a href="/blog">Blog</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather_small.png" alt="Apache Logo" style="height:20px;"><span class="caret"></span></a>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="http://www.apache.org/">ASF Homepage</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</a></li>
-            <li><a href="http://www.apache.org/security/">Security</a></li>
-            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-            <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
-          </ul>
-        </li>
-        <li>
-          <!--
-            data-proofer-ignore disables link checking from website test automation.
-            GitHub links will not resolve until the markdown source is available on the master branch.
-            New pages would fail validation during development / PR test automation.
-          -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/set.md" data-proofer-ignore>
-            <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
-          </a>
-        </li>
-      </ul>
-    </div>
-</nav>
-
-    <div class="clearfix container-main-content">
-      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
-        <span class="section-nav-back glyphicon glyphicon-menu-left"></span>
-        <nav>
-          <ul class="section-nav-list" data-section-nav>
-            <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<li><span class="section-nav-list-main-title">Languages</span></li>
-
-<li>
-  <span class="section-nav-list-title">Java</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/java/">Java SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/" target="_blank">Java SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/java-dependencies/">Java SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/java-extensions/">Java SDK extensions</a></li>
-    <li><a href="/documentation/sdks/java-thirdparty/">Java 3rd party extensions</a></li>
-    <li><a href="/documentation/sdks/java/testing/nexmark/">Nexmark benchmark suite</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Python</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/python/">Python SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/pydoc/2.12.0/" target="_blank">Python SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/python-dependencies/">Python SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/python-streaming/">Python streaming pipelines</a></li>
-    <li><a href="/documentation/sdks/python-type-safety/">Ensuring Python type safety</a></li>
-    <li><a href="/documentation/sdks/python-pipeline-dependencies/">Managing pipeline dependencies</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Go</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/go/">Go SDK overview</a></li>
-    <li><a href="https://godoc.org/github.com/apache/beam/sdks/go/pkg/beam" target="_blank">Go SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">SQL</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/dsls/sql/overview/">Overview</a></li>
-    <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
-    <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
-    <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
-
-      <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
-      </ul>
-    </li>
-  </ul>
-</li>
-
-          </ul>
-        </nav>
-      </div>
-
-      <nav class="page-nav clearfix" data-offset-top="90" data-offset-bottom="500">
-        <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-
-
-<ul class="nav">
-  <li><a href="#syntax">Syntax</a></li>
-  <li><a href="#common-options">Common Options</a></li>
-</ul>
-
-
-      </nav>
-
-      <div class="body__contained body__section-nav">
-        <!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<h1 id="set-and-reset-pipeline-options">SET and RESET Pipeline Options</h1>
-
-<p>Beam SQL’s <code class="highlighter-rouge">SET</code> and <code class="highlighter-rouge">RESET</code> statements allow the user to <a href="/documentation/programming-guide/#configuring-pipeline-options">configure Pipeline
-Options</a>
-via the SQL shell. These are the same Pipeline Options passed to other Beam
-applications on the command line in the <code class="highlighter-rouge">--&lt;option&gt;=&lt;value&gt;</code> format.</p>
-
-<h2 id="syntax">Syntax</h2>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>SET option = value
-</code></pre>
-</div>
-
-<p>The SET command sets a Pipeline Option.</p>
-
-<ul>
-  <li><code class="highlighter-rouge">option</code>: The case sensitive name of the Pipeline Option, specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>.</li>
-  <li><code class="highlighter-rouge">value</code>: The case sensitive value of the Pipeline Option, specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>.
-For flag options that have no value on the command line, use <code class="highlighter-rouge">true</code>.</li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>RESET option
-</code></pre>
-</div>
-
-<p>The RESET command resets a Pipeline Option to its default value.</p>
-
-<ul>
-  <li><code class="highlighter-rouge">option</code>: The case sensitive name of the Pipeline Option, specified as an
-<a href="/documentation/dsls/sql/lexical/#identifiers">Identifier</a>.</li>
-</ul>
-
-<h2 id="common-options">Common Options</h2>
-
-<ul>
-  <li><code class="highlighter-rouge">SET project = `my_gcp_project`</code>: Sets the default GCP project
-to<code class="highlighter-rouge">my_gcp_project</code>.</li>
-  <li><code class="highlighter-rouge">SET runner = DataflowRunner</code>: Sets the pipeline to run on Dataflow.</li>
-</ul>
-
-      </div>
-    </div>
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<footer class="footer">
-  <div class="footer__contained">
-    <div class="footer__cols">
-      <div class="footer__cols__col">
-        <div class="footer__cols__col__logo">
-          <img src="/images/beam_logo_circle.svg" class="footer__logo" alt="Beam logo">
-        </div>
-        <div class="footer__cols__col__logo">
-          <img src="/images/apache_logo_circle.svg" class="footer__logo" alt="Apache logo">
-        </div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Start</div>
-        <div class="footer__cols__col__link"><a href="/get-started/beam-overview/">Overview</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-java/">Quickstart (Java)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-py/">Quickstart (Python)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-go/">Quickstart (Go)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/downloads/">Downloads</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Docs</div>
-        <div class="footer__cols__col__link"><a href="/documentation/programming-guide/">Concepts</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/pipelines/design-your-pipeline/">Pipelines</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/runners/capability-matrix/">Runners</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Community</div>
-        <div class="footer__cols__col__link"><a href="/contribute/">Contribute</a></div>
-        <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam" target="_blank">Team<img src="/images/external-link-icon.png"
-                                                                                                                                width="14" height="14"
-                                                                                                                                alt="External link."></a></div>
-        <div class="footer__cols__col__link"><a href="/contribute/presentation-materials/">Media</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Resources</div>
-        <div class="footer__cols__col__link"><a href="/blog/">Blog</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/support/">Support</a></div>
-        <div class="footer__cols__col__link"><a href="https://github.com/apache/beam">GitHub</a></div>
-      </div>
-    </div>
-  </div>
-  <div class="footer__bottom">
-    &copy;
-    <a href="http://www.apache.org">The Apache Software Foundation</a>
-    | <a href="/privacy_policy">Privacy Policy</a>
-    | <a href="/feed.xml">RSS Feed</a>
-    <br><br>
-    Apache Beam, Apache, Beam, the Beam logo, and the Apache feather logo are
-    either registered trademarks or trademarks of The Apache Software
-    Foundation. All other products or name brands are trademarks of their
-    respective holders, including The Apache Software Foundation.
-  </div>
-</footer>
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/set/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/extensions/set/">
+<h1>Redirecting…</h1>
+<a href="https://beam.apache.org/documentation/dsls/sql/extensions/set/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/extensions/set/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/shell/index.html b/website/generated-content/documentation/dsls/sql/shell/index.html
index 01d9bc7..f707161 100644
--- a/website/generated-content/documentation/dsls/sql/shell/index.html
+++ b/website/generated-content/documentation/dsls/sql/shell/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
@@ -336,7 +343,7 @@ No rows affected (0.042 seconds)
 </code></pre>
 </div>
 
-<p><em>For more information about <code class="highlighter-rouge">SELECT</code> syntax, see the <a href="/documentation/dsls/sql/select/">SELECT reference page</a>.</em></p>
+<p><em>For more information about <code class="highlighter-rouge">SELECT</code> syntax, see the <a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax page</a>.</em></p>
 
 <p>To write data to the CSV file, use the <code class="highlighter-rouge">INSERT INTO … SELECT ...</code> statement:</p>
 
diff --git a/website/generated-content/documentation/dsls/sql/statements/create-table/index.html b/website/generated-content/documentation/dsls/sql/statements/create-table/index.html
index d1ba0da..690eeb3 100644
--- a/website/generated-content/documentation/dsls/sql/statements/create-table/index.html
+++ b/website/generated-content/documentation/dsls/sql/statements/create-table/index.html
@@ -2,9 +2,9 @@
 <html lang="en-US">
 <meta charset="utf-8">
 <title>Redirecting…</title>
-<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/create-external-table/">
-<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/create-external-table/">
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/">
 <h1>Redirecting…</h1>
-<a href="https://beam.apache.org/documentation/dsls/sql/create-external-table/">Click here if you are not redirected.</a>
-<script>location="https://beam.apache.org/documentation/dsls/sql/create-external-table/"</script>
+<a href="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/extensions/create-external-table/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/statements/select/index.html b/website/generated-content/documentation/dsls/sql/statements/select/ /documentation/dsls/sql/select/index.html
similarity index 56%
rename from website/generated-content/documentation/dsls/sql/statements/select/index.html
rename to website/generated-content/documentation/dsls/sql/statements/select/ /documentation/dsls/sql/select/index.html
index 5aed04a..4e26b56 100644
--- a/website/generated-content/documentation/dsls/sql/statements/select/index.html
+++ b/website/generated-content/documentation/dsls/sql/statements/select/ /documentation/dsls/sql/select/index.html	
@@ -2,9 +2,9 @@
 <html lang="en-US">
 <meta charset="utf-8">
 <title>Redirecting…</title>
-<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/select/">
-<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/select/">
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/calcite/query-syntax/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/calcite/query-syntax/">
 <h1>Redirecting…</h1>
-<a href="https://beam.apache.org/documentation/dsls/sql/select/">Click here if you are not redirected.</a>
-<script>location="https://beam.apache.org/documentation/dsls/sql/select/"</script>
+<a href="https://beam.apache.org/documentation/dsls/sql/calcite/query-syntax/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/calcite/query-syntax/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/user-defined-functions/index.html b/website/generated-content/documentation/dsls/sql/user-defined-functions/index.html
index a8e8831..003ff95 100644
--- a/website/generated-content/documentation/dsls/sql/user-defined-functions/index.html
+++ b/website/generated-content/documentation/dsls/sql/user-defined-functions/index.html
@@ -1,437 +1,10 @@
 <!DOCTYPE html>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<html lang="en">
-  <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam SQL: User-defined functions</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
-">
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
-  <link rel="stylesheet" href="/css/site.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script src="/js/language-switch.js"></script>
-  <script src="/js/fix-menu.js"></script>
-  <script src="/js/section-nav.js"></script>
-  <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/user-defined-functions/" data-proofer-ignore>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-73650088-1', 'auto');
-    ga('send', 'pageview');
-  </script>
-</head>
-
-  <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<nav class="header navbar navbar-fixed-top">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-    </div>
-
-    <div class="navbar-mask closed"></div>
-
-    <div id="navbar" class="navbar-container closed">
-      <ul class="nav navbar-nav">
-        <li>
-          <a href="/get-started/beam-overview/">Get Started</a>
-        </li>
-        <li>
-          <a href="/documentation/">Documentation</a>
-        </li>
-        <li>
-          <a href="/documentation/sdks/java/">Languages</a>
-        </li>
-        <li>
-          <a href="/documentation/runners/capability-matrix/">RUNNERS</a>
-        </li>
-        <li>
-          <a href="/roadmap/">Roadmap</a>
-        </li>
-        <li>
-          <a href="/contribute/">Contribute</a>
-        </li>
-        <li>
-          <a href="/community/contact-us/">Community</a>
-        </li>
-        <li><a href="/blog">Blog</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather_small.png" alt="Apache Logo" style="height:20px;"><span class="caret"></span></a>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="http://www.apache.org/">ASF Homepage</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</a></li>
-            <li><a href="http://www.apache.org/security/">Security</a></li>
-            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-            <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
-          </ul>
-        </li>
-        <li>
-          <!--
-            data-proofer-ignore disables link checking from website test automation.
-            GitHub links will not resolve until the markdown source is available on the master branch.
-            New pages would fail validation during development / PR test automation.
-          -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/user-defined-functions.md" data-proofer-ignore>
-            <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
-          </a>
-        </li>
-      </ul>
-    </div>
-</nav>
-
-    <div class="clearfix container-main-content">
-      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
-        <span class="section-nav-back glyphicon glyphicon-menu-left"></span>
-        <nav>
-          <ul class="section-nav-list" data-section-nav>
-            <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<li><span class="section-nav-list-main-title">Languages</span></li>
-
-<li>
-  <span class="section-nav-list-title">Java</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/java/">Java SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/" target="_blank">Java SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/java-dependencies/">Java SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/java-extensions/">Java SDK extensions</a></li>
-    <li><a href="/documentation/sdks/java-thirdparty/">Java 3rd party extensions</a></li>
-    <li><a href="/documentation/sdks/java/testing/nexmark/">Nexmark benchmark suite</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Python</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/python/">Python SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/pydoc/2.12.0/" target="_blank">Python SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/python-dependencies/">Python SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/python-streaming/">Python streaming pipelines</a></li>
-    <li><a href="/documentation/sdks/python-type-safety/">Ensuring Python type safety</a></li>
-    <li><a href="/documentation/sdks/python-pipeline-dependencies/">Managing pipeline dependencies</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Go</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/go/">Go SDK overview</a></li>
-    <li><a href="https://godoc.org/github.com/apache/beam/sdks/go/pkg/beam" target="_blank">Go SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">SQL</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/dsls/sql/overview/">Overview</a></li>
-    <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
-    <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
-    <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
-
-      <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
-      </ul>
-    </li>
-  </ul>
-</li>
-
-          </ul>
-        </nav>
-      </div>
-
-      <nav class="page-nav clearfix" data-offset-top="90" data-offset-bottom="500">
-        <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-
-
-<ul class="nav">
-  <li><a href="#create-and-specify-user-defined-function-udf">Create and specify User Defined Function (UDF)</a></li>
-  <li><a href="#create-and-specify-user-defined-aggregate-function-udaf">Create and specify User Defined Aggregate Function (UDAF)</a></li>
-</ul>
-
-
-      </nav>
-
-      <div class="body__contained body__section-nav">
-        <!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<h1 id="beam-sql-user-defined-functions">Beam SQL: User-defined functions</h1>
-
-<p>If Beam SQL does not have a scalar function or aggregate function to meet your
-needs, they can be authored in Java and invoked in your SQL query. These
-are commonly called UDF (for scalar functions) and UDAFs (for aggregate functions).</p>
-
-<h2 id="create-and-specify-user-defined-function-udf">Create and specify User Defined Function (UDF)</h2>
-
-<p>A UDF can be 1) any Java method that takes zero or more scalar fields and
-return one scalar value, or 2) a <code class="highlighter-rouge">SerializableFunction</code>. Below is an example of
-UDF and how to use it in DSL:</p>
-
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="cm">/**
- * A example UDF for test.
- */</span>
-<span class="kd">public</span> <span class="kd">static</span> <span class="kd">class</span> <span class="nc">CubicInteger</span> <span class="kd">implements</span> <span class="n">BeamSqlUdf</span> <span class="o">{</span>
-  <span class="kd">public</span> <span class="kd">static</span> <span class="n">Integer</span> <span class="nf">eval</span><span class="o">(</span><span class="n">Integer</span> <span class="n">input</span><span class="o">){</span>
-    <span class="k">return</span> <span class="n">input</span> <span class="o">*</span> <span class="n">input</span> <span class="o">*</span> <span class="n">input</span><span class="o">;</span>
-  <span class="o">}</span>
-<span class="o">}</span>
-
-<span class="cm">/**
- * Another example UDF with {@link SerializableFunction}.
- */</span>
-<span class="kd">public</span> <span class="kd">static</span> <span class="kd">class</span> <span class="nc">CubicIntegerFn</span> <span class="kd">implements</span> <span class="n">SerializableFunction</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;</span> <span class="o">{</span>
-  <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">Integer</span> <span class="nf">apply</span><span class="o">(</span><span class="n">Integer</span> <span class="n">input</span><span class="o">)</span> <span class="o">{</span>
-    <span class="k">return</span> <span class="n">input</span> <span class="o">*</span> <span class="n">input</span> <span class="o">*</span> <span class="n">input</span><span class="o">;</span>
-  <span class="o">}</span>
-<span class="o">}</span>
-
-<span class="c1">// Define a SQL query which calls the above UDFs</span>
-<span class="n">String</span> <span class="n">sql</span> <span class="o">=</span> 
-    <span class="s">"SELECT f_int, cubic1(f_int), cubic2(f_int)"</span>
-      <span class="o">+</span> <span class="s">"FROM PCOLLECTION "</span>
-      <span class="o">+</span> <span class="s">"WHERE f_int = 2"</span><span class="o">;</span>
-
-<span class="c1">// Create and apply the PTransform representing the query.</span>
-<span class="c1">// Register the UDFs used in the query by calling '.registerUdf()' with </span>
-<span class="c1">// either a class which implements BeamSqlUdf or with </span>
-<span class="c1">// an instance of the SerializableFunction;</span>
-<span class="n">PCollection</span><span class="o">&lt;</span><span class="n">Row</span><span class="o">&gt;</span> <span class="n">result</span> <span class="o">=</span>
-    <span class="n">input</span><span class="o">.</span><span class="na">apply</span><span class="o">(</span>
-        <span class="s">"udfExample"</span><span class="o">,</span>
-        <span class="n">SqlTransform</span>
-            <span class="o">.</span><span class="na">query</span><span class="o">(</span><span class="n">sql</span><span class="o">)</span>
-            <span class="o">.</span><span class="na">registerUdf</span><span class="o">(</span><span class="s">"cubic1"</span><span class="o">,</span> <span class="n">CubicInteger</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
-            <span class="o">.</span><span class="na">registerUdf</span><span class="o">(</span><span class="s">"cubic2"</span><span class="o">,</span> <span class="k">new</span> <span class="n">CubicIntegerFn</span><span class="o">())</span>
-</code></pre>
-</div>
-
-<h2 id="create-and-specify-user-defined-aggregate-function-udaf">Create and specify User Defined Aggregate Function (UDAF)</h2>
-
-<p>Beam SQL can accept a <code class="highlighter-rouge">CombineFn</code> as UDAF. Registration is similar to the UDF
-example above:</p>
-
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="cm">/**
- * UDAF(CombineFn) for test, which returns the sum of square.
- */</span>
-<span class="kd">public</span> <span class="kd">static</span> <span class="kd">class</span> <span class="nc">SquareSum</span> <span class="kd">extends</span> <span class="n">CombineFn</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">,</span> <span class="n">Integer</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;</span> <span class="o">{</span>
-  <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">Integer</span> <span class="nf">createAccumulator</span><span class="o">()</span> <span class="o">{</span>
-    <span class="k">return</span> <span class="mi">0</span><span class="o">;</span>
-  <span class="o">}</span>
-
-  <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">Integer</span> <span class="nf">addInput</span><span class="o">(</span><span class="n">Integer</span> <span class="n">accumulator</span><span class="o">,</span> <span class="n">Integer</span> <span class="n">input</span><span class="o">)</span> <span class="o">{</span>
-    <span class="k">return</span> <span class="n">accumulator</span> <span class="o">+</span> <span class="n">input</span> <span class="o">*</span> <span class="n">input</span><span class="o">;</span>
-  <span class="o">}</span>
-
-  <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">Integer</span> <span class="nf">mergeAccumulators</span><span class="o">(</span><span class="n">Iterable</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;</span> <span class="n">accumulators</span><span class="o">)</span> <span class="o">{</span>
-    <span class="kt">int</span> <span class="n">v</span> <span class="o">=</span> <span class="mi">0</span><span class="o">;</span>
-    <span class="n">Iterator</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;</span> <span class="n">ite</span> <span class="o">=</span> <span class="n">accumulators</span><span class="o">.</span><span class="na">iterator</span><span class="o">();</span>
-    <span class="k">while</span> <span class="o">(</span><span class="n">ite</span><span class="o">.</span><span class="na">hasNext</span><span class="o">())</span> <span class="o">{</span>
-      <span class="n">v</span> <span class="o">+=</span> <span class="n">ite</span><span class="o">.</span><span class="na">next</span><span class="o">();</span>
-    <span class="o">}</span>
-    <span class="k">return</span> <span class="n">v</span><span class="o">;</span>
-  <span class="o">}</span>
-
-  <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">Integer</span> <span class="nf">extractOutput</span><span class="o">(</span><span class="n">Integer</span> <span class="n">accumulator</span><span class="o">)</span> <span class="o">{</span>
-    <span class="k">return</span> <span class="n">accumulator</span><span class="o">;</span>
-  <span class="o">}</span>
-<span class="o">}</span>
-
-<span class="c1">// Define a SQL query which calls the above UDAF</span>
-<span class="n">String</span> <span class="n">sql</span> <span class="o">=</span> 
-    <span class="s">"SELECT f_int1, squaresum(f_int2) "</span>
-      <span class="o">+</span> <span class="s">"FROM PCOLLECTION "</span>
-      <span class="o">+</span> <span class="s">"GROUP BY f_int2"</span><span class="o">;</span>
-      
-<span class="c1">// Create and apply the PTransform representing the query.</span>
-<span class="c1">// Register the UDAFs used in the query by calling '.registerUdaf()' by </span>
-<span class="c1">// providing it an instance of the CombineFn</span>
-<span class="n">PCollection</span><span class="o">&lt;</span><span class="n">Row</span><span class="o">&gt;</span> <span class="n">result</span> <span class="o">=</span>
-    <span class="n">input</span><span class="o">.</span><span class="na">apply</span><span class="o">(</span>
-        <span class="s">"udafExample"</span><span class="o">,</span>
-        <span class="n">SqlTransform</span>
-            <span class="o">.</span><span class="na">query</span><span class="o">(</span><span class="n">sql</span><span class="o">)</span>
-            <span class="o">.</span><span class="na">registerUdaf</span><span class="o">(</span><span class="s">"squaresum"</span><span class="o">,</span> <span class="k">new</span> <span class="n">SquareSum</span><span class="o">()));</span>
-</code></pre>
-</div>
-
-
-      </div>
-    </div>
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<footer class="footer">
-  <div class="footer__contained">
-    <div class="footer__cols">
-      <div class="footer__cols__col">
-        <div class="footer__cols__col__logo">
-          <img src="/images/beam_logo_circle.svg" class="footer__logo" alt="Beam logo">
-        </div>
-        <div class="footer__cols__col__logo">
-          <img src="/images/apache_logo_circle.svg" class="footer__logo" alt="Apache logo">
-        </div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Start</div>
-        <div class="footer__cols__col__link"><a href="/get-started/beam-overview/">Overview</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-java/">Quickstart (Java)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-py/">Quickstart (Python)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-go/">Quickstart (Go)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/downloads/">Downloads</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Docs</div>
-        <div class="footer__cols__col__link"><a href="/documentation/programming-guide/">Concepts</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/pipelines/design-your-pipeline/">Pipelines</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/runners/capability-matrix/">Runners</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Community</div>
-        <div class="footer__cols__col__link"><a href="/contribute/">Contribute</a></div>
-        <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam" target="_blank">Team<img src="/images/external-link-icon.png"
-                                                                                                                                width="14" height="14"
-                                                                                                                                alt="External link."></a></div>
-        <div class="footer__cols__col__link"><a href="/contribute/presentation-materials/">Media</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Resources</div>
-        <div class="footer__cols__col__link"><a href="/blog/">Blog</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/support/">Support</a></div>
-        <div class="footer__cols__col__link"><a href="https://github.com/apache/beam">GitHub</a></div>
-      </div>
-    </div>
-  </div>
-  <div class="footer__bottom">
-    &copy;
-    <a href="http://www.apache.org">The Apache Software Foundation</a>
-    | <a href="/privacy_policy">Privacy Policy</a>
-    | <a href="/feed.xml">RSS Feed</a>
-    <br><br>
-    Apache Beam, Apache, Beam, the Beam logo, and the Apache feather logo are
-    either registered trademarks or trademarks of The Apache Software
-    Foundation. All other products or name brands are trademarks of their
-    respective holders, including The Apache Software Foundation.
-  </div>
-</footer>
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/user-defined-functions/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/extensions/user-defined-functions/">
+<h1>Redirecting…</h1>
+<a href="https://beam.apache.org/documentation/dsls/sql/extensions/user-defined-functions/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/extensions/user-defined-functions/"</script>
 </html>
diff --git a/website/generated-content/documentation/dsls/sql/walkthrough/index.html b/website/generated-content/documentation/dsls/sql/walkthrough/index.html
index 4287891..4bcc202 100644
--- a/website/generated-content/documentation/dsls/sql/walkthrough/index.html
+++ b/website/generated-content/documentation/dsls/sql/walkthrough/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/dsls/sql/windowing-and-triggering/index.html b/website/generated-content/documentation/dsls/sql/windowing-and-triggering/index.html
index 1937f9d..046f717 100644
--- a/website/generated-content/documentation/dsls/sql/windowing-and-triggering/index.html
+++ b/website/generated-content/documentation/dsls/sql/windowing-and-triggering/index.html
@@ -1,382 +1,10 @@
 <!DOCTYPE html>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<html lang="en">
-  <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Beam DSLs: SQL</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow  [...]
-">
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
-  <link rel="stylesheet" href="/css/site.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script src="/js/language-switch.js"></script>
-  <script src="/js/fix-menu.js"></script>
-  <script src="/js/section-nav.js"></script>
-  <script src="/js/page-nav.js"></script>
-  <link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/windowing-and-triggering/" data-proofer-ignore>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-73650088-1', 'auto');
-    ga('send', 'pageview');
-  </script>
-</head>
-
-  <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<nav class="header navbar navbar-fixed-top">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-    </div>
-
-    <div class="navbar-mask closed"></div>
-
-    <div id="navbar" class="navbar-container closed">
-      <ul class="nav navbar-nav">
-        <li>
-          <a href="/get-started/beam-overview/">Get Started</a>
-        </li>
-        <li>
-          <a href="/documentation/">Documentation</a>
-        </li>
-        <li>
-          <a href="/documentation/sdks/java/">Languages</a>
-        </li>
-        <li>
-          <a href="/documentation/runners/capability-matrix/">RUNNERS</a>
-        </li>
-        <li>
-          <a href="/roadmap/">Roadmap</a>
-        </li>
-        <li>
-          <a href="/contribute/">Contribute</a>
-        </li>
-        <li>
-          <a href="/community/contact-us/">Community</a>
-        </li>
-        <li><a href="/blog">Blog</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather_small.png" alt="Apache Logo" style="height:20px;"><span class="caret"></span></a>
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li><a href="http://www.apache.org/">ASF Homepage</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</a></li>
-            <li><a href="http://www.apache.org/security/">Security</a></li>
-            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-            <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
-          </ul>
-        </li>
-        <li>
-          <!--
-            data-proofer-ignore disables link checking from website test automation.
-            GitHub links will not resolve until the markdown source is available on the master branch.
-            New pages would fail validation during development / PR test automation.
-          -->
-          <a href="https://github.com/apache/beam/edit/master/website/src/documentation/dsls/sql/windowing-and-triggering.md" data-proofer-ignore>
-            <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
-          </a>
-        </li>
-      </ul>
-    </div>
-</nav>
-
-    <div class="clearfix container-main-content">
-      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
-        <span class="section-nav-back glyphicon glyphicon-menu-left"></span>
-        <nav>
-          <ul class="section-nav-list" data-section-nav>
-            <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<li><span class="section-nav-list-main-title">Languages</span></li>
-
-<li>
-  <span class="section-nav-list-title">Java</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/java/">Java SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/javadoc/2.12.0/" target="_blank">Java SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/java-dependencies/">Java SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/java-extensions/">Java SDK extensions</a></li>
-    <li><a href="/documentation/sdks/java-thirdparty/">Java 3rd party extensions</a></li>
-    <li><a href="/documentation/sdks/java/testing/nexmark/">Nexmark benchmark suite</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Python</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/python/">Python SDK overview</a></li>
-    <li><a href="https://beam.apache.org/releases/pydoc/2.12.0/" target="_blank">Python SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-    <li><a href="/documentation/sdks/python-dependencies/">Python SDK dependencies</a></li>
-    <li><a href="/documentation/sdks/python-streaming/">Python streaming pipelines</a></li>
-    <li><a href="/documentation/sdks/python-type-safety/">Ensuring Python type safety</a></li>
-    <li><a href="/documentation/sdks/python-pipeline-dependencies/">Managing pipeline dependencies</a></li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">Go</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/sdks/go/">Go SDK overview</a></li>
-    <li><a href="https://godoc.org/github.com/apache/beam/sdks/go/pkg/beam" target="_blank">Go SDK API reference <img src="/images/external-link-icon.png"
-                                                                                                                                   width="14" height="14"
-                                                                                                                                   alt="External link."></a>
-    </li>
-  </ul>
-</li>
-
-<li>
-  <span class="section-nav-list-title">SQL</span>
-  <ul class="section-nav-list">
-    <li><a href="/documentation/dsls/sql/overview/">Overview</a></li>
-    <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
-    <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
-    <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
-
-      <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
-      </ul>
-    </li>
-  </ul>
-</li>
-
-          </ul>
-        </nav>
-      </div>
-
-      <nav class="page-nav clearfix" data-offset-top="90" data-offset-bottom="500">
-        <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-
-
-
-
-      </nav>
-
-      <div class="body__contained body__section-nav">
-        <!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<h1 id="beam-sql-windowing-and-triggering">Beam SQL: Windowing and triggering</h1>
-
-<p>You can use Beam’s windowing semantics in two ways:</p>
-
-<ul>
-  <li>you can configure windowing on your input <code class="highlighter-rouge">PCollections</code> before passing them
-to a <code class="highlighter-rouge">BeamSql</code> transform</li>
-  <li>you can use windowing extensions in your windowing query, which will override
-the windowing of your input <code class="highlighter-rouge">PCollections</code></li>
-</ul>
-
-<p>Triggering can only be used by setting it on your input <code class="highlighter-rouge">PCollections</code>; there
-are no SQL extensions for specifying triggering.</p>
-
-<p>This section covers the use of SQL extensions to directly apply windowing.</p>
-
-<p>Beam SQL supports windowing functions specified in <code class="highlighter-rouge">GROUP BY</code> clause.
-<code class="highlighter-rouge">TIMESTAMP</code> field is required in this case. It is used as event timestamp for
-rows.</p>
-
-<p>Supported windowing functions:</p>
-<ul>
-  <li><code class="highlighter-rouge">TUMBLE</code>, or fixed windows. Example of how define a fixed window with duration of 1 hour:
-    <div class="highlighter-rouge"><pre class="highlight"><code>  SELECT f_int, COUNT(*) 
-  FROM PCOLLECTION 
-  GROUP BY 
-    f_int,
-    TUMBLE(f_timestamp, INTERVAL '1' HOUR)
-</code></pre>
-    </div>
-  </li>
-  <li><code class="highlighter-rouge">HOP</code>, or sliding windows. Example of how to define a sliding windows for every 30 minutes with 1 hour duration:
-    <div class="highlighter-rouge"><pre class="highlight"><code>  SELECT f_int, COUNT(*)
-  FROM PCOLLECTION 
-  GROUP BY 
-    f_int, 
-    HOP(f_timestamp, INTERVAL '30' MINUTE, INTERVAL '1' HOUR)
-</code></pre>
-    </div>
-  </li>
-  <li><code class="highlighter-rouge">SESSION</code>, session windows. Example of how to define a session window with 5 minutes gap duration:
-    <div class="highlighter-rouge"><pre class="highlight"><code>  SELECT f_int, COUNT(*) 
-  FROM PCOLLECTION 
-  GROUP BY 
-    f_int, 
-    SESSION(f_timestamp, INTERVAL '5' MINUTE)
-</code></pre>
-    </div>
-  </li>
-</ul>
-
-<p><strong>Note:</strong> when no windowing function is specified in the query, then windowing strategy of the input <code class="highlighter-rouge">PCollections</code> is unchanged by the SQL query. If windowing function is specified in the query, then the windowing function of the <code class="highlighter-rouge">PCollection</code> is updated accordingly, but trigger stays unchanged.</p>
-
-
-      </div>
-    </div>
-    <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<footer class="footer">
-  <div class="footer__contained">
-    <div class="footer__cols">
-      <div class="footer__cols__col">
-        <div class="footer__cols__col__logo">
-          <img src="/images/beam_logo_circle.svg" class="footer__logo" alt="Beam logo">
-        </div>
-        <div class="footer__cols__col__logo">
-          <img src="/images/apache_logo_circle.svg" class="footer__logo" alt="Apache logo">
-        </div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Start</div>
-        <div class="footer__cols__col__link"><a href="/get-started/beam-overview/">Overview</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-java/">Quickstart (Java)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-py/">Quickstart (Python)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/quickstart-go/">Quickstart (Go)</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/downloads/">Downloads</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Docs</div>
-        <div class="footer__cols__col__link"><a href="/documentation/programming-guide/">Concepts</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/pipelines/design-your-pipeline/">Pipelines</a></div>
-        <div class="footer__cols__col__link"><a href="/documentation/runners/capability-matrix/">Runners</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Community</div>
-        <div class="footer__cols__col__link"><a href="/contribute/">Contribute</a></div>
-        <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam" target="_blank">Team<img src="/images/external-link-icon.png"
-                                                                                                                                width="14" height="14"
-                                                                                                                                alt="External link."></a></div>
-        <div class="footer__cols__col__link"><a href="/contribute/presentation-materials/">Media</a></div>
-      </div>
-      <div class="footer__cols__col footer__cols__col--md">
-        <div class="footer__cols__col__title">Resources</div>
-        <div class="footer__cols__col__link"><a href="/blog/">Blog</a></div>
-        <div class="footer__cols__col__link"><a href="/get-started/support/">Support</a></div>
-        <div class="footer__cols__col__link"><a href="https://github.com/apache/beam">GitHub</a></div>
-      </div>
-    </div>
-  </div>
-  <div class="footer__bottom">
-    &copy;
-    <a href="http://www.apache.org">The Apache Software Foundation</a>
-    | <a href="/privacy_policy">Privacy Policy</a>
-    | <a href="/feed.xml">RSS Feed</a>
-    <br><br>
-    Apache Beam, Apache, Beam, the Beam logo, and the Apache feather logo are
-    either registered trademarks or trademarks of The Apache Software
-    Foundation. All other products or name brands are trademarks of their
-    respective holders, including The Apache Software Foundation.
-  </div>
-</footer>
-
-  </body>
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="https://beam.apache.org/documentation/dsls/sql/extensions/windowing-and-triggering/">
+<meta http-equiv="refresh" content="0; url=https://beam.apache.org/documentation/dsls/sql/extensions/windowing-and-triggering/">
+<h1>Redirecting…</h1>
+<a href="https://beam.apache.org/documentation/dsls/sql/extensions/windowing-and-triggering/">Click here if you are not redirected.</a>
+<script>location="https://beam.apache.org/documentation/dsls/sql/extensions/windowing-and-triggering/"</script>
 </html>
diff --git a/website/generated-content/documentation/sdks/feature-comparison/index.html b/website/generated-content/documentation/sdks/feature-comparison/index.html
index 92e2ba5..786bc6d 100644
--- a/website/generated-content/documentation/sdks/feature-comparison/index.html
+++ b/website/generated-content/documentation/sdks/feature-comparison/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/go/index.html b/website/generated-content/documentation/sdks/go/index.html
index 19b74b5..41a4fc4 100644
--- a/website/generated-content/documentation/sdks/go/index.html
+++ b/website/generated-content/documentation/sdks/go/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/java-dependencies/index.html b/website/generated-content/documentation/sdks/java-dependencies/index.html
index ecda5bb..3b6a091 100644
--- a/website/generated-content/documentation/sdks/java-dependencies/index.html
+++ b/website/generated-content/documentation/sdks/java-dependencies/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/java-extensions/index.html b/website/generated-content/documentation/sdks/java-extensions/index.html
index 2702017..f80f5ba 100644
--- a/website/generated-content/documentation/sdks/java-extensions/index.html
+++ b/website/generated-content/documentation/sdks/java-extensions/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/java-thirdparty/index.html b/website/generated-content/documentation/sdks/java-thirdparty/index.html
index a2f0f8b..2cee033 100644
--- a/website/generated-content/documentation/sdks/java-thirdparty/index.html
+++ b/website/generated-content/documentation/sdks/java-thirdparty/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/java/euphoria/index.html b/website/generated-content/documentation/sdks/java/euphoria/index.html
index 47dc379..1a00d76 100644
--- a/website/generated-content/documentation/sdks/java/euphoria/index.html
+++ b/website/generated-content/documentation/sdks/java/euphoria/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/java/index.html b/website/generated-content/documentation/sdks/java/index.html
index dab615d..ce752db 100644
--- a/website/generated-content/documentation/sdks/java/index.html
+++ b/website/generated-content/documentation/sdks/java/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/java/testing/nexmark/index.html b/website/generated-content/documentation/sdks/java/testing/nexmark/index.html
index 3499be2..c397486 100644
--- a/website/generated-content/documentation/sdks/java/testing/nexmark/index.html
+++ b/website/generated-content/documentation/sdks/java/testing/nexmark/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/python-dependencies/index.html b/website/generated-content/documentation/sdks/python-dependencies/index.html
index ec7c4dd..4c70f0c 100644
--- a/website/generated-content/documentation/sdks/python-dependencies/index.html
+++ b/website/generated-content/documentation/sdks/python-dependencies/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/python-pipeline-dependencies/index.html b/website/generated-content/documentation/sdks/python-pipeline-dependencies/index.html
index 96d4507..24159c1 100644
--- a/website/generated-content/documentation/sdks/python-pipeline-dependencies/index.html
+++ b/website/generated-content/documentation/sdks/python-pipeline-dependencies/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/python-streaming/index.html b/website/generated-content/documentation/sdks/python-streaming/index.html
index 43a1d71..5d304f4 100644
--- a/website/generated-content/documentation/sdks/python-streaming/index.html
+++ b/website/generated-content/documentation/sdks/python-streaming/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/python-type-safety/index.html b/website/generated-content/documentation/sdks/python-type-safety/index.html
index 6c2f14f..d5012a1 100644
--- a/website/generated-content/documentation/sdks/python-type-safety/index.html
+++ b/website/generated-content/documentation/sdks/python-type-safety/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>
diff --git a/website/generated-content/documentation/sdks/python/index.html b/website/generated-content/documentation/sdks/python/index.html
index 7c88227..ade9ad9 100644
--- a/website/generated-content/documentation/sdks/python/index.html
+++ b/website/generated-content/documentation/sdks/python/index.html
@@ -200,19 +200,26 @@
     <li><a href="/documentation/dsls/sql/walkthrough/">Walkthrough</a></li>
     <li><a href="/documentation/dsls/sql/shell/">Shell</a></li>
     <li class="section-nav-item--collapsible">
-      <span class="section-nav-list-title">SQL Reference</span>
+      <span class="section-nav-list-title">Apache Calcite dialect</span>
 
       <ul class="section-nav-list">
-        <li><a href="/documentation/dsls/sql/data-types/">Data types</a></li>
-        <li><a href="/documentation/dsls/sql/lexical/">Lexical structure</a></li>
-        <li><a href="/documentation/dsls/sql/create-external-table/">CREATE EXTERNAL TABLE</a></li>
-        <li><a href="/documentation/dsls/sql/select/">SELECT</a></li>
-        <li><a href="/documentation/dsls/sql/windowing-and-triggering/">Windowing & Triggering</a></li>
-        <li><a href="/documentation/dsls/sql/joins/">Joins</a></li>
-        <li><a href="/documentation/dsls/sql/scalar-functions/">Scalar functions</a></li>
-        <li><a href="/documentation/dsls/sql/aggregate-functions/">Aggregate functions</a></li>
-        <li><a href="/documentation/dsls/sql/user-defined-functions/">User-defined functions</a></li>
-        <li><a href="/documentation/dsls/sql/set/">SET Pipeline Options</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/overview/">Calcite support overview</a></li>  
+        <li><a href="/documentation/dsls/sql/calcite/query-syntax/">Query syntax</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/lexical/">Lexical structure</a></li>        
+        <li><a href="/documentation/dsls/sql/calcite/data-types/">Data types</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/scalar-functions/">Scalar functions</a></li>
+        <li><a href="/documentation/dsls/sql/calcite/aggregate-functions/">Aggregate functions</a></li>
+      </ul>
+    </li>
+    <li class="section-nav-item--collapsible">
+      <span class="section-nav-list-title">Beam SQL extensions</span>
+
+      <ul class="section-nav-list">
+        <li><a href="/documentation/dsls/sql/extensions/create-external-table/">CREATE EXTERNAL TABLE</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/windowing-and-triggering/">Windowing & triggering</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/joins/">Joins</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/user-defined-functions/">User-defined functions</a></li>
+        <li><a href="/documentation/dsls/sql/extensions/set/">SET pipeline options</a></li>
       </ul>
     </li>
   </ul>