From 9872a4018d4f6bd1ae515dc1575b46b19cb4abd3 Mon Sep 17 00:00:00 2001 From: Yifei Wu Date: Mon, 15 Jan 2018 20:34:01 +0800 Subject: [PATCH] reduce CORR key words --- cassandra/pom.xml | 4 ++-- core/pom.xml | 4 ++-- core/src/main/codegen/templates/Parser.jj | 1 - .../java/org/apache/calcite/sql/parser/SqlParserTest.java | 1 - druid/pom.xml | 4 ++-- elasticsearch/pom.xml | 4 ++-- example/csv/pom.xml | 4 ++-- example/function/pom.xml | 4 ++-- example/pom.xml | 4 ++-- file/pom.xml | 4 ++-- linq4j/pom.xml | 4 ++-- mongodb/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- piglet/pom.xml | 4 ++-- plus/pom.xml | 4 ++-- pom.xml | 2 +- site/_docs/reference.md | 1 - spark/pom.xml | 4 ++-- splunk/pom.xml | 4 ++-- ubenchmark/pom.xml | 2 +- 20 files changed, 32 insertions(+), 35 deletions(-) diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 869eaa74744..eec916898d0 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-cassandra jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Cassandra Cassandra adapter for Calcite diff --git a/core/pom.xml b/core/pom.xml index 48d7cf280fc..23e302ab5c8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-core jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Core Core Calcite APIs and engine. diff --git a/core/src/main/codegen/templates/Parser.jj b/core/src/main/codegen/templates/Parser.jj index c6a657ff41b..cb970a6290b 100644 --- a/core/src/main/codegen/templates/Parser.jj +++ b/core/src/main/codegen/templates/Parser.jj @@ -5348,7 +5348,6 @@ SqlPostfixOperator PostfixRowOperator() : | < CONTAINS: "CONTAINS" > | < CONTINUE: "CONTINUE" > | < CONVERT: "CONVERT" > -| < CORR: "CORR" > | < CORRESPONDING: "CORRESPONDING" > | < COUNT: "COUNT" > | < COVAR_POP: "COVAR_POP" > diff --git a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java index f132a24cc65..78e941e2594 100644 --- a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java +++ b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java @@ -163,7 +163,6 @@ public class SqlParserTest { "CONTAINS", "92", "2011", "2014", "c", "CONTINUE", "92", "99", "2003", "CONVERT", "92", "2011", "2014", "c", - "CORR", "2011", "2014", "c", "CORRESPONDING", "92", "99", "2003", "2011", "2014", "c", "COUNT", "92", "2011", "2014", "c", "COVAR_POP", "2011", "2014", "c", diff --git a/druid/pom.xml b/druid/pom.xml index 2133cc6e63f..b538c09357f 100644 --- a/druid/pom.xml +++ b/druid/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-druid jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Druid Druid adapter for Calcite diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index 90a88de3c35..6ca95b2e8a7 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -21,12 +21,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-elasticsearch jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Elasticsearch Elasticsearch adapter for Calcite diff --git a/example/csv/pom.xml b/example/csv/pom.xml index a7ad4d67421..2b8858f9a35 100644 --- a/example/csv/pom.xml +++ b/example/csv/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite-example - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-example-csv jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Example CSV An example Calcite provider that reads CSV files diff --git a/example/function/pom.xml b/example/function/pom.xml index 9d1e4ddf3ab..5db6d4c7417 100644 --- a/example/function/pom.xml +++ b/example/function/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite-example - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-example-function jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Example Function Examples of user-defined Calcite functions diff --git a/example/pom.xml b/example/pom.xml index 52bac8c2412..b7341042778 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -20,13 +20,13 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-example pom - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Examples Calcite examples diff --git a/file/pom.xml b/file/pom.xml index a1fd330c48b..6b67a44c8f3 100644 --- a/file/pom.xml +++ b/file/pom.xml @@ -19,13 +19,13 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-file jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite File Calcite provider that reads files and URIs diff --git a/linq4j/pom.xml b/linq4j/pom.xml index 6bc9b022226..61960bdd203 100644 --- a/linq4j/pom.xml +++ b/linq4j/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-linq4j jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Linq4j Calcite APIs for LINQ (Language-Integrated Query) in Java diff --git a/mongodb/pom.xml b/mongodb/pom.xml index fe868c18f3e..c8bec820a71 100644 --- a/mongodb/pom.xml +++ b/mongodb/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-mongodb jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite MongoDB MongoDB adapter for Calcite diff --git a/pig/pom.xml b/pig/pom.xml index 493dd72edc9..748e0881c21 100644 --- a/pig/pom.xml +++ b/pig/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-pig jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Pig Pig adapter for Calcite diff --git a/piglet/pom.xml b/piglet/pom.xml index 1a2f72ab7e2..95dc514aad5 100644 --- a/piglet/pom.xml +++ b/piglet/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-piglet jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Piglet Pig-like language built on top of Calcite algebra diff --git a/plus/pom.xml b/plus/pom.xml index dc708a16b8b..64883b166a9 100644 --- a/plus/pom.xml +++ b/plus/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-plus jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Plus Miscellaneous extras for Calcite diff --git a/pom.xml b/pom.xml index 15473b8450d..0cd88933d76 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ limitations under the License. org.apache.calcite calcite pom - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite diff --git a/site/_docs/reference.md b/site/_docs/reference.md index 5c140d4fa9c..1e263b20398 100644 --- a/site/_docs/reference.md +++ b/site/_docs/reference.md @@ -381,7 +381,6 @@ CONSTRUCTOR, **CONTAINS**, CONTINUE, **CONVERT**, -**CORR**, **CORRESPONDING**, **COUNT**, **COVAR_POP**, diff --git a/spark/pom.xml b/spark/pom.xml index decd25078b1..7df580c5f85 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-spark jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Spark diff --git a/splunk/pom.xml b/splunk/pom.xml index 20528e999d4..8f93f42f3bf 100644 --- a/splunk/pom.xml +++ b/splunk/pom.xml @@ -20,12 +20,12 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT calcite-splunk jar - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT Calcite Splunk Splunk adapter for Calcite; also a JDBC driver for Splunk diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml index 521c71135ae..d98761f76c2 100644 --- a/ubenchmark/pom.xml +++ b/ubenchmark/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.apache.calcite calcite - 1.13.0-kylin-r3 + 1.13.0-kylin-r4-SNAPSHOT