This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 3e8f5b8dfae branch-4.0: [fix](nereids)fix some show command's redirect
policy #55185 (#56952)
3e8f5b8dfae is described below
commit 3e8f5b8dfaec15048fe965fc271891c70c4a2d33
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Oct 16 10:01:19 2025 +0800
branch-4.0: [fix](nereids)fix some show command's redirect policy #55185
(#56952)
Cherry-picked from #55185
Co-authored-by: starocean999 <[email protected]>
---
.../nereids/trees/plans/commands/ShowBackupCommand.java | 6 ++++++
.../nereids/trees/plans/commands/ShowConfigCommand.java | 14 ++++++++++++++
.../nereids/trees/plans/commands/ShowRestoreCommand.java | 6 ++++++
.../trees/plans/commands/ShowWorkloadGroupsCommand.java | 10 ++++++++++
4 files changed, 36 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowBackupCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowBackupCommand.java
index e37d37d48c6..2d7c8de49b4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowBackupCommand.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowBackupCommand.java
@@ -17,6 +17,7 @@
package org.apache.doris.nereids.trees.plans.commands;
+import org.apache.doris.analysis.RedirectStatus;
import org.apache.doris.backup.AbstractJob;
import org.apache.doris.backup.BackupJob;
import org.apache.doris.catalog.Column;
@@ -187,4 +188,9 @@ public class ShowBackupCommand extends ShowCommand {
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
return visitor.visitShowBackupCommand(this, context);
}
+
+ @Override
+ public RedirectStatus toRedirectStatus() {
+ return RedirectStatus.FORWARD_NO_SYNC;
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowConfigCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowConfigCommand.java
index a53f8febe12..1e00ab3d76b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowConfigCommand.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowConfigCommand.java
@@ -17,6 +17,7 @@
package org.apache.doris.nereids.trees.plans.commands;
+import org.apache.doris.analysis.RedirectStatus;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.ScalarType;
@@ -177,4 +178,17 @@ public class ShowConfigCommand extends Command implements
NoForward {
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
return visitor.visitShowConfigCommand(this, context);
}
+
+ @Override
+ public RedirectStatus toRedirectStatus() {
+ // no need forward to master for backend config
+ if (nodeType == NodeType.BACKEND) {
+ return RedirectStatus.NO_FORWARD;
+ }
+ if (ConnectContext.get().getSessionVariable().getForwardToMaster()) {
+ return RedirectStatus.FORWARD_NO_SYNC;
+ } else {
+ return RedirectStatus.NO_FORWARD;
+ }
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowRestoreCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowRestoreCommand.java
index b50adb185d7..164466ac6e1 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowRestoreCommand.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowRestoreCommand.java
@@ -17,6 +17,7 @@
package org.apache.doris.nereids.trees.plans.commands;
+import org.apache.doris.analysis.RedirectStatus;
import org.apache.doris.backup.AbstractJob;
import org.apache.doris.backup.RestoreJob;
import org.apache.doris.catalog.Column;
@@ -211,4 +212,9 @@ public class ShowRestoreCommand extends ShowCommand {
return visitor.visitShowRestoreCommand(this, context);
}
+ @Override
+ public RedirectStatus toRedirectStatus() {
+ return RedirectStatus.FORWARD_NO_SYNC;
+ }
+
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowWorkloadGroupsCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowWorkloadGroupsCommand.java
index d33a21c4da8..684d559b723 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowWorkloadGroupsCommand.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowWorkloadGroupsCommand.java
@@ -17,6 +17,7 @@
package org.apache.doris.nereids.trees.plans.commands;
+import org.apache.doris.analysis.RedirectStatus;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.ScalarType;
@@ -87,4 +88,13 @@ public class ShowWorkloadGroupsCommand extends ShowCommand {
public String toString() {
return toSql();
}
+
+ @Override
+ public RedirectStatus toRedirectStatus() {
+ if (ConnectContext.get().getSessionVariable().getForwardToMaster()) {
+ return RedirectStatus.FORWARD_NO_SYNC;
+ } else {
+ return RedirectStatus.NO_FORWARD;
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
