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 ae97699bba8 [Chore](nereids) remove DropSqlBlockRuleStmt (#54536)
ae97699bba8 is described below
commit ae97699bba8d998de0f72da16a35ac254dc46cdf
Author: yaoxiao <[email protected]>
AuthorDate: Tue Aug 12 10:10:53 2025 +0800
[Chore](nereids) remove DropSqlBlockRuleStmt (#54536)
---
fe/fe-core/src/main/cup/sql_parser.cup | 4 --
.../doris/analysis/DropSqlBlockRuleStmt.java | 64 ----------------------
.../apache/doris/blockrule/SqlBlockRuleMgr.java | 8 ---
.../plans/commands/DropSqlBlockRuleCommand.java | 8 +++
.../main/java/org/apache/doris/qe/DdlExecutor.java | 3 -
.../apache/doris/utframe/TestWithFeService.java | 7 ++-
6 files changed, 12 insertions(+), 82 deletions(-)
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup
b/fe/fe-core/src/main/cup/sql_parser.cup
index 4b49cf6152f..eba238bd8e9 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -2521,10 +2521,6 @@ drop_stmt ::=
{:
RESULT = new DropWorkloadSchedPolicyStmt(ifExists, policyName);
:}
- | KW_DROP KW_SQL_BLOCK_RULE opt_if_exists:ifExists ident_list:ruleNames
- {:
- RESULT = new DropSqlBlockRuleStmt(ifExists, ruleNames);
- :}
| KW_DROP KW_INVERTED KW_INDEX KW_ANALYZER opt_if_exists:ifExists
ident:policyName
{:
RESULT = new DropIndexPolicyStmt(ifExists,
IndexPolicyTypeEnum.ANALYZER, policyName);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropSqlBlockRuleStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropSqlBlockRuleStmt.java
deleted file mode 100644
index 86bb4aaa56d..00000000000
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropSqlBlockRuleStmt.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// 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.analysis;
-
-import org.apache.doris.catalog.Env;
-import org.apache.doris.common.ErrorCode;
-import org.apache.doris.common.ErrorReport;
-import org.apache.doris.common.UserException;
-import org.apache.doris.mysql.privilege.PrivPredicate;
-import org.apache.doris.qe.ConnectContext;
-
-import com.google.common.base.Joiner;
-import lombok.Getter;
-
-import java.util.List;
-
-@Getter
-public class DropSqlBlockRuleStmt extends DdlStmt implements
NotFallbackInParser {
-
- private boolean ifExists;
-
- private List<String> ruleNames;
-
- @Override
- public void analyze() throws UserException {
- super.analyze();
- // check auth
- if
(!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(),
PrivPredicate.ADMIN)) {
-
ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR,
"ADMIN");
- }
- }
-
- public DropSqlBlockRuleStmt(boolean ifExists, List<String> ruleNames) {
- this.ifExists = ifExists;
- this.ruleNames = ruleNames;
- }
-
- @Override
- public String toSql() {
- StringBuilder sb = new StringBuilder();
- sb.append("DROP SQL_BLOCK_RULE
").append(Joiner.on(",").join(ruleNames));
- return sb.toString();
- }
-
- @Override
- public StmtType stmtType() {
- return StmtType.DROP;
- }
-}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java
index b309fd967a1..4a0488595f1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java
@@ -19,7 +19,6 @@ package org.apache.doris.blockrule;
import org.apache.doris.analysis.AlterSqlBlockRuleStmt;
import org.apache.doris.analysis.CreateSqlBlockRuleStmt;
-import org.apache.doris.analysis.DropSqlBlockRuleStmt;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
@@ -198,13 +197,6 @@ public class SqlBlockRuleMgr implements Writable {
nameToSqlBlockRuleMap.put(sqlBlockRule.getName(), sqlBlockRule);
}
- /**
- * Drop SqlBlockRule for drop stmt.
- **/
- public void dropSqlBlockRule(DropSqlBlockRuleStmt stmt) throws
DdlException {
- dropSqlBlockRule(stmt.getRuleNames(), stmt.isIfExists());
- }
-
public void dropSqlBlockRule(List<String> ruleNames, boolean isIfExists)
throws DdlException {
writeLock();
try {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropSqlBlockRuleCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropSqlBlockRuleCommand.java
index 37ce9104a44..ba1a78702ee 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropSqlBlockRuleCommand.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropSqlBlockRuleCommand.java
@@ -57,4 +57,12 @@ public class DropSqlBlockRuleCommand extends DropCommand {
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
return visitor.visitDropSqlBlockRuleCommand(this, context);
}
+
+ public boolean isIfExists() {
+ return ifExists;
+ }
+
+ public List<String> getRuleNames() {
+ return ruleNames;
+ }
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
index 862e5079fc7..16fcdc4052c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
@@ -32,7 +32,6 @@ import org.apache.doris.analysis.CreateSqlBlockRuleStmt;
import org.apache.doris.analysis.CreateTableStmt;
import org.apache.doris.analysis.DdlStmt;
import org.apache.doris.analysis.DropIndexPolicyStmt;
-import org.apache.doris.analysis.DropSqlBlockRuleStmt;
import org.apache.doris.analysis.DropTableStmt;
import org.apache.doris.analysis.DropUserStmt;
import org.apache.doris.analysis.DropWorkloadSchedPolicyStmt;
@@ -122,8 +121,6 @@ public class DdlExecutor {
env.getSqlBlockRuleMgr().createSqlBlockRule((CreateSqlBlockRuleStmt) ddlStmt);
} else if (ddlStmt instanceof AlterSqlBlockRuleStmt) {
env.getSqlBlockRuleMgr().alterSqlBlockRule((AlterSqlBlockRuleStmt)
ddlStmt);
- } else if (ddlStmt instanceof DropSqlBlockRuleStmt) {
- env.getSqlBlockRuleMgr().dropSqlBlockRule((DropSqlBlockRuleStmt)
ddlStmt);
} else if (ddlStmt instanceof RefreshTableStmt) {
RefreshTableStmt refreshTableStmt = (RefreshTableStmt) ddlStmt;
env.getRefreshManager().handleRefreshTable(refreshTableStmt.getCtl(),
refreshTableStmt.getDbName(),
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
b/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
index af9ff710a68..725cd6ca639 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
@@ -22,7 +22,6 @@ import org.apache.doris.analysis.AlterSqlBlockRuleStmt;
import org.apache.doris.analysis.AlterTableStmt;
import org.apache.doris.analysis.CreateSqlBlockRuleStmt;
import org.apache.doris.analysis.CreateTableStmt;
-import org.apache.doris.analysis.DropSqlBlockRuleStmt;
import org.apache.doris.analysis.ExplainOptions;
import org.apache.doris.analysis.RecoverTableStmt;
import org.apache.doris.analysis.SqlParser;
@@ -66,6 +65,7 @@ import
org.apache.doris.nereids.trees.plans.commands.DropConstraintCommand;
import org.apache.doris.nereids.trees.plans.commands.DropDatabaseCommand;
import org.apache.doris.nereids.trees.plans.commands.DropMTMVCommand;
import org.apache.doris.nereids.trees.plans.commands.DropRowPolicyCommand;
+import org.apache.doris.nereids.trees.plans.commands.DropSqlBlockRuleCommand;
import org.apache.doris.nereids.trees.plans.commands.DropTableCommand;
import org.apache.doris.nereids.trees.plans.commands.GrantRoleCommand;
import
org.apache.doris.nereids.trees.plans.commands.GrantTablePrivilegeCommand;
@@ -770,8 +770,9 @@ public abstract class TestWithFeService {
}
protected void dropSqlBlockRule(String sql) throws Exception {
- Env.getCurrentEnv().getSqlBlockRuleMgr()
- .dropSqlBlockRule((DropSqlBlockRuleStmt)
parseAndAnalyzeStmt(sql));
+ NereidsParser parser = new NereidsParser();
+ DropSqlBlockRuleCommand command = (DropSqlBlockRuleCommand)
parser.parseSingle(sql);
+
Env.getCurrentEnv().getSqlBlockRuleMgr().dropSqlBlockRule(command.getRuleNames(),
command.isIfExists());
}
protected void assertSQLPlanOrErrorMsgContains(String sql, String expect)
throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
