Merge branch '3.0' into feature/compressData

tests/parallel_test/cases.task

@@ -1338,6 +1338,7 @@
 ,,y,script,./test.sh -f tsim/compress/commitlog.sim
 ,,y,script,./test.sh -f tsim/compress/compress2.sim
 ,,y,script,./test.sh -f tsim/compress/compress.sim
+,,y,script,./test.sh -f tsim/compress/compress_col.sim
 ,,y,script,./test.sh -f tsim/compress/uncompress.sim
 ,,y,script,./test.sh -f tsim/compute/avg.sim
 ,,y,script,./test.sh -f tsim/compute/block_dist.sim

tests/script/tsim/compress/compress2.sim

@@ -27,6 +27,10 @@ sql desc $tb
 
 
 # normal table
+
+sql_err create table txx (ts timestamp compress 'xxx', f int)
+sql create table txx (ts timestamp compress 'disabled', f int)
+
 sql_error alter table $tb modify column b level 'i'
 sql alter table $tb modify column b level 'l'
 sql_error alter table $tb modify column b level 'l' # already exist 
@@ -166,4 +170,5 @@ sql alter table $stb modify column d compress 'tsz'
 sql desc $stb
 
 
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compress/compress_col.sim

@@ -10,104 +10,15 @@ $tbPrefix = tb
 $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 
-$N = 2000
-
-print =============== step1
-
 sql create database $db
 sql use $db
-sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, str binary(256))
+sql_error create table txx (ts timestamp compress 'xxx', f int)
-
+sql_error create table txx (ts timestamp compress 'disabled' level 'xxx', f int)
-$count = 0
+sql_error create table txx (ts timestamp compress 'disabled' level 'h', f int compress 'tsz')
-while $count < $N
+sql_error create table txx (ts timestamp compress 'disabled' level 'h', f int compress 'tsz')
-   $ms = 1591200000000 + $count
+sql create table txx1 (ts timestamp compress 'disabled' level 'h', f int compress 'lz4')
-   sql insert into $tb values(  $ms , 1, 0, $count , $count , $count ,'it is a string')
+sql create table txx2 (ts timestamp compress 'disabled' level 'h', f int compress 'zlib')
-   $count = $count + 1
+sql create table txx3 (ts timestamp compress 'disabled' level 'h', f int compress 'xz')
-endw
+sql create table txx4 (ts timestamp compress 'disabled' level 'h', f int compress 'zstd')
-
-sql select * from $tb
-if $rows != $N then
-  return -1
-endi
-
-print =============== step2
-$i = 1
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-
-sql create database $db
-sql use $db
-
-sql create table $tb (ts timestamp, f float, d double, str binary(256))
-
-$count = 0
-while $count < $N
-   $ms = 1591286400000 + $count
-   sql insert into $tb values( $ms , $count , $count ,'it is a string')
-   $count = $count + 1
-endw
-
-sql select * from $tb
-if $rows != $N then
-  return -1
-endi
-
-print =============== step3
-$i = 2
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-
-sql create database $db
-sql use $db
-
-sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, f float, d double, str binary(256))
-
-$count = 0
-while $count < $N
-   $ms = 1591372800000 + $count
-   sql insert into $tb values( $ms , 1 , 0 , $count , $count , $count , $count , $count ,'it is a string')
-   $count = $count + 1
-endw
-
-sql select * from $tb
-if $rows != $N then
-  return -1
-endi
-
-print =============== step4
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/exec.sh -n dnode1 -s start
-
-print =============== step5
-
-$i = 0
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-sql use $db
-sql select * from $tb
-print select * from $tb ==> $rows points
-if $rows != $N then
-  return -1
-endi
-
-$i = 1
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-sql use $db
-sql select * from $tb
-print select * from $tb ==> $rows points
-if $rows != $N then
-  return -1
-endi
-
-$i = 2
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-sql use $db
-sql select * from $tb
-print select * from $tb ==> $rows points
-if $rows != $N then
-  return -1
-endi
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT