other: merge 3.0.

Jenkinsfile2

@@ -401,7 +401,7 @@ pipeline {
                     }
                 }
                 stage('linux test') {
-                    agent{label " slave1_47 || slave1_48 || slave1_49 || slave1_50 || slave1_52  || slave1_59 || slave1_63 ||  worker03 || slave215 || slave217 || slave219 "}
+                    agent{label "slave1_47 || slave1_48 || slave1_49 || slave1_50 || slave1_52 || slave1_59 || slave1_63 || worker03 || slave215 || slave217 || slave219 "}
                     options { skipDefaultCheckout() } 
                     when {
                         changeRequest()
@@ -416,7 +416,7 @@ pipeline {
                             echo "${WKDIR}/restore.sh -p ${BRANCH_NAME} -n ${BUILD_ID} -c {container name}"
                         }
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                            timeout(time: 150, unit: 'MINUTES'){
+                            timeout(time: 200, unit: 'MINUTES'){
                                 pre_test()
                                 script {
                                     sh '''
@@ -454,7 +454,7 @@ pipeline {
                                         cd ${WKC}/tests/parallel_test
                                         export DEFAULT_RETRY_TIME=2
                                         date
-                                        ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 900 ''' + extra_param + '''
+                                        ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + '''
                                     '''
                                 }
                             }

docs/en/12-taos-sql/03-table.md

@@ -49,6 +49,7 @@ table_option: {
 7. Escape character "\`" can be used to avoid the conflict between table names and reserved keywords, above rules will be bypassed when using escape character on table names, but the upper limit for the name length is still valid. The table names specified using escape character are case sensitive.
    For example \`aBc\` and \`abc\` are different table names but `abc` and `aBc` are same table names because they are both converted to `abc` internally.
    Only ASCII visible characters can be used with escape character.
+8. For the details of using `ENCODE` and `COMPRESS`, please refer to [Encode and Compress for Column](../compress).
 
 **Parameter description**
 

docs/en/12-taos-sql/04-stable.md

@@ -13,17 +13,29 @@ create_definition:
     col_name column_definition
  
 column_definition:
-    type_name
+    type_name [comment 'string_value'] [PRIMARY KEY] [ENCODE 'encode_type'] [COMPRESS 'compress_type'] [LEVEL 'level_type']
+
+table_options:
+    table_option ...
+
+table_option: {
+    COMMENT 'string_value'
+  | SMA(col_name [, col_name] ...)
+  | TTL value
+}
+
 ```
 
 **More explanations**
-- Each supertable can have a maximum of 4096 columns, including tags. The minimum number of columns is 3: a timestamp column used as the key, one tag column, and one data column.
-- The TAGS keyword defines the tag columns for the supertable. The following restrictions apply to tag columns:
+1. Each supertable can have a maximum of 4096 columns, including tags. The minimum number of columns is 3: a timestamp column used as the key, one tag column, and one data column.
+2. Since version 3.3.0.0, besides the timestamp, you can specify another column as primary key using `PRIMARY KEY` keyword, the column specified using `primary key` must be type of integer or varchar.
+2. The TAGS keyword defines the tag columns for the supertable. The following restrictions apply to tag columns:
     - A tag column can use the TIMESTAMP data type, but the values in the column must be fixed numbers. Timestamps including formulae, such as "now + 10s", cannot be stored in a tag column.
     - The name of a tag column cannot be the same as the name of any other column.
     - The name of a tag column cannot be a reserved keyword.
     - Each supertable must contain between 1 and 128 tags. The total length of the TAGS keyword cannot exceed 16 KB.
-- For more information about table parameters, see Create a Table.
+3. Regarding how to use `ENCODE` and `COMPRESS`, please refer to [Encode and Compress for Column](../compress).
+3. For more information about table parameters, see [Create a Table](../table).
 
 ## View a Supertable
 

docs/en/12-taos-sql/06-select.md

@@ -65,10 +65,16 @@ interp_clause:
     RANGE(ts_val [, ts_val]) EVERY(every_val) FILL(fill_mod_and_val)
 
 partition_by_clause:
-    PARTITION BY expr [, expr] ...
+    PARTITION BY partition_by_expr [, partition_by_expr] ...
+
+partition_by_expr:
+    {expr | position | c_alias}
 
 group_by_clause:
-    GROUP BY expr [, expr] ... HAVING condition
+    GROUP BY group_by_expr [, group_by_expr] ... HAVING condition
+                                                    
+group_by_expr:
+    {expr | position | c_alias}
 
 order_by_clasue:
     ORDER BY order_expr [, order_expr] ...
@@ -274,7 +280,13 @@ If you use a GROUP BY clause, the SELECT list can only include the following ite
 
 The GROUP BY clause groups each row of data by the value of the expression following the clause and returns a combined result for each group.
 
-The expressions in a GROUP BY clause can include any column in any table or view. It is not necessary that the expressions appear in the SELECT list.
+In the GROUP BY clause, columns from a table or view can be grouped by specifying the column name. These columns do not need to be included in the SELECT list.
+
+You can specify integers in GROUP BY expression to indicate the expressions in the select list used for grouping. For example, 1 indicates the first item in the select list.
+
+You can specify column names in result set to indicate the expressions in the select list used for grouping.
+
+When using position and result set column names for grouping in the GROUP BY clause, the corresponding expressions in the select list must not be aggregate functions.
 
 The GROUP BY clause does not guarantee that the results are ordered. If you want to ensure that grouped data is ordered, use the ORDER BY clause.
 

docs/en/12-taos-sql/12-distinguished.md

@@ -38,7 +38,7 @@ select _wstart, tbname, avg(voltage) from meters partition by tbname interval(10
 
 ## Windowed Queries
 
-Aggregation by time window is supported in TDengine. For example, in the case where temperature sensors report the temperature every seconds, the average temperature for every 10 minutes can be retrieved by performing a query with a time window. Window related clauses are used to divide the data set to be queried into subsets and then aggregation is performed across the subsets. There are four kinds of windows: time window, status window, session window, and event window. There are two kinds of time windows: sliding window and flip time/tumbling window. The syntax of window clause is as follows:
+Aggregation by time window is supported in TDengine. For example, in the case where temperature sensors report the temperature every seconds, the average temperature for every 10 minutes can be retrieved by performing a query with a time window. Window related clauses are used to divide the data set to be queried into subsets and then aggregation is performed across the subsets. There are five kinds of windows: time window, status window, session window, event window, and count window. There are two kinds of time windows: sliding window and flip time/tumbling window. The syntax of window clause is as follows:
 
 ```sql
 window_clause: {

docs/en/14-reference/12-config/index.md

@@ -729,6 +729,57 @@ The charset that takes effect is UTF-8.
 | Value Range | -1: none message is compressed; 0: all messages are compressed; N (N>0): messages exceeding N bytes are compressed |
 | Default     | -1                                                                                                                 |
 
+### fPrecision
+
+| Attribute     | Description                           |
+| -------- | -------------------------------- |
+| Application | Server Only                         |
+| Meaning     | Compression precision for float data type    |
+| Value Range | 0.1 ~ 0.00000001                 |
+| Default   | 0.00000001                       |
+| Note | The floating value below this setting will be cut off |
+
+### dPrecision
+
+| Attribute     | Description                            |
+| -------- | -------------------------------- |
+| Applicable | Server Only                        |
+| Meaning     | Compression precision for double data type |
+| Value Range | 0.1 ~ 0.0000000000000001         |
+| Default   | 0.0000000000000001               |
+| Note | The floating value below this setting will be cut off |
+
+### lossyColumn
+
+| Attribute     | Description                             |
+| -------- | -------------------------------- |
+| Applicable | Server Only                         |
+| Meaning     | Enable TSZ lossy compression for float and/or double |
+| Value Range |  float, double        |
+| Default   | none: disable TSZ lossy compression                |
+
+**补充说明**
+1. It's only available since 3.2.0.0 version, and can't downgrade to previous version once upgrading to 3.2.0.0 and enabling this parameter
+2. TSZ compression algorithm compresses data based on data prediction technique, so it's more suitable for data with specific pattern
+3. TSZ compression algorithm may take longer time but it has better compression ratio, so it's suitable when you have enough CPU resources and are more sensitive to disk occupation
+4. Example: enable TSZ for both float and double
+```shell
+lossyColumns     float|double
+```
+5. After configuring, taosd service needs to restarted. After restarting, if you see the following output in taosd logfile, it means the function has been enabled
+```sql
+   02/22 10:49:27.607990 00002933 UTL  lossyColumns     float|double
+```
+
+### ifAdtFse 
+
+| Attribute     | Description                         |
+| -------- | -------------------------------- |
+| Applicable | Server Only                         |
+| Meaning     | Replace HUFFMAN with FSE in TSZ, FSE is faster when compressing but slower when uncompressing |
+| Value Range |  0: Use HUFFMAN, 1: Use FSE         |
+| Default   | 0: Use HUFFMAN               |
+
 
 ## Other Parameters
 

docs/examples/c/multi_bind_example.c

@@ -33,7 +33,7 @@ void executeSQL(TAOS *taos, const char *sql) {
 void checkErrorCode(TAOS_STMT *stmt, int code, const char *msg) {
   if (code != 0) {
     printf("%s. error: %s\n", msg, taos_stmt_errstr(stmt));
-    taos_stmt_close(stmt);
+    (void)taos_stmt_close(stmt);
     exit(EXIT_FAILURE);
   }
 }
@@ -123,7 +123,7 @@ void insertData(TAOS *taos) {
   int affectedRows = taos_stmt_affected_rows(stmt);
   printf("successfully inserted %d rows\n", affectedRows);
   // close
-  taos_stmt_close(stmt);
+  (void)taos_stmt_close(stmt);
 }
 
 int main() {

docs/examples/c/stmt_example.c

@@ -33,7 +33,7 @@ void executeSQL(TAOS *taos, const char *sql) {
 void checkErrorCode(TAOS_STMT *stmt, int code, const char* msg) {
   if (code != 0) {
     printf("%s. error: %s\n", msg, taos_stmt_errstr(stmt));
-    taos_stmt_close(stmt);
+    (void)taos_stmt_close(stmt);
     exit(EXIT_FAILURE);
   }
 }
@@ -119,7 +119,7 @@ void insertData(TAOS *taos) {
   int affectedRows = taos_stmt_affected_rows(stmt);
   printf("successfully inserted %d rows\n", affectedRows);
   // close
-  taos_stmt_close(stmt);
+  (void)taos_stmt_close(stmt);
 }
 
 int main() {

docs/examples/c/subscribe_demo.c

@@ -1,66 +0,0 @@
-// A simple demo for asynchronous subscription.
-// compile with:
-// gcc -o subscribe_demo subscribe_demo.c -ltaos
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <taos.h>
-
-int nTotalRows;
-
-/**
- * @brief callback function of subscription.
- *
- * @param tsub
- * @param res
- * @param param. the additional parameter passed to  taos_subscribe
- * @param code. error code
- */
-void subscribe_callback(TAOS_SUB* tsub, TAOS_RES* res, void* param, int code) {
-  if (code != 0) {
-    printf("error: %d\n", code);
-    exit(EXIT_FAILURE);
-  }
-
-  TAOS_ROW    row = NULL;
-  int         num_fields = taos_num_fields(res);
-  TAOS_FIELD* fields = taos_fetch_fields(res);
-  int         nRows = 0;
-
-  while ((row = taos_fetch_row(res))) {
-    char buf[4096] = {0};
-    taos_print_row(buf, row, fields, num_fields);
-    puts(buf);
-    nRows++;
-  }
-
-  nTotalRows += nRows;
-  printf("%d rows consumed.\n", nRows);
-}
-
-int main() {
-  TAOS* taos = taos_connect("localhost", "root", "taosdata", NULL, 6030);
-  if (taos == NULL) {
-    printf("failed to connect to server\n");
-    exit(EXIT_FAILURE);
-  }
-
-  int         restart = 1;  // if the topic already exists, where to subscribe from the begin.
-  const char* topic = "topic-meter-current-bg-10";
-  const char* sql = "select * from power.meters where current > 10";
-  void*       param = NULL;     // additional parameter.
-  int         interval = 2000;  // consumption interval in microseconds.
-  TAOS_SUB*   tsub = taos_subscribe(taos, restart, topic, sql, subscribe_callback, NULL, interval);
-
-  // wait for insert from others process. you can open TDengine CLI to insert some records for test.
-  
-  getchar();  // press Enter to stop
-
-  printf("total rows consumed: %d\n", nTotalRows);
-  int keep = 0;  // whether to keep subscribe process
-  taos_unsubscribe(tsub, keep);
-
-  taos_close(taos);
-  taos_cleanup();
-}

docs/zh/12-taos-sql/03-table.md

@@ -49,6 +49,7 @@ table_option: {
 6. 使用数据类型 BINARY/NCHAR/GEOMETRY，需指定其最长的字节数，如 BINARY(20)，表示 20 字节。
 7. 为了兼容支持更多形式的表名，TDengine 引入新的转义符 "\`"，可以让表名与关键词不冲突，同时不受限于上述表名称合法性约束检查。但是同样具有长度限制要求。使用转义字符以后，不再对转义字符中的内容进行大小写统一，
    例如：\`aBc\` 和 \`abc\` 是不同的表名，但是 abc 和 aBc 是相同的表名。
+8. 关于 `ENCODE` 和 `COMPRESS` 的使用，请参考[按列压缩](../compress)
 
 **参数说明**
 

docs/zh/12-taos-sql/04-stable.md

@@ -13,17 +13,28 @@ create_definition:
     col_name column_definition
  
 column_definition:
-    type_name
+    type_name [comment 'string_value'] [PRIMARY KEY] [ENCODE 'encode_type'] [COMPRESS 'compress_type'] [LEVEL 'level_type']
+
+table_options:
+    table_option ...
+
+table_option: {
+    COMMENT 'string_value'
+  | SMA(col_name [, col_name] ...)
+  | TTL value
+}
 ```
 
 **使用说明**
-- 超级表中列的最大个数为 4096，需要注意，这里的 4096 是包含 TAG 列在内的，最小个数为 3，包含一个时间戳主键、一个 TAG 列和一个数据列。
-- TAGS语法指定超级表的标签列，标签列需要遵循以下约定：
+1. 超级表中列的最大个数为 4096，需要注意，这里的 4096 是包含 TAG 列在内的，最小个数为 3，包含一个时间戳主键、一个 TAG 列和一个数据列。
+2. 除时间戳主键列之外，还可以通过 PRIMARY KEY 关键字指定第二列为额外的主键列。被指定为主键列的第二列必须为整型或字符串类型（varchar）
+3. TAGS语法指定超级表的标签列，标签列需要遵循以下约定：
     - TAGS 中的 TIMESTAMP 列写入数据时需要提供给定值，而暂不支持四则运算，例如 NOW + 10s 这类表达式。
     - TAGS 列名不能与其他列名相同。
     - TAGS 列名不能为预留关键字。
     - TAGS 最多允许 128 个，至少 1 个，总长度不超过 16 KB。
-- 关于表参数的详细说明，参见 CREATE TABLE 中的介绍。
+4. 关于 `ENCODE` 和 `COMPRESS` 的使用，请参考 [按列压缩](../compress)
+5. 关于 table_option 中的参数说明，请参考 [建表 SQL 说明](../table)
 
 ## 查看超级表
 

docs/zh/12-taos-sql/06-select.md

@@ -65,10 +65,16 @@ interp_clause:
     RANGE(ts_val [, ts_val]) EVERY(every_val) FILL(fill_mod_and_val)
 
 partition_by_clause:
-    PARTITION BY expr [, expr] ...
+    PARTITION BY partition_by_expr [, partition_by_expr] ...
+
+partition_by_expr:
+    {expr | position | c_alias}
 
 group_by_clause:
-    GROUP BY expr [, expr] ... HAVING condition
+    GROUP BY group_by_expr [, group_by_expr] ... HAVING condition
+                                                    
+group_by_expr:
+    {expr | position | c_alias}
 
 order_by_clasue:
     ORDER BY order_expr [, order_expr] ...
@@ -274,7 +280,13 @@ TDengine 支持基于时间戳主键的 INNER JOIN，规则如下：
 
 GROUP BY 子句对每行数据按 GROUP BY 后的表达式的值进行分组，并为每个组返回一行汇总信息。
 
-GROUP BY 子句中的表达式可以包含表或视图中的任何列，这些列不需要出现在 SELECT 列表中。
+GROUP BY 子句中可以通过指定表或视图的列名来按照表或视图中的任何列分组，这些列不需要出现在 SELECT 列表中。
+
+GROUP BY 子句中可以使用位置语法，位置标识为正整数，从 1 开始，表示使用 SELECT 列表的第几个表达式进行分组。
+
+GROUP BY 子句中可以使用结果集列名，表示使用 SELECT 列表的指定表达式进行分组。
+
+GROUP BY 子句中在使用位置语法和结果集列名进行分组时，其对应的 SELECT 列表中的表达式不能是聚集函数。
 
 该子句对行进行分组，但不保证结果集的顺序。若要对分组进行排序，请使用 ORDER BY 子句
 

docs/zh/12-taos-sql/12-distinguished.md

@@ -39,7 +39,7 @@ select _wstart, tbname, avg(voltage) from meters partition by tbname interval(10
 
 ## 窗口切分查询
 
-TDengine 支持按时间窗口切分方式进行聚合结果查询，比如温度传感器每秒采集一次数据，但需查询每隔 10 分钟的温度平均值。这种场景下可以使用窗口子句来获得需要的查询结果。窗口子句用于针对查询的数据集合按照窗口切分成为查询子集并进行聚合，窗口包含时间窗口（time window）、状态窗口（status window）、会话窗口（session window）、事件窗口（event window）四种窗口。其中时间窗口又可划分为滑动时间窗口和翻转时间窗口。
+TDengine 支持按时间窗口切分方式进行聚合结果查询，比如温度传感器每秒采集一次数据，但需查询每隔 10 分钟的温度平均值。这种场景下可以使用窗口子句来获得需要的查询结果。窗口子句用于针对查询的数据集合按照窗口切分成为查询子集并进行聚合，窗口包含时间窗口（time window）、状态窗口（status window）、会话窗口（session window）、事件窗口（event window）、计数窗口（count window）五种窗口。其中时间窗口又可划分为滑动时间窗口和翻转时间窗口。
 
 窗口子句语法如下：
 

docs/zh/12-taos-sql/31-compress.md

@@ -1,5 +1,6 @@
 ---
 title: 可配置压缩算法
+sidebar_label: 可配置压缩
 description: 可配置压缩算法
 ---
 

docs/zh/14-reference/12-config/index.md

@@ -784,6 +784,57 @@ charset 的有效值是 UTF-8。
 | 取值范围 | -1: 所有消息都不压缩; 0: 所有消息都压缩; N (N>0): 只有大于 N 个字节的消息才压缩 |
 | 缺省值   | -1                                                                              |
 
+### fPrecision
+FLOAT 类型压缩精度控制：
+
+| 属性     | 说明                             |
+| -------- | -------------------------------- |
+| 适用范围 | 服务器端                         |
+| 含义     | 设置 float 类型浮点数压缩精度    |
+| 取值范围 | 0.1 ~ 0.00000001                 |
+| 缺省值   | 0.00000001                       |
+| 补充说明 | 小于此值的浮点数尾数部分将被截取 |
+
+### dPrecision
+| 属性     | 说明                             |
+| -------- | -------------------------------- |
+| 适用范围 | 服务器端                         |
+| 含义     | 设置 double 类型浮点数压缩精度   |
+| 取值范围 | 0.1 ~ 0.0000000000000001         |
+| 缺省值   | 0.0000000000000001               |
+| 补充说明 | 小于此值的浮点数尾数部分将被截取 |
+
+### lossyColumn
+
+| 属性     | 说明                             |
+| -------- | -------------------------------- |
+| 适用范围 | 服务器端                         |
+| 含义     | 对 float 和/或 double 类型启用 TSZ 有损压缩 |
+| 取值范围 |  float, double        |
+| 缺省值   | none：表示关闭无损压缩                |
+
+**补充说明**
+1. 在 3.2.0.0 ~ 3.3.0.0（不包含）版本生效，启用该参数后不能回退到升级前的版本
+2. TSZ 压缩算法是通过数据预测技术完成的压缩，所以更适合有规律变化的数据
+3. TSZ 压缩时间会更长一些，如果您的服务器 CPU 空闲多，存储空间小的情况下适合选用
+4. 示例：对 float 和 double 类型都启用有损压缩
+```shell
+lossyColumns     float|double
+```
+5. 配置需重启服务生效，重启如果在 taosd 日志中看到以下内容，表明配置已生效：
+```sql
+   02/22 10:49:27.607990 00002933 UTL  lossyColumns     float|double
+```
+
+### ifAdtFse 
+
+| 属性     | 说明                             |
+| -------- | -------------------------------- |
+| 适用范围 | 服务器端                         |
+| 含义     | 在启用 TSZ 有损压缩时，使用 FSE 算法替换 HUFFMAN 算法， FSE 算法压缩速度更快，但解压稍慢，追求压缩速度可选用此算法  |
+| 取值范围 |  0：关闭  1：打开         |
+| 缺省值   | 0：关闭                |
+
 ## 3.0 中有效的配置参数列表
 
 | #   |        **参数**        | **适用于 2.X ** | **适用于 3.0 **                 | 3.0 版本的当前行为 |
@@ -922,8 +973,5 @@ charset 的有效值是 UTF-8。
 | 73  |      probeSeconds       | 是              | 否              | 3.0 行为未知                                         |
 | 74  |    probeKillSeconds     | 是              | 否              | 3.0 行为未知                                         |
 | 75  |      probeInterval      | 是              | 否              | 3.0 行为未知                                         |
-| 76  |      lossyColumns       | 是              | 否              | 3.0 行为未知                                         |
-| 77  |       fPrecision        | 是              | 否              | 3.0 行为未知                                         |
-| 78  |       dPrecision        | 是              | 否              | 3.0 行为未知                                         |
 | 79  |        maxRange         | 是              | 否              | 3.0 行为未知                                         |
 | 80  |          range          | 是              | 否              | 3.0 行为未知                                         |

docs/zh/21-tdinternal/07-tsz.md

@@ -1,69 +0,0 @@
----
-title: TSZ 压缩算法
-description: TDengine 对浮点数进行高效压缩的算法
----
-
-TSZ 压缩算法是 TDengine 为浮点数据类型提供的可选压缩算法，可以实现浮点数有损至无损全状态压缩，相比默认压缩算法， TSZ 压缩算法压缩率更高，即使切至无损状态，压缩率也会比默认压缩高一倍。
-
-## 适合场景
-
-- TSZ 压缩算法是通过数据预测技术完成的压缩，所以更适合有规律变化的数据
-- TSZ 压缩时间会更长一些，如果您的服务器 CPU 空闲多，存储空间小的情况下适合选用
-
-## 使用步骤
-- TDengine 支持版本为 3.2.0.0 或以上
-- 开启选项
-  在 taos.cfg 配置中增加以下内容，即可开启 TSZ 压缩算法，功能打开后，会替换默认算法。
-  以下表示字段类型是 float 及 double 类型都使用此压缩算法，也可以单独只配置一个
-
-```sql
-   lossyColumns     float|double
-```
-
-- 配置需重启服务生效
-- Taosd 日志输出以下内容，表明功能已生效：
-
-```sql
-   02/22 10:49:27.607990 00002933 UTL  lossyColumns     float|double
-```
-
-## 配置参数
-
-### fPrecision
-FLOAT 类型精度控制：
-
-| 属性     | 说明                             |
-| -------- | -------------------------------- |
-| 适用范围 | 服务器端                         |
-| 含义     | 设置 float 类型浮点数压缩精度    |
-| 取值范围 | 0.1 ~ 0.00000001                 |
-| 缺省值   | 0.00000001                       |
-| 补充说明 | 小于此值的浮点数尾数部分将被截取 |
-
-
-
-### dPrecision
-DOUBLE 类型精度控制：
-
-| 属性     | 说明                             |
-| -------- | -------------------------------- |
-| 适用范围 | 服务器端                         |
-| 含义     | 设置 double 类型浮点数压缩精度   |
-| 取值范围 | 0.1 ~ 0.0000000000000001         |
-| 缺省值   | 0.0000000000000001               |
-| 补充说明 | 小于此值的浮点数尾数部分将被截取 |
-
-
-### ifAdtFse 
-TSZ 压缩中可选择的算法 FSE，默认为 HUFFMAN：
-
-| 属性     | 说明                             |
-| -------- | -------------------------------- |
-| 适用范围 | 服务器端                         |
-| 含义     | 使用 FSE 算法替换 HUFFMAN 算法， FSE 算法压缩速度更快，但解压稍慢，追求压缩速度可选用此算法  |
-| 取值范围 |  0：关闭  1：打开         |
-| 缺省值   | 0：关闭                |
-
-
-## 注意事项
-- 打开 TSZ 后生成的存储数据格式，回退至 3.2.0.0 之前的版本，数据将不能被识别

include/common/rsync.h

@@ -12,7 +12,7 @@ extern "C" {
 #include "tarray.h"
 
 void    stopRsync();
-void    startRsync();
+int32_t startRsync();
 int32_t uploadByRsync(const char* id, const char* path, int64_t checkpointId);
 int32_t downloadByRsync(const char* id, const char* path, int64_t checkpointId);
 int32_t deleteRsync(const char* id);

include/common/tdatablock.h

@@ -32,8 +32,8 @@ typedef struct SBlockOrderInfo {
   SColumnInfoData* pColData;
 } SBlockOrderInfo;
 
-#define BLOCK_VERSION_1          1
-#define BLOCK_VERSION_2          2
+#define BLOCK_VERSION_1 1
+#define BLOCK_VERSION_2 2
 
 #define NBIT                     (3u)
 #define BitPos(_n)               ((_n) & ((1 << NBIT) - 1))
@@ -41,15 +41,24 @@ typedef struct SBlockOrderInfo {
 #define BMCharPos(bm_, r_)       ((bm_)[(r_) >> NBIT])
 #define colDataIsNull_f(bm_, r_) ((BMCharPos(bm_, r_) & (1u << (7u - BitPos(r_)))) == (1u << (7u - BitPos(r_))))
 
+#define QRY_OPTR_CHECK(_o)           \
+  do {                               \
+    if ((_o) == NULL) {              \
+      return TSDB_CODE_INVALID_PARA; \
+    } else {                         \
+      *(_o) = NULL;                  \
+    }                                \
+  } while(0)
+
 #define colDataSetNull_f(bm_, r_)                    \
   do {                                               \
     BMCharPos(bm_, r_) |= (1u << (7u - BitPos(r_))); \
   } while (0)
 
-#define colDataSetNull_f_s(c_, r_)                                        \
-  do {                                                                    \
-    colDataSetNull_f((c_)->nullbitmap, r_);                               \
-    memset(((char*)(c_)->pData) + (c_)->info.bytes * (r_), 0, (c_)->info.bytes); \
+#define colDataSetNull_f_s(c_, r_)                                                     \
+  do {                                                                                 \
+    colDataSetNull_f((c_)->nullbitmap, r_);                                            \
+    (void)memset(((char*)(c_)->pData) + (c_)->info.bytes * (r_), 0, (c_)->info.bytes); \
   } while (0)
 
 #define colDataClearNull_f(bm_, r_)                             \
@@ -143,7 +152,7 @@ static FORCE_INLINE void colDataSetNNULL(SColumnInfoData* pColumnInfoData, uint3
     for (int32_t i = start; i < start + nRows; ++i) {
       colDataSetNull_f(pColumnInfoData->nullbitmap, i);
     }
-    memset(pColumnInfoData->pData + start * pColumnInfoData->info.bytes, 0, pColumnInfoData->info.bytes * nRows);
+    (void)memset(pColumnInfoData->pData + start * pColumnInfoData->info.bytes, 0, pColumnInfoData->info.bytes * nRows);
   }
 
   pColumnInfoData->hasNull = true;
@@ -192,15 +201,17 @@ int32_t getJsonValueLen(const char* data);
 
 int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, bool isNull);
 int32_t colDataReassignVal(SColumnInfoData* pColumnInfoData, uint32_t dstRowIdx, uint32_t srcRowIdx, const char* pData);
-int32_t colDataSetNItems(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, uint32_t numOfRows, bool trimValue);
-void colDataSetNItemsNull(SColumnInfoData* pColumnInfoData, uint32_t currentRow, uint32_t numOfRows);
-int32_t colDataCopyNItems(SColumnInfoData* pColumnInfoData, uint32_t currentRow, const char* pData,
-                            uint32_t numOfRows, bool isNull);
+int32_t colDataSetNItems(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, uint32_t numOfRows,
+                         bool trimValue);
+void    colDataSetNItemsNull(SColumnInfoData* pColumnInfoData, uint32_t currentRow, uint32_t numOfRows);
+int32_t colDataCopyNItems(SColumnInfoData* pColumnInfoData, uint32_t currentRow, const char* pData, uint32_t numOfRows,
+                          bool isNull);
 int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, int32_t* capacity,
                         const SColumnInfoData* pSource, int32_t numOfRow2);
 int32_t colDataAssign(SColumnInfoData* pColumnInfoData, const SColumnInfoData* pSource, int32_t numOfRows,
                       const SDataBlockInfo* pBlockInfo);
-int32_t colDataAssignNRows(SColumnInfoData* pDst, int32_t dstIdx, const SColumnInfoData* pSrc, int32_t srcIdx, int32_t numOfRows);                      
+int32_t colDataAssignNRows(SColumnInfoData* pDst, int32_t dstIdx, const SColumnInfoData* pSrc, int32_t srcIdx,
+                           int32_t numOfRows);
 int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock, int32_t tsColumnIndex);
 int32_t blockDataUpdatePkRange(SSDataBlock* pDataBlock, int32_t pkColumnIndex, bool asc);
 
@@ -214,14 +225,13 @@ size_t blockDataGetNumOfRows(const SSDataBlock* pBlock);
 
 int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc);
 int32_t blockDataMergeNRows(SSDataBlock* pDest, const SSDataBlock* pSrc, int32_t srcIdx, int32_t numOfRows);
-void blockDataShrinkNRows(SSDataBlock* pBlock, int32_t numOfRows);
+void    blockDataShrinkNRows(SSDataBlock* pBlock, int32_t numOfRows);
 int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startIndex, int32_t* stopIndex,
                            int32_t pageSize);
 int32_t blockDataToBuf(char* buf, const SSDataBlock* pBlock);
 int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf);
 int32_t blockDataFromBuf1(SSDataBlock* pBlock, const char* buf, size_t capacity);
-
-SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int32_t rowCount);
+int32_t blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int32_t rowCount, SSDataBlock** pResBlock);
 
 size_t blockDataGetSize(const SSDataBlock* pBlock);
 size_t blockDataGetRowSize(SSDataBlock* pBlock);
@@ -237,50 +247,50 @@ int32_t blockDataGetSortedRows(SSDataBlock* pDataBlock, SArray* pOrderInfo);
 int32_t colInfoDataEnsureCapacity(SColumnInfoData* pColumn, uint32_t numOfRows, bool clearPayload);
 int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows);
 
-void colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows);
-void blockDataCleanup(SSDataBlock* pDataBlock);
-void blockDataReset(SSDataBlock* pDataBlock);
-void blockDataEmpty(SSDataBlock* pDataBlock);
+void    colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows);
+void    blockDataCleanup(SSDataBlock* pDataBlock);
+void    blockDataReset(SSDataBlock* pDataBlock);
+void    blockDataEmpty(SSDataBlock* pDataBlock);
 int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo* pBlockInfo, uint32_t numOfRows,
-                                bool clearPayload);
+                         bool clearPayload);
 
 size_t blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize, int32_t extraSize);
 
 int32_t blockDataTrimFirstRows(SSDataBlock* pBlock, size_t n);
-int32_t blockDataKeepFirstNRows(SSDataBlock* pBlock, size_t n);
+void    blockDataKeepFirstNRows(SSDataBlock* pBlock, size_t n);
 
 int32_t assignOneDataBlock(SSDataBlock* dst, const SSDataBlock* src);
 int32_t copyDataBlock(SSDataBlock* pDst, const SSDataBlock* pSrc);
 
-SSDataBlock* createDataBlock();
-void*        blockDataDestroy(SSDataBlock* pBlock);
-void         blockDataFreeRes(SSDataBlock* pBlock);
-SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData);
-SSDataBlock* createSpecialDataBlock(EStreamType type);
+int32_t createDataBlock(SSDataBlock** pResBlock);
+void    blockDataDestroy(SSDataBlock* pBlock);
+void    blockDataFreeRes(SSDataBlock* pBlock);
+int32_t createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData, SSDataBlock** pResBlock);
+int32_t createSpecialDataBlock(EStreamType type, SSDataBlock** pBlock);
 
-SSDataBlock* blockCopyOneRow(const SSDataBlock* pDataBlock, int32_t rowIdx);
-int32_t      blockDataAppendColInfo(SSDataBlock* pBlock, SColumnInfoData* pColInfoData);
+int32_t blockCopyOneRow(const SSDataBlock* pDataBlock, int32_t rowIdx, SSDataBlock** pResBlock);
+int32_t blockDataAppendColInfo(SSDataBlock* pBlock, SColumnInfoData* pColInfoData);
 
-SColumnInfoData  createColumnInfoData(int16_t type, int32_t bytes, int16_t colId);
-SColumnInfoData* bdGetColumnInfoData(const SSDataBlock* pBlock, int32_t index);
+SColumnInfoData createColumnInfoData(int16_t type, int32_t bytes, int16_t colId);
+int32_t         bdGetColumnInfoData(const SSDataBlock* pBlock, int32_t index, SColumnInfoData** pColInfoData);
 
 int32_t blockGetEncodeSize(const SSDataBlock* pBlock);
 int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols);
-const char* blockDecode(SSDataBlock* pBlock, const char* pData);
+int32_t blockDecode(SSDataBlock* pBlock, const char* pData, const char** pEndPos);
 
 // for debug
-char* dumpBlockData(SSDataBlock* pDataBlock, const char* flag, char** dumpBuf, const char* taskIdStr);
+int32_t dumpBlockData(SSDataBlock* pDataBlock, const char* flag, char** dumpBuf, const char* taskIdStr);
 
-int32_t buildSubmitReqFromDataBlock(SSubmitReq2** pReq, const SSDataBlock* pDataBlocks, const STSchema* pTSchema, int64_t uid, int32_t vgId,
-                                    tb_uid_t suid);
+int32_t buildSubmitReqFromDataBlock(SSubmitReq2** pReq, const SSDataBlock* pDataBlocks, const STSchema* pTSchema,
+                                    int64_t uid, int32_t vgId, tb_uid_t suid);
 
-bool  alreadyAddGroupId(char* ctbName, int64_t groupId);
-bool  isAutoTableName(char* ctbName);
-void  buildCtbNameAddGroupId(const char* stbName, char* ctbName, uint64_t groupId);
-char* buildCtbNameByGroupId(const char* stbName, uint64_t groupId);
+bool    alreadyAddGroupId(char* ctbName, int64_t groupId);
+bool    isAutoTableName(char* ctbName);
+void    buildCtbNameAddGroupId(const char* stbName, char* ctbName, uint64_t groupId);
+int32_t buildCtbNameByGroupId(const char* stbName, uint64_t groupId, char** pName);
 int32_t buildCtbNameByGroupIdImpl(const char* stbName, uint64_t groupId, char* pBuf);
 
-void trimDataBlock(SSDataBlock* pBlock, int32_t totalRows, const bool* pBoolList);
+int32_t trimDataBlock(SSDataBlock* pBlock, int32_t totalRows, const bool* pBoolList);
 
 void copyPkVal(SDataBlockInfo* pDst, const SDataBlockInfo* pSrc);
 

include/common/tdataformat.h

@@ -315,7 +315,7 @@ struct STag {
   do {                                            \
     VarDataLenT __len = (VarDataLenT)strlen(str); \
     *(VarDataLenT *)(x) = __len;                  \
-    memcpy(varDataVal(x), (str), __len);          \
+    (void)memcpy(varDataVal(x), (str), __len);    \
   } while (0);
 
 #define STR_WITH_MAXSIZE_TO_VARSTR(x, str, _maxs)                         \
@@ -324,10 +324,10 @@ struct STag {
     varDataSetLen(x, (_e - (x)-VARSTR_HEADER_SIZE));                      \
   } while (0)
 
-#define STR_WITH_SIZE_TO_VARSTR(x, str, _size)  \
-  do {                                          \
-    *(VarDataLenT *)(x) = (VarDataLenT)(_size); \
-    memcpy(varDataVal(x), (str), (_size));      \
+#define STR_WITH_SIZE_TO_VARSTR(x, str, _size)   \
+  do {                                           \
+    *(VarDataLenT *)(x) = (VarDataLenT)(_size);  \
+    (void)memcpy(varDataVal(x), (str), (_size)); \
   } while (0);
 
 // STSchema ================================

include/common/tglobal.h

@@ -272,11 +272,11 @@ int32_t taosCfgDynamicOptions(SConfig *pCfg, const char *name, bool forServer);
 
 struct SConfig *taosGetCfg();
 
-void   taosSetGlobalDebugFlag(int32_t flag);
-void   taosSetDebugFlag(int32_t *pFlagPtr, const char *flagName, int32_t flagVal);
-void   taosLocalCfgForbiddenToChange(char *name, bool *forbidden);
-int8_t taosGranted(int8_t type);
-int32_t taosSetSlowLogScope(char *pScope);
+int32_t taosSetGlobalDebugFlag(int32_t flag);
+int32_t taosSetDebugFlag(int32_t *pFlagPtr, const char *flagName, int32_t flagVal);
+void    taosLocalCfgForbiddenToChange(char *name, bool *forbidden);
+int8_t  taosGranted(int8_t type);
+int32_t taosSetSlowLogScope(char *pScopeStr, int32_t *pScope);
 
 #ifdef __cplusplus
 }

include/common/tgrant.h

@@ -68,7 +68,7 @@ int32_t generateEncryptCode(const char *key, const char *machineId, char **encry
 int64_t grantRemain(EGrantType grant);
 int32_t grantCheck(EGrantType grant);
 int32_t grantCheckExpire(EGrantType grant);
-char   *tGetMachineId();
+int32_t tGetMachineId(char **result);
 
 // #ifndef GRANTS_CFG
 #ifdef TD_ENTERPRISE

include/common/tmsg.h

@@ -683,36 +683,55 @@ typedef struct {
 } SColCmprWrapper;
 
 static FORCE_INLINE SColCmprWrapper* tCloneSColCmprWrapper(const SColCmprWrapper* pSrcWrapper) {
-  if (pSrcWrapper->pColCmpr == NULL || pSrcWrapper->nCols == 0) return NULL;
+  if (pSrcWrapper->pColCmpr == NULL || pSrcWrapper->nCols == 0) {
+    terrno = TSDB_CODE_INVALID_PARA;
+    return NULL;
+  }
 
   SColCmprWrapper* pDstWrapper = (SColCmprWrapper*)taosMemoryMalloc(sizeof(SColCmprWrapper));
+  if (pDstWrapper == NULL) {
+    return NULL;
+  }
   pDstWrapper->nCols = pSrcWrapper->nCols;
   pDstWrapper->version = pSrcWrapper->version;
 
   int32_t size = sizeof(SColCmpr) * pDstWrapper->nCols;
   pDstWrapper->pColCmpr = (SColCmpr*)taosMemoryCalloc(1, size);
-  memcpy(pDstWrapper->pColCmpr, pSrcWrapper->pColCmpr, size);
+  if (pDstWrapper->pColCmpr == NULL) {
+    taosMemoryFree(pDstWrapper);
+    return NULL;
+  }
+  (void)memcpy(pDstWrapper->pColCmpr, pSrcWrapper->pColCmpr, size);
 
   return pDstWrapper;
 }
 
-static FORCE_INLINE void tInitDefaultSColCmprWrapperByCols(SColCmprWrapper* pCmpr, int32_t nCols) {
+static FORCE_INLINE int32_t tInitDefaultSColCmprWrapperByCols(SColCmprWrapper* pCmpr, int32_t nCols) {
   assert(!pCmpr->pColCmpr);
   pCmpr->pColCmpr = (SColCmpr*)taosMemoryCalloc(nCols, sizeof(SColCmpr));
+  if (pCmpr->pColCmpr == NULL) {
+    return terrno;
+  }
   pCmpr->nCols = nCols;
+  return 0;
 }
 
-static FORCE_INLINE void tInitDefaultSColCmprWrapper(SColCmprWrapper* pCmpr, SSchemaWrapper* pSchema) {
+static FORCE_INLINE int32_t tInitDefaultSColCmprWrapper(SColCmprWrapper* pCmpr, SSchemaWrapper* pSchema) {
   pCmpr->nCols = pSchema->nCols;
   assert(!pCmpr->pColCmpr);
   pCmpr->pColCmpr = (SColCmpr*)taosMemoryCalloc(pCmpr->nCols, sizeof(SColCmpr));
+  if (pCmpr->pColCmpr == NULL) {
+    return terrno;
+  }
   for (int32_t i = 0; i < pCmpr->nCols; i++) {
     SColCmpr* pColCmpr = &pCmpr->pColCmpr[i];
     SSchema*  pColSchema = &pSchema->pSchema[i];
     pColCmpr->id = pColSchema->colId;
     pColCmpr->alg = 0;
   }
+  return 0;
 }
+
 static FORCE_INLINE void tDeleteSColCmprWrapper(SColCmprWrapper* pWrapper) {
   if (pWrapper == NULL) return;
 
@@ -723,7 +742,9 @@ static FORCE_INLINE SSchemaWrapper* tCloneSSchemaWrapper(const SSchemaWrapper* p
   if (pSchemaWrapper->pSchema == NULL) return NULL;
 
   SSchemaWrapper* pSW = (SSchemaWrapper*)taosMemoryMalloc(sizeof(SSchemaWrapper));
-  if (pSW == NULL) return pSW;
+  if (pSW == NULL) {
+    return NULL;
+  }
   pSW->nCols = pSchemaWrapper->nCols;
   pSW->version = pSchemaWrapper->version;
   pSW->pSchema = (SSchema*)taosMemoryCalloc(pSW->nCols, sizeof(SSchema));
@@ -732,7 +753,7 @@ static FORCE_INLINE SSchemaWrapper* tCloneSSchemaWrapper(const SSchemaWrapper* p
     return NULL;
   }
 
-  memcpy(pSW->pSchema, pSchemaWrapper->pSchema, pSW->nCols * sizeof(SSchema));
+  (void)memcpy(pSW->pSchema, pSchemaWrapper->pSchema, pSW->nCols * sizeof(SSchema));
   return pSW;
 }
 
@@ -770,32 +791,32 @@ static FORCE_INLINE void* taosDecodeSSchema(const void* buf, SSchema* pSchema) {
 }
 
 static FORCE_INLINE int32_t tEncodeSSchema(SEncoder* pEncoder, const SSchema* pSchema) {
-  if (tEncodeI8(pEncoder, pSchema->type) < 0) return -1;
-  if (tEncodeI8(pEncoder, pSchema->flags) < 0) return -1;
-  if (tEncodeI32v(pEncoder, pSchema->bytes) < 0) return -1;
-  if (tEncodeI16v(pEncoder, pSchema->colId) < 0) return -1;
-  if (tEncodeCStr(pEncoder, pSchema->name) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI8(pEncoder, pSchema->type));
+  TAOS_CHECK_RETURN(tEncodeI8(pEncoder, pSchema->flags));
+  TAOS_CHECK_RETURN(tEncodeI32v(pEncoder, pSchema->bytes));
+  TAOS_CHECK_RETURN(tEncodeI16v(pEncoder, pSchema->colId));
+  TAOS_CHECK_RETURN(tEncodeCStr(pEncoder, pSchema->name));
   return 0;
 }
 
 static FORCE_INLINE int32_t tDecodeSSchema(SDecoder* pDecoder, SSchema* pSchema) {
-  if (tDecodeI8(pDecoder, &pSchema->type) < 0) return -1;
-  if (tDecodeI8(pDecoder, &pSchema->flags) < 0) return -1;
-  if (tDecodeI32v(pDecoder, &pSchema->bytes) < 0) return -1;
-  if (tDecodeI16v(pDecoder, &pSchema->colId) < 0) return -1;
-  if (tDecodeCStrTo(pDecoder, pSchema->name) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI8(pDecoder, &pSchema->type));
+  TAOS_CHECK_RETURN(tDecodeI8(pDecoder, &pSchema->flags));
+  TAOS_CHECK_RETURN(tDecodeI32v(pDecoder, &pSchema->bytes));
+  TAOS_CHECK_RETURN(tDecodeI16v(pDecoder, &pSchema->colId));
+  TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, pSchema->name));
   return 0;
 }
 
 static FORCE_INLINE int32_t tEncodeSSchemaExt(SEncoder* pEncoder, const SSchemaExt* pSchemaExt) {
-  if (tEncodeI16v(pEncoder, pSchemaExt->colId) < 0) return -1;
-  if (tEncodeU32(pEncoder, pSchemaExt->compress) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI16v(pEncoder, pSchemaExt->colId));
+  TAOS_CHECK_RETURN(tEncodeU32(pEncoder, pSchemaExt->compress));
   return 0;
 }
 
 static FORCE_INLINE int32_t tDecodeSSchemaExt(SDecoder* pDecoder, SSchemaExt* pSchemaExt) {
-  if (tDecodeI16v(pDecoder, &pSchemaExt->colId) < 0) return -1;
-  if (tDecodeU32(pDecoder, &pSchemaExt->compress) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI16v(pDecoder, &pSchemaExt->colId));
+  TAOS_CHECK_RETURN(tDecodeU32(pDecoder, &pSchemaExt->compress));
   return 0;
 }
 
@@ -828,36 +849,39 @@ static FORCE_INLINE void* taosDecodeSSchemaWrapper(const void* buf, SSchemaWrapp
 }
 
 static FORCE_INLINE int32_t tEncodeSSchemaWrapper(SEncoder* pEncoder, const SSchemaWrapper* pSW) {
-  if (tEncodeI32v(pEncoder, pSW->nCols) < 0) return -1;
-  if (tEncodeI32v(pEncoder, pSW->version) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI32v(pEncoder, pSW->nCols));
+  TAOS_CHECK_RETURN(tEncodeI32v(pEncoder, pSW->version));
   for (int32_t i = 0; i < pSW->nCols; i++) {
-    if (tEncodeSSchema(pEncoder, &pSW->pSchema[i]) < 0) return -1;
+    TAOS_CHECK_RETURN(tEncodeSSchema(pEncoder, &pSW->pSchema[i]));
   }
-
   return 0;
 }
 
 static FORCE_INLINE int32_t tDecodeSSchemaWrapper(SDecoder* pDecoder, SSchemaWrapper* pSW) {
-  if (tDecodeI32v(pDecoder, &pSW->nCols) < 0) return -1;
-  if (tDecodeI32v(pDecoder, &pSW->version) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI32v(pDecoder, &pSW->nCols));
+  TAOS_CHECK_RETURN(tDecodeI32v(pDecoder, &pSW->version));
 
   pSW->pSchema = (SSchema*)taosMemoryCalloc(pSW->nCols, sizeof(SSchema));
-  if (pSW->pSchema == NULL) return -1;
+  if (pSW->pSchema == NULL) {
+    TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
+  }
   for (int32_t i = 0; i < pSW->nCols; i++) {
-    if (tDecodeSSchema(pDecoder, &pSW->pSchema[i]) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeSSchema(pDecoder, &pSW->pSchema[i]));
   }
 
   return 0;
 }
 
 static FORCE_INLINE int32_t tDecodeSSchemaWrapperEx(SDecoder* pDecoder, SSchemaWrapper* pSW) {
-  if (tDecodeI32v(pDecoder, &pSW->nCols) < 0) return -1;
-  if (tDecodeI32v(pDecoder, &pSW->version) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI32v(pDecoder, &pSW->nCols));
+  TAOS_CHECK_RETURN(tDecodeI32v(pDecoder, &pSW->version));
 
   pSW->pSchema = (SSchema*)tDecoderMalloc(pDecoder, pSW->nCols * sizeof(SSchema));
-  if (pSW->pSchema == NULL) return -1;
+  if (pSW->pSchema == NULL) {
+    TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
+  }
   for (int32_t i = 0; i < pSW->nCols; i++) {
-    if (tDecodeSSchema(pDecoder, &pSW->pSchema[i]) < 0) return -1;
+    TAOS_CHECK_RETURN(tDecodeSSchema(pDecoder, &pSW->pSchema[i]));
   }
 
   return 0;
@@ -1051,10 +1075,10 @@ typedef struct {
   SUpdateUserIpWhite* pUserIpWhite;
 } SUpdateIpWhite;
 
-int32_t         tSerializeSUpdateIpWhite(void* buf, int32_t bufLen, SUpdateIpWhite* pReq);
-int32_t         tDeserializeSUpdateIpWhite(void* buf, int32_t bufLen, SUpdateIpWhite* pReq);
-void            tFreeSUpdateIpWhiteReq(SUpdateIpWhite* pReq);
-SUpdateIpWhite* cloneSUpdateIpWhiteReq(SUpdateIpWhite* pReq);
+int32_t tSerializeSUpdateIpWhite(void* buf, int32_t bufLen, SUpdateIpWhite* pReq);
+int32_t tDeserializeSUpdateIpWhite(void* buf, int32_t bufLen, SUpdateIpWhite* pReq);
+void    tFreeSUpdateIpWhiteReq(SUpdateIpWhite* pReq);
+int32_t cloneSUpdateIpWhiteReq(SUpdateIpWhite* pReq, SUpdateIpWhite** pUpdate);
 
 typedef struct {
   int64_t ipWhiteVer;
@@ -1739,6 +1763,14 @@ int32_t tSerializeSStatusReq(void* buf, int32_t bufLen, SStatusReq* pReq);
 int32_t tDeserializeSStatusReq(void* buf, int32_t bufLen, SStatusReq* pReq);
 void    tFreeSStatusReq(SStatusReq* pReq);
 
+typedef struct {
+  int32_t dnodeId;
+  char    machineId[TSDB_MACHINE_ID_LEN + 1];
+} SDnodeInfoReq;
+
+int32_t tSerializeSDnodeInfoReq(void* buf, int32_t bufLen, SDnodeInfoReq* pReq);
+int32_t tDeserializeSDnodeInfoReq(void* buf, int32_t bufLen, SDnodeInfoReq* pReq);
+
 typedef enum {
   MONITOR_TYPE_COUNTER = 0,
   MONITOR_TYPE_SLOW_LOG = 1,
@@ -1803,12 +1835,18 @@ typedef struct {
 int32_t tSerializeSMTimerMsg(void* buf, int32_t bufLen, SMTimerReq* pReq);
 // int32_t tDeserializeSMTimerMsg(void* buf, int32_t bufLen, SMTimerReq* pReq);
 
-typedef struct {
-  int64_t tick;
-} SMStreamTickReq;
+typedef struct SOrphanTask {
+  int64_t streamId;
+  int32_t taskId;
+  int32_t nodeId;
+} SOrphanTask;
 
-int32_t tSerializeSMStreamTickMsg(void* buf, int32_t bufLen, SMStreamTickReq* pReq);
-// int32_t tDeserializeSMStreamTickMsg(void* buf, int32_t bufLen, SMStreamTickReq* pReq);
+typedef struct SMStreamDropOrphanMsg {
+  SArray* pList;  // SArray<SOrphanTask>
+} SMStreamDropOrphanMsg;
+
+int32_t tSerializeDropOrphanTaskMsg(void* buf, int32_t bufLen, SMStreamDropOrphanMsg* pMsg);
+int32_t tDeserializeDropOrphanTaskMsg(void* buf, int32_t bufLen, SMStreamDropOrphanMsg* pMsg);
 
 typedef struct {
   int32_t  id;
@@ -2828,19 +2866,24 @@ static FORCE_INLINE int32_t tSerializeSCMSubscribeReq(void** buf, const SCMSubsc
   return tlen;
 }
 
-static FORCE_INLINE void* tDeserializeSCMSubscribeReq(void* buf, SCMSubscribeReq* pReq) {
+static FORCE_INLINE int32_t tDeserializeSCMSubscribeReq(void* buf, SCMSubscribeReq* pReq) {
   buf = taosDecodeFixedI64(buf, &pReq->consumerId);
   buf = taosDecodeStringTo(buf, pReq->cgroup);
   buf = taosDecodeStringTo(buf, pReq->clientId);
 
-  int32_t topicNum;
+  int32_t topicNum = 0;
   buf = taosDecodeFixedI32(buf, &topicNum);
 
   pReq->topicNames = taosArrayInit(topicNum, sizeof(void*));
+  if (pReq->topicNames == NULL) {
+    return terrno;
+  }
   for (int32_t i = 0; i < topicNum; i++) {
-    char* name;
+    char* name = NULL;
     buf = taosDecodeString(buf, &name);
-    taosArrayPush(pReq->topicNames, &name);
+    if (taosArrayPush(pReq->topicNames, &name) == NULL) {
+      return terrno;
+    }
   }
 
   buf = taosDecodeFixedI8(buf, &pReq->withTbName);
@@ -2849,7 +2892,7 @@ static FORCE_INLINE void* tDeserializeSCMSubscribeReq(void* buf, SCMSubscribeReq
   buf = taosDecodeFixedI8(buf, &pReq->resetOffsetCfg);
   buf = taosDecodeFixedI8(buf, &pReq->enableReplay);
   buf = taosDecodeFixedI8(buf, &pReq->enableBatchMeta);
-  return buf;
+  return 0;
 }
 
 typedef struct {
@@ -3353,30 +3396,32 @@ int32_t tDeserializeSClientHbBatchRsp(void* buf, int32_t bufLen, SClientHbBatchR
 void    tFreeSClientHbBatchRsp(SClientHbBatchRsp* pBatchRsp);
 
 static FORCE_INLINE int32_t tEncodeSKv(SEncoder* pEncoder, const SKv* pKv) {
-  if (tEncodeI32(pEncoder, pKv->key) < 0) return -1;
-  if (tEncodeI32(pEncoder, pKv->valueLen) < 0) return -1;
-  if (tEncodeBinary(pEncoder, (uint8_t*)pKv->value, pKv->valueLen) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI32(pEncoder, pKv->key));
+  TAOS_CHECK_RETURN(tEncodeI32(pEncoder, pKv->valueLen));
+  TAOS_CHECK_RETURN(tEncodeBinary(pEncoder, (uint8_t*)pKv->value, pKv->valueLen));
   return 0;
 }
 
 static FORCE_INLINE int32_t tDecodeSKv(SDecoder* pDecoder, SKv* pKv) {
-  if (tDecodeI32(pDecoder, &pKv->key) < 0) return -1;
-  if (tDecodeI32(pDecoder, &pKv->valueLen) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI32(pDecoder, &pKv->key));
+  TAOS_CHECK_RETURN(tDecodeI32(pDecoder, &pKv->valueLen));
   pKv->value = taosMemoryMalloc(pKv->valueLen + 1);
-  if (pKv->value == NULL) return -1;
-  if (tDecodeCStrTo(pDecoder, (char*)pKv->value) < 0) return -1;
+  if (pKv->value == NULL) {
+    TAOS_CHECK_RETURN(TSDB_CODE_OUT_OF_MEMORY);
+  }
+  TAOS_CHECK_RETURN(tDecodeCStrTo(pDecoder, (char*)pKv->value));
   return 0;
 }
 
 static FORCE_INLINE int32_t tEncodeSClientHbKey(SEncoder* pEncoder, const SClientHbKey* pKey) {
-  if (tEncodeI64(pEncoder, pKey->tscRid) < 0) return -1;
-  if (tEncodeI8(pEncoder, pKey->connType) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI64(pEncoder, pKey->tscRid));
+  TAOS_CHECK_RETURN(tEncodeI8(pEncoder, pKey->connType));
   return 0;
 }
 
 static FORCE_INLINE int32_t tDecodeSClientHbKey(SDecoder* pDecoder, SClientHbKey* pKey) {
-  if (tDecodeI64(pDecoder, &pKey->tscRid) < 0) return -1;
-  if (tDecodeI8(pDecoder, &pKey->connType) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI64(pDecoder, &pKey->tscRid));
+  TAOS_CHECK_RETURN(tDecodeI8(pDecoder, &pKey->connType));
   return 0;
 }
 
@@ -3423,11 +3468,15 @@ static FORCE_INLINE void* taosDecodeSMqTopicInfoMsg(void* buf, SMqTopicInfo* pTo
   buf = taosDecodeStringTo(buf, pTopicInfo->name);
   int32_t sz;
   buf = taosDecodeFixedI32(buf, &sz);
-  pTopicInfo->pVgInfo = taosArrayInit(sz, sizeof(SMqReportVgInfo));
+  if ((pTopicInfo->pVgInfo = taosArrayInit(sz, sizeof(SMqReportVgInfo))) == NULL) {
+    return NULL;
+  }
   for (int32_t i = 0; i < sz; i++) {
     SMqReportVgInfo vgInfo;
     buf = taosDecodeSMqVgInfo(buf, &vgInfo);
-    taosArrayPush(pTopicInfo->pVgInfo, &vgInfo);
+    if (taosArrayPush(pTopicInfo->pVgInfo, &vgInfo) == NULL) {
+      return NULL;
+    }
   }
   return buf;
 }
@@ -3459,11 +3508,15 @@ static FORCE_INLINE void* taosDecodeSMqReportMsg(void* buf, SMqReportReq* pMsg)
   buf = taosDecodeFixedI64(buf, &pMsg->consumerId);
   int32_t sz;
   buf = taosDecodeFixedI32(buf, &sz);
-  pMsg->pTopics = taosArrayInit(sz, sizeof(SMqTopicInfo));
+  if ((pMsg->pTopics = taosArrayInit(sz, sizeof(SMqTopicInfo))) == NULL) {
+    return NULL;
+  }
   for (int32_t i = 0; i < sz; i++) {
     SMqTopicInfo topicInfo;
     buf = taosDecodeSMqTopicInfoMsg(buf, &topicInfo);
-    taosArrayPush(pMsg->pTopics, &topicInfo);
+    if (taosArrayPush(pMsg->pTopics, &topicInfo) == NULL) {
+      return NULL;
+    }
   }
   return buf;
 }
@@ -3600,9 +3653,9 @@ static FORCE_INLINE void tqOffsetResetToLog(STqOffsetVal* pOffsetVal, int64_t ve
 
 int32_t tEncodeSTqOffsetVal(SEncoder* pEncoder, const STqOffsetVal* pOffsetVal);
 int32_t tDecodeSTqOffsetVal(SDecoder* pDecoder, STqOffsetVal* pOffsetVal);
-int32_t tFormatOffset(char* buf, int32_t maxLen, const STqOffsetVal* pVal);
+void    tFormatOffset(char* buf, int32_t maxLen, const STqOffsetVal* pVal);
 bool    tOffsetEqual(const STqOffsetVal* pLeft, const STqOffsetVal* pRight);
-void    tOffsetCopy(STqOffsetVal* pLeft, const STqOffsetVal* pOffsetVal);
+void    tOffsetCopy(STqOffsetVal* pLeft, const STqOffsetVal* pRight);
 void    tOffsetDestroy(void* pVal);
 
 typedef struct {
@@ -3612,6 +3665,7 @@ typedef struct {
 
 int32_t tEncodeSTqOffset(SEncoder* pEncoder, const STqOffset* pOffset);
 int32_t tDecodeSTqOffset(SDecoder* pDecoder, STqOffset* pOffset);
+void    tDeleteSTqOffset(void* val);
 
 typedef struct SMqVgOffset {
   int64_t   consumerId;
@@ -3802,17 +3856,17 @@ int32_t tEncodeTSma(SEncoder* pCoder, const STSma* pSma);
 int32_t tDecodeTSma(SDecoder* pCoder, STSma* pSma, bool deepCopy);
 
 static int32_t tEncodeTSmaWrapper(SEncoder* pEncoder, const STSmaWrapper* pReq) {
-  if (tEncodeI32(pEncoder, pReq->number) < 0) return -1;
+  TAOS_CHECK_RETURN(tEncodeI32(pEncoder, pReq->number));
   for (int32_t i = 0; i < pReq->number; ++i) {
-    tEncodeTSma(pEncoder, pReq->tSma + i);
+    TAOS_CHECK_RETURN(tEncodeTSma(pEncoder, pReq->tSma + i));
   }
   return 0;
 }
 
 static int32_t tDecodeTSmaWrapper(SDecoder* pDecoder, STSmaWrapper* pReq, bool deepCopy) {
-  if (tDecodeI32(pDecoder, &pReq->number) < 0) return -1;
+  TAOS_CHECK_RETURN(tDecodeI32(pDecoder, &pReq->number));
   for (int32_t i = 0; i < pReq->number; ++i) {
-    tDecodeTSma(pDecoder, pReq->tSma + i, deepCopy);
+    TAOS_CHECK_RETURN(tDecodeTSma(pDecoder, pReq->tSma + i, deepCopy));
   }
   return 0;
 }
@@ -4035,7 +4089,12 @@ static FORCE_INLINE void* tDecodeSMqAskEpRsp(void* buf, SMqAskEpRsp* pRsp) {
   for (int32_t i = 0; i < sz; i++) {
     SMqSubTopicEp topicEp;
     buf = tDecodeMqSubTopicEp(buf, &topicEp);
-    taosArrayPush(pRsp->topics, &topicEp);
+    if (buf == NULL) {
+      return NULL;
+    }
+    if ((taosArrayPush(pRsp->topics, &topicEp) == NULL)) {
+      return NULL;
+    }
   }
   return buf;
 }

include/common/tmsgdef.h

@@ -224,9 +224,9 @@
   TD_DEF_MSG_TYPE(TDMT_MND_RESTORE_DNODE, "restore-dnode", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_PAUSE_STREAM, "pause-stream", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_RESUME_STREAM, "resume-stream", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_MND_STREAM_CHECKPOINT_TIMER, "stream-checkpoint-tmr", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_STREAM_CHECKPOINT_TIMER, "stream-checkpoint-tmr", NULL, NULL)            // not used
   TD_DEF_MSG_TYPE(TDMT_MND_STREAM_BEGIN_CHECKPOINT, "stream-begin-checkpoint", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_MND_STREAM_CHECKPOINT_CANDIDITATE, "stream-checkpoint-remain", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_STREAM_CHECKPOINT_CANDIDITATE, "stream-checkpoint-remain", NULL, NULL)   // not used
   TD_DEF_MSG_TYPE(TDMT_MND_STREAM_NODECHANGE_CHECK, "stream-nodechange-check", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_TRIM_DB_TIMER, "trim-db-tmr", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_GRANT_NOTIFY, "grant-notify", NULL, NULL)
@@ -251,7 +251,9 @@
   TD_DEF_MSG_TYPE(TDMT_MND_STREAM_UPDATE_CHKPT_EVT, "stream-update-chkpt-evt", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_STREAM_CHKPT_REPORT, "stream-chkpt-report", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_STREAM_CONSEN_TIMER, "stream-consen-tmr", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_MND_MAX_MSG, "mnd-max", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_STREAM_DROP_ORPHANTASKS, "stream-drop-orphan-tasks", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_STREAM_TASK_RESET, "stream-reset-tasks", NULL, NULL)
+  TD_DEF_MSG_TYPE(TDMT_MND_UPDATE_DNODE_INFO, "update-dnode-info", NULL, NULL)
   TD_CLOSE_MSG_SEG(TDMT_END_MND_MSG)
 
   TD_NEW_MSG_SEG(TDMT_VND_MSG)  // 2<<8

include/common/ttime.h

@@ -64,7 +64,7 @@ static FORCE_INLINE int64_t taosGetTimestampToday(int32_t precision) {
                                                                 : 1000000000;
   time_t    t = taosTime(NULL);
   struct tm tm;
-  taosLocalTime(&t, &tm, NULL);
+  (void) taosLocalTime(&t, &tm, NULL);
   tm.tm_hour = 0;
   tm.tm_min = 0;
   tm.tm_sec = 0;
@@ -86,11 +86,11 @@ void    deltaToUtcInitOnce();
 char    getPrecisionUnit(int32_t precision);
 
 int64_t convertTimePrecision(int64_t ts, int32_t fromPrecision, int32_t toPrecision);
-int64_t convertTimeFromPrecisionToUnit(int64_t ts, int32_t fromPrecision, char toUnit);
+int32_t convertTimeFromPrecisionToUnit(int64_t time, int32_t fromPrecision, char toUnit, int64_t* pRes);
 int32_t convertStringToTimestamp(int16_t type, char* inputData, int64_t timePrec, int64_t* timeVal);
 int32_t getDuration(int64_t val, char unit, int64_t* result, int32_t timePrecision);
 
-void taosFormatUtcTime(char* buf, int32_t bufLen, int64_t ts, int32_t precision);
+int32_t taosFormatUtcTime(char* buf, int32_t bufLen, int64_t ts, int32_t precision);
 
 struct STm {
   struct tm tm;
@@ -117,7 +117,7 @@ int32_t taosTs2Char(const char* format, SArray** formats, int64_t ts, int32_t pr
 int32_t taosChar2Ts(const char* format, SArray** formats, const char* tsStr, int64_t* ts, int32_t precision, char* errMsg,
                     int32_t errMsgLen);
 
-void    TEST_ts2char(const char* format, int64_t ts, int32_t precision, char* out, int32_t outLen);
+int32_t TEST_ts2char(const char* format, int64_t ts, int32_t precision, char* out, int32_t outLen);
 int32_t TEST_char2ts(const char* format, int64_t* ts, int32_t precision, const char* tsStr);
 
 /// @brief get offset seconds from zero timezone to input timezone

include/common/ttszip.h

@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TD_COMMON_TTSZIP_H_
-#define _TD_COMMON_TTSZIP_H_
-
-#include "os.h"
-#include "tdef.h"
-#include "tvariant.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MEM_BUF_SIZE           (1 << 20)
-#define TS_COMP_FILE_MAGIC     0x87F5EC4C
-#define TS_COMP_FILE_GROUP_MAX 512
-
-typedef struct STSList {
-  char*   rawBuf;
-  int32_t allocSize;
-  int32_t threshold;
-  int32_t len;
-} STSList;
-
-typedef struct STSElem {
-  TSKEY     ts;
-  SVariant* tag;
-  int32_t   id;
-} STSElem;
-
-typedef struct STSCursor {
-  int32_t  vgroupIndex;
-  int32_t  blockIndex;
-  int32_t  tsIndex;
-  uint32_t order;
-} STSCursor;
-
-typedef struct STSBlock {
-  SVariant tag;        // tag value
-  int32_t  numOfElem;  // number of elements
-  int32_t  compLen;    // size after compressed
-  int32_t  padding;    // 0xFFFFFFFF by default, after the payload
-  char*    payload;    // actual data that is compressed
-} STSBlock;
-
-/*
- * The size of buffer file should not be greater than 2G,
- * and the offset of int32_t type is enough
- */
-typedef struct STSGroupBlockInfo {
-  int32_t id;           // group id
-  int32_t offset;       // offset set value in file
-  int32_t numOfBlocks;  // number of total blocks
-  int32_t compLen;      // compressed size
-} STSGroupBlockInfo;
-
-typedef struct STSGroupBlockInfoEx {
-  STSGroupBlockInfo info;
-  int32_t           len;  // length before compress
-} STSGroupBlockInfoEx;
-
-typedef struct STSBuf {
-  TdFilePtr pFile;
-  char      path[PATH_MAX];
-  uint32_t  fileSize;
-
-  // todo use array
-  STSGroupBlockInfoEx* pData;
-  uint32_t             numOfAlloc;
-  uint32_t             numOfGroups;
-
-  char*     assistBuf;
-  int32_t   bufSize;
-  STSBlock  block;
-  STSList   tsData;  // uncompressed raw ts data
-  uint64_t  numOfTotal;
-  bool      autoDelete;
-  bool      remainOpen;
-  int32_t   tsOrder;  // order of timestamp in ts comp buffer
-  STSCursor cur;
-} STSBuf;
-
-typedef struct STSBufFileHeader {
-  uint32_t magic;       // file magic number
-  uint32_t numOfGroup;  // number of group stored in current file
-  int32_t  tsOrder;     // timestamp order in current file
-} STSBufFileHeader;
-
-STSBuf* tsBufCreate(bool autoDelete, int32_t order);
-STSBuf* tsBufCreateFromFile(const char* path, bool autoDelete);
-STSBuf* tsBufCreateFromCompBlocks(const char* pData, int32_t numOfBlocks, int32_t len, int32_t tsOrder, int32_t id);
-
-void* tsBufDestroy(STSBuf* pTSBuf);
-
-void    tsBufAppend(STSBuf* pTSBuf, int32_t id, SVariant* tag, const char* pData, int32_t len);
-int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf);
-
-STSBuf* tsBufClone(STSBuf* pTSBuf);
-
-STSGroupBlockInfo* tsBufGetGroupBlockInfo(STSBuf* pTSBuf, int32_t id);
-
-void tsBufFlush(STSBuf* pTSBuf);
-void tsBufResetPos(STSBuf* pTSBuf);
-bool tsBufNextPos(STSBuf* pTSBuf);
-
-STSElem tsBufGetElem(STSBuf* pTSBuf);
-STSElem tsBufGetElemStartPos(STSBuf* pTSBuf, int32_t id, SVariant* tag);
-
-STSCursor tsBufGetCursor(STSBuf* pTSBuf);
-void      tsBufSetTraverseOrder(STSBuf* pTSBuf, int32_t order);
-
-void tsBufSetCursor(STSBuf* pTSBuf, STSCursor* pCur);
-
-/**
- * display all data in comp block file, for debug purpose only
- * @param pTSBuf
- */
-void tsBufDisplay(STSBuf* pTSBuf);
-
-int32_t tsBufGetNumOfGroup(STSBuf* pTSBuf);
-
-void tsBufGetGroupIdList(STSBuf* pTSBuf, int32_t* num, int32_t** id);
-
-int32_t dumpFileBlockByGroupId(STSBuf* pTSBuf, int32_t id, void* buf, int32_t* len, int32_t* numOfBlocks);
-
-STSElem tsBufFindElemStartPosByTag(STSBuf* pTSBuf, SVariant* pTag);
-
-bool tsBufIsValidElem(STSElem* pElem);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TD_COMMON_TTSZIP_H_*/

include/common/ttypes.h

@@ -46,7 +46,7 @@ typedef struct {
 #pragma pack(pop)
 
 #define varDataTLen(v)         (sizeof(VarDataLenT) + varDataLen(v))
-#define varDataCopy(dst, v)    memcpy((dst), (void *)(v), varDataTLen(v))
+#define varDataCopy(dst, v)    (void)memcpy((dst), (void *)(v), varDataTLen(v))
 #define varDataLenByData(v)    (*(VarDataLenT *)(((char *)(v)) - VARSTR_HEADER_SIZE))
 #define varDataSetLen(v, _len) (((VarDataLenT *)(v))[0] = (VarDataLenT)(_len))
 

include/dnode/qnode/qnode.h

@@ -34,9 +34,10 @@ typedef struct {
  * @brief Start one Qnode in Dnode.
  *
  * @param pOption Option of the qnode.
- * @return SQnode* The qnode object.
+ * @param pQnode The qnode object.
+ * @return int32_t The error code.
  */
-SQnode *qndOpen(const SQnodeOpt *pOption);
+int32_t qndOpen(const SQnodeOpt *pOption, SQnode **pQnode);
 
 /**
  * @brief Stop Qnode in Dnode.

include/libs/executor/executor.h

@@ -201,7 +201,7 @@ void qStreamSetOpen(qTaskInfo_t tinfo);
 
 void qStreamSetSourceExcluded(qTaskInfo_t tinfo, int8_t sourceExcluded);
 
-void qStreamExtractOffset(qTaskInfo_t tinfo, STqOffsetVal* pOffset);
+int32_t qStreamExtractOffset(qTaskInfo_t tinfo, STqOffsetVal* pOffset);
 
 SMqBatchMetaRsp* qStreamExtractMetaMsg(qTaskInfo_t tinfo);
 
@@ -211,7 +211,7 @@ const char* qExtractTbnameFromTask(qTaskInfo_t tinfo);
 
 void* qExtractReaderFromStreamScanner(void* scanner);
 
-int32_t qExtractStreamScanner(qTaskInfo_t tinfo, void** scanner);
+void qExtractStreamScanner(qTaskInfo_t tinfo, void** scanner);
 
 int32_t qSetStreamOperatorOptionForScanHistory(qTaskInfo_t tinfo);
 int32_t qStreamSourceScanParamForHistoryScanStep1(qTaskInfo_t tinfo, SVersionRange *pVerRange, STimeWindow* pWindow);

include/libs/executor/storageapi.h

@@ -78,7 +78,7 @@ typedef struct SMetaEntry {
     } smaEntry;
   };
 
-  uint8_t*        pBuf;
+  uint8_t* pBuf;
 
   SColCmprWrapper colCmpr;  // col compress alg
 } SMetaEntry;
@@ -105,15 +105,15 @@ typedef struct SMTbCursor {
 } SMTbCursor;
 
 typedef struct SMCtbCursor {
-  struct SMeta*   pMeta;
-  void*    pCur;
-  tb_uid_t suid;
-  void*    pKey;
-  void*    pVal;
-  int      kLen;
-  int      vLen;
-  int8_t   paused;
-  int      lock;
+  struct SMeta* pMeta;
+  void*         pCur;
+  tb_uid_t      suid;
+  void*         pKey;
+  void*         pVal;
+  int           kLen;
+  int           vLen;
+  int8_t        paused;
+  int           lock;
 } SMCtbCursor;
 
 typedef struct SRowBuffPos {
@@ -135,17 +135,17 @@ typedef struct SMetaTableInfo {
 
 typedef struct SSnapContext {
   struct SMeta* pMeta;
-  int64_t   snapVersion;
-  void*     pCur;
-  int64_t   suid;
-  int8_t    subType;
-  SHashObj* idVersion;
-  SHashObj* suidInfo;
-  SArray*   idList;
-  int32_t   index;
-  int8_t    withMeta;
-  int8_t    queryMeta;  // true-get meta, false-get data
-  bool      hasPrimaryKey;
+  int64_t       snapVersion;
+  void*         pCur;
+  int64_t       suid;
+  int8_t        subType;
+  SHashObj*     idVersion;
+  SHashObj*     suidInfo;
+  SArray*       idList;
+  int32_t       index;
+  int8_t        withMeta;
+  int8_t        queryMeta;  // true-get meta, false-get data
+  bool          hasPrimaryKey;
 } SSnapContext;
 
 typedef struct {
@@ -195,7 +195,7 @@ typedef struct SStoreCacheReader {
   int32_t  (*openReader)(void *pVnode, int32_t type, void *pTableIdList, int32_t numOfTables, int32_t numOfCols,
                          SArray *pCidList, int32_t *pSlotIds, uint64_t suid, void **pReader, const char *idstr,
                          SArray *pFuncTypeList, SColumnInfo* pPkCol, int32_t numOfPks);
-  void    *(*closeReader)(void *pReader);
+  void     (*closeReader)(void *pReader);
   int32_t  (*retrieveRows)(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds, const int32_t *dstSlotIds,
                            SArray *pTableUidList);
   int32_t  (*reuseReader)(void *pReader, void *pTableIdList, int32_t numOfTables);
@@ -218,10 +218,10 @@ typedef struct SStoreTqReader {
   int32_t (*tqGetStreamExecProgress)();
 
   void (*tqReaderSetColIdList)();
-  int32_t (*tqReaderSetQueryTableList)();
+  void (*tqReaderSetQueryTableList)();
 
-  int32_t (*tqReaderAddTables)();
-  int32_t (*tqReaderRemoveTables)();
+  void (*tqReaderAddTables)();
+  void (*tqReaderRemoveTables)();
 
   void (*tqSetTablePrimaryKey)();
   bool (*tqGetTablePrimaryKey)();
@@ -229,18 +229,18 @@ typedef struct SStoreTqReader {
   bool (*tqReaderCurrentBlockConsumed)();
 
   struct SWalReader* (*tqReaderGetWalReader)();  // todo remove it
-//  int32_t (*tqReaderRetrieveTaosXBlock)();       // todo remove it
+                                                 //  int32_t (*tqReaderRetrieveTaosXBlock)();       // todo remove it
 
   int32_t (*tqReaderSetSubmitMsg)();  // todo remove it
-//  bool (*tqReaderNextBlockFilterOut)();
+  //  bool (*tqReaderNextBlockFilterOut)();
 } SStoreTqReader;
 
 typedef struct SStoreSnapshotFn {
-  bool    (*taosXGetTablePrimaryKey)(SSnapContext *ctx);
-  void    (*taosXSetTablePrimaryKey)(SSnapContext *ctx, int64_t uid);
+  bool (*taosXGetTablePrimaryKey)(SSnapContext* ctx);
+  void (*taosXSetTablePrimaryKey)(SSnapContext* ctx, int64_t uid);
   int32_t (*setForSnapShot)(SSnapContext* ctx, int64_t uid);
-  int32_t (*destroySnapshot)(SSnapContext* ctx);
-  SMetaTableInfo (*getMetaTableInfoFromSnapshot)(SSnapContext* ctx);
+  void (*destroySnapshot)(SSnapContext* ctx);
+  int32_t (*getMetaTableInfoFromSnapshot)(SSnapContext* ctx, SMetaTableInfo* info);
   int32_t (*getTableInfoFromSnapshot)(SSnapContext* ctx, void** pBuf, int32_t* contLen, int16_t* type, int64_t* uid);
 } SStoreSnapshotFn;
 
@@ -270,7 +270,7 @@ typedef struct SStoreMeta {
   int32_t (*putCachedTableList)(void* pVnode, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload,
                                 int32_t payloadLen, double selectivityRatio);
 
-  void* (*storeGetIndexInfo)(void *pVnode);
+  void* (*storeGetIndexInfo)(void* pVnode);
   void* (*getInvertIndex)(void* pVnode);
   // support filter and non-filter cases. [vnodeGetCtbIdList & vnodeGetCtbIdListByFilter]
   int32_t (*getChildTableList)(void* pVnode, int64_t suid, SArray* list);
@@ -329,29 +329,31 @@ typedef struct {
 
 typedef struct SStateStore {
   int32_t (*streamStatePutParName)(SStreamState* pState, int64_t groupId, const char* tbname);
-  int32_t (*streamStateGetParName)(SStreamState* pState, int64_t groupId, void** pVal, bool onlyCache);
+  int32_t (*streamStateGetParName)(SStreamState* pState, int64_t groupId, void** pVal, bool onlyCache,
+                                   int32_t* pWinCode);
 
-  int32_t (*streamStateAddIfNotExist)(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen);
-  int32_t (*streamStateReleaseBuf)(SStreamState* pState, void* pVal, bool used);
-  int32_t (*streamStateClearBuff)(SStreamState* pState, void* pVal);
+  int32_t (*streamStateAddIfNotExist)(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen,
+                                      int32_t* pWinCode);
+  void (*streamStateReleaseBuf)(SStreamState* pState, void* pVal, bool used);
+  void (*streamStateClearBuff)(SStreamState* pState, void* pVal);
   void (*streamStateFreeVal)(void* val);
 
   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 (*streamStateGet)(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen, int32_t* pWinCode);
   bool (*streamStateCheck)(SStreamState* pState, const SWinKey* key);
   int32_t (*streamStateGetByPos)(SStreamState* pState, void* pos, void** pVal);
-  int32_t (*streamStateDel)(SStreamState* pState, const SWinKey* key);
-  int32_t (*streamStateClear)(SStreamState* pState);
+  void (*streamStateDel)(SStreamState* pState, const SWinKey* key);
+  void (*streamStateClear)(SStreamState* pState);
   void (*streamStateSetNumber)(SStreamState* pState, int32_t number, int32_t tsIdex);
-  int32_t (*streamStateSaveInfo)(SStreamState* pState, void* pKey, int32_t keyLen, void* pVal, int32_t vLen);
+  void (*streamStateSaveInfo)(SStreamState* pState, void* pKey, int32_t keyLen, void* pVal, int32_t vLen);
   int32_t (*streamStateGetInfo)(SStreamState* pState, void* pKey, int32_t keyLen, void** pVal, int32_t* pLen);
 
   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);
-  int32_t (*streamStateFillDel)(SStreamState* pState, const SWinKey* key);
+  void (*streamStateFillDel)(SStreamState* pState, const SWinKey* key);
 
-  int32_t (*streamStateCurNext)(SStreamState* pState, SStreamStateCur* pCur);
-  int32_t (*streamStateCurPrev)(SStreamState* pState, SStreamStateCur* pCur);
+  void (*streamStateCurNext)(SStreamState* pState, SStreamStateCur* pCur);
+  void (*streamStateCurPrev)(SStreamState* pState, SStreamStateCur* pCur);
 
   SStreamStateCur* (*streamStateGetAndCheckCur)(SStreamState* pState, SWinKey* key);
   SStreamStateCur* (*streamStateSeekKeyNext)(SStreamState* pState, const SWinKey* key);
@@ -363,26 +365,29 @@ typedef struct SStateStore {
   int32_t (*streamStateGetKVByCur)(SStreamStateCur* pCur, SWinKey* pKey, const void** pVal, int32_t* pVLen);
 
   int32_t (*streamStateSessionAddIfNotExist)(SStreamState* pState, SSessionKey* key, TSKEY gap, void** pVal,
-                                             int32_t* pVLen);
+                                             int32_t* pVLen, int32_t* pWinCode);
   int32_t (*streamStateSessionPut)(SStreamState* pState, const SSessionKey* key, void* value, int32_t vLen);
-  int32_t (*streamStateSessionGet)(SStreamState* pState, SSessionKey* key, void** pVal, int32_t* pVLen);
-  int32_t (*streamStateSessionDel)(SStreamState* pState, const SSessionKey* key);
-  int32_t (*streamStateSessionReset)(SStreamState* pState, void* pVal);
-  int32_t (*streamStateSessionClear)(SStreamState* pState);
+  int32_t (*streamStateSessionGet)(SStreamState* pState, SSessionKey* key, void** pVal, int32_t* pVLen,
+                                   int32_t* pWinCode);
+  void (*streamStateSessionDel)(SStreamState* pState, const SSessionKey* key);
+  void (*streamStateSessionReset)(SStreamState* pState, void* pVal);
+  void (*streamStateSessionClear)(SStreamState* pState);
   int32_t (*streamStateSessionGetKVByCur)(SStreamStateCur* pCur, SSessionKey* pKey, void** pVal, int32_t* pVLen);
   int32_t (*streamStateStateAddIfNotExist)(SStreamState* pState, SSessionKey* key, char* pKeyData, int32_t keyDataLen,
-                                           state_key_cmpr_fn fn, void** pVal, int32_t* pVLen);
+                                           state_key_cmpr_fn fn, void** pVal, int32_t* pVLen, int32_t* pWinCode);
   int32_t (*streamStateSessionGetKeyByRange)(SStreamState* pState, const SSessionKey* range, SSessionKey* curKey);
   int32_t (*streamStateCountGetKeyByRange)(SStreamState* pState, const SSessionKey* range, SSessionKey* curKey);
   int32_t (*streamStateSessionAllocWinBuffByNextPosition)(SStreamState* pState, SStreamStateCur* pCur,
                                                           const SSessionKey* pKey, void** pVal, int32_t* pVLen);
 
   int32_t (*streamStateCountWinAddIfNotExist)(SStreamState* pState, SSessionKey* pKey, COUNT_TYPE winCount,
-                                              void** ppVal, int32_t* pVLen);
+                                              void** ppVal, int32_t* pVLen, int32_t* pWinCode);
   int32_t (*streamStateCountWinAdd)(SStreamState* pState, SSessionKey* pKey, void** pVal, int32_t* pVLen);
 
-  int32_t (*updateInfoInit)(int64_t interval, int32_t precision, int64_t watermark, bool igUp, int8_t pkType, int32_t pkLen, SUpdateInfo** ppInfo);
-  TSKEY (*updateInfoFillBlockData)(SUpdateInfo* pInfo, SSDataBlock* pBlock, int32_t primaryTsCol, int32_t primaryKeyCol);
+  int32_t (*updateInfoInit)(int64_t interval, int32_t precision, int64_t watermark, bool igUp, int8_t pkType,
+                            int32_t pkLen, SUpdateInfo** ppInfo);
+  int32_t (*updateInfoFillBlockData)(SUpdateInfo* pInfo, SSDataBlock* pBlock, int32_t primaryTsCol,
+                                     int32_t primaryKeyCol, TSKEY* pMaxResTs);
   bool (*updateInfoIsUpdated)(SUpdateInfo* pInfo, uint64_t tableId, TSKEY ts, void* pPkVal, int32_t len);
   bool (*updateInfoIsTableInserted)(SUpdateInfo* pInfo, int64_t tbUid);
   bool (*isIncrementalTimeStamp)(SUpdateInfo* pInfo, uint64_t tableId, TSKEY ts, void* pPkVal, int32_t len);
@@ -391,7 +396,8 @@ typedef struct SStateStore {
   void (*windowSBfDelete)(SUpdateInfo* pInfo, uint64_t count);
   int32_t (*windowSBfAdd)(SUpdateInfo* pInfo, uint64_t count);
 
-  int32_t (*updateInfoInitP)(SInterval* pInterval, int64_t watermark, bool igUp, int8_t pkType, int32_t pkLen, SUpdateInfo** ppInfo);
+  int32_t (*updateInfoInitP)(SInterval* pInterval, int64_t watermark, bool igUp, int8_t pkType, int32_t pkLen,
+                             SUpdateInfo** ppInfo);
   void (*updateInfoAddCloseWindowSBF)(SUpdateInfo* pInfo);
   void (*updateInfoDestoryColseWinSBF)(SUpdateInfo* pInfo);
   int32_t (*updateInfoSerialize)(void* buf, int32_t bufLen, const SUpdateInfo* pInfo, int32_t* pLen);
@@ -413,7 +419,7 @@ typedef struct SStateStore {
   SStreamState* (*streamStateOpen)(const char* path, void* pTask, int64_t streamId, int32_t taskId);
   void (*streamStateClose)(SStreamState* pState, bool remove);
   int32_t (*streamStateBegin)(SStreamState* pState);
-  int32_t (*streamStateCommit)(SStreamState* pState);
+  void (*streamStateCommit)(SStreamState* pState);
   void (*streamStateDestroy)(SStreamState* pState, bool remove);
   int32_t (*streamStateDeleteCheckPoint)(SStreamState* pState, TSKEY mark);
   void (*streamStateReloadInfo)(SStreamState* pState, TSKEY ts);

include/libs/function/function.h

@@ -36,7 +36,7 @@ typedef struct SFuncExecEnv {
 } SFuncExecEnv;
 
 typedef bool (*FExecGetEnv)(struct SFunctionNode *pFunc, SFuncExecEnv *pEnv);
-typedef bool (*FExecInit)(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
+typedef int32_t (*FExecInit)(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
 typedef int32_t (*FExecProcess)(struct SqlFunctionCtx *pCtx);
 typedef int32_t (*FExecFinalize)(struct SqlFunctionCtx *pCtx, SSDataBlock *pBlock);
 typedef int32_t (*FScalarExecProcess)(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
@@ -294,7 +294,7 @@ typedef struct SPoint {
   void   *val;
 } SPoint;
 
-int32_t taosGetLinearInterpolationVal(SPoint *point, int32_t outputType, SPoint *point1, SPoint *point2,
+void taosGetLinearInterpolationVal(SPoint *point, int32_t outputType, SPoint *point1, SPoint *point2,
                                       int32_t inputType);
 
 #define LEASTSQUARES_DOUBLE_ITEM_LENGTH 25

include/libs/function/functionMgt.h

@@ -138,6 +138,7 @@ typedef enum EFunctionType {
   FUNCTION_TYPE_CACHE_LAST_ROW,
   FUNCTION_TYPE_CACHE_LAST,
   FUNCTION_TYPE_TABLE_COUNT,
+  FUNCTION_TYPE_GROUP_CONST_VALUE,
 
   // distributed splitting functions
   FUNCTION_TYPE_APERCENTILE_PARTIAL = 4000,
@@ -256,9 +257,10 @@ bool fmIsConstantResFunc(SFunctionNode* pFunc);
 bool fmIsSkipScanCheckFunc(int32_t funcId);
 bool fmIsPrimaryKeyFunc(int32_t funcId);
 bool fmIsProcessByRowFunc(int32_t funcId);
+bool fmisSelectGroupConstValueFunc(int32_t funcId);
 
 void getLastCacheDataType(SDataType* pType, int32_t pkBytes);
-SFunctionNode* createFunction(const char* pName, SNodeList* pParameterList);
+int32_t createFunction(const char* pName, SNodeList* pParameterList, SFunctionNode** pFunc);
 
 int32_t fmGetDistMethod(const SFunctionNode* pFunc, SFunctionNode** pPartialFunc, SFunctionNode** pMidFunc, SFunctionNode** pMergeFunc);
 
@@ -271,7 +273,7 @@ typedef enum EFuncDataRequired {
 } EFuncDataRequired;
 
 EFuncDataRequired fmFuncDataRequired(SFunctionNode* pFunc, STimeWindow* pTimeWindow);
-EFuncDataRequired fmFuncDynDataRequired(int32_t funcId, void* pRes, SDataBlockInfo* pBlockInfo);
+int32_t fmFuncDynDataRequired(int32_t funcId, void* pRes, SDataBlockInfo* pBlockInfo, int32_t *reqStatus);
 
 int32_t fmGetFuncExecFuncs(int32_t funcId, SFuncExecFuncs* pFpSet);
 int32_t fmGetScalarFuncExecFuncs(int32_t funcId, SScalarFuncExecFuncs* pFpSet);

include/libs/function/taosudf.h

@@ -33,6 +33,15 @@ extern "C" {
 #else
 #define FORCE_INLINE
 #endif
+
+#define TAOS_UDF_CHECK_RETURN(CMD)   \
+  do {                               \
+    int32_t code = (CMD);            \
+    if (code != TSDB_CODE_SUCCESS) { \
+      return (CMD);                  \
+    }                                \
+  } while (0)
+
 typedef struct SUdfColumnMeta {
   int16_t type;
   int32_t bytes;
@@ -105,12 +114,14 @@ typedef uint16_t VarDataLenT;  // maxVarDataLen: 65535
 #define varDataLen(v)          ((VarDataLenT *)(v))[0]
 #define varDataVal(v)          ((char *)(v) + VARSTR_HEADER_SIZE)
 #define varDataTLen(v)         (sizeof(VarDataLenT) + varDataLen(v))
-#define varDataCopy(dst, v)    memcpy((dst), (void *)(v), varDataTLen(v))
+#define varDataCopy(dst, v)    (void)memcpy((dst), (void *)(v), varDataTLen(v))
 #define varDataLenByData(v)    (*(VarDataLenT *)(((char *)(v)) - VARSTR_HEADER_SIZE))
 #define varDataSetLen(v, _len) (((VarDataLenT *)(v))[0] = (VarDataLenT)(_len))
-#define IS_VAR_DATA_TYPE(t) \
-  (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_VARBINARY) || ((t) == TSDB_DATA_TYPE_NCHAR) || ((t) == TSDB_DATA_TYPE_JSON) || ((t) == TSDB_DATA_TYPE_GEOMETRY))
-#define IS_STR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_VARBINARY) || ((t) == TSDB_DATA_TYPE_NCHAR))
+#define IS_VAR_DATA_TYPE(t)                                                                                 \
+  (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_VARBINARY) || ((t) == TSDB_DATA_TYPE_NCHAR) || \
+   ((t) == TSDB_DATA_TYPE_JSON) || ((t) == TSDB_DATA_TYPE_GEOMETRY))
+#define IS_STR_DATA_TYPE(t) \
+  (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_VARBINARY) || ((t) == TSDB_DATA_TYPE_NCHAR))
 
 static FORCE_INLINE char *udfColDataGetData(const SUdfColumn *pColumn, int32_t row) {
   if (IS_VAR_DATA_TYPE(pColumn->colMeta.type)) {
@@ -158,7 +169,7 @@ static FORCE_INLINE int32_t udfColEnsureCapacity(SUdfColumn *pColumn, int32_t ne
     }
     data->varLenCol.varOffsets = (int32_t *)tmp;
     data->varLenCol.varOffsetsLen = sizeof(int32_t) * allocCapacity;
-    memset(&data->varLenCol.varOffsets[existedRows], 0, sizeof(int32_t) * (allocCapacity - existedRows));
+    (void)memset(&data->varLenCol.varOffsets[existedRows], 0, sizeof(int32_t) * (allocCapacity - existedRows));
     // for payload, add data in udfColDataAppend
   } else {
     char *tmp = (char *)realloc(data->fixLenCol.nullBitmap, BitmapLen(allocCapacity));
@@ -166,11 +177,11 @@ static FORCE_INLINE int32_t udfColEnsureCapacity(SUdfColumn *pColumn, int32_t ne
       return TSDB_CODE_OUT_OF_MEMORY;
     }
     uint32_t extend = BitmapLen(allocCapacity) - BitmapLen(data->rowsAlloc);
-    memset(tmp + BitmapLen(data->rowsAlloc), 0, extend);
+    (void)memset(tmp + BitmapLen(data->rowsAlloc), 0, extend);
     data->fixLenCol.nullBitmap = tmp;
     data->fixLenCol.nullBitmapLen = BitmapLen(allocCapacity);
     int32_t oldLen = BitmapLen(existedRows);
-    memset(&data->fixLenCol.nullBitmap[oldLen], 0, BitmapLen(allocCapacity) - oldLen);
+    (void)memset(&data->fixLenCol.nullBitmap[oldLen], 0, BitmapLen(allocCapacity) - oldLen);
 
     if (meta->type == TSDB_DATA_TYPE_NULL) {
       return TSDB_CODE_SUCCESS;
@@ -190,8 +201,11 @@ static FORCE_INLINE int32_t udfColEnsureCapacity(SUdfColumn *pColumn, int32_t ne
   return TSDB_CODE_SUCCESS;
 }
 
-static FORCE_INLINE void udfColDataSetNull(SUdfColumn *pColumn, int32_t row) {
-  udfColEnsureCapacity(pColumn, row + 1);
+static FORCE_INLINE int32_t udfColDataSetNull(SUdfColumn *pColumn, int32_t row) {
+  int32_t code = udfColEnsureCapacity(pColumn, row + 1);
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
   if (IS_VAR_DATA_TYPE(pColumn->colMeta.type)) {
     udfColDataSetNull_var(pColumn, row);
   } else {
@@ -199,19 +213,20 @@ static FORCE_INLINE void udfColDataSetNull(SUdfColumn *pColumn, int32_t row) {
   }
   pColumn->hasNull = true;
   pColumn->colData.numOfRows = ((int32_t)(row + 1) > pColumn->colData.numOfRows) ? (int32_t)(row + 1) : pColumn->colData.numOfRows;
+  return 0;
 }
 
 static FORCE_INLINE int32_t udfColDataSet(SUdfColumn *pColumn, uint32_t currentRow, const char *pData, bool isNull) {
   SUdfColumnMeta *meta = &pColumn->colMeta;
   SUdfColumnData *data = &pColumn->colData;
-  udfColEnsureCapacity(pColumn, currentRow + 1);
+  TAOS_UDF_CHECK_RETURN(udfColEnsureCapacity(pColumn, currentRow + 1));
   bool isVarCol = IS_VAR_DATA_TYPE(meta->type);
   if (isNull) {
-    udfColDataSetNull(pColumn, currentRow);
+    TAOS_UDF_CHECK_RETURN(udfColDataSetNull(pColumn, currentRow));
   } else {
     if (!isVarCol) {
       udfColDataSetNotNull_f(pColumn, currentRow);
-      memcpy(data->fixLenCol.data + meta->bytes * currentRow, pData, meta->bytes);
+      (void)memcpy(data->fixLenCol.data + meta->bytes * currentRow, pData, meta->bytes);
     } else {
       int32_t dataLen = varDataTLen(pData);
       if (meta->type == TSDB_DATA_TYPE_JSON) {
@@ -249,7 +264,7 @@ static FORCE_INLINE int32_t udfColDataSet(SUdfColumn *pColumn, uint32_t currentR
       uint32_t len = data->varLenCol.payloadLen;
       data->varLenCol.varOffsets[currentRow] = len;
 
-      memcpy(data->varLenCol.payload + len, pData, dataLen);
+      (void)memcpy(data->varLenCol.payload + len, pData, dataLen);
       data->varLenCol.payloadLen += dataLen;
     }
   }
@@ -278,8 +293,8 @@ typedef enum EUdfFuncType { UDF_FUNC_TYPE_SCALAR = 1, UDF_FUNC_TYPE_AGG = 2 } EU
 
 typedef struct SScriptUdfInfo {
   const char *name;
-  int32_t version;
-  int64_t createdTime;
+  int32_t     version;
+  int64_t     createdTime;
 
   EUdfFuncType funcType;
   int8_t       scriptType;

include/libs/function/tudf.h

@@ -43,6 +43,25 @@ extern "C" {
 #endif
 #define UDF_DNODE_ID_ENV_NAME "DNODE_ID"
 
+#define TAOS_UV_LIB_ERROR_RET(ret)                    \
+    do {                                              \
+        if (0 != ret) {                               \
+            terrno = TSDB_CODE_UDF_UV_EXEC_FAILURE;   \
+            return TSDB_CODE_UDF_UV_EXEC_FAILURE;     \
+        }                                             \
+    } while(0)
+
+
+#define TAOS_UV_CHECK_ERRNO(CODE)                   \
+  do {                                              \
+    if (0 != CODE) {                                \
+      terrln = __LINE__;                            \
+      terrno = (CODE);     \
+      goto _exit;                                   \
+    }                                               \
+  } while (0)
+
+
 // low level APIs
 /**
  * setup udf
@@ -77,7 +96,7 @@ void freeUdfInterBuf(SUdfInterBuf *buf);
 
 // high level APIs
 bool    udfAggGetEnv(struct SFunctionNode *pFunc, SFuncExecEnv *pEnv);
-bool    udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
+int32_t udfAggInit(struct SqlFunctionCtx *pCtx, struct SResultRowEntryInfo *pResultCellInfo);
 int32_t udfAggProcess(struct SqlFunctionCtx *pCtx);
 int32_t udfAggFinalize(struct SqlFunctionCtx *pCtx, SSDataBlock *pBlock);
 
@@ -109,13 +128,13 @@ int32_t udfStartUdfd(int32_t startDnodeId);
  * stop udfd
  * @return
  */
-int32_t udfStopUdfd();
+void udfStopUdfd();
 
 /**
  * get udfd pid
  *
  */
- int32_t udfGetUdfdPid(int32_t* pUdfdPid);
+// int32_t udfGetUdfdPid(int32_t* pUdfdPid);
 
 #ifdef __cplusplus
 }

include/libs/index/index.h

@@ -83,7 +83,7 @@ void indexMultiTermQueryDestroy(SIndexMultiTermQuery* pQuery);
  * @param type (input, single query type)
  * @return error code
  */
-int indexMultiTermQueryAdd(SIndexMultiTermQuery* pQuery, SIndexTerm* term, EIndexQueryType type);
+int32_t indexMultiTermQueryAdd(SIndexMultiTermQuery* pQuery, SIndexTerm* term, EIndexQueryType type);
 /*
  * open index
  * @param opt (input, index opt)
@@ -91,7 +91,7 @@ int indexMultiTermQueryAdd(SIndexMultiTermQuery* pQuery, SIndexTerm* term, EInde
  * @param index (output, index object)
  * @return error code
  */
-int indexOpen(SIndexOpts* opt, const char* path, SIndex** index);
+int32_t indexOpen(SIndexOpts* opt, const char* path, SIndex** index);
 /*
  * close index
  * @param index (input, index to be closed)
@@ -106,7 +106,7 @@ void indexClose(SIndex* index);
  * @param uid  (input, uid of terms)
  * @return error code
  */
-int indexPut(SIndex* index, SIndexMultiTerm* terms, uint64_t uid);
+int32_t indexPut(SIndex* index, SIndexMultiTerm* terms, uint64_t uid);
 /*
  * delete terms that meet query condition
  * @param index (input, index object)
@@ -114,7 +114,7 @@ int indexPut(SIndex* index, SIndexMultiTerm* terms, uint64_t uid);
  * @return error code
  */
 
-int indexDelete(SIndex* index, SIndexMultiTermQuery* query);
+int32_t indexDelete(SIndex* index, SIndexMultiTermQuery* query);
 /*
  * search index
  * @param index (input, index object)
@@ -122,7 +122,7 @@ int indexDelete(SIndex* index, SIndexMultiTermQuery* query);
  * @param result(output, query result)
  * @return error code
  */
-int indexSearch(SIndex* index, SIndexMultiTermQuery* query, SArray* result);
+int32_t indexSearch(SIndex* index, SIndexMultiTermQuery* query, SArray* result);
 /*
  * rebuild index
  * @param index (input, index object)
@@ -138,7 +138,7 @@ int indexSearch(SIndex* index, SIndexMultiTermQuery* query, SArray* result);
  * @param index (output, index json object)
  * @return error code
  */
-int indexJsonOpen(SIndexJsonOpts* opts, const char* path, SIndexJson** index);
+int32_t indexJsonOpen(SIndexJsonOpts* opts, const char* path, SIndexJson** index);
 /*
  * close index
  * @param index (input, index to be closed)
@@ -154,7 +154,7 @@ void indexJsonClose(SIndexJson* index);
  * @param uid  (input, uid of terms)
  * @return error code
  */
-int indexJsonPut(SIndexJson* index, SIndexJsonMultiTerm* terms, uint64_t uid);
+int32_t indexJsonPut(SIndexJson* index, SIndexJsonMultiTerm* terms, uint64_t uid);
 /*
  * search index
  * @param index (input, index object)
@@ -163,7 +163,7 @@ int indexJsonPut(SIndexJson* index, SIndexJsonMultiTerm* terms, uint64_t uid);
  * @return error code
  */
 
-int indexJsonSearch(SIndexJson* index, SIndexJsonMultiTermQuery* query, SArray* result);
+int32_t indexJsonSearch(SIndexJson* index, SIndexJsonMultiTermQuery* query, SArray* result);
 /*
  * @param
  * @param

include/libs/nodes/nodes.h

@@ -112,11 +112,11 @@ int64_t nodesMakeAllocatorWeakRef(int64_t allocatorId);
 int64_t nodesReleaseAllocatorWeakRef(int64_t allocatorId);
 void    nodesDestroyAllocator(int64_t allocatorId);
 
-SNode* nodesMakeNode(ENodeType type);
+int32_t nodesMakeNode(ENodeType type, SNode** ppNodeOut);
 void   nodesDestroyNode(SNode* pNode);
 void   nodesFree(void* p);
 
-SNodeList* nodesMakeList();
+int32_t    nodesMakeList(SNodeList** ppListOut);
 int32_t    nodesListAppend(SNodeList* pList, SNode* pNode);
 int32_t    nodesListStrictAppend(SNodeList* pList, SNode* pNode);
 int32_t    nodesListMakeAppend(SNodeList** pList, SNode* pNode);
@@ -156,8 +156,8 @@ bool nodeListNodeEqual(const SNodeList* a, const SNode* b);
 
 bool nodesMatchNode(const SNode* pSub, const SNode* pNode);
 
-SNode*     nodesCloneNode(const SNode* pNode);
-SNodeList* nodesCloneList(const SNodeList* pList);
+int32_t nodesCloneNode(const SNode* pNode, SNode** ppNodeOut);
+int32_t nodesCloneList(const SNodeList* pList, SNodeList** ppList);
 
 const char* nodesNodeName(ENodeType type);
 int32_t     nodesNodeToString(const SNode* pNode, bool format, char** pStr, int32_t* pLen);

include/libs/nodes/querynodes.h

@@ -60,6 +60,7 @@ typedef struct SExprNode {
   bool      orderAlias;
   bool      asAlias;
   bool      asParam;
+  bool      asPosition;
 } SExprNode;
 
 typedef enum EColumnType {
@@ -636,9 +637,9 @@ void*   nodesGetValueFromNode(SValueNode* pNode);
 int32_t nodesSetValueNodeValue(SValueNode* pNode, void* value);
 char*   nodesGetStrValueFromNode(SValueNode* pNode);
 void    nodesValueNodeToVariant(const SValueNode* pNode, SVariant* pVal);
-SValueNode* nodesMakeValueNodeFromString(char* literal);
-SValueNode* nodesMakeValueNodeFromBool(bool b);
-SNode* nodesMakeValueNodeFromInt32(int32_t value);
+int32_t nodesMakeValueNodeFromString(char* literal, SValueNode** ppValNode);
+int32_t nodesMakeValueNodeFromBool(bool b, SValueNode** ppValNode);
+int32_t nodesMakeValueNodeFromInt32(int32_t value, SNode** ppNode);
 
 char*   nodesGetFillModeString(EFillMode mode);
 int32_t nodesMergeConds(SNode** pDst, SNodeList** pSrc);

include/libs/parser/parser.h

@@ -118,6 +118,7 @@ void qDestroyQuery(SQuery* pQueryNode);
 
 int32_t qExtractResultSchema(const SNode* pRoot, int32_t* numOfCols, SSchema** pSchema);
 int32_t qSetSTableIdForRsma(SNode* pStmt, int64_t uid);
+int32_t qInitKeywordsTable();
 void    qCleanupKeywordsTable();
 
 int32_t     qAppendStmtTableOutput(SQuery* pQuery, SHashObj* pAllVgHash, STableColsData* pTbData, STableDataCxt* pTbCtx, SStbInterlaceInfo* pBuildInfo);
@@ -163,8 +164,8 @@ int     rawBlockBindData(SQuery *query, STableMeta* pTableMeta, void* data, SVCr
                          int numFields, bool needChangeLength, char* errstr, int32_t errstrLen);
 
 int32_t rewriteToVnodeModifyOpStmt(SQuery* pQuery, SArray* pBufArray);
-SArray* serializeVgroupsCreateTableBatch(SHashObj* pVgroupHashmap);
-SArray* serializeVgroupsDropTableBatch(SHashObj* pVgroupHashmap);
+int32_t serializeVgroupsCreateTableBatch(SHashObj* pVgroupHashmap, SArray** pOut);
+int32_t serializeVgroupsDropTableBatch(SHashObj* pVgroupHashmap, SArray** pOut);
 void    destoryCatalogReq(SCatalogReq *pCatalogReq);
 bool    isPrimaryKeyImpl(SNode* pExpr);
 int32_t insAppendStmtTableDataCxt(SHashObj* pAllVgHash, STableColsData* pTbData, STableDataCxt* pTbCtx, SStbInterlaceInfo* pBuildInfo);

include/libs/qcom/query.h

@@ -192,6 +192,7 @@ typedef struct SBoundColInfo {
   int16_t* pColIndex;  // bound index => schema index
   int32_t  numOfCols;
   int32_t  numOfBound;
+  bool     hasBoundCols;
 } SBoundColInfo;
 
 typedef struct STableColsData {
@@ -334,7 +335,7 @@ SSchema createSchema(int8_t type, int32_t bytes, col_id_t colId, const char* nam
 
 void    destroyQueryExecRes(SExecResult* pRes);
 int32_t dataConverToStr(char* str, int type, void* buf, int32_t bufSize, int32_t* len);
-char*   parseTagDatatoJson(void* p);
+void    parseTagDatatoJson(void* p, char** jsonStr);
 int32_t cloneTableMeta(STableMeta* pSrc, STableMeta** pDst);
 void    getColumnTypeFromMeta(STableMeta* pMeta, char* pName, ETableColumnType* pType);
 int32_t cloneDbVgInfo(SDBVgInfo* pSrc, SDBVgInfo** pDst);

include/libs/scalar/filter.h

@@ -58,12 +58,13 @@ extern int32_t filterGetTimeRange(SNode *pNode, STimeWindow *win, bool *isStrict
 extern int32_t filterConverNcharColumns(SFilterInfo *pFilterInfo, int32_t rows, bool *gotNchar);
 extern int32_t filterFreeNcharColumns(SFilterInfo *pFilterInfo);
 extern void    filterFreeInfo(SFilterInfo *info);
-extern bool    filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pColsAgg, int32_t numOfCols, int32_t numOfRows);
+extern int32_t filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pDataStatis, int32_t numOfCols, int32_t numOfRows,
+                                  bool *keep);
 
 /* condition split interface */
 int32_t filterPartitionCond(SNode **pCondition, SNode **pPrimaryKeyCond, SNode **pTagIndexCond, SNode **pTagCond,
                             SNode **pOtherCond);
-bool filterIsMultiTableColsCond(SNode *pCond);
+int32_t filterIsMultiTableColsCond(SNode *pCond, bool *res);
 EConditionType filterClassifyCondition(SNode *pNode);
 
 #ifdef __cplusplus

include/libs/stream/streamState.h

@@ -32,7 +32,7 @@ extern "C" {
 SStreamState* streamStateOpen(const char* path, void* pTask, int64_t streamId, int32_t taskId);
 void          streamStateClose(SStreamState* pState, bool remove);
 int32_t       streamStateBegin(SStreamState* pState);
-int32_t       streamStateCommit(SStreamState* pState);
+void          streamStateCommit(SStreamState* pState);
 void          streamStateDestroy(SStreamState* pState, bool remove);
 int32_t       streamStateDeleteCheckPoint(SStreamState* pState, TSKEY mark);
 int32_t       streamStateDelTaskDb(SStreamState* pState);
@@ -41,22 +41,23 @@ int32_t streamStateFuncPut(SStreamState* pState, const SWinKey* key, const void*
 int32_t streamStateFuncGet(SStreamState* pState, const SWinKey* key, void** ppVal, int32_t* pVLen);
 
 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 streamStateGet(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen, int32_t* pWinCode);
 bool    streamStateCheck(SStreamState* pState, const SWinKey* key);
 int32_t streamStateGetByPos(SStreamState* pState, void* pos, void** pVal);
-int32_t streamStateDel(SStreamState* pState, const SWinKey* key);
-int32_t streamStateClear(SStreamState* pState);
+void    streamStateDel(SStreamState* pState, const SWinKey* key);
+void    streamStateClear(SStreamState* pState);
 void    streamStateSetNumber(SStreamState* pState, int32_t number, int32_t tsIdex);
-int32_t streamStateSaveInfo(SStreamState* pState, void* pKey, int32_t keyLen, void* pVal, int32_t vLen);
+void    streamStateSaveInfo(SStreamState* pState, void* pKey, int32_t keyLen, void* pVal, int32_t vLen);
 int32_t streamStateGetInfo(SStreamState* pState, void* pKey, int32_t keyLen, void** pVal, int32_t* pLen);
 
 // session window
-int32_t streamStateSessionAddIfNotExist(SStreamState* pState, SSessionKey* key, TSKEY gap, void** pVal, int32_t* pVLen);
+int32_t streamStateSessionAddIfNotExist(SStreamState* pState, SSessionKey* key, TSKEY gap, void** pVal, int32_t* pVLen,
+                                        int32_t* pWinCode);
 int32_t streamStateSessionPut(SStreamState* pState, const SSessionKey* key, void* value, int32_t vLen);
-int32_t streamStateSessionGet(SStreamState* pState, SSessionKey* key, void** pVal, int32_t* pVLen);
-int32_t streamStateSessionDel(SStreamState* pState, const SSessionKey* key);
-int32_t streamStateSessionReset(SStreamState* pState, void* pVal);
-int32_t streamStateSessionClear(SStreamState* pState);
+int32_t streamStateSessionGet(SStreamState* pState, SSessionKey* key, void** pVal, int32_t* pVLen, int32_t* pWinCode);
+void    streamStateSessionDel(SStreamState* pState, const SSessionKey* key);
+void    streamStateSessionReset(SStreamState* pState, void* pVal);
+void    streamStateSessionClear(SStreamState* pState);
 int32_t streamStateSessionGetKVByCur(SStreamStateCur* pCur, SSessionKey* pKey, void** pVal, int32_t* pVLen);
 int32_t streamStateSessionGetKeyByRange(SStreamState* pState, const SSessionKey* range, SSessionKey* curKey);
 int32_t streamStateCountGetKeyByRange(SStreamState* pState, const SSessionKey* range, SSessionKey* curKey);
@@ -70,21 +71,22 @@ SStreamStateCur* streamStateSessionSeekKeyCurrentNext(SStreamState* pState, cons
 
 // state window
 int32_t streamStateStateAddIfNotExist(SStreamState* pState, SSessionKey* key, char* pKeyData, int32_t keyDataLen,
-                                      state_key_cmpr_fn fn, void** pVal, int32_t* pVLen);
+                                      state_key_cmpr_fn fn, void** pVal, int32_t* pVLen, int32_t* pWinCode);
 
 // fill
 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);
-int32_t streamStateFillDel(SStreamState* pState, const SWinKey* key);
+void    streamStateFillDel(SStreamState* pState, const SWinKey* key);
 
-int32_t streamStateAddIfNotExist(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen);
-int32_t streamStateReleaseBuf(SStreamState* pState, void* pVal, bool used);
-int32_t streamStateClearBuff(SStreamState* pState, void* pVal);
+int32_t streamStateAddIfNotExist(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen,
+                                 int32_t* pWinCode);
+void    streamStateReleaseBuf(SStreamState* pState, void* pVal, bool used);
+void    streamStateClearBuff(SStreamState* pState, void* pVal);
 void    streamStateFreeVal(void* val);
 
 // count window
 int32_t streamStateCountWinAddIfNotExist(SStreamState* pState, SSessionKey* pKey, COUNT_TYPE winCount, void** ppVal,
-                                         int32_t* pVLen);
+                                         int32_t* pVLen, int32_t* pWinCode);
 int32_t streamStateCountWinAdd(SStreamState* pState, SSessionKey* pKey, void** pVal, int32_t* pVLen);
 
 SStreamStateCur* streamStateGetAndCheckCur(SStreamState* pState, SWinKey* key);
@@ -97,11 +99,11 @@ void             streamStateResetCur(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 streamStateCurNext(SStreamState* pState, SStreamStateCur* pCur);
-int32_t streamStateCurPrev(SStreamState* pState, SStreamStateCur* pCur);
+void streamStateCurNext(SStreamState* pState, SStreamStateCur* pCur);
+void streamStateCurPrev(SStreamState* pState, SStreamStateCur* pCur);
 
 int32_t streamStatePutParName(SStreamState* pState, int64_t groupId, const char* tbname);
-int32_t streamStateGetParName(SStreamState* pState, int64_t groupId, void** pVal, bool onlyCache);
+int32_t streamStateGetParName(SStreamState* pState, int64_t groupId, void** pVal, bool onlyCache, int32_t* pWinCode);
 
 void streamStateReloadInfo(SStreamState* pState, TSKEY ts);
 

include/libs/stream/tstream.h

@@ -59,8 +59,6 @@ extern "C" {
 #define STREAM_EXEC_T_STOP_ALL_TASKS    (-5)
 #define STREAM_EXEC_T_RESUME_TASK       (-6)
 #define STREAM_EXEC_T_ADD_FAILED_TASK   (-7)
-// the load and start stream task should be executed after snode has started successfully, since the load of stream
-// tasks may incur the download of checkpoint data from remote, which may consume significant network and CPU resources.
 
 typedef struct SStreamTask           SStreamTask;
 typedef struct SStreamQueue          SStreamQueue;
@@ -190,8 +188,8 @@ typedef struct {
   SSDataBlock* pBlock;
 } SStreamRefDataBlock;
 
-SStreamDataSubmit* streamDataSubmitNew(SPackedData* pData, int32_t type);
-void               streamDataSubmitDestroy(SStreamDataSubmit* pDataSubmit);
+int32_t streamDataSubmitNew(SPackedData* pData, int32_t type, SStreamDataSubmit** pSubmit);
+void    streamDataSubmitDestroy(SStreamDataSubmit* pDataSubmit);
 
 typedef struct {
   char*              qmsg;
@@ -237,6 +235,8 @@ typedef struct {
   int64_t         stbUid;
   char            stbFullName[TSDB_TABLE_FNAME_LEN];
   SSchemaWrapper* pSchemaWrapper;
+  SSchemaWrapper* pTagSchema;
+  bool            autoCreateCtb;
   void*           vnode;  // not available to encoder and decoder
   FTbSink*        tbSinkFunc;
   STSchema*       pTSchema;
@@ -528,13 +528,13 @@ typedef struct STaskUpdateEntry {
 
 typedef int32_t (*__state_trans_user_fn)(SStreamTask*, void* param);
 
-SStreamTask* tNewStreamTask(int64_t streamId, int8_t taskLevel, SEpSet* pEpset, bool fillHistory, int64_t triggerParam,
-                            SArray* pTaskList, bool hasFillhistory, int8_t subtableWithoutMd5);
-void         tFreeStreamTask(SStreamTask* pTask);
-int32_t      tEncodeStreamTask(SEncoder* pEncoder, const SStreamTask* pTask);
-int32_t      tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask);
-int32_t      streamTaskInit(SStreamTask* pTask, SStreamMeta* pMeta, SMsgCb* pMsgCb, int64_t ver);
-void         streamFreeTaskState(SStreamTask* pTask, ETaskStatus status);
+int32_t tNewStreamTask(int64_t streamId, int8_t taskLevel, SEpSet* pEpset, bool fillHistory, int64_t triggerParam,
+                       SArray* pTaskList, bool hasFillhistory, int8_t subtableWithoutMd5, SStreamTask** pTask);
+void    tFreeStreamTask(SStreamTask* pTask);
+int32_t tEncodeStreamTask(SEncoder* pEncoder, const SStreamTask* pTask);
+int32_t tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask);
+int32_t streamTaskInit(SStreamTask* pTask, SStreamMeta* pMeta, SMsgCb* pMsgCb, int64_t ver);
+void    streamFreeTaskState(SStreamTask* pTask, ETaskStatus status);
 
 int32_t tDecodeStreamTaskChkInfo(SDecoder* pDecoder, SCheckpointInfo* pChkpInfo);
 int32_t tDecodeStreamTaskId(SDecoder* pDecoder, STaskId* pTaskId);
@@ -629,8 +629,10 @@ int32_t streamSetupScheduleTrigger(SStreamTask* pTask);
 int32_t streamProcessDispatchMsg(SStreamTask* pTask, SStreamDispatchReq* pReq, SRpcMsg* pMsg);
 int32_t streamProcessDispatchRsp(SStreamTask* pTask, SStreamDispatchRsp* pRsp, int32_t code);
 
-SStreamUpstreamEpInfo* streamTaskGetUpstreamTaskEpInfo(SStreamTask* pTask, int32_t taskId);
-SEpSet*                streamTaskGetDownstreamEpInfo(SStreamTask* pTask, int32_t taskId);
+void streamTaskGetUpstreamTaskEpInfo(SStreamTask* pTask, int32_t taskId, SStreamUpstreamEpInfo** pEpInfo);
+#if 0
+SEpSet* streamTaskGetDownstreamEpInfo(SStreamTask* pTask, int32_t taskId);
+#endif
 
 void streamTaskInputFail(SStreamTask* pTask);
 
@@ -639,8 +641,8 @@ bool streamTaskShouldPause(const SStreamTask* pStatus);
 bool streamTaskIsIdle(const SStreamTask* pTask);
 bool streamTaskReadyToRun(const SStreamTask* pTask, char** pStatus);
 
-char*             createStreamTaskIdStr(int64_t streamId, int32_t taskId);
-SStreamTaskState* streamTaskGetStatus(const SStreamTask* pTask);
+int32_t           createStreamTaskIdStr(int64_t streamId, int32_t taskId, const char** pId);
+SStreamTaskState  streamTaskGetStatus(const SStreamTask* pTask);
 const char*       streamTaskGetStatusStr(ETaskStatus status);
 void              streamTaskResetStatus(SStreamTask* pTask);
 void              streamTaskSetStatusReady(SStreamTask* pTask);
@@ -657,10 +659,10 @@ int8_t  streamTaskSetSchedStatusInactive(SStreamTask* pTask);
 int32_t streamTaskClearHTaskAttr(SStreamTask* pTask, int32_t clearRelHalt);
 
 int32_t streamExecTask(SStreamTask* pTask);
-int32_t streamResumeTask(SStreamTask* pTask);
+void    streamResumeTask(SStreamTask* pTask);
 int32_t streamTrySchedExec(SStreamTask* pTask);
 int32_t streamTaskSchedTask(SMsgCb* pMsgCb, int32_t vgId, int64_t streamId, int32_t taskId, int32_t execType);
-int32_t streamTaskResumeInFuture(SStreamTask* pTask);
+void    streamTaskResumeInFuture(SStreamTask* pTask);
 void    streamTaskClearSchedIdleInfo(SStreamTask* pTask);
 void    streamTaskSetIdleInfo(SStreamTask* pTask, int32_t idleTime);
 
@@ -673,20 +675,20 @@ int32_t streamTaskSendCheckRsp(const SStreamMeta* pMeta, int32_t vgId, SStreamTa
 int32_t streamTaskProcessCheckRsp(SStreamTask* pTask, const SStreamTaskCheckRsp* pRsp);
 
 // check downstream status
-int32_t streamTaskStartMonitorCheckRsp(SStreamTask* pTask);
-int32_t streamTaskStopMonitorCheckRsp(STaskCheckInfo* pInfo, const char* id);
+void    streamTaskStartMonitorCheckRsp(SStreamTask* pTask);
+void    streamTaskStopMonitorCheckRsp(STaskCheckInfo* pInfo, const char* id);
 void    streamTaskCleanupCheckInfo(STaskCheckInfo* pInfo);
 
 // fill-history task
 int32_t streamLaunchFillHistoryTask(SStreamTask* pTask);
 int32_t streamStartScanHistoryAsync(SStreamTask* pTask, int8_t igUntreated);
-int32_t streamExecScanHistoryInFuture(SStreamTask* pTask, int32_t idleDuration);
+void    streamExecScanHistoryInFuture(SStreamTask* pTask, int32_t idleDuration);
 bool    streamHistoryTaskSetVerRangeStep2(SStreamTask* pTask, int64_t latestVer);
 
 // checkpoint related
-int32_t streamTaskGetActiveCheckpointInfo(const SStreamTask* pTask, int32_t* pTransId, int64_t* pCheckpointId);
+void    streamTaskGetActiveCheckpointInfo(const SStreamTask* pTask, int32_t* pTransId, int64_t* pCheckpointId);
 int32_t streamTaskSetActiveCheckpointInfo(SStreamTask* pTask, int64_t activeCheckpointId);
-int32_t streamTaskSetFailedChkptInfo(SStreamTask* pTask, int32_t transId, int64_t checkpointId);
+void    streamTaskSetFailedChkptInfo(SStreamTask* pTask, int32_t transId, int64_t checkpointId);
 bool    streamTaskAlreadySendTrigger(SStreamTask* pTask, int32_t downstreamNodeId);
 void    streamTaskGetTriggerRecvStatus(SStreamTask* pTask, int32_t* pRecved, int32_t* pTotal);
 void    streamTaskInitTriggerDispatchInfo(SStreamTask* pTask);
@@ -722,43 +724,43 @@ int32_t streamSetParamForStreamScannerStep2(SStreamTask* pTask, SVersionRange* p
 SScanhistoryDataInfo streamScanHistoryData(SStreamTask* pTask, int64_t st);
 
 // stream task meta
-void         streamMetaInit();
-void         streamMetaCleanup();
-SStreamMeta* streamMetaOpen(const char* path, void* ahandle, FTaskBuild expandFunc, FTaskExpand expandTaskFn,
-                            int32_t vgId, int64_t stage, startComplete_fn_t fn);
-void         streamMetaClose(SStreamMeta* streamMeta);
-int32_t      streamMetaSaveTask(SStreamMeta* pMeta, SStreamTask* pTask);  // save to stream meta store
-int32_t      streamMetaRemoveTask(SStreamMeta* pMeta, STaskId* pKey);
-int32_t      streamMetaRegisterTask(SStreamMeta* pMeta, int64_t ver, SStreamTask* pTask, bool* pAdded);
-int32_t      streamMetaUnregisterTask(SStreamMeta* pMeta, int64_t streamId, int32_t taskId);
-int32_t      streamMetaGetNumOfTasks(SStreamMeta* pMeta);
-SStreamTask* streamMetaAcquireTaskNoLock(SStreamMeta* pMeta, int64_t streamId, int32_t taskId);
-SStreamTask* streamMetaAcquireTask(SStreamMeta* pMeta, int64_t streamId, int32_t taskId);
-void         streamMetaReleaseTask(SStreamMeta* pMeta, SStreamTask* pTask);
-SStreamTask* streamMetaAcquireOneTask(SStreamTask* pTask);
-void         streamMetaClear(SStreamMeta* pMeta);
-void         streamMetaInitBackend(SStreamMeta* pMeta);
-int32_t      streamMetaCommit(SStreamMeta* pMeta);
-int64_t      streamMetaGetLatestCheckpointId(SStreamMeta* pMeta);
-void         streamMetaNotifyClose(SStreamMeta* pMeta);
-void         streamMetaStartHb(SStreamMeta* pMeta);
-bool         streamMetaTaskInTimer(SStreamMeta* pMeta);
-int32_t      streamMetaAddTaskLaunchResult(SStreamMeta* pMeta, int64_t streamId, int32_t taskId, int64_t startTs,
-                                           int64_t endTs, bool ready);
-int32_t      streamMetaResetTaskStatus(SStreamMeta* pMeta);
-int32_t      streamMetaAddFailedTask(SStreamMeta* pMeta, int64_t streamId, int32_t taskId);
-void         streamMetaAddFailedTaskSelf(SStreamTask* pTask, int64_t failedTs);
-void streamMetaAddIntoUpdateTaskList(SStreamMeta* pMeta, SStreamTask* pTask, SStreamTask* pHTask, int32_t transId,
-                                     int64_t startTs);
-void streamMetaClearUpdateTaskList(SStreamMeta* pMeta);
-void streamMetaInitUpdateTaskList(SStreamMeta* pMeta, int32_t transId);
+void    streamMetaInit();
+void    streamMetaCleanup();
+int32_t streamMetaOpen(const char* path, void* ahandle, FTaskBuild expandFunc, FTaskExpand expandTaskFn, int32_t vgId,
+                       int64_t stage, startComplete_fn_t fn, SStreamMeta** pMeta);
+void    streamMetaClose(SStreamMeta* streamMeta);
+int32_t streamMetaSaveTask(SStreamMeta* pMeta, SStreamTask* pTask);  // save to stream meta store
+int32_t streamMetaRemoveTask(SStreamMeta* pMeta, STaskId* pKey);
+int32_t streamMetaRegisterTask(SStreamMeta* pMeta, int64_t ver, SStreamTask* pTask, bool* pAdded);
+int32_t streamMetaUnregisterTask(SStreamMeta* pMeta, int64_t streamId, int32_t taskId);
+int32_t streamMetaGetNumOfTasks(SStreamMeta* pMeta);
+int32_t streamMetaAcquireTaskNoLock(SStreamMeta* pMeta, int64_t streamId, int32_t taskId, SStreamTask** pTask);
+int32_t streamMetaAcquireTask(SStreamMeta* pMeta, int64_t streamId, int32_t taskId, SStreamTask** pTask);
+void    streamMetaReleaseTask(SStreamMeta* pMeta, SStreamTask* pTask);
+void    streamMetaAcquireOneTask(SStreamTask* pTask);
+void    streamMetaClear(SStreamMeta* pMeta);
+void    streamMetaInitBackend(SStreamMeta* pMeta);
+int32_t streamMetaCommit(SStreamMeta* pMeta);
+int64_t streamMetaGetLatestCheckpointId(SStreamMeta* pMeta);
+void    streamMetaNotifyClose(SStreamMeta* pMeta);
+void    streamMetaStartHb(SStreamMeta* pMeta);
+bool    streamMetaTaskInTimer(SStreamMeta* pMeta);
+int32_t streamMetaAddTaskLaunchResult(SStreamMeta* pMeta, int64_t streamId, int32_t taskId, int64_t startTs,
+                                      int64_t endTs, bool ready);
+int32_t streamMetaResetTaskStatus(SStreamMeta* pMeta);
+int32_t streamMetaAddFailedTask(SStreamMeta* pMeta, int64_t streamId, int32_t taskId);
+void    streamMetaAddFailedTaskSelf(SStreamTask* pTask, int64_t failedTs);
+void    streamMetaAddIntoUpdateTaskList(SStreamMeta* pMeta, SStreamTask* pTask, SStreamTask* pHTask, int32_t transId,
+                                        int64_t startTs);
+void    streamMetaClearUpdateTaskList(SStreamMeta* pMeta);
+void    streamMetaInitUpdateTaskList(SStreamMeta* pMeta, int32_t transId);
 
 void    streamMetaRLock(SStreamMeta* pMeta);
 void    streamMetaRUnLock(SStreamMeta* pMeta);
 void    streamMetaWLock(SStreamMeta* pMeta);
 void    streamMetaWUnLock(SStreamMeta* pMeta);
 void    streamMetaResetStartInfo(STaskStartInfo* pMeta, int32_t vgId);
-SArray* streamMetaSendMsgBeforeCloseTasks(SStreamMeta* pMeta);
+int32_t streamMetaSendMsgBeforeCloseTasks(SStreamMeta* pMeta, SArray** pTaskList);
 void    streamMetaUpdateStageRole(SStreamMeta* pMeta, int64_t stage, bool isLeader);
 void    streamMetaLoadAllTasks(SStreamMeta* pMeta);
 int32_t streamMetaStartAllTasks(SStreamMeta* pMeta);
@@ -768,7 +770,9 @@ bool    streamMetaAllTasksReady(const SStreamMeta* pMeta);
 int32_t streamTaskSendRestoreChkptMsg(SStreamTask* pTask);
 
 // timer
-tmr_h streamTimerGetInstance();
+int32_t streamTimerGetInstance(tmr_h* pTmr);
+void    streamTmrReset(TAOS_TMR_CALLBACK fp, int32_t mseconds, void* param, void* handle, tmr_h* pTmrId, int32_t vgId,
+                       const char* pMsg);
 
 // checkpoint
 int32_t streamProcessCheckpointSourceReq(SStreamTask* pTask, SStreamCheckpointSourceReq* pReq);
@@ -785,14 +789,14 @@ int32_t streamTaskBuildCheckpointSourceRsp(SStreamCheckpointSourceReq* pReq, SRp
                                            int32_t setCode);
 int32_t streamSendChkptReportMsg(SStreamTask* pTask, SCheckpointInfo* pCheckpointInfo, int8_t dropRelHTask);
 int32_t streamTaskUpdateTaskCheckpointInfo(SStreamTask* pTask, bool restored, SVUpdateCheckpointInfoReq* pReq);
-SActiveCheckpointInfo* streamTaskCreateActiveChkptInfo();
+int32_t streamTaskCreateActiveChkptInfo(SActiveCheckpointInfo** pRes);
 
 // stream task state machine, and event handling
-SStreamTaskSM* streamCreateStateMachine(SStreamTask* pTask);
-void*          streamDestroyStateMachine(SStreamTaskSM* pSM);
-int32_t        streamTaskHandleEvent(SStreamTaskSM* pSM, EStreamTaskEvent event);
-int32_t        streamTaskHandleEventAsync(SStreamTaskSM* pSM, EStreamTaskEvent event, __state_trans_user_fn callbackFn,
-                                          void* param);
+int32_t streamCreateStateMachine(SStreamTask* pTask);
+void    streamDestroyStateMachine(SStreamTaskSM* pSM);
+int32_t streamTaskHandleEvent(SStreamTaskSM* pSM, EStreamTaskEvent event);
+int32_t streamTaskHandleEventAsync(SStreamTaskSM* pSM, EStreamTaskEvent event, __state_trans_user_fn callbackFn,
+                                   void* param);
 int32_t streamTaskOnHandleEventSuccess(SStreamTaskSM* pSM, EStreamTaskEvent event, __state_trans_user_fn callbackFn,
                                        void* param);
 int32_t streamTaskRestoreStatus(SStreamTask* pTask);
@@ -803,8 +807,11 @@ int32_t streamTaskBroadcastRetrieveReq(SStreamTask* pTask, SStreamRetrieveReq* r
 void    streamTaskSendRetrieveRsp(SStreamRetrieveReq* pReq, SRpcMsg* pRsp);
 
 int32_t streamProcessHeartbeatRsp(SStreamMeta* pMeta, SMStreamHbRspMsg* pRsp);
-int32_t streamTaskSendPreparedCheckpointsourceRsp(SStreamTask* pTask);
+int32_t streamTaskSendCheckpointsourceRsp(SStreamTask* pTask);
 
+void streamMutexLock(TdThreadMutex *pMutex);
+void streamMutexUnlock(TdThreadMutex *pMutex);
+void streamMutexDestroy(TdThreadMutex *pMutex);
 
 #ifdef __cplusplus
 }

include/libs/stream/tstreamFileState.h

@@ -18,10 +18,10 @@
 
 #include "os.h"
 
+#include "storageapi.h"
 #include "tarray.h"
 #include "tdef.h"
 #include "tlist.h"
-#include "storageapi.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,62 +30,66 @@ extern "C" {
 typedef struct SStreamFileState SStreamFileState;
 typedef SList                   SStreamSnapshot;
 
-typedef void*   (*_state_buff_get_fn)(void* pRowBuff, const void* pKey, size_t keyLen);
+typedef void* (*_state_buff_get_fn)(void* pRowBuff, const void* pKey, size_t keyLen);
 typedef int32_t (*_state_buff_remove_fn)(void* pRowBuff, const void* pKey, size_t keyLen);
-typedef int32_t (*_state_buff_remove_by_pos_fn)(SStreamFileState* pState, SRowBuffPos* pPos);
-typedef void    (*_state_buff_cleanup_fn)(void* pRowBuff);
-typedef void*   (*_state_buff_create_statekey_fn)(SRowBuffPos* pPos, int64_t num);
+typedef void (*_state_buff_remove_by_pos_fn)(SStreamFileState* pState, SRowBuffPos* pPos);
+typedef void (*_state_buff_cleanup_fn)(void* pRowBuff);
+typedef void* (*_state_buff_create_statekey_fn)(SRowBuffPos* pPos, int64_t num);
 
 typedef int32_t (*_state_file_remove_fn)(SStreamFileState* pFileState, const void* pKey);
 typedef int32_t (*_state_file_get_fn)(SStreamFileState* pFileState, void* pKey, void* data, int32_t* pDataLen);
 typedef int32_t (*_state_file_clear_fn)(SStreamState* pState);
 
-typedef int32_t (*_state_fun_get_fn) (SStreamFileState* pFileState, void* pKey, int32_t keyLen, void** pVal, int32_t* pVLen);
+typedef int32_t (*_state_fun_get_fn)(SStreamFileState* pFileState, void* pKey, int32_t keyLen, void** pVal,
+                                     int32_t* pVLen, int32_t* pWinCode);
 
 typedef int32_t (*range_cmpr_fn)(const SSessionKey* pWin1, const SSessionKey* pWin2);
 
 SStreamFileState* streamFileStateInit(int64_t memSize, uint32_t keySize, uint32_t rowSize, uint32_t selectRowSize,
-                                      GetTsFun fp, void* pFile, TSKEY delMark, const char* taskId,
-                                      int64_t checkpointId, int8_t type);
+                                      GetTsFun fp, void* pFile, TSKEY delMark, const char* taskId, int64_t checkpointId,
+                                      int8_t type);
 void              streamFileStateDestroy(SStreamFileState* pFileState);
 void              streamFileStateClear(SStreamFileState* pFileState);
 bool              needClearDiskBuff(SStreamFileState* pFileState);
 void              streamFileStateReleaseBuff(SStreamFileState* pFileState, SRowBuffPos* pPos, bool used);
-int32_t           streamFileStateClearBuff(SStreamFileState* pFileState, SRowBuffPos* pPos);
+void              streamFileStateClearBuff(SStreamFileState* pFileState, SRowBuffPos* pPos);
 
-int32_t getRowBuff(SStreamFileState* pFileState, void* pKey, int32_t keyLen, void** pVal, int32_t* pVLen);
-int32_t deleteRowBuff(SStreamFileState* pFileState, const void* pKey, int32_t keyLen);
+int32_t getRowBuff(SStreamFileState* pFileState, void* pKey, int32_t keyLen, void** pVal, int32_t* pVLen,
+                   int32_t* pWinCode);
+void    deleteRowBuff(SStreamFileState* pFileState, const void* pKey, int32_t keyLen);
 int32_t getRowBuffByPos(SStreamFileState* pFileState, SRowBuffPos* pPos, void** pVal);
 bool    hasRowBuff(SStreamFileState* pFileState, void* pKey, int32_t keyLen);
-void    putFreeBuff(SStreamFileState* pFileState, SRowBuffPos* pPos);
+int32_t putFreeBuff(SStreamFileState* pFileState, SRowBuffPos* pPos);
 
 SStreamSnapshot* getSnapshot(SStreamFileState* pFileState);
-int32_t          flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot, bool flushState);
-int32_t          recoverSnapshot(SStreamFileState* pFileState, int64_t ckId);
+void             flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot, bool flushState);
+void             recoverSnapshot(SStreamFileState* pFileState, int64_t ckId);
 
 int32_t getSnapshotIdList(SStreamFileState* pFileState, SArray* list);
 int32_t deleteExpiredCheckPoint(SStreamFileState* pFileState, TSKEY mark);
 int32_t streamFileStateGetSelectRowSize(SStreamFileState* pFileState);
 void    streamFileStateReloadInfo(SStreamFileState* pFileState, TSKEY ts);
 
-void* getRowStateBuff(SStreamFileState* pFileState);
-void* getStateFileStore(SStreamFileState* pFileState);
-bool isDeteled(SStreamFileState* pFileState, TSKEY ts);
-bool isFlushedState(SStreamFileState* pFileState, TSKEY ts, TSKEY gap);
+void*        getRowStateBuff(SStreamFileState* pFileState);
+void*        getStateFileStore(SStreamFileState* pFileState);
+bool         isDeteled(SStreamFileState* pFileState, TSKEY ts);
+bool         isFlushedState(SStreamFileState* pFileState, TSKEY ts, TSKEY gap);
 SRowBuffPos* getNewRowPosForWrite(SStreamFileState* pFileState);
-int32_t getRowStateRowSize(SStreamFileState* pFileState);
+int32_t      getRowStateRowSize(SStreamFileState* pFileState);
 
 // session window
-int32_t getSessionWinResultBuff(SStreamFileState* pFileState, SSessionKey* pKey, TSKEY gap, void** pVal, int32_t* pVLen);
+int32_t getSessionWinResultBuff(SStreamFileState* pFileState, SSessionKey* pKey, TSKEY gap, void** pVal, int32_t* pVLen,
+                                int32_t* pWinCode);
 int32_t putSessionWinResultBuff(SStreamFileState* pFileState, SRowBuffPos* pPos);
-int32_t getSessionFlushedBuff(SStreamFileState* pFileState, SSessionKey* pKey, void** pVal, int32_t* pVLen);
+int32_t getSessionFlushedBuff(SStreamFileState* pFileState, SSessionKey* pKey, void** pVal, int32_t* pVLen,
+                              int32_t* pWinCode);
 int32_t deleteSessionWinStateBuffFn(void* pBuff, const void* key, size_t keyLen);
-int32_t deleteSessionWinStateBuffByPosFn(SStreamFileState* pFileState, SRowBuffPos* pPos);
+void    deleteSessionWinStateBuffByPosFn(SStreamFileState* pFileState, SRowBuffPos* pPos);
 int32_t allocSessioncWinBuffByNextPosition(SStreamFileState* pFileState, SStreamStateCur* pCur,
                                            const SSessionKey* pWinKey, void** ppVal, int32_t* pVLen);
 
 SRowBuffPos* createSessionWinBuff(SStreamFileState* pFileState, SSessionKey* pKey, void* p, int32_t* pVLen);
-int32_t      recoverSesssion(SStreamFileState* pFileState, int64_t ckId);
+void         recoverSesssion(SStreamFileState* pFileState, int64_t ckId);
 
 void sessionWinStateClear(SStreamFileState* pFileState);
 void sessionWinStateCleanup(void* pBuff);
@@ -94,20 +98,23 @@ SStreamStateCur* sessionWinStateSeekKeyCurrentPrev(SStreamFileState* pFileState,
 SStreamStateCur* sessionWinStateSeekKeyCurrentNext(SStreamFileState* pFileState, const SSessionKey* pWinKey);
 SStreamStateCur* sessionWinStateSeekKeyNext(SStreamFileState* pFileState, const SSessionKey* pWinKey);
 SStreamStateCur* countWinStateSeekKeyPrev(SStreamFileState* pFileState, const SSessionKey* pWinKey, COUNT_TYPE count);
-int32_t sessionWinStateGetKVByCur(SStreamStateCur* pCur, SSessionKey* pKey, void** pVal, int32_t* pVLen);
-int32_t sessionWinStateMoveToNext(SStreamStateCur* pCur);
-int32_t sessionWinStateGetKeyByRange(SStreamFileState* pFileState, const SSessionKey* key, SSessionKey* curKey, range_cmpr_fn cmpFn);
+int32_t          sessionWinStateGetKVByCur(SStreamStateCur* pCur, SSessionKey* pKey, void** pVal, int32_t* pVLen);
+void             sessionWinStateMoveToNext(SStreamStateCur* pCur);
+int32_t          sessionWinStateGetKeyByRange(SStreamFileState* pFileState, const SSessionKey* key, SSessionKey* curKey,
+                                              range_cmpr_fn cmpFn);
 
 // state window
 int32_t getStateWinResultBuff(SStreamFileState* pFileState, SSessionKey* key, char* pKeyData, int32_t keyDataLen,
-                             state_key_cmpr_fn fn, void** pVal, int32_t* pVLen);
+                              state_key_cmpr_fn fn, void** pVal, int32_t* pVLen, int32_t* pWinCode);
 
 // count window
-int32_t getCountWinResultBuff(SStreamFileState* pFileState, SSessionKey* pKey, COUNT_TYPE winCount, void** pVal, int32_t* pVLen);
+int32_t getCountWinResultBuff(SStreamFileState* pFileState, SSessionKey* pKey, COUNT_TYPE winCount, void** pVal,
+                              int32_t* pVLen, int32_t* pWinCode);
 int32_t createCountWinResultBuff(SStreamFileState* pFileState, SSessionKey* pKey, void** pVal, int32_t* pVLen);
 
-//function
-int32_t getSessionRowBuff(SStreamFileState* pFileState, void* pKey, int32_t keyLen, void** pVal, int32_t* pVLen);
+// function
+int32_t getSessionRowBuff(SStreamFileState* pFileState, void* pKey, int32_t keyLen, void** pVal, int32_t* pVLen,
+                          int32_t* pWinCode);
 int32_t getFunctionRowBuff(SStreamFileState* pFileState, void* pKey, int32_t keyLen, void** pVal, int32_t* pVLen);
 
 #ifdef __cplusplus

include/libs/stream/tstreamUpdate.h

@@ -25,9 +25,12 @@
 extern "C" {
 #endif
 
-int32_t updateInfoInitP(SInterval* pInterval, int64_t watermark, bool igUp, int8_t pkType, int32_t pkLen, SUpdateInfo** ppInfo);
-int32_t updateInfoInit(int64_t interval, int32_t precision, int64_t watermark, bool igUp, int8_t pkType, int32_t pkLen, SUpdateInfo** ppInfo);
-TSKEY   updateInfoFillBlockData(SUpdateInfo* pInfo, SSDataBlock* pBlock, int32_t primaryTsCol, int32_t primaryKeyCol);
+int32_t updateInfoInitP(SInterval* pInterval, int64_t watermark, bool igUp, int8_t pkType, int32_t pkLen,
+                        SUpdateInfo** ppInfo);
+int32_t updateInfoInit(int64_t interval, int32_t precision, int64_t watermark, bool igUp, int8_t pkType, int32_t pkLen,
+                       SUpdateInfo** ppInfo);
+int32_t updateInfoFillBlockData(SUpdateInfo* pInfo, SSDataBlock* pBlock, int32_t primaryTsCol, int32_t primaryKeyCol,
+                                TSKEY* pMaxResTs);
 bool    updateInfoIsUpdated(SUpdateInfo* pInfo, uint64_t tableId, TSKEY ts, void* pPkVal, int32_t len);
 bool    updateInfoIsTableInserted(SUpdateInfo* pInfo, int64_t tbUid);
 void    updateInfoDestroy(SUpdateInfo* pInfo);

include/libs/tfs/tfs.h

@@ -44,9 +44,9 @@ typedef struct {
  *
  * @param pCfg Config of the fs.
  * @param ndisk Length of the config.
- * @return STfs* The fs object.
+ * @param ppTfs The fs object.
  */
-STfs *tfsOpen(SDiskCfg *pCfg, int32_t ndisk);
+int32_t tfsOpen(SDiskCfg *pCfg, int32_t ndisk, STfs **ppTfs);
 
 /**
  * @brief Close a fs.
@@ -275,7 +275,7 @@ int32_t tfsCopyFile(const STfsFile *pFile1, const STfsFile *pFile2);
  * @param rname The rel name of file.
  * @return STfsDir* The dir object.
  */
-STfsDir *tfsOpendir(STfs *pTfs, const char *rname);
+int32_t tfsOpendir(STfs *pTfs, const char *rname, STfsDir **ppDir);
 
 /**
  * @brief Get a file from dir and move to next pos.

include/libs/transport/trpc.h

@@ -164,13 +164,13 @@ int rpcRegisterBrokenLinkArg(SRpcMsg *msg);
 int rpcReleaseHandle(void *handle, int8_t type);  // just release conn to rpc instance, no close sock
 
 // These functions will not be called in the child process
-int   rpcSendRequestWithCtx(void *thandle, const SEpSet *pEpSet, SRpcMsg *pMsg, int64_t *rid, SRpcCtx *ctx);
-int   rpcSendRecv(void *shandle, SEpSet *pEpSet, SRpcMsg *pReq, SRpcMsg *pRsp);
-int   rpcSendRecvWithTimeout(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp, int8_t *epUpdated,
-                             int32_t timeoutMs);
-int   rpcSetDefaultAddr(void *thandle, const char *ip, const char *fqdn);
-void *rpcAllocHandle();
-void  rpcSetIpWhite(void *thandl, void *arg);
+int     rpcSendRequestWithCtx(void *thandle, const SEpSet *pEpSet, SRpcMsg *pMsg, int64_t *rid, SRpcCtx *ctx);
+int     rpcSendRecv(void *shandle, SEpSet *pEpSet, SRpcMsg *pReq, SRpcMsg *pRsp);
+int     rpcSendRecvWithTimeout(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp, int8_t *epUpdated,
+                               int32_t timeoutMs);
+int     rpcSetDefaultAddr(void *thandle, const char *ip, const char *fqdn);
+void   *rpcAllocHandle();
+int32_t rpcSetIpWhite(void *thandl, void *arg);
 
 int32_t rpcUtilSIpRangeToStr(SIpV4Range *pRange, char *buf);
 

include/libs/wal/wal.h

@@ -12,6 +12,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef _TD_WAL_H_
 #define _TD_WAL_H_
 
@@ -20,19 +21,11 @@
 #include "tdef.h"
 #include "tlog.h"
 #include "tmsg.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// clang-format off
-#define wFatal(...) { if (wDebugFlag & DEBUG_FATAL) { taosPrintLog("WAL FATAL ", DEBUG_FATAL, 255,        __VA_ARGS__); }}
-#define wError(...) { if (wDebugFlag & DEBUG_ERROR) { taosPrintLog("WAL ERROR ", DEBUG_ERROR, 255,        __VA_ARGS__); }}
-#define wWarn(...)  { if (wDebugFlag & DEBUG_WARN)  { taosPrintLog("WAL WARN ",  DEBUG_WARN, 255,         __VA_ARGS__); }}
-#define wInfo(...)  { if (wDebugFlag & DEBUG_INFO)  { taosPrintLog("WAL ",       DEBUG_INFO, 255,         __VA_ARGS__); }}
-#define wDebug(...) { if (wDebugFlag & DEBUG_DEBUG) { taosPrintLog("WAL ",       DEBUG_DEBUG, wDebugFlag, __VA_ARGS__); }}
-#define wTrace(...) { if (wDebugFlag & DEBUG_TRACE) { taosPrintLog("WAL ",       DEBUG_TRACE, wDebugFlag, __VA_ARGS__); }}
-// clang-format on
-
 #define WAL_PROTO_VER     0
 #define WAL_NOSUFFIX_LEN  20
 #define WAL_SUFFIX_AT     (WAL_NOSUFFIX_LEN + 1)
@@ -131,8 +124,7 @@ typedef struct SWal {
 typedef struct {
   int64_t refId;
   int64_t refVer;
-  //  int64_t refFile;
-  SWal *pWal;
+  SWal   *pWal;
 } SWalRef;
 
 typedef struct {
@@ -143,10 +135,8 @@ typedef struct {
   int8_t enableRef;
 } SWalFilterCond;
 
-typedef struct SWalReader SWalReader;
-
 // todo hide this struct
-struct SWalReader {
+typedef struct SWalReader {
   SWal     *pWal;
   int64_t   readerId;
   TdFilePtr pLogFile;
@@ -159,7 +149,7 @@ struct SWalReader {
   TdThreadMutex  mutex;
   SWalFilterCond cond;
   SWalCkHead    *pHead;
-};
+} SWalReader;
 
 // module initialization
 int32_t walInit();
@@ -172,17 +162,9 @@ int32_t walPersist(SWal *);
 void    walClose(SWal *);
 
 // write interfaces
-
 // By assigning index by the caller, wal gurantees linearizability
-int32_t walWrite(SWal *, int64_t index, tmsg_t msgType, const void *body, int32_t bodyLen);
-int32_t walWriteWithSyncInfo(SWal *, int64_t index, tmsg_t msgType, SWalSyncInfo syncMeta, const void *body,
-                             int32_t bodyLen);
-
-// Assign version automatically and return to caller,
-// -1 will be returned for failed writes
-int64_t walAppendLog(SWal *, int64_t index, tmsg_t msgType, SWalSyncInfo syncMeta, const void *body, int32_t bodyLen);
-
-void walFsync(SWal *, bool force);
+int32_t walAppendLog(SWal *, int64_t index, tmsg_t msgType, SWalSyncInfo syncMeta, const void *body, int32_t bodyLen);
+int32_t walFsync(SWal *, bool force);
 
 // apis for lifecycle management
 int32_t walCommit(SWal *, int64_t ver);
@@ -191,17 +173,13 @@ int32_t walRollback(SWal *, int64_t ver);
 int32_t walBeginSnapshot(SWal *, int64_t ver, int64_t logRetention);
 int32_t walEndSnapshot(SWal *);
 int32_t walRestoreFromSnapshot(SWal *, int64_t ver);
-// for tq
 int32_t walApplyVer(SWal *, int64_t ver);
 
-// int32_t  walDataCorrupted(SWal*);
-
 // wal reader
 SWalReader *walOpenReader(SWal *, SWalFilterCond *pCond, int64_t id);
 void        walCloseReader(SWalReader *pRead);
 void        walReadReset(SWalReader *pReader);
 int32_t     walReadVer(SWalReader *pRead, int64_t ver);
-void        decryptBody(SWalCfg *cfg, SWalCkHead *pHead, int32_t plainBodyLen, const char *func);
 int32_t     walReaderSeekVer(SWalReader *pRead, int64_t ver);
 int32_t     walNextValidMsg(SWalReader *pRead);
 int64_t     walReaderGetCurrentVer(const SWalReader *pReader);
@@ -216,12 +194,11 @@ int32_t walFetchHead(SWalReader *pRead, int64_t ver);
 int32_t walFetchBody(SWalReader *pRead);
 int32_t walSkipFetchBody(SWalReader *pRead);
 
-void walRefFirstVer(SWal *, SWalRef *);
-void walRefLastVer(SWal *, SWalRef *);
-
 SWalRef *walOpenRef(SWal *);
 void     walCloseRef(SWal *pWal, int64_t refId);
 int32_t  walSetRefVer(SWalRef *, int64_t ver);
+void     walRefFirstVer(SWal *, SWalRef *);
+void     walRefLastVer(SWal *, SWalRef *);
 
 // helper function for raft
 bool walLogExist(SWal *, int64_t ver);

include/os/os.h

@@ -97,6 +97,7 @@ extern "C" {
 #include <nmmintrin.h>
 #endif
 
+
 #include "osThread.h"
 
 #include "osAtomic.h"

include/os/osDef.h

@@ -65,7 +65,7 @@ typedef int (*__compar_fn_t)(const void *, const void *);
 #endif
 #define ssize_t int
 #define _SSIZE_T_
-#define bzero(ptr, size) memset((ptr), 0, (size))
+#define bzero(ptr, size) (void)memset((ptr), 0, (size))
 #define strcasecmp       _stricmp
 #define strncasecmp      _strnicmp
 #define wcsncasecmp      _wcsnicmp
@@ -220,7 +220,7 @@ void syslog(int unused, const char *format, ...);
 // Linux, length of name must <= 16 (the last '\0' included)
 #define setThreadName(name)     \
   do {                          \
-    prctl(PR_SET_NAME, (name)); \
+    (void)prctl(PR_SET_NAME, (name)); \
   } while (0)
 #define getThreadName(name)     \
   do {                          \

include/os/osDir.h

@@ -79,6 +79,8 @@ extern "C" {
 typedef struct TdDir      *TdDirPtr;
 typedef struct TdDirEntry *TdDirEntryPtr;
 
+#define TAOS_DIRNAME(name) ((void)taosDirName(name))
+
 void    taosRemoveDir(const char *dirname);
 bool    taosDirExist(const char *dirname);
 int32_t taosMkDir(const char *dirname);

include/os/osEnv.h

@@ -54,7 +54,7 @@ extern SDiskSpace tsDataSpace;
 extern SDiskSpace tsLogSpace;
 extern SDiskSpace tsTempSpace;
 
-void osDefaultInit();
+int32_t osDefaultInit();
 void osUpdate();
 void osCleanup();
 
@@ -66,7 +66,7 @@ bool osLogSpaceSufficient();
 bool osDataSpaceSufficient();
 bool osTempSpaceSufficient();
 
-void osSetTimezone(const char *timezone);
+int32_t osSetTimezone(const char *timezone);
 void osSetSystemLocale(const char *inLocale, const char *inCharSet);
 void osSetProcPath(int32_t argc, char **argv);
 

include/os/osFile.h

@@ -114,8 +114,6 @@ int64_t taosFSendFile(TdFilePtr pFileOut, TdFilePtr pFileIn, int64_t *offset, in
 
 bool taosValidFile(TdFilePtr pFile);
 
-int32_t taosGetErrorFile(TdFilePtr pFile);
-
 int32_t taosCompressFile(char *srcFileName, char *destFileName);
 
 int32_t taosSetFileHandlesLimit();

include/os/osLocale.h

@@ -30,7 +30,7 @@ extern "C" {
 
 char *taosCharsetReplace(char *charsetstr);
 void  taosGetSystemLocale(char *outLocale, char *outCharset);
-void  taosSetSystemLocale(const char *inLocale, const char *inCharSet);
+int32_t  taosSetSystemLocale(const char *inLocale, const char *inCharSet);
 
 #ifdef __cplusplus
 }

include/os/osMath.h

@@ -32,9 +32,9 @@ extern "C" {
 #define TSWAP(a, b)                  \
   do {                               \
     char *__tmp = (char*)alloca(sizeof(a)); \
-    memcpy(__tmp, &(a), sizeof(a));  \
-    memcpy(&(a), &(b), sizeof(a));   \
-    memcpy(&(b), __tmp, sizeof(a));  \
+    (void)memcpy(__tmp, &(a), sizeof(a));  \
+    (void)memcpy(&(a), &(b), sizeof(a));   \
+    (void)memcpy(&(b), __tmp, sizeof(a));  \
   } while (0)
 
 #ifdef WINDOWS

include/os/osMemory.h

@@ -54,6 +54,8 @@ void    taosMemoryTrim(int32_t size);
 void   *taosMemoryMallocAlign(uint32_t alignment, int64_t size);
 
 #define TAOS_MEMSET(_s, _c, _n) ((void)memset(_s, _c, _n))
+#define TAOS_MEMCPY(_d, _s, _n) ((void)memcpy(_d, _s, _n))
+#define TAOS_MEMMOVE(_d, _s, _n) ((void)memmove(_d, _s, _n))
 
 #define taosMemoryFreeClear(ptr)   \
   do {                             \
@@ -63,6 +65,16 @@ void   *taosMemoryMallocAlign(uint32_t alignment, int64_t size);
     }                              \
   } while (0)
 
+#define TAOS_MEMORY_REALLOC(ptr, len)          \
+  do {                                         \
+    void *tmp = taosMemoryRealloc(ptr, (len)); \
+    if (tmp) {                                 \
+      (ptr) = tmp;                             \
+    } else {                                   \
+      taosMemoryFreeClear(ptr);                \
+    }                                          \
+  } while (0)
+
 #ifdef __cplusplus
 }
 #endif

include/os/osSignal.h

@@ -49,11 +49,14 @@ typedef BOOL (*FSignalHandler)(DWORD fdwCtrlType);
 #else
 typedef void (*FSignalHandler)(int32_t signum, void *sigInfo, void *context);
 #endif
-void taosSetSignal(int32_t signum, FSignalHandler sigfp);
-void taosIgnSignal(int32_t signum);
-void taosDflSignal(int32_t signum);
 
-void taosKillChildOnParentStopped();
+typedef void (*sighandler_t)(int);
+
+int32_t taosSetSignal(int32_t signum, FSignalHandler sigfp);
+int32_t taosIgnSignal(int32_t signum);
+int32_t taosDflSignal(int32_t signum);
+
+int32_t taosKillChildOnParentStopped();
 
 #ifdef __cplusplus
 }

include/os/osSocket.h

@@ -159,13 +159,12 @@ TdSocketPtr       taosAcceptTcpConnectSocket(TdSocketServerPtr pServerSocket, st
 
 int32_t taosGetSocketName(TdSocketPtr pSocket, struct sockaddr *destAddr, int *addrLen);
 
-void        taosBlockSIGPIPE();
-uint32_t    taosGetIpv4FromFqdn(const char *);
+int32_t     taosBlockSIGPIPE();
+int32_t     taosGetIpv4FromFqdn(const char *fqdn, uint32_t* ip);
 int32_t     taosGetFqdn(char *);
 void        tinet_ntoa(char *ipstr, uint32_t ip);
 uint32_t    ip2uint(const char *const ip_addr);
-void        taosIgnSIGPIPE();
-void        taosSetMaskSIGPIPE();
+int32_t     taosIgnSIGPIPE();
 uint32_t    taosInetAddr(const char *ipAddr);
 const char *taosInetNtoa(struct in_addr ipInt, char *dstStr, int32_t len);
 

include/os/osString.h

@@ -60,6 +60,8 @@ typedef enum { M2C = 0, C2M } ConvType;
   } while (0)
 
 #define TAOS_STRCPY(_dst, _src) ((void)strcpy(_dst, _src))
+#define TAOS_STRNCPY(_dst, _src, _size) ((void)strncpy(_dst, _src, _size))
+#define TAOS_STRCAT(_dst, _src) ((void)strcat(_dst, _src))
 
 char   *tstrdup(const char *src);
 int32_t taosUcs4len(TdUcs4 *ucs4);
@@ -73,7 +75,7 @@ int32_t taosUcs4ToMbs(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs);
 int32_t taosUcs4ToMbsEx(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs, iconv_t conv);
 bool    taosMbsToUcs4(const char *mbs, size_t mbs_len, TdUcs4 *ucs4, int32_t ucs4_max_len, int32_t *len);
 int32_t tasoUcs4Compare(TdUcs4 *f1_ucs4, TdUcs4 *f2_ucs4, int32_t bytes);
-TdUcs4 *tasoUcs4Copy(TdUcs4 *target_ucs4, TdUcs4 *source_ucs4, int32_t len_ucs4);
+int32_t tasoUcs4Copy(TdUcs4 *target_ucs4, TdUcs4 *source_ucs4, int32_t len_ucs4);
 bool    taosValidateEncodec(const char *encodec);
 int32_t taosHexEncode(const unsigned char *src, char *dst, int32_t len);
 int32_t taosHexDecode(const char *src, char *dst, int32_t len);

include/os/osSysinfo.h

@@ -39,7 +39,7 @@ int64_t taosGetOsUptime();
 int32_t taosGetEmail(char *email, int32_t maxLen);
 int32_t taosGetOsReleaseName(char *releaseName, char* sName, char* ver, int32_t maxLen);
 int32_t taosGetCpuInfo(char *cpuModel, int32_t maxLen, float *numOfCores);
-int32_t taosGetCpuCores(float *numOfCores, bool physical);
+void    taosGetCpuCores(float *numOfCores, bool physical);
 void    taosGetCpuUsage(double *cpu_system, double *cpu_engine);
 int32_t taosGetCpuInstructions(char* sse42, char* avx, char* avx2, char* fma, char* avx512);
 int32_t taosGetTotalMemory(int64_t *totalKB);

include/os/osSystem.h

@@ -44,7 +44,7 @@ int64_t taosGetLineCmd(TdCmdPtr pCmd, char **__restrict ptrBuf);
 
 int32_t taosEOFCmd(TdCmdPtr pCmd);
 
-int64_t taosCloseCmd(TdCmdPtr *ppCmd);
+void    taosCloseCmd(TdCmdPtr *ppCmd);
 
 void *taosLoadDll(const char *filename);
 
@@ -54,11 +54,11 @@ void taosCloseDll(void *handle);
 
 int32_t taosSetConsoleEcho(bool on);
 
-void taosSetTerminalMode();
+int32_t taosSetTerminalMode();
 
 int32_t taosGetOldTerminalMode();
 
-void taosResetTerminalMode();
+int32_t taosResetTerminalMode();
 
 #define STACKSIZE 100
 

include/os/osTime.h

@@ -65,28 +65,28 @@ int32_t taosGetTimestampSec();
 //@return timestamp in millisecond
 static FORCE_INLINE int64_t taosGetTimestampMs() {
   struct timeval systemTime;
-  taosGetTimeOfDay(&systemTime);
+  (void)taosGetTimeOfDay(&systemTime);
   return (int64_t)systemTime.tv_sec * 1000LL + (int64_t)systemTime.tv_usec / 1000;
 }
 
 //@return timestamp in microsecond
 static FORCE_INLINE int64_t taosGetTimestampUs() {
   struct timeval systemTime;
-  taosGetTimeOfDay(&systemTime);
+  (void)taosGetTimeOfDay(&systemTime);
   return (int64_t)systemTime.tv_sec * 1000000LL + (int64_t)systemTime.tv_usec;
 }
 
 //@return timestamp in nanosecond
 static FORCE_INLINE int64_t taosGetTimestampNs() {
   struct timespec systemTime = {0};
-  taosClockGetTime(CLOCK_REALTIME, &systemTime);
+  (void)taosClockGetTime(CLOCK_REALTIME, &systemTime);
   return (int64_t)systemTime.tv_sec * 1000000000LL + (int64_t)systemTime.tv_nsec;
 }
 
 //@return timestamp of monotonic clock in millisecond
 static FORCE_INLINE int64_t taosGetMonoTimestampMs() {
   struct timespec systemTime = {0};
-  taosClockGetTime(CLOCK_MONOTONIC, &systemTime);
+  (void)taosClockGetTime(CLOCK_MONOTONIC, &systemTime);
   return (int64_t)systemTime.tv_sec * 1000LL + (int64_t)systemTime.tv_nsec / 1000000;
 }
 

include/os/osTimezone.h

@@ -55,7 +55,7 @@ enum TdTimezone {
 };
 
 void taosGetSystemTimezone(char *outTimezone, enum TdTimezone *tsTimezone);
-void taosSetSystemTimezone(const char *inTimezone, char *outTimezone, int8_t *outDaylight, enum TdTimezone *tsTimezone);
+int32_t taosSetSystemTimezone(const char *inTimezone, char *outTimezone, int8_t *outDaylight, enum TdTimezone *tsTimezone);
 
 #ifdef __cplusplus
 }

include/util/tRealloc.h

@@ -41,7 +41,7 @@ static FORCE_INLINE int32_t tRealloc(uint8_t **ppBuf, int64_t size) {
 
   pBuf = (uint8_t *)taosMemoryRealloc(pBuf, bsize + sizeof(int64_t));
   if (pBuf == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
+    code = terrno;
     goto _exit;
   }
 

include/util/taoserror.h

@@ -53,7 +53,7 @@ int32_t  taosGetErrSize();
 #define terrln                              (*taosGetErrln())
 
 #define SET_ERROR_MSG(MSG, ...) \
-  snprintf(terrMsg, ERR_MSG_LEN, MSG, ##__VA_ARGS__)
+  (void)snprintf(terrMsg, ERR_MSG_LEN, MSG, ##__VA_ARGS__)
 
 #define TSDB_CODE_SUCCESS                   0
 #define TSDB_CODE_FAILED                    -1   // unknown or needn't tell detail error
@@ -90,6 +90,8 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_RPC_NETWORK_ERROR             TAOS_DEF_ERROR_CODE(0, 0x0023)
 #define TSDB_CODE_RPC_NETWORK_BUSY              TAOS_DEF_ERROR_CODE(0, 0x0024)
 #define TSDB_CODE_HTTP_MODULE_QUIT              TAOS_DEF_ERROR_CODE(0, 0x0025)
+#define TSDB_CODE_RPC_MODULE_QUIT               TAOS_DEF_ERROR_CODE(0, 0x0026)
+#define TSDB_CODE_RPC_ASYNC_MODULE_QUIT               TAOS_DEF_ERROR_CODE(0, 0x0027)
 
 
 
@@ -198,7 +200,8 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_TSC_ENCODE_PARAM_ERROR        TAOS_DEF_ERROR_CODE(0, 0X0231)
 #define TSDB_CODE_TSC_ENCODE_PARAM_NULL         TAOS_DEF_ERROR_CODE(0, 0X0232)
 #define TSDB_CODE_TSC_COMPRESS_PARAM_ERROR      TAOS_DEF_ERROR_CODE(0, 0X0233)
-#define TSDB_CODE_TSC_COMPRESS_LEVEL_ERROR TAOS_DEF_ERROR_CODE(0, 0X0234)
+#define TSDB_CODE_TSC_COMPRESS_LEVEL_ERROR      TAOS_DEF_ERROR_CODE(0, 0X0234)
+#define TSDB_CODE_TSC_FAIL_GENERATE_JSON        TAOS_DEF_ERROR_CODE(0, 0X0235)
 #define TSDB_CODE_TSC_INTERNAL_ERROR            TAOS_DEF_ERROR_CODE(0, 0X02FF)
 
 // mnode-common
@@ -224,6 +227,7 @@ int32_t  taosGetErrSize();
 // #define TSDB_CODE_MND_FAILED_TO_INIT_STEP    TAOS_DEF_ERROR_CODE(0, 0x0314) // 2.x
 #define TSDB_CODE_MND_USER_DISABLED             TAOS_DEF_ERROR_CODE(0, 0x0315)
 #define TSDB_CODE_MND_INVALID_PLATFORM          TAOS_DEF_ERROR_CODE(0, 0x0316)
+#define TSDB_CODE_MND_RETURN_VALUE_NULL         TAOS_DEF_ERROR_CODE(0, 0x0317)
 
 // mnode-sdb
 #define TSDB_CODE_SDB_OBJ_ALREADY_THERE         TAOS_DEF_ERROR_CODE(0, 0x0320) // internal
@@ -555,6 +559,7 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_TDB_INVALID_TABLE_SCHEMA_VER  TAOS_DEF_ERROR_CODE(0, 0x061B)
 #define TSDB_CODE_TDB_TDB_ENV_OPEN_ERROR        TAOS_DEF_ERROR_CODE(0, 0x061C)
 #define TSDB_CODE_TDB_TABLE_IN_OTHER_STABLE     TAOS_DEF_ERROR_CODE(0, 0x061D)
+#define TSDB_CODE_TDB_INCONSISTENT_DB_ID        TAOS_DEF_ERROR_CODE(0, 0x061E)
 
 // query
 #define TSDB_CODE_QRY_INVALID_QHANDLE           TAOS_DEF_ERROR_CODE(0, 0x0700)
@@ -596,6 +601,7 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_QRY_GEO_NOT_SUPPORT_ERROR     TAOS_DEF_ERROR_CODE(0, 0x0731)
 #define TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR   TAOS_DEF_ERROR_CODE(0, 0x0732)
 #define TSDB_CODE_QRY_INVALID_JOIN_CONDITION    TAOS_DEF_ERROR_CODE(0, 0x0733)
+#define TSDB_CODE_QRY_FILTER_NOT_SUPPORT_TYPE   TAOS_DEF_ERROR_CODE(0, 0x0734)
 
 // grant
 #define TSDB_CODE_GRANT_EXPIRED                 TAOS_DEF_ERROR_CODE(0, 0x0800)
@@ -665,8 +671,16 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_SYN_BUFFER_FULL               TAOS_DEF_ERROR_CODE(0, 0x0916)
 #define TSDB_CODE_SYN_WRITE_STALL               TAOS_DEF_ERROR_CODE(0, 0x0917)
 #define TSDB_CODE_SYN_NEGOTIATION_WIN_FULL      TAOS_DEF_ERROR_CODE(0, 0x0918)
+#define TSDB_CODE_SYN_WRONG_TERM                TAOS_DEF_ERROR_CODE(0, 0x0919)
+#define TSDB_CODE_SYN_WRONG_FSM_STATE           TAOS_DEF_ERROR_CODE(0, 0x091A)
+#define TSDB_CODE_SYN_WRONG_SYNC_STATE          TAOS_DEF_ERROR_CODE(0, 0x091B)
+#define TSDB_CODE_SYN_WRONG_REF                 TAOS_DEF_ERROR_CODE(0, 0x091C)
+#define TSDB_CODE_SYN_INVALID_ID                TAOS_DEF_ERROR_CODE(0, 0x091D)
+#define TSDB_CODE_SYN_RETURN_VALUE_NULL         TAOS_DEF_ERROR_CODE(0, 0x091E)
+#define TSDB_CODE_SYN_WRONG_ROLE                TAOS_DEF_ERROR_CODE(0, 0x091F)
 #define TSDB_CODE_SYN_INTERNAL_ERROR            TAOS_DEF_ERROR_CODE(0, 0x09FF)
 
+
 // tq
 #define TSDB_CODE_TQ_INVALID_CONFIG             TAOS_DEF_ERROR_CODE(0, 0x0A00)
 #define TSDB_CODE_TQ_INIT_FAILED                TAOS_DEF_ERROR_CODE(0, 0x0A01)
@@ -857,6 +871,11 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_FUNC_TO_TIMESTAMP_FAILED_TS_ERR TAOS_DEF_ERROR_CODE(0, 0x2807)
 #define TSDB_CODE_FUNC_TO_TIMESTAMP_FAILED_NOT_SUPPORTED TAOS_DEF_ERROR_CODE(0, 0x2808)
 #define TSDB_CODE_FUNC_TO_CHAR_NOT_SUPPORTED    TAOS_DEF_ERROR_CODE(0, 0x2809)
+#define TSDB_CODE_FUNC_TIME_UNIT_INVALID        TAOS_DEF_ERROR_CODE(0, 0x280A)
+#define TSDB_CODE_FUNC_TIME_UNIT_TOO_SMALL      TAOS_DEF_ERROR_CODE(0, 0x280B)
+#define TSDB_CODE_FUNC_INVALID_VALUE_RANGE      TAOS_DEF_ERROR_CODE(0, 0x280C)
+#define TSDB_CODE_FUNC_SETUP_ERROR              TAOS_DEF_ERROR_CODE(0, 0x280D)
+
 
 //udf
 #define TSDB_CODE_UDF_STOPPING                  TAOS_DEF_ERROR_CODE(0, 0x2901)
@@ -869,6 +888,7 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_UDF_INVALID_OUTPUT_TYPE       TAOS_DEF_ERROR_CODE(0, 0x2908)
 #define TSDB_CODE_UDF_SCRIPT_NOT_SUPPORTED      TAOS_DEF_ERROR_CODE(0, 0x2909)
 #define TSDB_CODE_UDF_FUNC_EXEC_FAILURE         TAOS_DEF_ERROR_CODE(0, 0x290A)
+#define TSDB_CODE_UDF_UV_EXEC_FAILURE           TAOS_DEF_ERROR_CODE(0, 0x290B)
 
 // sml
 #define TSDB_CODE_SML_INVALID_PROTOCOL_TYPE     TAOS_DEF_ERROR_CODE(0, 0x3000)

include/util/tarray2.h

@@ -55,7 +55,7 @@ static FORCE_INLINE int32_t tarray2_make_room(void *arr, int32_t expSize, int32_
     capacity <<= 1;
   }
   void *p = taosMemoryRealloc(a->data, capacity * eleSize);
-  if (p == NULL) return TSDB_CODE_OUT_OF_MEMORY;
+  if (p == NULL) return terrno;
   a->capacity = capacity;
   a->data = p;
   return 0;
@@ -71,9 +71,9 @@ static FORCE_INLINE int32_t tarray2InsertBatch(void *arr, int32_t idx, const voi
   }
   if (ret == 0) {
     if (idx < a->size) {
-      memmove(a->data + (idx + numEle) * eleSize, a->data + idx * eleSize, (a->size - idx) * eleSize);
+      (void)memmove(a->data + (idx + numEle) * eleSize, a->data + idx * eleSize, (a->size - idx) * eleSize);
     }
-    memcpy(a->data + idx * eleSize, elePtr, numEle * eleSize);
+    (void)memcpy(a->data + idx * eleSize, elePtr, numEle * eleSize);
     a->size += numEle;
   }
   return ret;
@@ -116,7 +116,7 @@ static FORCE_INLINE int32_t tarray2SortInsert(void *arr, const void *elePtr, int
     if ((cb) && (a)->size > 0) {                \
       TArray2Cb cb_ = (TArray2Cb)(cb);          \
       for (int32_t i = 0; i < (a)->size; ++i) { \
-        cb_((a)->data + i);                     \
+        (void)cb_((a)->data + i);               \
       }                                         \
     }                                           \
     (a)->size = 0;                              \
@@ -145,18 +145,18 @@ static FORCE_INLINE int32_t tarray2SortInsert(void *arr, const void *elePtr, int
 #define TARRAY2_SORT_INSERT(a, e, cmp)    tarray2SortInsert(a, &(e), sizeof(((a)->data[0])), (__compar_fn_t)cmp)
 #define TARRAY2_SORT_INSERT_P(a, ep, cmp) tarray2SortInsert(a, ep, sizeof(((a)->data[0])), (__compar_fn_t)cmp)
 
-#define TARRAY2_REMOVE(a, idx, cb)                                                                       \
-  do {                                                                                                   \
-    if ((idx) < (a)->size) {                                                                             \
-      if (cb) {                                                                                          \
-        TArray2Cb cb_ = (TArray2Cb)(cb);                                                                 \
-        cb_((a)->data + (idx));                                                                          \
-      }                                                                                                  \
-      if ((idx) < (a)->size - 1) {                                                                       \
-        memmove((a)->data + (idx), (a)->data + (idx) + 1, sizeof((*(a)->data)) * ((a)->size - (idx)-1)); \
-      }                                                                                                  \
-      (a)->size--;                                                                                       \
-    }                                                                                                    \
+#define TARRAY2_REMOVE(a, idx, cb)                                                                             \
+  do {                                                                                                         \
+    if ((idx) < (a)->size) {                                                                                   \
+      if (cb) {                                                                                                \
+        TArray2Cb cb_ = (TArray2Cb)(cb);                                                                       \
+        cb_((a)->data + (idx));                                                                                \
+      }                                                                                                        \
+      if ((idx) < (a)->size - 1) {                                                                             \
+        (void)memmove((a)->data + (idx), (a)->data + (idx) + 1, sizeof((*(a)->data)) * ((a)->size - (idx)-1)); \
+      }                                                                                                        \
+      (a)->size--;                                                                                             \
+    }                                                                                                          \
   } while (0)
 
 #define TARRAY2_FOREACH(a, e)         for (int32_t __i = 0; __i < (a)->size && ((e) = (a)->data[__i], 1); __i++)

include/util/tbase58.h

@@ -25,8 +25,8 @@ extern "C" {
 #define TBASE_MAX_ILEN 4096
 #define TBASE_MAX_OLEN 5653
 
-uint8_t *base58_decode(const char *value, size_t inlen, int32_t *outlen);
-char    *base58_encode(const uint8_t *value, int32_t vlen);
+int32_t base58_decode(const char *value, size_t inlen, int32_t *outlen, uint8_t **result);
+int32_t base58_encode(const uint8_t *value, int32_t vlen, char **result);
 
 #ifdef __cplusplus
 }

include/util/tbase64.h

@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-uint8_t *base64_decode(const char *value, int32_t inlen, int32_t *outlen);
-char    *base64_encode(const uint8_t *value, int32_t vlen);
+int32_t base64_decode(const char *value, int32_t inlen, int32_t *outlen, uint8_t **result);
+int32_t base64_encode(const uint8_t *value, int32_t vlen, char **result);
 
 #ifdef __cplusplus
 }

include/util/tbuffer.h

@@ -27,9 +27,9 @@ typedef struct SBufferReader SBufferReader;
 
 // SBuffer
 #define BUFFER_INITIALIZER ((SBuffer){0, 0, NULL})
-static int32_t tBufferInit(SBuffer *buffer);
-static int32_t tBufferDestroy(SBuffer *buffer);
-static int32_t tBufferClear(SBuffer *buffer);
+static void    tBufferInit(SBuffer *buffer);
+static void    tBufferDestroy(SBuffer *buffer);
+static void    tBufferClear(SBuffer *buffer);
 static int32_t tBufferEnsureCapacity(SBuffer *buffer, uint32_t capacity);
 static int32_t tBufferPut(SBuffer *buffer, const void *data, uint32_t size);
 static int32_t tBufferPutAt(SBuffer *buffer, uint32_t offset, const void *data, uint32_t size);

include/util/tbuffer.inc

@@ -15,6 +15,7 @@
 
 #include "taoserror.h"
 #include "tcoding.h"
+#include "tutil.h"
 
 struct SBuffer {
   uint32_t size;
@@ -28,27 +29,22 @@ struct SBufferReader {
 };
 
 // SBuffer
-static FORCE_INLINE int32_t tBufferInit(SBuffer *buffer) {
+static FORCE_INLINE void tBufferInit(SBuffer *buffer) {
   buffer->size = 0;
   buffer->capacity = 0;
   buffer->data = NULL;
-  return 0;
 }
 
-static FORCE_INLINE int32_t tBufferDestroy(SBuffer *buffer) {
+static FORCE_INLINE void tBufferDestroy(SBuffer *buffer) {
   buffer->size = 0;
   buffer->capacity = 0;
   if (buffer->data) {
     taosMemoryFree(buffer->data);
     buffer->data = NULL;
   }
-  return 0;
 }
 
-static FORCE_INLINE int32_t tBufferClear(SBuffer *buffer) {
-  buffer->size = 0;
-  return 0;
-}
+static FORCE_INLINE void tBufferClear(SBuffer *buffer) { buffer->size = 0; }
 
 static FORCE_INLINE int32_t tBufferEnsureCapacity(SBuffer *buffer, uint32_t capacity) {
   if (buffer->capacity < capacity) {
@@ -67,8 +63,7 @@ static FORCE_INLINE int32_t tBufferEnsureCapacity(SBuffer *buffer, uint32_t capa
 }
 
 static FORCE_INLINE int32_t tBufferPut(SBuffer *buffer, const void *data, uint32_t size) {
-  int32_t code = tBufferEnsureCapacity(buffer, buffer->size + size);
-  if (code) return code;
+  TAOS_CHECK_RETURN(tBufferEnsureCapacity(buffer, buffer->size + size));
   memcpy((char *)buffer->data + buffer->size, data, size);
   buffer->size += size;
   return 0;
@@ -119,10 +114,8 @@ static FORCE_INLINE int32_t tBufferPutU16v(SBuffer *buffer, uint16_t value) { re
 static FORCE_INLINE int32_t tBufferPutU32v(SBuffer *buffer, uint32_t value) { return tBufferPutU64v(buffer, value); }
 
 static FORCE_INLINE int32_t tBufferPutU64v(SBuffer *buffer, uint64_t value) {
-  int32_t code;
   while (value >= 0x80) {
-    code = tBufferPutU8(buffer, (value & 0x7F) | 0x80);
-    if (code) return code;
+    TAOS_CHECK_RETURN(tBufferPutU8(buffer, (value & 0x7F) | 0x80));
     value >>= 7;
   }
   return tBufferPutU8(buffer, value);
@@ -141,8 +134,7 @@ static FORCE_INLINE int32_t tBufferPutI64v(SBuffer *buffer, int64_t value) {
 }
 
 static FORCE_INLINE int32_t tBufferPutBinary(SBuffer *buffer, const void *data, uint32_t size) {
-  int32_t code = tBufferPutU32v(buffer, size);
-  if (code) return code;
+  TAOS_CHECK_RETURN(tBufferPutU32v(buffer, size));
   return tBufferPut(buffer, data, size);
 }
 
@@ -324,8 +316,7 @@ static int32_t tBufferGetF32(SBufferReader *reader, float *value) {
     float    f;
     uint32_t u;
   } u;
-  int32_t code = tBufferGetU32(reader, &u.u);
-  if (code) return code;
+  TAOS_CHECK_RETURN(tBufferGetU32(reader, &u.u));
   if (value) {
     *value = u.f;
   }
@@ -337,8 +328,7 @@ static int32_t tBufferGetF64(SBufferReader *reader, double *value) {
     double   f;
     uint64_t u;
   } u;
-  int32_t code = tBufferGetU64(reader, &u.u);
-  if (code) return code;
+  TAOS_CHECK_RETURN(tBufferGetU64(reader, &u.u));
   if (value) {
     *value = u.f;
   }

include/util/tcoding.h

@@ -79,7 +79,7 @@ static FORCE_INLINE void *taosDecodeFixedBool(const void *buf, bool *value) {
 static FORCE_INLINE int32_t taosEncodeFixedU16(void **buf, uint16_t value) {
   if (buf != NULL) {
     if (IS_LITTLE_ENDIAN()) {
-      memcpy(*buf, &value, sizeof(value));
+      TAOS_MEMCPY(*buf, &value, sizeof(value));
     } else {
       ((uint8_t *)(*buf))[0] = value & 0xff;
       ((uint8_t *)(*buf))[1] = (value >> 8) & 0xff;
@@ -92,7 +92,7 @@ static FORCE_INLINE int32_t taosEncodeFixedU16(void **buf, uint16_t value) {
 
 static FORCE_INLINE void *taosDecodeFixedU16(const void *buf, uint16_t *value) {
   if (IS_LITTLE_ENDIAN()) {
-    memcpy(value, buf, sizeof(*value));
+    TAOS_MEMCPY(value, buf, sizeof(*value));
   } else {
     ((uint8_t *)value)[1] = ((uint8_t *)buf)[0];
     ((uint8_t *)value)[0] = ((uint8_t *)buf)[1];
@@ -117,7 +117,7 @@ static FORCE_INLINE void *taosDecodeFixedI16(const void *buf, int16_t *value) {
 static FORCE_INLINE int32_t taosEncodeFixedU32(void **buf, uint32_t value) {
   if (buf != NULL) {
     if (IS_LITTLE_ENDIAN()) {
-      memcpy(*buf, &value, sizeof(value));
+      TAOS_MEMCPY(*buf, &value, sizeof(value));
     } else {
       ((uint8_t *)(*buf))[0] = value & 0xff;
       ((uint8_t *)(*buf))[1] = (value >> 8) & 0xff;
@@ -132,7 +132,7 @@ static FORCE_INLINE int32_t taosEncodeFixedU32(void **buf, uint32_t value) {
 
 static FORCE_INLINE void *taosDecodeFixedU32(const void *buf, uint32_t *value) {
   if (IS_LITTLE_ENDIAN()) {
-    memcpy(value, buf, sizeof(*value));
+    TAOS_MEMCPY(value, buf, sizeof(*value));
   } else {
     ((uint8_t *)value)[3] = ((uint8_t *)buf)[0];
     ((uint8_t *)value)[2] = ((uint8_t *)buf)[1];
@@ -159,7 +159,7 @@ static FORCE_INLINE void *taosDecodeFixedI32(const void *buf, int32_t *value) {
 static FORCE_INLINE int32_t taosEncodeFixedU64(void **buf, uint64_t value) {
   if (buf != NULL) {
     if (IS_LITTLE_ENDIAN()) {
-      memcpy(*buf, &value, sizeof(value));
+      TAOS_MEMCPY(*buf, &value, sizeof(value));
     } else {
       ((uint8_t *)(*buf))[0] = value & 0xff;
       ((uint8_t *)(*buf))[1] = (value >> 8) & 0xff;
@@ -179,7 +179,7 @@ static FORCE_INLINE int32_t taosEncodeFixedU64(void **buf, uint64_t value) {
 
 static FORCE_INLINE void *taosDecodeFixedU64(const void *buf, uint64_t *value) {
   if (IS_LITTLE_ENDIAN()) {
-    memcpy(value, buf, sizeof(*value));
+    TAOS_MEMCPY(value, buf, sizeof(*value));
   } else {
     ((uint8_t *)value)[7] = ((uint8_t *)buf)[0];
     ((uint8_t *)value)[6] = ((uint8_t *)buf)[1];
@@ -357,7 +357,7 @@ static FORCE_INLINE int32_t taosEncodeString(void **buf, const char *value) {
 
   tlen += taosEncodeVariantU64(buf, size);
   if (buf != NULL) {
-    memcpy(*buf, value, size);
+    TAOS_MEMCPY(*buf, value, size);
     *buf = POINTER_SHIFT(*buf, size);
   }
   tlen += (int32_t)size;
@@ -372,7 +372,7 @@ static FORCE_INLINE void *taosDecodeString(const void *buf, char **value) {
   *value = (char *)taosMemoryMalloc((size_t)size + 1);
 
   if (*value == NULL) return NULL;
-  memcpy(*value, buf, (size_t)size);
+  TAOS_MEMCPY(*value, buf, (size_t)size);
 
   (*value)[size] = '\0';
 
@@ -383,7 +383,7 @@ static FORCE_INLINE void *taosDecodeStringTo(const void *buf, char *value) {
   uint64_t size = 0;
 
   buf = taosDecodeVariantU64(buf, &size);
-  memcpy(value, buf, (size_t)size);
+  TAOS_MEMCPY(value, buf, (size_t)size);
 
   value[size] = '\0';
 
@@ -395,7 +395,7 @@ static FORCE_INLINE int32_t taosEncodeBinary(void **buf, const void *value, int3
   int32_t tlen = 0;
 
   if (buf != NULL) {
-    memcpy(*buf, value, valueLen);
+    TAOS_MEMCPY(*buf, value, valueLen);
     *buf = POINTER_SHIFT(*buf, valueLen);
   }
   tlen += (int32_t)valueLen;
@@ -406,13 +406,13 @@ static FORCE_INLINE int32_t taosEncodeBinary(void **buf, const void *value, int3
 static FORCE_INLINE void *taosDecodeBinary(const void *buf, void **value, int32_t valueLen) {
   *value = taosMemoryMalloc((size_t)valueLen);
   if (*value == NULL) return NULL;
-  memcpy(*value, buf, (size_t)valueLen);
+  TAOS_MEMCPY(*value, buf, (size_t)valueLen);
 
   return POINTER_SHIFT(buf, valueLen);
 }
 
 static FORCE_INLINE void *taosDecodeBinaryTo(const void *buf, void *value, int32_t valueLen) {
-  memcpy(value, buf, (size_t)valueLen);
+  TAOS_MEMCPY(value, buf, (size_t)valueLen);
   return POINTER_SHIFT(buf, valueLen);
 }
 

include/util/tconfig.h

@@ -101,7 +101,7 @@ typedef struct {
 typedef struct SConfig SConfig;
 typedef struct SConfigIter SConfigIter;
 
-SConfig     *cfgInit();
+int32_t      cfgInit(SConfig **ppCfg);
 int32_t      cfgLoad(SConfig *pCfg, ECfgSrcType cfgType, const void *sourceStr);
 int32_t      cfgLoadFromArray(SConfig *pCfg, SArray *pArgs);  // SConfigPair
 void         cfgCleanup(SConfig *pCfg);
@@ -110,7 +110,7 @@ SConfigItem *cfgGetItem(SConfig *pCfg, const char *pName);
 int32_t      cfgSetItem(SConfig *pCfg, const char *name, const char *value, ECfgSrcType stype, bool lock);
 int32_t      cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *pVal, bool isServer);
 
-SConfigIter *cfgCreateIter(SConfig *pConf);
+int32_t      cfgCreateIter(SConfig *pConf, SConfigIter **ppIter);
 SConfigItem *cfgNextIter(SConfigIter *pIter);
 void         cfgDestroyIter(SConfigIter *pIter);
 void         cfgLock(SConfig *pCfg);
@@ -131,8 +131,8 @@ int32_t cfgAddTimezone(SConfig *pCfg, const char *name, const char *defaultVal,
 const char *cfgStypeStr(ECfgSrcType type);
 const char *cfgDtypeStr(ECfgDataType type);
 
-void cfgDumpItemValue(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen);
-void cfgDumpItemScope(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen);
+int32_t cfgDumpItemValue(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen);
+int32_t cfgDumpItemScope(SConfigItem *pItem, char *buf, int32_t bufSize, int32_t *pLen);
 
 void cfgDumpCfg(SConfig *pCfg, bool tsc, bool dump);
 void cfgDumpCfgS3(SConfig *pCfg, bool tsc, bool dump);

include/util/tdef.h

@@ -131,10 +131,10 @@ static const int64_t TICK_PER_SECOND[] = {
                  : ((precision) == TSDB_TIME_PRECISION_MICRO ? 1000000LL : 1000000000LL)))
 
 #define T_MEMBER_SIZE(type, member) sizeof(((type *)0)->member)
-#define T_APPEND_MEMBER(dst, ptr, type, member)                                     \
-  do {                                                                              \
-    memcpy((void *)(dst), (void *)(&((ptr)->member)), T_MEMBER_SIZE(type, member)); \
-    dst = (void *)((char *)(dst) + T_MEMBER_SIZE(type, member));                    \
+#define T_APPEND_MEMBER(dst, ptr, type, member)                                           \
+  do {                                                                                    \
+    (void)memcpy((void *)(dst), (void *)(&((ptr)->member)), T_MEMBER_SIZE(type, member)); \
+    dst = (void *)((char *)(dst) + T_MEMBER_SIZE(type, member));                          \
   } while (0)
 #define T_READ_MEMBER(src, type, target)          \
   do {                                            \
@@ -556,7 +556,8 @@ typedef struct {
   char name[TSDB_LOG_VAR_LEN];
 } SLogVar;
 
-#define TMQ_SEPARATOR ':'
+#define TMQ_SEPARATOR      ":"
+#define TMQ_SEPARATOR_CHAR ':'
 
 enum {
   SND_WORKER_TYPE__SHARED = 1,

include/util/tdigest.h

@@ -64,10 +64,10 @@ typedef struct TDigest {
 } TDigest;
 
 TDigest *tdigestNewFrom(void *pBuf, int32_t compression);
-void     tdigestAdd(TDigest *t, double x, int64_t w);
-void     tdigestMerge(TDigest *t1, TDigest *t2);
+int32_t  tdigestAdd(TDigest *t, double x, int64_t w);
+int32_t  tdigestMerge(TDigest *t1, TDigest *t2);
 double   tdigestQuantile(TDigest *t, double q);
-void     tdigestCompress(TDigest *t);
+int32_t  tdigestCompress(TDigest *t);
 void     tdigestFreeFrom(TDigest *t);
 void     tdigestAutoFill(TDigest *t, int32_t compression);
 

include/util/tencode.h

@@ -127,7 +127,7 @@ static FORCE_INLINE int32_t tEncodeFixed(SEncoder* pCoder, const void* val, uint
     if (pCoder->pos + size > pCoder->size) {
       TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
     }
-    memcpy(pCoder->data + pCoder->pos, val, size);
+    TAOS_MEMCPY(pCoder->data + pCoder->pos, val, size);
   }
 
   pCoder->pos += size;
@@ -212,7 +212,7 @@ static FORCE_INLINE int32_t tEncodeBinary(SEncoder* pCoder, const uint8_t* val,
       if (pCoder->pos + len > pCoder->size) {
         TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
       }
-      memcpy(pCoder->data + pCoder->pos, val, len);
+      TAOS_MEMCPY(pCoder->data + pCoder->pos, val, len);
     }
 
     pCoder->pos += len;
@@ -233,7 +233,7 @@ static int32_t tDecodeFixed(SDecoder* pCoder, void* val, uint32_t size) {
   if (pCoder->pos + size > pCoder->size) {
     TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
   } else if (val) {
-    memcpy(val, pCoder->data + pCoder->pos, size);
+    TAOS_MEMCPY(val, pCoder->data + pCoder->pos, size);
   }
   pCoder->pos += size;
   return 0;
@@ -427,7 +427,7 @@ static int32_t tDecodeCStrTo(SDecoder* pCoder, char* val) {
   uint32_t len;
   TAOS_CHECK_RETURN(tDecodeCStrAndLen(pCoder, &pStr, &len));
 
-  memcpy(val, pStr, len + 1);
+  TAOS_MEMCPY(val, pStr, len + 1);
   return 0;
 }
 
@@ -446,7 +446,7 @@ static FORCE_INLINE int32_t tDecodeBinaryAlloc(SDecoder* pCoder, void** val, uin
       TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
     }
 
-    memcpy(*val, pCoder->data + pCoder->pos, length);
+    TAOS_MEMCPY(*val, pCoder->data + pCoder->pos, length);
 
     pCoder->pos += length;
   } else {
@@ -468,7 +468,7 @@ static FORCE_INLINE int32_t tDecodeBinaryAlloc32(SDecoder* pCoder, void** val, u
     if (*val == NULL) {
       TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY);
     }
-    memcpy(*val, pCoder->data + pCoder->pos, length);
+    TAOS_MEMCPY(*val, pCoder->data + pCoder->pos, length);
 
     pCoder->pos += length;
   } else {
@@ -757,7 +757,7 @@ static FORCE_INLINE int32_t tPutBinary(uint8_t* p, uint8_t* pData, uint32_t nDat
   int n = 0;
 
   n += tPutU32v(p ? p + n : p, nData);
-  if (p) memcpy(p + n, pData, nData);
+  if (p) TAOS_MEMCPY(p + n, pData, nData);
   n += nData;
 
   return n;

include/util/thash.h

@@ -28,8 +28,7 @@ typedef int32_t (*_equal_fn_t)(const void *, const void *, size_t len);
 typedef void (*_hash_before_fn_t)(void *);
 typedef void (*_hash_free_fn_t)(void *);
 
-#define HASH_KEY_ALREADY_EXISTS (-2)
-#define HASH_NODE_EXIST(code)   (code == HASH_KEY_ALREADY_EXISTS)
+#define HASH_NODE_EXIST(code)   (code == TSDB_CODE_DUP_KEY)
 
 /**
  * murmur hash algorithm

include/util/tlist.h

@@ -224,7 +224,7 @@ void       tdListInit(SList *list, int32_t eleSize);
 void       tdListEmpty(SList *list);
 SList     *tdListNew(int32_t eleSize);
 void      *tdListFree(SList *list);
-void      *tdListFreeP(SList *list, FDelete fp);
+void       tdListFreeP(SList *list, FDelete fp);
 void       tdListPrependNode(SList *list, SListNode *node);
 void       tdListAppendNode(SList *list, SListNode *node);
 int32_t    tdListPrepend(SList *list, void *data);

include/util/tlockfree.h

@@ -84,7 +84,7 @@ int32_t taosWTryLockLatch(SRWLatch *pLatch);
     int32_t old_ = atomic_add_fetch_32((x), 0); \
     if (old_ & 0x00000001) {                    \
       if (i_ % 1000 == 0) {                     \
-        sched_yield();                          \
+        (void)sched_yield();                    \
       }                                         \
       continue;                                 \
     }
@@ -98,9 +98,9 @@ int32_t taosWTryLockLatch(SRWLatch *pLatch);
 #define taosCorBeginWrite(x) \
   taosCorBeginRead(x) if (atomic_val_compare_exchange_32((x), old_, old_ + 1) != old_) { continue; }
 
-#define taosCorEndWrite(x)     \
-  atomic_add_fetch_32((x), 1); \
-  break;                       \
+#define taosCorEndWrite(x)           \
+  (void)atomic_add_fetch_32((x), 1); \
+  break;                             \
   }
 
 #ifdef __cplusplus

include/util/tpagedbuf.h

@@ -156,7 +156,7 @@ void setBufPageCompressOnDisk(SDiskbasedBuf* pBuf, bool comp);
  * @param pBuf
  * @param pageId
  */
-void dBufSetBufPageRecycled(SDiskbasedBuf* pBuf, void* pPage);
+int32_t dBufSetBufPageRecycled(SDiskbasedBuf* pBuf, void* pPage);
 
 /**
  * Print the statistics when closing this buffer

include/util/tqueue.h

@@ -73,36 +73,36 @@ struct STaosQnode {
   char        item[];
 };
 
-STaosQueue *taosOpenQueue();
-void        taosCloseQueue(STaosQueue *queue);
-void        taosSetQueueFp(STaosQueue *queue, FItem itemFp, FItems itemsFp);
-void       *taosAllocateQitem(int32_t size, EQItype itype, int64_t dataSize);
-void        taosFreeQitem(void *pItem);
-int32_t     taosWriteQitem(STaosQueue *queue, void *pItem);
-int32_t     taosReadQitem(STaosQueue *queue, void **ppItem);
-bool        taosQueueEmpty(STaosQueue *queue);
-void        taosUpdateItemSize(STaosQueue *queue, int32_t items);
-int32_t     taosQueueItemSize(STaosQueue *queue);
-int64_t     taosQueueMemorySize(STaosQueue *queue);
-void        taosSetQueueCapacity(STaosQueue *queue, int64_t size);
-void        taosSetQueueMemoryCapacity(STaosQueue *queue, int64_t mem);
+int32_t taosOpenQueue(STaosQueue **queue);
+void    taosCloseQueue(STaosQueue *queue);
+void    taosSetQueueFp(STaosQueue *queue, FItem itemFp, FItems itemsFp);
+int32_t taosAllocateQitem(int32_t size, EQItype itype, int64_t dataSize, void **item);
+void    taosFreeQitem(void *pItem);
+int32_t taosWriteQitem(STaosQueue *queue, void *pItem);
+int32_t taosReadQitem(STaosQueue *queue, void **ppItem);
+bool    taosQueueEmpty(STaosQueue *queue);
+void    taosUpdateItemSize(STaosQueue *queue, int32_t items);
+int32_t taosQueueItemSize(STaosQueue *queue);
+int64_t taosQueueMemorySize(STaosQueue *queue);
+void    taosSetQueueCapacity(STaosQueue *queue, int64_t size);
+void    taosSetQueueMemoryCapacity(STaosQueue *queue, int64_t mem);
 
-STaosQall *taosAllocateQall();
-void       taosFreeQall(STaosQall *qall);
-int32_t    taosReadAllQitems(STaosQueue *queue, STaosQall *qall);
-int32_t    taosGetQitem(STaosQall *qall, void **ppItem);
-void       taosResetQitems(STaosQall *qall);
-int32_t    taosQallItemSize(STaosQall *qall);
-int64_t    taosQallMemSize(STaosQall *qll);
-int64_t    taosQallUnAccessedItemSize(STaosQall *qall);
-int64_t    taosQallUnAccessedMemSize(STaosQall *qall);
+int32_t taosAllocateQall(STaosQall **qall);
+void    taosFreeQall(STaosQall *qall);
+int32_t taosReadAllQitems(STaosQueue *queue, STaosQall *qall);
+int32_t taosGetQitem(STaosQall *qall, void **ppItem);
+void    taosResetQitems(STaosQall *qall);
+int32_t taosQallItemSize(STaosQall *qall);
+int64_t taosQallMemSize(STaosQall *qll);
+int64_t taosQallUnAccessedItemSize(STaosQall *qall);
+int64_t taosQallUnAccessedMemSize(STaosQall *qall);
 
-STaosQset *taosOpenQset();
-void       taosCloseQset(STaosQset *qset);
-void       taosQsetThreadResume(STaosQset *qset);
-int32_t    taosAddIntoQset(STaosQset *qset, STaosQueue *queue, void *ahandle);
-void       taosRemoveFromQset(STaosQset *qset, STaosQueue *queue);
-int32_t    taosGetQueueNumber(STaosQset *qset);
+int32_t taosOpenQset(STaosQset **qset);
+void    taosCloseQset(STaosQset *qset);
+void    taosQsetThreadResume(STaosQset *qset);
+int32_t taosAddIntoQset(STaosQset *qset, STaosQueue *queue, void *ahandle);
+void    taosRemoveFromQset(STaosQset *qset, STaosQueue *queue);
+int32_t taosGetQueueNumber(STaosQset *qset);
 
 int32_t taosReadQitemFromQset(STaosQset *qset, void **ppItem, SQueueInfo *qinfo);
 int32_t taosReadAllQitemsFromQset(STaosQset *qset, STaosQall *qall, SQueueInfo *qinfo);

include/util/tscalablebf.h

@@ -34,7 +34,7 @@ typedef struct SScalableBf {
 
 int32_t tScalableBfInit(uint64_t expectedEntries, double errorRate, SScalableBf** ppSBf);
 int32_t tScalableBfPutNoCheck(SScalableBf* pSBf, const void* keyBuf, uint32_t len);
-int32_t tScalableBfPut(SScalableBf* pSBf, const void* keyBuf, uint32_t len);
+int32_t tScalableBfPut(SScalableBf* pSBf, const void* keyBuf, uint32_t len, int32_t* winRes);
 int32_t tScalableBfNoContain(const SScalableBf* pSBf, const void* keyBuf, uint32_t len);
 void    tScalableBfDestroy(SScalableBf* pSBf);
 int32_t tScalableBfEncode(const SScalableBf* pSBf, SEncoder* pEncoder);

include/util/tsimplehash.h

@@ -17,15 +17,12 @@
 #define TDENGINE_TSIMPLEHASH_H
 
 #include "tarray.h"
+#include "thash.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef uint32_t (*_hash_fn_t)(const char *, uint32_t);
-typedef int32_t (*_equal_fn_t)(const void *, const void *, size_t len);
-typedef void (*_hash_free_fn_t)(void *);
-
 /**
  * @brief single thread hash
  *

include/util/tutil.h

@@ -16,12 +16,10 @@
 #ifndef _TD_UTIL_UTIL_H_
 #define _TD_UTIL_UTIL_H_
 
-#include "os.h"
 #include "tcrc32c.h"
 #include "tdef.h"
 #include "thash.h"
 #include "tmd5.h"
-#include "tutil.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,7 +62,7 @@ static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, size_t inLen, char *tar
   tMD5Init(&context);
   tMD5Update(&context, inBuf, (uint32_t)inLen);
   tMD5Final(&context);
-  memcpy(target, context.digest, tListLen(context.digest));
+  (void)memcpy(target, context.digest, tListLen(context.digest));
 }
 
 static FORCE_INLINE void taosEncryptPass_c(uint8_t *inBuf, size_t len, char *target) {
@@ -75,11 +73,11 @@ static FORCE_INLINE void taosEncryptPass_c(uint8_t *inBuf, size_t len, char *tar
   char buf[TSDB_PASSWORD_LEN + 1];
 
   buf[TSDB_PASSWORD_LEN] = 0;
-  sprintf(buf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0], context.digest[1],
+  (void)sprintf(buf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0], context.digest[1],
           context.digest[2], context.digest[3], context.digest[4], context.digest[5], context.digest[6],
           context.digest[7], context.digest[8], context.digest[9], context.digest[10], context.digest[11],
           context.digest[12], context.digest[13], context.digest[14], context.digest[15]);
-  memcpy(target, buf, TSDB_PASSWORD_LEN);
+  (void)memcpy(target, buf, TSDB_PASSWORD_LEN);
 }
 
 static FORCE_INLINE int32_t taosCreateMD5Hash(char *pBuf, int32_t len) {
@@ -108,10 +106,10 @@ static FORCE_INLINE int32_t taosGetTbHashVal(const char *tbname, int32_t tblen,
     int32_t offset = 0;
     if (prefix < 0) {
       offset = -1 * prefix;
-      strncpy(tbName, tbname, offset);
+      (void)strncpy(tbName, tbname, offset);
     }
     if (suffix < 0) {
-      strncpy(tbName + offset, tbname + tblen + suffix, -1 * suffix);
+      (void)strncpy(tbName + offset, tbname + tblen + suffix, -1 * suffix);
       offset += -1 * suffix;
     }
     return MurmurHash3_32(tbName, offset);
@@ -135,6 +133,8 @@ static FORCE_INLINE int32_t taosGetTbHashVal(const char *tbname, int32_t tblen,
     }                                      \
   } while (0)
 
+#define QUERY_CHECK_CODE TSDB_CHECK_CODE
+
 #define TSDB_CHECK_NULL(ptr, CODE, LINO, LABEL, ERRNO) \
   if ((ptr) == NULL) {                                 \
     (CODE) = (ERRNO);                                  \
@@ -142,23 +142,28 @@ static FORCE_INLINE int32_t taosGetTbHashVal(const char *tbname, int32_t tblen,
     goto LABEL;                                        \
   }
 
+#define QUERY_CHECK_NULL TSDB_CHECK_NULL
+
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 
 #define VND_CHECK_CODE(CODE, LINO, LABEL) TSDB_CHECK_CODE(CODE, LINO, LABEL)
 
 #define TCONTAINER_OF(ptr, type, member) ((type *)((char *)(ptr)-offsetof(type, member)))
 
-#define TAOS_RETURN(code)     \
+#define TAOS_GET_TERRNO(code) \
+ (terrno == 0 ? code : terrno)
+
+#define TAOS_RETURN(CODE)     \
   do {                        \
-    return (terrno = (code)); \
+    return (terrno = (CODE)); \
   } while (0)
 
-#define TAOS_CHECK_RETURN(CMD)       \
-  do {                               \
-    int32_t code = (CMD);            \
-    if (code != TSDB_CODE_SUCCESS) { \
-      TAOS_RETURN(code);             \
-    }                                \
+#define TAOS_CHECK_RETURN(CMD)      \
+  do {                              \
+    int32_t __c = (CMD);            \
+    if (__c != TSDB_CODE_SUCCESS) { \
+      TAOS_RETURN(__c);             \
+    }                               \
   } while (0)
 
 #define TAOS_CHECK_GOTO(CMD, LINO, LABEL) \
@@ -172,6 +177,17 @@ static FORCE_INLINE int32_t taosGetTbHashVal(const char *tbname, int32_t tblen,
     }                                     \
   } while (0)
 
+#define TAOS_CHECK_EXIT(CMD)        \
+  do {                              \
+    code = (CMD);                   \
+    if (code < TSDB_CODE_SUCCESS) { \
+      lino = __LINE__;              \
+      goto _exit;                   \
+    }                               \
+  } while (0)
+
+#define TAOS_UNUSED(expr) (void)(expr)
+
 #ifdef __cplusplus
 }
 #endif

include/util/types.h

@@ -38,7 +38,7 @@ static FORCE_INLINE float taos_align_get_float(const char *pBuf) {
   assert(sizeof(float) == sizeof(uint32_t));
 #endif
   float fv = 0;
-  memcpy(&fv, pBuf, sizeof(fv));  // in ARM, return *((const float*)(pBuf)) may cause problem
+  (void)memcpy(&fv, pBuf, sizeof(fv));  // in ARM, return *((const float*)(pBuf)) may cause problem
   return fv;
 }
 
@@ -49,7 +49,7 @@ static FORCE_INLINE double taos_align_get_double(const char *pBuf) {
   assert(sizeof(double) == sizeof(uint64_t));
 #endif
   double dv = 0;
-  memcpy(&dv, pBuf, sizeof(dv));  // in ARM, return *((const double*)(pBuf)) may cause problem
+  (void)memcpy(&dv, pBuf, sizeof(dv));  // in ARM, return *((const double*)(pBuf)) may cause problem
   return dv;
 }
 

packaging/deb/DEBIAN/postinst

@@ -8,6 +8,7 @@ if command -v sudo > /dev/null; then
     csudo="sudo "
 fi
 
+${csudo}mkdir -p ${insmetaPath}
 ${csudo}chmod -R 744 ${insmetaPath}
 cd ${insmetaPath}
 ${csudo}./post.sh

packaging/deb/DEBIAN/prerm

@@ -20,6 +20,7 @@ if [ -f ${insmetaPath}/preun.sh ]; then
 else
     bin_link_dir="/usr/bin"
     lib_link_dir="/usr/lib"
+    lib64_link_dir="/usr/lib64"
     inc_link_dir="/usr/include"
 
     data_link_dir="/usr/local/taos/data"
@@ -33,15 +34,18 @@ else
     ${csudo}rm -f ${bin_link_dir}/taosadapter       || :
     ${csudo}rm -f ${bin_link_dir}/taosdemo   || :
     ${csudo}rm -f ${bin_link_dir}/taoskeeper   || :
+    ${csudo}rm -f ${bin_link_dir}/taos-explorer   || :
     ${csudo}rm -f ${cfg_link_dir}/*          || :
     ${csudo}rm -f ${inc_link_dir}/taos.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosdef.h     || :
     ${csudo}rm -f ${inc_link_dir}/taoserror.h     || :
     ${csudo}rm -f ${inc_link_dir}/tdef.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :
-    [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h     || :
+    ${csudo}rm -f ${inc_link_dir}/taosws.h     || :    
     ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
-    [ -f ${lib_link_dir}/libtaosws.so ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.so  || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaos.*  || :
+    ${csudo}rm -f ${lib_link_dir}/libtaosws.so  || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaosws.so  || : 
 
     ${csudo}rm -f ${log_link_dir}            || :
     ${csudo}rm -f ${data_link_dir}           || :

packaging/deb/makedeb.sh

@@ -76,11 +76,11 @@ if [ -f "${compile_dir}/test/cfg/taosadapter.service" ]; then
     cp ${compile_dir}/test/cfg/taosadapter.service	${pkg_dir}${install_home_path}/cfg || :
 fi
 
-if [ -f "%{_compiledir}/../../../explorer/target/taos-explorer.service" ]; then
-    cp %{_compiledir}/../../../explorer/target/taos-explorer.service ${pkg_dir}${install_home_path}/cfg || :
+if [ -f "${compile_dir}/../../../explorer/target/taos-explorer.service" ]; then
+    cp ${compile_dir}/../../../explorer/target/taos-explorer.service ${pkg_dir}${install_home_path}/cfg || :
 fi
-if [ -f "%{_compiledir}/../../../explorer/server/example/explorer.toml" ]; then
-    cp %{_compiledir}/../../../explorer/server/example/explorer.toml	${pkg_dir}${install_home_path}/cfg || :
+if [ -f "${compile_dir}/../../../explorer/server/example/explorer.toml" ]; then
+    cp ${compile_dir}/../../../explorer/server/example/explorer.toml	${pkg_dir}${install_home_path}/cfg || :
 fi
 
 cp ${taoskeeper_binary}                      ${pkg_dir}${install_home_path}/bin
@@ -90,6 +90,11 @@ cp ${compile_dir}/../packaging/tools/preun.sh       ${pkg_dir}${install_home_pat
 cp ${compile_dir}/../packaging/tools/startPre.sh    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/../packaging/tools/set_core.sh    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/../packaging/tools/taosd-dump-cfg.gdb    ${pkg_dir}${install_home_path}/bin
+cp ${top_dir}/../enterprise/packaging/start-all.sh  ${pkg_dir}${install_home_path}/bin
+cp ${top_dir}/../enterprise/packaging/stop-all.sh  ${pkg_dir}${install_home_path}/bin
+sed -i "s/versionType=\"enterprise\"/versionType=\"community\"/g" ${pkg_dir}${install_home_path}/bin/start-all.sh
+sed -i "s/versionType=\"enterprise\"/versionType=\"community\"/g" ${pkg_dir}${install_home_path}/bin/stop-all.sh
+
 
 cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/udfd                   ${pkg_dir}${install_home_path}/bin

packaging/rpm/makerpm.sh

@@ -70,8 +70,8 @@ else
 fi
 
 cd ${top_dir}
-echo "${top_dir}/../enterprise/packaging/build_taoskeeper.sh -r ${arch} -e taoskeeper"
-taoskeeper_binary=`${top_dir}/../enterprise/packaging/build_taoskeeper.sh -r $arch -e taoskeeper`
+echo "${top_dir}/../enterprise/packaging/build_taoskeeper.sh -r ${arch} -e taoskeeper -t ver-${tdengine_ver}"
+taoskeeper_binary=`${top_dir}/../enterprise/packaging/build_taoskeeper.sh -r $arch -e taoskeeper -t ver-${tdengine_ver}`
 echo "taoskeeper_binary: ${taoskeeper_binary}"
 cd ${package_dir}
 

packaging/rpm/tdengine.spec

@@ -56,6 +56,10 @@ mkdir -p %{buildroot}%{homepath}/include
 #mkdir -p %{buildroot}%{homepath}/init.d
 mkdir -p %{buildroot}%{homepath}/script
 
+if [ -f %{_compiledir}/../packaging/cfg/taosd.service ]; then
+    cp %{_compiledir}/../packaging/cfg/taosd.service %{buildroot}%{homepath}/cfg
+fi
+
 cp %{_compiledir}/../packaging/cfg/taos.cfg         %{buildroot}%{homepath}/cfg
 if [ -f %{_compiledir}/test/cfg/taosadapter.toml ]; then
     cp %{_compiledir}/test/cfg/taosadapter.toml         %{buildroot}%{homepath}/cfg
@@ -91,6 +95,10 @@ cp %{_compiledir}/build/bin/taosd                   %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/udfd                    %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosBenchmark           %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosdump                %{buildroot}%{homepath}/bin
+cp %{_compiledir}/../../enterprise/packaging/start-all.sh  %{buildroot}%{homepath}/bin
+cp %{_compiledir}/../../enterprise/packaging/stop-all.sh  %{buildroot}%{homepath}/bin
+sed -i "s/versionType=\"enterprise\"/versionType=\"community\"/g" %{buildroot}%{homepath}/bin/start-all.sh
+sed -i "s/versionType=\"enterprise\"/versionType=\"community\"/g" %{buildroot}%{homepath}/bin/stop-all.sh
 
 if [ -f %{_compiledir}/../../../explorer/target/release/taos-explorer ]; then
     cp %{_compiledir}/../../../explorer/target/release/taos-explorer %{buildroot}%{homepath}/bin
@@ -215,6 +223,7 @@ if [ $1 -eq 0 ];then
   else
     bin_link_dir="/usr/bin"
     lib_link_dir="/usr/lib"
+    lib64_link_dir="/usr/lib64"
     inc_link_dir="/usr/include"
 
     data_link_dir="/usr/local/taos/data"
@@ -227,13 +236,18 @@ if [ $1 -eq 0 ];then
     ${csudo}rm -f ${bin_link_dir}/udfd       || :
     ${csudo}rm -f ${bin_link_dir}/taosadapter       || :
     ${csudo}rm -f ${bin_link_dir}/taoskeeper       || :
+    ${csudo}rm -f ${bin_link_dir}/taosdump       || :
+    ${csudo}rm -f ${bin_link_dir}/taosBenchmark       || :
     ${csudo}rm -f ${cfg_link_dir}/*          || :
     ${csudo}rm -f ${inc_link_dir}/taos.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosdef.h     || :
     ${csudo}rm -f ${inc_link_dir}/taoserror.h     || :
     ${csudo}rm -f ${inc_link_dir}/tdef.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :  
-    ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
+    ${csudo}rm -f ${inc_link_dir}/taows.h     || :    
+    ${csudo}rm -f ${lib_link_dir}/libtaos.so  || :
+    ${csudo}rm -f ${lib_link_dir}/libtaosws.so  || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaosws.so  || :
 
     ${csudo}rm -f ${log_link_dir}            || :
     ${csudo}rm -f ${data_link_dir}           || :

packaging/tools/install.sh

@@ -156,7 +156,7 @@ done
 
 #echo "verType=${verType} interactiveFqdn=${interactiveFqdn}"
 
-tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} remove.sh udfd set_core.sh TDinsight.sh start_pre.sh)
+tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} remove.sh udfd set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh)
 if [ "${verMode}" == "cluster" ]; then
   services=(${serverName} ${adapterName} ${xname} ${explorerName} ${keeperName})
 elif [ "${verMode}" == "edge" ]; then
@@ -221,6 +221,8 @@ function install_bin() {
     ${csudo}cp -r ${script_dir}/bin/remove.sh ${install_main_dir}/bin
   else
     ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin
+    ${csudo}cp ${script_dir}/start-all.sh ${install_main_dir}/bin
+    ${csudo}cp ${script_dir}/stop-all.sh ${install_main_dir}/bin
   fi
 
   if [[ "${verMode}" == "cluster" && "${verType}" != "client" ]]; then
@@ -576,7 +578,9 @@ function install_taosd_config() {
     ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$serverFqdn/" ${script_dir}/cfg/${configFile}
     ${csudo}echo "monitor 1" >>${script_dir}/cfg/${configFile}
     ${csudo}echo "monitorFQDN ${serverFqdn}" >>${script_dir}/cfg/${configFile}
-    ${csudo}echo "audit 1" >>${script_dir}/cfg/${configFile}
+    if [ "$verMode" == "cluster" ]; then
+      ${csudo}echo "audit 1" >>${script_dir}/cfg/${configFile}  
+    fi
     
     if [ -f "${configDir}/${configFile}" ]; then
       ${csudo}cp ${fileName} ${configDir}/${configFile}.new
@@ -594,6 +598,7 @@ function install_config() {
   [ ! -z $1 ] && return 0 || : # only install client
 
   if ((${update_flag} == 1)); then
+    install_taosd_config
     return 0
   fi
 
@@ -652,8 +657,6 @@ function install_data() {
 function install_connector() {
   if [ -d "${script_dir}/connector/" ]; then
     ${csudo}cp -rf ${script_dir}/connector/ ${install_main_dir}/ || echo "failed to copy connector"    
-    ${csudo}cp ${script_dir}/start-all.sh ${install_main_dir}/ || echo "failed to copy start-all.sh"
-    ${csudo}cp ${script_dir}/stop-all.sh ${install_main_dir}/ || echo "failed to copy stop-all.sh"
     ${csudo}cp ${script_dir}/README.md ${install_main_dir}/ || echo "failed to copy README.md"
   fi
 }
@@ -911,38 +914,35 @@ function updateProduct() {
     echo -e "${GREEN_DARK}To configure ${productName} ${NC}\t\t: edit ${configDir}/${configFile}"
     [ -f ${configDir}/${adapterName}.toml ] && [ -f ${installDir}/bin/${adapterName} ] &&
       echo -e "${GREEN_DARK}To configure ${adapterName} ${NC}\t: edit ${configDir}/${adapterName}.toml"    
-    if [ "$verMode" == "cluster" ]; then
-      echo -e "${GREEN_DARK}To configure ${explorerName} ${NC}\t: edit ${configDir}/explorer.toml"
-    fi
+    echo -e "${GREEN_DARK}To configure ${explorerName} ${NC}\t: edit ${configDir}/explorer.toml"
     if ((${service_mod} == 0)); then
-      echo -e "${GREEN_DARK}To start ${productName}     ${NC}\t\t: ${csudo}systemctl start ${serverName}${NC}"
+      echo -e "${GREEN_DARK}To start ${productName} server     ${NC}\t: ${csudo}systemctl start ${serverName}${NC}"
       [ -f ${service_config_dir}/${clientName}adapter.service ] && [ -f ${installDir}/bin/${clientName}adapter ] &&
         echo -e "${GREEN_DARK}To start ${clientName}Adapter ${NC}\t\t: ${csudo}systemctl start ${clientName}adapter ${NC}"
     elif ((${service_mod} == 1)); then
-      echo -e "${GREEN_DARK}To start ${productName}     ${NC}\t\t: ${csudo}service ${serverName} start${NC}"
+      echo -e "${GREEN_DARK}To start ${productName} server     ${NC}\t: ${csudo}service ${serverName} start${NC}"
       [ -f ${service_config_dir}/${clientName}adapter.service ] && [ -f ${installDir}/bin/${clientName}adapter ] &&
         echo -e "${GREEN_DARK}To start ${clientName}Adapter ${NC}\t\t: ${csudo}service ${clientName}adapter start${NC}"
     else
-      echo -e "${GREEN_DARK}To start ${productName}     ${NC}\t\t: ./${serverName}${NC}"
+      echo -e "${GREEN_DARK}To start ${productName} server     ${NC}\t: ./${serverName}${NC}"
       [ -f ${installDir}/bin/${clientName}adapter ] &&
         echo -e "${GREEN_DARK}To start ${clientName}Adapter ${NC}\t\t: ${clientName}adapter ${NC}"
     fi
 
-    echo -e "${GREEN_DARK}To enable ${clientName}keeper ${NC}\t\t: sudo systemctl enable ${clientName}keeper ${NC}"
+    echo -e "${GREEN_DARK}To start ${clientName}keeper ${NC}\t\t: sudo systemctl start ${clientName}keeper ${NC}"
     if [ "$verMode" == "cluster" ]; then
       echo -e "${GREEN_DARK}To start ${clientName}x ${NC}\t\t\t: sudo systemctl start ${clientName}x ${NC}"      
-      echo -e "${GREEN_DARK}To start ${clientName}-explorer ${NC}\t\t: sudo systemctl start ${clientName}-explorer ${NC}"
     fi
+    echo -e "${GREEN_DARK}To start ${clientName}-explorer ${NC}\t\t: sudo systemctl start ${clientName}-explorer ${NC}"
 
     echo
     echo "${productName} is updated successfully!"
     echo
+    
+    echo -e "\033[44;32;1mTo start all the components                 : sudo start-all.sh${NC}"
+    echo -e "\033[44;32;1mTo access ${productName} Commnd Line Interface    : ${clientName} -h $serverFqdn${NC}"
+    echo -e "\033[44;32;1mTo access ${productName} Graphic User Interface   : http://$serverFqdn:6060${NC}"
     if [ "$verMode" == "cluster" ]; then
-      echo -e "\033[44;32;1mTo start all the components       : ./start-all.sh${NC}"
-    fi
-    echo -e "\033[44;32;1mTo access ${productName}                : ${clientName} -h $serverFqdn${NC}"
-    if [ "$verMode" == "cluster" ]; then
-      echo -e "\033[44;32;1mTo access the management system   : http://$serverFqdn:6060${NC}"
       echo -e "\033[44;32;1mTo read the user manual           : http://$serverFqdn:6060/docs${NC}"
     fi
   else
@@ -1007,39 +1007,36 @@ function installProduct() {
     echo -e "${GREEN_DARK}To configure ${productName} ${NC}\t\t: edit ${configDir}/${configFile}"
     [ -f ${configDir}/${clientName}adapter.toml ] && [ -f ${installDir}/bin/${clientName}adapter ] &&
       echo -e "${GREEN_DARK}To configure ${clientName}Adapter ${NC}\t: edit ${configDir}/${clientName}adapter.toml"
-    if [ "$verMode" == "cluster" ]; then
-      echo -e "${GREEN_DARK}To configure ${clientName}-explorer ${NC}\t: edit ${configDir}/explorer.toml"
-    fi
+    echo -e "${GREEN_DARK}To configure ${clientName}-explorer ${NC}\t: edit ${configDir}/explorer.toml"
     if ((${service_mod} == 0)); then
-      echo -e "${GREEN_DARK}To start ${productName}     ${NC}\t\t: ${csudo}systemctl start ${serverName}${NC}"
+      echo -e "${GREEN_DARK}To start ${productName} server    ${NC}\t: ${csudo}systemctl start ${serverName}${NC}"
       [ -f ${service_config_dir}/${clientName}adapter.service ] && [ -f ${installDir}/bin/${clientName}adapter ] &&
         echo -e "${GREEN_DARK}To start ${clientName}Adapter ${NC}\t\t: ${csudo}systemctl start ${clientName}adapter ${NC}"
     elif ((${service_mod} == 1)); then
-      echo -e "${GREEN_DARK}To start ${productName}     ${NC}\t\t: ${csudo}service ${serverName} start${NC}"
+      echo -e "${GREEN_DARK}To start ${productName} server     ${NC}\t: ${csudo}service ${serverName} start${NC}"
       [ -f ${service_config_dir}/${clientName}adapter.service ] && [ -f ${installDir}/bin/${clientName}adapter ] &&
         echo -e "${GREEN_DARK}To start ${clientName}Adapter ${NC}\t\t: ${csudo}service ${clientName}adapter start${NC}"
     else
-      echo -e "${GREEN_DARK}To start ${productName}     ${NC}\t\t: ${serverName}${NC}"
+      echo -e "${GREEN_DARK}To start ${productName} server     ${NC}\t: ${serverName}${NC}"
       [ -f ${installDir}/bin/${clientName}adapter ] &&
         echo -e "${GREEN_DARK}To start ${clientName}Adapter ${NC}\t\t: ${clientName}adapter ${NC}"
     fi
 
-    echo -e "${GREEN_DARK}To enable ${clientName}keeper ${NC}\t\t: sudo systemctl enable ${clientName}keeper ${NC}"
+    echo -e "${GREEN_DARK}To start ${clientName}keeper ${NC}\t\t: sudo systemctl start ${clientName}keeper ${NC}"
 
     if [ "$verMode" == "cluster" ]; then
       echo -e "${GREEN_DARK}To start ${clientName}x ${NC}\t\t\t: sudo systemctl start ${clientName}x ${NC}"
-      echo -e "${GREEN_DARK}To start ${clientName}-explorer ${NC}\t\t: sudo systemctl start ${clientName}-explorer ${NC}"
     fi
+    echo -e "${GREEN_DARK}To start ${clientName}-explorer ${NC}\t\t: sudo systemctl start ${clientName}-explorer ${NC}"
 
     echo
     echo "${productName} is installed successfully!"
     echo
+    
+    echo -e "\033[44;32;1mTo start all the components                 : sudo start-all.sh${NC}"
+    echo -e "\033[44;32;1mTo access ${productName} Commnd Line Interface    : ${clientName} -h $serverFqdn${NC}"
+    echo -e "\033[44;32;1mTo access ${productName} Graphic User Interface   : http://$serverFqdn:6060${NC}"
     if [ "$verMode" == "cluster" ]; then
-      echo -e "\033[44;32;1mTo start all the components       : sudo ./start-all.sh${NC}"
-    fi
-    echo -e "\033[44;32;1mTo access ${productName}                : ${clientName} -h $serverFqdn${NC}"
-    if [ "$verMode" == "cluster" ]; then
-      echo -e "\033[44;32;1mTo access the management system   : http://$serverFqdn:6060${NC}"
       echo -e "\033[44;32;1mTo read the user manual           : http://$serverFqdn:6060/docs-en${NC}"
     fi
     echo

packaging/tools/makepkg.sh

@@ -232,7 +232,7 @@ fi
 
 if [ "$verMode" == "cluster" ]; then
   sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >>remove_temp.sh
-  sed -i "s/PREFIX=\"taos\"/PREFIX=\"${serverName2}\"/g" remove_temp.sh  
+  sed -i "s/PREFIX=\"taos\"/PREFIX=\"${clientName2}\"/g" remove_temp.sh  
   sed -i "s/productName=\"TDengine\"/productName=\"${productName2}\"/g" remove_temp.sh  
   mv remove_temp.sh ${install_dir}/bin/remove.sh
 fi

packaging/tools/post.sh

@@ -104,6 +104,8 @@ fi
 
 function log_print(){
   now=$(date +"%D %T")
+  ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
+  ${csudo} touch ${install_log_path}
   echo "$now  $1" >> ${install_log_path}
 }
 
@@ -235,11 +237,14 @@ function install_bin() {
     ${csudo}rm -f ${bin_link_dir}/taosadapter     || :
     ${csudo}rm -f ${bin_link_dir}/taosBenchmark || :
     ${csudo}rm -f ${bin_link_dir}/taoskeeper || :
+    ${csudo}rm -f ${bin_link_dir}/taos-explorer || :
     ${csudo}rm -f ${bin_link_dir}/taosdemo || :
     ${csudo}rm -f ${bin_link_dir}/taosdump || :
     ${csudo}rm -f ${bin_link_dir}/rmtaos   || :
     ${csudo}rm -f ${bin_link_dir}/set_core || :
     ${csudo}rm -f ${bin_link_dir}/*explorer || :
+    ${csudo}rm -f ${bin_link_dir}/start-all.sh || :
+    ${csudo}rm -f ${bin_link_dir}/stop-all.sh || :
 
     ${csudo}chmod 0555 ${bin_dir}/*
 
@@ -275,8 +280,14 @@ function install_bin() {
     if [ -x ${bin_dir}/taoskeeper ]; then
       ${csudo}ln -sf ${bin_dir}/taoskeeper ${bin_link_dir}/taoskeeper        2>>${install_log_path} || return 1
     fi
-    if [ -x ${bin_dir}/*explorer ]; then
-      ${csudo}ln -s ${bin_dir}/*explorer ${bin_link_dir}/*explorer           2>>${install_log_path} || return 1
+    if [ -x ${bin_dir}/taos-explorer ]; then
+      ${csudo}ln -s ${bin_dir}/taos-explorer ${bin_link_dir}/taos-explorer           2>>${install_log_path} || return 1
+    fi
+    if [ -x ${bin_dir}/start-all.sh ]; then
+      ${csudo}ln -s ${bin_dir}/start-all.sh ${bin_link_dir}/start-all.sh           2>>${install_log_path} || return 1
+    fi
+    if [ -x ${bin_dir}/stop-all.sh ]; then
+      ${csudo}ln -s ${bin_dir}/stop-all.sh ${bin_link_dir}/stop-all.sh           2>>${install_log_path} || return 1
     fi
     log_print "install bin success"
 }
@@ -474,6 +485,22 @@ function install_taoskeeper_config() {
         ${csudo}ln -s ${cfg_install_dir}/taoskeeper.toml ${cfg_dir}
 }
 
+function install_taos-explorer_config() {
+    if [ ! -f "${cfg_install_dir}/explorer.toml" ]; then
+        [ ! -d ${cfg_install_dir} ] &&
+            ${csudo}${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${cfg_dir}/explorer.toml ] && ${csudo}cp ${cfg_dir}/explorer.toml ${cfg_install_dir}
+        [ -f ${cfg_install_dir}/explorer.toml ] &&
+            ${csudo}chmod 644 ${cfg_install_dir}/explorer.toml
+    fi
+
+    [ -f ${cfg_dir}/explorer.toml ] &&
+      ${csudo}mv ${cfg_dir}/explorer.toml ${cfg_dir}/explorer.toml.new
+
+    [ -f ${cfg_install_dir}/explorer.toml ] &&
+      ${csudo}ln -s ${cfg_install_dir}/explorer.toml ${cfg_dir}
+}
+
 function install_config() {
     log_print "start install config from ${cfg_dir} to ${cfg_install_dir}"
     if [ ! -f "${cfg_install_dir}/taos.cfg" ]; then
@@ -610,29 +637,11 @@ function clean_service_on_systemd() {
 function install_service_on_systemd() {
     clean_service_on_systemd
     
-    taosd_service_config="${service_config_dir}/taosd.service"
+    [ -f ${script_dir}/../cfg/taosd.service ] &&\
+        ${csudo}cp ${script_dir}/../cfg/taosd.service \
+        ${service_config_dir}/ || :
 
-    ${csudo}bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
-    ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
-    ${csudo}bash -c "echo '[Service]'                          >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'ExecStartPre=/usr/local/taos/bin/startPre.sh'           >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'TimeoutStartSec=0'                  >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'StandardOutput=null'                >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'Restart=always'                     >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'StartLimitBurst=3'                  >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'StartLimitInterval=60s'             >> ${taosd_service_config}"
-    ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
-    ${csudo}bash -c "echo '[Install]'                          >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
+    ${csudo}systemctl daemon-reload    
     ${csudo}systemctl enable taosd
 }
 
@@ -652,6 +661,11 @@ function install_service_on_launchctl() {
     ${csudo}cp ${install_main_dir}/service/com.taosdata.taoskeeper.plist /Library/LaunchDaemons/com.taosdata.taoskeeper.plist || :
     ${csudo}launchctl load -w /Library/LaunchDaemons/com.taosdata.taoskeeper.plist || :
   fi
+  if [ -f ${install_main_dir}/service/com.taosdata.taos-explorer.plist ]; then
+    ${csudo}launchctl unload -w /Library/LaunchDaemons/com.taosdata.taos-explorer.plist > /dev/null 2>&1 || :
+    ${csudo}cp ${install_main_dir}/service/com.taosdata.taos-explorer.plist /Library/LaunchDaemons/com.taosdata.taos-explorer.plist || :
+    ${csudo}launchctl load -w /Library/LaunchDaemons/com.taosdata.taos-explorer.plist || :
+  fi
 }
 
 function install_taosadapter_service() {
@@ -672,6 +686,15 @@ function install_taoskeeper_service() {
     fi
 }
 
+function install_taos-explorer_service() {
+    if ((${service_mod}==0)); then
+        [ -f ${script_dir}/../cfg/taos-explorer.service ] &&\
+            ${csudo}cp ${script_dir}/../cfg/taos-explorer.service \
+            ${service_config_dir}/ || :
+        ${csudo}systemctl daemon-reload
+    fi
+}
+
 function install_service() {
   log_print "start install service"
   if [ "$osType" != "Darwin" ]; then
@@ -748,8 +771,10 @@ function install_TDengine() {
     install_config
     install_taosadapter_config
     install_taoskeeper_config
+    install_taos-explorer_config
     install_taosadapter_service
     install_taoskeeper_service
+    install_taos-explorer_service
     install_service
     install_app
 
@@ -757,40 +782,38 @@ function install_TDengine() {
     #echo
     #echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
     echo
-    echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
+    echo -e "${GREEN_DARK}To configure TDengine      ${NC}\t: edit /etc/taos/taos.cfg"
+    echo -e "${GREEN_DARK}To configure taosAdapter   ${NC}\t: edit /etc/taos/taosadapter.toml"
+    echo -e "${GREEN_DARK}To configure taos-explorer ${NC}\t: edit /etc/taos/explorer.toml"    
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo}systemctl start taosd${NC}"
+        echo -e "${GREEN_DARK}To start TDengine server      ${NC}\t: ${csudo}systemctl start taosd${NC}"
+        echo -e "${GREEN_DARK}To start taosAdapter      ${NC}\t: ${csudo}systemctl start taosadapter${NC}"
+        echo -e "${GREEN_DARK}To start taoskeeper      ${NC}\t: ${csudo}systemctl start taoskeeper${NC}"
+        echo -e "${GREEN_DARK}To start taos-explorer      ${NC}\t: ${csudo}systemctl start taos-explorer${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo}update-rc.d taosd default  ${RED} for the first time${NC}"
+        echo -e "${GREEN_DARK}To start TDengine server      ${NC}\t: ${csudo}update-rc.d taosd default  ${RED} for the first time${NC}"
         echo -e "                      : ${csudo}service taosd start ${RED} after${NC}"
+        echo -e "${GREEN_DARK}To start taosAdapter      ${NC}\t: ${csudo}update-rc.d taosadapter default  ${RED} for the first time${NC}"
+        echo -e "                      : ${csudo}service taosd taosadapter ${RED} after${NC}"
+        echo -e "${GREEN_DARK}To start taoskeeper      ${NC}\t: ${csudo}update-rc.d taoskeeper default  ${RED} for the first time${NC}"
+        echo -e "                      : ${csudo}service taosd taoskeeper ${RED} after${NC}"
+        echo -e "${GREEN_DARK}To start taos-explorer      ${NC}\t: ${csudo}update-rc.d taos-explorer default  ${RED} for the first time${NC}"
+        echo -e "                      : ${csudo}service taosd taos-explorer ${RED} after${NC}"
     else
-        echo -e "${GREEN_DARK}To start TDengine     ${NC}: ./taosd${NC}"
+        echo -e "${GREEN_DARK}To start TDengine server     ${NC}\t: ./taosd${NC}"
+        echo -e "${GREEN_DARK}To start taosAdapter     ${NC}\t: ./taosadapter${NC}"
+        echo -e "${GREEN_DARK}To start taoskeeper     ${NC}\t: ./taoskeeper${NC}"
+        echo -e "${GREEN_DARK}To start taos-explorer     ${NC}\t: ./taos-explorer${NC}"
     fi
     
-
-
-    if [ ! -z "$firstEp" ]; then
-      tmpFqdn=${firstEp%%:*}
-      substr=":"
-      if [[ $firstEp =~ $substr ]];then
-        tmpPort=${firstEp#*:}
-      else
-        tmpPort=""
-      fi
-      if [[ "$tmpPort" != "" ]];then
-           echo -e "${GREEN_DARK}To access TDengine    ${NC}: taos -h $tmpFqdn -P $tmpPort${GREEN_DARK} to login into cluster, then${NC}"
-      else
-          echo -e "${GREEN_DARK}To access TDengine    ${NC}: taos -h $tmpFqdn${GREEN_DARK} to login into cluster, then${NC}"
-      fi
-      echo -e "${GREEN_DARK}execute ${NC}: create dnode 'newDnodeFQDN:port'; ${GREEN_DARK}to add this new node${NC}"
-      echo
-    elif [ ! -z "$serverFqdn" ]; then
-      echo -e "${GREEN_DARK}To access TDengine    ${NC}: taos -h $serverFqdn${GREEN_DARK} to login into TDengine server${NC}"
-      echo
-    fi
     log_print "install TDengine successfully!"
     echo
-    echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
+    echo "TDengine is installed successfully!"
+    echo
+    echo -e "\033[44;32;1mTo start all the components         : sudo start-all.sh${NC}"
+    echo -e "\033[44;32;1mTo access ${productName} Commnd Line Interface    : taos -h $serverFqdn${NC}"
+    echo -e "\033[44;32;1mTo access ${productName} Graphic User Interface   : http://$serverFqdn:6060${NC}"
+
 }
 
 

packaging/tools/remove.sh

@@ -12,6 +12,8 @@ RED='\033[0;31m'
 GREEN='\033[1;32m'
 NC='\033[0m'
 
+PREFIX="taos"
+
 if [ "$osType" != "Darwin" ]; then
   installDir="/usr/local/taos"
   bin_link_dir="/usr/bin"
@@ -31,41 +33,31 @@ else
   lib64_link_dir="/usr/local/lib"
   inc_link_dir="/usr/local/include"
 fi
-serverName="taosd"
-clientName="taos"
-uninstallScript="rmtaos"
+
+serverName="${PREFIX}d"
+clientName="${PREFIX}"
+uninstallScript="rm${PREFIX}"
+adapterName="${PREFIX}adapter"
+demoName="${PREFIX}demo"
+benchmarkName="${PREFIX}Benchmark"
+dumpName="${PREFIX}dump"
+keeperName="${PREFIX}keeper"
+xName="${PREFIX}x"
+explorerName="${PREFIX}-explorer"
+tarbitratorName="tarbitratord"
 productName="TDengine"
 
-serverName2="taosd"
-clientName2="taos"
-productName2="TDengine"
-
-adapterName2="${clientName2}adapter"
-demoName2="${clientName2}demo"
-benchmarkName2="${clientName2}Benchmark"
-dumpName2="${clientName2}dump"
-keeperName2="${clientName2}keeper"
-xName2="${clientName2}x"
-explorerName2="${clientName2}-explorer"
-uninstallScript2="rm${clientName2}"
-
-installDir="/usr/local/${clientName2}"
-
 #install main path
 install_main_dir=${installDir}
 data_link_dir=${installDir}/data
 log_link_dir=${installDir}/log
 cfg_link_dir=${installDir}/cfg
 local_bin_link_dir="/usr/local/bin"
-
-
 service_config_dir="/etc/systemd/system"
-taos_service_name=${serverName2}
-taosadapter_service_name="${clientName2}adapter"
-tarbitrator_service_name="tarbitratord"
-
-config_dir="/etc/${clientName2}"
+config_dir="/etc/${PREFIX}"
 
+services=(${PREFIX}"d" ${PREFIX}"adapter" ${PREFIX}"x" ${PREFIX}"-explorer" ${PREFIX}"keeper")
+tools=(${PREFIX} ${PREFIX}"Benchmark" ${PREFIX}"dump" ${PREFIX}"demo" udfd set_core.sh TDinsight.sh $uninstallScript start-all.sh stop-all.sh)
 
 csudo=""
 if command -v sudo >/dev/null; then
@@ -92,215 +84,26 @@ else
   service_mod=2
 fi
 
-function kill_taosadapter() {
-  pid=$(ps -ef | grep "${adapterName2}" | grep -v "grep" | awk '{print $2}')
-  if [ -n "$pid" ]; then
-    ${csudo}kill -9 $pid || :
-  fi
-}
-
-function kill_taosd() {
-  pid=$(ps -ef | grep ${serverName2} | grep -v "grep" | awk '{print $2}')
-  if [ -n "$pid" ]; then
-    ${csudo}kill -9 $pid || :
-  fi
-}
-
-function kill_tarbitrator() {
-  pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
-  if [ -n "$pid" ]; then
-    ${csudo}kill -9 $pid || :
-  fi
-}
-
-function clean_bin() {
-  # Remove link
-  ${csudo}rm -f ${bin_link_dir}/${clientName} || :
-  ${csudo}rm -f ${bin_link_dir}/${serverName} || :
-  echo "${serverName} is removed successfully"
-  ${csudo}rm -f ${bin_link_dir}/udfd || :
-  ${csudo}rm -f ${bin_link_dir}/${adapterName2}     || :
-  echo "${adapterName2} is removed successfully"
-  ${csudo}rm -f ${bin_link_dir}/${benchmarkName2}   || :
-  ${csudo}rm -f ${bin_link_dir}/${demoName2}        || :
-  ${csudo}rm -f ${bin_link_dir}/${dumpName2}        || :
-  ${csudo}rm -f ${bin_link_dir}/${uninstallScript}  || :
-  ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
-  ${csudo}rm -f ${bin_link_dir}/set_core || :
-  ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
-  ${csudo}rm -f ${bin_link_dir}/${keeperName2}      || :
-  
-
-  if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
-    ${csudo}rm -f ${bin_link_dir}/${xName2}           || :
-    ${csudo}rm -f ${bin_link_dir}/${explorerName2}    || :
-    ${csudo}rm -f ${bin_link_dir}/${clientName2} || :
-    ${csudo}rm -f ${bin_link_dir}/${benchmarkName2} || :
-    ${csudo}rm -f ${bin_link_dir}/${dumpName2} || :
-    ${csudo}rm -f ${bin_link_dir}/${uninstallScript2} || :
-  fi
-}
-
-function clean_local_bin() {
-  ${csudo}rm -f ${local_bin_link_dir}/${benchmarkName2} || :
-  ${csudo}rm -f ${local_bin_link_dir}/${demoName2}      || :
-}
-
-function clean_lib() {
-  # Remove link
-  ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
-  [ -f ${lib_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.* || :
-
-  ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
-  [ -f ${lib64_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.* || :
-  #${csudo}rm -rf ${v15_java_app_dir}           || :
-  
-}
-
-function clean_header() {
-  # Remove link
-  ${csudo}rm -f ${inc_link_dir}/taos.h || :
-  ${csudo}rm -f ${inc_link_dir}/taosdef.h || :
-  ${csudo}rm -f ${inc_link_dir}/taoserror.h || :
-  ${csudo}rm -f ${inc_link_dir}/tdef.h || :
-  ${csudo}rm -f ${inc_link_dir}/taosudf.h || :
-
-  [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h || :
-}
-
-function clean_config() {
-  # Remove link
-  ${csudo}rm -f ${cfg_link_dir}/* || :
-}
-
-function clean_log() {
-  # Remove link
-  ${csudo}rm -rf ${log_link_dir} || :
-}
-
-function clean_service_on_systemd() {
-  taosd_service_config="${service_config_dir}/${taos_service_name}.service"
-  if systemctl is-active --quiet ${taos_service_name}; then
-    echo "${taos_service_name} is running, stopping it..."
-    ${csudo}systemctl stop ${taos_service_name} &>/dev/null || echo &>/dev/null
-  fi
-  ${csudo}systemctl disable ${taos_service_name} &>/dev/null || echo &>/dev/null
-  ${csudo}rm -f ${taosd_service_config}
-
-  taosadapter_service_config="${service_config_dir}/${clientName2}adapter.service"
-  if systemctl is-active --quiet ${taosadapter_service_name}; then
-    echo "${clientName2}Adapter is running, stopping it..."
-    ${csudo}systemctl stop ${taosadapter_service_name} &>/dev/null || echo &>/dev/null
-  fi
-  ${csudo}systemctl disable ${taosadapter_service_name} &>/dev/null || echo &>/dev/null
-  [ -f ${taosadapter_service_config} ] && ${csudo}rm -f ${taosadapter_service_config}
-
-  tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
-  if systemctl is-active --quiet ${tarbitrator_service_name}; then
-    echo "${productName2} tarbitrator is running, stopping it..."
-    ${csudo}systemctl stop ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
-  fi
-  ${csudo}systemctl disable ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
-  
-}
-
-function clean_service_on_sysvinit() {
-  if ps aux | grep -v grep | grep ${serverName} &>/dev/null; then
-    echo "${serverName2} is running, stopping it..."
-    ${csudo}service ${serverName} stop || :
-  fi
-
-  if ps aux | grep -v grep | grep tarbitrator &>/dev/null; then
-    echo "${productName2} tarbitrator is running, stopping it..."
-    ${csudo}service tarbitratord stop || :
-  fi
-
-  if ((${initd_mod} == 1)); then
-    if [ -e ${service_config_dir}/${serverName} ]; then
-      ${csudo}chkconfig --del ${serverName} || :
-    fi
-    if [ -e ${service_config_dir}/tarbitratord ]; then
-      ${csudo}chkconfig --del tarbitratord || :
-    fi
-  elif ((${initd_mod} == 2)); then
-    if [ -e ${service_config_dir}/${serverName} ]; then
-      ${csudo}insserv -r ${serverName} || :
-    fi
-    if [ -e ${service_config_dir}/tarbitratord ]; then
-      ${csudo}insserv -r tarbitratord || :
-    fi
-  elif ((${initd_mod} == 3)); then
-    if [ -e ${service_config_dir}/${serverName} ]; then
-      ${csudo}update-rc.d -f ${serverName} remove || :
-    fi
-    if [ -e ${service_config_dir}/tarbitratord ]; then
-      ${csudo}update-rc.d -f tarbitratord remove || :
-    fi
-  fi
-
-  ${csudo}rm -f ${service_config_dir}/${serverName} || :
-  ${csudo}rm -f ${service_config_dir}/tarbitratord || :
-
-  if $(which init &>/dev/null); then
-    ${csudo}init q || :
-  fi
-}
-
-function clean_service_on_launchctl() {
-  ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
-  ${csudo}rm /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
-  ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.${clientName2}adapter.plist > /dev/null 2>&1 || :
-  ${csudo}rm /Library/LaunchDaemons/com.taosdata.${clientName2}adapter.plist > /dev/null 2>&1 || :
-}
-
-function clean_service() {
-  if ((${service_mod} == 0)); then
-    clean_service_on_systemd
-  elif ((${service_mod} == 1)); then
-    clean_service_on_sysvinit
-  else
-    if [ "$osType" = "Darwin" ]; then
-      clean_service_on_launchctl
-    fi
-    kill_taosadapter
-    kill_taosd
-    kill_tarbitrator
-  fi
-}
-
-function remove_data_and_config() {
-  data_dir=`grep dataDir /etc/taos/taos.cfg | grep -v '#' | tail -n 1 | awk {'print $2'}`
-  if [ X"$data_dir" == X"" ]; then
-    data_dir="/var/lib/taos"
-  fi
-  log_dir=`grep logDir /etc/taos/taos.cfg | grep -v '#' | tail -n 1 | awk {'print $2'}`
-  if [ X"$log_dir" == X"" ]; then
-    log_dir="/var/log/taos"
-  fi
-  [ -d "${config_dir}" ] && ${csudo}rm -rf ${config_dir}/*
-  [ -d "${data_dir}" ] && ${csudo}rm -rf ${data_dir}/*
-  [ -d "${log_dir}" ] && ${csudo}rm -rf ${log_dir}/*
-}
-
-_kill_service_of() {
+kill_service_of() {
   _service=$1
-  pid=$(ps -ef | grep "$_service" | grep -v "grep" | awk '{print $2}')
+  pid=$(ps -ef | grep $_service | grep -v grep | grep -v $uninstallScript | awk '{print $2}')
   if [ -n "$pid" ]; then
     ${csudo}kill -9 $pid || :
   fi
 }
 
-_clean_service_on_systemd_of() {
+clean_service_on_systemd_of() {
   _service=$1
   _service_config="${service_config_dir}/${_service}.service"
   if systemctl is-active --quiet ${_service}; then
-    echo "taoskeeper is running, stopping it..."
+    echo "${_service} is running, stopping it..."
     ${csudo}systemctl stop ${_service} &>/dev/null || echo &>/dev/null
   fi
   ${csudo}systemctl disable ${_service} &>/dev/null || echo &>/dev/null
   ${csudo}rm -f ${_service_config}
 }
-_clean_service_on_sysvinit_of() {
+
+clean_service_on_sysvinit_of() {
   _service=$1
   if pidof ${_service} &>/dev/null; then
     echo "${_service} is running, stopping it..."
@@ -327,45 +130,99 @@ _clean_service_on_sysvinit_of() {
   fi
 }
 
-_clean_service_of() {
+clean_service_of() {
   _service=$1
   if ((${service_mod} == 0)); then
-    _clean_service_on_systemd_of $_service
+    clean_service_on_systemd_of $_service
   elif ((${service_mod} == 1)); then
-    _clean_service_on_sysvinit_of $_service
+    clean_service_on_sysvinit_of $_service
   else
-    _kill_service_of $_service
+    kill_service_of $_service
   fi
 }
 
-remove_taoskeeper() {
-  # remove taoskeeper bin
-  _clean_service_of taoskeeper
-  [ -e "${bin_link_dir}/taoskeeper" ] && ${csudo}rm -rf ${bin_link_dir}/taoskeeper
-  [ -e "${installDir}/taoskeeper" ] && ${csudo}rm -rf ${installDir}/taoskeeper
-  [ -e "${cfg_link_dir}/metrics.toml" ] || ${csudo}rm -rf ${cfg_link_dir}/metrics.toml
-  echo "taosKeeper is removed successfully!"
-}
-
-function uninstall_taosx() {
-  if [ -f ${installDir}/uninstall.sh ]; then
-    cd ${installDir}
-    bash uninstall.sh
+remove_service_of() {
+  _service=$1
+  clean_service_of ${_service}
+  if [[ -e "${bin_link_dir}/${_service}" || -e "${installDir}/bin/${_service}" || -e "${local_bin_link_dir}/${_service}" ]]; then
+    ${csudo}rm -rf ${bin_link_dir}/${_service}
+    ${csudo}rm -rf ${installDir}/bin/${_service} 
+    ${csudo}rm -rf ${local_bin_link_dir}/${_service}
+    echo "${_service} is removed successfully!"
   fi
 }
 
-if [ "$verMode" == "cluster" ]; then
-  uninstall_taosx
-fi
+remove_tools_of() {
+  _tool=$1
+  kill_service_of ${_tool}
+  [ -e "${bin_link_dir}/${_tool}" ] && ${csudo}rm -rf ${bin_link_dir}/${_tool} || :
+  [ -e "${installDir}/bin/${_tool}" ] && ${csudo}rm -rf ${installDir}/bin/${_tool} || :
+  [ -e "${local_bin_link_dir}/${_tool}" ] && ${csudo}rm -rf ${local_bin_link_dir}/${_tool} || :
+}
 
-remove_taoskeeper
-# Stop service and disable booting start.
-clean_service
-# Remove binary file and links
-clean_bin
-# Remove links of local bin
-clean_local_bin
-# Remove header file.
+remove_bin() {
+  for _service in "${services[@]}"; do
+    remove_service_of ${_service}
+  done
+
+  for _tool in "${tools[@]}"; do    
+    remove_tools_of ${_tool}
+  done
+}
+
+function clean_lib() {
+  # Remove link
+  ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
+  [ -f ${lib_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.* || :
+
+  ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
+  [ -f ${lib64_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.* || :
+  #${csudo}rm -rf ${v15_java_app_dir}           || :
+}
+
+function clean_header() {
+  # Remove link
+  ${csudo}rm -f ${inc_link_dir}/taos.h || :
+  ${csudo}rm -f ${inc_link_dir}/taosdef.h || :
+  ${csudo}rm -f ${inc_link_dir}/taoserror.h || :
+  ${csudo}rm -f ${inc_link_dir}/tdef.h || :
+  ${csudo}rm -f ${inc_link_dir}/taosudf.h || :
+
+  [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h || :
+}
+
+function clean_config() {
+  # Remove link
+  ${csudo}rm -f ${cfg_link_dir}/* || :
+}
+
+function clean_log() {
+  # Remove link
+  ${csudo}rm -rf ${log_link_dir} || :
+}
+
+function clean_service_on_launchctl() {
+  ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
+  ${csudo}rm /Library/LaunchDaemons/com.taosdata.taosd.plist > /dev/null 2>&1 || :
+  ${csudouser}launchctl unload -w /Library/LaunchDaemons/com.taosdata.${clientName2}adapter.plist > /dev/null 2>&1 || :
+  ${csudo}rm /Library/LaunchDaemons/com.taosdata.${clientName2}adapter.plist > /dev/null 2>&1 || :
+}
+
+function remove_data_and_config() {
+  data_dir=`grep dataDir /etc/taos/taos.cfg | grep -v '#' | tail -n 1 | awk {'print $2'}`
+  if [ X"$data_dir" == X"" ]; then
+    data_dir="/var/lib/${PREFIX}"
+  fi
+  log_dir=`grep logDir /etc/taos/taos.cfg | grep -v '#' | tail -n 1 | awk {'print $2'}`
+  if [ X"$log_dir" == X"" ]; then
+    log_dir="/var/log/${PREFIX}"
+  fi  
+  [ -d "${config_dir}" ] && ${csudo}rm -rf ${config_dir}
+  [ -d "${data_dir}" ] && ${csudo}rm -rf ${data_dir}
+  [ -d "${log_dir}" ] && ${csudo}rm -rf ${log_dir}
+}
+
+remove_bin
 clean_header
 # Remove lib file
 clean_lib
@@ -375,8 +232,7 @@ clean_log
 clean_config
 # Remove data link directory
 ${csudo}rm -rf ${data_link_dir} || :
-
-${csudo}rm -rf ${install_main_dir}
+${csudo}rm -rf ${install_main_dir} || :
 if [[ -e /etc/os-release ]]; then
   osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
 else
@@ -394,6 +250,7 @@ elif echo $osinfo | grep -qwi "centos"; then
   ${csudo}rpm -e --noscripts tdengine >/dev/null 2>&1 || :
 fi
 if [ "$osType" = "Darwin" ]; then
+  clean_service_on_launchctl
   ${csudo}rm -rf /Applications/TDengine.app
 fi
 
@@ -411,6 +268,7 @@ if [ X$answer == X"y" ] || [ X$answer == X"Y" ]; then
   fi
 fi
 
+command -v systemctl >/dev/null 2>&1 && ${csudo}systemctl daemon-reload >/dev/null 2>&1 || true 
 echo 
-echo "${productName2} is removed successfully!"
+echo "${productName} is removed successfully!"
 echo

packaging/tools/remove_client.sh

@@ -38,9 +38,10 @@ if command -v sudo > /dev/null; then
 fi
 
 function kill_client() {
-  if [ -n "$(ps aux | grep -v grep | grep ${clientName})" ]; then
-    ${csudo}kill -9 $pid   || :
-  fi
+    pid=$(ps -ef | grep ${clientName2} | grep -v grep | grep -v $uninstallScript2 | awk '{print $2}')
+    if [ -n "$pid" ]; then
+        ${csudo}kill -9 $pid || :
+    fi
 }
 
 function clean_bin() {
@@ -62,10 +63,13 @@ function clean_bin() {
 }
 
 function clean_lib() {
-    # Remove link
-    ${csudo}rm -f ${lib_link_dir}/libtaos.*      || :
-    ${csudo}rm -f ${lib64_link_dir}/libtaos.*    || :
-    #${csudo}rm -rf ${v15_java_app_dir}           || :
+  # Remove link
+  ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
+  [ -f ${lib_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.* || :
+
+  ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
+  [ -f ${lib64_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.* || :
+  #${csudo}rm -rf ${v15_java_app_dir}           || :
 }
 
 function clean_header() {
@@ -75,6 +79,7 @@ function clean_header() {
     ${csudo}rm -f ${inc_link_dir}/taoserror.h      || :
     ${csudo}rm -f ${inc_link_dir}/tdef.h      || :
     ${csudo}rm -f ${inc_link_dir}/taosudf.h      || :    
+    ${csudo}rm -f ${inc_link_dir}/taosws.h      || :
 }
 
 function clean_config() {

source/client/inc/clientInt.h

@@ -310,7 +310,7 @@ void    setResPrecision(SReqResultInfo* pResInfo, int32_t precision);
 int32_t setQueryResultFromRsp(SReqResultInfo* pResultInfo, const SRetrieveTableRsp* pRsp, bool convertUcs4);
 int32_t setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32_t numOfCols, int32_t numOfRows,
                          bool convertUcs4);
-void    setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t numOfCols);
+int32_t setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t numOfCols);
 void    doFreeReqResultInfo(SReqResultInfo* pResInfo);
 int32_t transferTableNameList(const char* tbList, int32_t acctId, char* dbName, SArray** pReq);
 void    syncCatalogFn(SMetaData* pResult, void* param, int32_t code);
@@ -332,8 +332,7 @@ static FORCE_INLINE SReqResultInfo* tmqGetCurResInfo(TAOS_RES* res) {
   return (SReqResultInfo*)&msg->common.resInfo;
 }
 
-SReqResultInfo* tmqGetNextResInfo(TAOS_RES* res, bool convertUcs4);
-
+int32_t tmqGetNextResInfo(TAOS_RES* res, bool convertUcs4, SReqResultInfo** pResInfo);
 static FORCE_INLINE SReqResultInfo* tscGetCurResInfo(TAOS_RES* res) {
   if (TD_RES_QUERY(res)) return &(((SRequestObj*)res)->body.resInfo);
   return tmqGetCurResInfo(res);
@@ -349,15 +348,16 @@ __async_send_cb_fn_t getMsgRspHandle(int32_t msgType);
 
 SMsgSendInfo* buildMsgInfoImpl(SRequestObj* pReqObj);
 
-void*    createTscObj(const char* user, const char* auth, const char* db, int32_t connType, SAppInstInfo* pAppInfo);
+int32_t   createTscObj(const char *user, const char *auth, const char *db, int32_t connType, SAppInstInfo *pAppInfo,
+                      STscObj **p);
 void     destroyTscObj(void* pObj);
 STscObj* acquireTscObj(int64_t rid);
-int32_t  releaseTscObj(int64_t rid);
+void     releaseTscObj(int64_t rid);
 void     destroyAppInst(void* pAppInfo);
 
 uint64_t generateRequestId();
 
-void*        createRequest(uint64_t connId, int32_t type, int64_t reqid);
+int32_t      createRequest(uint64_t connId, int32_t type, int64_t reqid, SRequestObj **pRequest);
 void         destroyRequest(SRequestObj* pRequest);
 SRequestObj* acquireRequest(int64_t rid);
 int32_t      releaseRequest(int64_t rid);
@@ -371,7 +371,7 @@ void  resetConnectDB(STscObj* pTscObj);
 
 int taos_options_imp(TSDB_OPTION option, const char* str);
 
-void* openTransporter(const char* user, const char* auth, int32_t numOfThreads);
+int32_t openTransporter(const char* user, const char* auth, int32_t numOfThreads, void **pDnodeConn);
 void tscStopCrashReport();
 
 typedef struct AsyncArg {
@@ -382,8 +382,8 @@ typedef struct AsyncArg {
 bool persistConnForSpecificMsg(void* parenct, tmsg_t msgType);
 void processMsgFromServer(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet);
 
-STscObj* taos_connect_internal(const char* ip, const char* user, const char* pass, const char* auth, const char* db,
-                               uint16_t port, int connType);
+int32_t taos_connect_internal(const char* ip, const char* user, const char* pass, const char* auth, const char* db,
+                              uint16_t port, int connType, STscObj** pObj);
 
 int32_t parseSql(SRequestObj* pRequest, bool topicQuery, SQuery** pQuery, SStmtCallback* pStmtCb);
 
@@ -396,11 +396,11 @@ void taos_close_internal(void* taos);
 
 // --- heartbeat
 // global, called by mgmt
-int  hbMgrInit();
-void hbMgrCleanUp();
+int32_t hbMgrInit();
+void    hbMgrCleanUp();
 
 // cluster level
-SAppHbMgr* appHbMgrInit(SAppInstInfo* pAppInstInfo, char* key);
+int32_t    appHbMgrInit(SAppInstInfo *pAppInstInfo, char *key, SAppHbMgr **pAppHbMgr);
 void       appHbMgrCleanup(void);
 void       hbRemoveAppHbMrg(SAppHbMgr** pAppHbMgr);
 void       destroyAllRequests(SHashObj* pRequests);
@@ -409,7 +409,7 @@ void       stopAllRequests(SHashObj* pRequests);
 //SAppInstInfo* getAppInstInfo(const char* clusterKey);
 
 // conn level
-int  hbRegisterConn(SAppHbMgr* pAppHbMgr, int64_t tscRefId, int64_t clusterId, int8_t connType);
+int32_t hbRegisterConn(SAppHbMgr* pAppHbMgr, int64_t tscRefId, int64_t clusterId, int8_t connType);
 void hbDeregisterConn(STscObj* pTscObj, SClientHbKey connKey);
 
 typedef struct SSqlCallbackWrapper {
@@ -428,7 +428,7 @@ void    doAsyncQuery(SRequestObj* pRequest, bool forceUpdateMeta);
 int32_t removeMeta(STscObj* pTscObj, SArray* tbList, bool isView);
 int32_t handleAlterTbExecRes(void* res, struct SCatalog* pCatalog);
 int32_t handleCreateTbExecRes(void* res, SCatalog* pCatalog);
-bool    qnodeRequired(SRequestObj* pRequest);
+int32_t qnodeRequired(SRequestObj* pRequest, bool *required);
 void    continueInsertFromCsv(SSqlCallbackWrapper* pWrapper, SRequestObj* pRequest);
 void    destorySqlCallbackWrapper(SSqlCallbackWrapper* pWrapper);
 void    handleQueryAnslyseRes(SSqlCallbackWrapper *pWrapper, SMetaData *pResultMeta, int32_t code);
@@ -444,6 +444,30 @@ void    freeQueryParam(SSyncQueryParam* param);
 int32_t clientParseSqlImpl(void* param, const char* dbName, const char* sql, bool parseOnly, const char* effeciveUser, SParseSqlRes* pRes);
 #endif
 
+#define TSC_ERR_RET(c)                \
+  do {                                \
+    int32_t _code = c;                \
+    if (_code != TSDB_CODE_SUCCESS) { \
+      terrno = _code;                 \
+      return _code;                   \
+    }                                 \
+  } while (0)
+#define TSC_RET(c)                    \
+  do {                                \
+    int32_t _code = c;                \
+    if (_code != TSDB_CODE_SUCCESS) { \
+      terrno = _code;                 \
+    }                                 \
+    return _code;                     \
+  } while (0)
+#define TSC_ERR_JRET(c)              \
+  do {                               \
+    code = c;                        \
+    if (code != TSDB_CODE_SUCCESS) { \
+      terrno = code;                 \
+      goto _return;                  \
+    }                                \
+  } while (0)
 
 void slowQueryLog(int64_t rid, bool killed, int32_t code, int32_t cost);
 

source/client/src/clientEnv.c

@@ -35,6 +35,7 @@
 #include "tsched.h"
 #include "ttime.h"
 #include "tversion.h"
+#include "tcompare.h"
 
 #if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
 #include "cus_name.h"
@@ -43,6 +44,26 @@
 #define TSC_VAR_NOT_RELEASE 1
 #define TSC_VAR_RELEASED    0
 
+#define ENV_JSON_FALSE_CHECK(c)                    \
+  do {                                             \
+    if (!c) {                                      \
+      tscError("faild to add item to JSON object");\
+      code = TSDB_CODE_TSC_FAIL_GENERATE_JSON;     \
+      goto _end;                                   \
+    }                                              \
+  } while (0)
+
+#define ENV_ERR_RET(c,info)           \
+  do {                                \
+    int32_t _code = c;                \
+    if (_code != TSDB_CODE_SUCCESS) { \
+      errno = _code;                  \
+      tscInitRes = _code;             \
+      tscError(info);                 \
+      return;                         \
+    }                                 \
+  } while (0)
+
 STscDbg  tscDbg = {0};
 SAppInfo appInfo;
 int64_t  lastClusterId = 0;
@@ -56,8 +77,14 @@ static TdThreadOnce tscinit = PTHREAD_ONCE_INIT;
 volatile int32_t    tscInitRes = 0;
 
 static int32_t registerRequest(SRequestObj *pRequest, STscObj *pTscObj) {
+  int32_t code = TSDB_CODE_SUCCESS;
   // connection has been released already, abort creating request.
   pRequest->self = taosAddRef(clientReqRefPool, pRequest);
+  if (pRequest->self < 0) {
+    tscError("failed to add ref to request");
+    code = terrno;
+    return code;
+  }
 
   int32_t num = atomic_add_fetch_32(&pTscObj->numOfReqs, 1);
 
@@ -71,19 +98,23 @@ static int32_t registerRequest(SRequestObj *pRequest, STscObj *pTscObj) {
              pRequest->self, pRequest->pTscObj->id, num, currentInst, total, pRequest->requestId);
   }
 
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 static void concatStrings(SArray *list, char* buf, int size){
   int  len = 0;
   for(int i = 0; i < taosArrayGetSize(list); i++){
     char* db = taosArrayGet(list, i);
+    if (NULL == db) {
+      tscError("get dbname failed, buf:%s", buf);
+      break;
+    }
     char* dot = strchr(db, '.');
     if (dot != NULL) {
       db = dot + 1;
     }
     if (i != 0){
-      strcat(buf, ",");
+      (void)strcat(buf, ",");
       len += 1;
     }
     int ret = snprintf(buf + len, size - len, "%s", db);
@@ -99,61 +130,70 @@ static void concatStrings(SArray *list, char* buf, int size){
   }
 }
 
-static void generateWriteSlowLog(STscObj *pTscObj, SRequestObj *pRequest, int32_t reqType, int64_t duration){
+static int32_t generateWriteSlowLog(STscObj *pTscObj, SRequestObj *pRequest, int32_t reqType, int64_t duration){
   cJSON* json = cJSON_CreateObject();
+  int32_t code = TSDB_CODE_SUCCESS;
   if (json == NULL) {
     tscError("[monitor] cJSON_CreateObject failed");
-    return;
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
   char clusterId[32] = {0};
   if (snprintf(clusterId, sizeof(clusterId), "%" PRId64, pTscObj->pAppInfo->clusterId) < 0){
     tscError("failed to generate clusterId:%" PRId64, pTscObj->pAppInfo->clusterId);
+    code = TSDB_CODE_FAILED;
+    goto _end;
   }
 
   char startTs[32] = {0};
   if (snprintf(startTs, sizeof(startTs), "%" PRId64, pRequest->metric.start/1000) < 0){
     tscError("failed to generate startTs:%" PRId64, pRequest->metric.start/1000);
+    code = TSDB_CODE_FAILED;
+    goto _end;
   }
 
   char requestId[32] = {0};
   if (snprintf(requestId, sizeof(requestId), "%" PRIu64, pRequest->requestId) < 0){
     tscError("failed to generate requestId:%" PRIu64, pRequest->requestId);
+    code = TSDB_CODE_FAILED;
+    goto _end;
   }
-  cJSON_AddItemToObject(json, "cluster_id",  cJSON_CreateString(clusterId));
-  cJSON_AddItemToObject(json, "start_ts",    cJSON_CreateString(startTs));
-  cJSON_AddItemToObject(json, "request_id",  cJSON_CreateString(requestId));
-  cJSON_AddItemToObject(json, "query_time",         cJSON_CreateNumber(duration/1000));
-  cJSON_AddItemToObject(json, "code",         cJSON_CreateNumber(pRequest->code));
-  cJSON_AddItemToObject(json, "error_info",   cJSON_CreateString(tstrerror(pRequest->code)));
-  cJSON_AddItemToObject(json, "type",         cJSON_CreateNumber(reqType));
-  cJSON_AddItemToObject(json, "rows_num",     cJSON_CreateNumber(pRequest->body.resInfo.numOfRows + pRequest->body.resInfo.totalRows));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "cluster_id",   cJSON_CreateString(clusterId)));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "start_ts",     cJSON_CreateString(startTs)));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "request_id",   cJSON_CreateString(requestId)));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "query_time",   cJSON_CreateNumber(duration/1000)));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "code",         cJSON_CreateNumber(pRequest->code)));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "error_info",   cJSON_CreateString(tstrerror(pRequest->code))));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "type",         cJSON_CreateNumber(reqType)));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "rows_num",     cJSON_CreateNumber(pRequest->body.resInfo.numOfRows + pRequest->body.resInfo.totalRows)));
   if(pRequest->sqlstr != NULL && strlen(pRequest->sqlstr) > pTscObj->pAppInfo->monitorParas.tsSlowLogMaxLen){
     char tmp = pRequest->sqlstr[pTscObj->pAppInfo->monitorParas.tsSlowLogMaxLen];
     pRequest->sqlstr[pTscObj->pAppInfo->monitorParas.tsSlowLogMaxLen] = '\0';
-    cJSON_AddItemToObject(json, "sql",          cJSON_CreateString(pRequest->sqlstr));
+    ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "sql",        cJSON_CreateString(pRequest->sqlstr)));
     pRequest->sqlstr[pTscObj->pAppInfo->monitorParas.tsSlowLogMaxLen] = tmp;
   }else{
-    cJSON_AddItemToObject(json, "sql",          cJSON_CreateString(pRequest->sqlstr));
+    ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "sql",        cJSON_CreateString(pRequest->sqlstr)));
   }
 
-  cJSON_AddItemToObject(json, "user",         cJSON_CreateString(pTscObj->user));
-  cJSON_AddItemToObject(json, "process_name", cJSON_CreateString(appInfo.appName));
-  cJSON_AddItemToObject(json, "ip",           cJSON_CreateString(tsLocalFqdn));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "user",         cJSON_CreateString(pTscObj->user)));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "process_name", cJSON_CreateString(appInfo.appName)));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "ip",           cJSON_CreateString(tsLocalFqdn)));
 
   char pid[32] = {0};
   if (snprintf(pid, sizeof(pid), "%d", appInfo.pid) < 0){
     tscError("failed to generate pid:%d", appInfo.pid);
+    code = TSDB_CODE_FAILED;
+    goto _end;
   }
 
-  cJSON_AddItemToObject(json, "process_id",   cJSON_CreateString(pid));
+  ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "process_id",   cJSON_CreateString(pid)));
   if(pRequest->dbList != NULL){
     char dbList[1024] = {0};
     concatStrings(pRequest->dbList, dbList, sizeof(dbList) - 1);
-    cJSON_AddItemToObject(json, "db", cJSON_CreateString(dbList));
+    ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "db", cJSON_CreateString(dbList)));
   }else if(pRequest->pDb != NULL){
-    cJSON_AddItemToObject(json, "db", cJSON_CreateString(pRequest->pDb));
+    ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "db", cJSON_CreateString(pRequest->pDb)));
   }else{
-    cJSON_AddItemToObject(json, "db", cJSON_CreateString(""));
+    ENV_JSON_FALSE_CHECK(cJSON_AddItemToObject(json, "db", cJSON_CreateString("")));
   }
 
   char* value = cJSON_PrintUnformatted(json);
@@ -161,11 +201,15 @@ static void generateWriteSlowLog(STscObj *pTscObj, SRequestObj *pRequest, int32_
   data.clusterId = pTscObj->pAppInfo->clusterId;
   data.type = SLOW_LOG_WRITE;
   data.data = value;
-  if(monitorPutData2MonitorQueue(data) < 0){
+  code = monitorPutData2MonitorQueue(data);
+  if (TSDB_CODE_SUCCESS != code) {
     taosMemoryFree(value);
+    goto _end;
   }
 
+_end:
   cJSON_Delete(json);
+  return code;
 }
 
 static bool checkSlowLogExceptDb(SRequestObj *pRequest, char* exceptDb) {
@@ -175,6 +219,10 @@ static bool checkSlowLogExceptDb(SRequestObj *pRequest, char* exceptDb) {
 
   for (int i = 0; i < taosArrayGetSize(pRequest->dbList); i++) {
     char *db = taosArrayGet(pRequest->dbList, i);
+    if (NULL == db) {
+      tscError("get dbname failed, exceptDb:%s", exceptDb);
+      return false;
+    }
     char *dot = strchr(db, '.');
     if (dot != NULL) {
       db = dot + 1;
@@ -214,7 +262,7 @@ static void deregisterRequest(SRequestObj *pRequest) {
                "us, planCost:%" PRId64 "us, exec:%" PRId64 "us",
                duration, pRequest->metric.parseCostUs, pRequest->metric.ctgCostUs, pRequest->metric.analyseCostUs,
                pRequest->metric.planCostUs, pRequest->metric.execCostUs);
-      atomic_add_fetch_64((int64_t *)&pActivity->insertElapsedTime, duration);
+      (void)atomic_add_fetch_64((int64_t *)&pActivity->insertElapsedTime, duration);
       reqType = SLOW_LOG_TYPE_INSERT;
     } else if (QUERY_NODE_SELECT_STMT == pRequest->stmtType) {
       tscDebug("query duration %" PRId64 "us: parseCost:%" PRId64 "us, ctgCost:%" PRId64 "us, analyseCost:%" PRId64
@@ -222,11 +270,13 @@ static void deregisterRequest(SRequestObj *pRequest) {
                duration, pRequest->metric.parseCostUs, pRequest->metric.ctgCostUs, pRequest->metric.analyseCostUs,
                pRequest->metric.planCostUs, pRequest->metric.execCostUs);
 
-      atomic_add_fetch_64((int64_t *)&pActivity->queryElapsedTime, duration);
+      (void)atomic_add_fetch_64((int64_t *)&pActivity->queryElapsedTime, duration);
       reqType = SLOW_LOG_TYPE_QUERY;
     }
 
-    nodesSimReleaseAllocator(pRequest->allocatorRefId);
+    if (TSDB_CODE_SUCCESS != nodesSimReleaseAllocator(pRequest->allocatorRefId)) {
+      tscError("failed to release allocator");
+    }
   }
 
   if(pTscObj->pAppInfo->monitorParas.tsEnableMonitor){
@@ -241,14 +291,16 @@ static void deregisterRequest(SRequestObj *pRequest) {
 
   if ((duration >= pTscObj->pAppInfo->monitorParas.tsSlowLogThreshold * 1000000UL || duration >= pTscObj->pAppInfo->monitorParas.tsSlowLogThresholdTest * 1000000UL) &&
       checkSlowLogExceptDb(pRequest, pTscObj->pAppInfo->monitorParas.tsSlowLogExceptDb)) {
-    atomic_add_fetch_64((int64_t *)&pActivity->numOfSlowQueries, 1);
+    (void)atomic_add_fetch_64((int64_t *)&pActivity->numOfSlowQueries, 1);
     if (pTscObj->pAppInfo->monitorParas.tsSlowLogScope & reqType) {
       taosPrintSlowLog("PID:%d, Conn:%u, QID:0x%" PRIx64 ", Start:%" PRId64 " us, Duration:%" PRId64 "us, SQL:%s",
                        taosGetPId(), pTscObj->connId, pRequest->requestId, pRequest->metric.start, duration,
                        pRequest->sqlstr);
       if(pTscObj->pAppInfo->monitorParas.tsEnableMonitor){
         slowQueryLog(pTscObj->id, pRequest->killed, pRequest->code, duration);
-        generateWriteSlowLog(pTscObj, pRequest, reqType, duration);
+        if (TSDB_CODE_SUCCESS != generateWriteSlowLog(pTscObj, pRequest, reqType, duration)) {
+          tscError("failed to generate write slow log");
+        }
       }
     }
   }
@@ -288,9 +340,9 @@ static bool clientRpcTfp(int32_t code, tmsg_t msgType) {
 }
 
 // TODO refactor
-void *openTransporter(const char *user, const char *auth, int32_t numOfThread) {
+int32_t openTransporter(const char *user, const char *auth, int32_t numOfThread, void **pDnodeConn) {
   SRpcInit rpcInit;
-  memset(&rpcInit, 0, sizeof(rpcInit));
+  (void)memset(&rpcInit, 0, sizeof(rpcInit));
   rpcInit.localPort = 0;
   rpcInit.label = "TSC";
   rpcInit.numOfThreads = tsNumOfRpcThreads;
@@ -314,15 +366,19 @@ void *openTransporter(const char *user, const char *auth, int32_t numOfThread) {
   rpcInit.connLimitNum = connLimitNum;
   rpcInit.timeToGetConn = tsTimeToGetAvailableConn;
 
-  taosVersionStrToInt(version, &(rpcInit.compatibilityVer));
-
-  void *pDnodeConn = rpcOpen(&rpcInit);
-  if (pDnodeConn == NULL) {
-    tscError("failed to init connection to server");
-    return NULL;
+  int32_t code = taosVersionStrToInt(version, &(rpcInit.compatibilityVer));
+  if (TSDB_CODE_SUCCESS != code) {
+    tscError("invalid version string.");
+    return code;
   }
 
-  return pDnodeConn;
+  *pDnodeConn = rpcOpen(&rpcInit);
+  if (*pDnodeConn == NULL) {
+    tscError("failed to init connection to server.");
+    code = TSDB_CODE_FAILED;
+  }
+
+  return code;
 }
 
 void destroyAllRequests(SHashObj *pRequests) {
@@ -333,7 +389,7 @@ void destroyAllRequests(SHashObj *pRequests) {
     SRequestObj *pRequest = acquireRequest(*rid);
     if (pRequest) {
       destroyRequest(pRequest);
-      releaseRequest(*rid);
+      (void)releaseRequest(*rid); // ignore error
     }
 
     pIter = taosHashIterate(pRequests, pIter);
@@ -348,7 +404,7 @@ void stopAllRequests(SHashObj *pRequests) {
     SRequestObj *pRequest = acquireRequest(*rid);
     if (pRequest) {
       taos_stop_query(pRequest);
-      releaseRequest(*rid);
+      (void)releaseRequest(*rid); // ignore error
     }
 
     pIter = taosHashIterate(pRequests, pIter);
@@ -359,18 +415,31 @@ void destroyAppInst(void *info) {
   SAppInstInfo* pAppInfo = *(SAppInstInfo**)info;
   tscDebug("destroy app inst mgr %p", pAppInfo);
 
-  taosThreadMutexLock(&appInfo.mutex);
+  int32_t code = taosThreadMutexLock(&appInfo.mutex);
+  if (TSDB_CODE_SUCCESS != code) {
+    tscError("failed to lock app info, code:%s", tstrerror(TAOS_SYSTEM_ERROR(code)));
+  }
 
   hbRemoveAppHbMrg(&pAppInfo->pAppHbMgr);
 
-  taosThreadMutexUnlock(&appInfo.mutex);
+  code = taosThreadMutexUnlock(&appInfo.mutex);
+  if (TSDB_CODE_SUCCESS != code) {
+    tscError("failed to unlock app info, code:%s", tstrerror(TAOS_SYSTEM_ERROR(code)));
+  }
 
   taosMemoryFreeClear(pAppInfo->instKey);
   closeTransporter(pAppInfo);
 
-  taosThreadMutexLock(&pAppInfo->qnodeMutex);
+  code = taosThreadMutexLock(&pAppInfo->qnodeMutex);
+  if (TSDB_CODE_SUCCESS != code) {
+    tscError("failed to lock qnode mutex, code:%s", tstrerror(TAOS_SYSTEM_ERROR(code)));
+  }
+
   taosArrayDestroy(pAppInfo->pQnodeList);
-  taosThreadMutexUnlock(&pAppInfo->qnodeMutex);
+  code = taosThreadMutexUnlock(&pAppInfo->qnodeMutex);
+  if (TSDB_CODE_SUCCESS != code) {
+    tscError("failed to unlock qnode mutex, code:%s", tstrerror(TAOS_SYSTEM_ERROR(code)));
+  }
 
   taosMemoryFree(pAppInfo);
 }
@@ -395,97 +464,110 @@ void destroyTscObj(void *pObj) {
            pTscObj->pAppInfo->numOfConns);
 
   // In any cases, we should not free app inst here. Or an race condition rises.
-  /*int64_t connNum = */ atomic_sub_fetch_64(&pTscObj->pAppInfo->numOfConns, 1);
+  /*int64_t connNum = */ (void)atomic_sub_fetch_64(&pTscObj->pAppInfo->numOfConns, 1);
 
-  taosThreadMutexDestroy(&pTscObj->mutex);
+  (void)taosThreadMutexDestroy(&pTscObj->mutex);
   taosMemoryFree(pTscObj);
 
   tscTrace("end to destroy tscObj %" PRIx64 " p:%p", tscId, pTscObj);
 }
 
-void *createTscObj(const char *user, const char *auth, const char *db, int32_t connType, SAppInstInfo *pAppInfo) {
-  STscObj *pObj = (STscObj *)taosMemoryCalloc(1, sizeof(STscObj));
-  if (NULL == pObj) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return NULL;
+int32_t createTscObj(const char *user, const char *auth, const char *db, int32_t connType, SAppInstInfo *pAppInfo,
+                     STscObj **pObj) {
+  *pObj = (STscObj *)taosMemoryCalloc(1, sizeof(STscObj));
+  if (NULL == *pObj) {
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
 
-  pObj->pRequests = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK);
-  if (NULL == pObj->pRequests) {
-    taosMemoryFree(pObj);
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return NULL;
+  (*pObj)->pRequests = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK);
+  if (NULL == (*pObj)->pRequests) {
+    taosMemoryFree(*pObj);
+    return terrno ? terrno : TSDB_CODE_OUT_OF_MEMORY;
   }
 
-  pObj->connType = connType;
-  pObj->pAppInfo = pAppInfo;
-  pObj->appHbMgrIdx = pAppInfo->pAppHbMgr->idx;
-  tstrncpy(pObj->user, user, sizeof(pObj->user));
-  memcpy(pObj->pass, auth, TSDB_PASSWORD_LEN);
+  (*pObj)->connType = connType;
+  (*pObj)->pAppInfo = pAppInfo;
+  (*pObj)->appHbMgrIdx = pAppInfo->pAppHbMgr->idx;
+  tstrncpy((*pObj)->user, user, sizeof((*pObj)->user));
+  (void)memcpy((*pObj)->pass, auth, TSDB_PASSWORD_LEN);
 
   if (db != NULL) {
-    tstrncpy(pObj->db, db, tListLen(pObj->db));
+    tstrncpy((*pObj)->db, db, tListLen((*pObj)->db));
   }
 
-  taosThreadMutexInit(&pObj->mutex, NULL);
-  pObj->id = taosAddRef(clientConnRefPool, pObj);
+  TSC_ERR_RET(taosThreadMutexInit(&(*pObj)->mutex, NULL));
 
-  atomic_add_fetch_64(&pObj->pAppInfo->numOfConns, 1);
+  int32_t code = TSDB_CODE_SUCCESS;
 
-  tscDebug("connObj created, 0x%" PRIx64 ",p:%p", pObj->id, pObj);
-  return pObj;
+  (*pObj)->id = taosAddRef(clientConnRefPool, *pObj);
+  if ((*pObj)->id < 0) {
+    tscError("failed to add object to clientConnRefPool");
+    code = terrno;
+    taosMemoryFree(*pObj);
+    return code;
+  }
+
+  (void)atomic_add_fetch_64(&(*pObj)->pAppInfo->numOfConns, 1);
+
+  tscDebug("connObj created, 0x%" PRIx64 ",p:%p", (*pObj)->id, *pObj);
+  return code;
 }
 
 STscObj *acquireTscObj(int64_t rid) { return (STscObj *)taosAcquireRef(clientConnRefPool, rid); }
 
-int32_t releaseTscObj(int64_t rid) { return taosReleaseRef(clientConnRefPool, rid); }
+void releaseTscObj(int64_t rid) {
+  int32_t code = taosReleaseRef(clientConnRefPool, rid);
+  if (TSDB_CODE_SUCCESS != code) {
+    tscWarn("failed to release TscObj, code:%s", tstrerror(code));
+  }
+}
 
-void *createRequest(uint64_t connId, int32_t type, int64_t reqid) {
-  SRequestObj *pRequest = (SRequestObj *)taosMemoryCalloc(1, sizeof(SRequestObj));
-  if (NULL == pRequest) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return NULL;
+int32_t createRequest(uint64_t connId, int32_t type, int64_t reqid, SRequestObj **pRequest) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  *pRequest = (SRequestObj *)taosMemoryCalloc(1, sizeof(SRequestObj));
+  if (NULL == *pRequest) {
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
 
   STscObj *pTscObj = acquireTscObj(connId);
   if (pTscObj == NULL) {
-    taosMemoryFree(pRequest);
-    terrno = TSDB_CODE_TSC_DISCONNECTED;
-    return NULL;
+    code = TSDB_CODE_TSC_DISCONNECTED;
+    goto _return;
   }
   SSyncQueryParam *interParam = taosMemoryCalloc(1, sizeof(SSyncQueryParam));
   if (interParam == NULL) {
     releaseTscObj(connId);
-    doDestroyRequest(pRequest);
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return NULL;
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _return;
   }
-  tsem_init(&interParam->sem, 0, 0);
-  interParam->pRequest = pRequest;
-  pRequest->body.interParam = interParam;
+  TSC_ERR_JRET(tsem_init(&interParam->sem, 0, 0));
+  interParam->pRequest = *pRequest;
+  (*pRequest)->body.interParam = interParam;
 
-  pRequest->resType = RES_TYPE__QUERY;
-  pRequest->requestId = reqid == 0 ? generateRequestId() : reqid;
-  pRequest->metric.start = taosGetTimestampUs();
+  (*pRequest)->resType = RES_TYPE__QUERY;
+  (*pRequest)->requestId = reqid == 0 ? generateRequestId() : reqid;
+  (*pRequest)->metric.start = taosGetTimestampUs();
 
-  pRequest->body.resInfo.convertUcs4 = true;  // convert ucs4 by default
-  pRequest->type = type;
-  pRequest->allocatorRefId = -1;
+  (*pRequest)->body.resInfo.convertUcs4 = true;  // convert ucs4 by default
+  (*pRequest)->type = type;
+  (*pRequest)->allocatorRefId = -1;
 
-  pRequest->pDb = getDbOfConnection(pTscObj);
-  pRequest->pTscObj = pTscObj;
-  pRequest->inCallback = false;
-
-  pRequest->msgBuf = taosMemoryCalloc(1, ERROR_MSG_BUF_DEFAULT_SIZE);
-  pRequest->msgBufLen = ERROR_MSG_BUF_DEFAULT_SIZE;
-  tsem_init(&pRequest->body.rspSem, 0, 0);
-
-  if (registerRequest(pRequest, pTscObj)) {
-    doDestroyRequest(pRequest);
-    return NULL;
+  (*pRequest)->pDb = getDbOfConnection(pTscObj);
+  (*pRequest)->pTscObj = pTscObj;
+  (*pRequest)->inCallback = false;
+  (*pRequest)->msgBuf = taosMemoryCalloc(1, ERROR_MSG_BUF_DEFAULT_SIZE);
+  if (NULL == (*pRequest)->msgBuf) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto _return;
   }
+  (*pRequest)->msgBufLen = ERROR_MSG_BUF_DEFAULT_SIZE;
+  TSC_ERR_JRET(tsem_init(&(*pRequest)->body.rspSem, 0, 0));
+  TSC_ERR_JRET(registerRequest(*pRequest, pTscObj));
 
-  return pRequest;
+  return TSDB_CODE_SUCCESS;
+_return:
+  doDestroyRequest(*pRequest);
+  return code;
 }
 
 void doFreeReqResultInfo(SReqResultInfo *pResInfo) {
@@ -520,12 +602,12 @@ int64_t removeFromMostPrevReq(SRequestObj* pRequest) {
     pTmp = acquireRequest(pTmp->relation.prevRefId);
     if (pTmp) {
       mostPrevReqRefId = pTmp->self;
-      releaseRequest(mostPrevReqRefId);
+      (void)releaseRequest(mostPrevReqRefId); // ignore error
     } else {
       break;
     }
   }
-  removeRequest(mostPrevReqRefId);
+  (void)removeRequest(mostPrevReqRefId); // ignore error
   return mostPrevReqRefId;
 }
 
@@ -533,8 +615,8 @@ void destroyNextReq(int64_t nextRefId) {
   if (nextRefId) {
     SRequestObj* pObj = acquireRequest(nextRefId);
     if (pObj) {
-      releaseRequest(nextRefId);
-      releaseRequest(nextRefId);
+      (void)releaseRequest(nextRefId); // ignore error
+      (void)releaseRequest(nextRefId); // ignore error
     }
   }
 }
@@ -554,7 +636,7 @@ void destroySubRequests(SRequestObj *pRequest) {
     pTmp = acquireRequest(tmpRefId);
     if (pTmp) {
       pReqList[++reqIdx] = pTmp;
-      releaseRequest(tmpRefId);
+      (void)releaseRequest(tmpRefId); // ignore error
     } else {
       tscError("prev req ref 0x%" PRIx64 " is not there", tmpRefId);
       break;
@@ -562,7 +644,7 @@ void destroySubRequests(SRequestObj *pRequest) {
   }
 
   for (int32_t i = reqIdx; i >= 0; i--) {
-    removeRequest(pReqList[i]->self);
+    (void)removeRequest(pReqList[i]->self); // ignore error
   }
 
   tmpRefId = pRequest->relation.nextRefId;
@@ -570,8 +652,8 @@ void destroySubRequests(SRequestObj *pRequest) {
     pTmp = acquireRequest(tmpRefId);
     if (pTmp) {
       tmpRefId = pTmp->relation.nextRefId;
-      removeRequest(pTmp->self);
-      releaseRequest(pTmp->self);
+      (void)removeRequest(pTmp->self); // ignore error
+      (void)releaseRequest(pTmp->self); // ignore error
     } else {
       tscError("next req ref 0x%" PRIx64 " is not there", tmpRefId);
       break;
@@ -591,8 +673,10 @@ void doDestroyRequest(void *p) {
 
   int64_t nextReqRefId = pRequest->relation.nextRefId;
 
-  taosHashRemove(pRequest->pTscObj->pRequests, &pRequest->self, sizeof(pRequest->self));
-
+  int32_t code = taosHashRemove(pRequest->pTscObj->pRequests, &pRequest->self, sizeof(pRequest->self));
+  if (TSDB_CODE_SUCCESS != code) {
+    tscError("failed to remove request from hash, code:%s", tstrerror(code));
+  }
   schedulerFreeJob(&pRequest->body.queryJob, 0);
 
   destorySqlCallbackWrapper(pRequest->pWrapper);
@@ -600,7 +684,7 @@ void doDestroyRequest(void *p) {
   taosMemoryFreeClear(pRequest->msgBuf);
 
   doFreeReqResultInfo(&pRequest->body.resInfo);
-  tsem_destroy(&pRequest->body.rspSem);
+  (void)tsem_destroy(&pRequest->body.rspSem);
 
   taosArrayDestroy(pRequest->tableList);
   taosArrayDestroy(pRequest->targetTableList);
@@ -614,13 +698,15 @@ void doDestroyRequest(void *p) {
   taosMemoryFreeClear(pRequest->pDb);
   taosArrayDestroy(pRequest->dbList);
   if (pRequest->body.interParam) {
-    tsem_destroy(&((SSyncQueryParam *)pRequest->body.interParam)->sem);
+    (void)tsem_destroy(&((SSyncQueryParam *)pRequest->body.interParam)->sem);
   }
   taosMemoryFree(pRequest->body.interParam);
 
   if (TSDB_CODE_SUCCESS == nodesSimAcquireAllocator(pRequest->allocatorRefId)) {
     qDestroyQuery(pRequest->pQuery);
-    nodesSimReleaseAllocator(pRequest->allocatorRefId);
+    if (TSDB_CODE_SUCCESS != nodesSimReleaseAllocator(pRequest->allocatorRefId)) {
+      tscError("failed to release allocator");
+    }
   }
   nodesDestroyAllocator(pRequest->allocatorRefId);
 
@@ -637,7 +723,7 @@ void destroyRequest(SRequestObj *pRequest) {
   }
 
   taos_stop_query(pRequest);
-  removeFromMostPrevReq(pRequest);
+  (void)removeFromMostPrevReq(pRequest);
 }
 
 void taosStopQueryImpl(SRequestObj *pRequest) {
@@ -676,7 +762,7 @@ void stopAllQueries(SRequestObj *pRequest) {
 
   for (int32_t i = reqIdx; i >= 0; i--) {
     taosStopQueryImpl(pReqList[i]);
-    releaseRequest(pReqList[i]->self);
+    (void)releaseRequest(pReqList[i]->self); // ignore error
   }
 
   taosStopQueryImpl(pRequest);
@@ -687,7 +773,7 @@ void stopAllQueries(SRequestObj *pRequest) {
     if (pTmp) {
       tmpRefId = pTmp->relation.nextRefId;
       taosStopQueryImpl(pTmp);
-      releaseRequest(pTmp->self);
+      (void)releaseRequest(pTmp->self); // ignore error
     } else {
       tscError("next req ref 0x%" PRIx64 " is not there", tmpRefId);
       break;
@@ -700,7 +786,7 @@ void crashReportThreadFuncUnexpectedStopped(void) { atomic_store_32(&clientStop,
 static void *tscCrashReportThreadFp(void *param) {
   setThreadName("client-crashReport");
   char filepath[PATH_MAX] = {0};
-  snprintf(filepath, sizeof(filepath), "%s%s.taosCrashLog", tsLogDir, TD_DIRSEP);
+  (void)snprintf(filepath, sizeof(filepath), "%s%s.taosCrashLog", tsLogDir, TD_DIRSEP);
   char     *pMsg = NULL;
   int64_t   msgLen = 0;
   TdFilePtr pFile = NULL;
@@ -769,20 +855,27 @@ static void *tscCrashReportThreadFp(void *param) {
 
 int32_t tscCrashReportInit() {
   if (!tsEnableCrashReport) {
-    return 0;
+    return TSDB_CODE_SUCCESS;
   }
-
+  int32_t      code = TSDB_CODE_SUCCESS;
   TdThreadAttr thAttr;
-  taosThreadAttrInit(&thAttr);
-  taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE);
+  TSC_ERR_JRET(taosThreadAttrInit(&thAttr));
+  TSC_ERR_JRET(taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE));
   TdThread crashReportThread;
   if (taosThreadCreate(&crashReportThread, &thAttr, tscCrashReportThreadFp, NULL) != 0) {
     tscError("failed to create crashReport thread since %s", strerror(errno));
-    return -1;
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    TSC_ERR_RET(errno);
   }
 
-  taosThreadAttrDestroy(&thAttr);
-  return 0;
+  (void)taosThreadAttrDestroy(&thAttr);
+_return:
+  if (code) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    TSC_ERR_RET(terrno);
+  }
+
+  return TSDB_CODE_SUCCESS;
 }
 
 void tscStopCrashReport() {
@@ -823,17 +916,17 @@ void taos_init_imp(void) {
   if (tscDbg.memEnable) {
     int32_t code = taosMemoryDbgInit();
     if (code) {
-      printf("failed to init memory dbg, error:%s\n", tstrerror(code));
+      (void)printf("failed to init memory dbg, error:%s\n", tstrerror(code));
     } else {
       tsAsyncLog = false;
-      printf("memory dbg enabled\n");
+      (void)printf("memory dbg enabled\n");
     }
   }
 #endif
 
   // In the APIs of other program language, taos_cleanup is not available yet.
   // So, to make sure taos_cleanup will be invoked to clean up the allocated resource to suppress the valgrind warning.
-  atexit(taos_cleanup);
+  (void)atexit(taos_cleanup);
   errno = TSDB_CODE_SUCCESS;
   taosSeedRand(taosGetTimestampSec());
 
@@ -841,6 +934,11 @@ void taos_init_imp(void) {
   appInfo.startTime = taosGetTimestampMs();
   appInfo.pInstMap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_ENTRY_LOCK);
   appInfo.pInstMapByClusterId = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_ENTRY_LOCK);
+  if (NULL == appInfo.pInstMap || NULL == appInfo.pInstMapByClusterId) {
+    tscError("failed to allocate memory when init appInfo");
+    tscInitRes = TSDB_CODE_OUT_OF_MEMORY;
+    return;
+  }
   taosHashSetFreeFp(appInfo.pInstMap, destroyAppInst);
   deltaToUtcInitOnce();
 
@@ -848,60 +946,54 @@ void taos_init_imp(void) {
 #ifdef CUS_PROMPT
   snprintf(logDirName, 64, "%slog", CUS_PROMPT);
 #else
-  snprintf(logDirName, 64, "taoslog");
+  (void)snprintf(logDirName, 64, "taoslog");
 #endif
   if (taosCreateLog(logDirName, 10, configDir, NULL, NULL, NULL, NULL, 1) != 0) {
-    printf(" WARING: Create %s failed:%s. configDir=%s\n", logDirName, strerror(errno), configDir);
+    (void)printf(" WARING: Create %s failed:%s. configDir=%s\n", logDirName, strerror(errno), configDir);
     tscInitRes = -1;
     return;
   }
 
-  if (taosInitCfg(configDir, NULL, NULL, NULL, NULL, 1) != 0) {
-    tscInitRes = -1;
-    return;
-  }
+  ENV_ERR_RET(taosInitCfg(configDir, NULL, NULL, NULL, NULL, 1), "failed to init cfg");
 
   initQueryModuleMsgHandle();
+  ENV_ERR_RET(taosConvInit(), "failed to init conv");
+  ENV_ERR_RET(monitorInit(), "failed to init monitor");
+  ENV_ERR_RET(rpcInit(), "failed to init rpc");
 
-  if (taosConvInit() != 0) {
+  if (InitRegexCache() != 0) {
     tscInitRes = -1;
-    tscError("failed to init conv");
+    tscError("failed to init regex cache");
     return;
   }
-  if (monitorInit() != 0){
-    tscInitRes = -1;
-    tscError("failed to init monitor");
-    return;
-  }
-  rpcInit();
 
   SCatalogCfg cfg = {.maxDBCacheNum = 100, .maxTblCacheNum = 100};
-  catalogInit(&cfg);
+  ENV_ERR_RET(catalogInit(&cfg), "failed to init catalog");
+  ENV_ERR_RET(schedulerInit(), "failed to init scheduler");
 
-  schedulerInit();
   tscDebug("starting to initialize TAOS driver");
 
 #ifndef WINDOWS
   taosSetCoreDump(true);
 #endif
 
-  initTaskQueue();
-  fmFuncMgtInit();
-  nodesInitAllocatorSet();
+  ENV_ERR_RET(initTaskQueue(), "failed to init task queue");
+  ENV_ERR_RET(fmFuncMgtInit(), "failed to init funcMgt");
+  ENV_ERR_RET(nodesInitAllocatorSet(), "failed to init allocator set");
 
   clientConnRefPool = taosOpenRef(200, destroyTscObj);
   clientReqRefPool = taosOpenRef(40960, doDestroyRequest);
 
-  taosGetAppName(appInfo.appName, NULL);
-  taosThreadMutexInit(&appInfo.mutex, NULL);
-
-  tscCrashReportInit();
+  ENV_ERR_RET(taosGetAppName(appInfo.appName, NULL), "failed to get app name");
+  ENV_ERR_RET(taosThreadMutexInit(&appInfo.mutex, NULL), "failed to init thread mutex");
+  ENV_ERR_RET(tscCrashReportInit(), "failed to init crash report");
+  ENV_ERR_RET(qInitKeywordsTable(), "failed to init parser keywords table");
 
   tscDebug("client is initialized successfully");
 }
 
 int taos_init() {
-  taosThreadOnce(&tscinit, taos_init_imp);
+  (void)taosThreadOnce(&tscinit, taos_init_imp);
   return tscInitRes;
 }
 
@@ -942,7 +1034,7 @@ int taos_options_imp(TSDB_OPTION option, const char *str) {
         return -1;
       }
       newstr[0] = '"';
-      memcpy(newstr+1, str, len);
+      (void)memcpy(newstr+1, str, len);
       newstr[len + 1] = '"';
       newstr[len + 2] = '\0';
       str = newstr;