Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix](test) fix ccr test cases #28664

Merged
merged 1 commit into from
Dec 20, 2023
Merged

[fix](test) fix ccr test cases #28664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,9 @@ suite("test_mow_binlog_config_change") {
syncer.closeBackendClients()
}

target_sql " sync "
def res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)

// TODO: bugfix
// test 2: source cluster disable and re-enable binlog
Expand Down
6 changes: 4 additions & 2 deletions regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@ suite("test_mow_ingest_binlog") {
syncer.closeBackendClients()
}

target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)



Expand Down Expand Up @@ -116,8 +117,9 @@ suite("test_mow_ingest_binlog") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)


// End Test 2
Expand Down
6 changes: 4 additions & 2 deletions regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@ suite("test_mow_multi_buckets") {
assertTrue(syncer.commitTxn())
syncer.closeBackendClients()
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
def res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)



Expand All @@ -96,7 +97,8 @@ suite("test_mow_multi_buckets") {
syncer.closeBackendClients()
}

target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)

}
11 changes: 7 additions & 4 deletions regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ suite("test_mow_txn_case") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
def res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)



Expand Down Expand Up @@ -196,7 +197,7 @@ suite("test_mow_txn_case") {
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)

// End Test 3
syncer.context.user = context.config.feSyncerUser
Expand Down Expand Up @@ -241,8 +242,9 @@ suite("test_mow_txn_case") {
// def lastCommitInfo = syncer.copyCommitInfos()
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)
// syncer.context.commitInfos = lastCommitInfo
// assertTrue(syncer.commitTxn() == false)

Expand Down Expand Up @@ -294,8 +296,9 @@ suite("test_mow_txn_case") {
syncer.context.passwd = "123456"
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)

// End Test 5
syncer.context.user = context.config.feSyncerUser
Expand Down
6 changes: 4 additions & 2 deletions regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ suite("test_mow_backup_restore") {
INSERT INTO ${tableName} VALUES (${test_num}, ${i})
"""
}
sql " sync "
def res = sql "SELECT * FROM ${tableName}"
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)
sql """
BACKUP SNAPSHOT ${context.dbName}.${snapshotName}
TO `__keep_on_local__`
Expand All @@ -67,6 +68,7 @@ suite("test_mow_backup_restore") {
while (syncer.checkRestoreFinish() == false) {
Thread.sleep(3000)
}
target_sql " sync "
res = target_sql "SELECT * FROM ${tableName}"
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)
}
3 changes: 2 additions & 1 deletion regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ suite("test_binlog_config_change") {
syncer.closeBackendClients()
}

target_sql " sync "
def res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)

// TODO: bugfix
// test 2: source cluster disable and re-enable binlog
Expand Down
6 changes: 4 additions & 2 deletions regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,9 @@ suite("test_ingest_binlog") {
syncer.closeBackendClients()
}

target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)



Expand Down Expand Up @@ -116,8 +117,9 @@ suite("test_ingest_binlog") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)


// End Test 2
Expand Down
6 changes: 4 additions & 2 deletions regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ suite("test_multi_buckets") {
assertTrue(syncer.commitTxn())
syncer.closeBackendClients()
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
def res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)



Expand All @@ -94,7 +95,8 @@ suite("test_multi_buckets") {
syncer.closeBackendClients()
}

target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)

}
12 changes: 8 additions & 4 deletions regression-test/suites/ccr_syncer_p0/test_txn_case.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ suite("test_txn_case") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
def res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)



Expand Down Expand Up @@ -189,8 +190,9 @@ suite("test_txn_case") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)

// End Test 3
syncer.context.user = context.config.feSyncerUser
Expand Down Expand Up @@ -235,8 +237,9 @@ suite("test_txn_case") {
// def lastCommitInfo = syncer.copyCommitInfos()
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)
// syncer.context.commitInfos = lastCommitInfo
// assertTrue(syncer.commitTxn() == false)

Expand Down Expand Up @@ -288,8 +291,9 @@ suite("test_txn_case") {
syncer.context.passwd = "123456"
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
assertTrue(res.size() == 1)
assertEquals(res.size(), 1)

// End Test 5
syncer.context.user = context.config.feSyncerUser
Expand Down
6 changes: 4 additions & 2 deletions regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ suite("test_backup_restore") {
INSERT INTO ${tableName} VALUES (${test_num}, ${i})
"""
}
sql " sync "
def res = sql "SELECT * FROM ${tableName}"
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)
sql """
BACKUP SNAPSHOT ${context.dbName}.${snapshotName}
TO `__keep_on_local__`
Expand All @@ -66,6 +67,7 @@ suite("test_backup_restore") {
while (syncer.checkRestoreFinish() == false) {
Thread.sleep(3000)
}
target_sql " sync "
res = target_sql "SELECT * FROM ${tableName}"
assertTrue(res.size() == insert_num)
assertEquals(res.size(), insert_num)
}