You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by li...@apache.org on 2023/08/24 10:49:52 UTC
[calcite] 01/02: [CALCITE-5920] Reset PERCENTILE_CONT/PERCENTILE_DISC to reserved keywords
This is an automated email from the ASF dual-hosted git repository.
libenchao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 21440299d2b9e85c58b5327797cc721aaee8d9d3
Author: Ran Tao <ch...@gmail.com>
AuthorDate: Mon Aug 14 18:23:27 2023 +0800
[CALCITE-5920] Reset PERCENTILE_CONT/PERCENTILE_DISC to reserved keywords
---
core/src/main/codegen/default_config.fmpp | 2 --
core/src/main/codegen/templates/Parser.jj | 2 ++
core/src/test/java/org/apache/calcite/sql/test/SqlAdvisorTest.java | 2 ++
site/_docs/reference.md | 4 ++--
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/core/src/main/codegen/default_config.fmpp b/core/src/main/codegen/default_config.fmpp
index 1dc41b3b44..5f48306c65 100644
--- a/core/src/main/codegen/default_config.fmpp
+++ b/core/src/main/codegen/default_config.fmpp
@@ -210,8 +210,6 @@ parser: {
"PASSTHROUGH"
"PAST"
"PATH"
- "PERCENTILE_CONT"
- "PERCENTILE_DISC"
"PIVOT"
"PLACING"
"PLAN"
diff --git a/core/src/main/codegen/templates/Parser.jj b/core/src/main/codegen/templates/Parser.jj
index 293407ab1f..fffe2a4dca 100644
--- a/core/src/main/codegen/templates/Parser.jj
+++ b/core/src/main/codegen/templates/Parser.jj
@@ -7496,6 +7496,8 @@ SqlIdentifier ReservedFunctionName() :
| <NTILE>
| <NULLIF>
| <OCTET_LENGTH>
+ | <PERCENTILE_CONT>
+ | <PERCENTILE_DISC>
| <PERCENT_RANK>
| <POWER>
| <RANK>
diff --git a/core/src/test/java/org/apache/calcite/sql/test/SqlAdvisorTest.java b/core/src/test/java/org/apache/calcite/sql/test/SqlAdvisorTest.java
index f3195b3f92..b58a409dcc 100644
--- a/core/src/test/java/org/apache/calcite/sql/test/SqlAdvisorTest.java
+++ b/core/src/test/java/org/apache/calcite/sql/test/SqlAdvisorTest.java
@@ -211,6 +211,8 @@ class SqlAdvisorTest extends SqlValidatorTestCase {
"KEYWORD(NULLIF)",
"KEYWORD(OCTET_LENGTH)",
"KEYWORD(OVERLAY)",
+ "KEYWORD(PERCENTILE_CONT)",
+ "KEYWORD(PERCENTILE_DISC)",
"KEYWORD(PERCENT_RANK)",
"KEYWORD(PERIOD)",
"KEYWORD(POSITION)",
diff --git a/site/_docs/reference.md b/site/_docs/reference.md
index c7555adcbf..31067da6e5 100644
--- a/site/_docs/reference.md
+++ b/site/_docs/reference.md
@@ -829,8 +829,8 @@ PATH,
**PATTERN**,
**PER**,
**PERCENT**,
-PERCENTILE_CONT,
-PERCENTILE_DISC,
+**PERCENTILE_CONT**,
+**PERCENTILE_DISC**,
**PERCENT_RANK**,
**PERIOD**,
**PERMUTE**,