This is an automated email from the ASF dual-hosted git repository. morningman pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/doris.git
from f49a0daf54 [fix](regression) Fix concurrent regression failure (#13798) add ba177a15cb [feature-wip](recover) new recover ddl and support show catalog recycle bin (#13067) No new revisions were added by this update. Summary of changes: .../org/apache/doris/common/FeMetaVersion.java | 4 +- fe/fe-core/src/main/cup/sql_parser.cup | 45 ++- .../doris/alter/MaterializedViewHandler.java | 2 +- .../org/apache/doris/analysis/RecoverDbStmt.java | 34 +- .../doris/analysis/RecoverPartitionStmt.java | 27 +- .../apache/doris/analysis/RecoverTableStmt.java | 24 +- ...kupStmt.java => ShowCatalogRecycleBinStmt.java} | 72 ++-- .../apache/doris/catalog/CatalogRecycleBin.java | 372 ++++++++++++++------- .../main/java/org/apache/doris/catalog/Env.java | 28 +- .../apache/doris/datasource/InternalCatalog.java | 152 ++++++--- .../java/org/apache/doris/persist/DropDbInfo.java | 14 +- .../java/org/apache/doris/persist/DropInfo.java | 16 +- .../apache/doris/persist/DropPartitionInfo.java | 12 +- .../java/org/apache/doris/persist/EditLog.java | 7 +- .../java/org/apache/doris/persist/RecoverInfo.java | 33 +- .../java/org/apache/doris/qe/ShowExecutor.java | 15 + fe/fe-core/src/main/jflex/sql_scanner.flex | 2 + .../java/org/apache/doris/catalog/DropDbTest.java | 2 +- .../apache/doris/catalog/DropPartitionTest.java | 2 +- .../org/apache/doris/catalog/DropTableTest.java | 2 +- .../java/org/apache/doris/catalog/RecoverTest.java | 122 +++++-- .../org/apache/doris/persist/DropDbInfoTest.java | 8 +- .../org/apache/doris/persist/DropInfoTest.java | 10 +- .../doris/persist/DropPartitionInfoTest.java | 14 +- regression-test/data/ddl_p0/test_recover.out | 83 +++++ regression-test/suites/ddl_p0/test_recover.groovy | 268 +++++++++++++++ 26 files changed, 1078 insertions(+), 292 deletions(-) copy fe/fe-core/src/main/java/org/apache/doris/analysis/{ShowBackupStmt.java => ShowCatalogRecycleBinStmt.java} (62%) create mode 100644 regression-test/data/ddl_p0/test_recover.out create mode 100644 regression-test/suites/ddl_p0/test_recover.groovy --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org