diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim index 1bd1419496aebd532682c5632e52776dca538566..ad5a3faed5d00941d56ed3fa18af5340a40240d3 100644 --- a/tests/script/general/import/replica1.sim +++ b/tests/script/general/import/replica1.sim @@ -123,7 +123,7 @@ sql insert into tb values(1520000025002, 25002) sql insert into tb values(1520000060000, 60000) sql select * from tb; print $rows -if $rows != 24 then +if $rows != 23 then return -1 endi @@ -156,7 +156,7 @@ sql import into tb values(1523110400000, 50001) sql import into tb values(1521382400000, 500051) sql select * from tb; print $rows -if $rows != 36 then +if $rows != 35 then return -1 endi @@ -169,7 +169,7 @@ sleep 5000 sql use ir1db sql select * from tb; print $rows -if $rows != 36 then +if $rows != 35 then return -1 endi @@ -178,7 +178,7 @@ print ================= step11 #sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003) sql import into tb values(1515680000000, 7003) (1515852800000, 7003) (1516025600000, 7003) (1516198400000, 7003) (1516371200000, 7003) sql select * from tb; -if $rows != 41 then +if $rows != 40 then return -1 endi @@ -188,7 +188,7 @@ print ================= step12 sql import into tb values(1518358400000, 7003) (1518444800000, 7003) (1518531200000, 7003) (1518617600000, 7003) (1518704000000, 7003) (1518790400000, 7003) (1518876800000, 7003) (1518963200000, 7003) (1519049600000, 7003) sql select * from tb; print $rows -if $rows != 50 then +if $rows != 49 then return -1 endi @@ -204,7 +204,7 @@ sql import into tb values(1516716800000, 50001) sql import into tb values(1517580800000, 50001) sql select * from tb; -if $rows != 50 then +if $rows != 52 then return -1 endi diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 68ce299a3eefb7804213d4bd97dae3d373cee149..ea2c538ddf9c502307dcc4f8b8cf5731f7f701b7 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -32,7 +32,7 @@ cd ../../../debug; make ./test.sh -f general/compute/diff.sim ./test.sh -f general/compute/diff2.sim ./test.sh -f general/compute/first.sim -# liao ./test.sh -f general/compute/interval.sim +./test.sh -f general/compute/interval.sim ./test.sh -f general/compute/last.sim ./test.sh -f general/compute/leastsquare.sim ./test.sh -f general/compute/max.sim @@ -53,7 +53,7 @@ cd ../../../debug; make ./test.sh -f general/db/delete_reuse1.sim ./test.sh -f general/db/delete_reuse2.sim ./test.sh -f general/db/delete_reusevnode.sim -#hongze ./test.sh -f general/db/delete_reusevnode2.sim +./test.sh -f general/db/delete_reusevnode2.sim ./test.sh -f general/db/delete_writing1.sim ./test.sh -f general/db/delete_writing2.sim ./test.sh -f general/db/delete.sim @@ -103,9 +103,9 @@ cd ../../../debug; make #unsupport ./test.sh -f general/parser/alter_stable.sim ./test.sh -f general/parser/auto_create_tb.sim ./test.sh -f general/parser/auto_create_tb_drop_tb.sim -./test.sh -f general/parser/col_arithmetic_operation.sim +#liao ./test.sh -f general/parser/col_arithmetic_operation.sim ./test.sh -f general/parser/columnValue.sim -./test.sh -f general/parser/commit.sim +#liao ./test.sh -f general/parser/commit.sim # ./test.sh -f general/parser/create_db.sim # ./test.sh -f general/parser/create_mt.sim # ./test.sh -f general/parser/create_tb.sim @@ -130,7 +130,7 @@ cd ../../../debug; make # ./test.sh -f general/parser/limit1_tblocks100.sim # ./test.sh -f general/parser/limit2.sim # ./test.sh -f general/parser/mixed_blocks.sim -# ./test.sh -f general/parser/selectResNum.sim +./test.sh -f general/parser/selectResNum.sim # ./test.sh -f general/parser/select_across_vnodes.sim # ./test.sh -f general/parser/set_tag_vals.sim # ./test.sh -f general/parser/slimit.sim @@ -171,7 +171,7 @@ cd ../../../debug; make ./test.sh -f general/table/db.table.sim ./test.sh -f general/table/delete_reuse1.sim ./test.sh -f general/table/delete_reuse2.sim -#hongze ./test.sh -f general/table/delete_writing.sim +#liao ./test.sh -f general/table/delete_writing.sim ./test.sh -f general/table/describe.sim ./test.sh -f general/table/double.sim ./test.sh -f general/table/fill.sim @@ -253,12 +253,12 @@ cd ../../../debug; make ./test.sh -u -f unique/column/replica3.sim -#liao wait ./test.sh -u -f unique/db/commit.sim +./test.sh -u -f unique/db/commit.sim ./test.sh -u -f unique/db/delete.sim ./test.sh -u -f unique/db/delete_part.sim ./test.sh -u -f unique/db/replica_add12.sim ./test.sh -u -f unique/db/replica_add13.sim -#hongze wait ./test.sh -u -f unique/db/replica_add23.sim +./test.sh -u -f unique/db/replica_add23.sim ./test.sh -u -f unique/db/replica_reduce21.sim ./test.sh -u -f unique/db/replica_reduce32.sim ./test.sh -u -f unique/db/replica_reduce31.sim @@ -269,7 +269,7 @@ cd ../../../debug; make ./test.sh -u -f unique/dnode/balance3.sim ./test.sh -u -f unique/dnode/balancex.sim ./test.sh -u -f unique/dnode/offline1.sim -#hongze wait ./test.sh -u -f unique/dnode/offline2.sim +#jeff ./test.sh -u -f unique/dnode/offline2.sim ./test.sh -u -f unique/dnode/remove1.sim #hongze ./test.sh -u -f unique/dnode/remove2.sim ./test.sh -u -f unique/dnode/vnode_clean.sim diff --git a/tests/script/unique/db/replica_add23.sim b/tests/script/unique/db/replica_add23.sim index 995cd4116c307b5c0fe9cb37f7993d724da3cd70..2d293183af197379f2a541fc0a2662dc26c8d1cb 100644 --- a/tests/script/unique/db/replica_add23.sim +++ b/tests/script/unique/db/replica_add23.sim @@ -47,10 +47,10 @@ sql create table d2.t2 (ts timestamp, i int) sql create table d3.t3 (ts timestamp, i int) sql create table d4.t4 (ts timestamp, i int) -sql insert into d1.t1 values(now, 1) -sql insert into d2.t2 values(now, 1) -sql insert into d3.t3 values(now, 1) -sql insert into d4.t4 values(now, 1) +sql insert into d1.t1 values(1588262400001, 1) +sql insert into d2.t2 values(1588262400001, 1) +sql insert into d3.t3 values(1588262400001, 1) +sql insert into d4.t4 values(1588262400001, 1) sql select * from d1.t1 if $rows != 1 then @@ -111,10 +111,10 @@ if $data2_3 != 4 then endi print ======== step4 -sql insert into d1.t1 values(now, 2) -sql insert into d2.t2 values(now, 2) -sql insert into d3.t3 values(now, 2) -sql insert into d4.t4 values(now, 2) +sql insert into d1.t1 values(1588262400002, 2) +sql insert into d2.t2 values(1588262400002, 2) +sql insert into d3.t3 values(1588262400002, 2) +sql insert into d4.t4 values(1588262400002, 2) sql select * from d1.t1 if $rows != 2 then @@ -143,10 +143,10 @@ print ========= step5 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 5000 -sql insert into d1.t1 values(now, 3) -sql insert into d2.t2 values(now, 3) -sql insert into d3.t3 values(now, 3) -sql insert into d4.t4 values(now, 3) +sql insert into d1.t1 values(1588262400003, 3) +sql insert into d2.t2 values(1588262400003, 3) +sql insert into d3.t3 values(1588262400003, 3) +sql insert into d4.t4 values(1588262400003, 3) sql select * from d1.t1 if $rows != 3 then @@ -174,10 +174,10 @@ sleep 5000 system sh/exec_up.sh -n dnode3 -s stop -x SIGINT sleep 5000 -sql insert into d1.t1 values(now, 4) -sql insert into d2.t2 values(now, 4) -sql insert into d3.t3 values(now, 4) -sql insert into d4.t4 values(now, 4) +sql insert into d1.t1 values(1588262400004, 4) +sql insert into d2.t2 values(1588262400004, 4) +sql insert into d3.t3 values(1588262400004, 4) +sql insert into d4.t4 values(1588262400004, 4) sql select * from d1.t1 if $rows != 4 then @@ -205,10 +205,10 @@ sleep 5000 system sh/exec_up.sh -n dnode4 -s stop -x SIGINT sleep 5000 -sql insert into d1.t1 values(now, 5) -sql insert into d2.t2 values(now, 5) -sql insert into d3.t3 values(now, 5) -sql insert into d4.t4 values(now, 5) +sql insert into d1.t1 values(1588262400005, 5) +sql insert into d2.t2 values(1588262400005, 5) +sql insert into d3.t3 values(1588262400005, 5) +sql insert into d4.t4 values(1588262400005, 5) sql select * from d1.t1 if $rows != 5 then @@ -236,10 +236,10 @@ sleep 5000 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 5000 -sql insert into d1.t1 values(now, 6) -sql insert into d2.t2 values(now, 6) -sql insert into d3.t3 values(now, 6) -sql insert into d4.t4 values(now, 6) +sql insert into d1.t1 values(1588262400006, 6) +sql insert into d2.t2 values(1588262400006, 6) +sql insert into d3.t3 values(1588262400006, 6) +sql insert into d4.t4 values(1588262400006, 6) sql select * from d1.t1 if $rows != 6 then diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim index c526e45b6e44e3a7fc387e0b2430a52e85806829..9d8ba8bf9d15442a271f9d2755fce6f3f28a274e 100644 --- a/tests/script/unique/dnode/offline2.sim +++ b/tests/script/unique/dnode/offline2.sim @@ -29,7 +29,7 @@ sleep 3000 sql create database d1 replica 2 maxTables 4 sql create table d1.t1(ts timestamp, i int) -sql insert into d1.t1 values(now, 1) +sql insert into d1.t1 values(1588262400001, 1) sql show dnodes print dnode1 $data4_1 diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim index 77ec1fa630d409b391f72b7733959c1eee29059d..73e7a31250f2b7ab09d38013cb0e09839c27cc19 100644 --- a/tests/script/unique/dnode/remove2.sim +++ b/tests/script/unique/dnode/remove2.sim @@ -22,19 +22,19 @@ sql connect sql create database d1 maxTables 4 sql create table d1.t1 (t timestamp, i int) -sql insert into d1.t1 values(now+1s, 15) -sql insert into d1.t1 values(now+2s, 14) -sql insert into d1.t1 values(now+3s, 13) -sql insert into d1.t1 values(now+4s, 12) -sql insert into d1.t1 values(now+5s, 11) +sql insert into d1.t1 values(1588262400001, 15) +sql insert into d1.t1 values(1588262400002, 14) +sql insert into d1.t1 values(1588262400003, 13) +sql insert into d1.t1 values(1588262400004, 12) +sql insert into d1.t1 values(1588262400005, 11) sql create database d2 maxTables 4 sql create table d2.t2 (t timestamp, i int) -sql insert into d2.t2 values(now+1s, 25) -sql insert into d2.t2 values(now+2s, 24) -sql insert into d2.t2 values(now+3s, 23) -sql insert into d2.t2 values(now+4s, 22) -sql insert into d2.t2 values(now+5s, 21) +sql insert into d2.t2 values(1588262400001, 25) +sql insert into d2.t2 values(1588262400002, 24) +sql insert into d2.t2 values(1588262400003, 23) +sql insert into d2.t2 values(1588262400004, 22) +sql insert into d2.t2 values(1588262400005, 21) sql show dnodes print dnode1 openVnodes $data2_1 @@ -49,11 +49,11 @@ sleep 9000 sql create database d3 replica 2 maxTables 4 sql create table d3.t3 (t timestamp, i int) -sql insert into d3.t3 values(now+1s, 35) -sql insert into d3.t3 values(now+2s, 34) -sql insert into d3.t3 values(now+3s, 33) -sql insert into d3.t3 values(now+4s, 32) -sql insert into d3.t3 values(now+5s, 31) +sql insert into d3.t3 values(1588262400001, 35) +sql insert into d3.t3 values(1588262400002, 34) +sql insert into d3.t3 values(1588262400003, 33) +sql insert into d3.t3 values(1588262400004, 32) +sql insert into d3.t3 values(1588262400005, 31) $x = 0 show2: