Merge branch '3.0' into fix/TD-18617
This commit is contained in:
parent
6b9ace9c35
commit
7f3146203b
|
@ -130,4 +130,4 @@ endi
|
|||
# return -1
|
||||
#endi
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
@ -101,4 +101,4 @@ sql_error insert into tb values(now, '\');
|
|||
#sql_error insert into tb values(now, '\\\n');
|
||||
sql insert into tb values(now, '\n');
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
@ -132,4 +132,4 @@ sql_error select max(c1-c2) from $tb
|
|||
print =====================> td-1764
|
||||
sql select sum(c1)/count(*), sum(c1) as b, count(*) as b from $stb interval(1y)
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
@ -129,4 +129,4 @@ if $rows != 1 then
|
|||
return -1
|
||||
endi
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
@ -279,7 +279,7 @@ endi
|
|||
#endi
|
||||
|
||||
## linear fill
|
||||
sql select _wstart, max(c1), min(c2), avg(c3), sum(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(linear)
|
||||
sql select _wstart, max(c1), min(c2), avg(c3), sum(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(linear)
|
||||
$val = $rowNum * 2
|
||||
$val = $val - 1
|
||||
$val = $val * $tbNum
|
||||
|
|
|
@ -69,4 +69,4 @@ endi
|
|||
|
||||
system rm -f $inFileName
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
@ -6,4 +6,4 @@ while $i <= $loops
|
|||
$i = $i + 1
|
||||
endw
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
@ -60,4 +60,4 @@ if $data12 != 1 then
|
|||
return -1
|
||||
endi
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
@ -33,4 +33,4 @@ print ================== server restart completed
|
|||
|
||||
run tsim/parser/single_row_in_tb_query.sim
|
||||
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
system sh/exec.sh -n dnode1 -s stop -x SIGINT
|
||||
|
|
|
@ -195,4 +195,4 @@ endi
|
|||
|
||||
print ===============>safty check TD-4927
|
||||
sql select first(ts, c1) from sr_stb where ts<1 group by t1;
|
||||
sql select first(ts, c1) from sr_stb where ts>0 and ts<1;
|
||||
sql select first(ts, c1) from sr_stb where ts>0 and ts<1;
|
||||
|
|
Loading…
Reference in New Issue