Skip to content

Commit

Permalink
[Enhancement] (nereids)implement showDeleteCommand in nereids (#44296)
Browse files Browse the repository at this point in the history
Issue Number: close #42754
  • Loading branch information
Vallishp authored Nov 22, 2024
1 parent 76c1332 commit f958509
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ supportedShowStatement
| SHOW AUTHORS #showAuthors
| SHOW DYNAMIC PARTITION TABLES ((FROM | IN) database=multipartIdentifier)? #showDynamicPartition
| SHOW LAST INSERT #showLastInsert
| SHOW DELETE ((FROM | IN) database=multipartIdentifier)? #showDelete
| SHOW ALL? GRANTS #showGrants
| SHOW GRANTS FOR userIdentify #showGrantsForUser
| SHOW VIEW
Expand Down Expand Up @@ -295,7 +296,6 @@ unsupportedShowStatement
sortClause? limitClause? #showLoad
| SHOW EXPORT ((FROM | IN) database=multipartIdentifier)? wildWhere?
sortClause? limitClause? #showExport
| SHOW DELETE ((FROM | IN) database=multipartIdentifier)? #showDelete
| SHOW ALTER TABLE (ROLLUP | (MATERIALIZED VIEW) | COLUMN)
((FROM | IN) database=multipartIdentifier)? wildWhere?
sortClause? limitClause? #showAlterTable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@
import org.apache.doris.nereids.DorisParser.ShowCreateMaterializedViewContext;
import org.apache.doris.nereids.DorisParser.ShowCreateProcedureContext;
import org.apache.doris.nereids.DorisParser.ShowCreateTableContext;
import org.apache.doris.nereids.DorisParser.ShowDeleteContext;
import org.apache.doris.nereids.DorisParser.ShowDynamicPartitionContext;
import org.apache.doris.nereids.DorisParser.ShowFrontendsContext;
import org.apache.doris.nereids.DorisParser.ShowGrantsContext;
Expand Down Expand Up @@ -473,6 +474,7 @@
import org.apache.doris.nereids.trees.plans.commands.ShowCreateMaterializedViewCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowCreateProcedureCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowCreateTableCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowDeleteCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowDynamicPartitionCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowFrontendsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowGrantsCommand;
Expand Down Expand Up @@ -4350,6 +4352,16 @@ public LogicalPlan visitShowTableId(ShowTableIdContext ctx) {
return new ShowTableIdCommand(tableId);
}

@Override
public LogicalPlan visitShowDelete(ShowDeleteContext ctx) {
String dbName = null;
if (ctx.database != null) {
List<String> nameParts = visitMultipartIdentifier(ctx.database);
dbName = nameParts.get(0); // only one entry possible
}
return new ShowDeleteCommand(dbName);
}

@Override
public LogicalPlan visitShowPrivileges(ShowPrivilegesContext ctx) {
return new ShowPrivilegesCommand();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ public enum PlanType {
SHOW_CREATE_CATALOG_COMMAND,
SHOW_CREATE_MATERIALIZED_VIEW_COMMAND,
SHOW_CREATE_TABLE_COMMAND,
SHOW_DELETE_COMMAND,
SHOW_DYNAMIC_PARTITION_COMMAND,
SHOW_FRONTENDS_COMMAND,
SHOW_GRANTS_COMMAND,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
// 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.analysis.RedirectStatus;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Database;
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.DeleteInfoProcDir;
import org.apache.doris.load.DeleteHandler;
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.base.Strings;
import com.google.common.collect.Lists;

import java.util.ArrayList;
import java.util.List;

/**
* show delete command
*/
public class ShowDeleteCommand extends ShowCommand {
private String dbName; // if not given use current.

/**
* constructor
*/
public ShowDeleteCommand(String dbName) {
super(PlanType.SHOW_DELETE_COMMAND);
this.dbName = dbName;
}

@Override
public ShowResultSet doRun(ConnectContext ctx, StmtExecutor executor) throws Exception {
if (Strings.isNullOrEmpty(dbName)) {
dbName = ctx.getDatabase();
if (Strings.isNullOrEmpty(dbName)) {
ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_DB_ERROR);
}
}
Env env = Env.getCurrentEnv();
Database db = env.getInternalCatalog().getDbOrAnalysisException(dbName);
long dbId = db.getId();

DeleteHandler deleteHandler = env.getDeleteHandler();
List<List<Comparable>> deleteInfos = deleteHandler.getDeleteInfosByDb(dbId);
List<List<String>> rows = Lists.newArrayList();
for (List<Comparable> deleteInfo : deleteInfos) {
List<String> oneInfo = new ArrayList<String>(deleteInfo.size());
for (Comparable element : deleteInfo) {
oneInfo.add(element.toString());
}
rows.add(oneInfo);
}
return new ShowResultSet(getMetaData(), rows);
}

@Override
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
return visitor.visitShowDeleteCommand(this, context);
}

public ShowResultSetMetaData getMetaData() {
ShowResultSetMetaData.Builder builder = ShowResultSetMetaData.builder();
for (String title : DeleteInfoProcDir.TITLE_NAMES) {
builder.addColumn(new Column(title, ScalarType.createVarchar(30)));
}
return builder.build();
}

@Override
public RedirectStatus toRedirectStatus() {
return RedirectStatus.FORWARD_NO_SYNC;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
import org.apache.doris.nereids.trees.plans.commands.ShowCreateMaterializedViewCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowCreateProcedureCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowCreateTableCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowDeleteCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowDynamicPartitionCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowFrontendsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowGrantsCommand;
Expand Down Expand Up @@ -411,6 +412,10 @@ default R visitShowTrashCommand(ShowTrashCommand showTrashCommand, C context) {
return visitCommand(showTrashCommand, context);
}

default R visitShowDeleteCommand(ShowDeleteCommand showDeleteCommand, C context) {
return visitCommand(showDeleteCommand, context);
}

default R visitShowPrivilegesCommand(ShowPrivilegesCommand showPrivilegesCommand, C context) {
return visitCommand(showPrivilegesCommand, context);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ suite("test_dml_delete_table_auth","p0,auth_call") {
sql """DELETE FROM ${dbName}.${tableName} WHERE id = 3;"""
exception "denied"
}

checkNereidsExecute("show DELETE from ${dbName}")
def del_res = sql """show DELETE from ${dbName}"""
assertTrue(del_res.size() == 0)
}
Expand Down
1 change: 1 addition & 0 deletions regression-test/suites/show_p0/test_show_delete.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ suite("test_show_delete") {
// don't care nereids planner
sql """ delete from ${tableName} PARTITION Mar where type ='2'"""
sql """ delete from ${tableName} where type ='1'"""
checkNereidsExecute("show DELETE")
def showDeleteResult = sql """ show delete"""
//When we test locally, multiple history results will be included, so size will be >= 2
assert showDeleteResult.size() >= 0
Expand Down

0 comments on commit f958509

Please sign in to comment.