From b529f05aec0374e49b6f5c07aff10cafd0c6197e Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Mon, 1 Aug 2022 11:03:18 +0800 Subject: [PATCH 1/2] refactor(sync): add test case --- source/libs/sync/test/sh/auto_bench.sh | 7 ++++--- source/libs/sync/test/sh/insert.tpl.json | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/libs/sync/test/sh/auto_bench.sh b/source/libs/sync/test/sh/auto_bench.sh index 32dc071018..06af59da34 100644 --- a/source/libs/sync/test/sh/auto_bench.sh +++ b/source/libs/sync/test/sh/auto_bench.sh @@ -1,7 +1,7 @@ #!/bin/bash -if [ $# != 5 ] ; then - echo "Uasge: $0 instances vgroups replica ctables rows" +if [ $# != 6 ] ; then + 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} diff --git a/source/libs/sync/test/sh/insert.tpl.json b/source/libs/sync/test/sh/insert.tpl.json index 633dd70a24..e68ff3c5ff 100644 --- a/source/libs/sync/test/sh/insert.tpl.json +++ b/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 }, From 2b2b8862d10785d56a5268e5bcab39cd4f1fbe27 Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Mon, 1 Aug 2022 11:10:14 +0800 Subject: [PATCH 2/2] refactor(sync): delete traft in cmake --- cmake/cmake.options | 12 ------------ cmake/craft_CMakeLists.txt.in | 14 -------------- cmake/traft_CMakeLists.txt.in | 14 -------------- 3 files changed, 40 deletions(-) delete mode 100644 cmake/craft_CMakeLists.txt.in delete mode 100644 cmake/traft_CMakeLists.txt.in diff --git a/cmake/cmake.options b/cmake/cmake.options index d2dd48c1a0..92e9567521 100644 --- a/cmake/cmake.options +++ b/cmake/cmake.options @@ -157,18 +157,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( diff --git a/cmake/craft_CMakeLists.txt.in b/cmake/craft_CMakeLists.txt.in deleted file mode 100644 index f0ec7feaf2..0000000000 --- a/cmake/craft_CMakeLists.txt.in +++ /dev/null @@ -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 "" -) diff --git a/cmake/traft_CMakeLists.txt.in b/cmake/traft_CMakeLists.txt.in deleted file mode 100644 index 0934e2c35c..0000000000 --- a/cmake/traft_CMakeLists.txt.in +++ /dev/null @@ -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 "" -)