This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c8033c98538 support for CollateExpression (#27361)
c8033c98538 is described below
commit c8033c9853840969fed30f2008a2cca1d930b5b3
Author: kanha gupta <[email protected]>
AuthorDate: Sat Aug 12 12:57:29 2023 +0530
support for CollateExpression (#27361)
* support for CollateExpression
* Support complete
* optimize
* rechange parse logic
---
.../segment/expression/ExpressionConverter.java | 5 +++
.../impl/CollateExpressionConverter.java | 44 ++++++++++++++++++++++
.../expression/impl/SQLExtensionOperatorTable.java | 2 +
.../visitor/statement/MySQLStatementVisitor.java | 6 ++-
.../common/segment/dml/expr/CollateExpression.java | 8 ++++
.../test/resources/converter/select-expression.xml | 1 +
.../main/resources/case/dml/select-expression.xml | 9 +++--
.../sql/supported/dml/select-expression.xml | 2 +-
8 files changed, 72 insertions(+), 5 deletions(-)
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/ExpressionConverter.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/ExpressionConverter.java
index 5077462596d..79252fddb66 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/ExpressionConverter.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/ExpressionConverter.java
@@ -37,12 +37,14 @@ import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.subquery
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.MatchAgainstExpression;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.AggregationProjectionSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.NotExpression;
+import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.CollateExpression;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DataTypeSegment;
import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.SQLSegmentConverter;
import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.impl.BetweenExpressionConverter;
import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.impl.BinaryOperationExpressionConverter;
import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.impl.CaseWhenExpressionConverter;
import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.impl.ColumnConverter;
+import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.impl.CollateExpressionConverter;
import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.impl.ExistsSubqueryExpressionConverter;
import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.impl.ExtractArgExpressionConverter;
import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.impl.FunctionConverter;
@@ -124,6 +126,9 @@ public final class ExpressionConverter implements
SQLSegmentConverter<Expression
if (segment instanceof MatchAgainstExpression) {
return new
MatchExpressionConverter().convert((MatchAgainstExpression) segment);
}
+ if (segment instanceof CollateExpression) {
+ return new
CollateExpressionConverter().convert((CollateExpression) segment);
+ }
throw new UnsupportedSQLOperationException("unsupported TableSegment
type: " + segment.getClass());
}
}
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/impl/CollateExpressionConverter.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/impl/CollateExpressionConverter.java
new file mode 100644
index 00000000000..630a5f3c4a2
--- /dev/null
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/impl/CollateExpressionConverter.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.impl;
+
+import org.apache.calcite.sql.SqlBasicCall;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.CollateExpression;
+import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.SQLSegmentConverter;
+import
org.apache.shardingsphere.sqlfederation.compiler.converter.segment.expression.ExpressionConverter;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Collate expression converter.
+ */
+public final class CollateExpressionConverter implements
SQLSegmentConverter<CollateExpression, SqlNode> {
+
+ @Override
+ public Optional<SqlNode> convert(final CollateExpression segment) {
+ List<SqlNode> sqlNodes = new LinkedList<>();
+ sqlNodes.add(new
ExpressionConverter().convert(segment.getExpr().get()).orElse(SqlNodeList.EMPTY));
+ sqlNodes.add(new
ExpressionConverter().convert(segment.getCollateName()).orElse(SqlNodeList.EMPTY));
+ return Optional.of(new SqlBasicCall(SQLExtensionOperatorTable.COLLATE,
sqlNodes, SqlParserPos.ZERO));
+ }
+}
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/impl/SQLExtensionOperatorTable.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/impl/SQLExtensionOperatorTable.java
index 119989e0a4f..6a82cdbcfa0 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/impl/SQLExtensionOperatorTable.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/expression/impl/SQLExtensionOperatorTable.java
@@ -53,4 +53,6 @@ public final class SQLExtensionOperatorTable {
public static final SqlBinaryOperator SOUNDS_LIKE = new
SqlBinaryOperator("SOUNDS LIKE", SqlKind.OTHER, 30, true, null, null, null);
public static final MySQLMatchAgainstFunction MATCH_AGAINST = new
MySQLMatchAgainstFunction();
+
+ public static final SqlBinaryOperator COLLATE = new
SqlBinaryOperator("COLLATE", SqlKind.OTHER, 30, true, null, null, null);
}
diff --git
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
index 960a876105c..e368a630c42 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
@@ -614,7 +614,11 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
return visit(ctx.functionCall());
}
if (null != ctx.collateClause()) {
- return new CollateExpression(startIndex, stopIndex,
(SimpleExpressionSegment) visit(ctx.collateClause()));
+ if (null != ctx.simpleExpr()) {
+ ExpressionSegment expr = (ExpressionSegment)
visit(ctx.simpleExpr(0));
+ return new CollateExpression(startIndex, stopIndex,
(SimpleExpressionSegment) visit(ctx.collateClause()), expr);
+ }
+ return new CollateExpression(startIndex, stopIndex,
(SimpleExpressionSegment) visit(ctx.collateClause()), null);
}
if (null != ctx.columnRef()) {
return visit(ctx.columnRef());
diff --git
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/CollateExpression.java
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/CollateExpression.java
index 0e85b4f4dde..d2bf7fd1986 100644
---
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/CollateExpression.java
+++
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/CollateExpression.java
@@ -21,6 +21,8 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.SimpleExpressionSegment;
+import java.util.Optional;
+
/**
* Collate expression.
*/
@@ -34,8 +36,14 @@ public final class CollateExpression implements
ExpressionSegment {
private final SimpleExpressionSegment collateName;
+ private final ExpressionSegment expr;
+
@Override
public String getText() {
return collateName.getText();
}
+
+ public Optional<ExpressionSegment> getExpr() {
+ return Optional.ofNullable(expr);
+ }
}
diff --git
a/test/it/optimizer/src/test/resources/converter/select-expression.xml
b/test/it/optimizer/src/test/resources/converter/select-expression.xml
index d61c3bfa031..61c1b190c6c 100644
--- a/test/it/optimizer/src/test/resources/converter/select-expression.xml
+++ b/test/it/optimizer/src/test/resources/converter/select-expression.xml
@@ -48,4 +48,5 @@
<test-cases sql-case-id="select_where_with_simple_expr_with_match"
expected-sql="SELECT * FROM `t_order` WHERE MATCH (`order_id`) AGAINST (? IN
NATURAL LANGUAGE MODE)" db-types="MySQL" sql-case-types="PLACEHOLDER" />
<test-cases sql-case-id="select_where_with_predicate_with_in_subquery"
expected-sql="SELECT * FROM "t_order" WHERE
"t_order"."order_id" NOT IN (SELECT "order_id"
FROM "t_order_item" WHERE "status" > 1)"
db-types="PostgreSQL, openGauss" sql-case-types="LITERAL" />
<test-cases sql-case-id="select_where_with_predicate_with_in_subquery"
expected-sql="SELECT * FROM "t_order" WHERE
"t_order"."order_id" NOT IN (SELECT "order_id"
FROM "t_order_item" WHERE "status" > ?)"
db-types="PostgreSQL, openGauss" sql-case-types="PLACEHOLDER" />
+ <test-cases sql-case-id="select_where_with_simple_expr_with_collate"
expected-sql="SELECT * FROM `t_order` WHERE `order_id` COLLATE
'utf8mb4_0900_ai_ci'" db-types="MySQL" sql-case-types="LITERAL" />
</sql-node-converter-test-cases>
diff --git a/test/it/parser/src/main/resources/case/dml/select-expression.xml
b/test/it/parser/src/main/resources/case/dml/select-expression.xml
index e4ca1a5df40..1e1a4770c7f 100644
--- a/test/it/parser/src/main/resources/case/dml/select-expression.xml
+++ b/test/it/parser/src/main/resources/case/dml/select-expression.xml
@@ -1713,14 +1713,17 @@
<projections distinct-row="false" start-index="7" stop-index="7">
<shorthand-projection start-index="7" stop-index="7" />
</projections>
- <where start-index="22" stop-index="45" literal-stop-index="64">
+ <where start-index="22" stop-index="62" literal-stop-index="62">
<expr>
- <collate-expression start-index="28" stop-index="45"
literal-stop-index="64">
+ <collate-expression start-index="28" stop-index="62"
literal-stop-index="62">
<collate-name>
- <literal-expression value="'utf8mb4_0900_ai_ci'"
start-index="37" stop-index="64" />
+ <literal-expression value="utf8mb4_0900_ai_ci"
start-index="37" stop-index="62" />
<parameter-marker-expression parameter-index="0"
start-index="37" stop-index="45" />
</collate-name>
</collate-expression>
+ <expr>
+ <column name="order_id" start-index="28" stop-index="35" />
+ </expr>
</expr>
</where>
</select>
diff --git
a/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
b/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
index c8327f68a6e..a711e045042 100644
--- a/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
+++ b/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
@@ -70,7 +70,7 @@
<sql-case id="select_where_with_simple_expr_with_literals" value="SELECT *
FROM t_order WHERE ? < order_id" db-types="MySQL" />
<sql-case id="select_where_with_simple_expr_with_column" value="SELECT *
FROM t_order WHERE t_order.order_id" db-types="MySQL" />
<sql-case id="select_where_with_simple_expr_with_function_call"
value="SELECT * FROM t_order WHERE now() < order_id" db-types="MySQL" />
- <sql-case id="select_where_with_simple_expr_with_collate" value="SELECT *
FROM t_order WHERE order_id collate 'utf8mb4_0900_ai_ci'" db-types="MySQL" />
+ <sql-case id="select_where_with_simple_expr_with_collate" value="SELECT *
FROM t_order WHERE order_id collate utf8mb4_0900_ai_ci" db-types="MySQL" />
<sql-case id="select_where_with_simple_expr_with_variable" value="SELECT *
FROM t_order WHERE @@max_connections < order_id" db-types="MySQL" />
<sql-case id="select_where_with_simple_expr_with_plus" value="SELECT *
FROM t_order WHERE ? + t_order.order_id" db-types="MySQL" />
<sql-case id="select_where_with_simple_expr_with_minus" value="SELECT *
FROM t_order WHERE ? - t_order.order_id" db-types="MySQL" />
