xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'enh/rocksRevert' of https://github.com/taosdata/TDengine into enh/rocksRevert

This commit is contained in:
yihaoDeng 2023-04-20 01:56:00 +00:00
parent 98bc1b6101 eaca23c41b
commit b6108921ec
7 changed files with 196 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/parallel_test/run.sh
View File

@ -303,7 +303,7 @@ function run_thread() {
if [ ! -z "$corefile" ]; then
echo -e "\e[34m corefiles: $corefile \e[0m"
local build_dir=$log_dir/build_${hosts[index]}
local remote_build_dir="${workdirs[index]}/{DEBUGPATH}/build"
local remote_build_dir="${workdirs[index]}/${DEBUGPATH}/build"
# if [ $ent -ne 0 ]; then
# remote_build_dir="${workdirs[index]}/{DEBUGPATH}/build"
# fi

30
tests/script/tsim/stream/deleteInterval.sim
View File

@ -29,7 +29,7 @@ sleep 1000
sql select * from streamt order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -47,7 +47,7 @@ sleep 1000
sql select * from streamt order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -76,7 +76,7 @@ sleep 1000
sql select * from streamt order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -102,7 +102,7 @@ sleep 1000
sql select * from streamt order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -122,7 +122,7 @@ sleep 1000
sql select * from streamt order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -160,7 +160,7 @@ sleep 1000
sql select * from streamt order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -205,7 +205,7 @@ sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -226,7 +226,7 @@ sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -260,7 +260,7 @@ sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -295,7 +295,7 @@ sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -334,7 +334,7 @@ sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -384,7 +384,7 @@ sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -433,7 +433,7 @@ sleep 1000
sql select * from test.streamt3 order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -451,7 +451,7 @@ sleep 1000
sql select * from test.streamt3 order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi
@ -469,7 +469,7 @@ sleep 1000
sql select * from test.streamt3 order by c1, c2, c3;
$loop_count = $loop_count + 1
if $loop_count == 10 then
if $loop_count == 30 then
return -1
endi

12
tests/script/tsim/stream/fillHistoryBasic3.sim
View File

@ -4,7 +4,7 @@ looptest:
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/exec.sh -n dnode1 -s start
sleep 50
sleep 1000
sql connect
sql create database test vgroups 1;
@ -24,7 +24,7 @@ sleep 3000
$loop_count = 0
loop7:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -48,7 +48,7 @@ sql insert into t2 values(1648791213000,1,2,3,1.0);
$loop_count = 0
loop8:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -72,7 +72,7 @@ sql insert into t2 values(1648791213000,2,2,3,1.0);
$loop_count = 0
loop9:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -102,7 +102,7 @@ sql insert into t2 values(1648791213002,1,2,3,1.0);
$loop_count = 0
loop10:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -144,7 +144,7 @@ sql insert into t2 values(1648791213001,1,2,3,1.0) (1648791223001,2,2,3,1.0) (16
$loop_count = 0
loop11:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1

28
tests/script/tsim/stream/partitionbyColumnInterval.sim
View File

@ -4,7 +4,7 @@ looptest:
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/exec.sh -n dnode1 -s start
sleep 50
sleep 1000
sql connect
sql drop stream if exists streams0;
@ -24,7 +24,7 @@ sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL);
$loop_count = 0
loop0:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -48,7 +48,7 @@ sql insert into t1 values(1648791213000,1,2,3,1.0);
$loop_count = 0
loop1:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -71,7 +71,7 @@ sql insert into t1 values(1648791213000,2,2,3,1.0);
$loop_count = 0
loop2:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -97,7 +97,7 @@ sql insert into t1 values(1648791213002,1,2,3,1.0);
$loop_count = 0
loop3:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -134,7 +134,7 @@ sql insert into t1 values(1648791213001,1,2,3,1.0) (1648791223001,2,2,3,1.0) (16
$loop_count = 0
loop4:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -208,7 +208,7 @@ sql insert into t1 values(1648791213001,1,2,3,2.0);
$loop_count = 0
loop5:
sleep 50
sleep 1000
sql select * from streamt1 order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -229,7 +229,7 @@ sql insert into t1 values(1648791213001,1,1,6,2.0) (1648791223002,1,1,7,2.0);
$loop_count = 0
loop6:
sleep 50
sleep 1000
sql select * from streamt1 order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -294,7 +294,7 @@ sql insert into t2 values(1648791213000,NULL,NULL,NULL,NULL);
$loop_count = 0
loop7:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -318,7 +318,7 @@ sql insert into t2 values(1648791213000,1,2,3,1.0);
$loop_count = 0
loop8:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -342,7 +342,7 @@ sql insert into t2 values(1648791213000,2,2,3,1.0);
$loop_count = 0
loop9:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -590,7 +590,7 @@ sql delete from st where ts = 1648791223000;
$loop_count = 0
loop15:
sleep 50
sleep 1000
sql select * from test.streamt5 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -615,7 +615,7 @@ sql delete from st where ts = 1648791223001;
$loop_count = 0
loop16:
sleep 50
sleep 1000
sql select * from test.streamt5 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -640,7 +640,7 @@ sql delete from st where ts = 1648791223001;
$loop_count = 0
loop17:
sleep 50
sleep 1000
sql select * from test.streamt5 order by c1, c2, c3;
$loop_count = $loop_count + 1

30
tests/script/tsim/stream/partitionbyColumnSession.sim
View File

@ -4,7 +4,7 @@ looptest:
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/exec.sh -n dnode1 -s start
sleep 50
sleep 1000
sql connect
sql drop stream if exists streams0;
@ -24,7 +24,7 @@ sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL);
$loop_count = 0
loop0:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -48,7 +48,7 @@ sql insert into t1 values(1648791213000,1,2,3,1.0);
$loop_count = 0
loop1:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -71,7 +71,7 @@ sql insert into t1 values(1648791213000,2,2,3,1.0);
$loop_count = 0
loop2:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -97,7 +97,7 @@ sql insert into t1 values(1648791213002,1,2,3,1.0);
$loop_count = 0
loop3:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -134,7 +134,7 @@ sql insert into t1 values(1648791213001,1,2,3,1.0) (1648791223001,2,2,3,1.0) (16
$loop_count = 0
loop4:
sleep 50
sleep 1000
sql select * from streamt order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -207,7 +207,7 @@ sql insert into t1 values(1648791213001,1,2,3,2.0);
$loop_count = 0
loop5:
sleep 50
sleep 1000
sql select * from streamt1 order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -228,7 +228,7 @@ sql insert into t1 values(1648791213001,1,1,6,2.0) (1648791223002,1,1,7,2.0);
$loop_count = 0
loop6:
sleep 50
sleep 1000
sql select * from streamt1 order by c1, c4, c2, c3;
$loop_count = $loop_count + 1
@ -292,7 +292,7 @@ sql insert into t2 values(1648791213000,NULL,NULL,NULL,NULL);
$loop_count = 0
loop7:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -316,7 +316,7 @@ sql insert into t2 values(1648791213000,1,2,3,1.0);
$loop_count = 0
loop8:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -340,7 +340,7 @@ sql insert into t2 values(1648791213000,2,2,3,1.0);
$loop_count = 0
loop9:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -370,7 +370,7 @@ sql insert into t2 values(1648791213002,1,2,3,1.0);
$loop_count = 0
loop10:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -412,7 +412,7 @@ sql insert into t2 values(1648791213001,1,2,3,1.0) (1648791223001,2,2,3,1.0) (16
$loop_count = 0
loop11:
sleep 50
sleep 1000
sql select * from test.streamt2 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -489,7 +489,7 @@ sql insert into t4 values(1648791213000,1,2,3,1.0);
$loop_count = 0
loop13:
sleep 50
sleep 1000
sql select * from test.streamt4 order by c1, c2, c3;
$loop_count = $loop_count + 1
@ -531,7 +531,7 @@ sql insert into t1 values(1648791213000,1,2,3,1.0);
$loop_count = 0
loop14:
sleep 50
sleep 1000
sql select * from test.streamt4 order by c1, c2, c3;
$loop_count = $loop_count + 1

94
tests/script/tsim/stream/session1.sim
View File

@ -22,77 +22,95 @@ sql insert into t1 values(1648791210000,1,1,1,1.1,1);
sql insert into t1 values(1648791220000,2,2,2,2.1,2);
sql insert into t1 values(1648791230000,3,3,3,3.1,3);
sql insert into t1 values(1648791240000,4,4,4,4.1,4);
$loop_count = 0
loop0:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 10 then
return -1
endi
sql select * from streamt order by s desc;
# row 0
if $data01 != 4 then
print ======$data01
return -1
goto loop0
endi
if $data02 != 10 then
print ======$data02
return -1
goto loop0
endi
if $data03 != 1 then
print ======$data03
return -1
goto loop0
endi
if $data04 != 4 then
print ======$data04
return -1
goto loop0
endi
sql insert into t1 values(1648791250005,5,5,5,5.1,5);
sql insert into t1 values(1648791260006,6,6,6,6.1,6);
sql insert into t1 values(1648791270007,7,7,7,7.1,7);
sql insert into t1 values(1648791240005,5,5,5,5.1,8) (1648791250006,6,6,6,6.1,9);
$loop_count = 0
loop1:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 10 then
return -1
endi
sql select * from streamt order by s desc;
# row 0
if $data01 != 8 then
print ======$data01
return -1
goto loop1
endi
if $data02 != 32 then
print ======$data02
return -1
goto loop1
endi
if $data03 != 1 then
print ======$data03
return -1
goto loop1
endi
if $data04 != 9 then
print ======$data04
return -1
goto loop1
endi
# row 1
if $data11 != 1 then
print ======$data11
return -1
goto loop1
endi
if $data12 != 7 then
print ======$data12
return -1
goto loop1
endi
if $data13 != 7 then
print ======$data13
return -1
goto loop1
endi
if $data14 != 7 then
print ======$data14
return -1
goto loop1
endi
sql insert into t1 values(1648791280008,7,7,7,7.1,10) (1648791300009,8,8,8,8.1,11);
@ -100,101 +118,119 @@ sql insert into t1 values(1648791260007,7,7,7,7.1,12) (1648791290008,7,7,7,7.1,1
sql insert into t1 values(1648791500000,7,7,7,7.1,15) (1648791520000,8,8,8,8.1,16) (1648791540000,8,8,8,8.1,17);
sql insert into t1 values(1648791530000,8,8,8,8.1,18);
sql insert into t1 values(1648791220000,10,10,10,10.1,19) (1648791290008,2,2,2,2.1,20) (1648791540000,17,17,17,17.1,21) (1648791500001,22,22,22,22.1,22);
$loop_count = 0
loop2:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 10 then
return -1
endi
sql select * from streamt order by s desc;
# row 0
if $data01 != 2 then
print ======$data01
return -1
goto loop2
endi
if $data02 != 29 then
print ======$data02
return -1
goto loop2
endi
if $data03 != 7 then
print ======$data03
return -1
goto loop2
endi
if $data04 != 22 then
print ======$data04
return -1
goto loop2
endi
# row 1
if $data11 != 3 then
print ======$data11
return -1
goto loop2
endi
if $data12 != 33 then
print ======$data12
return -1
goto loop2
endi
if $data13 != 8 then
print ======$data13
return -1
goto loop2
endi
if $data14 != 21 then
print ======$data14
return -1
goto loop2
endi
# row 2
if $data21 != 4 then
print ======$data21
return -1
goto loop2
endi
if $data22 != 25 then
print ======$data22
return -1
goto loop2
endi
if $data23 != 2 then
print ======$data23
return -1
goto loop2
endi
if $data24 != 20 then
print ======$data24
return -1
goto loop2
endi
# row 3
if $data31 != 10 then
print ======$data31
return -1
goto loop2
endi
if $data32 != 54 then
print ======$data32
return -1
goto loop2
endi
if $data33 != 1 then
print ======$data33
return -1
goto loop2
endi
if $data34 != 19 then
print ======$data34
return -1
goto loop2
endi
sql insert into t1 values(1648791000000,1,1,1,1.1,23);
$loop_count = 0
loop3:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 10 then
return -1
endi
sql select * from streamt order by s desc;
# row 0
if $data01 != 1 then
print ======$data01
return -1
goto loop3
endi
sql create database test1 vgroups 1;

104
tests/script/tsim/stream/triggerSession0.sim
View File

@ -22,79 +22,135 @@ sql insert into t2 values(1648791222999,1,2,3,1.0);
sql insert into t2 values(1648791223000,1,2,3,1.0);
sql insert into t2 values(1648791223001,1,2,3,1.0);
sql insert into t2 values(1648791233001,1,2,3,1.0);
sleep 2000
sql select * from streamt2;
if $rows != 0 then
print ======$rows
$loop_count = 0
loop0:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 20 then
return -1
endi
sql insert into t2 values(1648791243002,1,2,3,1.0);
sleep 2000
sql select * from streamt2;
if $rows != 0 then
print ======$rows
goto loop0
endi
sql insert into t2 values(1648791243002,1,2,3,1.0);
loop1:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 20 then
return -1
endi
sql select * from streamt2;
if $rows != 1 then
print ======$rows
return -1
goto loop1
endi
if $data01 != 5 then
print ======$data01
return -1
goto loop1
endi
sql insert into t2 values(1648791223001,1,2,3,1.0) (1648791223002,1,2,3,1.0) (1648791222999,1,2,3,1.0);
sleep 2000
loop2:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 20 then
return -1
endi
sql select * from streamt2;
if $rows != 1 then
print ======$rows
return -1
goto loop2
endi
if $data01 != 6 then
print ======$data01
return -1
goto loop2
endi
sql insert into t2 values(1648791233002,1,2,3,1.0);
sleep 2000
sql select * from streamt2;
if $rows != 0 then
print ======$rows
loop3:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 20 then
return -1
endi
sql insert into t2 values(1648791253003,1,2,3,1.0);
sleep 2000
sql select * from streamt2;
if $rows != 0 then
print ======$rows
goto loop3
endi
sql insert into t2 values(1648791253003,1,2,3,1.0);
loop4:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 20 then
return -1
endi
sql select * from streamt2;
if $rows != 1 then
print ======$rows
return -1
goto loop4
endi
if $data01 != 8 then
print ======$data01
return -1
goto loop4
endi
sql insert into t2 values(1648791243003,1,2,3,1.0) (1648791243002,1,2,3,1.0) (1648791270004,1,2,3,1.0) (1648791280005,1,2,3,1.0) (1648791290006,1,2,3,1.0);
sleep 2000
loop5:
sleep 1000
$loop_count = $loop_count + 1
if $loop_count == 20 then
return -1
endi
sql select * from streamt2;
if $rows != 3 then
print =====rows=$rows
return -1
goto loop5
endi
if $data01 != 10 then
print ======$data01
return -1
goto loop5
endi
if $data11 != 1 then
print ======$data11
return -1
goto loop5
endi
if $data21 != 1 then
print ======$data21
return -1
goto loop5
endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT