This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit e8a20d8899f3f1804b45dd4466aaf4c79464a418 Author: Mingyu Chen <[email protected]> AuthorDate: Thu Jan 25 14:30:53 2024 +0800 [fix](meta) remove default_cluster prefix in recover db log (#30350) --- fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java | 3 ++- .../main/java/org/apache/doris/datasource/InternalCatalog.java | 6 +----- .../src/main/java/org/apache/doris/persist/RecoverInfo.java | 9 ++++++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java index 96db31af430..3975fe8b388 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java @@ -216,7 +216,8 @@ public class Database extends MetaObject implements Writable, DatabaseIf<Table> public void setNameWithLock(String newName) { writeLock(); try { - this.fullQualifiedName = newName; + // ClusterNamespace.getNameFromFullName should be removed in 3.0 + this.fullQualifiedName = ClusterNamespace.getNameFromFullName(newName); for (Table table : idToTable.values()) { table.setQualifiedDbName(fullQualifiedName); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java index 8832aa25dc8..c977b61be2f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java @@ -649,7 +649,7 @@ public class InternalCatalog implements CatalogIf<Database> { String tableName = recoverStmt.getTableName(); String newTableName = recoverStmt.getNewTableName(); - Database db = (Database) getDbOrDdlException(dbName); + Database db = getDbOrDdlException(dbName); db.writeLockOrDdlException(); try { if (Strings.isNullOrEmpty(newTableName)) { @@ -698,10 +698,6 @@ public class InternalCatalog implements CatalogIf<Database> { } } - public void replayEraseDatabase(long dbId) throws DdlException { - Env.getCurrentRecycleBin().replayEraseDatabase(dbId); - } - public void replayRecoverDatabase(RecoverInfo info) { long dbId = info.getDbId(); String newDbName = info.getNewDbName(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/RecoverInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/RecoverInfo.java index 7809b05d0e6..15764a99b43 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/RecoverInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/RecoverInfo.java @@ -18,9 +18,11 @@ package org.apache.doris.persist; import org.apache.doris.catalog.Env; +import org.apache.doris.cluster.ClusterNamespace; import org.apache.doris.common.FeMetaVersion; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; +import org.apache.doris.persist.gson.GsonPostProcessable; import org.apache.doris.persist.gson.GsonUtils; import com.google.gson.annotations.SerializedName; @@ -29,7 +31,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -public class RecoverInfo implements Writable { +public class RecoverInfo implements Writable, GsonPostProcessable { @SerializedName(value = "dbId") private long dbId; @SerializedName(value = "newDbName") @@ -102,4 +104,9 @@ public class RecoverInfo implements Writable { tableId = in.readLong(); partitionId = in.readLong(); } + + @Override + public void gsonPostProcess() throws IOException { + newDbName = ClusterNamespace.getNameFromFullName(newDbName); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
