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

Merge branch '3.0' into feature/compressData

This commit is contained in:
yihaoDeng 2024-03-30 11:06:09 +00:00
parent d20da622a7
commit bda7014b1c
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/common/src/tcol.c
View File

@ -325,6 +325,7 @@ int8_t setColCompressByOption(uint8_t type, uint8_t encode, uint16_t compressTyp
bool useCompress(uint8_t tableType) { return TSDB_SUPER_TABLE == tableType || TSDB_NORMAL_TABLE == tableType; } bool useCompress(uint8_t tableType) { return TSDB_SUPER_TABLE == tableType || TSDB_NORMAL_TABLE == tableType; }
int8_t validColCompressLevel(uint8_t type, uint8_t level) { int8_t validColCompressLevel(uint8_t type, uint8_t level) {
if (level == TSDB_COLVAL_LEVEL_DISABLED) return 1;
if (level < TSDB_COLVAL_LEVEL_NOCHANGE || level > TSDB_COLVAL_LEVEL_HIGH) { if (level < TSDB_COLVAL_LEVEL_NOCHANGE || level > TSDB_COLVAL_LEVEL_HIGH) {
return 0; return 0;
} }

39
tests/script/tsim/compress/compress2.sim
View File

@ -10,6 +10,8 @@ $tbPrefix = tb
$db = $dbPrefix . $i $db = $dbPrefix . $i
$tb = $tbPrefix . $i $tb = $tbPrefix . $i
$stb = teststb
$N = 2000 $N = 2000
print =============== step1 print =============== step1
@ -23,6 +25,8 @@ sql desc $tb
sql alter table $tb drop column f sql alter table $tb drop column f
sql desc $tb sql desc $tb
# normal table
sql_error alter table $tb modify column b level 'i' sql_error alter table $tb modify column b level 'i'
sql alter table $tb modify column b level 'l' sql alter table $tb modify column b level 'l'
sql_error alter table $tb modify column b level 'l' # already exist sql_error alter table $tb modify column b level 'l' # already exist
@ -127,4 +131,39 @@ if $rows != $N then
return -1 return -1
endi endi
# super table
sql create table $stb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, str binary(256), f float, d double) tags(t1 int, t2 int)
sql desc $stb
sql_error alter table $stb modify column b level 'i'
sql alter table $stb modify column b level 'l'
sql_error alter table $stb modify column b level 'l' # already exist
sql alter table $stb modify column b level 'm'
sql_error alter table $stb modify column b level 'l' # already exist
sql desc $stb
sql_error alter table $stb modify column b compress 'lz4'
sql alter table $stb modify column b compress 'xz'
sql alter table $stb modify column b compress 'zstd'
sql_error alter table $stb modify column b compress 'tsz'
sql alter table $stb modify column b compress 'zlib'
sql desc $stb
sql_error alter table $stb modify column f compress 'lz4'
sql alter table $stb modify column f compress 'disabled'
sql desc $stb
sql alter table $stb modify column f compress 'tsz'
sql desc $stb
sql alter table $stb modify column f compress 'zlib'
sql desc $stb
sql alter table $stb modify column f compress 'zstd'
sql_error alter table $stb modify column d compress 'lz4' # same with init
sql alter table $stb modify column d compress 'disabled'
sql desc $stb
sql alter table $stb modify column d compress 'tsz'
sql desc $stb
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT