From dc0d9c2f53a66ee00770e2fd7437b869e13231fa Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Wed, 4 Jan 2023 17:01:07 +0800
Subject: [PATCH 1/2] test: add test case for update

---
 tests/parallel_test/cases.task       |   1 +
 tests/script/tsim/insert/update2.sim | 222 +++++++++++++++++++++++++++
 2 files changed, 223 insertions(+)
 create mode 100644 tests/script/tsim/insert/update2.sim

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index d55e4f919b..49e391c4ab 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -82,6 +82,7 @@
 ,,y,script,./test.sh -f tsim/insert/tcp.sim
 ,,y,script,./test.sh -f tsim/insert/update0.sim
 ,,y,script,./test.sh -f tsim/insert/update1_sort_merge.sim
+,,y,script,./test.sh -f tsim/insert/update2.sim
 ,,y,script,./test.sh -f tsim/parser/alter__for_community_version.sim
 ,,y,script,./test.sh -f tsim/parser/alter_column.sim
 ,,y,script,./test.sh -f tsim/parser/alter_stable.sim
diff --git a/tests/script/tsim/insert/update2.sim b/tests/script/tsim/insert/update2.sim
new file mode 100644
index 0000000000..f5a3d6492e
--- /dev/null
+++ b/tests/script/tsim/insert/update2.sim
@@ -0,0 +1,222 @@
+################################################################################################
+# migrate from 2.0 insert_update2.sim
+################################################################################################
+
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 2000
+sql connect
+
+### 4096*0.8 - 1 = 3275
+$rowSuperBlk = 3275
+### 4096 - 3275 -1 - 1 = 819
+$rowSubBlk = 819
+$ts0 = 1672372800000
+$ts1 = 1672372900000
+$ts2 = 1672686800000
+
+$i = 0
+$db = db0
+$stb1 = stb1
+$tb1 = tb1
+$stb2 = stb2
+$tb2 = tb2
+
+print ====== create database
+sql drop database if exists $db
+sql create database $db keep 1000 duration 10
+print ====== create tables
+sql use $db
+sql create table $stb1 (ts timestamp, c1 bigint, c2 bigint, c3 bigint) tags(t1 int)
+sql create table $stb2 (ts timestamp, c1 bigint, c2 bigint, c3 bigint, c4 bigint, c5 bigint, c6 bigint, c7 bigint, c8 bigint, c9 bigint, c10 bigint, c11 bigint, c12 bigint, c13 bigint, c14 bigint, c15 bigint, c16 bigint, c17 bigint, c18 bigint, c19 bigint, c20 bigint, c21 bigint, c22 bigint, c23 bigint, c24 bigint, c25 bigint, c26 bigint, c27 bigint, c28 bigint, c29 bigint, c30 bigint) tags(t1 int)
+sql create table $tb1 using $stb1 tags(1)
+sql create table $tb2 using $stb2 tags(2)
+print ====== tables created
+
+
+print ========== step 1: merge dataRow in mem
+
+$i = 0
+while $i < $rowSuperBlk
+  $xs = $i * 10
+  $ts = $ts2 + $xs
+  sql insert into $tb1 (ts,c1) values ( $ts , $i ) 
+  $i = $i + 1
+endw 
+
+sql insert into $tb1 values ( $ts0 , 1,NULL,0)
+sql insert into $tb1 (ts,c2,c3) values ( $ts0 , 1,1)
+
+sql select * from $tb1 where ts = $ts0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+
+print ========== step 2: merge kvRow in mem
+$i = 0
+while $i < $rowSuperBlk
+  $xs = $i * 10
+  $ts = $ts2 + $xs
+  sql insert into $tb2 (ts,c1) values ( $ts , $i ) 
+  $i = $i + 1
+endw 
+
+sql insert into $tb2 (ts,c3,c8,c10) values ( $ts0 , 1,NULL,0)
+sql insert into $tb2 (ts,c8,c10) values ( $ts0 , 1,1)
+
+sql select ts,c1,c3,c8,c10 from $tb2 where ts = $ts0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+if $data04 != 1 then 
+  return -1
+endi
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sleep 2000
+
+print ========== step 3: merge dataRow in file
+sql insert into $tb1 (ts,c1) values ( $ts0 , 2)
+print ========== step 4: merge kvRow in file
+sql insert into $tb2 (ts,c3) values ( $ts0 , 2)
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sleep 2000
+
+sql select * from $tb1 where ts = $ts0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+
+sql select ts,c1,c3,c8,c10 from $tb2 where ts = $ts0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then 
+  return -1
+endi
+if $data02 != 2 then 
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+if $data04 != 1 then 
+  return -1
+endi
+
+
+print ========== step 5: merge dataRow in file/mem
+$i = 0
+while $i < $rowSubBlk
+  $xs = $i * 1
+  $ts = $ts1 + $xs
+  sql insert into $tb1 (ts,c1) values ( $ts , $i ) 
+  $i = $i + 1
+endw
+print ========== step 6: merge kvRow in file/mem
+$i = 0
+while $i < $rowSubBlk
+  $xs = $i * 1
+  $ts = $ts1 + $xs
+  sql insert into $tb2 (ts,c1) values ( $ts , $i ) 
+  $i = $i + 1
+endw
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sleep 2000
+
+sql insert into $tb1 (ts,c3) values ( $ts0 , 3)
+sql insert into $tb2 (ts,c3) values ( $ts0 , 3)
+$tsN = $ts0 + 1
+sql insert into $tb1 (ts,c1,c3) values ( $tsN , 1,0)
+sql insert into $tb2 (ts,c3,c8) values ( $tsN , 100,200)
+$tsN = $ts0 + 2
+sql insert into $tb1 (ts,c1,c3) values ( $tsN , 1,0)
+sql insert into $tb2 (ts,c3,c8) values ( $tsN , 100,200)
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sleep 2000
+
+
+sql select * from $tb1 where ts = $ts0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 3 then 
+  return -1
+endi
+
+sql select ts,c1,c3,c8,c10 from $tb2 where ts = $ts0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then 
+  return -1
+endi
+if $data02 != 3 then 
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+
+### this check for fix TS-2306
+if $data04 != 1 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

From d9c188bf97754099b95a73df49823172cf560272 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Wed, 4 Jan 2023 17:02:41 +0800
Subject: [PATCH 2/2] chore: update comments for update2.sim

---
 tests/script/tsim/insert/update2.sim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/script/tsim/insert/update2.sim b/tests/script/tsim/insert/update2.sim
index f5a3d6492e..d2b5b05267 100644
--- a/tests/script/tsim/insert/update2.sim
+++ b/tests/script/tsim/insert/update2.sim
@@ -214,7 +214,6 @@ if $data03 != 1 then
   return -1
 endi
 
-### this check for fix TS-2306
 if $data04 != 1 then 
   return -1
 endi