Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/tsdb_optimize

cmake/taostools_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG 3.0
+        GIT_TAG main
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

docs/en/12-taos-sql/02-database.md

@@ -41,7 +41,7 @@ database_option: {
 
 ## Parameters
 
-- BUFFER: specifies the size (in MB) of the write buffer for each vnode. Enter a value between 3 and 16384. The default value is 96.
+- BUFFER: specifies the size (in MB) of the write buffer for each vnode. Enter a value between 3 and 16384. The default value is 256.
 - CACHEMODEL: specifies how the latest data in subtables is stored in the cache. The default value is none.
   - none: The latest data is not cached.
   - last_row: The last row of each subtable is cached. This option significantly improves the performance of the LAST_ROW function.

docs/en/12-taos-sql/19-limit.md

@@ -36,7 +36,7 @@ The following characters cannot occur in a password: single quotation marks ('),
 - Maximum numbers of databases, STables, tables are dependent only on the system resources.
 - The number of replicas can only be 1 or 3.
 - The maximum length of a username is 23 bytes.
-- The maximum length of a password is 128 bytes.
+- The maximum length of a password is 31 bytes.
 - The maximum number of rows depends on system resources.
 - The maximum number of vnodes in a database is 1024.
 

docs/en/12-taos-sql/25-grant.md

@@ -16,7 +16,7 @@ This statement creates a user account.
 
 The maximum length of user_name is 23 bytes.
 
-The maximum length of password is 128 bytes. The password can include leters, digits, and special characters excluding single quotation marks, double quotation marks, backticks, backslashes, and spaces. The password cannot be empty.
+The maximum length of password is 31 bytes. The password can include leters, digits, and special characters excluding single quotation marks, double quotation marks, backticks, backslashes, and spaces. The password cannot be empty.
 
 `SYSINFO` indicates whether the user is allowed to view system information. `1` means allowed, `0` means not allowed. System information includes server configuration, dnode, vnode, storage. The default value is `1`.
 

docs/en/12-taos-sql/27-index.md

@@ -28,6 +28,24 @@ Performs pre-aggregation on the specified column over the time window defined by
 - WATERMARK: Enter a value between 0ms and 900000ms. The most precise unit supported is milliseconds. The default value is 5 seconds. This option can be used only on supertables.
 - MAX_DELAY: Enter a value between 1ms and 900000ms. The most precise unit supported is milliseconds. The default value is the value of interval provided that it does not exceed 900000ms. This option can be used only on supertables. Note: Retain the default value if possible. Configuring a small MAX_DELAY may cause results to be frequently pushed, affecting storage and query performance.
 
+```sql
+DROP DATABASE IF EXISTS d0;
+CREATE DATABASE d0;
+USE d0;
+CREATE TABLE IF NOT EXISTS st1 (ts timestamp, c1 int, c2 float, c3 double) TAGS (t1 int unsigned);
+CREATE TABLE ct1 USING st1 TAGS(1000);
+CREATE TABLE ct2 USING st1 TAGS(2000);
+INSERT INTO ct1 VALUES(now+0s, 10, 2.0, 3.0);
+INSERT INTO ct1 VALUES(now+1s, 11, 2.1, 3.1)(now+2s, 12, 2.2, 3.2)(now+3s, 13, 2.3, 3.3);
+CREATE SMA INDEX sma_index_name1 ON st1 FUNCTION(max(c1),max(c2),min(c1)) INTERVAL(5m,10s) SLIDING(5m) WATERMARK 5s MAX_DELAY 1m;
+-- query from SMA Index
+ALTER LOCAL 'querySmaOptimize' '1';
+SELECT max(c2),min(c1) FROM st1 INTERVAL(5m,10s) SLIDING(5m);
+SELECT _wstart,_wend,_wduration,max(c2),min(c1) FROM st1 INTERVAL(5m,10s) SLIDING(5m);
+-- query from raw data
+ALTER LOCAL 'querySmaOptimize' '0';
+```
+
 ### FULLTEXT Indexing
 
 Creates a text index for the specified column. FULLTEXT indexing improves performance for queries with text filtering. The index_option syntax is not supported for FULLTEXT indexing. FULLTEXT indexing is supported for JSON tag columns only. Multiple columns cannot be indexed together. However, separate indices can be created for each column.
@@ -41,7 +59,6 @@ DROP INDEX index_name;
 ## View Indices
 
 ````sql
-```sql
 SHOW INDEXES FROM tbl_name [FROM db_name];
 SHOW INDEXES FROM [db_name.]tbl_name ;
 ````

docs/en/14-reference/05-taosbenchmark.md

@@ -470,3 +470,26 @@ The configuration parameters for subscribing to a super table are set in `super_
   - **sql**: The SQL command to be executed. For the query SQL of super table, keep "xxxx" in the SQL command. The program will automatically replace it with all the sub-table names of the super table.
     Replace it with all the sub-table names in the super table.
   - **result**: The file to save the query result. If not specified, taosBenchmark will not save result.
+
+#### data type on taosBenchmark
+
+| #   |   **TDengine**     | **taosBenchmark** 
+| --- | :----------------: | :---------------:
+| 1   |  TIMESTAMP         |    timestamp
+| 2   |  INT               |    int
+| 3   |  INT UNSIGNED      |    uint
+| 4   |  BIGINT            |    bigint
+| 5   |  BIGINT UNSIGNED   |    ubigint
+| 6   |  FLOAT             |    float
+| 7   |  DOUBLE            |    double
+| 8   |  BINARY            |    binary
+| 9   |  SMALLINT          |    smallint
+| 10  |  SMALLINT UNSIGNED |    usmallint
+| 11  |  TINYINT           |    tinyint
+| 12  |  TINYINT UNSIGNED  |    utinyint
+| 13  |  BOOL              |    bool
+| 14  |  NCHAR             |    nchar
+| 15  |  VARCHAR           |    varchar
+| 15  |  JSON              |    json
+
+note：Lowercase characters must be used on taosBenchmark datatype

docs/en/20-third-party/11-kafka.md

@@ -363,7 +363,10 @@ The following configuration items apply to TDengine Sink Connector and TDengine
 7. `out.format`: Result output format. `line` indicates that the output format is InfluxDB line protocol format, `json` indicates that the output format is json. The default is line.
 8. `topic.per.stable`: If it's set to true, it means one super table in TDengine corresponds to a topic in Kafka, the topic naming rule is `<topic.prefix><topic.delimiter><connection.database><topic.delimiter><stable.name>`; if it's set to false, it means the whole DB corresponds to a topic in Kafka, the topic naming rule is `<topic.prefix><topic.delimiter><connection.database>`.
 9. `topic.ignore.db`: Whether the topic naming rule contains the database name: true indicates that the rule is `<topic.prefix><topic.delimiter><stable.name>`, false indicates that the rule is `<topic.prefix><topic.delimiter><connection.database><topic.delimiter><stable.name>`, and the default is false. Does not take effect when `topic.per.stable` is set to false.
-10. `topic.delimiter`: topic name delimiter，default is `-`。
+10. `topic.delimiter`: topic name delimiter，default is `-`.
+11. `read.method`: read method for query TDengine data, query or subscription. default is subscription.
+12. `subscription.group.id`: subscription group id for subscription data from TDengine, this field is required when `read.method` is subscription.
+13. `subscription.from`: subscription from latest or earliest. default is latest。
 
 ## Other notes
 

docs/en/20-third-party/14-dbeaver.md

@@ -12,50 +12,25 @@ To use DBeaver to manage TDengine, you need to prepare the following:
 
 - Install DBeaver. DBeaver supports mainstream operating systems including Windows, macOS, and Linux. Please make sure you download and install the correct version (23.1.1+) and platform package. Please refer to the [official DBeaver documentation](https://github.com/dbeaver/dbeaver/wiki/Installation) for detailed installation steps.
 - If you use an on-premises TDengine cluster, please make sure that TDengine and taosAdapter are deployed and running properly. For detailed information, please refer to the taosAdapter User Manual.
-- If you use TDengine Cloud, please [register](https://cloud.tdengine.com/) for an account.
 
-## Usage
-
-### Use DBeaver to access on-premises TDengine cluster
+## Use DBeaver to access on-premises TDengine cluster
 
 1. Start the DBeaver application, click the button or menu item to choose **New Database Connection**, and then select **TDengine** in the **Timeseries** category.
 
-![Connect TDengine with DBeaver](./dbeaver/dbeaver-connect-tdengine-en.webp)
+ ![Connect TDengine with DBeaver](./dbeaver/dbeaver-connect-tdengine-en.webp)
 
 2. Configure the TDengine connection by filling in the host address, port number, username, and password. If TDengine is deployed on the local machine, you are only required to fill in the username and password. The default username is root and the default password is taosdata. Click **Test Connection** to check whether the connection is workable. If you do not have the TDengine Java connector installed on the local machine, DBeaver will prompt you to download and install it.
 
-![Configure the TDengine connection](./dbeaver/dbeaver-config-tdengine-en.webp))
+ ![Configure the TDengine connection](./dbeaver/dbeaver-config-tdengine-en.webp))
 
 3. If the connection is successful, it will be displayed as shown in the following figure. If the connection fails, please check whether the TDengine service and taosAdapter are running correctly and whether the host address, port number, username, and password are correct.
 
-![Connection successful](./dbeaver/dbeaver-connect-tdengine-test-en.webp)
+ ![Connection successful](./dbeaver/dbeaver-connect-tdengine-test-en.webp)
 
 4. Use DBeaver to select databases and tables and browse your data stored in TDengine.
 
-![Browse TDengine data with DBeaver](./dbeaver/dbeaver-browse-data-en.webp)
+ ![Browse TDengine data with DBeaver](./dbeaver/dbeaver-browse-data-en.webp)
 
 5. You can also manipulate TDengine data by executing SQL commands.
 
-![Use SQL commands to manipulate TDengine data in DBeaver](./dbeaver/dbeaver-sql-execution-en.webp)
-
-### Use DBeaver to access TDengine Cloud
-
-1. Log in to the TDengine Cloud service, select **Programming** > **Java** in the management console, and then copy the string value of `TDENGINE_JDBC_URL` displayed in the **Config** section.
-
-![Copy JDBC URL from TDengine Cloud](./dbeaver/tdengine-cloud-jdbc-dsn-en.webp)
-
-2. Start the DBeaver application, click the button or menu item to choose **New Database Connection**, and then select **TDengine Cloud** in the **Timeseries** category.
-
-![Connect TDengine Cloud with DBeaver](./dbeaver/dbeaver-connect-tdengine-cloud-en.webp)
-
-3. Configure the TDengine Cloud connection by filling in the JDBC URL value. Click **Test Connection**. If you do not have the TDengine Java connector installed on the local machine, DBeaver will prompt you to download and install it. If the connection is successful, it will be displayed as shown in the following figure. If the connection fails, please check whether the TDengine Cloud service is running properly and whether the JDBC URL is correct.
-
-![Configure the TDengine Cloud connection](./dbeaver/dbeaver-connect-tdengine-cloud-test-en.webp)
-
-4. Use DBeaver to select databases and tables and browse your data stored in TDengine Cloud.
-
-![Browse TDengine Cloud data with DBeaver](./dbeaver/dbeaver-browse-data-cloud-en.webp)
-
-5. You can also manipulate TDengine Cloud data by executing SQL commands.
-
-![Use SQL commands to manipulate TDengine Cloud data in DBeaver](./dbeaver/dbeaver-sql-execution-cloud-en.webp)
+ ![Use SQL commands to manipulate TDengine data in DBeaver](./dbeaver/dbeaver-sql-execution-en.webp)

docs/zh/08-connector/30-python.mdx

 ---
+toc_max_heading_level: 4
 sidebar_label: Python
 title: TDengine Python Connector
 description: "taospy 是 TDengine 的官方 Python 连接器。taospy 提供了丰富的 API， 使得 Python 应用可以很方便地使用 TDengine。tasopy 对 TDengine 的原生接口和 REST 接口都进行了封装， 分别对应 tasopy 的两个子模块：taos 和 taosrest。除了对原生接口和 REST 接口的封装，taospy 还提供了符合 Python 数据访问规范(PEP 249)的编程接口。这使得 taospy 和很多第三方工具集成变得简单，比如 SQLAlchemy 和 pandas"

docs/zh/12-taos-sql/02-database.md

@@ -41,7 +41,7 @@ database_option: {
 
 ### 参数说明
 
-- BUFFER: 一个 VNODE 写入内存池大小，单位为 MB，默认为 96，最小为 3，最大为 16384。
+- BUFFER: 一个 VNODE 写入内存池大小，单位为 MB，默认为 256，最小为 3，最大为 16384。
 - CACHEMODEL：表示是否在内存中缓存子表的最近数据。默认为 none。
   - none：表示不缓存。
   - last_row：表示缓存子表最近一行数据。这将显著改善 LAST_ROW 函数的性能表现。

docs/zh/12-taos-sql/19-limit.md

@@ -36,7 +36,7 @@ description: 合法字符集和命名中的限制规则
 - 库的数目，超级表的数目、表的数目，系统不做限制，仅受系统资源限制
 - 数据库的副本数只能设置为 1 或 3
 - 用户名的最大长度是 23 字节
-- 用户密码的最大长度是 128 字节
+- 用户密码的最大长度是 31 字节
 - 总数据行数取决于可用资源
 - 单个数据库的虚拟结点数上限为 1024
 

docs/zh/12-taos-sql/25-grant.md

@@ -16,7 +16,7 @@ CREATE USER use_name PASS 'password' [SYSINFO {1|0}];
 
 use_name 最长为 23 字节。
 
-password 最长为 128 字节，合法字符包括"a-zA-Z0-9!?$%^&*()_–+={[}]:;@~#|<,>.?/"，不可以出现单双引号、撇号、反斜杠和空格，且不可以为空。
+password 最长为 31 字节，合法字符包括"a-zA-Z0-9!?$%^&*()_–+={[}]:;@~#|<,>.?/"，不可以出现单双引号、撇号、反斜杠和空格，且不可以为空。
 
 SYSINFO 表示用户是否可以查看系统信息。1 表示可以查看，0 表示不可以查看。系统信息包括服务端配置信息、服务端各种节点信息（如 DNODE、QNODE等）、存储相关的信息等。默认为可以查看系统信息。
 

docs/zh/12-taos-sql/27-index.md

@@ -28,6 +28,24 @@ functions:
 - WATERMARK: 最小单位毫秒，取值范围 [0ms, 900000ms]，默认值为 5 秒，只可用于超级表。
 - MAX_DELAY: 最小单位毫秒，取值范围 [1ms, 900000ms]，默认值为 interval 的值(但不能超过最大值)，只可用于超级表。注：不建议 MAX_DELAY 设置太小，否则会过于频繁的推送结果，影响存储和查询性能，如无特殊需求，取默认值即可。
 
+```sql
+DROP DATABASE IF EXISTS d0;
+CREATE DATABASE d0;
+USE d0;
+CREATE TABLE IF NOT EXISTS st1 (ts timestamp, c1 int, c2 float, c3 double) TAGS (t1 int unsigned);
+CREATE TABLE ct1 USING st1 TAGS(1000);
+CREATE TABLE ct2 USING st1 TAGS(2000);
+INSERT INTO ct1 VALUES(now+0s, 10, 2.0, 3.0);
+INSERT INTO ct1 VALUES(now+1s, 11, 2.1, 3.1)(now+2s, 12, 2.2, 3.2)(now+3s, 13, 2.3, 3.3);
+CREATE SMA INDEX sma_index_name1 ON st1 FUNCTION(max(c1),max(c2),min(c1)) INTERVAL(5m,10s) SLIDING(5m) WATERMARK 5s MAX_DELAY 1m;
+-- 从 SMA 索引查询
+ALTER LOCAL 'querySmaOptimize' '1';
+SELECT max(c2),min(c1) FROM st1 INTERVAL(5m,10s) SLIDING(5m);
+SELECT _wstart,_wend,_wduration,max(c2),min(c1) FROM st1 INTERVAL(5m,10s) SLIDING(5m);
+-- 从原始数据查询
+ALTER LOCAL 'querySmaOptimize' '0'; 
+```
+
 ### FULLTEXT 索引
 
 对指定列建立文本索引，可以提升含有文本过滤的查询的性能。FULLTEXT 索引不支持 index_option 语法。现阶段只支持对 JSON 类型的标签列创建 FULLTEXT 索引。不支持多列联合索引，但可以为每个列分布创建 FULLTEXT 索引。
@@ -41,7 +59,6 @@ DROP INDEX index_name;
 ## 查看索引
 
 ````sql
-```sql
 SHOW INDEXES FROM tbl_name [FROM db_name];
 SHOW INDEXES FROM [db_name.]tbl_name;
 ````

docs/zh/14-reference/05-taosbenchmark.md

@@ -437,3 +437,29 @@ taosBenchmark -A INT,DOUBLE,NCHAR,BINARY\(16\)
 
 - **sqls** ：
   - **sql** : 执行的 SQL 命令，必填。
+ 
+#### 配置文件中数据类型书写对照表
+
+| #   |     **引擎**      | **taosBenchmark** 
+| --- | :----------------: | :---------------:
+| 1   |  TIMESTAMP         |    timestamp
+| 2   |  INT               |    int
+| 3   |  INT UNSIGNED      |    uint
+| 4   |  BIGINT            |    bigint
+| 5   |  BIGINT UNSIGNED   |    ubigint
+| 6   |  FLOAT             |    float
+| 7   |  DOUBLE            |    double
+| 8   |  BINARY            |    binary
+| 9   |  SMALLINT          |    smallint
+| 10  |  SMALLINT UNSIGNED |    usmallint
+| 11  |  TINYINT           |    tinyint
+| 12  |  TINYINT UNSIGNED  |    utinyint
+| 13  |  BOOL              |    bool
+| 14  |  NCHAR             |    nchar
+| 15  |  VARCHAR           |    varchar
+| 15  |  JSON              |    json
+
+注意：taosBenchmark 配置文件中数据类型必须小写方可识别
+
+
+

docs/zh/20-third-party/11-kafka.md

@@ -369,6 +369,9 @@ curl -X DELETE http://localhost:8083/connectors/TDengineSourceConnector
 8. `topic.per.stable`: 如果设置为 true，表示一个超级表对应一个 Kafka topic，topic的命名规则 `<topic.prefix><topic.delimiter><connection.database><topic.delimiter><stable.name>`；如果设置为 false，则指定的 DB 中的所有数据进入一个 Kafka topic，topic 的命名规则为 `<topic.prefix><topic.delimiter><connection.database>`
 9. `topic.ignore.db`: topic 命名规则是否包含 database 名称，true 表示规则为 `<topic.prefix><topic.delimiter><stable.name>`，false 表示规则为 `<topic.prefix><topic.delimiter><connection.database><topic.delimiter><stable.name>`，默认 false。此配置项在 `topic.per.stable` 设置为 false 时不生效。
 10. `topic.delimiter`: topic 名称分割符，默认为 `-`。
+11. `read.method`: 从 TDengine 读取数据方式，query 或是 subscription。默认为 subscription。
+12. `subscription.group.id`: 指定 TDengine 数据订阅的组 id，当 `read.method` 为 subscription 时，此项为必填项。
+13. `subscription.from`: 指定 TDengine 数据订阅起始位置，latest 或是 earliest。默认为 latest。
 
 ## 其他说明
 

docs/zh/20-third-party/13-dbeaver.md

@@ -8,21 +8,16 @@ DBeaver 是一款流行的跨平台数据库管理工具，方便开发者、数
 
 ## 前置条件
 
-### 安装 DBeaver
-
 使用 DBeaver 管理 TDengine 需要以下几方面的准备工作。
 
 - 安装 DBeaver。DBeaver 支持主流操作系统包括 Windows、macOS 和 Linux。请注意[下载](https://dbeaver.io/download/)正确平台和版本（23.1.1+）的安装包。详细安装步骤请参考 [DBeaver 官方文档](https://github.com/dbeaver/dbeaver/wiki/Installation)。
 - 如果使用独立部署的 TDengine 集群，请确认 TDengine 正常运行，并且 taosAdapter 已经安装并正常运行，具体细节请参考 [taosAdapter 的使用手册](/reference/taosadapter)。
-- 如果使用 TDengine Cloud，请[注册](https://cloud.taosdata.com/)相应账号。
-
-## 使用步骤
 
-### 使用 DBeaver 访问内部部署的 TDengine
+## 使用 DBeaver 访问内部部署的 TDengine
 
 1. 启动 DBeaver 应用，点击按钮或菜单项选择“连接到数据库”，然后在时间序列分类栏中选择 TDengine。
 
-![DBeaver 连接 TDengine](./dbeaver/dbeaver-connect-tdengine-zh.webp)
+ ![DBeaver 连接 TDengine](./dbeaver/dbeaver-connect-tdengine-zh.webp)
 
 2. 配置 TDengine 连接，填入主机地址、端口号、用户名和密码。如果 TDengine 部署在本机，可以只填用户名和密码，默认用户名为 root，默认密码为 taosdata。点击“测试连接”可以对连接是否可用进行测试。如果本机没有安装 TDengine Java
  连接器，DBeaver 会提示下载安装。
@@ -31,37 +26,12 @@ DBeaver 是一款流行的跨平台数据库管理工具，方便开发者、数
 
 3. 连接成功将显示如下图所示。如果显示连接失败，请检查 TDengine 服务和 taosAdapter 是否正确运行，主机地址、端口号、用户名和密码是否正确。
 
-![连接成功](./dbeaver/dbeaver-connect-tdengine-test-zh.webp)
+ ![连接成功](./dbeaver/dbeaver-connect-tdengine-test-zh.webp)
 
 4. 使用 DBeaver 选择数据库和表可以浏览 TDengine 服务的数据。
 
-![DBeaver 浏览 TDengine 数据](./dbeaver/dbeaver-browse-data-zh.webp)
+ ![DBeaver 浏览 TDengine 数据](./dbeaver/dbeaver-browse-data-zh.webp)
 
 5. 也可以通过执行 SQL 命令的方式对 TDengine 数据进行操作。
 
-![DBeaver SQL 命令](./dbeaver/dbeaver-sql-execution-zh.webp)
-
-### 使用 DBeaver 访问 TDengine Cloud
-
-1. 登录 TDengine Cloud 服务，在管理界面中选择“编程”和“Java”，然后复制 TDENGINE_JDBC_URL 的字符串值。
-
-![复制 TDengine Cloud DSN](./dbeaver/tdengine-cloud-jdbc-dsn-zh.webp)
-
-2. 启动 DBeaver 应用，点击按钮或菜单项选择“连接到数据库”，然后在时间序列分类栏中选择 TDengine Cloud。
-
-![DBeaver 连接 TDengine Cloud](./dbeaver/dbeaver-connect-tdengine-cloud-zh.webp)
-
-
-3. 配置 TDengine Cloud 连接，填入 JDBC_URL 值。点击“测试连接”，如果本机没有安装 TDengine Java
- 连接器，DBeaver 会提示下载安装。连接成功将显示如下图所示。如果显示连接失败，请检查 TDengine Cloud 服务是否启动，JDBC_URL 是否正确。
-
- ![配置 TDengine Cloud 连接](./dbeaver/dbeaver-connect-tdengine-cloud-test-zh.webp)
-
-4. 使用 DBeaver 选择数据库和表可以浏览 TDengine Cloud 服务的数据。
-
-![DBeaver 浏览 TDengine Cloud 数据](./dbeaver/dbeaver-browse-cloud-data-zh.webp)
-
-5. 也可以通过执行 SQL 命令的方式对 TDengine Cloud 数据进行操作。
-
-![DBeaver SQL 命令 操作 TDengine Cloud](./dbeaver/dbeaver-sql-execution-cloud-zh.webp)
-
+ ![DBeaver SQL 命令](./dbeaver/dbeaver-sql-execution-zh.webp)

examples/C#/taosdemo/README.md

@@ -36,7 +36,11 @@ dotnet build -c Release
 ## Usage
 
 ```
-Usage: mono taosdemo.exe [OPTION...]
+Usage with mono:
+$ mono taosdemo.exe [OPTION...]
+
+Usage with dotnet:
+Usage: .\bin\Release\net5.0\taosdemo.exe [OPTION...]
 
         --help                   Show usage.
 

examples/C#/taosdemo/taosdemo.cs

@@ -72,7 +72,7 @@ namespace TDengineDriver
             {
                 if ("--help" == argv[i])
                 {
-                    Console.WriteLine("Usage: mono taosdemo.exe [OPTION...]");
+                    Console.WriteLine("Usage: taosdemo.exe [OPTION...]");
                     Console.WriteLine("");
                     HelpPrint("--help", "Show usage.");
                     Console.WriteLine("");
@@ -305,7 +305,7 @@ namespace TDengineDriver
             this.conn = TDengine.Connect(this.host, this.user, this.password, db, this.port);
             if (this.conn == IntPtr.Zero)
             {
-                Console.WriteLine("Connect to TDengine failed");
+                Console.WriteLine("Connect to TDengine failed. Reason: {0}\n", TDengine.Error(0));
                 CleanAndExitProgram(1);
             }
             else

include/common/tmsg.h

@@ -106,7 +106,6 @@ enum {
   HEARTBEAT_KEY_DBINFO,
   HEARTBEAT_KEY_STBINFO,
   HEARTBEAT_KEY_TMQ,
-  HEARTBEAT_KEY_USER_PASSINFO,
 };
 
 typedef enum _mgmt_table {
@@ -636,6 +635,7 @@ typedef struct {
   SEpSet   epSet;
   int32_t  svrTimestamp;
   int32_t  passVer;
+  int32_t  authVer;
   char     sVer[TSDB_VERSION_LEN];
   char     sDetailVer[128];
 } SConnectRsp;
@@ -703,6 +703,7 @@ int32_t tDeserializeSGetUserAuthReq(void* buf, int32_t bufLen, SGetUserAuthReq*
 typedef struct {
   char      user[TSDB_USER_LEN];
   int32_t   version;
+  int32_t   passVer;
   int8_t    superAuth;
   int8_t    sysInfo;
   int8_t    enable;
@@ -719,14 +720,6 @@ int32_t tSerializeSGetUserAuthRsp(void* buf, int32_t bufLen, SGetUserAuthRsp* pR
 int32_t tDeserializeSGetUserAuthRsp(void* buf, int32_t bufLen, SGetUserAuthRsp* pRsp);
 void    tFreeSGetUserAuthRsp(SGetUserAuthRsp* pRsp);
 
-typedef struct SUserPassVersion {
-  char    user[TSDB_USER_LEN];
-  int32_t version;
-} SUserPassVersion;
-
-typedef SGetUserAuthReq SGetUserPassReq;
-typedef SUserPassVersion SGetUserPassRsp;
-
 /*
  * for client side struct, only column id, type, bytes are necessary
  * But for data in vnode side, we need all the following information.
@@ -1070,14 +1063,6 @@ int32_t tSerializeSUserAuthBatchRsp(void* buf, int32_t bufLen, SUserAuthBatchRsp
 int32_t tDeserializeSUserAuthBatchRsp(void* buf, int32_t bufLen, SUserAuthBatchRsp* pRsp);
 void    tFreeSUserAuthBatchRsp(SUserAuthBatchRsp* pRsp);
 
-typedef struct {
-  SArray* pArray;  // Array of SGetUserPassRsp
-} SUserPassBatchRsp;
-
-int32_t tSerializeSUserPassBatchRsp(void* buf, int32_t bufLen, SUserPassBatchRsp* pRsp);
-int32_t tDeserializeSUserPassBatchRsp(void* buf, int32_t bufLen, SUserPassBatchRsp* pRsp);
-void    tFreeSUserPassBatchRsp(SUserPassBatchRsp* pRsp);
-
 typedef struct {
   char        db[TSDB_DB_FNAME_LEN];
   STimeWindow timeRange;

include/libs/parser/parser.h

@@ -58,6 +58,7 @@ typedef struct SParseContext {
   bool             isSuperUser;
   bool             enableSysInfo;
   bool             async;
+  bool             hasInvisibleCol;
   const char*      svrVer;
   bool             nodeOffline;
   SArray*          pTableMetaPos;    // sql table pos => catalog data pos

include/libs/transport/trpc.h

@@ -46,6 +46,7 @@ typedef struct SRpcHandleInfo {
   int8_t  noResp;         // has response or not(default 0, 0: resp, 1: no resp)
   int8_t  persistHandle;  // persist handle or not
   int8_t  hasEpSet;
+  int32_t cliVer;
 
   // app info
   void *ahandle;  // app handle set by client
@@ -83,6 +84,7 @@ typedef struct SRpcInit {
   int32_t  sessions;      // number of sessions allowed
   int8_t   connType;      // TAOS_CONN_UDP, TAOS_CONN_TCPC, TAOS_CONN_TCPS
   int32_t  idleTime;      // milliseconds, 0 means idle timer is disabled
+  int32_t  compatibilityVer;
 
   int32_t retryMinInterval;  // retry init interval
   int32_t retryStepFactor;   // retry interval factor

include/util/taoserror.h

@@ -757,9 +757,8 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_RSMA_INVALID_SCHEMA            TAOS_DEF_ERROR_CODE(0, 0x3153)
 #define TSDB_CODE_RSMA_STREAM_STATE_OPEN         TAOS_DEF_ERROR_CODE(0, 0x3154)
 #define TSDB_CODE_RSMA_STREAM_STATE_COMMIT       TAOS_DEF_ERROR_CODE(0, 0x3155)
-#define TSDB_CODE_RSMA_FS_REF                    TAOS_DEF_ERROR_CODE(0, 0x3156)
-#define TSDB_CODE_RSMA_FS_SYNC                   TAOS_DEF_ERROR_CODE(0, 0x3157)
-#define TSDB_CODE_RSMA_FS_UPDATE                 TAOS_DEF_ERROR_CODE(0, 0x3158)
+#define TSDB_CODE_RSMA_FS_SYNC                   TAOS_DEF_ERROR_CODE(0, 0x3156)
+#define TSDB_CODE_RSMA_RESULT                    TAOS_DEF_ERROR_CODE(0, 0x3157)
 
 //index
 #define TSDB_CODE_INDEX_REBUILDING               TAOS_DEF_ERROR_CODE(0, 0x3200)
@@ -775,6 +774,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_TMQ_CONSUMER_ERROR             TAOS_DEF_ERROR_CODE(0, 0x4003)
 #define TSDB_CODE_TMQ_TOPIC_OUT_OF_RANGE         TAOS_DEF_ERROR_CODE(0, 0x4004)
 #define TSDB_CODE_TMQ_GROUP_OUT_OF_RANGE         TAOS_DEF_ERROR_CODE(0, 0x4005)
+#define TSDB_CODE_TMQ_SNAPSHOT_ERROR             TAOS_DEF_ERROR_CODE(0, 0x4006)
 
 // stream
 #define TSDB_CODE_STREAM_TASK_NOT_EXIST          TAOS_DEF_ERROR_CODE(0, 0x4100)

packaging/checkPackageRuning.py

@@ -87,7 +87,7 @@ os.system("rm -rf /tmp/dumpdata/*")
 # dump data out 
 print("taosdump dump out data")
 
-os.system("taosdump -o /tmp/dumpdata -D test -y -h %s  "%serverHost)
+os.system("taosdump -o /tmp/dumpdata -D test -h %s  "%serverHost)
 
 # drop database of test
 print("drop database test")
@@ -95,7 +95,7 @@ os.system(" taos -s ' drop database test ;'  -h %s  "%serverHost)
 
 # dump data in 
 print("taosdump dump data in")
-os.system("taosdump -i /tmp/dumpdata  -y  -h %s  "%serverHost)
+os.system("taosdump -i /tmp/dumpdata -h %s  "%serverHost)
 
 result = conn.query("SELECT count(*) from test.meters")
 

source/client/inc/clientInt.h

@@ -63,7 +63,7 @@ typedef struct {
   // statistics
   int32_t reportCnt;
   int32_t connKeyCnt;
-  int32_t passKeyCnt;   // with passVer call back
+  int8_t  connHbFlag;   // 0 init, 1 send req, 2 get resp
   int64_t reportBytes;  // not implemented
   int64_t startTime;
   // ctl
@@ -83,8 +83,9 @@ typedef struct {
   int8_t        threadStop;
   int8_t        quitByKill;
   TdThread      thread;
-  TdThreadMutex lock;  // used when app init and cleanup
+  TdThreadMutex lock;       // used when app init and cleanup
   SHashObj*     appSummary;
+  SHashObj*     appHbHash;  // key: clusterId
   SArray*       appHbMgrs;  // SArray<SAppHbMgr*> one for each cluster
   FHbReqHandle  reqHandle[CONN_TYPE__MAX];
   FHbRspHandle  rspHandle[CONN_TYPE__MAX];
@@ -146,6 +147,7 @@ typedef struct STscObj {
   int64_t       id;         // ref ID returned by taosAddRef
   TdThreadMutex mutex;      // used to protect the operation on db
   int32_t       numOfReqs;  // number of sqlObj bound to this connection
+  int32_t       authVer;
   SAppInstInfo* pAppInfo;
   SHashObj*     pRequests;
   SPassInfo     passInfo;

source/client/src/clientEnv.c

@@ -29,6 +29,7 @@
 #include "trpc.h"
 #include "tsched.h"
 #include "ttime.h"
+#include "tversion.h"
 
 #if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
 #include "cus_name.h"
@@ -111,7 +112,8 @@ static void deregisterRequest(SRequestObj *pRequest) {
     atomic_add_fetch_64((int64_t *)&pActivity->numOfSlowQueries, 1);
     if (tsSlowLogScope & reqType) {
       taosPrintSlowLog("PID:%d, Conn:%u, QID:0x%" PRIx64 ", Start:%" PRId64 ", Duration:%" PRId64 "us, SQL:%s",
-        taosGetPId(), pTscObj->connId, pRequest->requestId, pRequest->metric.start, duration, pRequest->sqlstr);
+                       taosGetPId(), pTscObj->connId, pRequest->requestId, pRequest->metric.start, duration,
+                       pRequest->sqlstr);
     }
   }
 
@@ -175,6 +177,8 @@ 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");
@@ -358,17 +362,16 @@ int32_t releaseRequest(int64_t rid) { return taosReleaseRef(clientReqRefPool, ri
 
 int32_t removeRequest(int64_t rid) { return taosRemoveRef(clientReqRefPool, rid); }
 
-
 void destroySubRequests(SRequestObj *pRequest) {
-  int32_t reqIdx = -1;
+  int32_t      reqIdx = -1;
   SRequestObj *pReqList[16] = {NULL};
-  uint64_t tmpRefId = 0;
+  uint64_t     tmpRefId = 0;
 
   if (pRequest->relation.userRefId && pRequest->relation.userRefId != pRequest->self) {
     return;
   }
-  
-  SRequestObj* pTmp = pRequest;
+
+  SRequestObj *pTmp = pRequest;
   while (pTmp->relation.prevRefId) {
     tmpRefId = pTmp->relation.prevRefId;
     pTmp = acquireRequest(tmpRefId);
@@ -376,9 +379,9 @@ void destroySubRequests(SRequestObj *pRequest) {
       pReqList[++reqIdx] = pTmp;
       releaseRequest(tmpRefId);
     } else {
-      tscError("0x%" PRIx64 ", prev req ref 0x%" PRIx64 " is not there, reqId:0x%" PRIx64, pTmp->self,
-               tmpRefId, pTmp->requestId);
-      break;         
+      tscError("0x%" PRIx64 ", prev req ref 0x%" PRIx64 " is not there, reqId:0x%" PRIx64, pTmp->self, tmpRefId,
+               pTmp->requestId);
+      break;
     }
   }
 
@@ -391,16 +394,15 @@ void destroySubRequests(SRequestObj *pRequest) {
     pTmp = acquireRequest(tmpRefId);
     if (pTmp) {
       tmpRefId = pTmp->relation.nextRefId;
-      removeRequest(pTmp->self);      
+      removeRequest(pTmp->self);
       releaseRequest(pTmp->self);
     } else {
       tscError("0x%" PRIx64 " is not there", tmpRefId);
-      break;         
+      break;
     }
   }
 }
 
-
 void doDestroyRequest(void *p) {
   if (NULL == p) {
     return;
@@ -412,7 +414,7 @@ void doDestroyRequest(void *p) {
   tscTrace("begin to destroy request %" PRIx64 " p:%p", reqId, pRequest);
 
   destroySubRequests(pRequest);
-  
+
   taosHashRemove(pRequest->pTscObj->pRequests, &pRequest->self, sizeof(pRequest->self));
 
   schedulerFreeJob(&pRequest->body.queryJob, 0);
@@ -473,15 +475,15 @@ void taosStopQueryImpl(SRequestObj *pRequest) {
 }
 
 void stopAllQueries(SRequestObj *pRequest) {
-  int32_t reqIdx = -1;
+  int32_t      reqIdx = -1;
   SRequestObj *pReqList[16] = {NULL};
-  uint64_t tmpRefId = 0;
+  uint64_t     tmpRefId = 0;
 
   if (pRequest->relation.userRefId && pRequest->relation.userRefId != pRequest->self) {
     return;
   }
-  
-  SRequestObj* pTmp = pRequest;
+
+  SRequestObj *pTmp = pRequest;
   while (pTmp->relation.prevRefId) {
     tmpRefId = pTmp->relation.prevRefId;
     pTmp = acquireRequest(tmpRefId);
@@ -489,9 +491,9 @@ void stopAllQueries(SRequestObj *pRequest) {
       pReqList[++reqIdx] = pTmp;
       releaseRequest(tmpRefId);
     } else {
-      tscError("0x%" PRIx64 ", prev req ref 0x%" PRIx64 " is not there, reqId:0x%" PRIx64, pTmp->self,
-               tmpRefId, pTmp->requestId);
-      break;         
+      tscError("0x%" PRIx64 ", prev req ref 0x%" PRIx64 " is not there, reqId:0x%" PRIx64, pTmp->self, tmpRefId,
+               pTmp->requestId);
+      break;
     }
   }
 
@@ -510,12 +512,11 @@ void stopAllQueries(SRequestObj *pRequest) {
       releaseRequest(pTmp->self);
     } else {
       tscError("0x%" PRIx64 " is not there", tmpRefId);
-      break;         
+      break;
     }
   }
 }
 
-
 void crashReportThreadFuncUnexpectedStopped(void) { atomic_store_32(&clientStop, -1); }
 
 static void *tscCrashReportThreadFp(void *param) {

source/client/src/clientHb.c

@@ -22,10 +22,10 @@
 typedef struct {
   union {
     struct {
-      int64_t clusterId;
-      int32_t passKeyCnt;
-      int32_t passVer;
-      int32_t reqCnt;
+      SAppHbMgr *pAppHbMgr;
+      int64_t    clusterId;
+      int32_t    reqCnt;
+      int8_t     connHbFlag;
     };
   };
 } SHbParam;
@@ -34,12 +34,14 @@ static SClientHbMgr clientHbMgr = {0};
 
 static int32_t hbCreateThread();
 static void    hbStopThread();
+static int32_t hbUpdateUserAuthInfo(SAppHbMgr *pAppHbMgr, SUserAuthBatchRsp *batchRsp);
 
 static int32_t hbMqHbReqHandle(SClientHbKey *connKey, void *param, SClientHbReq *req) { return 0; }
 
 static int32_t hbMqHbRspHandle(SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) { return 0; }
 
-static int32_t hbProcessUserAuthInfoRsp(void *value, int32_t valueLen, struct SCatalog *pCatalog) {
+static int32_t hbProcessUserAuthInfoRsp(void *value, int32_t valueLen, struct SCatalog *pCatalog,
+                                        SAppHbMgr *pAppHbMgr) {
   int32_t code = 0;
 
   SUserAuthBatchRsp batchRsp = {0};
@@ -56,54 +58,68 @@ static int32_t hbProcessUserAuthInfoRsp(void *value, int32_t valueLen, struct SC
     catalogUpdateUserAuthInfo(pCatalog, rsp);
   }
 
+  if (numOfBatchs > 0) hbUpdateUserAuthInfo(pAppHbMgr, &batchRsp);
+
+  atomic_val_compare_exchange_8(&pAppHbMgr->connHbFlag, 1, 2);
+
   taosArrayDestroy(batchRsp.pArray);
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t hbProcessUserPassInfoRsp(void *value, int32_t valueLen, SClientHbKey *connKey, SAppHbMgr *pAppHbMgr) {
-  int32_t           code = 0;
-  int32_t           numOfBatchs = 0;
-  SUserPassBatchRsp batchRsp = {0};
-  if (tDeserializeSUserPassBatchRsp(value, valueLen, &batchRsp) != 0) {
-    code = TSDB_CODE_INVALID_MSG;
-    return code;
-  }
-
-  numOfBatchs = taosArrayGetSize(batchRsp.pArray);
-
-  SClientHbReq *pReq = NULL;
-  while ((pReq = taosHashIterate(pAppHbMgr->activeInfo, pReq))) {
-    STscObj *pTscObj = (STscObj *)acquireTscObj(pReq->connKey.tscRid);
-    if (!pTscObj) {
-      continue;
-    }
-    SPassInfo *passInfo = &pTscObj->passInfo;
-    if (!passInfo->fp) {
-      releaseTscObj(pReq->connKey.tscRid);
+static int32_t hbUpdateUserAuthInfo(SAppHbMgr *pAppHbMgr, SUserAuthBatchRsp *batchRsp) {
+  uint64_t clusterId = pAppHbMgr->pAppInstInfo->clusterId;
+  for (int i = 0; i < TARRAY_SIZE(clientHbMgr.appHbMgrs); ++i) {
+    SAppHbMgr *hbMgr = taosArrayGetP(clientHbMgr.appHbMgrs, i);
+    if (!hbMgr || hbMgr->pAppInstInfo->clusterId != clusterId) {
       continue;
     }
 
-    for (int32_t i = 0; i < numOfBatchs; ++i) {
-      SGetUserPassRsp *rsp = taosArrayGet(batchRsp.pArray, i);
-      if (0 == strncmp(rsp->user, pTscObj->user, TSDB_USER_LEN)) {
-        int32_t oldVer = atomic_load_32(&passInfo->ver);
-        if (oldVer < rsp->version) {
-          atomic_store_32(&passInfo->ver, rsp->version);
+    SClientHbReq    *pReq = NULL;
+    SGetUserAuthRsp *pRsp = NULL;
+    while ((pReq = taosHashIterate(hbMgr->activeInfo, pReq))) {
+      STscObj *pTscObj = (STscObj *)acquireTscObj(pReq->connKey.tscRid);
+      if (!pTscObj) {
+        continue;
+      }
+
+      if (!pRsp) {
+        for (int32_t j = 0; j < TARRAY_SIZE(batchRsp->pArray); ++j) {
+          SGetUserAuthRsp *rsp = TARRAY_GET_ELEM(batchRsp->pArray, j);
+          if (0 == strncmp(rsp->user, pTscObj->user, TSDB_USER_LEN)) {
+            pRsp = rsp;
+            break;
+          }
+        }
+        if (!pRsp) {
+          releaseTscObj(pReq->connKey.tscRid);
+          break;
+        }
+      }
+
+      pTscObj->authVer = pRsp->version;
+
+      if (pTscObj->sysInfo != pRsp->sysInfo) {
+        tscDebug("update sysInfo of user %s from %" PRIi8 " to %" PRIi8 ", tscRid:%" PRIi64, pRsp->user,
+                 pTscObj->sysInfo, pRsp->sysInfo, pTscObj->id);
+        pTscObj->sysInfo = pRsp->sysInfo;
+      }
+
+      if (pTscObj->passInfo.fp) {
+        SPassInfo *passInfo = &pTscObj->passInfo;
+        int32_t    oldVer = atomic_load_32(&passInfo->ver);
+        if (oldVer < pRsp->passVer) {
+          atomic_store_32(&passInfo->ver, pRsp->passVer);
           if (passInfo->fp) {
-            (*passInfo->fp)(passInfo->param, &passInfo->ver, TAOS_NOTIFY_PASSVER);
+            (*passInfo->fp)(passInfo->param, &pRsp->passVer, TAOS_NOTIFY_PASSVER);
           }
-          tscDebug("update passVer of user %s from %d to %d, tscRid:%" PRIi64, rsp->user, oldVer,
+          tscDebug("update passVer of user %s from %d to %d, tscRid:%" PRIi64, pRsp->user, oldVer,
                    atomic_load_32(&passInfo->ver), pTscObj->id);
         }
-        break;
       }
+      releaseTscObj(pReq->connKey.tscRid);
     }
-    releaseTscObj(pReq->connKey.tscRid);
   }
-
-  taosArrayDestroy(batchRsp.pArray);
-
-  return code;
+  return 0;
 }
 
 static int32_t hbGenerateVgInfoFromRsp(SDBVgInfo **pInfo, SUseDbRsp *rsp) {
@@ -121,7 +137,6 @@ static int32_t hbGenerateVgInfoFromRsp(SDBVgInfo **pInfo, SUseDbRsp *rsp) {
   vgInfo->hashSuffix = rsp->hashSuffix;
   vgInfo->vgHash = taosHashInit(rsp->vgNum, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, HASH_ENTRY_LOCK);
   if (NULL == vgInfo->vgHash) {
-    taosMemoryFree(vgInfo);
     tscError("hash init[%d] failed", rsp->vgNum);
     code = TSDB_CODE_OUT_OF_MEMORY;
     goto _return;
@@ -131,8 +146,6 @@ static int32_t hbGenerateVgInfoFromRsp(SDBVgInfo **pInfo, SUseDbRsp *rsp) {
     SVgroupInfo *pInfo = taosArrayGet(rsp->pVgroupInfos, j);
     if (taosHashPut(vgInfo->vgHash, &pInfo->vgId, sizeof(int32_t), pInfo, sizeof(SVgroupInfo)) != 0) {
       tscError("hash push failed, errno:%d", errno);
-      taosHashCleanup(vgInfo->vgHash);
-      taosMemoryFree(vgInfo);
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _return;
     }
@@ -316,7 +329,7 @@ static int32_t hbQueryHbRspHandle(SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) {
           break;
         }
 
-        hbProcessUserAuthInfoRsp(kv->value, kv->valueLen, pCatalog);
+        hbProcessUserAuthInfoRsp(kv->value, kv->valueLen, pCatalog, pAppHbMgr);
         break;
       }
       case HEARTBEAT_KEY_DBINFO: {
@@ -353,15 +366,6 @@ static int32_t hbQueryHbRspHandle(SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) {
         hbProcessStbInfoRsp(kv->value, kv->valueLen, pCatalog);
         break;
       }
-      case HEARTBEAT_KEY_USER_PASSINFO: {
-        if (kv->valueLen <= 0 || NULL == kv->value) {
-          tscError("invalid hb user pass info, len:%d, value:%p", kv->valueLen, kv->value);
-          break;
-        }
-
-        hbProcessUserPassInfoRsp(kv->value, kv->valueLen, &pRsp->connKey, pAppHbMgr);
-        break;
-      }
       default:
         tscError("invalid hb key type:%d", kv->key);
         break;
@@ -479,7 +483,6 @@ int32_t hbBuildQueryDesc(SQueryHbReqBasic *hbBasic, STscObj *pObj) {
       if (code) {
         taosArrayDestroy(desc.subDesc);
         desc.subDesc = NULL;
-        desc.subPlanNum = 0;
       }
       desc.subPlanNum = taosArrayGetSize(desc.subDesc);
     } else {
@@ -543,7 +546,7 @@ int32_t hbGetQueryBasicInfo(SClientHbKey *connKey, SClientHbReq *req) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t hbGetUserBasicInfo(SClientHbKey *connKey, SHbParam *param, SClientHbReq *req) {
+static int32_t hbGetUserAuthInfo(SClientHbKey *connKey, SHbParam *param, SClientHbReq *req) {
   STscObj *pTscObj = (STscObj *)acquireTscObj(connKey->tscRid);
   if (!pTscObj) {
     tscWarn("tscObj rid %" PRIx64 " not exist", connKey->tscRid);
@@ -552,46 +555,61 @@ static int32_t hbGetUserBasicInfo(SClientHbKey *connKey, SHbParam *param, SClien
 
   int32_t code = 0;
 
-  if (param && (param->passVer != INT32_MIN) && (param->passVer <= pTscObj->passInfo.ver)) {
-    tscDebug("hb got user basic info, no need since passVer %d <= %d", param->passVer, pTscObj->passInfo.ver);
+  SKv  kv = {.key = HEARTBEAT_KEY_USER_AUTHINFO};
+  SKv *pKv = NULL;
+  if ((pKv = taosHashGet(req->info, &kv.key, sizeof(kv.key)))) {
+    int32_t           userNum = pKv->valueLen / sizeof(SUserAuthVersion);
+    SUserAuthVersion *userAuths = (SUserAuthVersion *)pKv->value;
+    for (int32_t i = 0; i < userNum; ++i) {
+      SUserAuthVersion *pUserAuth = userAuths + i;
+      // both key and user exist, update version
+      if (strncmp(pUserAuth->user, pTscObj->user, TSDB_USER_LEN) == 0) {
+        pUserAuth->version = htonl(-1);  // force get userAuthInfo
+        goto _return;
+      }
+    }
+    // key exists, user not exist, append user
+    SUserAuthVersion *qUserAuth =
+        (SUserAuthVersion *)taosMemoryRealloc(pKv->value, (userNum + 1) * sizeof(SUserAuthVersion));
+    if (qUserAuth) {
+      strncpy((qUserAuth + userNum)->user, pTscObj->user, TSDB_USER_LEN);
+      (qUserAuth + userNum)->version = htonl(-1);  // force get userAuthInfo
+      pKv->value = qUserAuth;
+      pKv->valueLen += sizeof(SUserAuthVersion);
+    } else {
+      code = TSDB_CODE_OUT_OF_MEMORY;
+    }
     goto _return;
   }
 
-  SUserPassVersion *user = taosMemoryMalloc(sizeof(SUserPassVersion));
+  // key/user not exist, add user
+  SUserAuthVersion *user = taosMemoryMalloc(sizeof(SUserAuthVersion));
   if (!user) {
     code = TSDB_CODE_OUT_OF_MEMORY;
     goto _return;
   }
-  strncpy(user->user, pTscObj->user, TSDB_USER_LEN);
-  user->version = htonl(pTscObj->passInfo.ver);
+  tstrncpy(user->user, pTscObj->user, TSDB_USER_LEN);
+  user->version = htonl(-1);  // force get userAuthInfo
+  kv.valueLen = sizeof(SUserAuthVersion);
+  kv.value = user;
 
-  SKv kv = {
-      .key = HEARTBEAT_KEY_USER_PASSINFO,
-      .valueLen = sizeof(SUserPassVersion),
-      .value = user,
-  };
-
-  tscDebug("hb got user basic info, valueLen:%d, user:%s, passVer:%d, tscRid:%" PRIi64, kv.valueLen, user->user,
-           pTscObj->passInfo.ver, connKey->tscRid);
+  tscDebug("hb got user auth info, valueLen:%d, user:%s, authVer:%d, tscRid:%" PRIi64, kv.valueLen, user->user,
+           pTscObj->authVer, connKey->tscRid);
 
   if (!req->info) {
     req->info = taosHashInit(64, hbKeyHashFunc, 1, HASH_ENTRY_LOCK);
   }
 
   if (taosHashPut(req->info, &kv.key, sizeof(kv.key), &kv, sizeof(kv)) < 0) {
+    taosMemoryFree(user);
     code = terrno ? terrno : TSDB_CODE_APP_ERROR;
     goto _return;
   }
 
-  // assign the passVer
-  if (param) {
-    param->passVer = pTscObj->passInfo.ver;
-  }
-
 _return:
   releaseTscObj(connKey->tscRid);
   if (code) {
-    tscError("hb got user basic info failed since %s", terrstr(code));
+    tscError("hb got user auth info failed since %s", terrstr(code));
   }
 
   return code;
@@ -749,14 +767,21 @@ int32_t hbQueryHbReqHandle(SClientHbKey *connKey, void *param, SClientHbReq *req
 
   hbGetQueryBasicInfo(connKey, req);
 
-  if (hbParam->passKeyCnt > 0) {
-    hbGetUserBasicInfo(connKey, hbParam, req);
-  }
-
   if (hbParam->reqCnt == 0) {
-    code = hbGetExpiredUserInfo(connKey, pCatalog, req);
-    if (TSDB_CODE_SUCCESS != code) {
-      return code;
+    if (!taosHashGet(clientHbMgr.appHbHash, &hbParam->clusterId, sizeof(hbParam->clusterId))) {
+      code = hbGetExpiredUserInfo(connKey, pCatalog, req);
+      if (TSDB_CODE_SUCCESS != code) {
+        return code;
+      }
+    }
+
+    // invoke after hbGetExpiredUserInfo
+    if (2 != atomic_load_8(&hbParam->pAppHbMgr->connHbFlag)) {
+      code = hbGetUserAuthInfo(connKey, hbParam, req);
+      if (TSDB_CODE_SUCCESS != code) {
+        return code;
+      }
+      atomic_store_8(&hbParam->pAppHbMgr->connHbFlag, 1);
     }
 
     code = hbGetExpiredDBInfo(connKey, pCatalog, req);
@@ -770,7 +795,7 @@ int32_t hbQueryHbReqHandle(SClientHbKey *connKey, void *param, SClientHbReq *req
     }
   }
 
-  ++hbParam->reqCnt; // success to get catalog info
+  ++hbParam->reqCnt;  // success to get catalog info
 
   return TSDB_CODE_SUCCESS;
 }
@@ -815,9 +840,9 @@ SClientHbBatchReq *hbGatherAllInfo(SAppHbMgr *pAppHbMgr) {
         if (param.clusterId == 0) {
           // init
           param.clusterId = pOneReq->clusterId;
-          param.passVer = INT32_MIN;
+          param.pAppHbMgr = pAppHbMgr;
+          param.connHbFlag = atomic_load_8(&pAppHbMgr->connHbFlag);
         }
-        param.passKeyCnt = atomic_load_32(&pAppHbMgr->passKeyCnt);
         break;
       }
       default:
@@ -901,6 +926,10 @@ static void *hbThreadFunc(void *param) {
     int sz = taosArrayGetSize(clientHbMgr.appHbMgrs);
     if (sz > 0) {
       hbGatherAppInfo();
+      if (sz > 1 && !clientHbMgr.appHbHash) {
+        clientHbMgr.appHbHash = taosHashInit(0, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false, HASH_NO_LOCK);
+      }
+      taosHashClear(clientHbMgr.appHbHash);
     }
 
     for (int i = 0; i < sz; i++) {
@@ -953,7 +982,7 @@ static void *hbThreadFunc(void *param) {
       asyncSendMsgToServer(pAppInstInfo->pTransporter, &epSet, &transporterId, pInfo);
       tFreeClientHbBatchReq(pReq);
       // hbClearReqInfo(pAppHbMgr);
-
+      taosHashPut(clientHbMgr.appHbHash, &pAppHbMgr->pAppInstInfo->clusterId, sizeof(uint64_t), NULL, 0);
       atomic_add_fetch_32(&pAppHbMgr->reportCnt, 1);
     }
 
@@ -961,6 +990,7 @@ static void *hbThreadFunc(void *param) {
 
     taosMsleep(HEARTBEAT_INTERVAL);
   }
+  taosHashCleanup(clientHbMgr.appHbHash);
   return NULL;
 }
 
@@ -1009,7 +1039,7 @@ SAppHbMgr *appHbMgrInit(SAppInstInfo *pAppInstInfo, char *key) {
   // init stat
   pAppHbMgr->startTime = taosGetTimestampMs();
   pAppHbMgr->connKeyCnt = 0;
-  pAppHbMgr->passKeyCnt = 0;
+  pAppHbMgr->connHbFlag = 0;
   pAppHbMgr->reportCnt = 0;
   pAppHbMgr->reportBytes = 0;
   pAppHbMgr->key = taosStrdup(key);
@@ -1127,7 +1157,6 @@ void hbMgrCleanUp() {
   appHbMgrCleanup();
   taosArrayDestroy(clientHbMgr.appHbMgrs);
   taosThreadMutexUnlock(&clientHbMgr.lock);
-
   clientHbMgr.appHbMgrs = NULL;
 }
 
@@ -1180,12 +1209,6 @@ void hbDeregisterConn(STscObj *pTscObj, SClientHbKey connKey) {
   }
 
   atomic_sub_fetch_32(&pAppHbMgr->connKeyCnt, 1);
-
-  taosThreadMutexLock(&pTscObj->mutex);
-  if (pTscObj->passInfo.fp) {
-    atomic_sub_fetch_32(&pAppHbMgr->passKeyCnt, 1);
-  }
-  taosThreadMutexUnlock(&pTscObj->mutex);
 }
 
 // set heart beat thread quit mode , if quicByKill 1 then kill thread else quit from inner

source/client/src/clientImpl.c

@@ -26,7 +26,7 @@
 #include "tpagedbuf.h"
 #include "tref.h"
 #include "tsched.h"
-
+#include "tversion.h"
 static int32_t       initEpSetFromCfg(const char* firstEp, const char* secondEp, SCorEpSet* pEpSet);
 static SMsgSendInfo* buildConnectMsg(SRequestObj* pRequest);
 
@@ -237,8 +237,9 @@ int32_t buildRequest(uint64_t connId, const char* sql, int sqlLen, void* param,
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t buildPreviousRequest(SRequestObj *pRequest, const char* sql, SRequestObj** pNewRequest) {
-  int32_t code = buildRequest(pRequest->pTscObj->id, sql, strlen(sql), pRequest, pRequest->validateOnly, pNewRequest, 0);
+int32_t buildPreviousRequest(SRequestObj* pRequest, const char* sql, SRequestObj** pNewRequest) {
+  int32_t code =
+      buildRequest(pRequest->pTscObj->id, sql, strlen(sql), pRequest, pRequest->validateOnly, pNewRequest, 0);
   if (TSDB_CODE_SUCCESS == code) {
     pRequest->relation.prevRefId = (*pNewRequest)->self;
     (*pNewRequest)->relation.nextRefId = pRequest->self;
@@ -502,8 +503,7 @@ void setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t
     pResInfo->userFields[i].bytes = pSchema[i].bytes;
     pResInfo->userFields[i].type = pSchema[i].type;
 
-    if (pSchema[i].type == TSDB_DATA_TYPE_VARCHAR ||
-        pSchema[i].type == TSDB_DATA_TYPE_GEOMETRY) {
+    if (pSchema[i].type == TSDB_DATA_TYPE_VARCHAR || pSchema[i].type == TSDB_DATA_TYPE_GEOMETRY) {
       pResInfo->userFields[i].bytes -= VARSTR_HEADER_SIZE;
     } else if (pSchema[i].type == TSDB_DATA_TYPE_NCHAR || pSchema[i].type == TSDB_DATA_TYPE_JSON) {
       pResInfo->userFields[i].bytes = (pResInfo->userFields[i].bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE;
@@ -891,7 +891,7 @@ static bool incompletaFileParsing(SNode* pStmt) {
 
 void continuePostSubQuery(SRequestObj* pRequest, TAOS_ROW row) {
   SSqlCallbackWrapper* pWrapper = pRequest->pWrapper;
-  int32_t code = nodesAcquireAllocator(pWrapper->pParseCtx->allocatorId);
+  int32_t              code = nodesAcquireAllocator(pWrapper->pParseCtx->allocatorId);
   if (TSDB_CODE_SUCCESS == code) {
     int64_t analyseStart = taosGetTimestampUs();
     code = qContinueParsePostQuery(pWrapper->pParseCtx, pRequest->pQuery, (void**)row);
@@ -934,7 +934,7 @@ void postSubQueryFetchCb(void* param, TAOS_RES* res, int32_t rowNum) {
 
   TAOS_ROW row = NULL;
   if (rowNum > 0) {
-    row = taos_fetch_row(res); // for single row only now
+    row = taos_fetch_row(res);  // for single row only now
   }
 
   SRequestObj* pNextReq = acquireRequest(pRequest->relation.nextRefId);
@@ -2135,6 +2135,7 @@ TSDB_SERVER_STATUS taos_check_server_status(const char* fqdn, int port, char* de
   connLimitNum = TMIN(connLimitNum, 500);
   rpcInit.connLimitNum = connLimitNum;
   rpcInit.timeToGetConn = tsTimeToGetAvailableConn;
+  taosVersionStrToInt(version, &(rpcInit.compatibilityVer));
 
   clientRpc = rpcOpen(&rpcInit);
   if (clientRpc == NULL) {
@@ -2494,11 +2495,10 @@ TAOS_RES* taosQueryImplWithReqid(TAOS* taos, const char* sql, bool validateOnly,
   return pRequest;
 }
 
+static void fetchCallback(void* pResult, void* param, int32_t code) {
+  SRequestObj* pRequest = (SRequestObj*)param;
 
-static void fetchCallback(void *pResult, void *param, int32_t code) {
-  SRequestObj *pRequest = (SRequestObj *)param;
-
-  SReqResultInfo *pResultInfo = &pRequest->body.resInfo;
+  SReqResultInfo* pResultInfo = &pRequest->body.resInfo;
 
   tscDebug("0x%" PRIx64 " enter scheduler fetch cb, code:%d - %s, reqId:0x%" PRIx64, pRequest->self, code,
            tstrerror(code), pRequest->requestId);
@@ -2520,7 +2520,7 @@ static void fetchCallback(void *pResult, void *param, int32_t code) {
   }
 
   pRequest->code =
-      setQueryResultFromRsp(pResultInfo, (const SRetrieveTableRsp *)pResultInfo->pData, pResultInfo->convertUcs4, true);
+      setQueryResultFromRsp(pResultInfo, (const SRetrieveTableRsp*)pResultInfo->pData, pResultInfo->convertUcs4, true);
   if (pRequest->code != TSDB_CODE_SUCCESS) {
     pResultInfo->numOfRows = 0;
     pRequest->code = code;
@@ -2531,19 +2531,19 @@ static void fetchCallback(void *pResult, void *param, int32_t code) {
              pRequest->self, pResultInfo->numOfRows, pResultInfo->totalRows, pResultInfo->completed,
              pRequest->requestId);
 
-    STscObj            *pTscObj = pRequest->pTscObj;
-    SAppClusterSummary *pActivity = &pTscObj->pAppInfo->summary;
-    atomic_add_fetch_64((int64_t *)&pActivity->fetchBytes, pRequest->body.resInfo.payloadLen);
+    STscObj*            pTscObj = pRequest->pTscObj;
+    SAppClusterSummary* pActivity = &pTscObj->pAppInfo->summary;
+    atomic_add_fetch_64((int64_t*)&pActivity->fetchBytes, pRequest->body.resInfo.payloadLen);
   }
 
   pRequest->body.fetchFp(pRequest->body.param, pRequest, pResultInfo->numOfRows);
 }
 
-void taosAsyncFetchImpl(SRequestObj *pRequest, __taos_async_fn_t fp, void *param) {
+void taosAsyncFetchImpl(SRequestObj* pRequest, __taos_async_fn_t fp, void* param) {
   pRequest->body.fetchFp = fp;
   pRequest->body.param = param;
 
-  SReqResultInfo *pResultInfo = &pRequest->body.resInfo;
+  SReqResultInfo* pResultInfo = &pRequest->body.resInfo;
 
   // this query has no results or error exists, return directly
   if (taos_num_fields(pRequest) == 0 || pRequest->code != TSDB_CODE_SUCCESS) {
@@ -2578,5 +2578,3 @@ void taosAsyncFetchImpl(SRequestObj *pRequest, __taos_async_fn_t fp, void *param
 
   schedulerFetchRows(pRequest->body.queryJob, &req);
 }
-
-

source/client/src/clientMain.c

@@ -135,11 +135,6 @@ int taos_set_notify_cb(TAOS *taos, __taos_notify_fn_t fp, void *param, int type)
   switch (type) {
     case TAOS_NOTIFY_PASSVER: {
       taosThreadMutexLock(&pObj->mutex);
-      if (fp && !pObj->passInfo.fp) {
-        atomic_add_fetch_32(&pObj->pAppInfo->pAppHbMgr->passKeyCnt, 1);
-      } else if (!fp && pObj->passInfo.fp) {
-        atomic_sub_fetch_32(&pObj->pAppInfo->pAppHbMgr->passKeyCnt, 1);
-      }
       pObj->passInfo.fp = fp;
       pObj->passInfo.param = param;
       taosThreadMutexUnlock(&pObj->mutex);
@@ -563,13 +558,12 @@ int taos_select_db(TAOS *taos, const char *db) {
   return code;
 }
 
-
 void taos_stop_query(TAOS_RES *res) {
   if (res == NULL || TD_RES_TMQ(res) || TD_RES_TMQ_META(res) || TD_RES_TMQ_METADATA(res)) {
     return;
   }
 
-  stopAllQueries((SRequestObj*)res);
+  stopAllQueries((SRequestObj *)res);
 }
 
 bool taos_is_null(TAOS_RES *res, int32_t row, int32_t col) {
@@ -790,7 +784,7 @@ void destorySqlCallbackWrapper(SSqlCallbackWrapper *pWrapper) {
   taosMemoryFree(pWrapper);
 }
 
-void destroyCtxInRequest(SRequestObj* pRequest) {
+void destroyCtxInRequest(SRequestObj *pRequest) {
   schedulerFreeJob(&pRequest->body.queryJob, 0);
   qDestroyQuery(pRequest->pQuery);
   pRequest->pQuery = NULL;
@@ -798,7 +792,6 @@ void destroyCtxInRequest(SRequestObj* pRequest) {
   pRequest->pWrapper = NULL;
 }
 
-
 static void doAsyncQueryFromAnalyse(SMetaData *pResultMeta, void *param, int32_t code) {
   SSqlCallbackWrapper *pWrapper = (SSqlCallbackWrapper *)param;
   SRequestObj         *pRequest = pWrapper->pRequest;
@@ -812,15 +805,15 @@ static void doAsyncQueryFromAnalyse(SMetaData *pResultMeta, void *param, int32_t
   if (TSDB_CODE_SUCCESS == code) {
     code = qAnalyseSqlSemantic(pWrapper->pParseCtx, pWrapper->pCatalogReq, pResultMeta, pQuery);
   }
-  
+
   pRequest->metric.analyseCostUs += taosGetTimestampUs() - analyseStart;
-  
+
   handleQueryAnslyseRes(pWrapper, pResultMeta, code);
 }
 
-int32_t cloneCatalogReq(SCatalogReq*     * ppTarget, SCatalogReq* pSrc) {
-  int32_t code = TSDB_CODE_SUCCESS;
-  SCatalogReq* pTarget = taosMemoryCalloc(1, sizeof(SCatalogReq));
+int32_t cloneCatalogReq(SCatalogReq **ppTarget, SCatalogReq *pSrc) {
+  int32_t      code = TSDB_CODE_SUCCESS;
+  SCatalogReq *pTarget = taosMemoryCalloc(1, sizeof(SCatalogReq));
   if (pTarget == NULL) {
     code = TSDB_CODE_OUT_OF_MEMORY;
   } else {
@@ -847,17 +840,16 @@ int32_t cloneCatalogReq(SCatalogReq*     * ppTarget, SCatalogReq* pSrc) {
   return code;
 }
 
-
-void handleSubQueryFromAnalyse(SSqlCallbackWrapper *pWrapper, SMetaData *pResultMeta, SNode* pRoot) {
-  SRequestObj* pNewRequest = NULL;
-  SSqlCallbackWrapper* pNewWrapper = NULL;
-  int32_t code = buildPreviousRequest(pWrapper->pRequest, pWrapper->pRequest->sqlstr, &pNewRequest);
+void handleSubQueryFromAnalyse(SSqlCallbackWrapper *pWrapper, SMetaData *pResultMeta, SNode *pRoot) {
+  SRequestObj         *pNewRequest = NULL;
+  SSqlCallbackWrapper *pNewWrapper = NULL;
+  int32_t              code = buildPreviousRequest(pWrapper->pRequest, pWrapper->pRequest->sqlstr, &pNewRequest);
   if (code) {
     handleQueryAnslyseRes(pWrapper, pResultMeta, code);
     return;
   }
 
-  pNewRequest->pQuery = (SQuery*)nodesMakeNode(QUERY_NODE_QUERY);
+  pNewRequest->pQuery = (SQuery *)nodesMakeNode(QUERY_NODE_QUERY);
   if (NULL == pNewRequest->pQuery) {
     code = TSDB_CODE_OUT_OF_MEMORY;
   } else {
@@ -876,16 +868,16 @@ void handleSubQueryFromAnalyse(SSqlCallbackWrapper *pWrapper, SMetaData *pResult
 }
 
 void handleQueryAnslyseRes(SSqlCallbackWrapper *pWrapper, SMetaData *pResultMeta, int32_t code) {
-  SRequestObj         *pRequest = pWrapper->pRequest;
-  SQuery              *pQuery = pRequest->pQuery;
+  SRequestObj *pRequest = pWrapper->pRequest;
+  SQuery      *pQuery = pRequest->pQuery;
 
   if (code == TSDB_CODE_SUCCESS && pQuery->pPrevRoot) {
-    SNode* prevRoot = pQuery->pPrevRoot;
+    SNode *prevRoot = pQuery->pPrevRoot;
     pQuery->pPrevRoot = NULL;
     handleSubQueryFromAnalyse(pWrapper, pResultMeta, prevRoot);
     return;
   }
-  
+
   if (code == TSDB_CODE_SUCCESS) {
     pRequest->stableQuery = pQuery->stableQuery;
     if (pQuery->pRoot) {
@@ -1048,7 +1040,7 @@ int32_t createParseContext(const SRequestObj *pRequest, SParseContext **pCxt) {
 }
 
 int32_t prepareAndParseSqlSyntax(SSqlCallbackWrapper **ppWrapper, SRequestObj *pRequest, bool updateMetaForce) {
-  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t              code = TSDB_CODE_SUCCESS;
   STscObj             *pTscObj = pRequest->pTscObj;
   SSqlCallbackWrapper *pWrapper = taosMemoryCalloc(1, sizeof(SSqlCallbackWrapper));
   if (pWrapper == NULL) {
@@ -1086,7 +1078,6 @@ int32_t prepareAndParseSqlSyntax(SSqlCallbackWrapper **ppWrapper, SRequestObj *p
   return code;
 }
 
-
 void doAsyncQuery(SRequestObj *pRequest, bool updateMetaForce) {
   SSqlCallbackWrapper *pWrapper = NULL;
   int32_t              code = TSDB_CODE_SUCCESS;
@@ -1133,12 +1124,12 @@ void doAsyncQuery(SRequestObj *pRequest, bool updateMetaForce) {
 }
 
 void restartAsyncQuery(SRequestObj *pRequest, int32_t code) {
-  int32_t reqIdx = 0;
+  int32_t      reqIdx = 0;
   SRequestObj *pReqList[16] = {NULL};
   SRequestObj *pUserReq = NULL;
   pReqList[0] = pRequest;
-  uint64_t tmpRefId = 0;
-  SRequestObj* pTmp = pRequest;
+  uint64_t     tmpRefId = 0;
+  SRequestObj *pTmp = pRequest;
   while (pTmp->relation.prevRefId) {
     tmpRefId = pTmp->relation.prevRefId;
     pTmp = acquireRequest(tmpRefId);
@@ -1146,9 +1137,9 @@ void restartAsyncQuery(SRequestObj *pRequest, int32_t code) {
       pReqList[++reqIdx] = pTmp;
       releaseRequest(tmpRefId);
     } else {
-      tscError("0x%" PRIx64 ", prev req ref 0x%" PRIx64 " is not there, reqId:0x%" PRIx64, pTmp->self,
-               tmpRefId, pTmp->requestId);
-      break;         
+      tscError("0x%" PRIx64 ", prev req ref 0x%" PRIx64 " is not there, reqId:0x%" PRIx64, pTmp->self, tmpRefId,
+               pTmp->requestId);
+      break;
     }
   }
 
@@ -1157,11 +1148,11 @@ void restartAsyncQuery(SRequestObj *pRequest, int32_t code) {
     pTmp = acquireRequest(tmpRefId);
     if (pTmp) {
       tmpRefId = pTmp->relation.nextRefId;
-      removeRequest(pTmp->self);      
+      removeRequest(pTmp->self);
       releaseRequest(pTmp->self);
     } else {
       tscError("0x%" PRIx64 " is not there", tmpRefId);
-      break;         
+      break;
     }
   }
 

source/client/src/clientMsgHandler.c

@@ -131,6 +131,7 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
 
   pTscObj->connType = connectRsp.connType;
   pTscObj->passInfo.ver = connectRsp.passVer;
+  pTscObj->authVer = connectRsp.authVer;
 
   hbRegisterConn(pTscObj->pAppInfo->pAppHbMgr, pTscObj->id, connectRsp.clusterId, connectRsp.connType);
 

source/client/src/clientRawBlockWrite.c

@@ -1286,6 +1286,10 @@ static int32_t taosAlterTable(TAOS* taos, void* meta, int32_t metaLen) {
   taosArrayPush(pArray, &pVgData);
 
   pQuery = (SQuery*)nodesMakeNode(QUERY_NODE_QUERY);
+  if (NULL == pQuery) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    goto end;
+  }
   pQuery->execMode = QUERY_EXEC_MODE_SCHEDULE;
   pQuery->msgType = TDMT_VND_ALTER_TABLE;
   pQuery->stableQuery = false;

source/client/test/clientTests.cpp

@@ -1073,6 +1073,146 @@ TEST(clientCase, sub_db_test) {
   fprintf(stderr, "%d msg consumed, include %d rows\n", msgCnt, totalRows);
 }
 
+TEST(clientCase, td_25129) {
+//  taos_options(TSDB_OPTION_CONFIGDIR, "~/first/cfg");
+
+  TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
+  ASSERT_NE(pConn, nullptr);
+
+  tmq_conf_t* conf = tmq_conf_new();
+
+  tmq_conf_set(conf, "enable.auto.commit", "false");
+  tmq_conf_set(conf, "auto.commit.interval.ms", "2000");
+  tmq_conf_set(conf, "group.id", "group_id_2");
+  tmq_conf_set(conf, "td.connect.user", "root");
+  tmq_conf_set(conf, "td.connect.pass", "taosdata");
+  tmq_conf_set(conf, "auto.offset.reset", "earliest");
+  tmq_conf_set(conf, "msg.with.table.name", "true");
+
+  tmq_t* tmq = tmq_consumer_new(conf, NULL, 0);
+  tmq_conf_destroy(conf);
+
+  // 创建订阅 topics 列表
+  tmq_list_t* topicList = tmq_list_new();
+  tmq_list_append(topicList, "tp");
+
+  // 启动订阅
+  tmq_subscribe(tmq, topicList);
+  tmq_list_destroy(topicList);
+
+  TAOS_FIELD* fields = NULL;
+  int32_t     numOfFields = 0;
+  int32_t     precision = 0;
+  int32_t     totalRows = 0;
+  int32_t     msgCnt = 0;
+  int32_t     timeout = 2000;
+
+  int32_t count = 0;
+
+  tmq_topic_assignment* pAssign = NULL;
+  int32_t numOfAssign = 0;
+
+  int32_t code = tmq_get_topic_assignment(tmq, "tp", &pAssign, &numOfAssign);
+  if (code != 0) {
+    printf("error occurs:%s\n", tmq_err2str(code));
+    tmq_free_assignment(pAssign);
+    tmq_consumer_close(tmq);
+    taos_close(pConn);
+    fprintf(stderr, "%d msg consumed, include %d rows\n", msgCnt, totalRows);
+    return;
+  }
+
+  for(int i = 0; i < numOfAssign; i++){
+    printf("assign i:%d, vgId:%d, offset:%lld, start:%lld, end:%lld\n", i, pAssign[i].vgId, pAssign[i].currentOffset, pAssign[i].begin, pAssign[i].end);
+  }
+
+//  tmq_offset_seek(tmq, "tp", pAssign[0].vgId, 4);
+  tmq_free_assignment(pAssign);
+
+  code = tmq_get_topic_assignment(tmq, "tp", &pAssign, &numOfAssign);
+  if (code != 0) {
+    printf("error occurs:%s\n", tmq_err2str(code));
+    tmq_free_assignment(pAssign);
+    tmq_consumer_close(tmq);
+    taos_close(pConn);
+    fprintf(stderr, "%d msg consumed, include %d rows\n", msgCnt, totalRows);
+    return;
+  }
+
+  for(int i = 0; i < numOfAssign; i++){
+    printf("assign i:%d, vgId:%d, offset:%lld, start:%lld, end:%lld\n", i, pAssign[i].vgId, pAssign[i].currentOffset, pAssign[i].begin, pAssign[i].end);
+  }
+
+  tmq_free_assignment(pAssign);
+
+  code = tmq_get_topic_assignment(tmq, "tp", &pAssign, &numOfAssign);
+  if (code != 0) {
+    printf("error occurs:%s\n", tmq_err2str(code));
+    tmq_free_assignment(pAssign);
+    tmq_consumer_close(tmq);
+    taos_close(pConn);
+    fprintf(stderr, "%d msg consumed, include %d rows\n", msgCnt, totalRows);
+    return;
+  }
+
+  for(int i = 0; i < numOfAssign; i++){
+    printf("assign i:%d, vgId:%d, offset:%lld, start:%lld, end:%lld\n", i, pAssign[i].vgId, pAssign[i].currentOffset, pAssign[i].begin, pAssign[i].end);
+  }
+
+  while (1) {
+    TAOS_RES* pRes = tmq_consumer_poll(tmq, timeout);
+    if (pRes) {
+      char buf[128];
+
+      const char* topicName = tmq_get_topic_name(pRes);
+//      const char* dbName = tmq_get_db_name(pRes);
+//      int32_t     vgroupId = tmq_get_vgroup_id(pRes);
+//
+//      printf("topic: %s\n", topicName);
+//      printf("db: %s\n", dbName);
+//      printf("vgroup id: %d\n", vgroupId);
+
+      printSubResults(pRes, &totalRows);
+    } else {
+      tmq_offset_seek(tmq, "tp", pAssign[0].vgId, pAssign[0].currentOffset);
+      tmq_offset_seek(tmq, "tp", pAssign[1].vgId, pAssign[1].currentOffset);
+      continue;
+    }
+
+//    tmq_commit_sync(tmq, pRes);
+    if (pRes != NULL) {
+      taos_free_result(pRes);
+      //      if ((++count) > 1) {
+      //        break;
+      //      }
+    } else {
+      break;
+    }
+
+//    tmq_offset_seek(tmq, "tp", pAssign[0].vgId, pAssign[0].begin);
+  }
+
+  tmq_free_assignment(pAssign);
+
+  code = tmq_get_topic_assignment(tmq, "tp", &pAssign, &numOfAssign);
+  if (code != 0) {
+    printf("error occurs:%s\n", tmq_err2str(code));
+    tmq_free_assignment(pAssign);
+    tmq_consumer_close(tmq);
+    taos_close(pConn);
+    fprintf(stderr, "%d msg consumed, include %d rows\n", msgCnt, totalRows);
+    return;
+  }
+
+  for(int i = 0; i < numOfAssign; i++){
+    printf("assign i:%d, vgId:%d, offset:%lld, start:%lld, end:%lld\n", i, pAssign[i].vgId, pAssign[i].currentOffset, pAssign[i].begin, pAssign[i].end);
+  }
+
+  tmq_consumer_close(tmq);
+  taos_close(pConn);
+  fprintf(stderr, "%d msg consumed, include %d rows\n", msgCnt, totalRows);
+}
+
 TEST(clientCase, sub_tb_test) {
   taos_options(TSDB_OPTION_CONFIGDIR, "~/first/cfg");
 

source/common/src/systable.c

@@ -315,7 +315,7 @@ static const SSysTableMeta infosMeta[] = {
     {TSDB_INS_TABLE_MNODES, mnodesSchema, tListLen(mnodesSchema), true},
     {TSDB_INS_TABLE_MODULES, modulesSchema, tListLen(modulesSchema), true},
     {TSDB_INS_TABLE_QNODES, qnodesSchema, tListLen(qnodesSchema), true},
-    {TSDB_INS_TABLE_SNODES, snodesSchema, tListLen(snodesSchema)},
+    {TSDB_INS_TABLE_SNODES, snodesSchema, tListLen(snodesSchema), true},
     {TSDB_INS_TABLE_CLUSTER, clusterSchema, tListLen(clusterSchema), true},
     {TSDB_INS_TABLE_DATABASES, userDBSchema, tListLen(userDBSchema), false},
     {TSDB_INS_TABLE_FUNCTIONS, userFuncSchema, tListLen(userFuncSchema), false},

source/common/src/tmsg.c

@@ -1525,6 +1525,9 @@ int32_t tSerializeSGetUserAuthRspImpl(SEncoder *pEncoder, SGetUserAuthRsp *pRsp)
     useDb = taosHashIterate(pRsp->useDbs, useDb);
   }
 
+  // since 3.0.7.0
+  if (tEncodeI32(pEncoder, pRsp->passVer) < 0) return -1;
+
   return 0;
 }
 
@@ -1646,6 +1649,12 @@ int32_t tDeserializeSGetUserAuthRspImpl(SDecoder *pDecoder, SGetUserAuthRsp *pRs
       taosHashPut(pRsp->useDbs, key, strlen(key), &ref, sizeof(ref));
       taosMemoryFree(key);
     }
+    // since 3.0.7.0
+    if (!tDecodeIsEnd(pDecoder)) {
+      if (tDecodeI32(pDecoder, &pRsp->passVer) < 0) return -1;
+    } else {
+      pRsp->passVer = 0;
+    }
   }
 
   return 0;
@@ -3031,59 +3040,6 @@ void tFreeSUserAuthBatchRsp(SUserAuthBatchRsp *pRsp) {
   taosArrayDestroy(pRsp->pArray);
 }
 
-int32_t tSerializeSUserPassBatchRsp(void *buf, int32_t bufLen, SUserPassBatchRsp *pRsp) {
-  SEncoder encoder = {0};
-  tEncoderInit(&encoder, buf, bufLen);
-
-  if (tStartEncode(&encoder) < 0) return -1;
-
-  int32_t numOfBatch = taosArrayGetSize(pRsp->pArray);
-  if (tEncodeI32(&encoder, numOfBatch) < 0) return -1;
-  for (int32_t i = 0; i < numOfBatch; ++i) {
-    SGetUserPassRsp *pUserPassRsp = taosArrayGet(pRsp->pArray, i);
-    if (tEncodeCStr(&encoder, pUserPassRsp->user) < 0) return -1;
-    if (tEncodeI32(&encoder, pUserPassRsp->version) < 0) return -1;
-  }
-  tEndEncode(&encoder);
-
-  int32_t tlen = encoder.pos;
-  tEncoderClear(&encoder);
-  return tlen;
-}
-
-int32_t tDeserializeSUserPassBatchRsp(void *buf, int32_t bufLen, SUserPassBatchRsp *pRsp) {
-  SDecoder decoder = {0};
-  tDecoderInit(&decoder, buf, bufLen);
-
-  if (tStartDecode(&decoder) < 0) return -1;
-
-  int32_t numOfBatch = taosArrayGetSize(pRsp->pArray);
-  if (tDecodeI32(&decoder, &numOfBatch) < 0) return -1;
-
-  pRsp->pArray = taosArrayInit(numOfBatch, sizeof(SGetUserPassRsp));
-  if (pRsp->pArray == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
-  }
-
-  for (int32_t i = 0; i < numOfBatch; ++i) {
-    SGetUserPassRsp rsp = {0};
-    if (tDecodeCStrTo(&decoder, rsp.user) < 0) return -1;
-    if (tDecodeI32(&decoder, &rsp.version) < 0) return -1;
-    taosArrayPush(pRsp->pArray, &rsp);
-  }
-  tEndDecode(&decoder);
-
-  tDecoderClear(&decoder);
-  return 0;
-}
-
-void tFreeSUserPassBatchRsp(SUserPassBatchRsp *pRsp) {
-  if(pRsp) {
-    taosArrayDestroy(pRsp->pArray);
-  }
-}
-
 int32_t tSerializeSDbCfgReq(void *buf, int32_t bufLen, SDbCfgReq *pReq) {
   SEncoder encoder = {0};
   tEncoderInit(&encoder, buf, bufLen);
@@ -4161,6 +4117,7 @@ int32_t tSerializeSConnectRsp(void *buf, int32_t bufLen, SConnectRsp *pRsp) {
   if (tEncodeCStr(&encoder, pRsp->sVer) < 0) return -1;
   if (tEncodeCStr(&encoder, pRsp->sDetailVer) < 0) return -1;
   if (tEncodeI32(&encoder, pRsp->passVer) < 0) return -1;
+  if (tEncodeI32(&encoder, pRsp->authVer) < 0) return -1;
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
@@ -4190,6 +4147,12 @@ int32_t tDeserializeSConnectRsp(void *buf, int32_t bufLen, SConnectRsp *pRsp) {
   } else {
     pRsp->passVer = 0;
   }
+  // since 3.0.7.0
+  if (!tDecodeIsEnd(&decoder)) {
+    if (tDecodeI32(&decoder, &pRsp->authVer) < 0) return -1;
+  } else {
+    pRsp->authVer = 0;
+  }
 
   tEndDecode(&decoder);
 

source/common/src/trow.c

@@ -423,7 +423,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow) {
         val = (const void *)&pColVal->value.val;
       }
     } else {
-      pColVal = NULL;
+      // pColVal = NULL;
       valType = TD_VTYPE_NONE;
     }
 

source/dnode/mgmt/exe/dmMain.c

@@ -19,6 +19,9 @@
 #include "tconfig.h"
 #include "tglobal.h"
 #include "version.h"
+#ifdef TD_JEMALLOC_ENABLED
+#include "jemalloc/jemalloc.h"
+#endif
 
 #if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
 #include "cus_name.h"
@@ -255,6 +258,10 @@ static void taosCleanupArgs() {
 }
 
 int main(int argc, char const *argv[]) {
+#ifdef TD_JEMALLOC_ENABLED
+  bool jeBackgroundThread = true;
+  mallctl("background_thread", NULL, NULL, &jeBackgroundThread, sizeof(bool));
+#endif
   if (!taosCheckSystemIsLittleEnd()) {
     printf("failed to start since on non-little-end machines\n");
     return -1;

source/dnode/mgmt/node_mgmt/src/dmTransport.c

@@ -16,6 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "dmMgmt.h"
 #include "qworker.h"
+#include "tversion.h"
 
 static inline void dmSendRsp(SRpcMsg *pMsg) { rpcSendResponse(pMsg); }
 
@@ -73,6 +74,13 @@ static void dmProcessRpcMsg(SDnode *pDnode, SRpcMsg *pRpc, SEpSet *pEpSet) {
   dGTrace("msg:%s is received, handle:%p len:%d code:0x%x app:%p refId:%" PRId64, TMSG_INFO(pRpc->msgType),
           pRpc->info.handle, pRpc->contLen, pRpc->code, pRpc->info.ahandle, pRpc->info.refId);
 
+  int32_t svrVer = 0;
+  taosVersionStrToInt(version, &svrVer);
+  if (0 != taosCheckVersionCompatible(pRpc->info.cliVer, svrVer, 3)) {
+    dError("Version not compatible, cli ver: %d, svr ver: %d", pRpc->info.cliVer, svrVer);
+    goto _OVER;
+  }
+
   switch (pRpc->msgType) {
     case TDMT_DND_NET_TEST:
       dmProcessNetTestReq(pDnode, pRpc);
@@ -305,6 +313,7 @@ int32_t dmInitClient(SDnode *pDnode) {
   rpcInit.supportBatch = 1;
   rpcInit.batchSize = 8 * 1024;
   rpcInit.timeToGetConn = tsTimeToGetAvailableConn;
+  taosVersionStrToInt(version, &(rpcInit.compatibilityVer));
 
   pTrans->clientRpc = rpcOpen(&rpcInit);
   if (pTrans->clientRpc == NULL) {
@@ -339,7 +348,7 @@ int32_t dmInitServer(SDnode *pDnode) {
   rpcInit.idleTime = tsShellActivityTimer * 1000;
   rpcInit.parent = pDnode;
   rpcInit.compressSize = tsCompressMsgSize;
-
+  taosVersionStrToInt(version, &(rpcInit.compatibilityVer));
   pTrans->serverRpc = rpcOpen(&rpcInit);
   if (pTrans->serverRpc == NULL) {
     dError("failed to init dnode rpc server");

source/dnode/mgmt/test/sut/src/client.cpp

@@ -16,6 +16,7 @@
 #include "sut.h"
 #include "tdatablock.h"
 #include "tmisce.h"
+#include "tversion.h"
 
 static void processClientRsp(void* parent, SRpcMsg* pRsp, SEpSet* pEpSet) {
   TestClient* client = (TestClient*)parent;
@@ -53,6 +54,7 @@ void TestClient::DoInit() {
   rpcInit.parent = this;
   // rpcInit.secret = (char*)secretEncrypt;
   // rpcInit.spi = 1;
+  taosVersionStrToInt(version, &(rpcInit.compatibilityVer));
 
   clientRpc = rpcOpen(&rpcInit);
   ASSERT(clientRpc);

source/dnode/mnode/impl/inc/mndUser.h

@@ -35,8 +35,6 @@ SHashObj *mndDupTableHash(SHashObj *pOld);
 SHashObj *mndDupTopicHash(SHashObj *pOld);
 int32_t   mndValidateUserAuthInfo(SMnode *pMnode, SUserAuthVersion *pUsers, int32_t numOfUses, void **ppRsp,
                                   int32_t *pRspLen);
-int32_t   mndValidateUserPassInfo(SMnode *pMnode, SUserPassVersion *pUsers, int32_t numOfUses, void **ppRsp,
-                                  int32_t *pRspLen);
 int32_t   mndUserRemoveDb(SMnode *pMnode, STrans *pTrans, char *db);
 int32_t   mndUserRemoveTopic(SMnode *pMnode, STrans *pTrans, char *topic);
 

source/dnode/mnode/impl/src/mndConsumer.c

@@ -419,6 +419,9 @@ static int32_t mndProcessMqHbReq(SRpcMsg *pMsg) {
     mDebug("heartbeat report offset rows.%s:%s", pConsumer->cgroup, data->topicName);
 
     SMqSubscribeObj *pSub = mndAcquireSubscribe(pMnode, pConsumer->cgroup, data->topicName);
+    if(pSub == NULL){
+      continue;
+    }
     taosWLockLatch(&pSub->lock);
     SMqConsumerEp *pConsumerEp = taosHashGet(pSub->consumerHash, &consumerId, sizeof(int64_t));
     if(pConsumerEp){

source/dnode/mnode/impl/src/mndDb.c

@@ -382,6 +382,40 @@ static int32_t mndCheckDbCfg(SMnode *pMnode, SDbCfg *pCfg) {
   return terrno;
 }
 
+static int32_t mndCheckInChangeDbCfg(SMnode *pMnode, SDbCfg *pCfg) {
+  terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+  if (pCfg->buffer < TSDB_MIN_BUFFER_PER_VNODE || pCfg->buffer > TSDB_MAX_BUFFER_PER_VNODE) return -1;
+  if (pCfg->pages < TSDB_MIN_PAGES_PER_VNODE || pCfg->pages > TSDB_MAX_PAGES_PER_VNODE) return -1;
+  if (pCfg->pageSize < TSDB_MIN_PAGESIZE_PER_VNODE || pCfg->pageSize > TSDB_MAX_PAGESIZE_PER_VNODE) return -1;
+  if (pCfg->daysPerFile < TSDB_MIN_DAYS_PER_FILE || pCfg->daysPerFile > TSDB_MAX_DAYS_PER_FILE) return -1;
+  if (pCfg->daysToKeep0 < TSDB_MIN_KEEP || pCfg->daysToKeep0 > TSDB_MAX_KEEP) return -1;
+  if (pCfg->daysToKeep1 < TSDB_MIN_KEEP || pCfg->daysToKeep1 > TSDB_MAX_KEEP) return -1;
+  if (pCfg->daysToKeep2 < TSDB_MIN_KEEP || pCfg->daysToKeep2 > TSDB_MAX_KEEP) return -1;
+  if (pCfg->daysToKeep0 < pCfg->daysPerFile) return -1;
+  if (pCfg->daysToKeep0 > pCfg->daysToKeep1) return -1;
+  if (pCfg->daysToKeep1 > pCfg->daysToKeep2) return -1;
+  if (pCfg->walFsyncPeriod < TSDB_MIN_FSYNC_PERIOD || pCfg->walFsyncPeriod > TSDB_MAX_FSYNC_PERIOD) return -1;
+  if (pCfg->walLevel < TSDB_MIN_WAL_LEVEL || pCfg->walLevel > TSDB_MAX_WAL_LEVEL) return -1;
+  if (pCfg->cacheLast < TSDB_CACHE_MODEL_NONE || pCfg->cacheLast > TSDB_CACHE_MODEL_BOTH) return -1;
+  if (pCfg->cacheLastSize < TSDB_MIN_DB_CACHE_SIZE || pCfg->cacheLastSize > TSDB_MAX_DB_CACHE_SIZE) return -1;
+  if (pCfg->replications < TSDB_MIN_DB_REPLICA || pCfg->replications > TSDB_MAX_DB_REPLICA) return -1;
+  if (pCfg->replications != 1 && pCfg->replications != 3) return -1;
+  if (pCfg->sstTrigger < TSDB_MIN_STT_TRIGGER || pCfg->sstTrigger > TSDB_MAX_STT_TRIGGER) return -1;
+  if (pCfg->minRows < TSDB_MIN_MINROWS_FBLOCK || pCfg->minRows > TSDB_MAX_MINROWS_FBLOCK) return -1;
+  if (pCfg->maxRows < TSDB_MIN_MAXROWS_FBLOCK || pCfg->maxRows > TSDB_MAX_MAXROWS_FBLOCK) return -1;
+  if (pCfg->minRows > pCfg->maxRows) return -1;
+  if (pCfg->walRetentionPeriod < TSDB_DB_MIN_WAL_RETENTION_PERIOD) return -1;
+  if (pCfg->walRetentionSize < TSDB_DB_MIN_WAL_RETENTION_SIZE) return -1;
+  if (pCfg->strict < TSDB_DB_STRICT_OFF || pCfg->strict > TSDB_DB_STRICT_ON) return -1;
+  if (pCfg->replications > mndGetDnodeSize(pMnode)) {
+    terrno = TSDB_CODE_MND_NO_ENOUGH_DNODES;
+    return -1;
+  }
+
+  terrno = 0;
+  return terrno;
+}
+
 static void mndSetDefaultDbCfg(SDbCfg *pCfg) {
   if (pCfg->numOfVgroups < 0) pCfg->numOfVgroups = TSDB_DEFAULT_VN_PER_DB;
   if (pCfg->numOfStables < 0) pCfg->numOfStables = TSDB_DEFAULT_DB_SINGLE_STABLE;
@@ -897,7 +931,7 @@ static int32_t mndProcessAlterDbReq(SRpcMsg *pReq) {
   code = mndSetDbCfgFromAlterDbReq(&dbObj, &alterReq);
   if (code != 0) goto _OVER;
 
-  code = mndCheckDbCfg(pMnode, &dbObj.cfg);
+  code = mndCheckInChangeDbCfg(pMnode, &dbObj.cfg);
   if (code != 0) goto _OVER;
 
   dbObj.cfgVersion++;

source/dnode/mnode/impl/src/mndPrivilege.c

@@ -36,7 +36,9 @@ int32_t mndSetUserAuthRsp(SMnode *pMnode, SUserObj *pUser, SGetUserAuthRsp *pRsp
   memcpy(pRsp->user, pUser->user, TSDB_USER_LEN);
   pRsp->superAuth = 1;
   pRsp->enable = pUser->enable;
+  pRsp->sysInfo = pUser->sysInfo;
   pRsp->version = pUser->authVersion;
+  pRsp->passVer = pUser->passVersion;
   return 0;
 }
 #endif
\ No newline at end of file

source/dnode/mnode/impl/src/mndProfile.c

@@ -288,6 +288,7 @@ _CONNECT:
   connectRsp.dnodeNum = mndGetDnodeSize(pMnode);
   connectRsp.svrTimestamp = taosGetTimestampSec();
   connectRsp.passVer = pUser->passVersion;
+  connectRsp.authVer = pUser->authVersion;
 
   strcpy(connectRsp.sVer, version);
   snprintf(connectRsp.sDetailVer, sizeof(connectRsp.sDetailVer), "ver:%s\nbuild:%s\ngitinfo:%s", version, buildinfo,
@@ -552,16 +553,6 @@ static int32_t mndProcessQueryHeartBeat(SMnode *pMnode, SRpcMsg *pMsg, SClientHb
         }
         break;
       }
-      case HEARTBEAT_KEY_USER_PASSINFO: {
-        void   *rspMsg = NULL;
-        int32_t rspLen = 0;
-        mndValidateUserPassInfo(pMnode, kv->value, kv->valueLen / sizeof(SUserPassVersion), &rspMsg, &rspLen);
-        if (rspMsg && rspLen > 0) {
-          SKv kv1 = {.key = HEARTBEAT_KEY_USER_PASSINFO, .valueLen = rspLen, .value = rspMsg};
-          taosArrayPush(hbRsp.info, &kv1);
-        }
-        break;
-      }
       default:
         mError("invalid kv key:%d", kv->key);
         hbRsp.status = TSDB_CODE_APP_ERROR;
@@ -827,6 +818,9 @@ static int32_t packQueriesIntoBlock(SShowObj* pShow, SConnObj* pConn, SSDataBloc
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataSetVal(pColInfo, curRowIndex, (const char *)&pQuery->stableQuery, false);
 
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataSetVal(pColInfo, curRowIndex, (const char *)&pQuery->isSubQuery, false);
+
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataSetVal(pColInfo, curRowIndex, (const char *)&pQuery->subPlanNum, false);
 

source/dnode/mnode/impl/src/mndSubscribe.c

@@ -275,7 +275,7 @@ static void doAddNewConsumers(SMqRebOutputObj *pOutput, const SMqRebInputObj *pI
 
     taosHashPut(pOutput->pSub->consumerHash, &consumerId, sizeof(int64_t), &newConsumerEp, sizeof(SMqConsumerEp));
     taosArrayPush(pOutput->newConsumers, &consumerId);
-    mInfo("sub:%s mq rebalance add new consumer:%" PRIx64, pSubKey, consumerId);
+    mInfo("sub:%s mq rebalance add new consumer:0x%" PRIx64, pSubKey, consumerId);
   }
 }
 

source/dnode/mnode/impl/src/mndUser.c

@@ -801,7 +801,8 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
     goto _OVER;
   }
 
-  if (TSDB_ALTER_USER_PASSWD == alterReq.alterType && alterReq.pass[0] == 0) {
+  if (TSDB_ALTER_USER_PASSWD == alterReq.alterType && 
+      (alterReq.pass[0] == 0 || strlen(alterReq.pass) >= TSDB_PASSWORD_LEN)) {
     terrno = TSDB_CODE_MND_INVALID_PASS_FORMAT;
     goto _OVER;
   }
@@ -824,7 +825,6 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
 
   if (mndUserDupObj(pUser, &newUser) != 0) goto _OVER;
 
-  newUser.passVersion = pUser->passVersion;
   if (alterReq.alterType == TSDB_ALTER_USER_PASSWD) {
     char pass[TSDB_PASSWORD_LEN + 1] = {0};
     taosEncryptPass_c((uint8_t *)alterReq.pass, strlen(alterReq.pass), pass);
@@ -1431,69 +1431,6 @@ _OVER:
   return code;
 }
 
-int32_t mndValidateUserPassInfo(SMnode *pMnode, SUserPassVersion *pUsers, int32_t numOfUses, void **ppRsp,
-                                int32_t *pRspLen) {
-  int32_t           code = 0;
-  SUserPassBatchRsp batchRsp = {0};
-
-  for (int32_t i = 0; i < numOfUses; ++i) {
-    SUserObj *pUser = mndAcquireUser(pMnode, pUsers[i].user);
-    if (pUser == NULL) {
-      mError("user:%s, failed to validate user pass since %s", pUsers[i].user, terrstr());
-      continue;
-    }
-
-    pUsers[i].version = ntohl(pUsers[i].version);
-    if (pUser->passVersion <= pUsers[i].version) {
-      mTrace("user:%s, not update since mnd passVer %d <= client passVer %d", pUsers[i].user, pUser->passVersion,
-             pUsers[i].version);
-      mndReleaseUser(pMnode, pUser);
-      continue;
-    }
-
-    SGetUserPassRsp rsp = {0};
-    memcpy(rsp.user, pUser->user, TSDB_USER_LEN);
-    rsp.version = pUser->passVersion;
-
-    if (!batchRsp.pArray && !(batchRsp.pArray = taosArrayInit(numOfUses, sizeof(SGetUserPassRsp)))) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      mndReleaseUser(pMnode, pUser);
-      goto _OVER;
-    }
-
-    taosArrayPush(batchRsp.pArray, &rsp);
-    mndReleaseUser(pMnode, pUser);
-  }
-
-  if (taosArrayGetSize(batchRsp.pArray) <= 0) {
-    goto _OVER;
-  }
-
-  int32_t rspLen = tSerializeSUserPassBatchRsp(NULL, 0, &batchRsp);
-  if (rspLen < 0) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    goto _OVER;
-  }
-  void   *pRsp = taosMemoryMalloc(rspLen);
-  if (pRsp == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    goto _OVER;
-  }
-  tSerializeSUserPassBatchRsp(pRsp, rspLen, &batchRsp);
-
-  *ppRsp = pRsp;
-  *pRspLen = rspLen;
-
-_OVER:
-  if (code) {
-    *ppRsp = NULL;
-    *pRspLen = 0;
-  }
-
-  tFreeSUserPassBatchRsp(&batchRsp);
-  return code;
-}
-
 int32_t mndUserRemoveDb(SMnode *pMnode, STrans *pTrans, char *db) {
   int32_t   code = 0;
   SSdb     *pSdb = pMnode->pSdb;

source/dnode/vnode/CMakeLists.txt

@@ -26,15 +26,14 @@ set(
     "src/meta/metaCache.c"
     "src/meta/metaTtl.c"
 
-  # sma
-  "src/sma/smaEnv.c"
-  "src/sma/smaUtil.c"
-  "src/sma/smaFS.c"
-  "src/sma/smaOpen.c"
-  "src/sma/smaCommit.c"
-  "src/sma/smaRollup.c"
-  "src/sma/smaSnapshot.c"
-  "src/sma/smaTimeRange.c"
+    # sma
+    "src/sma/smaEnv.c"
+    "src/sma/smaUtil.c"
+    "src/sma/smaOpen.c"
+    "src/sma/smaCommit.c"
+    "src/sma/smaRollup.c"
+    "src/sma/smaSnapshot.c"
+    "src/sma/smaTimeRange.c"
 
   # # tsdb
   # "src/tsdb/tsdbCommit.c"

source/dnode/vnode/src/inc/sma.h

@@ -105,17 +105,16 @@ struct SRSmaFS {
 
 struct SRSmaStat {
   SSma            *pSma;
-  int64_t          commitAppliedVer;  // vnode applied version for async commit
-  int64_t          refId;             // shared by fetch tasks
-  volatile int64_t nBufItems;         // number of items in queue buffer
-  SRWLatch         lock;              // r/w lock for rsma fs(e.g. qtaskinfo)
-  volatile int32_t nFetchAll;         // active number of fetch all
-  volatile int8_t  triggerStat;       // shared by fetch tasks
-  volatile int8_t  commitStat;        // 0 not in committing, 1 in committing
-  volatile int8_t  delFlag;           // 0 no deleted SRSmaInfo, 1 has deleted SRSmaInfo
-  SRSmaFS          fs;                // for recovery/snapshot r/w
-  SHashObj        *infoHash;          // key: suid, value: SRSmaInfo
-  tsem_t           notEmpty;          // has items in queue buffer
+  int64_t          refId;        // shared by fetch tasks
+  volatile int64_t nBufItems;    // number of items in queue buffer
+  SRWLatch         lock;         // r/w lock for rsma fs(e.g. qtaskinfo)
+  volatile int32_t nFetchAll;    // active number of fetch all
+  volatile int8_t  triggerStat;  // shared by fetch tasks
+  volatile int8_t  commitStat;   // 0 not in committing, 1 in committing
+  volatile int8_t  delFlag;      // 0 no deleted SRSmaInfo, 1 has deleted SRSmaInfo
+  SRSmaFS          fs;           // for recovery/snapshot r/w
+  SHashObj        *infoHash;     // key: suid, value: SRSmaInfo
+  tsem_t           notEmpty;     // has items in queue buffer
 };
 
 struct SSmaStat {
@@ -156,12 +155,9 @@ struct SRSmaInfo {
   int16_t   padding;
   T_REF_DECLARE()
   SRSmaInfoItem items[TSDB_RETENTION_L2];
-  void         *taskInfo[TSDB_RETENTION_L2];   // qTaskInfo_t
-  STaosQueue   *queue;                         // buffer queue of SubmitReq
-  STaosQall    *qall;                          // buffer qall of SubmitReq
-  void         *iTaskInfo[TSDB_RETENTION_L2];  // immutable qTaskInfo_t
-  STaosQueue   *iQueue;                        // immutable buffer queue of SubmitReq
-  STaosQall    *iQall;                         // immutable buffer qall of SubmitReq
+  void         *taskInfo[TSDB_RETENTION_L2];  // qTaskInfo_t
+  STaosQueue   *queue;                        // buffer queue of SubmitReq
+  STaosQall    *qall;                         // buffer qall of SubmitReq
 };
 
 #define RSMA_INFO_HEAD_LEN     offsetof(SRSmaInfo, items)
@@ -191,6 +187,12 @@ typedef enum {
   RSMA_EXEC_COMMIT = 3,    // triggered by commit
 } ERsmaExecType;
 
+#define TD_SMA_LOOPS_CHECK(n, limit) \
+  if (++(n) > limit) {               \
+    sched_yield();                   \
+    (n) = 0;                         \
+  }
+
 // sma
 int32_t tdCheckAndInitSmaEnv(SSma *pSma, int8_t smaType);
 void    tdDestroySmaEnv(SSmaEnv *pSmaEnv);
@@ -213,27 +215,12 @@ int32_t smaPreClose(SSma *pSma);
 
 // rsma
 void   *tdFreeRSmaInfo(SSma *pSma, SRSmaInfo *pInfo, bool isDeepFree);
-int32_t tdRSmaFSOpen(SSma *pSma, int64_t version, int8_t rollback);
-void    tdRSmaFSClose(SRSmaFS *fs);
-int32_t tdRSmaFSPrepareCommit(SSma *pSma, SRSmaFS *pFSNew);
-int32_t tdRSmaFSCommit(SSma *pSma);
-int32_t tdRSmaFSFinishCommit(SSma *pSma);
-int32_t tdRSmaFSCopy(SSma *pSma, SRSmaFS *pFS);
-int32_t tdRSmaFSTakeSnapshot(SSma *pSma, SRSmaFS *pFS);
-int32_t tdRSmaFSRef(SSma *pSma, SRSmaFS *pFS);
-void    tdRSmaFSUnRef(SSma *pSma, SRSmaFS *pFS);
-int32_t tdRSmaFSUpsertQTaskFile(SSma *pSma, SRSmaFS *pFS, SQTaskFile *qTaskFile, int32_t nSize);
-int32_t tdRSmaFSRollback(SSma *pSma);
 int32_t tdRSmaRestore(SSma *pSma, int8_t type, int64_t committedVer, int8_t rollback);
 int32_t tdRSmaProcessCreateImpl(SSma *pSma, SRSmaParam *param, int64_t suid, const char *tbName);
 int32_t tdRSmaProcessExecImpl(SSma *pSma, ERsmaExecType type);
-int32_t tdRSmaPersistExecImpl(SRSmaStat *pRSmaStat, SHashObj *pInfoHash);
+// int32_t tdRSmaPersistExecImpl(SRSmaStat *pRSmaStat, SHashObj *pInfoHash);
 int32_t tdRSmaProcessRestoreImpl(SSma *pSma, int8_t type, int64_t qtaskFileVer, int8_t rollback);
-void    tdRSmaQTaskInfoGetFileName(SVnode *pVnode, int64_t suid, int8_t level, int64_t version, char *outputName);
-void    tdRSmaQTaskInfoGetFullName(SVnode *pVnode, int64_t suid, int8_t level, int64_t version, STfs *pTfs,
-                                   char *outputName);
-void    tdRSmaQTaskInfoGetFullPath(SVnode *pVnode, int8_t level, STfs *pTfs, char *outputName);
-void    tdRSmaQTaskInfoGetFullPathEx(SVnode *pVnode, tb_uid_t suid, int8_t level, STfs *pTfs, char *outputName);
+void    tdRSmaQTaskInfoGetFullPath(SVnode *pVnode, tb_uid_t suid, int8_t level, STfs *pTfs, char *outputName);
 
 static FORCE_INLINE void tdRefRSmaInfo(SSma *pSma, SRSmaInfo *pRSmaInfo) {
   int32_t ref = T_REF_INC(pRSmaInfo);
@@ -244,8 +231,6 @@ static FORCE_INLINE void tdUnRefRSmaInfo(SSma *pSma, SRSmaInfo *pRSmaInfo) {
   smaTrace("vgId:%d, unref rsma info:%p, val:%d", SMA_VID(pSma), pRSmaInfo, ref);
 }
 
-void tdRSmaGetFileName(SVnode *pVnode, STfs *pTfs, const char *fname, int64_t suid, int8_t level, int64_t version,
-                       char *outputName);
 void tdRSmaGetDirName(SVnode *pVnode, STfs *pTfs, bool endWithSep, char *outputName);
 
 #ifdef __cplusplus

source/dnode/vnode/src/inc/tq.h

@@ -134,7 +134,8 @@ int32_t tqTaosxScanLog(STQ* pTq, STqHandle* pHandle, SPackedData submit, STaosxR
 int32_t tqAddBlockDataToRsp(const SSDataBlock* pBlock, SMqDataRsp* pRsp, int32_t numOfCols, int8_t precision);
 int32_t tqSendDataRsp(STqHandle* pHandle, const SRpcMsg* pMsg, const SMqPollReq* pReq, const SMqDataRsp* pRsp,
                       int32_t type, int32_t vgId);
-int32_t tqPushDataRsp(STqHandle* pHandle, int32_t vgId);
+//int32_t tqPushDataRsp(STqHandle* pHandle, int32_t vgId);
+int32_t tqPushEmptyDataRsp(STqHandle* pHandle, int32_t vgId);
 
 // tqMeta
 int32_t tqMetaOpen(STQ* pTq);

source/dnode/vnode/src/inc/vnodeInt.h

@@ -319,7 +319,6 @@ int32_t rsmaSnapRead(SRSmaSnapReader* pReader, uint8_t** ppData);
 // SRSmaSnapWriter ========================================
 int32_t rsmaSnapWriterOpen(SSma* pSma, int64_t sver, int64_t ever, SRSmaSnapWriter** ppWriter);
 int32_t rsmaSnapWrite(SRSmaSnapWriter* pWriter, uint8_t* pData, uint32_t nData);
-int32_t rsmaSnapWriterPrepareClose(SRSmaSnapWriter* pWriter);
 int32_t rsmaSnapWriterClose(SRSmaSnapWriter** ppWriter, int8_t rollback);
 
 typedef struct {

source/dnode/vnode/src/meta/metaTable.c

@@ -207,7 +207,10 @@ int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
     tb_uid_t uid = *(tb_uid_t *)pData;
     tdbFree(pData);
     SMetaInfo info;
-    metaGetInfo(pMeta, uid, &info, NULL);
+    if (metaGetInfo(pMeta, uid, &info, NULL) == TSDB_CODE_NOT_FOUND) {
+      terrno = TSDB_CODE_PAR_TABLE_NOT_EXIST;
+      return -1;
+    }
     if (info.uid == info.suid) {
       return 0;
     } else {
@@ -939,7 +942,7 @@ int metaTtlDropTable(SMeta *pMeta, int64_t timePointMs, SArray *tbUids) {
     return 0;
   }
 
-  metaInfo("ttl find expired table count: %zu" , TARRAY_SIZE(tbUids));
+  metaInfo("ttl find expired table count: %zu", TARRAY_SIZE(tbUids));
 
   metaDropTables(pMeta, tbUids);
   return 0;

source/dnode/vnode/src/sma/smaCommit.c

@@ -108,9 +108,6 @@ int32_t smaFinishCommit(SSma *pSma) {
   int32_t lino = 0;
   SVnode *pVnode = pSma->pVnode;
 
-  code = tdRSmaFSFinishCommit(pSma);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
   if (VND_RSMA1(pVnode) && (code = tsdbFinishCommit(VND_RSMA1(pVnode))) < 0) {
     TSDB_CHECK_CODE(code, lino, _exit);
   }
@@ -150,18 +147,7 @@ static int32_t tdProcessRSmaAsyncPreCommitImpl(SSma *pSma, bool isCommit) {
   atomic_store_8(RSMA_TRIGGER_STAT(pRSmaStat), TASK_TRIGGER_STAT_PAUSED);
   if (isCommit) {
     while (atomic_val_compare_exchange_8(RSMA_COMMIT_STAT(pRSmaStat), 0, 1) != 0) {
-      ++nLoops;
-      if (nLoops > 1000) {
-        sched_yield();
-        nLoops = 0;
-      }
-    }
-
-    pRSmaStat->commitAppliedVer = pSma->pVnode->state.applied;
-    if (ASSERTS(pRSmaStat->commitAppliedVer >= -1, "commit applied version %" PRIi64 " < -1",
-                pRSmaStat->commitAppliedVer)) {
-      code = TSDB_CODE_APP_ERROR;
-      TSDB_CHECK_CODE(code, lino, _exit);
+      TD_SMA_LOOPS_CHECK(nLoops, 1000)
     }
   }
   // step 2: wait for all triggered fetch tasks to finish
@@ -173,11 +159,7 @@ static int32_t tdProcessRSmaAsyncPreCommitImpl(SSma *pSma, bool isCommit) {
     } else {
       smaDebug("vgId:%d, rsma commit%d, fetch tasks are not all finished yet", SMA_VID(pSma), isCommit);
     }
-    ++nLoops;
-    if (nLoops > 1000) {
-      sched_yield();
-      nLoops = 0;
-    }
+    TD_SMA_LOOPS_CHECK(nLoops, 1000);
   }
 
   /**
@@ -189,40 +171,17 @@ static int32_t tdProcessRSmaAsyncPreCommitImpl(SSma *pSma, bool isCommit) {
           (void *)taosGetSelfPthreadId());
   nLoops = 0;
   while (atomic_load_64(&pRSmaStat->nBufItems) > 0) {
-    ++nLoops;
-    if (nLoops > 1000) {
-      sched_yield();
-      nLoops = 0;
-    }
+    TD_SMA_LOOPS_CHECK(nLoops, 1000);
   }
 
   if (!isCommit) goto _exit;
 
-  smaInfo("vgId:%d, rsma commit, all items are consumed, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
-  code = tdRSmaPersistExecImpl(pRSmaStat, RSMA_INFO_HASH(pRSmaStat));
+  // code = tdRSmaPersistExecImpl(pRSmaStat, RSMA_INFO_HASH(pRSmaStat));
   TSDB_CHECK_CODE(code, lino, _exit);
 
   smaInfo("vgId:%d, rsma commit, operator state committed, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
 
-#if 0  // consuming task of qTaskInfo clone 
-  // step 4:  swap queue/qall and iQueue/iQall
-  // lock
-  taosWLockLatch(SMA_ENV_LOCK(pEnv));
-
-  void *pIter = taosHashIterate(RSMA_INFO_HASH(pRSmaStat), NULL);
-
-  while (pIter) {
-    SRSmaInfo *pInfo = *(SRSmaInfo **)pIter;
-    TSWAP(pInfo->iQall, pInfo->qall);
-    TSWAP(pInfo->iQueue, pInfo->queue);
-    TSWAP(pInfo->iTaskInfo[0], pInfo->taskInfo[0]);
-    TSWAP(pInfo->iTaskInfo[1], pInfo->taskInfo[1]);
-    pIter = taosHashIterate(RSMA_INFO_HASH(pRSmaStat), pIter);
-  }
-
-  // unlock
-  taosWUnLockLatch(SMA_ENV_LOCK(pEnv));
-#endif
+  smaInfo("vgId:%d, rsma commit, all items are consumed, TID:%p", SMA_VID(pSma), (void *)taosGetSelfPthreadId());
 
   // all rsma results are written completely
   STsdb *pTsdb = NULL;
@@ -258,9 +217,6 @@ static int32_t tdProcessRSmaAsyncCommitImpl(SSma *pSma, SCommitInfo *pInfo) {
     goto _exit;
   }
 
-  code = tdRSmaFSCommit(pSma);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
   code = tsdbCommit(VND_RSMA1(pVnode), pInfo);
   TSDB_CHECK_CODE(code, lino, _exit);
 
@@ -310,20 +266,6 @@ static int32_t tdProcessRSmaAsyncPostCommitImpl(SSma *pSma) {
 
         continue;
       }
-#if 0
-    if (pRSmaInfo->taskInfo[0]) {
-      if (pRSmaInfo->iTaskInfo[0]) {
-        SRSmaInfo *pRSmaInfo = *(SRSmaInfo **)pRSmaInfo->iTaskInfo[0];
-        tdFreeRSmaInfo(pSma, pRSmaInfo, false);
-        pRSmaInfo->iTaskInfo[0] = NULL;
-      }
-    } else {
-      TSWAP(pRSmaInfo->taskInfo[0], pRSmaInfo->iTaskInfo[0]);
-    }
-
-    taosHashPut(RSMA_INFO_HASH(pRSmaStat), pSuid, sizeof(tb_uid_t), pIter, sizeof(pIter));
-    smaDebug("vgId:%d, rsma async post commit, migrated from iRsmaInfoHash for table:%" PRIi64, SMA_VID(pSma), *pSuid);
-#endif
     }
 
     // unlock

source/dnode/vnode/src/sma/smaEnv.c

@@ -30,7 +30,6 @@ static int32_t tdRsmaStartExecutor(const SSma *pSma);
 static int32_t tdRsmaStopExecutor(const SSma *pSma);
 static int32_t tdDestroySmaState(SSmaStat *pSmaStat, int8_t smaType);
 static void   *tdFreeSmaState(SSmaStat *pSmaStat, int8_t smaType);
-static void   *tdFreeTSmaStat(STSmaStat *pStat);
 static void    tdDestroyRSmaStat(void *pRSmaStat);
 
 /**
@@ -63,19 +62,15 @@ int32_t smaInit() {
 
     int32_t type = (8 == POINTER_BYTES) ? TSDB_DATA_TYPE_UBIGINT : TSDB_DATA_TYPE_UINT;
     smaMgmt.refHash = taosHashInit(64, taosGetDefaultHashFunction(type), true, HASH_ENTRY_LOCK);
-    if (!smaMgmt.refHash) {
-      taosCloseRef(smaMgmt.rsetId);
-      atomic_store_8(&smaMgmt.inited, 0);
-      smaError("failed to init sma tmr hanle since %s", terrstr());
-      return TSDB_CODE_FAILED;
-    }
-
     // init fetch timer handle
     smaMgmt.tmrHandle = taosTmrInit(10000, 100, 10000, "RSMA");
-    if (!smaMgmt.tmrHandle) {
+
+    if (!smaMgmt.refHash || !smaMgmt.tmrHandle) {
       taosCloseRef(smaMgmt.rsetId);
-      taosHashCleanup(smaMgmt.refHash);
-      smaMgmt.refHash = NULL;
+      if (smaMgmt.refHash) {
+        taosHashCleanup(smaMgmt.refHash);
+        smaMgmt.refHash = NULL;
+      }
       atomic_store_8(&smaMgmt.inited, 0);
       smaError("failed to init sma tmr handle since %s", terrstr());
       return TSDB_CODE_FAILED;
@@ -143,10 +138,6 @@ static int32_t tdNewSmaEnv(SSma *pSma, int8_t smaType, SSmaEnv **ppEnv) {
 }
 
 static int32_t tdInitSmaEnv(SSma *pSma, int8_t smaType, SSmaEnv **ppEnv) {
-  if (!ppEnv) {
-    terrno = TSDB_CODE_INVALID_PTR;
-    return TSDB_CODE_FAILED;
-  }
 
   if (!(*ppEnv)) {
     if (tdNewSmaEnv(pSma, smaType, ppEnv) != TSDB_CODE_SUCCESS) {
@@ -196,10 +187,6 @@ static int32_t tdInitSmaStat(SSmaStat **pSmaStat, int8_t smaType, const SSma *pS
   int32_t code = 0;
   int32_t lino = 0;
 
-  if (ASSERTS(pSmaStat != NULL, "pSmaStat is NULL")) {
-    terrno = TSDB_CODE_RSMA_INVALID_ENV;
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
 
   if (*pSmaStat) {  // no lock
     return code;    // success, return directly
@@ -255,15 +242,13 @@ static int32_t tdInitSmaStat(SSmaStat **pSmaStat, int8_t smaType, const SSma *pS
       taosInitRWLatch(RSMA_FS_LOCK(pRSmaStat));
     } else if (smaType == TSDB_SMA_TYPE_TIME_RANGE) {
       // TODO
-    } else {
-      ASSERTS(0, "unknown smaType:%" PRIi8, smaType);
-      code = TSDB_CODE_APP_ERROR;
-      TSDB_CHECK_CODE(code, lino, _exit);
     }
   }
 _exit:
   if (code) {
     smaError("vgId:%d, %s failed at line %d since %s", SMA_VID(pSma), __func__, lino, tstrerror(code));
+  } else {
+    smaDebug("vgId:%d, %s succeed, type:%" PRIi8, SMA_VID(pSma), __func__, smaType);
   }
   return code;
 }
@@ -277,12 +262,6 @@ static void tdDestroyTSmaStat(STSmaStat *pStat) {
   }
 }
 
-static void *tdFreeTSmaStat(STSmaStat *pStat) {
-  tdDestroyTSmaStat(pStat);
-  taosMemoryFreeClear(pStat);
-  return NULL;
-}
-
 static void tdDestroyRSmaStat(void *pRSmaStat) {
   if (pRSmaStat) {
     SRSmaStat *pStat = (SRSmaStat *)pRSmaStat;
@@ -300,11 +279,7 @@ static void tdDestroyRSmaStat(void *pRSmaStat) {
       } else {
         smaDebug("vgId:%d, rsma fetch tasks are not all finished yet", SMA_VID(pSma));
       }
-      ++nLoops;
-      if (nLoops > 1000) {
-        sched_yield();
-        nLoops = 0;
-      }
+      TD_SMA_LOOPS_CHECK(nLoops, 1000);
     }
 
     // step 3:
@@ -313,10 +288,7 @@ static void tdDestroyRSmaStat(void *pRSmaStat) {
     // step 4: destroy the rsma info and associated fetch tasks
     taosHashCleanup(RSMA_INFO_HASH(pStat));
 
-    // step 5:
-    tdRSmaFSClose(RSMA_FS(pStat));
-
-    // step 6: free pStat
+    // step 5: free pStat
     tsem_destroy(&(pStat->notEmpty));
     taosMemoryFreeClear(pStat);
   }
@@ -354,10 +326,7 @@ static int32_t tdDestroySmaState(SSmaStat *pSmaStat, int8_t smaType) {
         smaDebug("vgId:%d, remove refId:%" PRIi64 " from rsmaRef:%" PRIi32 " succeed", vid, refId, smaMgmt.rsetId);
       }
     } else {
-      ASSERTS(0, "unknown smaType:%" PRIi8, smaType);
-      terrno = TSDB_CODE_APP_ERROR;
-      smaError("%s failed at line %d since %s", __func__, __LINE__, terrstr());
-      return -1;
+      smaError("%s failed at line %d since Unknown type", __func__, __LINE__);
     }
   }
   return 0;
@@ -375,11 +344,6 @@ int32_t tdLockSma(SSma *pSma) {
 }
 
 int32_t tdUnLockSma(SSma *pSma) {
-  if (ASSERTS(SMA_LOCKED(pSma), "pSma %p is not locked:%d", pSma, pSma->locked)) {
-    terrno = TSDB_CODE_APP_ERROR;
-    smaError("vgId:%d, failed to unlock since %s", SMA_VID(pSma), tstrerror(terrno));
-    return -1;
-  }
 
   pSma->locked = false;
   int code = taosThreadMutexUnlock(&pSma->mutex);

source/dnode/vnode/src/sma/smaFS.c

-/*
- * 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/>.
- */
-
-#include "sma.h"
-#include "vnd.h"
-
-// =================================================================================================
-
-// static int32_t tdFetchQTaskInfoFiles(SSma *pSma, int64_t version, SArray **output);
-static int32_t tdQTaskInfCmprFn1(const void *p1, const void *p2);
-
-static FORCE_INLINE int32_t tPutQTaskF(uint8_t *p, SQTaskFile *pFile) {
-  int32_t n = 0;
-
-  n += tPutI8(p ? p + n : p, pFile->level);
-  n += tPutI64v(p ? p + n : p, pFile->size);
-  n += tPutI64v(p ? p + n : p, pFile->suid);
-  n += tPutI64v(p ? p + n : p, pFile->version);
-  n += tPutI64v(p ? p + n : p, pFile->mtime);
-
-  return n;
-}
-
-static int32_t tdRSmaFSToBinary(uint8_t *p, SRSmaFS *pFS) {
-  int32_t  n = 0;
-  uint32_t size = taosArrayGetSize(pFS->aQTaskInf);
-
-  // version
-  n += tPutI8(p ? p + n : p, 0);
-
-  // SArray<SQTaskFile>
-  n += tPutU32v(p ? p + n : p, size);
-  for (uint32_t i = 0; i < size; ++i) {
-    n += tPutQTaskF(p ? p + n : p, taosArrayGet(pFS->aQTaskInf, i));
-  }
-
-  return n;
-}
-
-int32_t tdRSmaGetQTaskF(uint8_t *p, SQTaskFile *pFile) {
-  int32_t n = 0;
-
-  n += tGetI8(p + n, &pFile->level);
-  n += tGetI64v(p + n, &pFile->size);
-  n += tGetI64v(p + n, &pFile->suid);
-  n += tGetI64v(p + n, &pFile->version);
-  n += tGetI64v(p + n, &pFile->mtime);
-
-  return n;
-}
-
-static int32_t tsdbBinaryToFS(uint8_t *pData, int64_t nData, SRSmaFS *pFS) {
-  int32_t code = 0;
-  int32_t n = 0;
-  int8_t  version = 0;
-
-  // version
-  n += tGetI8(pData + n, &version);
-
-  // SArray<SQTaskFile>
-  taosArrayClear(pFS->aQTaskInf);
-  uint32_t size = 0;
-  n += tGetU32v(pData + n, &size);
-  for (uint32_t i = 0; i < size; ++i) {
-    SQTaskFile qTaskF = {0};
-
-    int32_t nt = tdRSmaGetQTaskF(pData + n, &qTaskF);
-    if (nt < 0) {
-      code = TSDB_CODE_FILE_CORRUPTED;
-      goto _exit;
-    }
-
-    n += nt;
-    if (taosArrayPush(pFS->aQTaskInf, &qTaskF) == NULL) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      goto _exit;
-    }
-  }
-
-  if (ASSERTS(n + sizeof(TSCKSUM) == nData, "n:%d + sizeof(TSCKSUM):%d != nData:%d", n, (int32_t)sizeof(TSCKSUM),
-              nData)) {
-    code = TSDB_CODE_FILE_CORRUPTED;
-    goto _exit;
-  }
-
-_exit:
-  return code;
-}
-
-static int32_t tdRSmaSaveFSToFile(SRSmaFS *pFS, const char *fname) {
-  int32_t code = 0;
-  int32_t lino = 0;
-
-  // encode to binary
-  int32_t  size = tdRSmaFSToBinary(NULL, pFS) + sizeof(TSCKSUM);
-  uint8_t *pData = taosMemoryMalloc(size);
-  if (pData == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-  tdRSmaFSToBinary(pData, pFS);
-  taosCalcChecksumAppend(0, pData, size);
-
-  // save to file
-  TdFilePtr pFD = taosCreateFile(fname, TD_FILE_WRITE | TD_FILE_CREATE | TD_FILE_TRUNC);
-  if (pFD == NULL) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  int64_t n = taosWriteFile(pFD, pData, size);
-  if (n < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    taosCloseFile(&pFD);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  if (taosFsyncFile(pFD) < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    taosCloseFile(&pFD);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  taosCloseFile(&pFD);
-
-_exit:
-  if (pData) taosMemoryFree(pData);
-  if (code) {
-    smaError("%s failed at line %d since %s, fname:%s", __func__, lino, tstrerror(code), fname);
-  }
-  return code;
-}
-
-static int32_t tdRSmaFSCreate(SRSmaFS *pFS, int32_t size) {
-  int32_t code = 0;
-
-  pFS->aQTaskInf = taosArrayInit(size, sizeof(SQTaskFile));
-  if (pFS->aQTaskInf == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    goto _exit;
-  }
-
-_exit:
-  return code;
-}
-
-static void tdRSmaGetCurrentFName(SSma *pSma, char *current, char *current_t) {
-  SVnode *pVnode = pSma->pVnode;
-  int32_t offset = 0;
-
-  vnodeGetPrimaryDir(pVnode->path, pVnode->pTfs, current, TSDB_FILENAME_LEN);
-  offset = strlen(current);
-  snprintf(current + offset, TSDB_FILENAME_LEN - offset - 1, "%s%s%sPRESENT", TD_DIRSEP, VNODE_RSMA_DIR, TD_DIRSEP);
-
-  vnodeGetPrimaryDir(pVnode->path, pVnode->pTfs, current_t, TSDB_FILENAME_LEN);
-  offset = strlen(current_t);
-  snprintf(current_t + offset, TSDB_FILENAME_LEN - offset - 1, "%s%s%sPRESENT.t", TD_DIRSEP, VNODE_RSMA_DIR, TD_DIRSEP);
-}
-
-static int32_t tdRSmaLoadFSFromFile(const char *fname, SRSmaFS *pFS) {
-  int32_t  code = 0;
-  int32_t  lino = 0;
-  uint8_t *pData = NULL;
-
-  // load binary
-  TdFilePtr pFD = taosOpenFile(fname, TD_FILE_READ);
-  if (pFD == NULL) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  int64_t size;
-  if (taosFStatFile(pFD, &size, NULL) < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    taosCloseFile(&pFD);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  pData = taosMemoryMalloc(size);
-  if (pData == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    taosCloseFile(&pFD);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  if (taosReadFile(pFD, pData, size) < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    taosCloseFile(&pFD);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  if (!taosCheckChecksumWhole(pData, size)) {
-    code = TSDB_CODE_FILE_CORRUPTED;
-    taosCloseFile(&pFD);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  taosCloseFile(&pFD);
-
-  // decode binary
-  code = tsdbBinaryToFS(pData, size, pFS);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-_exit:
-  if (pData) taosMemoryFree(pData);
-  if (code) {
-    smaError("%s failed at line %d since %s, fname:%s", __func__, lino, tstrerror(code), fname);
-  }
-  return code;
-}
-
-static int32_t tdQTaskInfCmprFn1(const void *p1, const void *p2) {
-  const SQTaskFile *q1 = (const SQTaskFile *)p1;
-  const SQTaskFile *q2 = (const SQTaskFile *)p2;
-
-  if (q1->suid < q2->suid) {
-    return -1;
-  } else if (q1->suid > q2->suid) {
-    return 1;
-  }
-
-  if (q1->level < q2->level) {
-    return -1;
-  } else if (q1->level > q2->level) {
-    return 1;
-  }
-
-  if (q1->version < q2->version) {
-    return -2;
-  } else if (q1->version > q2->version) {
-    return 1;
-  }
-
-  return 0;
-}
-
-static int32_t tdRSmaFSApplyChange(SSma *pSma, SRSmaFS *pFSNew) {
-  int32_t    code = 0;
-  int32_t    lino = 0;
-  int32_t    nRef = 0;
-  SVnode    *pVnode = pSma->pVnode;
-  SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
-  SRSmaStat *pStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
-  SRSmaFS   *pFSOld = RSMA_FS(pStat);
-  int64_t    version = pStat->commitAppliedVer;
-  char       fname[TSDB_FILENAME_LEN] = {0};
-
-  // SQTaskFile
-  int32_t nNew = taosArrayGetSize(pFSNew->aQTaskInf);
-  int32_t iNew = 0;
-  while (iNew < nNew) {
-    SQTaskFile *pQTaskFNew = TARRAY_GET_ELEM(pFSNew->aQTaskInf, iNew++);
-
-    int32_t idx = taosArraySearchIdx(pFSOld->aQTaskInf, pQTaskFNew, tdQTaskInfCmprFn1, TD_GE);
-
-    if (idx < 0) {
-      idx = taosArrayGetSize(pFSOld->aQTaskInf);
-      pQTaskFNew->nRef = 1;
-    } else {
-      SQTaskFile *pTaskF = TARRAY_GET_ELEM(pFSOld->aQTaskInf, idx);
-      int32_t     c1 = tdQTaskInfCmprFn1(pQTaskFNew, pTaskF);
-      if (c1 == 0) {
-        // utilize the item in pFSOld->qQTaskInf, instead of pFSNew
-        continue;
-      } else if (c1 < 0) {
-        // NOTHING TODO
-      } else {
-        code = TSDB_CODE_RSMA_FS_UPDATE;
-        TSDB_CHECK_CODE(code, lino, _exit);
-      }
-    }
-
-    if (taosArrayInsert(pFSOld->aQTaskInf, idx, pQTaskFNew) == NULL) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      TSDB_CHECK_CODE(code, lino, _exit);
-    }
-
-    // remove previous version
-    while (--idx >= 0) {
-      SQTaskFile *preTaskF = TARRAY_GET_ELEM(pFSOld->aQTaskInf, idx);
-      int32_t     c2 = tdQTaskInfCmprFn1(preTaskF, pQTaskFNew);
-      if (c2 == 0) {
-        code = TSDB_CODE_RSMA_FS_UPDATE;
-        TSDB_CHECK_CODE(code, lino, _exit);
-      } else if (c2 != -2) {
-        break;
-      }
-
-      nRef = atomic_sub_fetch_32(&preTaskF->nRef, 1);
-      if (nRef <= 0) {
-        tdRSmaQTaskInfoGetFullName(pVnode, preTaskF->suid, preTaskF->level, preTaskF->version, pVnode->pTfs, fname);
-        (void)taosRemoveFile(fname);
-        taosArrayRemove(pFSOld->aQTaskInf, idx);
-      }
-    }
-  }
-
-_exit:
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", TD_VID(pVnode), __func__, lino, tstrerror(code));
-  }
-  return code;
-}
-
-static int32_t tdRSmaFSScanAndTryFix(SSma *pSma) {
-  int32_t code = 0;
-#if 0
-  int32_t    lino = 0;
-  SVnode    *pVnode = pSma->pVnode;
-  SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
-  SRSmaStat *pStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
-  SRSmaFS   *pFS = RSMA_FS(pStat);
-  char       fname[TSDB_FILENAME_LEN] = {0};
-  char       fnameVer[TSDB_FILENAME_LEN] = {0};
-
-  // SArray<SQTaskFile>
-  int32_t size = taosArrayGetSize(pFS->aQTaskInf);
-  for (int32_t i = 0; i < size; ++i) {
-    SQTaskFile *pTaskF = (SQTaskFile *)taosArrayGet(pFS->aQTaskInf, i);
-
-    // main.tdb =========
-    tdRSmaQTaskInfoGetFullName(pVnode, pTaskF->suid, pTaskF->level, pTaskF->version,
-                               pVnode->pTfs, fnameVer);
-    tdRSmaQTaskInfoGetFullName(pVnode, pTaskF->suid, pTaskF->level, -1, pVnode->pTfs, fname);
-
-    if (taosCheckExistFile(fnameVer)) {
-      if (taosRenameFile(fnameVer, fname) < 0) {
-        code = TAOS_SYSTEM_ERROR(errno);
-        TSDB_CHECK_CODE(code, lino, _exit);
-      }
-      smaDebug("vgId:%d, %s:%d succeed to to rename %s to %s", TD_VID(pVnode), __func__, lino, fnameVer, fname);
-    } else if (taosCheckExistFile(fname)) {
-      if (taosRemoveFile(fname) < 0) {
-        code = TAOS_SYSTEM_ERROR(errno);
-        TSDB_CHECK_CODE(code, lino, _exit);
-      }
-      smaDebug("vgId:%d, %s:%d succeed to to remove %s", TD_VID(pVnode), __func__, lino, fname);
-    }
-  }
-
-  {
-    // remove those invalid files (todo)
-    // main.tdb-journal.5 // TDB should handle its clear for kill -9
-  }
-
-_exit:
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", TD_VID(pVnode), __func__, lino, tstrerror(code));
-  }
-#endif
-  return code;
-}
-
-// EXPOSED APIS ====================================================================================
-
-int32_t tdRSmaFSOpen(SSma *pSma, int64_t version, int8_t rollback) {
-  int32_t    code = 0;
-  int32_t    lino = 0;
-  SVnode    *pVnode = pSma->pVnode;
-  SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
-  SRSmaStat *pStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
-
-  // open handle
-  code = tdRSmaFSCreate(RSMA_FS(pStat), 0);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-  // open impl
-  char current[TSDB_FILENAME_LEN] = {0};
-  char current_t[TSDB_FILENAME_LEN] = {0};
-  tdRSmaGetCurrentFName(pSma, current, current_t);
-
-  if (taosCheckExistFile(current)) {
-    code = tdRSmaLoadFSFromFile(current, RSMA_FS(pStat));
-    TSDB_CHECK_CODE(code, lino, _exit);
-
-    if (taosCheckExistFile(current_t)) {
-      if (rollback) {
-        code = tdRSmaFSRollback(pSma);
-        TSDB_CHECK_CODE(code, lino, _exit);
-      } else {
-        code = tdRSmaFSCommit(pSma);
-        TSDB_CHECK_CODE(code, lino, _exit);
-      }
-    }
-  } else {
-    // 1st time open with empty current/qTaskInfoFile
-    code = tdRSmaSaveFSToFile(RSMA_FS(pStat), current);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  // scan and try fix(remove main.db/main.db.xxx and use the one with version)
-  code = tdRSmaFSScanAndTryFix(pSma);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-_exit:
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", TD_VID(pVnode), __func__, lino, tstrerror(code));
-  }
-  return code;
-}
-
-void tdRSmaFSClose(SRSmaFS *pFS) { pFS->aQTaskInf = taosArrayDestroy(pFS->aQTaskInf); }
-
-int32_t tdRSmaFSPrepareCommit(SSma *pSma, SRSmaFS *pFSNew) {
-  int32_t code = 0;
-  int32_t lino = 0;
-  char    tfname[TSDB_FILENAME_LEN];
-
-  tdRSmaGetCurrentFName(pSma, NULL, tfname);
-
-  // generate PRESENT.t
-  code = tdRSmaSaveFSToFile(pFSNew, tfname);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-_exit:
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", TD_VID(pSma->pVnode), __func__, lino, tstrerror(code));
-  }
-  return code;
-}
-
-int32_t tdRSmaFSCommit(SSma *pSma) {
-  int32_t code = 0;
-  int32_t lino = 0;
-  SRSmaFS fs = {0};
-
-  char current[TSDB_FILENAME_LEN] = {0};
-  char current_t[TSDB_FILENAME_LEN] = {0};
-  tdRSmaGetCurrentFName(pSma, current, current_t);
-
-  if (!taosCheckExistFile(current_t)) {
-    goto _exit;
-  }
-
-  // rename the file
-  if (taosRenameFile(current_t, current) < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  // load the new FS
-  code = tdRSmaFSCreate(&fs, 1);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-  code = tdRSmaLoadFSFromFile(current, &fs);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-  // apply file change
-  code = tdRSmaFSApplyChange(pSma, &fs);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-_exit:
-  tdRSmaFSClose(&fs);
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", SMA_VID(pSma), __func__, lino, tstrerror(code));
-  }
-  return code;
-}
-
-int32_t tdRSmaFSFinishCommit(SSma *pSma) {
-  int32_t    code = 0;
-  int32_t    lino = 0;
-  SSmaEnv   *pSmaEnv = SMA_RSMA_ENV(pSma);
-  SRSmaStat *pStat = (SRSmaStat *)SMA_ENV_STAT(pSmaEnv);
-
-  taosWLockLatch(RSMA_FS_LOCK(pStat));
-  code = tdRSmaFSCommit(pSma);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-_exit:
-  taosWUnLockLatch(RSMA_FS_LOCK(pStat));
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", SMA_VID(pSma), __func__, lino, tstrerror(code));
-  } else {
-    smaInfo("vgId:%d, rsmaFS finish commit", SMA_VID(pSma));
-  }
-  return code;
-}
-
-int32_t tdRSmaFSRollback(SSma *pSma) {
-  int32_t code = 0;
-  int32_t lino = 0;
-
-  char current_t[TSDB_FILENAME_LEN] = {0};
-  tdRSmaGetCurrentFName(pSma, NULL, current_t);
-  (void)taosRemoveFile(current_t);
-
-_exit:
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", SMA_VID(pSma), __func__, lino, tstrerror(errno));
-  }
-  return code;
-}
-
-int32_t tdRSmaFSUpsertQTaskFile(SSma *pSma, SRSmaFS *pFS, SQTaskFile *qTaskFile, int32_t nSize) {
-  int32_t code = 0;
-
-  for (int32_t i = 0; i < nSize; ++i) {
-    SQTaskFile *qTaskF = qTaskFile + i;
-
-    int32_t idx = taosArraySearchIdx(pFS->aQTaskInf, qTaskF, tdQTaskInfCmprFn1, TD_GE);
-
-    if (idx < 0) {
-      idx = taosArrayGetSize(pFS->aQTaskInf);
-    } else {
-      SQTaskFile *pTaskF = (SQTaskFile *)taosArrayGet(pFS->aQTaskInf, idx);
-      int32_t     c = tdQTaskInfCmprFn1(pTaskF, qTaskF);
-      if (c == 0) {
-        if (pTaskF->size != qTaskF->size) {
-          code = TSDB_CODE_RSMA_FS_UPDATE;
-          smaError("vgId:%d, %s failed at line %d since %s, level:%" PRIi8 ", suid:%" PRIi64 ", version:%" PRIi64
-                   ", size:%" PRIi64 " != %" PRIi64,
-                   SMA_VID(pSma), __func__, __LINE__, tstrerror(code), pTaskF->level, pTaskF->suid, pTaskF->version,
-                   pTaskF->size, qTaskF->size);
-          goto _exit;
-        }
-        continue;
-      }
-    }
-
-    if (!taosArrayInsert(pFS->aQTaskInf, idx, qTaskF)) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      goto _exit;
-    }
-  }
-
-_exit:
-  return code;
-}
-
-int32_t tdRSmaFSRef(SSma *pSma, SRSmaFS *pFS) {
-  int32_t    code = 0;
-  int32_t    lino = 0;
-  int32_t    nRef = 0;
-  SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
-  SRSmaStat *pStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
-  SRSmaFS   *qFS = RSMA_FS(pStat);
-  int32_t    size = taosArrayGetSize(qFS->aQTaskInf);
-
-  pFS->aQTaskInf = taosArrayInit_s(sizeof(SQTaskFile), size);
-  if (pFS->aQTaskInf == NULL) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  for (int32_t i = 0; i < size; ++i) {
-    SQTaskFile *qTaskF = (SQTaskFile *)taosArrayGet(qFS->aQTaskInf, i);
-    nRef = atomic_fetch_add_32(&qTaskF->nRef, 1);
-    if (nRef <= 0) {
-      code = TSDB_CODE_RSMA_FS_REF;
-      TSDB_CHECK_CODE(code, lino, _exit);
-    }
-  }
-
-  memcpy(pFS->aQTaskInf->pData, qFS->aQTaskInf->pData, size * sizeof(SQTaskFile));
-
-_exit:
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s, nRef %d", TD_VID(pSma->pVnode), __func__, lino, tstrerror(code),
-             nRef);
-  }
-  return code;
-}
-
-void tdRSmaFSUnRef(SSma *pSma, SRSmaFS *pFS) {
-  int32_t    nRef = 0;
-  char       fname[TSDB_FILENAME_LEN];
-  SVnode    *pVnode = pSma->pVnode;
-  SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
-  SRSmaStat *pStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
-  int32_t    size = taosArrayGetSize(pFS->aQTaskInf);
-
-  for (int32_t i = 0; i < size; ++i) {
-    SQTaskFile *pTaskF = (SQTaskFile *)taosArrayGet(pFS->aQTaskInf, i);
-
-    nRef = atomic_sub_fetch_32(&pTaskF->nRef, 1);
-    if (nRef == 0) {
-      tdRSmaQTaskInfoGetFullName(pVnode, pTaskF->suid, pTaskF->level, pTaskF->version, pVnode->pTfs, fname);
-      if (taosRemoveFile(fname) < 0) {
-        smaWarn("vgId:%d, failed to remove %s since %s", TD_VID(pVnode), fname, tstrerror(TAOS_SYSTEM_ERROR(errno)));
-      } else {
-        smaDebug("vgId:%d, success to remove %s", TD_VID(pVnode), fname);
-      }
-    } else if (nRef < 0) {
-      smaWarn("vgId:%d, abnormal unref %s since %s", TD_VID(pVnode), fname, tstrerror(TSDB_CODE_RSMA_FS_REF));
-    }
-  }
-
-  taosArrayDestroy(pFS->aQTaskInf);
-}
-
-int32_t tdRSmaFSTakeSnapshot(SSma *pSma, SRSmaFS *pFS) {
-  int32_t    code = 0;
-  int32_t    lino = 0;
-  SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
-  SRSmaStat *pStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
-
-  taosRLockLatch(RSMA_FS_LOCK(pStat));
-  code = tdRSmaFSRef(pSma, pFS);
-  TSDB_CHECK_CODE(code, lino, _exit);
-_exit:
-  taosRUnLockLatch(RSMA_FS_LOCK(pStat));
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", TD_VID(pSma->pVnode), __func__, lino, tstrerror(code));
-  }
-  return code;
-}
-
-int32_t tdRSmaFSCopy(SSma *pSma, SRSmaFS *pFS) {
-  int32_t    code = 0;
-  int32_t    lino = 0;
-  SSmaEnv   *pEnv = SMA_RSMA_ENV(pSma);
-  SRSmaStat *pStat = (SRSmaStat *)SMA_ENV_STAT(pEnv);
-  SRSmaFS   *qFS = RSMA_FS(pStat);
-  int32_t    size = taosArrayGetSize(qFS->aQTaskInf);
-
-  code = tdRSmaFSCreate(pFS, size);
-  TSDB_CHECK_CODE(code, lino, _exit);
-  taosArrayAddBatch(pFS->aQTaskInf, qFS->aQTaskInf->pData, size);
-
-_exit:
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", TD_VID(pSma->pVnode), __func__, lino, tstrerror(code));
-  }
-  return code;
-}

source/dnode/vnode/src/sma/smaOpen.c

@@ -101,10 +101,6 @@ int smaSetKeepCfg(SVnode *pVnode, STsdbKeepCfg *pKeepCfg, STsdbCfg *pCfg, int ty
   terrno = 0;
   pKeepCfg->precision = pCfg->precision;
   switch (type) {
-    case TSDB_TYPE_TSMA:
-      ASSERTS(0, "undefined smaType:%d", (int32_t)type);
-      terrno = TSDB_CODE_APP_ERROR;
-      break;
     case TSDB_TYPE_RSMA_L0:
       SMA_SET_KEEP_CFG(pVnode, 0);
       break;
@@ -115,7 +111,6 @@ int smaSetKeepCfg(SVnode *pVnode, STsdbKeepCfg *pKeepCfg, STsdbCfg *pCfg, int ty
       SMA_SET_KEEP_CFG(pVnode, 2);
       break;
     default:
-      ASSERTS(0, "unknown smaType:%d", (int32_t)type);
       terrno = TSDB_CODE_APP_ERROR;
       break;
   }
@@ -189,8 +184,7 @@ int32_t smaClose(SSma *pSma) {
  */
 int32_t tdRSmaRestore(SSma *pSma, int8_t type, int64_t committedVer, int8_t rollback) {
   if (!VND_IS_RSMA(pSma->pVnode)) {
-    terrno = TSDB_CODE_RSMA_INVALID_ENV;
-    return TSDB_CODE_FAILED;
+    return TSDB_CODE_RSMA_INVALID_ENV;
   }
 
   return tdRSmaProcessRestoreImpl(pSma, type, committedVer, rollback);

source/dnode/vnode/src/sma/smaSnapshot.c

@@ -15,9 +15,6 @@
 
 #include "sma.h"
 
-static int32_t rsmaSnapReadQTaskInfo(SRSmaSnapReader* pReader, uint8_t** ppData);
-static int32_t rsmaSnapWriteQTaskInfo(SRSmaSnapWriter* pWriter, uint8_t* pData, uint32_t nData);
-
 // SRSmaSnapReader ========================================
 struct SRSmaSnapReader {
   SSma*   pSma;
@@ -28,11 +25,6 @@ struct SRSmaSnapReader {
   // for data file
   int8_t           rsmaDataDone[TSDB_RETENTION_L2];
   STsdbSnapReader* pDataReader[TSDB_RETENTION_L2];
-
-  // for qtaskinfo file
-  int8_t         qTaskDone;
-  int32_t        fsIter;
-  SQTaskFReader* pQTaskFReader;
 };
 
 int32_t rsmaSnapReaderOpen(SSma* pSma, int64_t sver, int64_t ever, SRSmaSnapReader** ppReader) {
@@ -62,22 +54,6 @@ int32_t rsmaSnapReaderOpen(SSma* pSma, int64_t sver, int64_t ever, SRSmaSnapRead
     }
   }
 
-  // open qtaskinfo
-  taosRLockLatch(RSMA_FS_LOCK(pStat));
-  code = tdRSmaFSRef(pSma, &pReader->fs);
-  taosRUnLockLatch(RSMA_FS_LOCK(pStat));
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-  if (taosArrayGetSize(pReader->fs.aQTaskInf) > 0) {
-    pReader->pQTaskFReader = taosMemoryCalloc(1, sizeof(SQTaskFReader));
-    if (!pReader->pQTaskFReader) {
-      code = TSDB_CODE_OUT_OF_MEMORY;
-      TSDB_CHECK_CODE(code, lino, _exit);
-    }
-    pReader->pQTaskFReader->pSma = pSma;
-    pReader->pQTaskFReader->version = pReader->ever;
-  }
-
   *ppReader = pReader;
 _exit:
   if (code) {
@@ -88,113 +64,6 @@ _exit:
   return code;
 }
 
-static int32_t rsmaSnapReadQTaskInfo(SRSmaSnapReader* pReader, uint8_t** ppBuf) {
-  int32_t        code = 0;
-  int32_t        lino = 0;
-  SVnode*        pVnode = pReader->pSma->pVnode;
-  SQTaskFReader* qReader = pReader->pQTaskFReader;
-  SRSmaFS*       pFS = &pReader->fs;
-  int64_t        n = 0;
-  uint8_t*       pBuf = NULL;
-  int64_t        version = pReader->ever;
-  char           fname[TSDB_FILENAME_LEN];
-
-  if (!qReader) {
-    *ppBuf = NULL;
-    smaInfo("vgId:%d, vnode snapshot rsma reader qtaskinfo, not needed since qTaskReader is NULL", TD_VID(pVnode));
-    goto _exit;
-  }
-
-  if (pReader->fsIter >= taosArrayGetSize(pFS->aQTaskInf)) {
-    *ppBuf = NULL;
-    smaInfo("vgId:%d, vnode snapshot rsma reader qtaskinfo, fsIter reach end", TD_VID(pVnode));
-    goto _exit;
-  }
-
-  while (pReader->fsIter < taosArrayGetSize(pFS->aQTaskInf)) {
-    SQTaskFile* qTaskF = taosArrayGet(pFS->aQTaskInf, pReader->fsIter++);
-    if (qTaskF->version != version) {
-      continue;
-    }
-
-    tdRSmaQTaskInfoGetFullName(pVnode, qTaskF->suid, qTaskF->level, version, pVnode->pTfs, fname);
-    if (!taosCheckExistFile(fname)) {
-      smaError("vgId:%d, vnode snapshot rsma reader for qtaskinfo, table %" PRIi64 ", level %" PRIi8
-               ", version %" PRIi64 " failed since %s not exist",
-               TD_VID(pVnode), qTaskF->suid, qTaskF->level, version, fname);
-      code = TSDB_CODE_RSMA_FS_SYNC;
-      TSDB_CHECK_CODE(code, lino, _exit);
-    }
-
-    TdFilePtr fp = taosOpenFile(fname, TD_FILE_READ);
-    if (!fp) {
-      code = TAOS_SYSTEM_ERROR(errno);
-      TSDB_CHECK_CODE(code, lino, _exit);
-    }
-    qReader->pReadH = fp;
-    qReader->level = qTaskF->level;
-    qReader->suid = qTaskF->suid;
-  }
-
-  if (!qReader->pReadH) {
-    *ppBuf = NULL;
-    smaInfo("vgId:%d, vnode snapshot rsma reader qtaskinfo, not needed since readh is NULL", TD_VID(pVnode));
-    goto _exit;
-  }
-
-  int64_t size = 0;
-  if (taosFStatFile(qReader->pReadH, &size, NULL) < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  // seek
-  if (taosLSeekFile(qReader->pReadH, 0, SEEK_SET) < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  if (*ppBuf) {
-    *ppBuf = taosMemoryRealloc(*ppBuf, sizeof(SSnapDataHdr) + size);
-  } else {
-    *ppBuf = taosMemoryMalloc(sizeof(SSnapDataHdr) + size);
-  }
-  if (!(*ppBuf)) {
-    code = TSDB_CODE_OUT_OF_MEMORY;
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  // read
-  n = taosReadFile(qReader->pReadH, POINTER_SHIFT(*ppBuf, sizeof(SSnapDataHdr)), size);
-  if (n < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  } else if (n != size) {
-    code = TSDB_CODE_FILE_CORRUPTED;
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  smaInfo("vgId:%d, vnode snapshot rsma read qtaskinfo, version:%" PRIi64 ", size:%" PRIi64, TD_VID(pVnode), version,
-          size);
-
-  SSnapDataHdr* pHdr = (SSnapDataHdr*)(*ppBuf);
-  pHdr->type = SNAP_DATA_QTASK;
-  pHdr->flag = qReader->level;
-  pHdr->index = qReader->suid;
-  pHdr->size = size;
-
-_exit:
-  if (qReader) taosCloseFile(&qReader->pReadH);
-
-  if (code) {
-    *ppBuf = NULL;
-    smaError("vgId:%d, %s failed at line %d since %s", TD_VID(pVnode), __func__, lino, tstrerror(code));
-  } else {
-    smaInfo("vgId:%d, vnode snapshot rsma read qtaskinfo succeed", TD_VID(pVnode));
-  }
-  return code;
-}
-
 int32_t rsmaSnapRead(SRSmaSnapReader* pReader, uint8_t** ppData) {
   int32_t code = 0;
   int32_t lino = 0;
@@ -222,18 +91,6 @@ int32_t rsmaSnapRead(SRSmaSnapReader* pReader, uint8_t** ppData) {
     }
   }
 
-  // read qtaskinfo file
-  if (!pReader->qTaskDone) {
-    smaInfo("vgId:%d, vnode snapshot rsma qtaskinfo not done", SMA_VID(pReader->pSma));
-    code = rsmaSnapReadQTaskInfo(pReader, ppData);
-    TSDB_CHECK_CODE(code, lino, _exit);
-    if (*ppData) {
-      goto _exit;
-    } else {
-      pReader->qTaskDone = 1;
-    }
-  }
-
 _exit:
   if (code) {
     smaError("vgId:%d, vnode snapshot rsma read failed since %s", SMA_VID(pReader->pSma), tstrerror(code));
@@ -248,9 +105,6 @@ int32_t rsmaSnapReaderClose(SRSmaSnapReader** ppReader) {
   int32_t          code = 0;
   SRSmaSnapReader* pReader = *ppReader;
 
-  tdRSmaFSUnRef(pReader->pSma, &pReader->fs);
-  taosMemoryFreeClear(pReader->pQTaskFReader);
-
   for (int32_t i = 0; i < TSDB_RETENTION_L2; ++i) {
     if (pReader->pDataReader[i]) {
       tsdbSnapReaderClose(&pReader->pDataReader[i]);
@@ -298,10 +152,6 @@ int32_t rsmaSnapWriterOpen(SSma* pSma, int64_t sver, int64_t ever, SRSmaSnapWrit
     }
   }
 
-  // qtaskinfo
-  code = tdRSmaFSCopy(pSma, &pWriter->fs);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
   // snapWriter
   *ppWriter = pWriter;
 _exit:
@@ -315,22 +165,6 @@ _exit:
   return code;
 }
 
-int32_t rsmaSnapWriterPrepareClose(SRSmaSnapWriter* pWriter) {
-  int32_t code = 0;
-  int32_t lino = 0;
-
-  if (pWriter) {
-    code = tdRSmaFSPrepareCommit(pWriter->pSma, &pWriter->fs);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-_exit:
-  if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s", SMA_VID(pWriter->pSma), __func__, lino, tstrerror(code));
-  }
-  return code;
-}
-
 int32_t rsmaSnapWriterClose(SRSmaSnapWriter** ppWriter, int8_t rollback) {
   int32_t          code = 0;
   int32_t          lino = 0;
@@ -361,61 +195,6 @@ int32_t rsmaSnapWriterClose(SRSmaSnapWriter** ppWriter, int8_t rollback) {
     }
   }
 
-  // qtaskinfo
-  if (rollback) {
-    tdRSmaFSRollback(pSma);
-    // remove qTaskFiles
-  } else {
-    // sendFile from fname.Ver to fname
-    SRSmaFS* pFS = &pWriter->fs;
-    int32_t  size = taosArrayGetSize(pFS->aQTaskInf);
-    for (int32_t i = 0; i < size; ++i) {
-      SQTaskFile* pTaskF = TARRAY_GET_ELEM(pFS->aQTaskInf, i);
-      if (pTaskF->version == pWriter->ever) {
-        tdRSmaQTaskInfoGetFullName(pVnode, pTaskF->suid, pTaskF->level, pTaskF->version, pVnode->pTfs, fnameVer);
-        tdRSmaQTaskInfoGetFullName(pVnode, pTaskF->suid, pTaskF->level, -1, pVnode->pTfs, fname);
-
-        pInFD = taosOpenFile(fnameVer, TD_FILE_READ);
-        if (pInFD == NULL) {
-          code = TAOS_SYSTEM_ERROR(errno);
-          TSDB_CHECK_CODE(code, lino, _exit);
-        }
-
-        pOutFD = taosCreateFile(fname, TD_FILE_WRITE | TD_FILE_CREATE | TD_FILE_TRUNC);
-        if (pOutFD == NULL) {
-          code = TAOS_SYSTEM_ERROR(errno);
-          TSDB_CHECK_CODE(code, lino, _exit);
-        }
-
-        int64_t size = 0;
-        if (taosFStatFile(pInFD, &size, NULL) < 0) {
-          code = TAOS_SYSTEM_ERROR(errno);
-          TSDB_CHECK_CODE(code, lino, _exit);
-        }
-
-        int64_t offset = 0;
-        if (taosFSendFile(pOutFD, pInFD, &offset, size) < 0) {
-          code = TAOS_SYSTEM_ERROR(errno);
-          smaError("vgId:%d, vnode snapshot rsma writer, send qtaskinfo file %s to %s failed since %s", TD_VID(pVnode),
-                   fnameVer, fname, tstrerror(code));
-          TSDB_CHECK_CODE(code, lino, _exit);
-        }
-        taosCloseFile(&pOutFD);
-        taosCloseFile(&pInFD);
-      }
-    }
-
-    // lock
-    taosWLockLatch(RSMA_FS_LOCK(pStat));
-    code = tdRSmaFSCommit(pSma);
-    if (code) {
-      taosWUnLockLatch(RSMA_FS_LOCK(pStat));
-      goto _exit;
-    }
-    // unlock
-    taosWUnLockLatch(RSMA_FS_LOCK(pStat));
-  }
-
   // rsma restore
   code = tdRSmaRestore(pWriter->pSma, RSMA_RESTORE_SYNC, pWriter->ever, rollback);
   TSDB_CHECK_CODE(code, lino, _exit);
@@ -447,8 +226,6 @@ int32_t rsmaSnapWrite(SRSmaSnapWriter* pWriter, uint8_t* pData, uint32_t nData)
   } else if (pHdr->type == SNAP_DATA_RSMA2) {
     pHdr->type = SNAP_DATA_TSDB;
     code = tsdbSnapWrite(pWriter->pDataWriter[1], pHdr);
-  } else if (pHdr->type == SNAP_DATA_QTASK) {
-    code = rsmaSnapWriteQTaskInfo(pWriter, pData, nData);
   } else {
     code = TSDB_CODE_RSMA_FS_SYNC;
   }
@@ -463,67 +240,3 @@ _exit:
   }
   return code;
 }
-
-static int32_t rsmaSnapWriteQTaskInfo(SRSmaSnapWriter* pWriter, uint8_t* pData, uint32_t nData) {
-  int32_t       code = 0;
-  int32_t       lino = 0;
-  SSma*         pSma = pWriter->pSma;
-  SVnode*       pVnode = pSma->pVnode;
-  char          fname[TSDB_FILENAME_LEN];
-  TdFilePtr     fp = NULL;
-  SSnapDataHdr* pHdr = (SSnapDataHdr*)pData;
-
-  fname[0] = '\0';
-
-  if (pHdr->size != (nData - sizeof(SSnapDataHdr))) {
-    code = TSDB_CODE_RSMA_FS_SYNC;
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  SQTaskFile qTaskFile = {
-      .nRef = 1, .level = pHdr->flag, .suid = pHdr->index, .version = pWriter->ever, .size = pHdr->size};
-
-  tdRSmaQTaskInfoGetFullName(pVnode, pHdr->index, pHdr->flag, qTaskFile.version, pVnode->pTfs, fname);
-
-  fp = taosCreateFile(fname, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
-  if (!fp) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  int64_t contLen = taosWriteFile(fp, pHdr->data, pHdr->size);
-  if (contLen != pHdr->size) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  uint32_t mtime = 0;
-  if (taosFStatFile(fp, NULL, &mtime) != 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  } else {
-    qTaskFile.mtime = mtime;
-  }
-
-  if (taosFsyncFile(fp) < 0) {
-    code = TAOS_SYSTEM_ERROR(errno);
-    TSDB_CHECK_CODE(code, lino, _exit);
-  }
-
-  taosCloseFile(&fp);
-
-  code = tdRSmaFSUpsertQTaskFile(pSma, &pWriter->fs, &qTaskFile, 1);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-_exit:
-  if (code) {
-    if (fp) {
-      (void)taosRemoveFile(fname);
-    }
-    smaError("vgId:%d, %s failed at line %d since %s, file:%s", TD_VID(pVnode), __func__, lino, tstrerror(code), fname);
-  } else {
-    smaInfo("vgId:%d, vnode snapshot rsma write qtaskinfo %s succeed", TD_VID(pVnode), fname);
-  }
-
-  return code;
-}

source/dnode/vnode/src/sma/smaTimeRange.c

@@ -29,27 +29,21 @@ int32_t tdProcessTSmaInsert(SSma *pSma, int64_t indexUid, const char *msg) {
   int32_t code = TSDB_CODE_SUCCESS;
 
   if ((code = tdProcessTSmaInsertImpl(pSma, indexUid, msg)) < 0) {
-    smaError("vgId:%d, insert tsma data failed since %s", SMA_VID(pSma), tstrerror(terrno));
+    smaError("vgId:%d, insert tsma data failed since %s", SMA_VID(pSma), tstrerror(code));
   }
 
   return code;
 }
 
 int32_t tdProcessTSmaCreate(SSma *pSma, int64_t version, const char *msg) {
-  int32_t code = TSDB_CODE_SUCCESS;
+  int32_t code = tdProcessTSmaCreateImpl(pSma, version, msg);
 
-  if ((code = tdProcessTSmaCreateImpl(pSma, version, msg)) < 0) {
-    smaWarn("vgId:%d, create tsma failed since %s", SMA_VID(pSma), tstrerror(terrno));
-  }
   return code;
 }
 
 int32_t smaGetTSmaDays(SVnodeCfg *pCfg, void *pCont, uint32_t contLen, int32_t *days) {
-  int32_t code = TSDB_CODE_SUCCESS;
-  if ((code = tdProcessTSmaGetDaysImpl(pCfg, pCont, contLen, days)) < 0) {
-    smaWarn("vgId:%d, get tsma days failed since %s", pCfg->vgId, tstrerror(terrno));
-  }
-  smaDebug("vgId:%d, get tsma days %d", pCfg->vgId, *days);
+  int32_t code = tdProcessTSmaGetDaysImpl(pCfg, pCont, contLen, days);
+
   return code;
 }
 
@@ -63,19 +57,22 @@ int32_t smaGetTSmaDays(SVnodeCfg *pCfg, void *pCont, uint32_t contLen, int32_t *
  * @return int32_t
  */
 static int32_t tdProcessTSmaGetDaysImpl(SVnodeCfg *pCfg, void *pCont, uint32_t contLen, int32_t *days) {
+  int32_t  code = 0;
+  int32_t  lino = 0;
   SDecoder coder = {0};
   tDecoderInit(&coder, pCont, contLen);
 
   STSma tsma = {0};
   if (tDecodeSVCreateTSmaReq(&coder, &tsma) < 0) {
-    terrno = TSDB_CODE_MSG_DECODE_ERROR;
-    goto _err;
+    code = TSDB_CODE_MSG_DECODE_ERROR;
+    TSDB_CHECK_CODE(code, lino, _exit);
   }
+
   STsdbCfg *pTsdbCfg = &pCfg->tsdbCfg;
   int64_t   sInterval = convertTimeFromPrecisionToUnit(tsma.interval, pTsdbCfg->precision, TIME_UNIT_SECOND);
   if (sInterval <= 0) {
     *days = pTsdbCfg->days;
-    return 0;
+    goto _exit;
   }
   int64_t records = pTsdbCfg->days * 60 / sInterval;
   if (records >= SMA_STORAGE_SPLIT_FACTOR) {
@@ -94,11 +91,14 @@ static int32_t tdProcessTSmaGetDaysImpl(SVnodeCfg *pCfg, void *pCont, uint32_t c
       *days = pTsdbCfg->days;
     }
   }
+_exit:
+  if (code) {
+    smaWarn("vgId:%d, failed at line %d to get tsma days %d since %s", pCfg->vgId, lino, *days, tstrerror(code));
+  } else {
+    smaDebug("vgId:%d, succeed to get tsma days %d", pCfg->vgId, *days);
+  }
   tDecoderClear(&coder);
-  return 0;
-_err:
-  tDecoderClear(&coder);
-  return -1;
+  return code;
 }
 
 /**
@@ -157,6 +157,8 @@ _exit:
 int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *pTSchema,
                          SSchemaWrapper *pTagSchemaWrapper, bool createTb, int64_t suid, const char *stbFullName,
                          SBatchDeleteReq *pDeleteReq, void **ppData, int32_t *pLen) {
+  int32_t      code = 0;
+  int32_t      lino = 0;
   void        *pBuf = NULL;
   int32_t      len = 0;
   SSubmitReq2 *pReq = NULL;
@@ -166,21 +168,14 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
 
   int32_t sz = taosArrayGetSize(pBlocks);
 
-  if (!(tagArray = taosArrayInit(1, sizeof(STagVal)))) {
-    goto _end;
-  }
-
-  if (!(createTbArray = taosArrayInit(sz, POINTER_BYTES))) {
-    goto _end;
-  }
-
-  if (!(pReq = taosMemoryCalloc(1, sizeof(SSubmitReq2)))) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    goto _end;
-  }
+  tagArray = taosArrayInit(1, sizeof(STagVal));
+  createTbArray = taosArrayInit(sz, POINTER_BYTES);
+  pReq = taosMemoryCalloc(1, sizeof(SSubmitReq2));
+  pReq->aSubmitTbData = taosArrayInit(1, sizeof(SSubmitTbData));
 
-  if (!(pReq->aSubmitTbData = taosArrayInit(1, sizeof(SSubmitTbData)))) {
-    goto _end;
+  if(!tagArray || !createTbArray || !pReq || !pReq->aSubmitTbData) {
+    code = terrno == TSDB_CODE_SUCCESS ? TSDB_CODE_OUT_OF_MEMORY : terrno;
+    TSDB_CHECK_CODE(code, lino, _exit);
   }
 
   // create table req
@@ -194,7 +189,8 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
       }
 
       if (!(pCreateTbReq = taosMemoryCalloc(1, sizeof(SVCreateStbReq)))) {
-        goto _end;
+        code = TSDB_CODE_OUT_OF_MEMORY;
+        TSDB_CHECK_CODE(code, lino, _exit);
       };
 
       // don't move to the end of loop as to destroy in the end of func when error occur
@@ -223,8 +219,8 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
       STag *pTag = NULL;
       tTagNew(tagArray, 1, false, &pTag);
       if (pTag == NULL) {
-        terrno = TSDB_CODE_OUT_OF_MEMORY;
-        goto _end;
+        code = TSDB_CODE_OUT_OF_MEMORY;
+        TSDB_CHECK_CODE(code, lino, _exit);
       }
       pCreateTbReq->ctb.pTag = (uint8_t *)pTag;
 
@@ -259,7 +255,8 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
     SSubmitTbData tbData = {0};
 
     if (!(tbData.aRowP = taosArrayInit(rows, sizeof(SRow *)))) {
-      goto _end;
+      code = terrno;
+      TSDB_CHECK_CODE(code, lino, _exit);
     }
     tbData.suid = suid;
     tbData.uid = 0;  // uid is assigned by vnode
@@ -272,7 +269,8 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
 
     if (!pVals && !(pVals = taosArrayInit(pTSchema->numOfCols, sizeof(SColVal)))) {
       taosArrayDestroy(tbData.aRowP);
-      goto _end;
+      code = terrno;
+      TSDB_CHECK_CODE(code, lino, _exit);
     }
 
     for (int32_t j = 0; j < rows; ++j) {
@@ -298,9 +296,9 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
         }
       }
       SRow *pRow = NULL;
-      if ((terrno = tRowBuild(pVals, (STSchema *)pTSchema, &pRow)) < 0) {
+      if ((code = tRowBuild(pVals, (STSchema *)pTSchema, &pRow)) < 0) {
         tDestroySubmitTbData(&tbData, TSDB_MSG_FLG_ENCODE);
-        goto _end;
+        TSDB_CHECK_CODE(code, lino, _exit);
       }
       taosArrayPush(tbData.aRowP, &pRow);
     }
@@ -309,25 +307,27 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
   }
 
   // encode
-  tEncodeSize(tEncodeSubmitReq, pReq, len, terrno);
-  if (TSDB_CODE_SUCCESS == terrno) {
+  tEncodeSize(tEncodeSubmitReq, pReq, len, code);
+  if (TSDB_CODE_SUCCESS == code) {
     SEncoder encoder;
     len += sizeof(SSubmitReq2Msg);
-    pBuf = rpcMallocCont(len);
-    if (NULL == pBuf) {
-      goto _end;
+    if (!(pBuf = rpcMallocCont(len))) {
+      code = terrno;
+      TSDB_CHECK_CODE(code, lino, _exit);
     }
+
     ((SSubmitReq2Msg *)pBuf)->header.vgId = TD_VID(pVnode);
     ((SSubmitReq2Msg *)pBuf)->header.contLen = htonl(len);
     ((SSubmitReq2Msg *)pBuf)->version = htobe64(1);
     tEncoderInit(&encoder, POINTER_SHIFT(pBuf, sizeof(SSubmitReq2Msg)), len - sizeof(SSubmitReq2Msg));
     if (tEncodeSubmitReq(&encoder, pReq) < 0) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
-      /*vError("failed to encode submit req since %s", terrstr());*/
+      tEncoderClear(&encoder);
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      TSDB_CHECK_CODE(code, lino, _exit);
     }
     tEncoderClear(&encoder);
   }
-_end:
+_exit:
   taosArrayDestroy(createTbArray);
   taosArrayDestroy(tagArray);
   taosArrayDestroy(pVals);
@@ -336,14 +336,15 @@ _end:
     taosMemoryFree(pReq);
   }
 
-  if (terrno != 0) {
+  if (code) {
     rpcFreeCont(pBuf);
     taosArrayDestroy(pDeleteReq->deleteReqs);
-    return TSDB_CODE_FAILED;
+    smaWarn("vgId:%d, failed at line %d since %s", TD_VID(pVnode), lino, tstrerror(code));
+  } else {
+    if (ppData) *ppData = pBuf;
+    if (pLen) *pLen = len;
   }
-  if (ppData) *ppData = pBuf;
-  if (pLen) *pLen = len;
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 static int32_t tsmaProcessDelReq(SSma *pSma, int64_t indexUid, SBatchDeleteReq *pDelReq) {
@@ -391,22 +392,18 @@ _exit:
  * @return int32_t
  */
 static int32_t tdProcessTSmaInsertImpl(SSma *pSma, int64_t indexUid, const char *msg) {
+  int32_t       code = 0;
+  int32_t       lino = 0;
   const SArray *pDataBlocks = (const SArray *)msg;
-  if (!pDataBlocks) {
-    terrno = TSDB_CODE_TSMA_INVALID_PTR;
-    smaWarn("vgId:%d, insert tsma data failed since pDataBlocks is NULL", SMA_VID(pSma));
-    return TSDB_CODE_FAILED;
-  }
 
   if (taosArrayGetSize(pDataBlocks) <= 0) {
-    terrno = TSDB_CODE_TSMA_INVALID_PARA;
-    smaWarn("vgId:%d, insert tsma data failed since pDataBlocks is empty", SMA_VID(pSma));
-    return TSDB_CODE_FAILED;
+    code = TSDB_CODE_TSMA_INVALID_PARA;
+    TSDB_CHECK_CODE(code, lino, _exit);
   }
 
   if (tdCheckAndInitSmaEnv(pSma, TSDB_SMA_TYPE_TIME_RANGE) != 0) {
-    terrno = TSDB_CODE_TSMA_INIT_FAILED;
-    return TSDB_CODE_FAILED;
+    code = TSDB_CODE_TSMA_INIT_FAILED;
+    TSDB_CHECK_CODE(code, lino, _exit);
   }
 
   SSmaEnv   *pEnv = SMA_TSMA_ENV(pSma);
@@ -414,49 +411,43 @@ static int32_t tdProcessTSmaInsertImpl(SSma *pSma, int64_t indexUid, const char
   STSmaStat *pTsmaStat = NULL;
 
   if (!pEnv || !(pStat = SMA_ENV_STAT(pEnv))) {
-    terrno = TSDB_CODE_TSMA_INVALID_ENV;
-    return TSDB_CODE_FAILED;
+    code = TSDB_CODE_TSMA_INVALID_ENV;
+    TSDB_CHECK_CODE(code, lino, _exit);
   }
 
   pTsmaStat = SMA_STAT_TSMA(pStat);
 
   if (!pTsmaStat->pTSma) {
+    terrno = 0;
     STSma *pTSma = metaGetSmaInfoByIndex(SMA_META(pSma), indexUid);
     if (!pTSma) {
-      smaError("vgId:%d, failed to get STSma while tsma insert for smaIndex %" PRIi64 " since %s", SMA_VID(pSma),
-               indexUid, tstrerror(terrno));
-      goto _err;
+      code = terrno ? terrno : TSDB_CODE_TSMA_INVALID_PTR;
+      TSDB_CHECK_CODE(code, lino, _exit);
     }
     pTsmaStat->pTSma = pTSma;
     pTsmaStat->pTSchema = metaGetTbTSchema(SMA_META(pSma), pTSma->dstTbUid, -1, 1);
     if (!pTsmaStat->pTSchema) {
-      smaError("vgId:%d, failed to get STSchema while tsma insert for smaIndex %" PRIi64 " since %s", SMA_VID(pSma),
-               indexUid, tstrerror(terrno));
-      goto _err;
+      code = terrno ? terrno : TSDB_CODE_TSMA_INVALID_PTR;
+      TSDB_CHECK_CODE(code, lino, _exit);
     }
   }
 
-  if (pTsmaStat->pTSma->indexUid != indexUid) {
-    terrno = TSDB_CODE_APP_ERROR;
-    smaError("vgId:%d, tsma insert for smaIndex %" PRIi64 "(!=%" PRIi64 ") failed since %s", SMA_VID(pSma), indexUid,
-             pTsmaStat->pTSma->indexUid, tstrerror(terrno));
-    goto _err;
+  if (ASSERTS(pTsmaStat->pTSma->indexUid == indexUid, "indexUid:%" PRIi64 " != %" PRIi64, pTsmaStat->pTSma->indexUid,
+              indexUid)) {
+    code = TSDB_CODE_APP_ERROR;
+    TSDB_CHECK_CODE(code, lino, _exit);
   }
 
   SBatchDeleteReq deleteReq = {0};
   void           *pSubmitReq = NULL;
   int32_t         contLen = 0;
 
-  if (smaBlockToSubmit(pSma->pVnode, (const SArray *)msg, pTsmaStat->pTSchema, &pTsmaStat->pTSma->schemaTag, true,
-                       pTsmaStat->pTSma->dstTbUid, pTsmaStat->pTSma->dstTbName, &deleteReq, &pSubmitReq,
-                       &contLen) < 0) {
-    smaError("vgId:%d, failed to gen submit msg while tsma insert for smaIndex %" PRIi64 " since %s", SMA_VID(pSma),
-             indexUid, tstrerror(terrno));
-    goto _err;
-  }
+  code = smaBlockToSubmit(pSma->pVnode, (const SArray *)msg, pTsmaStat->pTSchema, &pTsmaStat->pTSma->schemaTag, true,
+                          pTsmaStat->pTSma->dstTbUid, pTsmaStat->pTSma->dstTbName, &deleteReq, &pSubmitReq, &contLen);
+  TSDB_CHECK_CODE(code, lino, _exit);
 
   if ((terrno = tsmaProcessDelReq(pSma, indexUid, &deleteReq)) != 0) {
-    goto _err;
+    goto _exit;
   }
 
 #if 0
@@ -474,13 +465,13 @@ static int32_t tdProcessTSmaInsertImpl(SSma *pSma, int64_t indexUid, const char
       .contLen = contLen,
   };
 
-  if (tmsgPutToQueue(&pSma->pVnode->msgCb, WRITE_QUEUE, &submitReqMsg) < 0) {
-    smaError("vgId:%d, failed to put SubmitReq msg while tsma insert for smaIndex %" PRIi64 " since %s", SMA_VID(pSma),
-             indexUid, tstrerror(terrno));
-    goto _err;
-  }
+  code = tmsgPutToQueue(&pSma->pVnode->msgCb, WRITE_QUEUE, &submitReqMsg);
+  TSDB_CHECK_CODE(code, lino, _exit);
 
-  return TSDB_CODE_SUCCESS;
-_err:
-  return TSDB_CODE_FAILED;
+_exit:
+  if (code) {
+    smaError("vgId:%d, %s failed at line %d since %s, smaIndex:%" PRIi64, SMA_VID(pSma), __func__, lino,
+             tstrerror(code), indexUid);
+  }
+  return code;
 }

source/dnode/vnode/src/sma/smaUtil.c

@@ -16,60 +16,12 @@
 #include "sma.h"
 #include "vnd.h"
 
-#define TD_QTASKINFO_FNAME_PREFIX "main.tdb"
-
-void tdRSmaQTaskInfoGetFileName(SVnode *pVnode, int64_t suid, int8_t level, int64_t version, char *outputName) {
-  tdRSmaGetFileName(pVnode, NULL, TD_QTASKINFO_FNAME_PREFIX, suid, level, version, outputName);
-}
-
-void tdRSmaQTaskInfoGetFullName(SVnode *pVnode, int64_t suid, int8_t level, int64_t version, STfs *pTfs,
-                                char *outputName) {
-  tdRSmaGetFileName(pVnode, pTfs, TD_QTASKINFO_FNAME_PREFIX, suid, level, version, outputName);
-}
-
-void tdRSmaQTaskInfoGetFullPath(SVnode *pVnode, int8_t level, STfs *pTfs, char *outputName) {
-  tdRSmaGetDirName(pVnode, pTfs, true, outputName);
-  int32_t rsmaLen = strlen(outputName);
-  snprintf(outputName + rsmaLen, TSDB_FILENAME_LEN - rsmaLen, "%" PRIi8, level);
-}
-
-void tdRSmaQTaskInfoGetFullPathEx(SVnode *pVnode, tb_uid_t suid, int8_t level, STfs *pTfs, char *outputName) {
+void tdRSmaQTaskInfoGetFullPath(SVnode *pVnode, tb_uid_t suid, int8_t level, STfs *pTfs, char *outputName) {
   tdRSmaGetDirName(pVnode, pTfs, true, outputName);
   int32_t rsmaLen = strlen(outputName);
   snprintf(outputName + rsmaLen, TSDB_FILENAME_LEN - rsmaLen, "%" PRIi8 "%s%" PRIi64, level, TD_DIRSEP, suid);
 }
 
-void tdRSmaGetFileName(SVnode *pVnode, STfs *pTfs, const char *fname, int64_t suid, int8_t level, int64_t version,
-                       char *outputName) {
-  int32_t offset = 0;
-
-  // vnode
-  vnodeGetPrimaryDir(pVnode->path, pTfs, outputName, TSDB_FILENAME_LEN);
-  offset = strlen(outputName);
-
-  // rsma
-  snprintf(outputName + offset, TSDB_FILENAME_LEN - offset - 1, "%s%s", TD_DIRSEP, VNODE_RSMA_DIR);
-  offset = strlen(outputName);
-
-  // level & suid || vgid
-  if (level >= 0 && suid > 0) {
-    snprintf(outputName + offset, TSDB_FILENAME_LEN - offset - 1, "%s%" PRIi8 "%s%" PRIi64 "%s", TD_DIRSEP, level,
-             TD_DIRSEP, suid, TD_DIRSEP);
-  } else {
-    snprintf(outputName + offset, TSDB_FILENAME_LEN - offset - 1, "%sv%d", TD_DIRSEP, TD_VID(pVnode));
-  }
-  offset = strlen(outputName);
-
-  // fname
-  snprintf(outputName + offset, TSDB_FILENAME_LEN - offset - 1, "%s", fname);
-  offset = strlen(outputName);
-
-  // version
-  if (version >= 0) {
-    snprintf(outputName + offset, TSDB_FILENAME_LEN - offset - 1, ".%" PRIi64, version);
-  }
-}
-
 void tdRSmaGetDirName(SVnode *pVnode, STfs *pTfs, bool endWithSep, char *outputName) {
   int32_t offset = 0;
 
@@ -83,22 +35,13 @@ void tdRSmaGetDirName(SVnode *pVnode, STfs *pTfs, bool endWithSep, char *outputN
 }
 
 // smaXXXUtil ================
-void *tdAcquireSmaRef(int32_t rsetId, int64_t refId) {
-  void *pResult = taosAcquireRef(rsetId, refId);
-  if (!pResult) {
-    smaWarn("rsma acquire ref for rsetId:%d refId:%" PRIi64 " failed since %s", rsetId, refId, terrstr());
-  } else {
-    smaTrace("rsma acquire ref for rsetId:%d refId:%" PRIi64 " success", rsetId, refId);
-  }
-  return pResult;
-}
+void *tdAcquireSmaRef(int32_t rsetId, int64_t refId) { return taosAcquireRef(rsetId, refId); }
 
 int32_t tdReleaseSmaRef(int32_t rsetId, int64_t refId) {
   if (taosReleaseRef(rsetId, refId) < 0) {
     smaWarn("rsma release ref for rsetId:%d refId:%" PRIi64 " failed since %s", rsetId, refId, terrstr());
     return TSDB_CODE_FAILED;
   }
-  smaTrace("rsma release ref for rsetId:%d refId:%" PRIi64 " success", rsetId, refId);
 
   return TSDB_CODE_SUCCESS;
 }

source/dnode/vnode/src/tq/tqOffset.c

@@ -104,7 +104,7 @@ STqOffsetStore* tqOffsetOpen(STQ* pTq) {
   pStore->needCommit = 0;
   pTq->pOffsetStore = pStore;
 
-  pStore->pHash = taosHashInit(64, MurmurHash3_32, true, HASH_NO_LOCK);
+  pStore->pHash = taosHashInit(64, MurmurHash3_32, true, HASH_ENTRY_LOCK);
   if (pStore->pHash == NULL) {
     taosMemoryFree(pStore);
     return NULL;

source/dnode/vnode/src/tq/tqPush.c

@@ -64,7 +64,9 @@ int32_t tqRegisterPushHandle(STQ* pTq, void* handle, SRpcMsg* pMsg) {
     memcpy(pHandle->msg, pMsg, sizeof(SRpcMsg));
     pHandle->msg->pCont = rpcMallocCont(pMsg->contLen);
   } else {
-    tqPushDataRsp(pHandle, vgId);
+//    tqPushDataRsp(pHandle, vgId);
+    tqPushEmptyDataRsp(pHandle, vgId);
+
     void* tmp = pHandle->msg->pCont;
     memcpy(pHandle->msg, pMsg, sizeof(SRpcMsg));
     pHandle->msg->pCont = tmp;
@@ -89,7 +91,8 @@ int32_t tqUnregisterPushHandle(STQ* pTq, void *handle) {
   tqDebug("vgId:%d remove pHandle:%p,ret:%d consumer Id:0x%" PRIx64, vgId, pHandle, ret, pHandle->consumerId);
 
   if(pHandle->msg != NULL) {
-    tqPushDataRsp(pHandle, vgId);
+//    tqPushDataRsp(pHandle, vgId);
+    tqPushEmptyDataRsp(pHandle, vgId);
 
     rpcFreeCont(pHandle->msg->pCont);
     taosMemoryFree(pHandle->msg);

source/dnode/vnode/src/tq/tqUtil.c

@@ -93,7 +93,7 @@ static int32_t extractResetOffsetVal(STqOffsetVal* pOffsetVal, STQ* pTq, STqHand
   if (pOffset != NULL) {
     *pOffsetVal = pOffset->val;
 
-    char formatBuf[TSDB_OFFSET_LEN];
+    char formatBuf[TSDB_OFFSET_LEN] = {0};
     tFormatOffset(formatBuf, TSDB_OFFSET_LEN, pOffsetVal);
     tqDebug("tmq poll: consumer:0x%" PRIx64
             ", subkey %s, vgId:%d, existed offset found, offset reset to %s and continue. reqId:0x%" PRIx64,
@@ -145,6 +145,7 @@ static int32_t extractDataAndRspForNormalSubscribe(STQ* pTq, STqHandle* pHandle,
   uint64_t consumerId = pRequest->consumerId;
   int32_t  vgId = TD_VID(pTq->pVnode);
   int      code = 0;
+  terrno        = 0;
 
   SMqDataRsp dataRsp = {0};
   tqInitDataRsp(&dataRsp, pRequest);

source/dnode/vnode/src/tsdb/tsdbRead.c

@@ -289,6 +289,10 @@ static int32_t setColumnIdSlotList(SBlockLoadSuppInfo* pSupInfo, SColumnInfo* pC
 static int32_t updateBlockSMAInfo(STSchema* pSchema, SBlockLoadSuppInfo* pSupInfo) {
   int32_t i = 0, j = 0;
 
+  if (j < pSupInfo->numOfCols && PRIMARYKEY_TIMESTAMP_COL_ID == pSupInfo->colId[j]) {
+    j += 1;
+  }
+  
   while (i < pSchema->numOfCols && j < pSupInfo->numOfCols) {
     STColumn* pTCol = &pSchema->columns[i];
     if (pTCol->colId == pSupInfo->colId[j]) {
@@ -3064,6 +3068,7 @@ static int32_t moveToNextFile(STsdbReader* pReader, SBlockNumber* pBlockNum, SAr
     // only check here, since the iterate data in memory is very fast.
     if (pReader->code != TSDB_CODE_SUCCESS) {
       tsdbWarn("tsdb reader is stopped ASAP, code:%s, %s", strerror(pReader->code), pReader->idStr);
+      taosArrayDestroy(pIndexList);
       return pReader->code;
     }
 
@@ -5586,4 +5591,3 @@ void tsdbReaderSetId(STsdbReader* pReader, const char* idstr) {
 }
 
 void tsdbReaderSetCloseFlag(STsdbReader* pReader) { pReader->code = TSDB_CODE_TSC_QUERY_CANCELLED; }
-

source/dnode/vnode/src/vnd/vnodeCommit.c

@@ -361,7 +361,12 @@ static int32_t vnodeCommitTask(void *arg) {
 
   // commit
   code = vnodeCommitImpl(pInfo);
-  if (code) goto _exit;
+  if (code) {
+    vFatal("vgId:%d, failed to commit vnode since %s", TD_VID(pVnode), terrstr());
+    taosMsleep(100);
+    exit(EXIT_FAILURE);
+    goto _exit;
+  }
 
   vnodeReturnBufPool(pVnode);
 

source/dnode/vnode/src/vnd/vnodeOpen.c

@@ -367,12 +367,6 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
     goto _err;
   }
 
-  // open sma
-  if (smaOpen(pVnode, rollback)) {
-    vError("vgId:%d, failed to open vnode sma since %s", TD_VID(pVnode), tstrerror(terrno));
-    goto _err;
-  }
-
   // open wal
   sprintf(tdir, "%s%s%s", dir, TD_DIRSEP, VNODE_WAL_DIR);
   taosRealPath(tdir, NULL, sizeof(tdir));
@@ -392,6 +386,12 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
     goto _err;
   }
 
+  // open sma
+  if (smaOpen(pVnode, rollback)) {
+    vError("vgId:%d, failed to open vnode sma since %s", TD_VID(pVnode), tstrerror(terrno));
+    goto _err;
+  }
+
   // open query
   if (vnodeQueryOpen(pVnode)) {
     vError("vgId:%d, failed to open vnode query since %s", TD_VID(pVnode), tstrerror(terrno));

source/dnode/vnode/src/vnd/vnodeRetention.c

@@ -19,12 +19,21 @@ extern int32_t tsdbSyncRetention(STsdb *tsdb, int64_t now);
 
 int32_t vnodeSyncRetention(SVnode *pVnode, int64_t now) {
   int32_t code;
+  int32_t lino;
+
   if (pVnode->config.sttTrigger == 1) {
     tsem_wait(&pVnode->canCommit);
     code = tsdbSyncRetention(pVnode->pTsdb, now);
+    TSDB_CHECK_CODE(code, lino, _exit);
+
+    // code = smaDoRetention(pVnode->pSma, now);
+    // TSDB_CHECK_CODE(code, lino, _exit);
     tsem_post(&pVnode->canCommit);
   } else {
     code = tsdbSyncRetention(pVnode->pTsdb, now);
+    TSDB_CHECK_CODE(code, lino, _exit);
   }
+
+_exit:
   return code;
 }
\ No newline at end of file

source/dnode/vnode/src/vnd/vnodeSvr.c

@@ -1376,7 +1376,8 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t ver, void *pReq, in
       }
 
       if (info.suid) {
-        metaGetInfo(pVnode->pMeta, info.suid, &info, NULL);
+        code = metaGetInfo(pVnode->pMeta, info.suid, &info, NULL);
+        ASSERT(code == 0);
       }
 
       if (pSubmitTbData->sver != info.skmVer) {

source/libs/catalog/src/catalog.c

@@ -341,13 +341,10 @@ int32_t ctgChkAuth(SCatalog* pCtg, SRequestConnInfo* pConn, SUserAuthInfo *pReq,
   SCtgAuthReq req = {0};
   req.pRawReq = pReq;
   req.pConn = pConn;
-  req.onlyCache = exists ? true : false;
+  req.onlyCache = false;
   CTG_ERR_RET(ctgGetUserDbAuthFromMnode(pCtg, pConn, pReq->user, &req.authInfo, NULL));
 
   CTG_ERR_JRET(ctgChkSetAuthRes(pCtg, &req, &rsp));
-  if (rsp.metaNotExists && exists) {
-    *exists = false;
-  }
 
 _return:
 

source/libs/catalog/src/ctgCache.c

@@ -1721,9 +1721,7 @@ int32_t ctgWriteTbMetaToCache(SCatalog *pCtg, SCtgDBCache *dbCache, char *dbFNam
   ctgDebug("stb 0x%" PRIx64 " updated to cache, dbFName:%s, tbName:%s, tbType:%d", meta->suid, dbFName, tbName,
            meta->tableType);
 
-  if (pCache) {
-    CTG_ERR_RET(ctgUpdateRentStbVersion(pCtg, dbFName, tbName, dbId, meta->suid, pCache));
-  }
+  CTG_ERR_RET(ctgUpdateRentStbVersion(pCtg, dbFName, tbName, dbId, meta->suid, pCache));
 
   return TSDB_CODE_SUCCESS;
 }