Merge pull request #15289 from taosdata/feature/TD-11274-3.0

test: add case update1_sort_merge.sim to CI

source/dnode/vnode/src/sma/smaRollup.c

@@ -582,7 +582,7 @@ static int32_t tdRSmaFetchAndSubmitResult(SRSmaInfoItem *pItem, STSchema *pTSche
 
     int32_t code = qExecTask(pItem->taskInfo, &output, &ts);
     if (code < 0) {
-      smaError("vgId:%d, qExecTask for rsma table %" PRIi64 "l evel %" PRIi8 " failed since %s", SMA_VID(pSma), suid,
+      smaError("vgId:%d, qExecTask for rsma table %" PRIi64 " level %" PRIi8 " failed since %s", SMA_VID(pSma), suid,
                pItem->level, terrstr(code));
       goto _err;
     }

source/dnode/vnode/src/vnd/vnodeSvr.c

@@ -773,6 +773,7 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t version, void *pReq
   terrno = TSDB_CODE_SUCCESS;
 
   pRsp->code = 0;
+  pSubmitReq->version = version;
 
 #ifdef TD_DEBUG_PRINT_ROW
   vnodeDebugPrintSubmitMsg(pVnode, pReq, __func__);
@@ -791,7 +792,7 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t version, void *pReq
 
   submitRsp.pArray = taosArrayInit(msgIter.numOfBlocks, sizeof(SSubmitBlkRsp));
   newTbUids = taosArrayInit(msgIter.numOfBlocks, sizeof(int64_t));
-  if (!submitRsp.pArray) {
+  if (!submitRsp.pArray || !newTbUids) {
     pRsp->code = TSDB_CODE_OUT_OF_MEMORY;
     goto _exit;
   }

tests/script/jenkins/basic.txt

@@ -81,6 +81,7 @@
 ./test.sh -f tsim/insert/query_multi_file.sim
 ./test.sh -f tsim/insert/tcp.sim
 ./test.sh -f tsim/insert/update0.sim
+./test.sh -f tsim/insert/update1_sort_merge.sim
 
 # ---- parser
 ./test.sh -f tsim/parser/alter__for_community_version.sim

tests/script/tsim/insert/dupinsert.sim

-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-print =============== create database
-sql drop database if exists d0
-sql create database d0 keep 365000d,365000d,365000d
-sql use d0
-
-print =============== create super table
-sql create table if not exists stb (ts timestamp, c1 int unsigned, c2 double, c3 binary(10), c4 nchar(10), c5 double) tags (city binary(20),district binary(20));
-
-sql show stables
-if $rows != 1 then 
-  return -1
-endi
-
-print =============== create child table
-sql create table ct1 using stb tags("BeiJing", "ChaoYang")
-sql create table ct2 using stb tags("BeiJing", "HaiDian")
-sql create table ct3 using stb tags("BeiJing", "PingGu")
-sql create table ct4 using stb tags("BeiJing", "YanQing")
-
-sql show tables
-if $rows != 4 then 
-  print rows $rows != 4
-  return -1
-endi
-
-print =============== step 1 insert records into ct1 - taosd merge
-sql insert into ct1(ts,c1,c2) values('2022-05-03 16:59:00.010', 10, 20);
-sql insert into ct1(ts,c1,c2,c3,c4) values('2022-05-03 16:59:00.011', 11, NULL, 'binary', 'nchar');
-sql insert into ct1 values('2022-05-03 16:59:00.016', 16, NULL, NULL, 'nchar', NULL);
-sql insert into ct1 values('2022-05-03 16:59:00.016', 17, NULL, NULL, 'nchar', 170);
-sql insert into ct1 values('2022-05-03 16:59:00.020', 20, NULL, NULL, 'nchar', 200);
-sql insert into ct1 values('2022-05-03 16:59:00.016', 18, NULL, NULL, 'nchar', 180);
-sql insert into ct1 values('2022-05-03 16:59:00.021', 21, NULL, NULL, 'nchar', 210);
-sql insert into ct1 values('2022-05-03 16:59:00.022', 22, NULL, NULL, 'nchar', 220);
-
-print =============== step 2 insert records into ct1/ct2 - taosc merge for 2022-05-03 16:59:00.010
-sql insert into ct1(ts,c1,c2) values('2022-05-03 16:59:00.010', 10,10), ('2022-05-03 16:59:00.010',20,10.0), ('2022-05-03 16:59:00.010',30,NULL) ct2(ts,c1) values('2022-05-03 16:59:00.010',10), ('2022-05-03 16:59:00.010',20) ct1(ts,c2) values('2022-05-03 16:59:00.010',10), ('2022-05-03 16:59:00.010',100) ct1(ts,c3) values('2022-05-03 16:59:00.010','bin1'), ('2022-05-03 16:59:00.010','bin2') ct1(ts,c4,c5) values('2022-05-03 16:59:00.010',NULL,NULL), ('2022-05-03 16:59:00.010','nchar4',1000.01) ct2(ts,c2,c3,c4,c5) values('2022-05-03 16:59:00.010',20,'xkl','zxc',10);
-
-print =============== step 3 insert records into ct3
-sql insert into ct3(ts,c1,c5) values('2022-05-03 16:59:00.020', 10,10);
-sql insert into ct3(ts,c1,c5) values('2022-05-03 16:59:00.021', 10,10), ('2022-05-03 16:59:00.021',20,20.0);
-sql insert into ct3(ts,c1,c5) values('2022-05-03 16:59:00.022', 30,30), ('2022-05-03 16:59:00.022',40,40.0),('2022-05-03 16:59:00.022',50,50.0);
-sql insert into ct3(ts,c1,c5) values('2022-05-03 16:59:00.023', 60,60), ('2022-05-03 16:59:00.023',70,70.0),('2022-05-03 16:59:00.023',80,80.0), ('2022-05-03 16:59:00.023',90,90.0);
-sql insert into ct3(ts,c1,c5) values('2022-05-03 16:59:00.024', 100,100), ('2022-05-03 16:59:00.025',110,110.0),('2022-05-03 16:59:00.025',120,120.0), ('2022-05-03 16:59:00.025',130,130.0);
-sql insert into ct3(ts,c1,c5) values('2022-05-03 16:59:00.030', 140,140), ('2022-05-03 16:59:00.030',150,150.0),('2022-05-03 16:59:00.031',160,160.0), ('2022-05-03 16:59:00.030',170,170.0), ('2022-05-03 16:59:00.031',180,180.0);
-sql insert into ct3(ts,c1,c5) values('2022-05-03 16:59:00.042', 190,190), ('2022-05-03 16:59:00.041',200,200.0),('2022-05-03 16:59:00.040',210,210.0);
-sql insert into ct3(ts,c1,c5) values('2022-05-03 16:59:00.050', 220,220), ('2022-05-03 16:59:00.051',230,230.0),('2022-05-03 16:59:00.052',240,240.0);
-
-print =============== step 4 insert records into ct4
-sql insert into ct4(ts,c1,c3,c4) values('2022-05-03 16:59:00.020', 10,'b0','n0');
-sql insert into ct4(ts,c1,c3,c4) values('2022-05-03 16:59:00.021', 20,'b1','n1'), ('2022-05-03 16:59:00.021',30,'b2','n2');
-sql insert into ct4(ts,c1,c3,c4) values('2022-05-03 16:59:00.022', 40,'b3','n3'), ('2022-05-03 16:59:00.022',40,'b4','n4'),('2022-05-03 16:59:00.022',50,'b5','n5');
-sql insert into ct4(ts,c1,c3,c4) values('2022-05-03 16:59:00.023', 60,'b6','n6'), ('2022-05-03 16:59:00.024',70,'b7','n7'),('2022-05-03 16:59:00.024',80,'b8','n8'), ('2022-05-03 16:59:00.023',90,'b9','n9');
-
-
-
-print =============== step 5 query records of ct1 from memory(taosc and taosd merge)
-sql select * from ct1;
-print $data00 $data01 $data02 $data03 $data04 $data05
-print $data10 $data11 $data12 $data13 $data14 $data15
-print $data20 $data21 $data22 $data23 $data24 $data25
-print $data30 $data31 $data32 $data33 $data34 $data35
-print $data40 $data41 $data42 $data43 $data44 $data45
-print $data50 $data51 $data52 $data53 $data54 $data55
-
-
-
-print =============== step 6 query records of ct2 from memory(taosc and taosd merge)
-sql select * from ct2;
-print $data00 $data01 $data02 $data03 $data04 $data05
-
-if $rows != 1 then 
-  print rows $rows != 1
-  return -1
-endi
-
-
-
-print =============== step 7 query records of ct3 from memory
-sql select * from ct3;
-print $data00 $data01 $data02 $data03 $data04 $data05
-print $data10 $data11 $data12 $data13 $data14 $data15
-print $data20 $data21 $data22 $data23 $data24 $data25
-print $data30 $data31 $data32 $data33 $data34 $data35
-print $data40 $data41 $data42 $data43 $data44 $data45
-print $data50 $data51 $data52 $data53 $data54 $data55
-print $data60 $data61 $data62 $data63 $data64 $data65
-print $data70 $data71 $data72 $data73 $data74 $data75
-print $data80 $data81 $data82 $data83 $data84 $data85
-print $data90 $data91 $data92 $data93 $data94 $data95
-print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5] 
-print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5] 
-print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5] 
-print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5] 
-
-if $rows != 14 then 
-  print rows $rows != 14
-  return -1
-endi
-
-
-print =============== step 8 query records of ct4 from memory
-sql select * from ct4;
-print $data00 $data01 $data02 $data03 $data04 $data05
-print $data10 $data11 $data12 $data13 $data14 $data15
-print $data20 $data21 $data22 $data23 $data24 $data25
-print $data30 $data31 $data32 $data33 $data34 $data35
-print $data40 $data41 $data42 $data43 $data44 $data45
-
-
-if $rows != 5 then 
-  print rows $rows != 5
-  return -1
-endi
-
-
-#==================== reboot to trigger commit data to file
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/exec.sh -n dnode1 -s start
-
-
-print =============== step 9 query records of ct1 from file
-sql select * from ct1;
-print $data00 $data01 $data02 $data03 $data04 $data05
-print $data10 $data11 $data12 $data13 $data14 $data15
-print $data20 $data21 $data22 $data23 $data24 $data25
-print $data30 $data31 $data32 $data33 $data34 $data35
-print $data40 $data41 $data42 $data43 $data44 $data45
-print $data50 $data51 $data52 $data53 $data54 $data55
-
-if $rows != 6 then 
-  print rows $rows != 6
-  return -1
-endi
-
-
-print =============== step 10 query records of ct2 from file
-sql select * from ct2;
-print $data00 $data01 $data02 $data03 $data04 $data05
-
-if $rows != 1 then 
-  print rows $rows != 1
-  return -1
-endi
-
-
-print =============== step 11 query records of ct3 from file
-sql select * from ct3;
-print $data00 $data01 $data02 $data03 $data04 $data05
-print $data10 $data11 $data12 $data13 $data14 $data15
-print $data20 $data21 $data22 $data23 $data24 $data25
-print $data30 $data31 $data32 $data33 $data34 $data35
-print $data40 $data41 $data42 $data43 $data44 $data45
-print $data50 $data51 $data52 $data53 $data54 $data55
-print $data60 $data61 $data62 $data63 $data64 $data65
-print $data70 $data71 $data72 $data73 $data74 $data75
-print $data80 $data81 $data82 $data83 $data84 $data85
-print $data90 $data91 $data92 $data93 $data94 $data95
-print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5] 
-print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5] 
-print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5] 
-print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5] 
-
-
-print =============== step 12 query records of ct4 from file
-sql select * from ct4;
-print $data00 $data01 $data02 $data03 $data04 $data05
-print $data10 $data11 $data12 $data13 $data14 $data15
-print $data20 $data21 $data22 $data23 $data24 $data25
-print $data30 $data31 $data32 $data33 $data34 $data35
-print $data40 $data41 $data42 $data43 $data44 $data45
\ No newline at end of file

tests/script/tsim/insert/update1_sort_merge.sim

@@ -3,6 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
+print =============== test case: merge duplicated rows in taosc and taosd
 print =============== create database
 sql drop database if exists d0
 sql create database d0 keep 365000d,365000d,365000d