Skip to content

branch-4.2: [fix](show command) some show command should not be forward to master #69677 #70326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: branch-4.2
Choose a base branch
from
+12 −5
Open

branch-4.2: [fix](show command) some show command should not be forward to master #69677 #70326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowProcCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,17 @@

import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;

/**
* show proc command
*/
public class ShowProcCommand extends ShowCommand {
// Match the repeated slashes and whitespace accepted by ProcService.open().
private static final Pattern LOCAL_QUERY_PATH = Pattern.compile(
"[ \\t\\r\\n]*/+(?:current_queries|current_query_stmts|current_backend_instances)/*(?:[ \\t\\r\\n].*)?",
Pattern.DOTALL);

private final String path;

/**
Expand Down Expand Up @@ -122,6 +128,10 @@ public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {

@Override
public RedirectStatus toRedirectStatus() {
// These nodes read this FE's coordinators, not cluster-wide query state.
if (LOCAL_QUERY_PATH.matcher(path).matches()) {
return RedirectStatus.NO_FORWARD;
}
if (ConnectContext.get().getSessionVariable().getForwardToMaster()) {
return RedirectStatus.FORWARD_NO_SYNC;
} else {
Expand Down
7 changes: 2 additions & 5 deletions ...rc/main/java/org/apache/doris/nereids/trees/plans/commands/ShowWorkloadGroupsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,7 @@ public String toString() {

@Override
public RedirectStatus toRedirectStatus() {
if (ConnectContext.get().getSessionVariable().getForwardToMaster()) {
return RedirectStatus.FORWARD_NO_SYNC;
} else {
return RedirectStatus.NO_FORWARD;
}
// Running and waiting query counts belong to the local FE's query queues.
return RedirectStatus.NO_FORWARD;
}
}
Loading