Merge branch 'nnn' into dv3

4a3436b1 · dengyihao · 738fddb8 · 7674fa97 · 4a3436b1 · 4a3436b1
71 changed file
--- a/docs/en/07-develop/03-insert-data/03-opentsdb-telnet.mdx
+++ b/docs/en/07-develop/03-insert-data/03-opentsdb-telnet.mdx
@@ -64,10 +64,10 @@ taos> use test;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- meters.current                 | 2022-03-30 17:04:10.877 |       2 |      2 |           2 |
- meters.voltage                 | 2022-03-30 17:04:10.882 |       2 |      2 |           2 |
+              name              |
+=================================
+ meters.current                 |
+ meters.voltage                 |
 Query OK, 2 row(s) in set (0.002544s)

 taos> select tbname, * from `meters.current`;

--- a/docs/en/07-develop/03-insert-data/04-opentsdb-json.mdx
+++ b/docs/en/07-develop/03-insert-data/04-opentsdb-json.mdx
@@ -81,10 +81,10 @@ taos> use test;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- meters.current                 | 2022-03-29 16:05:25.193 |       2 |      2 |           1 |
- meters.voltage                 | 2022-03-29 16:05:25.200 |       2 |      2 |           1 |
+              name              |
+=================================
+ meters.current                 |
+ meters.voltage                 |
 Query OK, 2 row(s) in set (0.001954s)

 taos> select * from `meters.current`;

--- a/docs/en/14-reference/03-connector/_verify_linux.mdx
+++ b/docs/en/14-reference/03-connector/_verify_linux.mdx
@@ -4,11 +4,11 @@ Execute TDengine CLI program `taos` directly from the Linux shell to connect to
 $ taos

 taos> show databases;
-              name              |       create_time       | vgroups |        ntables        | replica | strict |  duration  |              keep              |   buffer    |  pagesize   |    pages    |   minrows   |   maxrows   | comp | precision |   status   |           retention            | single_stable | cachemodel  |  cachesize  | wal_level | wal_fsync_period | wal_retention_period |  wal_retention_size   | wal_roll_period |     wal_seg_size      |
-=========================================================================================================================================================================================================================================================================================================================================================================================================================================================================
- information_schema             | NULL                    |    NULL |                    14 |    NULL | NULL   | NULL       | NULL                           |        NULL |        NULL |        NULL |        NULL |        NULL | NULL | NULL      | ready      | NULL                           | NULL          | NULL        |        NULL |      NULL |             NULL |                 NULL |                  NULL |            NULL |                  NULL |
- performance_schema             | NULL                    |    NULL |                     3 |    NULL | NULL   | NULL       | NULL                           |        NULL |        NULL |        NULL |        NULL |        NULL | NULL | NULL      | ready      | NULL                           | NULL          | NULL        |        NULL |      NULL |             NULL |                 NULL |                  NULL |            NULL |                  NULL |
- db                             | 2022-08-04 14:14:49.385 |       2 |                     4 |       1 | off    | 14400m     | 5254560m,5254560m,5254560m     |          96 |           4 |         256 |         100 |        4096 |    2 | ms        | ready      | NULL                           |         false | none        |           1 |         1 |             3000 |                    0 |                     0 |               0 |                     0 |
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ db                             |
 Query OK, 3 rows in database (0.019154s)

 taos>

--- a/docs/en/14-reference/03-connector/_verify_windows.mdx
+++ b/docs/en/14-reference/03-connector/_verify_windows.mdx
@@ -2,12 +2,11 @@ Go to the `C:\TDengine` directory from `cmd` and execute TDengine CLI program `t

 ```text
 taos> show databases;
-              name              |       create_time       | vgroups |        ntables        | replica | strict |  duration  |              keep              |   buffer    |  pagesize   |    pages    |   minrows   |   maxrows   | comp | precision |   status   |           retention            | single_stable | cachemodel  |  cachesize  | wal_level | wal_fsync_period | wal_retention_period |  wal_retention_size   | wal_roll_period |     wal_seg_size      |
-=========================================================================================================================================================================================================================================================================================================================================================================================================================================================================
- information_schema             | NULL                    |    NULL |                    14 |    NULL | NULL   | NULL       | NULL                           |        NULL |        NULL |        NULL |        NULL |        NULL | NULL | NULL      | ready      | NULL                           | NULL          | NULL        |        NULL |      NULL |             NULL |                 NULL |                  NULL |            NULL |                  NULL |
- performance_schema             | NULL                    |    NULL |                     3 |    NULL | NULL   | NULL       | NULL                           |        NULL |        NULL |        NULL |        NULL |        NULL | NULL | NULL      | ready      | NULL                           | NULL          | NULL        |        NULL |      NULL |             NULL |                 NULL |                  NULL |            NULL |                  NULL |
- test                           | 2022-08-04 16:46:40.506 |       2 |                     0 |       1 | off    | 14400m     | 5256000m,5256000m,5256000m     |          96 |           4 |         256 |
-100 |        4096 |    2 | ms        | ready      | NULL                           |         false | none        |           1 |         1 |             3000 |                    0 |                     0 |               0 |                     0 |
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ test                           |
 Query OK, 3 rows in database (0.123000s)

 taos>

--- a/docs/en/14-reference/11-docker/index.md
+++ b/docs/en/14-reference/11-docker/index.md
@@ -25,10 +25,11 @@ The TDengine client taos can be executed in this container to access TDengine us
 $ docker exec -it tdengine taos

 taos> show databases;
-              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
-====================================================================================================================================================================================================================================================================================
- log                            | 2022-01-17 13:57:22.270 |          10 |           1 |       1 |      1 |     10 | 30                       |           1 |           3 |         100 |        4096 |        1 |        3000 |    2 |         0 | us        |      0 | ready      |
-Query OK, 1 row(s) in set (0.002843s)
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+Query OK, 2 row(s) in set (0.002843s)
 ```

 The TDengine server running in the container uses the container's hostname to establish a connection. Using TDengine CLI or various connectors (such as JDBC-JNI) to access the TDengine inside the container from outside the container is more complicated. So the above is the simplest way to access the TDengine service in the container and is suitable for some simple scenarios. Please refer to the next section if you want to access the TDengine service in the container from outside the container using TDengine CLI or various connectors for complex scenarios.

--- a/docs/en/14-reference/_statsd.mdx
+++ b/docs/en/14-reference/_statsd.mdx
@@ -51,5 +51,6 @@ port: 8125
 Start StatsD after adding the following (assuming the config file is modified to config.js)

 ```
+npm install
 node stats.js config.js &
 ```
--- a/docs/en/20-third-party/02-prometheus.md
+++ b/docs/en/20-third-party/02-prometheus.md
@@ -30,21 +30,20 @@ After restarting Prometheus, you can refer to the following example to verify th

 ```
 taos> show databases;
-              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
-====================================================================================================================================================================================================================================================================================
- test                           | 2022-04-12 08:07:58.756 |           1 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
- log                            | 2022-04-20 07:19:50.260 |           2 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
- prometheus_data                | 2022-04-20 07:21:09.202 |         158 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
- db                             | 2022-04-15 06:37:08.512 |           1 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
-Query OK, 4 row(s) in set (0.000585s)
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ prometheus_data                |
+Query OK, 3 row(s) in set (0.000585s)

 taos> use prometheus_data;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- metrics                        | 2022-04-20 07:21:09.209 |       2 |      1 |        1389 |
+              name              |
+=================================
+ metrics                        |
 Query OK, 1 row(s) in set (0.000487s)

 taos> select * from metrics limit 10;

--- a/docs/en/20-third-party/03-telegraf.md
+++ b/docs/en/20-third-party/03-telegraf.md
@@ -43,16 +43,16 @@ taos> use telegraf;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- swap                           | 2022-04-20 08:47:53.532 |       7 |      1 |           1 |
- cpu                            | 2022-04-20 08:48:03.488 |      11 |      2 |           5 |
- system                         | 2022-04-20 08:47:53.512 |       8 |      1 |           1 |
- diskio                         | 2022-04-20 08:47:53.550 |      12 |      2 |          15 |
- kernel                         | 2022-04-20 08:47:53.503 |       6 |      1 |           1 |
- mem                            | 2022-04-20 08:47:53.521 |      35 |      1 |           1 |
- processes                      | 2022-04-20 08:47:53.555 |      12 |      1 |           1 |
- disk                           | 2022-04-20 08:47:53.541 |       8 |      5 |           2 |
+              name              |
+=================================
+ swap                           |
+ cpu                            |
+ system                         |
+ diskio                         |
+ kernel                         |
+ mem                            |
+ processes                      |
+ disk                           |
 Query OK, 8 row(s) in set (0.000521s)

 taos> select * from telegraf.system limit 10;

--- a/docs/en/20-third-party/05-collectd.md
+++ b/docs/en/20-third-party/05-collectd.md
@@ -32,28 +32,29 @@ Use the TDengine CLI to verify that collectd's data is written to TDengine and c

 ```
 taos> show databases;
-              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
-====================================================================================================================================================================================================================================================================================
- collectd                       | 2022-04-20 09:27:45.460 |          95 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
- log                            | 2022-04-20 07:19:50.260 |          11 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
-Query OK, 2 row(s) in set (0.003266s)
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ collectd                       |
+Query OK, 3 row(s) in set (0.003266s)

 taos> use collectd;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- load_1                         | 2022-04-20 09:27:45.492 |       2 |      2 |           1 |
- memory_value                   | 2022-04-20 09:27:45.463 |       2 |      3 |           6 |
- df_value                       | 2022-04-20 09:27:45.463 |       2 |      4 |          25 |
- load_2                         | 2022-04-20 09:27:45.501 |       2 |      2 |           1 |
- load_0                         | 2022-04-20 09:27:45.485 |       2 |      2 |           1 |
- interface_1                    | 2022-04-20 09:27:45.488 |       2 |      3 |          12 |
- irq_value                      | 2022-04-20 09:27:45.476 |       2 |      3 |          31 |
- interface_0                    | 2022-04-20 09:27:45.480 |       2 |      3 |          12 |
- entropy_value                  | 2022-04-20 09:27:45.473 |       2 |      2 |           1 |
- swap_value                     | 2022-04-20 09:27:45.477 |       2 |      3 |           5 |
+              name              |
+=================================
+ load_1                         |
+ memory_value                   |
+ df_value                       |
+ load_2                         |
+ load_0                         |
+ interface_1                    |
+ irq_value                      |
+ interface_0                    |
+ entropy_value                  |
+ swap_value                     |
 Query OK, 10 row(s) in set (0.002236s)

 taos> select * from collectd.memory_value limit 10;

--- a/docs/en/20-third-party/06-statsd.md
+++ b/docs/en/20-third-party/06-statsd.md
@@ -26,7 +26,7 @@ Start StatsD:
 ```
 $ node stats.js config.js &
 [1] 8546
-$ 20 Apr 09:54:41 - [8546] reading config file: exampleConfig.js
+$ 20 Apr 09:54:41 - [8546] reading config file: config.js
 20 Apr 09:54:41 - server is up INFO
 ```

@@ -40,19 +40,20 @@ Use the TDengine CLI to verify that StatsD data is written to TDengine and can r

 ```
 taos> show databases;
-              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
-====================================================================================================================================================================================================================================================================================
- log                            | 2022-04-20 07:19:50.260 |          11 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
- statsd                         | 2022-04-20 09:54:51.220 |           1 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
-Query OK, 2 row(s) in set (0.003142s)
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ statsd                         |
+Query OK, 3 row(s) in set (0.003142s)

 taos> use statsd;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- foo                            | 2022-04-20 09:54:51.234 |       2 |      1 |           1 |
+              name              |
+=================================
+ foo                            |
 Query OK, 1 row(s) in set (0.002161s)

 taos> select * from foo;
@@ -63,3 +64,8 @@ Query OK, 1 row(s) in set (0.004179s)

 taos>
 ```
+
+:::note
+
+- TDengine will automatically create unique IDs for sub-table names by the rule.
+:::
--- a/docs/en/20-third-party/07-icinga2.md
+++ b/docs/en/20-third-party/07-icinga2.md
@@ -47,30 +47,30 @@ taos> use icinga2;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- icinga.service.users.state_... | 2022-04-20 12:11:39.726 |       2 |      1 |           1 |
- icinga.service.users.acknow... | 2022-04-20 12:11:39.756 |       2 |      1 |           1 |
- icinga.service.procs.downti... | 2022-04-20 12:11:44.541 |       2 |      1 |           1 |
- icinga.service.users.users     | 2022-04-20 12:11:39.770 |       2 |      1 |           1 |
- icinga.service.procs.procs_min | 2022-04-20 12:11:44.599 |       2 |      1 |           1 |
- icinga.service.users.users_min | 2022-04-20 12:11:39.809 |       2 |      1 |           1 |
- icinga.check.max_check_atte... | 2022-04-20 12:11:39.847 |       2 |      3 |           2 |
- icinga.service.procs.state_... | 2022-04-20 12:11:44.522 |       2 |      1 |           1 |
- icinga.service.procs.procs_... | 2022-04-20 12:11:44.576 |       2 |      1 |           1 |
- icinga.service.users.users_... | 2022-04-20 12:11:39.796 |       2 |      1 |           1 |
- icinga.check.latency           | 2022-04-20 12:11:39.869 |       2 |      3 |           2 |
- icinga.service.procs.procs_... | 2022-04-20 12:11:44.588 |       2 |      1 |           1 |
- icinga.service.users.downti... | 2022-04-20 12:11:39.746 |       2 |      1 |           1 |
- icinga.service.users.users_... | 2022-04-20 12:11:39.783 |       2 |      1 |           1 |
- icinga.service.users.reachable | 2022-04-20 12:11:39.736 |       2 |      1 |           1 |
- icinga.service.procs.procs     | 2022-04-20 12:11:44.565 |       2 |      1 |           1 |
- icinga.service.procs.acknow... | 2022-04-20 12:11:44.554 |       2 |      1 |           1 |
- icinga.service.procs.state     | 2022-04-20 12:11:44.509 |       2 |      1 |           1 |
- icinga.service.procs.reachable | 2022-04-20 12:11:44.532 |       2 |      1 |           1 |
- icinga.check.current_attempt   | 2022-04-20 12:11:39.825 |       2 |      3 |           2 |
- icinga.check.execution_time    | 2022-04-20 12:11:39.898 |       2 |      3 |           2 |
- icinga.service.users.state     | 2022-04-20 12:11:39.704 |       2 |      1 |           1 |
+              name              |
+=================================
+ icinga.service.users.state_... |
+ icinga.service.users.acknow... |
+ icinga.service.procs.downti... |
+ icinga.service.users.users     |
+ icinga.service.procs.procs_min |
+ icinga.service.users.users_min |
+ icinga.check.max_check_atte... |
+ icinga.service.procs.state_... |
+ icinga.service.procs.procs_... |
+ icinga.service.users.users_... |
+ icinga.check.latency           |
+ icinga.service.procs.procs_... |
+ icinga.service.users.downti... |
+ icinga.service.users.users_... |
+ icinga.service.users.reachable |
+ icinga.service.procs.procs     |
+ icinga.service.procs.acknow... |
+ icinga.service.procs.state     |
+ icinga.service.procs.reachable |
+ icinga.check.current_attempt   |
+ icinga.check.execution_time    |
+ icinga.service.users.state     |
 Query OK, 22 row(s) in set (0.002317s)
 ```


--- a/docs/en/20-third-party/08-tcollector.md
+++ b/docs/en/20-third-party/08-tcollector.md
@@ -33,35 +33,41 @@ Wait for a few seconds and then use the TDengine CLI to query whether the corres

 ```
 taos> show databases;
-              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
-====================================================================================================================================================================================================================================================================================
- tcollector                     | 2022-04-20 12:44:49.604 |          88 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
- log                            | 2022-04-20 07:19:50.260 |          11 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
-Query OK, 2 row(s) in set (0.002679s)
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ tcollector                     |
+Query OK, 3 rows in database (0.001647s)

 taos> use tcollector;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- proc.meminfo.hugepages_rsvd    | 2022-04-20 12:44:53.945 |       2 |      1 |           1 |
- proc.meminfo.directmap1g       | 2022-04-20 12:44:54.110 |       2 |      1 |           1 |
- proc.meminfo.vmallocchunk      | 2022-04-20 12:44:53.724 |       2 |      1 |           1 |
- proc.meminfo.hugepagesize      | 2022-04-20 12:44:54.004 |       2 |      1 |           1 |
- tcollector.reader.lines_dro... | 2022-04-20 12:44:49.675 |       2 |      1 |           1 |
- proc.meminfo.sunreclaim        | 2022-04-20 12:44:53.437 |       2 |      1 |           1 |
- proc.stat.ctxt                 | 2022-04-20 12:44:55.363 |       2 |      1 |           1 |
- proc.meminfo.swaptotal         | 2022-04-20 12:44:53.158 |       2 |      1 |           1 |
- proc.uptime.total              | 2022-04-20 12:44:52.813 |       2 |      1 |           1 |
- tcollector.collector.lines_... | 2022-04-20 12:44:49.895 |       2 |      2 |          51 |
- proc.meminfo.vmallocused       | 2022-04-20 12:44:53.704 |       2 |      1 |           1 |
- proc.meminfo.memavailable      | 2022-04-20 12:44:52.939 |       2 |      1 |           1 |
- sys.numa.foreign_allocs        | 2022-04-20 12:44:57.929 |       2 |      2 |           1 |
- proc.meminfo.committed_as      | 2022-04-20 12:44:53.639 |       2 |      1 |           1 |
- proc.vmstat.pswpin             | 2022-04-20 12:44:54.177 |       2 |      1 |           1 |
- proc.meminfo.cmafree           | 2022-04-20 12:44:53.865 |       2 |      1 |           1 |
- proc.meminfo.mapped            | 2022-04-20 12:44:53.349 |       2 |      1 |           1 |
- proc.vmstat.pgmajfault         | 2022-04-20 12:44:54.251 |       2 |      1 |           1 |
+              name              |
+=================================
+ proc.meminfo.hugepages_rsvd    |
+ proc.meminfo.directmap1g       |
+ proc.meminfo.vmallocchunk      |
+ proc.meminfo.hugepagesize      |
+ tcollector.reader.lines_dro... |
+ proc.meminfo.sunreclaim        |
+ proc.stat.ctxt                 |
+ proc.meminfo.swaptotal         |
+ proc.uptime.total              |
+ tcollector.collector.lines_... |
+ proc.meminfo.vmallocused       |
+ proc.meminfo.memavailable      |
+ sys.numa.foreign_allocs        |
+ proc.meminfo.committed_as      |
+ proc.vmstat.pswpin             |
+ proc.meminfo.cmafree           |
+ proc.meminfo.mapped            |
+ proc.vmstat.pgmajfault         |
 ...
 ```
+
+:::note
+
+- TDengine will automatically create unique IDs for sub-table names by the rule.
+:::
--- a/docs/zh/07-develop/03-insert-data/03-opentsdb-telnet.mdx
+++ b/docs/zh/07-develop/03-insert-data/03-opentsdb-telnet.mdx
@@ -66,10 +66,10 @@ taos> use test;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- meters.current                 | 2022-03-30 17:04:10.877 |       2 |      2 |           2 |
- meters.voltage                 | 2022-03-30 17:04:10.882 |       2 |      2 |           2 |
+              name              |
+=================================
+ meters.current                 |
+ meters.voltage                 |
 Query OK, 2 row(s) in set (0.002544s)

 taos> select tbname, * from `meters.current`;

--- a/docs/zh/07-develop/03-insert-data/04-opentsdb-json.mdx
+++ b/docs/zh/07-develop/03-insert-data/04-opentsdb-json.mdx
@@ -82,10 +82,10 @@ taos> use test;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- meters.current                 | 2022-03-29 16:05:25.193 |       2 |      2 |           1 |
- meters.voltage                 | 2022-03-29 16:05:25.200 |       2 |      2 |           1 |
+              name              |
+=================================
+ meters.current                 |
+ meters.voltage                 |
 Query OK, 2 row(s) in set (0.001954s)

 taos> select * from `meters.current`;

--- a/docs/zh/08-connector/_verify_linux.mdx
+++ b/docs/zh/08-connector/_verify_linux.mdx
@@ -4,11 +4,11 @@
 $ taos

 taos> show databases;
-              name              |       create_time       | vgroups |        ntables        | replica | strict |  duration  |              keep              |   buffer    |  pagesize   |    pages    |   minrows   |   maxrows   | comp | precision |   status   |           retention            | single_stable | cachemodel  |  cachesize  | wal_level | wal_fsync_period | wal_retention_period |  wal_retention_size   | wal_roll_period |     wal_seg_size      |
-=========================================================================================================================================================================================================================================================================================================================================================================================================================================================================
- information_schema             | NULL                    |    NULL |                    14 |    NULL | NULL   | NULL       | NULL                           |        NULL |        NULL |        NULL |        NULL |        NULL | NULL | NULL      | ready      | NULL                           | NULL          | NULL        |        NULL |      NULL |             NULL |                 NULL |                  NULL |            NULL |                  NULL |
- performance_schema             | NULL                    |    NULL |                     3 |    NULL | NULL   | NULL       | NULL                           |        NULL |        NULL |        NULL |        NULL |        NULL | NULL | NULL      | ready      | NULL                           | NULL          | NULL        |        NULL |      NULL |             NULL |                 NULL |                  NULL |            NULL |                  NULL |
- db                             | 2022-08-04 14:14:49.385 |       2 |                     4 |       1 | off    | 14400m     | 5254560m,5254560m,5254560m     |          96 |           4 |         256 |         100 |        4096 |    2 | ms        | ready      | NULL                           |         false | none        |           1 |         1 |             3000 |                    0 |                     0 |               0 |                     0 |
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ db                             |
 Query OK, 3 rows in database (0.019154s)

 taos>

--- a/docs/zh/14-reference/_statsd.mdx
+++ b/docs/zh/14-reference/_statsd.mdx
@@ -51,5 +51,6 @@ port: 8125
 增加如下内容后启动 StatsD（假设配置文件修改为 config.js）。

 ```
+npm install
 node stats.js config.js &
 ```
--- a/docs/zh/20-third-party/02-prometheus.md
+++ b/docs/zh/20-third-party/02-prometheus.md
@@ -29,21 +29,20 @@ Prometheus 提供了 `remote_write` 和 `remote_read` 接口来利用其它数
 ### 使用 TDengine CLI 查询写入数据
 ```
 taos> show databases;
-              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
-====================================================================================================================================================================================================================================================================================
- test                           | 2022-04-12 08:07:58.756 |           1 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
- log                            | 2022-04-20 07:19:50.260 |           2 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
- prometheus_data                | 2022-04-20 07:21:09.202 |         158 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
- db                             | 2022-04-15 06:37:08.512 |           1 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
-Query OK, 4 row(s) in set (0.000585s)
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ prometheus_data                |
+Query OK, 3 row(s) in set (0.000585s)

 taos> use prometheus_data;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- metrics                        | 2022-04-20 07:21:09.209 |       2 |      1 |        1389 |
+              name              |
+=================================
+ metrics                        |
 Query OK, 1 row(s) in set (0.000487s)

 taos> select * from metrics limit 10;

--- a/docs/zh/20-third-party/03-telegraf.md
+++ b/docs/zh/20-third-party/03-telegraf.md
@@ -44,16 +44,16 @@ taos> use telegraf;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- swap                           | 2022-04-20 08:47:53.532 |       7 |      1 |           1 |
- cpu                            | 2022-04-20 08:48:03.488 |      11 |      2 |           5 |
- system                         | 2022-04-20 08:47:53.512 |       8 |      1 |           1 |
- diskio                         | 2022-04-20 08:47:53.550 |      12 |      2 |          15 |
- kernel                         | 2022-04-20 08:47:53.503 |       6 |      1 |           1 |
- mem                            | 2022-04-20 08:47:53.521 |      35 |      1 |           1 |
- processes                      | 2022-04-20 08:47:53.555 |      12 |      1 |           1 |
- disk                           | 2022-04-20 08:47:53.541 |       8 |      5 |           2 |
+              name              |
+=================================
+ swap                           |
+ cpu                            |
+ system                         |
+ diskio                         |
+ kernel                         |
+ mem                            |
+ processes                      |
+ disk                           |
 Query OK, 8 row(s) in set (0.000521s)

 taos> select * from telegraf.system limit 10;

--- a/docs/zh/20-third-party/05-collectd.md
+++ b/docs/zh/20-third-party/05-collectd.md
@@ -32,28 +32,29 @@ sudo systemctl restart collectd

 ```
 taos> show databases;
-              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
-====================================================================================================================================================================================================================================================================================
- collectd                       | 2022-04-20 09:27:45.460 |          95 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
- log                            | 2022-04-20 07:19:50.260 |          11 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
-Query OK, 2 row(s) in set (0.003266s)
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ collectd                       |
+Query OK, 3 row(s) in set (0.003266s)

 taos> use collectd;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- load_1                         | 2022-04-20 09:27:45.492 |       2 |      2 |           1 |
- memory_value                   | 2022-04-20 09:27:45.463 |       2 |      3 |           6 |
- df_value                       | 2022-04-20 09:27:45.463 |       2 |      4 |          25 |
- load_2                         | 2022-04-20 09:27:45.501 |       2 |      2 |           1 |
- load_0                         | 2022-04-20 09:27:45.485 |       2 |      2 |           1 |
- interface_1                    | 2022-04-20 09:27:45.488 |       2 |      3 |          12 |
- irq_value                      | 2022-04-20 09:27:45.476 |       2 |      3 |          31 |
- interface_0                    | 2022-04-20 09:27:45.480 |       2 |      3 |          12 |
- entropy_value                  | 2022-04-20 09:27:45.473 |       2 |      2 |           1 |
- swap_value                     | 2022-04-20 09:27:45.477 |       2 |      3 |           5 |
+              name              |
+=================================
+ load_1                         |
+ memory_value                   |
+ df_value                       |
+ load_2                         |
+ load_0                         |
+ interface_1                    |
+ irq_value                      |
+ interface_0                    |
+ entropy_value                  |
+ swap_value                     |
 Query OK, 10 row(s) in set (0.002236s)

 taos> select * from collectd.memory_value limit 10;

--- a/docs/zh/20-third-party/06-statsd.md
+++ b/docs/zh/20-third-party/06-statsd.md
@@ -27,7 +27,7 @@ StatsD 是汇总和总结应用指标的一个简单的守护进程，近些年
 ```
 $ node stats.js config.js &
 [1] 8546
-$ 20 Apr 09:54:41 - [8546] reading config file: exampleConfig.js
+$ 20 Apr 09:54:41 - [8546] reading config file: config.js
 20 Apr 09:54:41 - server is up INFO
 ```

@@ -41,19 +41,20 @@ $ echo "foo:1|c" | nc -u -w0 127.0.0.1 8125

 ```
 taos> show databases;
-              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
-====================================================================================================================================================================================================================================================================================
- log                            | 2022-04-20 07:19:50.260 |          11 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
- statsd                         | 2022-04-20 09:54:51.220 |           1 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
-Query OK, 2 row(s) in set (0.003142s)
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ statsd                         |
+Query OK, 3 row(s) in set (0.003142s)

 taos> use statsd;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- foo                            | 2022-04-20 09:54:51.234 |       2 |      1 |           1 |
+              name              |
+=================================
+ foo                            |
 Query OK, 1 row(s) in set (0.002161s)

 taos> select * from foo;
@@ -64,3 +65,8 @@ Query OK, 1 row(s) in set (0.004179s)

 taos>
 ```
+
+:::note
+
+- TDengine will automatically create unique IDs for sub-table names by the rule.
+:::
--- a/docs/zh/20-third-party/07-icinga2.md
+++ b/docs/zh/20-third-party/07-icinga2.md
@@ -48,30 +48,30 @@ taos> use icinga2;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- icinga.service.users.state_... | 2022-04-20 12:11:39.726 |       2 |      1 |           1 |
- icinga.service.users.acknow... | 2022-04-20 12:11:39.756 |       2 |      1 |           1 |
- icinga.service.procs.downti... | 2022-04-20 12:11:44.541 |       2 |      1 |           1 |
- icinga.service.users.users     | 2022-04-20 12:11:39.770 |       2 |      1 |           1 |
- icinga.service.procs.procs_min | 2022-04-20 12:11:44.599 |       2 |      1 |           1 |
- icinga.service.users.users_min | 2022-04-20 12:11:39.809 |       2 |      1 |           1 |
- icinga.check.max_check_atte... | 2022-04-20 12:11:39.847 |       2 |      3 |           2 |
- icinga.service.procs.state_... | 2022-04-20 12:11:44.522 |       2 |      1 |           1 |
- icinga.service.procs.procs_... | 2022-04-20 12:11:44.576 |       2 |      1 |           1 |
- icinga.service.users.users_... | 2022-04-20 12:11:39.796 |       2 |      1 |           1 |
- icinga.check.latency           | 2022-04-20 12:11:39.869 |       2 |      3 |           2 |
- icinga.service.procs.procs_... | 2022-04-20 12:11:44.588 |       2 |      1 |           1 |
- icinga.service.users.downti... | 2022-04-20 12:11:39.746 |       2 |      1 |           1 |
- icinga.service.users.users_... | 2022-04-20 12:11:39.783 |       2 |      1 |           1 |
- icinga.service.users.reachable | 2022-04-20 12:11:39.736 |       2 |      1 |           1 |
- icinga.service.procs.procs     | 2022-04-20 12:11:44.565 |       2 |      1 |           1 |
- icinga.service.procs.acknow... | 2022-04-20 12:11:44.554 |       2 |      1 |           1 |
- icinga.service.procs.state     | 2022-04-20 12:11:44.509 |       2 |      1 |           1 |
- icinga.service.procs.reachable | 2022-04-20 12:11:44.532 |       2 |      1 |           1 |
- icinga.check.current_attempt   | 2022-04-20 12:11:39.825 |       2 |      3 |           2 |
- icinga.check.execution_time    | 2022-04-20 12:11:39.898 |       2 |      3 |           2 |
- icinga.service.users.state     | 2022-04-20 12:11:39.704 |       2 |      1 |           1 |
+              name              |
+=================================
+ icinga.service.users.state_... |
+ icinga.service.users.acknow... |
+ icinga.service.procs.downti... |
+ icinga.service.users.users     |
+ icinga.service.procs.procs_min |
+ icinga.service.users.users_min |
+ icinga.check.max_check_atte... |
+ icinga.service.procs.state_... |
+ icinga.service.procs.procs_... |
+ icinga.service.users.users_... |
+ icinga.check.latency           |
+ icinga.service.procs.procs_... |
+ icinga.service.users.downti... |
+ icinga.service.users.users_... |
+ icinga.service.users.reachable |
+ icinga.service.procs.procs     |
+ icinga.service.procs.acknow... |
+ icinga.service.procs.state     |
+ icinga.service.procs.reachable |
+ icinga.check.current_attempt   |
+ icinga.check.execution_time    |
+ icinga.service.users.state     |
 Query OK, 22 row(s) in set (0.002317s)
 ```


--- a/docs/zh/20-third-party/08-tcollector.md
+++ b/docs/zh/20-third-party/08-tcollector.md
@@ -34,35 +34,42 @@ sudo systemctl restart taosadapter

 ```
 taos> show databases;
-              name              |      created_time       |   ntables   |   vgroups   | replica | quorum |  days  |           keep           |  cache(MB)  |   blocks    |   minrows   |   maxrows   | wallevel |    fsync    | comp | cachelast | precision | update |   status   |
-====================================================================================================================================================================================================================================================================================
- tcollector                     | 2022-04-20 12:44:49.604 |          88 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ns        |      2 | ready      |
- log                            | 2022-04-20 07:19:50.260 |          11 |           1 |       1 |      1 |     10 | 3650                     |          16 |           6 |         100 |        4096 |        1 |        3000 |    2 |         0 | ms        |      0 | ready      |
-Query OK, 2 row(s) in set (0.002679s)
+              name              |
+=================================
+ information_schema             |
+ performance_schema             |
+ tcollector                     |
+Query OK, 3 rows in database (0.001647s)
+

 taos> use tcollector;
 Database changed.

 taos> show stables;
-              name              |      created_time       | columns |  tags  |   tables    |
-============================================================================================
- proc.meminfo.hugepages_rsvd    | 2022-04-20 12:44:53.945 |       2 |      1 |           1 |
- proc.meminfo.directmap1g       | 2022-04-20 12:44:54.110 |       2 |      1 |           1 |
- proc.meminfo.vmallocchunk      | 2022-04-20 12:44:53.724 |       2 |      1 |           1 |
- proc.meminfo.hugepagesize      | 2022-04-20 12:44:54.004 |       2 |      1 |           1 |
- tcollector.reader.lines_dro... | 2022-04-20 12:44:49.675 |       2 |      1 |           1 |
- proc.meminfo.sunreclaim        | 2022-04-20 12:44:53.437 |       2 |      1 |           1 |
- proc.stat.ctxt                 | 2022-04-20 12:44:55.363 |       2 |      1 |           1 |
- proc.meminfo.swaptotal         | 2022-04-20 12:44:53.158 |       2 |      1 |           1 |
- proc.uptime.total              | 2022-04-20 12:44:52.813 |       2 |      1 |           1 |
- tcollector.collector.lines_... | 2022-04-20 12:44:49.895 |       2 |      2 |          51 |
- proc.meminfo.vmallocused       | 2022-04-20 12:44:53.704 |       2 |      1 |           1 |
- proc.meminfo.memavailable      | 2022-04-20 12:44:52.939 |       2 |      1 |           1 |
- sys.numa.foreign_allocs        | 2022-04-20 12:44:57.929 |       2 |      2 |           1 |
- proc.meminfo.committed_as      | 2022-04-20 12:44:53.639 |       2 |      1 |           1 |
- proc.vmstat.pswpin             | 2022-04-20 12:44:54.177 |       2 |      1 |           1 |
- proc.meminfo.cmafree           | 2022-04-20 12:44:53.865 |       2 |      1 |           1 |
- proc.meminfo.mapped            | 2022-04-20 12:44:53.349 |       2 |      1 |           1 |
- proc.vmstat.pgmajfault         | 2022-04-20 12:44:54.251 |       2 |      1 |           1 |
+              name              |
+=================================
+ proc.meminfo.hugepages_rsvd    |
+ proc.meminfo.directmap1g       |
+ proc.meminfo.vmallocchunk      |
+ proc.meminfo.hugepagesize      |
+ tcollector.reader.lines_dro... |
+ proc.meminfo.sunreclaim        |
+ proc.stat.ctxt                 |
+ proc.meminfo.swaptotal         |
+ proc.uptime.total              |
+ tcollector.collector.lines_... |
+ proc.meminfo.vmallocused       |
+ proc.meminfo.memavailable      |
+ sys.numa.foreign_allocs        |
+ proc.meminfo.committed_as      |
+ proc.vmstat.pswpin             |
+ proc.meminfo.cmafree           |
+ proc.meminfo.mapped            |
+ proc.vmstat.pgmajfault         |
 ...
 ```
+
+:::note
+
+- TDengine 默认生成的子表名是根据规则生成的唯一 ID 值。
+:::
--- a/include/common/tdataformat.h
+++ b/include/common/tdataformat.h
@@ -162,17 +162,7 @@ struct STSRowBuilder {

 struct SValue {
  union {
-    int8_t   i8;   // TSDB_DATA_TYPE_BOOL||TSDB_DATA_TYPE_TINYINT
-    uint8_t  u8;   // TSDB_DATA_TYPE_UTINYINT
-    int16_t  i16;  // TSDB_DATA_TYPE_SMALLINT
-    uint16_t u16;  // TSDB_DATA_TYPE_USMALLINT
-    int32_t  i32;  // TSDB_DATA_TYPE_INT
-    uint32_t u32;  // TSDB_DATA_TYPE_UINT
-    int64_t  i64;  // TSDB_DATA_TYPE_BIGINT
-    uint64_t u64;  // TSDB_DATA_TYPE_UBIGINT
-    TSKEY    ts;   // TSDB_DATA_TYPE_TIMESTAMP
-    float    f;    // TSDB_DATA_TYPE_FLOAT
-    double   d;    // TSDB_DATA_TYPE_DOUBLE
+    int64_t val;
    struct {
      uint32_t nData;
      uint8_t *pData;

--- a/include/common/ttypes.h
+++ b/include/common/ttypes.h
@@ -333,10 +333,10 @@ typedef struct tDataTypeDescriptor {
  char   *name;
  int64_t minValue;
  int64_t maxValue;
-  int32_t (*compFunc)(const char *const input, int32_t inputSize, const int32_t nelements, char *const output,
-                      int32_t outputSize, char algorithm, char *const buffer, int32_t bufferSize);
-  int32_t (*decompFunc)(const char *const input, int32_t compressedSize, const int32_t nelements, char *const output,
-                        int32_t outputSize, char algorithm, char *const buffer, int32_t bufferSize);
+  int32_t (*compFunc)(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                      int32_t nBuf);
+  int32_t (*decompFunc)(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                        int32_t nBuf);
  void (*statisFunc)(int8_t bitmapMode, const void *pBitmap, const void *pData, int32_t numofrow, int64_t *min,
                     int64_t *max, int64_t *sum, int16_t *minindex, int16_t *maxindex, int16_t *numofnull);
 } tDataTypeDescriptor;
@@ -356,7 +356,6 @@ void  operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type);
 void *getDataMin(int32_t type);
 void *getDataMax(int32_t type);

-
 #ifdef __cplusplus
 }
 #endif

--- a/include/libs/stream/streamState.h
+++ b/include/libs/stream/streamState.h
@@ -33,6 +33,7 @@ typedef struct {
  TTB*         pFuncStateDb;
  TTB*         pFillStateDb;  // todo refactor
  TXN          txn;
+  int32_t      number;
 } SStreamState;

 SStreamState* streamStateOpen(char* path, SStreamTask* pTask, bool specPath);
@@ -42,7 +43,8 @@ int32_t       streamStateCommit(SStreamState* pState);
 int32_t       streamStateAbort(SStreamState* pState);

 typedef struct {
-  TBC* pCur;
+  TBC*    pCur;
+  int64_t number;
 } SStreamStateCur;

 int32_t streamStateFuncPut(SStreamState* pState, const STupleKey* key, const void* value, int32_t vLen);
@@ -52,6 +54,8 @@ int32_t streamStateFuncDel(SStreamState* pState, const STupleKey* key);
 int32_t streamStatePut(SStreamState* pState, const SWinKey* key, const void* value, int32_t vLen);
 int32_t streamStateGet(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen);
 int32_t streamStateDel(SStreamState* pState, const SWinKey* key);
+int32_t streamStateClear(SStreamState* pState);
+void    streamStateSetNumber(SStreamState* pState, int32_t number);

 int32_t streamStateFillPut(SStreamState* pState, const SWinKey* key, const void* value, int32_t vLen);
 int32_t streamStateFillGet(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen);
@@ -63,6 +67,7 @@ void    streamFreeVal(void* val);

 SStreamStateCur* streamStateGetCur(SStreamState* pState, const SWinKey* key);
 SStreamStateCur* streamStateGetAndCheckCur(SStreamState* pState, SWinKey* key);
+SStreamStateCur* streamStateSeekKeyNext(SStreamState* pState, const SWinKey* key);
 SStreamStateCur* streamStateFillSeekKeyNext(SStreamState* pState, const SWinKey* key);
 SStreamStateCur* streamStateFillSeekKeyPrev(SStreamState* pState, const SWinKey* key);
 void             streamStateFreeCur(SStreamStateCur* pCur);
@@ -70,6 +75,7 @@ void             streamStateFreeCur(SStreamStateCur* pCur);
 int32_t streamStateGetGroupKVByCur(SStreamStateCur* pCur, SWinKey* pKey, const void** pVal, int32_t* pVLen);
 int32_t streamStateGetKVByCur(SStreamStateCur* pCur, SWinKey* pKey, const void** pVal, int32_t* pVLen);

+int32_t streamStateGetFirst(SStreamState* pState, SWinKey* key);
 int32_t streamStateSeekFirst(SStreamState* pState, SStreamStateCur* pCur);
 int32_t streamStateSeekLast(SStreamState* pState, SStreamStateCur* pCur);


--- a/include/util/tcoding.h
+++ b/include/util/tcoding.h
@@ -23,8 +23,8 @@ extern "C" {
 #endif

 #define ENCODE_LIMIT  (((uint8_t)1) << 7)
-#define ZIGZAGE(T, v) ((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1)  // zigzag encode
-#define ZIGZAGD(T, v) ((v) >> 1) ^ -((T)((v)&1))                                 // zigzag decode
+#define ZIGZAGE(T, v) (((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1))  // zigzag encode
+#define ZIGZAGD(T, v) (((v) >> 1) ^ -((T)((v)&1)))                                 // zigzag decode

 /* ------------------------ LEGACY CODES ------------------------ */
 #if 1
@@ -70,7 +70,7 @@ static FORCE_INLINE int32_t taosEncodeFixedBool(void **buf, bool value) {
 }

 static FORCE_INLINE void *taosDecodeFixedBool(const void *buf, bool *value) {
-  *value = ( (((int8_t *)buf)[0] == 0) ? false : true );
+  *value = ((((int8_t *)buf)[0] == 0) ? false : true);
  return POINTER_SHIFT(buf, sizeof(int8_t));
 }


--- a/include/util/tcompression.h
+++ b/include/util/tcompression.h
@@ -51,287 +51,12 @@ extern "C" {
 #define HEAD_MODE(x) x % 2
 #define HEAD_ALGO(x) x / 2

-extern int32_t tsCompressINTImp(const char *const input, const int32_t nelements, char *const output, const char type);
-extern int32_t tsDecompressINTImp(const char *const input, const int32_t nelements, char *const output,
-                                  const char type);
-extern int32_t tsCompressBoolImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressBoolImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsCompressStringImp(const char *const input, int32_t inputSize, char *const output, int32_t outputSize);
-extern int32_t tsDecompressStringImp(const char *const input, int32_t compressedSize, char *const output,
-                                     int32_t outputSize);
-extern int32_t tsCompressTimestampImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressTimestampImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsCompressDoubleImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressDoubleImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsCompressFloatImp(const char *const input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressFloatImp(const char *const input, const int32_t nelements, char *const output);
-// lossy
-extern int32_t tsCompressFloatLossyImp(const char *input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressFloatLossyImp(const char *input, int32_t compressedSize, const int32_t nelements,
-                                         char *const output);
-extern int32_t tsCompressDoubleLossyImp(const char *input, const int32_t nelements, char *const output);
-extern int32_t tsDecompressDoubleLossyImp(const char *input, int32_t compressedSize, const int32_t nelements,
-                                          char *const output);
-
 #ifdef TD_TSZ
 extern bool lossyFloat;
 extern bool lossyDouble;
 int32_t     tsCompressInit();
 void        tsCompressExit();
-#endif
-
-static FORCE_INLINE int32_t tsCompressTinyint(const char *const input, int32_t inputSize, const int32_t nelements,
-                                              char *const output, int32_t outputSize, char algorithm,
-                                              char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_TINYINT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressTinyint(const char *const input, int32_t compressedSize,
-                                                const int32_t nelements, char *const output, int32_t outputSize,
-                                                char algorithm, char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressSmallint(const char *const input, int32_t inputSize, const int32_t nelements,
-                                               char *const output, int32_t outputSize, char algorithm,
-                                               char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_SMALLINT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressSmallint(const char *const input, int32_t compressedSize,
-                                                 const int32_t nelements, char *const output, int32_t outputSize,
-                                                 char algorithm, char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressInt(const char *const input, int32_t inputSize, const int32_t nelements,
-                                          char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                          int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_INT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressInt(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                            char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                            int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressBigint(const char *const input, int32_t inputSize, const int32_t nelements,
-                                             char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                             int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_BIGINT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressBigint(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                               char *const output, int32_t outputSize, char algorithm,
-                                               char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressBool(const char *const input, int32_t inputSize, const int32_t nelements,
-                                           char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                           int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressBoolImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressBoolImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressBool(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                             char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                             int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressBoolImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressBoolImp(buffer, nelements, output);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsCompressString(const char *const input, int32_t inputSize, const int32_t nelements,
-                                             char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                             int32_t bufferSize) {
-  return tsCompressStringImp(input, inputSize, output, outputSize);
-}
-
-static FORCE_INLINE int32_t tsDecompressString(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                               char *const output, int32_t outputSize, char algorithm,
-                                               char *const buffer, int32_t bufferSize) {
-  return tsDecompressStringImp(input, compressedSize, output, outputSize);
-}
-
-static FORCE_INLINE int32_t tsCompressFloat(const char *const input, int32_t inputSize, const int32_t nelements,
-                                            char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                            int32_t bufferSize) {
-#ifdef TD_TSZ
-  // lossy mode
-  if (lossyFloat) {
-    return tsCompressFloatLossyImp(input, nelements, output);
-    // lossless mode
-  } else {
-#endif
-    if (algorithm == ONE_STAGE_COMP) {
-      return tsCompressFloatImp(input, nelements, output);
-    } else if (algorithm == TWO_STAGE_COMP) {
-      int32_t len = tsCompressFloatImp(input, nelements, buffer);
-      return tsCompressStringImp(buffer, len, output, outputSize);
-    } else {
-      assert(0);
-      return -1;
-    }
-#ifdef TD_TSZ
-  }
-#endif
-}
-
-static FORCE_INLINE int32_t tsDecompressFloat(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                              char *const output, int32_t outputSize, char algorithm,
-                                              char *const buffer, int32_t bufferSize) {
-#ifdef TD_TSZ
-  if (HEAD_ALGO(input[0]) == ALGO_SZ_LOSSY) {
-    // decompress lossy
-    return tsDecompressFloatLossyImp(input, compressedSize, nelements, output);
-  } else {
-#endif
-    // decompress lossless
-    if (algorithm == ONE_STAGE_COMP) {
-      return tsDecompressFloatImp(input, nelements, output);
-    } else if (algorithm == TWO_STAGE_COMP) {
-      if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-      return tsDecompressFloatImp(buffer, nelements, output);
-    } else {
-      assert(0);
-      return -1;
-    }
-#ifdef TD_TSZ
-  }
-#endif
-}
-
-static FORCE_INLINE int32_t tsCompressDouble(const char *const input, int32_t inputSize, const int32_t nelements,
-                                             char *const output, int32_t outputSize, char algorithm, char *const buffer,
-                                             int32_t bufferSize) {
-#ifdef TD_TSZ
-  if (lossyDouble) {
-    // lossy mode
-    return tsCompressDoubleLossyImp(input, nelements, output);
-  } else {
-#endif
-    // lossless mode
-    if (algorithm == ONE_STAGE_COMP) {
-      return tsCompressDoubleImp(input, nelements, output);
-    } else if (algorithm == TWO_STAGE_COMP) {
-      int32_t len = tsCompressDoubleImp(input, nelements, buffer);
-      return tsCompressStringImp(buffer, len, output, outputSize);
-    } else {
-      assert(0);
-      return -1;
-    }
-#ifdef TD_TSZ
-  }
-#endif
-}
-
-static FORCE_INLINE int32_t tsDecompressDouble(const char *const input, int32_t compressedSize, const int32_t nelements,
-                                               char *const output, int32_t outputSize, char algorithm,
-                                               char *const buffer, int32_t bufferSize) {
-#ifdef TD_TSZ
-  if (HEAD_ALGO(input[0]) == ALGO_SZ_LOSSY) {
-    // decompress lossy
-    return tsDecompressDoubleLossyImp(input, compressedSize, nelements, output);
-  } else {
-#endif
-    // decompress lossless
-    if (algorithm == ONE_STAGE_COMP) {
-      return tsDecompressDoubleImp(input, nelements, output);
-    } else if (algorithm == TWO_STAGE_COMP) {
-      if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-      return tsDecompressDoubleImp(buffer, nelements, output);
-    } else {
-      assert(0);
-      return -1;
-    }
-#ifdef TD_TSZ
-  }
-#endif
-}

-#ifdef TD_TSZ
-//
-//  lossy float double
-//
 static FORCE_INLINE int32_t tsCompressFloatLossy(const char *const input, int32_t inputSize, const int32_t nelements,
                                                 char *const output, int32_t outputSize, char algorithm,
                                                 char *const buffer, int32_t bufferSize) {
@@ -358,33 +83,56 @@ static FORCE_INLINE int32_t tsDecompressDoubleLossy(const char *const input, int

 #endif

-static FORCE_INLINE int32_t tsCompressTimestamp(const char *const input, int32_t inputSize, const int32_t nelements,
-                                                char *const output, int32_t outputSize, char algorithm,
-                                                char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressTimestampImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int32_t len = tsCompressTimestampImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t tsDecompressTimestamp(const char *const input, int32_t compressedSize,
-                                                  const int32_t nelements, char *const output, int32_t outputSize,
-                                                  char algorithm, char *const buffer, int32_t bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressTimestampImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressTimestampImp(buffer, nelements, output);
-  } else {
-    assert(0);
-    return -1;
-  }
-}
+/*************************************************************************
+ *                  REGULAR COMPRESSION
+ *************************************************************************/
+int32_t tsCompressTimestamp(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                            int32_t nBuf);
+int32_t tsDecompressTimestamp(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg,
+                              void *pBuf, int32_t nBuf);
+int32_t tsCompressFloat(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                        int32_t nBuf);
+int32_t tsDecompressFloat(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                          int32_t nBuf);
+int32_t tsCompressDouble(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                         int32_t nBuf);
+int32_t tsDecompressDouble(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                           int32_t nBuf);
+int32_t tsCompressString(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                         int32_t nBuf);
+int32_t tsDecompressString(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                           int32_t nBuf);
+int32_t tsCompressBool(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                       int32_t nBuf);
+int32_t tsDecompressBool(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                         int32_t nBuf);
+int32_t tsCompressTinyint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                          int32_t nBuf);
+int32_t tsDecompressTinyint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                            int32_t nBuf);
+int32_t tsCompressSmallint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                           int32_t nBuf);
+int32_t tsDecompressSmallint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg,
+                             void *pBuf, int32_t nBuf);
+int32_t tsCompressInt(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                      int32_t nBuf);
+int32_t tsDecompressInt(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                        int32_t nBuf);
+int32_t tsCompressBigint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                         int32_t nBuf);
+int32_t tsDecompressBigint(void *pIn, int32_t nIn, int32_t nEle, void *pOut, int32_t nOut, uint8_t cmprAlg, void *pBuf,
+                           int32_t nBuf);
+
+/*************************************************************************
+ *                  STREAM COMPRESSION
+ *************************************************************************/
+typedef struct SCompressor SCompressor;
+
+int32_t tCompressorCreate(SCompressor **ppCmprsor);
+int32_t tCompressorDestroy(SCompressor *pCmprsor);
+int32_t tCompressStart(SCompressor *pCmprsor, int8_t type, int8_t cmprAlg);
+int32_t tCompressEnd(SCompressor *pCmprsor, const uint8_t **ppOut, int32_t *nOut, int32_t *nOrigin);
+int32_t tCompress(SCompressor *pCmprsor, const void *pData, int64_t nData);

 #ifdef __cplusplus
 }

--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
@@ -689,7 +689,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow) {
        memcpy(varDataVal(varBuf), pColVal->value.pData, pColVal->value.nData);
        val = varBuf;
      } else {
-        val = (const void *)&pColVal->value.i64;
+        val = (const void *)&pColVal->value.val;
      }
    } else {
      pColVal = NULL;

--- a/source/common/test/dataformatTest.cpp
+++ b/source/common/test/dataformatTest.cpp
@@ -13,6 +13,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+#if 0
 #include <gtest/gtest.h>

 #include <taoserror.h>
@@ -476,4 +477,5 @@ TEST(testCase, NoneTest) {
  taosArrayDestroy(pArray);
  taosMemoryFree(pTSchema);
 }
+#endif
 #endif
\ No newline at end of file
--- a/source/dnode/mnode/impl/src/mndCluster.c
+++ b/source/dnode/mnode/impl/src/mndCluster.c
@@ -237,6 +237,7 @@ static int32_t mndCreateDefaultCluster(SMnode *pMnode) {

  STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_NOTHING, NULL, "create-cluster");
  if (pTrans == NULL) {
+    sdbFreeRaw(pRaw);
    mError("cluster:%" PRId64 ", failed to create since %s", clusterObj.id, terrstr());
    return -1;
  }

--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -1594,7 +1594,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
      break;
  }
  char precVstr[10] = {0};
-  STR_WITH_SIZE_TO_VARSTR(precVstr, precStr, 2);
+  STR_WITH_MAXSIZE_TO_VARSTR(precVstr, precStr, 10);

  char *statusStr = "ready";
  if (objStatus == SDB_STATUS_CREATING) {
@@ -1607,7 +1607,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
    }
  }
  char statusVstr[24] = {0};
-  STR_WITH_SIZE_TO_VARSTR(statusVstr, statusStr, strlen(statusStr));
+  STR_WITH_MAXSIZE_TO_VARSTR(statusVstr, statusStr, 24);

  if (sysDb || !sysinfo) {
    for (int32_t i = 0; i < pShow->numOfColumns; ++i) {
@@ -1644,7 +1644,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,

    const char *strictStr = pDb->cfg.strict ? "on" : "off";
    char        strictVstr[24] = {0};
-    STR_WITH_SIZE_TO_VARSTR(strictVstr, strictStr, strlen(strictStr));
+    STR_WITH_MAXSIZE_TO_VARSTR(strictVstr, strictStr, 24);
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, rows, (const char *)strictVstr, false);

@@ -1704,7 +1704,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,

    const char *cacheModelStr = getCacheModelStr(pDb->cfg.cacheLast);
    char        cacheModelVstr[24] = {0};
-    STR_WITH_SIZE_TO_VARSTR(cacheModelVstr, cacheModelStr, strlen(cacheModelStr));
+    STR_WITH_MAXSIZE_TO_VARSTR(cacheModelVstr, cacheModelStr, 24);
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, rows, (const char *)cacheModelVstr, false);


--- a/source/dnode/mnode/impl/src/mndDef.c
+++ b/source/dnode/mnode/impl/src/mndDef.c
@@ -42,9 +42,23 @@ int32_t tEncodeSStreamObj(SEncoder *pEncoder, const SStreamObj *pObj) {
  if (tEncodeI64(pEncoder, pObj->targetStbUid) < 0) return -1;
  if (tEncodeI32(pEncoder, pObj->fixedSinkVgId) < 0) return -1;

-  if (tEncodeCStr(pEncoder, pObj->sql) < 0) return -1;
-  if (tEncodeCStr(pEncoder, pObj->ast) < 0) return -1;
-  if (tEncodeCStr(pEncoder, pObj->physicalPlan) < 0) return -1;
+  if (pObj->sql != NULL) {
+    if (tEncodeCStr(pEncoder, pObj->sql) < 0) return -1;
+  } else {
+    if (tEncodeCStr(pEncoder, "") < 0) return -1;
+  }
+
+  if (pObj->ast != NULL) {
+    if (tEncodeCStr(pEncoder, pObj->ast) < 0) return -1;
+  } else {
+    if (tEncodeCStr(pEncoder, "") < 0) return -1;
+  }
+
+  if (pObj->physicalPlan != NULL) {
+    if (tEncodeCStr(pEncoder, pObj->physicalPlan) < 0) return -1;
+  } else {
+    if (tEncodeCStr(pEncoder, "") < 0) return -1;
+  }

  int32_t sz = taosArrayGetSize(pObj->tasks);
  if (tEncodeI32(pEncoder, sz) < 0) return -1;

--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -102,7 +102,7 @@ static int32_t mndCreateDefaultDnode(SMnode *pMnode) {
  dnodeObj.updateTime = dnodeObj.createdTime;
  dnodeObj.port = tsServerPort;
  memcpy(&dnodeObj.fqdn, tsLocalFqdn, TSDB_FQDN_LEN);
-  snprintf(dnodeObj.ep, TSDB_EP_LEN, "%s:%u", dnodeObj.fqdn, dnodeObj.port);
+  snprintf(dnodeObj.ep, TSDB_EP_LEN - 1, "%s:%u", dnodeObj.fqdn, dnodeObj.port);

  pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_GLOBAL, NULL, "create-dnode");
  if (pTrans == NULL) goto _OVER;
@@ -190,7 +190,7 @@ _OVER:
 static int32_t mndDnodeActionInsert(SSdb *pSdb, SDnodeObj *pDnode) {
  mTrace("dnode:%d, perform insert action, row:%p", pDnode->id, pDnode);
  pDnode->offlineReason = DND_REASON_STATUS_NOT_RECEIVED;
-  snprintf(pDnode->ep, TSDB_EP_LEN, "%s:%u", pDnode->fqdn, pDnode->port);
+  snprintf(pDnode->ep, TSDB_EP_LEN - 1, "%s:%u", pDnode->fqdn, pDnode->port);
  return 0;
 }

@@ -253,7 +253,7 @@ int32_t mndGetDnodeSize(SMnode *pMnode) {

 bool mndIsDnodeOnline(SDnodeObj *pDnode, int64_t curMs) {
  int64_t interval = TABS(pDnode->lastAccessTime - curMs);
-  if (interval > 5000 * tsStatusInterval) {
+  if (interval > 5000 * (int64_t)tsStatusInterval) {
    if (pDnode->rebootTime > 0) {
      pDnode->offlineReason = DND_REASON_STATUS_MSG_TIMEOUT;
    }
@@ -486,7 +486,7 @@ static int32_t mndCreateDnode(SMnode *pMnode, SRpcMsg *pReq, SCreateDnodeReq *pC
  dnodeObj.updateTime = dnodeObj.createdTime;
  dnodeObj.port = pCreate->port;
  memcpy(dnodeObj.fqdn, pCreate->fqdn, TSDB_FQDN_LEN);
-  snprintf(dnodeObj.ep, TSDB_EP_LEN, "%s:%u", dnodeObj.fqdn, dnodeObj.port);
+  snprintf(dnodeObj.ep, TSDB_EP_LEN - 1, "%s:%u", dnodeObj.fqdn, dnodeObj.port);

  pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_CONFLICT_GLOBAL, pReq, "create-dnode");
  if (pTrans == NULL) goto _OVER;
@@ -673,12 +673,14 @@ static int32_t mndDropDnode(SMnode *pMnode, SRpcMsg *pReq, SDnodeObj *pDnode, SM
  mInfo("trans:%d, used to drop dnode:%d", pTrans->id, pDnode->id);

  pRaw = mndDnodeActionEncode(pDnode);
-  if (pRaw == NULL || mndTransAppendRedolog(pTrans, pRaw) != 0) goto _OVER;
+  if (pRaw == NULL) goto _OVER;
+  if (mndTransAppendRedolog(pTrans, pRaw) != 0) goto _OVER;
  sdbSetRawStatus(pRaw, SDB_STATUS_DROPPING);
  pRaw = NULL;

  pRaw = mndDnodeActionEncode(pDnode);
-  if (pRaw == NULL || mndTransAppendCommitlog(pTrans, pRaw) != 0) goto _OVER;
+  if (pRaw == NULL) goto _OVER;
+  if (mndTransAppendCommitlog(pTrans, pRaw) != 0) goto _OVER;
  sdbSetRawStatus(pRaw, SDB_STATUS_DROPPED);
  pRaw = NULL;


--- a/source/dnode/mnode/impl/src/mndFunc.c
+++ b/source/dnode/mnode/impl/src/mndFunc.c
@@ -257,15 +257,18 @@ static int32_t mndDropFunc(SMnode *pMnode, SRpcMsg *pReq, SFuncObj *pFunc) {
  mInfo("trans:%d, used to drop user:%s", pTrans->id, pFunc->name);

  SSdbRaw *pRedoRaw = mndFuncActionEncode(pFunc);
-  if (pRedoRaw == NULL || mndTransAppendRedolog(pTrans, pRedoRaw) != 0) goto _OVER;
+  if (pRedoRaw == NULL) goto _OVER;
+  if (mndTransAppendRedolog(pTrans, pRedoRaw) != 0) goto _OVER;
  sdbSetRawStatus(pRedoRaw, SDB_STATUS_DROPPING);

  SSdbRaw *pUndoRaw = mndFuncActionEncode(pFunc);
-  if (pUndoRaw == NULL || mndTransAppendUndolog(pTrans, pUndoRaw) != 0) goto _OVER;
+  if (pUndoRaw == NULL) goto _OVER;
+  if (mndTransAppendUndolog(pTrans, pUndoRaw) != 0) goto _OVER;
  sdbSetRawStatus(pUndoRaw, SDB_STATUS_READY);

  SSdbRaw *pCommitRaw = mndFuncActionEncode(pFunc);
-  if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) goto _OVER;
+  if (pCommitRaw == NULL) goto _OVER;
+  if (mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) goto _OVER;
  sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED);

  if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;

--- a/source/dnode/mnode/impl/src/mndGrant.c
+++ b/source/dnode/mnode/impl/src/mndGrant.c
@@ -30,85 +30,85 @@ static int32_t mndRetrieveGrant(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
    cols = 0;
    SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    const char      *src = "community";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "false";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    cols++;
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
    src = "unlimited";
-    STR_WITH_SIZE_TO_VARSTR(tmp, src, strlen(src));
+    STR_WITH_MAXSIZE_TO_VARSTR(tmp, src, 32);
    colDataAppend(pColInfo, numOfRows, tmp, false);

    numOfRows++;

--- a/source/dnode/mnode/impl/src/mndMain.c
+++ b/source/dnode/mnode/impl/src/mndMain.c
@@ -649,7 +649,7 @@ int32_t mndProcessRpcMsg(SRpcMsg *pMsg) {

 void mndSetMsgHandle(SMnode *pMnode, tmsg_t msgType, MndMsgFp fp) {
  tmsg_t type = TMSG_INDEX(msgType);
-  if (type >= 0 && type < TDMT_MAX) {
+  if (type < TDMT_MAX) {
    pMnode->msgFp[type] = fp;
  }
 }

--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
@@ -93,6 +93,7 @@ static int32_t mndCreateDefaultMnode(SMnode *pMnode) {

  STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_GLOBAL, NULL, "create-mnode");
  if (pTrans == NULL) {
+    sdbFreeRaw(pRaw);
    mError("mnode:%d, failed to create since %s", mnodeObj.id, terrstr());
    return -1;
  }
@@ -220,8 +221,12 @@ bool mndIsMnode(SMnode *pMnode, int32_t dnodeId) {
 void mndGetMnodeEpSet(SMnode *pMnode, SEpSet *pEpSet) {
  SSdb   *pSdb = pMnode->pSdb;
  int32_t totalMnodes = sdbGetSize(pSdb, SDB_MNODE);
-  void   *pIter = NULL;
+  if (totalMnodes == 0) {
+    syncGetRetryEpSet(pMnode->syncMgmt.sync, pEpSet);
+    return;
+  }

+  void *pIter = NULL;
  while (1) {
    SMnodeObj *pObj = NULL;
    pIter = sdbFetch(pSdb, SDB_MNODE, pIter, (void **)&pObj);
@@ -658,7 +663,7 @@ static int32_t mndRetrieveMnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
    colDataAppend(pColInfo, numOfRows, (const char *)&pObj->id, false);

    char b1[TSDB_EP_LEN + VARSTR_HEADER_SIZE] = {0};
-    STR_WITH_MAXSIZE_TO_VARSTR(b1, pObj->pDnode->ep, pShow->pMeta->pSchemas[cols].bytes);
+    STR_WITH_MAXSIZE_TO_VARSTR(b1, pObj->pDnode->ep, TSDB_EP_LEN + VARSTR_HEADER_SIZE);

    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, numOfRows, b1, false);
@@ -667,7 +672,7 @@ static int32_t mndRetrieveMnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
    if (pObj->id == pMnode->selfDnodeId) {
      roles = syncStr(TAOS_SYNC_STATE_LEADER);
    }
-    if (pObj->pDnode && mndIsDnodeOnline(pObj->pDnode, curMs)) {
+    if (mndIsDnodeOnline(pObj->pDnode, curMs)) {
      roles = syncStr(pObj->state);
      if (pObj->state == TAOS_SYNC_STATE_LEADER && pObj->id != pMnode->selfDnodeId) {
        roles = syncStr(TAOS_SYNC_STATE_ERROR);

--- a/source/dnode/mnode/impl/src/mndPerfSchema.c
+++ b/source/dnode/mnode/impl/src/mndPerfSchema.c
@@ -26,7 +26,7 @@ int32_t mndInitPerfsTableSchema(const SSysDbTableSchema *pSrc, int32_t colNum, S
  }

  for (int32_t i = 0; i < colNum; ++i) {
-    strcpy(schema[i].name, pSrc[i].name);
+    tstrncpy(schema[i].name, pSrc[i].name, sizeof(schema[i].name));

    schema[i].type = pSrc[i].type;
    schema[i].colId = i + 1;
@@ -40,7 +40,7 @@ int32_t mndInitPerfsTableSchema(const SSysDbTableSchema *pSrc, int32_t colNum, S
 int32_t mndPerfsInitMeta(SHashObj *hash) {
  STableMetaRsp meta = {0};

-  strcpy(meta.dbFName, TSDB_INFORMATION_SCHEMA_DB);
+  tstrncpy(meta.dbFName, TSDB_INFORMATION_SCHEMA_DB, sizeof(meta.dbFName));
  meta.tableType = TSDB_SYSTEM_TABLE;
  meta.sversion = 1;
  meta.tversion = 1;
@@ -50,7 +50,7 @@ int32_t mndPerfsInitMeta(SHashObj *hash) {
  getPerfDbMeta(&pSysDbTableMeta, &size);

  for (int32_t i = 0; i < size; ++i) {
-    strcpy(meta.tbName, pSysDbTableMeta[i].name);
+    tstrncpy(meta.tbName, pSysDbTableMeta[i].name, sizeof(meta.tbName));
    meta.numOfColumns = pSysDbTableMeta[i].colNum;

    if (mndInitPerfsTableSchema(pSysDbTableMeta[i].schema, pSysDbTableMeta[i].colNum, &meta.pSchemas)) {

--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
@@ -664,7 +664,7 @@ static int32_t mndProcessKillConnReq(SRpcMsg *pReq) {
 static int32_t mndProcessSvrVerReq(SRpcMsg *pReq) {
  int32_t       code = -1;
  SServerVerRsp rsp = {0};
-  strcpy(rsp.ver, version);
+  tstrncpy(rsp.ver, version, sizeof(rsp.ver));

  int32_t contLen = tSerializeSServerVerRsp(NULL, 0, &rsp);
  if (contLen < 0) goto _over;
@@ -702,7 +702,7 @@ static int32_t mndRetrieveConns(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
      break;
    }

-    if ((taosGetTimestampMs() - pConn->lastAccessTimeMs) > (keepTime * 1000)) {
+    if ((taosGetTimestampMs() - pConn->lastAccessTimeMs) > ((int64_t)keepTime * 1000)) {
      continue;
    }


--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -554,7 +554,7 @@ int32_t mndCheckCreateStbReq(SMCreateStbReq *pCreate) {

  for (int32_t i = 0; i < pCreate->numOfColumns; ++i) {
    SField *pField1 = taosArrayGet(pCreate->pColumns, i);
-    if (pField1->type < 0) {
+    if (pField1->type >= TSDB_DATA_TYPE_MAX) {
      terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
      return -1;
    }
@@ -570,7 +570,7 @@ int32_t mndCheckCreateStbReq(SMCreateStbReq *pCreate) {

  for (int32_t i = 0; i < pCreate->numOfTags; ++i) {
    SField *pField1 = taosArrayGet(pCreate->pTags, i);
-    if (pField1->type < 0) {
+    if (pField1->type >= TSDB_DATA_TYPE_MAX) {
      terrno = TSDB_CODE_MND_INVALID_STB_OPTION;
      return -1;
    }
@@ -982,8 +982,8 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
          goto _OVER;
        }
      } else {
-        mError("stb:%s, already exist while create, input tagVer:%d colVer:%d is invalid", createReq.name,
-               createReq.tagVer, createReq.colVer, pStb->tagVer, pStb->colVer);
+        mError("stb:%s, already exist while create, input tagVer:%d colVer:%d is invalid, origin tagVer:%d colVer:%d",
+               createReq.name, createReq.tagVer, createReq.colVer, pStb->tagVer, pStb->colVer);
        terrno = TSDB_CODE_MND_INVALID_SCHEMA_VER;
        goto _OVER;
      }
@@ -1603,9 +1603,9 @@ static int32_t mndBuildStbSchemaImp(SDbObj *pDb, SStbObj *pStb, const char *tbNa
    return -1;
  }

-  strcpy(pRsp->dbFName, pStb->db);
-  strcpy(pRsp->tbName, tbName);
-  strcpy(pRsp->stbName, tbName);
+  tstrncpy(pRsp->dbFName, pStb->db, sizeof(pRsp->dbFName));
+  tstrncpy(pRsp->tbName, tbName, sizeof(pRsp->tbName));
+  tstrncpy(pRsp->stbName, tbName, sizeof(pRsp->stbName));
  pRsp->dbId = pDb->uid;
  pRsp->numOfTags = pStb->numOfTags;
  pRsp->numOfColumns = pStb->numOfColumns;
@@ -1649,9 +1649,9 @@ static int32_t mndBuildStbCfgImp(SDbObj *pDb, SStbObj *pStb, const char *tbName,
    return -1;
  }

-  strcpy(pRsp->dbFName, pStb->db);
-  strcpy(pRsp->tbName, tbName);
-  strcpy(pRsp->stbName, tbName);
+  tstrncpy(pRsp->dbFName, pStb->db, sizeof(pRsp->dbFName));
+  tstrncpy(pRsp->tbName, tbName, sizeof(pRsp->tbName));
+  tstrncpy(pRsp->stbName, tbName, sizeof(pRsp->stbName));
  pRsp->numOfTags = pStb->numOfTags;
  pRsp->numOfColumns = pStb->numOfColumns;
  pRsp->tableType = TSDB_SUPER_TABLE;
@@ -2551,7 +2551,7 @@ static int32_t mndRetrieveStb(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBloc
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, numOfRows, (const char *)maxDelay, false);

-    char    rollup[128 + VARSTR_HEADER_SIZE] = {0};
+    char    rollup[160 + VARSTR_HEADER_SIZE] = {0};
    int32_t rollupNum = (int32_t)taosArrayGetSize(pStb->pFuncs);
    for (int32_t i = 0; i < rollupNum; ++i) {
      char *funcName = taosArrayGet(pStb->pFuncs, i);

--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -425,8 +425,10 @@ static int32_t mndSetStreamRecover(SMnode *pMnode, STrans *pTrans, const SStream
  SStreamObj streamObj = {0};
  memcpy(streamObj.name, pStream->name, TSDB_STREAM_FNAME_LEN);
  streamObj.status = STREAM_STATUS__RECOVER;
+
  SSdbRaw *pCommitRaw = mndStreamActionEncode(&streamObj);
-  if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
+  if (pCommitRaw == NULL) return -1;
+  if (mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
    mError("stream trans:%d, failed to append commit log since %s", pTrans->id, terrstr());
    mndTransDrop(pTrans);
    return -1;
@@ -771,12 +773,14 @@ static int32_t mndProcessDropStreamReq(SRpcMsg *pReq) {
  if (mndDropStreamTasks(pMnode, pTrans, pStream) < 0) {
    mError("stream:%s, failed to drop task since %s", dropReq.name, terrstr());
    sdbRelease(pMnode->pSdb, pStream);
+    mndTransDrop(pTrans);
    return -1;
  }

  // drop stream
  if (mndPersistDropStreamLog(pMnode, pTrans, pStream) < 0) {
    sdbRelease(pMnode->pSdb, pStream);
+    mndTransDrop(pTrans);
    return -1;
  }

@@ -945,10 +949,8 @@ static int32_t mndRetrieveStream(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
    SName            n;
    int32_t          cols = 0;

-    char streamName[TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-    tNameFromString(&n, pStream->name, T_NAME_ACCT | T_NAME_DB);
-    tNameGetDbName(&n, varDataVal(streamName));
-    varDataSetLen(streamName, strlen(varDataVal(streamName)));
+    char streamName[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(streamName, mndGetDbStr(pStream->name), sizeof(streamName));
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, numOfRows, (const char *)streamName, false);

@@ -956,28 +958,24 @@ static int32_t mndRetrieveStream(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
    colDataAppend(pColInfo, numOfRows, (const char *)&pStream->createTime, false);

    char sql[TSDB_SHOW_SQL_LEN + VARSTR_HEADER_SIZE] = {0};
-    tstrncpy(&sql[VARSTR_HEADER_SIZE], pStream->sql, TSDB_SHOW_SQL_LEN);
-    varDataSetLen(sql, strlen(&sql[VARSTR_HEADER_SIZE]));
+    STR_WITH_MAXSIZE_TO_VARSTR(sql, pStream->sql, sizeof(sql));
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, numOfRows, (const char *)sql, false);

    char status[20 + VARSTR_HEADER_SIZE] = {0};
-    mndShowStreamStatus(&status[VARSTR_HEADER_SIZE], pStream);
-    varDataSetLen(status, strlen(varDataVal(status)));
+    char status2[20] = {0};
+    mndShowStreamStatus(status2, pStream);
+    STR_WITH_MAXSIZE_TO_VARSTR(status, status2, sizeof(status));
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, numOfRows, (const char *)&status, false);

    char sourceDB[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-    tNameFromString(&n, pStream->sourceDb, T_NAME_ACCT | T_NAME_DB);
-    tNameGetDbName(&n, varDataVal(sourceDB));
-    varDataSetLen(sourceDB, strlen(varDataVal(sourceDB)));
+    STR_WITH_MAXSIZE_TO_VARSTR(sourceDB, mndGetDbStr(pStream->sourceDb), sizeof(sourceDB));
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, numOfRows, (const char *)&sourceDB, false);

    char targetDB[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-    tNameFromString(&n, pStream->targetDb, T_NAME_ACCT | T_NAME_DB);
-    tNameGetDbName(&n, varDataVal(targetDB));
-    varDataSetLen(targetDB, strlen(varDataVal(targetDB)));
+    STR_WITH_MAXSIZE_TO_VARSTR(targetDB, mndGetDbStr(pStream->targetDb), sizeof(targetDB));
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, numOfRows, (const char *)&targetDB, false);

@@ -986,9 +984,7 @@ static int32_t mndRetrieveStream(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
      colDataAppend(pColInfo, numOfRows, NULL, true);
    } else {
      char targetSTB[TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-      tNameFromString(&n, pStream->targetSTbName, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);
-      strcpy(&targetSTB[VARSTR_HEADER_SIZE], tNameGetTableName(&n));
-      varDataSetLen(targetSTB, strlen(varDataVal(targetSTB)));
+      STR_WITH_MAXSIZE_TO_VARSTR(targetSTB, mndGetStbStr(pStream->targetSTbName), sizeof(targetSTB));
      pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
      colDataAppend(pColInfo, numOfRows, (const char *)&targetSTB, false);
    }
@@ -997,8 +993,9 @@ static int32_t mndRetrieveStream(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
    colDataAppend(pColInfo, numOfRows, (const char *)&pStream->watermark, false);

    char trigger[20 + VARSTR_HEADER_SIZE] = {0};
-    mndShowStreamTrigger(&trigger[VARSTR_HEADER_SIZE], pStream);
-    varDataSetLen(trigger, strlen(varDataVal(trigger)));
+    char trigger2[20] = {0};
+    mndShowStreamTrigger(trigger2, pStream);
+    STR_WITH_MAXSIZE_TO_VARSTR(trigger, trigger2, sizeof(trigger));
    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
    colDataAppend(pColInfo, numOfRows, (const char *)&trigger, false);


--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
@@ -123,7 +123,7 @@ static int32_t mndBuildSubChangeReq(void **pBuf, int32_t *pLen, const SMqSubscri
  req.subType = pSub->subType;
  req.withMeta = pSub->withMeta;
  req.suid = pSub->stbUid;
-  strncpy(req.subKey, pSub->key, TSDB_SUBSCRIBE_KEY_LEN);
+  tstrncpy(req.subKey, pSub->key, TSDB_SUBSCRIBE_KEY_LEN);

  int32_t tlen = sizeof(SMsgHead) + tEncodeSMqRebVgReq(NULL, &req);
  void   *buf = taosMemoryMalloc(tlen);

--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -159,7 +159,7 @@ uint64_t getReaderMaxVersion(STsdbReader *pReader);

 int32_t tsdbCacherowsReaderOpen(void *pVnode, int32_t type, SArray *pTableIdList, int32_t numOfCols, void **pReader);
 int32_t tsdbRetrieveCacheRows(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds, SArray *pTableUids);
-int32_t tsdbCacherowsReaderClose(void *pReader);
+void*   tsdbCacherowsReaderClose(void *pReader);
 int32_t tsdbGetTableSchema(SVnode *pVnode, int64_t uid, STSchema **pSchema, int64_t *suid);

 void   tsdbCacheSetCapacity(SVnode *pVnode, size_t capacity);

--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -38,39 +38,43 @@ extern "C" {
    goto LABEL;                            \
  }

-typedef struct TSDBROW       TSDBROW;
-typedef struct TABLEID       TABLEID;
-typedef struct TSDBKEY       TSDBKEY;
-typedef struct SDelData      SDelData;
-typedef struct SDelIdx       SDelIdx;
-typedef struct STbData       STbData;
-typedef struct SMemTable     SMemTable;
-typedef struct STbDataIter   STbDataIter;
-typedef struct SMapData      SMapData;
-typedef struct SBlockIdx     SBlockIdx;
-typedef struct SDataBlk      SDataBlk;
-typedef struct SSttBlk       SSttBlk;
-typedef struct SDiskDataHdr  SDiskDataHdr;
-typedef struct SBlockData    SBlockData;
-typedef struct SDelFile      SDelFile;
-typedef struct SHeadFile     SHeadFile;
-typedef struct SDataFile     SDataFile;
-typedef struct SSttFile      SSttFile;
-typedef struct SSmaFile      SSmaFile;
-typedef struct SDFileSet     SDFileSet;
-typedef struct SDataFWriter  SDataFWriter;
-typedef struct SDataFReader  SDataFReader;
-typedef struct SDelFWriter   SDelFWriter;
-typedef struct SDelFReader   SDelFReader;
-typedef struct SRowIter      SRowIter;
-typedef struct STsdbFS       STsdbFS;
-typedef struct SRowMerger    SRowMerger;
-typedef struct STsdbReadSnap STsdbReadSnap;
-typedef struct SBlockInfo    SBlockInfo;
-typedef struct SSmaInfo      SSmaInfo;
-typedef struct SBlockCol     SBlockCol;
-typedef struct SVersionRange SVersionRange;
-typedef struct SLDataIter    SLDataIter;
+typedef struct TSDBROW          TSDBROW;
+typedef struct TABLEID          TABLEID;
+typedef struct TSDBKEY          TSDBKEY;
+typedef struct SDelData         SDelData;
+typedef struct SDelIdx          SDelIdx;
+typedef struct STbData          STbData;
+typedef struct SMemTable        SMemTable;
+typedef struct STbDataIter      STbDataIter;
+typedef struct SMapData         SMapData;
+typedef struct SBlockIdx        SBlockIdx;
+typedef struct SDataBlk         SDataBlk;
+typedef struct SSttBlk          SSttBlk;
+typedef struct SDiskDataHdr     SDiskDataHdr;
+typedef struct SBlockData       SBlockData;
+typedef struct SDelFile         SDelFile;
+typedef struct SHeadFile        SHeadFile;
+typedef struct SDataFile        SDataFile;
+typedef struct SSttFile         SSttFile;
+typedef struct SSmaFile         SSmaFile;
+typedef struct SDFileSet        SDFileSet;
+typedef struct SDataFWriter     SDataFWriter;
+typedef struct SDataFReader     SDataFReader;
+typedef struct SDelFWriter      SDelFWriter;
+typedef struct SDelFReader      SDelFReader;
+typedef struct SRowIter         SRowIter;
+typedef struct STsdbFS          STsdbFS;
+typedef struct SRowMerger       SRowMerger;
+typedef struct STsdbReadSnap    STsdbReadSnap;
+typedef struct SBlockInfo       SBlockInfo;
+typedef struct SSmaInfo         SSmaInfo;
+typedef struct SBlockCol        SBlockCol;
+typedef struct SVersionRange    SVersionRange;
+typedef struct SLDataIter       SLDataIter;
+typedef struct SDiskCol         SDiskCol;
+typedef struct SDiskData        SDiskData;
+typedef struct SDiskDataBuilder SDiskDataBuilder;
+typedef struct SBlkInfo         SBlkInfo;

 #define TSDB_FILE_DLMT     ((uint32_t)0xF00AFA0F)
 #define TSDB_MAX_SUBBLOCKS 8
@@ -170,7 +174,7 @@ int32_t   tCmprBlockData(SBlockData *pBlockData, int8_t cmprAlg, uint8_t **ppOut
                         int32_t aBufN[]);
 int32_t   tDecmprBlockData(uint8_t *pIn, int32_t szIn, SBlockData *pBlockData, uint8_t *aBuf[]);
 // SDiskDataHdr
-int32_t tPutDiskDataHdr(uint8_t *p, void *ph);
+int32_t tPutDiskDataHdr(uint8_t *p, const SDiskDataHdr *pHdr);
 int32_t tGetDiskDataHdr(uint8_t *p, void *ph);
 // SDelIdx
 int32_t tPutDelIdx(uint8_t *p, void *ph);
@@ -267,6 +271,7 @@ int32_t tsdbWriteDataBlk(SDataFWriter *pWriter, SMapData *mDataBlk, SBlockIdx *p
 int32_t tsdbWriteSttBlk(SDataFWriter *pWriter, SArray *aSttBlk);
 int32_t tsdbWriteBlockData(SDataFWriter *pWriter, SBlockData *pBlockData, SBlockInfo *pBlkInfo, SSmaInfo *pSmaInfo,
                           int8_t cmprAlg, int8_t toLast);
+int32_t tsdbWriteDiskData(SDataFWriter *pWriter, const SDiskData *pDiskData, SBlockInfo *pBlkInfo, SSmaInfo *pSmaInfo);

 int32_t tsdbDFileSetCopy(STsdb *pTsdb, SDFileSet *pSetFrom, SDFileSet *pSetTo);
 // SDataFReader
@@ -300,7 +305,7 @@ int32_t tsdbMerge(STsdb *pTsdb);
 #define TSDB_CACHE_LAST_ROW(c) (((c).cacheLast & 1) > 0)
 #define TSDB_CACHE_LAST(c)     (((c).cacheLast & 2) > 0)

-// tsdbCache
+// tsdbCache ==============================================================================================
 int32_t tsdbOpenCache(STsdb *pTsdb);
 void    tsdbCloseCache(STsdb *pTsdb);
 int32_t tsdbCacheInsertLast(SLRUCache *pCache, tb_uid_t uid, STSRow *row, STsdb *pTsdb);
@@ -318,6 +323,15 @@ size_t tsdbCacheGetCapacity(SVnode *pVnode);

 int32_t tsdbCacheLastArray2Row(SArray *pLastArray, STSRow **ppRow, STSchema *pSchema);

+// tsdbDiskData ==============================================================================================
+int32_t tDiskDataBuilderCreate(SDiskDataBuilder **ppBuilder);
+void   *tDiskDataBuilderDestroy(SDiskDataBuilder *pBuilder);
+int32_t tDiskDataBuilderInit(SDiskDataBuilder *pBuilder, STSchema *pTSchema, TABLEID *pId, uint8_t cmprAlg,
+                             uint8_t calcSma);
+int32_t tDiskDataBuilderClear(SDiskDataBuilder *pBuilder);
+int32_t tDiskDataAddRow(SDiskDataBuilder *pBuilder, TSDBROW *pRow, STSchema *pTSchema, TABLEID *pId);
+int32_t tGnrtDiskData(SDiskDataBuilder *pBuilder, const SDiskData **ppDiskData, const SBlkInfo **ppBlkInfo);
+
 // structs =======================
 struct STsdbFS {
  SDelFile *pDelFile;
@@ -438,6 +452,17 @@ struct SSmaInfo {
  int32_t size;
 };

+struct SBlkInfo {
+  int64_t minUid;
+  int64_t maxUid;
+  TSKEY   minKey;
+  TSKEY   maxKey;
+  int64_t minVer;
+  int64_t maxVer;
+  TSDBKEY minTKey;
+  TSDBKEY maxTKey;
+};
+
 struct SDataBlk {
  TSDBKEY    minKey;
  TSDBKEY    maxKey;
@@ -661,6 +686,38 @@ typedef struct {
  STSchema *pTSchema;
 } SSkmInfo;

+struct SDiskCol {
+  SBlockCol      bCol;
+  const uint8_t *pBit;
+  const uint8_t *pOff;
+  const uint8_t *pVal;
+  SColumnDataAgg agg;
+};
+
+struct SDiskData {
+  SDiskDataHdr   hdr;
+  const uint8_t *pUid;
+  const uint8_t *pVer;
+  const uint8_t *pKey;
+  SArray        *aDiskCol;  // SArray<SDiskCol>
+};
+
+struct SDiskDataBuilder {
+  int64_t      suid;
+  int64_t      uid;
+  int32_t      nRow;
+  uint8_t      cmprAlg;
+  uint8_t      calcSma;
+  SCompressor *pUidC;
+  SCompressor *pVerC;
+  SCompressor *pKeyC;
+  int32_t      nBuilder;
+  SArray      *aBuilder;  // SArray<SDiskColBuilder>
+  uint8_t     *aBuf[2];
+  SDiskData    dd;
+  SBlkInfo     bi;
+};
+
 int32_t tMergeTreeOpen(SMergeTree *pMTree, int8_t backward, SDataFReader *pFReader, uint64_t suid, uint64_t uid,
                       STimeWindow *pTimeWindow, SVersionRange *pVerRange, SSttBlockLoadInfo *pBlockLoadInfo,
                       bool destroyLoadInfo, const char *idStr);

--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -260,7 +260,7 @@ int32_t tsdbCacheInsertLast(SLRUCache *pCache, tb_uid_t uid, STSRow *row, STsdb
    SLastCol *tTsVal = (SLastCol *)taosArrayGet(pLast, iCol);
    if (keyTs > tTsVal->ts) {
      STColumn *pTColumn = &pTSchema->columns[0];
-      SColVal   tColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = keyTs});
+      SColVal   tColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.val = keyTs});

      taosArraySet(pLast, iCol, &(SLastCol){.ts = keyTs, .colVal = tColVal});
    }
@@ -447,7 +447,7 @@ static int32_t getNextRowFromFSLast(void *iter, TSDBROW **ppRow) {
      if (--state->iFileSet >= 0) {
        pFileSet = (SDFileSet *)taosArrayGet(state->aDFileSet, state->iFileSet);
      } else {
-        // tMergeTreeClose(&state->mergeTree);
+        tMergeTreeClose(&state->mergeTree);

        *ppRow = NULL;
        return code;
@@ -463,7 +463,7 @@ static int32_t getNextRowFromFSLast(void *iter, TSDBROW **ppRow) {
      bool hasVal = tMergeTreeNext(&state->mergeTree);
      if (!hasVal) {
        state->state = SFSLASTNEXTROW_FILESET;
-        // tMergeTreeClose(&state->mergeTree);
+        tMergeTreeClose(&state->mergeTree);
        goto _next_fileset;
      }
      state->state = SFSLASTNEXTROW_BLOCKROW;
@@ -590,7 +590,10 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
        goto _next_fileset;
      }

-      tMapDataReset(&state->blockMap);
+      if (state->blockMap.pData != NULL) {
+        tMapDataClear(&state->blockMap);
+      }
+
      code = tsdbReadDataBlk(state->pDataFReader, state->pBlockIdx, &state->blockMap);
      if (code) goto _err;

@@ -695,6 +698,10 @@ int32_t clearNextRowFromFS(void *iter) {
    state->pBlockData = NULL;
  }

+  if (state->blockMap.pData != NULL) {
+    tMapDataClear(&state->blockMap);
+  }
+
  return code;
 }

@@ -1052,7 +1059,7 @@ static int32_t mergeLastRow(tb_uid_t uid, STsdb *pTsdb, bool *dup, STSRow **ppRo
      lastRowTs = TSDBROW_TS(pRow);
      STColumn *pTColumn = &pTSchema->columns[0];

-      *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = lastRowTs});
+      *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.val = lastRowTs});
      if (taosArrayPush(pColArray, pColVal) == NULL) {
        code = TSDB_CODE_OUT_OF_MEMORY;
        goto _err;
@@ -1151,7 +1158,7 @@ static int32_t mergeLast(tb_uid_t uid, STsdb *pTsdb, SArray **ppLastArray) {
      lastRowTs = rowTs;
      STColumn *pTColumn = &pTSchema->columns[0];

-      *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = lastRowTs});
+      *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.val = lastRowTs});
      if (taosArrayPush(pColArray, &(SLastCol){.ts = lastRowTs, .colVal = *pColVal}) == NULL) {
        code = TSDB_CODE_OUT_OF_MEMORY;
        goto _err;

--- a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
@@ -101,7 +101,7 @@ int32_t tsdbCacherowsReaderOpen(void* pVnode, int32_t type, SArray* pTableIdList
  return TSDB_CODE_SUCCESS;
 }

-int32_t tsdbCacherowsReaderClose(void* pReader) {
+void* tsdbCacherowsReaderClose(void* pReader) {
  SCacheRowsReader* p = pReader;

  if (p->pSchema != NULL) {
@@ -114,7 +114,7 @@ int32_t tsdbCacherowsReaderClose(void* pReader) {
  }

  taosMemoryFree(pReader);
-  return TSDB_CODE_SUCCESS;
+  return NULL;
 }

 static int32_t doExtractCacheRow(SCacheRowsReader* pr, SLRUCache* lruCache, uint64_t uid, STSRow** pRow,

--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
--- a/source/dnode/vnode/src/tsdb/tsdbDiskData.c
+++ b/source/dnode/vnode/src/tsdb/tsdbDiskData.c
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -926,6 +926,7 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
    }
  }

+  // fill the mis-matched columns with null value
  while (i < numOfOutputCols) {
    pColData = taosArrayGet(pResBlock->pDataBlock, i);
    colDataAppendNNULL(pColData, 0, remain);
@@ -935,12 +936,15 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
  pResBlock->info.rows = remain;
  pDumpInfo->rowIndex += step * remain;

+  // check if current block are all handled
  if (pDumpInfo->rowIndex >= 0 && pDumpInfo->rowIndex < pBlock->nRow) {
-//    int64_t ts = pBlockData->aTSKEY[pDumpInfo->rowIndex];
-//    setBlockAllDumped(pDumpInfo, ts, pReader->order);
+    int64_t ts = pBlockData->aTSKEY[pDumpInfo->rowIndex];
+    if (outOfTimeWindow(ts, &pReader->window)) {  // the remain data has out of query time window, ignore current block
+      setBlockAllDumped(pDumpInfo, ts, pReader->order);
+    }
  } else {
-    int64_t k = asc ? pBlock->maxKey.ts : pBlock->minKey.ts;
-    setBlockAllDumped(pDumpInfo, k, pReader->order);
+    int64_t ts = asc ? pBlock->maxKey.ts : pBlock->minKey.ts;
+    setBlockAllDumped(pDumpInfo, ts, pReader->order);
  }

  double elapsedTime = (taosGetTimestampUs() - st) / 1000.0;

--- a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
@@ -128,7 +128,7 @@ _exit:
  return code;
 }

-static int32_t tsdbWriteFile(STsdbFD *pFD, int64_t offset, uint8_t *pBuf, int64_t size) {
+static int32_t tsdbWriteFile(STsdbFD *pFD, int64_t offset, const uint8_t *pBuf, int64_t size) {
  int32_t code = 0;
  int64_t fOffset = LOGIC_TO_FILE_OFFSET(offset, pFD->szPage);
  int64_t pgno = OFFSET_PGNO(fOffset, pFD->szPage);
@@ -522,9 +522,6 @@ static int32_t tsdbWriteBlockSma(SDataFWriter *pWriter, SBlockData *pBlockData,

  // write
  if (pSmaInfo->size) {
-    code = tRealloc(&pWriter->aBuf[0], pSmaInfo->size);
-    if (code) goto _err;
-
    code = tsdbWriteFile(pWriter->pSmaFD, pWriter->fSma.size, pWriter->aBuf[0], pSmaInfo->size);
    if (code) goto _err;

@@ -607,6 +604,132 @@ _err:
  return code;
 }

+int32_t tsdbWriteDiskData(SDataFWriter *pWriter, const SDiskData *pDiskData, SBlockInfo *pBlkInfo, SSmaInfo *pSmaInfo) {
+  int32_t code = 0;
+  int32_t lino = 0;
+
+  STsdbFD *pFD = NULL;
+  if (pSmaInfo) {
+    pFD = pWriter->pDataFD;
+    pBlkInfo->offset = pWriter->fData.size;
+  } else {
+    pFD = pWriter->pSttFD;
+    pBlkInfo->offset = pWriter->fStt[pWriter->wSet.nSttF - 1].size;
+  }
+  pBlkInfo->szBlock = 0;
+  pBlkInfo->szKey = 0;
+
+  // hdr
+  int32_t n = tPutDiskDataHdr(NULL, &pDiskData->hdr);
+  code = tRealloc(&pWriter->aBuf[0], n);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+  tPutDiskDataHdr(pWriter->aBuf[0], &pDiskData->hdr);
+
+  code = tsdbWriteFile(pFD, pBlkInfo->offset, pWriter->aBuf[0], n);
+  TSDB_CHECK_CODE(code, lino, _exit);
+  pBlkInfo->szKey += n;
+  pBlkInfo->szBlock += n;
+
+  // uid + ver + key
+  if (pDiskData->pUid) {
+    code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskData->pUid, pDiskData->hdr.szUid);
+    TSDB_CHECK_CODE(code, lino, _exit);
+    pBlkInfo->szKey += pDiskData->hdr.szUid;
+    pBlkInfo->szBlock += pDiskData->hdr.szUid;
+  }
+
+  code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskData->pVer, pDiskData->hdr.szVer);
+  TSDB_CHECK_CODE(code, lino, _exit);
+  pBlkInfo->szKey += pDiskData->hdr.szVer;
+  pBlkInfo->szBlock += pDiskData->hdr.szVer;
+
+  code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskData->pKey, pDiskData->hdr.szKey);
+  TSDB_CHECK_CODE(code, lino, _exit);
+  pBlkInfo->szKey += pDiskData->hdr.szKey;
+  pBlkInfo->szBlock += pDiskData->hdr.szKey;
+
+  // aBlockCol
+  if (pDiskData->hdr.szBlkCol) {
+    code = tRealloc(&pWriter->aBuf[0], pDiskData->hdr.szBlkCol);
+    TSDB_CHECK_CODE(code, lino, _exit);
+
+    n = 0;
+    for (int32_t iDiskCol = 0; iDiskCol < taosArrayGetSize(pDiskData->aDiskCol); iDiskCol++) {
+      SDiskCol *pDiskCol = (SDiskCol *)taosArrayGet(pDiskData->aDiskCol, iDiskCol);
+      n += tPutBlockCol(pWriter->aBuf[0] + n, pDiskCol);
+    }
+    ASSERT(n == pDiskData->hdr.szBlkCol);
+
+    code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pWriter->aBuf[0], pDiskData->hdr.szBlkCol);
+    TSDB_CHECK_CODE(code, lino, _exit);
+
+    pBlkInfo->szBlock += pDiskData->hdr.szBlkCol;
+  }
+
+  // aDiskCol
+  for (int32_t iDiskCol = 0; iDiskCol < taosArrayGetSize(pDiskData->aDiskCol); iDiskCol++) {
+    SDiskCol *pDiskCol = (SDiskCol *)taosArrayGet(pDiskData->aDiskCol, iDiskCol);
+
+    if (pDiskCol->pBit) {
+      code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskCol->pBit, pDiskCol->bCol.szBitmap);
+      TSDB_CHECK_CODE(code, lino, _exit);
+
+      pBlkInfo->szBlock += pDiskCol->bCol.szBitmap;
+    }
+
+    if (pDiskCol->pOff) {
+      code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskCol->pOff, pDiskCol->bCol.szOffset);
+      TSDB_CHECK_CODE(code, lino, _exit);
+
+      pBlkInfo->szBlock += pDiskCol->bCol.szOffset;
+    }
+
+    if (pDiskCol->pVal) {
+      code = tsdbWriteFile(pFD, pBlkInfo->offset + pBlkInfo->szBlock, pDiskCol->pVal, pDiskCol->bCol.szValue);
+      TSDB_CHECK_CODE(code, lino, _exit);
+
+      pBlkInfo->szBlock += pDiskCol->bCol.szValue;
+    }
+  }
+
+  if (pSmaInfo) {
+    pWriter->fData.size += pBlkInfo->szBlock;
+  } else {
+    pWriter->fStt[pWriter->wSet.nSttF - 1].size += pBlkInfo->szBlock;
+    goto _exit;
+  }
+
+  pSmaInfo->offset = 0;
+  pSmaInfo->size = 0;
+  for (int32_t iDiskCol = 0; iDiskCol < taosArrayGetSize(pDiskData->aDiskCol); iDiskCol++) {
+    SDiskCol *pDiskCol = (SDiskCol *)taosArrayGet(pDiskData->aDiskCol, iDiskCol);
+
+    if (IS_VAR_DATA_TYPE(pDiskCol->bCol.type)) continue;
+    if (pDiskCol->bCol.flag == HAS_NULL || pDiskCol->bCol.flag == (HAS_NULL | HAS_NONE)) continue;
+    if (!pDiskCol->bCol.smaOn) continue;
+
+    code = tRealloc(&pWriter->aBuf[0], pSmaInfo->size + tPutColumnDataAgg(NULL, &pDiskCol->agg));
+    TSDB_CHECK_CODE(code, lino, _exit);
+    pSmaInfo->size += tPutColumnDataAgg(pWriter->aBuf[0] + pSmaInfo->size, &pDiskCol->agg);
+  }
+
+  if (pSmaInfo->size) {
+    pSmaInfo->offset = pWriter->fSma.size;
+
+    code = tsdbWriteFile(pWriter->pSmaFD, pSmaInfo->offset, pWriter->aBuf[0], pSmaInfo->size);
+    TSDB_CHECK_CODE(code, lino, _exit);
+
+    pWriter->fSma.size += pSmaInfo->size;
+  }
+
+_exit:
+  if (code) {
+    tsdbError("vgId:%d %s failed at %d since %s", TD_VID(pWriter->pTsdb->pVnode), __func__, lino, tstrerror(code));
+  }
+  return code;
+}
+
 int32_t tsdbDFileSetCopy(STsdb *pTsdb, SDFileSet *pSetFrom, SDFileSet *pSetTo) {
  int32_t   code = 0;
  int64_t   n;
@@ -946,8 +1069,8 @@ static int32_t tsdbReadBlockDataImpl(SDataFReader *pReader, SBlockInfo *pBlkInfo

  ASSERT(hdr.delimiter == TSDB_FILE_DLMT);
  ASSERT(pBlockData->suid == hdr.suid);
-  ASSERT(pBlockData->uid == hdr.uid);

+  pBlockData->uid = hdr.uid;
  pBlockData->nRow = hdr.nRow;

  // uid

--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@@ -328,14 +328,14 @@ int32_t vnodeProcessSyncMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
  const STraceId *trace = &pMsg->info.traceId;

  if (!syncEnvIsStart()) {
-    vGError("vgId:%d, msg:%p failed to process since sync env not start", pVnode->config.vgId);
+    vGError("vgId:%d, msg:%p failed to process since sync env not start", pVnode->config.vgId, pMsg);
    terrno = TSDB_CODE_APP_ERROR;
    return -1;
  }

  SSyncNode *pSyncNode = syncNodeAcquire(pVnode->sync);
  if (pSyncNode == NULL) {
-    vGError("vgId:%d, msg:%p failed to process since invalid sync node", pVnode->config.vgId);
+    vGError("vgId:%d, msg:%p failed to process since invalid sync node", pVnode->config.vgId, pMsg);
    terrno = TSDB_CODE_SYN_INTERNAL_ERROR;
    return -1;
  }
@@ -394,7 +394,7 @@ int32_t vnodeProcessSyncMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
      SRpcMsg rsp = {.code = code, .info = pMsg->info};
      tmsgSendRsp(&rsp);
    } else {
-      vGError("vgId:%d, msg:%p failed to process since error msg type:%d", pVnode->config.vgId, pMsg->msgType);
+      vGError("vgId:%d, msg:%p failed to process since error msg type:%d", pVnode->config.vgId, pMsg, pMsg->msgType);
      code = -1;
    }

@@ -459,7 +459,7 @@ int32_t vnodeProcessSyncMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
      SRpcMsg rsp = {.code = code, .info = pMsg->info};
      tmsgSendRsp(&rsp);
    } else {
-      vGError("vgId:%d, msg:%p failed to process since error msg type:%d", pVnode->config.vgId, pMsg->msgType);
+      vGError("vgId:%d, msg:%p failed to process since error msg type:%d", pVnode->config.vgId, pMsg, pMsg->msgType);
      code = -1;
    }
  }
@@ -630,7 +630,7 @@ static int32_t vnodeSnapshotStartWrite(struct SSyncFSM *pFsm, void *pParam, void
      vInfo("vgId:%d, start write vnode snapshot since apply queue is empty", pVnode->config.vgId);
      break;
    } else {
-      vInfo("vgId:%d, write vnode snapshot later since %d items in apply queue", pVnode->config.vgId);
+      vInfo("vgId:%d, write vnode snapshot later since %d items in apply queue", pVnode->config.vgId, itemSize);
      taosMsleep(10);
    }
  } while (true);
@@ -683,7 +683,7 @@ static void vnodeRestoreFinish(struct SSyncFSM *pFsm) {
      vInfo("vgId:%d, apply queue is empty, restore finish", pVnode->config.vgId);
      break;
    } else {
-      vInfo("vgId:%d, restore not finish since %d items in apply queue", pVnode->config.vgId);
+      vInfo("vgId:%d, restore not finish since %d items in apply queue", pVnode->config.vgId, itemSize);
      taosMsleep(10);
    }
  } while (true);

--- a/source/libs/executor/inc/executil.h
+++ b/source/libs/executor/inc/executil.h
@@ -15,7 +15,6 @@
 #ifndef TDENGINE_QUERYUTIL_H
 #define TDENGINE_QUERYUTIL_H

-#include "vnode.h"
 #include "function.h"
 #include "nodes.h"
 #include "plannodes.h"
@@ -23,6 +22,7 @@
 #include "tcommon.h"
 #include "tpagedbuf.h"
 #include "tsimplehash.h"
+#include "vnode.h"

 #define T_LONG_JMP(_obj, _c) \
  do {                       \
@@ -93,7 +93,7 @@ void   resetResultRow(SResultRow* pResultRow, size_t entrySize);
 struct SResultRowEntryInfo* getResultEntryInfo(const SResultRow* pRow, int32_t index, const int32_t* offset);

 static FORCE_INLINE SResultRow* getResultRowByPos(SDiskbasedBuf* pBuf, SResultRowPosition* pos, bool forUpdate) {
-  SFilePage*  bufPage = (SFilePage*)getBufPage(pBuf, pos->pageId);
+  SFilePage* bufPage = (SFilePage*)getBufPage(pBuf, pos->pageId);
  if (forUpdate) {
    setBufPageDirty(bufPage, true);
  }
@@ -101,11 +101,6 @@ static FORCE_INLINE SResultRow* getResultRowByPos(SDiskbasedBuf* pBuf, SResultRo
  return pRow;
 }

-static FORCE_INLINE void setResultBufPageDirty(SDiskbasedBuf* pBuf, SResultRowPosition* pos) {
-  void* pPage = getBufPage(pBuf, pos->pageId);
-  setBufPageDirty(pPage, true);
-}
-
 void initGroupedResultInfo(SGroupResInfo* pGroupResInfo, SSHashObj* pHashmap, int32_t order);
 void cleanupGroupResInfo(SGroupResInfo* pGroupResInfo);

@@ -117,17 +112,18 @@ int32_t getNumOfTotalRes(SGroupResInfo* pGroupResInfo);
 SSDataBlock* createResDataBlock(SDataBlockDescNode* pNode);

 EDealRes doTranslateTagExpr(SNode** pNode, void* pContext);
-int32_t getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, SNode* pTagIndexCond, STableListInfo* pListInfo);
-int32_t getGroupIdFromTagsVal(void* pMeta, uint64_t uid, SNodeList* pGroupNode, char* keyBuf, uint64_t* pGroupId);
-int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableListInfo* pTableListInfo);
-size_t  getTableTagsBufLen(const SNodeList* pGroups);
-
-SArray*  createSortInfo(SNodeList* pNodeList);
-SArray*  extractPartitionColInfo(SNodeList* pNodeList);
-SArray*  extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNodeList, int32_t* numOfOutputCols,
-                             int32_t type);
-
-void createExprFromTargetNode(SExprInfo* pExp, STargetNode* pTargetNode);
+int32_t  getTableList(void* metaHandle, void* pVnode, SScanPhysiNode* pScanNode, SNode* pTagCond, SNode* pTagIndexCond,
+                      STableListInfo* pListInfo);
+int32_t  getGroupIdFromTagsVal(void* pMeta, uint64_t uid, SNodeList* pGroupNode, char* keyBuf, uint64_t* pGroupId);
+int32_t  getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableListInfo* pTableListInfo);
+size_t   getTableTagsBufLen(const SNodeList* pGroups);
+
+SArray* createSortInfo(SNodeList* pNodeList);
+SArray* extractPartitionColInfo(SNodeList* pNodeList);
+SArray* extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNodeList, int32_t* numOfOutputCols,
+                            int32_t type);
+
+void       createExprFromTargetNode(SExprInfo* pExp, STargetNode* pTargetNode);
 SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t* numOfExprs);

 SqlFunctionCtx* createSqlFunctionCtx(SExprInfo* pExprInfo, int32_t numOfOutput, int32_t** rowEntryInfoOffset);

--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
--- a/source/libs/executor/src/cachescanoperator.c
+++ b/source/libs/executor/src/cachescanoperator.c
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
--- a/source/libs/executor/src/tfill.c
+++ b/source/libs/executor/src/tfill.c
@@ -1620,9 +1620,7 @@ SOperatorInfo* createStreamFillOperatorInfo(SOperatorInfo* downstream, SStreamFi
    goto _error;
  }

-  SInterval* pInterval = QUERY_NODE_PHYSICAL_PLAN_STREAM_FINAL_INTERVAL == downstream->operatorType
-                             ? &((SStreamFinalIntervalOperatorInfo*)downstream->info)->interval
-                             : &((SStreamIntervalOperatorInfo*)downstream->info)->interval;
+  SInterval* pInterval = &((SStreamIntervalOperatorInfo*)downstream->info)->interval;
  int32_t    numOfFillCols = 0;
  SExprInfo* pFillExprInfo = createExprInfo(pPhyFillNode->pFillExprs, NULL, &numOfFillCols);
  pInfo->pFillSup = initStreamFillSup(pPhyFillNode, pInterval, pFillExprInfo, numOfFillCols);

--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
--- a/source/libs/parser/inc/parUtil.h
+++ b/source/libs/parser/inc/parUtil.h
--- a/source/libs/parser/src/parAstParser.c
+++ b/source/libs/parser/src/parAstParser.c
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
--- a/source/libs/parser/test/parSelectTest.cpp
+++ b/source/libs/parser/test/parSelectTest.cpp
--- a/source/libs/parser/test/parTestMain.cpp
+++ b/source/libs/parser/test/parTestMain.cpp
--- a/source/libs/planner/test/planTestMain.cpp
+++ b/source/libs/planner/test/planTestMain.cpp
--- a/source/libs/stream/src/streamState.c
+++ b/source/libs/stream/src/streamState.c
--- a/source/util/src/tcompression.c
+++ b/source/util/src/tcompression.c
--- a/tests/script/tsim/stream/distributeInterval0.sim
+++ b/tests/script/tsim/stream/distributeInterval0.sim
--- a/tests/script/tsim/stream/sliding.sim
+++ b/tests/script/tsim/stream/sliding.sim