From ddf37b10a030a7cae595c1713358b0fd6ecc363c Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sat, 30 Mar 2024 10:37:33 +0000
Subject: [PATCH] Merge branch '3.0' into feature/compressData

---
 source/common/src/tcol.c                 |  7 +++++++
 tests/script/tsim/compress/compress2.sim | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/source/common/src/tcol.c b/source/common/src/tcol.c
index 6ca23f626f..7abd439784 100644
--- a/source/common/src/tcol.c
+++ b/source/common/src/tcol.c
@@ -334,6 +334,13 @@ int8_t validColCompress(uint8_t type, uint8_t l2) {
   if (l2 > TSDB_COLVAL_COMPRESS_XZ && l2 < TSDB_COLVAL_COMPRESS_DISABLED) {
     return 0;
   }
+  if (l2 == TSDB_COLVAL_COMPRESS_TSZ) {
+    if (type == TSDB_DATA_TYPE_FLOAT || type == TSDB_DATA_TYPE_DOUBLE) {
+      return 1;
+    } else {
+      return 0;
+    }
+  }
   return 1;
 }
 
diff --git a/tests/script/tsim/compress/compress2.sim b/tests/script/tsim/compress/compress2.sim
index c55b74f246..cea444ec28 100644
--- a/tests/script/tsim/compress/compress2.sim
+++ b/tests/script/tsim/compress/compress2.sim
@@ -18,6 +18,29 @@ 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 alter table $tb add column f bool
+sql desc $tb
+sql alter table $tb drop column f
+sql desc $tb
+
+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 
+sql alter table $tb modify column b level 'm' 
+sql_error alter table $tb modify column b level 'l' # already exist 
+
+
+sql_error alter table $tb modify column b compress 'lz4'
+sql alter table $tb modify column b compress 'xz'
+sql alter table $tb modify column b compress 'zstd'
+sql_err alter table $tb modify column b compress 'tsz'
+
+
+
+
+
+
+
 $count = 0
 while $count < $N
    $ms = 1591200000000 + $count