From fd0992ebec4eacd7c1cddef1521130ea0f084cfe Mon Sep 17 00:00:00 2001
From: w41ter <w41ter.l@gmail.com>
Date: Thu, 26 Sep 2024 16:34:41 +0800
Subject: [PATCH] Fix test_column_ops and row_storage case

---
 .../suites/table-sync/test_column_ops.groovy   |  4 ++--
 .../suites/table-sync/test_keyword_name.groovy | 18 +++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/regression-test/suites/table-sync/test_column_ops.groovy b/regression-test/suites/table-sync/test_column_ops.groovy
index 8517e4a9..482045a8 100644
--- a/regression-test/suites/table-sync/test_column_ops.groovy
+++ b/regression-test/suites/table-sync/test_column_ops.groovy
@@ -113,9 +113,9 @@ suite("test_column_ops") {
         INSERT INTO ${tableName} VALUES (${test_num}, 0, "666")
         """
     sql "sync"
-    assertTrue(checkSelectRowTimesOf("SELECT * FROM ${tableName} WHERE test=${test_num}",
+    assertTrue(helper.checkSelectRowTimesOf("SELECT * FROM ${tableName} WHERE test=${test_num}",
         1, 30))
-    assertTrue(checkSelectRowTimesOf("SELECT * FROM ${tableName} WHERE test=${test_num} AND _cost='666'",
+    assertTrue(helper.checkSelectRowTimesOf("SELECT * FROM ${tableName} WHERE test=${test_num} AND _cost='666'",
         1, 1))
 
 
diff --git a/regression-test/suites/table-sync/test_keyword_name.groovy b/regression-test/suites/table-sync/test_keyword_name.groovy
index 6ee46091..87a24cb1 100644
--- a/regression-test/suites/table-sync/test_keyword_name.groovy
+++ b/regression-test/suites/table-sync/test_keyword_name.groovy
@@ -21,7 +21,6 @@ suite("test_keyword_name") {
 
     def tableName = "roles"
     def newTableName = "test-hyphen"
-    def syncerAddress = "127.0.0.1:9190"
     def test_num = 0
     def insert_num = 5
     def opPartitonName = "less0"
@@ -68,7 +67,6 @@ suite("test_keyword_name") {
             "binlog.enable" = "true"
         );
     """ 
-    // sql """ALTER TABLE ${tableName} set ("binlog.enable" = "true")"""
 
     sql """
         INSERT INTO `${tableName}` VALUES
@@ -95,15 +93,9 @@ suite("test_keyword_name") {
 
     assertTrue(helper.checkRestoreFinishTimesOf("${tableName}", 30))
 
-    httpTest {
-        uri "/create_ccr"
-        endpoint syncerAddress
-        def bodyJson = get_ccr_body "${newTableName}"
-        body "${bodyJson}"
-        op "post"
-        result response
-    }
-    assertTrue(checkRestoreFinishTimesOf("${newTableName}", 30))
+    helper.ccrJobDelete(newTableName)
+    helper.ccrJobCreate(newTableName)
+    assertTrue(helper.checkRestoreFinishTimesOf("${newTableName}", 30))
 
     logger.info("=== Test 1: Check keyword name table ===")
     // def checkShowTimesOf = { sqlString, myClosure, times, func = "sql" -> Boolean
@@ -112,10 +104,10 @@ suite("test_keyword_name") {
                                 """,
                                 exist, 30, "target"))
 
-    assertTrue(checkShowTimesOf("""
+    assertTrue(helper.checkShowTimesOf("""
                                 SHOW CREATE TABLE `TEST_${context.dbName}`.`${newTableName}`
                                 """,
-                                exist, 30, "target"))                                
+                                exist, 30, "target"))
 
     logger.info("=== Test 2: Add new partition ===")
     sql """