Skip to content

Commit 51e50a7

Browse files
committed
fix: waitAllRestoreFinish
修复文件: - test_MoW_backup_restore.groovy (8 处) - test_seq_map_backup_restore.groovy (9 处) 所有 waitAllRestoreFinish() 改为 waitAllRestoreFinish(dbName)
1 parent 1c2c238 commit 51e50a7

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

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
}

regression-test/suites/backup_restore/test_seq_map_backup_restore.groovy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,23 @@ suite("test_seq_map_backup_restore", "p1") {
8080
// version1
8181
assertTrue(syncer.getSnapshot("seq_map_snapshot1", "${tableName}"))
8282
assertTrue(syncer.restoreSnapshot())
83-
syncer.waitAllRestoreFinish()
83+
syncer.waitAllRestoreFinish(dbName)
8484
qt_7 """select * from ${dbName}.$tableName order by a"""
8585

8686
// version2
8787
assertTrue(syncer.getSnapshot("seq_map_snapshot2", "${tableName}"))
8888
assertTrue(syncer.restoreSnapshot())
89-
syncer.waitAllRestoreFinish()
89+
syncer.waitAllRestoreFinish(dbName)
9090
qt_8 """select * from ${dbName}.$tableName order by a"""
9191
// version3
9292
assertTrue(syncer.getSnapshot("seq_map_snapshot3", "${tableName}"))
9393
assertTrue(syncer.restoreSnapshot())
94-
syncer.waitAllRestoreFinish()
94+
syncer.waitAllRestoreFinish(dbName)
9595
qt_9 """select * from ${dbName}.$tableName order by a"""
9696
// version4
9797
assertTrue(syncer.getSnapshot("seq_map_snapshot4", "${tableName}"))
9898
assertTrue(syncer.restoreSnapshot())
99-
syncer.waitAllRestoreFinish()
99+
syncer.waitAllRestoreFinish(dbName)
100100
qt_10 """select * from ${dbName}.$tableName order by a"""
101101

102102
sql """drop table if exists ${dbName}.$tableName"""
@@ -124,23 +124,23 @@ suite("test_seq_map_backup_restore", "p1") {
124124
// version1
125125
assertTrue(syncer.getSnapshot("seq_map_snapshot1", "${tableName}"))
126126
assertTrue(syncer.restoreSnapshot())
127-
syncer.waitAllRestoreFinish()
127+
syncer.waitAllRestoreFinish(dbName)
128128
qt_11 """select * from ${dbName}.$tableName order by a"""
129129

130130
// version2
131131
assertTrue(syncer.getSnapshot("seq_map_snapshot2", "${tableName}"))
132132
assertTrue(syncer.restoreSnapshot())
133-
syncer.waitAllRestoreFinish()
133+
syncer.waitAllRestoreFinish(dbName)
134134
qt_12 """select * from ${dbName}.$tableName order by a"""
135135
// version3
136136
assertTrue(syncer.getSnapshot("seq_map_snapshot3", "${tableName}"))
137137
assertTrue(syncer.restoreSnapshot())
138-
syncer.waitAllRestoreFinish()
138+
syncer.waitAllRestoreFinish(dbName)
139139
qt_13 """select * from ${dbName}.$tableName order by a"""
140140
// version4
141141
assertTrue(syncer.getSnapshot("seq_map_snapshot4", "${tableName}"))
142142
assertTrue(syncer.restoreSnapshot())
143-
syncer.waitAllRestoreFinish()
143+
syncer.waitAllRestoreFinish(dbName)
144144
qt_14 """select * from ${dbName}.$tableName order by a"""
145145

146146
sql """drop table if exists ${dbName}.$tableName"""
@@ -169,7 +169,7 @@ suite("test_seq_map_backup_restore", "p1") {
169169
syncer.waitSnapshotFinish()
170170
assertTrue(syncer.getSnapshot("seq_map_seq_without_value_snapshot", "${tableName}"))
171171
assertTrue(syncer.restoreSnapshot())
172-
syncer.waitAllRestoreFinish()
172+
syncer.waitAllRestoreFinish(dbName)
173173
qt_16 """select * from ${dbName}.$tableName order by a"""
174174

175175
sql """drop table if exists ${dbName}.$tableName"""

0 commit comments

Comments
 (0)