Branch 2.0

CHANGELOG.md

@@ -1,12 +1,9 @@
 # 更新日志
 
-## dev
 
-### Fix
-
-- 修复因与上下游 FE 网络中断而触发 full sync 的问题
+## v 2.0.10.0
 
-## v 2.1.3/2.0.3.10
+对应 doris 2.0.10.
 
 ### Feature
 
@@ -20,12 +17,13 @@
 
 ## v 2.0.3.9
 
-配合 doris 2.0.9 版本
+配合 doris 2.0.9 版本.
 
 ### Feature
 
 - 添加选项以启动 pprof server
-- 允许配置 rpc 合 connection 超时
+- 允许配置 rpc 和 connection 超时
+
 
 ### Fix
 

pkg/ccr/base/spec.go

@@ -677,7 +677,7 @@ func (s *Spec) CheckRestoreFinished(snapshotName string) (bool, error) {
 }
 
 func (s *Spec) GetRestoreSignatureNotMatchedTable(snapshotName string) (string, error) {
-	log.Debugf("get restore signature not matched table, spec: %s, snapshot: %s", s.String(), snapshotName)
+	log.Debugf("get restore signature not matched table, spec: %s, datebase: %s, snapshot: %s", s.String(), s.Database, snapshotName)
 
 	for i := 0; i < MAX_CHECK_RETRY_TIMES; i++ {
 		if restoreState, status, err := s.checkRestoreFinished(snapshotName); err != nil {

regression-test/suites/db-sync/test_db_sync.groovy

@@ -20,26 +20,20 @@ suite("test_db_sync") {
     def syncerAddress = "127.0.0.1:9190"
     def test_num = 0
     def insert_num = 5
-    def date_num = "2021-01-02"
     def sync_gap_time = 5000
 
     def createUniqueTable = { tableName ->
         sql """
             CREATE TABLE if NOT EXISTS ${tableName}
             (
                 `test` INT,
-                `id` INT,
-                `date_time` date NOT NULL
+                `id` INT
             )
             ENGINE=OLAP
-            UNIQUE KEY(`test`, `id`, `date_time`)
-            AUTO PARTITION BY RANGE (date_trunc(`date_time`, 'day'))
-            (
-            )
-            DISTRIBUTED BY HASH(id) BUCKETS AUTO
+            UNIQUE KEY(`test`, `id`)
+            DISTRIBUTED BY HASH(id) BUCKETS 1
             PROPERTIES (
                 "replication_allocation" = "tag.location.default: 1",
-                "estimate_partition_size" = "10G",
                 "binlog.enable" = "true"
             )
         """
@@ -49,43 +43,33 @@ suite("test_db_sync") {
             CREATE TABLE if NOT EXISTS ${tableName}
             (
                 `test` INT,
-                `date_time` date NOT NULL,
                 `last` INT REPLACE DEFAULT "0",
                 `cost` INT SUM DEFAULT "0",
                 `max` INT MAX DEFAULT "0",
                 `min` INT MIN DEFAULT "0"
             )
             ENGINE=OLAP
-            AGGREGATE KEY(`test`, `date_time`)
-            AUTO PARTITION BY RANGE (date_trunc(`date_time`, 'day'))
-            (
-            )
-            DISTRIBUTED BY HASH(`test`) BUCKETS AUTO
+            AGGREGATE KEY(`test`)
+            DISTRIBUTED BY HASH(`test`) BUCKETS 1
             PROPERTIES (
                 "replication_allocation" = "tag.location.default: 1",
-                "estimate_partition_size" = "10G",
                 "binlog.enable" = "true"
             )
         """
     }
 
     def createDuplicateTable = { tableName ->
-       sql """
+        sql """
             CREATE TABLE if NOT EXISTS ${tableName}
             (
                 `test` INT,
-                `id` INT,
-                `date_time` date NOT NULL
+                `id` INT
             )
             ENGINE=OLAP
-            DUPLICATE KEY(`test`, `id`, `date_time`)
-            AUTO PARTITION BY RANGE (date_trunc(`date_time`, 'day'))
-            (
-            )
-            DISTRIBUTED BY HASH(id) BUCKETS AUTO
+            DUPLICATE KEY(`test`, `id`)
+            DISTRIBUTED BY HASH(id) BUCKETS 1
             PROPERTIES (
                 "replication_allocation" = "tag.location.default: 1",
-                "estimate_partition_size" = "10G",
                 "binlog.enable" = "true"
             )
         """
@@ -163,25 +147,26 @@ suite("test_db_sync") {
     createUniqueTable(tableUnique0)
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableUnique0} VALUES (${test_num}, ${index}, '${date_num}')
+            INSERT INTO ${tableUnique0} VALUES (${test_num}, ${index})
             """
     }
 
     createAggergateTable(tableAggregate0)
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableAggregate0} VALUES (${test_num}, '${date_num}', ${index}, ${index}, ${index}, ${index})
+            INSERT INTO ${tableAggregate0} VALUES (${test_num}, ${index}, ${index}, ${index}, ${index})
             """
     }
 
     createDuplicateTable(tableDuplicate0)
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableDuplicate0} VALUES (0, 99, '${date_num}')
+            INSERT INTO ${tableDuplicate0} VALUES (0, 99)
             """
     }
 
     sql "ALTER DATABASE ${context.dbName} SET properties (\"binlog.enable\" = \"true\")"
+    sql "sync"
 
     String response
     httpTest {
@@ -209,20 +194,21 @@ suite("test_db_sync") {
     test_num = 1
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableUnique0} VALUES (${test_num}, ${index}, '${date_num}')
+            INSERT INTO ${tableUnique0} VALUES (${test_num}, ${index})
             """
     }
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableAggregate0} VALUES (${test_num}, '${date_num}', ${index}, ${index}, ${index}, ${index})
+            INSERT INTO ${tableAggregate0} VALUES (${test_num}, ${index}, ${index}, ${index}, ${index})
             """
     }
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableDuplicate0} VALUES (0, 99, '${date_num}')
+            INSERT INTO ${tableDuplicate0} VALUES (0, 99)
             """
     }
 
+    sql "sync"
     assertTrue(checkSelectTimesOf("SELECT * FROM ${tableUnique0} WHERE test=${test_num}",
                                    insert_num, 30))
     assertTrue(checkSelectTimesOf("SELECT * FROM ${tableAggregate0} WHERE test=${test_num}",
@@ -246,17 +232,22 @@ suite("test_db_sync") {
 
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableUnique1} VALUES (${test_num}, ${index}, '${date_num}')
+            INSERT INTO ${tableUnique1} VALUES (${test_num}, ${index})
+            """
+    }
+    for (int index = 0; index < insert_num; index++) {
+        sql """
+            INSERT INTO ${tableAggregate1} VALUES (${test_num}, ${index}, ${index}, ${index}, ${index})
             """
     }
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableAggregate1} VALUES (${test_num}, '${date_num}', ${index}, ${index}, ${index}, ${index})
+            INSERT INTO ${tableDuplicate1} VALUES (0, 99)
             """
     }
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableDuplicate1} VALUES (0, 99, '${date_num}')
+            INSERT INTO ${keywordTableName} VALUES (${test_num}, ${index})
             """
     }
     for (int index = 0; index < insert_num; index++) {
@@ -265,6 +256,7 @@ suite("test_db_sync") {
             """
     }
 
+    sql "sync"
     assertTrue(checkShowTimesOf("SHOW CREATE TABLE TEST_${context.dbName}.${tableUnique1}",
                                 exist, 30, "target"))
     assertTrue(checkSelectTimesOf("SELECT * FROM ${tableUnique1} WHERE test=${test_num}",
@@ -291,6 +283,7 @@ suite("test_db_sync") {
     sql "DROP TABLE ${tableDuplicate1}"
     sql "DROP TABLE ${keywordTableName}"
 
+    sql "sync"
     assertTrue(checkShowTimesOf("SHOW TABLES LIKE '${tableUnique1}'", 
                                 notExist, 30, "target"))
     assertTrue(checkShowTimesOf("SHOW TABLES LIKE '${tableAggregate1}'",
@@ -313,10 +306,11 @@ suite("test_db_sync") {
     test_num = 4
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableUnique0} VALUES (${test_num}, ${index}, '${date_num}')
+            INSERT INTO ${tableUnique0} VALUES (${test_num}, ${index})
             """
     }
 
+    sql "sync"
     assertTrue(!checkSelectTimesOf("SELECT * FROM ${tableUnique0} WHERE test=${test_num}",
                                    insert_num, 3))
 
@@ -328,6 +322,7 @@ suite("test_db_sync") {
         op "post"
         result response
     }
+    sql "sync"
     assertTrue(checkSelectTimesOf("SELECT * FROM ${tableUnique0} WHERE test=${test_num}",
                                    insert_num, 30))
 
@@ -357,6 +352,7 @@ suite("test_db_sync") {
         assertTrue(desynced)
     }
 
+    sql "sync"
     checkDesynced(tableUnique0)
     checkDesynced(tableAggregate0)
     checkDesynced(tableDuplicate0)
@@ -375,10 +371,11 @@ suite("test_db_sync") {
 
     for (int index = 0; index < insert_num; index++) {
         sql """
-            INSERT INTO ${tableUnique0} VALUES (${test_num}, ${index}, '${date_num}')
+            INSERT INTO ${tableUnique0} VALUES (${test_num}, ${index})
             """
     }
 
+    sql "sync"
     assertTrue(!checkSelectTimesOf("SELECT * FROM ${tableUnique0} WHERE test=${test_num}",
                                    insert_num, 5))
 }

regression-test/suites/table-sync/test_bitmap_index.groovy

@@ -34,6 +34,9 @@ suite("test_bitmap_index") {
                 } else {
                     res = target_sql "${sqlString}"
                 }
+
+                logger.info("res: ${res}")
+
                 if (myClosure.call(res)) {
                     ret = true
                 }

regression-test/suites/table-sync/test_bloomfilter_index.groovy

@@ -34,6 +34,7 @@ suite("test_bloomfilter_index") {
                 } else {
                     res = target_sql "${sqlString}"
                 }
+                logger.info("res: ${res}")
                 if (myClosure.call(res)) {
                     ret = true
                 }