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 bf1894771e9 [Chore](nereids) remove CreateWorkloadSchedPolicyStmt
(#54388)
bf1894771e9 is described below
commit bf1894771e956991e1befbdb0030bdd878bcbd40
Author: yaoxiao <[email protected]>
AuthorDate: Thu Aug 7 15:31:32 2025 +0800
[Chore](nereids) remove CreateWorkloadSchedPolicyStmt (#54388)
---
fe/fe-core/src/main/cup/sql_parser.cup | 5 -
.../analysis/CreateWorkloadSchedPolicyStmt.java | 130 ---------------------
.../main/java/org/apache/doris/qe/DdlExecutor.java | 3 -
.../WorkloadSchedPolicyMgr.java | 11 --
4 files changed, 149 deletions(-)
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup
b/fe/fe-core/src/main/cup/sql_parser.cup
index c19b7df4dfe..72024945040 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -1696,11 +1696,6 @@ create_stmt ::=
{:
RESULT = new AlterTableStmt(tableName, Lists.newArrayList(new
CreateIndexClause(tableName, new IndexDef(indexName, ifNotExists, cols,
indexType, properties, comment), false)));
:}
- /* workload schedule policy */
- | KW_CREATE KW_WORKLOAD KW_POLICY opt_if_not_exists:ifNotExists
ident_or_text:workloadPolicyName opt_conditions:conditions opt_actions:actions
opt_properties:properties
- {:
- RESULT = new CreateWorkloadSchedPolicyStmt(ifNotExists,
workloadPolicyName, conditions, actions, properties);
- :}
/* encryptkey */
| KW_CREATE KW_ENCRYPTKEY opt_if_not_exists:ifNotExists
encryptkey_name:keyName KW_AS STRING_LITERAL:keyString
{:
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateWorkloadSchedPolicyStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateWorkloadSchedPolicyStmt.java
deleted file mode 100644
index 6b5290f1c2a..00000000000
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateWorkloadSchedPolicyStmt.java
+++ /dev/null
@@ -1,130 +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.DdlException;
-import org.apache.doris.common.ErrorCode;
-import org.apache.doris.common.ErrorReport;
-import org.apache.doris.common.FeNameFormat;
-import org.apache.doris.common.UserException;
-import org.apache.doris.mysql.privilege.PrivPredicate;
-import org.apache.doris.qe.ConnectContext;
-import org.apache.doris.resource.workloadschedpolicy.WorkloadActionMeta;
-import org.apache.doris.resource.workloadschedpolicy.WorkloadConditionMeta;
-
-import java.util.List;
-import java.util.Map;
-
-public class CreateWorkloadSchedPolicyStmt extends DdlStmt implements
NotFallbackInParser {
-
- private final boolean ifNotExists;
- private final String policyName;
- private final List<WorkloadConditionMeta> conditions;
- private final List<WorkloadActionMeta> actions;
- private final Map<String, String> properties;
-
- public CreateWorkloadSchedPolicyStmt(boolean ifNotExists, String
policyName,
- List<WorkloadConditionMeta> conditions, List<WorkloadActionMeta>
actions, Map<String, String> properties) {
- this.ifNotExists = ifNotExists;
- this.policyName = policyName;
- this.conditions = conditions;
- this.actions = actions;
- this.properties = properties;
- }
-
- public boolean isIfNotExists() {
- return ifNotExists;
- }
-
- @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");
- }
-
- // check name
- FeNameFormat.checkWorkloadSchedPolicyName(policyName);
-
- if (conditions == null || conditions.size() < 1) {
- throw new DdlException("At least one condition needs to be
specified");
- }
-
- if (actions == null || actions.size() < 1) {
- throw new DdlException("At least one action needs to be
specified");
- }
- }
-
- public String getPolicyName() {
- return policyName;
- }
-
- public List<WorkloadConditionMeta> getConditions() {
- return conditions;
- }
-
- public List<WorkloadActionMeta> getActions() {
- return actions;
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
-
- @Override
- public String toSql() {
- String str = "";
- str = str + "CREAYE ";
- str = str + "WORKLOAD SCHEDULE POLICY " + policyName + " ";
-
- str = str + " CONDITIONS( ";
- if (conditions != null) {
- for (WorkloadConditionMeta wcm : conditions) {
- str += wcm.toString() + ",";
- }
- }
- str = str.substring(0, str.length() - 1);
- str = str + ")";
-
- str = str + " ACTIONS( ";
- if (actions != null) {
- for (WorkloadActionMeta wam : actions) {
- str = str + wam.toString() + ",";
- }
- }
- str = str.substring(0, str.length() - 1);
- str = str + ")";
-
- str = str + " PROPERTIES(";
- for (Map.Entry<String, String> entry : properties.entrySet()) {
- str = str + "\"" + entry.getKey() + "\"" + "=" + "\"" +
entry.getValue() + "\",";
- }
- str = str.substring(0, str.length() - 1);
- str = str + ")";
-
- return str;
- }
-
- @Override
- public StmtType stmtType() {
- return StmtType.CREATE;
- }
-}
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 d0bf58d833c..ca6d847ecaf 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
@@ -34,7 +34,6 @@ import org.apache.doris.analysis.CreateMaterializedViewStmt;
import org.apache.doris.analysis.CreateRoutineLoadStmt;
import org.apache.doris.analysis.CreateSqlBlockRuleStmt;
import org.apache.doris.analysis.CreateTableStmt;
-import org.apache.doris.analysis.CreateWorkloadSchedPolicyStmt;
import org.apache.doris.analysis.DdlStmt;
import org.apache.doris.analysis.DropCatalogStmt;
import org.apache.doris.analysis.DropIndexPolicyStmt;
@@ -145,8 +144,6 @@ public class DdlExecutor {
env.uninstallPlugin((UninstallPluginStmt) ddlStmt);
} else if (ddlStmt instanceof AdminSetPartitionVersionStmt) {
env.setPartitionVersion((AdminSetPartitionVersionStmt) ddlStmt);
- } else if (ddlStmt instanceof CreateWorkloadSchedPolicyStmt) {
-
env.getWorkloadSchedPolicyMgr().createWorkloadSchedPolicy((CreateWorkloadSchedPolicyStmt)
ddlStmt);
} else if (ddlStmt instanceof AlterWorkloadSchedPolicyStmt) {
env.getWorkloadSchedPolicyMgr().alterWorkloadSchedPolicy((AlterWorkloadSchedPolicyStmt)
ddlStmt);
} else if (ddlStmt instanceof DropWorkloadSchedPolicyStmt) {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadSchedPolicyMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadSchedPolicyMgr.java
index 80ed2a7249b..3b7fdf81d68 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadSchedPolicyMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadSchedPolicyMgr.java
@@ -18,7 +18,6 @@
package org.apache.doris.resource.workloadschedpolicy;
import org.apache.doris.analysis.AlterWorkloadSchedPolicyStmt;
-import org.apache.doris.analysis.CreateWorkloadSchedPolicyStmt;
import org.apache.doris.analysis.DropWorkloadSchedPolicyStmt;
import org.apache.doris.analysis.UserIdentity;
import org.apache.doris.catalog.Env;
@@ -246,16 +245,6 @@ public class WorkloadSchedPolicyMgr extends MasterDaemon
implements Writable, Gs
}
}
- public void createWorkloadSchedPolicy(CreateWorkloadSchedPolicyStmt
createStmt) throws UserException {
- String policyName = createStmt.getPolicyName();
- List<WorkloadConditionMeta> originConditions =
createStmt.getConditions();
- List<WorkloadActionMeta> originActions = createStmt.getActions();
- Map<String, String> propMap = createStmt.getProperties();
- boolean isIfNotExists = createStmt.isIfNotExists();
-
- createWorkloadSchedPolicy(policyName, isIfNotExists, originConditions,
originActions, propMap);
- }
-
private boolean checkPolicyCondition(List<WorkloadCondition>
conditionList) throws UserException {
if (conditionList.size() >
Config.workload_max_condition_num_in_policy) {
throw new UserException(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
