You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ya...@apache.org on 2020/05/22 23:47:26 UTC
[spark] branch branch-3.0 updated:
[SPARK-31612][SQL][DOCS][FOLLOW-UP] Fix a few issues in SQL ref
This is an automated email from the ASF dual-hosted git repository.
yamamuro pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 23019aa [SPARK-31612][SQL][DOCS][FOLLOW-UP] Fix a few issues in SQL ref
23019aa is described below
commit 23019aa429d8f0db52b1ed5e9e6dc00ea7b94740
Author: Huaxin Gao <hu...@us.ibm.com>
AuthorDate: Sat May 23 08:43:16 2020 +0900
[SPARK-31612][SQL][DOCS][FOLLOW-UP] Fix a few issues in SQL ref
### What changes were proposed in this pull request?
Fix a few issues in SQL Reference
### Why are the changes needed?
To make SQL Reference look better
### Does this PR introduce _any_ user-facing change?
Yes.
before:
<img width="189" alt="Screen Shot 2020-05-21 at 11 41 34 PM" src="https://user-images.githubusercontent.com/13592258/82639052-d0f38a80-9bbc-11ea-81a4-22def4ca5cc0.png">
after:
<img width="195" alt="Screen Shot 2020-05-21 at 11 41 17 PM" src="https://user-images.githubusercontent.com/13592258/82639063-d5b83e80-9bbc-11ea-84d1-8361e6bee949.png">
before:
<img width="763" alt="Screen Shot 2020-05-21 at 11 45 22 PM" src="https://user-images.githubusercontent.com/13592258/82639252-3e9fb680-9bbd-11ea-863c-e6a6c2f83a06.png">
after:
<img width="724" alt="Screen Shot 2020-05-21 at 11 45 02 PM" src="https://user-images.githubusercontent.com/13592258/82639265-42cbd400-9bbd-11ea-8df2-fc5c255b84d3.png">
before:
<img width="437" alt="Screen Shot 2020-05-21 at 11 41 57 PM" src="https://user-images.githubusercontent.com/13592258/82639072-db158900-9bbc-11ea-9963-731881cda4fd.png">
after
<img width="347" alt="Screen Shot 2020-05-21 at 11 42 26 PM" src="https://user-images.githubusercontent.com/13592258/82639082-dfda3d00-9bbc-11ea-9bd2-f922cc91f175.png">
### How was this patch tested?
Manually build and check
Closes #28608 from huaxingao/doc_fix.
Authored-by: Huaxin Gao <hu...@us.ibm.com>
Signed-off-by: Takeshi Yamamuro <ya...@apache.org>
(cherry picked from commit ad9532a09c70bf6acc8b79b4fdbfcd6afadcbc91)
Signed-off-by: Takeshi Yamamuro <ya...@apache.org>
---
docs/_data/menu-sql.yaml | 42 ++++++++++++++++++------------------
docs/sql-ref-syntax-aux-conf-mgmt.md | 2 +-
docs/sql-ref-syntax-qry.md | 35 +++++++++++++++---------------
docs/sql-ref-syntax.md | 28 ++++++++++++++++--------
docs/sql-ref.md | 16 +++++++-------
5 files changed, 67 insertions(+), 56 deletions(-)
diff --git a/docs/_data/menu-sql.yaml b/docs/_data/menu-sql.yaml
index 57fc493..289a9d3 100644
--- 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-aux-conf-mgmt.md b/docs/sql-ref-syntax-aux-conf-mgmt.md
index f5e48ef2..1900fb7 100644
--- a/docs/sql-ref-syntax-aux-conf-mgmt.md
+++ b/docs/sql-ref-syntax-aux-conf-mgmt.md
@@ -20,4 +20,4 @@ license: |
---
* [SET](sql-ref-syntax-aux-conf-mgmt-set.html)
- * [UNSET](sql-ref-syntax-aux-conf-mgmt-reset.html)
+ * [RESET](sql-ref-syntax-aux-conf-mgmt-reset.html)
diff --git a/docs/sql-ref-syntax-qry.md b/docs/sql-ref-syntax-qry.md
index 1171fea..8accdfe 100644
--- 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
index 94bd476..98e3065 100644
--- 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
@@ -73,6 +83,7 @@ Spark SQL is Apache Spark's module for working with structured data. The SQL Syn
* [LIST JAR](sql-ref-syntax-aux-resource-mgmt-list-jar.html)
* [REFRESH](sql-ref-syntax-aux-cache-refresh.html)
* [REFRESH TABLE](sql-ref-syntax-aux-refresh-table.html)
+ * [RESET](sql-ref-syntax-aux-conf-mgmt-reset.html)
* [SET](sql-ref-syntax-aux-conf-mgmt-set.html)
* [SHOW COLUMNS](sql-ref-syntax-aux-show-columns.html)
* [SHOW CREATE TABLE](sql-ref-syntax-aux-show-create-table.html)
@@ -84,4 +95,3 @@ Spark SQL is Apache Spark's module for working with structured data. The SQL Syn
* [SHOW TBLPROPERTIES](sql-ref-syntax-aux-show-tblproperties.html)
* [SHOW VIEWS](sql-ref-syntax-aux-show-views.html)
* [UNCACHE TABLE](sql-ref-syntax-aux-cache-uncache-table.html)
- * [UNSET](sql-ref-syntax-aux-conf-mgmt-reset.html)
diff --git a/docs/sql-ref.md b/docs/sql-ref.md
index db51fe1..f88026b 100644
--- 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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org