Skip to content

[fix](Nereids) fix ShowProcedureStatusCommand sendResultSet #35355

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

Merged
yiguolei merged 1 commit into from
May 24, 2024
Merged

[fix](Nereids) fix ShowProcedureStatusCommand sendResultSet #35355

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
3 changes: 2 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDbStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.qe.ShowResultSetMetaData;

import com.google.common.base.Strings;
import com.google.common.collect.Lists;

// Show database statement.
Expand Down Expand Up @@ -95,7 +96,7 @@ public String toSql() {
if (pattern != null) {
sb.append(" LIKE '").append(pattern).append("'");
}
if (!InternalCatalog.INTERNAL_CATALOG_NAME.equals(catalogName)) {
if (!Strings.isNullOrEmpty(catalogName) && !InternalCatalog.INTERNAL_CATALOG_NAME.equals(catalogName)) {
sb.append(" FROM ").append(catalogName);
}
return sb.toString();
Expand Down
6 changes: 2 additions & 4 deletions ...c/main/java/org/apache/doris/nereids/trees/plans/commands/ShowCreateProcedureCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,8 @@ public ShowResultSetMetaData getMetaData() {
public void run(ConnectContext ctx, StmtExecutor executor) throws Exception {
List<List<String>> results = new ArrayList<>();
ctx.getPlSqlOperation().getExec().functions.showCreateProcedure(this.procedureName, results);
if (!results.isEmpty()) {
ShowResultSet commonResultSet = new ShowResultSet(getMetaData(), results);
executor.sendResultSet(commonResultSet);
}
ShowResultSet commonResultSet = new ShowResultSet(getMetaData(), results);
executor.sendResultSet(commonResultSet);
}

@Override
Expand Down
6 changes: 2 additions & 4 deletions ...c/main/java/org/apache/doris/nereids/trees/plans/commands/ShowProcedureStatusCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,8 @@ public ShowResultSetMetaData getMetaData() {
public void run(ConnectContext ctx, StmtExecutor executor) throws Exception {
List<List<String>> results = new ArrayList<>();
ctx.getPlSqlOperation().getExec().functions.showProcedure(results);
if (!results.isEmpty()) {
ShowResultSet commonResultSet = new ShowResultSet(getMetaData(), results);
executor.sendResultSet(commonResultSet);
}
ShowResultSet commonResultSet = new ShowResultSet(getMetaData(), results);
executor.sendResultSet(commonResultSet);
}

@Override
Expand Down