From 1051277addd10e509136df883348fba600011b5c Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Fri, 27 May 2022 21:02:01 +0800 Subject: [PATCH] fix: rsma cases refactor --- .../script/tsim/sma/rsmaCreateInsertQuery.sim | 42 +++++++++++++------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/tests/script/tsim/sma/rsmaCreateInsertQuery.sim b/tests/script/tsim/sma/rsmaCreateInsertQuery.sim index 3c62fd9e53..5d9425e506 100644 --- a/tests/script/tsim/sma/rsmaCreateInsertQuery.sim +++ b/tests/script/tsim/sma/rsmaCreateInsertQuery.sim @@ -37,10 +37,15 @@ if $rows > 2 then print retention level 2 file rows $rows > 2 return -1 endi -if $data01 != 1 && $data01 != 10 then - print retention level 2 file result $data01 != 1 or 10 + + +if $data01 != 1 then + if $data01 != 10 then + print retention level 2 file result $data01 != 1 or 10 return -1 + endi endi + print =============== select * from retention level 1 from memory sql select * from ct1 where ts > now-8d; print $data00 $data01 @@ -48,23 +53,30 @@ if $rows > 2 then print retention level 1 file rows $rows > 2 return -1 endi -if $data01 != 1 && $data01 != 10 then - print retention level 1 file result $data01 != 1 or 10 + +if $data01 != 1 then + if $data01 != 10 then + print retention level 1 file result $data01 != 1 or 10 return -1 + endi endi + print =============== select * from retention level 0 from memory sql select * from ct1 where ts > now-3d; print $data00 $data01 print $data10 $data11 print $data20 $data21 + if $rows < 1 then print retention level 0 file rows $rows < 1 return -1 endi -if $data01 != 1 && $data01 != 10 then + +if $data01 != 10 then print retention level 0 file result $data01 != 10 return -1 endi + #=================================================================== @@ -79,11 +91,13 @@ if $rows > 2 then print retention level 2 file rows $rows > 2 return -1 endi -if $data01 != 1 && $data01 != 10 then - print retention level 2 file result $data01 != 1 or 10 - return -1 -endi +if $data01 != 1 then + if $data01 != 10 then + print retention level 2 file result $data01 != 1 or 10 + return -1 + endi +endi print =============== select * from retention level 1 from file sql select * from ct1 where ts > now-8d; @@ -92,9 +106,12 @@ if $rows > 2 then print retention level 1 file rows $rows > 2 return -1 endi -if $data01 != 1 && $data01 != 10 then - print retention level 1 file result $data01 != 1 or 10 + +if $data01 != 1 then + if $data01 != 10 then + print retention level 1 file result $data01 != 1 or 10 return -1 + endi endi print =============== select * from retention level 0 from file @@ -106,7 +123,8 @@ if $rows < 1 then print retention level 0 file rows $rows < 1 return -1 endi -if $data01 != 1 && $data01 != 10 then + +if $data01 != 10 then print retention level 0 file result $data01 != 10 return -1 endi