This is an automated email from the ASF dual-hosted git repository. jhyde pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 90a431691c50e9ffccf18356ed4e87e57643bf43 Author: Julian Hyde <[email protected]> AuthorDate: Sun Jun 9 18:08:31 2019 -0700 Following [CALCITE-3005], remove conflict warning in SQL parser Alphabetize some lists in pom.xml. Remove call to deprecated SqlAggFunction constructor. --- core/src/main/codegen/templates/Parser.jj | 1 + .../apache/calcite/test/MockSqlOperatorTable.java | 17 ++++-------- pom.xml | 32 ++++++++++------------ 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/core/src/main/codegen/templates/Parser.jj b/core/src/main/codegen/templates/Parser.jj index bebc52f..f2c77ae 100644 --- a/core/src/main/codegen/templates/Parser.jj +++ b/core/src/main/codegen/templates/Parser.jj @@ -5981,6 +5981,7 @@ SqlNode JdbcFunctionCall() : ( // INSERT is a reserved word, but we need to handle {fn insert} // Similarly LEFT, RIGHT, TRUNCATE + LOOKAHEAD(1) ( <INSERT> | <LEFT> | <RIGHT> | <TRUNCATE> ) { name = unquotedIdentifier(); } | // For cases like {fn power(1,2)} and {fn lower('a')} diff --git a/core/src/test/java/org/apache/calcite/test/MockSqlOperatorTable.java b/core/src/test/java/org/apache/calcite/test/MockSqlOperatorTable.java index c128540..c7ec801 100644 --- a/core/src/test/java/org/apache/calcite/test/MockSqlOperatorTable.java +++ b/core/src/test/java/org/apache/calcite/test/MockSqlOperatorTable.java @@ -29,10 +29,10 @@ import org.apache.calcite.sql.SqlOperatorTable; import org.apache.calcite.sql.parser.SqlParserPos; import org.apache.calcite.sql.type.OperandTypes; import org.apache.calcite.sql.type.ReturnTypes; -import org.apache.calcite.sql.type.SqlTypeFamily; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.sql.util.ChainedSqlOperatorTable; import org.apache.calcite.sql.util.ListSqlOperatorTable; +import org.apache.calcite.util.Optionality; import com.google.common.collect.ImmutableList; @@ -130,25 +130,18 @@ public class MockSqlOperatorTable extends ChainedSqlOperatorTable { } } - /** "MY_AVG" user-defined aggregate function. */ + /** "MY_AVG" user-defined aggregate function, with two arguments. */ public static class MyAvgAggFunction extends SqlAggFunction { public MyAvgAggFunction() { - super("MY_AVG", - null, - SqlKind.AVG, - ReturnTypes.AVG_AGG_FUNCTION, - null, - OperandTypes.family(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC), - SqlFunctionCategory.NUMERIC, - false, - false); + super("MY_AVG", null, SqlKind.AVG, ReturnTypes.AVG_AGG_FUNCTION, + null, OperandTypes.NUMERIC_NUMERIC, SqlFunctionCategory.NUMERIC, + false, false, Optionality.FORBIDDEN); } @Override public boolean isDeterministic() { return false; } } - } // End MockSqlOperatorTable.java diff --git a/pom.xml b/pom.xml index 13c6ed7..3d176d9 100644 --- a/pom.xml +++ b/pom.xml @@ -64,35 +64,36 @@ limitations under the License. <failBuildOnCVSS>8</failBuildOnCVSS> <!-- This list is in alphabetical order. --> + <aggdesigner.version>6.0</aggdesigner.version> <airlift-tpch.version>0.1</airlift-tpch.version> <avatica.version>1.15.0</avatica.version> <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version> <cassandra-driver-core.version>3.6.0</cassandra-driver-core.version> <cassandra-unit.version>3.5.0.1</cassandra-unit.version> <cassandra.version>3.11.2</cassandra.version> + <checkstyle.version>7.8.2</checkstyle.version> <checksum-maven-plugin.version>1.2</checksum-maven-plugin.version> <chinook-data-hsqldb.version>0.1</chinook-data-hsqldb.version> <commons-codec.version>1.12</commons-codec.version> <commons-dbcp2.version>2.6.0</commons-dbcp2.version> <commons-lang3.version>3.8</commons-lang3.version> <commons-pool2.version>2.6.2</commons-pool2.version> + <drill-fmpp-maven-plugin.version>1.14.0</drill-fmpp-maven-plugin.version> <elasticsearch.version>7.0.1</elasticsearch.version> <esri-geometry-api.version>2.2.0</esri-geometry-api.version> <findbugs.version>3.0.1</findbugs.version> - <drill-fmpp-maven-plugin.version>1.14.0</drill-fmpp-maven-plugin.version> + <fmpp.version>0.9.16</fmpp.version> + <fongo.version>2.1.1</fongo.version> <foodmart-data-hsqldb.version>0.3</foodmart-data-hsqldb.version> + <foodmart-data-json.version>0.4</foodmart-data-json.version> <foodmart-queries.version>0.4.1</foodmart-queries.version> <forbiddenapis.version>2.6</forbiddenapis.version> <freemarker.version>2.3.28</freemarker.version> - <git-commit-id-plugin.version>2.1.9</git-commit-id-plugin.version> <geode.version>1.6.0</geode.version> - <fongo.version>2.1.1</fongo.version> - <foodmart-data-json.version>0.4</foodmart-data-json.version> - + <git-commit-id-plugin.version>2.1.9</git-commit-id-plugin.version> <!-- We support (and test against) Guava versions between - 19.0 and 23.0. Default is 19.0 due to Cassandra adapter. --> + 19.0 and 27.1. Default is 19.0 due to Cassandra adapter. --> <guava.version>19.0</guava.version> - <joda.version>2.8.1</joda.version> <h2.version>1.4.197</h2.version> <!-- Require Hadoop 2.7.4+ due to HADOOP-14586 --> <hadoop.version>2.7.5</hadoop.version> @@ -105,15 +106,18 @@ limitations under the License. <hydromatic-tpcds.version>0.4</hydromatic-tpcds.version> <jackson.version>2.9.8</jackson.version> <janino.version>3.0.11</janino.version> - <java-diff.version>1.1.2</java-diff.version> <javacc-maven-plugin.version>2.4</javacc-maven-plugin.version> + <java-diff.version>1.1.2</java-diff.version> <jcip-annotations.version>1.0-1</jcip-annotations.version> <jetty.version>9.4.11.v20180605</jetty.version> <jmh.version>1.12</jmh.version> + <joda.version>2.8.1</joda.version> + <jsonpath.version>2.4.0</jsonpath.version> <jsoup.version>1.11.3</jsoup.version> <junit.version>4.12</junit.version> + <kafka.client.version>2.0.0</kafka.client.version> <kotlin.version>1.2.71</kotlin.version> - <checkstyle.version>7.8.2</checkstyle.version> + <log4j2.version>2.11.0</log4j2.version> <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version> <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version> <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version> @@ -127,24 +131,18 @@ limitations under the License. <oracle-jdbc6-driver.version>11.2.0.2.0</oracle-jdbc6-driver.version> <owasp-dependency-check.version>3.3.2</owasp-dependency-check.version> <pig.version>0.16.0</pig.version> - <aggdesigner.version>6.0</aggdesigner.version> <postgresql.version>9.3-1102-jdbc41</postgresql.version> <quidem.version>0.9</quidem.version> <scala.version>2.10.3</scala.version> <scott-data-hsqldb.version>0.1</scott-data-hsqldb.version> <servlet.version>4.0.1</servlet.version> + <sketches.version>0.9.0</sketches.version> <slf4j.version>1.7.25</slf4j.version> - <log4j2.version>2.11.0</log4j2.version> <spark.version>2.2.0</spark.version> <sqlline.version>1.8.0</sqlline.version> <tpcds.version>1.2</tpcds.version> <xalan.version>2.7.1</xalan.version> <xerces.version>2.9.1</xerces.version> - <sketches.version>0.9.0</sketches.version> - <fmpp.version>0.9.16</fmpp.version> - <jsonpath.version>2.4.0</jsonpath.version> - - <kafka.client.version>2.0.0</kafka.client.version> <!-- Other properties (not version numbers) --> <!-- Java 1.8 does not support -html5, so override via profile for Java 1.8 --> @@ -182,6 +180,7 @@ limitations under the License. <module>example</module> <module>file</module> <module>geode</module> + <module>kafka</module> <module>linq4j</module> <module>mongodb</module> <module>pig</module> @@ -191,7 +190,6 @@ limitations under the License. <module>spark</module> <module>splunk</module> <module>ubenchmark</module> - <module>kafka</module> </modules> <!-- No dependencies here. Declare dependency VERSIONS in
