This is an automated email from the ASF dual-hosted git repository.
w41ter pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 25d52192b17 [fix](restore) Reset the db name of the materialized index
stmt #39710 (#39851)
25d52192b17 is described below
commit 25d52192b1703f07b6139b1eed78ce0588b63fd6
Author: walter <w41te...@gmail.com>
AuthorDate: Mon Aug 26 10:54:55 2024 +0800
[fix](restore) Reset the db name of the materialized index stmt #39710
(#39851)
cherry pick from #39710
---
.../java/org/apache/doris/backup/BackupJob.java | 4 +-
.../java/org/apache/doris/backup/RestoreJob.java | 3 +-
.../doris/catalog/MaterializedIndexMeta.java | 9 +-
.../java/org/apache/doris/catalog/OlapTable.java | 6 +-
.../backup_restore/test_backup_restore_mv.groovy | 126 +++++++++++++++++++++
5 files changed, 141 insertions(+), 7 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
index 937c97f473d..4d8648bc664 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
@@ -566,8 +566,8 @@ public class BackupJob extends AbstractJob {
}
}
- LOG.info("snapshot for partition {}, version: {}",
- partition.getId(), visibleVersion);
+ LOG.info("snapshot for partition {}, version: {}, job: {}",
+ partition.getId(), visibleVersion, label);
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
index c76ce530141..725fe392b1a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
@@ -721,7 +721,8 @@ public class RestoreJob extends AbstractJob {
}
// reset all ids in this table
- Status st = remoteOlapTbl.resetIdsForRestore(env, db,
replicaAlloc, reserveReplica);
+ String srcDbName = backupMeta.getDbName();
+ Status st = remoteOlapTbl.resetIdsForRestore(env, db,
replicaAlloc, reserveReplica, srcDbName);
if (!st.ok()) {
status = st;
return;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/MaterializedIndexMeta.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/MaterializedIndexMeta.java
index b9d4de727cd..23b0a353366 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/catalog/MaterializedIndexMeta.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/catalog/MaterializedIndexMeta.java
@@ -122,8 +122,15 @@ public class MaterializedIndexMeta implements Writable,
GsonPostProcessable {
return indexId;
}
- public void resetIndexIdForRestore(long id) {
+ public void resetIndexIdForRestore(long id, String srcDbName, String
dbName) {
indexId = id;
+
+ // the source db name is not setted in old BackupMeta, keep compatible
with the old one.
+ // See InitMaterializationContextHook.java:createSyncMvContexts for
details.
+ if (defineStmt != null && srcDbName != null) {
+ String newStmt = defineStmt.originStmt.replaceAll(srcDbName,
dbName);
+ defineStmt = new OriginStatement(newStmt, defineStmt.idx);
+ }
}
public KeysType getKeysType() {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
index 3b4d22f0e5d..bf0b6bb62d6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -550,7 +550,7 @@ public class OlapTable extends Table {
}
public Status resetIdsForRestore(Env env, Database db, ReplicaAllocation
restoreReplicaAlloc,
- boolean reserveReplica) {
+ boolean reserveReplica, String srcDbName) {
// ATTN: The meta of the restore may come from different clusters, so
the
// original ID in the meta may conflict with the ID of the new
cluster. For
// example, if a newly allocated ID happens to be the same as an
original ID,
@@ -576,7 +576,7 @@ public class OlapTable extends Table {
baseIndexId = newIdxId;
}
MaterializedIndexMeta indexMeta =
origIdxIdToMeta.get(entry.getKey());
- indexMeta.resetIndexIdForRestore(newIdxId);
+ indexMeta.resetIndexIdForRestore(newIdxId, srcDbName,
db.getFullName());
indexIdToMeta.put(newIdxId, indexMeta);
indexNameToId.put(entry.getValue(), newIdxId);
}
@@ -1499,7 +1499,7 @@ public class OlapTable extends Table {
LOG.warn("HACK: the index id {} in materialized index meta of
{} is not equals"
+ " to the index saved in table {} ({}), reset it to
{}",
indexMeta.getIndexId(), indexName, name, id, indexId);
- indexMeta.resetIndexIdForRestore(indexId);
+ indexMeta.resetIndexIdForRestore(indexId, null, null);
}
}
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_mv.groovy
b/regression-test/suites/backup_restore/test_backup_restore_mv.groovy
new file mode 100644
index 00000000000..0a54aa76e17
--- /dev/null
+++ b/regression-test/suites/backup_restore/test_backup_restore_mv.groovy
@@ -0,0 +1,126 @@
+// 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.
+
+suite("test_backup_restore_mv", "backup_restore") {
+ String suiteName = "test_backup_restore_mv"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+ String dbName = "${suiteName}_db"
+ String dbName1 = "${suiteName}_db_1"
+ String tableName = "${suiteName}_table"
+ String mvName = "${suiteName}_mv"
+ String snapshotName = "${suiteName}_snapshot"
+
+ def syncer = getSyncer()
+ syncer.createS3Repository(repoName)
+
+ sql "CREATE DATABASE IF NOT EXISTS ${dbName}"
+ sql "DROP TABLE IF EXISTS ${dbName}.${tableName}"
+ sql """
+ CREATE TABLE ${dbName}.${tableName} (
+ `id` LARGEINT NOT NULL,
+ `item_id` LARGEINT NOT NULL)
+ DUPLICATE KEY(`id`)
+ DISTRIBUTED BY HASH(`id`) BUCKETS 2
+ PROPERTIES
+ (
+ "replication_num" = "1"
+ )
+ """
+
+ List<String> values = []
+ for (int i = 1; i <= 10; ++i) {
+ values.add("(${i}, ${i})")
+ }
+ sql "INSERT INTO ${dbName}.${tableName} VALUES ${values.join(",")}"
+ def result = sql "SELECT * FROM ${dbName}.${tableName}"
+ assertEquals(result.size(), values.size());
+
+ sql """DROP MATERIALIZED VIEW IF EXISTS ${dbName}.${mvName};"""
+ sql """
+ CREATE MATERIALIZED VIEW ${mvName}
+ AS
+ SELECT id, sum(item_id) FROM ${dbName}.${tableName} GROUP BY id;
+ """
+
+ def alter_finished = false
+ for (i = 0; i < 60 && !alter_finished; i++) {
+ result = sql_return_maparray "SHOW ALTER TABLE MATERIALIZED VIEW FROM
${dbName}"
+ logger.info("result: ${result}")
+ for (int i = 0; i < result.size(); i++) {
+ if (result[i]['TableName'] == "${tableName}" &&
+ result[i]['RollupIndexName'] == "${mvName}" &&
+ result[i]['State'] == 'FINISHED') {
+ alter_finished = true
+ break
+ }
+ }
+ Thread.sleep(3000)
+ }
+ assertTrue(alter_finished);
+
+ sql """
+ BACKUP SNAPSHOT ${dbName}.${snapshotName}
+ TO `${repoName}`
+ """
+
+ syncer.waitSnapshotFinish(dbName)
+
+ def snapshot = syncer.getSnapshotTimestamp(repoName, snapshotName)
+ assertTrue(snapshot != null)
+
+ sql "DROP DATABASE IF EXISTS ${dbName1}"
+ sql "CREATE DATABASE IF NOT EXISTS ${dbName1}"
+
+ sql """
+ RESTORE SNAPSHOT ${dbName1}.${snapshotName}
+ FROM `${repoName}`
+ PROPERTIES
+ (
+ "backup_timestamp" = "${snapshot}",
+ "reserve_replica" = "true"
+ )
+ """
+
+ syncer.waitAllRestoreFinish(dbName1)
+
+ result = sql "SELECT * FROM ${dbName1}.${tableName}"
+ assertEquals(result.size(), values.size());
+
+ result = sql_return_maparray "DESC ${dbName1}.${tableName} ALL"
+ logger.info("result: ${result}")
+ def mv_existed = false
+ for (int i = 0; i < result.size(); i++) {
+ if (result[i]['IndexName'] == "${mvName}") {
+ mv_existed = true
+ }
+ }
+ assertTrue(mv_existed)
+
+ sql "ANALYZE TABLE ${dbName1}.${tableName} WITH SYNC"
+
+ def explain_result = sql """ EXPLAIN SELECT id, sum(item_id) FROM
${dbName1}.${tableName} GROUP BY id"""
+ logger.info("explain result: ${explain_result}")
+ // ATTN: RestoreJob will reset the src db name of OriginStatement of the
MaterializedIndexMeta.
+
assertTrue(explain_result.toString().contains("${dbName1}.${tableName}(${mvName})"))
+
+ sql "DROP TABLE ${dbName}.${tableName} FORCE"
+ sql "DROP TABLE ${dbName1}.${tableName} FORCE"
+ sql "DROP DATABASE ${dbName} FORCE"
+ sql "DROP DATABASE ${dbName1} FORCE"
+ sql "DROP REPOSITORY `${repoName}`"
+}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
