Skip to content

[fix](regression) add exception when can not find profile with specific tag #44530

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
morrySnow merged 2 commits into from
Nov 25, 2024
Merged

[fix](regression) add exception when can not find profile with specific tag #44530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
636c674
[fix](regression) add exception when can not find profile with specif…
Nov 25, 2024
068a47c
Revert "[Feat] (Nereids)support showTrash Command (#44352)"
Nov 25, 2024
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
7 changes: 0 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@
import org.apache.doris.nereids.DorisParser.ShowStorageEnginesContext;
import org.apache.doris.nereids.DorisParser.ShowTableIdContext;
import org.apache.doris.nereids.DorisParser.ShowTabletsBelongContext;
import org.apache.doris.nereids.DorisParser.ShowTrashContext;
import org.apache.doris.nereids.DorisParser.ShowTriggersContext;
import org.apache.doris.nereids.DorisParser.ShowVariablesContext;
import org.apache.doris.nereids.DorisParser.ShowViewContext;
Expand Down Expand Up @@ -495,7 +494,6 @@
import org.apache.doris.nereids.trees.plans.commands.ShowStorageEnginesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTableIdCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTabletsBelongCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTrashCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTriggersCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowVariablesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowViewCommand;
Expand Down Expand Up @@ -4127,11 +4125,6 @@ public SetDefaultStorageVaultCommand visitSetDefaultStorageVault(SetDefaultStora
return new SetDefaultStorageVaultCommand(stripQuotes(ctx.identifier().getText()));
}

@Override
public LogicalPlan visitShowTrash(ShowTrashContext ctx) {
return new ShowTrashCommand();
}

@Override
public Object visitRefreshCatalog(RefreshCatalogContext ctx) {
if (ctx.name != null) {
Expand Down
1 change: 0 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ public enum PlanType {
SHOW_ROLE_COMMAND,
SHOW_STORAGE_ENGINES_COMMAND,
SHOW_TABLE_ID_COMMAND,
SHOW_TRASH_COMMAND,
SHOW_TRIGGERS_COMMAND,
SHOW_VARIABLES_COMMAND,
SHOW_AUTHORS_COMMAND,
Expand Down
78 changes: 0 additions & 78 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ShowTrashCommand.java
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
import org.apache.doris.nereids.trees.plans.commands.ShowStorageEnginesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTableIdCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTabletsBelongCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTrashCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowTriggersCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowVariablesCommand;
import org.apache.doris.nereids.trees.plans.commands.ShowViewCommand;
Expand Down Expand Up @@ -419,10 +418,6 @@ default R visitShowTableIdCommand(ShowTableIdCommand showTableIdCommand, C conte
return visitCommand(showTableIdCommand, context);
}

default R visitShowTrashCommand(ShowTrashCommand showTrashCommand, C context) {
return visitCommand(showTrashCommand, context);
}

default R visitSyncCommand(SyncCommand syncCommand, C context) {
return visitCommand(syncCommand, context);
}
Expand Down
5 changes: 5 additions & 0 deletions ...on-test/framework/src/main/groovy/org/apache/doris/regression/action/ProfileAction.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ class ProfileAction implements SuiteAction {

def jsonSlurper = new JsonSlurper()
List profileData = jsonSlurper.parseText(body).data.rows
def canFindProfile = false;
for (final def profileItem in profileData) {
if (profileItem["Sql Statement"].toString().contains(tag)) {
canFindProfile = true
def profileId = profileItem["Profile ID"].toString()

def profileCli = new HttpCliAction(context)
Expand Down Expand Up @@ -113,6 +115,9 @@ class ProfileAction implements SuiteAction {
break
}
}
if (!canFindProfile) {
throw new IllegalStateException("Missing profile with tag: " + tag)
}
}
httpCli.run()
} finally {
Expand Down
22 changes: 0 additions & 22 deletions regression-test/suites/nereids_p0/ddl/show_trash/test_nereids_trash.groovy
View file
Open in desktop

This file was deleted.