Merge pull request #15622 from taosdata/feature/3.0_mhli

refactor(sync): delete traft in cmake

cmake/cmake.options

@@ -163,18 +163,6 @@ option(
     ON 
 )
 
-option(
-    BUILD_WITH_CRAFT
-    "If build with canonical-raft"
-    OFF
-)
-
-option(
-    BUILD_WITH_TRAFT
-    "If build with traft"
-    OFF
-)
-
 IF(${TD_LINUX} MATCHES TRUE)
 
 option(

cmake/craft_CMakeLists.txt.in

@@ -1,14 +0,0 @@
-
-# canonical-raft
-ExternalProject_Add(craft
-        GIT_REPOSITORY https://github.com/canonical/raft.git
-        GIT_TAG v0.11.2
-        SOURCE_DIR "${TD_CONTRIB_DIR}/craft"
-        BINARY_DIR "${TD_CONTRIB_DIR}/craft"
-        #BUILD_IN_SOURCE TRUE
-        # https://answers.ros.org/question/333125/how-to-include-external-automakeautoconf-projects-into-ament_cmake/
-        CONFIGURE_COMMAND COMMAND autoreconf -i COMMAND ./configure --enable-example
-        BUILD_COMMAND "$(MAKE)"
-        INSTALL_COMMAND ""
-        TEST_COMMAND ""
-)

cmake/traft_CMakeLists.txt.in

@@ -1,14 +0,0 @@
-
-# traft
-ExternalProject_Add(traft
-        GIT_REPOSITORY https://github.com/taosdata/traft.git
-        GIT_TAG for_3.0
-        SOURCE_DIR "${TD_CONTRIB_DIR}/traft"
-        BINARY_DIR "${TD_CONTRIB_DIR}/traft"
-        #BUILD_IN_SOURCE TRUE
-        # https://answers.ros.org/question/333125/how-to-include-external-automakeautoconf-projects-into-ament_cmake/
-        CONFIGURE_COMMAND COMMAND autoreconf -i COMMAND ./configure
-        BUILD_COMMAND "$(MAKE)"
-        INSTALL_COMMAND ""
-        TEST_COMMAND ""
-)

source/libs/sync/test/sh/auto_bench.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [ $# != 5 ] ; then
+if [ $# != 6 ] ; then
-  echo "Uasge: $0 instances vgroups replica ctables rows"
+  echo "Uasge: $0 instances vgroups replica ctables rows weak"
   echo ""
   exit 1
 fi
@@ -11,11 +11,12 @@ vgroups=$2
 replica=$3
 ctables=$4
 rows=$5
+weak=$6
 
 echo "params: instances:${instances}, vgroups:${vgroups}, replica:${replica}, ctables:${ctables}, rows:${rows}"
 
 dt=`date "+%Y-%m-%d-%H-%M-%S"`
-casedir=instances_${instances}_vgroups_${vgroups}_replica_${replica}_ctables_${ctables}_rows_${rows}_${dt}
+casedir=instances_${instances}_vgroups_${vgroups}_replica_${replica}_ctables_${ctables}_rows_${rows}_weak_${weak}_${dt}
 mkdir ${casedir}
 cp ./insert.tpl.json ${casedir}
 cd ${casedir}

source/libs/sync/test/sh/insert.tpl.json

@@ -16,7 +16,10 @@
         {
             "dbinfo": {
                 "name": "db1",
-                "drop": "yes",
+                "drop": "no",
+		"wal_retention_period": -1,
+		"wal_retention_size": -1,
+		"drop": "no",
                 "vgroups": tpl_vgroups_tpl,
 	        "replica": tpl_replica_tpl 	
             },