Skip to content

[Chore](nereids) remove RecoverTableStmt #54714

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
starocean999 merged 2 commits into from
Aug 14, 2025
Merged

[Chore](nereids) remove RecoverTableStmt #54714

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
9eb1b4d
remove RecoverTableStmt
Aug 13, 2025
b37c1d9
optimize code
Aug 13, 2025
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
4 changes: 0 additions & 4 deletions fe/fe-core/src/main/cup/sql_parser.cup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2483,10 +2483,6 @@ recover_stmt ::=
{:
RESULT = new RecoverDbStmt(dbName, dbId, alias);
:}
| KW_RECOVER KW_TABLE table_name:dbTblName opt_id:tableId opt_alias:alias
{:
RESULT = new RecoverTableStmt(dbTblName, tableId, alias);
:}
| KW_RECOVER KW_PARTITION ident:partitionName opt_id:partitionId opt_alias:alias KW_FROM table_name:dbTblName
{:
RESULT = new RecoverPartitionStmt(dbTblName, partitionName, partitionId, alias);
Expand Down
99 changes: 0 additions & 99 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/RecoverTableStmt.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/catalog/Env.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import org.apache.doris.analysis.PartitionRenameClause;
import org.apache.doris.analysis.RecoverDbStmt;
import org.apache.doris.analysis.RecoverPartitionStmt;
import org.apache.doris.analysis.RecoverTableStmt;
import org.apache.doris.analysis.ReplacePartitionClause;
import org.apache.doris.analysis.RollupRenameClause;
import org.apache.doris.analysis.SlotRef;
Expand Down Expand Up @@ -3413,10 +3412,6 @@ public void recoverDatabase(String dbName, long dbId, String newDbName) throws D
getInternalCatalog().recoverDatabase(dbName, dbId, newDbName);
}

public void recoverTable(RecoverTableStmt recoverStmt) throws DdlException {
getInternalCatalog().recoverTable(recoverStmt);
}

public void recoverTable(String dbName, String tableName, String newTableName, long tableId) throws DdlException {
getInternalCatalog().recoverTable(dbName, tableName, newTableName, tableId);
}
Expand Down
6 changes: 0 additions & 6 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.apache.doris.analysis.PartitionValue;
import org.apache.doris.analysis.RecoverDbStmt;
import org.apache.doris.analysis.RecoverPartitionStmt;
import org.apache.doris.analysis.RecoverTableStmt;
import org.apache.doris.analysis.SinglePartitionDesc;
import org.apache.doris.analysis.SlotRef;
import org.apache.doris.analysis.TableName;
Expand Down Expand Up @@ -675,11 +674,6 @@ public void recoverTable(String dbName, String tableName, String newTableName, l
}
}

public void recoverTable(RecoverTableStmt recoverStmt) throws DdlException {
recoverTable(recoverStmt.getDbName(), recoverStmt.getTableName(),
recoverStmt.getNewTableName(), recoverStmt.getTableId());
}

public void recoverPartition(String dbName, String tableName, String partitionName,
String newPartitionName, long partitionId) throws DdlException {
Database db = getDbOrDdlException(dbName);
Expand Down
16 changes: 16 additions & 0 deletions ...core/src/main/java/org/apache/doris/nereids/trees/plans/commands/RecoverTableCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,20 @@ public void doRun(ConnectContext ctx, StmtExecutor executor) throws UserExceptio
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
return visitor.visitRecoverTableCommand(this, context);
}

public String getDbName() {
return dbTblName.getDb();
}

public String getTblName() {
return dbTblName.getTbl();
}

public long getTableId() {
return tableId;
}

public String getNewTableName() {
return newTableName;
}
}
3 changes: 0 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.doris.analysis.DropWorkloadSchedPolicyStmt;
import org.apache.doris.analysis.RecoverDbStmt;
import org.apache.doris.analysis.RecoverPartitionStmt;
import org.apache.doris.analysis.RecoverTableStmt;
import org.apache.doris.analysis.RefreshDbStmt;
import org.apache.doris.analysis.RefreshTableStmt;
import org.apache.doris.analysis.SetUserPropertyStmt;
Expand Down Expand Up @@ -88,8 +87,6 @@ public static void execute(Env env, DdlStmt ddlStmt) throws Exception {

} else if (ddlStmt instanceof RecoverDbStmt) {
env.recoverDatabase((RecoverDbStmt) ddlStmt);
} else if (ddlStmt instanceof RecoverTableStmt) {
env.recoverTable((RecoverTableStmt) ddlStmt);
} else if (ddlStmt instanceof RecoverPartitionStmt) {
env.recoverPartition((RecoverPartitionStmt) ddlStmt);
} else if (ddlStmt instanceof SyncStmt) {
Expand Down
8 changes: 4 additions & 4 deletions fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.apache.doris.analysis.AlterTableStmt;
import org.apache.doris.analysis.CreateTableStmt;
import org.apache.doris.analysis.ExplainOptions;
import org.apache.doris.analysis.RecoverTableStmt;
import org.apache.doris.analysis.SqlParser;
import org.apache.doris.analysis.SqlScanner;
import org.apache.doris.analysis.StatementBase;
Expand Down Expand Up @@ -70,6 +69,7 @@
import org.apache.doris.nereids.trees.plans.commands.DropTableCommand;
import org.apache.doris.nereids.trees.plans.commands.GrantRoleCommand;
import org.apache.doris.nereids.trees.plans.commands.GrantTablePrivilegeCommand;
import org.apache.doris.nereids.trees.plans.commands.RecoverTableCommand;
import org.apache.doris.nereids.trees.plans.commands.info.TableNameInfo;
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
import org.apache.doris.nereids.util.MemoTestUtils;
Expand Down Expand Up @@ -670,9 +670,9 @@ public void dropTableWithSql(String sql) throws Exception {
}

public void recoverTable(String table) throws Exception {
RecoverTableStmt recoverTableStmt = (RecoverTableStmt) parseAndAnalyzeStmt(
"recover table " + table + ";", connectContext);
Env.getCurrentEnv().recoverTable(recoverTableStmt);
NereidsParser nereidsParser = new NereidsParser();
RecoverTableCommand command = (RecoverTableCommand) nereidsParser.parseSingle(table);
Env.getCurrentEnv().recoverTable(command.getDbName(), command.getTblName(), command.getNewTableName(), command.getTableId());
}

public void createCatalog(String sql) throws Exception {
Expand Down
Loading