database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Enhancement] [plsql] support drop store procedure (#30966) (#31001)

Browse Source
This commit is contained in:
Vallish Pai
2024-02-21 20:30:30 +05:30
committed by yiguolei
parent c56cb0ac3e
commit 98a1b12ac6
8 changed files with 120 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
View File

@ -83,6 +83,7 @@ import org.apache.doris.nereids.DorisParser.DeleteContext;
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;
@ -348,6 +349,7 @@ import org.apache.doris.nereids.trees.plans.commands.DeleteFromCommand;
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;
@ -3286,4 +3288,11 @@ public class LogicalPlanBuilder extends DorisParserBaseVisitor<Object> {
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)));
}
}

3
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
View File

@ -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
}

62
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropProcedureCommand.java Normal file
View File

@ -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);
}
}

5
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
View File

@ -31,6 +31,7 @@ import org.apache.doris.nereids.trees.plans.commands.DeleteFromCommand;
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;
@ -141,4 +142,8 @@ public interface CommandVisitor<R, C> {
default R visitCreateProcedureCommand(CreateProcedureCommand createProcedureCommand, C context) {
return visitCommand(createProcedureCommand, context);
}
default R visitDropProcedureCommand(DropProcedureCommand dropProcedureCommand, C context) {
return visitCommand(dropProcedureCommand, context);
}
}

33
fe/fe-core/src/main/java/org/apache/doris/plsql/Exec.java
View File

@ -47,6 +47,7 @@ import org.apache.doris.nereids.PLParser.Declare_cursor_itemContext;
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;
@ -1459,6 +1460,38 @@ public class Exec extends org.apache.doris.nereids.PLParserBaseVisitor<Integer>
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) {