Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ statement
: statementBase # statementBaseAlias
| CALL name=multipartIdentifier LEFT_PAREN (expression (COMMA expression)*)? RIGHT_PAREN #callProcedure
| (ALTER | CREATE (OR REPLACE)? | REPLACE) (PROCEDURE | PROC) name=multipartIdentifier LEFT_PAREN .*? RIGHT_PAREN .*? #createProcedure
| DROP (PROCEDURE | PROC) (IF EXISTS)? name=multipartIdentifier #dropProcedure
;

statementBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ stmt :
| create_package_body_stmt
| create_procedure_stmt
| declare_stmt
| drop_procedure_stmt
| exec_stmt
| exit_stmt
| fetch_stmt
Expand Down Expand Up @@ -329,6 +330,9 @@ package_body_item :
create_procedure_stmt :
(ALTER | CREATE (OR REPLACE)? | REPLACE) (PROCEDURE | PROC) multipartIdentifier create_routine_params? create_routine_options? (AS | IS)? declare_block_inplace? label_stmt? procedure_block (ident_pl SEMICOLON)?
;
drop_procedure_stmt:
DROP (PROCEDURE | PROC) (IF EXISTS)? name=multipartIdentifier
;

create_routine_params :
LEFT_PAREN RIGHT_PAREN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
import org.apache.doris.nereids.DorisParser.DereferenceContext;
import org.apache.doris.nereids.DorisParser.DropConstraintContext;
import org.apache.doris.nereids.DorisParser.DropMTMVContext;
import org.apache.doris.nereids.DorisParser.DropProcedureContext;
import org.apache.doris.nereids.DorisParser.ElementAtContext;
import org.apache.doris.nereids.DorisParser.ExistContext;
import org.apache.doris.nereids.DorisParser.ExplainContext;
Expand Down Expand Up @@ -348,6 +349,7 @@
import org.apache.doris.nereids.trees.plans.commands.DeleteFromUsingCommand;
import org.apache.doris.nereids.trees.plans.commands.DropConstraintCommand;
import org.apache.doris.nereids.trees.plans.commands.DropMTMVCommand;
import org.apache.doris.nereids.trees.plans.commands.DropProcedureCommand;
import org.apache.doris.nereids.trees.plans.commands.ExplainCommand;
import org.apache.doris.nereids.trees.plans.commands.ExplainCommand.ExplainLevel;
import org.apache.doris.nereids.trees.plans.commands.ExportCommand;
Expand Down Expand Up @@ -3286,4 +3288,11 @@ public LogicalPlan visitCreateProcedure(CreateProcedureContext ctx) {
return createProcedurePlan;
});
}

@Override
public LogicalPlan visitDropProcedure(DropProcedureContext ctx) {
List<String> nameParts = visitMultipartIdentifier(ctx.name);
FuncNameInfo procedureName = new FuncNameInfo(nameParts);
return ParserUtils.withOrigin(ctx, () -> new DropProcedureCommand(procedureName, getOriginSql(ctx)));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -140,5 +140,6 @@ public enum PlanType {
RESUME_MTMV_COMMAND,
CANCEL_MTMV_TASK_COMMAND,
CALL_COMMAND,
CREATE_PROCEDURE_COMMAND
CREATE_PROCEDURE_COMMAND,
DROP_PROCEDURE_COMMAND
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// 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.nereids.annotation.Developing;
import org.apache.doris.nereids.trees.plans.PlanType;
import org.apache.doris.nereids.trees.plans.commands.info.FuncNameInfo;
import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
import org.apache.doris.plsql.metastore.PlsqlMetaClient;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.StmtExecutor;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.Objects;

/**
* Drop table procedure
*/
@Developing
public class DropProcedureCommand extends Command implements ForwardWithSync {
public static final Logger LOG = LogManager.getLogger(DropProcedureCommand.class);
private final FuncNameInfo procedureName;
private final String source; // Original SQL, from LogicalPlanBuilder.getOriginSql()
private final PlsqlMetaClient client;

/**
* constructor
*/
public DropProcedureCommand(FuncNameInfo procedureName, String source) {
super(PlanType.DROP_PROCEDURE_COMMAND);
this.client = new PlsqlMetaClient();
this.procedureName = Objects.requireNonNull(procedureName, "procedureName is null");
this.source = Objects.requireNonNull(source, "source is null");
}

@Override
public void run(ConnectContext ctx, StmtExecutor executor) throws Exception {
ctx.getPlSqlOperation().getExec().functions.remove(procedureName);
}

@Override
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
return visitor.visitDropProcedureCommand(this, context);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.doris.nereids.trees.plans.commands.DeleteFromUsingCommand;
import org.apache.doris.nereids.trees.plans.commands.DropConstraintCommand;
import org.apache.doris.nereids.trees.plans.commands.DropMTMVCommand;
import org.apache.doris.nereids.trees.plans.commands.DropProcedureCommand;
import org.apache.doris.nereids.trees.plans.commands.ExplainCommand;
import org.apache.doris.nereids.trees.plans.commands.ExportCommand;
import org.apache.doris.nereids.trees.plans.commands.InsertIntoTableCommand;
Expand Down Expand Up @@ -141,4 +142,8 @@ default R visitCallCommand(CallCommand callCommand, C context) {
default R visitCreateProcedureCommand(CreateProcedureCommand createProcedureCommand, C context) {
return visitCommand(createProcedureCommand, context);
}

default R visitDropProcedureCommand(DropProcedureCommand dropProcedureCommand, C context) {
return visitCommand(dropProcedureCommand, context);
}
}
33 changes: 33 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/plsql/Exec.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.apache.doris.nereids.PLParser.Declare_handler_itemContext;
import org.apache.doris.nereids.PLParser.Declare_var_itemContext;
import org.apache.doris.nereids.PLParser.Doris_statementContext;
import org.apache.doris.nereids.PLParser.Drop_procedure_stmtContext;
import org.apache.doris.nereids.PLParser.DtypeContext;
import org.apache.doris.nereids.PLParser.Dtype_lenContext;
import org.apache.doris.nereids.PLParser.Exception_block_itemContext;
Expand Down Expand Up @@ -1459,6 +1460,38 @@ String createLocalUdf() {
return null;
}

/**
* DROP PROCEDURE statement
*/
@Override
public Integer visitDrop_procedure_stmt(Drop_procedure_stmtContext ctx) {
FuncNameInfo procedureName = new FuncNameInfo(
exec.logicalPlanBuilder.visitMultipartIdentifier(ctx.multipartIdentifier()));
if (builtinFunctions.exists(procedureName.toString())) {
exec.info(ctx, procedureName.toString() + " is a built-in function which cannot be removed.");
return 0;
}
if (trace) {
trace(ctx, "DROP PROCEDURE " + procedureName.toString());
}
exec.functions.remove(procedureName);
removeLocalUdf(ctx);
return 0;
}

/**
* Remove functions and procedures defined in the current script
*/
void removeLocalUdf(ParserRuleContext ctx) {
if (exec == this) {
String str = Exec.getFormattedText(ctx);
int i = localUdf.indexOf(str);
if (i != -1) {
localUdf.delete(i, i + str.length());
}
}
}

@Override
public Integer visitSet_doris_session_option(
Set_doris_session_optionContext ctx) {
Expand Down
4 changes: 4 additions & 0 deletions regression-test/suites/plsql_p0/test_plsql_loop_cursor.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,8 @@ suite("test_plsql_loop_cursor") {
// TODO support print
sql """call procedure_cursor_select(111, "plsql111")"""
sql """call procedure_cursor_select(111, "plsql333")"""
// TODO call show command before drop
sql """DROP PROCEDURE procedure_cursor_select"""
sql """DROP PROC procedure_insert"""
// TODO call show command after drop
}