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 70415afa864 [Feat] (Nereids)support showTrash Command (#44684)
70415afa864 is described below
commit 70415afa864af41d5028605b897ae2ff67a62c66
Author: echo-dundun <[email protected]>
AuthorDate: Mon Dec 2 10:57:27 2024 +0800
[Feat] (Nereids)support showTrash Command (#44684)
Issue Number: close #42763
---
.../antlr4/org/apache/doris/nereids/DorisParser.g4 | 2 +-
.../doris/nereids/parser/LogicalPlanBuilder.java | 13 +++
.../apache/doris/nereids/trees/plans/PlanType.java | 1 +
.../trees/plans/commands/ShowTrashCommand.java | 109 +++++++++++++++++++++
.../trees/plans/visitor/CommandVisitor.java | 5 +
.../ddl/show_trash/test_nereids_trash.groovy | 22 +++++
6 files changed, 151 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 f78a1c4b531..e5c9a997073 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
@@ -246,6 +246,7 @@ supportedShowStatement
| SHOW TABLET DIAGNOSIS tabletId=INTEGER_VALUE
#showDiagnoseTablet
| SHOW FRONTENDS name=identifier?
#showFrontends
| SHOW TABLE tableId=INTEGER_VALUE
#showTableId
+ | SHOW TRASH (ON backend=STRING_LITERAL)?
#showTrash
| SHOW WHITELIST
#showWhitelist
| SHOW TABLETS BELONG
tabletIds+=INTEGER_VALUE (COMMA tabletIds+=INTEGER_VALUE)*
#showTabletsBelong
@@ -332,7 +333,6 @@ unsupportedShowStatement
| SHOW BRIEF? RESTORE ((FROM | IN) database=multipartIdentifier)?
wildWhere? #showRestore
| SHOW RESOURCES wildWhere? sortClause? limitClause?
#showResources
| SHOW WORKLOAD GROUPS wildWhere?
#showWorkloadGroups
- | SHOW TRASH (ON backend=STRING_LITERAL)?
#showTrash
| SHOW SNAPSHOT ON repo=identifier wildWhere?
#showSnapshot
| SHOW FULL? BUILTIN? FUNCTIONS
((FROM | IN) database=multipartIdentifier)? wildWhere?
#showFunctions
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 d52d2696a29..5ab217a1d5e 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
@@ -255,6 +255,7 @@ import
org.apache.doris.nereids.DorisParser.ShowSqlBlockRuleContext;
import org.apache.doris.nereids.DorisParser.ShowStorageEnginesContext;
import org.apache.doris.nereids.DorisParser.ShowTableIdContext;
import org.apache.doris.nereids.DorisParser.ShowTabletsBelongContext;
+import org.apache.doris.nereids.DorisParser.ShowTrashContext;
import org.apache.doris.nereids.DorisParser.ShowTriggersContext;
import org.apache.doris.nereids.DorisParser.ShowVariablesContext;
import org.apache.doris.nereids.DorisParser.ShowViewContext;
@@ -541,6 +542,7 @@ import
org.apache.doris.nereids.trees.plans.commands.ShowSqlBlockRuleCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowStorageEnginesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTableIdCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTabletsBelongCommand;
+import org.apache.doris.nereids.trees.plans.commands.ShowTrashCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTriggersCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowVariablesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowViewCommand;
@@ -4462,6 +4464,17 @@ public class LogicalPlanBuilder extends
DorisParserBaseVisitor<Object> {
return new ShowTriggersCommand();
}
+ @Override
+ public LogicalPlan visitShowTrash(ShowTrashContext ctx) {
+ if (ctx.ON() != null) {
+ String backend = stripQuotes(ctx.STRING_LITERAL().getText());
+ new ShowTrashCommand(backend);
+ } else {
+ return new ShowTrashCommand();
+ }
+ return new ShowTrashCommand();
+ }
+
@Override
public LogicalPlan visitShowRepositories(ShowRepositoriesContext ctx) {
return new ShowRepositoriesCommand();
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 8625d103f3b..683af9fe2c4 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
@@ -220,6 +220,7 @@ public enum PlanType {
SHOW_SMALL_FILES_COMMAND,
SHOW_STORAGE_ENGINES_COMMAND,
SHOW_TABLE_ID_COMMAND,
+ SHOW_TRASH_COMMAND,
SHOW_TRIGGERS_COMMAND,
SHOW_VARIABLES_COMMAND,
SHOW_AUTHORS_COMMAND,
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowTrashCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowTrashCommand.java
new file mode 100644
index 00000000000..bcf30490cc9
--- /dev/null
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowTrashCommand.java
@@ -0,0 +1,109 @@
+// 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.Env;
+import org.apache.doris.catalog.ScalarType;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.proc.TrashProcDir;
+import org.apache.doris.common.util.NetUtils;
+import org.apache.doris.mysql.privilege.PrivPredicate;
+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 org.apache.doris.system.Backend;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+
+import java.util.List;
+
+/**
+ * show trash command
+ */
+public class ShowTrashCommand extends ShowCommand {
+ private List<Backend> backends = Lists.newArrayList();
+ private String backendQuery;
+
+ public ShowTrashCommand() {
+ super(PlanType.SHOW_TRASH_COMMAND);
+ }
+
+ public ShowTrashCommand(String backendQuery) {
+ super(PlanType.SHOW_TRASH_COMMAND);
+ this.backendQuery = backendQuery;
+ }
+
+ public List<Backend> getBackends() {
+ return backends;
+ }
+
+ public String getBackend() {
+ return backendQuery;
+ }
+
+ public ShowResultSetMetaData getMetaData() {
+ ShowResultSetMetaData.Builder builder =
ShowResultSetMetaData.builder();
+ for (String title : TrashProcDir.TITLE_NAMES) {
+ builder.addColumn(new Column(title, ScalarType.createVarchar(30)));
+ }
+ return builder.build();
+ }
+
+ private ShowResultSet handleShowTrash(String backendQuery) throws
Exception {
+ if
(!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(),
PrivPredicate.ADMIN)
+ &&
!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(),
+ PrivPredicate.OPERATOR)) {
+
ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR,
"ADMIN/OPERATOR");
+ }
+ ImmutableMap<Long, Backend> backendsInfo =
Env.getCurrentSystemInfo().getAllBackendsByAllCluster();
+ if (backendQuery == null || backendQuery.isEmpty()) {
+ for (Backend backend : backendsInfo.values()) {
+ this.backends.add(backend);
+ }
+ } else {
+ for (Backend backend : backendsInfo.values()) {
+ String backendStr =
NetUtils.getHostPortInAccessibleFormat(backend.getHost(),
+ backend.getHeartbeatPort());
+ if (backendQuery.equals(backendStr)) {
+ this.backends.add(backend);
+ break;
+ }
+ }
+ }
+ List<List<String>> infos = Lists.newArrayList();
+ TrashProcDir.getTrashInfo(backends, infos);
+ return new ShowResultSet(getMetaData(), infos);
+ }
+
+ @Override
+ public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
+ return visitor.visitShowTrashCommand(this, context);
+ }
+
+ @Override
+ public ShowResultSet doRun(ConnectContext ctx, StmtExecutor executor)
throws Exception {
+ return handleShowTrash(backendQuery);
+ }
+}
+
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 49485cda51d..98050c598e1 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
@@ -102,6 +102,7 @@ import
org.apache.doris.nereids.trees.plans.commands.ShowSqlBlockRuleCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowStorageEnginesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTableIdCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTabletsBelongCommand;
+import org.apache.doris.nereids.trees.plans.commands.ShowTrashCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTriggersCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowVariablesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowViewCommand;
@@ -370,6 +371,10 @@ public interface CommandVisitor<R, C> {
return visitCommand(showPluginsCommand, context);
}
+ default R visitShowTrashCommand(ShowTrashCommand showTrashCommand, C
context) {
+ return visitCommand(showTrashCommand, context);
+ }
+
default R visitShowTriggersCommand(ShowTriggersCommand
showTriggersCommand, C context) {
return visitCommand(showTriggersCommand, context);
}
diff --git
a/regression-test/suites/nereids_p0/ddl/show_trash/test_nereids_trash.groovy
b/regression-test/suites/nereids_p0/ddl/show_trash/test_nereids_trash.groovy
new file mode 100644
index 00000000000..5d795e6fd11
--- /dev/null
+++ b/regression-test/suites/nereids_p0/ddl/show_trash/test_nereids_trash.groovy
@@ -0,0 +1,22 @@
+// 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("show_trash_nereids") {
+ // can not use qt command since the output change based on cluster and
backend ip
+ checkNereidsExecute("""show trash;""")
+ checkNereidsExecute("""show trash on "127.0.0.1:9050";""")
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
