This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push:
new 79df7f9 Following [CALCITE-3010], remove redundant non-reserved
keyword definitions
79df7f9 is described below
commit 79df7f9df496959c3cfebc80bc545ac9946bd7a0
Author: Hongze Zhang <[email protected]>
AuthorDate: Tue Apr 23 23:15:46 2019 +0800
Following [CALCITE-3010], remove redundant non-reserved keyword definitions
---
babel/src/main/codegen/config.fmpp | 9 ---------
core/src/main/codegen/config.fmpp | 5 -----
core/src/main/codegen/templates/Parser.jj | 5 -----
core/src/test/codegen/config.fmpp | 5 -----
server/src/main/codegen/config.fmpp | 5 -----
site/_docs/reference.md | 5 -----
6 files changed, 34 deletions(-)
diff --git a/babel/src/main/codegen/config.fmpp
b/babel/src/main/codegen/config.fmpp
index dc9f513..9ff0556 100644
--- a/babel/src/main/codegen/config.fmpp
+++ b/babel/src/main/codegen/config.fmpp
@@ -140,11 +140,6 @@ data: {
"ISOLATION"
"JAVA"
"JSON"
- "JSON_DEPTH"
- "JSON_KEYS"
- "JSON_LENGTH"
- "JSON_PRETTY"
- "JSON_TYPE"
"K"
"KEY"
"KEY_MEMBER"
@@ -558,14 +553,10 @@ data: {
# "JOIN",
"JSON_ARRAY",
"JSON_ARRAYAGG",
- "JSON_DEPTH",
"JSON_EXISTS",
- "JSON_KEYS",
"JSON_OBJECT",
"JSON_OBJECTAGG",
- "JSON_PRETTY",
"JSON_QUERY",
- "JSON_TYPE",
"JSON_VALUE",
# "KEEP", # not a keyword in Calcite
"KEY",
diff --git a/core/src/main/codegen/config.fmpp
b/core/src/main/codegen/config.fmpp
index 0138304..278e0d0 100644
--- a/core/src/main/codegen/config.fmpp
+++ b/core/src/main/codegen/config.fmpp
@@ -160,11 +160,6 @@ data: {
"ISOLATION"
"JAVA"
"JSON"
- "JSON_DEPTH"
- "JSON_KEYS"
- "JSON_LENGTH"
- "JSON_PRETTY"
- "JSON_TYPE"
"K"
"KEY"
"KEY_MEMBER"
diff --git a/core/src/main/codegen/templates/Parser.jj
b/core/src/main/codegen/templates/Parser.jj
index f9af1f0..e83c946 100644
--- a/core/src/main/codegen/templates/Parser.jj
+++ b/core/src/main/codegen/templates/Parser.jj
@@ -6406,15 +6406,10 @@ SqlPostfixOperator PostfixRowOperator() :
| < JSON: "JSON" >
| < JSON_ARRAY: "JSON_ARRAY">
| < JSON_ARRAYAGG: "JSON_ARRAYAGG">
-| < JSON_DEPTH: "JSON_DEPTH">
| < JSON_EXISTS: "JSON_EXISTS" >
-| < JSON_KEYS: "JSON_KEYS" >
-| < JSON_LENGTH: "JSON_LENGTH">
| < JSON_OBJECT: "JSON_OBJECT">
| < JSON_OBJECTAGG: "JSON_OBJECTAGG">
-| < JSON_PRETTY: "JSON_PRETTY" >
| < JSON_QUERY: "JSON_QUERY" >
-| < JSON_TYPE: "JSON_TYPE">
| < JSON_VALUE: "JSON_VALUE" >
| < K: "K" >
| < KEY: "KEY" >
diff --git a/core/src/test/codegen/config.fmpp
b/core/src/test/codegen/config.fmpp
index 7c24366..a135836 100644
--- a/core/src/test/codegen/config.fmpp
+++ b/core/src/test/codegen/config.fmpp
@@ -144,11 +144,6 @@ data: {
"ISOLATION"
"JAVA"
"JSON"
- "JSON_DEPTH"
- "JSON_KEYS"
- "JSON_LENGTH"
- "JSON_PRETTY"
- "JSON_TYPE"
"K"
"KEY"
"KEY_MEMBER"
diff --git a/server/src/main/codegen/config.fmpp
b/server/src/main/codegen/config.fmpp
index 296db46..faa22dd 100644
--- a/server/src/main/codegen/config.fmpp
+++ b/server/src/main/codegen/config.fmpp
@@ -152,11 +152,6 @@ data: {
"ISOLATION"
"JAVA"
"JSON"
- "JSON_DEPTH"
- "JSON_KEYS"
- "JSON_LENGTH"
- "JSON_PRETTY"
- "JSON_TYPE"
"K"
"KEY"
"KEY_MEMBER"
diff --git a/site/_docs/reference.md b/site/_docs/reference.md
index 5868e89..8ac4581 100644
--- a/site/_docs/reference.md
+++ b/site/_docs/reference.md
@@ -565,15 +565,10 @@ JAVA,
JSON,
**JSON_ARRAY**,
**JSON_ARRAYAGG**,
-JSON_DEPTH,
**JSON_EXISTS**,
-JSON_KEYS,
-JSON_LENGTH,
**JSON_OBJECT**,
**JSON_OBJECTAGG**,
-JSON_PRETTY,
**JSON_QUERY**,
-JSON_TYPE,
**JSON_VALUE**,
K,
KEY,
