[SPARK-31612][SQL][DOCS][FOLLOW-UP] Fix a few issues in SQL ref

apache · May 22, 2020 · 6668a1f · 6668a1f
1 parent b3686a7
commit 6668a1f
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 54 deletions.
diff --git a/docs/_data/menu-sql.yaml b/docs/_data/menu-sql.yaml
@@ -76,14 +76,6 @@
 - text: SQL Reference
   url: sql-ref.html
   subitems:
-    - text: Data Types
-      url: sql-ref-datatypes.html
-    - text: Identifiers
-      url: sql-ref-identifier.html
-    - text: Literals
-      url: sql-ref-literals.html
-    - text: Null Semantics
-      url: sql-ref-null-semantics.html
     - text: ANSI Compliance
       url: sql-ref-ansi-compliance.html
       subitems:
@@ -93,6 +85,27 @@
           url: sql-ref-ansi-compliance.html#type-conversion
         - text: SQL Keywords
           url: sql-ref-ansi-compliance.html#sql-keywords
+    - text: Data Types
+      url: sql-ref-datatypes.html
+    - text: Datetime Pattern
+      url: sql-ref-datetime-pattern.html
+    - text: Functions
+      url: sql-ref-functions.html
+      subitems:
+      - text: Built-in Functions
+        url: sql-ref-functions-builtin.html
+      - text: Scalar UDFs (User-Defined Functions)
+        url: sql-ref-functions-udf-scalar.html
+      - text: UDAFs (User-Defined Aggregate Functions)
+        url: sql-ref-functions-udf-aggregate.html
+      - text: Integration with Hive UDFs/UDAFs/UDTFs
+        url: sql-ref-functions-udf-hive.html
+    - text: Identifiers
+      url: sql-ref-identifier.html
+    - text: Literals
+      url: sql-ref-literals.html
+    - text: Null Semantics
+      url: sql-ref-null-semantics.html
     - text: SQL Syntax
       url: sql-ref-syntax.html
       subitems:
@@ -247,16 +260,3 @@
                   url: sql-ref-syntax-aux-resource-mgmt-list-file.html
                 - text: LIST JAR
                   url: sql-ref-syntax-aux-resource-mgmt-list-jar.html
-    - text: Functions
-      url: sql-ref-functions.html
-      subitems:
-      - text: Built-in Functions
-        url: sql-ref-functions-builtin.html
-      - text: Scalar UDFs (User-Defined Functions)
-        url: sql-ref-functions-udf-scalar.html
-      - text: UDAFs (User-Defined Aggregate Functions)
-        url: sql-ref-functions-udf-aggregate.html
-      - text: Integration with Hive UDFs/UDAFs/UDTFs
-        url: sql-ref-functions-udf-hive.html
-    - text: Datetime Pattern
-      url: sql-ref-datetime-pattern.html
diff --git a/docs/sql-ref-syntax-qry.md b/docs/sql-ref-syntax-qry.md
@@ -27,21 +27,22 @@ to SELECT are also included in this section. Spark also provides the
 ability to generate logical and physical plan for a given query using
 [EXPLAIN](sql-ref-syntax-qry-explain.html) statement.
 
-* [WHERE Clause](sql-ref-syntax-qry-select-where.html)
-* [GROUP BY Clause](sql-ref-syntax-qry-select-groupby.html)
-* [HAVING Clause](sql-ref-syntax-qry-select-having.html)
-* [ORDER BY Clause](sql-ref-syntax-qry-select-orderby.html)
-* [SORT BY Clause](sql-ref-syntax-qry-select-sortby.html)
-* [CLUSTER BY Clause](sql-ref-syntax-qry-select-clusterby.html)
-* [DISTRIBUTE BY Clause](sql-ref-syntax-qry-select-distribute-by.html)
-* [LIMIT Clause](sql-ref-syntax-qry-select-limit.html)
-* [Common Table Expression](sql-ref-syntax-qry-select-cte.html)
-* [Inline Table](sql-ref-syntax-qry-select-inline-table.html)
-* [JOIN](sql-ref-syntax-qry-select-join.html)
-* [Join Hints](sql-ref-syntax-qry-select-hints.html)
-* [LIKE Predicate](sql-ref-syntax-qry-select-like.html)
-* [Set Operators](sql-ref-syntax-qry-select-setops.html)
-* [TABLESAMPLE](sql-ref-syntax-qry-sampling.html)
-* [Table-valued Function](sql-ref-syntax-qry-select-tvf.html)
-* [Window Function](sql-ref-syntax-qry-window.html)
+* [SELECT Statement](sql-ref-syntax-qry-select.html)
+  * [WHERE Clause](sql-ref-syntax-qry-select-where.html)
+  * [GROUP BY Clause](sql-ref-syntax-qry-select-groupby.html)
+  * [HAVING Clause](sql-ref-syntax-qry-select-having.html)
+  * [ORDER BY Clause](sql-ref-syntax-qry-select-orderby.html)
+  * [SORT BY Clause](sql-ref-syntax-qry-select-sortby.html)
+  * [CLUSTER BY Clause](sql-ref-syntax-qry-select-clusterby.html)
+  * [DISTRIBUTE BY Clause](sql-ref-syntax-qry-select-distribute-by.html)
+  * [LIMIT Clause](sql-ref-syntax-qry-select-limit.html)
+  * [Common Table Expression](sql-ref-syntax-qry-select-cte.html)
+  * [Inline Table](sql-ref-syntax-qry-select-inline-table.html)
+  * [JOIN](sql-ref-syntax-qry-select-join.html)
+  * [Join Hints](sql-ref-syntax-qry-select-hints.html)
+  * [LIKE Predicate](sql-ref-syntax-qry-select-like.html)
+  * [Set Operators](sql-ref-syntax-qry-select-setops.html)
+  * [TABLESAMPLE](sql-ref-syntax-qry-sampling.html)
+  * [Table-valued Function](sql-ref-syntax-qry-select-tvf.html)
+  * [Window Function](sql-ref-syntax-qry-window.html)
 * [EXPLAIN Statement](sql-ref-syntax-qry-explain.html)
diff --git a/docs/sql-ref-syntax.md b/docs/sql-ref-syntax.md
@@ -48,15 +48,25 @@ Spark SQL is Apache Spark's module for working with structured data. The SQL Syn
 
 ### Data Retrieval Statements
 
- * [CLUSTER BY Clause](sql-ref-syntax-qry-select-clusterby.html)
- * [DISTRIBUTE BY Clause](sql-ref-syntax-qry-select-distribute-by.html)
+ * [SELECT Statement](sql-ref-syntax-qry-select.html)
+   * [Common Table Expression](sql-ref-syntax-qry-select-cte.html)
+   * [CLUSTER BY Clause](sql-ref-syntax-qry-select-clusterby.html)
+   * [DISTRIBUTE BY Clause](sql-ref-syntax-qry-select-distribute-by.html)
+   * [GROUP BY Clause](sql-ref-syntax-qry-select-groupby.html)
+   * [HAVING Clause](sql-ref-syntax-qry-select-having.html)
+   * [Inline Table](sql-ref-syntax-qry-select-inline-table.html)
+   * [JOIN](sql-ref-syntax-qry-select-join.html)
+   * [Join Hints](sql-ref-syntax-qry-select-hints.html)
+   * [LIKE Predicate](sql-ref-syntax-qry-select-like.html)
+   * [LIMIT Clause](sql-ref-syntax-qry-select-limit.html)
+   * [ORDER BY Clause](sql-ref-syntax-qry-select-orderby.html)
+   * [Set Operators](sql-ref-syntax-qry-select-setops.html)
+   * [SORT BY Clause](sql-ref-syntax-qry-select-sortby.html)
+   * [TABLESAMPLE](sql-ref-syntax-qry-sampling.html)
+   * [Table-valued Function](sql-ref-syntax-qry-select-tvf.html)
+   * [WHERE Clause](sql-ref-syntax-qry-select-where.html)
+   * [Window Function](sql-ref-syntax-qry-window.html)
  * [EXPLAIN](sql-ref-syntax-qry-explain.html)
- * [GROUP BY Clause](sql-ref-syntax-qry-select-groupby.html)
- * [HAVING Clause](sql-ref-syntax-qry-select-having.html)
- * [LIMIT Clause](sql-ref-syntax-qry-select-limit.html)
- * [ORDER BY Clause](sql-ref-syntax-qry-select-orderby.html)
- * [SORT BY Clause](sql-ref-syntax-qry-select-sortby.html)
- * [WHERE Clause](sql-ref-syntax-qry-select-where.html)
 
 ### Auxiliary Statements
 

diff --git a/docs/sql-ref.md b/docs/sql-ref.md
@@ -21,19 +21,19 @@ license: |
 
 Spark SQL is Apache Spark's module for working with structured data. This guide is a reference for Structured Query Language (SQL) and includes syntax, semantics, keywords, and examples for common SQL usage. It contains information for the following topics:
 
+ * [ANSI Compliance](sql-ref-ansi-compliance.html)
  * [Data Types](sql-ref-datatypes.html)
+ * [Datetime Pattern](sql-ref-datetime-pattern.html)
+ * [Functions](sql-ref-functions.html)
+   * [Built-in Functions](sql-ref-functions-builtin.html)
+   * [Scalar User-Defined Functions (UDFs)](sql-ref-functions-udf-scalar.html)
+   * [User-Defined Aggregate Functions (UDAFs)](sql-ref-functions-udf-aggregate.html)
+   * [Integration with Hive UDFs/UDAFs/UDTFs](sql-ref-functions-udf-hive.html)
  * [Identifiers](sql-ref-identifier.html)
  * [Literals](sql-ref-literals.html)
  * [Null Semanitics](sql-ref-null-semantics.html)
- * [ANSI Compliance](sql-ref-ansi-compliance.html)
  * [SQL Syntax](sql-ref-syntax.html)
    * [DDL Statements](sql-ref-syntax-ddl.html)
-   * [DML Statements](sql-ref-syntax-ddl.html)
+   * [DML Statements](sql-ref-syntax-dml.html)
    * [Data Retrieval Statements](sql-ref-syntax-qry.html)
    * [Auxiliary Statements](sql-ref-syntax-aux.html)
- * [Functions](sql-ref-functions.html)
-   * [Built-in Functions](sql-ref-functions-builtin.html)
-   * [Scalar User-Defined Functions (UDFs)](sql-ref-functions-udf-scalar.html)
-   * [User-Defined Aggregate Functions (UDAFs)](sql-ref-functions-udf-aggregate.html)
-   * [Integration with Hive UDFs/UDAFs/UDTFs](sql-ref-functions-udf-hive.html)
- * [Datetime Pattern](sql-ref-datetime-pattern.html)