From eb784f7e04b08264bcd255392a056c04fd072fc7 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 22 Jun 2024 14:48:25 +0800
Subject: [PATCH] case: add modify two three combine item

---
 .../cluster/incSnapshot.py                    |  0
 tests/army/storage/compressBasic.py           | 45 +++++++++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 rename tests/army/{community => cluster}/cluster/incSnapshot.py (100%)

diff --git a/tests/army/community/cluster/incSnapshot.py b/tests/army/cluster/cluster/incSnapshot.py
similarity index 100%
rename from tests/army/community/cluster/incSnapshot.py
rename to tests/army/cluster/cluster/incSnapshot.py
diff --git a/tests/army/storage/compressBasic.py b/tests/army/storage/compressBasic.py
index 64d0d4148f..0d62ab9e8b 100644
--- a/tests/army/storage/compressBasic.py
+++ b/tests/army/storage/compressBasic.py
@@ -194,11 +194,11 @@ class TDTestCase(TBase):
         # alter float(c9) double(c10) to tsz
         comp = "tsz"
         sql = f"alter table {tbname} modify column c9 COMPRESS '{comp}';"
-        tdSql.execute(sql)
+        tdSql.execute(sql, show=True)
         self.checkDataDesc(tbname, 10, 5, comp)
         self.writeData(10000)
         sql = f"alter table {tbname} modify column c10 COMPRESS '{comp}';"
-        tdSql.execute(sql)
+        tdSql.execute(sql, show=True)
         self.checkDataDesc(tbname, 11, 5, comp)
         self.writeData(10000)
 
@@ -207,9 +207,48 @@ class TDTestCase(TBase):
             for i in range(self.colCnt - 1):
                 col = f"c{i}"
                 sql = f"alter table {tbname} modify column {col} LEVEL '{level}';"
-                tdSql.execute(sql)
+                tdSql.execute(sql, show=True)
+                self.checkDataDesc(tbname, i + 1, 6, level)
                 self.writeData(1000)
 
+        # modify two combine
+
+
+        i = 9
+        encode   = "delta-d"
+        compress = "zlib"
+        sql = f"alter table {tbname} modify column c{i} ENCODE '{encode}' COMPRESS '{compress}';"
+        tdSql.execute(sql, show=True)
+        self.checkDataDesc(tbname, i + 1, 4, encode)
+        self.checkDataDesc(tbname, i + 1, 5, compress)
+        
+        i = 10
+        encode = "delta-d"
+        level  = "high"
+        sql = f"alter table {tbname} modify column c{i} ENCODE '{encode}' LEVEL '{level}';"
+        tdSql.execute(sql, show=True)
+        self.checkDataDesc(tbname, i + 1, 4, encode)
+        self.checkDataDesc(tbname, i + 1, 6, level)
+
+        i = 2
+        compress = "zlib"
+        level    = "high"
+        sql = f"alter table {tbname} modify column c{i} COMPRESS '{compress}' LEVEL '{level}';"
+        tdSql.execute(sql, show=True)
+        self.checkDataDesc(tbname, i + 1, 5, compress)
+        self.checkDataDesc(tbname, i + 1, 6, level)
+
+        # modify three combine
+        i = 7
+        encode   = "simple8b"
+        compress = "zstd"
+        level    = "medium"
+        sql = f"alter table {tbname} modify column c{i} ENCODE '{encode}' COMPRESS '{compress}' LEVEL '{level}';"
+        tdSql.execute(sql, show=True)
+        self.checkDataDesc(tbname, i + 1, 4, encode)
+        self.checkDataDesc(tbname, i + 1, 5, compress)
+        self.checkDataDesc(tbname, i + 1, 6, level)
+
         # alter error 
         sqls = [
             "alter table nodb.nostb modify column ts LEVEL 'high';",