You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2018/03/08 07:44:23 UTC
[2/2] calcite git commit: Site: Add committer Zhen Wang;
update MinJi Kim
Site: Add committer Zhen Wang; update MinJi Kim
Fix quotes in SQL reference.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/cfbf6a2a
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/cfbf6a2a
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/cfbf6a2a
Branch: refs/heads/master
Commit: cfbf6a2a12388ec7cdc42fdc4d92d59c9f0dd9b9
Parents: 4893a3d
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Mar 7 21:15:40 2018 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Wed Mar 7 23:39:56 2018 -0800
----------------------------------------------------------------------
site/_data/contributors.yml | 9 ++++++---
site/_docs/reference.md | 9 +++++----
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/cfbf6a2a/site/_data/contributors.yml
----------------------------------------------------------------------
diff --git a/site/_data/contributors.yml b/site/_data/contributors.yml
index c68b936..3dd96b3 100644
--- a/site/_data/contributors.yml
+++ b/site/_data/contributors.yml
@@ -127,10 +127,8 @@
- name: MinJi Kim
apacheId: minji
githubId: minji-kim
- org: Dremio
+ org: Oracle
role: Committer
- avatar: http://web.mit.edu/minjikim/www/minji.png
- homepage: http://web.mit.edu/minjikim/www/
- name: Nick Dimiduk
apacheId: ndimiduk
githubId: ndimiduk
@@ -173,4 +171,9 @@
githubId: Zhiqiang-He
org: Huawei
role: Committer
+- name: Zhen Wang
+ apacheId: zhenw
+ githubId: zinking
+ org:
+ role: Committer
# End contributors.yml
http://git-wip-us.apache.org/repos/asf/calcite/blob/cfbf6a2a/site/_docs/reference.md
----------------------------------------------------------------------
diff --git a/site/_docs/reference.md b/site/_docs/reference.md
index f9b8b14..6954f89 100644
--- a/site/_docs/reference.md
+++ b/site/_docs/reference.md
@@ -1038,7 +1038,7 @@ for example `ST_GeomFromText('POINT (30 10)')`.
| MULTICURVE | - | generalization of MULTILINESTRING
| MULTILINESTRING | 5 | <tt>ST_GeomFromText(​'MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10))')</tt>
| MULTISURFACE | - | generalization of MULTIPOLYGON
-| MULTIPOLYGON | 6 | <tt>ST_GeomFromText(`​'MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)), ((15 5, 40 10, 10 20, 5 10, 15 5)))')</tt>
+| MULTIPOLYGON | 6 | <tt>ST_GeomFromText(​'MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)), ((15 5, 40 10, 10 20, 5 10, 15 5)))')</tt>
## Operators and functions
@@ -1964,12 +1964,14 @@ that is used if they are not specified).
Suppose you have a function `f`, declared as in the following pseudo syntax:
-```FUNCTION f(
+{% highlight sql %}
+FUNCTION f(
INTEGER a,
INTEGER b DEFAULT NULL,
INTEGER c,
INTEGER d DEFAULT NULL,
- INTEGER e DEFAULT NULL) RETURNS INTEGER```
+ INTEGER e DEFAULT NULL) RETURNS INTEGER
+{% endhighlight sql %}
All of the function's parameters have names, and parameters `b`, `d` and `e`
have a default value of `NULL` and are therefore optional.
@@ -2000,7 +2002,6 @@ Here are some examples:
* `f(c => 3, d => 1, a => 0)` is equivalent to `f(0, NULL, 3, 1, NULL)`;
* `f(c => 3, d => 1)` is not legal, because you have not specified a value for
`a` and `a` is not optional.
-```
### MATCH_RECOGNIZE