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 ee635a8fefa [Feat](Nereids) support unset command (#43103)
ee635a8fefa is described below
commit ee635a8fefa467763f4390b316df6a48eaf36f0c
Author: LiBinfeng <[email protected]>
AuthorDate: Mon Nov 4 21:12:52 2024 +0800
[Feat](Nereids) support unset command (#43103)
### What problem does this PR solve?
<!--
You need to clearly describe your PR in this part:
migrate unset commands from original planner to nereids planner
The description of the PR needs to enable reviewers to quickly and
clearly understand the logic of the code modification.
-->
<!--
If there are related issues, please fill in the issue number.
- If you want the issue to be closed after the PR is merged, please use
"close #12345". Otherwise, use "ref #12345"
-->
Issue Number: close #43102
Problem Summary:
### Check List (For Committer)
- Test <!-- At least one of them must be included. -->
- [x] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No colde files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [x] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [x] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
- Release note
<!-- bugfix, feat, behavior changed need a release note -->
<!-- Add one line release note for this PR. -->
None
### Check List (For Reviewer who merge this PR)
- [x] Confirm the release note
- [x] Confirm test cases
- [x] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
.../antlr4/org/apache/doris/nereids/DorisParser.g4 | 6 +-
.../doris/nereids/parser/LogicalPlanBuilder.java | 22 +++
.../apache/doris/nereids/trees/plans/PlanType.java | 2 +
.../commands/UnsetDefaultStorageVaultCommand.java | 70 +++++++++
.../trees/plans/commands/UnsetVariableCommand.java | 160 +++++++++++++++++++++
.../trees/plans/visitor/CommandVisitor.java | 11 ++
.../set_and_unset_variable_command.out | 121 ++++++++++++++++
.../org/apache/doris/regression/suite/Suite.groovy | 18 +++
.../set_and_unset_variable_command.groovy | 116 +++++++++++++++
9 files changed, 523 insertions(+), 3 deletions(-)
diff --git a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
index acd139c010e..6cd4010bdcb 100644
--- a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
+++ b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
@@ -54,12 +54,12 @@ statementBase
| constraintStatement #constraintStatementAlias
| supportedDropStatement #supportedDropStatementAlias
| supportedSetStatement #supportedSetStatementAlias
+ | supportedUnsetStatement #supportedUnsetStatementAlias
| unsupportedStatement #unsupported
;
unsupportedStatement
- : unsupoortedUnsetStatement
- | unsupportedUseStatement
+ : unsupportedUseStatement
| unsupportedDmlStatement
| unsupportedKillStatement
| unsupportedDescribeStatement
@@ -839,7 +839,7 @@ isolationLevel
: ISOLATION LEVEL ((READ UNCOMMITTED) | (READ COMMITTED) | (REPEATABLE
READ) | (SERIALIZABLE))
;
-unsupoortedUnsetStatement
+supportedUnsetStatement
: UNSET (GLOBAL | SESSION | LOCAL)? VARIABLE (ALL | identifier)
| UNSET DEFAULT STORAGE VAULT
;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
index b5e6d928d6c..1af48c8a597 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -206,6 +206,7 @@ import
org.apache.doris.nereids.DorisParser.StringLiteralContext;
import org.apache.doris.nereids.DorisParser.StructLiteralContext;
import org.apache.doris.nereids.DorisParser.SubqueryContext;
import org.apache.doris.nereids.DorisParser.SubqueryExpressionContext;
+import org.apache.doris.nereids.DorisParser.SupportedUnsetStatementContext;
import org.apache.doris.nereids.DorisParser.SystemVariableContext;
import org.apache.doris.nereids.DorisParser.TableAliasContext;
import org.apache.doris.nereids.DorisParser.TableNameContext;
@@ -422,6 +423,8 @@ import
org.apache.doris.nereids.trees.plans.commands.ShowConstraintsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowCreateMTMVCommand;
import
org.apache.doris.nereids.trees.plans.commands.ShowCreateProcedureCommand;
import
org.apache.doris.nereids.trees.plans.commands.ShowProcedureStatusCommand;
+import
org.apache.doris.nereids.trees.plans.commands.UnsetDefaultStorageVaultCommand;
+import org.apache.doris.nereids.trees.plans.commands.UnsetVariableCommand;
import org.apache.doris.nereids.trees.plans.commands.UnsupportedCommand;
import org.apache.doris.nereids.trees.plans.commands.UpdateCommand;
import org.apache.doris.nereids.trees.plans.commands.info.AlterMTMVInfo;
@@ -3834,6 +3837,25 @@ public class LogicalPlanBuilder extends
DorisParserBaseVisitor<Object> {
return UnsupportedCommand.INSTANCE;
}
+ @Override
+ public LogicalPlan
visitSupportedUnsetStatement(SupportedUnsetStatementContext ctx) {
+ if (ctx.DEFAULT() != null && ctx.STORAGE() != null && ctx.VAULT() !=
null) {
+ return new UnsetDefaultStorageVaultCommand();
+ }
+ SetType type = SetType.DEFAULT;
+ if (ctx.GLOBAL() != null) {
+ type = SetType.GLOBAL;
+ } else if (ctx.LOCAL() != null || ctx.SESSION() != null) {
+ type = SetType.SESSION;
+ }
+ if (ctx.ALL() != null) {
+ return new UnsetVariableCommand(type, true);
+ } else if (ctx.identifier() != null) {
+ return new UnsetVariableCommand(type, ctx.identifier().getText());
+ }
+ throw new AnalysisException("Should add 'ALL' or variable name");
+ }
+
@Override
public LogicalPlan visitCreateTableLike(CreateTableLikeContext ctx) {
List<String> nameParts = visitMultipartIdentifier(ctx.name);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
index b87dfaf08ae..d7a219cc7e4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
@@ -164,6 +164,8 @@ public enum PlanType {
ALTER_VIEW_COMMAND,
ALTER_STORAGE_VAULT,
DROP_CATALOG_RECYCLE_BIN_COMMAND,
+ UNSET_VARIABLE_COMMAND,
+ UNSET_DEFAULT_STORAGE_VAULT_COMMAND,
UNSUPPORTED_COMMAND,
CREATE_TABLE_LIKE_COMMAND,
SET_OPTIONS_COMMAND,
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/UnsetDefaultStorageVaultCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/UnsetDefaultStorageVaultCommand.java
new file mode 100644
index 00000000000..80f2bdaf20f
--- /dev/null
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/UnsetDefaultStorageVaultCommand.java
@@ -0,0 +1,70 @@
+// 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.catalog.Env;
+import org.apache.doris.cloud.catalog.CloudEnv;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.FeConstants;
+import org.apache.doris.mysql.privilege.PrivPredicate;
+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.StmtExecutor;
+
+/**
+ * Unset Default Storage Vault Command
+ */
+public class UnsetDefaultStorageVaultCommand extends Command implements
ForwardWithSync {
+ public UnsetDefaultStorageVaultCommand() {
+ super(PlanType.UNSET_DEFAULT_STORAGE_VAULT_COMMAND);
+ }
+
+ public String toSql() {
+ final String stmt = "UNSET DEFAULT STORAGE VAULT";
+ return stmt;
+ }
+
+ @Override
+ public void run(ConnectContext ctx, StmtExecutor executor) throws
Exception {
+ if (Config.isNotCloudMode()) {
+ throw new AnalysisException("Storage Vault is only supported for
cloud mode");
+ }
+ if (!FeConstants.runningUnitTest) {
+ // In legacy cloud mode, some s3 back-ended storage does need to
use storage vault.
+ if (!((CloudEnv) Env.getCurrentEnv()).getEnableStorageVault()) {
+ throw new AnalysisException("Your cloud instance doesn't
support storage vault");
+ }
+ }
+
+ // check auth
+ if
(!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(),
PrivPredicate.ADMIN)) {
+
ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR,
"ADMIN");
+ }
+
+ ctx.getEnv().getStorageVaultMgr().unsetDefaultStorageVault();
+ }
+
+ @Override
+ public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
+ return visitor.visitUnsetDefaultStorageVaultCommand(this, context);
+ }
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/UnsetVariableCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/UnsetVariableCommand.java
new file mode 100644
index 00000000000..48af3a43769
--- /dev/null
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/UnsetVariableCommand.java
@@ -0,0 +1,160 @@
+// 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.analysis.SetType;
+import org.apache.doris.analysis.SetVar;
+import org.apache.doris.analysis.StringLiteral;
+import org.apache.doris.catalog.Env;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.DdlException;
+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.nereids.trees.plans.PlanType;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.StmtExecutor;
+import org.apache.doris.qe.VariableMgr;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * UnSetVarOp
+ */
+public class UnsetVariableCommand extends Command implements Forward {
+ private static final Logger LOG = LogManager.getLogger(StmtExecutor.class);
+
+ private SetType setType;
+
+ // variable to restore
+ private String variable = null;
+
+ private boolean applyToAll = false;
+
+ public UnsetVariableCommand(SetType setType, String varName) {
+ super(PlanType.UNSET_VARIABLE_COMMAND);
+ this.setType = setType;
+ this.variable = varName;
+ }
+
+ public UnsetVariableCommand(SetType setType, boolean applyToAll) {
+ super(PlanType.UNSET_VARIABLE_COMMAND);
+ this.setType = setType;
+ this.applyToAll = applyToAll;
+ }
+
+ public SetType getSetType() {
+ return setType;
+ }
+
+ public String getVariable() {
+ return variable;
+ }
+
+ public boolean isApplyToAll() {
+ return applyToAll;
+ }
+
+ private void validate() throws UserException {
+ if (StringUtils.isEmpty(variable) && !applyToAll) {
+ throw new AnalysisException("You should specific the unset
variable.");
+ }
+
+ if (setType == SetType.GLOBAL) {
+ if
(!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(),
PrivPredicate.ADMIN)) {
+
ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR,
+ "ADMIN");
+ }
+ }
+ }
+
+ /**
+ * return sql expression of this command
+ * @return string of this command
+ */
+ public String toSql() {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("UNSET ");
+ sb.append(setType).append(" VARIABLE ");
+ if (!StringUtils.isEmpty(variable)) {
+ sb.append(variable).append(" ");
+ } else if (applyToAll) {
+ sb.append("ALL");
+ }
+ return sb.toString();
+ }
+
+ @Override
+ public RedirectStatus toRedirectStatus() {
+ if (setType == SetType.GLOBAL) {
+ return RedirectStatus.FORWARD_WITH_SYNC;
+ }
+
+ return RedirectStatus.NO_FORWARD;
+ }
+
+ @Override
+ public void afterForwardToMaster(ConnectContext context) throws Exception {
+ if (isApplyToAll()) {
+ VariableMgr.setAllVarsToDefaultValue(context.getSessionVariable(),
SetType.SESSION);
+ } else {
+ String defaultValue = VariableMgr.getDefaultValue(getVariable());
+ if (defaultValue == null) {
+
ErrorReport.reportDdlException(ErrorCode.ERR_UNKNOWN_SYSTEM_VARIABLE,
getVariable());
+ }
+ SetVar var = new SetVar(SetType.SESSION, getVariable(),
+ new StringLiteral(defaultValue),
SetVar.SetVarType.SET_SESSION_VAR);
+ VariableMgr.setVar(context.getSessionVariable(), var);
+ }
+ }
+
+ @Override
+ public void run(ConnectContext ctx, StmtExecutor executor) throws
Exception {
+ validate();
+ try {
+ if (isApplyToAll()) {
+ VariableMgr.setAllVarsToDefaultValue(ctx.getSessionVariable(),
getSetType());
+ } else {
+ String defaultValue =
VariableMgr.getDefaultValue(getVariable());
+ if (defaultValue == null) {
+
ErrorReport.reportDdlException(ErrorCode.ERR_UNKNOWN_SYSTEM_VARIABLE,
getVariable());
+ }
+ SetVar var = new SetVar(getSetType(), getVariable(),
+ new StringLiteral(defaultValue),
SetVar.SetVarType.SET_SESSION_VAR);
+ VariableMgr.setVar(ctx.getSessionVariable(), var);
+ }
+ } catch (DdlException e) {
+ LOG.warn("", e);
+ // Return error message to client.
+ ctx.getState().setError(ErrorCode.ERR_LOCAL_VARIABLE,
e.getMessage() + toSql());
+ return;
+ }
+ ctx.getState().setOk();
+ }
+
+ @Override
+ public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
+ return visitor.visitUnsetVariableCommand(this, context);
+ }
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
index 03e2853ffa0..814596bca31 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
@@ -52,6 +52,8 @@ import
org.apache.doris.nereids.trees.plans.commands.ShowConstraintsCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowCreateMTMVCommand;
import
org.apache.doris.nereids.trees.plans.commands.ShowCreateProcedureCommand;
import
org.apache.doris.nereids.trees.plans.commands.ShowProcedureStatusCommand;
+import
org.apache.doris.nereids.trees.plans.commands.UnsetDefaultStorageVaultCommand;
+import org.apache.doris.nereids.trees.plans.commands.UnsetVariableCommand;
import org.apache.doris.nereids.trees.plans.commands.UnsupportedCommand;
import org.apache.doris.nereids.trees.plans.commands.UpdateCommand;
import
org.apache.doris.nereids.trees.plans.commands.insert.BatchInsertIntoTableCommand;
@@ -198,6 +200,15 @@ public interface CommandVisitor<R, C> {
return visitCommand(unsupportedCommand, context);
}
+ default R visitUnsetVariableCommand(UnsetVariableCommand
unsetVariableCommand, C context) {
+ return visitCommand(unsetVariableCommand, context);
+ }
+
+ default R
visitUnsetDefaultStorageVaultCommand(UnsetDefaultStorageVaultCommand
unsetDefaultStorageVaultCommand,
+ C context) {
+ return visitCommand(unsetDefaultStorageVaultCommand, context);
+ }
+
default R visitCreateTableLikeCommand(CreateTableLikeCommand
createTableLikeCommand, C context) {
return visitCommand(createTableLikeCommand, context);
}
diff --git
a/regression-test/data/nereids_p0/ddl/set_and_unset_commands/set_and_unset_variable_command.out
b/regression-test/data/nereids_p0/ddl/set_and_unset_commands/set_and_unset_variable_command.out
new file mode 100644
index 00000000000..e7a063c5116
--- /dev/null
+++
b/regression-test/data/nereids_p0/ddl/set_and_unset_commands/set_and_unset_variable_command.out
@@ -0,0 +1,121 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !cmd --
+wait_timeout 1000 28800 1
+
+-- !cmd --
+wait_timeout 28800 28800 0
+
+-- !cmd --
+runtime_filter_type BLOOM_FILTER IN_OR_BLOOM_FILTER,MIN_MAX 1
+
+-- !cmd --
+runtime_filter_type IN_OR_BLOOM_FILTER,MIN_MAX
IN_OR_BLOOM_FILTER,MIN_MAX 0
+
+-- !cmd --
+runtime_filter_type IN_OR_BLOOM_FILTER,MIN_MAX
IN_OR_BLOOM_FILTER,MIN_MAX 0
+
+-- !cmd --
+runtime_filter_type IN_OR_BLOOM_FILTER,MIN_MAX
IN_OR_BLOOM_FILTER,MIN_MAX 0
+
+-- !cmd --
+runtime_filter_type BLOOM_FILTER IN_OR_BLOOM_FILTER,MIN_MAX 1
+
+-- !cmd --
+runtime_filter_type BLOOM_FILTER IN_OR_BLOOM_FILTER,MIN_MAX 1
+
+-- !cmd --
+runtime_filter_type IN_OR_BLOOM_FILTER,MIN_MAX
IN_OR_BLOOM_FILTER,MIN_MAX 0
+
+-- !cmd --
+runtime_filter_type IN_OR_BLOOM_FILTER,MIN_MAX
IN_OR_BLOOM_FILTER,MIN_MAX 0
+
+-- !cmd --
+experimental_enable_agg_state true false 1
+
+-- !cmd --
+experimental_enable_agg_state false false 0
+
+-- !cmd --
+experimental_enable_agg_state false false 0
+
+-- !cmd --
+experimental_enable_agg_state false false 0
+
+-- !cmd --
+experimental_enable_agg_state true false 1
+
+-- !cmd --
+experimental_enable_agg_state true false 1
+
+-- !cmd --
+experimental_enable_agg_state false false 0
+
+-- !cmd --
+experimental_enable_agg_state false false 0
+
+-- !cmd --
+deprecated_enable_local_exchange false true 1
+
+-- !cmd --
+deprecated_enable_local_exchange true true 0
+
+-- !cmd --
+deprecated_enable_local_exchange true true 0
+
+-- !cmd --
+deprecated_enable_local_exchange true true 0
+
+-- !cmd --
+runtime_filter_type IN_OR_BLOOM_FILTER,MIN_MAX
IN_OR_BLOOM_FILTER,MIN_MAX 0
+
+-- !cmd --
+experimental_enable_agg_state false false 0
+
+-- !cmd --
+deprecated_enable_local_exchange true true 0
+
+-- !cmd --
+show_hidden_columns false false 0
+
+-- !cmd --
+show_hidden_columns false false 0
+
+-- !cmd --
+runtime_filter_type IN_OR_BLOOM_FILTER,MIN_MAX
IN_OR_BLOOM_FILTER,MIN_MAX 0
+
+-- !cmd --
+experimental_enable_agg_state false false 0
+
+-- !cmd --
+deprecated_enable_local_exchange true true 0
+
+-- !cmd --
+show_hidden_columns false false 0
+
+-- !cmd --
+show_hidden_columns false false 0
+
+-- !cmd --
+read_only true true 0
+
+-- !cmd --
+0
+
+-- !cmd --
+read_only true true 0
+
+-- !cmd --
+read_only true true 0
+
+-- !cmd --
+super_read_only true true 0
+
+-- !cmd --
+0
+
+-- !cmd --
+super_read_only true true 0
+
+-- !cmd --
+super_read_only true true 0
+
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
index 6dda050fbf3..f9532a19f8f 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
@@ -690,6 +690,24 @@ class Suite implements GroovyInterceptable {
runAction(new ProfileAction(context, tag), actionSupplier)
}
+ void checkNereidsExecute(String sqlString) {
+ String tag = UUID.randomUUID().toString();
+ log.info("start check" + tag)
+ String finalSqlString = "--" + tag + "\n" + sqlString
+ ProfileAction profileAction = new ProfileAction(context, tag)
+ profileAction.run {
+ log.info("start profile run" + tag)
+ sql (finalSqlString)
+ }
+ profileAction.check {
+ profileString, exception ->
+ log.info("start profile check" + tag)
+ log.info(profileString)
+ Assertions.assertTrue(profileString.contains("- Is Nereids:
Yes"))
+ }
+ profileAction.run()
+ }
+
void createMV(String sql) {
(new CreateMVAction(context, sql)).run()
}
diff --git
a/regression-test/suites/nereids_p0/ddl/set_and_unset_commands/set_and_unset_variable_command.groovy
b/regression-test/suites/nereids_p0/ddl/set_and_unset_commands/set_and_unset_variable_command.groovy
new file mode 100644
index 00000000000..1eae1ad77a4
--- /dev/null
+++
b/regression-test/suites/nereids_p0/ddl/set_and_unset_commands/set_and_unset_variable_command.groovy
@@ -0,0 +1,116 @@
+// 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.
+
+suite("set_and_unset_variable_command") {
+ sql "set enable_nereids_planner=true"
+ sql "set enable_fallback_to_original_planner=false"
+
+ checkNereidsExecute("UNSET VARIABLE ALL")
+ checkNereidsExecute("UNSET global VARIABLE ALL")
+
+ checkNereidsExecute("set wait_timeout = 1000")
+ qt_cmd """show variables like 'wait_timeout'"""
+
+ checkNereidsExecute("UNSET VARIABLE wait_timeout")
+ qt_cmd """show variables like 'wait_timeout'"""
+
+ checkNereidsExecute("set runtime_filter_type='BLOOM_FILTER'")
+ qt_cmd """show session variables like 'runtime_filter_type'"""
+ qt_cmd """show global variables like 'runtime_filter_type'"""
+ checkNereidsExecute("UNSET VARIABLE runtime_filter_type")
+ qt_cmd """show session variables like 'runtime_filter_type'"""
+ qt_cmd """show global variables like 'runtime_filter_type'"""
+
+ checkNereidsExecute("set global runtime_filter_type='BLOOM_FILTER'")
+ qt_cmd """show session variables like 'runtime_filter_type'"""
+ qt_cmd """show global variables like 'runtime_filter_type'"""
+ checkNereidsExecute("UNSET global VARIABLE runtime_filter_type")
+ qt_cmd """show session variables like 'runtime_filter_type'"""
+ qt_cmd """show global variables like 'runtime_filter_type'"""
+
+ // test variables with experimental_ prefix in session scope
+ checkNereidsExecute("set experimental_enable_agg_state='true'")
+ qt_cmd """show session variables like 'experimental_enable_agg_state'"""
+ qt_cmd """show global variables like 'experimental_enable_agg_state'"""
+ checkNereidsExecute("UNSET VARIABLE experimental_enable_agg_state")
+ qt_cmd """show session variables like 'experimental_enable_agg_state'"""
+ qt_cmd """show global variables like 'experimental_enable_agg_state'"""
+
+ // test variables with experimental_ prefix in global scope
+ checkNereidsExecute("set global experimental_enable_agg_state='true'")
+ qt_cmd """show session variables like 'experimental_enable_agg_state'"""
+ qt_cmd """show global variables like 'experimental_enable_agg_state'"""
+ checkNereidsExecute("UNSET global VARIABLE experimental_enable_agg_state")
+ qt_cmd """show session variables like 'experimental_enable_agg_state'"""
+ qt_cmd """show global variables like 'experimental_enable_agg_state'"""
+
+ // test variables with deprecated_ prefix
+ checkNereidsExecute("set deprecated_enable_local_exchange = false")
+ qt_cmd """show session variables like 'deprecated_enable_local_exchange'"""
+ qt_cmd """show global variables like 'deprecated_enable_local_exchange'"""
+ checkNereidsExecute("UNSET global VARIABLE
deprecated_enable_local_exchange")
+ qt_cmd """show session variables like 'deprecated_enable_local_exchange'"""
+ qt_cmd """show global variables like 'deprecated_enable_local_exchange'"""
+
+ // test UNSET VARIABLE ALL
+ checkNereidsExecute("set runtime_filter_type='BLOOM_FILTER'")
+ checkNereidsExecute("set experimental_enable_agg_state='true'")
+ checkNereidsExecute("set deprecated_enable_local_exchange = false")
+ checkNereidsExecute("set show_hidden_columns=true")
+ checkNereidsExecute("UNSET VARIABLE ALL")
+ qt_cmd """show session variables like 'runtime_filter_type'"""
+ qt_cmd """show session variables like 'experimental_enable_agg_state'"""
+ qt_cmd """show session variables like 'deprecated_enable_local_exchange'"""
+ qt_cmd """show session variables like 'show_hidden_columns'"""
+
+ qt_cmd """select * from information_schema.session_variables where
variable_name = 'show_hidden_columns'"""
+
+ // test UNSET GLOBAL VARIABLE ALL
+ checkNereidsExecute("set global runtime_filter_type='BLOOM_FILTER'")
+ checkNereidsExecute("set global experimental_enable_agg_state='true'")
+ checkNereidsExecute("set global deprecated_enable_local_exchange = false")
+ checkNereidsExecute("set show_hidden_columns=true")
+ checkNereidsExecute("UNSET global VARIABLE ALL")
+ qt_cmd """show global variables like 'runtime_filter_type'"""
+ qt_cmd """show global variables like 'experimental_enable_agg_state'"""
+ qt_cmd """show global variables like 'deprecated_enable_local_exchange'"""
+ qt_cmd """show global variables like 'show_hidden_columns'"""
+
+ qt_cmd """select * from information_schema.global_variables where
variable_name = 'show_hidden_columns'"""
+
+ // test read_only
+ qt_cmd """show variables like 'read_only'"""
+ test {
+ sql "set read_only=true"
+ exception "should be set with SET GLOBAL"
+ }
+ qt_cmd "set global read_only=true"
+ qt_cmd """show global variables like 'read_only'"""
+ qt_cmd """show variables like 'read_only'"""
+ sql "set global read_only=false"
+
+ // test super_read_only
+ qt_cmd """show variables like 'super_read_only'"""
+ test {
+ sql "set super_read_only=true"
+ exception "should be set with SET GLOBAL"
+ }
+ qt_cmd "set global super_read_only=true"
+ qt_cmd """show global variables like 'super_read_only'"""
+ qt_cmd """show variables like 'super_read_only'"""
+ sql "set global super_read_only=false"
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
