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 ab1f777edb617ed9cf1c2f9b9a99c4dd0202a36b Author: Julian Hyde <[email protected]> AuthorDate: Wed Jun 12 18:56:38 2019 -0700 Change type of SqlStdOperatorTable.GROUPING field to public class --- .../main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java | 6 +++--- linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java index b033ea2..dae3b00 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java @@ -205,11 +205,11 @@ public class SqlStdOperatorTable extends ReflectiveSqlOperatorTable { * <p>Occurs in similar places to an aggregate * function ({@code SELECT}, {@code HAVING} clause, etc. of an aggregate * query), but not technically an aggregate function. */ - public static final SqlGroupingFunction GROUPING = + public static final SqlAggFunction GROUPING = new SqlGroupingFunction("GROUPING"); /** {@code GROUP_ID()} function. (Oracle-specific.) */ - public static final SqlGroupIdFunction GROUP_ID = + public static final SqlAggFunction GROUP_ID = new SqlGroupIdFunction(); /** {@code GROUPING_ID} function is a synonym for {@code GROUPING}. @@ -222,7 +222,7 @@ public class SqlStdOperatorTable extends ReflectiveSqlOperatorTable { * <p>The SQL standard has changed to allow {@code GROUPING} to have multiple * arguments. It is now equivalent to {@code GROUPING_ID}, so we made * {@code GROUPING_ID} a synonym for {@code GROUPING}. */ - public static final SqlGroupingFunction GROUPING_ID = + public static final SqlAggFunction GROUPING_ID = new SqlGroupingFunction("GROUPING_ID"); /** {@code EXTEND} operator. */ diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java b/linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java index 4f5192f..27a9e07 100644 --- a/linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java +++ b/linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java @@ -150,7 +150,7 @@ public class Ord<E> implements Map.Entry<Integer, E> { } public Ord<E> get(int index) { - return of(index, elements.get(index)); + return Ord.of(index, elements.get(index)); } public int size() {
