This is an automated email from the ASF dual-hosted git repository. dzamo pushed a commit to branch calcite-1.34-test in repository https://gitbox.apache.org/repos/asf/drill.git
commit 53a4cdaa82b9434cd953e7c9b8ef237d571a0339 Author: James Turton <[email protected]> AuthorDate: Thu Mar 9 14:16:36 2023 +0200 Support the QUALIFY clause introduced in Calcite 1.34. --- .../java/org/apache/drill/exec/planner/sql/SqlSelectBuilder.java | 8 +++++++- .../exec/planner/sql/parser/CompoundIdentifierConverter.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlSelectBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlSelectBuilder.java index a6653900f9..07dcf01280 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlSelectBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlSelectBuilder.java @@ -31,6 +31,7 @@ public class SqlSelectBuilder { private SqlNodeList groupBy; private SqlNode having; private SqlNodeList windowDecls; + private SqlNode qualify; private SqlNodeList orderBy; private SqlNode offset; private SqlNode fetch; @@ -76,6 +77,11 @@ public class SqlSelectBuilder { return this; } + public SqlSelectBuilder qualify(SqlNode qualify) { + this.qualify = qualify; + return this; + } + public SqlSelectBuilder orderBy(SqlNodeList orderBy) { this.orderBy = orderBy; return this; @@ -98,7 +104,7 @@ public class SqlSelectBuilder { public SqlSelect build() { return new SqlSelect(parserPosition, keywordList, selectList, from, - where, groupBy, having, windowDecls, orderBy, offset, fetch, hints); + where, groupBy, having, windowDecls, qualify, orderBy, offset, fetch, hints); } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java index 6aca6ba847..2d006d38c9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java @@ -66,7 +66,7 @@ public class CompoundIdentifierConverter extends SqlShuttle { .put(SqlAnalyzeTable.class, arrayOf(D, D, E, D)) .put(SqlMetastoreAnalyzeTable.class, arrayOf(D, E, D, D, D)) .put(SqlDropTableMetadata.class, arrayOf(D, D, D)) - .put(SqlSelect.class, arrayOf(D, E, D, E, E, E, E, E, D, D, D)) + .put(SqlSelect.class, arrayOf(D, E, D, E, E, E, E, E, E, D, D, D)) .put(SqlCreateTable.class, arrayOf(D, D, D, E, D, D)) .put(SqlCreateView.class, arrayOf(D, E, E, D)) .put(DrillSqlDescribeTable.class, arrayOf(D, D, E))
