This is an automated email from the ASF dual-hosted git repository.
starocean999 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new b8555c4dfa9 [Enhancement] (nereids)implement showCollationCommand in
nereids (#43157)
b8555c4dfa9 is described below
commit b8555c4dfa9fbcf122c3df077d919991388dcb3b
Author: Sridhar R Manikarnike <[email protected]>
AuthorDate: Mon Dec 2 08:27:58 2024 +0530
[Enhancement] (nereids)implement showCollationCommand in nereids (#43157)
Issue Number: close #42748
---
.../antlr4/org/apache/doris/nereids/DorisParser.g4 | 2 +-
.../doris/nereids/parser/LogicalPlanBuilder.java | 15 ++++
.../apache/doris/nereids/trees/plans/PlanType.java | 1 +
.../trees/plans/commands/ShowCollationCommand.java | 89 ++++++++++++++++++++++
.../trees/plans/visitor/CommandVisitor.java | 5 ++
.../data/nereids_p0/show/test_show_collation.out | 5 ++
.../nereids_p0/show/test_show_collation.groovy | 29 +++++++
7 files changed, 145 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
index e5c9a997073..8edcbb40c3c 100644
--- a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
+++ b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
@@ -236,6 +236,7 @@ supportedShowStatement
| SHOW FILE ((FROM | IN) database=multipartIdentifier)?
#showSmallFiles
| SHOW STORAGE? ENGINES
#showStorageEngines
| SHOW CREATE CATALOG name=identifier
#showCreateCatalog
+ | SHOW COLLATION wildWhere?
#showCollation
| SHOW SQL_BLOCK_RULE (FOR ruleName=identifier)?
#showSqlBlockRule
| SHOW CREATE VIEW name=multipartIdentifier
#showCreateView
| SHOW CREATE MATERIALIZED VIEW mvName=identifier
@@ -307,7 +308,6 @@ unsupportedShowStatement
| SHOW CATALOG name=identifier
#showCatalog
| SHOW FULL? (COLUMNS | FIELDS) (FROM | IN) tableName=multipartIdentifier
((FROM | IN) database=multipartIdentifier)? wildWhere?
#showColumns
- | SHOW COLLATION wildWhere?
#showCollation
| SHOW ((CHAR SET) | CHARSET) wildWhere?
#showCharset
| SHOW COUNT LEFT_PAREN ASTERISK RIGHT_PAREN (WARNINGS | ERRORS)
#showWaringErrorCount
| SHOW (WARNINGS | ERRORS) limitClause?
#showWaringErrors
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
index 5ab217a1d5e..60eda00ce89 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -224,6 +224,7 @@ import
org.apache.doris.nereids.DorisParser.SetVariableWithTypeContext;
import org.apache.doris.nereids.DorisParser.ShowAuthorsContext;
import org.apache.doris.nereids.DorisParser.ShowBackendsContext;
import org.apache.doris.nereids.DorisParser.ShowBrokerContext;
+import org.apache.doris.nereids.DorisParser.ShowCollationContext;
import org.apache.doris.nereids.DorisParser.ShowConfigContext;
import org.apache.doris.nereids.DorisParser.ShowConstraintContext;
import org.apache.doris.nereids.DorisParser.ShowCreateCatalogContext;
@@ -512,6 +513,7 @@ import
org.apache.doris.nereids.trees.plans.commands.SetUserPropertiesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowAuthorsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowBackendsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowBrokerCommand;
+import org.apache.doris.nereids.trees.plans.commands.ShowCollationCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowConfigCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowConstraintsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowCreateCatalogCommand;
@@ -4782,4 +4784,17 @@ public class LogicalPlanBuilder extends
DorisParserBaseVisitor<Object> {
});
return new ShowTabletsBelongCommand(tabletIdLists);
}
+
+ @Override
+ public LogicalPlan visitShowCollation(ShowCollationContext ctx) {
+ String wild = null;
+ if (ctx.wildWhere() != null) {
+ if (ctx.wildWhere().LIKE() != null) {
+ wild = stripQuotes(ctx.wildWhere().STRING_LITERAL().getText());
+ } else if (ctx.wildWhere().WHERE() != null) {
+ wild = ctx.wildWhere().expression().getText();
+ }
+ }
+ return new ShowCollationCommand(wild);
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
index 683af9fe2c4..d07c90b7ccd 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
@@ -196,6 +196,7 @@ public enum PlanType {
SHOW_BACKENDS_COMMAND,
SHOW_BLOCK_RULE_COMMAND,
SHOW_BROKER_COMMAND,
+ SHOW_COLLATION_COMMAND,
SHOW_CONFIG_COMMAND,
SHOW_CREATE_CATALOG_COMMAND,
SHOW_CREATE_DATABASE_COMMAND,
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowCollationCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowCollationCommand.java
new file mode 100644
index 00000000000..945db68bf59
--- /dev/null
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowCollationCommand.java
@@ -0,0 +1,89 @@
+// 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.doris.nereids.trees.plans.commands;
+
+import org.apache.doris.catalog.Column;
+import org.apache.doris.catalog.ScalarType;
+import org.apache.doris.nereids.trees.plans.PlanType;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.ShowResultSet;
+import org.apache.doris.qe.ShowResultSetMetaData;
+import org.apache.doris.qe.StmtExecutor;
+
+import com.google.common.collect.Lists;
+
+import java.util.List;
+
+/**
+ * Represents the command for SHOW COLLATION
+ */
+public class ShowCollationCommand extends ShowCommand {
+ private static final ShowResultSetMetaData COLLATION_META_DATA =
+ ShowResultSetMetaData.builder()
+ .addColumn(new Column("Collation",
ScalarType.createVarchar(20)))
+ .addColumn(new Column("Charset",
ScalarType.createVarchar(20)))
+ .addColumn(new Column("Id", ScalarType.createVarchar(10)))
+ .addColumn(new Column("Default",
ScalarType.createVarchar(10)))
+ .addColumn(new Column("Compiled",
ScalarType.createVarchar(10)))
+ .addColumn(new Column("Sortlen",
ScalarType.createVarchar(10)))
+ .build();
+
+ private final String wild;
+
+ public ShowCollationCommand(String wild) {
+ super(PlanType.SHOW_COLLATION_COMMAND);
+ this.wild = wild;
+ }
+
+ @Override
+ public ShowResultSet doRun(ConnectContext ctx, StmtExecutor executor)
throws Exception {
+ List<List<String>> rows = Lists.newArrayList();
+ List<String> utf8mb40900Bin = Lists.newArrayList();
+ // | utf8mb4_0900_bin | utf8mb4 | 309 | Yes | Yes | 1 |
+ utf8mb40900Bin.add(ctx.getSessionVariable().getCollationConnection());
+ utf8mb40900Bin.add(ctx.getSessionVariable().getCharsetServer());
+ utf8mb40900Bin.add("309");
+ utf8mb40900Bin.add("Yes");
+ utf8mb40900Bin.add("Yes");
+ utf8mb40900Bin.add("1");
+ rows.add(utf8mb40900Bin);
+ // ATTN: we must have this collation for compatible with some bi tools
+ List<String> utf8mb3GeneralCi = Lists.newArrayList();
+ // | utf8mb3_general_ci | utf8mb3 | 33 | Yes | Yes | 1 |
+ utf8mb3GeneralCi.add("utf8mb3_general_ci");
+ utf8mb3GeneralCi.add("utf8mb3");
+ utf8mb3GeneralCi.add("33");
+ utf8mb3GeneralCi.add("Yes");
+ utf8mb3GeneralCi.add("Yes");
+ utf8mb3GeneralCi.add("1");
+ rows.add(utf8mb3GeneralCi);
+ // Set the result set and send it using the executor
+ return new ShowResultSet(COLLATION_META_DATA, rows);
+ }
+
+ @Override
+ public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
+ return visitor.visitShowCollationCommand(this, context);
+ }
+
+ @Override
+ public String toString() {
+ return "SHOW COLLATION" + (wild != null ? " LIKE '" + wild + "'" : "");
+ }
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
index 98050c598e1..f3bf05b2377 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
@@ -72,6 +72,7 @@ import
org.apache.doris.nereids.trees.plans.commands.SetUserPropertiesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowAuthorsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowBackendsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowBrokerCommand;
+import org.apache.doris.nereids.trees.plans.commands.ShowCollationCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowConfigCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowConstraintsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowCreateCatalogCommand;
@@ -521,6 +522,10 @@ public interface CommandVisitor<R, C> {
return visitCommand(showTabletBelongCommand, context);
}
+ default R visitShowCollationCommand(ShowCollationCommand
showCollationCommand, C context) {
+ return visitCommand(showCollationCommand, context);
+ }
+
default R visitCreateRoutineLoadCommand(CreateRoutineLoadCommand
createRoutineLoadCommand, C context) {
return visitCommand(createRoutineLoadCommand, context);
}
diff --git a/regression-test/data/nereids_p0/show/test_show_collation.out
b/regression-test/data/nereids_p0/show/test_show_collation.out
new file mode 100644
index 00000000000..60bac6866a7
--- /dev/null
+++ b/regression-test/data/nereids_p0/show/test_show_collation.out
@@ -0,0 +1,5 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !cmd --
+utf8mb4_0900_bin utf8mb4 309 Yes Yes 1
+utf8mb3_general_ci utf8mb3 33 Yes Yes 1
+
diff --git a/regression-test/suites/nereids_p0/show/test_show_collation.groovy
b/regression-test/suites/nereids_p0/show/test_show_collation.groovy
new file mode 100644
index 00000000000..00837d72161
--- /dev/null
+++ b/regression-test/suites/nereids_p0/show/test_show_collation.groovy
@@ -0,0 +1,29 @@
+// 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.
+
+suite("test_show_collation", "query,collation") {
+ try {
+ // Execute the SHOW COLLATION command and verify the output
+ checkNereidsExecute("SHOW COLLATION")
+ qt_cmd("SHOW COLLATION")
+ } catch (Exception e) {
+ // Log any exceptions that occur during testing
+ log.error("Failed to execute SHOW COLLATION command", e)
+ throw e
+ }
+}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
