Skip to content

Commit 6364151

Browse files
Ryan19929Ryan19929
committed
2026_update2
1 parent 51ecb23 commit 6364151

9 files changed

+38
-746
lines changed

‎regression-test/framework/src/main/groovy/org/apache/doris/regression/util/BackupRestoreHelper.groovy‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ package org.apache.doris.regression.util
3030
class BackupRestoreHelper {
3131
private static final String LOCAL_REPO_NAME = "__keep_on_local__"
3232

33-
private def sql
33+
private Closure sql
3434
private def syncer
3535
private def logger
3636

@@ -68,11 +68,11 @@ class BackupRestoreHelper {
6868
String tables = tableNames.join(", ")
6969
logger.info("S3 BACKUP: ${dbName}.${snapshotName} ON (${tables})")
7070

71-
sql """
71+
sql.call("""
7272
BACKUP SNAPSHOT ${dbName}.${snapshotName}
7373
TO `${repoName}`
7474
ON (${tables})
75-
"""
75+
""")
7676

7777
syncer.waitSnapshotFinish(dbName)
7878
logger.info("S3 BACKUP completed: ${dbName}.${snapshotName}")
@@ -104,13 +104,13 @@ class BackupRestoreHelper {
104104
propStr = "\"backup_timestamp\" = \"${snapshot}\""
105105
}
106106

107-
sql """
107+
sql.call("""
108108
RESTORE SNAPSHOT ${dbName}.${snapshotName} FROM `${repoName}`
109109
ON (`${tableName}`)
110110
PROPERTIES (
111111
${propStr}
112112
)
113-
"""
113+
""")
114114

115115
syncer.waitAllRestoreFinish(dbName)
116116
logger.info("S3 RESTORE completed: ${dbName}.${snapshotName}")
@@ -133,11 +133,11 @@ class BackupRestoreHelper {
133133
try {
134134
logger.info("LOCAL BACKUP: ${dbName}.${snapshotName} ON (${tableName})")
135135

136-
sql """
136+
sql.call("""
137137
BACKUP SNAPSHOT ${dbName}.${snapshotName}
138138
TO `${LOCAL_REPO_NAME}`
139139
ON (${tableName})
140-
"""
140+
""")
141141

142142
syncer.waitSnapshotFinish(dbName)
143143
logger.info("LOCAL BACKUP completed: ${dbName}.${snapshotName}")
@@ -210,7 +210,7 @@ class BackupRestoreHelper {
210210
propStr += ",\n\"replication_num\" = \"1\""
211211
}
212212

213-
sql """
213+
sql.call("""
214214
CREATE TABLE ${dbName}.${tableName} (
215215
`id` INT,
216216
`value` STRING
@@ -219,7 +219,7 @@ class BackupRestoreHelper {
219219
PROPERTIES (
220220
${propStr}
221221
)
222-
"""
222+
""")
223223
logger.info("Created table: ${dbName}.${tableName}")
224224
}
225225

@@ -234,7 +234,7 @@ class BackupRestoreHelper {
234234
propStr += ",\n\"replication_num\" = \"1\""
235235
}
236236

237-
sql """
237+
sql.call("""
238238
CREATE TABLE ${dbName}.${tableName} (
239239
`date` DATE,
240240
`id` INT,
@@ -248,23 +248,23 @@ class BackupRestoreHelper {
248248
PROPERTIES (
249249
${propStr}
250250
)
251-
"""
251+
""")
252252
logger.info("Created partition table: ${dbName}.${tableName}")
253253
}
254254

255255
/**
256256
* Insert test data
257257
*/
258258
void insertData(String dbName, String tableName, List<String> values) {
259-
sql "INSERT INTO ${dbName}.${tableName} VALUES ${values.join(',')}"
259+
sql.call("INSERT INTO ${dbName}.${tableName} VALUES ${values.join(',')}")
260260
logger.info("Inserted ${values.size()} rows into ${dbName}.${tableName}")
261261
}
262262

263263
/**
264264
* Truncate table
265265
*/
266266
void truncateTable(String dbName, String tableName) {
267-
sql "TRUNCATE TABLE ${dbName}.${tableName}"
267+
sql.call("TRUNCATE TABLE ${dbName}.${tableName}")
268268
logger.info("Truncated table: ${dbName}.${tableName}")
269269
}
270270

@@ -274,9 +274,9 @@ class BackupRestoreHelper {
274274
void dropTable(String dbName, String tableName, boolean force = true) {
275275
try {
276276
if (force) {
277-
sql "DROP TABLE IF EXISTS ${dbName}.${tableName} FORCE"
277+
sql.call("DROP TABLE IF EXISTS ${dbName}.${tableName} FORCE")
278278
} else {
279-
sql "DROP TABLE IF EXISTS ${dbName}.${tableName}"
279+
sql.call("DROP TABLE IF EXISTS ${dbName}.${tableName}")
280280
}
281281
logger.info("Dropped table: ${dbName}.${tableName}")
282282
} catch (Exception e) {
@@ -292,7 +292,7 @@ class BackupRestoreHelper {
292292
* Verify row count
293293
*/
294294
boolean verifyRowCount(String dbName, String tableName, int expectedCount) {
295-
def result = sql "SELECT COUNT(*) FROM ${dbName}.${tableName}"
295+
def result = sql.call("SELECT COUNT(*) FROM ${dbName}.${tableName}")
296296
def actualCount = result[0][0]
297297
if (actualCount == expectedCount) {
298298
logger.info("✓ Row count verified: ${actualCount} == ${expectedCount}")
@@ -307,7 +307,7 @@ class BackupRestoreHelper {
307307
* Verify data exists
308308
*/
309309
boolean verifyDataExists(String dbName, String tableName, String whereClause, boolean shouldExist = true) {
310-
def result = sql "SELECT COUNT(*) FROM ${dbName}.${tableName} WHERE ${whereClause}"
310+
def result = sql.call("SELECT COUNT(*) FROM ${dbName}.${tableName} WHERE ${whereClause}")
311311
def count = result[0][0]
312312

313313
if (shouldExist && count > 0) {
@@ -326,7 +326,7 @@ class BackupRestoreHelper {
326326
* Verify table property
327327
*/
328328
boolean verifyTableProperty(String dbName, String tableName, String propertyName) {
329-
def result = sql "SHOW CREATE TABLE ${dbName}.${tableName}"
329+
def result = sql.call("SHOW CREATE TABLE ${dbName}.${tableName}")
330330
def createTableStr = result[0][1]
331331

332332
if (createTableStr.contains(propertyName)) {

‎regression-test/suites/backup_restore/test_MoW_backup_restore.groovy‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,23 @@ suite("test_MoW_backup_restore", "p1") {
5959
// version1 (1,1)(2,2)
6060
assertTrue(syncer.getSnapshot("snapshot1", "${tableName}"))
6161
assertTrue(syncer.restoreSnapshot())
62-
syncer.waitAllRestoreFinish()
62+
syncer.waitAllRestoreFinish(dbName)
6363
qt_7 """select * from ${tableName} order by user_id"""
6464

6565
// version2 (1,10)(2,2)
6666
assertTrue(syncer.getSnapshot("snapshot2", "${tableName}"))
6767
assertTrue(syncer.restoreSnapshot())
68-
syncer.waitAllRestoreFinish()
68+
syncer.waitAllRestoreFinish(dbName)
6969
qt_8 """select * from ${tableName} order by user_id"""
7070
// version3 (1,100)(2,2)
7171
assertTrue(syncer.getSnapshot("snapshot3", "${tableName}"))
7272
assertTrue(syncer.restoreSnapshot())
73-
syncer.waitAllRestoreFinish()
73+
syncer.waitAllRestoreFinish(dbName)
7474
qt_9 """select * from ${tableName} order by user_id"""
7575
// version4 (2,2)
7676
assertTrue(syncer.getSnapshot("snapshot4", "${tableName}"))
7777
assertTrue(syncer.restoreSnapshot())
78-
syncer.waitAllRestoreFinish()
78+
syncer.waitAllRestoreFinish(dbName)
7979
qt_10 """select * from ${tableName} order by user_id"""
8080

8181
sql """drop table if exists ${tableName}"""
@@ -91,22 +91,22 @@ suite("test_MoW_backup_restore", "p1") {
9191
// version1 (1,1)(2,2)
9292
assertTrue(syncer.getSnapshot("snapshot1", "${tableName}"))
9393
assertTrue(syncer.restoreSnapshot())
94-
syncer.waitAllRestoreFinish()
94+
syncer.waitAllRestoreFinish(dbName)
9595
qt_11 """select * from ${tableName} order by user_id"""
9696

9797
// version2 (1,10)(2,2)
9898
assertTrue(syncer.getSnapshot("snapshot2", "${tableName}"))
9999
assertTrue(syncer.restoreSnapshot())
100-
syncer.waitAllRestoreFinish()
100+
syncer.waitAllRestoreFinish(dbName)
101101
qt_12 """select * from ${tableName} order by user_id"""
102102
// version3 (1,100)(2,2)
103103
assertTrue(syncer.getSnapshot("snapshot3", "${tableName}"))
104104
assertTrue(syncer.restoreSnapshot())
105-
syncer.waitAllRestoreFinish()
105+
syncer.waitAllRestoreFinish(dbName)
106106
qt_13 """select * from ${tableName} order by user_id"""
107107
// version4 (2,2)
108108
assertTrue(syncer.getSnapshot("snapshot4", "${tableName}"))
109109
assertTrue(syncer.restoreSnapshot())
110-
syncer.waitAllRestoreFinish()
110+
syncer.waitAllRestoreFinish(dbName)
111111
qt_14 """select * from ${tableName} order by user_id"""
112112
}

0 commit comments

Comments
 (0)