You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ti...@apache.org on 2017/09/20 04:18:19 UTC
asterixdb git commit: [NO ISSUE] Small documentation fixes
Repository: asterixdb
Updated Branches:
refs/heads/master 7a4b5681f -> ef4b8c992
[NO ISSUE] Small documentation fixes
Change-Id: Ib7c040cf90f48f848a16e2729fa2e75d654b565d
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2013
Reviewed-by: Xikui Wang <xk...@gmail.com>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/ef4b8c99
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/ef4b8c99
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/ef4b8c99
Branch: refs/heads/master
Commit: ef4b8c9921ef911a943fd71083c52f92e449c288
Parents: 7a4b568
Author: Till Westmann <ti...@apache.org>
Authored: Fri Sep 15 10:55:31 2017 -0700
Committer: Till Westmann <ti...@apache.org>
Committed: Tue Sep 19 21:18:00 2017 -0700
----------------------------------------------------------------------
asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md | 11 +++++++----
.../src/main/markdown/sqlpp/appendix_2_parameters.md | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef4b8c99/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
index 409ca38..5d94ea4 100644
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
@@ -38,7 +38,7 @@ The following shows the (rich) grammar for the `SELECT` statement in SQL++.
SelectClause ::= <SELECT> ( <ALL> | <DISTINCT> )? ( SelectRegular | SelectValue )
SelectRegular ::= Projection ( "," Projection )*
- SelectValue ::= ( <VALUE> | <ELEMENT> | <RAW> ) Expression
+ SelectValue ::= ( <VALUE> | <ELEMENT> | <RAW> ) Expression
Projection ::= ( Expression ( <AS> )? Identifier | "*" )
FromClause ::= <FROM> FromTerm ( "," FromTerm )*
@@ -57,13 +57,16 @@ The following shows the (rich) grammar for the `SELECT` statement in SQL++.
WhereClause ::= <WHERE> Expression
- GroupbyClause ::= <GROUP> <BY> ( Expression ( (<AS>)? Variable )? ( "," Expression ( (<AS>)? Variable )? )*
+ GroupbyClause ::= <GROUP> <BY> Expression ( ( (<AS>)? Variable )?
+ ( "," Expression ( (<AS>)? Variable )? )* )
( <GROUP> <AS> Variable
- ("(" Variable <AS> VariableReference ("," Variable <AS> VariableReference )* ")")?
+ ("(" Variable <AS> VariableReference
+ ("," Variable <AS> VariableReference )* ")")?
)?
HavingClause ::= <HAVING> Expression
- OrderbyClause ::= <ORDER> <BY> Expression ( <ASC> | <DESC> )? ( "," Expression ( <ASC> | <DESC> )? )*
+ OrderbyClause ::= <ORDER> <BY> Expression ( <ASC> | <DESC> )?
+ ( "," Expression ( <ASC> | <DESC> )? )*
LimitClause ::= <LIMIT> Expression ( <OFFSET> Expression )?
In this section, we will make use of two stored collections of objects (datasets), `GleambookUsers` and `GleambookMessages`, in a series of running examples to explain `SELECT` queries. The contents of the example collections are as follows:
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ef4b8c99/asterixdb/asterix-doc/src/main/markdown/sqlpp/appendix_2_parameters.md
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/appendix_2_parameters.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/appendix_2_parameters.md
index 1b392fe..3976937 100644
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/appendix_2_parameters.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/appendix_2_parameters.md
@@ -19,7 +19,7 @@
The SET statement can be used to override some cluster-wide configuration parameters for a specific request:
- SET <IDENTIFIER> <STRING_LITERAL>
+ SET <IDENTIFIER> <STRING_LITERAL>
As parameter identifiers are qualified names (containing a '.') they have to be escaped using backticks (\`\`).
Note that changing query parameters will not affect query correctness but only impact performance