-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Enhancement] (nereids)implement RecoverCommand in nereids
- Loading branch information
Showing
9 changed files
with
359 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
fe/fe-core/src/main/java/org/apache/doris/nereids/RecoverPartitionCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.apache.doris.nereids.trees.plans.commands; | ||
|
|
||
| import org.apache.doris.catalog.Env; | ||
| import org.apache.doris.common.ErrorCode; | ||
| import org.apache.doris.common.ErrorReport; | ||
| import org.apache.doris.common.UserException; | ||
| import org.apache.doris.common.util.Util; | ||
| import org.apache.doris.mysql.privilege.PrivPredicate; | ||
| import org.apache.doris.nereids.trees.plans.PlanType; | ||
| import org.apache.doris.nereids.trees.plans.commands.info.TableNameInfo; | ||
| import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor; | ||
| import org.apache.doris.qe.ConnectContext; | ||
| import org.apache.doris.qe.StmtExecutor; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| /** | ||
| * recover partition command | ||
| */ | ||
| public class RecoverPartitionCommand extends RecoverCommand { | ||
| public static final Logger LOG = LogManager.getLogger(RecoverPartitionCommand.class); | ||
| private final TableNameInfo dbTblName; | ||
| private final String partitionName; | ||
| private final long partitionId; | ||
| private final String newPartitionName; | ||
|
|
||
| /** | ||
| * constructor | ||
| */ | ||
| public RecoverPartitionCommand(TableNameInfo dbTblName, String partitionName, | ||
| long partitionId, String newPartitionName) { | ||
| super(PlanType.RECOVER_PARTITION_COMMAND); | ||
| this.dbTblName = dbTblName; | ||
| this.partitionName = partitionName; | ||
| this.partitionId = partitionId; | ||
| this.newPartitionName = newPartitionName; | ||
| } | ||
|
|
||
| @Override | ||
| public void doRun(ConnectContext ctx, StmtExecutor executor) throws UserException { | ||
| dbTblName.analyze(ctx); | ||
|
|
||
| // disallow external catalog | ||
| Util.prohibitExternalCatalog(dbTblName.getCtl(), this.getClass().getSimpleName()); | ||
| if (!Env.getCurrentEnv().getAccessManager() | ||
| .checkTblPriv(ConnectContext.get(), dbTblName.getCtl(), dbTblName.getDb(), | ||
| dbTblName.getTbl(), PrivPredicate.ALTER_CREATE)) { | ||
| ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "RECOVERY", | ||
| ConnectContext.get().getQualifiedUser(), | ||
| ConnectContext.get().getRemoteIP(), | ||
| dbTblName.getDb() + ": " + dbTblName.getTbl()); | ||
| } | ||
|
|
||
| Env.getCurrentEnv().recoverPartition(dbTblName.getDb(), dbTblName.getTbl(), | ||
| partitionName, newPartitionName, partitionId); | ||
| } | ||
|
|
||
| @Override | ||
| public <R, C> R accept(PlanVisitor<R, C> visitor, C context) { | ||
| return visitor.visitRecoverPartitionCommand(this, context); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
...core/src/main/java/org/apache/doris/nereids/trees/plans/commands/RecoverTableCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.apache.doris.nereids.trees.plans.commands; | ||
|
|
||
| import org.apache.doris.catalog.Env; | ||
| import org.apache.doris.common.ErrorCode; | ||
| import org.apache.doris.common.ErrorReport; | ||
| import org.apache.doris.common.UserException; | ||
| import org.apache.doris.common.util.Util; | ||
| import org.apache.doris.mysql.privilege.PrivPredicate; | ||
| import org.apache.doris.nereids.trees.plans.PlanType; | ||
| import org.apache.doris.nereids.trees.plans.commands.info.TableNameInfo; | ||
| import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor; | ||
| import org.apache.doris.qe.ConnectContext; | ||
| import org.apache.doris.qe.StmtExecutor; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| /** | ||
| * recover table command | ||
| */ | ||
| public class RecoverTableCommand extends RecoverCommand { | ||
| public static final Logger LOG = LogManager.getLogger(RecoverTableCommand.class); | ||
| private final TableNameInfo dbTblName; | ||
| private final long tableId; | ||
| private final String newTableName; | ||
|
|
||
| /** | ||
| * constructor | ||
| */ | ||
| public RecoverTableCommand(TableNameInfo dbTblName, long tableId, String newTableName) { | ||
| super(PlanType.RECOVER_TABLE_COMMAND); | ||
| this.dbTblName = dbTblName; | ||
| this.tableId = tableId; | ||
| this.newTableName = newTableName; | ||
| } | ||
|
|
||
| @Override | ||
| public void doRun(ConnectContext ctx, StmtExecutor executor) throws UserException { | ||
| dbTblName.analyze(ctx); | ||
|
|
||
| // disallow external catalog | ||
| Util.prohibitExternalCatalog(dbTblName.getCtl(), this.getClass().getSimpleName()); | ||
|
|
||
| if (!Env.getCurrentEnv().getAccessManager().checkTblPriv( | ||
| ConnectContext.get(), dbTblName.getCtl(), dbTblName.getDb(), dbTblName.getTbl(), | ||
| PrivPredicate.ALTER_CREATE)) { | ||
| ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "RECOVERY", | ||
| ConnectContext.get().getQualifiedUser(), | ||
| ConnectContext.get().getRemoteIP(), | ||
| dbTblName.getDb() + ": " + dbTblName.getTbl()); | ||
| } | ||
|
|
||
| Env.getCurrentEnv().recoverTable(dbTblName.getDb(), dbTblName.getTbl(), newTableName, tableId); | ||
| } | ||
|
|
||
| @Override | ||
| public <R, C> R accept(PlanVisitor<R, C> visitor, C context) { | ||
| return visitor.visitRecoverTableCommand(this, context); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
regression-test/data/nereids_p0/ddl/recover/test_recover_all.out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| -- This file is automatically generated. You should know what you did if you want to edit this | ||
| -- !select -- | ||
| table1 | ||
| table2 | ||
|
|
||
| -- !select2 -- | ||
| table1 | ||
|
|
||
| -- !select3 -- | ||
| table1 | ||
| table2 | ||
|
|
||
| -- !select4 -- | ||
| table1 | ||
|
|
||
| -- !select5 -- | ||
| table1 | ||
| table3 | ||
|
|
||
| -- !select_check_1 -- | ||
| 1 a 2022-01-02 | ||
| 2 a 2023-01-02 | ||
| 3 a 2024-01-02 | ||
|
|
||
| -- !select_partitions -- | ||
| p4 | ||
| p5 | ||
|
|
||
| -- !select_partitions_2 -- | ||
| p3 | ||
| p4 | ||
| p5 | ||
|
|
||
| -- !select_check_1 -- | ||
| 1 a 2022-01-02 | ||
| 2 a 2023-01-02 | ||
| 3 a 2024-01-02 | ||
|
|
||
| -- !select_partitions_3 -- | ||
| p4 | ||
| p5 | ||
|
|
||
| -- !select_partitions_4 -- | ||
| p1 | ||
| p4 | ||
| p5 | ||
|
|
||
| -- !select_check_1 -- | ||
| 1 a 2022-01-02 | ||
| 2 a 2023-01-02 | ||
| 3 a 2024-01-02 | ||
|
|
Oops, something went wrong.