diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in
index 115e2fc674..599b508c93 100644
--- a/cmake/taostools_CMakeLists.txt.in
+++ b/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 4776778
+ GIT_TAG 94d6895
SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
diff --git a/docs/en/12-taos-sql/02-database.md b/docs/en/12-taos-sql/02-database.md
index c3c7e5928b..476df0a60d 100644
--- a/docs/en/12-taos-sql/02-database.md
+++ b/docs/en/12-taos-sql/02-database.md
@@ -30,8 +30,10 @@ database_option: {
| WAL_LEVEL {1 | 2}
| VGROUPS value
| SINGLE_STABLE {0 | 1}
+ | STT_TRIGGER value
| TABLE_PREFIX value
| TABLE_SUFFIX value
+ | TSDB_PAGESIZE value
| WAL_RETENTION_PERIOD value
| WAL_ROLL_PERIOD value
| WAL_RETENTION_SIZE value
@@ -69,8 +71,10 @@ database_option: {
- SINGLE_STABLE: specifies whether the database can contain more than one supertable.
- 0: The database can contain multiple supertables.
- 1: The database can contain only one supertable.
+- STT_TRIGGER: specifies the number of file merges triggered by flushed files. The default is 8, ranging from 1 to 16. For high-frequency scenarios with few tables, it is recommended to use the default configuration or a smaller value for this parameter; For multi-table low-frequency scenarios, it is recommended to configure this parameter with a larger value.
- TABLE_PREFIX：The prefix length in the table name that is ignored when distributing table to vnode based on table name.
- TABLE_SUFFIX：The suffix length in the table name that is ignored when distributing table to vnode based on table name.
+- TSDB_PAGESIZE: The page size of the data storage engine in a vnode. The unit is KB. The default is 4 KB. The range is 1 to 16384, that is, 1 KB to 16 MB.
- WAL_RETENTION_PERIOD: specifies the time after which WAL files are deleted. This parameter is used for data subscription. Enter a time in seconds. The default value of single copy is 0. A value of 0 indicates that each WAL file is deleted immediately after its contents are written to disk. -1: WAL files are never deleted. The default value of multiple copy is 4 days.
- WAL_RETENTION_SIZE: specifies the size at which WAL files are deleted. This parameter is used for data subscription. Enter a size in KB. The default value of single copy is 0. A value of 0 indicates that each WAL file is deleted immediately after its contents are written to disk. -1: WAL files are never deleted. The default value of multiple copy is -1.
- WAL_ROLL_PERIOD: specifies the time after which WAL files are rotated. After this period elapses, a new WAL file is created. The default value of single copy is 0. A value of 0 indicates that a new WAL file is created only after the previous WAL file was written to disk. The default values of multiple copy is 1 day.
@@ -112,6 +116,10 @@ alter_database_options:
alter_database_option: {
CACHEMODEL {'none' | 'last_row' | 'last_value' | 'both'}
| CACHESIZE value
+ | BUFFER value
+ | PAGES value
+ | REPLICA value
+ | STT_TRIGGER value
| WAL_LEVEL value
| WAL_FSYNC_PERIOD value
| KEEP value
@@ -154,3 +162,19 @@ TRIM DATABASE db_name;
```
The preceding SQL statement deletes data that has expired and orders the remaining data in accordance with the storage configuration.
+
+## Redistribute Vgroup
+
+```sql
+REDISTRIBUTE VGROUP vgroup_no DNODE dnode_id1 [DNODE dnode_id2] [DNODE dnode_id3]
+```
+
+Adjust the distribution of vnodes in the vgroup according to the given list of dnodes.
+
+## Balance Vgroup
+
+```sql
+BALANCE VGROUP
+```
+
+Automatically adjusts the distribution of vnodes in all vgroups of the cluster, which is equivalent to load balancing the data of the cluster at the vnode level.
diff --git a/docs/en/12-taos-sql/06-select.md b/docs/en/12-taos-sql/06-select.md
index c087a9e9fb..ee06a7be2d 100644
--- a/docs/en/12-taos-sql/06-select.md
+++ b/docs/en/12-taos-sql/06-select.md
@@ -350,9 +350,9 @@ SELECT AVG(CASE WHEN voltage < 200 or voltage > 250 THEN 220 ELSE voltage END) F
## JOIN
-TDengine supports natural joins between supertables, between standard tables, and between subqueries. The difference between natural joins and inner joins is that natural joins require that the fields being joined in the supertables or standard tables must have the same name. Data or tag columns must be joined with the equivalent column in another table.
+TDengine supports the `INTER JOIN` based on the timestamp primary key, that is, the `JOIN` condition must contain the timestamp primary key. As long as the requirement of timestamp-based primary key is met, `INTER JOIN` can be made between normal tables, sub-tables, super tables and sub-queries at will, and there is no limit on the number of tables.
-For standard tables, only the timestamp (primary key) can be used in join operations. For example:
+For standard tables:
```sql
SELECT *
@@ -360,7 +360,7 @@ FROM temp_tb_1 t1, pressure_tb_1 t2
WHERE t1.ts = t2.ts
```
-For supertables, tags as well as timestamps can be used in join operations. For example:
+For supertables:
```sql
SELECT *
@@ -368,21 +368,16 @@ FROM temp_stable t1, temp_stable t2
WHERE t1.ts = t2.ts AND t1.deviceid = t2.deviceid AND t1.status=0;
```
+For sub-table and super table：
+
+```sql
+SELECT *
+FROM temp_ctable t1, temp_stable t2
+WHERE t1.ts = t2.ts AND t1.deviceid = t2.deviceid AND t1.status=0;
+```
+
Similarly, join operations can be performed on the result sets of multiple subqueries.
-:::note
-
-The following restriction apply to JOIN statements:
-
-- The number of tables or supertables in a single join operation cannot exceed 10.
-- `FILL` cannot be used in a JOIN statement.
-- Arithmetic operations cannot be performed on the result sets of join operation.
-- `GROUP BY` is not allowed on a segment of the tables that participate in a join operation.
-- `OR` cannot be used in the conditions for join operation
-- Join operation can be performed only on tags or timestamps. You cannot perform a join operation on data columns.
-
-:::
-
## Nested Query
Nested query is also called sub query. This means that in a single SQL statement the result of inner query can be used as the data source of the outer query.
diff --git a/docs/en/12-taos-sql/10-function.md b/docs/en/12-taos-sql/10-function.md
index 30422ca20c..802eb259bf 100644
--- a/docs/en/12-taos-sql/10-function.md
+++ b/docs/en/12-taos-sql/10-function.md
@@ -877,7 +877,7 @@ INTERP(expr)
- Interpolation is performed based on `FILL` parameter.
- `INTERP` can only be used to interpolate in single timeline. So it must be used with `partition by tbname` when it's used on a STable.
- Pseudocolumn `_irowts` can be used along with `INTERP` to return the timestamps associated with interpolation points(support after version 3.0.1.4).
-- Pseudocolumn `_isfilled` can be used along with `INTERP` to indicate whether the results are original records or data points generated by interpolation algorithm(support after version 3.0.2.1).
+- Pseudocolumn `_isfilled` can be used along with `INTERP` to indicate whether the results are original records or data points generated by interpolation algorithm(support after version 3.0.2.3).
### LAST
diff --git a/docs/en/12-taos-sql/29-changes.md b/docs/en/12-taos-sql/29-changes.md
index 78b6d5fc05..f288cd7545 100644
--- a/docs/en/12-taos-sql/29-changes.md
+++ b/docs/en/12-taos-sql/29-changes.md
@@ -54,7 +54,6 @@ The following data types can be used in the schema for standard tables.
| 27 | GRANT | Added | Grants permissions to a user.
| 28 | KILL TRANSACTION | Added | Terminates an mnode transaction.
| 29 | KILL STREAM | Deprecated | Terminated a continuous query. The continuous query feature has been replaced with the stream processing feature.
-| 30 | MERGE VGROUP | Added | Merges vgroups.
| 31 | REVOKE | Added | Revokes permissions from a user.
| 32 | SELECT | Modified | - SELECT does not use the implicit results column. Output columns must be specified in the SELECT clause.
- DISTINCT support is enhanced. In previous versions, DISTINCT only worked on the tag column and could not be used with JOIN or GROUP BY.
- JOIN support is enhanced. The following are now supported after JOIN: a WHERE clause with OR, operations on multiple tables, and GROUP BY on multiple tables.
- Subqueries after FROM are enhanced. Levels of nesting are no longer restricted. Subqueries can be used with UNION ALL. Other syntax restrictions are eliminated.
- All scalar functions can be used after WHERE.
- GROUP BY is enhanced. You can group by any scalar expression or combination thereof.
- SESSION can be used on supertables. When PARTITION BY is not used, data in supertables is merged into a single timeline.
- STATE_WINDOW can be used on supertables. When PARTITION BY is not used, data in supertables is merged into a single timeline.
- ORDER BY is enhanced. It is no longer required to use ORDER BY and GROUP BY together. There is no longer a restriction on the number of order expressions. NULLS FIRST and NULLS LAST syntax has been added. Any expression that conforms to the ORDER BY semantics can be used.
- Added PARTITION BY syntax. PARTITION BY replaces GROUP BY tags.
| 33 | SHOW ACCOUNTS | Deprecated | This Enterprise Edition-only statement has been removed. It returns the error "This statement is no longer supported."
@@ -76,8 +75,9 @@ The following data types can be used in the schema for standard tables.
| 49 | SHOW TRANSACTIONS | Added | Shows all running transactions in the system.
| 50 | SHOW DNODE VARIABLES | Added | Shows the configuration of the specified dnode.
| 51 | SHOW VNODES | Not supported | Shows information about vnodes in the system. Not supported.
-| 52 | SPLIT VGROUP | Added | Splits a vgroup into two vgroups.
-| 53 | TRIM DATABASE | Added | Deletes data that has expired and orders the remaining data in accordance with the storage configuration.
+| 52 | TRIM DATABASE | Added | Deletes data that has expired and orders the remaining data in accordance with the storage configuration.
+| 53 | REDISTRIBUTE VGROUP | Added | Adjust the distribution of VNODES in VGROUP.
+| 54 | BALANCE VGROUP | Added | Auto adjust the distribution of VNODES in VGROUP.
## SQL Functions
diff --git a/docs/en/14-reference/03-connector/09-csharp.mdx b/docs/en/14-reference/03-connector/09-csharp.mdx
index 85514f58ac..b73e1c2627 100644
--- a/docs/en/14-reference/03-connector/09-csharp.mdx
+++ b/docs/en/14-reference/03-connector/09-csharp.mdx
@@ -252,14 +252,14 @@ ws://localhost:6041/test
|Sample program |Sample program description |
|--------------------------------------------------------------------------------------------------------------------|--------------------------------------------|
-| [CURD](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/Query/Query.cs) | Table creation, data insertion, and query examples with TDengine.Connector |
-| [JSON Tag](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/JSONTag) | Writing and querying JSON tag data with TDengine Connector |
-| [stmt](https://github.com/taosdata/taos-connector-dotnet/tree/3.0/examples/Stmt) | Parameter binding with TDengine Connector |
-| [schemaless](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/schemaless) | Schemaless writes with TDengine Connector |
-| [async query](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/AsyncQuery/QueryAsync.cs) | Asynchronous queries with TDengine Connector |
-| [Subscription](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/TMQ/TMQ.cs) | Subscription example with TDengine Connector |
-| [Basic WebSocket Usage](https://github.com/taosdata/taos-connector-dotnet/blob/5a4a7cd0dbcda114447cdc6d0c6dedd8e84a52da/examples/WS/WebSocketSample.cs) | WebSocket basic data in and out with TDengine connector |
-| [WebSocket Parameter Binding](https://github.com/taosdata/taos-connector-dotnet/blob/5a4a7cd0dbcda114447cdc6d0c6dedd8e84a52da/examples/WS/WebSocketSTMT.cs) | WebSocket parameter binding example |
+| [CURD](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/Query/Query.cs) | Table creation, data insertion, and query examples with TDengine.Connector |
+| [JSON Tag](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/JSONTag) | Writing and querying JSON tag data with TDengine Connector |
+| [stmt](https://github.com/taosdata/taos-connector-dotnet/tree/3.0/examples/NET6Examples/Stmt) | Parameter binding with TDengine Connector |
+| [schemaless](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/schemaless) | Schemaless writes with TDengine Connector |
+| [async query](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/AsyncQuery/QueryAsync.cs) | Asynchronous queries with TDengine Connector |
+| [Subscription](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/TMQ/TMQ.cs) | Subscription example with TDengine Connector |
+| [Basic WebSocket Usage](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/FrameWork45/WS/WebSocketSample.cs) | WebSocket basic data in and out with TDengine connector |
+| [WebSocket Parameter Binding](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/FrameWork45/WS/WebSocketSTMT.cs) | WebSocket parameter binding example |
## Important update records
diff --git a/docs/en/14-reference/05-taosbenchmark.md b/docs/en/14-reference/05-taosbenchmark.md
index 19feeb6740..4017b12be9 100644
--- a/docs/en/14-reference/05-taosbenchmark.md
+++ b/docs/en/14-reference/05-taosbenchmark.md
@@ -92,7 +92,7 @@ taosBenchmark -f
-## Command-line argument in detailed
+## Command-line argument in detail
- **-f/--file ** :
specify the configuration file to use. This file includes All parameters. Users should not use this parameter with other parameters on the command-line. There is no default value.
@@ -198,7 +198,7 @@ taosBenchmark -A INT,DOUBLE,NCHAR,BINARY\(16\)
- **-R/--disorder-range ** :
Specify the timestamp range for the disordered data. It leads the resulting disorder timestamp as the ordered timestamp minus a random value in this range. Valid only if the percentage of disordered data specified by `-O/--disorder` is greater than 0.
-- **-F/--prepare_rand ** :
+- **-F/--prepared_rand ** :
Specify the number of unique values in the generated random data. A value of 1 means that all data are equal. The default value is 10000.
- **-a/--replica ** :
@@ -216,7 +216,7 @@ taosBenchmark -A INT,DOUBLE,NCHAR,BINARY\(16\)
- **-? /--help** :
Show help information and exit. Users should not use it with other parameters.
-## Configuration file parameters in detailed
+## Configuration file parameters in detail
### General configuration parameters
@@ -380,7 +380,7 @@ The configuration parameters for specifying super table tag columns and data col
- **num_of_records_per_req** :
Writing the number of rows of records per request to TDengine, the default value is 30000. When it is set too large, the TDengine client driver will return the corresponding error message, so you need to lower the setting of this parameter to meet the writing requirements.
-- **prepare_rand**: The number of unique values in the generated random data. A value of 1 means that all data are equal. The default value is 10000.
+- **prepared_rand**: The number of unique values in the generated random data. A value of 1 means that all data are equal. The default value is 10000.
### Query scenario configuration parameters
diff --git a/docs/en/14-reference/12-config/index.md b/docs/en/14-reference/12-config/index.md
index b6bfa4bc7d..c3d5de0213 100644
--- a/docs/en/14-reference/12-config/index.md
+++ b/docs/en/14-reference/12-config/index.md
@@ -142,6 +142,15 @@ The parameters described in this document by the effect that they have on the sy
| Meaning | Switch for allowing TDengine to collect and report service usage information |
| Value Range | 0: Not allowed; 1: Allowed |
| Default Value | 1 |
+### crashReporting
+
+| Attribute | Description |
+| -------- | -------------------------------------------- |
+| Applicable | Server Only |
+| Meaning |Switch for allowing TDengine to collect and report crash related information |
+| Value Range | 0,1 0: Not allowed；1：allowed |
+| Default Value | 1 |
+
## Query Parameters
diff --git a/docs/en/28-releases/01-tdengine.md b/docs/en/28-releases/01-tdengine.md
index 9b83c5fd65..4e0239eb80 100644
--- a/docs/en/28-releases/01-tdengine.md
+++ b/docs/en/28-releases/01-tdengine.md
@@ -10,6 +10,10 @@ For TDengine 2.x installation packages by version, please visit [here](https://w
import Release from "/components/ReleaseV3";
+## 3.0.2.3
+
+
+
## 3.0.2.2
diff --git a/docs/en/28-releases/02-tools.md b/docs/en/28-releases/02-tools.md
index dd44e43ab6..2d20c26c56 100644
--- a/docs/en/28-releases/02-tools.md
+++ b/docs/en/28-releases/02-tools.md
@@ -10,6 +10,10 @@ For other historical version installers, please visit [here](https://www.taosdat
import Release from "/components/ReleaseV3";
+## 2.4.1
+
+
+
## 2.4.0
diff --git a/docs/zh/08-connector/40-csharp.mdx b/docs/zh/08-connector/40-csharp.mdx
index a1a161d4ee..c70a8a633e 100644
--- a/docs/zh/08-connector/40-csharp.mdx
+++ b/docs/zh/08-connector/40-csharp.mdx
@@ -253,14 +253,14 @@ namespace TDengineExample
|示例程序 | 示例程序描述 |
|--------------------------------------------------------------------------------------------------------------------|--------------------------------------------|
-| [CURD](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/Query/Query.cs) | 使用 TDengine.Connector 实现的建表、插入、查询示例 |
-| [JSON Tag](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/JSONTag) | 使用 TDengine.Connector 实现的写入和查询 JSON tag 类型数据的示例 |
-| [stmt](https://github.com/taosdata/taos-connector-dotnet/tree/3.0/examples/Stmt) | 使用 TDengine.Connector 实现的参数绑定插入和查询的示例 |
-| [schemaless](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/schemaless) | 使用 TDengine.Connector 实现的使用 schemaless 写入的示例 |
-| [async query](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/AsyncQuery/QueryAsync.cs) | 使用 TDengine.Connector 实现的异步查询的示例 |
-| [数据订阅（TMQ）](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/TMQ/TMQ.cs) | 使用 TDengine.Connector 实现的订阅数据的示例 |
-| [Basic WebSocket Usage](https://github.com/taosdata/taos-connector-dotnet/blob/5a4a7cd0dbcda114447cdc6d0c6dedd8e84a52da/examples/WS/WebSocketSample.cs) | 使用 TDengine.Connector 的 WebSocket 基本的示例 |
-| [Basic WebSocket STMT](https://github.com/taosdata/taos-connector-dotnet/blob/5a4a7cd0dbcda114447cdc6d0c6dedd8e84a52da/examples/WS/WebSocketSTMT.cs) | 使用 TDengine.Connector 的 WebSocket STMT 基本的示例 |
+| [CURD](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/Query/Query.cs) | 使用 TDengine.Connector 实现的建表、插入、查询示例 |
+| [JSON Tag](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/JSONTag) | 使用 TDengine.Connector 实现的写入和查询 JSON tag 类型数据的示例 |
+| [stmt](https://github.com/taosdata/taos-connector-dotnet/tree/3.0/examples/NET6Examples/Stmt) | 使用 TDengine.Connector 实现的参数绑定插入和查询的示例 |
+| [schemaless](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/schemaless) | 使用 TDengine.Connector 实现的使用 schemaless 写入的示例 |
+| [async query](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/AsyncQuery/QueryAsync.cs) | 使用 TDengine.Connector 实现的异步查询的示例 |
+| [数据订阅（TMQ）](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/NET6Examples/TMQ/TMQ.cs) | 使用 TDengine.Connector 实现的订阅数据的示例 |
+| [Basic WebSocket Usage](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/FrameWork45/WS/WebSocketSample.cs) | 使用 TDengine.Connector 的 WebSocket 基本的示例 |
+| [Basic WebSocket STMT](https://github.com/taosdata/taos-connector-dotnet/blob/3.0/examples/FrameWork45/WS/WebSocketSTMT.cs) | 使用 TDengine.Connector 的 WebSocket STMT 基本的示例 |
## 重要更新记录
diff --git a/docs/zh/12-taos-sql/02-database.md b/docs/zh/12-taos-sql/02-database.md
index df52a0890b..7d9566f4f2 100644
--- a/docs/zh/12-taos-sql/02-database.md
+++ b/docs/zh/12-taos-sql/02-database.md
@@ -30,8 +30,10 @@ database_option: {
| WAL_LEVEL {1 | 2}
| VGROUPS value
| SINGLE_STABLE {0 | 1}
+ | STT_TRIGGER value
| TABLE_PREFIX value
| TABLE_SUFFIX value
+ | TSDB_PAGESIZE value
| WAL_RETENTION_PERIOD value
| WAL_ROLL_PERIOD value
| WAL_RETENTION_SIZE value
@@ -69,8 +71,10 @@ database_option: {
- SINGLE_STABLE：表示此数据库中是否只可以创建一个超级表，用于超级表列非常多的情况。
- 0：表示可以创建多张超级表。
- 1：表示只可以创建一张超级表。
+- STT_TRIGGER：表示落盘文件触发文件合并的个数。默认为 1，范围 1 到 16。对于少表高频场景，此参数建议使用默认配置，或较小的值；而对于多表低频场景，此参数建议配置较大的值。
- TABLE_PREFIX：内部存储引擎根据表名分配存储该表数据的 VNODE 时要忽略的前缀的长度。
- TABLE_SUFFIX：内部存储引擎根据表名分配存储该表数据的 VNODE 时要忽略的后缀的长度。
+- TSDB_PAGESIZE：一个 VNODE 中时序数据存储引擎的页大小，单位为 KB，默认为 4 KB。范围为 1 到 16384，即 1 KB到 16 MB。
- WAL_RETENTION_PERIOD：wal 文件的额外保留策略，用于数据订阅。wal 的保存时长，单位为 s。单副本默认为 0，即落盘后立即删除。-1 表示不删除。多副本默认为 4 天。
- WAL_RETENTION_SIZE：wal 文件的额外保留策略，用于数据订阅。wal 的保存的最大上限，单位为 KB。单副本默认为 0，即落盘后立即删除。多副本默认为-1，表示不删除。
- WAL_ROLL_PERIOD：wal 文件切换时长，单位为 s。当 wal 文件创建并写入后，经过该时间，会自动创建一个新的 wal 文件。单副本默认为 0，即仅在落盘时创建新文件。多副本默认为 1 天。
@@ -112,6 +116,10 @@ alter_database_options:
alter_database_option: {
CACHEMODEL {'none' | 'last_row' | 'last_value' | 'both'}
| CACHESIZE value
+ | BUFFER value
+ | PAGES value
+ | REPLICA value
+ | STT_TRIGGER value
| WAL_LEVEL value
| WAL_FSYNC_PERIOD value
| KEEP value
@@ -154,3 +162,19 @@ TRIM DATABASE db_name;
```
删除过期数据，并根据多级存储的配置归整数据。
+
+## 调整VGROUP中VNODE的分布
+
+```sql
+REDISTRIBUTE VGROUP vgroup_no DNODE dnode_id1 [DNODE dnode_id2] [DNODE dnode_id3]
+```
+
+按照给定的dnode列表，调整vgroup中的vnode分布。因为副本数目最大为3，所以最多输入3个dnode。
+
+## 自动调整VGROUP中VNODE的分布
+
+```sql
+BALANCE VGROUP
+```
+
+自动调整集群所有vgroup中的vnode分布，相当于在vnode级别对集群进行数据的负载均衡操作。
\ No newline at end of file
diff --git a/docs/zh/12-taos-sql/06-select.md b/docs/zh/12-taos-sql/06-select.md
index 3b681f401c..8244c0f27a 100644
--- a/docs/zh/12-taos-sql/06-select.md
+++ b/docs/zh/12-taos-sql/06-select.md
@@ -350,9 +350,9 @@ SELECT AVG(CASE WHEN voltage < 200 or voltage > 250 THEN 220 ELSE voltage END) F
## JOIN 子句
-TDengine 支持“普通表与普通表之间”、“超级表与超级表之间”、“子查询与子查询之间” 进行自然连接。自然连接与内连接的主要区别是，自然连接要求参与连接的字段在不同的表/超级表中必须是同名字段。也即，TDengine 在连接关系的表达中，要求必须使用同名数据列/标签列的相等关系。
+TDengine 支持基于时间戳主键的内连接，即 JOIN 条件必须包含时间戳主键。只要满足基于时间戳主键这个要求，普通表、子表、超级表和子查询之间可以随意的进行内连接，且对表个数没有限制。
-在普通表与普通表之间的 JOIN 操作中，只能使用主键时间戳之间的相等关系。例如：
+普通表与普通表之间的 JOIN 操作：
```sql
SELECT *
@@ -360,7 +360,7 @@ FROM temp_tb_1 t1, pressure_tb_1 t2
WHERE t1.ts = t2.ts
```
-在超级表与超级表之间的 JOIN 操作中，除了主键时间戳一致的条件外，还要求引入能实现一一对应的标签列的相等关系。例如：
+超级表与超级表之间的 JOIN 操作：
```sql
SELECT *
@@ -368,21 +368,16 @@ FROM temp_stable t1, temp_stable t2
WHERE t1.ts = t2.ts AND t1.deviceid = t2.deviceid AND t1.status=0;
```
+子表与超级表之间的 JOIN 操作：
+
+```sql
+SELECT *
+FROM temp_ctable t1, temp_stable t2
+WHERE t1.ts = t2.ts AND t1.deviceid = t2.deviceid AND t1.status=0;
+```
+
类似地，也可以对多个子查询的查询结果进行 JOIN 操作。
-:::note
-
-JOIN 语句存在如下限制要求：
-
-- 参与一条语句中 JOIN 操作的表/超级表最多可以有 10 个。
-- 在包含 JOIN 操作的查询语句中不支持 FILL。
-- 暂不支持参与 JOIN 操作的表之间聚合后的四则运算。
-- 不支持只对其中一部分表做 GROUP BY。
-- JOIN 查询的不同表的过滤条件之间不能为 OR。
-- JOIN 查询要求连接条件不能是普通列，只能针对标签和主时间字段列（第一列）。
-
-:::
-
## 嵌套查询
“嵌套查询”又称为“子查询”，也即在一条 SQL 语句中，“内层查询”的计算结果可以作为“外层查询”的计算对象来使用。
diff --git a/docs/zh/12-taos-sql/10-function.md b/docs/zh/12-taos-sql/10-function.md
index cb99c83cc5..81fdb46f25 100644
--- a/docs/zh/12-taos-sql/10-function.md
+++ b/docs/zh/12-taos-sql/10-function.md
@@ -880,7 +880,7 @@ INTERP(expr)
- INTERP 根据 FILL 字段来决定在每个符合输出条件的时刻如何进行插值。
- INTERP 只能在一个时间序列内进行插值，因此当作用于超级表时必须跟 partition by tbname 一起使用。
- INTERP 可以与伪列 _irowts 一起使用，返回插值点所对应的时间戳(3.0.1.4版本以后支持)。
-- INTERP 可以与伪列 _isfilled 一起使用，显示返回结果是否为原始记录或插值算法产生的数据(3.0.2.1版本以后支持)。
+- INTERP 可以与伪列 _isfilled 一起使用，显示返回结果是否为原始记录或插值算法产生的数据(3.0.2.3版本以后支持)。
### LAST
diff --git a/docs/zh/12-taos-sql/29-changes.md b/docs/zh/12-taos-sql/29-changes.md
index 1e421f95e1..9d67533cde 100644
--- a/docs/zh/12-taos-sql/29-changes.md
+++ b/docs/zh/12-taos-sql/29-changes.md
@@ -54,7 +54,6 @@ description: "TDengine 3.0 版本的语法变更说明"
| 27 | GRANT | 新增 | 授予用户权限。
| 28 | KILL TRANSACTION | 新增 | 终止管理节点的事务。
| 29 | KILL STREAM | 废除 | 终止连续查询。3.0版本不再支持连续查询，而是用更通用的流计算来代替。
-| 30 | MERGE VGROUP | 新增 | 合并VGROUP。
| 31 | REVOKE | 新增 | 回收用户权限。
| 32 | SELECT | 调整 | - SELECT关闭隐式结果列，输出列均需要由SELECT子句来指定。
- DISTINCT功能全面支持。2.x版本只支持对标签列去重，并且不可以和JOIN、GROUP BY等子句混用。
- JOIN功能增强。增加支持：JOIN后WHERE条件中有OR条件；JOIN后的多表运算；JOIN后的多表GROUP BY。
- FROM后子查询功能大幅增强。不限制子查询嵌套层数；支持子查询和UNION ALL混合使用；移除其他一些之前版本的语法限制。
- WHERE后可以使用任意的标量表达式。
- GROUP BY功能增强。支持任意标量表达式及其组合的分组。
- SESSION可以用于超级表了。没有PARTITION BY时，超级表的数据会被合并成一条时间线。
- STATE_WINDOW可以用于超级表了。没有PARTITION BY时，超级表的数据会被合并成一条时间线。
- ORDER BY功能大幅增强。不再必须和GROUP BY子句一起使用；不再有排序表达式个数的限制；增加支持NULLS FIRST/LAST语法功能；支持符合语法语义的任意表达式。
- 新增PARTITION BY语法。替代原来的GROUP BY tags。
| 33 | SHOW ACCOUNTS | 废除 | 2.x中为企业版功能，3.0不再支持。语法暂时保留了，执行报“This statement is no longer supported”错误。
@@ -76,8 +75,9 @@ description: "TDengine 3.0 版本的语法变更说明"
| 49 | SHOW TRANSACTIONS | 新增 | 显示当前系统中正在执行的事务的信息。
| 50 | SHOW DNODE VARIABLES | 新增 |显示指定DNODE的配置参数。
| 51 | SHOW VNODES | 暂不支持 | 显示当前系统中VNODE的信息。3.0.0版本暂不支持。
-| 52 | SPLIT VGROUP | 新增 | 拆分VGROUP。
-| 53 | TRIM DATABASE | 新增 | 删除过期数据，并根据多级存储的配置归整数据。
+| 52 | TRIM DATABASE | 新增 | 删除过期数据，并根据多级存储的配置归整数据。
+| 53 | REDISTRIBUTE VGROUP | 新增 | 调整VGROUP中VNODE的分布。
+| 54 | BALANCE VGROUP | 新增 | 自动调整VGROUP中VNODE的分布。
## SQL 函数变更
diff --git a/docs/zh/14-reference/12-config/index.md b/docs/zh/14-reference/12-config/index.md
index bc62a536e5..135d97e8fb 100644
--- a/docs/zh/14-reference/12-config/index.md
+++ b/docs/zh/14-reference/12-config/index.md
@@ -134,6 +134,24 @@ taos --dump-config
| 取值范围 | 1-200000 |
| 缺省值 | 30 |
+### telemetryReporting
+
+| 属性 | 说明 |
+| -------- | -------------------------------------------- |
+| 适用范围 | 仅服务端适用 |
+| 含义 |是否上传 telemetry |
+| 取值范围 | 0,1 0: 不上传；1：上传 |
+| 缺省值 | 1 |
+
+### crashReporting
+
+| 属性 | 说明 |
+| -------- | -------------------------------------------- |
+| 适用范围 | 仅服务端适用 |
+| 含义 |是否上传 crash 信息 |
+| 取值范围 | 0,1 0: 不上传；1：上传 |
+| 缺省值 | 1 |
+
## 查询相关
### queryPolicy
@@ -698,7 +716,7 @@ charset 的有效值是 UTF-8。
| 2 | numOfThreadsPerCore | 是 | 否 | 有其它参数设置多种线程池的大小 |
| 3 | numOfMnodes | 是 | 否 | 通过 create mnode 命令动态创建 mnode |
| 4 | vnodeBak | 是 | 否 | 3.0 行为未知 |
-| 5 | balance | 是 | 否 | 负载均衡功能由 split/merge vgroups 实现 |
+| 5 | balance | 是 | 否 | 负载均衡功能由 split/merge vgroups 实现 （暂不支持） |
| 6 | balanceInterval | 是 | 否 | 随着 balance 参数失效 |
| 7 | offlineThreshold | 是 | 否 | 3.0 行为未知 |
| 8 | role | 是 | 否 | 由 supportVnode 决定是否能够创建 |
diff --git a/docs/zh/27-train-faq/01-faq.md b/docs/zh/27-train-faq/01-faq.md
index 595b69b08b..c6ecbe471a 100644
--- a/docs/zh/27-train-faq/01-faq.md
+++ b/docs/zh/27-train-faq/01-faq.md
@@ -243,3 +243,8 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
```
launchctl limit maxfiles
```
+### 19 建库时提示Out of dnode
+该提示是创建db的vnode数量不够了，需要的vnode不能超过了dnode中vnode的上限。因为系统默认是一个dnode中有cpu核数两倍的vnode，也可以通过配置文件中的参数supportVnodes控制。
+正常调大taos.cfg种这个supportVnodes参数即可。
+
+
diff --git a/docs/zh/28-releases/01-tdengine.md b/docs/zh/28-releases/01-tdengine.md
index e19b2133e4..29403f3874 100644
--- a/docs/zh/28-releases/01-tdengine.md
+++ b/docs/zh/28-releases/01-tdengine.md
@@ -10,6 +10,10 @@ TDengine 2.x 各版本安装包请访问[这里](https://www.taosdata.com/all-do
import Release from "/components/ReleaseV3";
+## 3.0.2.3
+
+
+
## 3.0.2.2
diff --git a/docs/zh/28-releases/02-tools.md b/docs/zh/28-releases/02-tools.md
index b2ead5b264..f10d97ebb9 100644
--- a/docs/zh/28-releases/02-tools.md
+++ b/docs/zh/28-releases/02-tools.md
@@ -10,6 +10,10 @@ taosTools 各版本安装包下载链接如下：
import Release from "/components/ReleaseV3";
+## 2.4.1
+
+
+
## 2.4.0
diff --git a/include/client/taos.h b/include/client/taos.h
index e54300e33e..838d0e8266 100644
--- a/include/client/taos.h
+++ b/include/client/taos.h
@@ -220,6 +220,7 @@ DLL_EXPORT const void *taos_get_raw_block(TAOS_RES *res);
DLL_EXPORT int taos_get_db_route_info(TAOS *taos, const char *db, TAOS_DB_ROUTE_INFO *dbInfo);
DLL_EXPORT int taos_get_table_vgId(TAOS *taos, const char *db, const char *table, int *vgId);
+DLL_EXPORT int taos_get_tables_vgId(TAOS *taos, const char *db, const char *table[], int tableNum, int *vgId);
DLL_EXPORT int taos_load_table_info(TAOS *taos, const char *tableNameList);
diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index 2643273555..c6e21af644 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -162,6 +162,7 @@ typedef enum EStreamType {
STREAM_PULL_DATA,
STREAM_PULL_OVER,
STREAM_FILL_OVER,
+ STREAM_CREATE_CHILD_TABLE,
} EStreamType;
#pragma pack(push, 1)
@@ -205,8 +206,6 @@ typedef struct SDataBlockInfo {
TSKEY watermark; // used for stream
char parTbName[TSDB_TABLE_NAME_LEN]; // used for stream partition
- int32_t tagLen;
- void* pTag; // used for stream partition
} SDataBlockInfo;
typedef struct SSDataBlock {
@@ -379,6 +378,11 @@ typedef struct SSortExecInfo {
#define CALCULATE_END_TS_COLUMN_INDEX 5
#define TABLE_NAME_COLUMN_INDEX 6
+// stream create table block column
+#define UD_TABLE_NAME_COLUMN_INDEX 0
+#define UD_GROUPID_COLUMN_INDEX 1
+#define UD_TAG_COLUMN_INDEX 2
+
#ifdef __cplusplus
}
#endif
diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index d445fc26e8..2331f0b23c 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -69,6 +69,9 @@ extern int32_t tsElectInterval;
extern int32_t tsHeartbeatInterval;
extern int32_t tsHeartbeatTimeout;
+// vnode
+extern int64_t tsVndCommitMaxIntervalMs;
+
// monitor
extern bool tsEnableMonitor;
extern int32_t tsMonitorInterval;
@@ -82,6 +85,10 @@ extern bool tsEnableTelem;
extern int32_t tsTelemInterval;
extern char tsTelemServer[];
extern uint16_t tsTelemPort;
+extern bool tsEnableCrashReport;
+extern char* tsTelemUri;
+extern char* tsClientCrashReportUri;
+extern char* tsSvrCrashReportUri;
// query buffer management
extern int32_t tsQueryBufferSize; // maximum allowed usage buffer size in MB for each data node during query processing
diff --git a/include/common/tname.h b/include/common/tname.h
index 666a25303e..6a89d2a6be 100644
--- a/include/common/tname.h
+++ b/include/common/tname.h
@@ -78,7 +78,7 @@ typedef struct {
// output
char* ctbShortName; // must have size of TSDB_TABLE_NAME_LEN;
- uint64_t uid; // child table uid, may be useful
+// uint64_t uid; // child table uid, may be useful
} RandTableName;
void buildChildTableName(RandTableName* rName);
diff --git a/include/common/ttypes.h b/include/common/ttypes.h
index d0f72fbfe5..97ae151b7a 100644
--- a/include/common/ttypes.h
+++ b/include/common/ttypes.h
@@ -343,8 +343,8 @@ typedef struct tDataTypeDescriptor {
extern tDataTypeDescriptor tDataTypes[TSDB_DATA_TYPE_MAX];
bool isValidDataType(int32_t type);
+int32_t operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type);
void assignVal(char *val, const char *src, int32_t len, int32_t type);
-void operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type);
void *getDataMin(int32_t type, void* value);
void *getDataMax(int32_t type, void* value);
diff --git a/include/libs/catalog/catalog.h b/include/libs/catalog/catalog.h
index 0e2d043174..fbb24d2862 100644
--- a/include/libs/catalog/catalog.h
+++ b/include/libs/catalog/catalog.h
@@ -210,6 +210,9 @@ int32_t catalogGetCachedTableMeta(SCatalog* pCtg, const SName* pTableName, STabl
int32_t catalogGetCachedSTableMeta(SCatalog* pCtg, const SName* pTableName, STableMeta** pTableMeta);
+int32_t catalogGetTablesHashVgId(SCatalog* pCtg, SRequestConnInfo* pConn, int32_t acctId, const char* pDb, const char* pTableName[],
+ int32_t tableNum, int32_t *vgId);
+
int32_t catalogGetCachedTableHashVgroup(SCatalog* pCtg, const SName* pTableName, SVgroupInfo* pVgroup, bool* exists);
int32_t catalogGetCachedTableVgMeta(SCatalog* pCtg, const SName* pTableName, SVgroupInfo* pVgroup, STableMeta** pTableMeta);
diff --git a/include/libs/executor/executor.h b/include/libs/executor/executor.h
index 871dd60741..095d2f6d10 100644
--- a/include/libs/executor/executor.h
+++ b/include/libs/executor/executor.h
@@ -154,6 +154,8 @@ void qCleanExecTaskBlockBuf(qTaskInfo_t tinfo);
*/
int32_t qAsyncKillTask(qTaskInfo_t tinfo, int32_t rspCode);
+bool qTaskIsExecuting(qTaskInfo_t qinfo);
+
/**
* destroy query info structure
* @param qHandle
@@ -216,6 +218,7 @@ int32_t qStreamSourceRecoverStep2(qTaskInfo_t tinfo, int64_t ver);
int32_t qStreamRecoverFinish(qTaskInfo_t tinfo);
int32_t qStreamRestoreParam(qTaskInfo_t tinfo);
bool qStreamRecoverScanFinished(qTaskInfo_t tinfo);
+void qStreamCloseTsdbReader(void* task);
#ifdef __cplusplus
}
diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h
index d37f8f76c2..4c23c1f557 100644
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@@ -49,10 +49,12 @@ extern "C" {
#define SYNC_HEARTBEAT_REPLY_SLOW_MS 1500
#define SYNC_SNAP_RESEND_MS 1000 * 60
+#define SYNC_VND_COMMIT_MIN_MS 1000
+
#define SYNC_MAX_BATCH_SIZE 1
#define SYNC_INDEX_BEGIN 0
#define SYNC_INDEX_INVALID -1
-#define SYNC_TERM_INVALID -1 // 0xFFFFFFFFFFFFFFFF
+#define SYNC_TERM_INVALID -1
typedef enum {
SYNC_STRATEGY_NO_SNAPSHOT = 0,
@@ -232,6 +234,7 @@ int64_t syncOpen(SSyncInfo* pSyncInfo);
int32_t syncStart(int64_t rid);
void syncStop(int64_t rid);
void syncPreStop(int64_t rid);
+void syncPostStop(int64_t rid);
int32_t syncPropose(int64_t rid, SRpcMsg* pMsg, bool isWeak, int64_t* seq);
int32_t syncProcessMsg(int64_t rid, SRpcMsg* pMsg);
int32_t syncReconfig(int64_t rid, SSyncCfg* pCfg);
diff --git a/include/libs/transport/thttp.h b/include/libs/transport/thttp.h
index 7d8c588bfc..9a6aee4187 100644
--- a/include/libs/transport/thttp.h
+++ b/include/libs/transport/thttp.h
@@ -24,7 +24,7 @@ extern "C" {
typedef enum { HTTP_GZIP, HTTP_FLAT } EHttpCompFlag;
-int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag);
+int32_t taosSendHttpReport(const char* server, const char* uri, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag);
#ifdef __cplusplus
}
diff --git a/include/os/os.h b/include/os/os.h
index b27fa84406..809b814491 100644
--- a/include/os/os.h
+++ b/include/os/os.h
@@ -116,6 +116,7 @@ extern "C" {
#include "osTimer.h"
#include "osTimezone.h"
#include "taoserror.h"
+#include "tlog.h"
#ifdef __cplusplus
}
diff --git a/include/os/osSystem.h b/include/os/osSystem.h
index 58f34d26f0..5154c56e4b 100644
--- a/include/os/osSystem.h
+++ b/include/os/osSystem.h
@@ -46,27 +46,73 @@ void taosSetTerminalMode();
int32_t taosGetOldTerminalMode();
void taosResetTerminalMode();
+#define STACKSIZE 100
+
#if !defined(WINDOWS)
-#define taosPrintTrace(flags, level, dflag) \
- { \
- void* array[100]; \
- int32_t size = backtrace(array, 100); \
- char** strings = backtrace_symbols(array, size); \
- if (strings != NULL) { \
- taosPrintLog(flags, level, dflag, "obtained %d stack frames", size); \
- for (int32_t i = 0; i < size; i++) { \
- taosPrintLog(flags, level, dflag, "frame:%d, %s", i, strings[i]); \
- } \
- } \
- \
- taosMemoryFree(strings); \
+#define taosLogTraceToBuf(buf, bufSize, ignoreNum) { \
+ void* array[STACKSIZE]; \
+ int32_t size = backtrace(array, STACKSIZE); \
+ char** strings = backtrace_symbols(array, size); \
+ int32_t offset = 0; \
+ if (strings != NULL) { \
+ offset = snprintf(buf, bufSize - 1, "obtained %d stack frames\n", (ignoreNum > 0) ? size - ignoreNum : size); \
+ for (int32_t i = (ignoreNum > 0) ? ignoreNum : 0; i < size; i++) { \
+ offset += snprintf(buf + offset, bufSize - 1 - offset, "frame:%d, %s\n", (ignoreNum > 0) ? i - ignoreNum : i, strings[i]); \
+ } \
+ } \
+ \
+ taosMemoryFree(strings); \
+}
+
+#define taosPrintTrace(flags, level, dflag, ignoreNum) \
+ { \
+ void* array[STACKSIZE]; \
+ int32_t size = backtrace(array, STACKSIZE); \
+ char** strings = backtrace_symbols(array, size); \
+ if (strings != NULL) { \
+ taosPrintLog(flags, level, dflag, "obtained %d stack frames", (ignoreNum > 0) ? size - ignoreNum : size); \
+ for (int32_t i = (ignoreNum > 0) ? ignoreNum : 0; i < size; i++) { \
+ taosPrintLog(flags, level, dflag, "frame:%d, %s", (ignoreNum > 0) ? i - ignoreNum : i, strings[i]); \
+ } \
+ } \
+ \
+ taosMemoryFree(strings); \
}
#else
+
#include
#include
-#define STACKSIZE 64
-#define taosPrintTrace(flags, level, dflag) \
+#define taosLogTraceToBuf(buf, bufSize, ignoreNum) { \
+ unsigned int i; \
+ void* stack[STACKSIZE]; \
+ unsigned short frames; \
+ SYMBOL_INFO* symbol; \
+ HANDLE process; \
+ int32_t offset = 0; \
+ \
+ process = GetCurrentProcess(); \
+ \
+ SymInitialize(process, NULL, TRUE); \
+ \
+ frames = CaptureStackBackTrace(0, STACKSIZE, stack, NULL); \
+ symbol = (SYMBOL_INFO*)calloc(sizeof(SYMBOL_INFO) + 256 * sizeof(char), 1); \
+ if (symbol != NULL) { \
+ symbol->MaxNameLen = 255; \
+ symbol->SizeOfStruct = sizeof(SYMBOL_INFO); \
+ \
+ if (frames > 0) { \
+ offset = snprintf(buf, bufSize - 1, "obtained %d stack frames\n", (ignoreNum > 0) ? frames - ignoreNum : frames); \
+ for (i = (ignoreNum > 0) ? ignoreNum : 0; i < frames; i++) { \
+ SymFromAddr(process, (DWORD64)(stack[i]), 0, symbol); \
+ offset += snprintf(buf + offset, bufSize - 1 - offset, "frame:%i, %s - 0x%0X\n", (ignoreNum > 0) ? i - ignoreNum : i, symbol->Name, symbol->Address); \
+ } \
+ } \
+ free(symbol); \
+ } \
+ }
+
+#define taosPrintTrace(flags, level, dflag, ignoreNum) \
{ \
unsigned int i; \
void* stack[STACKSIZE]; \
@@ -85,10 +131,10 @@ void taosResetTerminalMode();
symbol->SizeOfStruct = sizeof(SYMBOL_INFO); \
\
if (frames > 0) { \
- taosPrintLog(flags, level, dflag, "obtained %d stack frames", frames); \
- for (i = 0; i < frames; i++) { \
+ taosPrintLog(flags, level, dflag, "obtained %d stack frames\n", (ignoreNum > 0) ? frames - ignoreNum : frames); \
+ for (i = (ignoreNum > 0) ? ignoreNum : 0; i < frames; i++) { \
SymFromAddr(process, (DWORD64)(stack[i]), 0, symbol); \
- taosPrintLog(flags, level, dflag, "frame:%i: %s - 0x%0X", frames - i - 1, symbol->Name, symbol->Address); \
+ taosPrintLog(flags, level, dflag, "frame:%i, %s - 0x%0X\n", (ignoreNum > 0) ? i - ignoreNum : i, symbol->Name, symbol->Address); \
} \
} \
free(symbol); \
diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index 9d594d1507..52d8a75ee0 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -159,6 +159,7 @@ int32_t* taosGetErrno();
#define TSDB_CODE_TSC_NO_EXEC_NODE TAOS_DEF_ERROR_CODE(0, 0X022E)
#define TSDB_CODE_TSC_NOT_STABLE_ERROR TAOS_DEF_ERROR_CODE(0, 0X022F)
#define TSDB_CODE_TSC_STMT_CACHE_ERROR TAOS_DEF_ERROR_CODE(0, 0X0230)
+#define TSDB_CODE_TSC_INTERNAL_ERROR TAOS_DEF_ERROR_CODE(0, 0X0231)
// mnode-common
// #define TSDB_CODE_MND_MSG_NOT_PROCESSED TAOS_DEF_ERROR_CODE(0, 0x0300) // 2.x
@@ -414,6 +415,7 @@ int32_t* taosGetErrno();
#define TSDB_CODE_VND_NO_AVAIL_BUFPOOL TAOS_DEF_ERROR_CODE(0, 0x0528)
#define TSDB_CODE_VND_STOPPED TAOS_DEF_ERROR_CODE(0, 0x0529)
#define TSDB_CODE_VND_DUP_REQUEST TAOS_DEF_ERROR_CODE(0, 0x0530)
+#define TSDB_CODE_VND_QUERY_BUSY TAOS_DEF_ERROR_CODE(0, 0x0531)
// tsdb
#define TSDB_CODE_TDB_INVALID_TABLE_ID TAOS_DEF_ERROR_CODE(0, 0x0600)
@@ -700,6 +702,7 @@ int32_t* taosGetErrno();
#define TSDB_CODE_SML_INVALID_DATA TAOS_DEF_ERROR_CODE(0, 0x3002)
#define TSDB_CODE_SML_INVALID_DB_CONF TAOS_DEF_ERROR_CODE(0, 0x3003)
#define TSDB_CODE_SML_NOT_SAME_TYPE TAOS_DEF_ERROR_CODE(0, 0x3004)
+#define TSDB_CODE_SML_INTERNAL_ERROR TAOS_DEF_ERROR_CODE(0, 0x3005)
//tsma
#define TSDB_CODE_TSMA_INIT_FAILED TAOS_DEF_ERROR_CODE(0, 0x3100)
diff --git a/include/util/tlog.h b/include/util/tlog.h
index 6e9b304e1d..808377fa77 100644
--- a/include/util/tlog.h
+++ b/include/util/tlog.h
@@ -99,6 +99,11 @@ bool taosAssertRelease(bool condition);
#endif
#endif
+void taosLogCrashInfo(char* nodeType, char* pMsg, int64_t msgLen, int signum, void *sigInfo);
+void taosReadCrashInfo(char* filepath, char** pMsg, int64_t* pMsgLen, TdFilePtr* pFd);
+void taosReleaseCrashLogFile(TdFilePtr pFile, bool truncateFile);
+int32_t taosGenCrashJsonMsg(int signum, char** pMsg, int64_t clusterId, int64_t startTime);
+
// clang-format off
#define uFatal(...) { if (uDebugFlag & DEBUG_FATAL) { taosPrintLog("UTL FATAL", DEBUG_FATAL, tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
#define uError(...) { if (uDebugFlag & DEBUG_ERROR) { taosPrintLog("UTL ERROR ", DEBUG_ERROR, tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
diff --git a/packaging/cfg/taos.cfg b/packaging/cfg/taos.cfg
index e22aa85c97..3d3dfc8e73 100644
--- a/packaging/cfg/taos.cfg
+++ b/packaging/cfg/taos.cfg
@@ -43,6 +43,9 @@
# Switch for allowing TDengine to collect and report service usage information
# telemetryReporting 1
+# Switch for allowing TDengine to collect and report crash information
+# crashReporting 1
+
# The maximum number of vnodes supported by this dnode
# supportVnodes 0
diff --git a/packaging/release.sh b/packaging/release.sh
deleted file mode 100755
index 7a8a08352f..0000000000
--- a/packaging/release.sh
+++ /dev/null
@@ -1,319 +0,0 @@
-#!/bin/bash
-#
-# Generate the deb package for ubuntu, or rpm package for centos, or tar.gz package for other linux os
-
-set -e
-# set -x
-
-# release.sh -v [cluster | edge]
-# -c [aarch32 | aarch64 | x64 | x86 | mips64 | loongarch64...]
-# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
-# -V [stable | beta]
-# -l [full | lite]
-# -s [static | dynamic]
-# -d [taos | ...]
-# -n [2.0.0.3]
-# -m [2.0.0.0]
-# -H [ false | true]
-
-# set parameters by default value
-verMode=edge # [cluster, edge, cloud]
-verType=stable # [stable, beta]
-cpuType=x64 # [aarch32 | aarch64 | x64 | x86 | mips64 loongarch64...]
-osType=Linux # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
-pagMode=full # [full | lite]
-soMode=dynamic # [static | dynamic]
-dbName=taos # [taos | ...]
-allocator=glibc # [glibc | jemalloc]
-verNumber=""
-verNumberComp="3.0.0.0"
-httpdBuild=false
-
-while getopts "hv:V:c:o:l:s:d:a:n:m:H:" arg; do
- case $arg in
- v)
- #echo "verMode=$OPTARG"
- verMode=$(echo $OPTARG)
- ;;
- V)
- #echo "verType=$OPTARG"
- verType=$(echo $OPTARG)
- ;;
- c)
- #echo "cpuType=$OPTARG"
- cpuType=$(echo $OPTARG)
- ;;
- l)
- #echo "pagMode=$OPTARG"
- pagMode=$(echo $OPTARG)
- ;;
- s)
- #echo "soMode=$OPTARG"
- soMode=$(echo $OPTARG)
- ;;
- d)
- #echo "dbName=$OPTARG"
- dbName=$(echo $OPTARG)
- ;;
- a)
- #echo "allocator=$OPTARG"
- allocator=$(echo $OPTARG)
- ;;
- n)
- #echo "verNumber=$OPTARG"
- verNumber=$(echo $OPTARG)
- ;;
- m)
- #echo "verNumberComp=$OPTARG"
- verNumberComp=$(echo $OPTARG)
- ;;
- o)
- #echo "osType=$OPTARG"
- osType=$(echo $OPTARG)
- ;;
- H)
- #echo "httpdBuild=$OPTARG"
- httpdBuild=$(echo $OPTARG)
- ;;
- h)
- echo "Usage: $(basename $0) -v [cluster | edge] "
- echo " -c [aarch32 | aarch64 | x64 | x86 | mips64 | loongarch64 ...] "
- echo " -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...] "
- echo " -V [stable | beta] "
- echo " -l [full | lite] "
- echo " -a [glibc | jemalloc] "
- echo " -s [static | dynamic] "
- echo " -d [taos | ...] "
- echo " -n [version number] "
- echo " -m [compatible version number] "
- echo " -H [false | true] "
- exit 0
- ;;
- ?) #unknow option
- echo "unkonw argument"
- exit 1
- ;;
- esac
-done
-
-osType=$(uname)
-
-echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} soMode=${soMode} dbName=${dbName} allocator=${allocator} verNumber=${verNumber} verNumberComp=${verNumberComp} httpdBuild=${httpdBuild}"
-
-curr_dir=$(pwd)
-
-if [ "$osType" == "Darwin" ]; then
- script_dir=$(dirname $0)
- cd ${script_dir}
- script_dir="$(pwd)"
- top_dir=${script_dir}/..
-else
- script_dir="$(dirname $(readlink -f $0))"
- top_dir="$(readlink -f ${script_dir}/..)"
-fi
-
-csudo=""
-#if command -v sudo > /dev/null; then
-# csudo="sudo "
-#fi
-
-function is_valid_version() {
- [ -z $1 ] && return 1 || :
-
- rx='^([0-9]+\.){3}(\*|[0-9]+)$'
- if [[ $1 =~ $rx ]]; then
- return 0
- fi
- return 1
-}
-
-function vercomp() {
- if [[ $1 == $2 ]]; then
- echo 0
- exit 0
- fi
-
- local IFS=.
- local i ver1=($1) ver2=($2)
-
- # fill empty fields in ver1 with zeros
- for ((i = ${#ver1[@]}; i < ${#ver2[@]}; i++)); do
- ver1[i]=0
- done
-
- for ((i = 0; i < ${#ver1[@]}; i++)); do
- if [[ -z ${ver2[i]} ]]; then
- # fill empty fields in ver2 with zeros
- ver2[i]=0
- fi
- if ((10#${ver1[i]} > 10#${ver2[i]})); then
- echo 1
- exit 0
- fi
- if ((10#${ver1[i]} < 10#${ver2[i]})); then
- echo 2
- exit 0
- fi
- done
- echo 0
-}
-
-# 1. check version information
-if ( (! is_valid_version $verNumber) || (! is_valid_version $verNumberComp) || [[ "$(vercomp $verNumber $verNumberComp)" == '2' ]]); then
- echo "please enter correct version"
- exit 0
-fi
-
-echo "=======================new version number: ${verNumber}, compatible version: ${verNumberComp}======================================"
-
-build_time=$(date +"%F %R")
-
-# get commint id from git
-gitinfo=$(git rev-parse --verify HEAD)
-
-if [[ "$verMode" == "cluster" ]] || [[ "$verMode" == "cloud" ]]; then
- enterprise_dir="${top_dir}/../enterprise"
- cd ${enterprise_dir}
- gitinfoOfInternal=$(git rev-parse --verify HEAD)
-else
- gitinfoOfInternal=NULL
-fi
-
-cd "${curr_dir}"
-
-# 2. cmake executable file
-compile_dir="${top_dir}/debug"
-if [ -d ${compile_dir} ]; then
- rm -rf ${compile_dir}
-fi
-
-mkdir -p ${compile_dir}
-cd ${compile_dir}
-
-if [[ "$allocator" == "jemalloc" ]]; then
- allocator_macro="-DJEMALLOC_ENABLED=true"
-else
- allocator_macro=""
-fi
-
-if [[ "$dbName" != "taos" ]]; then
- source ${enterprise_dir}/packaging/oem/sed_$dbName.sh
- replace_community_$dbName
-fi
-
-if [[ "$httpdBuild" == "true" ]]; then
- BUILD_HTTP=true
-else
- BUILD_HTTP=false
-fi
-
-if [[ "$verMode" == "cluster" ]] || [[ "$verMode" == "cloud" ]]; then
- BUILD_HTTP=internal
-fi
-
-if [[ "$pagMode" == "full" ]]; then
- BUILD_TOOLS=true
-else
- BUILD_TOOLS=false
-fi
-
-# check support cpu type
-if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "arm64" ]] || [[ "$cpuType" == "arm32" ]] || [[ "$cpuType" == "mips64" ]] || [[ "$cpuType" == "loongarch64" ]] ; then
- if [ "$verMode" == "edge" ]; then
- # community-version compile
- cmake ../ -DCPUTYPE=${cpuType} -DWEBSOCKET=true -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp} -DPAGMODE=${pagMode} -DBUILD_HTTP=${BUILD_HTTP} -DBUILD_TOOLS=${BUILD_TOOLS} ${allocator_macro}
- elif [ "$verMode" == "cloud" ]; then
- cmake ../../ -DCPUTYPE=${cpuType} -DWEBSOCKET=true -DBUILD_TAOSX=true -DBUILD_CLOUD=true -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp} -DBUILD_HTTP=${BUILD_HTTP} -DBUILD_TOOLS=${BUILD_TOOLS} ${allocator_macro}
- elif [ "$verMode" == "cluster" ]; then
- if [[ "$dbName" != "taos" ]]; then
- replace_enterprise_$dbName
- fi
- cmake ../../ -DCPUTYPE=${cpuType} -DWEBSOCKET=true -DBUILD_TAOSX=true -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp} -DBUILD_HTTP=${BUILD_HTTP} -DBUILD_TOOLS=${BUILD_TOOLS} ${allocator_macro}
- fi
-else
- echo "input cpuType=${cpuType} error!!!"
- exit 1
-fi
-
-ostype=`uname`
-if [ "${ostype}" == "Darwin" ]; then
- CORES=$(sysctl -n hw.ncpu)
-else
- CORES=$(grep -c ^processor /proc/cpuinfo)
-fi
-
-if [[ "$allocator" == "jemalloc" ]]; then
- # jemalloc need compile first, so disable parallel build
- make -j ${CORES} && ${csudo}make install
-else
- make -j ${CORES} && ${csudo}make install
-fi
-
-cd ${curr_dir}
-
-# 3. Call the corresponding script for packaging
-if [ "$osType" != "Darwin" ]; then
- if [[ "$verMode" != "cluster" ]] && [[ "$verMode" != "cloud" ]] && [[ "$pagMode" == "full" ]] && [[ "$cpuType" == "x64" ]] && [[ "$dbName" == "taos" ]]; then
- ret='0'
- command -v dpkg >/dev/null 2>&1 || { ret='1'; }
- if [ "$ret" -eq 0 ]; then
- echo "====do deb package for the ubuntu system===="
- output_dir="${top_dir}/debs"
- if [ -d ${output_dir} ]; then
- rm -rf ${output_dir}
- fi
- mkdir -p ${output_dir}
- cd ${script_dir}/deb
- ${csudo}./makedeb.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
-
- if [[ "$pagMode" == "full" ]]; then
- if [ -d ${top_dir}/tools/taos-tools/packaging/deb ]; then
- cd ${top_dir}/tools/taos-tools/packaging/deb
- taos_tools_ver=$(git tag |grep -v taos | sort | tail -1)
- [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
-
- ${csudo}./make-taos-tools-deb.sh ${top_dir} \
- ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
- fi
- fi
- else
- echo "==========dpkg command not exist, so not release deb package!!!"
- fi
- ret='0'
- command -v rpmbuild >/dev/null 2>&1 || { ret='1'; }
- if [ "$ret" -eq 0 ]; then
- echo "====do rpm package for the centos system===="
- output_dir="${top_dir}/rpms"
- if [ -d ${output_dir} ]; then
- rm -rf ${output_dir}
- fi
- mkdir -p ${output_dir}
- cd ${script_dir}/rpm
- ${csudo}./makerpm.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
-
- if [[ "$pagMode" == "full" ]]; then
- if [ -d ${top_dir}/tools/taos-tools/packaging/rpm ]; then
- cd ${top_dir}/tools/taos-tools/packaging/rpm
- taos_tools_ver=$(git tag |grep -v taos | sort | tail -1)
- [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
-
- ${csudo}./make-taos-tools-rpm.sh ${top_dir} \
- ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
- fi
- fi
- else
- echo "==========rpmbuild command not exist, so not release rpm package!!!"
- fi
- fi
-
- echo "====do tar.gz package for all systems===="
- cd ${script_dir}/tools
-
- ${csudo}./makepkg.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp} ${dbName}
- ${csudo}./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
-
-else
- cd ${script_dir}/tools
- ./makepkg.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp} ${dbName}
- ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
-fi
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 63009e5421..2a078b5eab 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -481,11 +481,11 @@ function install_adapter_config() {
${csudo}mkdir -p ${cfg_install_dir}
[ -f ${script_dir}/cfg/${adapterName}.toml ] && ${csudo}cp ${script_dir}/cfg/${adapterName}.toml ${cfg_install_dir}
[ -f ${cfg_install_dir}/${adapterName}.toml ] && ${csudo}chmod 644 ${cfg_install_dir}/${adapterName}.toml
+ else
+ [ -f ${script_dir}/cfg/${adapterName}.toml ] &&
+ ${csudo}cp -f ${script_dir}/cfg/${adapterName}.toml ${cfg_install_dir}/${adapterName}.toml.new
fi
- [ -f ${script_dir}/cfg/${adapterName}.toml ] &&
- ${csudo}cp -f ${script_dir}/cfg/${adapterName}.toml ${cfg_install_dir}/${adapterName}.toml.new
-
[ -f ${cfg_install_dir}/${adapterName}.toml ] &&
${csudo}ln -s ${cfg_install_dir}/${adapterName}.toml ${install_main_dir}/cfg/${adapterName}.toml
@@ -499,9 +499,10 @@ function install_config() {
${csudo}mkdir -p ${cfg_install_dir}
[ -f ${script_dir}/cfg/${configFile} ] && ${csudo}cp ${script_dir}/cfg/${configFile} ${cfg_install_dir}
${csudo}chmod 644 ${cfg_install_dir}/*
+ else
+ ${csudo}cp -f ${script_dir}/cfg/${configFile} ${cfg_install_dir}/${configFile}.new
fi
- ${csudo}cp -f ${script_dir}/cfg/${configFile} ${cfg_install_dir}/${configFile}.new
${csudo}ln -s ${cfg_install_dir}/${configFile} ${install_main_dir}/cfg
[ ! -z $1 ] && return 0 || : # only install client
diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh
index 482345dcd8..b246e0225f 100755
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@@ -109,6 +109,13 @@ function kill_taosadapter() {
fi
}
+function kill_taoskeeper() {
+ pid=$(ps -ef | grep "taoskeeper" | grep -v "grep" | awk '{print $2}')
+ if [ -n "$pid" ]; then
+ ${csudo}kill -9 $pid || :
+ fi
+}
+
function kill_taosd() {
# ${csudo}pkill -f taosd || :
pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
@@ -161,6 +168,7 @@ function install_bin() {
${csudo}rm -f ${bin_link_dir}/udfd || :
${csudo}rm -f ${bin_link_dir}/taosadapter || :
${csudo}rm -f ${bin_link_dir}/taosBenchmark || :
+ ${csudo}rm -f ${bin_link_dir}/taoskeeper || :
${csudo}rm -f ${bin_link_dir}/taosdemo || :
${csudo}rm -f ${bin_link_dir}/taosdump || :
${csudo}rm -f ${bin_link_dir}/rmtaos || :
@@ -179,6 +187,7 @@ function install_bin() {
[ -x ${bin_dir}/taosdump ] && ${csudo}ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || :
[ -x ${bin_dir}/set_core.sh ] && ${csudo}ln -s ${bin_dir}/set_core.sh ${bin_link_dir}/set_core || :
[ -x ${bin_dir}/remove.sh ] && ${csudo}ln -s ${bin_dir}/remove.sh ${bin_link_dir}/rmtaos || :
+ [ -x ${bin_dir}/taoskeeper ] && ${csudo}ln -sf ${bin_dir}/taoskeeper ${bin_link_dir}/taoskeeper || :
}
function add_newHostname_to_hosts() {
@@ -351,6 +360,22 @@ function install_taosadapter_config() {
${csudo}ln -s ${cfg_install_dir}/taosadapter.toml ${cfg_dir}
}
+function install_taoskeeper_config() {
+ if [ ! -f "${cfg_install_dir}/keeper.toml" ]; then
+ [ ! -d %{cfg_install_dir} ] &&
+ ${csudo}${csudo}mkdir -p ${cfg_install_dir}
+ [ -f ${cfg_dir}/keeper.toml ] && ${csudo}cp ${cfg_dir}/keeper.toml ${cfg_install_dir}
+ [ -f ${cfg_install_dir}/keeper.toml ] &&
+ ${csudo}chmod 644 ${cfg_install_dir}/keeper.toml
+ fi
+
+ [ -f ${cfg_dir}/keeper.toml ] &&
+ ${csudo}mv ${cfg_dir}/keeper.toml ${cfg_dir}/keeper.toml.new
+
+ [ -f ${cfg_install_dir}/keeper.toml ] &&
+ ${csudo}ln -s ${cfg_install_dir}/keeper.toml ${cfg_dir}
+}
+
function install_config() {
if [ ! -f "${cfg_install_dir}/taos.cfg" ]; then
${csudo}${csudo}mkdir -p ${cfg_install_dir}
@@ -583,6 +608,7 @@ function install_TDengine() {
install_bin
install_config
install_taosadapter_config
+ install_taoskeeper_config
install_taosadapter_service
install_service
install_app
diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index c3b79d7829..3fc5cc9cec 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -312,6 +312,8 @@ extern SAppInfo appInfo;
extern int32_t clientReqRefPool;
extern int32_t clientConnRefPool;
extern int32_t timestampDeltaLimit;
+extern int64_t lastClusterId;
+
__async_send_cb_fn_t getMsgRspHandle(int32_t msgType);
@@ -339,6 +341,7 @@ void resetConnectDB(STscObj* pTscObj);
int taos_options_imp(TSDB_OPTION option, const char* str);
void* openTransporter(const char* user, const char* auth, int32_t numOfThreads);
+void tscStopCrashReport();
typedef struct AsyncArg {
SRpcMsg msg;
diff --git a/source/client/inc/clientSml.h b/source/client/inc/clientSml.h
index 11f72efeaf..15d91641a4 100644
--- a/source/client/inc/clientSml.h
+++ b/source/client/inc/clientSml.h
@@ -164,6 +164,7 @@ typedef struct {
bool dataFormat; // true means that the name and order of keys in each line are the same(only for influx protocol)
bool isRawLine;
int32_t ttl;
+ int32_t uid; // used for automatic create child table
NodeList *childTables;
NodeList *superTables;
@@ -182,6 +183,7 @@ typedef struct {
int8_t offset[OTD_JSON_FIELDS_NUM];
SSmlLineInfo *lines; // element is SSmlLineInfo
bool parseJsonByLib;
+ SArray *tagJsonArray;
//
SArray *preLineTagKV;
@@ -230,6 +232,8 @@ int64_t smlParseOpenTsdbTime(SSmlHandle *info, const char *data, int32
int32_t smlClearForRerun(SSmlHandle *info);
int32_t smlParseValue(SSmlKv *pVal, SSmlMsgBuf *msg);
uint8_t smlGetTimestampLen(int64_t num);
+void clearColValArray(SArray* pCols);
+void smlDestroyTableInfo(SSmlHandle *info, SSmlTableInfo *tag);
int32_t smlParseInfluxString(SSmlHandle *info, char *sql, char *sqlEnd, SSmlLineInfo *elements);
int32_t smlParseTelnetString(SSmlHandle *info, char *sql, char *sqlEnd, SSmlLineInfo *elements);
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index d429e52111..8bf646486d 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -28,13 +28,16 @@
#include "trpc.h"
#include "tsched.h"
#include "ttime.h"
+#include "thttp.h"
#define TSC_VAR_NOT_RELEASE 1
#define TSC_VAR_RELEASED 0
SAppInfo appInfo;
+int64_t lastClusterId = 0;
int32_t clientReqRefPool = -1;
int32_t clientConnRefPool = -1;
+int32_t clientStop = 0;
int32_t timestampDeltaLimit = 900; // s
@@ -62,7 +65,10 @@ static int32_t registerRequest(SRequestObj *pRequest, STscObj *pTscObj) {
static void deregisterRequest(SRequestObj *pRequest) {
const static int64_t SLOW_QUERY_INTERVAL = 3000000L; // todo configurable
- assert(pRequest != NULL);
+ if(pRequest == NULL){
+ tscError("pRequest == NULL");
+ return;
+ }
STscObj *pTscObj = pRequest->pTscObj;
SAppClusterSummary *pActivity = &pTscObj->pAppInfo->summary;
@@ -390,6 +396,146 @@ void destroyRequest(SRequestObj *pRequest) {
removeRequest(pRequest->self);
}
+void taosClientCrash(int signum, void *sigInfo, void *context) {
+ taosIgnSignal(SIGTERM);
+ taosIgnSignal(SIGHUP);
+ taosIgnSignal(SIGINT);
+ taosIgnSignal(SIGBREAK);
+
+#if !defined(WINDOWS)
+ taosIgnSignal(SIGBUS);
+#endif
+ taosIgnSignal(SIGABRT);
+ taosIgnSignal(SIGFPE);
+ taosIgnSignal(SIGSEGV);
+
+ char *pMsg = NULL;
+ const char *flags = "UTL FATAL ";
+ ELogLevel level = DEBUG_FATAL;
+ int32_t dflag = 255;
+ int64_t msgLen= -1;
+
+ if (tsEnableCrashReport) {
+ if (taosGenCrashJsonMsg(signum, &pMsg, lastClusterId, appInfo.startTime)) {
+ taosPrintLog(flags, level, dflag, "failed to generate crash json msg");
+ goto _return;
+ } else {
+ msgLen = strlen(pMsg);
+ }
+ }
+
+_return:
+
+ taosLogCrashInfo("taos", pMsg, msgLen, signum, sigInfo);
+
+ exit(signum);
+}
+
+void crashReportThreadFuncUnexpectedStopped(void) { atomic_store_32(&clientStop, -1); }
+
+static void *tscCrashReportThreadFp(void *param) {
+ setThreadName("client-crashReport");
+ char filepath[PATH_MAX] = {0};
+ snprintf(filepath, sizeof(filepath), "%s%s.taosCrashLog", tsLogDir, TD_DIRSEP);
+ char *pMsg = NULL;
+ int64_t msgLen = 0;
+ TdFilePtr pFile = NULL;
+ bool truncateFile = false;
+ int32_t sleepTime = 200;
+ int32_t reportPeriodNum = 3600 * 1000 / sleepTime;
+ int32_t loopTimes = reportPeriodNum;
+
+#ifdef WINDOWS
+ if (taosCheckCurrentInDll()) {
+ atexit(crashReportThreadFuncUnexpectedStopped);
+ }
+#endif
+
+ while (1) {
+ if (clientStop) break;
+ if (loopTimes++ < reportPeriodNum) {
+ taosMsleep(sleepTime);
+ continue;
+ }
+
+ taosReadCrashInfo(filepath, &pMsg, &msgLen, &pFile);
+ if (pMsg && msgLen > 0) {
+ if (taosSendHttpReport(tsTelemServer, tsClientCrashReportUri, tsTelemPort, pMsg, msgLen, HTTP_FLAT) != 0) {
+ tscError("failed to send crash report");
+ if (pFile) {
+ taosReleaseCrashLogFile(pFile, false);
+ continue;
+ }
+ } else {
+ tscInfo("succeed to send crash report");
+ truncateFile = true;
+ }
+ } else {
+ tscDebug("no crash info");
+ }
+
+ taosMemoryFree(pMsg);
+
+ if (pMsg && msgLen > 0) {
+ pMsg = NULL;
+ continue;
+ }
+
+ if (pFile) {
+ taosReleaseCrashLogFile(pFile, truncateFile);
+ truncateFile = false;
+ }
+
+ taosMsleep(sleepTime);
+ loopTimes = 0;
+ }
+
+ clientStop = -1;
+ return NULL;
+}
+
+int32_t tscCrashReportInit() {
+ if (!tsEnableCrashReport) {
+ return 0;
+ }
+
+ TdThreadAttr thAttr;
+ taosThreadAttrInit(&thAttr);
+ taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE);
+ TdThread crashReportThread;
+ if (taosThreadCreate(&crashReportThread, &thAttr, tscCrashReportThreadFp, NULL) != 0) {
+ tscError("failed to create crashReport thread since %s", strerror(errno));
+ return -1;
+ }
+
+ taosThreadAttrDestroy(&thAttr);
+ return 0;
+}
+
+void tscStopCrashReport() {
+ if (!tsEnableCrashReport) {
+ return;
+ }
+
+ if (atomic_val_compare_exchange_32(&clientStop, 0, 1)) {
+ tscDebug("hb thread already stopped");
+ return;
+ }
+
+ while (atomic_load_32(&clientStop) > 0) {
+ taosMsleep(100);
+ }
+}
+
+static void tscSetSignalHandle() {
+#if !defined(WINDOWS)
+ taosSetSignal(SIGBUS, taosClientCrash);
+#endif
+ taosSetSignal(SIGABRT, taosClientCrash);
+ taosSetSignal(SIGFPE, taosClientCrash);
+ taosSetSignal(SIGSEGV, taosClientCrash);
+}
+
void taos_init_imp(void) {
// In the APIs of other program language, taos_cleanup is not available yet.
// So, to make sure taos_cleanup will be invoked to clean up the allocated resource to suppress the valgrind warning.
@@ -397,6 +543,10 @@ void taos_init_imp(void) {
errno = TSDB_CODE_SUCCESS;
taosSeedRand(taosGetTimestampSec());
+ appInfo.pid = taosGetPId();
+ appInfo.startTime = taosGetTimestampMs();
+ appInfo.pInstMap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_ENTRY_LOCK);
+
deltaToUtcInitOnce();
if (taosCreateLog("taoslog", 10, configDir, NULL, NULL, NULL, NULL, 1) != 0) {
@@ -409,10 +559,13 @@ void taos_init_imp(void) {
return;
}
+ tscSetSignalHandle();
+
initQueryModuleMsgHandle();
if (taosConvInit() != 0) {
- ASSERTS(0, "failed to init conv");
+ tscError("failed to init conv");
+ return;
}
rpcInit();
@@ -438,9 +591,8 @@ void taos_init_imp(void) {
taosGetAppName(appInfo.appName, NULL);
taosThreadMutexInit(&appInfo.mutex, NULL);
- appInfo.pid = taosGetPId();
- appInfo.startTime = taosGetTimestampMs();
- appInfo.pInstMap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_ENTRY_LOCK);
+ tscCrashReportInit();
+
tscDebug("client is initialized successfully");
}
diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c
index 47ed2cf035..3cb8a2e1bd 100644
--- a/source/client/src/clientHb.c
+++ b/source/client/src/clientHb.c
@@ -376,7 +376,6 @@ int32_t hbBuildQueryDesc(SQueryHbReqBasic *hbBasic, STscObj *pObj) {
desc.subPlanNum = 0;
}
desc.subPlanNum = taosArrayGetSize(desc.subDesc);
- ASSERT(desc.subPlanNum == taosArrayGetSize(desc.subDesc));
} else {
desc.subDesc = NULL;
}
@@ -813,7 +812,10 @@ static void hbStopThread() {
}
SAppHbMgr *appHbMgrInit(SAppInstInfo *pAppInstInfo, char *key) {
- hbMgrInit();
+ if(hbMgrInit() != 0){
+ terrno = TSDB_CODE_TSC_INTERNAL_ERROR;
+ return NULL;
+ }
SAppHbMgr *pAppHbMgr = taosMemoryMalloc(sizeof(SAppHbMgr));
if (pAppHbMgr == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
@@ -899,16 +901,28 @@ int hbMgrInit() {
TdThreadMutexAttr attr = {0};
int ret = taosThreadMutexAttrInit(&attr);
- assert(ret == 0);
+ if(ret != 0){
+ uError("hbMgrInit:taosThreadMutexAttrInit error")
+ return ret;
+ }
ret = taosThreadMutexAttrSetType(&attr, PTHREAD_MUTEX_RECURSIVE);
- assert(ret == 0);
+ if(ret != 0){
+ uError("hbMgrInit:taosThreadMutexAttrSetType error")
+ return ret;
+ }
ret = taosThreadMutexInit(&clientHbMgr.lock, &attr);
- assert(ret == 0);
+ if(ret != 0){
+ uError("hbMgrInit:taosThreadMutexInit error")
+ return ret;
+ }
ret = taosThreadMutexAttrDestroy(&attr);
- assert(ret == 0);
+ if(ret != 0){
+ uError("hbMgrInit:taosThreadMutexAttrDestroy error")
+ return ret;
+ }
// init handle funcs
hbMgrInitHandle();
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index 75288cfa14..aeb73784f2 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -452,7 +452,10 @@ int32_t getPlan(SRequestObj* pRequest, SQuery* pQuery, SQueryPlan** pPlan, SArra
}
void setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t numOfCols) {
- ASSERT(pSchema != NULL && numOfCols > 0);
+ if(pResInfo == NULL || pSchema == NULL || numOfCols <= 0){
+ tscError("invalid paras, pResInfo == NULL || pSchema == NULL || numOfCols <= 0");
+ return;
+ }
pResInfo->numOfCols = numOfCols;
if (pResInfo->fields != NULL) {
@@ -463,7 +466,10 @@ void setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t
}
pResInfo->fields = taosMemoryCalloc(numOfCols, sizeof(TAOS_FIELD));
pResInfo->userFields = taosMemoryCalloc(numOfCols, sizeof(TAOS_FIELD));
- ASSERT(numOfCols == pResInfo->numOfCols);
+ if(numOfCols != pResInfo->numOfCols){
+ tscError("numOfCols:%d != pResInfo->numOfCols:%d", numOfCols, pResInfo->numOfCols);
+ return;
+ }
for (int32_t i = 0; i < pResInfo->numOfCols; ++i) {
pResInfo->fields[i].bytes = pSchema[i].bytes;
@@ -1226,7 +1232,7 @@ STscObj* taosConnectImpl(const char* user, const char* auth, const char* db, __t
int64_t transporterId = 0;
asyncSendMsgToServer(pTscObj->pAppInfo->pTransporter, &pTscObj->pAppInfo->mgmtEp.epSet, &transporterId, body);
-
+
tsem_wait(&pRequest->body.rspSem);
if (pRequest->code != TSDB_CODE_SUCCESS) {
const char* errorMsg =
@@ -1339,7 +1345,10 @@ int32_t doProcessMsgFromServer(void* param) {
SEpSet* pEpSet = arg->pEpset;
SMsgSendInfo* pSendInfo = (SMsgSendInfo*)pMsg->info.ahandle;
- assert(pMsg->info.ahandle != NULL);
+ if(pMsg->info.ahandle == NULL){
+ tscError("doProcessMsgFromServer pMsg->info.ahandle == NULL");
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
+ }
STscObj* pTscObj = NULL;
STraceId* trace = &pMsg->info.traceId;
@@ -1352,8 +1361,10 @@ int32_t doProcessMsgFromServer(void* param) {
if (pSendInfo->requestObjRefId != 0) {
SRequestObj* pRequest = (SRequestObj*)taosAcquireRef(clientReqRefPool, pSendInfo->requestObjRefId);
if (pRequest) {
- assert(pRequest->self == pSendInfo->requestObjRefId);
-
+ if(pRequest->self != pSendInfo->requestObjRefId){
+ tscError("doProcessMsgFromServer pRequest->self:%"PRId64" != pSendInfo->requestObjRefId:%"PRId64, pRequest->self, pSendInfo->requestObjRefId);
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
+ }
pRequest->metric.rsp = taosGetTimestampUs();
pTscObj = pRequest->pTscObj;
/*
@@ -1495,7 +1506,9 @@ void doSetOneRowPtr(SReqResultInfo* pResultInfo) {
}
void* doFetchRows(SRequestObj* pRequest, bool setupOneRowPtr, bool convertUcs4) {
- assert(pRequest != NULL);
+ if(pRequest == NULL){
+ return NULL;
+ }
SReqResultInfo* pResultInfo = &pRequest->body.resInfo;
if (pResultInfo->pData == NULL || pResultInfo->current >= pResultInfo->numOfRows) {
@@ -1549,7 +1562,9 @@ static void syncFetchFn(void* param, TAOS_RES* res, int32_t numOfRows) {
}
void* doAsyncFetchRows(SRequestObj* pRequest, bool setupOneRowPtr, bool convertUcs4) {
- assert(pRequest != NULL);
+ if(pRequest == NULL){
+ return NULL;
+ }
SReqResultInfo* pResultInfo = &pRequest->body.resInfo;
if (pResultInfo->pData == NULL || pResultInfo->current >= pResultInfo->numOfRows) {
@@ -1613,8 +1628,10 @@ static int32_t doConvertUCS4(SReqResultInfo* pResultInfo, int32_t numOfRows, int
char* pStart = pCol->offset[j] + pCol->pData;
int32_t len = taosUcs4ToMbs((TdUcs4*)varDataVal(pStart), varDataLen(pStart), varDataVal(p));
- ASSERT(len <= bytes);
- ASSERT((p + len) < (pResultInfo->convertBuf[i] + colLength[i]));
+ if(len > bytes || (p + len) >= (pResultInfo->convertBuf[i] + colLength[i])){
+ tscError("doConvertUCS4 error, invalid data. len:%d, bytes:%d, (p + len):%p, (pResultInfo->convertBuf[i] + colLength[i]):%p", len, bytes, (p + len), (pResultInfo->convertBuf[i] + colLength[i]));
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
+ }
varDataSetLen(p, len);
pCol->offset[j] = (p - pResultInfo->convertBuf[i]);
@@ -1631,9 +1648,6 @@ static int32_t doConvertUCS4(SReqResultInfo* pResultInfo, int32_t numOfRows, int
}
int32_t getVersion1BlockMetaSize(const char* p, int32_t numOfCols) {
- int32_t cols = *(int32_t*)(p + sizeof(int32_t) * 3);
- ASSERT(numOfCols == cols);
-
return sizeof(int32_t) + sizeof(int32_t) + sizeof(int32_t) * 3 + sizeof(uint64_t) +
numOfCols * (sizeof(int8_t) + sizeof(int32_t));
}
@@ -1643,6 +1657,12 @@ static int32_t estimateJsonLen(SReqResultInfo* pResultInfo, int32_t numOfCols, i
// | version | total length | total rows | total columns | flag seg| block group id | column schema | each column
// length |
+ int32_t cols = *(int32_t*)(p + sizeof(int32_t) * 3);
+ if(ASSERT(numOfCols == cols)){
+ tscError("estimateJsonLen error: numOfCols:%d != cols:%d", numOfCols, cols);
+ return -1;
+ }
+
int32_t len = getVersion1BlockMetaSize(p, numOfCols);
int32_t* colLength = (int32_t*)(p + len);
len += sizeof(int32_t) * numOfCols;
@@ -1676,7 +1696,8 @@ static int32_t estimateJsonLen(SReqResultInfo* pResultInfo, int32_t numOfCols, i
} else if (jsonInnerType == TSDB_DATA_TYPE_BOOL) {
len += (VARSTR_HEADER_SIZE + 5);
} else {
- ASSERT(0);
+ tscError("estimateJsonLen error: invalid type:%d", jsonInnerType);
+ return -1;
}
}
} else if (IS_VAR_DATA_TYPE(pResultInfo->fields[i].type)) {
@@ -1710,12 +1731,21 @@ static int32_t doConvertJson(SReqResultInfo* pResultInfo, int32_t numOfCols, int
char* p = (char*)pResultInfo->pData;
int32_t dataLen = estimateJsonLen(pResultInfo, numOfCols, numOfRows);
+ if(dataLen <= 0){
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
+ }
pResultInfo->convertJson = taosMemoryCalloc(1, dataLen);
if (pResultInfo->convertJson == NULL) return TSDB_CODE_OUT_OF_MEMORY;
char* p1 = pResultInfo->convertJson;
int32_t totalLen = 0;
+ int32_t cols = *(int32_t*)(p + sizeof(int32_t) * 3);
+ if(ASSERT(numOfCols == cols)){
+ tscError("doConvertJson error: numOfCols:%d != cols:%d", numOfCols, cols);
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
+ }
+
int32_t len = getVersion1BlockMetaSize(p, numOfCols);
memcpy(p1, p, len);
@@ -1736,8 +1766,10 @@ static int32_t doConvertJson(SReqResultInfo* pResultInfo, int32_t numOfCols, int
for (int32_t i = 0; i < numOfCols; ++i) {
int32_t colLen = htonl(colLength[i]);
int32_t colLen1 = htonl(colLength1[i]);
- ASSERT(colLen < dataLen);
-
+ if(ASSERT(colLen < dataLen)){
+ tscError("doConvertJson error: colLen:%d >= dataLen:%d", colLen, dataLen);
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
+ }
if (pResultInfo->fields[i].type == TSDB_DATA_TYPE_JSON) {
int32_t* offset = (int32_t*)pStart;
int32_t* offset1 = (int32_t*)pStart1;
@@ -1782,7 +1814,8 @@ static int32_t doConvertJson(SReqResultInfo* pResultInfo, int32_t numOfCols, int
sprintf(varDataVal(dst), "%s", (*((char*)jsonInnerData) == 1) ? "true" : "false");
varDataSetLen(dst, strlen(varDataVal(dst)));
} else {
- ASSERT(0);
+ tscError("doConvertJson error: invalid type:%d", jsonInnerType);
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
}
offset1[j] = len;
@@ -1820,7 +1853,10 @@ static int32_t doConvertJson(SReqResultInfo* pResultInfo, int32_t numOfCols, int
int32_t setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32_t numOfCols, int32_t numOfRows,
bool convertUcs4) {
- assert(numOfCols > 0 && pFields != NULL && pResultInfo != NULL);
+ if(ASSERT(numOfCols > 0 && pFields != NULL && pResultInfo != NULL)){
+ tscError("setResultDataPtr paras error");
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
+ }
if (numOfRows == 0) {
return TSDB_CODE_SUCCESS;
}
@@ -1849,7 +1885,10 @@ int32_t setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32
int32_t cols = *(int32_t*)p;
p += sizeof(int32_t);
- ASSERT(rows == numOfRows && cols == numOfCols);
+ if(ASSERT(rows == numOfRows && cols == numOfCols)){
+ tscError("setResultDataPtr paras error:rows;%d numOfRows:%d cols:%d numOfCols:%d", rows, numOfRows, cols, numOfCols);
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
+ }
int32_t hasColumnSeg = *(int32_t*)p;
p += sizeof(int32_t);
@@ -1876,7 +1915,7 @@ int32_t setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32
colLength[i] = htonl(colLength[i]);
if (colLength[i] >= dataLen) {
tscError("invalid colLength %d, dataLen %d", colLength[i], dataLen);
- ASSERT(0);
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
}
if (IS_VAR_DATA_TYPE(pResultInfo->fields[i].type)) {
@@ -1914,7 +1953,11 @@ char* getDbOfConnection(STscObj* pObj) {
}
void setConnectionDB(STscObj* pTscObj, const char* db) {
- assert(db != NULL && pTscObj != NULL);
+ if(db == NULL || pTscObj == NULL){
+ tscError("setConnectionDB para is NULL");
+ return;
+ }
+
taosThreadMutexLock(&pTscObj->mutex);
tstrncpy(pTscObj->db, db, tListLen(pTscObj->db));
taosThreadMutexUnlock(&pTscObj->mutex);
@@ -1932,7 +1975,10 @@ void resetConnectDB(STscObj* pTscObj) {
int32_t setQueryResultFromRsp(SReqResultInfo* pResultInfo, const SRetrieveTableRsp* pRsp, bool convertUcs4,
bool freeAfterUse) {
- assert(pResultInfo != NULL && pRsp != NULL);
+ if(pResultInfo == NULL || pRsp == NULL){
+ tscError("setQueryResultFromRsp paras is null");
+ return TSDB_CODE_TSC_INTERNAL_ERROR;
+ }
if (freeAfterUse) taosMemoryFreeClear(pResultInfo->pRspMsg);
diff --git a/source/client/src/clientJniConnector.c b/source/client/src/clientJniConnector.c
index 859d4ec80f..750ba684f4 100644
--- a/source/client/src/clientJniConnector.c
+++ b/source/client/src/clientJniConnector.c
@@ -574,7 +574,11 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchBlockImp(JNI
TAOS_RES *tres = (TAOS_RES *)res;
int32_t numOfFields = taos_num_fields(tres);
- assert(numOfFields > 0);
+ if(numOfFields <= 0){
+ jniError("jobj:%p, conn:%p, query interrupted. taos_num_fields error code:%d, msg:%s", jobj, tscon, numOfFields,
+ taos_errstr(tres));
+ return JNI_RESULT_SET_NULL;
+ }
void *data;
int32_t numOfRows;
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 36126d6468..e1df2a4540 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -55,6 +55,8 @@ void taos_cleanup(void) {
return;
}
+ tscStopCrashReport();
+
int32_t id = clientReqRefPool;
clientReqRefPool = -1;
taosCloseRef(id);
@@ -106,7 +108,7 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
if (pass == NULL) {
pass = TSDB_DEFAULT_PASS;
}
-
+
STscObj *pObj = taos_connect_internal(ip, user, pass, NULL, db, port, CONN_TYPE__QUERY);
if (pObj) {
int64_t *rid = taosMemoryCalloc(1, sizeof(int64_t));
@@ -291,7 +293,6 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) {
tscError("invalid result passed to taos_fetch_row");
return NULL;
}
- return NULL;
}
int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields) {
@@ -355,9 +356,13 @@ int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields)
case TSDB_DATA_TYPE_NCHAR: {
int32_t charLen = varDataLen((char *)row[i] - VARSTR_HEADER_SIZE);
if (fields[i].type == TSDB_DATA_TYPE_BINARY) {
- assert(charLen <= fields[i].bytes && charLen >= 0);
+ if(ASSERT(charLen <= fields[i].bytes && charLen >= 0)){
+ tscError("taos_print_row error binary. charLen:%d, fields[i].bytes:%d", charLen, fields[i].bytes);
+ }
} else {
- assert(charLen <= fields[i].bytes * TSDB_NCHAR_SIZE && charLen >= 0);
+ if(ASSERT(charLen <= fields[i].bytes * TSDB_NCHAR_SIZE && charLen >= 0)){
+ tscError("taos_print_row error. charLen:%d, fields[i].bytes:%d", charLen, fields[i].bytes);
+ }
}
memcpy(str + len, row[i], charLen);
@@ -577,7 +582,7 @@ int taos_fetch_block_s(TAOS_RES *res, int *numOfRows, TAOS_ROW *rows) {
(*numOfRows) = pResultInfo->numOfRows;
return 0;
} else {
- ASSERT(0);
+ tscError("taos_fetch_block_s invalid res type");
return -1;
}
}
@@ -802,7 +807,7 @@ static void doAsyncQueryFromParse(SMetaData *pResultMeta, void *param, int32_t c
tstrerror(code));
if (code == TSDB_CODE_SUCCESS) {
- //pWrapper->pCatalogReq->forceUpdate = false;
+ // pWrapper->pCatalogReq->forceUpdate = false;
code = qContinueParseSql(pWrapper->pParseCtx, pWrapper->pCatalogReq, pResultMeta, pQuery);
}
@@ -831,8 +836,8 @@ void continueInsertFromCsv(SSqlCallbackWrapper *pWrapper, SRequestObj *pRequest)
tstrerror(code), pWrapper->pRequest->requestId);
destorySqlCallbackWrapper(pWrapper);
terrno = code;
- pWrapper->pRequest->code = code;
- pWrapper->pRequest->body.queryFp(pWrapper->pRequest->body.param, pWrapper->pRequest, code);
+ pRequest->code = code;
+ pRequest->body.queryFp(pRequest->body.param, pRequest, code);
}
}
@@ -1000,8 +1005,14 @@ static void fetchCallback(void *pResult, void *param, int32_t code) {
}
void taos_fetch_rows_a(TAOS_RES *res, __taos_async_fn_t fp, void *param) {
- ASSERT(res != NULL && fp != NULL);
- ASSERT(TD_RES_QUERY(res));
+ if(ASSERT(res != NULL && fp != NULL)){
+ tscError("taos_fetch_rows_a invalid paras");
+ return;
+ }
+ if(ASSERT(TD_RES_QUERY(res))){
+ tscError("taos_fetch_rows_a res is NULL");
+ return;
+ }
SRequestObj *pRequest = res;
pRequest->body.fetchFp = fp;
@@ -1044,9 +1055,14 @@ void taos_fetch_rows_a(TAOS_RES *res, __taos_async_fn_t fp, void *param) {
}
void taos_fetch_raw_block_a(TAOS_RES *res, __taos_async_fn_t fp, void *param) {
- ASSERT(res != NULL && fp != NULL);
- ASSERT(TD_RES_QUERY(res));
-
+ if(ASSERT(res != NULL && fp != NULL)){
+ tscError("taos_fetch_rows_a invalid paras");
+ return;
+ }
+ if(ASSERT(TD_RES_QUERY(res))){
+ tscError("taos_fetch_rows_a res is NULL");
+ return;
+ }
SRequestObj *pRequest = res;
SReqResultInfo *pResultInfo = &pRequest->body.resInfo;
@@ -1058,8 +1074,14 @@ void taos_fetch_raw_block_a(TAOS_RES *res, __taos_async_fn_t fp, void *param) {
}
const void *taos_get_raw_block(TAOS_RES *res) {
- ASSERT(res != NULL);
- ASSERT(TD_RES_QUERY(res));
+ if(ASSERT(res != NULL)){
+ tscError("taos_fetch_rows_a invalid paras");
+ return NULL;
+ }
+ if(ASSERT(TD_RES_QUERY(res))){
+ tscError("taos_fetch_rows_a res is NULL");
+ return NULL;
+ }
SRequestObj *pRequest = res;
return pRequest->body.resInfo.pData;
@@ -1167,6 +1189,54 @@ _return:
return code;
}
+int taos_get_tables_vgId(TAOS *taos, const char *db, const char *table[], int tableNum, int *vgId) {
+ if (NULL == taos) {
+ terrno = TSDB_CODE_TSC_DISCONNECTED;
+ return terrno;
+ }
+
+ if (NULL == db || NULL == table || NULL == vgId || tableNum <= 0) {
+ tscError("invalid input param, db:%p, table:%p, vgId:%p, tbNum:%d", db, table, vgId, tableNum);
+ terrno = TSDB_CODE_TSC_INVALID_INPUT;
+ return terrno;
+ }
+
+ int64_t connId = *(int64_t *)taos;
+ SRequestObj *pRequest = NULL;
+ char *sql = "taos_get_table_vgId";
+ int32_t code = buildRequest(connId, sql, strlen(sql), NULL, false, &pRequest, 0);
+ if (code != TSDB_CODE_SUCCESS) {
+ return terrno;
+ }
+
+ pRequest->syncQuery = true;
+
+ STscObj *pTscObj = pRequest->pTscObj;
+ SCatalog *pCtg = NULL;
+ code = catalogGetHandle(pTscObj->pAppInfo->clusterId, &pCtg);
+ if (code != TSDB_CODE_SUCCESS) {
+ goto _return;
+ }
+
+ SRequestConnInfo conn = {
+ .pTrans = pTscObj->pAppInfo->pTransporter, .requestId = pRequest->requestId, .requestObjRefId = pRequest->self};
+
+ conn.mgmtEps = getEpSet_s(&pTscObj->pAppInfo->mgmtEp);
+
+ code = catalogGetTablesHashVgId(pCtg, &conn, pTscObj->acctId, db, table, tableNum, vgId);
+ if (code) {
+ goto _return;
+ }
+
+_return:
+
+ terrno = code;
+
+ destroyRequest(pRequest);
+ return code;
+}
+
+
int taos_load_table_info(TAOS *taos, const char *tableNameList) {
if (NULL == taos) {
terrno = TSDB_CODE_TSC_DISCONNECTED;
@@ -1331,8 +1401,7 @@ int taos_stmt_get_col_fields(TAOS_STMT *stmt, int *fieldNum, TAOS_FIELD_E **fiel
}
// let stmt to reclaim TAOS_FIELD_E that was allocated by `taos_stmt_get_tag_fields`/`taos_stmt_get_col_fields`
-void taos_stmt_reclaim_fields(TAOS_STMT *stmt, TAOS_FIELD_E *fields)
-{
+void taos_stmt_reclaim_fields(TAOS_STMT *stmt, TAOS_FIELD_E *fields) {
(void)stmt;
if (!fields) return;
taosMemoryFree(fields);
diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c
index 85027ff371..2191c54315 100644
--- a/source/client/src/clientMsgHandler.c
+++ b/source/client/src/clientMsgHandler.c
@@ -119,6 +119,7 @@ int32_t processConnectRsp(void* param, SDataBuf* pMsg, int32_t code) {
// update the appInstInfo
pTscObj->pAppInfo->clusterId = connectRsp.clusterId;
+ lastClusterId = connectRsp.clusterId;
pTscObj->connType = connectRsp.connType;
@@ -149,7 +150,6 @@ SMsgSendInfo* buildMsgInfoImpl(SRequestObj* pRequest) {
pMsgSendInfo->msgType = pRequest->type;
pMsgSendInfo->target.type = TARGET_TYPE_MNODE;
- assert(pRequest != NULL);
pMsgSendInfo->msgInfo = pRequest->body.requestMsg;
pMsgSendInfo->fp = getMsgRspHandle(pRequest->type);
return pMsgSendInfo;
@@ -273,7 +273,9 @@ int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
}
int32_t processCreateSTableRsp(void* param, SDataBuf* pMsg, int32_t code) {
- assert(pMsg != NULL && param != NULL);
+ if(pMsg == NULL || param == NULL){
+ return TSDB_CODE_TSC_INVALID_INPUT;
+ }
SRequestObj* pRequest = param;
if (code != TSDB_CODE_SUCCESS) {
@@ -454,7 +456,10 @@ static int32_t buildShowVariablesRsp(SArray* pVars, SRetrieveTableRsp** pRsp) {
(*pRsp)->numOfCols = htonl(SHOW_VARIABLES_RESULT_COLS);
int32_t len = blockEncode(pBlock, (*pRsp)->data, SHOW_VARIABLES_RESULT_COLS);
- ASSERT(len == rspSize - sizeof(SRetrieveTableRsp));
+ if(len != rspSize - sizeof(SRetrieveTableRsp)){
+ uError("buildShowVariablesRsp error, len:%d != rspSize - sizeof(SRetrieveTableRsp):%" PRIu64, len, (uint64_t) (rspSize - sizeof(SRetrieveTableRsp)));
+ return TSDB_CODE_TSC_INVALID_INPUT;
+ }
blockDataDestroy(pBlock);
return TSDB_CODE_SUCCESS;
diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c
index 0918b99cda..3fd6fed4fc 100644
--- a/source/client/src/clientRawBlockWrite.c
+++ b/source/client/src/clientRawBlockWrite.c
@@ -373,7 +373,10 @@ static char* processCreateTable(SMqMetaRsp* metaRsp) {
}
static char* processAutoCreateTable(STaosxRsp* rsp) {
- ASSERT(rsp->createTableNum != 0);
+ if(rsp->createTableNum <= 0){
+ uError("WriteRaw:processAutoCreateTable rsp->createTableNum <= 0");
+ goto _exit;
+ }
SDecoder* decoder = taosMemoryCalloc(rsp->createTableNum, sizeof(SDecoder));
SVCreateTbReq* pCreateReq = taosMemoryCalloc(rsp->createTableNum, sizeof(SVCreateTbReq));
@@ -389,7 +392,10 @@ static char* processAutoCreateTable(STaosxRsp* rsp) {
goto _exit;
}
- ASSERT(pCreateReq[iReq].type == TSDB_CHILD_TABLE);
+ if(pCreateReq[iReq].type != TSDB_CHILD_TABLE){
+ uError("WriteRaw:processAutoCreateTable pCreateReq[iReq].type != TSDB_CHILD_TABLE");
+ goto _exit;
+ }
}
string = buildCreateCTableJson(pCreateReq, rsp->createTableNum);
@@ -494,7 +500,10 @@ static char* processAlterTable(SMqMetaRsp* metaRsp) {
char* buf = NULL;
if (vAlterTbReq.tagType == TSDB_DATA_TYPE_JSON) {
- ASSERT(tTagIsJson(vAlterTbReq.pTagVal) == true);
+ if(!tTagIsJson(vAlterTbReq.pTagVal)){
+ uError("processAlterTable isJson false");
+ goto _exit;
+ }
buf = parseTagDatatoJson(vAlterTbReq.pTagVal);
} else {
buf = taosMemoryCalloc(vAlterTbReq.nTagVal + 1, 1);
@@ -1610,7 +1619,11 @@ static int32_t tmqWriteRawMetaDataImpl(TAOS* taos, void* data, int32_t dataLen)
goto end;
}
- ASSERT(pCreateReq.type == TSDB_CHILD_TABLE);
+ if(pCreateReq.type != TSDB_CHILD_TABLE){
+ uError("WriteRaw:pCreateReq.type != TSDB_CHILD_TABLE. table name: %s", tbName);
+ code = TSDB_CODE_TSC_INVALID_VALUE;
+ goto end;
+ }
if (strcmp(tbName, pCreateReq.name) == 0) {
strcpy(pName.tname, pCreateReq.ctb.stbName);
tDecoderClear(&decoderTmp);
diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c
index ca6395b52b..8c4a97443c 100644
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
@@ -186,13 +186,10 @@ int32_t smlSetCTableName(SSmlTableInfo *oneTable) {
if (strlen(oneTable->childTableName) == 0) {
SArray *dst = taosArrayDup(oneTable->tags, NULL);
- RandTableName rName = {dst, oneTable->sTableName, (uint8_t)oneTable->sTableNameLen, oneTable->childTableName, 0};
+ RandTableName rName = {dst, oneTable->sTableName, (uint8_t)oneTable->sTableNameLen, oneTable->childTableName};
buildChildTableName(&rName);
taosArrayDestroy(dst);
- oneTable->uid = rName.uid;
- } else {
- oneTable->uid = *(uint64_t *)(oneTable->childTableName);
}
return TSDB_CODE_SUCCESS;
}
@@ -523,7 +520,10 @@ STableMeta *smlGetMeta(SSmlHandle *info, const void *measure, int32_t measureLen
memset(pName.tname, 0, TSDB_TABLE_NAME_LEN);
memcpy(pName.tname, measure, measureLen);
- catalogGetSTableMeta(info->pCatalog, &conn, &pName, &pTableMeta);
+ int32_t code = catalogGetSTableMeta(info->pCatalog, &conn, &pName, &pTableMeta);
+ if(code != TSDB_CODE_SUCCESS){
+ return NULL;
+ }
return pTableMeta;
}
@@ -996,7 +996,10 @@ static int32_t smlUpdateMeta(SHashObj *metaHash, SArray *metaArray, SArray *cols
}
} else {
size_t tmp = taosArrayGetSize(metaArray);
- ASSERT(tmp <= INT16_MAX);
+ if(tmp > INT16_MAX){
+ uError("too many cols or tags");
+ return -1;
+ }
int16_t size = tmp;
int ret = taosHashPut(metaHash, kv->key, kv->keyLen, &size, SHORT_BYTES);
if (ret == 0) {
@@ -1008,7 +1011,7 @@ static int32_t smlUpdateMeta(SHashObj *metaHash, SArray *metaArray, SArray *cols
return TSDB_CODE_SUCCESS;
}
-static void smlDestroyTableInfo(SSmlHandle *info, SSmlTableInfo *tag) {
+void smlDestroyTableInfo(SSmlHandle *info, SSmlTableInfo *tag) {
for (size_t i = 0; i < taosArrayGetSize(tag->cols); i++) {
SHashObj *kvHash = (SHashObj *)taosArrayGetP(tag->cols, i);
taosHashCleanup(kvHash);
@@ -1024,6 +1027,16 @@ static void smlDestroyTableInfo(SSmlHandle *info, SSmlTableInfo *tag) {
taosMemoryFree(tag);
}
+void clearColValArray(SArray* pCols) {
+ int32_t num = taosArrayGetSize(pCols);
+ for (int32_t i = 0; i < num; ++i) {
+ SColVal* pCol = taosArrayGet(pCols, i);
+ if (TSDB_DATA_TYPE_NCHAR == pCol->type) {
+ taosMemoryFreeClear(pCol->value.pData);
+ }
+ }
+}
+
void smlDestroyInfo(SSmlHandle *info) {
if (!info) return;
qDestroyQuery(info->pQuery);
@@ -1053,6 +1066,12 @@ void smlDestroyInfo(SSmlHandle *info) {
// destroy info->pVgHash
taosHashCleanup(info->pVgHash);
+ for(int i = 0; i< taosArrayGetSize(info->tagJsonArray); i++){
+ cJSON *tags = (cJSON *)taosArrayGetP(info->tagJsonArray, i);
+ cJSON_Delete(tags);
+ }
+ taosArrayDestroy(info->tagJsonArray);
+
taosArrayDestroy(info->preLineTagKV);
taosArrayDestroy(info->maxTagKVs);
taosArrayDestroy(info->preLineColKV);
@@ -1067,6 +1086,7 @@ void smlDestroyInfo(SSmlHandle *info) {
taosMemoryFree(info->lines);
}
+ cJSON_Delete(info->root);
taosMemoryFreeClear(info);
}
@@ -1090,6 +1110,7 @@ SSmlHandle *smlBuildSmlInfo(TAOS *taos) {
info->pQuery = smlInitHandle();
info->dataFormat = true;
+ info->tagJsonArray = taosArrayInit(8, POINTER_BYTES);
info->preLineTagKV = taosArrayInit(8, sizeof(SSmlKv));
info->maxTagKVs = taosArrayInit(8, sizeof(SSmlKv));
info->preLineColKV = taosArrayInit(8, sizeof(SSmlKv));
@@ -1211,7 +1232,10 @@ static int32_t smlInsertData(SSmlHandle *info) {
SSmlSTableMeta *pMeta =
(SSmlSTableMeta *)nodeListGet(info->superTables, tableData->sTableName, tableData->sTableNameLen, NULL);
- ASSERT(NULL != pMeta);
+ if(unlikely(NULL == pMeta || NULL == pMeta->tableMeta)){
+ uError("SML:0x%" PRIx64 " NULL == pMeta. table name: %s", info->id, tableData->childTableName);
+ return TSDB_CODE_SML_INTERNAL_ERROR;
+ }
// use tablemeta of stable to save vgid and uid of child table
pMeta->tableMeta->vgId = vg.vgId;
@@ -1347,9 +1371,8 @@ static int32_t smlParseLine(SSmlHandle *info, char *lines[], char *rawLine, char
} else {
code = smlParseTelnetString(info, (char *)tmp, (char *)tmp + len, info->lines + i);
}
-
} else {
- ASSERT(0);
+ code = TSDB_CODE_SML_INVALID_PROTOCOL_TYPE;
}
if (code != TSDB_CODE_SUCCESS) {
uError("SML:0x%" PRIx64 " smlParseLine failed. line %d : %s", info->id, i, tmp);
diff --git a/source/client/src/clientSmlJson.c b/source/client/src/clientSmlJson.c
index 60e29638f5..e6b71c4aaa 100644
--- a/source/client/src/clientSmlJson.c
+++ b/source/client/src/clientSmlJson.c
@@ -143,7 +143,10 @@ while(*(start)){\
// if(unlikely(kv.length > preKV->length)){
// preKV->length = kv.length;
// SSmlSTableMeta *tableMeta = (SSmlSTableMeta *)nodeListGet(info->superTables, elements->measure, elements->measureLen, NULL);
-// ASSERT(tableMeta != NULL);
+// if(unlikely(NULL == tableMeta)){
+// uError("SML:0x%" PRIx64 " NULL == tableMeta", info->id);
+// return TSDB_CODE_SML_INTERNAL_ERROR;
+// }
//
// SSmlKv *oldKV = (SSmlKv *)taosArrayGet(tableMeta->tags, cnt);
// oldKV->length = kv.length;
@@ -335,6 +338,9 @@ int smlJsonParseObjFirst(char **start, SSmlLineInfo *element, int8_t *offset){
(*start)++;
}
}
+ if(*(*start) == '\0'){
+ break;
+ }
if(*(*start) == '}'){
(*start)++;
break;
@@ -655,14 +661,14 @@ static int32_t smlParseTagsFromJSON(SSmlHandle *info, cJSON *tags, SSmlLineInfo
SSmlSTableMeta *sMeta = (SSmlSTableMeta *)nodeListGet(info->superTables, elements->measure, elements->measureLen, NULL);
if(unlikely(sMeta == NULL)){
- sMeta = smlBuildSTableMeta(info->dataFormat);
STableMeta * pTableMeta = smlGetMeta(info, elements->measure, elements->measureLen);
- sMeta->tableMeta = pTableMeta;
if(pTableMeta == NULL){
info->dataFormat = false;
info->reRun = true;
return TSDB_CODE_SUCCESS;
}
+ sMeta = smlBuildSTableMeta(info->dataFormat);
+ sMeta->tableMeta = pTableMeta;
nodeListSet(&info->superTables, elements->measure, elements->measureLen, sMeta, NULL);
}
info->currSTableMeta = sMeta->tableMeta;
@@ -720,7 +726,10 @@ static int32_t smlParseTagsFromJSON(SSmlHandle *info, cJSON *tags, SSmlLineInfo
if(unlikely(kv.length > maxKV->length)){
maxKV->length = kv.length;
SSmlSTableMeta *tableMeta = (SSmlSTableMeta *)nodeListGet(info->superTables, elements->measure, elements->measureLen, NULL);
- ASSERT(tableMeta != NULL);
+ if(unlikely(NULL == tableMeta)){
+ uError("SML:0x%" PRIx64 " NULL == tableMeta", info->id);
+ return TSDB_CODE_SML_INTERNAL_ERROR;
+ }
SSmlKv *oldKV = (SSmlKv *)taosArrayGet(tableMeta->tags, cnt);
oldKV->length = kv.length;
@@ -772,11 +781,13 @@ static int32_t smlParseTagsFromJSON(SSmlHandle *info, cJSON *tags, SSmlLineInfo
tinfo->tags = taosArrayDup(preLineKV, NULL);
smlSetCTableName(tinfo);
+ tinfo->uid = info->uid++;
if (info->dataFormat) {
info->currSTableMeta->uid = tinfo->uid;
tinfo->tableDataCtx = smlInitTableDataCtx(info->pQuery, info->currSTableMeta);
if (tinfo->tableDataCtx == NULL) {
smlBuildInvalidDataMsg(&info->msgBuf, "smlInitTableDataCtx error", NULL);
+ smlDestroyTableInfo(info, tinfo);
return TSDB_CODE_SML_INVALID_DATA;
}
}
@@ -923,9 +934,6 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
cJSON *tsJson = NULL;
cJSON *valueJson = NULL;
cJSON *tagsJson = NULL;
- char* rootStr = cJSON_PrintUnformatted(root);
- uError("rootStr:%s", rootStr);
- taosMemoryFree(rootStr);
int32_t size = cJSON_GetArraySize(root);
// outmost json fields has to be exactly 4
@@ -956,6 +964,7 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
}
// Parse tags
+ bool needFree = info->dataFormat;
elements->tags = cJSON_PrintUnformatted(tagsJson);
elements->tagsLen = strlen(elements->tags);
if(is_same_child_table_telnet(elements, &info->preLine) != 0) {
@@ -968,7 +977,7 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
}
}
- if(info->dataFormat){
+ if(needFree){
taosMemoryFree(elements->tags);
elements->tags = NULL;
}
@@ -994,6 +1003,7 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
if(ret == TSDB_CODE_SUCCESS){
ret = smlBuildRow(info->currTableDataCtx);
}
+ clearColValArray(info->currTableDataCtx->pValues);
if (unlikely(ret != TSDB_CODE_SUCCESS)) {
smlBuildInvalidDataMsg(&info->msgBuf, "smlBuildCol error", NULL);
return ret;
@@ -1095,6 +1105,11 @@ static int32_t smlParseJSONString(SSmlHandle *info, char **start, SSmlLineInfo *
if(unlikely(**start == '\0' && elements->measure == NULL)) return TSDB_CODE_SUCCESS;
+ if (unlikely(IS_INVALID_TABLE_LEN(elements->measureLen))) {
+ smlBuildInvalidDataMsg(&info->msgBuf, "measure is empty or too large than 192", NULL);
+ return TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
+ }
+
SSmlKv kv = {.key = VALUE, .keyLen = VALUE_LEN, .value = elements->cols, .length = (size_t)elements->colsLen};
if (elements->colsLen == 0 || smlParseValue(&kv, &info->msgBuf) != TSDB_CODE_SUCCESS) {
uError("SML:cols invalidate:%s", elements->cols);
@@ -1112,8 +1127,8 @@ static int32_t smlParseJSONString(SSmlHandle *info, char **start, SSmlLineInfo *
return TSDB_CODE_TSC_INVALID_JSON;
}
+ taosArrayPush(info->tagJsonArray, &tagsJson);
ret = smlParseTagsFromJSON(info, tagsJson, elements);
- cJSON_free(tagsJson);
if (unlikely(ret)) {
uError("OTD:0x%" PRIx64 " Unable to parse tags from JSON payload", info->id);
return ret;
@@ -1141,6 +1156,7 @@ static int32_t smlParseJSONString(SSmlHandle *info, char **start, SSmlLineInfo *
if(ret == TSDB_CODE_SUCCESS){
ret = smlBuildRow(info->currTableDataCtx);
}
+ clearColValArray(info->currTableDataCtx->pValues);
if (unlikely(ret != TSDB_CODE_SUCCESS)) {
smlBuildInvalidDataMsg(&info->msgBuf, "smlBuildCol error", NULL);
return ret;
diff --git a/source/client/src/clientSmlLine.c b/source/client/src/clientSmlLine.c
index d93fdf198f..890245f53d 100644
--- a/source/client/src/clientSmlLine.c
+++ b/source/client/src/clientSmlLine.c
@@ -151,14 +151,14 @@ static int32_t smlParseTagKv(SSmlHandle *info, char **sql, char *sqlEnd,
SSmlSTableMeta *sMeta = (SSmlSTableMeta *)nodeListGet(info->superTables, currElement->measure, currElement->measureLen, NULL);
if(unlikely(sMeta == NULL)){
- sMeta = smlBuildSTableMeta(info->dataFormat);
STableMeta * pTableMeta = smlGetMeta(info, currElement->measure, currElement->measureLen);
- sMeta->tableMeta = pTableMeta;
if(pTableMeta == NULL){
info->dataFormat = false;
info->reRun = true;
return TSDB_CODE_SUCCESS;
}
+ sMeta = smlBuildSTableMeta(info->dataFormat);
+ sMeta->tableMeta = pTableMeta;
nodeListSet(&info->superTables, currElement->measure, currElement->measureLen, sMeta, NULL);
}
info->currSTableMeta = sMeta->tableMeta;
@@ -259,7 +259,10 @@ static int32_t smlParseTagKv(SSmlHandle *info, char **sql, char *sqlEnd,
if(unlikely(kv.length > maxKV->length)){
maxKV->length = kv.length;
SSmlSTableMeta *tableMeta = (SSmlSTableMeta *)nodeListGet(info->superTables, currElement->measure, currElement->measureLen, NULL);
- ASSERT(tableMeta != NULL);
+ if(unlikely(NULL == tableMeta)){
+ uError("SML:0x%" PRIx64 " NULL == tableMeta", info->id);
+ return TSDB_CODE_SML_INTERNAL_ERROR;
+ }
SSmlKv *oldKV = (SSmlKv *)taosArrayGet(tableMeta->tags, cnt);
oldKV->length = kv.length;
@@ -319,6 +322,7 @@ static int32_t smlParseTagKv(SSmlHandle *info, char **sql, char *sqlEnd,
tinfo->tags = taosArrayDup(preLineKV, NULL);
smlSetCTableName(tinfo);
+ tinfo->uid = info->uid++;
if(info->dataFormat) {
info->currSTableMeta->uid = tinfo->uid;
tinfo->tableDataCtx = smlInitTableDataCtx(info->pQuery, info->currSTableMeta);
@@ -353,14 +357,14 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd,
SSmlSTableMeta *sMeta = (SSmlSTableMeta *)nodeListGet(info->superTables, currElement->measure, currElement->measureLen, NULL);
if(unlikely(sMeta == NULL)){
- sMeta = smlBuildSTableMeta(info->dataFormat);
STableMeta * pTableMeta = smlGetMeta(info, currElement->measure, currElement->measureLen);
- sMeta->tableMeta = pTableMeta;
if(pTableMeta == NULL){
info->dataFormat = false;
info->reRun = true;
return TSDB_CODE_SUCCESS;
}
+ sMeta = smlBuildSTableMeta(info->dataFormat);
+ sMeta->tableMeta = pTableMeta;
nodeListSet(&info->superTables, currElement->measure, currElement->measureLen, sMeta, NULL);
}
info->currSTableMeta = sMeta->tableMeta;
@@ -484,7 +488,10 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd,
if(unlikely(IS_VAR_DATA_TYPE(kv.type) && kv.length > maxKV->length)){
maxKV->length = kv.length;
SSmlSTableMeta *tableMeta = (SSmlSTableMeta *)nodeListGet(info->superTables, currElement->measure, currElement->measureLen, NULL);
- ASSERT(tableMeta != NULL);
+ if(unlikely(NULL == tableMeta)){
+ uError("SML:0x%" PRIx64 " NULL == tableMeta", info->id);
+ return TSDB_CODE_SML_INTERNAL_ERROR;
+ }
SSmlKv *oldKV = (SSmlKv *)taosArrayGet(tableMeta->cols, cnt);
oldKV->length = kv.length;
@@ -646,6 +653,7 @@ int32_t smlParseInfluxString(SSmlHandle *info, char *sql, char *sqlEnd, SSmlLine
if(info->dataFormat){
smlBuildCol(info->currTableDataCtx, info->currSTableMeta->schema, &kv, 0);
smlBuildRow(info->currTableDataCtx);
+ clearColValArray(info->currTableDataCtx->pValues);
}else{
taosArraySet(elements->colArray, 0, &kv);
}
diff --git a/source/client/src/clientSmlTelnet.c b/source/client/src/clientSmlTelnet.c
index 71d4e21400..d43ab6c9f9 100644
--- a/source/client/src/clientSmlTelnet.c
+++ b/source/client/src/clientSmlTelnet.c
@@ -86,14 +86,14 @@ static int32_t smlParseTelnetTags(SSmlHandle *info, char *data, char *sqlEnd, SS
SSmlSTableMeta *sMeta = (SSmlSTableMeta *)nodeListGet(info->superTables, elements->measure, elements->measureLen, NULL);
if(unlikely(sMeta == NULL)){
- sMeta = smlBuildSTableMeta(info->dataFormat);
STableMeta * pTableMeta = smlGetMeta(info, elements->measure, elements->measureLen);
- sMeta->tableMeta = pTableMeta;
if(pTableMeta == NULL){
info->dataFormat = false;
info->reRun = true;
return TSDB_CODE_SUCCESS;
}
+ sMeta = smlBuildSTableMeta(info->dataFormat);
+ sMeta->tableMeta = pTableMeta;
nodeListSet(&info->superTables, elements->measure, elements->measureLen, sMeta, NULL);
}
info->currSTableMeta = sMeta->tableMeta;
@@ -184,7 +184,10 @@ static int32_t smlParseTelnetTags(SSmlHandle *info, char *data, char *sqlEnd, SS
if(unlikely(kv.length > maxKV->length)){
maxKV->length = kv.length;
SSmlSTableMeta *tableMeta = (SSmlSTableMeta *)nodeListGet(info->superTables, elements->measure, elements->measureLen, NULL);
- ASSERT(tableMeta != NULL);
+ if(unlikely(NULL == tableMeta)){
+ uError("SML:0x%" PRIx64 " NULL == tableMeta", info->id);
+ return TSDB_CODE_SML_INTERNAL_ERROR;
+ }
SSmlKv *oldKV = (SSmlKv *)taosArrayGet(tableMeta->tags, cnt);
oldKV->length = kv.length;
@@ -235,11 +238,13 @@ static int32_t smlParseTelnetTags(SSmlHandle *info, char *data, char *sqlEnd, SS
tinfo->tags = taosArrayDup(preLineKV, NULL);
smlSetCTableName(tinfo);
+ tinfo->uid = info->uid++;
if (info->dataFormat) {
info->currSTableMeta->uid = tinfo->uid;
tinfo->tableDataCtx = smlInitTableDataCtx(info->pQuery, info->currSTableMeta);
if (tinfo->tableDataCtx == NULL) {
smlBuildInvalidDataMsg(&info->msgBuf, "smlInitTableDataCtx error", NULL);
+ smlDestroyTableInfo(info, tinfo);
return TSDB_CODE_SML_INVALID_DATA;
}
}
@@ -324,6 +329,7 @@ int32_t smlParseTelnetString(SSmlHandle *info, char *sql, char *sqlEnd, SSmlLine
if(ret == TSDB_CODE_SUCCESS){
ret = smlBuildRow(info->currTableDataCtx);
}
+ clearColValArray(info->currTableDataCtx->pValues);
if (unlikely(ret != TSDB_CODE_SUCCESS)) {
smlBuildInvalidDataMsg(&info->msgBuf, "smlBuildCol error", NULL);
return ret;
diff --git a/source/client/src/clientStmt.c b/source/client/src/clientStmt.c
index 7bc99c65e8..f5b65371a7 100644
--- a/source/client/src/clientStmt.c
+++ b/source/client/src/clientStmt.c
@@ -296,7 +296,6 @@ int32_t stmtCleanExecInfo(STscStmt* pStmt, bool keepTable, bool deepClean) {
STableMeta* pMeta = qGetTableMetaInDataBlock(pBlocks);
if (keepTable && pBlocks == pStmt->exec.pCurrBlock) {
- ASSERT(NULL == pBlocks->pData);
TSWAP(pBlocks->pData, pStmt->exec.pCurrTbData);
STMT_ERR_RET(qResetStmtDataBlock(pBlocks, false));
@@ -394,7 +393,10 @@ int32_t stmtGetFromCache(STscStmt* pStmt) {
if (NULL == pStmt->sql.pTableCache || taosHashGetSize(pStmt->sql.pTableCache) <= 0) {
if (pStmt->bInfo.inExecCache) {
- ASSERT(taosHashGetSize(pStmt->exec.pBlockHash) == 1);
+ if(ASSERT(taosHashGetSize(pStmt->exec.pBlockHash) == 1)){
+ tscError("stmtGetFromCache error");
+ return TSDB_CODE_TSC_STMT_CACHE_ERROR;
+ }
pStmt->bInfo.needParse = false;
tscDebug("reuse stmt block for tb %s in execBlock", pStmt->bInfo.tbFName);
return TSDB_CODE_SUCCESS;
diff --git a/source/client/src/clientTmq.c b/source/client/src/clientTmq.c
index a3754d0695..01c99c6e9e 100644
--- a/source/client/src/clientTmq.c
+++ b/source/client/src/clientTmq.c
@@ -418,7 +418,10 @@ int32_t tmqCommitDone(SMqCommitCbParamSet* pParamSet) {
static void tmqCommitRspCountDown(SMqCommitCbParamSet* pParamSet) {
int32_t waitingRspNum = atomic_sub_fetch_32(&pParamSet->waitingRspNum, 1);
- ASSERT(waitingRspNum >= 0);
+ if(ASSERT(waitingRspNum >= 0)){
+ tscError("tmqCommitRspCountDown error:%d", waitingRspNum);
+ return;
+ }
if (waitingRspNum == 0) {
tmqCommitDone(pParamSet);
}
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 3dfa32ccc5..f09cf9e630 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -22,7 +22,6 @@
#define MALLOC_ALIGN_BYTES 32
int32_t colDataGetLength(const SColumnInfoData* pColumnInfoData, int32_t numOfRows) {
- ASSERT(pColumnInfoData != NULL);
if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
return pColumnInfoData->varmeta.length;
} else {
@@ -66,8 +65,6 @@ int32_t getJsonValueLen(const char* data) {
}
int32_t colDataAppend(SColumnInfoData* pColumnInfoData, uint32_t currentRow, const char* pData, bool isNull) {
- ASSERT(pColumnInfoData != NULL);
-
if (isNull) {
// There is a placehold for each NULL value of binary or nchar type.
if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
@@ -112,7 +109,7 @@ int32_t colDataAppend(SColumnInfoData* pColumnInfoData, uint32_t currentRow, con
uint32_t len = pColumnInfoData->varmeta.length;
pColumnInfoData->varmeta.offset[currentRow] = len;
- memcpy(pColumnInfoData->pData + len, pData, dataLen);
+ memmove(pColumnInfoData->pData + len, pData, dataLen);
pColumnInfoData->varmeta.length += dataLen;
} else {
memcpy(pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow, pData, pColumnInfoData->info.bytes);
@@ -178,8 +175,6 @@ static void doCopyNItems(struct SColumnInfoData* pColumnInfoData, int32_t curren
int32_t colDataAppendNItems(SColumnInfoData* pColumnInfoData, uint32_t currentRow, const char* pData,
uint32_t numOfRows) {
- ASSERT(pData != NULL && pColumnInfoData != NULL);
-
int32_t len = pColumnInfoData->info.bytes;
if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
len = varDataTLen(pData);
@@ -237,7 +232,10 @@ static void doBitmapMerge(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, c
int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, int32_t* capacity,
const SColumnInfoData* pSource, int32_t numOfRow2) {
- ASSERT(pColumnInfoData != NULL && pSource != NULL && pColumnInfoData->info.type == pSource->info.type);
+ if (pColumnInfoData->info.type != pSource->info.type) {
+ return TSDB_CODE_FAILED;
+ }
+
if (numOfRow2 == 0) {
return numOfRow1;
}
@@ -317,13 +315,13 @@ int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, int
int32_t colDataAssign(SColumnInfoData* pColumnInfoData, const SColumnInfoData* pSource, int32_t numOfRows,
const SDataBlockInfo* pBlockInfo) {
- ASSERT(pColumnInfoData != NULL && pSource != NULL && pColumnInfoData->info.type == pSource->info.type);
- if (numOfRows <= 0) {
- return numOfRows;
+ if (pColumnInfoData->info.type != pSource->info.type ||
+ (pBlockInfo != NULL && pBlockInfo->capacity < numOfRows)) {
+ return TSDB_CODE_FAILED;
}
- if (pBlockInfo != NULL) {
- ASSERT(pBlockInfo->capacity >= numOfRows);
+ if (numOfRows <= 0) {
+ return numOfRows;
}
if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
@@ -359,14 +357,14 @@ size_t blockDataGetNumOfCols(const SSDataBlock* pBlock) { return taosArrayGetSiz
size_t blockDataGetNumOfRows(const SSDataBlock* pBlock) { return pBlock->info.rows; }
int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock, int32_t tsColumnIndex) {
- if (pDataBlock->info.rows > 0) {
- // ASSERT(pDataBlock->info.dataLoad == 1);
- }
-
if (pDataBlock == NULL || pDataBlock->info.rows <= 0 || pDataBlock->info.dataLoad == 0) {
return 0;
}
+ if (pDataBlock->info.rows > 0) {
+ // ASSERT(pDataBlock->info.dataLoad == 1);
+ }
+
size_t numOfCols = taosArrayGetSize(pDataBlock->pDataBlock);
if (numOfCols <= 0) {
return -1;
@@ -389,7 +387,6 @@ int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock, int32_t tsColumnIndex)
}
int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc) {
- assert(pSrc != NULL && pDest != NULL);
int32_t capacity = pDest->info.capacity;
size_t numOfCols = taosArrayGetSize(pDest->pDataBlock);
@@ -407,8 +404,6 @@ int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc) {
}
size_t blockDataGetSize(const SSDataBlock* pBlock) {
- assert(pBlock != NULL);
-
size_t total = 0;
size_t numOfCols = taosArrayGetSize(pBlock->pDataBlock);
for (int32_t i = 0; i < numOfCols; ++i) {
@@ -423,8 +418,6 @@ size_t blockDataGetSize(const SSDataBlock* pBlock) {
// Actual data rows pluses the corresponding meta data must fit in one memory buffer of the given page size.
int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startIndex, int32_t* stopIndex,
int32_t pageSize) {
- ASSERT(pBlock != NULL && stopIndex != NULL);
-
size_t numOfCols = taosArrayGetSize(pBlock->pDataBlock);
int32_t numOfRows = pBlock->info.rows;
@@ -438,7 +431,9 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
if (!hasVarCol) {
size_t rowSize = blockDataGetRowSize(pBlock);
int32_t capacity = payloadSize / (rowSize + numOfCols * bitmapChar / 8.0);
- ASSERT(capacity > 0);
+ if (capacity <= 0) {
+ return TSDB_CODE_FAILED;
+ }
*stopIndex = startIndex + capacity - 1;
if (*stopIndex >= numOfRows) {
@@ -470,7 +465,9 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
if (size > pageSize) { // pageSize must be able to hold one row
*stopIndex = j - 1;
- ASSERT(*stopIndex >= startIndex);
+ if (*stopIndex < startIndex) {
+ return TSDB_CODE_FAILED;
+ }
return TSDB_CODE_SUCCESS;
}
@@ -541,8 +538,6 @@ SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int3
* @return
*/
int32_t blockDataToBuf(char* buf, const SSDataBlock* pBlock) {
- ASSERT(pBlock != NULL);
-
// write the number of rows
*(uint32_t*)buf = pBlock->info.rows;
@@ -613,7 +608,9 @@ int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) {
}
pCol->varmeta.length = colLength;
- ASSERT(pCol->varmeta.length <= pCol->varmeta.allocLen);
+ if (pCol->varmeta.length > pCol->varmeta.allocLen) {
+ return TSDB_CODE_FAILED;
+ }
}
memcpy(pCol->pData, pStart, colLength);
@@ -660,7 +657,9 @@ int32_t blockDataFromBuf1(SSDataBlock* pBlock, const char* buf, size_t capacity)
}
pCol->varmeta.length = colLength;
- ASSERT(pCol->varmeta.length <= pCol->varmeta.allocLen);
+ if (pCol->varmeta.length > pCol->varmeta.allocLen) {
+ return TSDB_CODE_FAILED;
+ }
}
if (!colDataIsNNull_s(pCol, 0, pBlock->info.rows)) {
@@ -674,7 +673,6 @@ int32_t blockDataFromBuf1(SSDataBlock* pBlock, const char* buf, size_t capacity)
}
size_t blockDataGetRowSize(SSDataBlock* pBlock) {
- ASSERT(pBlock != NULL);
if (pBlock->info.rowSize == 0) {
size_t rowSize = 0;
@@ -703,7 +701,6 @@ size_t blockDataGetSerialMetaSize(uint32_t numOfCols) {
}
double blockDataGetSerialRowSize(const SSDataBlock* pBlock) {
- ASSERT(pBlock != NULL);
double rowSize = 0;
size_t numOfCols = taosArrayGetSize(pBlock->pDataBlock);
@@ -906,7 +903,6 @@ static int32_t* createTupleIndex(size_t rows) {
static void destroyTupleIndex(int32_t* index) { taosMemoryFreeClear(index); }
int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo) {
- ASSERT(pDataBlock != NULL && pOrderInfo != NULL);
if (pDataBlock->info.rows <= 1) {
return TSDB_CODE_SUCCESS;
}
@@ -1150,8 +1146,7 @@ void blockDataCleanup(SSDataBlock* pDataBlock) {
void blockDataEmpty(SSDataBlock* pDataBlock) {
SDataBlockInfo* pInfo = &pDataBlock->info;
- ASSERT(pInfo->rows <= pDataBlock->info.capacity);
- if (pInfo->capacity == 0) {
+ if (pInfo->capacity == 0 || pInfo->rows > pDataBlock->info.capacity) {
return;
}
@@ -1168,12 +1163,9 @@ void blockDataEmpty(SSDataBlock* pDataBlock) {
}
// todo temporarily disable it
-
static int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo* pBlockInfo, uint32_t numOfRows,
bool clearPayload) {
- ASSERT(numOfRows > 0);
-
- if (numOfRows <= pBlockInfo->capacity) {
+ if (numOfRows <= 0 || numOfRows <= pBlockInfo->capacity) {
return TSDB_CODE_SUCCESS;
}
@@ -1200,7 +1192,9 @@ static int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo*
int32_t oldLen = BitmapLen(existedRows);
pColumn->nullbitmap = tmp;
memset(&pColumn->nullbitmap[oldLen], 0, BitmapLen(numOfRows) - oldLen);
- ASSERT(pColumn->info.bytes);
+ if (pColumn->info.bytes == 0) {
+ return TSDB_CODE_FAILED;
+ }
// make sure the allocated memory is MALLOC_ALIGN_BYTES aligned
tmp = taosMemoryMallocAlign(MALLOC_ALIGN_BYTES, numOfRows * pColumn->info.bytes);
@@ -1218,7 +1212,9 @@ static int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo*
// todo remove it soon
#if defined LINUX
- ASSERT((((uint64_t)pColumn->pData) & (MALLOC_ALIGN_BYTES - 1)) == 0x0);
+ if ((((uint64_t)pColumn->pData) & (MALLOC_ALIGN_BYTES - 1)) != 0x0) {
+ return TSDB_CODE_FAILED;
+ }
#endif
if (clearPayload) {
@@ -1297,7 +1293,6 @@ void blockDataFreeRes(SSDataBlock* pBlock) {
taosArrayDestroy(pBlock->pDataBlock);
pBlock->pDataBlock = NULL;
taosMemoryFreeClear(pBlock->pBlockAgg);
- taosMemoryFree(pBlock->info.pTag);
memset(&pBlock->info, 0, sizeof(SDataBlockInfo));
}
@@ -1312,8 +1307,6 @@ void* blockDataDestroy(SSDataBlock* pBlock) {
}
int32_t assignOneDataBlock(SSDataBlock* dst, const SSDataBlock* src) {
- ASSERT(src != NULL);
-
dst->info = src->info;
dst->info.rows = 0;
dst->info.capacity = 0;
@@ -1348,8 +1341,6 @@ int32_t assignOneDataBlock(SSDataBlock* dst, const SSDataBlock* src) {
}
int32_t copyDataBlock(SSDataBlock* dst, const SSDataBlock* src) {
- ASSERT(src != NULL && dst != NULL);
-
blockDataCleanup(dst);
int32_t code = blockDataEnsureCapacity(dst, src->info.rows);
if (code != TSDB_CODE_SUCCESS) {
@@ -1505,7 +1496,6 @@ SSDataBlock* createDataBlock() {
}
int32_t blockDataAppendColInfo(SSDataBlock* pBlock, SColumnInfoData* pColInfoData) {
- ASSERT(pBlock != NULL && pColInfoData != NULL);
if (pBlock->pDataBlock == NULL) {
pBlock->pDataBlock = taosArrayInit(4, sizeof(SColumnInfoData));
if (pBlock->pDataBlock == NULL) {
@@ -1540,7 +1530,6 @@ SColumnInfoData createColumnInfoData(int16_t type, int32_t bytes, int16_t colId)
}
SColumnInfoData* bdGetColumnInfoData(const SSDataBlock* pBlock, int32_t index) {
- ASSERT(pBlock != NULL);
if (index >= taosArrayGetSize(pBlock->pDataBlock)) {
return NULL;
}
@@ -1971,10 +1960,10 @@ char* dumpBlockData(SSDataBlock* pDataBlock, const char* flag, char** pDataBuf)
int32_t len = 0;
len += snprintf(dumpBuf + len, size - len,
"===stream===%s|block type %d|child id %d|group id:%" PRIu64 "|uid:%" PRId64
- "|rows:%d|version:%" PRIu64 "|cal start:%" PRIu64 "|cal end:%" PRIu64 "\n",
+ "|rows:%d|version:%" PRIu64 "|cal start:%" PRIu64 "|cal end:%" PRIu64 "|tbl:%s\n",
flag, (int32_t)pDataBlock->info.type, pDataBlock->info.childId, pDataBlock->info.id.groupId,
pDataBlock->info.id.uid, pDataBlock->info.rows, pDataBlock->info.version,
- pDataBlock->info.calWin.skey, pDataBlock->info.calWin.ekey);
+ pDataBlock->info.calWin.skey, pDataBlock->info.calWin.ekey, pDataBlock->info.parTbName);
if (len >= size - 1) return dumpBuf;
for (int32_t j = 0; j < rows; j++) {
@@ -2164,7 +2153,6 @@ int32_t buildSubmitReqFromDataBlock(SSubmitReq** pReq, const SSDataBlock* pDataB
case TSDB_DATA_TYPE_JSON:
case TSDB_DATA_TYPE_MEDIUMBLOB:
uError("the column type %" PRIi16 " is defined but not implemented yet", pColInfoData->info.type);
- ASSERT(0);
break;
default:
if (pColInfoData->info.type < TSDB_DATA_TYPE_MAX && pColInfoData->info.type > TSDB_DATA_TYPE_NULL) {
@@ -2198,7 +2186,6 @@ int32_t buildSubmitReqFromDataBlock(SSubmitReq** pReq, const SSDataBlock* pDataB
}
} else {
uError("the column type %" PRIi16 " is undefined\n", pColInfoData->info.type);
- ASSERT(0);
}
break;
}
@@ -2405,7 +2392,10 @@ _end:
}
char* buildCtbNameByGroupId(const char* stbFullName, uint64_t groupId) {
- ASSERT(stbFullName[0] != 0);
+ if (stbFullName[0] == 0) {
+ return NULL;
+ }
+
SArray* tags = taosArrayInit(0, sizeof(SSmlKv));
if (tags == NULL) {
return NULL;
@@ -2435,7 +2425,9 @@ char* buildCtbNameByGroupId(const char* stbFullName, uint64_t groupId) {
taosArrayDestroy(tags);
- ASSERT(rname.ctbShortName && rname.ctbShortName[0]);
+ if ((rname.ctbShortName && rname.ctbShortName[0]) == 0) {
+ return NULL;
+ }
return rname.ctbShortName;
}
diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c
index 5d19012273..5e001a9687 100644
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
@@ -903,9 +903,7 @@ static int32_t tRowAppendTupleToColData(SRow *pRow, STSchema *pTSchema, SColData
int32_t iTColumn = 1;
STColumn *pTColumn = &pTSchema->columns[iTColumn];
- uint8_t *pb = NULL;
- uint8_t *pf;
- uint8_t *pv;
+ uint8_t *pb = NULL, *pf = NULL, *pv = NULL;
switch (pRow->flag) {
case HAS_VALUE:
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index deefa65595..037c8a4541 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -60,6 +60,9 @@ int32_t tsElectInterval = 25 * 1000;
int32_t tsHeartbeatInterval = 1000;
int32_t tsHeartbeatTimeout = 20 * 1000;
+// vnode
+int64_t tsVndCommitMaxIntervalMs = 60 * 1000;
+
// monitor
bool tsEnableMonitor = true;
int32_t tsMonitorInterval = 30;
@@ -73,6 +76,11 @@ bool tsEnableTelem = true;
int32_t tsTelemInterval = 43200;
char tsTelemServer[TSDB_FQDN_LEN] = "telemetry.taosdata.com";
uint16_t tsTelemPort = 80;
+char* tsTelemUri = "/report";
+
+bool tsEnableCrashReport = true;
+char* tsClientCrashReportUri = "/ccrashreport";
+char* tsSvrCrashReportUri = "/dcrashreport";
// schemaless
char tsSmlTagName[TSDB_COL_NAME_LEN] = "_tag_null";
@@ -202,7 +210,9 @@ int32_t taosSetTfsCfg(SConfig *pCfg) {
int32_t taosSetTfsCfg(SConfig *pCfg);
#endif
-struct SConfig *taosGetCfg() { return tsCfg; }
+struct SConfig *taosGetCfg() {
+ return tsCfg;
+}
static int32_t taosLoadCfg(SConfig *pCfg, const char **envCmd, const char *inputCfgDir, const char *envFile,
char *apolloUrl) {
@@ -314,6 +324,7 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
if (cfgAddInt32(pCfg, "maxMemUsedByInsert", tsMaxMemUsedByInsert, 1, INT32_MAX, true) != 0) return -1;
if (cfgAddInt32(pCfg, "maxRetryWaitTime", tsMaxRetryWaitTime, 0, 86400000, 0) != 0) return -1;
if (cfgAddBool(pCfg, "useAdapter", tsUseAdapter, true) != 0) return -1;
+ if (cfgAddBool(pCfg, "crashReporting", tsEnableCrashReport, true) != 0) return -1;
tsNumOfTaskQueueThreads = tsNumOfCores / 2;
tsNumOfTaskQueueThreads = TMAX(tsNumOfTaskQueueThreads, 4);
@@ -377,7 +388,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
if (cfgAddInt32(pCfg, "queryRspPolicy", tsQueryRspPolicy, 0, 1, 0) != 0) return -1;
tsNumOfRpcThreads = tsNumOfCores / 2;
- tsNumOfRpcThreads = TRANGE(tsNumOfRpcThreads, 1, 4);
+ tsNumOfRpcThreads = TRANGE(tsNumOfRpcThreads, 1, TSDB_MAX_RPC_THREADS);
if (cfgAddInt32(pCfg, "numOfRpcThreads", tsNumOfRpcThreads, 1, 1024, 0) != 0) return -1;
tsNumOfCommitThreads = tsNumOfCores / 2;
@@ -427,6 +438,8 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
if (cfgAddInt32(pCfg, "syncHeartbeatInterval", tsHeartbeatInterval, 10, 1000 * 60 * 24 * 2, 0) != 0) return -1;
if (cfgAddInt32(pCfg, "syncHeartbeatTimeout", tsHeartbeatTimeout, 10, 1000 * 60 * 24 * 2, 0) != 0) return -1;
+ if (cfgAddInt64(pCfg, "vndCommitMaxInterval", tsVndCommitMaxIntervalMs, 1000, 1000 * 60 * 60, 0) != 0) return -1;
+
if (cfgAddBool(pCfg, "monitor", tsEnableMonitor, 0) != 0) return -1;
if (cfgAddInt32(pCfg, "monitorInterval", tsMonitorInterval, 1, 200000, 0) != 0) return -1;
if (cfgAddString(pCfg, "monitorFqdn", tsMonitorFqdn, 0) != 0) return -1;
@@ -434,6 +447,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
if (cfgAddInt32(pCfg, "monitorMaxLogs", tsMonitorMaxLogs, 1, 1000000, 0) != 0) return -1;
if (cfgAddBool(pCfg, "monitorComp", tsMonitorComp, 0) != 0) return -1;
+ if (cfgAddBool(pCfg, "crashReporting", tsEnableCrashReport, 0) != 0) return -1;
if (cfgAddBool(pCfg, "telemetryReporting", tsEnableTelem, 0) != 0) return -1;
if (cfgAddInt32(pCfg, "telemetryInterval", tsTelemInterval, 1, 200000, 0) != 0) return -1;
if (cfgAddString(pCfg, "telemetryServer", tsTelemServer, 0) != 0) return -1;
@@ -665,6 +679,7 @@ static int32_t taosSetClientCfg(SConfig *pCfg) {
tsQueryUseNodeAllocator = cfgGetItem(pCfg, "queryUseNodeAllocator")->bval;
tsKeepColumnName = cfgGetItem(pCfg, "keepColumnName")->bval;
tsUseAdapter = cfgGetItem(pCfg, "useAdapter")->bval;
+ tsEnableCrashReport = cfgGetItem(pCfg, "crashReporting")->bval;
tsMaxRetryWaitTime = cfgGetItem(pCfg, "maxRetryWaitTime")->i32;
return 0;
@@ -715,7 +730,7 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
tsNumOfSnodeWriteThreads = cfgGetItem(pCfg, "numOfSnodeUniqueThreads")->i32;
tsRpcQueueMemoryAllowed = cfgGetItem(pCfg, "rpcQueueMemoryAllowed")->i64;
- tsSIMDBuiltins = (bool) cfgGetItem(pCfg, "SIMD-builtins")->bval;
+ tsSIMDBuiltins = (bool)cfgGetItem(pCfg, "SIMD-builtins")->bval;
tsEnableMonitor = cfgGetItem(pCfg, "monitor")->bval;
tsMonitorInterval = cfgGetItem(pCfg, "monitorInterval")->i32;
@@ -726,6 +741,7 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
tsQueryRspPolicy = cfgGetItem(pCfg, "queryRspPolicy")->i32;
tsEnableTelem = cfgGetItem(pCfg, "telemetryReporting")->bval;
+ tsEnableCrashReport = cfgGetItem(pCfg, "crashReporting")->bval;
tsTelemInterval = cfgGetItem(pCfg, "telemetryInterval")->i32;
tstrncpy(tsTelemServer, cfgGetItem(pCfg, "telemetryServer")->str, TSDB_FQDN_LEN);
tsTelemPort = (uint16_t)cfgGetItem(pCfg, "telemetryPort")->i32;
@@ -743,6 +759,8 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
tsHeartbeatInterval = cfgGetItem(pCfg, "syncHeartbeatInterval")->i32;
tsHeartbeatTimeout = cfgGetItem(pCfg, "syncHeartbeatTimeout")->i32;
+ tsVndCommitMaxIntervalMs = cfgGetItem(pCfg, "vndCommitMaxInterval")->i64;
+
tsStartUdfd = cfgGetItem(pCfg, "udf")->bval;
tstrncpy(tsUdfdResFuncs, cfgGetItem(pCfg, "udfdResFuncs")->str, sizeof(tsUdfdResFuncs));
tstrncpy(tsUdfdLdLibPath, cfgGetItem(pCfg, "udfdLdLibPath")->str, sizeof(tsUdfdLdLibPath));
@@ -795,6 +813,8 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
tsCountAlwaysReturnValue = cfgGetItem(pCfg, "countAlwaysReturnValue")->i32;
} else if (strcasecmp("cDebugFlag", name) == 0) {
cDebugFlag = cfgGetItem(pCfg, "cDebugFlag")->i32;
+ } else if (strcasecmp("crashReporting", name) == 0) {
+ tsEnableCrashReport = cfgGetItem(pCfg, "crashReporting")->bval;
}
break;
}
diff --git a/source/common/src/tname.c b/source/common/src/tname.c
index 644b253cc2..e45cec6560 100644
--- a/source/common/src/tname.c
+++ b/source/common/src/tname.c
@@ -90,16 +90,12 @@ int64_t taosGetIntervalStartTimestamp(int64_t startTime, int64_t slidingTime, in
SName* toName(int32_t acctId, const char* pDbName, const char* pTableName, SName* pName) {
pName->type = TSDB_TABLE_NAME_T;
pName->acctId = acctId;
- memset(pName->dbname, 0, TSDB_DB_NAME_LEN);
- strncpy(pName->dbname, pDbName, TSDB_DB_NAME_LEN - 1);
- memset(pName->tname, 0, TSDB_TABLE_NAME_LEN);
- strncpy(pName->tname, pTableName, TSDB_TABLE_NAME_LEN - 1);
+ snprintf(pName->dbname, sizeof(pName->dbname), "%s", pDbName);
+ snprintf(pName->tname, sizeof(pName->tname), "%s", pTableName);
return pName;
}
int32_t tNameExtractFullName(const SName* name, char* dst) {
- assert(name != NULL && dst != NULL);
-
// invalid full name format, abort
if (!tNameIsValid(name)) {
return -1;
@@ -109,7 +105,7 @@ int32_t tNameExtractFullName(const SName* name, char* dst) {
size_t tnameLen = strlen(name->tname);
if (tnameLen > 0) {
- /*assert(name->type == TSDB_TABLE_NAME_T);*/
+ /*ASSERT(name->type == TSDB_TABLE_NAME_T);*/
dst[len] = TS_PATH_DELIMITER[0];
memcpy(dst + len + 1, name->tname, tnameLen);
@@ -120,25 +116,21 @@ int32_t tNameExtractFullName(const SName* name, char* dst) {
}
int32_t tNameLen(const SName* name) {
- assert(name != NULL);
-
char tmp[12] = {0};
int32_t len = sprintf(tmp, "%d", name->acctId);
int32_t len1 = (int32_t)strlen(name->dbname);
int32_t len2 = (int32_t)strlen(name->tname);
if (name->type == TSDB_DB_NAME_T) {
- assert(len2 == 0);
+ ASSERT(len2 == 0);
return len + len1 + TSDB_NAME_DELIMITER_LEN;
} else {
- assert(len2 > 0);
+ ASSERT(len2 > 0);
return len + len1 + len2 + TSDB_NAME_DELIMITER_LEN * 2;
}
}
bool tNameIsValid(const SName* name) {
- assert(name != NULL);
-
if (!VALID_NAME_TYPE(name->type)) {
return false;
}
@@ -151,15 +143,12 @@ bool tNameIsValid(const SName* name) {
}
SName* tNameDup(const SName* name) {
- assert(name != NULL);
-
SName* p = taosMemoryMalloc(sizeof(SName));
memcpy(p, name, sizeof(SName));
return p;
}
int32_t tNameGetDbName(const SName* name, char* dst) {
- assert(name != NULL && dst != NULL);
strncpy(dst, name->dbname, tListLen(name->dbname));
return 0;
}
@@ -167,28 +156,24 @@ int32_t tNameGetDbName(const SName* name, char* dst) {
const char* tNameGetDbNameP(const SName* name) { return &name->dbname[0]; }
int32_t tNameGetFullDbName(const SName* name, char* dst) {
- assert(name != NULL && dst != NULL);
snprintf(dst, TSDB_DB_FNAME_LEN, "%d.%s", name->acctId, name->dbname);
return 0;
}
bool tNameIsEmpty(const SName* name) {
- assert(name != NULL);
return name->type == 0 || name->acctId == 0;
}
const char* tNameGetTableName(const SName* name) {
- assert(name != NULL && name->type == TSDB_TABLE_NAME_T);
+ ASSERT(name != NULL && name->type == TSDB_TABLE_NAME_T);
return &name->tname[0];
}
void tNameAssign(SName* dst, const SName* src) { memcpy(dst, src, sizeof(SName)); }
int32_t tNameSetDbName(SName* dst, int32_t acct, const char* dbName, size_t nameLen) {
- assert(dst != NULL && dbName != NULL && nameLen > 0);
-
// too long account id or too long db name
- if (nameLen >= tListLen(dst->dbname)) {
+ if (nameLen <= 0 || nameLen >= tListLen(dst->dbname)) {
return -1;
}
@@ -199,8 +184,6 @@ int32_t tNameSetDbName(SName* dst, int32_t acct, const char* dbName, size_t name
}
int32_t tNameAddTbName(SName* dst, const char* tbName, size_t nameLen) {
- assert(dst != NULL && tbName != NULL && nameLen > 0);
-
// too long account id or too long db name
if (nameLen >= tListLen(dst->tname) || nameLen <= 0) {
return -1;
@@ -212,7 +195,6 @@ int32_t tNameAddTbName(SName* dst, const char* tbName, size_t nameLen) {
}
int32_t tNameSetAcctId(SName* dst, int32_t acctId) {
- assert(dst != NULL);
dst->acctId = acctId;
return 0;
}
@@ -247,7 +229,9 @@ bool tNameTbNameEqual(SName* left, SName* right) {
}
int32_t tNameFromString(SName* dst, const char* str, uint32_t type) {
- assert(dst != NULL && str != NULL && strlen(str) > 0);
+ if (strlen(str) == 0) {
+ return -1;
+ }
char* p = NULL;
if ((type & T_NAME_ACCT) == T_NAME_ACCT) {
@@ -316,7 +300,7 @@ static int compareKv(const void* p1, const void* p2) {
void buildChildTableName(RandTableName* rName) {
SStringBuilder sb = {0};
taosStringBuilderAppendStringLen(&sb, rName->stbFullName, rName->stbFullNameLen);
- if(sb.buf == NULL) return;
+ if (sb.buf == NULL) return;
taosArraySort(rName->tags, compareKv);
for (int j = 0; j < taosArrayGetSize(rName->tags); ++j) {
taosStringBuilderAppendChar(&sb, ',');
@@ -344,5 +328,5 @@ void buildChildTableName(RandTableName* rName) {
strcat(rName->ctbShortName, temp);
}
taosStringBuilderDestroy(&sb);
- rName->uid = *(uint64_t*)(context.digest);
+// rName->uid = *(uint64_t*)(context.digest);
}
diff --git a/source/common/src/trow.c b/source/common/src/trow.c
index ca2c056743..9d381ce15f 100644
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
@@ -76,7 +76,6 @@ void tdSCellValPrint(SCellVal *pVal, int8_t colType) {
return;
}
if (!pVal->val) {
- ASSERT(0);
printf("BadVal ");
return;
}
@@ -342,7 +341,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow) {
}
if (iColumn == 0) {
- ASSERT(pColVal->cid == pTColumn->colId);
+ ASSERT(pColVal && pColVal->cid == pTColumn->colId);
ASSERT(pTColumn->type == TSDB_DATA_TYPE_TIMESTAMP);
ASSERT(pTColumn->colId == PRIMARYKEY_TIMESTAMP_COL_ID);
} else {
@@ -490,7 +489,6 @@ bool tdSTSRowGetVal(STSRowIter *pIter, col_id_t colId, col_type_t colType, SCell
int32_t tdGetBitmapValTypeII(const void *pBitmap, int16_t colIdx, TDRowValT *pValType) {
if (!pBitmap || colIdx < 0) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -512,7 +510,6 @@ int32_t tdGetBitmapValTypeII(const void *pBitmap, int16_t colIdx, TDRowValT *pVa
*pValType = ((*pDestByte) & 0x03);
break;
default:
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -521,7 +518,6 @@ int32_t tdGetBitmapValTypeII(const void *pBitmap, int16_t colIdx, TDRowValT *pVa
int32_t tdGetBitmapValTypeI(const void *pBitmap, int16_t colIdx, TDRowValT *pValType) {
if (!pBitmap || colIdx < 0) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -555,7 +551,6 @@ int32_t tdGetBitmapValTypeI(const void *pBitmap, int16_t colIdx, TDRowValT *pVal
*pValType = ((*pDestByte) & 0x01);
break;
default:
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -564,7 +559,6 @@ int32_t tdGetBitmapValTypeI(const void *pBitmap, int16_t colIdx, TDRowValT *pVal
int32_t tdSetBitmapValTypeI(void *pBitmap, int16_t colIdx, TDRowValT valType) {
if (!pBitmap || colIdx < 0) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -607,7 +601,6 @@ int32_t tdSetBitmapValTypeI(void *pBitmap, int16_t colIdx, TDRowValT valType) {
// *pDestByte |= (valType);
break;
default:
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -630,7 +623,6 @@ int32_t tdGetKvRowValOfCol(SCellVal *output, STSRow *pRow, void *pBitmap, int32_
output->val = POINTER_SHIFT(pRow, offset);
}
#else
- ASSERT(0);
if (offset < 0) {
terrno = TSDB_CODE_INVALID_PARA;
output->valType = TD_VTYPE_NONE;
@@ -680,7 +672,6 @@ int32_t tdAppendColValToRow(SRowBuilder *pBuilder, col_id_t colId, int8_t colTyp
return terrno;
}
#else
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
#endif
@@ -707,8 +698,8 @@ int32_t tdAppendColValToRow(SRowBuilder *pBuilder, col_id_t colId, int8_t colTyp
if (!pBuilder->hasNone) pBuilder->hasNone = true;
return TSDB_CODE_SUCCESS;
default:
- ASSERT(0);
- break;
+ terrno = TSDB_CODE_INVALID_PARA;
+ return terrno;
}
if (TD_IS_TP_ROW(pRow)) {
@@ -722,7 +713,6 @@ int32_t tdAppendColValToRow(SRowBuilder *pBuilder, col_id_t colId, int8_t colTyp
int32_t tdAppendColValToKvRow(SRowBuilder *pBuilder, TDRowValT valType, const void *val, bool isCopyVarData,
int8_t colType, int16_t colIdx, int32_t offset, col_id_t colId) {
if ((offset < (int32_t)sizeof(SKvRowIdx)) || (colIdx < 1)) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -810,7 +800,6 @@ int32_t tdSRowSetExtendedInfo(SRowBuilder *pBuilder, int32_t nCols, int32_t nBou
pBuilder->nCols = nCols;
pBuilder->nBoundCols = nBoundCols;
if (pBuilder->flen <= 0 || pBuilder->nCols <= 0) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -832,7 +821,6 @@ int32_t tdSRowSetExtendedInfo(SRowBuilder *pBuilder, int32_t nCols, int32_t nBou
int32_t tdSRowResetBuf(SRowBuilder *pBuilder, void *pBuf) {
pBuilder->pBuf = (STSRow *)pBuf;
if (!pBuilder->pBuf) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -869,7 +857,6 @@ int32_t tdSRowResetBuf(SRowBuilder *pBuilder, void *pBuf) {
TD_ROW_SET_NCOLS(pBuilder->pBuf, pBuilder->nBoundCols);
break;
default:
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -880,7 +867,6 @@ int32_t tdSRowResetBuf(SRowBuilder *pBuilder, void *pBuf) {
int32_t tdSRowGetBuf(SRowBuilder *pBuilder, void *pBuf) {
pBuilder->pBuf = (STSRow *)pBuf;
if (!pBuilder->pBuf) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -900,7 +886,6 @@ int32_t tdSRowGetBuf(SRowBuilder *pBuilder, void *pBuf) {
#endif
break;
default:
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -920,7 +905,6 @@ int32_t tdSRowSetTpInfo(SRowBuilder *pBuilder, int32_t nCols, int32_t flen) {
pBuilder->flen = flen;
pBuilder->nCols = nCols;
if (pBuilder->flen <= 0 || pBuilder->nCols <= 0) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -939,7 +923,6 @@ int32_t tdSRowSetInfo(SRowBuilder *pBuilder, int32_t nCols, int32_t nBoundCols,
pBuilder->nCols = nCols;
pBuilder->nBoundCols = nBoundCols;
if (pBuilder->flen <= 0 || pBuilder->nCols <= 0) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -968,7 +951,6 @@ int32_t tdGetBitmapValType(const void *pBitmap, int16_t colIdx, TDRowValT *pValT
tdGetBitmapValTypeI(pBitmap, colIdx, pValType);
break;
default:
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return TSDB_CODE_FAILED;
}
@@ -987,7 +969,6 @@ bool tdIsBitmapValTypeNorm(const void *pBitmap, int16_t idx, int8_t bitmapMode)
int32_t tdSetBitmapValTypeII(void *pBitmap, int16_t colIdx, TDRowValT valType) {
if (!pBitmap || colIdx < 0) {
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -1014,7 +995,6 @@ int32_t tdSetBitmapValTypeII(void *pBitmap, int16_t colIdx, TDRowValT valType) {
// *pDestByte |= (valType);
break;
default:
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return terrno;
}
@@ -1031,7 +1011,6 @@ int32_t tdSetBitmapValType(void *pBitmap, int16_t colIdx, TDRowValT valType, int
tdSetBitmapValTypeI(pBitmap, colIdx, valType);
break;
default:
- ASSERT(0);
terrno = TSDB_CODE_INVALID_PARA;
return TSDB_CODE_FAILED;
}
diff --git a/source/common/src/ttime.c b/source/common/src/ttime.c
index ec05ef4c44..559ffd2aaf 100644
--- a/source/common/src/ttime.c
+++ b/source/common/src/ttime.c
@@ -168,12 +168,13 @@ int64_t parseFraction(char* str, char** end, int32_t timePrec) {
i = MICRO_SEC_FRACTION_LEN;
}
times = MICRO_SEC_FRACTION_LEN - i;
- } else {
- assert(timePrec == TSDB_TIME_PRECISION_NANO);
+ } else if (timePrec == TSDB_TIME_PRECISION_NANO) {
if (i >= NANO_SEC_FRACTION_LEN) {
i = NANO_SEC_FRACTION_LEN;
}
times = NANO_SEC_FRACTION_LEN - i;
+ } else {
+ return -1;
}
fraction = strnatoi(str, i) * factor[times];
@@ -510,8 +511,11 @@ int64_t convertTimePrecision(int64_t utime, int32_t fromPrecision, int32_t toPre
// !!!!notice: double lose precison if time is too large, for example: 1626006833631000000*1.0 = double =
// 1626006833631000064
int64_t convertTimeFromPrecisionToUnit(int64_t time, int32_t fromPrecision, char toUnit) {
- assert(fromPrecision == TSDB_TIME_PRECISION_MILLI || fromPrecision == TSDB_TIME_PRECISION_MICRO ||
- fromPrecision == TSDB_TIME_PRECISION_NANO);
+ if (fromPrecision != TSDB_TIME_PRECISION_MILLI && fromPrecision != TSDB_TIME_PRECISION_MICRO &&
+ fromPrecision != TSDB_TIME_PRECISION_NANO) {
+ return -1;
+ }
+
int64_t factors[3] = {NANOSECOND_PER_MSEC, NANOSECOND_PER_USEC, 1};
double tmp = time;
switch (toUnit) {
@@ -761,8 +765,7 @@ int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char
}
int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precision) {
- if (pInterval->sliding == 0) {
- assert(pInterval->interval == 0);
+ if (pInterval->sliding == 0 && pInterval->interval == 0) {
return t;
}
@@ -931,7 +934,7 @@ void taosFormatUtcTime(char* buf, int32_t bufLen, int64_t t, int32_t precision)
default:
fractionLen = 0;
- assert(false);
+ ASSERT(false);
}
taosLocalTime(", &ptm);
diff --git a/source/common/src/ttszip.c b/source/common/src/ttszip.c
index 3a6bc097c1..0faa6eb4c8 100644
--- a/source/common/src/ttszip.c
+++ b/source/common/src/ttszip.c
@@ -17,6 +17,7 @@
#include "ttszip.h"
#include "taoserror.h"
#include "tcompression.h"
+#include "tlog.h"
static int32_t getDataStartOffset();
static void TSBufUpdateGroupInfo(STSBuf* pTSBuf, int32_t index, STSGroupBlockInfo* pBlockInfo);
@@ -202,14 +203,14 @@ void* tsBufDestroy(STSBuf* pTSBuf) {
static STSGroupBlockInfoEx* tsBufGetLastGroupInfo(STSBuf* pTSBuf) {
int32_t last = pTSBuf->numOfGroups - 1;
- assert(last >= 0);
+ ASSERT(last >= 0);
return &pTSBuf->pData[last];
}
static STSGroupBlockInfoEx* addOneGroupInfo(STSBuf* pTSBuf, int32_t id) {
if (pTSBuf->numOfAlloc <= pTSBuf->numOfGroups) {
uint32_t newSize = (uint32_t)(pTSBuf->numOfAlloc * 1.5);
- assert((int32_t)newSize > pTSBuf->numOfAlloc);
+ ASSERT((int32_t)newSize > pTSBuf->numOfAlloc);
STSGroupBlockInfoEx* tmp =
(STSGroupBlockInfoEx*)taosMemoryRealloc(pTSBuf->pData, sizeof(STSGroupBlockInfoEx) * newSize);
@@ -233,7 +234,7 @@ static STSGroupBlockInfoEx* addOneGroupInfo(STSBuf* pTSBuf, int32_t id) {
STSGroupBlockInfo* pBlockInfo = &pTSBuf->pData[pTSBuf->numOfGroups].info;
pBlockInfo->id = id;
pBlockInfo->offset = pTSBuf->fileSize;
- assert(pBlockInfo->offset >= getDataStartOffset());
+ ASSERT(pBlockInfo->offset >= getDataStartOffset());
// update vnode info in file
TSBufUpdateGroupInfo(pTSBuf, pTSBuf->numOfGroups, pBlockInfo);
@@ -282,7 +283,7 @@ static void writeDataToDisk(STSBuf* pTSBuf) {
pTsData->allocSize, TWO_STAGE_COMP, pTSBuf->assistBuf, pTSBuf->bufSize);
int64_t r = taosLSeekFile(pTSBuf->pFile, pTSBuf->fileSize, SEEK_SET);
- assert(r == 0);
+ ASSERT(r == 0);
/*
* format for output data:
@@ -316,7 +317,7 @@ static void writeDataToDisk(STSBuf* pTSBuf) {
taosWriteFile(pTSBuf->pFile, &pBlock->compLen, sizeof(pBlock->compLen));
metaLen += (int32_t)taosWriteFile(pTSBuf->pFile, &trueLen, sizeof(pBlock->tag.nLen));
- assert(metaLen == getTagAreaLength(&pBlock->tag));
+ ASSERT(metaLen == getTagAreaLength(&pBlock->tag));
int32_t blockSize = metaLen + sizeof(pBlock->numOfElem) + sizeof(pBlock->compLen) * 2 + pBlock->compLen;
pTSBuf->fileSize += blockSize;
@@ -379,7 +380,7 @@ STSBlock* readDataFromDisk(STSBuf* pTSBuf, int32_t order, bool decomp) {
size_t sz = 0;
if (pBlock->tag.nType == TSDB_DATA_TYPE_BINARY || pBlock->tag.nType == TSDB_DATA_TYPE_NCHAR) {
char* tp = taosMemoryRealloc(pBlock->tag.pz, pBlock->tag.nLen + 1);
- assert(tp != NULL);
+ ASSERT(tp != NULL);
memset(tp, 0, pBlock->tag.nLen + 1);
pBlock->tag.pz = tp;
@@ -410,14 +411,14 @@ STSBlock* readDataFromDisk(STSBuf* pTSBuf, int32_t order, bool decomp) {
// read the comp length at the length of comp block
sz = taosReadFile(pTSBuf->pFile, &pBlock->padding, sizeof(pBlock->padding));
- assert(pBlock->padding == pBlock->compLen);
+ ASSERT(pBlock->padding == pBlock->compLen);
int32_t n = 0;
sz = taosReadFile(pTSBuf->pFile, &n, sizeof(pBlock->tag.nLen));
if (pBlock->tag.nType == TSDB_DATA_TYPE_NULL) {
- assert(n == 0);
+ ASSERT(n == 0);
} else {
- assert(n == pBlock->tag.nLen);
+ ASSERT(n == pBlock->tag.nLen);
}
UNUSED(sz);
@@ -477,7 +478,7 @@ void tsBufAppend(STSBuf* pTSBuf, int32_t id, SVariant* tag, const char* pData, i
pBlockInfo = tsBufGetLastGroupInfo(pTSBuf);
}
- assert(pBlockInfo->info.id == id);
+ ASSERT(pBlockInfo->info.id == id);
if ((taosVariantCompare(&pTSBuf->block.tag, tag) != 0) && ptsData->len > 0) {
// new arrived data with different tags value, save current value into disk first
@@ -596,7 +597,7 @@ static int32_t tsBufFindBlockByTag(STSBuf* pTSBuf, STSGroupBlockInfo* pBlockInfo
static void tsBufGetBlock(STSBuf* pTSBuf, int32_t groupIndex, int32_t blockIndex) {
STSGroupBlockInfo* pBlockInfo = &pTSBuf->pData[groupIndex].info;
if (pBlockInfo->numOfBlocks <= blockIndex) {
- assert(false);
+ ASSERT(false);
}
STSCursor* pCur = &pTSBuf->cur;
@@ -613,7 +614,7 @@ static void tsBufGetBlock(STSBuf* pTSBuf, int32_t groupIndex, int32_t blockIndex
}
} else {
if (tsBufFindBlock(pTSBuf, pBlockInfo, blockIndex) == -1) {
- assert(false);
+ ASSERT(false);
}
}
@@ -633,7 +634,7 @@ static void tsBufGetBlock(STSBuf* pTSBuf, int32_t groupIndex, int32_t blockIndex
tsDecompressTimestamp(pBlock->payload, pBlock->compLen, pBlock->numOfElem, pTSBuf->tsData.rawBuf,
pTSBuf->tsData.allocSize, TWO_STAGE_COMP, pTSBuf->assistBuf, pTSBuf->bufSize);
- assert((pTSBuf->tsData.len / TSDB_KEYSIZE == pBlock->numOfElem) && (pTSBuf->tsData.allocSize >= pTSBuf->tsData.len));
+ ASSERT((pTSBuf->tsData.len / TSDB_KEYSIZE == pBlock->numOfElem) && (pTSBuf->tsData.allocSize >= pTSBuf->tsData.len));
pCur->vgroupIndex = groupIndex;
pCur->blockIndex = blockIndex;
@@ -668,7 +669,9 @@ int32_t STSBufUpdateHeader(STSBuf* pTSBuf, STSBufFileHeader* pHeader) {
return -1;
}
- assert(pHeader->tsOrder == TSDB_ORDER_ASC || pHeader->tsOrder == TSDB_ORDER_DESC);
+ if (pHeader->tsOrder != TSDB_ORDER_ASC && pHeader->tsOrder != TSDB_ORDER_DESC) {
+ return -1;
+ }
int32_t r = taosLSeekFile(pTSBuf->pFile, 0, SEEK_SET);
if (r != 0) {
@@ -705,7 +708,7 @@ bool tsBufNextPos(STSBuf* pTSBuf) {
}
} else { // get the last timestamp record in the last block of the last vnode
- assert(pTSBuf->numOfGroups > 0);
+ ASSERT(pTSBuf->numOfGroups > 0);
int32_t groupIndex = pTSBuf->numOfGroups - 1;
pCur->vgroupIndex = groupIndex;
@@ -729,7 +732,7 @@ bool tsBufNextPos(STSBuf* pTSBuf) {
int32_t step = pCur->order == TSDB_ORDER_ASC ? 1 : -1;
while (1) {
- assert(pTSBuf->tsData.len == pTSBuf->block.numOfElem * TSDB_KEYSIZE);
+ ASSERT(pTSBuf->tsData.len == pTSBuf->block.numOfElem * TSDB_KEYSIZE);
if ((pCur->order == TSDB_ORDER_ASC && pCur->tsIndex >= pTSBuf->block.numOfElem - 1) ||
(pCur->order == TSDB_ORDER_DESC && pCur->tsIndex <= 0)) {
@@ -810,7 +813,7 @@ int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf) {
}
// src can only have one vnode index
- assert(pSrcBuf->numOfGroups == 1);
+ ASSERT(pSrcBuf->numOfGroups == 1);
// there are data in buffer, flush to disk first
tsBufFlush(pDestBuf);
@@ -853,7 +856,7 @@ int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf) {
}
int32_t r = taosLSeekFile(pDestBuf->pFile, 0, SEEK_END);
- assert(r == 0);
+ ASSERT(r == 0);
int64_t offset = getDataStartOffset();
int32_t size = (int32_t)pSrcBuf->fileSize - (int32_t)offset;
@@ -881,7 +884,7 @@ int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf) {
}
pDestBuf->fileSize = (uint32_t)file_size;
- assert(pDestBuf->fileSize == oldSize + size);
+ ASSERT(pDestBuf->fileSize == oldSize + size);
return 0;
}
@@ -913,7 +916,10 @@ STSBuf* tsBufCreateFromCompBlocks(const char* pData, int32_t numOfBlocks, int32_
pTSBuf->fileSize += len;
pTSBuf->tsOrder = order;
- assert(order == TSDB_ORDER_ASC || order == TSDB_ORDER_DESC);
+ if (order != TSDB_ORDER_ASC && order != TSDB_ORDER_DESC) {
+ tsBufDestroy(pTSBuf);
+ return NULL;
+ }
STSBufFileHeader header = {
.magic = TS_COMP_FILE_MAGIC, .numOfGroup = pTSBuf->numOfGroups, .tsOrder = pTSBuf->tsOrder};
@@ -1095,7 +1101,7 @@ void tsBufGetGroupIdList(STSBuf* pTSBuf, int32_t* num, int32_t** id) {
}
int32_t dumpFileBlockByGroupId(STSBuf* pTSBuf, int32_t groupIndex, void* buf, int32_t* len, int32_t* numOfBlocks) {
- assert(groupIndex >= 0 && groupIndex < pTSBuf->numOfGroups);
+ ASSERT(groupIndex >= 0 && groupIndex < pTSBuf->numOfGroups);
STSGroupBlockInfo* pBlockInfo = &pTSBuf->pData[groupIndex].info;
*len = 0;
diff --git a/source/common/src/ttypes.c b/source/common/src/ttypes.c
index d412fd89da..c83bdc0e32 100644
--- a/source/common/src/ttypes.c
+++ b/source/common/src/ttypes.c
@@ -140,7 +140,7 @@ void assignVal(char *val, const char *src, int32_t len, int32_t type) {
}
}
-void operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type) {
+int32_t operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type) {
if (optr == OP_TYPE_ADD) {
switch (type) {
case TSDB_DATA_TYPE_TINYINT:
@@ -177,11 +177,12 @@ void operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type) {
SET_DOUBLE_VAL(dst, GET_DOUBLE_VAL(s1) + GET_DOUBLE_VAL(s2));
break;
default: {
- assert(0);
- break;
+ return -1;
}
}
} else {
- assert(0);
+ return -1;
}
+
+ return 0;
}
diff --git a/source/common/src/tvariant.c b/source/common/src/tvariant.c
index 65e9a767f5..de225581a6 100644
--- a/source/common/src/tvariant.c
+++ b/source/common/src/tvariant.c
@@ -168,7 +168,7 @@ void taosVariantAssign(SVariant *pDst, const SVariant *pSrc) {
pSrc->nType == TSDB_DATA_TYPE_JSON) {
int32_t len = pSrc->nLen + TSDB_NCHAR_SIZE;
char *p = taosMemoryRealloc(pDst->pz, len);
- assert(p);
+ ASSERT(p);
memset(p, 0, len);
pDst->pz = p;
@@ -192,7 +192,7 @@ void taosVariantAssign(SVariant *pDst, const SVariant *pSrc) {
size_t num = taosArrayGetSize(pSrc->arr);
pDst->arr = taosArrayInit(num, sizeof(int64_t));
pDst->nLen = pSrc->nLen;
- assert(pSrc->nLen == num);
+ ASSERT(pSrc->nLen == num);
for (size_t i = 0; i < num; i++) {
int64_t *p = taosArrayGet(pSrc->arr, i);
taosArrayPush(pDst->arr, p);
diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c
index d308d3e618..711280ea58 100644
--- a/source/dnode/mgmt/exe/dmMain.c
+++ b/source/dnode/mgmt/exe/dmMain.c
@@ -44,6 +44,7 @@ static struct {
char apolloUrl[PATH_MAX];
const char **envCmd;
SArray *pArgs; // SConfigPair
+ int64_t startTime;
} global = {0};
static void dmSetDebugFlag(int32_t signum, void *sigInfo, void *context) { taosSetAllDebugFlag(143, true); }
@@ -67,23 +68,67 @@ static void dmStopDnode(int signum, void *sigInfo, void *context) {
dmStop();
}
+void dmLogCrash(int signum, void *sigInfo, void *context) {
+ taosIgnSignal(SIGTERM);
+ taosIgnSignal(SIGHUP);
+ taosIgnSignal(SIGINT);
+ taosIgnSignal(SIGBREAK);
+
+#ifndef WINDOWS
+ taosIgnSignal(SIGBUS);
+#endif
+ taosIgnSignal(SIGABRT);
+ taosIgnSignal(SIGFPE);
+ taosIgnSignal(SIGSEGV);
+
+ char *pMsg = NULL;
+ const char *flags = "UTL FATAL ";
+ ELogLevel level = DEBUG_FATAL;
+ int32_t dflag = 255;
+ int64_t msgLen= -1;
+
+ if (tsEnableCrashReport) {
+ if (taosGenCrashJsonMsg(signum, &pMsg, dmGetClusterId(), global.startTime)) {
+ taosPrintLog(flags, level, dflag, "failed to generate crash json msg");
+ goto _return;
+ } else {
+ msgLen = strlen(pMsg);
+ }
+ }
+
+_return:
+
+ taosLogCrashInfo("taosd", pMsg, msgLen, signum, sigInfo);
+
+ exit(signum);
+}
+
static void dmSetSignalHandle() {
taosSetSignal(SIGUSR1, dmSetDebugFlag);
taosSetSignal(SIGUSR2, dmSetAssert);
taosSetSignal(SIGTERM, dmStopDnode);
taosSetSignal(SIGHUP, dmStopDnode);
taosSetSignal(SIGINT, dmStopDnode);
- taosSetSignal(SIGABRT, dmStopDnode);
taosSetSignal(SIGBREAK, dmStopDnode);
#ifndef WINDOWS
taosSetSignal(SIGTSTP, dmStopDnode);
taosSetSignal(SIGQUIT, dmStopDnode);
#endif
+
+#ifndef WINDOWS
+ taosSetSignal(SIGBUS, dmLogCrash);
+#endif
+ taosSetSignal(SIGABRT, dmLogCrash);
+ taosSetSignal(SIGFPE, dmLogCrash);
+ taosSetSignal(SIGSEGV, dmLogCrash);
}
static int32_t dmParseArgs(int32_t argc, char const *argv[]) {
+ global.startTime = taosGetTimestampMs();
+
int32_t cmdEnvIndex = 0;
if (argc < 2) return 0;
+
global.envCmd = taosMemoryMalloc((argc - 1) * sizeof(char *));
memset(global.envCmd, 0, (argc - 1) * sizeof(char *));
for (int32_t i = 1; i < argc; ++i) {
diff --git a/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h b/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h
index c776beb3f0..ff32cbcb08 100644
--- a/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h
+++ b/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h
@@ -29,6 +29,7 @@ typedef struct SDnodeMgmt {
const char *name;
TdThread statusThread;
TdThread monitorThread;
+ TdThread crashReportThread;
SSingleWorker mgmtWorker;
ProcessCreateNodeFp processCreateNodeFp;
ProcessDropNodeFp processDropNodeFp;
@@ -55,6 +56,8 @@ int32_t dmStartStatusThread(SDnodeMgmt *pMgmt);
void dmStopStatusThread(SDnodeMgmt *pMgmt);
int32_t dmStartMonitorThread(SDnodeMgmt *pMgmt);
void dmStopMonitorThread(SDnodeMgmt *pMgmt);
+int32_t dmStartCrashReportThread(SDnodeMgmt *pMgmt);
+void dmStopCrashReportThread(SDnodeMgmt *pMgmt);
int32_t dmStartWorker(SDnodeMgmt *pMgmt);
void dmStopWorker(SDnodeMgmt *pMgmt);
diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmInt.c b/source/dnode/mgmt/mgmt_dnode/src/dmInt.c
index d2db1a4a62..51df293ba7 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmInt.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmInt.c
@@ -23,6 +23,9 @@ static int32_t dmStartMgmt(SDnodeMgmt *pMgmt) {
if (dmStartMonitorThread(pMgmt) != 0) {
return -1;
}
+ if (dmStartCrashReportThread(pMgmt) != 0) {
+ return -1;
+ }
return 0;
}
@@ -30,6 +33,7 @@ static void dmStopMgmt(SDnodeMgmt *pMgmt) {
pMgmt->pData->stopped = true;
dmStopMonitorThread(pMgmt);
dmStopStatusThread(pMgmt);
+ dmStopCrashReportThread(pMgmt);
}
static int32_t dmOpenMgmt(SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) {
diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
index 80c040a5e8..76c8e09b70 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
@@ -15,6 +15,7 @@
#define _DEFAULT_SOURCE
#include "dmInt.h"
+#include "thttp.h"
static void *dmStatusThreadFp(void *param) {
SDnodeMgmt *pMgmt = param;
@@ -63,6 +64,63 @@ static void *dmMonitorThreadFp(void *param) {
return NULL;
}
+static void *dmCrashReportThreadFp(void *param) {
+ SDnodeMgmt *pMgmt = param;
+ int64_t lastTime = taosGetTimestampMs();
+ setThreadName("dnode-crashReport");
+ char filepath[PATH_MAX] = {0};
+ snprintf(filepath, sizeof(filepath), "%s%s.taosdCrashLog", tsLogDir, TD_DIRSEP);
+ char *pMsg = NULL;
+ int64_t msgLen = 0;
+ TdFilePtr pFile = NULL;
+ bool truncateFile = false;
+ int32_t sleepTime = 200;
+ int32_t reportPeriodNum = 3600 * 1000 / sleepTime;;
+ int32_t loopTimes = reportPeriodNum;
+
+ while (1) {
+ if (pMgmt->pData->dropped || pMgmt->pData->stopped) break;
+ if (loopTimes++ < reportPeriodNum) {
+ taosMsleep(sleepTime);
+ continue;
+ }
+
+ taosReadCrashInfo(filepath, &pMsg, &msgLen, &pFile);
+ if (pMsg && msgLen > 0) {
+ if (taosSendHttpReport(tsTelemServer, tsSvrCrashReportUri, tsTelemPort, pMsg, msgLen, HTTP_FLAT) != 0) {
+ dError("failed to send crash report");
+ if (pFile) {
+ taosReleaseCrashLogFile(pFile, false);
+ continue;
+ }
+ } else {
+ dInfo("succeed to send crash report");
+ truncateFile = true;
+ }
+ } else {
+ dDebug("no crash info");
+ }
+
+ taosMemoryFree(pMsg);
+
+ if (pMsg && msgLen > 0) {
+ pMsg = NULL;
+ continue;
+ }
+
+ if (pFile) {
+ taosReleaseCrashLogFile(pFile, truncateFile);
+ truncateFile = false;
+ }
+
+ taosMsleep(sleepTime);
+ loopTimes = 0;
+ }
+
+ return NULL;
+}
+
+
int32_t dmStartStatusThread(SDnodeMgmt *pMgmt) {
TdThreadAttr thAttr;
taosThreadAttrInit(&thAttr);
@@ -105,6 +163,36 @@ void dmStopMonitorThread(SDnodeMgmt *pMgmt) {
}
}
+int32_t dmStartCrashReportThread(SDnodeMgmt *pMgmt) {
+ if (!tsEnableCrashReport) {
+ return 0;
+ }
+
+ TdThreadAttr thAttr;
+ taosThreadAttrInit(&thAttr);
+ taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE);
+ if (taosThreadCreate(&pMgmt->crashReportThread, &thAttr, dmCrashReportThreadFp, pMgmt) != 0) {
+ dError("failed to create crashReport thread since %s", strerror(errno));
+ return -1;
+ }
+
+ taosThreadAttrDestroy(&thAttr);
+ tmsgReportStartup("dnode-crashReport", "initialized");
+ return 0;
+}
+
+void dmStopCrashReportThread(SDnodeMgmt *pMgmt) {
+ if (!tsEnableCrashReport) {
+ return;
+ }
+
+ if (taosCheckPthreadValid(pMgmt->crashReportThread)) {
+ taosThreadJoin(pMgmt->crashReportThread, NULL);
+ taosThreadClear(&pMgmt->crashReportThread);
+ }
+}
+
+
static void dmProcessMgmtQueue(SQueueInfo *pInfo, SRpcMsg *pMsg) {
SDnodeMgmt *pMgmt = pInfo->ahandle;
int32_t code = -1;
diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmFile.c b/source/dnode/mgmt/mgmt_mnode/src/mmFile.c
index f736ffd0c8..dd05fe673a 100644
--- a/source/dnode/mgmt/mgmt_mnode/src/mmFile.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmFile.c
@@ -15,6 +15,7 @@
#define _DEFAULT_SOURCE
#include "mmInt.h"
+#include "tjson.h"
int32_t mmReadFile(const char *path, SMnodeOpt *pOption) {
int32_t code = TSDB_CODE_INVALID_JSON_FORMAT;
@@ -130,56 +131,70 @@ _OVER:
return code;
}
+static int32_t mmEncodeOption(SJson *pJson, const SMnodeOpt *pOption) {
+ if (pOption->deploy && pOption->numOfReplicas > 0) {
+ if (tjsonAddDoubleToObject(pJson, "selfIndex", pOption->selfIndex) < 0) return -1;
+
+ SJson *replicas = tjsonCreateArray();
+ if (replicas == NULL) return -1;
+ if (tjsonAddItemToObject(pJson, "replicas", replicas) < 0) return -1;
+
+ for (int32_t i = 0; i < pOption->numOfReplicas; ++i) {
+ SJson *replica = tjsonCreateObject();
+ if (replica == NULL) return -1;
+
+ const SReplica *pReplica = pOption->replicas + i;
+ if (tjsonAddDoubleToObject(replica, "id", pReplica->id) < 0) return -1;
+ if (tjsonAddStringToObject(replica, "fqdn", pReplica->fqdn) < 0) return -1;
+ if (tjsonAddDoubleToObject(replica, "port", pReplica->port) < 0) return -1;
+ if (tjsonAddItemToArray(replicas, replica) < 0) return -1;
+ }
+ }
+
+ if (tjsonAddDoubleToObject(pJson, "deployed", pOption->deploy) < 0) return -1;
+
+ return 0;
+}
+
int32_t mmWriteFile(const char *path, const SMnodeOpt *pOption) {
- char file[PATH_MAX] = {0};
- char realfile[PATH_MAX] = {0};
+ int32_t code = -1;
+ char *buffer = NULL;
+ SJson *pJson = NULL;
+ TdFilePtr pFile = NULL;
+ char file[PATH_MAX] = {0};
+ char realfile[PATH_MAX] = {0};
snprintf(file, sizeof(file), "%s%smnode.json.bak", path, TD_DIRSEP);
snprintf(realfile, sizeof(realfile), "%s%smnode.json", path, TD_DIRSEP);
- TdFilePtr pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
- if (pFile == NULL) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- dError("failed to write %s since %s", file, terrstr());
- return -1;
- }
+ terrno = TSDB_CODE_OUT_OF_MEMORY;
+ pJson = tjsonCreateObject();
+ if (pJson == NULL) goto _OVER;
+ if (mmEncodeOption(pJson, pOption) != 0) goto _OVER;
+ buffer = tjsonToString(pJson);
+ if (buffer == NULL) goto _OVER;
+ terrno = 0;
- int32_t len = 0;
- int32_t maxLen = 4096;
- char *content = taosMemoryCalloc(1, maxLen + 1);
+ pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
+ if (pFile == NULL) goto _OVER;
- len += snprintf(content + len, maxLen - len, "{\n");
- if (pOption->deploy && pOption->numOfReplicas > 0) {
- len += snprintf(content + len, maxLen - len, " \"selfIndex\": %d,\n", pOption->selfIndex);
- len += snprintf(content + len, maxLen - len, " \"replicas\": [{\n");
+ int32_t len = strlen(buffer);
+ if (taosWriteFile(pFile, buffer, len) <= 0) goto _OVER;
+ if (taosFsyncFile(pFile) < 0) goto _OVER;
- for (int32_t i = 0; i < pOption->numOfReplicas; ++i) {
- const SReplica *pReplica = pOption->replicas + i;
- if (pReplica != NULL && pReplica->id > 0) {
- len += snprintf(content + len, maxLen - len, " \"id\": %d,\n", pReplica->id);
- len += snprintf(content + len, maxLen - len, " \"fqdn\": \"%s\",\n", pReplica->fqdn);
- len += snprintf(content + len, maxLen - len, " \"port\": %u\n", pReplica->port);
- }
- if (i < pOption->numOfReplicas - 1) {
- len += snprintf(content + len, maxLen - len, " },{\n");
- } else {
- len += snprintf(content + len, maxLen - len, " }],\n");
- }
- }
- }
- len += snprintf(content + len, maxLen - len, " \"deployed\": %d\n", pOption->deploy);
- len += snprintf(content + len, maxLen - len, "}\n");
-
- taosWriteFile(pFile, content, len);
- taosFsyncFile(pFile);
taosCloseFile(&pFile);
- taosMemoryFree(content);
+ if (taosRenameFile(file, realfile) != 0) goto _OVER;
- if (taosRenameFile(file, realfile) != 0) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- dError("failed to rename %s since %s", file, terrstr());
- return -1;
+ code = 0;
+ dInfo("succeed to write mnode file:%s, deloyed:%d", realfile, pOption->deploy);
+
+_OVER:
+ if (pJson != NULL) tjsonDelete(pJson);
+ if (buffer != NULL) taosMemoryFree(buffer);
+ if (pFile != NULL) taosCloseFile(&pFile);
+
+ if (code != 0) {
+ if (terrno == 0) terrno = TAOS_SYSTEM_ERROR(errno);
+ dError("failed to write mnode file:%s since %s, deloyed:%d", realfile, terrstr(), pOption->deploy);
}
-
- dDebug("succeed to write %s, deployed:%d", realfile, pOption->deploy);
- return 0;
+ return code;
}
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
index dc32054fd7..8337fb5d10 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
@@ -15,6 +15,7 @@
#define _DEFAULT_SOURCE
#include "vmInt.h"
+#include "tjson.h"
#define MAX_CONTENT_LEN 2 * 1024 * 1024
@@ -144,65 +145,66 @@ _OVER:
return code;
}
-int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) {
- int32_t code = 0;
- char file[PATH_MAX] = {0};
- char realfile[PATH_MAX] = {0};
- snprintf(file, sizeof(file), "%s%svnodes.json.bak", pMgmt->path, TD_DIRSEP);
- snprintf(realfile, sizeof(file), "%s%svnodes.json", pMgmt->path, TD_DIRSEP);
+static int32_t vmEncodeVnodeList(SJson *pJson, SVnodeObj **ppVnodes, int32_t numOfVnodes) {
+ SJson *vnodes = tjsonCreateArray();
+ if (vnodes == NULL) return -1;
+ if (tjsonAddItemToObject(pJson, "vnodes", vnodes) < 0) return -1;
- TdFilePtr pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
- if (pFile == NULL) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- dError("failed to write %s since %s", file, terrstr());
- return -1;
- }
-
- int32_t numOfVnodes = 0;
- SVnodeObj **ppVnodes = vmGetVnodeListFromHash(pMgmt, &numOfVnodes);
- if (ppVnodes == NULL) {
- terrno = TSDB_CODE_OUT_OF_MEMORY;
- code = -1;
- dError("failed to write %s while get vnodelist", file);
- goto _OVER;
- }
-
- int32_t len = 0;
- int32_t maxLen = MAX_CONTENT_LEN;
- char *content = taosMemoryCalloc(1, maxLen + 1);
- if (content == NULL) {
- terrno = TSDB_CODE_OUT_OF_MEMORY;
- code = -1;
- dError("failed to write %s while malloc content", file);
- goto _OVER;
- }
-
- len += snprintf(content + len, maxLen - len, "{\n");
- len += snprintf(content + len, maxLen - len, " \"vnodes\": [\n");
for (int32_t i = 0; i < numOfVnodes; ++i) {
SVnodeObj *pVnode = ppVnodes[i];
if (pVnode == NULL) continue;
- len += snprintf(content + len, maxLen - len, " {\n");
- len += snprintf(content + len, maxLen - len, " \"vgId\": %d,\n", pVnode->vgId);
- len += snprintf(content + len, maxLen - len, " \"dropped\": %d,\n", pVnode->dropped);
- len += snprintf(content + len, maxLen - len, " \"vgVersion\": %d\n", pVnode->vgVersion);
- if (i < numOfVnodes - 1) {
- len += snprintf(content + len, maxLen - len, " },\n");
- } else {
- len += snprintf(content + len, maxLen - len, " }\n");
- }
+ SJson *vnode = tjsonCreateObject();
+ if (vnode == NULL) return -1;
+ if (tjsonAddDoubleToObject(vnode, "vgId", pVnode->vgId) < 0) return -1;
+ if (tjsonAddDoubleToObject(vnode, "dropped", pVnode->dropped) < 0) return -1;
+ if (tjsonAddDoubleToObject(vnode, "vgVersion", pVnode->vgVersion) < 0) return -1;
+ if (tjsonAddItemToArray(vnodes, vnode) < 0) return -1;
}
- len += snprintf(content + len, maxLen - len, " ]\n");
- len += snprintf(content + len, maxLen - len, "}\n");
+
+ return 0;
+}
+
+int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) {
+ int32_t code = -1;
+ char *buffer = NULL;
+ SJson *pJson = NULL;
+ TdFilePtr pFile = NULL;
+ SVnodeObj **ppVnodes = NULL;
+ char file[PATH_MAX] = {0};
+ char realfile[PATH_MAX] = {0};
+ snprintf(file, sizeof(file), "%s%svnodes.json.bak", pMgmt->path, TD_DIRSEP);
+ snprintf(realfile, sizeof(realfile), "%s%svnodes.json", pMgmt->path, TD_DIRSEP);
+
+ int32_t numOfVnodes = 0;
+ ppVnodes = vmGetVnodeListFromHash(pMgmt, &numOfVnodes);
+ if (ppVnodes == NULL) goto _OVER;
+
+ terrno = TSDB_CODE_OUT_OF_MEMORY;
+ pJson = tjsonCreateObject();
+ if (pJson == NULL) goto _OVER;
+ if (vmEncodeVnodeList(pJson, ppVnodes, numOfVnodes) != 0) goto _OVER;
+ buffer = tjsonToString(pJson);
+ if (buffer == NULL) goto _OVER;
terrno = 0;
-_OVER:
- taosWriteFile(pFile, content, len);
- taosFsyncFile(pFile);
- taosCloseFile(&pFile);
- taosMemoryFree(content);
+ pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
+ if (pFile == NULL) goto _OVER;
+ int32_t len = strlen(buffer);
+ if (taosWriteFile(pFile, buffer, len) <= 0) goto _OVER;
+ if (taosFsyncFile(pFile) < 0) goto _OVER;
+
+ taosCloseFile(&pFile);
+ if (taosRenameFile(file, realfile) != 0) goto _OVER;
+
+ code = 0;
+ dInfo("succeed to write vnodes file:%s, vnodes:%d", realfile, numOfVnodes);
+
+_OVER:
+ if (pJson != NULL) tjsonDelete(pJson);
+ if (buffer != NULL) taosMemoryFree(buffer);
+ if (pFile != NULL) taosCloseFile(&pFile);
if (ppVnodes != NULL) {
for (int32_t i = 0; i < numOfVnodes; ++i) {
SVnodeObj *pVnode = ppVnodes[i];
@@ -213,14 +215,9 @@ _OVER:
taosMemoryFree(ppVnodes);
}
- if (code != 0) return -1;
-
- dInfo("succeed to write %s, numOfVnodes:%d", realfile, numOfVnodes);
- code = taosRenameFile(file, realfile);
-
if (code != 0) {
- dError("failed to rename %s to %s", file, realfile);
+ if (terrno == 0) terrno = TAOS_SYSTEM_ERROR(errno);
+ dError("failed to write vnodes file:%s since %s, vnodes:%d", realfile, terrstr(), numOfVnodes);
}
-
return code;
}
\ No newline at end of file
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
index f808c67ef6..693fe97daa 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
@@ -79,6 +79,8 @@ int32_t vmOpenVnode(SVnodeMgmt *pMgmt, SWrapperCfg *pCfg, SVnode *pImpl) {
void vmCloseVnode(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
char path[TSDB_FILENAME_LEN] = {0};
+ vnodeProposeCommitOnNeed(pVnode->pImpl);
+
taosThreadRwlockWrlock(&pMgmt->lock);
taosHashRemove(pMgmt->hash, &pVnode->vgId, sizeof(int32_t));
taosThreadRwlockUnlock(&pMgmt->lock);
@@ -118,6 +120,9 @@ void vmCloseVnode(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
dInfo("vgId:%d, all vnode queues is empty", pVnode->vgId);
+ dInfo("vgId:%d, post close", pVnode->vgId);
+ vnodePostClose(pVnode->pImpl);
+
vmFreeQueue(pMgmt, pVnode);
vnodeClose(pVnode->pImpl);
pVnode->pImpl = NULL;
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
index 642ca1ebc1..cd29b11550 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
@@ -134,6 +134,13 @@ static void vmProcessSyncQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numOf
}
}
+static void vmSendResponse(SRpcMsg *pMsg) {
+ if (pMsg->info.handle) {
+ SRpcMsg rsp = {.info = pMsg->info, .code = terrno};
+ rpcSendResponse(&rsp);
+ }
+}
+
static int32_t vmPutMsgToQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg, EQueueType qtype) {
const STraceId *trace = &pMsg->info.traceId;
if (pMsg->contLen < sizeof(SMsgHead)) {
@@ -152,7 +159,9 @@ static int32_t vmPutMsgToQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg, EQueueType qtyp
if (pVnode == NULL) {
dGError("vgId:%d, msg:%p failed to put into vnode queue since %s, type:%s qtype:%d contLen:%d", pHead->vgId, pMsg,
terrstr(), TMSG_INFO(pMsg->msgType), qtype, pHead->contLen);
- return terrno != 0 ? terrno : -1;
+ terrno = (terrno != 0) ? terrno : -1;
+ vmSendResponse(pMsg);
+ return terrno;
}
switch (qtype) {
diff --git a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
index 7e85e6b722..02cd678433 100644
--- a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
+++ b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
@@ -85,6 +85,7 @@ typedef struct SDnode {
// dmEnv.c
SDnode *dmInstance();
void dmReportStartup(const char *pName, const char *pDesc);
+int64_t dmGetClusterId();
// dmMgmt.c
int32_t dmInitDnode(SDnode *pDnode);
diff --git a/source/dnode/mgmt/node_mgmt/src/dmEnv.c b/source/dnode/mgmt/node_mgmt/src/dmEnv.c
index e3bda5a3f0..1d0236c0c5 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmEnv.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmEnv.c
@@ -268,3 +268,8 @@ void dmReportStartup(const char *pName, const char *pDesc) {
tstrncpy(pStartup->desc, pDesc, TSDB_STEP_DESC_LEN);
dDebug("step:%s, %s", pStartup->name, pStartup->desc);
}
+
+int64_t dmGetClusterId() {
+ return global.data.clusterId;
+}
+
diff --git a/source/dnode/mgmt/node_mgmt/src/dmNodes.c b/source/dnode/mgmt/node_mgmt/src/dmNodes.c
index 981797834a..16931ab6df 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmNodes.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmNodes.c
@@ -109,8 +109,8 @@ static int32_t dmStartNodes(SDnode *pDnode) {
}
}
- dInfo("TDengine initialized successfully");
- dmReportStartup("TDengine", "initialized successfully");
+ dInfo("The daemon initialized successfully");
+ dmReportStartup("The daemon", "initialized successfully");
return 0;
}
@@ -142,7 +142,7 @@ int32_t dmRunDnode(SDnode *pDnode) {
while (1) {
if (pDnode->stop) {
- dInfo("TDengine is about to stop");
+ dInfo("The daemon is about to stop");
dmSetStatus(pDnode, DND_STAT_STOPPED);
dmStopNodes(pDnode);
dmCloseNodes(pDnode);
diff --git a/source/dnode/mgmt/node_util/src/dmEps.c b/source/dnode/mgmt/node_util/src/dmEps.c
index a7a63fbaca..3e2d8b53aa 100644
--- a/source/dnode/mgmt/node_util/src/dmEps.c
+++ b/source/dnode/mgmt/node_util/src/dmEps.c
@@ -15,6 +15,7 @@
#define _DEFAULT_SOURCE
#include "dmUtil.h"
+#include "tjson.h"
#include "tmisce.h"
static void dmPrintEps(SDnodeData *pData);
@@ -181,81 +182,73 @@ _OVER:
return code;
}
-int32_t dmWriteEps(SDnodeData *pData) {
- int32_t code = -1;
- char *content = NULL;
- TdFilePtr pFile = NULL;
+static int32_t dmEncodeEps(SJson *pJson, SDnodeData *pData) {
+ if (tjsonAddDoubleToObject(pJson, "dnodeId", pData->dnodeId) < 0) return -1;
+ if (tjsonAddIntegerToObject(pJson, "dnodeVer", pData->dnodeVer) < 0) return -1;
+ if (tjsonAddIntegerToObject(pJson, "clusterId", pData->clusterId) < 0) return -1;
+ if (tjsonAddDoubleToObject(pJson, "dropped", pData->dropped) < 0) return -1;
- char file[PATH_MAX] = {0};
- char realfile[PATH_MAX] = {0};
- snprintf(file, sizeof(file), "%s%sdnode%sdnode.json.bak", tsDataDir, TD_DIRSEP, TD_DIRSEP);
- snprintf(realfile, sizeof(realfile), "%s%sdnode%sdnode.json", tsDataDir, TD_DIRSEP, TD_DIRSEP);
-
- pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
- if (pFile == NULL) {
- dError("failed to open %s since %s", file, strerror(errno));
- terrno = TAOS_SYSTEM_ERROR(errno);
- goto _OVER;
- }
-
- int32_t len = 0;
- int32_t maxLen = 256 * 1024;
- content = taosMemoryCalloc(1, maxLen + 1);
-
- len += snprintf(content + len, maxLen - len, "{\n");
- len += snprintf(content + len, maxLen - len, " \"dnodeId\": %d,\n", pData->dnodeId);
- len += snprintf(content + len, maxLen - len, " \"dnodeVer\": \"%" PRId64 "\",\n", pData->dnodeVer);
- len += snprintf(content + len, maxLen - len, " \"clusterId\": \"%" PRId64 "\",\n", pData->clusterId);
- len += snprintf(content + len, maxLen - len, " \"dropped\": %d,\n", pData->dropped);
- len += snprintf(content + len, maxLen - len, " \"dnodes\": [{\n");
+ SJson *dnodes = tjsonCreateArray();
+ if (dnodes == NULL) return -1;
+ if (tjsonAddItemToObject(pJson, "dnodes", dnodes) < 0) return -1;
int32_t numOfEps = (int32_t)taosArrayGetSize(pData->dnodeEps);
for (int32_t i = 0; i < numOfEps; ++i) {
SDnodeEp *pDnodeEp = taosArrayGet(pData->dnodeEps, i);
- len += snprintf(content + len, maxLen - len, " \"id\": %d,\n", pDnodeEp->id);
- len += snprintf(content + len, maxLen - len, " \"fqdn\": \"%s\",\n", pDnodeEp->ep.fqdn);
- len += snprintf(content + len, maxLen - len, " \"port\": %u,\n", pDnodeEp->ep.port);
- len += snprintf(content + len, maxLen - len, " \"isMnode\": %d\n", pDnodeEp->isMnode);
- if (i < numOfEps - 1) {
- len += snprintf(content + len, maxLen - len, " },{\n");
- } else {
- len += snprintf(content + len, maxLen - len, " }]\n");
- }
- }
- len += snprintf(content + len, maxLen - len, "}\n");
+ SJson *dnode = tjsonCreateObject();
+ if (dnode == NULL) return -1;
- if (taosWriteFile(pFile, content, len) != len) {
- dError("failed to write %s since %s", file, strerror(errno));
- terrno = TAOS_SYSTEM_ERROR(errno);
- goto _OVER;
+ if (tjsonAddDoubleToObject(dnode, "id", pDnodeEp->id) < 0) return -1;
+ if (tjsonAddStringToObject(dnode, "fqdn", pDnodeEp->ep.fqdn) < 0) return -1;
+ if (tjsonAddDoubleToObject(dnode, "port", pDnodeEp->ep.port) < 0) return -1;
+ if (tjsonAddDoubleToObject(dnode, "isMnode", pDnodeEp->isMnode) < 0) return -1;
+ if (tjsonAddItemToArray(dnodes, dnode) < 0) return -1;
}
- if (taosFsyncFile(pFile) < 0) {
- dError("failed to fsync %s since %s", file, strerror(errno));
- terrno = TAOS_SYSTEM_ERROR(errno);
- goto _OVER;
- }
+ return 0;
+}
+
+int32_t dmWriteEps(SDnodeData *pData) {
+ int32_t code = -1;
+ char *buffer = NULL;
+ SJson *pJson = NULL;
+ TdFilePtr pFile = NULL;
+ char file[PATH_MAX] = {0};
+ char realfile[PATH_MAX] = {0};
+ snprintf(file, sizeof(file), "%s%sdnode%sdnode.json.bak", tsDataDir, TD_DIRSEP, TD_DIRSEP);
+ snprintf(realfile, sizeof(realfile), "%s%sdnode%sdnode.json", tsDataDir, TD_DIRSEP, TD_DIRSEP);
+
+ terrno = TSDB_CODE_OUT_OF_MEMORY;
+ pJson = tjsonCreateObject();
+ if (pJson == NULL) goto _OVER;
+ if (dmEncodeEps(pJson, pData) != 0) goto _OVER;
+ buffer = tjsonToString(pJson);
+ if (buffer == NULL) goto _OVER;
+ terrno = 0;
+
+ pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
+ if (pFile == NULL) goto _OVER;
+
+ int32_t len = strlen(buffer);
+ if (taosWriteFile(pFile, buffer, len) <= 0) goto _OVER;
+ if (taosFsyncFile(pFile) < 0) goto _OVER;
taosCloseFile(&pFile);
- taosMemoryFreeClear(content);
-
- if (taosRenameFile(file, realfile) != 0) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- dError("failed to rename %s since %s", file, terrstr());
- goto _OVER;
- }
+ if (taosRenameFile(file, realfile) != 0) goto _OVER;
code = 0;
pData->updateTime = taosGetTimestampMs();
- dInfo("succeed to write %s, dnodeVer:%" PRId64, realfile, pData->dnodeVer);
+ dInfo("succeed to write dnode file:%s, dnodeVer:%" PRId64, realfile, pData->dnodeVer);
_OVER:
- if (content != NULL) taosMemoryFreeClear(content);
+ if (pJson != NULL) tjsonDelete(pJson);
+ if (buffer != NULL) taosMemoryFree(buffer);
if (pFile != NULL) taosCloseFile(&pFile);
- if (code != 0) {
- dError("failed to write file %s since %s", realfile, terrstr());
- }
+ if (code != 0) {
+ if (terrno == 0) terrno = TAOS_SYSTEM_ERROR(errno);
+ dInfo("succeed to write dnode file:%s since %s, dnodeVer:%" PRId64, realfile, terrstr(), pData->dnodeVer);
+ }
return code;
}
diff --git a/source/dnode/mgmt/node_util/src/dmFile.c b/source/dnode/mgmt/node_util/src/dmFile.c
index 2eb1462efc..4dcc962a20 100644
--- a/source/dnode/mgmt/node_util/src/dmFile.c
+++ b/source/dnode/mgmt/node_util/src/dmFile.c
@@ -15,6 +15,7 @@
#define _DEFAULT_SOURCE
#include "dmUtil.h"
+#include "tjson.h"
#define MAXLEN 1024
@@ -63,56 +64,51 @@ _OVER:
return code;
}
+static int32_t dmEncodeFile(SJson *pJson, bool deployed) {
+ if (tjsonAddDoubleToObject(pJson, "deployed", deployed) < 0) return -1;
+ return 0;
+}
+
int32_t dmWriteFile(const char *path, const char *name, bool deployed) {
int32_t code = -1;
- int32_t len = 0;
- char content[MAXLEN + 1] = {0};
+ char *buffer = NULL;
+ SJson *pJson = NULL;
+ TdFilePtr pFile = NULL;
char file[PATH_MAX] = {0};
char realfile[PATH_MAX] = {0};
- TdFilePtr pFile = NULL;
-
snprintf(file, sizeof(file), "%s%s%s.json", path, TD_DIRSEP, name);
snprintf(realfile, sizeof(realfile), "%s%s%s.json", path, TD_DIRSEP, name);
+ terrno = TSDB_CODE_OUT_OF_MEMORY;
+ pJson = tjsonCreateObject();
+ if (pJson == NULL) goto _OVER;
+ if (dmEncodeFile(pJson, deployed) != 0) goto _OVER;
+ buffer = tjsonToString(pJson);
+ if (buffer == NULL) goto _OVER;
+ terrno = 0;
+
pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
- if (pFile == NULL) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- dError("failed to write %s since %s", file, terrstr());
- goto _OVER;
- }
+ if (pFile == NULL) goto _OVER;
- len += snprintf(content + len, MAXLEN - len, "{\n");
- len += snprintf(content + len, MAXLEN - len, " \"deployed\": %d\n", deployed);
- len += snprintf(content + len, MAXLEN - len, "}\n");
-
- if (taosWriteFile(pFile, content, len) != len) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- dError("failed to write file:%s since %s", file, terrstr());
- goto _OVER;
- }
-
- if (taosFsyncFile(pFile) != 0) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- dError("failed to fsync file:%s since %s", file, terrstr());
- goto _OVER;
- }
+ int32_t len = strlen(buffer);
+ if (taosWriteFile(pFile, buffer, len) <= 0) goto _OVER;
+ if (taosFsyncFile(pFile) < 0) goto _OVER;
taosCloseFile(&pFile);
+ if (taosRenameFile(file, realfile) != 0) goto _OVER;
- if (taosRenameFile(file, realfile) != 0) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- dError("failed to rename %s since %s", file, terrstr());
- return -1;
- }
-
- dInfo("succeed to write %s, deployed:%d", realfile, deployed);
code = 0;
+ dInfo("succeed to write file:%s, deloyed:%d", realfile, deployed);
_OVER:
- if (pFile != NULL) {
- taosCloseFile(&pFile);
- }
+ if (pJson != NULL) tjsonDelete(pJson);
+ if (buffer != NULL) taosMemoryFree(buffer);
+ if (pFile != NULL) taosCloseFile(&pFile);
+ if (code != 0) {
+ if (terrno == 0) terrno = TAOS_SYSTEM_ERROR(errno);
+ dError("failed to write file:%s since %s, deloyed:%d", realfile, terrstr(), deployed);
+ }
return code;
}
diff --git a/source/dnode/mnode/impl/inc/mndUser.h b/source/dnode/mnode/impl/inc/mndUser.h
index cf7deba397..8943ba703e 100644
--- a/source/dnode/mnode/impl/inc/mndUser.h
+++ b/source/dnode/mnode/impl/inc/mndUser.h
@@ -34,6 +34,8 @@ SHashObj *mndDupDbHash(SHashObj *pOld);
SHashObj *mndDupTopicHash(SHashObj *pOld);
int32_t mndValidateUserAuthInfo(SMnode *pMnode, SUserAuthVersion *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);
#ifdef __cplusplus
}
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index 87b5a5c42d..7e5c29d56f 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -1051,17 +1051,7 @@ static int32_t mndDropDb(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pDb) {
if (mndDropStreamByDb(pMnode, pTrans, pDb) != 0) goto _OVER;
if (mndDropSmasByDb(pMnode, pTrans, pDb) != 0) goto _OVER;
if (mndSetDropDbRedoActions(pMnode, pTrans, pDb) != 0) goto _OVER;
-
- SUserObj *pUser = mndAcquireUser(pMnode, pDb->createUser);
- if (pUser != NULL) {
- pUser->authVersion++;
- SSdbRaw *pCommitRaw = mndUserActionEncode(pUser);
- if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
- mError("trans:%d, failed to append redo log since %s", pTrans->id, terrstr());
- goto _OVER;
- }
- (void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY);
- }
+ if (mndUserRemoveDb(pMnode, pTrans, pDb->name) != 0) goto _OVER;
int32_t rspLen = 0;
void *pRsp = NULL;
diff --git a/source/dnode/mnode/impl/src/mndDef.c b/source/dnode/mnode/impl/src/mndDef.c
index a5f77513de..8983d73c70 100644
--- a/source/dnode/mnode/impl/src/mndDef.c
+++ b/source/dnode/mnode/impl/src/mndDef.c
@@ -167,6 +167,10 @@ void tFreeStreamObj(SStreamObj *pStream) {
taosArrayDestroy(pLevel);
}
taosArrayDestroy(pStream->tasks);
+ // tagSchema.pSchema
+ if (pStream->tagSchema.nCols > 0) {
+ taosMemoryFree(pStream->tagSchema.pSchema);
+ }
}
SMqVgEp *tCloneSMqVgEp(const SMqVgEp *pVgEp) {
diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c
index d7b16c2c8e..c7a416d444 100644
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -1050,7 +1050,7 @@ static int32_t mndRetrieveDnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
status = "offline";
}
- char b1[9] = {0};
+ char b1[16] = {0};
STR_TO_VARSTR(b1, status);
pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
colDataAppend(pColInfo, numOfRows, b1, false);
diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c
index c8c8e06c5e..9b3934c40c 100644
--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
@@ -785,9 +785,9 @@ static void mndReloadSyncConfig(SMnode *pMnode) {
int32_t code = syncReconfig(pMnode->syncMgmt.sync, &cfg);
if (code != 0) {
- mError("vgId:1, failed to reconfig mnode sync since %s", terrstr());
+ mError("vgId:1, mnode sync reconfig failed since %s", terrstr());
} else {
- mInfo("vgId:1, reconfig mnode sync success");
+ mInfo("vgId:1, mnode sync reconfig success");
}
}
}
diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
index 61374aa0bf..8a435c4887 100644
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -465,7 +465,6 @@ static int32_t mndCreateStbForStream(SMnode *pMnode, STrans *pTrans, const SStre
SMCreateStbReq createReq = {0};
tstrncpy(createReq.name, pStream->targetSTbName, TSDB_TABLE_FNAME_LEN);
createReq.numOfColumns = pStream->outputSchema.nCols;
- createReq.numOfTags = 1; // group id
createReq.pColumns = taosArrayInit(createReq.numOfColumns, sizeof(SField));
// build fields
taosArraySetSize(createReq.pColumns, createReq.numOfColumns);
@@ -476,14 +475,29 @@ static int32_t mndCreateStbForStream(SMnode *pMnode, STrans *pTrans, const SStre
pField->type = pStream->outputSchema.pSchema[i].type;
pField->bytes = pStream->outputSchema.pSchema[i].bytes;
}
- createReq.pTags = taosArrayInit(createReq.numOfTags, sizeof(SField));
- taosArraySetSize(createReq.pTags, 1);
- // build tags
- SField *pField = taosArrayGet(createReq.pTags, 0);
- strcpy(pField->name, "group_id");
- pField->type = TSDB_DATA_TYPE_UBIGINT;
- pField->flags = 0;
- pField->bytes = 8;
+
+ if (pStream->tagSchema.nCols == 0) {
+ createReq.numOfTags = 1;
+ createReq.pTags = taosArrayInit(createReq.numOfTags, sizeof(SField));
+ taosArraySetSize(createReq.pTags, createReq.numOfTags);
+ // build tags
+ SField *pField = taosArrayGet(createReq.pTags, 0);
+ strcpy(pField->name, "group_id");
+ pField->type = TSDB_DATA_TYPE_UBIGINT;
+ pField->flags = 0;
+ pField->bytes = 8;
+ } else {
+ createReq.numOfTags = pStream->tagSchema.nCols;
+ createReq.pTags = taosArrayInit(createReq.numOfTags, sizeof(SField));
+ taosArraySetSize(createReq.pTags, createReq.numOfTags);
+ for (int32_t i = 0; i < createReq.numOfTags; i++) {
+ SField *pField = taosArrayGet(createReq.pTags, i);
+ pField->bytes = pStream->tagSchema.pSchema[i].bytes;
+ pField->flags = pStream->tagSchema.pSchema[i].flags;
+ pField->type = pStream->tagSchema.pSchema[i].type;
+ tstrncpy(pField->name, pStream->tagSchema.pSchema[i].name, TSDB_COL_NAME_LEN);
+ }
+ }
if (mndCheckCreateStbReq(&createReq) != 0) {
goto _OVER;
diff --git a/source/dnode/mnode/impl/src/mndTelem.c b/source/dnode/mnode/impl/src/mndTelem.c
index b0b49b42dc..679fafa28d 100644
--- a/source/dnode/mnode/impl/src/mndTelem.c
+++ b/source/dnode/mnode/impl/src/mndTelem.c
@@ -131,7 +131,7 @@ static int32_t mndProcessTelemTimer(SRpcMsg* pReq) {
taosThreadMutexUnlock(&pMgmt->lock);
if (pCont != NULL) {
- if (taosSendHttpReport(tsTelemServer, tsTelemPort, pCont, strlen(pCont), HTTP_FLAT) != 0) {
+ if (taosSendHttpReport(tsTelemServer, tsTelemUri, tsTelemPort, pCont, strlen(pCont), HTTP_FLAT) != 0) {
mError("failed to send telemetry report");
} else {
mInfo("succeed to send telemetry report");
diff --git a/source/dnode/mnode/impl/src/mndTopic.c b/source/dnode/mnode/impl/src/mndTopic.c
index ce04c72344..96dba24566 100644
--- a/source/dnode/mnode/impl/src/mndTopic.c
+++ b/source/dnode/mnode/impl/src/mndTopic.c
@@ -604,22 +604,19 @@ _OVER:
}
static int32_t mndDropTopic(SMnode *pMnode, STrans *pTrans, SRpcMsg *pReq, SMqTopicObj *pTopic) {
+ int32_t code = -1;
+ if (mndUserRemoveTopic(pMnode, pTrans, pTopic->name) != 0) goto _OVER;
+
SSdbRaw *pCommitRaw = mndTopicActionEncode(pTopic);
- if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
- mError("trans:%d, failed to append commit log since %s", pTrans->id, terrstr());
- mndTransDrop(pTrans);
- return -1;
- }
+ if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) goto _OVER;
(void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED);
- if (mndTransPrepare(pMnode, pTrans) != 0) {
- mError("trans:%d, failed to prepare since %s", pTrans->id, terrstr());
- mndTransDrop(pTrans);
- return -1;
- }
+ if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
+ code = 0;
+_OVER:
mndTransDrop(pTrans);
- return 0;
+ return code;
}
static int32_t mndProcessDropTopicReq(SRpcMsg *pReq) {
@@ -885,6 +882,7 @@ int32_t mndCheckTopicExist(SMnode *pMnode, SDbObj *pDb) {
return 0;
}
+#if 0
int32_t mndDropTopicByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
int32_t code = 0;
SSdb *pSdb = pMnode->pSdb;
@@ -912,3 +910,4 @@ int32_t mndDropTopicByDB(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
return code;
}
+#endif
\ No newline at end of file
diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c
index efce6255fb..b965e13316 100644
--- a/source/dnode/mnode/impl/src/mndUser.c
+++ b/source/dnode/mnode/impl/src/mndUser.c
@@ -285,14 +285,35 @@ static int32_t mndUserActionInsert(SSdb *pSdb, SUserObj *pUser) {
return 0;
}
-static int32_t mndUserActionDelete(SSdb *pSdb, SUserObj *pUser) {
- mTrace("user:%s, perform delete action, row:%p", pUser->user, pUser);
+static int32_t mndUserDupObj(SUserObj *pUser, SUserObj *pNew) {
+ memcpy(pNew, pUser, sizeof(SUserObj));
+ pNew->authVersion++;
+ pNew->updateTime = taosGetTimestampMs();
+
+ taosRLockLatch(&pUser->lock);
+ pNew->readDbs = mndDupDbHash(pUser->readDbs);
+ pNew->writeDbs = mndDupDbHash(pUser->writeDbs);
+ pNew->topics = mndDupTopicHash(pUser->topics);
+ taosRUnLockLatch(&pUser->lock);
+
+ if (pNew->readDbs == NULL || pNew->writeDbs == NULL || pNew->topics == NULL) {
+ return -1;
+ }
+ return 0;
+}
+
+static void mndUserFreeObj(SUserObj *pUser) {
taosHashCleanup(pUser->readDbs);
taosHashCleanup(pUser->writeDbs);
taosHashCleanup(pUser->topics);
pUser->readDbs = NULL;
pUser->writeDbs = NULL;
pUser->topics = NULL;
+}
+
+static int32_t mndUserActionDelete(SSdb *pSdb, SUserObj *pUser) {
+ mTrace("user:%s, perform delete action, row:%p", pUser->user, pUser);
+ mndUserFreeObj(pUser);
return 0;
}
@@ -516,19 +537,7 @@ static int32_t mndProcessAlterUserReq(SRpcMsg *pReq) {
goto _OVER;
}
- memcpy(&newUser, pUser, sizeof(SUserObj));
- newUser.authVersion++;
- newUser.updateTime = taosGetTimestampMs();
-
- taosRLockLatch(&pUser->lock);
- newUser.readDbs = mndDupDbHash(pUser->readDbs);
- newUser.writeDbs = mndDupDbHash(pUser->writeDbs);
- newUser.topics = mndDupTopicHash(pUser->topics);
- taosRUnLockLatch(&pUser->lock);
-
- if (newUser.readDbs == NULL || newUser.writeDbs == NULL || newUser.topics == NULL) {
- goto _OVER;
- }
+ if (mndUserDupObj(pUser, &newUser) != 0) goto _OVER;
if (alterReq.alterType == TSDB_ALTER_USER_PASSWD) {
char pass[TSDB_PASSWORD_LEN + 1] = {0};
@@ -654,9 +663,7 @@ _OVER:
mndReleaseUser(pMnode, pOperUser);
mndReleaseUser(pMnode, pUser);
- taosHashCleanup(newUser.writeDbs);
- taosHashCleanup(newUser.readDbs);
- taosHashCleanup(newUser.topics);
+ mndUserFreeObj(&newUser);
return code;
}
@@ -884,9 +891,9 @@ static int32_t mndRetrievePrivileges(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock
db = taosHashIterate(pUser->writeDbs, NULL);
while (db != NULL) {
cols = 0;
- SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
- char userName[TSDB_USER_LEN + VARSTR_HEADER_SIZE] = {0};
+ char userName[TSDB_USER_LEN + VARSTR_HEADER_SIZE] = {0};
STR_WITH_MAXSIZE_TO_VARSTR(userName, pUser->user, pShow->pMeta->pSchemas[cols].bytes);
+ SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
colDataAppend(pColInfo, numOfRows, (const char *)userName, false);
char privilege[20] = {0};
@@ -909,9 +916,9 @@ static int32_t mndRetrievePrivileges(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock
char *topic = taosHashIterate(pUser->topics, NULL);
while (topic != NULL) {
cols = 0;
- SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
- char userName[TSDB_USER_LEN + VARSTR_HEADER_SIZE] = {0};
+ char userName[TSDB_USER_LEN + VARSTR_HEADER_SIZE] = {0};
STR_WITH_MAXSIZE_TO_VARSTR(userName, pUser->user, pShow->pMeta->pSchemas[cols].bytes);
+ SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
colDataAppend(pColInfo, numOfRows, (const char *)userName, false);
char privilege[20] = {0};
@@ -1007,3 +1014,74 @@ _OVER:
tFreeSUserAuthBatchRsp(&batchRsp);
return code;
}
+
+int32_t mndUserRemoveDb(SMnode *pMnode, STrans *pTrans, char *db) {
+ int32_t code = 0;
+ SSdb *pSdb = pMnode->pSdb;
+ int32_t len = strlen(db) + 1;
+ void *pIter = NULL;
+ SUserObj *pUser = NULL;
+ SUserObj newUser = {0};
+
+ while (1) {
+ pIter = sdbFetch(pSdb, SDB_USER, pIter, (void **)&pUser);
+ if (pIter == NULL) break;
+
+ code = -1;
+ if (mndUserDupObj(pUser, &newUser) != 0) break;
+
+ bool inRead = (taosHashGet(newUser.readDbs, db, len) != NULL);
+ bool inWrite = (taosHashGet(newUser.writeDbs, db, len) != NULL);
+ if (inRead || inWrite) {
+ (void)taosHashRemove(newUser.readDbs, db, len);
+ (void)taosHashRemove(newUser.writeDbs, db, len);
+
+ SSdbRaw *pCommitRaw = mndUserActionEncode(&newUser);
+ if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) break;
+ (void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY);
+ }
+
+ mndUserFreeObj(&newUser);
+ sdbRelease(pSdb, pUser);
+ code = 0;
+ }
+
+ if (pUser != NULL) sdbRelease(pSdb, pUser);
+ if (pIter != NULL) sdbCancelFetch(pSdb, pIter);
+ mndUserFreeObj(&newUser);
+ return code;
+}
+
+int32_t mndUserRemoveTopic(SMnode *pMnode, STrans *pTrans, char *topic) {
+ int32_t code = 0;
+ SSdb *pSdb = pMnode->pSdb;
+ int32_t len = strlen(topic) + 1;
+ void *pIter = NULL;
+ SUserObj *pUser = NULL;
+ SUserObj newUser = {0};
+
+ while (1) {
+ pIter = sdbFetch(pSdb, SDB_USER, pIter, (void **)&pUser);
+ if (pIter == NULL) break;
+
+ code = -1;
+ if (mndUserDupObj(pUser, &newUser) != 0) break;
+
+ bool inTopic = (taosHashGet(newUser.topics, topic, len) != NULL);
+ if (inTopic) {
+ (void)taosHashRemove(newUser.topics, topic, len);
+ SSdbRaw *pCommitRaw = mndUserActionEncode(&newUser);
+ if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) break;
+ (void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY);
+ }
+
+ mndUserFreeObj(&newUser);
+ sdbRelease(pSdb, pUser);
+ code = 0;
+ }
+
+ if (pUser != NULL) sdbRelease(pSdb, pUser);
+ if (pIter != NULL) sdbCancelFetch(pSdb, pIter);
+ mndUserFreeObj(&newUser);
+ return code;
+}
diff --git a/source/dnode/mnode/sdb/src/sdbFile.c b/source/dnode/mnode/sdb/src/sdbFile.c
index f43b6bdb25..9e830b83e6 100644
--- a/source/dnode/mnode/sdb/src/sdbFile.c
+++ b/source/dnode/mnode/sdb/src/sdbFile.c
@@ -243,7 +243,7 @@ static int32_t sdbReadFileImp(SSdb *pSdb) {
if (pFile == NULL) {
taosMemoryFree(pRaw);
terrno = TAOS_SYSTEM_ERROR(errno);
- mDebug("failed to read sdb file:%s since %s", file, terrstr());
+ mInfo("read sdb file:%s finished since %s", file, terrstr());
return 0;
}
@@ -636,15 +636,20 @@ int32_t sdbStartWrite(SSdb *pSdb, SSdbIter **ppIter) {
}
int32_t sdbStopWrite(SSdb *pSdb, SSdbIter *pIter, bool isApply, int64_t index, int64_t term, int64_t config) {
- int32_t code = 0;
+ int32_t code = -1;
if (!isApply) {
mInfo("sdbiter:%p, not apply to sdb", pIter);
- sdbCloseIter(pIter);
- return 0;
+ code = 0;
+ goto _OVER;
+ }
+
+ if (taosFsyncFile(pIter->file) != 0) {
+ terrno = TAOS_SYSTEM_ERROR(errno);
+ mError("sdbiter:%p, failed to fasync file %s since %s", pIter, pIter->name, terrstr());
+ goto _OVER;
}
- taosFsyncFile(pIter->file);
taosCloseFile(&pIter->file);
pIter->file = NULL;
@@ -653,14 +658,12 @@ int32_t sdbStopWrite(SSdb *pSdb, SSdbIter *pIter, bool isApply, int64_t index, i
if (taosRenameFile(pIter->name, datafile) != 0) {
terrno = TAOS_SYSTEM_ERROR(errno);
mError("sdbiter:%p, failed to rename file %s to %s since %s", pIter, pIter->name, datafile, terrstr());
- sdbCloseIter(pIter);
- return -1;
+ goto _OVER;
}
if (sdbReadFile(pSdb) != 0) {
mError("sdbiter:%p, failed to read from %s since %s", pIter, datafile, terrstr());
- sdbCloseIter(pIter);
- return -1;
+ goto _OVER;
}
if (config > 0) {
@@ -674,8 +677,11 @@ int32_t sdbStopWrite(SSdb *pSdb, SSdbIter *pIter, bool isApply, int64_t index, i
}
mInfo("sdbiter:%p, success applyed to sdb", pIter);
+ code = 0;
+
+_OVER:
sdbCloseIter(pIter);
- return 0;
+ return code;
}
int32_t sdbDoWrite(SSdb *pSdb, SSdbIter *pIter, void *pBuf, int32_t len) {
diff --git a/source/dnode/snode/src/snode.c b/source/dnode/snode/src/snode.c
index b133226ed3..860db20fa8 100644
--- a/source/dnode/snode/src/snode.c
+++ b/source/dnode/snode/src/snode.c
@@ -124,6 +124,7 @@ FAIL:
}
void sndClose(SSnode *pSnode) {
+ streamMetaCommit(pSnode->pMeta);
streamMetaClose(pSnode->pMeta);
taosMemoryFree(pSnode->path);
taosMemoryFree(pSnode);
diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index a7564e352c..b1093e0f23 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -54,7 +54,8 @@ int32_t vnodeAlter(const char *path, SAlterVnodeReplicaReq *pReq, STfs *pTfs);
void vnodeDestroy(const char *path, STfs *pTfs);
SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb);
void vnodePreClose(SVnode *pVnode);
-void vnodeSyncCheckTimeout(SVnode* pVnode);
+void vnodePostClose(SVnode *pVnode);
+void vnodeSyncCheckTimeout(SVnode *pVnode);
void vnodeClose(SVnode *pVnode);
int32_t vnodeStart(SVnode *pVnode);
@@ -88,6 +89,7 @@ int32_t vnodeProcessQueryMsg(SVnode *pVnode, SRpcMsg *pMsg);
int32_t vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo);
void vnodeProposeWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs);
void vnodeApplyWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs);
+void vnodeProposeCommitOnNeed(SVnode *pVnode);
// meta
typedef struct SMeta SMeta; // todo: remove
@@ -175,7 +177,8 @@ int32_t tsdbReaderOpen(SVnode *pVnode, SQueryTableDataCond *pCond, void *pTableL
void tsdbReaderClose(STsdbReader *pReader);
bool tsdbNextDataBlock(STsdbReader *pReader);
void tsdbRetrieveDataBlockInfo(const STsdbReader *pReader, int32_t *rows, uint64_t *uid, STimeWindow *pWindow);
-int32_t tsdbRetrieveDatablockSMA(STsdbReader *pReader, SSDataBlock* pDataBlock, bool *allHave);
+int32_t tsdbRetrieveDatablockSMA(STsdbReader *pReader, SSDataBlock *pDataBlock, bool *allHave);
+void tsdbReleaseDataBlock(STsdbReader *pReader);
SSDataBlock *tsdbRetrieveDataBlock(STsdbReader *pTsdbReadHandle, SArray *pColumnIdList);
int32_t tsdbReaderReset(STsdbReader *pReader, SQueryTableDataCond *pCond);
int32_t tsdbGetFileBlocksDistInfo(STsdbReader *pReader, STableBlockDistInfo *pTableBlockInfo);
@@ -185,7 +188,7 @@ void *tsdbGetIvtIdx(SMeta *pMeta);
uint64_t getReaderMaxVersion(STsdbReader *pReader);
int32_t tsdbCacherowsReaderOpen(void *pVnode, int32_t type, void *pTableIdList, int32_t numOfTables, int32_t numOfCols,
- uint64_t suid, void **pReader, const char* idstr);
+ uint64_t suid, void **pReader, const char *idstr);
int32_t tsdbRetrieveCacheRows(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds, SArray *pTableUids);
void *tsdbCacherowsReaderClose(void *pReader);
int32_t tsdbGetTableSchema(SVnode *pVnode, int64_t uid, STSchema **pSchema, int64_t *suid);
diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h
index acdc038299..8c8775548d 100644
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -209,10 +209,10 @@ int32_t tsdbDecmprColData(uint8_t *pIn, SBlockCol *pBlockCol, int8_t cmprAlg, in
// tsdbMemTable ==============================================================================================
// SMemTable
int32_t tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable);
-void tsdbMemTableDestroy(SMemTable *pMemTable);
+void tsdbMemTableDestroy(SMemTable *pMemTable, bool proactive);
STbData *tsdbGetTbDataFromMemTable(SMemTable *pMemTable, tb_uid_t suid, tb_uid_t uid);
-void tsdbRefMemTable(SMemTable *pMemTable);
-void tsdbUnrefMemTable(SMemTable *pMemTable);
+int32_t tsdbRefMemTable(SMemTable *pMemTable, SQueryNode *pQNode);
+int32_t tsdbUnrefMemTable(SMemTable *pMemTable, SQueryNode *pNode, bool proactive);
SArray *tsdbMemTableGetTbDataArray(SMemTable *pMemTable);
// STbDataIter
int32_t tsdbTbDataIterCreate(STbData *pTbData, TSDBKEY *pFrom, int8_t backward, STbDataIter **ppIter);
@@ -290,8 +290,8 @@ int32_t tsdbDelFReaderClose(SDelFReader **ppReader);
int32_t tsdbReadDelData(SDelFReader *pReader, SDelIdx *pDelIdx, SArray *aDelData);
int32_t tsdbReadDelIdx(SDelFReader *pReader, SArray *aDelIdx);
// tsdbRead.c ==============================================================================================
-int32_t tsdbTakeReadSnap(STsdb *pTsdb, STsdbReadSnap **ppSnap, const char *id);
-void tsdbUntakeReadSnap(STsdb *pTsdb, STsdbReadSnap *pSnap, const char *id);
+int32_t tsdbTakeReadSnap(STsdbReader *pReader, _query_reseek_func_t reseek, STsdbReadSnap **ppSnap);
+void tsdbUntakeReadSnap(STsdbReader *pReader, STsdbReadSnap *pSnap, bool proactive);
// tsdbMerge.c ==============================================================================================
int32_t tsdbMerge(STsdb *pTsdb);
@@ -371,6 +371,8 @@ struct SMemTable {
STsdb *pTsdb;
SVBufPool *pPool;
volatile int32_t nRef;
+ int64_t minVer;
+ int64_t maxVer;
TSKEY minKey;
TSKEY maxKey;
int64_t nRow;
@@ -605,9 +607,11 @@ struct SDelFWriter {
};
struct STsdbReadSnap {
- SMemTable *pMem;
- SMemTable *pIMem;
- STsdbFS fs;
+ SMemTable *pMem;
+ SQueryNode *pNode;
+ SMemTable *pIMem;
+ SQueryNode *pINode;
+ STsdbFS fs;
};
struct SDataFWriter {
@@ -726,6 +730,9 @@ void *destroyLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo);
// tsdbCache ==============================================================================================
typedef struct SCacheRowsReader {
+ STsdb *pTsdb;
+ SVersionRange verRange;
+ TdThreadMutex readerMutex;
SVnode *pVnode;
STSchema *pSchema;
uint64_t uid;
diff --git a/source/dnode/vnode/src/inc/vnd.h b/source/dnode/vnode/src/inc/vnd.h
index 28797c5361..e0d0e9408b 100644
--- a/source/dnode/vnode/src/inc/vnd.h
+++ b/source/dnode/vnode/src/inc/vnd.h
@@ -61,10 +61,19 @@ struct SVBufPoolNode {
};
struct SVBufPool {
- SVBufPool* next;
+ SVBufPool* freeNext;
+ SVBufPool* recycleNext;
+ SVBufPool* recyclePrev;
+
+ // query handle list
+ TdThreadMutex mutex;
+ int32_t nQuery;
+ SQueryNode qList;
+
SVnode* pVnode;
- TdThreadSpinlock* lock;
+ int32_t id;
volatile int32_t nRef;
+ TdThreadSpinlock* lock;
int64_t size;
uint8_t* ptr;
SVBufPoolNode* pTail;
@@ -74,6 +83,8 @@ struct SVBufPool {
int32_t vnodeOpenBufPool(SVnode* pVnode);
int32_t vnodeCloseBufPool(SVnode* pVnode);
void vnodeBufPoolReset(SVBufPool* pPool);
+void vnodeBufPoolAddToFreeList(SVBufPool* pPool);
+int32_t vnodeBufPoolRecycle(SVBufPool* pPool);
// vnodeQuery.c
int32_t vnodeQueryOpen(SVnode* pVnode);
@@ -86,6 +97,7 @@ int32_t vnodeGetBatchMeta(SVnode* pVnode, SRpcMsg* pMsg);
// vnodeCommit.c
int32_t vnodeBegin(SVnode* pVnode);
int32_t vnodeShouldCommit(SVnode* pVnode);
+void vnodeUpdCommitSched(SVnode* pVnode);
void vnodeRollback(SVnode* pVnode);
int32_t vnodeSaveInfo(const char* dir, const SVnodeInfo* pCfg);
int32_t vnodeCommitInfo(const char* dir, const SVnodeInfo* pInfo);
@@ -98,10 +110,12 @@ bool vnodeShouldRollback(SVnode* pVnode);
int32_t vnodeSyncOpen(SVnode* pVnode, char* path);
int32_t vnodeSyncStart(SVnode* pVnode);
void vnodeSyncPreClose(SVnode* pVnode);
+void vnodeSyncPostClose(SVnode* pVnode);
void vnodeSyncClose(SVnode* pVnode);
void vnodeRedirectRpcMsg(SVnode* pVnode, SRpcMsg* pMsg, int32_t code);
bool vnodeIsLeader(SVnode* pVnode);
bool vnodeIsRoleLeader(SVnode* pVnode);
+int vnodeShouldCommit(SVnode* pVnode);
#ifdef __cplusplus
}
diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 3cfa0d89f3..848f3d8fcc 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -76,6 +76,7 @@ typedef struct SRSmaSnapReader SRSmaSnapReader;
typedef struct SRSmaSnapWriter SRSmaSnapWriter;
typedef struct SSnapDataHdr SSnapDataHdr;
typedef struct SCommitInfo SCommitInfo;
+typedef struct SQueryNode SQueryNode;
#define VNODE_META_DIR "meta"
#define VNODE_TSDB_DIR "tsdb"
@@ -87,17 +88,29 @@ typedef struct SCommitInfo SCommitInfo;
#define VNODE_RSMA1_DIR "rsma1"
#define VNODE_RSMA2_DIR "rsma2"
+#define VNODE_BUFPOOL_SEGMENTS 3
+
#define VND_INFO_FNAME "vnode.json"
// vnd.h
+typedef int32_t (*_query_reseek_func_t)(void* pQHandle);
+struct SQueryNode {
+ SQueryNode* pNext;
+ SQueryNode** ppNext;
+ void* pQHandle;
+ _query_reseek_func_t reseek;
+};
void* vnodeBufPoolMalloc(SVBufPool* pPool, int size);
void* vnodeBufPoolMallocAligned(SVBufPool* pPool, int size);
void vnodeBufPoolFree(SVBufPool* pPool, void* p);
void vnodeBufPoolRef(SVBufPool* pPool);
-void vnodeBufPoolUnRef(SVBufPool* pPool);
+void vnodeBufPoolUnRef(SVBufPool* pPool, bool proactive);
int vnodeDecodeInfo(uint8_t* pData, SVnodeInfo* pInfo);
+int32_t vnodeBufPoolRegisterQuery(SVBufPool* pPool, SQueryNode* pQNode);
+void vnodeBufPoolDeregisterQuery(SVBufPool* pPool, SQueryNode* pQNode, bool proactive);
+
// meta
typedef struct SMCtbCursor SMCtbCursor;
typedef struct SMStbCursor SMStbCursor;
@@ -328,17 +341,30 @@ struct STsdbKeepCfg {
int32_t keep2;
};
+typedef struct SVCommitSched {
+ int64_t commitMs;
+ int64_t maxWaitMs;
+} SVCommitSched;
+
struct SVnode {
- char* path;
- SVnodeCfg config;
- SVState state;
- SVStatis statis;
- STfs* pTfs;
- SMsgCb msgCb;
+ char* path;
+ SVnodeCfg config;
+ SVState state;
+ SVStatis statis;
+ STfs* pTfs;
+ SMsgCb msgCb;
+
+ // Buffer Pool
TdThreadMutex mutex;
TdThreadCond poolNotEmpty;
- SVBufPool* pPool;
+ SVBufPool* aBufPool[VNODE_BUFPOOL_SEGMENTS];
+ SVBufPool* freeList;
SVBufPool* inUse;
+ SVBufPool* onCommit;
+ SVBufPool* recycleHead;
+ SVBufPool* recycleTail;
+ SVBufPool* onRecycle;
+
SMeta* pMeta;
SSma* pSma;
STsdb* pTsdb;
@@ -346,6 +372,7 @@ struct SVnode {
STQ* pTq;
SSink* pSink;
tsem_t canCommit;
+ SVCommitSched commitSched;
int64_t sync;
TdThreadMutex lock;
bool blocked;
diff --git a/source/dnode/vnode/src/meta/metaCache.c b/source/dnode/vnode/src/meta/metaCache.c
index 893bf1b496..85d8f031fb 100644
--- a/source/dnode/vnode/src/meta/metaCache.c
+++ b/source/dnode/vnode/src/meta/metaCache.c
@@ -55,8 +55,8 @@ struct SMetaCache {
// query cache
struct STagFilterResCache {
TdThreadMutex lock;
- SHashObj* pTableEntry;
- SLRUCache* pUidResCache;
+ SHashObj* pTableEntry;
+ SLRUCache* pUidResCache;
} sTagFilterResCache;
};
@@ -563,13 +563,13 @@ int32_t metaUidFilterCachePut(SMeta* pMeta, uint64_t suid, const void* pKey, int
}
// add to cache.
- taosLRUCacheInsert(pCache, buf, sizeof(uint64_t) + keyLen, pPayload, payloadLen, freePayload, NULL,
- TAOS_LRU_PRIORITY_LOW);
+ int32_t ret = taosLRUCacheInsert(pCache, buf, sizeof(uint64_t) + keyLen, pPayload, payloadLen, freePayload, NULL,
+ TAOS_LRU_PRIORITY_LOW);
taosThreadMutexUnlock(pLock);
- metaDebug("vgId:%d, suid:%" PRIu64 " list cache added into cache, total:%d, tables:%d", TD_VID(pMeta->pVnode), suid,
- (int32_t)taosLRUCacheGetUsage(pCache), taosHashGetSize(pTableEntry));
+ metaDebug("vgId:%d, suid:%" PRIu64 " list cache added into cache, total:%d, tables:%d, ret:%d", TD_VID(pMeta->pVnode),
+ suid, (int32_t)taosLRUCacheGetUsage(pCache), taosHashGetSize(pTableEntry), ret);
return TSDB_CODE_SUCCESS;
}
diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c
index a78239eb56..609ffc58c3 100644
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
@@ -203,6 +203,7 @@ _err:
int metaClose(SMeta *pMeta) {
if (pMeta) {
+ if (pMeta->pEnv) tdbAbort(pMeta->pEnv, pMeta->txn);
if (pMeta->pCache) metaCacheClose(pMeta);
if (pMeta->pIdx) metaCloseIdx(pMeta);
if (pMeta->pStreamDb) tdbTbClose(pMeta->pStreamDb);
diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index 0697f68f89..def5dc22b3 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -653,8 +653,10 @@ int32_t metaGetTbTSchemaEx(SMeta *pMeta, tb_uid_t suid, tb_uid_t uid, int32_t sv
}
if (c == 0) {
- metaError("meta/query: incorrect c: %" PRId32 ".", c);
+ metaULock(pMeta);
+ tdbTbcClose(pSkmDbC);
code = TSDB_CODE_FAILED;
+ metaError("meta/query: incorrect c: %" PRId32 ".", c);
goto _exit;
}
diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index a9317abf2b..6782edf1a7 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -343,12 +343,17 @@ int metaAlterSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL);
ret = tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = pReq->suid, .version = oversion}), sizeof(STbDbKey), &c);
if (!(ret == 0 && c == 0)) {
+ tdbTbcClose(pUidIdxc);
+ tdbTbcClose(pTbDbc);
+
+ terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
metaError("meta/table: invalide ret: %" PRId32 " or c: %" PRId32 "alter stb failed.", ret, c);
return -1;
}
ret = tdbTbcGet(pTbDbc, NULL, NULL, &pData, &nData);
if (ret < 0) {
+ tdbTbcClose(pUidIdxc);
tdbTbcClose(pTbDbc);
terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
@@ -926,6 +931,7 @@ static int metaAlterTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pAl
tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL);
tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c);
if (c != 0) {
+ tdbTbcClose(pUidIdxc);
metaError("meta/table: invalide c: %" PRId32 " alt tb column failed.", c);
return -1;
}
@@ -939,6 +945,8 @@ static int metaAlterTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pAl
tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL);
tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c);
if (c != 0) {
+ tdbTbcClose(pUidIdxc);
+ tdbTbcClose(pTbDbc);
metaError("meta/table: invalide c: %" PRId32 " alt tb column failed.", c);
return -1;
}
@@ -952,6 +960,8 @@ static int metaAlterTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pAl
tDecoderInit(&dc, entry.pBuf, nData);
ret = metaDecodeEntry(&dc, &entry);
if (ret != 0) {
+ tdbTbcClose(pUidIdxc);
+ tdbTbcClose(pTbDbc);
tDecoderClear(&dc);
metaError("meta/table: invalide ret: %" PRId32 " alt tb column failed.", ret);
return -1;
@@ -1132,6 +1142,8 @@ static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pA
tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL);
tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c);
if (c != 0) {
+ tdbTbcClose(pUidIdxc);
+ terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
metaError("meta/table: invalide c: %" PRId32 " update tb tag val failed.", c);
return -1;
}
@@ -1148,6 +1160,9 @@ static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pA
tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL);
tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c);
if (c != 0) {
+ tdbTbcClose(pUidIdxc);
+ tdbTbcClose(pTbDbc);
+ terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
metaError("meta/table: invalide c: %" PRId32 " update tb tag val failed.", c);
return -1;
}
@@ -1309,6 +1324,7 @@ static int metaUpdateTableOptions(SMeta *pMeta, int64_t version, SVAlterTbReq *p
tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL);
tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c);
if (c != 0) {
+ tdbTbcClose(pUidIdxc);
metaError("meta/table: invalide c: %" PRId32 " update tb options failed.", c);
return -1;
}
@@ -1322,6 +1338,8 @@ static int metaUpdateTableOptions(SMeta *pMeta, int64_t version, SVAlterTbReq *p
tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL);
tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c);
if (c != 0) {
+ tdbTbcClose(pUidIdxc);
+ tdbTbcClose(pTbDbc);
metaError("meta/table: invalide c: %" PRId32 " update tb options failed.", c);
return -1;
}
@@ -1336,6 +1354,8 @@ static int metaUpdateTableOptions(SMeta *pMeta, int64_t version, SVAlterTbReq *p
ret = metaDecodeEntry(&dc, &entry);
if (ret != 0) {
tDecoderClear(&dc);
+ tdbTbcClose(pUidIdxc);
+ tdbTbcClose(pTbDbc);
metaError("meta/table: invalide ret: %" PRId32 " alt tb options failed.", ret);
return -1;
}
diff --git a/source/dnode/vnode/src/sma/smaCommit.c b/source/dnode/vnode/src/sma/smaCommit.c
index 0aa20e9e1d..38f04bb8e8 100644
--- a/source/dnode/vnode/src/sma/smaCommit.c
+++ b/source/dnode/vnode/src/sma/smaCommit.c
@@ -239,6 +239,11 @@ static int32_t tdProcessRSmaAsyncCommitImpl(SSma *pSma, SCommitInfo *pInfo) {
int32_t lino = 0;
SVnode *pVnode = pSma->pVnode;
+ SSmaEnv *pSmaEnv = SMA_RSMA_ENV(pSma);
+ if (!pSmaEnv) {
+ goto _exit;
+ }
+
code = tdRSmaFSCommit(pSma);
TSDB_CHECK_CODE(code, lino, _exit);
diff --git a/source/dnode/vnode/src/sma/smaOpen.c b/source/dnode/vnode/src/sma/smaOpen.c
index ed33e0fd7b..21c2839943 100644
--- a/source/dnode/vnode/src/sma/smaOpen.c
+++ b/source/dnode/vnode/src/sma/smaOpen.c
@@ -148,10 +148,6 @@ int32_t smaOpen(SVnode *pVnode, int8_t rollback) {
SMA_OPEN_RSMA_IMPL(pVnode, 1);
} else if (i == TSDB_RETENTION_L2) {
SMA_OPEN_RSMA_IMPL(pVnode, 2);
- } else {
- code = TSDB_CODE_APP_ERROR;
- smaError("vgId:%d, sma open failed since %s, level:%d", TD_VID(pVnode), tstrerror(code), i);
- TSDB_CHECK_CODE(code, lino, _exit);
}
}
diff --git a/source/dnode/vnode/src/sma/smaSnapshot.c b/source/dnode/vnode/src/sma/smaSnapshot.c
index c68525a493..de3d93395a 100644
--- a/source/dnode/vnode/src/sma/smaSnapshot.c
+++ b/source/dnode/vnode/src/sma/smaSnapshot.c
@@ -237,8 +237,8 @@ int32_t rsmaSnapRead(SRSmaSnapReader* pReader, uint8_t** ppData) {
_exit:
if (code) {
- rsmaSnapReaderClose(&pReader);
smaError("vgId:%d, vnode snapshot rsma read failed since %s", SMA_VID(pReader->pSma), tstrerror(code));
+ rsmaSnapReaderClose(&pReader);
} else {
smaInfo("vgId:%d, vnode snapshot rsma read succeed", SMA_VID(pReader->pSma));
}
@@ -432,7 +432,7 @@ _exit:
if (pInFD) taosCloseFile(&pInFD);
smaError("vgId:%d, vnode snapshot rsma writer close failed since %s", SMA_VID(pSma), tstrerror(code));
} else {
- smaInfo("vgId:%d, vnode snapshot rsma writer close succeed", SMA_VID(pSma));
+ smaInfo("vgId:%d, vnode snapshot rsma writer close succeed", pSma ? SMA_VID(pSma) : 0);
}
return code;
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 141f79ee41..a27b6988c5 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -725,6 +725,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg) {
int32_t tqProcessDeleteSubReq(STQ* pTq, int64_t version, char* msg, int32_t msgLen) {
SMqVDeleteReq* pReq = (SMqVDeleteReq*)msg;
+ tqDebug("vgId:%d, tq process delete sub req %s", pTq->pVnode->config.vgId, pReq->subKey);
+
taosWLockLatch(&pTq->pushLock);
int32_t code = taosHashRemove(pTq->pPushMgr, pReq->subKey, strlen(pReq->subKey));
if (code != 0) {
@@ -791,6 +793,9 @@ int32_t tqProcessSubscribeReq(STQ* pTq, int64_t version, char* msg, int32_t msgL
SMqRebVgReq req = {0};
tDecodeSMqRebVgReq(msg, &req);
// todo lock
+
+ tqDebug("vgId:%d, tq process sub req %s", pTq->pVnode->config.vgId, req.subKey);
+
STqHandle* pHandle = taosHashGet(pTq->pHandle, req.subKey, strlen(req.subKey));
if (pHandle == NULL) {
if (req.oldConsumerId != -1) {
@@ -881,6 +886,9 @@ int32_t tqProcessSubscribeReq(STQ* pTq, int64_t version, char* msg, int32_t msgL
atomic_store_64(&pHandle->consumerId, req.newConsumerId);
atomic_add_fetch_32(&pHandle->epoch, 1);
taosMemoryFree(req.qmsg);
+ if (pHandle->execHandle.subType == TOPIC_SUB_TYPE__COLUMN) {
+ qStreamCloseTsdbReader(pHandle->execHandle.task);
+ }
if (tqMetaSaveHandle(pTq, req.subKey, pHandle) < 0) {
}
// close handle
diff --git a/source/dnode/vnode/src/tq/tqCommit.c b/source/dnode/vnode/src/tq/tqCommit.c
index dabd97a345..7fc66c4919 100644
--- a/source/dnode/vnode/src/tq/tqCommit.c
+++ b/source/dnode/vnode/src/tq/tqCommit.c
@@ -15,4 +15,11 @@
#include "tq.h"
-int tqCommit(STQ* pTq) { return tqOffsetCommitFile(pTq->pOffsetStore); }
+int tqCommit(STQ* pTq) {
+ if (streamMetaCommit(pTq->pStreamMeta) < 0) {
+ tqError("vgId:%d, failed to commit stream meta since %s", TD_VID(pTq->pVnode), terrstr());
+ return -1;
+ }
+
+ return tqOffsetCommitFile(pTq->pOffsetStore);
+}
diff --git a/source/dnode/vnode/src/tq/tqSink.c b/source/dnode/vnode/src/tq/tqSink.c
index 75c0c0659e..cc60283c58 100644
--- a/source/dnode/vnode/src/tq/tqSink.c
+++ b/source/dnode/vnode/src/tq/tqSink.c
@@ -323,6 +323,70 @@ void tqSinkToTablePipeline(SStreamTask* pTask, void* vnode, int64_t ver, void* d
taosArrayDestroy(tagArray);
}
+static int32_t encodeCreateChildTableForRPC(SVCreateTbReq* req, int32_t vgId, void** pBuf, int32_t* contLen) {
+ int32_t ret = 0;
+ SVCreateTbBatchReq reqs = {0};
+
+ reqs.pArray = taosArrayInit(1, sizeof(struct SVCreateTbReq));
+ if (NULL == reqs.pArray) {
+ ret = -1;
+ goto end;
+ }
+ taosArrayPush(reqs.pArray, req);
+ reqs.nReqs = 1;
+
+ tEncodeSize(tEncodeSVCreateTbBatchReq, &reqs, *contLen, ret);
+ if (ret < 0) {
+ ret = -1;
+ goto end;
+ }
+ *contLen += sizeof(SMsgHead);
+ *pBuf = rpcMallocCont(*contLen);
+ if (NULL == *pBuf) {
+ ret = -1;
+ goto end;
+ }
+ ((SMsgHead*)(*pBuf))->vgId = vgId;
+ ((SMsgHead*)(*pBuf))->contLen = htonl(*contLen);
+ SEncoder coder = {0};
+ tEncoderInit(&coder, POINTER_SHIFT(*pBuf, sizeof(SMsgHead)), (*contLen) - sizeof(SMsgHead) );
+ if (tEncodeSVCreateTbBatchReq(&coder, &reqs) < 0) {
+ rpcFreeCont(*pBuf);
+ *pBuf = NULL;
+ *contLen = 0;
+ tEncoderClear(&coder);
+ ret = -1;
+ goto end;
+ }
+ tEncoderClear(&coder);
+
+end:
+ taosArrayDestroy(reqs.pArray);
+ return ret;
+}
+
+int32_t tqPutReqToQueue(SVnode* pVnode, SVCreateTbReq* pReq) {
+ void* buf = NULL;
+ int32_t tlen = 0;
+ encodeCreateChildTableForRPC(pReq, TD_VID(pVnode), &buf, &tlen);
+
+ SRpcMsg msg = {
+ .msgType = TDMT_VND_CREATE_TABLE,
+ .pCont = buf,
+ .contLen = tlen,
+ };
+
+ if (tmsgPutToQueue(&pVnode->msgCb, WRITE_QUEUE, &msg) != 0) {
+ tqError("failed to put into write-queue since %s", terrstr());
+ }
+
+ return TSDB_CODE_SUCCESS;
+
+_error:
+ terrno = TSDB_CODE_OUT_OF_MEMORY;
+ tqError("failed to encode submit req since %s", terrstr());
+ return TSDB_CODE_OUT_OF_MEMORY;
+}
void tqSinkToTablePipeline2(SStreamTask* pTask, void* vnode, int64_t ver, void* data) {
const SArray* pBlocks = (const SArray*)data;
SVnode* pVnode = (SVnode*)vnode;
@@ -339,12 +403,9 @@ void tqSinkToTablePipeline2(SStreamTask* pTask, void* vnode, int64_t ver, void*
SArray* tagArray = NULL;
SArray* pVals = NULL;
- if (!(tagArray = taosArrayInit(1, sizeof(STagVal)))) {
- goto _end;
- }
-
for (int32_t i = 0; i < blockSz; i++) {
SSDataBlock* pDataBlock = taosArrayGet(pBlocks, i);
+ int32_t rows = pDataBlock->info.rows;
if (pDataBlock->info.type == STREAM_DELETE_RESULT) {
SBatchDeleteReq deleteReq = {0};
deleteReq.deleteReqs = taosArrayInit(0, sizeof(SSingleDeleteReq));
@@ -380,9 +441,98 @@ void tqSinkToTablePipeline2(SStreamTask* pTask, void* vnode, int64_t ver, void*
if (tmsgPutToQueue(&pVnode->msgCb, WRITE_QUEUE, &msg) != 0) {
tqDebug("failed to put delete req into write-queue since %s", terrstr());
}
+ } else if (pDataBlock->info.type == STREAM_CREATE_CHILD_TABLE) {
+ for (int32_t rowId = 0; rowId < rows; rowId++) {
+ SVCreateTbReq* pCreateTbReq = taosMemoryCalloc(1, sizeof(SVCreateStbReq));
+ if (!pCreateTbReq) {
+ goto _end;
+ }
+
+ // set const
+ pCreateTbReq->flags = 0;
+ pCreateTbReq->type = TSDB_CHILD_TABLE;
+ pCreateTbReq->ctb.suid = suid;
+
+ // set super table name
+ SName name = {0};
+ tNameFromString(&name, stbFullName, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);
+ pCreateTbReq->ctb.stbName = strdup((char*)tNameGetTableName(&name)); // strdup(stbFullName);
+
+ // set tag content
+ int32_t size = taosArrayGetSize(pDataBlock->pDataBlock);
+ if (size == 2) {
+ tagArray = taosArrayInit(1, sizeof(STagVal));
+ if (!tagArray) {
+ goto _end;
+ }
+ STagVal tagVal = {
+ .cid = pTSchema->numOfCols + 1,
+ .type = TSDB_DATA_TYPE_UBIGINT,
+ .i64 = (int64_t)pDataBlock->info.id.groupId,
+ };
+ taosArrayPush(tagArray, &tagVal);
+
+ // set tag name
+ SArray* tagName = taosArrayInit(1, TSDB_COL_NAME_LEN);
+ char tagNameStr[TSDB_COL_NAME_LEN] = "group_id";
+ taosArrayPush(tagName, tagNameStr);
+ pCreateTbReq->ctb.tagName = tagName;
+ } else {
+ tagArray = taosArrayInit(size - 1, sizeof(STagVal));
+ if (!tagArray) {
+ goto _end;
+ }
+ for (int32_t tagId = UD_TAG_COLUMN_INDEX, step = 1; tagId < size; tagId++, step++) {
+ SColumnInfoData* pTagData = taosArrayGet(pDataBlock->pDataBlock, tagId);
+ STagVal tagVal = {
+ .cid = pTSchema->numOfCols + step,
+ .type = pTagData->info.type,
+ };
+ void* pData = colDataGetData(pTagData, rowId);
+ if (colDataIsNull_s(pTagData, rowId)) {
+ tagVal.type = TSDB_DATA_TYPE_NULL;
+ tagVal.pData = NULL;
+ tagVal.nData = 0;
+ } else if (IS_VAR_DATA_TYPE(pTagData->info.type)) {
+ tagVal.nData = varDataLen(pData);
+ tagVal.pData = varDataVal(pData);
+ } else {
+ memcpy(&tagVal.i64, pData, pTagData->info.bytes);
+ }
+ taosArrayPush(tagArray, &tagVal);
+ }
+ }
+ pCreateTbReq->ctb.tagNum = taosArrayGetSize(tagArray);
+
+ STag* pTag = NULL;
+ tTagNew(tagArray, 1, false, &pTag);
+ tagArray = taosArrayDestroy(tagArray);
+ if (pTag == NULL) {
+ terrno = TSDB_CODE_OUT_OF_MEMORY;
+ goto _end;
+ }
+ pCreateTbReq->ctb.pTag = (uint8_t*)pTag;
+
+ // set table name
+ SColumnInfoData* pTbColInfo = taosArrayGet(pDataBlock->pDataBlock, UD_TABLE_NAME_COLUMN_INDEX);
+ if (colDataIsNull_s(pTbColInfo, rowId)) {
+ SColumnInfoData* pGpIdColInfo = taosArrayGet(pDataBlock->pDataBlock, UD_GROUPID_COLUMN_INDEX);
+ void* pGpIdData = colDataGetData(pGpIdColInfo, rowId);
+ pCreateTbReq->name = buildCtbNameByGroupId(stbFullName, *(uint64_t*)pGpIdData);
+ } else {
+ void* pTbData = colDataGetData(pTbColInfo, rowId);
+ pCreateTbReq->name = taosMemoryCalloc(1, varDataLen(pTbData) + 1);
+ memcpy(pCreateTbReq->name, varDataVal(pTbData), varDataLen(pTbData));
+ }
+
+ if (tqPutReqToQueue(pVnode, pCreateTbReq) != TSDB_CODE_SUCCESS) {
+ goto _end;
+ }
+ tdDestroySVCreateTbReq(pCreateTbReq);
+ taosMemoryFreeClear(pCreateTbReq);
+ }
} else {
SSubmitTbData tbData = {0};
- int32_t rows = pDataBlock->info.rows;
tqDebug("tq sink pipe2, convert block1 %d, rows: %d", i, rows);
if (!(tbData.aRowP = taosArrayInit(rows, sizeof(SRow*)))) {
@@ -394,6 +544,7 @@ void tqSinkToTablePipeline2(SStreamTask* pTask, void* vnode, int64_t ver, void*
tbData.sver = pTSchema->version;
char* ctbName = NULL;
+ tqDebug("vgId:%d, stream write into %s, table auto created", TD_VID(pVnode), pDataBlock->info.parTbName);
if (pDataBlock->info.parTbName[0]) {
ctbName = strdup(pDataBlock->info.parTbName);
} else {
@@ -423,7 +574,10 @@ void tqSinkToTablePipeline2(SStreamTask* pTask, void* vnode, int64_t ver, void*
pCreateTbReq->ctb.stbName = strdup((char*)tNameGetTableName(&name)); // strdup(stbFullName);
// set tag content
- taosArrayClear(tagArray);
+ tagArray = taosArrayInit(1, sizeof(STagVal));
+ if (!tagArray) {
+ goto _end;
+ }
STagVal tagVal = {
.cid = taosArrayGetSize(pDataBlock->pDataBlock) + 1,
.type = TSDB_DATA_TYPE_UBIGINT,
@@ -434,6 +588,7 @@ void tqSinkToTablePipeline2(SStreamTask* pTask, void* vnode, int64_t ver, void*
STag* pTag = NULL;
tTagNew(tagArray, 1, false, &pTag);
+ tagArray = taosArrayDestroy(tagArray);
if (pTag == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
goto _end;
diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index c7b36ebb22..d18014c37b 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -1153,6 +1153,8 @@ static int32_t nextRowIterGet(CacheNextRowIter *pIter, TSDBROW **ppRow) {
iMax[nMax] = i;
max[nMax++] = pIter->input[i].pRow;
+ } else {
+ pIter->input[i].next = false;
}
}
}
diff --git a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
index 9f48125638..6a5acecfc3 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
@@ -109,6 +109,8 @@ int32_t tsdbCacherowsReaderOpen(void* pVnode, int32_t type, void* pTableIdList,
p->type = type;
p->pVnode = pVnode;
+ p->pTsdb = p->pVnode->pTsdb;
+ p->verRange = (SVersionRange){.minVer = 0, .maxVer = UINT64_MAX};
p->numOfCols = numOfCols;
p->suid = suid;
@@ -145,6 +147,7 @@ int32_t tsdbCacherowsReaderOpen(void* pVnode, int32_t type, void* pTableIdList,
}
p->idstr = taosMemoryStrDup(idstr);
+ taosThreadMutexInit(&p->readerMutex, NULL);
*pReader = p;
return TSDB_CODE_SUCCESS;
@@ -164,7 +167,9 @@ void* tsdbCacherowsReaderClose(void* pReader) {
destroyLastBlockLoadInfo(p->pLoadInfo);
- taosMemoryFree((void*) p->idstr);
+ taosMemoryFree((void*)p->idstr);
+ taosThreadMutexDestroy(&p->readerMutex);
+
taosMemoryFree(pReader);
return NULL;
}
@@ -199,6 +204,27 @@ static void freeItem(void* pItem) {
}
}
+static int32_t tsdbCacheQueryReseek(void* pQHandle) {
+ int32_t code = 0;
+ SCacheRowsReader* pReader = pQHandle;
+
+ code = taosThreadMutexTryLock(&pReader->readerMutex);
+ if (code == 0) {
+ // pause current reader's state if not paused, save ts & version for resuming
+ // just wait for the big all tables' snapshot untaking for now
+
+ code = TSDB_CODE_VND_QUERY_BUSY;
+
+ taosThreadMutexUnlock(&pReader->readerMutex);
+
+ return code;
+ } else if (code == EBUSY) {
+ return TSDB_CODE_VND_QUERY_BUSY;
+ } else {
+ return -1;
+ }
+}
+
int32_t tsdbRetrieveCacheRows(void* pReader, SSDataBlock* pResBlock, const int32_t* slotIds, SArray* pTableUidList) {
if (pReader == NULL || pResBlock == NULL) {
return TSDB_CODE_INVALID_PARA;
@@ -241,7 +267,8 @@ int32_t tsdbRetrieveCacheRows(void* pReader, SSDataBlock* pResBlock, const int32
taosArrayPush(pLastCols, &p);
}
- tsdbTakeReadSnap(pr->pVnode->pTsdb, &pr->pReadSnap, "cache-l");
+ taosThreadMutexLock(&pr->readerMutex);
+ tsdbTakeReadSnap((STsdbReader*)pr, tsdbCacheQueryReseek, &pr->pReadSnap);
pr->pDataFReader = NULL;
pr->pDataFReaderLast = NULL;
@@ -355,8 +382,9 @@ _end:
tsdbDataFReaderClose(&pr->pDataFReaderLast);
tsdbDataFReaderClose(&pr->pDataFReader);
- tsdbUntakeReadSnap(pr->pVnode->pTsdb, pr->pReadSnap, "cache-l");
resetLastBlockLoadInfo(pr->pLoadInfo);
+ tsdbUntakeReadSnap((STsdbReader*)pr, pr->pReadSnap, true);
+ taosThreadMutexUnlock(&pr->readerMutex);
for (int32_t j = 0; j < pr->numOfCols; ++j) {
taosMemoryFree(pRes[j]);
diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c
index 92451dcf58..d15f848cfd 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
@@ -175,7 +175,7 @@ int32_t tsdbCommit(STsdb *pTsdb, SCommitInfo *pInfo) {
pTsdb->imem = NULL;
taosThreadRwlockUnlock(&pTsdb->rwLock);
- tsdbUnrefMemTable(pMemTable);
+ tsdbUnrefMemTable(pMemTable, NULL, true);
goto _exit;
}
@@ -1664,7 +1664,7 @@ int32_t tsdbFinishCommit(STsdb *pTsdb) {
// unlock
taosThreadRwlockUnlock(&pTsdb->rwLock);
if (pMemTable) {
- tsdbUnrefMemTable(pMemTable);
+ tsdbUnrefMemTable(pMemTable, NULL, true);
}
_exit:
diff --git a/source/dnode/vnode/src/tsdb/tsdbMemTable.c b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
index 953b4884a3..d68afbed1f 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMemTable.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
@@ -22,10 +22,10 @@
#define SL_NODE_SIZE(l) (sizeof(SMemSkipListNode) + ((l) << 4))
#define SL_NODE_FORWARD(n, l) ((n)->forwards[l])
#define SL_NODE_BACKWARD(n, l) ((n)->forwards[(n)->level + (l)])
-#define SL_GET_NODE_FORWARD(n, l) ((SMemSkipListNode *)atomic_load_64((int64_t *)&SL_NODE_FORWARD(n, l)))
-#define SL_GET_NODE_BACKWARD(n, l) ((SMemSkipListNode *)atomic_load_64((int64_t *)&SL_NODE_BACKWARD(n, l)))
-#define SL_SET_NODE_FORWARD(n, l, p) atomic_store_64((int64_t *)&SL_NODE_FORWARD(n, l), (int64_t)(p))
-#define SL_SET_NODE_BACKWARD(n, l, p) atomic_store_64((int64_t *)&SL_NODE_BACKWARD(n, l), (int64_t)(p))
+#define SL_GET_NODE_FORWARD(n, l) ((SMemSkipListNode *)atomic_load_ptr(&SL_NODE_FORWARD(n, l)))
+#define SL_GET_NODE_BACKWARD(n, l) ((SMemSkipListNode *)atomic_load_ptr(&SL_NODE_BACKWARD(n, l)))
+#define SL_SET_NODE_FORWARD(n, l, p) atomic_store_ptr(&SL_NODE_FORWARD(n, l), p)
+#define SL_SET_NODE_BACKWARD(n, l, p) atomic_store_ptr(&SL_NODE_BACKWARD(n, l), p)
#define SL_MOVE_BACKWARD 0x1
#define SL_MOVE_FROM_POS 0x2
@@ -50,6 +50,8 @@ int32_t tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable) {
pMemTable->pTsdb = pTsdb;
pMemTable->pPool = pTsdb->pVnode->inUse;
pMemTable->nRef = 1;
+ pMemTable->minVer = VERSION_MAX;
+ pMemTable->maxVer = VERSION_MIN;
pMemTable->minKey = TSKEY_MAX;
pMemTable->maxKey = TSKEY_MIN;
pMemTable->nRow = 0;
@@ -62,6 +64,8 @@ int32_t tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable) {
taosMemoryFree(pMemTable);
goto _err;
}
+ // pMemTable->qList.pNext = &pMemTable->qList;
+ // pMemTable->qList.ppNext = &pMemTable->qList.pNext;
vnodeBufPoolRef(pMemTable->pPool);
*ppMemTable = pMemTable;
@@ -72,9 +76,9 @@ _err:
return code;
}
-void tsdbMemTableDestroy(SMemTable *pMemTable) {
+void tsdbMemTableDestroy(SMemTable *pMemTable, bool proactive) {
if (pMemTable) {
- vnodeBufPoolUnRef(pMemTable->pPool);
+ vnodeBufPoolUnRef(pMemTable->pPool, proactive);
taosMemoryFree(pMemTable->aBucket);
taosMemoryFree(pMemTable);
}
@@ -146,6 +150,10 @@ int32_t tsdbInsertTableData(STsdb *pTsdb, int64_t version, SSubmitTbData *pSubmi
}
if (code) goto _err;
+ // update
+ pMemTable->minVer = TMIN(pMemTable->minVer, version);
+ pMemTable->maxVer = TMAX(pMemTable->maxVer, version);
+
return code;
_err:
@@ -197,6 +205,8 @@ int32_t tsdbDeleteTableData(STsdb *pTsdb, int64_t version, tb_uid_t suid, tb_uid
}
pMemTable->nDel++;
+ pMemTable->minVer = TMIN(pMemTable->minVer, version);
+ pMemTable->maxVer = TMIN(pMemTable->maxVer, version);
if (TSDB_CACHE_LAST_ROW(pMemTable->pTsdb->pVnode->config) && tsdbKeyCmprFn(&lastKey, &pTbData->maxKey) >= 0) {
tsdbCacheDeleteLastrow(pTsdb->lruCache, pTbData->uid, eKey);
@@ -237,7 +247,6 @@ void *tsdbTbDataIterDestroy(STbDataIter *pIter) {
if (pIter) {
taosMemoryFree(pIter);
}
-
return NULL;
}
@@ -740,16 +749,30 @@ _exit:
int32_t tsdbGetNRowsInTbData(STbData *pTbData) { return pTbData->sl.size; }
-void tsdbRefMemTable(SMemTable *pMemTable) {
+int32_t tsdbRefMemTable(SMemTable *pMemTable, SQueryNode *pQNode) {
+ int32_t code = 0;
+
int32_t nRef = atomic_fetch_add_32(&pMemTable->nRef, 1);
ASSERT(nRef > 0);
+
+ vnodeBufPoolRegisterQuery(pMemTable->pPool, pQNode);
+
+_exit:
+ return code;
}
-void tsdbUnrefMemTable(SMemTable *pMemTable) {
- int32_t nRef = atomic_sub_fetch_32(&pMemTable->nRef, 1);
- if (nRef == 0) {
- tsdbMemTableDestroy(pMemTable);
+int32_t tsdbUnrefMemTable(SMemTable *pMemTable, SQueryNode *pNode, bool proactive) {
+ int32_t code = 0;
+
+ if (pNode) {
+ vnodeBufPoolDeregisterQuery(pMemTable->pPool, pNode, proactive);
}
+
+ if (atomic_sub_fetch_32(&pMemTable->nRef, 1) == 0) {
+ tsdbMemTableDestroy(pMemTable, proactive);
+ }
+
+ return code;
}
static FORCE_INLINE int32_t tbDataPCmprFn(const void *p1, const void *p2) {
@@ -789,3 +812,29 @@ SArray *tsdbMemTableGetTbDataArray(SMemTable *pMemTable) {
_exit:
return aTbDataP;
}
+
+// int32_t tsdbRecycleMemTable(SMemTable *pMemTable) {
+// int32_t code = 0;
+
+// SQueryNode *pNode = pMemTable->qList.pNext;
+// while (1) {
+// ASSERT(pNode != &pMemTable->qList);
+// SQueryNode *pNextNode = pNode->pNext;
+
+// if (pNextNode == &pMemTable->qList) {
+// code = (*pNode->reseek)(pNode->pQHandle);
+// if (code) goto _exit;
+// break;
+// } else {
+// code = (*pNode->reseek)(pNode->pQHandle);
+// if (code) goto _exit;
+// pNode = pMemTable->qList.pNext;
+// ASSERT(pNode == pNextNode);
+// }
+// }
+
+// // NOTE: Take care here, pMemTable is destroyed
+
+// _exit:
+// return code;
+// }
diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c
index f71b5b6706..8901f64459 100644
--- a/source/dnode/vnode/src/tsdb/tsdbOpen.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c
@@ -88,7 +88,7 @@ _err:
int tsdbClose(STsdb **pTsdb) {
if (*pTsdb) {
taosThreadRwlockWrlock(&(*pTsdb)->rwLock);
- tsdbMemTableDestroy((*pTsdb)->mem);
+ tsdbMemTableDestroy((*pTsdb)->mem, true);
(*pTsdb)->mem = NULL;
taosThreadRwlockUnlock(&(*pTsdb)->rwLock);
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 1938f751a2..5ba44decb4 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -156,6 +156,9 @@ typedef struct SBlockInfoBuf {
struct STsdbReader {
STsdb* pTsdb;
+ SVersionRange verRange;
+ TdThreadMutex readerMutex;
+ bool suspended;
uint64_t suid;
int16_t order;
bool freeBlock;
@@ -173,10 +176,10 @@ struct STsdbReader {
SDataFReader* pFileReader; // the file reader
SDelFReader* pDelFReader; // the del file reader
SArray* pDelIdx; // del file block index;
- SVersionRange verRange;
- SBlockInfoBuf blockInfoBuf;
- int32_t step;
- STsdbReader* innerReader[2];
+ // SVersionRange verRange;
+ SBlockInfoBuf blockInfoBuf;
+ int32_t step;
+ STsdbReader* innerReader[2];
};
static SFileDataBlockInfo* getCurrentBlockInfo(SDataBlockIter* pBlockIter);
@@ -399,9 +402,7 @@ static void destroyAllBlockScanInfo(SHashObj* pTableMap) {
taosHashCleanup(pTableMap);
}
-static bool isEmptyQueryTimeWindow(STimeWindow* pWindow) {
- return pWindow->skey > pWindow->ekey;
-}
+static bool isEmptyQueryTimeWindow(STimeWindow* pWindow) { return pWindow->skey > pWindow->ekey; }
// Update the query time window according to the data time to live(TTL) information, in order to avoid to return
// the expired data to client, even it is queried already.
@@ -635,6 +636,8 @@ static int32_t tsdbReaderCreate(SVnode* pVnode, SQueryTableDataCond* pCond, STsd
setColumnIdSlotList(&pReader->suppInfo, pCond->colList, pCond->pSlotList, pCond->numOfCols);
+ taosThreadMutexInit(&pReader->readerMutex, NULL);
+
*ppReader = pReader;
return code;
@@ -729,12 +732,25 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockN
sizeInDisk += pScanInfo->mapData.nData;
+ int32_t step = ASCENDING_TRAVERSE(pReader->order) ? 1 : -1;
+ STimeWindow w = pReader->window;
+ if (ASCENDING_TRAVERSE(pReader->order)) {
+ w.skey = pScanInfo->lastKey + step;
+ } else {
+ w.ekey = pScanInfo->lastKey + step;
+ }
+
+ if (isEmptyQueryTimeWindow(&w)) {
+ continue;
+ }
+
SDataBlk block = {0};
for (int32_t j = 0; j < pScanInfo->mapData.nItem; ++j) {
tGetDataBlk(pScanInfo->mapData.pData + pScanInfo->mapData.aOffset[j], &block);
// 1. time range check
- if (block.minKey.ts > pReader->window.ekey || block.maxKey.ts < pReader->window.skey) {
+ // if (block.minKey.ts > pReader->window.ekey || block.maxKey.ts < pReader->window.skey) {
+ if (block.minKey.ts > w.ekey || block.maxKey.ts < w.skey) {
continue;
}
@@ -915,7 +931,7 @@ static void copyNumericCols(const SColData* pData, SFileBlockDumpInfo* pDumpInfo
int32_t step = asc ? 1 : -1;
// make sure it is aligned to 8bit, the allocated memory address is aligned to 256bit
-// ASSERT((((uint64_t)pColData->pData) & (0x8 - 1)) == 0);
+ // ASSERT((((uint64_t)pColData->pData) & (0x8 - 1)) == 0);
// 1. copy data in a batch model
memcpy(pColData->pData, p, dumpedRows * tDataTypes[pData->type].bytes);
@@ -2170,9 +2186,11 @@ static int32_t initMemDataIterator(STableBlockScanInfo* pBlockScanInfo, STsdbRea
TSDBKEY startKey = {0};
if (ASCENDING_TRAVERSE(pReader->order)) {
- startKey = (TSDBKEY){.ts = pReader->window.skey, .version = pReader->verRange.minVer};
+ // startKey = (TSDBKEY){.ts = pReader->window.skey, .version = pReader->verRange.minVer};
+ startKey = (TSDBKEY){.ts = pBlockScanInfo->lastKey + 1, .version = pReader->verRange.minVer};
} else {
- startKey = (TSDBKEY){.ts = pReader->window.ekey, .version = pReader->verRange.maxVer};
+ // startKey = (TSDBKEY){.ts = pReader->window.ekey, .version = pReader->verRange.maxVer};
+ startKey = (TSDBKEY){.ts = pBlockScanInfo->lastKey - 1, .version = pReader->verRange.maxVer};
}
int32_t backward = (!ASCENDING_TRAVERSE(pReader->order));
@@ -2295,7 +2313,7 @@ static bool hasDataInLastBlock(SLastBlockReader* pLastBlockReader) { return pLas
bool hasDataInFileBlock(const SBlockData* pBlockData, const SFileBlockDumpInfo* pDumpInfo) {
if ((pBlockData->nRow > 0) && (pBlockData->nRow != pDumpInfo->totalRows)) {
- return false; // this is an invalid result.
+ return false; // this is an invalid result.
}
return pBlockData->nRow > 0 && (!pDumpInfo->allDumped);
}
@@ -2403,6 +2421,19 @@ static int32_t loadNeighborIfOverlap(SFileDataBlockInfo* pBlockInfo, STableBlock
return code;
}
+static void updateComposedBlockInfo(STsdbReader* pReader, double el, STableBlockScanInfo* pBlockScanInfo) {
+ SSDataBlock* pResBlock = pReader->pResBlock;
+
+ pResBlock->info.id.uid = (pBlockScanInfo != NULL) ? pBlockScanInfo->uid : 0;
+ pResBlock->info.dataLoad = 1;
+ blockDataUpdateTsWindow(pResBlock, pReader->suppInfo.slotId[0]);
+
+ setComposedBlockFlag(pReader, true);
+
+ pReader->cost.composedBlocks += 1;
+ pReader->cost.buildComposedBlockTime += el;
+}
+
static int32_t buildComposedDataBlock(STsdbReader* pReader) {
int32_t code = TSDB_CODE_SUCCESS;
@@ -2414,6 +2445,7 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) {
bool asc = ASCENDING_TRAVERSE(pReader->order);
int64_t st = taosGetTimestampUs();
int32_t step = asc ? 1 : -1;
+ double el = 0;
STableBlockScanInfo* pBlockScanInfo = NULL;
if (pBlockInfo != NULL) {
@@ -2451,7 +2483,8 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) {
while (1) {
bool hasBlockData = false;
{
- while (pBlockData->nRow > 0 && pBlockData->uid == pBlockScanInfo->uid) { // find the first qualified row in data block
+ while (pBlockData->nRow > 0 &&
+ pBlockData->uid == pBlockScanInfo->uid) { // find the first qualified row in data block
if (isValidFileBlockRow(pBlockData, pDumpInfo, pBlockScanInfo, pReader)) {
hasBlockData = true;
break;
@@ -2475,10 +2508,8 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) {
}
}
- bool hasBlockLData = hasDataInLastBlock(pLastBlockReader);
-
// no data in last block and block, no need to proceed.
- if ((hasBlockData == false) && (hasBlockLData == false)) {
+ if (hasBlockData == false) {
break;
}
@@ -2497,15 +2528,8 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) {
}
_end:
- pResBlock->info.id.uid = (pBlockScanInfo != NULL) ? pBlockScanInfo->uid : 0;
- pResBlock->info.dataLoad = 1;
- blockDataUpdateTsWindow(pResBlock, pReader->suppInfo.slotId[0]);
-
- setComposedBlockFlag(pReader, true);
- double el = (taosGetTimestampUs() - st) / 1000.0;
-
- pReader->cost.composedBlocks += 1;
- pReader->cost.buildComposedBlockTime += el;
+ el = (taosGetTimestampUs() - st) / 1000.0;
+ updateComposedBlockInfo(pReader, el, pBlockScanInfo);
if (pResBlock->info.rows > 0) {
tsdbDebug("%p uid:%" PRIu64 ", composed data block created, brange:%" PRIu64 "-%" PRIu64
@@ -2749,6 +2773,8 @@ static int32_t doLoadLastBlockSequentially(STsdbReader* pReader) {
return code;
}
+ SSDataBlock* pResBlock = pReader->pResBlock;
+
while (1) {
// load the last data block of current table
STableBlockScanInfo* pScanInfo = *(STableBlockScanInfo**)pStatus->pTableIter;
@@ -2759,15 +2785,33 @@ static int32_t doLoadLastBlockSequentially(STsdbReader* pReader) {
if (!hasNexTable) {
return TSDB_CODE_SUCCESS;
}
+
continue;
}
- code = doBuildDataBlock(pReader);
- if (code != TSDB_CODE_SUCCESS) {
- return code;
+ int64_t st = taosGetTimestampUs();
+ while (1) {
+ bool hasBlockLData = hasDataInLastBlock(pLastBlockReader);
+
+ // no data in last block and block, no need to proceed.
+ if (hasBlockLData == false) {
+ break;
+ }
+
+ buildComposedDataBlockImpl(pReader, pScanInfo, &pReader->status.fileBlockData, pLastBlockReader);
+ if (pResBlock->info.rows >= pReader->capacity) {
+ break;
+ }
}
- if (pReader->pResBlock->info.rows > 0) {
+ double el = (taosGetTimestampUs() - st) / 1000.0;
+ updateComposedBlockInfo(pReader, el, pScanInfo);
+
+ if (pResBlock->info.rows > 0) {
+ tsdbDebug("%p uid:%" PRIu64 ", composed data block created, brange:%" PRIu64 "-%" PRIu64
+ " rows:%d, elapsed time:%.2f ms %s",
+ pReader, pResBlock->info.id.uid, pResBlock->info.window.skey, pResBlock->info.window.ekey,
+ pResBlock->info.rows, el, pReader->idStr);
return TSDB_CODE_SUCCESS;
}
@@ -2882,9 +2926,16 @@ static int32_t buildBlockFromBufferSequentially(STsdbReader* pReader) {
}
// set the correct start position in case of the first/last file block, according to the query time window
-void initBlockDumpInfo(STsdbReader* pReader, SDataBlockIter* pBlockIter) {
- SDataBlk* pBlock = getCurrentBlock(pBlockIter);
-
+static void initBlockDumpInfo(STsdbReader* pReader, SDataBlockIter* pBlockIter) {
+ int64_t lastKey = ASCENDING_TRAVERSE(pReader->order) ? INT64_MIN : INT64_MAX;
+ SDataBlk* pBlock = getCurrentBlock(pBlockIter);
+ SFileDataBlockInfo* pBlockInfo = getCurrentBlockInfo(pBlockIter);
+ if (pBlockInfo) {
+ STableBlockScanInfo* pScanInfo = taosHashGet(pBlockIter->pTableMap, &pBlockInfo->uid, sizeof(pBlockInfo->uid));
+ if (pScanInfo) {
+ lastKey = pScanInfo->lastKey;
+ }
+ }
SReaderStatus* pStatus = &pReader->status;
SFileBlockDumpInfo* pDumpInfo = &pStatus->fBlockDumpInfo;
@@ -2892,6 +2943,7 @@ void initBlockDumpInfo(STsdbReader* pReader, SDataBlockIter* pBlockIter) {
pDumpInfo->totalRows = pBlock->nRow;
pDumpInfo->allDumped = false;
pDumpInfo->rowIndex = ASCENDING_TRAVERSE(pReader->order) ? 0 : pBlock->nRow - 1;
+ pDumpInfo->lastKey = lastKey;
}
static int32_t initForFirstBlockInFile(STsdbReader* pReader, SDataBlockIter* pBlockIter) {
@@ -3096,7 +3148,8 @@ bool hasBeenDropped(const SArray* pDelList, int32_t* index, TSDBKEY* pKey, int32
return false;
} else if (pKey->ts == last->ts) {
TSDBKEY* prev = taosArrayGet(pDelList, num - 2);
- return (prev->version >= pKey->version && prev->version <= pVerRange->maxVer && prev->version >= pVerRange->minVer);
+ return (prev->version >= pKey->version && prev->version <= pVerRange->maxVer &&
+ prev->version >= pVerRange->minVer);
}
} else {
TSDBKEY* pCurrent = taosArrayGet(pDelList, *index);
@@ -3285,7 +3338,7 @@ static int32_t checkForNeighborFileBlock(STsdbReader* pReader, STableBlockScanIn
*state = CHECK_FILEBLOCK_QUIT;
int32_t step = ASCENDING_TRAVERSE(pReader->order) ? 1 : -1;
- bool loadNeighbor = true;
+ bool loadNeighbor = true;
int32_t code = loadNeighborIfOverlap(pFBlock, pScanInfo, pReader, &loadNeighbor);
if (loadNeighbor && (code == TSDB_CODE_SUCCESS)) {
@@ -3826,40 +3879,7 @@ int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, void* pTableL
goto _err;
}
- if (numOfTables > 0) {
- code = tsdbTakeReadSnap(pReader->pTsdb, &pReader->pReadSnap, pReader->idStr);
- if (code != TSDB_CODE_SUCCESS) {
- goto _err;
- }
-
- if (pReader->type == TIMEWINDOW_RANGE_CONTAINED) {
- code = doOpenReaderImpl(pReader);
- if (code != TSDB_CODE_SUCCESS) {
- return code;
- }
- } else {
- STsdbReader* pPrevReader = pReader->innerReader[0];
- STsdbReader* pNextReader = pReader->innerReader[1];
-
- // we need only one row
- pPrevReader->capacity = 1;
- pPrevReader->status.pTableMap = pReader->status.pTableMap;
- pPrevReader->pSchema = pReader->pSchema;
- pPrevReader->pMemSchema = pReader->pMemSchema;
- pPrevReader->pReadSnap = pReader->pReadSnap;
-
- pNextReader->capacity = 1;
- pNextReader->status.pTableMap = pReader->status.pTableMap;
- pNextReader->pSchema = pReader->pSchema;
- pNextReader->pMemSchema = pReader->pMemSchema;
- pNextReader->pReadSnap = pReader->pReadSnap;
-
- code = doOpenReaderImpl(pPrevReader);
- if (code != TSDB_CODE_SUCCESS) {
- return code;
- }
- }
- }
+ pReader->suspended = true;
tsdbDebug("%p total numOfTable:%d in this query %s", pReader, numOfTables, pReader->idStr);
return code;
@@ -3932,7 +3952,10 @@ void tsdbReaderClose(STsdbReader* pReader) {
pReader->pDelIdx = NULL;
}
- tsdbUntakeReadSnap(pReader->pTsdb, pReader->pReadSnap, pReader->idStr);
+ qTrace("tsdb/reader: %p, untake snapshot", pReader);
+ tsdbUntakeReadSnap(pReader, pReader->pReadSnap, true);
+
+ taosThreadMutexDestroy(&pReader->readerMutex);
taosMemoryFree(pReader->status.uidCheckInfo.tableUidList);
SIOCostSummary* pCost = &pReader->cost;
@@ -3964,9 +3987,173 @@ void tsdbReaderClose(STsdbReader* pReader) {
if (pReader->pMemSchema != pReader->pSchema) {
taosMemoryFree(pReader->pMemSchema);
}
+
taosMemoryFreeClear(pReader);
}
+int32_t tsdbReaderSuspend(STsdbReader* pReader) {
+ int32_t code = 0;
+
+ // save reader's base state & reset top state to be reconstructed from base state
+ SReaderStatus* pStatus = &pReader->status;
+ STableBlockScanInfo* pBlockScanInfo = NULL;
+
+ if (pStatus->loadFromFile) {
+ SFileDataBlockInfo* pBlockInfo = getCurrentBlockInfo(&pReader->status.blockIter);
+ if (pBlockInfo != NULL) {
+ pBlockScanInfo =
+ *(STableBlockScanInfo**)taosHashGet(pStatus->pTableMap, &pBlockInfo->uid, sizeof(pBlockInfo->uid));
+ if (pBlockScanInfo == NULL) {
+ code = TSDB_CODE_INVALID_PARA;
+ tsdbError("failed to locate the uid:%" PRIu64 " in query table uid list, total tables:%d, %s", pBlockInfo->uid,
+ taosHashGetSize(pReader->status.pTableMap), pReader->idStr);
+ goto _err;
+ }
+ } else {
+ pBlockScanInfo = *pStatus->pTableIter;
+ }
+
+ tsdbDataFReaderClose(&pReader->pFileReader);
+
+ // resetDataBlockScanInfo excluding lastKey
+ STableBlockScanInfo** p = NULL;
+
+ while ((p = taosHashIterate(pStatus->pTableMap, p)) != NULL) {
+ STableBlockScanInfo* pInfo = *(STableBlockScanInfo**)p;
+
+ pInfo->iterInit = false;
+ pInfo->iter.hasVal = false;
+ pInfo->iiter.hasVal = false;
+
+ if (pInfo->iter.iter != NULL) {
+ pInfo->iter.iter = tsdbTbDataIterDestroy(pInfo->iter.iter);
+ }
+
+ if (pInfo->iiter.iter != NULL) {
+ pInfo->iiter.iter = tsdbTbDataIterDestroy(pInfo->iiter.iter);
+ }
+
+ pInfo->delSkyline = taosArrayDestroy(pInfo->delSkyline);
+ // pInfo->lastKey = ts;
+ }
+ } else {
+ pBlockScanInfo = pStatus->pTableIter == NULL ? NULL : *pStatus->pTableIter;
+ if (pBlockScanInfo) {
+ // save lastKey to restore memory iterator
+ STimeWindow w = pReader->pResBlock->info.window;
+ pBlockScanInfo->lastKey = ASCENDING_TRAVERSE(pReader->order) ? w.ekey : w.skey;
+
+ // reset current current table's data block scan info,
+ pBlockScanInfo->iterInit = false;
+ // pBlockScanInfo->iiter.hasVal = false;
+ if (pBlockScanInfo->iter.iter != NULL) {
+ pBlockScanInfo->iter.iter = tsdbTbDataIterDestroy(pBlockScanInfo->iter.iter);
+ }
+
+ if (pBlockScanInfo->iiter.iter != NULL) {
+ pBlockScanInfo->iiter.iter = tsdbTbDataIterDestroy(pBlockScanInfo->iiter.iter);
+ }
+
+ pBlockScanInfo->pBlockList = taosArrayDestroy(pBlockScanInfo->pBlockList);
+ tMapDataClear(&pBlockScanInfo->mapData);
+ // TODO: keep skyline for reuse
+ pBlockScanInfo->delSkyline = taosArrayDestroy(pBlockScanInfo->delSkyline);
+ }
+ }
+
+ tsdbUntakeReadSnap(pReader, pReader->pReadSnap, false);
+ pReader->pReadSnap = NULL;
+
+ pReader->suspended = true;
+
+ tsdbDebug("reader: %p suspended uid %" PRIu64 " in this query %s", pReader, pBlockScanInfo ? pBlockScanInfo->uid : 0,
+ pReader->idStr);
+ return code;
+
+_err:
+ tsdbError("failed to suspend data reader, code:%s %s", tstrerror(code), pReader->idStr);
+ return code;
+}
+
+static int32_t tsdbSetQueryReseek(void* pQHandle) {
+ int32_t code = 0;
+ STsdbReader* pReader = pQHandle;
+
+ code = taosThreadMutexTryLock(&pReader->readerMutex);
+ if (code == 0) {
+ if (pReader->suspended) {
+ taosThreadMutexUnlock(&pReader->readerMutex);
+ return code;
+ }
+
+ tsdbReaderSuspend(pReader);
+
+ taosThreadMutexUnlock(&pReader->readerMutex);
+
+ return code;
+ } else if (code == EBUSY) {
+ return TSDB_CODE_VND_QUERY_BUSY;
+ } else {
+ terrno = TAOS_SYSTEM_ERROR(code);
+ return TSDB_CODE_FAILED;
+ }
+}
+
+int32_t tsdbReaderResume(STsdbReader* pReader) {
+ int32_t code = 0;
+
+ STableBlockScanInfo** pBlockScanInfo = pReader->status.pTableIter;
+
+ // restore reader's state
+ // task snapshot
+ int32_t numOfTables = taosHashGetSize(pReader->status.pTableMap);
+ if (numOfTables > 0) {
+ qTrace("tsdb/reader: %p, take snapshot", pReader);
+ code = tsdbTakeReadSnap(pReader, tsdbSetQueryReseek, &pReader->pReadSnap);
+ if (code != TSDB_CODE_SUCCESS) {
+ goto _err;
+ }
+
+ if (pReader->type == TIMEWINDOW_RANGE_CONTAINED) {
+ code = doOpenReaderImpl(pReader);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
+ } else {
+ STsdbReader* pPrevReader = pReader->innerReader[0];
+ STsdbReader* pNextReader = pReader->innerReader[1];
+
+ // we need only one row
+ pPrevReader->capacity = 1;
+ pPrevReader->status.pTableMap = pReader->status.pTableMap;
+ pPrevReader->pSchema = pReader->pSchema;
+ pPrevReader->pMemSchema = pReader->pMemSchema;
+ pPrevReader->pReadSnap = pReader->pReadSnap;
+
+ pNextReader->capacity = 1;
+ pNextReader->status.pTableMap = pReader->status.pTableMap;
+ pNextReader->pSchema = pReader->pSchema;
+ pNextReader->pMemSchema = pReader->pMemSchema;
+ pNextReader->pReadSnap = pReader->pReadSnap;
+
+ code = doOpenReaderImpl(pPrevReader);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
+ }
+ }
+
+ pReader->suspended = false;
+
+ tsdbDebug("reader: %p resumed uid %" PRIu64 ", numOfTable:%" PRId32 ", in this query %s", pReader,
+ pBlockScanInfo ? (*pBlockScanInfo)->uid : 0, numOfTables, pReader->idStr);
+ return code;
+
+_err:
+ tsdbError("failed to resume data reader, code:%s %s", tstrerror(code), pReader->idStr);
+ return code;
+}
+
static bool doTsdbNextDataBlock(STsdbReader* pReader) {
// cleanup the data that belongs to the previous data block
SSDataBlock* pBlock = pReader->pResBlock;
@@ -4000,10 +4187,24 @@ bool tsdbNextDataBlock(STsdbReader* pReader) {
return false;
}
+ SReaderStatus* pStatus = &pReader->status;
+
+ qTrace("tsdb/read: %p, take read mutex", pReader);
+ taosThreadMutexLock(&pReader->readerMutex);
+ if (pReader->suspended) {
+ tsdbReaderResume(pReader);
+ }
+
if (pReader->innerReader[0] != NULL && pReader->step == 0) {
bool ret = doTsdbNextDataBlock(pReader->innerReader[0]);
pReader->step = EXTERNAL_ROWS_PREV;
if (ret) {
+ pStatus = &pReader->innerReader[0]->status;
+ if (pStatus->composedDataBlock) {
+ qTrace("tsdb/read: %p, unlock read mutex", pReader);
+ taosThreadMutexUnlock(&pReader->readerMutex);
+ }
+
return ret;
}
}
@@ -4022,6 +4223,11 @@ bool tsdbNextDataBlock(STsdbReader* pReader) {
bool ret = doTsdbNextDataBlock(pReader);
if (ret) {
+ if (pStatus->composedDataBlock) {
+ qTrace("tsdb/read: %p, unlock read mutex", pReader);
+ taosThreadMutexUnlock(&pReader->readerMutex);
+ }
+
return ret;
}
@@ -4036,10 +4242,19 @@ bool tsdbNextDataBlock(STsdbReader* pReader) {
bool ret1 = doTsdbNextDataBlock(pReader->innerReader[1]);
pReader->step = EXTERNAL_ROWS_NEXT;
if (ret1) {
+ pStatus = &pReader->innerReader[1]->status;
+ if (pStatus->composedDataBlock) {
+ qTrace("tsdb/read: %p, unlock read mutex", pReader);
+ taosThreadMutexUnlock(&pReader->readerMutex);
+ }
+
return ret1;
}
}
+ qTrace("tsdb/read: %p, unlock read mutex", pReader);
+ taosThreadMutexUnlock(&pReader->readerMutex);
+
return false;
}
@@ -4175,12 +4390,7 @@ int32_t tsdbRetrieveDatablockSMA(STsdbReader* pReader, SSDataBlock* pDataBlock,
}
static SSDataBlock* doRetrieveDataBlock(STsdbReader* pReader) {
- SReaderStatus* pStatus = &pReader->status;
-
- if (pStatus->composedDataBlock) {
- return pReader->pResBlock;
- }
-
+ SReaderStatus* pStatus = &pReader->status;
SFileDataBlockInfo* pBlockInfo = getCurrentBlockInfo(&pStatus->blockIter);
STableBlockScanInfo* pBlockScanInfo =
*(STableBlockScanInfo**)taosHashGet(pStatus->pTableMap, &pBlockInfo->uid, sizeof(pBlockInfo->uid));
@@ -4202,20 +4412,51 @@ static SSDataBlock* doRetrieveDataBlock(STsdbReader* pReader) {
return pReader->pResBlock;
}
+void tsdbReleaseDataBlock(STsdbReader* pReader) {
+ // SReaderStatus* pStatus = &pReader->status;
+ // if (!pStatus->composedDataBlock) {
+ taosThreadMutexUnlock(&pReader->readerMutex);
+ //}
+}
+
SSDataBlock* tsdbRetrieveDataBlock(STsdbReader* pReader, SArray* pIdList) {
+ STsdbReader* pTReader = pReader;
if (pReader->type == TIMEWINDOW_RANGE_EXTERNAL) {
if (pReader->step == EXTERNAL_ROWS_PREV) {
- return doRetrieveDataBlock(pReader->innerReader[0]);
+ pTReader = pReader->innerReader[0];
} else if (pReader->step == EXTERNAL_ROWS_NEXT) {
- return doRetrieveDataBlock(pReader->innerReader[1]);
+ pTReader = pReader->innerReader[1];
}
}
- return doRetrieveDataBlock(pReader);
+ SReaderStatus* pStatus = &pTReader->status;
+ if (pStatus->composedDataBlock) {
+ return pTReader->pResBlock;
+ }
+
+ SSDataBlock* ret = doRetrieveDataBlock(pTReader);
+
+ qTrace("tsdb/read-retrieve: %p, unlock read mutex", pReader);
+ taosThreadMutexUnlock(&pReader->readerMutex);
+
+ return ret;
}
int32_t tsdbReaderReset(STsdbReader* pReader, SQueryTableDataCond* pCond) {
+ SReaderStatus* pStatus = &pReader->status;
+
+ qTrace("tsdb/reader-reset: %p, take read mutex", pReader);
+ taosThreadMutexLock(&pReader->readerMutex);
+
+ if (pReader->suspended) {
+ tsdbReaderResume(pReader);
+ }
+
if (isEmptyQueryTimeWindow(&pReader->window) || pReader->pReadSnap == NULL) {
+ tsdbDebug("tsdb reader reset return %p", pReader->pReadSnap);
+
+ taosThreadMutexUnlock(&pReader->readerMutex);
+
return TSDB_CODE_SUCCESS;
}
@@ -4251,6 +4492,9 @@ int32_t tsdbReaderReset(STsdbReader* pReader, SQueryTableDataCond* pCond) {
if (code != TSDB_CODE_SUCCESS) {
tsdbError("%p reset reader failed, numOfTables:%d, query range:%" PRId64 " - %" PRId64 " in query %s", pReader,
numOfTables, pReader->window.skey, pReader->window.ekey, pReader->idStr);
+
+ taosThreadMutexUnlock(&pReader->readerMutex);
+
return code;
}
}
@@ -4260,6 +4504,8 @@ int32_t tsdbReaderReset(STsdbReader* pReader, SQueryTableDataCond* pCond) {
pReader, pReader->suid, numOfTables, pCond->twindows.skey, pReader->window.skey, pReader->window.ekey,
pReader->idStr);
+ taosThreadMutexUnlock(&pReader->readerMutex);
+
return code;
}
@@ -4343,13 +4589,18 @@ int64_t tsdbGetNumOfRowsInMemTable(STsdbReader* pReader) {
int64_t rows = 0;
SReaderStatus* pStatus = &pReader->status;
+ taosThreadMutexLock(&pReader->readerMutex);
+ if (pReader->suspended) {
+ tsdbReaderResume(pReader);
+ }
+
pStatus->pTableIter = taosHashIterate(pStatus->pTableMap, NULL);
while (pStatus->pTableIter != NULL) {
STableBlockScanInfo* pBlockScanInfo = *(STableBlockScanInfo**)pStatus->pTableIter;
STbData* d = NULL;
- if (pReader->pTsdb->mem != NULL) {
+ if (pReader->pReadSnap->pMem != NULL) {
d = tsdbGetTbDataFromMemTable(pReader->pReadSnap->pMem, pReader->suid, pBlockScanInfo->uid);
if (d != NULL) {
rows += tsdbGetNRowsInTbData(d);
@@ -4357,7 +4608,7 @@ int64_t tsdbGetNumOfRowsInMemTable(STsdbReader* pReader) {
}
STbData* di = NULL;
- if (pReader->pTsdb->imem != NULL) {
+ if (pReader->pReadSnap->pIMem != NULL) {
di = tsdbGetTbDataFromMemTable(pReader->pReadSnap->pIMem, pReader->suid, pBlockScanInfo->uid);
if (di != NULL) {
rows += tsdbGetNRowsInTbData(di);
@@ -4368,6 +4619,8 @@ int64_t tsdbGetNumOfRowsInMemTable(STsdbReader* pReader) {
pStatus->pTableIter = taosHashIterate(pStatus->pTableMap, pStatus->pTableIter);
}
+ taosThreadMutexUnlock(&pReader->readerMutex);
+
return rows;
}
@@ -4409,66 +4662,92 @@ int32_t tsdbGetTableSchema(SVnode* pVnode, int64_t uid, STSchema** pSchema, int6
return TSDB_CODE_SUCCESS;
}
-int32_t tsdbTakeReadSnap(STsdb* pTsdb, STsdbReadSnap** ppSnap, const char* idStr) {
- int32_t code = 0;
+int32_t tsdbTakeReadSnap(STsdbReader* pReader, _query_reseek_func_t reseek, STsdbReadSnap** ppSnap) {
+ int32_t code = 0;
+ STsdb* pTsdb = pReader->pTsdb;
+ SVersionRange* pRange = &pReader->verRange;
// alloc
- *ppSnap = (STsdbReadSnap*)taosMemoryCalloc(1, sizeof(STsdbReadSnap));
- if (*ppSnap == NULL) {
+ STsdbReadSnap* pSnap = (STsdbReadSnap*)taosMemoryCalloc(1, sizeof(*pSnap));
+ if (pSnap == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY;
goto _exit;
}
// lock
- code = taosThreadRwlockRdlock(&pTsdb->rwLock);
- if (code) {
- code = TAOS_SYSTEM_ERROR(code);
- goto _exit;
- }
+ taosThreadRwlockRdlock(&pTsdb->rwLock);
// take snapshot
- (*ppSnap)->pMem = pTsdb->mem;
- (*ppSnap)->pIMem = pTsdb->imem;
+ if (pTsdb->mem && (pRange->minVer <= pTsdb->mem->maxVer && pRange->maxVer >= pTsdb->mem->minVer)) {
+ pSnap->pMem = pTsdb->mem;
+ pSnap->pNode = taosMemoryMalloc(sizeof(*pSnap->pNode));
+ if (pSnap->pNode == NULL) {
+ taosThreadRwlockUnlock(&pTsdb->rwLock);
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ goto _exit;
+ }
+ pSnap->pNode->pQHandle = pReader;
+ pSnap->pNode->reseek = reseek;
- if ((*ppSnap)->pMem) {
- tsdbRefMemTable((*ppSnap)->pMem);
+ tsdbRefMemTable(pTsdb->mem, pSnap->pNode);
}
- if ((*ppSnap)->pIMem) {
- tsdbRefMemTable((*ppSnap)->pIMem);
+ if (pTsdb->imem && (pRange->minVer <= pTsdb->imem->maxVer && pRange->maxVer >= pTsdb->imem->minVer)) {
+ pSnap->pIMem = pTsdb->imem;
+ pSnap->pINode = taosMemoryMalloc(sizeof(*pSnap->pINode));
+ if (pSnap->pINode == NULL) {
+ taosThreadRwlockUnlock(&pTsdb->rwLock);
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ goto _exit;
+ }
+ pSnap->pINode->pQHandle = pReader;
+ pSnap->pINode->reseek = reseek;
+
+ tsdbRefMemTable(pTsdb->imem, pSnap->pINode);
}
// fs
- code = tsdbFSRef(pTsdb, &(*ppSnap)->fs);
+ code = tsdbFSRef(pTsdb, &pSnap->fs);
if (code) {
taosThreadRwlockUnlock(&pTsdb->rwLock);
goto _exit;
}
// unlock
- code = taosThreadRwlockUnlock(&pTsdb->rwLock);
- if (code) {
- code = TAOS_SYSTEM_ERROR(code);
- goto _exit;
- }
+ taosThreadRwlockUnlock(&pTsdb->rwLock);
+
+ tsdbTrace("vgId:%d, take read snapshot", TD_VID(pTsdb->pVnode));
- tsdbTrace("vgId:%d, take read snapshot, %s", TD_VID(pTsdb->pVnode), idStr);
_exit:
+ if (code) {
+ *ppSnap = NULL;
+ if (pSnap) {
+ if (pSnap->pNode) taosMemoryFree(pSnap->pNode);
+ if (pSnap->pINode) taosMemoryFree(pSnap->pINode);
+ taosMemoryFree(pSnap);
+ }
+ } else {
+ *ppSnap = pSnap;
+ }
return code;
}
-void tsdbUntakeReadSnap(STsdb* pTsdb, STsdbReadSnap* pSnap, const char* idStr) {
+void tsdbUntakeReadSnap(STsdbReader* pReader, STsdbReadSnap* pSnap, bool proactive) {
+ STsdb* pTsdb = pReader->pTsdb;
+
if (pSnap) {
if (pSnap->pMem) {
- tsdbUnrefMemTable(pSnap->pMem);
+ tsdbUnrefMemTable(pSnap->pMem, pSnap->pNode, proactive);
}
if (pSnap->pIMem) {
- tsdbUnrefMemTable(pSnap->pIMem);
+ tsdbUnrefMemTable(pSnap->pIMem, pSnap->pINode, proactive);
}
tsdbFSUnref(pTsdb, &pSnap->fs);
+ if (pSnap->pNode) taosMemoryFree(pSnap->pNode);
+ if (pSnap->pINode) taosMemoryFree(pSnap->pINode);
taosMemoryFree(pSnap);
}
- tsdbTrace("vgId:%d, untake read snapshot, %s", TD_VID(pTsdb->pVnode), idStr);
+ tsdbTrace("vgId:%d, untake read snapshot", TD_VID(pTsdb->pVnode));
}
diff --git a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
index 1fc8049d00..5c7bfee5a7 100644
--- a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
@@ -192,6 +192,7 @@ static int32_t tsdbSnapNextRow(STsdbSnapReader* pReader) {
int64_t rowVer = pIter->bData.aVersion[pIter->iRow];
if (rowVer >= pReader->sver && rowVer <= pReader->ever) {
+ pIter->rInfo.suid = pIter->bData.suid;
pIter->rInfo.uid = pIter->bData.uid ? pIter->bData.uid : pIter->bData.aUid[pIter->iRow];
pIter->rInfo.row = tsdbRowFromBlockData(&pIter->bData, pIter->iRow);
goto _out;
diff --git a/source/dnode/vnode/src/tsdb/tsdbWrite.c b/source/dnode/vnode/src/tsdb/tsdbWrite.c
index 7329bd65fb..02d076113f 100644
--- a/source/dnode/vnode/src/tsdb/tsdbWrite.c
+++ b/source/dnode/vnode/src/tsdb/tsdbWrite.c
@@ -83,8 +83,7 @@ static FORCE_INLINE int tsdbCheckRowRange(STsdb *pTsdb, tb_uid_t uid, TSKEY rowK
tsdbError("vgId:%d, table uid %" PRIu64 " timestamp is out of range! now %" PRId64 " minKey %" PRId64
" maxKey %" PRId64 " row key %" PRId64,
TD_VID(pTsdb->pVnode), uid, now, minKey, maxKey, rowKey);
- terrno = TSDB_CODE_TDB_TIMESTAMP_OUT_OF_RANGE;
- return -1;
+ return TSDB_CODE_TDB_TIMESTAMP_OUT_OF_RANGE;
}
return 0;
@@ -164,15 +163,13 @@ int tsdbScanAndConvertSubmitMsg(STsdb *pTsdb, SSubmitReq *pMsg) {
#endif
int tsdbScanAndConvertSubmitMsg(STsdb *pTsdb, SSubmitReq2 *pMsg) {
- ASSERT(pMsg != NULL);
+ int32_t code = 0;
STsdbKeepCfg *pCfg = &pTsdb->keepCfg;
TSKEY now = taosGetTimestamp(pCfg->precision);
TSKEY minKey = now - tsTickPerMin[pCfg->precision] * pCfg->keep2;
TSKEY maxKey = tsMaxKeyByPrecision[pCfg->precision];
int32_t size = taosArrayGetSize(pMsg->aSubmitTbData);
- terrno = TSDB_CODE_SUCCESS;
-
for (int32_t i = 0; i < size; ++i) {
SSubmitTbData *pData = TARRAY_GET_ELEM(pMsg->aSubmitTbData, i);
if (pData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) {
@@ -182,8 +179,8 @@ int tsdbScanAndConvertSubmitMsg(STsdb *pTsdb, SSubmitReq2 *pMsg) {
int32_t nRows = aColData[0].nVal;
TSKEY *aKey = (TSKEY *)aColData[0].pData;
for (int32_t r = 0; r < nRows; ++r) {
- if (tsdbCheckRowRange(pTsdb, pData->uid, aKey[r], minKey, maxKey, now) < 0) {
- return -1;
+ if ((code = tsdbCheckRowRange(pTsdb, pData->uid, aKey[r], minKey, maxKey, now)) < 0) {
+ goto _exit;
}
}
}
@@ -191,13 +188,13 @@ int tsdbScanAndConvertSubmitMsg(STsdb *pTsdb, SSubmitReq2 *pMsg) {
int32_t nRows = taosArrayGetSize(pData->aRowP);
for (int32_t r = 0; r < nRows; ++r) {
SRow *pRow = (SRow *)taosArrayGetP(pData->aRowP, r);
- if (tsdbCheckRowRange(pTsdb, pData->uid, pRow->ts, minKey, maxKey, now) < 0) {
- return -1;
+ if ((code = tsdbCheckRowRange(pTsdb, pData->uid, pRow->ts, minKey, maxKey, now)) < 0) {
+ goto _exit;
}
}
}
}
- if (terrno != TSDB_CODE_SUCCESS) return -1;
- return 0;
+_exit:
+ return code;
}
\ No newline at end of file
diff --git a/source/dnode/vnode/src/vnd/vnodeBufPool.c b/source/dnode/vnode/src/vnd/vnodeBufPool.c
index e67f2cc59a..80a422ca3b 100644
--- a/source/dnode/vnode/src/vnd/vnodeBufPool.c
+++ b/source/dnode/vnode/src/vnd/vnodeBufPool.c
@@ -16,9 +16,7 @@
#include "vnd.h"
/* ------------------------ STRUCTURES ------------------------ */
-#define VNODE_BUFPOOL_SEGMENTS 3
-
-static int vnodeBufPoolCreate(SVnode *pVnode, int64_t size, SVBufPool **ppPool) {
+static int vnodeBufPoolCreate(SVnode *pVnode, int32_t id, int64_t size, SVBufPool **ppPool) {
SVBufPool *pPool;
pPool = taosMemoryMalloc(sizeof(SVBufPool) + size);
@@ -26,6 +24,21 @@ static int vnodeBufPoolCreate(SVnode *pVnode, int64_t size, SVBufPool **ppPool)
terrno = TSDB_CODE_OUT_OF_MEMORY;
return -1;
}
+ memset(pPool, 0, sizeof(SVBufPool));
+
+ // query handle list
+ taosThreadMutexInit(&pPool->mutex, NULL);
+ pPool->nQuery = 0;
+ pPool->qList.pNext = &pPool->qList;
+ pPool->qList.ppNext = &pPool->qList.pNext;
+
+ pPool->pVnode = pVnode;
+ pPool->id = id;
+ pPool->ptr = pPool->node.data;
+ pPool->pTail = &pPool->node;
+ pPool->node.prev = NULL;
+ pPool->node.pnext = &pPool->pTail;
+ pPool->node.size = size;
if (VND_IS_RSMA(pVnode)) {
pPool->lock = taosMemoryMalloc(sizeof(TdThreadSpinlock));
@@ -44,16 +57,6 @@ static int vnodeBufPoolCreate(SVnode *pVnode, int64_t size, SVBufPool **ppPool)
pPool->lock = NULL;
}
- pPool->next = NULL;
- pPool->pVnode = pVnode;
- pPool->nRef = 0;
- pPool->size = 0;
- pPool->ptr = pPool->node.data;
- pPool->pTail = &pPool->node;
- pPool->node.prev = NULL;
- pPool->node.pnext = &pPool->pTail;
- pPool->node.size = size;
-
*ppPool = pPool;
return 0;
}
@@ -64,27 +67,25 @@ static int vnodeBufPoolDestroy(SVBufPool *pPool) {
taosThreadSpinDestroy(pPool->lock);
taosMemoryFree((void *)pPool->lock);
}
+ taosThreadMutexDestroy(&pPool->mutex);
taosMemoryFree(pPool);
return 0;
}
int vnodeOpenBufPool(SVnode *pVnode) {
- SVBufPool *pPool = NULL;
- int64_t size = pVnode->config.szBuf / VNODE_BUFPOOL_SEGMENTS;
+ int64_t size = pVnode->config.szBuf / VNODE_BUFPOOL_SEGMENTS;
- ASSERT(pVnode->pPool == NULL);
-
- for (int i = 0; i < 3; i++) {
+ for (int i = 0; i < VNODE_BUFPOOL_SEGMENTS; i++) {
// create pool
- if (vnodeBufPoolCreate(pVnode, size, &pPool)) {
+ if (vnodeBufPoolCreate(pVnode, i, size, &pVnode->aBufPool[i])) {
vError("vgId:%d, failed to open vnode buffer pool since %s", TD_VID(pVnode), tstrerror(terrno));
vnodeCloseBufPool(pVnode);
return -1;
}
- // add pool to vnode
- pPool->next = pVnode->pPool;
- pVnode->pPool = pPool;
+ // add to free list
+ pVnode->aBufPool[i]->freeNext = pVnode->freeList;
+ pVnode->freeList = pVnode->aBufPool[i];
}
vDebug("vgId:%d, vnode buffer pool is opened, size:%" PRId64, TD_VID(pVnode), size);
@@ -92,23 +93,19 @@ int vnodeOpenBufPool(SVnode *pVnode) {
}
int vnodeCloseBufPool(SVnode *pVnode) {
- SVBufPool *pPool;
-
- for (pPool = pVnode->pPool; pPool; pPool = pVnode->pPool) {
- pVnode->pPool = pPool->next;
- vnodeBufPoolDestroy(pPool);
+ for (int32_t i = 0; i < VNODE_BUFPOOL_SEGMENTS; i++) {
+ if (pVnode->aBufPool[i]) {
+ vnodeBufPoolDestroy(pVnode->aBufPool[i]);
+ pVnode->aBufPool[i] = NULL;
+ }
}
- if (pVnode->inUse) {
- vnodeBufPoolDestroy(pVnode->inUse);
- pVnode->inUse = NULL;
- }
vDebug("vgId:%d, vnode buffer pool is closed", TD_VID(pVnode));
-
return 0;
}
void vnodeBufPoolReset(SVBufPool *pPool) {
+ ASSERT(pPool->nQuery == 0);
for (SVBufPoolNode *pNode = pPool->pTail; pNode->prev; pNode = pPool->pTail) {
ASSERT(pNode->pnext == &pPool->pTail);
pNode->prev->pnext = &pPool->pTail;
@@ -123,7 +120,6 @@ void vnodeBufPoolReset(SVBufPool *pPool) {
pPool->ptr = pPool->node.data;
}
-
void *vnodeBufPoolMallocAligned(SVBufPool *pPool, int size) {
SVBufPoolNode *pNode;
void *p = NULL;
@@ -216,35 +212,121 @@ void vnodeBufPoolRef(SVBufPool *pPool) {
ASSERT(nRef > 0);
}
-void vnodeBufPoolUnRef(SVBufPool *pPool) {
- if (pPool == NULL) {
- return;
+void vnodeBufPoolAddToFreeList(SVBufPool *pPool) {
+ SVnode *pVnode = pPool->pVnode;
+
+ int64_t size = pVnode->config.szBuf / VNODE_BUFPOOL_SEGMENTS;
+ if (pPool->node.size != size) {
+ SVBufPool *pNewPool = NULL;
+ if (vnodeBufPoolCreate(pVnode, pPool->id, size, &pNewPool) < 0) {
+ vWarn("vgId:%d failed to change buffer pool of id %d size from %" PRId64 " to %" PRId64 " since %s",
+ TD_VID(pVnode), pPool->id, pPool->node.size, size, tstrerror(errno));
+ } else {
+ vInfo("vgId:%d buffer pool of id %d size changed from %" PRId64 " to %" PRId64, TD_VID(pVnode), pPool->id,
+ pPool->node.size, size);
+
+ vnodeBufPoolDestroy(pPool);
+ pPool = pNewPool;
+ pVnode->aBufPool[pPool->id] = pPool;
+ }
}
- int32_t nRef = atomic_sub_fetch_32(&pPool->nRef, 1);
- if (nRef == 0) {
- SVnode *pVnode = pPool->pVnode;
- vnodeBufPoolReset(pPool);
+ // add to free list
+ vDebug("vgId:%d buffer pool %p of id %d is added to free list", TD_VID(pVnode), pPool, pPool->id);
+ vnodeBufPoolReset(pPool);
+ pPool->freeNext = pVnode->freeList;
+ pVnode->freeList = pPool;
+ taosThreadCondSignal(&pVnode->poolNotEmpty);
+}
- taosThreadMutexLock(&pVnode->mutex);
+void vnodeBufPoolUnRef(SVBufPool *pPool, bool proactive) {
+ if (pPool == NULL) return;
- int64_t size = pVnode->config.szBuf / VNODE_BUFPOOL_SEGMENTS;
- if (pPool->node.size != size) {
- SVBufPool *pPoolT = NULL;
- if (vnodeBufPoolCreate(pVnode, size, &pPoolT) < 0) {
- vWarn("vgId:%d, try to change buf pools size from %" PRId64 " to %" PRId64 " since %s", TD_VID(pVnode),
- pPool->node.size, size, tstrerror(errno));
- } else {
- vnodeBufPoolDestroy(pPool);
- pPool = pPoolT;
- vDebug("vgId:%d, change buf pools size from %" PRId64 " to %" PRId64, TD_VID(pVnode), pPool->node.size, size);
- }
+ SVnode *pVnode = pPool->pVnode;
+
+ if (proactive) taosThreadMutexLock(&pVnode->mutex);
+
+ if (atomic_sub_fetch_32(&pPool->nRef, 1) > 0) goto _exit;
+
+ // remove from recycle queue or on-recycle position
+ if (pVnode->onRecycle == pPool) {
+ pVnode->onRecycle = NULL;
+ } else {
+ ASSERT(proactive);
+
+ if (pPool->recyclePrev) {
+ pPool->recyclePrev->recycleNext = pPool->recycleNext;
+ } else {
+ pVnode->recycleHead = pPool->recycleNext;
}
- pPool->next = pVnode->pPool;
- pVnode->pPool = pPool;
- taosThreadCondSignal(&pVnode->poolNotEmpty);
-
- taosThreadMutexUnlock(&pVnode->mutex);
+ if (pPool->recycleNext) {
+ pPool->recycleNext->recyclePrev = pPool->recyclePrev;
+ } else {
+ pVnode->recycleTail = pPool->recyclePrev;
+ }
+ pPool->recyclePrev = pPool->recycleNext = NULL;
}
+
+ vnodeBufPoolAddToFreeList(pPool);
+
+_exit:
+ if (proactive) taosThreadMutexUnlock(&pVnode->mutex);
+ return;
}
+
+int32_t vnodeBufPoolRegisterQuery(SVBufPool *pPool, SQueryNode *pQNode) {
+ int32_t code = 0;
+
+ taosThreadMutexLock(&pPool->mutex);
+
+ pQNode->pNext = pPool->qList.pNext;
+ pQNode->ppNext = &pPool->qList.pNext;
+ pPool->qList.pNext->ppNext = &pQNode->pNext;
+ pPool->qList.pNext = pQNode;
+ pPool->nQuery++;
+
+ taosThreadMutexUnlock(&pPool->mutex);
+
+_exit:
+ return code;
+}
+
+void vnodeBufPoolDeregisterQuery(SVBufPool *pPool, SQueryNode *pQNode, bool proactive) {
+ int32_t code = 0;
+
+ if (proactive) taosThreadMutexLock(&pPool->mutex);
+
+ pQNode->pNext->ppNext = pQNode->ppNext;
+ *pQNode->ppNext = pQNode->pNext;
+ pPool->nQuery--;
+
+ if (proactive) taosThreadMutexUnlock(&pPool->mutex);
+}
+
+int32_t vnodeBufPoolRecycle(SVBufPool *pPool) {
+ int32_t code = 0;
+
+ SVnode *pVnode = pPool->pVnode;
+
+ vDebug("vgId:%d recycle buffer pool %p of id %d", TD_VID(pVnode), pPool, pPool->id);
+
+ taosThreadMutexLock(&pPool->mutex);
+
+ SQueryNode *pNode = pPool->qList.pNext;
+ while (pNode != &pPool->qList) {
+ SQueryNode *pTNode = pNode->pNext;
+
+ int32_t rc = pNode->reseek(pNode->pQHandle);
+ if (rc == 0 || rc == TSDB_CODE_VND_QUERY_BUSY) {
+ pNode = pTNode;
+ } else {
+ code = rc;
+ goto _exit;
+ }
+ }
+
+_exit:
+ taosThreadMutexUnlock(&pPool->mutex);
+ return code;
+}
\ No newline at end of file
diff --git a/source/dnode/vnode/src/vnd/vnodeCfg.c b/source/dnode/vnode/src/vnd/vnodeCfg.c
index 69af536a44..c326c8bfac 100644
--- a/source/dnode/vnode/src/vnd/vnodeCfg.c
+++ b/source/dnode/vnode/src/vnd/vnodeCfg.c
@@ -262,9 +262,10 @@ int vnodeDecodeConfig(const SJson *pJson, void *pObj) {
tjsonGetNumberValue(info, "nodePort", pNode->nodePort, code);
if (code < 0) return -1;
tjsonGetStringValue(info, "nodeFqdn", pNode->nodeFqdn);
- if (code < 0) return -1;
tjsonGetNumberValue(info, "nodeId", pNode->nodeId, code);
+ if (code < 0) return -1;
tjsonGetNumberValue(info, "clusterId", pNode->clusterId, code);
+ if (code < 0) return -1;
vDebug("vgId:%d, decode config, replica:%d ep:%s:%u dnode:%d", pCfg->vgId, i, pNode->nodeFqdn, pNode->nodePort,
pNode->nodeId);
}
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index ab7f73121f..63c05ce88c 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -21,44 +21,149 @@
static int vnodeEncodeInfo(const SVnodeInfo *pInfo, char **ppData);
static int vnodeCommitImpl(SCommitInfo *pInfo);
-int vnodeBegin(SVnode *pVnode) {
- // alloc buffer pool
- taosThreadMutexLock(&pVnode->mutex);
+#define WAIT_TIME_MILI_SEC 10 // miliseconds
- while (pVnode->pPool == NULL) {
- taosThreadCondWait(&pVnode->poolNotEmpty, &pVnode->mutex);
+static int32_t vnodeTryRecycleBufPool(SVnode *pVnode) {
+ int32_t code = 0;
+
+ if (pVnode->onRecycle == NULL) {
+ if (pVnode->recycleHead == NULL) {
+ vDebug("vgId:%d no recyclable buffer pool", TD_VID(pVnode));
+ goto _exit;
+ } else {
+ vDebug("vgId:%d buffer pool %p of id %d on recycle queue, try to recycle", TD_VID(pVnode), pVnode->recycleHead,
+ pVnode->recycleHead->id);
+
+ pVnode->onRecycle = pVnode->recycleHead;
+ if (pVnode->recycleHead == pVnode->recycleTail) {
+ pVnode->recycleHead = pVnode->recycleTail = NULL;
+ } else {
+ pVnode->recycleHead = pVnode->recycleHead->recycleNext;
+ pVnode->recycleHead->recyclePrev = NULL;
+ }
+ pVnode->onRecycle->recycleNext = pVnode->onRecycle->recyclePrev = NULL;
+ }
}
- pVnode->inUse = pVnode->pPool;
- pVnode->inUse->nRef = 1;
- pVnode->pPool = pVnode->inUse->next;
- pVnode->inUse->next = NULL;
+ code = vnodeBufPoolRecycle(pVnode->onRecycle);
+ if (code) goto _exit;
+_exit:
+ if (code) {
+ vError("vgId:%d %s failed since %s", TD_VID(pVnode), __func__, tstrerror(code));
+ }
+ return code;
+}
+static int32_t vnodeGetBufPoolToUse(SVnode *pVnode) {
+ int32_t code = 0;
+ int32_t lino = 0;
+
+ taosThreadMutexLock(&pVnode->mutex);
+
+ int32_t nTry = 0;
+ for (;;) {
+ ++nTry;
+
+ if (pVnode->freeList) {
+ vDebug("vgId:%d allocate free buffer pool on %d try, pPool:%p id:%d", TD_VID(pVnode), nTry, pVnode->freeList,
+ pVnode->freeList->id);
+
+ pVnode->inUse = pVnode->freeList;
+ pVnode->inUse->nRef = 1;
+ pVnode->freeList = pVnode->inUse->freeNext;
+ pVnode->inUse->freeNext = NULL;
+ break;
+ } else {
+ vDebug("vgId:%d no free buffer pool on %d try, try to recycle...", TD_VID(pVnode), nTry);
+ /*
+ code = vnodeTryRecycleBufPool(pVnode);
+ TSDB_CHECK_CODE(code, lino, _exit);
+ */
+ if (pVnode->freeList == NULL) {
+ vDebug("vgId:%d no free buffer pool on %d try, wait %d ms...", TD_VID(pVnode), nTry, WAIT_TIME_MILI_SEC);
+
+ struct timeval tv;
+ struct timespec ts;
+ taosGetTimeOfDay(&tv);
+ ts.tv_nsec = tv.tv_usec * 1000 + WAIT_TIME_MILI_SEC * 1000000;
+ if (ts.tv_nsec > 999999999l) {
+ ts.tv_sec = tv.tv_sec + 1;
+ ts.tv_nsec -= 1000000000l;
+ } else {
+ ts.tv_sec = tv.tv_sec;
+ }
+
+ int32_t rc = taosThreadCondTimedWait(&pVnode->poolNotEmpty, &pVnode->mutex, &ts);
+ if (rc && rc != ETIMEDOUT) {
+ code = TAOS_SYSTEM_ERROR(rc);
+ TSDB_CHECK_CODE(code, lino, _exit);
+ }
+ }
+ }
+ }
+
+_exit:
taosThreadMutexUnlock(&pVnode->mutex);
+ if (code) {
+ vError("vgId:%d %s failed at line %d since %s", TD_VID(pVnode), __func__, lino, tstrerror(code));
+ }
+ return code;
+}
+int vnodeBegin(SVnode *pVnode) {
+ int32_t code = 0;
+ int32_t lino = 0;
pVnode->state.commitID++;
+
+ // alloc buffer pool
+ code = vnodeGetBufPoolToUse(pVnode);
+ TSDB_CHECK_CODE(code, lino, _exit);
+
// begin meta
if (metaBegin(pVnode->pMeta, META_BEGIN_HEAP_BUFFERPOOL) < 0) {
- vError("vgId:%d, failed to begin meta since %s", TD_VID(pVnode), tstrerror(terrno));
- return -1;
+ code = terrno;
+ TSDB_CHECK_CODE(code, lino, _exit);
}
// begin tsdb
if (tsdbBegin(pVnode->pTsdb) < 0) {
- vError("vgId:%d, failed to begin tsdb since %s", TD_VID(pVnode), tstrerror(terrno));
- return -1;
+ code = terrno;
+ TSDB_CHECK_CODE(code, lino, _exit);
}
// begin sma
if (VND_IS_RSMA(pVnode) && smaBegin(pVnode->pSma) < 0) {
- vError("vgId:%d, failed to begin sma since %s", TD_VID(pVnode), tstrerror(terrno));
- return -1;
+ code = terrno;
+ TSDB_CHECK_CODE(code, lino, _exit);
}
- return 0;
+_exit:
+ if (code) {
+ terrno = code;
+ vError("vgId:%d %s failed at line %d since %s", TD_VID(pVnode), __func__, lino, tstrerror(code));
+ }
+ return code;
+}
+
+void vnodeUpdCommitSched(SVnode *pVnode) {
+ int64_t randNum = taosRand();
+ pVnode->commitSched.commitMs = taosGetMonoTimestampMs();
+ pVnode->commitSched.maxWaitMs = tsVndCommitMaxIntervalMs + (randNum % tsVndCommitMaxIntervalMs);
}
int vnodeShouldCommit(SVnode *pVnode) {
+ if (!pVnode->inUse || !osDataSpaceAvailable()) {
+ return false;
+ }
+
+ SVCommitSched *pSched = &pVnode->commitSched;
+ int64_t nowMs = taosGetMonoTimestampMs();
+
+ return (((pVnode->inUse->size > pVnode->inUse->node.size) && (pSched->commitMs + SYNC_VND_COMMIT_MIN_MS < nowMs)) ||
+ (pVnode->inUse->size > 0 && pSched->commitMs + pSched->maxWaitMs < nowMs));
+}
+
+int vnodeShouldCommitOld(SVnode *pVnode) {
if (pVnode->inUse) {
return osDataSpaceAvailable() && (pVnode->inUse->size > pVnode->inUse->node.size);
}
@@ -191,6 +296,12 @@ static int32_t vnodePrepareCommit(SVnode *pVnode, SCommitInfo *pInfo) {
tsem_wait(&pVnode->canCommit);
+ taosThreadMutexLock(&pVnode->mutex);
+ ASSERT(pVnode->onCommit == NULL);
+ pVnode->onCommit = pVnode->inUse;
+ pVnode->inUse = NULL;
+ taosThreadMutexUnlock(&pVnode->mutex);
+
pVnode->state.commitTerm = pVnode->state.applyTerm;
pInfo->info.config = pVnode->config;
@@ -220,9 +331,6 @@ static int32_t vnodePrepareCommit(SVnode *pVnode, SCommitInfo *pInfo) {
code = smaPrepareAsyncCommit(pVnode->pSma);
if (code) goto _exit;
- vnodeBufPoolUnRef(pVnode->inUse);
- pVnode->inUse = NULL;
-
_exit:
if (code) {
vError("vgId:%d, %s failed at line %d since %s, commit id:%" PRId64, TD_VID(pVnode), __func__, lino,
@@ -233,22 +341,52 @@ _exit:
return code;
}
+static void vnodeReturnBufPool(SVnode *pVnode) {
+ taosThreadMutexLock(&pVnode->mutex);
+ SVBufPool *pPool = pVnode->onCommit;
+ int32_t nRef = atomic_sub_fetch_32(&pPool->nRef, 1);
+
+ pVnode->onCommit = NULL;
+ if (nRef == 0) {
+ vnodeBufPoolAddToFreeList(pPool);
+ } else if (nRef > 0) {
+ vDebug("vgId:%d buffer pool %p of id %d is added to recycle queue", TD_VID(pVnode), pPool, pPool->id);
+
+ if (pVnode->recycleTail == NULL) {
+ pPool->recyclePrev = pPool->recycleNext = NULL;
+ pVnode->recycleHead = pVnode->recycleTail = pPool;
+ } else {
+ pPool->recyclePrev = pVnode->recycleTail;
+ pPool->recycleNext = NULL;
+ pVnode->recycleTail->recycleNext = pPool;
+ pVnode->recycleTail = pPool;
+ }
+ } else {
+ ASSERT(0);
+ }
+
+ taosThreadMutexUnlock(&pVnode->mutex);
+}
static int32_t vnodeCommitTask(void *arg) {
int32_t code = 0;
SCommitInfo *pInfo = (SCommitInfo *)arg;
+ SVnode *pVnode = pInfo->pVnode;
// commit
code = vnodeCommitImpl(pInfo);
if (code) goto _exit;
+ vnodeReturnBufPool(pVnode);
+
_exit:
// end commit
- tsem_post(&pInfo->pVnode->canCommit);
+ tsem_post(&pVnode->canCommit);
taosMemoryFree(pInfo);
return code;
}
+
int vnodeAsyncCommit(SVnode *pVnode) {
int32_t code = 0;
@@ -297,7 +435,9 @@ static int vnodeCommitImpl(SCommitInfo *pInfo) {
SVnode *pVnode = pInfo->pVnode;
vInfo("vgId:%d, start to commit, commitId:%" PRId64 " version:%" PRId64 " term: %" PRId64, TD_VID(pVnode),
- pVnode->state.commitID, pVnode->state.applied, pVnode->state.applyTerm);
+ pInfo->info.state.commitID, pInfo->info.state.committed, pInfo->info.state.commitTerm);
+
+ vnodeUpdCommitSched(pVnode);
// persist wal before starting
if (walPersist(pVnode->pWal) < 0) {
diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index bec5d2977b..52c1f45762 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -160,6 +160,8 @@ SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
taosThreadMutexInit(&pVnode->mutex, NULL);
taosThreadCondInit(&pVnode->poolNotEmpty, NULL);
+ vnodeUpdCommitSched(pVnode);
+
int8_t rollback = vnodeShouldRollback(pVnode);
// open buffer pool
@@ -238,7 +240,7 @@ _err:
if (pVnode->pTsdb) tsdbClose(&pVnode->pTsdb);
if (pVnode->pSma) smaClose(pVnode->pSma);
if (pVnode->pMeta) metaClose(pVnode->pMeta);
- if (pVnode->pPool) vnodeCloseBufPool(pVnode);
+ if (pVnode->freeList) vnodeCloseBufPool(pVnode);
tsem_destroy(&(pVnode->canCommit));
taosMemoryFree(pVnode);
@@ -250,9 +252,11 @@ void vnodePreClose(SVnode *pVnode) {
vnodeSyncPreClose(pVnode);
}
+void vnodePostClose(SVnode *pVnode) { vnodeSyncPostClose(pVnode); }
+
void vnodeClose(SVnode *pVnode) {
if (pVnode) {
- vnodeSyncCommit(pVnode);
+ tsem_wait(&pVnode->canCommit);
vnodeSyncClose(pVnode);
vnodeQueryClose(pVnode);
walClose(pVnode->pWal);
@@ -261,6 +265,8 @@ void vnodeClose(SVnode *pVnode) {
smaClose(pVnode->pSma);
metaClose(pVnode->pMeta);
vnodeCloseBufPool(pVnode);
+ tsem_post(&pVnode->canCommit);
+
// destroy handle
tsem_destroy(&(pVnode->canCommit));
tsem_destroy(&pVnode->syncSem);
diff --git a/source/dnode/vnode/src/vnd/vnodeSnapshot.c b/source/dnode/vnode/src/vnd/vnodeSnapshot.c
index cc22668b29..e75dc24329 100644
--- a/source/dnode/vnode/src/vnd/vnodeSnapshot.c
+++ b/source/dnode/vnode/src/vnd/vnodeSnapshot.c
@@ -406,8 +406,10 @@ static int32_t vnodeSnapWriteInfo(SVSnapWriter *pWriter, uint8_t *pData, uint32_
snprintf(dir, TSDB_FILENAME_LEN, "%s", pWriter->pVnode->path);
}
- SVnode *pVnode = pWriter->pVnode;
+ SVnodeStats vndStats = pWriter->info.config.vndStats;
+ SVnode *pVnode = pWriter->pVnode;
pWriter->info.config = pVnode->config;
+ pWriter->info.config.vndStats = vndStats;
vDebug("vgId:%d, save config while write snapshot", pWriter->pVnode->config.vgId);
if (vnodeSaveInfo(dir, &pWriter->info) < 0) {
code = terrno;
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index 7f6c7e0c67..c81c11abbf 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -193,18 +193,17 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
void *pReq;
int32_t len;
int32_t ret;
-
+ /*
if (!pVnode->inUse) {
terrno = TSDB_CODE_VND_NO_AVAIL_BUFPOOL;
vError("vgId:%d, not ready to write since %s", TD_VID(pVnode), terrstr());
return -1;
}
-
+ */
if (version <= pVnode->state.applied) {
vError("vgId:%d, duplicate write request. version: %" PRId64 ", applied: %" PRId64 "", TD_VID(pVnode), version,
pVnode->state.applied);
terrno = TSDB_CODE_VND_DUP_REQUEST;
- pRsp->info.handle = NULL;
return -1;
}
@@ -226,6 +225,7 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
// skip header
pReq = POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead));
len = pMsg->contLen - sizeof(SMsgHead);
+ bool needCommit = false;
switch (pMsg->msgType) {
/* META */
@@ -322,6 +322,7 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
vnodeProcessAlterConfigReq(pVnode, version, pReq, len, pRsp);
break;
case TDMT_VND_COMMIT:
+<<<<<<< HEAD
vnodeSyncCommit(pVnode);
vnodeBegin(pVnode);
goto _exit;
@@ -330,6 +331,9 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
break;
case TDMT_VND_DROP_INDEX:
vnodeProcessDropIndexReq(pVnode, version, pReq, len, pRsp);
+=======
+ needCommit = true;
+>>>>>>> 072d6ab059553781b4fde03902d5d653e1151ce3
break;
default:
vError("vgId:%d, unprocessed msg, %d", TD_VID(pVnode), pMsg->msgType);
@@ -347,7 +351,7 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
}
// commit if need
- if (vnodeShouldCommit(pVnode)) {
+ if (needCommit) {
vInfo("vgId:%d, commit at version %" PRId64, TD_VID(pVnode), version);
if (vnodeAsyncCommit(pVnode) < 0) {
vError("vgId:%d, failed to vnode async commit since %s.", TD_VID(pVnode), tstrerror(terrno));
@@ -1010,6 +1014,7 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t version, void *pReq
code = terrno;
goto _exit;
}
+ pSubmitTbData->uid = pSubmitTbData->pCreateTbReq->uid; // update uid if table exist for using below
}
}
diff --git a/source/dnode/vnode/src/vnd/vnodeSync.c b/source/dnode/vnode/src/vnd/vnodeSync.c
index 749c81224c..6f3788616a 100644
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@@ -101,6 +101,64 @@ static void vnodeHandleProposeError(SVnode *pVnode, SRpcMsg *pMsg, int32_t code)
}
}
+static int32_t inline vnodeProposeMsg(SVnode *pVnode, SRpcMsg *pMsg, bool isWeak) {
+ int64_t seq = 0;
+
+ taosThreadMutexLock(&pVnode->lock);
+ int32_t code = syncPropose(pVnode->sync, pMsg, isWeak, &seq);
+ bool wait = (code == 0 && vnodeIsMsgBlock(pMsg->msgType));
+ if (wait) {
+ ASSERT(!pVnode->blocked);
+ pVnode->blocked = true;
+ pVnode->blockSec = taosGetTimestampSec();
+ pVnode->blockSeq = seq;
+#if 0
+ pVnode->blockInfo = pMsg->info;
+#endif
+ }
+ taosThreadMutexUnlock(&pVnode->lock);
+
+ if (code > 0) {
+ vnodeHandleWriteMsg(pVnode, pMsg);
+ } else if (code < 0) {
+ if (terrno != 0) code = terrno;
+ vnodeHandleProposeError(pVnode, pMsg, code);
+ }
+
+ if (wait) vnodeWaitBlockMsg(pVnode, pMsg);
+ return code;
+}
+
+void vnodeProposeCommitOnNeed(SVnode *pVnode) {
+ if (!vnodeShouldCommit(pVnode)) {
+ return;
+ }
+
+ int32_t contLen = sizeof(SMsgHead);
+ SMsgHead *pHead = rpcMallocCont(contLen);
+ pHead->contLen = contLen;
+ pHead->vgId = pVnode->config.vgId;
+
+ SRpcMsg rpcMsg = {0};
+ rpcMsg.msgType = TDMT_VND_COMMIT;
+ rpcMsg.contLen = contLen;
+ rpcMsg.pCont = pHead;
+ rpcMsg.info.noResp = 1;
+
+ bool isWeak = false;
+ if (vnodeProposeMsg(pVnode, &rpcMsg, isWeak) < 0) {
+ vTrace("vgId:%d, failed to propose vnode commit since %s", pVnode->config.vgId, terrstr());
+ goto _out;
+ }
+
+ vInfo("vgId:%d, proposed vnode commit", pVnode->config.vgId);
+
+_out:
+ vnodeUpdCommitSched(pVnode);
+ rpcFreeCont(rpcMsg.pCont);
+ rpcMsg.pCont = NULL;
+}
+
#if BATCH_ENABLE
static void inline vnodeProposeBatchMsg(SVnode *pVnode, SRpcMsg **pMsgArr, bool *pIsWeakArr, int32_t *arrSize) {
@@ -178,6 +236,8 @@ void vnodeProposeWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs)
continue;
}
+ vnodeProposeCommitOnNeed(pVnode);
+
code = vnodePreProcessWriteMsg(pVnode, pMsg);
if (code != 0) {
vGError("vgId:%d, msg:%p failed to pre-process since %s", vgId, pMsg, terrstr());
@@ -205,34 +265,6 @@ void vnodeProposeWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs)
#else
-static int32_t inline vnodeProposeMsg(SVnode *pVnode, SRpcMsg *pMsg, bool isWeak) {
- int64_t seq = 0;
-
- taosThreadMutexLock(&pVnode->lock);
- int32_t code = syncPropose(pVnode->sync, pMsg, isWeak, &seq);
- bool wait = (code == 0 && vnodeIsMsgBlock(pMsg->msgType));
- if (wait) {
- ASSERT(!pVnode->blocked);
- pVnode->blocked = true;
- pVnode->blockSec = taosGetTimestampSec();
- pVnode->blockSeq = seq;
-#if 0
- pVnode->blockInfo = pMsg->info;
-#endif
- }
- taosThreadMutexUnlock(&pVnode->lock);
-
- if (code > 0) {
- vnodeHandleWriteMsg(pVnode, pMsg);
- } else if (code < 0) {
- if (terrno != 0) code = terrno;
- vnodeHandleProposeError(pVnode, pMsg, code);
- }
-
- if (wait) vnodeWaitBlockMsg(pVnode, pMsg);
- return code;
-}
-
void vnodeProposeWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs) {
SVnode *pVnode = pInfo->ahandle;
int32_t vgId = pVnode->config.vgId;
@@ -256,6 +288,8 @@ void vnodeProposeWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs)
continue;
}
+ vnodeProposeCommitOnNeed(pVnode);
+
code = vnodePreProcessWriteMsg(pVnode, pMsg);
if (code != 0) {
vGError("vgId:%d, msg:%p failed to pre-process since %s", vgId, pMsg, terrstr());
@@ -614,6 +648,11 @@ void vnodeSyncPreClose(SVnode *pVnode) {
taosThreadMutexUnlock(&pVnode->lock);
}
+void vnodeSyncPostClose(SVnode *pVnode) {
+ vInfo("vgId:%d, post close sync", pVnode->config.vgId);
+ syncPostStop(pVnode->sync);
+}
+
void vnodeSyncClose(SVnode *pVnode) {
vInfo("vgId:%d, close sync", pVnode->config.vgId);
syncStop(pVnode->sync);
diff --git a/source/libs/catalog/inc/catalogInt.h b/source/libs/catalog/inc/catalogInt.h
index 9cbad139bf..836ce87fbb 100644
--- a/source/libs/catalog/inc/catalogInt.h
+++ b/source/libs/catalog/inc/catalogInt.h
@@ -776,6 +776,7 @@ void ctgFreeHandleImpl(SCatalog* pCtg);
int32_t ctgGetVgInfoFromHashValue(SCatalog* pCtg, SDBVgInfo* dbInfo, const SName* pTableName, SVgroupInfo* pVgroup);
int32_t ctgGetVgInfosFromHashValue(SCatalog* pCtg, SCtgTaskReq* tReq, SDBVgInfo* dbInfo, SCtgTbHashsCtx* pCtx,
char* dbFName, SArray* pNames, bool update);
+int32_t ctgGetVgIdsFromHashValue(SCatalog* pCtg, SDBVgInfo* dbInfo, char* dbFName, const char* pTbs[], int32_t tbNum, int32_t* vgId);
void ctgResetTbMetaTask(SCtgTask* pTask);
void ctgFreeDbCache(SCtgDBCache* dbCache);
int32_t ctgStbVersionSortCompare(const void* key1, const void* key2);
diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index acd0fb9d8c..c7af0411be 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -551,6 +551,37 @@ _return:
CTG_RET(code);
}
+int32_t ctgGetTbsHashVgId(SCatalog* pCtg, SRequestConnInfo* pConn, int32_t acctId, const char* pDb, const char* pTbs[], int32_t tbNum, int32_t* vgId) {
+ if (IS_SYS_DBNAME(pDb)) {
+ ctgError("no valid vgInfo for db, dbname:%s", pDb);
+ CTG_ERR_RET(TSDB_CODE_CTG_INVALID_INPUT);
+ }
+
+ SCtgDBCache* dbCache = NULL;
+ int32_t code = 0;
+ char dbFName[TSDB_DB_FNAME_LEN] = {0};
+ snprintf(dbFName, TSDB_DB_FNAME_LEN, "%d.%s", acctId, pDb);
+
+ SDBVgInfo* vgInfo = NULL;
+ CTG_ERR_JRET(ctgGetDBVgInfo(pCtg, pConn, dbFName, &dbCache, &vgInfo, NULL));
+
+ CTG_ERR_JRET(ctgGetVgIdsFromHashValue(pCtg, vgInfo ? vgInfo : dbCache->vgCache.vgInfo, dbFName, pTbs, tbNum, vgId));
+
+_return:
+
+ if (dbCache) {
+ ctgRUnlockVgInfo(dbCache);
+ ctgReleaseDBCache(pCtg, dbCache);
+ }
+
+ if (vgInfo) {
+ freeVgInfo(vgInfo);
+ }
+
+ CTG_RET(code);
+}
+
+
int32_t ctgGetCachedTbVgMeta(SCatalog* pCtg, const SName* pTableName, SVgroupInfo* pVgroup, STableMeta** pTableMeta) {
int32_t code = 0;
char db[TSDB_DB_FNAME_LEN] = {0};
@@ -1141,6 +1172,13 @@ int32_t catalogGetTableHashVgroup(SCatalog* pCtg, SRequestConnInfo* pConn, const
CTG_API_LEAVE(ctgGetTbHashVgroup(pCtg, pConn, pTableName, pVgroup, NULL));
}
+int32_t catalogGetTablesHashVgId(SCatalog* pCtg, SRequestConnInfo* pConn, int32_t acctId, const char* pDb, const char* pTableName[],
+ int32_t tableNum, int32_t *vgId) {
+ CTG_API_ENTER();
+
+ CTG_API_LEAVE(ctgGetTbsHashVgId(pCtg, pConn, acctId, pDb, pTableName, tableNum, vgId));
+}
+
int32_t catalogGetCachedTableHashVgroup(SCatalog* pCtg, const SName* pTableName, SVgroupInfo* pVgroup, bool* exists) {
CTG_API_ENTER();
diff --git a/source/libs/catalog/src/ctgAsync.c b/source/libs/catalog/src/ctgAsync.c
index b8590c9255..438128203e 100644
--- a/source/libs/catalog/src/ctgAsync.c
+++ b/source/libs/catalog/src/ctgAsync.c
@@ -483,7 +483,7 @@ int32_t ctgInitTask(SCtgJob* pJob, CTG_TASK_TYPE type, void* param, int32_t* tas
_return:
CTG_UNLOCK(CTG_WRITE, &pJob->taskLock);
-
+
return code;
}
@@ -905,6 +905,14 @@ int32_t ctgCallUserCb(void* param) {
return TSDB_CODE_SUCCESS;
}
+void ctgUpdateJobErrCode(SCtgJob* pJob, int32_t errCode) {
+ if (!NEED_CLIENT_REFRESH_VG_ERROR(errCode) || errCode == TSDB_CODE_SUCCESS) return;
+
+ atomic_store_32(&pJob->jobResCode, errCode);
+ qDebug("QID:0x%" PRIx64 " ctg job errCode updated to %s", pJob->queryId, tstrerror(errCode));
+ return;
+}
+
int32_t ctgHandleTaskEnd(SCtgTask* pTask, int32_t rspCode) {
SCtgJob* pJob = pTask->pJob;
int32_t code = 0;
@@ -924,6 +932,8 @@ int32_t ctgHandleTaskEnd(SCtgTask* pTask, int32_t rspCode) {
if (taskDone < taosArrayGetSize(pJob->pTasks)) {
qDebug("QID:0x%" PRIx64 " task done: %d, total: %d", pJob->queryId, taskDone,
(int32_t)taosArrayGetSize(pJob->pTasks));
+
+ ctgUpdateJobErrCode(pJob, rspCode);
return TSDB_CODE_SUCCESS;
}
@@ -931,7 +941,8 @@ int32_t ctgHandleTaskEnd(SCtgTask* pTask, int32_t rspCode) {
_return:
- pJob->jobResCode = code;
+ ctgUpdateJobErrCode(pJob, rspCode);
+ // pJob->jobResCode = code;
// taosSsleep(2);
// qDebug("QID:0x%" PRIx64 " ctg after sleep", pJob->queryId);
@@ -1098,7 +1109,8 @@ _return:
}
if (code) {
- ctgTaskError("Get table %d.%s.%s meta failed with error %s", pName->acctId, pName->dbname, pName->tname, tstrerror(code));
+ ctgTaskError("Get table %d.%s.%s meta failed with error %s", pName->acctId, pName->dbname, pName->tname,
+ tstrerror(code));
}
if (pTask->res || code) {
ctgHandleTaskEnd(pTask, code);
@@ -1286,7 +1298,8 @@ _return:
TSWAP(pTask->res, ctx->pResList);
taskDone = true;
}
- ctgTaskError("Get table %d.%s.%s meta failed with error %s", pName->acctId, pName->dbname, pName->tname, tstrerror(code));
+ ctgTaskError("Get table %d.%s.%s meta failed with error %s", pName->acctId, pName->dbname, pName->tname,
+ tstrerror(code));
}
if (pTask->res && taskDone) {
diff --git a/source/libs/catalog/src/ctgUtil.c b/source/libs/catalog/src/ctgUtil.c
index 802ecde63e..3dd40a4139 100644
--- a/source/libs/catalog/src/ctgUtil.c
+++ b/source/libs/catalog/src/ctgUtil.c
@@ -986,6 +986,43 @@ int32_t ctgGetVgInfosFromHashValue(SCatalog* pCtg, SCtgTaskReq* tReq, SDBVgInfo*
CTG_RET(code);
}
+int32_t ctgGetVgIdsFromHashValue(SCatalog* pCtg, SDBVgInfo* dbInfo, char* dbFName, const char* pTbs[], int32_t tbNum, int32_t* vgId) {
+ int32_t code = 0;
+ CTG_ERR_RET(ctgMakeVgArray(dbInfo));
+
+ int32_t vgNum = taosArrayGetSize(dbInfo->vgArray);
+
+ if (vgNum <= 0) {
+ ctgError("db vgroup cache invalid, db:%s, vgroup number:%d", dbFName, vgNum);
+ CTG_ERR_RET(TSDB_CODE_TSC_DB_NOT_SELECTED);
+ }
+
+ SVgroupInfo* vgInfo = NULL;
+ char tbFullName[TSDB_TABLE_FNAME_LEN];
+ snprintf(tbFullName, sizeof(tbFullName), "%s.", dbFName);
+ int32_t offset = strlen(tbFullName);
+
+ for (int32_t i = 0; i < tbNum; ++i) {
+ snprintf(tbFullName + offset, sizeof(tbFullName) - offset, "%s", pTbs[i]);
+ uint32_t hashValue = taosGetTbHashVal(tbFullName, (uint32_t)strlen(tbFullName), dbInfo->hashMethod,
+ dbInfo->hashPrefix, dbInfo->hashSuffix);
+
+ vgInfo = taosArraySearch(dbInfo->vgArray, &hashValue, ctgHashValueComp, TD_EQ);
+ if (NULL == vgInfo) {
+ ctgError("no hash range found for hash value [%u], db:%s, numOfVgId:%d", hashValue, dbFName,
+ (int32_t)taosArrayGetSize(dbInfo->vgArray));
+ CTG_ERR_RET(TSDB_CODE_CTG_INTERNAL_ERROR);
+ }
+
+ vgId[i] = vgInfo->vgId;
+
+ ctgDebug("Got tb %s vgId:%d", tbFullName, vgInfo->vgId);
+ }
+
+ CTG_RET(code);
+}
+
+
int32_t ctgStbVersionSearchCompare(const void* key1, const void* key2) {
if (*(uint64_t*)key1 < ((SSTableVersion*)key2)->suid) {
return -1;
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 45cfcba8b5..c122a91d71 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -474,9 +474,11 @@ typedef struct SStreamScanInfo {
SNode* pTagIndexCond;
// recover
- int32_t blockRecoverContiCnt;
- int32_t blockRecoverTotCnt;
+ int32_t blockRecoverContiCnt;
+ int32_t blockRecoverTotCnt;
+ SSDataBlock* pRecoverRes;
+ SSDataBlock* pCreateTbRes;
} SStreamScanInfo;
typedef struct {
@@ -567,6 +569,8 @@ typedef struct SStreamIntervalOperatorInfo {
SStreamState* pState;
SWinKey delKey;
uint64_t numOfDatapack;
+ SArray* pUpdated;
+ SHashObj* pUpdatedMap;
} SStreamIntervalOperatorInfo;
typedef struct SDataGroupInfo {
@@ -613,6 +617,8 @@ typedef struct SStreamSessionAggOperatorInfo {
SPhysiNode* pPhyNode; // create new child
bool isFinal;
bool ignoreExpiredData;
+ SArray* pUpdated;
+ SSHashObj* pStUpdated;
} SStreamSessionAggOperatorInfo;
typedef struct SStreamStateAggOperatorInfo {
@@ -628,6 +634,8 @@ typedef struct SStreamStateAggOperatorInfo {
void* pDelIterator;
SArray* pChildren; // cache for children's result;
bool ignoreExpiredData;
+ SArray* pUpdated;
+ SSHashObj* pSeUpdated;
} SStreamStateAggOperatorInfo;
typedef struct SStreamPartitionOperatorInfo {
@@ -638,9 +646,11 @@ typedef struct SStreamPartitionOperatorInfo {
SExprSupp tagCalSup;
SHashObj* pPartitions;
void* parIte;
+ void* pTbNameIte;
SSDataBlock* pInputDataBlock;
int32_t tsColIndex;
SSDataBlock* pDelRes;
+ SSDataBlock* pCreateTbRes;
} SStreamPartitionOperatorInfo;
typedef struct SStreamFillSupporter {
@@ -762,7 +772,7 @@ SOperatorInfo* createMultiwayMergeOperatorInfo(SOperatorInfo** dowStreams, size_
SOperatorInfo* createCacherowsScanOperator(SLastRowScanPhysiNode* pTableScanNode, SReadHandle* readHandle, SExecTaskInfo* pTaskInfo);
-SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SIntervalPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo, bool isStream);
+SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SIntervalPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo);
SOperatorInfo* createMergeIntervalOperatorInfo(SOperatorInfo* downstream, SMergeIntervalPhysiNode* pIntervalPhyNode, SExecTaskInfo* pTaskInfo);
@@ -838,7 +848,6 @@ bool isDeletedStreamWindow(STimeWindow* pWin, uint64_t groupId, SStreamState* pS
void appendOneRowToStreamSpecialBlock(SSDataBlock* pBlock, TSKEY* pStartTs, TSKEY* pEndTs, uint64_t* pUid,
uint64_t* pGp, void* pTbName);
uint64_t calGroupIdByData(SPartitionBySupporter* pParSup, SExprSupp* pExprSup, SSDataBlock* pBlock, int32_t rowId);
-void calBlockTbName(SStreamScanInfo* pInfo, SSDataBlock* pBlock);
int32_t finalizeResultRows(SDiskbasedBuf* pBuf, SResultRowPosition* resultRowPosition, SExprSupp* pSup,
SSDataBlock* pBlock, SExecTaskInfo* pTaskInfo);
@@ -857,6 +866,11 @@ void getNextIntervalWindow(SInterval* pInterval, STimeWindow* tw, int32_t ord
int32_t qAppendTaskStopInfo(SExecTaskInfo* pTaskInfo, SExchangeOpStopInfo* pInfo);
int32_t getForwardStepsInBlock(int32_t numOfRows, __block_search_fn_t searchFn, TSKEY ekey, int32_t pos,
int32_t order, int64_t* pData);
+void appendCreateTableRow(SStreamState* pState, SExprSupp* pTableSup, SExprSupp* pTagSup, int64_t groupId,
+ SSDataBlock* pSrcBlock, int32_t rowId, SSDataBlock* pDestBlock);
+
+SSDataBlock* buildCreateTableBlock(SExprSupp* tbName, SExprSupp* tag);
+SExprInfo* createExpr(SNodeList* pNodeList, int32_t* numOfExprs);
#ifdef __cplusplus
}
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index a5468008aa..cbb056b3b1 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -1424,6 +1424,18 @@ void createExprFromTargetNode(SExprInfo* pExp, STargetNode* pTargetNode) {
createExprFromOneNode(pExp, pTargetNode->pExpr, pTargetNode->slotId);
}
+SExprInfo* createExpr(SNodeList* pNodeList, int32_t* numOfExprs) {
+ *numOfExprs = LIST_LENGTH(pNodeList);
+ SExprInfo* pExprs = taosMemoryCalloc(*numOfExprs, sizeof(SExprInfo));
+
+ for (int32_t i = 0; i < (*numOfExprs); ++i) {
+ SExprInfo* pExp = &pExprs[i];
+ createExprFromOneNode(pExp, nodesListGetNode(pNodeList, i), i + UD_TAG_COLUMN_INDEX);
+ }
+
+ return pExprs;
+}
+
SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t* numOfExprs) {
int32_t numOfFuncs = LIST_LENGTH(pNodeList);
int32_t numOfGroupKeys = 0;
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index 0a2802ba37..6ec60ee857 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -710,6 +710,15 @@ int32_t qAsyncKillTask(qTaskInfo_t qinfo, int32_t rspCode) {
return TSDB_CODE_SUCCESS;
}
+bool qTaskIsExecuting(qTaskInfo_t qinfo) {
+ SExecTaskInfo* pTaskInfo = (SExecTaskInfo*)qinfo;
+ if (NULL == pTaskInfo) {
+ return false;
+ }
+
+ return 0 != atomic_load_64(&pTaskInfo->owner);
+}
+
static void printTaskExecCostInLog(SExecTaskInfo* pTaskInfo) {
STaskCostInfo* pSummary = &pTaskInfo->cost;
int64_t idleTime = pSummary->start - pSummary->created;
@@ -1207,3 +1216,4 @@ void qProcessRspMsg(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) {
rpcFreeCont(pMsg->pCont);
destroySendMsgInfo(pSendInfo);
}
+
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 72419d8fe4..c7ea27edad 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -871,6 +871,7 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoD
return;
}
+ int8_t* pIndicator = (int8_t*)p->pData;
int32_t totalRows = pBlock->info.rows;
if (status == FILTER_RESULT_ALL_QUALIFIED) {
@@ -878,42 +879,135 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoD
} else if (status == FILTER_RESULT_NONE_QUALIFIED) {
pBlock->info.rows = 0;
} else {
- SSDataBlock* px = createOneDataBlock(pBlock, true);
+ int32_t bmLen = BitmapLen(totalRows);
+ char* pBitmap = NULL;
+ int32_t maxRows = 0;
size_t numOfCols = taosArrayGetSize(pBlock->pDataBlock);
for (int32_t i = 0; i < numOfCols; ++i) {
- SColumnInfoData* pSrc = taosArrayGet(px->pDataBlock, i);
SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, i);
// it is a reserved column for scalar function, and no data in this column yet.
- if (pDst->pData == NULL || pSrc->pData == NULL) {
+ if (pDst->pData == NULL) {
continue;
}
- colInfoDataCleanup(pDst, pBlock->info.rows);
-
int32_t numOfRows = 0;
- for (int32_t j = 0; j < totalRows; ++j) {
- if (((int8_t*)p->pData)[j] == 0) {
- continue;
+
+ if (IS_VAR_DATA_TYPE(pDst->info.type)) {
+ int32_t j = 0;
+ pDst->varmeta.length = 0;
+
+ while(j < totalRows) {
+ if (pIndicator[j] == 0) {
+ j += 1;
+ continue;
+ }
+
+ if (colDataIsNull_var(pDst, j)) {
+ colDataSetNull_var(pDst, numOfRows);
+ } else {
+ char* p1 = colDataGetVarData(pDst, j);
+ colDataAppend(pDst, numOfRows, p1, false);
+ }
+ numOfRows += 1;
+ j += 1;
}
- if (colDataIsNull_s(pSrc, j)) {
- colDataAppendNULL(pDst, numOfRows);
- } else {
- colDataAppend(pDst, numOfRows, colDataGetData(pSrc, j), false);
+ if (maxRows < numOfRows) {
+ maxRows = numOfRows;
+ }
+ } else {
+ if (pBitmap == NULL) {
+ pBitmap = taosMemoryCalloc(1, bmLen);
+ }
+
+ memcpy(pBitmap, pDst->nullbitmap, bmLen);
+ memset(pDst->nullbitmap, 0, bmLen);
+
+ int32_t j = 0;
+
+ switch (pDst->info.type) {
+ case TSDB_DATA_TYPE_BIGINT:
+ case TSDB_DATA_TYPE_UBIGINT:
+ case TSDB_DATA_TYPE_DOUBLE:
+ case TSDB_DATA_TYPE_TIMESTAMP:
+ while (j < totalRows) {
+ if (pIndicator[j] == 0) {
+ j += 1;
+ continue;
+ }
+
+ if (colDataIsNull_f(pBitmap, j)) {
+ colDataSetNull_f(pDst->nullbitmap, numOfRows);
+ } else {
+ ((int64_t*)pDst->pData)[numOfRows] = ((int64_t*)pDst->pData)[j];
+ }
+ numOfRows += 1;
+ j += 1;
+ }
+ break;
+ case TSDB_DATA_TYPE_FLOAT:
+ case TSDB_DATA_TYPE_INT:
+ case TSDB_DATA_TYPE_UINT:
+ while (j < totalRows) {
+ if (pIndicator[j] == 0) {
+ j += 1;
+ continue;
+ }
+ if (colDataIsNull_f(pBitmap, j)) {
+ colDataSetNull_f(pDst->nullbitmap, numOfRows);
+ } else {
+ ((int32_t*)pDst->pData)[numOfRows] = ((int32_t*)pDst->pData)[j];
+ }
+ numOfRows += 1;
+ j += 1;
+ }
+ break;
+ case TSDB_DATA_TYPE_SMALLINT:
+ case TSDB_DATA_TYPE_USMALLINT:
+ while (j < totalRows) {
+ if (pIndicator[j] == 0) {
+ j += 1;
+ continue;
+ }
+ if (colDataIsNull_f(pBitmap, j)) {
+ colDataSetNull_f(pDst->nullbitmap, numOfRows);
+ } else {
+ ((int16_t*)pDst->pData)[numOfRows] = ((int16_t*)pDst->pData)[j];
+ }
+ numOfRows += 1;
+ j += 1;
+ }
+ break;
+ case TSDB_DATA_TYPE_BOOL:
+ case TSDB_DATA_TYPE_TINYINT:
+ case TSDB_DATA_TYPE_UTINYINT:
+ while (j < totalRows) {
+ if (pIndicator[j] == 0) {
+ j += 1;
+ continue;
+ }
+ if (colDataIsNull_f(pBitmap, j)) {
+ colDataSetNull_f(pDst->nullbitmap, numOfRows);
+ } else {
+ ((int8_t*)pDst->pData)[numOfRows] = ((int8_t*)pDst->pData)[j];
+ }
+ numOfRows += 1;
+ j += 1;
+ }
+ break;
}
- numOfRows += 1;
}
- // todo this value can be assigned directly
- if (pBlock->info.rows == totalRows) {
- pBlock->info.rows = numOfRows;
- } else {
- ASSERT(pBlock->info.rows == numOfRows);
+ if (maxRows < numOfRows) {
+ maxRows = numOfRows;
}
}
- blockDataDestroy(px); // fix memory leak
+ pBlock->info.rows = maxRows;
+ if (pBitmap != NULL) {
+ taosMemoryFree(pBitmap);
+ }
}
}
@@ -2166,9 +2260,7 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
}
} else if (QUERY_NODE_PHYSICAL_PLAN_HASH_INTERVAL == type) {
SIntervalPhysiNode* pIntervalPhyNode = (SIntervalPhysiNode*)pPhyNode;
-
- bool isStream = (QUERY_NODE_PHYSICAL_PLAN_STREAM_INTERVAL == type);
- pOptr = createIntervalOperatorInfo(ops[0], pIntervalPhyNode, pTaskInfo, isStream);
+ pOptr = createIntervalOperatorInfo(ops[0], pIntervalPhyNode, pTaskInfo);
} else if (QUERY_NODE_PHYSICAL_PLAN_STREAM_INTERVAL == type) {
pOptr = createStreamIntervalOperatorInfo(ops[0], pPhyNode, pTaskInfo);
} else if (QUERY_NODE_PHYSICAL_PLAN_MERGE_ALIGNED_INTERVAL == type) {
@@ -2654,3 +2746,24 @@ int32_t buildSessionResultDataBlock(SOperatorInfo* pOperator, SStreamState* pSta
blockDataUpdateTsWindow(pBlock, 0);
return TSDB_CODE_SUCCESS;
}
+
+void qStreamCloseTsdbReader(void* task) {
+ if (task == NULL) return;
+ SExecTaskInfo* pTaskInfo = (SExecTaskInfo*)task;
+ SOperatorInfo* pOp = pTaskInfo->pRoot;
+ qDebug("stream close tsdb reader, reset status uid %" PRId64 " ts %" PRId64, pTaskInfo->streamInfo.lastStatus.uid,
+ pTaskInfo->streamInfo.lastStatus.ts);
+ pTaskInfo->streamInfo.lastStatus = (STqOffsetVal){0};
+ while (pOp->numOfDownstream == 1 && pOp->pDownstream[0]) {
+ SOperatorInfo* pDownstreamOp = pOp->pDownstream[0];
+ if (pDownstreamOp->operatorType == QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN) {
+ SStreamScanInfo* pInfo = pDownstreamOp->info;
+ if (pInfo->pTableScanOp) {
+ STableScanInfo* pTSInfo = pInfo->pTableScanOp->info;
+ tsdbReaderClose(pTSInfo->base.dataReader);
+ pTSInfo->base.dataReader = NULL;
+ return;
+ }
+ }
+ }
+}
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index 5676e19cdf..3bc00b79b1 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -917,6 +917,7 @@ uint64_t calGroupIdByData(SPartitionBySupporter* pParSup, SExprSupp* pExprSup, S
}
static bool hasRemainPartion(SStreamPartitionOperatorInfo* pInfo) { return pInfo->parIte != NULL; }
+static bool hasRemainTbName(SStreamPartitionOperatorInfo* pInfo) { return pInfo->pTbNameIte != NULL; }
static SSDataBlock* buildStreamPartitionResult(SOperatorInfo* pOperator) {
SStreamPartitionOperatorInfo* pInfo = pOperator->info;
@@ -937,40 +938,13 @@ static SSDataBlock* buildStreamPartitionResult(SOperatorInfo* pOperator) {
colDataAppend(pDestCol, pDest->info.rows, pSrcData, isNull);
}
pDest->info.rows++;
- if (pInfo->tbnameCalSup.numOfExprs > 0 && i == 0) {
- void* tbname = NULL;
- if (streamStateGetParName(pOperator->pTaskInfo->streamInfo.pState, pParInfo->groupId, &tbname) == 0) {
- memcpy(pDest->info.parTbName, tbname, TSDB_TABLE_NAME_LEN);
- tdbFree(tbname);
- } else {
- SSDataBlock* pTmpBlock = blockCopyOneRow(pSrc, rowIndex);
- SSDataBlock* pResBlock = createDataBlock();
- pResBlock->info.rowSize = TSDB_TABLE_NAME_LEN;
- SColumnInfoData data = createColumnInfoData(TSDB_DATA_TYPE_VARCHAR, TSDB_TABLE_NAME_LEN, 0);
- taosArrayPush(pResBlock->pDataBlock, &data);
- blockDataEnsureCapacity(pResBlock, 1);
- projectApplyFunctions(pInfo->tbnameCalSup.pExprInfo, pResBlock, pTmpBlock, pInfo->tbnameCalSup.pCtx, 1, NULL);
- ASSERT(pResBlock->info.rows == 1);
- ASSERT(taosArrayGetSize(pResBlock->pDataBlock) == 1);
- SColumnInfoData* pCol = taosArrayGet(pResBlock->pDataBlock, 0);
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_VARCHAR);
- void* pData = colDataGetVarData(pCol, 0);
- // TODO check tbname validity
- if (pData != (void*)-1) {
- memset(pDest->info.parTbName, 0, TSDB_TABLE_NAME_LEN);
- int32_t len = TMIN(varDataLen(pData), TSDB_TABLE_NAME_LEN - 1);
- memcpy(pDest->info.parTbName, varDataVal(pData), len);
- /*pDest->info.parTbName[len + 1] = 0;*/
- } else {
- pDest->info.parTbName[0] = 0;
- }
- if (pParInfo->groupId && pDest->info.parTbName[0]) {
- streamStatePutParName(pOperator->pTaskInfo->streamInfo.pState, pParInfo->groupId, pDest->info.parTbName);
- }
- /*printf("\n\n set name %s\n\n", pDest->info.parTbName);*/
- blockDataDestroy(pTmpBlock);
- blockDataDestroy(pResBlock);
- }
+ }
+ pDest->info.parTbName[0] = 0;
+ if (pInfo->tbnameCalSup.numOfExprs > 0) {
+ void* tbname = NULL;
+ if (streamStateGetParName(pOperator->pTaskInfo->streamInfo.pState, pParInfo->groupId, &tbname) == 0) {
+ memcpy(pDest->info.parTbName, tbname, TSDB_TABLE_NAME_LEN);
+ tdbFree(tbname);
}
}
taosArrayDestroy(pParInfo->rowIds);
@@ -986,6 +960,60 @@ static SSDataBlock* buildStreamPartitionResult(SOperatorInfo* pOperator) {
return pDest;
}
+void appendCreateTableRow(SStreamState* pState, SExprSupp* pTableSup, SExprSupp* pTagSup, int64_t groupId,
+ SSDataBlock* pSrcBlock, int32_t rowId, SSDataBlock* pDestBlock) {
+ void* pValue = NULL;
+ if (groupId != 0 && streamStateGetParName(pState, groupId, &pValue) != 0) {
+ SSDataBlock* pTmpBlock = blockCopyOneRow(pSrcBlock, rowId);
+ if (pTableSup->numOfExprs > 0) {
+ projectApplyFunctions(pTableSup->pExprInfo, pDestBlock, pTmpBlock, pTableSup->pCtx, pTableSup->numOfExprs, NULL);
+ SColumnInfoData* pTbCol = taosArrayGet(pDestBlock->pDataBlock, UD_TABLE_NAME_COLUMN_INDEX);
+ void* pData = colDataGetVarData(pTbCol, pDestBlock->info.rows - 1);
+ char* tbName = pSrcBlock->info.parTbName;
+ memset(tbName, 0, TSDB_TABLE_NAME_LEN);
+ int32_t len = TMIN(varDataLen(pData), TSDB_TABLE_NAME_LEN - 1);
+ memcpy(tbName, varDataVal(pData), len);
+ streamStatePutParName(pState, groupId, tbName);
+ pDestBlock->info.rows--;
+ } else {
+ void* pTbNameCol = taosArrayGet(pDestBlock->pDataBlock, UD_TABLE_NAME_COLUMN_INDEX);
+ colDataAppendNULL(pTbNameCol, pDestBlock->info.rows);
+ pSrcBlock->info.parTbName[0] = 0;
+ }
+
+ if (pTagSup->numOfExprs > 0) {
+ projectApplyFunctions(pTagSup->pExprInfo, pDestBlock, pTmpBlock, pTagSup->pCtx, pTagSup->numOfExprs, NULL);
+ pDestBlock->info.rows--;
+ }
+
+ void* pGpIdCol = taosArrayGet(pDestBlock->pDataBlock, UD_GROUPID_COLUMN_INDEX);
+ colDataAppend(pGpIdCol, pDestBlock->info.rows, (const char*)&groupId, false);
+
+ pDestBlock->info.rows++;
+ blockDataDestroy(pTmpBlock);
+ }
+ streamStateReleaseBuf(pState, NULL, pValue);
+}
+
+static SSDataBlock* buildStreamCreateTableResult(SOperatorInfo* pOperator) {
+ SStreamPartitionOperatorInfo* pInfo = pOperator->info;
+ if ( (pInfo->tbnameCalSup.numOfExprs == 0 && pInfo->tagCalSup.numOfExprs == 0) || taosHashGetSize(pInfo->pPartitions) == 0) {
+ return NULL;
+ }
+ blockDataCleanup(pInfo->pCreateTbRes);
+ blockDataEnsureCapacity(pInfo->pCreateTbRes, taosHashGetSize(pInfo->pPartitions));
+ SSDataBlock* pSrc = pInfo->pInputDataBlock;
+
+ while (pInfo->pTbNameIte != NULL) {
+ SPartitionDataInfo* pParInfo = (SPartitionDataInfo*)pInfo->pTbNameIte;
+ int32_t rowId = *(int32_t*) taosArrayGet(pParInfo->rowIds, 0);
+ appendCreateTableRow(pOperator->pTaskInfo->streamInfo.pState, &pInfo->tbnameCalSup, &pInfo->tagCalSup,
+ pParInfo->groupId, pSrc, rowId, pInfo->pCreateTbRes);
+ pInfo->pTbNameIte = taosHashIterate(pInfo->pPartitions, pInfo->pTbNameIte);
+ }
+ return pInfo->pCreateTbRes->info.rows > 0 ? pInfo->pCreateTbRes : NULL;
+}
+
static void doStreamHashPartitionImpl(SStreamPartitionOperatorInfo* pInfo, SSDataBlock* pBlock) {
pInfo->pInputDataBlock = pBlock;
for (int32_t i = 0; i < pBlock->info.rows; ++i) {
@@ -1012,6 +1040,15 @@ static SSDataBlock* doStreamHashPartition(SOperatorInfo* pOperator) {
SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
SStreamPartitionOperatorInfo* pInfo = pOperator->info;
+ SSDataBlock* pCtRes = NULL;
+
+ if (hasRemainTbName(pInfo)) {
+ pCtRes = buildStreamCreateTableResult(pOperator);
+ if (pCtRes != NULL) {
+ return pCtRes;
+ }
+ }
+
if (hasRemainPartion(pInfo)) {
return buildStreamPartitionResult(pOperator);
}
@@ -1039,6 +1076,7 @@ static SSDataBlock* doStreamHashPartition(SOperatorInfo* pOperator) {
return pInfo->pDelRes;
} break;
default:
+ ASSERTS(pBlock->info.type == STREAM_CREATE_CHILD_TABLE, "invalid SSDataBlock type");
return pBlock;
}
@@ -1056,6 +1094,11 @@ static SSDataBlock* doStreamHashPartition(SOperatorInfo* pOperator) {
pOperator->cost.openCost = (taosGetTimestampUs() - st) / 1000.0;
pInfo->parIte = taosHashIterate(pInfo->pPartitions, NULL);
+ pInfo->pTbNameIte = taosHashIterate(pInfo->pPartitions, NULL);
+ pCtRes = buildStreamCreateTableResult(pOperator);
+ if (pCtRes != NULL) {
+ return pCtRes;
+ }
return buildStreamPartitionResult(pOperator);
}
@@ -1076,6 +1119,7 @@ static void destroyStreamPartitionOperatorInfo(void* param) {
cleanupExprSupp(&pInfo->tagCalSup);
blockDataDestroy(pInfo->pDelRes);
taosHashCleanup(pInfo->pPartitions);
+ blockDataDestroy(pInfo->pCreateTbRes);
taosMemoryFreeClear(param);
}
@@ -1091,6 +1135,46 @@ void initParDownStream(SOperatorInfo* downstream, SPartitionBySupporter* pParSup
}
}
+SSDataBlock* buildCreateTableBlock(SExprSupp* tbName, SExprSupp* tag) {
+ SSDataBlock* pBlock = taosMemoryCalloc(1, sizeof(SSDataBlock));
+ pBlock->info.hasVarCol = false;
+ pBlock->info.id.groupId = 0;
+ pBlock->info.rows = 0;
+ pBlock->info.type = STREAM_CREATE_CHILD_TABLE;
+ pBlock->info.watermark = INT64_MIN;
+
+ pBlock->pDataBlock = taosArrayInit(4, sizeof(SColumnInfoData));
+ SColumnInfoData infoData = {0};
+ infoData.info.type = TSDB_DATA_TYPE_VARCHAR;
+ if (tbName->numOfExprs > 0) {
+ infoData.info.bytes = tbName->pExprInfo->base.resSchema.bytes;
+ } else {
+ infoData.info.bytes = 1;
+ }
+ pBlock->info.rowSize += infoData.info.bytes;
+ // sub table name
+ taosArrayPush(pBlock->pDataBlock, &infoData);
+
+ SColumnInfoData gpIdData = {0};
+ gpIdData.info.type = TSDB_DATA_TYPE_UBIGINT;
+ gpIdData.info.bytes = 8;
+ pBlock->info.rowSize += gpIdData.info.bytes;
+ // group id
+ taosArrayPush(pBlock->pDataBlock, &gpIdData);
+
+ for (int32_t i = 0; i < tag->numOfExprs; i++) {
+ SColumnInfoData tagCol = {0};
+ tagCol.info.type = tag->pExprInfo[i].base.resSchema.type;
+ tagCol.info.bytes = tag->pExprInfo[i].base.resSchema.bytes;
+ tagCol.info.precision = tag->pExprInfo[i].base.resSchema.precision;
+ // tag info
+ taosArrayPush(pBlock->pDataBlock, &tagCol);
+ pBlock->info.rowSize += tagCol.info.bytes;
+ }
+
+ return pBlock;
+}
+
SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStreamPartitionPhysiNode* pPartNode,
SExecTaskInfo* pTaskInfo) {
SStreamPartitionOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SStreamPartitionOperatorInfo));
@@ -1110,6 +1194,7 @@ SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStr
}
}
+ pInfo->tbnameCalSup.numOfExprs = 0;
if (pPartNode->pSubtable != NULL) {
SExprInfo* pSubTableExpr = taosMemoryCalloc(1, sizeof(SExprInfo));
if (pSubTableExpr == NULL) {
@@ -1124,9 +1209,10 @@ SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStr
}
}
+ pInfo->tagCalSup.numOfExprs = 0;
if (pPartNode->pTags != NULL) {
int32_t numOfTags;
- SExprInfo* pTagExpr = createExprInfo(pPartNode->pTags, NULL, &numOfTags);
+ SExprInfo* pTagExpr = createExpr(pPartNode->pTags, &numOfTags);
if (pTagExpr == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
goto _error;
@@ -1137,6 +1223,12 @@ SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStr
}
}
+ if (pInfo->tbnameCalSup.numOfExprs != 0 || pInfo->tagCalSup.numOfExprs != 0) {
+ pInfo->pCreateTbRes = buildCreateTableBlock(&pInfo->tbnameCalSup, &pInfo->tagCalSup);
+ } else {
+ pInfo->pCreateTbRes = NULL;
+ }
+
int32_t keyLen = 0;
code = initGroupOptrInfo(&pInfo->partitionSup.pGroupColVals, &keyLen, &pInfo->partitionSup.keyBuf,
pInfo->partitionSup.pGroupCols);
@@ -1153,6 +1245,7 @@ SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStr
blockDataEnsureCapacity(pInfo->binfo.pRes, 4096);
pInfo->parIte = NULL;
+ pInfo->pTbNameIte = NULL;
pInfo->pInputDataBlock = NULL;
_hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
diff --git a/source/libs/executor/src/projectoperator.c b/source/libs/executor/src/projectoperator.c
index 2a90f24346..73c3ac4311 100644
--- a/source/libs/executor/src/projectoperator.c
+++ b/source/libs/executor/src/projectoperator.c
@@ -278,7 +278,7 @@ SSDataBlock* doProjectOperation(SOperatorInfo* pOperator) {
// for stream interval
if (pBlock->info.type == STREAM_RETRIEVE || pBlock->info.type == STREAM_DELETE_RESULT ||
- pBlock->info.type == STREAM_DELETE_DATA) {
+ pBlock->info.type == STREAM_DELETE_DATA || pBlock->info.type == STREAM_CREATE_CHILD_TABLE) {
// printDataBlock1(pBlock, "project1");
return pBlock;
}
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index a7f5eb9b22..deae38b331 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -173,7 +173,7 @@ static SResultRow* getTableGroupOutputBuf(SOperatorInfo* pOperator, uint64_t gro
if (NULL == *pPage) {
return NULL;
}
-
+
return (SResultRow*)((char*)(*pPage) + p1->offset);
}
@@ -306,12 +306,14 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanBase* pTableSca
pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
pCost->filterOutBlocks += 1;
pCost->totalRows += pBlock->info.rows;
+ tsdbReleaseDataBlock(pTableScanInfo->dataReader);
return TSDB_CODE_SUCCESS;
} else if (*status == FUNC_DATA_REQUIRED_NOT_LOAD) {
qDebug("%s data block skipped, brange:%" PRId64 "-%" PRId64 ", rows:%d", GET_TASKID(pTaskInfo),
pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
doSetTagColumnData(pTableScanInfo, pBlock, pTaskInfo, 1);
pCost->skipBlocks += 1;
+ tsdbReleaseDataBlock(pTableScanInfo->dataReader);
return TSDB_CODE_SUCCESS;
} else if (*status == FUNC_DATA_REQUIRED_SMA_LOAD) {
pCost->loadBlockStatis += 1;
@@ -321,6 +323,7 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanBase* pTableSca
qDebug("%s data block SMA loaded, brange:%" PRId64 "-%" PRId64 ", rows:%d", GET_TASKID(pTaskInfo),
pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
doSetTagColumnData(pTableScanInfo, pBlock, pTaskInfo, 1);
+ tsdbReleaseDataBlock(pTableScanInfo->dataReader);
return TSDB_CODE_SUCCESS;
} else {
qDebug("%s failed to load SMA, since not all columns have SMA", GET_TASKID(pTaskInfo));
@@ -342,6 +345,7 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanBase* pTableSca
pCost->filterOutBlocks += 1;
(*status) = FUNC_DATA_REQUIRED_FILTEROUT;
+ tsdbReleaseDataBlock(pTableScanInfo->dataReader);
return TSDB_CODE_SUCCESS;
}
}
@@ -356,7 +360,7 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanBase* pTableSca
qDebug("%s data block skipped due to dynamic prune, brange:%" PRId64 "-%" PRId64 ", rows:%d", GET_TASKID(pTaskInfo),
pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
pCost->skipBlocks += 1;
-
+ tsdbReleaseDataBlock(pTableScanInfo->dataReader);
*status = FUNC_DATA_REQUIRED_FILTEROUT;
return TSDB_CODE_SUCCESS;
}
@@ -1357,54 +1361,16 @@ void calBlockTag(SStreamScanInfo* pInfo, SSDataBlock* pBlock) {
}
#endif
-void calBlockTbName(SStreamScanInfo* pInfo, SSDataBlock* pBlock) {
+static void calBlockTbName(SStreamScanInfo* pInfo, SSDataBlock* pBlock) {
SExprSupp* pTbNameCalSup = &pInfo->tbnameCalSup;
SStreamState* pState = pInfo->pStreamScanOp->pTaskInfo->streamInfo.pState;
- if (pTbNameCalSup == NULL || pTbNameCalSup->numOfExprs == 0) return;
- if (pBlock == NULL || pBlock->info.rows == 0) return;
-
- void* tbname = NULL;
- if (streamStateGetParName(pState, pBlock->info.id.groupId, &tbname) == 0) {
- memcpy(pBlock->info.parTbName, tbname, TSDB_TABLE_NAME_LEN);
- tdbFree(tbname);
- return;
- } else {
+ blockDataCleanup(pInfo->pCreateTbRes);
+ if (pInfo->tbnameCalSup.numOfExprs == 0 && pInfo->tagCalSup.numOfExprs == 0) {
pBlock->info.parTbName[0] = 0;
- }
- tdbFree(tbname);
-
- SSDataBlock* pSrcBlock = blockCopyOneRow(pBlock, 0);
- ASSERT(pSrcBlock->info.rows == 1);
-
- SSDataBlock* pResBlock = createDataBlock();
- pResBlock->info.rowSize = VARSTR_HEADER_SIZE + TSDB_TABLE_NAME_LEN;
- SColumnInfoData data = createColumnInfoData(TSDB_DATA_TYPE_VARCHAR, TSDB_TABLE_NAME_LEN, 0);
- taosArrayPush(pResBlock->pDataBlock, &data);
- blockDataEnsureCapacity(pResBlock, 1);
-
- projectApplyFunctions(pTbNameCalSup->pExprInfo, pResBlock, pSrcBlock, pTbNameCalSup->pCtx, 1, NULL);
- ASSERT(pResBlock->info.rows == 1);
- ASSERT(taosArrayGetSize(pResBlock->pDataBlock) == 1);
- SColumnInfoData* pCol = taosArrayGet(pResBlock->pDataBlock, 0);
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_VARCHAR);
-
- void* pData = colDataGetData(pCol, 0);
- // TODO check tbname validation
- if (pData != (void*)-1 && pData != NULL) {
- memset(pBlock->info.parTbName, 0, TSDB_TABLE_NAME_LEN);
- int32_t len = TMIN(varDataLen(pData), TSDB_TABLE_NAME_LEN - 1);
- memcpy(pBlock->info.parTbName, varDataVal(pData), len);
- /*pBlock->info.parTbName[len + 1] = 0;*/
} else {
- pBlock->info.parTbName[0] = 0;
+ appendCreateTableRow(pInfo->pStreamScanOp->pTaskInfo->streamInfo.pState, &pInfo->tbnameCalSup, &pInfo->tagCalSup,
+ pBlock->info.id.groupId, pBlock, 0, pInfo->pCreateTbRes);
}
-
- if (pBlock->info.id.groupId && pBlock->info.parTbName[0]) {
- streamStatePutParName(pState, pBlock->info.id.groupId, pBlock->info.parTbName);
- }
-
- blockDataDestroy(pSrcBlock);
- blockDataDestroy(pResBlock);
}
void appendOneRowToStreamSpecialBlock(SSDataBlock* pBlock, TSKEY* pStartTs, TSKEY* pEndTs, uint64_t* pUid,
@@ -1584,7 +1550,8 @@ static SSDataBlock* doQueueScan(SOperatorInfo* pOperator) {
if (pTaskInfo->streamInfo.prepareStatus.type == TMQ_OFFSET__SNAPSHOT_DATA) {
SSDataBlock* pResult = doTableScan(pInfo->pTableScanOp);
if (pResult && pResult->info.rows > 0) {
- qDebug("queue scan tsdb return %d rows", pResult->info.rows);
+ qDebug("queue scan tsdb return %d rows min:%" PRId64 " max:%" PRId64, pResult->info.rows,
+ pResult->info.window.skey, pResult->info.window.ekey);
pTaskInfo->streamInfo.returned = 1;
return pResult;
} else {
@@ -1705,47 +1672,30 @@ static void setBlockGroupIdByUid(SStreamScanInfo* pInfo, SSDataBlock* pBlock) {
}
}
+static void doCheckUpdate(SStreamScanInfo* pInfo, TSKEY endKey) {
+ if (pInfo->pUpdateInfo) {
+ checkUpdateData(pInfo, true, pInfo->pRes, true);
+ pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, endKey);
+ if (pInfo->pUpdateDataRes->info.rows > 0) {
+ pInfo->updateResIndex = 0;
+ if (pInfo->pUpdateDataRes->info.type == STREAM_CLEAR) {
+ pInfo->scanMode = STREAM_SCAN_FROM_UPDATERES;
+ } else if (pInfo->pUpdateDataRes->info.type == STREAM_INVERT) {
+ pInfo->scanMode = STREAM_SCAN_FROM_RES;
+ // return pInfo->pUpdateDataRes;
+ } else if (pInfo->pUpdateDataRes->info.type == STREAM_DELETE_DATA) {
+ pInfo->scanMode = STREAM_SCAN_FROM_DELETE_DATA;
+ }
+ }
+ }
+}
+
static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
// NOTE: this operator does never check if current status is done or not
SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
SStreamScanInfo* pInfo = pOperator->info;
qDebug("stream scan called");
-#if 0
- SStreamState* pState = pTaskInfo->streamInfo.pState;
- if (pState) {
- printf(">>>>>>>> stream write backend\n");
- SWinKey key = {
- .ts = 1,
- .groupId = 2,
- };
- char tmp[100] = "abcdefg1";
- if (streamStatePut(pState, &key, &tmp, strlen(tmp) + 1) < 0) {
- ASSERT(0);
- }
-
- key.ts = 2;
- char tmp2[100] = "abcdefg2";
- if (streamStatePut(pState, &key, &tmp2, strlen(tmp2) + 1) < 0) {
- ASSERT(0);
- }
-
- key.groupId = 5;
- key.ts = 1;
- char tmp3[100] = "abcdefg3";
- if (streamStatePut(pState, &key, &tmp3, strlen(tmp3) + 1) < 0) {
- ASSERT(0);
- }
-
- char* val2 = NULL;
- int32_t sz;
- if (streamStateGet(pState, &key, (void**)&val2, &sz) < 0) {
- ASSERT(0);
- }
- printf("stream read %s %d\n", val2, sz);
- streamFreeVal(val2);
- }
-#endif
if (pTaskInfo->streamInfo.recoverStep == STREAM_RECOVER_STEP__PREPARE1 ||
pTaskInfo->streamInfo.recoverStep == STREAM_RECOVER_STEP__PREPARE2) {
@@ -1779,17 +1729,32 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
pInfo->blockRecoverContiCnt = 0;
return NULL;
}
- SSDataBlock* pBlock = doTableScan(pInfo->pTableScanOp);
- if (pBlock != NULL) {
+
+ switch (pInfo->scanMode) {
+ case STREAM_SCAN_FROM_RES: {
+ pInfo->scanMode = STREAM_SCAN_FROM_READERHANDLE;
+ printDataBlock(pInfo->pRecoverRes, "scan recover");
+ return pInfo->pRecoverRes;
+ } break;
+ default:
+ break;
+ }
+
+ pInfo->pRecoverRes = doTableScan(pInfo->pTableScanOp);
+ if (pInfo->pRecoverRes != NULL) {
pInfo->blockRecoverContiCnt++;
- calBlockTbName(pInfo, pBlock);
+ calBlockTbName(pInfo, pInfo->pRecoverRes);
if (pInfo->pUpdateInfo) {
- TSKEY maxTs = updateInfoFillBlockData(pInfo->pUpdateInfo, pBlock, pInfo->primaryTsIndex);
+ TSKEY maxTs = updateInfoFillBlockData(pInfo->pUpdateInfo, pInfo->pRecoverRes, pInfo->primaryTsIndex);
pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, maxTs);
}
- qDebug("stream recover scan get block, rows %d", pBlock->info.rows);
- printDataBlock(pBlock, "scan recover");
- return pBlock;
+ if (pInfo->pCreateTbRes->info.rows > 0) {
+ pInfo->scanMode = STREAM_SCAN_FROM_RES;
+ return pInfo->pCreateTbRes;
+ }
+ qDebug("stream recover scan get block, rows %d", pInfo->pRecoverRes->info.rows);
+ printDataBlock(pInfo->pRecoverRes, "scan recover");
+ return pInfo->pRecoverRes;
}
pTaskInfo->streamInfo.recoverStep = STREAM_RECOVER_STEP__NONE;
STableScanInfo* pTSInfo = pInfo->pTableScanOp->info;
@@ -1891,8 +1856,11 @@ FETCH_NEXT_BLOCK:
qDebug("scan mode %d", pInfo->scanMode);
switch (pInfo->scanMode) {
case STREAM_SCAN_FROM_RES: {
- blockDataDestroy(pInfo->pUpdateRes);
pInfo->scanMode = STREAM_SCAN_FROM_READERHANDLE;
+ doCheckUpdate(pInfo, pInfo->pRes->info.window.ekey);
+ doFilter(pInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
+ pInfo->pRes->info.dataLoad = 1;
+ blockDataUpdateTsWindow(pInfo->pRes, pInfo->primaryTsIndex);
return pInfo->pRes;
} break;
case STREAM_SCAN_FROM_DELETE_DATA: {
@@ -1983,22 +1951,12 @@ FETCH_NEXT_BLOCK:
continue;
}
- if (pInfo->pUpdateInfo) {
- checkUpdateData(pInfo, true, pInfo->pRes, true);
- pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, pBlockInfo->window.ekey);
- if (pInfo->pUpdateDataRes->info.rows > 0) {
- pInfo->updateResIndex = 0;
- if (pInfo->pUpdateDataRes->info.type == STREAM_CLEAR) {
- pInfo->scanMode = STREAM_SCAN_FROM_UPDATERES;
- } else if (pInfo->pUpdateDataRes->info.type == STREAM_INVERT) {
- pInfo->scanMode = STREAM_SCAN_FROM_RES;
- return pInfo->pUpdateDataRes;
- } else if (pInfo->pUpdateDataRes->info.type == STREAM_DELETE_DATA) {
- pInfo->scanMode = STREAM_SCAN_FROM_DELETE_DATA;
- }
- }
+ if (pInfo->pCreateTbRes->info.rows > 0) {
+ pInfo->scanMode = STREAM_SCAN_FROM_RES;
+ return pInfo->pCreateTbRes;
}
+ doCheckUpdate(pInfo, pBlockInfo->window.ekey);
doFilter(pInfo->pRes, pOperator->exprSupp.pFilterInfo, NULL);
pInfo->pRes->info.dataLoad = 1;
blockDataUpdateTsWindow(pInfo->pRes, pInfo->primaryTsIndex);
@@ -2012,7 +1970,6 @@ FETCH_NEXT_BLOCK:
} else {
continue;
}
- /*blockDataCleanup(pInfo->pRes);*/
}
// record the scan action.
@@ -2218,6 +2175,7 @@ static void destroyStreamScanOperatorInfo(void* param) {
}
cleanupExprSupp(&pStreamScan->tbnameCalSup);
+ cleanupExprSupp(&pStreamScan->tagCalSup);
updateInfoDestroy(pStreamScan->pUpdateInfo);
blockDataDestroy(pStreamScan->pRes);
@@ -2225,6 +2183,7 @@ static void destroyStreamScanOperatorInfo(void* param) {
blockDataDestroy(pStreamScan->pPullDataRes);
blockDataDestroy(pStreamScan->pDeleteDataRes);
blockDataDestroy(pStreamScan->pUpdateDataRes);
+ blockDataDestroy(pStreamScan->pCreateTbRes);
taosArrayDestroy(pStreamScan->pBlockLists);
taosMemoryFree(pStreamScan);
}
@@ -2280,7 +2239,7 @@ SOperatorInfo* createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhys
if (pTableScanNode->pTags != NULL) {
int32_t numOfTags;
- SExprInfo* pTagExpr = createExprInfo(pTableScanNode->pTags, NULL, &numOfTags);
+ SExprInfo* pTagExpr = createExpr(pTableScanNode->pTags, &numOfTags);
if (pTagExpr == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
goto _error;
@@ -2338,6 +2297,8 @@ SOperatorInfo* createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhys
pInfo->readHandle = *pHandle;
pInfo->tableUid = pScanPhyNode->uid;
pTaskInfo->streamInfo.snapshotVer = pHandle->version;
+ pInfo->pCreateTbRes = buildCreateTableBlock(&pInfo->tbnameCalSup, &pInfo->tagCalSup);
+ blockDataEnsureCapacity(pInfo->pCreateTbRes, 8);
// set the extract column id to streamHandle
tqReaderSetColIdList(pInfo->tqReader, pColIds);
@@ -2554,6 +2515,7 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
}
STsdbReader* reader = pInfo->base.dataReader;
+ qTrace("tsdb/read-table-data: %p, enter next reader", reader);
while (tsdbNextDataBlock(reader)) {
if (isTaskKilled(pTaskInfo)) {
T_LONG_JMP(pTaskInfo->env, pTaskInfo->code);
@@ -2588,6 +2550,7 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
pOperator->resultInfo.totalRows += pBlock->info.rows;
pInfo->base.readRecorder.elapsedTime += (taosGetTimestampUs() - st) / 1000.0;
+ qTrace("tsdb/read-table-data: %p, close reader", reader);
tsdbReaderClose(pInfo->base.dataReader);
pInfo->base.dataReader = NULL;
return pBlock;
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index d78e9c4edf..68f178803d 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -1740,7 +1740,7 @@ void initStreamFunciton(SqlFunctionCtx* pCtx, int32_t numOfExpr) {
}
SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SIntervalPhysiNode* pPhyNode,
- SExecTaskInfo* pTaskInfo, bool isStream) {
+ SExecTaskInfo* pTaskInfo) {
SIntervalAggOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SIntervalAggOperatorInfo));
SOperatorInfo* pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
if (pInfo == NULL || pOperator == NULL) {
@@ -2493,12 +2493,8 @@ static void doStreamIntervalAggImpl(SOperatorInfo* pOperatorInfo, SSDataBlock* p
static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
SStreamIntervalOperatorInfo* pInfo = pOperator->info;
SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
-
- SOperatorInfo* downstream = pOperator->pDownstream[0];
- TSKEY maxTs = INT64_MIN;
- TSKEY minTs = INT64_MAX;
-
- SExprSupp* pSup = &pOperator->exprSupp;
+ SOperatorInfo* downstream = pOperator->pDownstream[0];
+ SExprSupp* pSup = &pOperator->exprSupp;
qDebug("interval status %d %s", pOperator->status, IS_FINAL_OP(pInfo) ? "interval final" : "interval semi");
@@ -2554,9 +2550,14 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
}
}
- SArray* pUpdated = taosArrayInit(4, POINTER_BYTES);
- _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
- SHashObj* pUpdatedMap = taosHashInit(1024, hashFn, false, HASH_NO_LOCK);
+ if (!pInfo->pUpdated) {
+ pInfo->pUpdated = taosArrayInit(4, POINTER_BYTES);
+ }
+ if (!pInfo->pUpdatedMap) {
+ _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
+ pInfo->pUpdatedMap = taosHashInit(1024, hashFn, false, HASH_NO_LOCK);
+ }
+
while (1) {
SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream);
if (pBlock == NULL) {
@@ -2574,35 +2575,39 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
} else if (pBlock->info.type == STREAM_DELETE_DATA || pBlock->info.type == STREAM_DELETE_RESULT ||
pBlock->info.type == STREAM_CLEAR) {
SArray* delWins = taosArrayInit(8, sizeof(SWinKey));
- doDeleteWindows(pOperator, &pInfo->interval, pBlock, delWins, pUpdatedMap);
+ doDeleteWindows(pOperator, &pInfo->interval, pBlock, delWins, pInfo->pUpdatedMap);
if (IS_FINAL_OP(pInfo)) {
int32_t childIndex = getChildIndex(pBlock);
SOperatorInfo* pChildOp = taosArrayGetP(pInfo->pChildren, childIndex);
SStreamIntervalOperatorInfo* pChildInfo = pChildOp->info;
SExprSupp* pChildSup = &pChildOp->exprSupp;
doDeleteWindows(pChildOp, &pChildInfo->interval, pBlock, NULL, NULL);
- rebuildIntervalWindow(pOperator, delWins, pUpdatedMap);
+ rebuildIntervalWindow(pOperator, delWins, pInfo->pUpdatedMap);
addRetriveWindow(delWins, pInfo);
taosArrayAddAll(pInfo->pDelWins, delWins);
taosArrayDestroy(delWins);
continue;
}
- removeResults(delWins, pUpdatedMap);
+ removeResults(delWins, pInfo->pUpdatedMap);
taosArrayAddAll(pInfo->pDelWins, delWins);
taosArrayDestroy(delWins);
break;
} else if (pBlock->info.type == STREAM_GET_ALL && IS_FINAL_OP(pInfo)) {
- getAllIntervalWindow(pInfo->aggSup.pResultRowHashTable, pUpdatedMap);
+ getAllIntervalWindow(pInfo->aggSup.pResultRowHashTable, pInfo->pUpdatedMap);
continue;
} else if (pBlock->info.type == STREAM_RETRIEVE && !IS_FINAL_OP(pInfo)) {
- doDeleteWindows(pOperator, &pInfo->interval, pBlock, NULL, pUpdatedMap);
- if (taosArrayGetSize(pUpdated) > 0) {
+ doDeleteWindows(pOperator, &pInfo->interval, pBlock, NULL, pInfo->pUpdatedMap);
+ if (taosArrayGetSize(pInfo->pUpdated) > 0) {
break;
}
continue;
} else if (pBlock->info.type == STREAM_PULL_OVER && IS_FINAL_OP(pInfo)) {
processPullOver(pBlock, pInfo->pPullDataMap, &pInfo->interval);
continue;
+ } else if (pBlock->info.type == STREAM_CREATE_CHILD_TABLE) {
+ return pBlock;
+ } else {
+ ASSERTS(pBlock->info.type == STREAM_INVALID, "invalid SSDataBlock type");
}
if (pInfo->scalarSupp.pExprInfo != NULL) {
@@ -2610,7 +2615,7 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL);
}
setInputDataBlock(pSup, pBlock, TSDB_ORDER_ASC, MAIN_SCAN, true);
- doStreamIntervalAggImpl(pOperator, pBlock, pBlock->info.id.groupId, pUpdatedMap);
+ doStreamIntervalAggImpl(pOperator, pBlock, pBlock->info.id.groupId, pInfo->pUpdatedMap);
if (IS_FINAL_OP(pInfo)) {
int32_t chIndex = getChildIndex(pBlock);
int32_t size = taosArrayGetSize(pInfo->pChildren);
@@ -2630,29 +2635,29 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
setInputDataBlock(&pChildOp->exprSupp, pBlock, TSDB_ORDER_ASC, MAIN_SCAN, true);
doStreamIntervalAggImpl(pChildOp, pBlock, pBlock->info.id.groupId, NULL);
}
- maxTs = TMAX(maxTs, pBlock->info.window.ekey);
- maxTs = TMAX(maxTs, pBlock->info.watermark);
- minTs = TMIN(minTs, pBlock->info.window.skey);
+ pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, pBlock->info.window.ekey);
+ pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, pBlock->info.watermark);
+ pInfo->twAggSup.minTs = TMIN(pInfo->twAggSup.minTs, pBlock->info.window.skey);
}
- removeDeleteResults(pUpdatedMap, pInfo->pDelWins);
- pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, maxTs);
- pInfo->twAggSup.minTs = TMIN(pInfo->twAggSup.minTs, minTs);
+ removeDeleteResults(pInfo->pUpdatedMap, pInfo->pDelWins);
if (IS_FINAL_OP(pInfo)) {
closeStreamIntervalWindow(pInfo->aggSup.pResultRowHashTable, &pInfo->twAggSup, &pInfo->interval,
- pInfo->pPullDataMap, pUpdatedMap, pInfo->pDelWins, pOperator);
+ pInfo->pPullDataMap, pInfo->pUpdatedMap, pInfo->pDelWins, pOperator);
closeChildIntervalWindow(pOperator, pInfo->pChildren, pInfo->twAggSup.maxTs);
}
pInfo->binfo.pRes->info.watermark = pInfo->twAggSup.maxTs;
void* pIte = NULL;
- while ((pIte = taosHashIterate(pUpdatedMap, pIte)) != NULL) {
- taosArrayPush(pUpdated, pIte);
+ while ((pIte = taosHashIterate(pInfo->pUpdatedMap, pIte)) != NULL) {
+ taosArrayPush(pInfo->pUpdated, pIte);
}
- taosHashCleanup(pUpdatedMap);
- taosArraySort(pUpdated, resultrowComparAsc);
+ taosHashCleanup(pInfo->pUpdatedMap);
+ pInfo->pUpdatedMap = NULL;
+ taosArraySort(pInfo->pUpdated, resultrowComparAsc);
- initMultiResInfoFromArrayList(&pInfo->groupResInfo, pUpdated);
+ initMultiResInfoFromArrayList(&pInfo->groupResInfo, pInfo->pUpdated);
+ pInfo->pUpdated = NULL;
blockDataEnsureCapacity(pInfo->binfo.pRes, pOperator->resultInfo.capacity);
doBuildPullDataBlock(pInfo->pPullWins, &pInfo->pullIndex, pInfo->pPullDataRes);
@@ -2790,6 +2795,8 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream,
pInfo->delKey.ts = INT64_MAX;
pInfo->delKey.groupId = 0;
pInfo->numOfDatapack = 0;
+ pInfo->pUpdated = NULL;
+ pInfo->pUpdatedMap = NULL;
pOperator->operatorType = pPhyNode->type;
pOperator->blocking = true;
@@ -3419,7 +3426,6 @@ static SSDataBlock* doStreamSessionAgg(SOperatorInfo* pOperator) {
SExprSupp* pSup = &pOperator->exprSupp;
SStreamSessionAggOperatorInfo* pInfo = pOperator->info;
SOptrBasicInfo* pBInfo = &pInfo->binfo;
- TSKEY maxTs = INT64_MIN;
SStreamAggSupporter* pAggSup = &pInfo->streamAggSup;
if (pOperator->status == OP_EXEC_DONE) {
return NULL;
@@ -3439,10 +3445,14 @@ static SSDataBlock* doStreamSessionAgg(SOperatorInfo* pOperator) {
return NULL;
}
- _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
- SSHashObj* pStUpdated = tSimpleHashInit(64, hashFn);
SOperatorInfo* downstream = pOperator->pDownstream[0];
- SArray* pUpdated = taosArrayInit(16, sizeof(SSessionKey)); // SResKeyPos
+ if (!pInfo->pUpdated) {
+ pInfo->pUpdated = taosArrayInit(16, sizeof(SSessionKey));
+ }
+ if (!pInfo->pStUpdated) {
+ _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
+ pInfo->pStUpdated = tSimpleHashInit(64, hashFn);
+ }
while (1) {
SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream);
if (pBlock == NULL) {
@@ -3455,21 +3465,25 @@ static SSDataBlock* doStreamSessionAgg(SOperatorInfo* pOperator) {
SArray* pWins = taosArrayInit(16, sizeof(SSessionKey));
// gap must be 0
doDeleteTimeWindows(pAggSup, pBlock, pWins);
- removeSessionResults(pStUpdated, pWins);
+ removeSessionResults(pInfo->pStUpdated, pWins);
if (IS_FINAL_OP(pInfo)) {
int32_t childIndex = getChildIndex(pBlock);
SOperatorInfo* pChildOp = taosArrayGetP(pInfo->pChildren, childIndex);
SStreamSessionAggOperatorInfo* pChildInfo = pChildOp->info;
// gap must be 0
doDeleteTimeWindows(&pChildInfo->streamAggSup, pBlock, NULL);
- rebuildSessionWindow(pOperator, pWins, pStUpdated);
+ rebuildSessionWindow(pOperator, pWins, pInfo->pStUpdated);
}
copyDeleteWindowInfo(pWins, pInfo->pStDeleted);
taosArrayDestroy(pWins);
continue;
} else if (pBlock->info.type == STREAM_GET_ALL) {
- getAllSessionWindow(pAggSup->pResultRows, pStUpdated);
+ getAllSessionWindow(pAggSup->pResultRows, pInfo->pStUpdated);
continue;
+ } else if (pBlock->info.type == STREAM_CREATE_CHILD_TABLE) {
+ return pBlock;
+ } else {
+ ASSERTS(pBlock->info.type == STREAM_NORMAL || pBlock->info.type == STREAM_INVALID, "invalid SSDataBlock type");
}
if (pInfo->scalarSupp.pExprInfo != NULL) {
@@ -3478,7 +3492,7 @@ static SSDataBlock* doStreamSessionAgg(SOperatorInfo* pOperator) {
}
// the pDataBlock are always the same one, no need to call this again
setInputDataBlock(pSup, pBlock, TSDB_ORDER_ASC, MAIN_SCAN, true);
- doStreamSessionAggImpl(pOperator, pBlock, pStUpdated, pInfo->pStDeleted, IS_FINAL_OP(pInfo));
+ doStreamSessionAggImpl(pOperator, pBlock, pInfo->pStUpdated, pInfo->pStDeleted, IS_FINAL_OP(pInfo));
if (IS_FINAL_OP(pInfo)) {
int32_t chIndex = getChildIndex(pBlock);
int32_t size = taosArrayGetSize(pInfo->pChildren);
@@ -3495,20 +3509,20 @@ static SSDataBlock* doStreamSessionAgg(SOperatorInfo* pOperator) {
setInputDataBlock(&pChildOp->exprSupp, pBlock, TSDB_ORDER_ASC, MAIN_SCAN, true);
doStreamSessionAggImpl(pChildOp, pBlock, NULL, NULL, true);
}
- maxTs = TMAX(maxTs, pBlock->info.window.ekey);
- maxTs = TMAX(maxTs, pBlock->info.watermark);
+ pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, pBlock->info.window.ekey);
+ pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, pBlock->info.watermark);
}
-
- pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, maxTs);
// restore the value
pOperator->status = OP_RES_TO_RETURN;
- closeSessionWindow(pAggSup->pResultRows, &pInfo->twAggSup, pStUpdated);
+ closeSessionWindow(pAggSup->pResultRows, &pInfo->twAggSup, pInfo->pStUpdated);
closeChildSessionWindow(pInfo->pChildren, pInfo->twAggSup.maxTs);
- copyUpdateResult(pStUpdated, pUpdated);
- removeSessionResults(pInfo->pStDeleted, pUpdated);
- tSimpleHashCleanup(pStUpdated);
- initGroupResInfoFromArrayList(&pInfo->groupResInfo, pUpdated);
+ copyUpdateResult(pInfo->pStUpdated, pInfo->pUpdated);
+ removeSessionResults(pInfo->pStDeleted, pInfo->pUpdated);
+ tSimpleHashCleanup(pInfo->pStUpdated);
+ pInfo->pStUpdated = NULL;
+ initGroupResInfoFromArrayList(&pInfo->groupResInfo, pInfo->pUpdated);
+ pInfo->pUpdated = NULL;
blockDataEnsureCapacity(pInfo->binfo.pRes, pOperator->resultInfo.capacity);
#if 0
@@ -3593,6 +3607,8 @@ SOperatorInfo* createStreamSessionAggOperatorInfo(SOperatorInfo* downstream, SPh
pInfo->isFinal = false;
pInfo->pPhyNode = pPhyNode;
pInfo->ignoreExpiredData = pSessionNode->window.igExpired;
+ pInfo->pUpdated = NULL;
+ pInfo->pStUpdated = NULL;
setOperatorInfo(pOperator, "StreamSessionWindowAggOperator", QUERY_NODE_PHYSICAL_PLAN_STREAM_SESSION, true,
OP_NOT_OPENED, pInfo, pTaskInfo);
@@ -3653,10 +3669,14 @@ static SSDataBlock* doStreamSessionSemiAgg(SOperatorInfo* pOperator) {
}
}
- _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
- SSHashObj* pStUpdated = tSimpleHashInit(64, hashFn);
SOperatorInfo* downstream = pOperator->pDownstream[0];
- SArray* pUpdated = taosArrayInit(16, sizeof(SSessionKey));
+ if (!pInfo->pUpdated) {
+ pInfo->pUpdated = taosArrayInit(16, sizeof(SSessionKey));
+ }
+ if (!pInfo->pStUpdated) {
+ _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
+ pInfo->pStUpdated = tSimpleHashInit(64, hashFn);
+ }
while (1) {
SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream);
if (pBlock == NULL) {
@@ -3671,13 +3691,17 @@ static SSDataBlock* doStreamSessionSemiAgg(SOperatorInfo* pOperator) {
// gap must be 0
SArray* pWins = taosArrayInit(16, sizeof(SSessionKey));
doDeleteTimeWindows(&pInfo->streamAggSup, pBlock, pWins);
- removeSessionResults(pStUpdated, pWins);
+ removeSessionResults(pInfo->pStUpdated, pWins);
copyDeleteWindowInfo(pWins, pInfo->pStDeleted);
taosArrayDestroy(pWins);
break;
} else if (pBlock->info.type == STREAM_GET_ALL) {
- getAllSessionWindow(pInfo->streamAggSup.pResultRows, pStUpdated);
+ getAllSessionWindow(pInfo->streamAggSup.pResultRows, pInfo->pStUpdated);
continue;
+ } else if (pBlock->info.type == STREAM_CREATE_CHILD_TABLE) {
+ return pBlock;
+ } else {
+ ASSERTS(pBlock->info.type == STREAM_NORMAL || pBlock->info.type == STREAM_INVALID, "invalid SSDataBlock type");
}
if (pInfo->scalarSupp.pExprInfo != NULL) {
@@ -3686,18 +3710,20 @@ static SSDataBlock* doStreamSessionSemiAgg(SOperatorInfo* pOperator) {
}
// the pDataBlock are always the same one, no need to call this again
setInputDataBlock(pSup, pBlock, TSDB_ORDER_ASC, MAIN_SCAN, true);
- doStreamSessionAggImpl(pOperator, pBlock, pStUpdated, NULL, false);
+ doStreamSessionAggImpl(pOperator, pBlock, pInfo->pStUpdated, NULL, false);
maxTs = TMAX(pInfo->twAggSup.maxTs, pBlock->info.window.ekey);
}
pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, maxTs);
pBInfo->pRes->info.watermark = pInfo->twAggSup.maxTs;
- copyUpdateResult(pStUpdated, pUpdated);
- removeSessionResults(pInfo->pStDeleted, pUpdated);
- tSimpleHashCleanup(pStUpdated);
+ copyUpdateResult(pInfo->pStUpdated, pInfo->pUpdated);
+ removeSessionResults(pInfo->pStDeleted, pInfo->pUpdated);
+ tSimpleHashCleanup(pInfo->pStUpdated);
+ pInfo->pStUpdated = NULL;
- initGroupResInfoFromArrayList(&pInfo->groupResInfo, pUpdated);
+ initGroupResInfoFromArrayList(&pInfo->groupResInfo, pInfo->pUpdated);
+ pInfo->pUpdated = NULL;
blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity);
#if 0
@@ -3957,7 +3983,6 @@ static SSDataBlock* doStreamStateAgg(SOperatorInfo* pOperator) {
SExprSupp* pSup = &pOperator->exprSupp;
SStreamStateAggOperatorInfo* pInfo = pOperator->info;
SOptrBasicInfo* pBInfo = &pInfo->binfo;
- int64_t maxTs = INT64_MIN;
if (pOperator->status == OP_RES_TO_RETURN) {
doBuildDeleteDataBlock(pOperator, pInfo->pSeDeleted, pInfo->pDelRes, &pInfo->pDelIterator);
if (pInfo->pDelRes->info.rows > 0) {
@@ -3975,10 +4000,14 @@ static SSDataBlock* doStreamStateAgg(SOperatorInfo* pOperator) {
return NULL;
}
- _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
- SSHashObj* pSeUpdated = tSimpleHashInit(64, hashFn);
SOperatorInfo* downstream = pOperator->pDownstream[0];
- SArray* pUpdated = taosArrayInit(16, sizeof(SSessionKey));
+ if (!pInfo->pUpdated) {
+ pInfo->pUpdated = taosArrayInit(16, sizeof(SSessionKey));
+ }
+ if (!pInfo->pSeUpdated) {
+ _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
+ pInfo->pSeUpdated = tSimpleHashInit(64, hashFn);
+ }
while (1) {
SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream);
if (pBlock == NULL) {
@@ -3990,13 +4019,17 @@ static SSDataBlock* doStreamStateAgg(SOperatorInfo* pOperator) {
pBlock->info.type == STREAM_CLEAR) {
SArray* pWins = taosArrayInit(16, sizeof(SSessionKey));
doDeleteTimeWindows(&pInfo->streamAggSup, pBlock, pWins);
- removeSessionResults(pSeUpdated, pWins);
+ removeSessionResults(pInfo->pSeUpdated, pWins);
copyDeleteWindowInfo(pWins, pInfo->pSeDeleted);
taosArrayDestroy(pWins);
continue;
} else if (pBlock->info.type == STREAM_GET_ALL) {
- getAllSessionWindow(pInfo->streamAggSup.pResultRows, pSeUpdated);
+ getAllSessionWindow(pInfo->streamAggSup.pResultRows, pInfo->pSeUpdated);
continue;
+ } else if (pBlock->info.type == STREAM_CREATE_CHILD_TABLE) {
+ return pBlock;
+ } else {
+ ASSERTS(pBlock->info.type == STREAM_NORMAL || pBlock->info.type == STREAM_INVALID, "invalid SSDataBlock type");
}
if (pInfo->scalarSupp.pExprInfo != NULL) {
@@ -4005,19 +4038,20 @@ static SSDataBlock* doStreamStateAgg(SOperatorInfo* pOperator) {
}
// the pDataBlock are always the same one, no need to call this again
setInputDataBlock(pSup, pBlock, TSDB_ORDER_ASC, MAIN_SCAN, true);
- doStreamStateAggImpl(pOperator, pBlock, pSeUpdated, pInfo->pSeDeleted);
- maxTs = TMAX(maxTs, pBlock->info.window.ekey);
+ doStreamStateAggImpl(pOperator, pBlock, pInfo->pSeUpdated, pInfo->pSeDeleted);
+ pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, pBlock->info.window.ekey);
}
- pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, maxTs);
// restore the value
pOperator->status = OP_RES_TO_RETURN;
- closeSessionWindow(pInfo->streamAggSup.pResultRows, &pInfo->twAggSup, pSeUpdated);
- copyUpdateResult(pSeUpdated, pUpdated);
- removeSessionResults(pInfo->pSeDeleted, pUpdated);
- tSimpleHashCleanup(pSeUpdated);
+ closeSessionWindow(pInfo->streamAggSup.pResultRows, &pInfo->twAggSup, pInfo->pSeUpdated);
+ copyUpdateResult(pInfo->pSeUpdated, pInfo->pUpdated);
+ removeSessionResults(pInfo->pSeDeleted, pInfo->pUpdated);
+ tSimpleHashCleanup(pInfo->pSeUpdated);
+ pInfo->pSeUpdated = NULL;
- initGroupResInfoFromArrayList(&pInfo->groupResInfo, pUpdated);
+ initGroupResInfoFromArrayList(&pInfo->groupResInfo, pInfo->pUpdated);
+ pInfo->pUpdated = NULL;
blockDataEnsureCapacity(pInfo->binfo.pRes, pOperator->resultInfo.capacity);
#if 0
@@ -4098,6 +4132,8 @@ SOperatorInfo* createStreamStateAggOperatorInfo(SOperatorInfo* downstream, SPhys
pInfo->pDelRes = createSpecialDataBlock(STREAM_DELETE_RESULT);
pInfo->pChildren = NULL;
pInfo->ignoreExpiredData = pStateNode->window.igExpired;
+ pInfo->pUpdated = NULL;
+ pInfo->pSeUpdated = NULL;
setOperatorInfo(pOperator, "StreamStateAggOperator", QUERY_NODE_PHYSICAL_PLAN_STREAM_STATE, true, OP_NOT_OPENED,
pInfo, pTaskInfo);
@@ -4711,8 +4747,6 @@ _error:
static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) {
SStreamIntervalOperatorInfo* pInfo = pOperator->info;
SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
- int64_t maxTs = INT64_MIN;
- int64_t minTs = INT64_MAX;
SExprSupp* pSup = &pOperator->exprSupp;
if (pOperator->status == OP_EXEC_DONE) {
@@ -4740,9 +4774,14 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) {
SOperatorInfo* downstream = pOperator->pDownstream[0];
- SArray* pUpdated = taosArrayInit(4, POINTER_BYTES); // SResKeyPos
- _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
- SHashObj* pUpdatedMap = taosHashInit(1024, hashFn, false, HASH_NO_LOCK);
+ if (!pInfo->pUpdated) {
+ pInfo->pUpdated = taosArrayInit(4, POINTER_BYTES);
+ }
+ if (!pInfo->pUpdatedMap) {
+ _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
+ pInfo->pUpdatedMap = taosHashInit(1024, hashFn, false, HASH_NO_LOCK);
+ }
+
while (1) {
SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream);
@@ -4756,11 +4795,15 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) {
if (pBlock->info.type == STREAM_DELETE_DATA || pBlock->info.type == STREAM_DELETE_RESULT ||
pBlock->info.type == STREAM_CLEAR) {
- doDeleteWindows(pOperator, &pInfo->interval, pBlock, pInfo->pDelWins, pUpdatedMap);
+ doDeleteWindows(pOperator, &pInfo->interval, pBlock, pInfo->pDelWins, pInfo->pUpdatedMap);
continue;
} else if (pBlock->info.type == STREAM_GET_ALL) {
- getAllIntervalWindow(pInfo->aggSup.pResultRowHashTable, pUpdatedMap);
+ getAllIntervalWindow(pInfo->aggSup.pResultRowHashTable, pInfo->pUpdatedMap);
continue;
+ } else if (pBlock->info.type == STREAM_CREATE_CHILD_TABLE) {
+ return pBlock;
+ } else {
+ ASSERTS(pBlock->info.type == STREAM_NORMAL || pBlock->info.type == STREAM_INVALID, "invalid SSDataBlock type");
}
if (pBlock->info.type == STREAM_NORMAL && pBlock->info.version != 0) {
@@ -4781,27 +4824,27 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) {
setInverFunction(pSup->pCtx, pOperator->exprSupp.numOfExprs, pBlock->info.type);
}
- maxTs = TMAX(maxTs, pBlock->info.window.ekey);
- minTs = TMIN(minTs, pBlock->info.window.skey);
+ pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, pBlock->info.window.ekey);
+ pInfo->twAggSup.minTs = TMIN(pInfo->twAggSup.minTs, pBlock->info.window.skey);
- doStreamIntervalAggImpl(pOperator, pBlock, pBlock->info.id.groupId, pUpdatedMap);
+ doStreamIntervalAggImpl(pOperator, pBlock, pBlock->info.id.groupId, pInfo->pUpdatedMap);
}
- pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, maxTs);
- pInfo->twAggSup.minTs = TMIN(pInfo->twAggSup.minTs, minTs);
pOperator->status = OP_RES_TO_RETURN;
- removeDeleteResults(pUpdatedMap, pInfo->pDelWins);
- closeStreamIntervalWindow(pInfo->aggSup.pResultRowHashTable, &pInfo->twAggSup, &pInfo->interval, NULL, pUpdatedMap,
+ removeDeleteResults(pInfo->pUpdatedMap, pInfo->pDelWins);
+ closeStreamIntervalWindow(pInfo->aggSup.pResultRowHashTable, &pInfo->twAggSup, &pInfo->interval, NULL, pInfo->pUpdatedMap,
pInfo->pDelWins, pOperator);
void* pIte = NULL;
- while ((pIte = taosHashIterate(pUpdatedMap, pIte)) != NULL) {
- taosArrayPush(pUpdated, pIte);
+ while ((pIte = taosHashIterate(pInfo->pUpdatedMap, pIte)) != NULL) {
+ taosArrayPush(pInfo->pUpdated, pIte);
}
- taosArraySort(pUpdated, resultrowComparAsc);
+ taosArraySort(pInfo->pUpdated, resultrowComparAsc);
- initMultiResInfoFromArrayList(&pInfo->groupResInfo, pUpdated);
+ initMultiResInfoFromArrayList(&pInfo->groupResInfo, pInfo->pUpdated);
+ pInfo->pUpdated = NULL;
blockDataEnsureCapacity(pInfo->binfo.pRes, pOperator->resultInfo.capacity);
- taosHashCleanup(pUpdatedMap);
+ taosHashCleanup(pInfo->pUpdatedMap);
+ pInfo->pUpdatedMap = NULL;
doBuildDeleteResult(pInfo, pInfo->pDelWins, &pInfo->delIndex, pInfo->pDelRes);
if (pInfo->pDelRes->info.rows > 0) {
@@ -4902,6 +4945,8 @@ SOperatorInfo* createStreamIntervalOperatorInfo(SOperatorInfo* downstream, SPhys
pInfo->delKey.ts = INT64_MAX;
pInfo->delKey.groupId = 0;
pInfo->numOfDatapack = 0;
+ pInfo->pUpdated = NULL;
+ pInfo->pUpdatedMap = NULL;
setOperatorInfo(pOperator, "StreamIntervalOperator", QUERY_NODE_PHYSICAL_PLAN_STREAM_INTERVAL, true, OP_NOT_OPENED,
pInfo, pTaskInfo);
@@ -4922,4 +4967,3 @@ _error:
pTaskInfo->code = code;
return NULL;
}
-
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 06ef36664a..03be1ee6f2 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -108,7 +108,7 @@ static int32_t sortComparCleanup(SMsortComparParam* cmpParam) {
return TSDB_CODE_SUCCESS;
}
-void tsortClearOrderdSource(SArray *pOrderedSource) {
+void tsortClearOrderdSource(SArray* pOrderedSource) {
for (size_t i = 0; i < taosArrayGetSize(pOrderedSource); i++) {
SSortSource** pSource = taosArrayGet(pOrderedSource, i);
if (NULL == *pSource) {
@@ -121,6 +121,12 @@ void tsortClearOrderdSource(SArray *pOrderedSource) {
if ((*pSource)->param && !(*pSource)->onlyRef) {
taosMemoryFree((*pSource)->param);
}
+
+ if (!(*pSource)->onlyRef && (*pSource)->src.pBlock) {
+ blockDataDestroy((*pSource)->src.pBlock);
+ (*pSource)->src.pBlock = NULL;
+ }
+
taosMemoryFreeClear(*pSource);
}
@@ -629,9 +635,9 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
if (pHandle->type == SORT_SINGLESOURCE_SORT) {
SSortSource** pSource = taosArrayGet(pHandle->pOrderedSource, 0);
- SSortSource* source = *pSource;
+ SSortSource* source = *pSource;
*pSource = NULL;
-
+
tsortClearOrderdSource(pHandle->pOrderedSource);
while (1) {
@@ -659,6 +665,10 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
if (source->param && !source->onlyRef) {
taosMemoryFree(source->param);
}
+ if (!source->onlyRef && source->src.pBlock) {
+ blockDataDestroy(source->src.pBlock);
+ source->src.pBlock = NULL;
+ }
taosMemoryFree(source);
return code;
}
@@ -672,6 +682,10 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
if (source->param && !source->onlyRef) {
taosMemoryFree(source->param);
}
+ if (!source->onlyRef && source->src.pBlock) {
+ blockDataDestroy(source->src.pBlock);
+ source->src.pBlock = NULL;
+ }
taosMemoryFree(source);
return code;
}
@@ -849,8 +863,8 @@ SSortExecInfo tsortGetSortExecInfo(SSortHandle* pHandle) {
SSortExecInfo info = {0};
if (pHandle == NULL) {
- info.sortMethod = SORT_QSORT_T; // by default
- info.sortBuffer = 2 * 1048576; // 2mb by default
+ info.sortMethod = SORT_QSORT_T; // by default
+ info.sortBuffer = 2 * 1048576; // 2mb by default
} else {
info.sortBuffer = pHandle->pageSize * pHandle->numOfPages;
info.sortMethod = pHandle->inMemSort ? SORT_QSORT_T : SORT_SPILLED_MERGE_SORT_T;
diff --git a/source/libs/function/inc/builtinsimpl.h b/source/libs/function/inc/builtinsimpl.h
index cbda8dc472..dc884a0581 100644
--- a/source/libs/function/inc/builtinsimpl.h
+++ b/source/libs/function/inc/builtinsimpl.h
@@ -44,9 +44,10 @@ typedef struct SMinmaxResInfo {
bool nullTupleSaved;
int16_t type;
} SMinmaxResInfo;
-int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc);
-STuplePos saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock);
+int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc, int32_t* nElems);
+
+int32_t saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos);
int32_t updateTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos);
const char* loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos);
diff --git a/source/libs/function/inc/tpercentile.h b/source/libs/function/inc/tpercentile.h
index 873dc46a08..80159460f5 100644
--- a/source/libs/function/inc/tpercentile.h
+++ b/source/libs/function/inc/tpercentile.h
@@ -73,10 +73,10 @@ void tMemBucketDestroy(tMemBucket *pBucket);
int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size);
-double getPercentile(tMemBucket *pMemBucket, double percent);
+int32_t getPercentile(tMemBucket *pMemBucket, double percent, double *result);
#endif // TDENGINE_TPERCENTILE_H
#ifdef __cplusplus
}
-#endif
\ No newline at end of file
+#endif
diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index 06406d158f..1a0437c26a 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -1016,7 +1016,10 @@ static bool validateHistogramBinDesc(char* binDescStr, int8_t binType, char* err
intervals[0] = -INFINITY;
intervals[numOfBins - 1] = INFINITY;
// in case of desc bin orders, -inf/inf should be swapped
- ASSERT(numOfBins >= 4);
+ if (numOfBins < 4) {
+ return false;
+ }
+
if (intervals[1] > intervals[numOfBins - 2]) {
TSWAP(intervals[0], intervals[numOfBins - 1]);
}
@@ -1361,7 +1364,7 @@ static int32_t translateCsum(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
} else if (IS_FLOAT_TYPE(colType)) {
resType = TSDB_DATA_TYPE_DOUBLE;
} else {
- ASSERT(0);
+ return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
}
}
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 51945d6a0a..6b6db16725 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -506,7 +506,6 @@ static int32_t getNumOfElems(SqlFunctionCtx* pCtx) {
SColumnInfoData* pInputCol = pInput->pData[0];
if (pInput->colDataSMAIsSet && pInput->totalRows == pInput->numOfRows && !IS_VAR_DATA_TYPE(pInputCol->info.type)) {
numOfElem = pInput->numOfRows - pInput->pColumnDataAgg[0]->numOfNull;
- ASSERT(numOfElem >= 0);
} else {
if (pInputCol->hasNull) {
for (int32_t i = pInput->startRowIndex; i < pInput->startRowIndex + pInput->numOfRows; ++i) {
@@ -596,7 +595,6 @@ int32_t sumFunction(SqlFunctionCtx* pCtx) {
if (pInput->colDataSMAIsSet) {
numOfElem = pInput->numOfRows - pAgg->numOfNull;
- ASSERT(numOfElem >= 0);
if (IS_SIGNED_NUMERIC_TYPE(type)) {
pSumRes->isum += pAgg->sum;
@@ -661,7 +659,6 @@ int32_t sumInvertFunction(SqlFunctionCtx* pCtx) {
if (pInput->colDataSMAIsSet) {
numOfElem = pInput->numOfRows - pAgg->numOfNull;
- ASSERT(numOfElem >= 0);
if (IS_SIGNED_NUMERIC_TYPE(type)) {
pSumRes->isum -= pAgg->sum;
@@ -757,24 +754,33 @@ bool getMinmaxFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
}
int32_t minFunction(SqlFunctionCtx* pCtx) {
- int32_t numOfElems = doMinMaxHelper(pCtx, 1);
+ int32_t numOfElems = 0;
+ int32_t code = doMinMaxHelper(pCtx, 1, &numOfElems);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
SET_VAL(GET_RES_INFO(pCtx), numOfElems, 1);
return TSDB_CODE_SUCCESS;
}
int32_t maxFunction(SqlFunctionCtx* pCtx) {
- int32_t numOfElems = doMinMaxHelper(pCtx, 0);
+ int32_t numOfElems = 0;
+ int32_t code = doMinMaxHelper(pCtx, 0, &numOfElems);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
SET_VAL(GET_RES_INFO(pCtx), numOfElems, 1);
return TSDB_CODE_SUCCESS;
}
-static void setNullSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, int32_t rowIndex);
-static void setSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, const STuplePos* pTuplePos,
+static int32_t setNullSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, int32_t rowIndex);
+static int32_t setSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, const STuplePos* pTuplePos,
int32_t rowIndex);
int32_t minmaxFunctionFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
- SResultRowEntryInfo* pEntryInfo = GET_RES_INFO(pCtx);
+ int32_t code = TSDB_CODE_SUCCESS;
+ SResultRowEntryInfo* pEntryInfo = GET_RES_INFO(pCtx);
SMinmaxResInfo* pRes = GET_ROWCELL_INTERBUF(pEntryInfo);
int32_t slotId = pCtx->pExpr->base.resSchema.slotId;
@@ -791,17 +797,17 @@ int32_t minmaxFunctionFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
}
if (pEntryInfo->numOfRes > 0) {
- setSelectivityValue(pCtx, pBlock, &pRes->tuplePos, currentRow);
+ code = setSelectivityValue(pCtx, pBlock, &pRes->tuplePos, currentRow);
} else {
- setSelectivityValue(pCtx, pBlock, &pRes->nullTuplePos, currentRow);
+ code = setSelectivityValue(pCtx, pBlock, &pRes->nullTuplePos, currentRow);
}
- return pEntryInfo->numOfRes;
+ return code;
}
-void setNullSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, int32_t rowIndex) {
+int32_t setNullSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, int32_t rowIndex) {
if (pCtx->subsidiaries.num <= 0) {
- return;
+ return TSDB_CODE_SUCCESS;
}
for (int32_t j = 0; j < pCtx->subsidiaries.num; ++j) {
@@ -811,17 +817,23 @@ void setNullSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, int32_t
SColumnInfoData* pDstCol = taosArrayGet(pBlock->pDataBlock, dstSlotId);
colDataAppendNULL(pDstCol, rowIndex);
}
+
+ return TSDB_CODE_SUCCESS;
}
-void setSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, const STuplePos* pTuplePos, int32_t rowIndex) {
+int32_t setSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, const STuplePos* pTuplePos, int32_t rowIndex) {
if (pCtx->subsidiaries.num <= 0) {
- return;
+ return TSDB_CODE_SUCCESS;
}
if ((pCtx->saveHandle.pBuf != NULL && pTuplePos->pageId != -1) ||
(pCtx->saveHandle.pState && pTuplePos->streamTupleKey.ts > 0)) {
int32_t numOfCols = pCtx->subsidiaries.num;
const char* p = loadTupleData(pCtx, pTuplePos);
+ if (p == NULL) {
+ terrno = TSDB_CODE_NO_AVAIL_DISK;
+ return terrno;
+ }
bool* nullList = (bool*)p;
char* pStart = (char*)(nullList + numOfCols * sizeof(bool));
@@ -832,7 +844,6 @@ void setSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, const STuple
int32_t dstSlotId = pc->pExpr->base.resSchema.slotId;
SColumnInfoData* pDstCol = taosArrayGet(pBlock->pDataBlock, dstSlotId);
- ASSERT(pc->pExpr->base.resSchema.bytes == pDstCol->info.bytes);
if (nullList[j]) {
colDataAppendNULL(pDstCol, rowIndex);
} else {
@@ -845,13 +856,8 @@ void setSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, const STuple
tdbFree((void*)p);
}
}
-}
-void releaseSource(STuplePos* pPos) {
- if (pPos->pageId == -1) {
- return;
- }
- // Todo(liuyao) relase row
+ return TSDB_CODE_SUCCESS;
}
// This function append the selectivity to subsidiaries function context directly, without fetching data
@@ -876,7 +882,6 @@ void appendSelectivityValue(SqlFunctionCtx* pCtx, int32_t rowIndex, int32_t pos)
int32_t dstSlotId = pc->pExpr->base.resSchema.slotId;
SColumnInfoData* pDstCol = taosArrayGet(pCtx->pDstBlock->pDataBlock, dstSlotId);
- ASSERT(pc->pExpr->base.resSchema.bytes == pDstCol->info.bytes);
if (colDataIsNull_s(pSrcCol, rowIndex) == true) {
colDataAppendNULL(pDstCol, pos);
@@ -887,7 +892,6 @@ void appendSelectivityValue(SqlFunctionCtx* pCtx, int32_t rowIndex, int32_t pos)
}
void replaceTupleData(STuplePos* pDestPos, STuplePos* pSourcePos) {
- releaseSource(pDestPos);
*pDestPos = *pSourcePos;
}
@@ -1145,7 +1149,9 @@ static void stddevTransferInfo(SStddevRes* pInput, SStddevRes* pOutput) {
int32_t stddevFunctionMerge(SqlFunctionCtx* pCtx) {
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pCol = pInput->pData[0];
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
+ if (pCol->info.type != TSDB_DATA_TYPE_BINARY) {
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
+ }
SStddevRes* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
@@ -1570,7 +1576,7 @@ int32_t percentileFunction(SqlFunctionCtx* pCtx) {
// all data are null, set it completed
if (pInfo->numOfElems == 0) {
pResInfo->complete = true;
- return 0;
+ return TSDB_CODE_SUCCESS;
} else {
pInfo->pMemBucket = tMemBucketCreate(pCol->info.bytes, type, pInfo->minval, pInfo->maxval);
}
@@ -1633,7 +1639,11 @@ int32_t percentileFunction(SqlFunctionCtx* pCtx) {
char* data = colDataGetData(pCol, i);
numOfElems += 1;
- tMemBucketPut(pInfo->pMemBucket, data, 1);
+ int32_t code = tMemBucketPut(pInfo->pMemBucket, data, 1);
+ if (code != TSDB_CODE_SUCCESS) {
+ tMemBucketDestroy(pInfo->pMemBucket);
+ return code;
+ }
}
SET_VAL(pResInfo, numOfElems, 1);
@@ -1652,7 +1662,11 @@ int32_t percentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
tMemBucket* pMemBucket = ppInfo->pMemBucket;
if (pMemBucket != NULL && pMemBucket->total > 0) { // check for null
- SET_DOUBLE_VAL(&ppInfo->result, getPercentile(pMemBucket, v));
+ int32_t code = getPercentile(pMemBucket, v, &ppInfo->result);
+ if (code != TSDB_CODE_SUCCESS) {
+ tMemBucketDestroy(pMemBucket);
+ return code;
+ }
}
tMemBucketDestroy(pMemBucket);
@@ -1771,7 +1785,10 @@ int32_t apercentileFunction(SqlFunctionCtx* pCtx) {
double v = 0;
GET_TYPED_DATA(v, double, type, data);
- tHistogramAdd(&pInfo->pHisto, v);
+ int32_t code = tHistogramAdd(&pInfo->pHisto, v);
+ if (code != 0) {
+ return TSDB_CODE_FAILED;
+ }
}
qDebug("%s after add %d elements into histogram, total:%" PRId64 ", numOfEntry:%d, pHisto:%p, elems: %p",
@@ -1841,7 +1858,9 @@ int32_t apercentileFunctionMerge(SqlFunctionCtx* pCtx) {
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pCol = pInput->pData[0];
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
+ if (pCol->info.type != TSDB_DATA_TYPE_BINARY) {
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
+ }
SAPercentileInfo* pInfo = GET_ROWCELL_INTERBUF(pResInfo);
@@ -2009,25 +2028,26 @@ static void prepareBuf(SqlFunctionCtx* pCtx) {
pCtx->subsidiaries.rowLen = rowLen + pCtx->subsidiaries.num * sizeof(bool);
pCtx->subsidiaries.buf = taosMemoryMalloc(pCtx->subsidiaries.rowLen);
}
-
- ASSERT(pCtx->subsidiaries.buf != NULL);
- ASSERT(pCtx->subsidiaries.rowLen > 0);
}
-static void firstlastSaveTupleData(const SSDataBlock* pSrcBlock, int32_t rowIndex, SqlFunctionCtx* pCtx,
+static int32_t firstlastSaveTupleData(const SSDataBlock* pSrcBlock, int32_t rowIndex, SqlFunctionCtx* pCtx,
SFirstLastRes* pInfo) {
+ int32_t code = TSDB_CODE_SUCCESS;
+
if (pCtx->subsidiaries.num <= 0) {
- return;
+ return TSDB_CODE_SUCCESS;
}
if (!pInfo->hasResult) {
- pInfo->pos = saveTupleData(pCtx, rowIndex, pSrcBlock);
+ code = saveTupleData(pCtx, rowIndex, pSrcBlock, &pInfo->pos);
} else {
- updateTupleData(pCtx, rowIndex, pSrcBlock, &pInfo->pos);
+ code = updateTupleData(pCtx, rowIndex, pSrcBlock, &pInfo->pos);
}
+
+ return code;
}
-static void doSaveCurrentVal(SqlFunctionCtx* pCtx, int32_t rowIndex, int64_t currentTs, int32_t type, char* pData) {
+static int32_t doSaveCurrentVal(SqlFunctionCtx* pCtx, int32_t rowIndex, int64_t currentTs, int32_t type, char* pData) {
SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
SFirstLastRes* pInfo = GET_ROWCELL_INTERBUF(pResInfo);
@@ -2037,9 +2057,13 @@ static void doSaveCurrentVal(SqlFunctionCtx* pCtx, int32_t rowIndex, int64_t cur
memcpy(pInfo->buf, pData, pInfo->bytes);
pInfo->ts = currentTs;
- firstlastSaveTupleData(pCtx->pSrcBlock, rowIndex, pCtx, pInfo);
+ int32_t code = firstlastSaveTupleData(pCtx->pSrcBlock, rowIndex, pCtx, pInfo);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pInfo->hasResult = true;
+ return TSDB_CODE_SUCCESS;
}
// This ordinary first function does not care if current scan is ascending order or descending order scan
@@ -2060,10 +2084,12 @@ int32_t firstFunction(SqlFunctionCtx* pCtx) {
}
// All null data column, return directly.
- if (pInput->colDataSMAIsSet && (pInput->pColumnDataAgg[0]->numOfNull == pInput->totalRows)) {
- ASSERT(pInputCol->hasNull == true);
+ if (pInput->colDataSMAIsSet && (pInput->pColumnDataAgg[0]->numOfNull == pInput->totalRows) && pInputCol->hasNull == true) {
// save selectivity value for column consisted of all null values
- firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
+ int32_t code = firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
return TSDB_CODE_SUCCESS;
}
@@ -2136,7 +2162,10 @@ int32_t firstFunction(SqlFunctionCtx* pCtx) {
char* data = colDataGetData(pInputCol, i);
TSKEY cts = pts[i];
if (pResInfo->numOfRes == 0 || pInfo->ts > cts) {
- doSaveCurrentVal(pCtx, i, cts, pInputCol->info.type, data);
+ int32_t code = doSaveCurrentVal(pCtx, i, cts, pInputCol->info.type, data);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pResInfo->numOfRes = 1;
}
}
@@ -2144,7 +2173,10 @@ int32_t firstFunction(SqlFunctionCtx* pCtx) {
if (numOfElems == 0) {
// save selectivity value for column consisted of all null values
- firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
+ int32_t code = firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
SET_VAL(pResInfo, numOfElems, 1);
return TSDB_CODE_SUCCESS;
@@ -2168,10 +2200,12 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) {
}
// All null data column, return directly.
- if (pInput->colDataSMAIsSet && (pInput->pColumnDataAgg[0]->numOfNull == pInput->totalRows)) {
- ASSERT(pInputCol->hasNull == true);
+ if (pInput->colDataSMAIsSet && (pInput->pColumnDataAgg[0]->numOfNull == pInput->totalRows) && pInputCol->hasNull == true) {
// save selectivity value for column consisted of all null values
- firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
+ int32_t code = firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
return TSDB_CODE_SUCCESS;
}
@@ -2261,7 +2295,10 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) {
if (pResInfo->numOfRes == 0 || pInfo->ts < cts) {
char* data = colDataGetData(pInputCol, chosen);
- doSaveCurrentVal(pCtx, i, cts, type, data);
+ int32_t code = doSaveCurrentVal(pCtx, i, cts, type, data);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pResInfo->numOfRes = 1;
}
}
@@ -2269,7 +2306,10 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) {
for (int32_t i = pInput->startRowIndex + round * 4; i < pInput->startRowIndex + pInput->numOfRows; ++i) {
if (pResInfo->numOfRes == 0 || pInfo->ts < pts[i]) {
char* data = colDataGetData(pInputCol, i);
- doSaveCurrentVal(pCtx, i, pts[i], type, data);
+ int32_t code = doSaveCurrentVal(pCtx, i, pts[i], type, data);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pResInfo->numOfRes = 1;
}
}
@@ -2283,7 +2323,10 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) {
if (pResInfo->numOfRes == 0 || pInfo->ts < pts[i]) {
char* data = colDataGetData(pInputCol, i);
- doSaveCurrentVal(pCtx, i, pts[i], type, data);
+ int32_t code = doSaveCurrentVal(pCtx, i, pts[i], type, data);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pResInfo->numOfRes = 1;
}
}
@@ -2294,7 +2337,10 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) {
// save selectivity value for column consisted of all null values
if (numOfElems == 0) {
- firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
+ int32_t code = firstlastSaveTupleData(pCtx->pSrcBlock, pInput->startRowIndex, pCtx, pInfo);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
// SET_VAL(pResInfo, numOfElems, 1);
@@ -2322,18 +2368,25 @@ static int32_t firstLastTransferInfoImpl(SFirstLastRes* pInput, SFirstLastRes* p
return TSDB_CODE_SUCCESS;
}
-static void firstLastTransferInfo(SqlFunctionCtx* pCtx, SFirstLastRes* pInput, SFirstLastRes* pOutput, bool isFirst,
+static int32_t firstLastTransferInfo(SqlFunctionCtx* pCtx, SFirstLastRes* pInput, SFirstLastRes* pOutput, bool isFirst,
int32_t rowIndex) {
if (TSDB_CODE_SUCCESS == firstLastTransferInfoImpl(pInput, pOutput, isFirst)) {
- firstlastSaveTupleData(pCtx->pSrcBlock, rowIndex, pCtx, pOutput);
+ int32_t code = firstlastSaveTupleData(pCtx->pSrcBlock, rowIndex, pCtx, pOutput);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pOutput->hasResult = true;
}
+
+ return TSDB_CODE_SUCCESS;
}
static int32_t firstLastFunctionMergeImpl(SqlFunctionCtx* pCtx, bool isFirstQuery) {
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pCol = pInput->pData[0];
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
+ if (pCol->info.type != TSDB_DATA_TYPE_BINARY) {
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
+ }
SFirstLastRes* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
@@ -2343,7 +2396,10 @@ static int32_t firstLastFunctionMergeImpl(SqlFunctionCtx* pCtx, bool isFirstQuer
for (int32_t i = start; i < start + pInput->numOfRows; ++i) {
char* data = colDataGetData(pCol, i);
SFirstLastRes* pInputInfo = (SFirstLastRes*)varDataVal(data);
- firstLastTransferInfo(pCtx, pInputInfo, pInfo, isFirstQuery, i);
+ int32_t code = firstLastTransferInfo(pCtx, pInputInfo, pInfo, isFirstQuery, i);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
if (!numOfElems) {
numOfElems = pInputInfo->hasResult ? 1 : 0;
}
@@ -2358,6 +2414,7 @@ int32_t firstFunctionMerge(SqlFunctionCtx* pCtx) { return firstLastFunctionMerge
int32_t lastFunctionMerge(SqlFunctionCtx* pCtx) { return firstLastFunctionMergeImpl(pCtx, false); }
int32_t firstLastFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+ int32_t code = TSDB_CODE_SUCCESS;
int32_t slotId = pCtx->pExpr->base.resSchema.slotId;
SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, slotId);
@@ -2368,12 +2425,14 @@ int32_t firstLastFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
colDataAppend(pCol, pBlock->info.rows, pRes->buf, pRes->isNull || pResInfo->isNullRes);
// handle selectivity
- setSelectivityValue(pCtx, pBlock, &pRes->pos, pBlock->info.rows);
+ code = setSelectivityValue(pCtx, pBlock, &pRes->pos, pBlock->info.rows);
- return pResInfo->numOfRes;
+ return code;
}
int32_t firstLastPartialFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+ int32_t code = TSDB_CODE_SUCCESS;
+
SResultRowEntryInfo* pEntryInfo = GET_RES_INFO(pCtx);
SFirstLastRes* pRes = GET_ROWCELL_INTERBUF(pEntryInfo);
@@ -2389,10 +2448,10 @@ int32_t firstLastPartialFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, slotId);
colDataAppend(pCol, pBlock->info.rows, res, false);
- setSelectivityValue(pCtx, pBlock, &pRes->pos, pBlock->info.rows);
+ code = setSelectivityValue(pCtx, pBlock, &pRes->pos, pBlock->info.rows);
taosMemoryFree(res);
- return 1;
+ return code;
}
int32_t lastCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx) {
@@ -2412,7 +2471,7 @@ int32_t lastCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx) {
return TSDB_CODE_SUCCESS;
}
-static void doSaveLastrow(SqlFunctionCtx* pCtx, char* pData, int32_t rowIndex, int64_t cts, SFirstLastRes* pInfo) {
+static int32_t doSaveLastrow(SqlFunctionCtx* pCtx, char* pData, int32_t rowIndex, int64_t cts, SFirstLastRes* pInfo) {
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pInputCol = pInput->pData[0];
@@ -2429,9 +2488,14 @@ static void doSaveLastrow(SqlFunctionCtx* pCtx, char* pData, int32_t rowIndex, i
}
pInfo->ts = cts;
- firstlastSaveTupleData(pCtx->pSrcBlock, rowIndex, pCtx, pInfo);
+ int32_t code = firstlastSaveTupleData(pCtx->pSrcBlock, rowIndex, pCtx, pInfo);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pInfo->hasResult = true;
+
+ return TSDB_CODE_SUCCESS;
}
int32_t lastRowFunction(SqlFunctionCtx* pCtx) {
@@ -2493,7 +2557,10 @@ int32_t lastRowFunction(SqlFunctionCtx* pCtx) {
numOfElems++;
if (pResInfo->numOfRes == 0 || pInfo->ts < cts) {
- doSaveLastrow(pCtx, data, i, cts, pInfo);
+ int32_t code = doSaveLastrow(pCtx, data, i, cts, pInfo);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pResInfo->numOfRes = 1;
}
}
@@ -2528,7 +2595,7 @@ bool diffFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo) {
return true;
}
-static void doSetPrevVal(SDiffInfo* pDiffInfo, int32_t type, const char* pv, int64_t ts) {
+static int32_t doSetPrevVal(SDiffInfo* pDiffInfo, int32_t type, const char* pv, int64_t ts) {
switch (type) {
case TSDB_DATA_TYPE_BOOL:
pDiffInfo->prev.i64 = *(bool*)pv ? 1 : 0;
@@ -2553,12 +2620,14 @@ static void doSetPrevVal(SDiffInfo* pDiffInfo, int32_t type, const char* pv, int
pDiffInfo->prev.d64 = *(double*)pv;
break;
default:
- ASSERT(0);
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
}
pDiffInfo->prevTs = ts;
+
+ return TSDB_CODE_SUCCESS;
}
-static void doHandleDiff(SDiffInfo* pDiffInfo, int32_t type, const char* pv, SColumnInfoData* pOutput, int32_t pos,
+static int32_t doHandleDiff(SDiffInfo* pDiffInfo, int32_t type, const char* pv, SColumnInfoData* pOutput, int32_t pos,
int32_t order, int64_t ts) {
int32_t factor = (order == TSDB_ORDER_ASC) ? 1 : -1;
pDiffInfo->prevTs = ts;
@@ -2633,8 +2702,10 @@ static void doHandleDiff(SDiffInfo* pDiffInfo, int32_t type, const char* pv, SCo
break;
}
default:
- ASSERT(0);
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
}
+
+ return TSDB_CODE_SUCCESS;
}
int32_t diffFunction(SqlFunctionCtx* pCtx) {
@@ -2671,7 +2742,10 @@ int32_t diffFunction(SqlFunctionCtx* pCtx) {
if (tsList[i] == pDiffInfo->prevTs) {
return TSDB_CODE_FUNC_DUP_TIMESTAMP;
}
- doHandleDiff(pDiffInfo, pInputCol->info.type, pv, pOutput, pos, pCtx->order, tsList[i]);
+ int32_t code = doHandleDiff(pDiffInfo, pInputCol->info.type, pv, pOutput, pos, pCtx->order, tsList[i]);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
// handle selectivity
if (pCtx->subsidiaries.num > 0) {
appendSelectivityValue(pCtx, i, pos);
@@ -2679,7 +2753,10 @@ int32_t diffFunction(SqlFunctionCtx* pCtx) {
numOfElems++;
} else {
- doSetPrevVal(pDiffInfo, pInputCol->info.type, pv, tsList[i]);
+ int32_t code = doSetPrevVal(pDiffInfo, pInputCol->info.type, pv, tsList[i]);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
pDiffInfo->hasPrev = true;
@@ -2704,7 +2781,10 @@ int32_t diffFunction(SqlFunctionCtx* pCtx) {
if (tsList[i] == pDiffInfo->prevTs) {
return TSDB_CODE_FUNC_DUP_TIMESTAMP;
}
- doHandleDiff(pDiffInfo, pInputCol->info.type, pv, pOutput, pos, pCtx->order, tsList[i]);
+ int32_t code = doHandleDiff(pDiffInfo, pInputCol->info.type, pv, pOutput, pos, pCtx->order, tsList[i]);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
// handle selectivity
if (pCtx->subsidiaries.num > 0) {
appendSelectivityValue(pCtx, i, pos);
@@ -2712,7 +2792,10 @@ int32_t diffFunction(SqlFunctionCtx* pCtx) {
numOfElems++;
} else {
- doSetPrevVal(pDiffInfo, pInputCol->info.type, pv, tsList[i]);
+ int32_t code = doSetPrevVal(pDiffInfo, pInputCol->info.type, pv, tsList[i]);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
pDiffInfo->hasPrev = true;
@@ -2754,8 +2837,8 @@ static STopBotRes* getTopBotOutputInfo(SqlFunctionCtx* pCtx) {
return pRes;
}
-static void doAddIntoResult(SqlFunctionCtx* pCtx, void* pData, int32_t rowIndex, SSDataBlock* pSrcBlock, uint16_t type,
- uint64_t uid, SResultRowEntryInfo* pEntryInfo, bool isTopQuery);
+static int32_t doAddIntoResult(SqlFunctionCtx* pCtx, void* pData, int32_t rowIndex, SSDataBlock* pSrcBlock, uint16_t type,
+ uint64_t uid, SResultRowEntryInfo* pEntryInfo, bool isTopQuery);
static void addResult(SqlFunctionCtx* pCtx, STopBotResItem* pSourceItem, int16_t type, bool isTopQuery);
@@ -2777,11 +2860,17 @@ int32_t topFunction(SqlFunctionCtx* pCtx) {
numOfElems++;
char* data = colDataGetData(pCol, i);
- doAddIntoResult(pCtx, data, i, pCtx->pSrcBlock, pRes->type, pInput->uid, pResInfo, true);
+ int32_t code = doAddIntoResult(pCtx, data, i, pCtx->pSrcBlock, pRes->type, pInput->uid, pResInfo, true);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pRes->nullTupleSaved) {
- pRes->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, &pRes->nullTuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pRes->nullTupleSaved = true;
}
return TSDB_CODE_SUCCESS;
@@ -2805,11 +2894,17 @@ int32_t bottomFunction(SqlFunctionCtx* pCtx) {
numOfElems++;
char* data = colDataGetData(pCol, i);
- doAddIntoResult(pCtx, data, i, pCtx->pSrcBlock, pRes->type, pInput->uid, pResInfo, false);
+ int32_t code = doAddIntoResult(pCtx, data, i, pCtx->pSrcBlock, pRes->type, pInput->uid, pResInfo, false);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pRes->nullTupleSaved) {
- pRes->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, &pRes->nullTuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pRes->nullTupleSaved = true;
}
@@ -2849,7 +2944,7 @@ static int32_t topBotResComparFn(const void* p1, const void* p2, const void* par
return (val1->v.d > val2->v.d) ? 1 : -1;
}
-void doAddIntoResult(SqlFunctionCtx* pCtx, void* pData, int32_t rowIndex, SSDataBlock* pSrcBlock, uint16_t type,
+int32_t doAddIntoResult(SqlFunctionCtx* pCtx, void* pData, int32_t rowIndex, SSDataBlock* pSrcBlock, uint16_t type,
uint64_t uid, SResultRowEntryInfo* pEntryInfo, bool isTopQuery) {
STopBotRes* pRes = getTopBotOutputInfo(pCtx);
@@ -2857,7 +2952,6 @@ void doAddIntoResult(SqlFunctionCtx* pCtx, void* pData, int32_t rowIndex, SSData
taosVariantCreateFromBinary(&val, pData, tDataTypes[type].bytes, type);
STopBotResItem* pItems = pRes->pItems;
- assert(pItems != NULL);
// not full yet
if (pEntryInfo->numOfRes < pRes->maxSize) {
@@ -2867,7 +2961,10 @@ void doAddIntoResult(SqlFunctionCtx* pCtx, void* pData, int32_t rowIndex, SSData
// save the data of this tuple
if (pCtx->subsidiaries.num > 0) {
- pItem->tuplePos = saveTupleData(pCtx, rowIndex, pSrcBlock);
+ int32_t code = saveTupleData(pCtx, rowIndex, pSrcBlock, &pItem->tuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
#ifdef BUF_PAGE_DEBUG
qDebug("page_saveTuple i:%d, item:%p,pageId:%d, offset:%d\n", pEntryInfo->numOfRes, pItem, pItem->tuplePos.pageId,
@@ -2893,7 +2990,10 @@ void doAddIntoResult(SqlFunctionCtx* pCtx, void* pData, int32_t rowIndex, SSData
// save the data of this tuple by over writing the old data
if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, rowIndex, pSrcBlock, &pItem->tuplePos);
+ int32_t code = updateTupleData(pCtx, rowIndex, pSrcBlock, &pItem->tuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
#ifdef BUF_PAGE_DEBUG
qDebug("page_copyTuple pageId:%d, offset:%d", pItem->tuplePos.pageId, pItem->tuplePos.offset);
@@ -2902,6 +3002,8 @@ void doAddIntoResult(SqlFunctionCtx* pCtx, void* pData, int32_t rowIndex, SSData
topBotResComparFn, NULL, !isTopQuery);
}
}
+
+ return TSDB_CODE_SUCCESS;
}
/*
@@ -2941,20 +3043,33 @@ void* serializeTupleData(const SSDataBlock* pSrcBlock, int32_t rowIndex, SSubsid
return buf;
}
-static STuplePos doSaveTupleData(SSerializeDataHandle* pHandle, const void* pBuf, size_t length, STupleKey key) {
+static int32_t doSaveTupleData(SSerializeDataHandle* pHandle, const void* pBuf, size_t length, STupleKey key,
+ STuplePos* pPos) {
STuplePos p = {0};
if (pHandle->pBuf != NULL) {
SFilePage* pPage = NULL;
if (pHandle->currentPage == -1) {
pPage = getNewBufPage(pHandle->pBuf, &pHandle->currentPage);
+ if (pPage == NULL) {
+ terrno = TSDB_CODE_NO_AVAIL_DISK;
+ return terrno;
+ }
pPage->num = sizeof(SFilePage);
} else {
pPage = getBufPage(pHandle->pBuf, pHandle->currentPage);
+ if (pPage == NULL) {
+ terrno = TSDB_CODE_NO_AVAIL_DISK;
+ return terrno;
+ }
if (pPage->num + length > getBufPageSize(pHandle->pBuf)) {
// current page is all used, let's prepare a new buffer page
releaseBufPage(pHandle->pBuf, pPage);
pPage = getNewBufPage(pHandle->pBuf, &pHandle->currentPage);
+ if (pPage == NULL) {
+ terrno = TSDB_CODE_NO_AVAIL_DISK;
+ return terrno;
+ }
pPage->num = sizeof(SFilePage);
}
}
@@ -2967,36 +3082,41 @@ static STuplePos doSaveTupleData(SSerializeDataHandle* pHandle, const void* pBuf
releaseBufPage(pHandle->pBuf, pPage);
} else {
// other tuple save policy
- if (streamStateFuncPut(pHandle->pState, &key, pBuf, length) < 0) {
- ASSERT(0);
+ if (streamStateFuncPut(pHandle->pState, &key, pBuf, length) >= 0) {
+ p.streamTupleKey = key;
}
- p.streamTupleKey = key;
}
- return p;
+ *pPos = p;
+ return TSDB_CODE_SUCCESS;
}
-STuplePos saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock) {
+int32_t saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos) {
prepareBuf(pCtx);
STupleKey key;
if (pCtx->saveHandle.pBuf == NULL) {
SColumnInfoData* pColInfo = taosArrayGet(pSrcBlock->pDataBlock, 0);
- ASSERT(pColInfo->info.type == TSDB_DATA_TYPE_TIMESTAMP);
- int64_t skey = *(int64_t*)colDataGetData(pColInfo, rowIndex);
+ if (pColInfo->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
+ int64_t skey = *(int64_t*)colDataGetData(pColInfo, rowIndex);
- key.groupId = pSrcBlock->info.id.groupId;
- key.ts = skey;
- key.exprIdx = pCtx->exprIdx;
+ key.groupId = pSrcBlock->info.id.groupId;
+ key.ts = skey;
+ key.exprIdx = pCtx->exprIdx;
+ }
}
char* buf = serializeTupleData(pSrcBlock, rowIndex, &pCtx->subsidiaries, pCtx->subsidiaries.buf);
- return doSaveTupleData(&pCtx->saveHandle, buf, pCtx->subsidiaries.rowLen, key);
+ return doSaveTupleData(&pCtx->saveHandle, buf, pCtx->subsidiaries.rowLen, key, pPos);
}
static int32_t doUpdateTupleData(SSerializeDataHandle* pHandle, const void* pBuf, size_t length, STuplePos* pPos) {
if (pHandle->pBuf != NULL) {
SFilePage* pPage = getBufPage(pHandle->pBuf, pPos->pageId);
+ if (pPage == NULL) {
+ terrno = TSDB_CODE_NO_AVAIL_DISK;
+ return terrno;
+ }
memcpy(pPage->data + pPos->offset, pBuf, length);
setBufPageDirty(pPage, true);
releaseBufPage(pHandle->pBuf, pPage);
@@ -3011,13 +3131,15 @@ int32_t updateTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBloc
prepareBuf(pCtx);
char* buf = serializeTupleData(pSrcBlock, rowIndex, &pCtx->subsidiaries, pCtx->subsidiaries.buf);
- doUpdateTupleData(&pCtx->saveHandle, buf, pCtx->subsidiaries.rowLen, pPos);
- return TSDB_CODE_SUCCESS;
+ return doUpdateTupleData(&pCtx->saveHandle, buf, pCtx->subsidiaries.rowLen, pPos);
}
static char* doLoadTupleData(SSerializeDataHandle* pHandle, const STuplePos* pPos) {
if (pHandle->pBuf != NULL) {
SFilePage* pPage = getBufPage(pHandle->pBuf, pPos->pageId);
+ if (pPage == NULL) {
+ return NULL;
+ }
char* p = pPage->data + pPos->offset;
releaseBufPage(pHandle->pBuf, pPage);
return p;
@@ -3034,6 +3156,8 @@ const char* loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos) {
}
int32_t topBotFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+ int32_t code = TSDB_CODE_SUCCESS;
+
SResultRowEntryInfo* pEntryInfo = GET_RES_INFO(pCtx);
STopBotRes* pRes = getTopBotOutputInfo(pCtx);
@@ -3046,8 +3170,8 @@ int32_t topBotFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
int32_t currentRow = pBlock->info.rows;
if (pEntryInfo->numOfRes <= 0) {
colDataAppendNULL(pCol, currentRow);
- setSelectivityValue(pCtx, pBlock, &pRes->nullTuplePos, currentRow);
- return pEntryInfo->numOfRes;
+ code = setSelectivityValue(pCtx, pBlock, &pRes->nullTuplePos, currentRow);
+ return code;
}
for (int32_t i = 0; i < pEntryInfo->numOfRes; ++i) {
STopBotResItem* pItem = &pRes->pItems[i];
@@ -3056,18 +3180,17 @@ int32_t topBotFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
qDebug("page_finalize i:%d,item:%p,pageId:%d, offset:%d\n", i, pItem, pItem->tuplePos.pageId,
pItem->tuplePos.offset);
#endif
- setSelectivityValue(pCtx, pBlock, &pRes->pItems[i].tuplePos, currentRow);
+ code = setSelectivityValue(pCtx, pBlock, &pRes->pItems[i].tuplePos, currentRow);
currentRow += 1;
}
- return pEntryInfo->numOfRes;
+ return code;
}
void addResult(SqlFunctionCtx* pCtx, STopBotResItem* pSourceItem, int16_t type, bool isTopQuery) {
SResultRowEntryInfo* pEntryInfo = GET_RES_INFO(pCtx);
STopBotRes* pRes = getTopBotOutputInfo(pCtx);
STopBotResItem* pItems = pRes->pItems;
- assert(pItems != NULL);
// not full yet
if (pEntryInfo->numOfRes < pRes->maxSize) {
@@ -3225,7 +3348,9 @@ static void spreadTransferInfo(SSpreadInfo* pInput, SSpreadInfo* pOutput) {
int32_t spreadFunctionMerge(SqlFunctionCtx* pCtx) {
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pCol = pInput->pData[0];
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
+ if (pCol->info.type != TSDB_DATA_TYPE_BINARY) {
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
+ }
SSpreadInfo* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
@@ -3404,7 +3529,9 @@ static void elapsedTransferInfo(SElapsedInfo* pInput, SElapsedInfo* pOutput) {
int32_t elapsedFunctionMerge(SqlFunctionCtx* pCtx) {
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pCol = pInput->pData[0];
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
+ if (pCol->info.type != TSDB_DATA_TYPE_BINARY) {
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
+ }
SElapsedInfo* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
@@ -3574,7 +3701,9 @@ static bool getHistogramBinDesc(SHistoFuncInfo* pInfo, char* binDescStr, int8_t
intervals[0] = -INFINITY;
intervals[numOfBins - 1] = INFINITY;
// in case of desc bin orders, -inf/inf should be swapped
- ASSERT(numOfBins >= 4);
+ if (numOfBins < 4) {
+ return false;
+ }
if (intervals[1] > intervals[numOfBins - 2]) {
TSWAP(intervals[0], intervals[numOfBins - 1]);
}
@@ -3717,7 +3846,9 @@ static void histogramTransferInfo(SHistoFuncInfo* pInput, SHistoFuncInfo* pOutpu
int32_t histogramFunctionMerge(SqlFunctionCtx* pCtx) {
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pCol = pInput->pData[0];
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
+ if (pCol->info.type != TSDB_DATA_TYPE_BINARY) {
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
+ }
SHistoFuncInfo* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
@@ -4099,7 +4230,7 @@ static bool checkStateOp(int8_t op, SColumnInfoData* pCol, int32_t index, SVaria
break;
}
default: {
- ASSERT(0);
+ return false;
}
}
return false;
@@ -4431,12 +4562,15 @@ static void sampleAssignResult(SSampleInfo* pInfo, char* data, int32_t index) {
assignVal(pInfo->data + index * pInfo->colBytes, data, pInfo->colBytes, pInfo->colType);
}
-static void doReservoirSample(SqlFunctionCtx* pCtx, SSampleInfo* pInfo, char* data, int32_t index) {
+static int32_t doReservoirSample(SqlFunctionCtx* pCtx, SSampleInfo* pInfo, char* data, int32_t index) {
pInfo->totalPoints++;
if (pInfo->numSampled < pInfo->samples) {
sampleAssignResult(pInfo, data, pInfo->numSampled);
if (pCtx->subsidiaries.num > 0) {
- pInfo->tuplePos[pInfo->numSampled] = saveTupleData(pCtx, index, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, index, pCtx->pSrcBlock, &pInfo->tuplePos[pInfo->numSampled]);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
pInfo->numSampled++;
} else {
@@ -4444,10 +4578,15 @@ static void doReservoirSample(SqlFunctionCtx* pCtx, SSampleInfo* pInfo, char* da
if (j < pInfo->samples) {
sampleAssignResult(pInfo, data, j);
if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, index, pCtx->pSrcBlock, &pInfo->tuplePos[j]);
+ int32_t code = updateTupleData(pCtx, index, pCtx->pSrcBlock, &pInfo->tuplePos[j]);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
}
}
+
+ return TSDB_CODE_SUCCESS;
}
int32_t sampleFunction(SqlFunctionCtx* pCtx) {
@@ -4463,11 +4602,17 @@ int32_t sampleFunction(SqlFunctionCtx* pCtx) {
}
char* data = colDataGetData(pInputCol, i);
- doReservoirSample(pCtx, pInfo, data, i);
+ int32_t code = doReservoirSample(pCtx, pInfo, data, i);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
if (pInfo->numSampled == 0 && pCtx->subsidiaries.num > 0 && !pInfo->nullTupleSaved) {
- pInfo->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, &pInfo->nullTuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pInfo->nullTupleSaved = true;
}
@@ -4476,6 +4621,7 @@ int32_t sampleFunction(SqlFunctionCtx* pCtx) {
}
int32_t sampleFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+ int32_t code = TSDB_CODE_SUCCESS;
SResultRowEntryInfo* pEntryInfo = GET_RES_INFO(pCtx);
SSampleInfo* pInfo = getSampleOutputInfo(pCtx);
@@ -4487,15 +4633,15 @@ int32_t sampleFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
int32_t currentRow = pBlock->info.rows;
if (pInfo->numSampled == 0) {
colDataAppendNULL(pCol, currentRow);
- setSelectivityValue(pCtx, pBlock, &pInfo->nullTuplePos, currentRow);
- return pInfo->numSampled;
+ code = setSelectivityValue(pCtx, pBlock, &pInfo->nullTuplePos, currentRow);
+ return code;
}
for (int32_t i = 0; i < pInfo->numSampled; ++i) {
colDataAppend(pCol, currentRow + i, pInfo->data + i * pInfo->colBytes, false);
- setSelectivityValue(pCtx, pBlock, &pInfo->tuplePos[i], currentRow + i);
+ code = setSelectivityValue(pCtx, pBlock, &pInfo->tuplePos[i], currentRow + i);
}
- return pInfo->numSampled;
+ return code;
}
bool getTailFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
@@ -4761,7 +4907,7 @@ bool modeFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo) {
return true;
}
-static void doModeAdd(SModeInfo* pInfo, int32_t rowIndex, SqlFunctionCtx* pCtx, char* data) {
+static int32_t doModeAdd(SModeInfo* pInfo, int32_t rowIndex, SqlFunctionCtx* pCtx, char* data) {
int32_t hashKeyBytes = IS_STR_DATA_TYPE(pInfo->colType) ? varDataTLen(data) : pInfo->colBytes;
SModeItem** pHashItem = taosHashGet(pInfo->pHash, data, hashKeyBytes);
if (pHashItem == NULL) {
@@ -4771,7 +4917,10 @@ static void doModeAdd(SModeInfo* pInfo, int32_t rowIndex, SqlFunctionCtx* pCtx,
pItem->count += 1;
if (pCtx->subsidiaries.num > 0) {
- pItem->tuplePos = saveTupleData(pCtx, rowIndex, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, rowIndex, pCtx->pSrcBlock, &pItem->tuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
taosHashPut(pInfo->pHash, data, hashKeyBytes, &pItem, sizeof(SModeItem*));
@@ -4779,9 +4928,14 @@ static void doModeAdd(SModeInfo* pInfo, int32_t rowIndex, SqlFunctionCtx* pCtx,
} else {
(*pHashItem)->count += 1;
if (pCtx->subsidiaries.num > 0) {
- updateTupleData(pCtx, rowIndex, pCtx->pSrcBlock, &((*pHashItem)->tuplePos));
+ int32_t code = updateTupleData(pCtx, rowIndex, pCtx->pSrcBlock, &((*pHashItem)->tuplePos));
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
}
+
+ return TSDB_CODE_SUCCESS;
}
int32_t modeFunction(SqlFunctionCtx* pCtx) {
@@ -4802,7 +4956,10 @@ int32_t modeFunction(SqlFunctionCtx* pCtx) {
numOfElems++;
char* data = colDataGetData(pInputCol, i);
- doModeAdd(pInfo, i, pCtx, data);
+ int32_t code = doModeAdd(pInfo, i, pCtx, data);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
if (sizeof(SModeInfo) + pInfo->numOfPoints * (sizeof(SModeItem) + pInfo->colBytes) >= MODE_MAX_RESULT_SIZE) {
taosHashCleanup(pInfo->pHash);
@@ -4811,7 +4968,10 @@ int32_t modeFunction(SqlFunctionCtx* pCtx) {
}
if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pInfo->nullTupleSaved) {
- pInfo->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, &pInfo->nullTuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pInfo->nullTupleSaved = true;
}
@@ -4821,6 +4981,7 @@ int32_t modeFunction(SqlFunctionCtx* pCtx) {
}
int32_t modeFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
+ int32_t code = TSDB_CODE_SUCCESS;
SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
SModeInfo* pInfo = GET_ROWCELL_INTERBUF(pResInfo);
int32_t slotId = pCtx->pExpr->base.resSchema.slotId;
@@ -4840,15 +5001,15 @@ int32_t modeFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
if (maxCount != 0) {
SModeItem* pResItem = (SModeItem*)(pInfo->pItems + resIndex * (sizeof(SModeItem) + pInfo->colBytes));
colDataAppend(pCol, currentRow, pResItem->data, false);
- setSelectivityValue(pCtx, pBlock, &pResItem->tuplePos, currentRow);
+ code = setSelectivityValue(pCtx, pBlock, &pResItem->tuplePos, currentRow);
} else {
colDataAppendNULL(pCol, currentRow);
- setSelectivityValue(pCtx, pBlock, &pInfo->nullTuplePos, currentRow);
+ code = setSelectivityValue(pCtx, pBlock, &pInfo->nullTuplePos, currentRow);
}
taosHashCleanup(pInfo->pHash);
- return pResInfo->numOfRes;
+ return code;
}
bool getTwaFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
@@ -4900,11 +5061,7 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
}
int32_t i = pInput->startRowIndex;
- if (pCtx->start.key != INT64_MIN) {
- // ASSERT((pCtx->start.key < tsList[i] && pCtx->order == TSDB_ORDER_ASC) ||
- // (pCtx->start.key > tsList[i] && pCtx->order == TSDB_ORDER_DESC));
-
- ASSERT(last->key == INT64_MIN);
+ if (pCtx->start.key != INT64_MIN && last->key == INT64_MIN) {
for (; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
continue;
@@ -5124,7 +5281,7 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
}
default:
- ASSERT(0);
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
}
// the last interpolated time window value
@@ -5151,7 +5308,6 @@ _twa_over:
* is required, we simply copy to the resut ot interResBuffer.
*/
// void twa_function_copy(SQLFunctionCtx *pCtx) {
-// assert(pCtx->inputType == TSDB_DATA_TYPE_BINARY);
// SResultRowEntryInfo *pResInfo = GET_RES_INFO(pCtx);
//
// memcpy(GET_ROWCELL_INTERBUF(pResInfo), pCtx->pInput, (size_t)pCtx->inputBytes);
@@ -5700,7 +5856,10 @@ int32_t cachedLastRowFunction(SqlFunctionCtx* pCtx) {
TSKEY cts = getRowPTs(pInput->pPTS, i);
if (pResInfo->numOfRes == 0 || pInfo->ts < cts) {
- doSaveLastrow(pCtx, data, i, cts, pInfo);
+ int32_t code = doSaveLastrow(pCtx, data, i, cts, pInfo);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pResInfo->numOfRes = 1;
}
}
diff --git a/source/libs/function/src/detail/tavgfunction.c b/source/libs/function/src/detail/tavgfunction.c
index 8e010181d1..3a70a65ec4 100644
--- a/source/libs/function/src/detail/tavgfunction.c
+++ b/source/libs/function/src/detail/tavgfunction.c
@@ -366,7 +366,6 @@ bool avgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo) {
static int32_t calculateAvgBySMAInfo(SAvgRes* pRes, int32_t numOfRows, int32_t type, const SColumnDataAgg* pAgg) {
int32_t numOfElem = numOfRows - pAgg->numOfNull;
- ASSERT(numOfElem >= 0);
pRes->count += numOfElem;
if (IS_SIGNED_NUMERIC_TYPE(type)) {
@@ -672,7 +671,7 @@ int32_t avgFunction(SqlFunctionCtx* pCtx) {
break;
}
default:
- ASSERT(0);
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
}
} else {
numOfElem = doAddNumericVector(pCol, type, pInput, pAvgRes);
@@ -706,7 +705,9 @@ static void avgTransferInfo(SAvgRes* pInput, SAvgRes* pOutput) {
int32_t avgFunctionMerge(SqlFunctionCtx* pCtx) {
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pCol = pInput->pData[0];
- ASSERT(pCol->info.type == TSDB_DATA_TYPE_BINARY);
+ if (pCol->info.type != TSDB_DATA_TYPE_BINARY) {
+ return TSDB_CODE_FUNC_FUNTION_PARA_TYPE;
+ }
SAvgRes* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
diff --git a/source/libs/function/src/detail/tminmax.c b/source/libs/function/src/detail/tminmax.c
index 3660ec272f..847c738655 100644
--- a/source/libs/function/src/detail/tminmax.c
+++ b/source/libs/function/src/detail/tminmax.c
@@ -700,7 +700,7 @@ static void doExtractVal(SColumnInfoData* pCol, int32_t i, int32_t end, SqlFunct
}
}
-int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
+int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc, int32_t* nElems) {
int32_t numOfElems = 0;
SInputColumnInfoData* pInput = &pCtx->input;
@@ -721,7 +721,6 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
// data in current data block are qualified to the query
if (pInput->colDataSMAIsSet) {
numOfElems = pInput->numOfRows - pAgg->numOfNull;
- ASSERT(pInput->numOfRows == pInput->totalRows && numOfElems >= 0);
if (numOfElems == 0) {
goto _over;
@@ -746,7 +745,10 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
if (pCtx->subsidiaries.num > 0) {
index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, index, pCtx->pSrcBlock, &pBuf->tuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
}
} else {
@@ -760,7 +762,10 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
if (pCtx->subsidiaries.num > 0) {
index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, index, pCtx->pSrcBlock, &pBuf->tuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
}
}
@@ -774,7 +779,10 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
if (pCtx->subsidiaries.num > 0) {
index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, index, pCtx->pSrcBlock, &pBuf->tuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
}
}
@@ -788,7 +796,10 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
if (pCtx->subsidiaries.num > 0) {
index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, index, pCtx->pSrcBlock, &pBuf->tuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
}
}
@@ -804,14 +815,17 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
if (pCtx->subsidiaries.num > 0) {
index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
if (index >= 0) {
- pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, index, pCtx->pSrcBlock, &pBuf->tuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
}
}
}
pBuf->assign = true;
- return numOfElems;
+ return TSDB_CODE_SUCCESS;
}
int32_t start = pInput->startRowIndex;
@@ -825,14 +839,16 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
memcpy(&pBuf->v, pCol->pData + (pCol->info.bytes * i), pCol->info.bytes);
if (pCtx->subsidiaries.num > 0) {
- pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, i, pCtx->pSrcBlock, &pBuf->tuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
}
pBuf->assign = true;
numOfElems = 1;
}
if (i >= end) {
- ASSERT(numOfElems == 0);
goto _over;
}
@@ -889,9 +905,13 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
_over:
if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pBuf->nullTupleSaved) {
- pBuf->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock);
+ int32_t code = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, &pBuf->nullTuplePos);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
pBuf->nullTupleSaved = true;
}
- return numOfElems;
+ *nElems = numOfElems;
+ return TSDB_CODE_SUCCESS;
}
diff --git a/source/libs/function/src/tfunctionInt.c b/source/libs/function/src/tfunctionInt.c
index 3afa0e5cdd..edfd866010 100644
--- a/source/libs/function/src/tfunctionInt.c
+++ b/source/libs/function/src/tfunctionInt.c
@@ -40,8 +40,6 @@ int32_t getNumOfResult(SqlFunctionCtx* pCtx, int32_t num, SSDataBlock* pResBlock
}
}
- assert(maxRows >= 0);
-
blockDataEnsureCapacity(pResBlock, maxRows);
for (int32_t i = 0; i < num; ++i) {
SColumnInfoData* pCol = taosArrayGet(pResBlock->pDataBlock, i);
@@ -63,7 +61,6 @@ int32_t getNumOfResult(SqlFunctionCtx* pCtx, int32_t num, SSDataBlock* pResBlock
}
bool isRowEntryCompleted(struct SResultRowEntryInfo* pEntry) {
- assert(pEntry != NULL);
return pEntry->complete;
}
diff --git a/source/libs/function/src/thistogram.c b/source/libs/function/src/thistogram.c
index b0f23f78df..e7d631f638 100644
--- a/source/libs/function/src/thistogram.c
+++ b/source/libs/function/src/thistogram.c
@@ -73,7 +73,10 @@ int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
#if defined(USE_ARRAYLIST)
int32_t idx = histoBinarySearch((*pHisto)->elems, (*pHisto)->numOfEntries, val);
- assert(idx >= 0 && idx <= (*pHisto)->maxEntries && (*pHisto)->elems != NULL);
+ if (ASSERTS(idx >= 0 && idx <= (*pHisto)->maxEntries && (*pHisto)->elems != NULL, "tHistogramAdd Error, idx:%d, maxEntries:%d, elems:%p",
+ idx, (*pHisto)->maxEntries, (*pHisto)->elems)) {
+ return -1;
+ }
if ((*pHisto)->elems[idx].val == val && idx >= 0) {
(*pHisto)->elems[idx].num += 1;
@@ -84,15 +87,27 @@ int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
} else { /* insert a new slot */
if ((*pHisto)->numOfElems >= 1 && idx < (*pHisto)->numOfEntries) {
if (idx > 0) {
- assert((*pHisto)->elems[idx - 1].val <= val);
+ if (ASSERTS((*pHisto)->elems[idx - 1].val <= val, "tHistogramAdd Error, elems[%d].val:%lf, val:%lf",
+ idx - 1, (*pHisto)->elems[idx - 1].val, val)) {
+ return -1;
+ }
} else {
- assert((*pHisto)->elems[idx].val > val);
+ if (ASSERTS((*pHisto)->elems[idx].val > val, "tHistogramAdd Error, elems[%d].val:%lf, val:%lf",
+ idx, (*pHisto)->elems[idx].val, val)) {
+ return -1;
+ }
}
} else if ((*pHisto)->numOfElems > 0) {
- assert((*pHisto)->elems[(*pHisto)->numOfEntries].val <= val);
+ if (ASSERTS((*pHisto)->elems[(*pHisto)->numOfEntries].val <= val, "tHistogramAdd Error, elems[%d].val:%lf, val:%lf",
+ (*pHisto)->numOfEntries, (*pHisto)->elems[idx].val, val)) {
+ return -1;
+ }
}
- histogramCreateBin(*pHisto, idx, val);
+ int32_t code = histogramCreateBin(*pHisto, idx, val);
+ if (code != 0) {
+ return code;
+ }
}
#else
tSkipListKey key = tSkipListCreateKey(TSDB_DATA_TYPE_DOUBLE, &val, tDataTypes[TSDB_DATA_TYPE_DOUBLE].nSize);
@@ -151,7 +166,6 @@ int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
if ((*pHisto)->numOfEntries >= (*pHisto)->maxEntries + 1) {
// set the right value for loser-tree
- assert((*pHisto)->pLoserTree != NULL);
if (!(*pHisto)->ordered) {
SSkipListPrint((*pHisto)->pList, 1);
@@ -203,7 +217,10 @@ int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
tSkipListNode* pNext = pNode->pForward[0];
SHistBin* pNextEntry = (SHistBin*)pNext->pData;
- assert(pNextEntry->val - pEntry->val == pEntry->delta);
+ if (ASSERTS(pNextEntry->val - pEntry->val == pEntry->delta, "tHistogramAdd Error, pNextEntry->val:%lf, pEntry->val:%lf, pEntry->delta:%lf",
+ pNextEntry->val, pEntry->val, pEntry->delta)) {
+ return -1;
+ }
double newVal = (pEntry->val * pEntry->num + pNextEntry->val * pNextEntry->num) / (pEntry->num + pNextEntry->num);
pEntry->val = newVal;
@@ -253,7 +270,9 @@ int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
} else {
SHistBin* pEntry = (SHistBin*)pResNode->pData;
- assert(pEntry->val == val);
+ if (ASSERTS(pEntry->val == val, "tHistogramAdd Error, pEntry->val:%lf, val:%lf")) {
+ return -1;
+ }
pEntry->num += 1;
}
@@ -329,7 +348,10 @@ int32_t histogramCreateBin(SHistogramInfo* pHisto, int32_t index, double val) {
memmove(&pHisto->elems[index + 1], &pHisto->elems[index], sizeof(SHistBin) * remain);
}
- assert(index >= 0 && index <= pHisto->maxEntries);
+ if (ASSERTS(index >= 0 && index <= pHisto->maxEntries, "histogramCreateBin Error, index:%d, maxEntries:%d",
+ index, pHisto->maxEntries)) {
+ return -1;
+ }
pHisto->elems[index].num = 1;
pHisto->elems[index].val = val;
@@ -343,7 +365,11 @@ int32_t histogramCreateBin(SHistogramInfo* pHisto, int32_t index, double val) {
pHisto->elems[pHisto->maxEntries].num = 0;
}
#endif
- assert(pHisto->numOfEntries <= pHisto->maxEntries);
+ if (ASSERTS(pHisto->numOfEntries <= pHisto->maxEntries, "histogramCreateBin Error, numOfEntries:%d, maxEntries:%d",
+ pHisto->numOfEntries, pHisto->maxEntries)) {
+ return -1;
+ }
+
return 0;
}
@@ -386,12 +412,14 @@ int64_t tHistogramSum(SHistogramInfo* pHisto, double v) {
if (slotIdx < 0) {
slotIdx = 0;
- assert(v <= pHisto->elems[slotIdx].val);
+ ASSERTS(v <= pHisto->elems[slotIdx].val, "tHistogramSum Error, elems[%d].val:%lf, v:%lf",
+ slotIdx, pHisto->elems[slotIdx].val, v);
} else {
- assert(v >= pHisto->elems[slotIdx].val);
-
+ ASSERTS(v >= pHisto->elems[slotIdx].val, "tHistogramSum Error, elems[%d].val:%lf, v:%lf",
+ slotIdx, pHisto->elems[slotIdx].val, v);
if (slotIdx + 1 < pHisto->numOfEntries) {
- assert(v < pHisto->elems[slotIdx + 1].val);
+ ASSERTS(v < pHisto->elems[slotIdx + 1].val, "tHistogramSum Error, elems[%d].val:%lf, v:%lf",
+ slotIdx + 1, pHisto->elems[slotIdx + 1].val, v);
}
}
}
@@ -445,7 +473,9 @@ double* tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num) {
j += 1;
}
- assert(total <= numOfElem && total + pHisto->elems[j + 1].num > numOfElem);
+ ASSERTS(total <= numOfElem && total + pHisto->elems[j + 1].num > numOfElem,
+ "tHistogramUniform Error, total:%d, numOfElem:%d, elems[%d].num:%d",
+ total, numOfElem, j + 1, pHisto->elems[j + 1].num);
double delta = numOfElem - total;
if (fabs(delta) < FLT_EPSILON) {
@@ -502,7 +532,9 @@ double* tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num) {
j += 1;
}
- assert(total <= numOfElem && total + pEntry->num > numOfElem);
+ ASSERTS(total <= numOfElem && total + pEntry->num > numOfElem,
+ "tHistogramUniform Error, total:%d, numOfElem:%d, pEntry->num:%d",
+ total, numOfElem, pEntry->num);
double delta = numOfElem - total;
if (fabs(delta) < FLT_EPSILON) {
diff --git a/source/libs/function/src/tpercentile.c b/source/libs/function/src/tpercentile.c
index 157ee08f15..19be8120f1 100644
--- a/source/libs/function/src/tpercentile.c
+++ b/source/libs/function/src/tpercentile.c
@@ -33,13 +33,23 @@ static SFilePage *loadDataFromFilePage(tMemBucket *pMemBucket, int32_t slotIdx)
(SFilePage *)taosMemoryCalloc(1, pMemBucket->bytes * pMemBucket->pSlots[slotIdx].info.size + sizeof(SFilePage));
int32_t groupId = getGroupId(pMemBucket->numOfSlots, slotIdx, pMemBucket->times);
- SArray *pIdList = *(SArray **)taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
+
+ SArray *pIdList;
+ void *p = taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
+ if (p != NULL) {
+ pIdList = *(SArray **)p;
+ } else {
+ return NULL;
+ }
int32_t offset = 0;
for (int32_t i = 0; i < taosArrayGetSize(pIdList); ++i) {
int32_t *pageId = taosArrayGet(pIdList, i);
SFilePage *pg = getBufPage(pMemBucket->pBuffer, *pageId);
+ if (pg == NULL) {
+ return NULL;
+ }
memcpy(buffer->data + offset, pg->data, (size_t)(pg->num * pMemBucket->bytes));
offset += (int32_t)(pg->num * pMemBucket->bytes);
@@ -87,8 +97,8 @@ static void resetPosInfo(SSlotInfo *pInfo) {
pInfo->data = NULL;
}
-double findOnlyResult(tMemBucket *pMemBucket) {
- assert(pMemBucket->total == 1);
+int32_t findOnlyResult(tMemBucket *pMemBucket, double *result) {
+ ASSERT(pMemBucket->total == 1);
for (int32_t i = 0; i < pMemBucket->numOfSlots; ++i) {
tMemBucketSlot *pSlot = &pMemBucket->pSlots[i];
@@ -100,19 +110,22 @@ double findOnlyResult(tMemBucket *pMemBucket) {
SArray **pList = taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
if (pList != NULL) {
SArray *list = *pList;
- assert(list->size == 1);
+ ASSERT(list->size == 1);
int32_t *pageId = taosArrayGet(list, 0);
SFilePage *pPage = getBufPage(pMemBucket->pBuffer, *pageId);
- assert(pPage->num == 1);
+ if (pPage == NULL) {
+ return TSDB_CODE_NO_AVAIL_DISK;
+ }
+ ASSERT(pPage->num == 1);
- double v = 0;
- GET_TYPED_DATA(v, double, pMemBucket->type, pPage->data);
- return v;
+ GET_TYPED_DATA(*result, double, pMemBucket->type, pPage->data);
+ return TSDB_CODE_SUCCESS;
}
}
- return 0;
+ *result = 0.0;
+ return TSDB_CODE_SUCCESS;
}
int32_t tBucketIntHash(tMemBucket *pBucket, const void *value) {
@@ -140,7 +153,8 @@ int32_t tBucketIntHash(tMemBucket *pBucket, const void *value) {
}
}
- assert(index >= 0 && index < pBucket->numOfSlots);
+ ASSERTS(index >= 0 && index < pBucket->numOfSlots, "tBucketIntHash Error, index:%d, numOfSlots:%d",
+ index, pBucket->numOfSlots);
return index;
}
@@ -167,7 +181,7 @@ int32_t tBucketUintHash(tMemBucket *pBucket, const void *value) {
}
}
- assert(index >= 0 && index < pBucket->numOfSlots);
+ ASSERT(index >= 0 && index < pBucket->numOfSlots);
return index;
}
@@ -198,7 +212,7 @@ int32_t tBucketDoubleHash(tMemBucket *pBucket, const void *value) {
}
}
- assert(index >= 0 && index < pBucket->numOfSlots);
+ ASSERT(index >= 0 && index < pBucket->numOfSlots);
return index;
}
@@ -331,7 +345,7 @@ void tMemBucketUpdateBoundingBox(MinMaxEntry *r, const char *data, int32_t dataT
r->dMaxVal = v;
}
} else {
- assert(0);
+ ASSERT(0);
}
}
@@ -339,7 +353,7 @@ void tMemBucketUpdateBoundingBox(MinMaxEntry *r, const char *data, int32_t dataT
* in memory bucket, we only accept data array list
*/
int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size) {
- assert(pBucket != NULL && data != NULL && size > 0);
+ ASSERT(pBucket != NULL && data != NULL && size > 0);
int32_t count = 0;
int32_t bytes = pBucket->bytes;
@@ -361,7 +375,7 @@ int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size) {
if (pSlot->info.data == NULL || pSlot->info.data->num >= pBucket->elemPerPage) {
if (pSlot->info.data != NULL) {
- assert(pSlot->info.data->num >= pBucket->elemPerPage && pSlot->info.size > 0);
+ ASSERT(pSlot->info.data->num >= pBucket->elemPerPage && pSlot->info.size > 0);
// keep the pointer in memory
setBufPageDirty(pSlot->info.data, true);
@@ -379,6 +393,9 @@ int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size) {
}
pSlot->info.data = getNewBufPage(pBucket->pBuffer, &pageId);
+ if (pSlot->info.data == NULL) {
+ return TSDB_CODE_NO_AVAIL_DISK;
+ }
pSlot->info.pageId = pageId;
taosArrayPush(pPageIdList, &pageId);
}
@@ -390,7 +407,7 @@ int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size) {
}
pBucket->total += count;
- return 0;
+ return TSDB_CODE_SUCCESS;
}
////////////////////////////////////////////////////////////////////////////////////////////
@@ -407,14 +424,14 @@ static MinMaxEntry getMinMaxEntryOfNextSlotWithData(tMemBucket *pMemBucket, int3
++j;
}
- assert(j < pMemBucket->numOfSlots);
+ ASSERT(j < pMemBucket->numOfSlots);
return pMemBucket->pSlots[j].range;
}
static bool isIdenticalData(tMemBucket *pMemBucket, int32_t index);
static double getIdenticalDataVal(tMemBucket *pMemBucket, int32_t slotIndex) {
- assert(isIdenticalData(pMemBucket, slotIndex));
+ ASSERT(isIdenticalData(pMemBucket, slotIndex));
tMemBucketSlot *pSlot = &pMemBucket->pSlots[slotIndex];
@@ -430,7 +447,7 @@ static double getIdenticalDataVal(tMemBucket *pMemBucket, int32_t slotIndex) {
return finalResult;
}
-double getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction) {
+int32_t getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction, double *result) {
int32_t num = 0;
for (int32_t i = 0; i < pMemBucket->numOfSlots; ++i) {
@@ -461,15 +478,18 @@ double getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction)
minOfNextSlot = (double)next.dMinVal;
}
- assert(minOfNextSlot > maxOfThisSlot);
+ ASSERT(minOfNextSlot > maxOfThisSlot);
- double val = (1 - fraction) * maxOfThisSlot + fraction * minOfNextSlot;
- return val;
+ *result = (1 - fraction) * maxOfThisSlot + fraction * minOfNextSlot;
+ return TSDB_CODE_SUCCESS;
}
if (pSlot->info.size <= pMemBucket->maxCapacity) {
// data in buffer and file are merged together to be processed.
SFilePage *buffer = loadDataFromFilePage(pMemBucket, i);
+ if (buffer == NULL) {
+ return TSDB_CODE_NO_AVAIL_DISK;
+ }
int32_t currentIdx = count - num;
char *thisVal = buffer->data + pMemBucket->bytes * currentIdx;
@@ -479,13 +499,14 @@ double getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction)
GET_TYPED_DATA(td, double, pMemBucket->type, thisVal);
GET_TYPED_DATA(nd, double, pMemBucket->type, nextVal);
- double val = (1 - fraction) * td + fraction * nd;
+ *result = (1 - fraction) * td + fraction * nd;
taosMemoryFreeClear(buffer);
- return val;
+ return TSDB_CODE_SUCCESS;
} else { // incur a second round bucket split
if (isIdenticalData(pMemBucket, i)) {
- return getIdenticalDataVal(pMemBucket, i);
+ *result = getIdenticalDataVal(pMemBucket, i);
+ return TSDB_CODE_SUCCESS;
}
// try next round
@@ -498,36 +519,53 @@ double getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction)
resetSlotInfo(pMemBucket);
int32_t groupId = getGroupId(pMemBucket->numOfSlots, i, pMemBucket->times - 1);
- SArray* list = *(SArray **)taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
- ASSERT(list != NULL && list->size > 0);
+
+ SArray* list;
+ void *p = taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
+ if (p != NULL) {
+ list = *(SArray **)p;
+ if (list == NULL || list->size <= 0) {
+ return -1;
+ }
+ } else {
+ return -1;
+ }
for (int32_t f = 0; f < list->size; ++f) {
int32_t *pageId = taosArrayGet(list, f);
SFilePage *pg = getBufPage(pMemBucket->pBuffer, *pageId);
+ if (pg == NULL) {
+ return TSDB_CODE_NO_AVAIL_DISK;
+ }
- tMemBucketPut(pMemBucket, pg->data, (int32_t)pg->num);
+ int32_t code = tMemBucketPut(pMemBucket, pg->data, (int32_t)pg->num);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
setBufPageDirty(pg, true);
releaseBufPage(pMemBucket->pBuffer, pg);
}
- return getPercentileImpl(pMemBucket, count - num, fraction);
+ return getPercentileImpl(pMemBucket, count - num, fraction, result);
}
} else {
num += pSlot->info.size;
}
}
- return 0;
+ *result = 0;
+ return TSDB_CODE_SUCCESS;
}
-double getPercentile(tMemBucket *pMemBucket, double percent) {
+int32_t getPercentile(tMemBucket *pMemBucket, double percent, double *result) {
if (pMemBucket->total == 0) {
- return 0.0;
+ *result = 0.0;
+ return TSDB_CODE_SUCCESS;
}
// if only one elements exists, return it
if (pMemBucket->total == 1) {
- return findOnlyResult(pMemBucket);
+ return findOnlyResult(pMemBucket, result);
}
percent = fabs(percent);
@@ -537,21 +575,21 @@ double getPercentile(tMemBucket *pMemBucket, double percent) {
MinMaxEntry *pRange = &pMemBucket->range;
if (IS_SIGNED_NUMERIC_TYPE(pMemBucket->type)) {
- double v = (double)(fabs(percent - 100) < DBL_EPSILON ? pRange->i64MaxVal : pRange->i64MinVal);
- return v;
+ *result = (double)(fabs(percent - 100) < DBL_EPSILON ? pRange->i64MaxVal : pRange->i64MinVal);
} else if (IS_UNSIGNED_NUMERIC_TYPE(pMemBucket->type)) {
- double v = (double)(fabs(percent - 100) < DBL_EPSILON ? pRange->u64MaxVal : pRange->u64MinVal);
- return v;
+ *result = (double)(fabs(percent - 100) < DBL_EPSILON ? pRange->u64MaxVal : pRange->u64MinVal);
} else {
- return fabs(percent - 100) < DBL_EPSILON ? pRange->dMaxVal : pRange->dMinVal;
+ *result = fabs(percent - 100) < DBL_EPSILON ? pRange->dMaxVal : pRange->dMinVal;
}
+
+ return TSDB_CODE_SUCCESS;
}
double percentVal = (percent * (pMemBucket->total - 1)) / ((double)100.0);
// do put data by using buckets
int32_t orderIdx = (int32_t)percentVal;
- return getPercentileImpl(pMemBucket, orderIdx, percentVal - orderIdx);
+ return getPercentileImpl(pMemBucket, orderIdx, percentVal - orderIdx, result);
}
/*
diff --git a/source/libs/monitor/src/monMain.c b/source/libs/monitor/src/monMain.c
index b3ca0fa452..b23a36d4df 100644
--- a/source/libs/monitor/src/monMain.c
+++ b/source/libs/monitor/src/monMain.c
@@ -20,6 +20,7 @@
#include "ttime.h"
static SMonitor tsMonitor = {0};
+static char* tsMonUri = "/report";
void monRecordLog(int64_t ts, ELogLevel level, const char *content) {
taosThreadMutexLock(&tsMonitor.lock);
@@ -550,7 +551,7 @@ void monSendReport() {
// uDebugL("report cont:%s\n", pCont);
if (pCont != NULL) {
EHttpCompFlag flag = tsMonitor.cfg.comp ? HTTP_GZIP : HTTP_FLAT;
- if (taosSendHttpReport(tsMonitor.cfg.server, tsMonitor.cfg.port, pCont, strlen(pCont), flag) != 0) {
+ if (taosSendHttpReport(tsMonitor.cfg.server, tsMonUri, tsMonitor.cfg.port, pCont, strlen(pCont), flag) != 0) {
uError("failed to send monitor msg");
}
taosMemoryFree(pCont);
diff --git a/source/libs/parser/inc/parToken.h b/source/libs/parser/inc/parToken.h
index fb4b46aa35..642979c471 100644
--- a/source/libs/parser/inc/parToken.h
+++ b/source/libs/parser/inc/parToken.h
@@ -175,8 +175,6 @@ _end:
void taosCleanupKeywordsTable();
-SToken taosTokenDup(SToken *pToken, char *buf, int32_t len);
-
#ifdef __cplusplus
}
#endif
diff --git a/source/libs/parser/src/parInsertSml.c b/source/libs/parser/src/parInsertSml.c
index e613739f26..4742921d08 100644
--- a/source/libs/parser/src/parInsertSml.c
+++ b/source/libs/parser/src/parInsertSml.c
@@ -18,6 +18,16 @@
#include "parToken.h"
#include "ttime.h"
+static void clearColValArray(SArray* pCols) {
+ int32_t num = taosArrayGetSize(pCols);
+ for (int32_t i = 0; i < num; ++i) {
+ SColVal* pCol = taosArrayGet(pCols, i);
+ if (TSDB_DATA_TYPE_NCHAR == pCol->type) {
+ taosMemoryFreeClear(pCol->value.pData);
+ }
+ }
+}
+
int32_t qCreateSName(SName* pName, const char* pTableName, int32_t acctId, char* dbName, char* msgBuf,
int32_t msgBufLen) {
SMsgBuf msg = {.buf = msgBuf, .len = msgBufLen};
@@ -189,7 +199,7 @@ int32_t smlBuildCol(STableDataCxt* pTableCxt, SSchema* schema, void* data, int32
SSchema* pColSchema = schema + index;
SColVal* pVal = taosArrayGet(pTableCxt->pValues, index);
SSmlKv* kv = (SSmlKv*)data;
- if(kv->keyLen != strlen(pColSchema->name) || memcmp(kv->key, pColSchema->name, kv->keyLen) != 0){
+ if(kv->keyLen != strlen(pColSchema->name) || memcmp(kv->key, pColSchema->name, kv->keyLen) != 0 || kv->type != pColSchema->type){
ret = TSDB_CODE_SML_INVALID_DATA;
goto end;
}
@@ -207,9 +217,11 @@ int32_t smlBuildCol(STableDataCxt* pTableCxt, SSchema* schema, void* data, int32
}
if (!taosMbsToUcs4(kv->value, kv->length, (TdUcs4*)pUcs4, size, &len)) {
if (errno == E2BIG) {
+ taosMemoryFree(pUcs4);
ret = TSDB_CODE_PAR_VALUE_TOO_LONG;
goto end;
}
+ taosMemoryFree(pUcs4);
ret = TSDB_CODE_TSC_INVALID_VALUE;
goto end;
}
@@ -316,7 +328,10 @@ int32_t smlBindData(SQuery* query, bool dataFormat, SArray* tags, SArray* colsSc
continue;
}
SSmlKv* kv = *(SSmlKv**)p;
-
+ if(kv->type != pColSchema->type){
+ ret = buildInvalidOperationMsg(&pBuf, "kv type not equal to col type");
+ goto end;
+ }
if (pColSchema->type == TSDB_DATA_TYPE_TIMESTAMP) {
kv->i = convertTimePrecision(kv->i, TSDB_TIME_PRECISION_NANO, pTableMeta->tableInfo.precision);
}
@@ -354,10 +369,12 @@ int32_t smlBindData(SQuery* query, bool dataFormat, SArray* tags, SArray* colsSc
goto end;
}
insCheckTableDataOrder(pTableCxt, TD_ROW_KEY(*pRow));
+ clearColValArray(pTableCxt->pValues);
}
end:
insDestroyBoundColInfo(&bindTags);
+ tdDestroySVCreateTbReq(pCreateTblReq);
taosMemoryFree(pCreateTblReq);
taosArrayDestroy(tagName);
return ret;
diff --git a/source/libs/parser/src/parInsertSql.c b/source/libs/parser/src/parInsertSql.c
index 582bb466d2..3c5d4d506a 100644
--- a/source/libs/parser/src/parInsertSql.c
+++ b/source/libs/parser/src/parInsertSql.c
@@ -1161,6 +1161,7 @@ static int32_t parseValueTokenImpl(SInsertParseContext* pCxt, const char** pSql,
return TSDB_CODE_OUT_OF_MEMORY;
}
if (!taosMbsToUcs4(pToken->z, pToken->n, (TdUcs4*)pUcs4, pSchema->bytes - VARSTR_HEADER_SIZE, &len)) {
+ taosMemoryFree(pUcs4);
if (errno == E2BIG) {
return generateSyntaxErrMsg(&pCxt->msg, TSDB_CODE_PAR_VALUE_TOO_LONG, pSchema->name);
}
diff --git a/source/libs/parser/src/parInsertUtil.c b/source/libs/parser/src/parInsertUtil.c
index b3018d63b4..b8ef7d970d 100644
--- a/source/libs/parser/src/parInsertUtil.c
+++ b/source/libs/parser/src/parInsertUtil.c
@@ -73,8 +73,6 @@ int32_t insCreateSName(SName* pName, SToken* pTableName, int32_t acctId, const c
char* p = tableNameGetPosition(pTableName, TS_PATH_DELIMITER[0]);
if (p != NULL) { // db has been specified in sql string so we ignore current db path
- assert(*p == TS_PATH_DELIMITER[0]);
-
int32_t dbLen = p - pTableName->z;
if (dbLen <= 0) {
return buildInvalidOperationMsg(pMsgBuf, msg2);
@@ -106,8 +104,6 @@ int32_t insCreateSName(SName* pName, SToken* pTableName, int32_t acctId, const c
return buildInvalidOperationMsg(pMsgBuf, msg1);
}
- assert(pTableName->n < TSDB_TABLE_FNAME_LEN);
-
char name[TSDB_TABLE_FNAME_LEN] = {0};
strncpy(name, pTableName->z, pTableName->n);
strdequote(name);
diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c
index cacb6f3c3b..93bfe179f4 100644
--- a/source/libs/parser/src/parTokenizer.c
+++ b/source/libs/parser/src/parTokenizer.c
@@ -715,14 +715,3 @@ void taosCleanupKeywordsTable() {
taosHashCleanup(m);
}
}
-
-SToken taosTokenDup(SToken* pToken, char* buf, int32_t len) {
- assert(pToken != NULL && buf != NULL && len > pToken->n);
-
- strncpy(buf, pToken->z, pToken->n);
- buf[pToken->n] = 0;
-
- SToken token = *pToken;
- token.z = buf;
- return token;
-}
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 202afbd39b..6376a63cc3 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -3902,7 +3902,8 @@ static int32_t checkDbKeepOption(STranslateContext* pCxt, SDatabaseOptions* pOpt
if (pOptions->keep[0] < TSDB_MIN_KEEP || pOptions->keep[1] < TSDB_MIN_KEEP || pOptions->keep[2] < TSDB_MIN_KEEP ||
pOptions->keep[0] > tsdbMaxKeep || pOptions->keep[1] > tsdbMaxKeep || pOptions->keep[2] > tsdbMaxKeep) {
return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_DB_OPTION,
- "Invalid option keep: %" PRId64 ", %" PRId64 ", %" PRId64 " valid range: [%dm, %dm]",
+ "Invalid option keep: %" PRId64 ", %" PRId64 ", %" PRId64
+ " valid range: [%dm, %" PRId64 "m]",
pOptions->keep[0], pOptions->keep[1], pOptions->keep[2], TSDB_MIN_KEEP, tsdbMaxKeep);
}
@@ -5612,7 +5613,8 @@ static void getStreamQueryFirstProjectAliasName(SHashObj* pUserAliasSet, char* a
return;
}
-static int32_t addWstartTsToCreateStreamQueryImpl(SSelectStmt* pSelect, SHashObj* pUserAliasSet) {
+static int32_t addWstartTsToCreateStreamQueryImpl(STranslateContext* pCxt, SSelectStmt* pSelect,
+ SHashObj* pUserAliasSet) {
SNode* pProj = nodesListGetNode(pSelect->pProjectionList, 0);
if (NULL == pSelect->pWindow ||
(QUERY_NODE_FUNCTION == nodeType(pProj) && 0 == strcmp("_wstart", ((SFunctionNode*)pProj)->functionName))) {
@@ -5624,7 +5626,10 @@ static int32_t addWstartTsToCreateStreamQueryImpl(SSelectStmt* pSelect, SHashObj
}
strcpy(pFunc->functionName, "_wstart");
getStreamQueryFirstProjectAliasName(pUserAliasSet, pFunc->node.aliasName, sizeof(pFunc->node.aliasName));
- int32_t code = nodesListPushFront(pSelect->pProjectionList, (SNode*)pFunc);
+ int32_t code = getFuncInfo(pCxt, pFunc);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = nodesListPushFront(pSelect->pProjectionList, (SNode*)pFunc);
+ }
if (TSDB_CODE_SUCCESS != code) {
nodesDestroyNode((SNode*)pFunc);
}
@@ -5636,7 +5641,7 @@ static int32_t addWstartTsToCreateStreamQuery(STranslateContext* pCxt, SNode* pS
SHashObj* pUserAliasSet = NULL;
int32_t code = checkProjectAlias(pCxt, pSelect->pProjectionList, &pUserAliasSet);
if (TSDB_CODE_SUCCESS == code) {
- code = addWstartTsToCreateStreamQueryImpl(pSelect, pUserAliasSet);
+ code = addWstartTsToCreateStreamQueryImpl(pCxt, pSelect, pUserAliasSet);
}
taosHashCleanup(pUserAliasSet);
return code;
@@ -5877,18 +5882,19 @@ static int32_t adjustStreamQueryForExistTable(STranslateContext* pCxt, SCreateSt
if (TSDB_CODE_SUCCESS == code) {
code = adjustStreamQueryForExistTableImpl(pCxt, pStmt, pMeta);
}
+ taosMemoryFree(pMeta);
return code;
}
static int32_t buildCreateStreamQuery(STranslateContext* pCxt, SCreateStreamStmt* pStmt, SCMCreateStreamReq* pReq) {
pCxt->createStream = true;
- int32_t code = addWstartTsToCreateStreamQuery(pCxt, pStmt->pQuery);
- if (TSDB_CODE_SUCCESS == code) {
- code = addSubtableInfoToCreateStreamQuery(pCxt, pStmt);
- }
+ int32_t code = addSubtableInfoToCreateStreamQuery(pCxt, pStmt);
if (TSDB_CODE_SUCCESS == code) {
code = translateQuery(pCxt, pStmt->pQuery);
}
+ if (TSDB_CODE_SUCCESS == code) {
+ code = addWstartTsToCreateStreamQuery(pCxt, pStmt->pQuery);
+ }
if (TSDB_CODE_SUCCESS == code) {
code = checkStreamQuery(pCxt, pStmt);
}
@@ -6561,7 +6567,7 @@ static int32_t createOperatorNode(EOperatorType opType, const char* pColName, SN
nodesDestroyNode((SNode*)pOper);
return TSDB_CODE_OUT_OF_MEMORY;
}
- strcpy(((SColumnNode*)pOper->pLeft)->colName, pColName);
+ snprintf(((SColumnNode*)pOper->pLeft)->colName, sizeof(((SColumnNode*)pOper->pLeft)->colName), "%s", pColName);
*pOp = (SNode*)pOper;
return TSDB_CODE_SUCCESS;
diff --git a/source/libs/parser/test/mockCatalogService.cpp b/source/libs/parser/test/mockCatalogService.cpp
index ac801149f5..0d46b63278 100644
--- a/source/libs/parser/test/mockCatalogService.cpp
+++ b/source/libs/parser/test/mockCatalogService.cpp
@@ -33,7 +33,6 @@ std::unique_ptr g_mockCatalogService;
class TableBuilder : public ITableBuilder {
public:
virtual TableBuilder& addColumn(const string& name, int8_t type, int32_t bytes) {
- assert(colId_ <= schema()->tableInfo.numOfTags + schema()->tableInfo.numOfColumns);
SSchema* col = schema()->schema + (colId_ - 1);
col->type = type;
col->colId = colId_++;
diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 559182bf7b..fef5bd654e 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -1359,6 +1359,7 @@ static int32_t createSetOpLogicNode(SLogicPlanContext* pCxt, SSetOperator* pSetO
}
if (TSDB_CODE_SUCCESS == code) {
+ pSetOp->precision = pSetOperator->precision;
*pLogicNode = (SLogicNode*)pSetOp;
} else {
nodesDestroyNode((SNode*)pSetOp);
diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c
index 952b87f9d7..2f4e8001df 100644
--- a/source/libs/qworker/src/qworker.c
+++ b/source/libs/qworker/src/qworker.c
@@ -201,6 +201,15 @@ _return:
QW_RET(code);
}
+bool qwTaskNotInExec(SQWTaskCtx *ctx) {
+ qTaskInfo_t taskHandle = ctx->taskHandle;
+ if (NULL == taskHandle || !qTaskIsExecuting(taskHandle)) {
+ return true;
+ }
+
+ return false;
+}
+
int32_t qwGenerateSchHbRsp(SQWorker *mgmt, SQWSchStatus *sch, SQWHbInfo *hbInfo) {
int32_t taskNum = 0;
@@ -507,8 +516,10 @@ int32_t qwHandlePostPhaseEvents(QW_FPARAMS_DEF, int8_t phase, SQWPhaseInput *inp
}
if (QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP)) {
- QW_ERR_JRET(qwDropTask(QW_FPARAMS()));
- QW_ERR_JRET(ctx->rspCode);
+ if (QW_PHASE_POST_FETCH != phase || qwTaskNotInExec(ctx)) {
+ QW_ERR_JRET(qwDropTask(QW_FPARAMS()));
+ QW_ERR_JRET(ctx->rspCode);
+ }
}
if (ctx->rspCode) {
diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index d0c27560ca..de660ae958 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -90,7 +90,7 @@ rangeCompFunc gRangeCompare[] = {filterRangeCompee, filterRangeCompei, filterRan
int8_t filterGetRangeCompFuncFromOptrs(uint8_t optr, uint8_t optr2) {
if (optr2) {
- assert(optr2 == OP_TYPE_LOWER_THAN || optr2 == OP_TYPE_LOWER_EQUAL);
+ ASSERT(optr2 == OP_TYPE_LOWER_THAN || optr2 == OP_TYPE_LOWER_EQUAL);
if (optr == OP_TYPE_GREATER_THAN) {
if (optr2 == OP_TYPE_LOWER_THAN) {
@@ -705,7 +705,7 @@ int32_t filterAddRangeImpl(void *h, SFilterRange *ra, int32_t optr) {
int32_t filterAddRange(void *h, SFilterRange *ra, int32_t optr) {
SFilterRangeCtx *ctx = (SFilterRangeCtx *)h;
int64_t tmp = 0;
-
+
if (FILTER_GET_FLAG(ra->sflag, RANGE_FLG_NULL)) {
SIMPLE_COPY_VALUES(&ra->s, getDataMin(ctx->type, &tmp));
// FILTER_CLR_FLAG(ra->sflag, RA_NULL);
@@ -723,7 +723,7 @@ int32_t filterAddRangeCtx(void *dst, void *src, int32_t optr) {
SFilterRangeCtx *dctx = (SFilterRangeCtx *)dst;
SFilterRangeCtx *sctx = (SFilterRangeCtx *)src;
- assert(optr == LOGIC_COND_TYPE_OR);
+ ASSERT(optr == LOGIC_COND_TYPE_OR);
if (sctx->rs == NULL) {
return TSDB_CODE_SUCCESS;
@@ -778,7 +778,10 @@ int32_t filterFinishRange(void *h) {
while (r && r->next) {
int64_t tmp = 1;
- operateVal(&tmp, &r->ra.e, &tmp, OP_TYPE_ADD, ctx->type);
+ int32_t code = operateVal(&tmp, &r->ra.e, &tmp, OP_TYPE_ADD, ctx->type);
+ if (code != 0) {
+ return TSDB_CODE_APP_ERROR;
+ }
if (ctx->pCompareFunc(&tmp, &r->next->ra.s) == 0) {
rn = r->next;
SIMPLE_COPY_VALUES((char *)&r->next->ra.s, (char *)&r->ra.s);
@@ -1122,7 +1125,7 @@ int32_t filterAddUnitImpl(SFilterInfo *info, uint8_t optr, SFilterFieldId *left,
if (u->right.type == FLD_TYPE_VALUE) {
SFilterField *val = FILTER_UNIT_RIGHT_FIELD(info, u);
- assert(FILTER_GET_FLAG(val->flag, FLD_TYPE_VALUE));
+ ASSERT(FILTER_GET_FLAG(val->flag, FLD_TYPE_VALUE));
} else {
int32_t paramNum = scalarGetOperatorParamNum(optr);
if (1 != paramNum) {
@@ -1132,7 +1135,7 @@ int32_t filterAddUnitImpl(SFilterInfo *info, uint8_t optr, SFilterFieldId *left,
}
SFilterField *col = FILTER_UNIT_LEFT_FIELD(info, u);
- assert(FILTER_GET_FLAG(col->flag, FLD_TYPE_COLUMN));
+ ASSERT(FILTER_GET_FLAG(col->flag, FLD_TYPE_COLUMN));
info->units[info->unitNum].compare.type = FILTER_GET_COL_FIELD_TYPE(col);
info->units[info->unitNum].compare.precision = FILTER_GET_COL_FIELD_PRECISION(col);
@@ -1292,29 +1295,29 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan
if (optr == LOGIC_COND_TYPE_AND) {
if (ctx->isnull) {
- assert(ctx->notnull == false && ctx->isrange == false);
+ ASSERT(ctx->notnull == false && ctx->isrange == false);
filterAddUnit(dst, OP_TYPE_IS_NULL, &left, NULL, &uidx);
filterAddUnitToGroup(g, uidx);
return TSDB_CODE_SUCCESS;
}
if (ctx->notnull) {
- assert(ctx->isnull == false && ctx->isrange == false);
+ ASSERT(ctx->isnull == false && ctx->isrange == false);
filterAddUnit(dst, OP_TYPE_IS_NOT_NULL, &left, NULL, &uidx);
filterAddUnitToGroup(g, uidx);
return TSDB_CODE_SUCCESS;
}
if (!ctx->isrange) {
- assert(ctx->isnull || ctx->notnull);
+ ASSERT(ctx->isnull || ctx->notnull);
return TSDB_CODE_SUCCESS;
}
- assert(ctx->rs && ctx->rs->next == NULL);
+ ASSERT(ctx->rs && ctx->rs->next == NULL);
SFilterRange *ra = &ctx->rs->ra;
- assert(!((FILTER_GET_FLAG(ra->sflag, RANGE_FLG_NULL)) && (FILTER_GET_FLAG(ra->eflag, RANGE_FLG_NULL))));
+ ASSERT(!((FILTER_GET_FLAG(ra->sflag, RANGE_FLG_NULL)) && (FILTER_GET_FLAG(ra->eflag, RANGE_FLG_NULL))));
if ((!FILTER_GET_FLAG(ra->sflag, RANGE_FLG_NULL)) && (!FILTER_GET_FLAG(ra->eflag, RANGE_FLG_NULL))) {
__compar_fn_t func = getComparFunc(type, 0);
@@ -1368,7 +1371,7 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan
SFilterGroup ng = {0};
g = &ng;
- assert(ctx->isnull || ctx->notnull || ctx->isrange);
+ ASSERT(ctx->isnull || ctx->notnull || ctx->isrange);
if (ctx->isnull) {
filterAddUnit(dst, OP_TYPE_IS_NULL, &left, NULL, &uidx);
@@ -1377,7 +1380,7 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan
}
if (ctx->notnull) {
- assert(!ctx->isrange);
+ ASSERT(!ctx->isrange);
memset(g, 0, sizeof(*g));
filterAddUnit(dst, OP_TYPE_IS_NOT_NULL, &left, NULL, &uidx);
@@ -1386,7 +1389,7 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan
}
if (!ctx->isrange) {
- assert(ctx->isnull || ctx->notnull);
+ ASSERT(ctx->isnull || ctx->notnull);
g->unitNum = 0;
return TSDB_CODE_SUCCESS;
}
@@ -1444,7 +1447,7 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan
filterAddUnitToGroup(g, uidx);
}
- assert(g->unitNum > 0);
+ ASSERT(g->unitNum > 0);
taosArrayPush(res, g);
@@ -1900,7 +1903,7 @@ void filterFreeInfo(SFilterInfo *info) {
}
int32_t filterHandleValueExtInfo(SFilterUnit *unit, char extInfo) {
- assert(extInfo > 0 || extInfo < 0);
+ ASSERT(extInfo > 0 || extInfo < 0);
uint8_t optr = FILTER_UNIT_OPTR(unit);
switch (optr) {
@@ -1916,7 +1919,8 @@ int32_t filterHandleValueExtInfo(SFilterUnit *unit, char extInfo) {
unit->compare.optr = FILTER_DUMMY_EMPTY_OPTR;
break;
default:
- assert(0);
+ fltError("unsupported operator type");
+ return TSDB_CODE_APP_ERROR;
}
return TSDB_CODE_SUCCESS;
@@ -1926,13 +1930,13 @@ int32_t fltInitValFieldData(SFilterInfo *info) {
for (uint32_t i = 0; i < info->unitNum; ++i) {
SFilterUnit *unit = &info->units[i];
if (unit->right.type != FLD_TYPE_VALUE) {
- assert(unit->compare.optr == FILTER_DUMMY_EMPTY_OPTR || scalarGetOperatorParamNum(unit->compare.optr) == 1);
+ ASSERT(unit->compare.optr == FILTER_DUMMY_EMPTY_OPTR || scalarGetOperatorParamNum(unit->compare.optr) == 1);
continue;
}
SFilterField *right = FILTER_UNIT_RIGHT_FIELD(info, unit);
- assert(FILTER_GET_FLAG(right->flag, FLD_TYPE_VALUE));
+ ASSERT(FILTER_GET_FLAG(right->flag, FLD_TYPE_VALUE));
uint32_t type = FILTER_UNIT_DATA_TYPE(unit);
int8_t precision = FILTER_UNIT_DATA_PRECISION(unit);
@@ -1940,7 +1944,7 @@ int32_t fltInitValFieldData(SFilterInfo *info) {
SValueNode *var = (SValueNode *)fi->desc;
if (var == NULL) {
- assert(fi->data != NULL);
+ ASSERT(fi->data != NULL);
continue;
}
@@ -2068,7 +2072,8 @@ bool filterDoCompare(__compar_fn_t func, uint8_t optr, void *left, void *right)
}
default:
- assert(false);
+ fltError("unsupported operator type");
+ return false;
}
return true;
@@ -2101,7 +2106,7 @@ int32_t filterAddUnitRange(SFilterInfo *info, SFilterUnit *u, SFilterRangeCtx *c
FILTER_SET_FLAG(ra.sflag, RANGE_FLG_NULL);
break;
case OP_TYPE_NOT_EQUAL:
- assert(type == TSDB_DATA_TYPE_BOOL);
+ ASSERT(type == TSDB_DATA_TYPE_BOOL);
if (GET_INT8_VAL(val)) {
SIMPLE_COPY_VALUES(&ra.s, &tmp);
SIMPLE_COPY_VALUES(&ra.e, &tmp);
@@ -2116,7 +2121,8 @@ int32_t filterAddUnitRange(SFilterInfo *info, SFilterUnit *u, SFilterRangeCtx *c
SIMPLE_COPY_VALUES(&ra.e, val);
break;
default:
- assert(0);
+ fltError("unsupported operator type");
+ return TSDB_CODE_APP_ERROR;
}
filterAddRange(ctx, &ra, optr);
@@ -2368,8 +2374,8 @@ int32_t filterMergeTwoGroupsImpl(SFilterInfo *info, SFilterRangeCtx **ctx, int32
filterReuseRangeCtx(*ctx, type, 0);
}
- assert(gRes2->colInfo[cidx].type == RANGE_TYPE_MR_CTX);
- assert(gRes1->colInfo[cidx].type == RANGE_TYPE_MR_CTX);
+ ASSERT(gRes2->colInfo[cidx].type == RANGE_TYPE_MR_CTX);
+ ASSERT(gRes1->colInfo[cidx].type == RANGE_TYPE_MR_CTX);
filterCopyRangeCtx(*ctx, gRes2->colInfo[cidx].info);
filterSourceRangeFromCtx(*ctx, gRes1->colInfo[cidx].info, optr, empty, all);
@@ -2405,7 +2411,7 @@ int32_t filterMergeTwoGroups(SFilterInfo *info, SFilterGroupCtx **gRes1, SFilter
continue;
}
- assert(idx1 == idx2);
+ ASSERT(idx1 == idx2);
++merNum;
@@ -2455,15 +2461,15 @@ int32_t filterMergeTwoGroups(SFilterInfo *info, SFilterGroupCtx **gRes1, SFilter
}
}
- assert(merNum > 0);
+ ASSERT(merNum > 0);
SFilterColInfo *colInfo = NULL;
- assert(merNum == equal1 || merNum == equal2);
+ ASSERT(merNum == equal1 || merNum == equal2);
filterFreeGroupCtx(*gRes2);
*gRes2 = NULL;
- assert(colCtxs && taosArrayGetSize(colCtxs) > 0);
+ ASSERT(colCtxs && taosArrayGetSize(colCtxs) > 0);
int32_t ctxSize = (int32_t)taosArrayGetSize(colCtxs);
SFilterColCtx *pctx = NULL;
@@ -2520,7 +2526,7 @@ int32_t filterMergeGroups(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gR
if (pColNum > 0) {
for (int32_t m = 0; m <= pEnd; ++m) {
for (int32_t n = cStart; n <= cEnd; ++n) {
- assert(m < n);
+ ASSERT(m < n);
filterMergeTwoGroups(info, &gRes[m], &gRes[n], &all);
FLT_CHK_JMP(all);
@@ -2541,7 +2547,7 @@ int32_t filterMergeGroups(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gR
for (int32_t m = cStart; m < cEnd; ++m) {
for (int32_t n = m + 1; n <= cEnd; ++n) {
- assert(m < n);
+ ASSERT(m < n);
filterMergeTwoGroups(info, &gRes[m], &gRes[n], &all);
FLT_CHK_JMP(all);
@@ -2636,7 +2642,7 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum
for (uint32_t m = 0; m < res->colNum; ++m) {
colInfo = &res->colInfo[res->colIdx[m]];
if (FILTER_NO_MERGE_DATA_TYPE(colInfo->dataType)) {
- assert(colInfo->type == RANGE_TYPE_UNIT);
+ ASSERT(colInfo->type == RANGE_TYPE_UNIT);
int32_t usize = (int32_t)taosArrayGetSize((SArray *)colInfo->info);
for (int32_t n = 0; n < usize; ++n) {
@@ -2649,7 +2655,7 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum
continue;
}
- assert(colInfo->type == RANGE_TYPE_MR_CTX);
+ ASSERT(colInfo->type == RANGE_TYPE_MR_CTX);
filterAddGroupUnitFromCtx(info, &oinfo, colInfo->info, res->colIdx[m], &ng, optr, group);
}
@@ -2690,7 +2696,7 @@ int32_t filterGenerateColRange(SFilterInfo *info, SFilterGroupCtx **gRes, int32_
continue;
}
- assert(idxNum[i] == gResNum);
+ ASSERT(idxNum[i] == gResNum);
if (idxs == NULL) {
idxs = taosMemoryCalloc(info->fields[FLD_TYPE_COLUMN].num, sizeof(*idxs));
@@ -2714,7 +2720,7 @@ int32_t filterGenerateColRange(SFilterInfo *info, SFilterGroupCtx **gRes, int32_
continue;
}
- assert(res->colIdx[n] == idxs[m]);
+ ASSERT(res->colIdx[n] == idxs[m]);
SFilterColInfo *colInfo = &res->colInfo[res->colIdx[n]];
if (info->colRange[m] == NULL) {
@@ -2723,7 +2729,7 @@ int32_t filterGenerateColRange(SFilterInfo *info, SFilterGroupCtx **gRes, int32_
info->colRange[m]->colId = FILTER_GET_COL_FIELD_ID(fi);
}
- assert(colInfo->type == RANGE_TYPE_MR_CTX);
+ ASSERT(colInfo->type == RANGE_TYPE_MR_CTX);
bool all = false;
filterSourceRangeFromCtx(info->colRange[m], colInfo->info, LOGIC_COND_TYPE_OR, NULL, &all);
@@ -2971,7 +2977,7 @@ int32_t filterRmUnitByRange(SFilterInfo *info, SColumnDataAgg *pDataStatis, int3
unitIdx = pGroupIdx;
--info->blkGroupNum;
- assert(empty || all);
+ ASSERT(empty || all);
if (empty) {
FILTER_SET_FLAG(info->blkFlag, FI_STATUS_BLK_EMPTY);
@@ -3077,7 +3083,7 @@ int32_t filterExecuteBasedOnStatis(SFilterInfo *info, int32_t numOfRows, SColumn
goto _return;
}
- assert(info->unitNum > 1);
+ ASSERT(info->unitNum > 1);
*all = filterExecuteBasedOnStatisImpl(info, numOfRows, p, statis, numOfCols);
goto _return;
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index debc210f0f..c1e958b055 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -327,7 +327,10 @@ int32_t sclInitParam(SNode *node, SScalarParam *param, SScalarCtx *ctx, int32_t
case QUERY_NODE_VALUE: {
SValueNode *valueNode = (SValueNode *)node;
- ASSERT(param->columnData == NULL);
+ if (param->columnData != NULL) {
+ sclError("columnData should be NULL");
+ SCL_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT);
+ }
param->numOfRows = 1;
int32_t code = sclCreateColumnInfoData(&valueNode->node.resType, 1, param);
if (code != TSDB_CODE_SUCCESS) {
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index 1de8a35308..411b9b7ab5 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -361,7 +361,6 @@ static int32_t doLengthFunction(SScalarParam *pInput, int32_t inputNum, SScalarP
SColumnInfoData *pInputData = pInput->columnData;
SColumnInfoData *pOutputData = pOutput->columnData;
- ASSERT(pOutputData->info.type == TSDB_DATA_TYPE_BIGINT);
int64_t *out = (int64_t *)pOutputData->pData;
for (int32_t i = 0; i < pInput->numOfRows; ++i) {
@@ -1729,37 +1728,31 @@ bool getTimePseudoFuncEnv(SFunctionNode *UNUSED_PARAM(pFunc), SFuncExecEnv *pEnv
}
int32_t qStartTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
- ASSERT(inputNum == 1);
colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 0));
return TSDB_CODE_SUCCESS;
}
int32_t qEndTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
- ASSERT(inputNum == 1);
colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 1));
return TSDB_CODE_SUCCESS;
}
int32_t winDurFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
- ASSERT(inputNum == 1);
colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 2));
return TSDB_CODE_SUCCESS;
}
int32_t winStartTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
- ASSERT(inputNum == 1);
colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 3));
return TSDB_CODE_SUCCESS;
}
int32_t winEndTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
- ASSERT(inputNum == 1);
colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 4));
return TSDB_CODE_SUCCESS;
}
int32_t qTbnameFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
- ASSERT(inputNum == 1);
char* p = colDataGetVarData(pInput->columnData, 0);
colDataAppendNItems(pOutput->columnData, pOutput->numOfRows, p, pInput->numOfRows);
@@ -2598,7 +2591,7 @@ static bool checkStateOp(int8_t op, SColumnInfoData *pCol, int32_t index, SScala
break;
}
default: {
- ASSERT(0);
+ return false;
}
}
return false;
@@ -2771,7 +2764,9 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin
intervals[0] = -INFINITY;
intervals[numOfBins - 1] = INFINITY;
// in case of desc bin orders, -inf/inf should be swapped
- ASSERT(numOfBins >= 4);
+ if (numOfBins < 4) {
+ return false;
+ }
if (intervals[1] > intervals[numOfBins - 2]) {
TSWAP(intervals[0], intervals[numOfBins - 1]);
}
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index 8f2fe87a53..e9f345215e 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -389,18 +389,18 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) {
func = varToUnsigned;
} else if (IS_FLOAT_TYPE(pCtx->outType)) {
func = varToFloat;
- } else if (pCtx->outType == TSDB_DATA_TYPE_BINARY) { // nchar -> binary
- ASSERT(pCtx->inType == TSDB_DATA_TYPE_NCHAR);
+ } else if (pCtx->outType == TSDB_DATA_TYPE_VARCHAR &&
+ pCtx->inType == TSDB_DATA_TYPE_NCHAR) { // nchar -> binary
func = ncharToVar;
vton = true;
- } else if (pCtx->outType == TSDB_DATA_TYPE_NCHAR) { // binary -> nchar
- ASSERT(pCtx->inType == TSDB_DATA_TYPE_VARCHAR);
+ } else if (pCtx->outType == TSDB_DATA_TYPE_NCHAR &&
+ pCtx->inType == TSDB_DATA_TYPE_VARCHAR) { // binary -> nchar
func = varToNchar;
vton = true;
} else if (TSDB_DATA_TYPE_TIMESTAMP == pCtx->outType) {
func = varToTimestamp;
} else {
- sclError("invalid convert outType:%d", pCtx->outType);
+ sclError("invalid convert outType:%d, inType:%d", pCtx->outType, pCtx->inType);
return TSDB_CODE_APP_ERROR;
}
@@ -416,12 +416,10 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) {
char *data = colDataGetVarData(pCtx->pIn->columnData, i);
int32_t convertType = pCtx->inType;
if (pCtx->inType == TSDB_DATA_TYPE_JSON) {
- if (*data == TSDB_DATA_TYPE_NULL) {
- ASSERT(0);
- } else if (*data == TSDB_DATA_TYPE_NCHAR) {
+ if (*data == TSDB_DATA_TYPE_NCHAR) {
data += CHAR_BYTES;
convertType = TSDB_DATA_TYPE_NCHAR;
- } else if (tTagIsJson(data)) {
+ } else if (tTagIsJson(data) || *data == TSDB_DATA_TYPE_NULL) {
terrno = TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR;
return terrno;
} else {
@@ -447,7 +445,11 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) {
tmp[varDataLen(data)] = 0;
} else if (TSDB_DATA_TYPE_NCHAR == convertType) {
// we need to convert it to native char string, and then perform the string to numeric data
- ASSERT(varDataLen(data) <= bufSize);
+ if (varDataLen(data) > bufSize) {
+ sclError("castConvert convert buffer size too small");
+ taosMemoryFreeClear(tmp);
+ return TSDB_CODE_APP_ERROR;
+ }
int len = taosUcs4ToMbs((TdUcs4 *)varDataVal(data), varDataLen(data), tmp);
if (len < 0) {
@@ -557,27 +559,17 @@ bool convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_t t
*fp = filterGetCompFunc(type, optr);
if (IS_NUMERIC_TYPE(type)) {
- if (typeLeft == TSDB_DATA_TYPE_NCHAR) {
- ASSERT(0);
- // convertNcharToDouble(*pLeftData, pLeftOut);
- // *pLeftData = pLeftOut;
- } else if (typeLeft == TSDB_DATA_TYPE_BINARY) {
- ASSERT(0);
- // convertBinaryToDouble(*pLeftData, pLeftOut);
- // *pLeftData = pLeftOut;
+ if (typeLeft == TSDB_DATA_TYPE_NCHAR ||
+ typeLeft == TSDB_DATA_TYPE_VARCHAR) {
+ return false;
} else if (typeLeft != type) {
convertNumberToNumber(*pLeftData, pLeftOut, typeLeft, type);
*pLeftData = pLeftOut;
}
- if (typeRight == TSDB_DATA_TYPE_NCHAR) {
- ASSERT(0);
- // convertNcharToDouble(*pRightData, pRightOut);
- // *pRightData = pRightOut;
- } else if (typeRight == TSDB_DATA_TYPE_BINARY) {
- ASSERT(0);
- // convertBinaryToDouble(*pRightData, pRightOut);
- // *pRightData = pRightOut;
+ if (typeRight == TSDB_DATA_TYPE_NCHAR ||
+ typeRight == TSDB_DATA_TYPE_VARCHAR) {
+ return false;
} else if (typeRight != type) {
convertNumberToNumber(*pRightData, pRightOut, typeRight, type);
*pRightData = pRightOut;
@@ -592,7 +584,7 @@ bool convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_t t
*freeRight = true;
}
} else {
- ASSERT(0);
+ return false;
}
return true;
@@ -683,7 +675,10 @@ int32_t vectorConvertSingleColImpl(const SScalarParam *pIn, SScalarParam *pOut,
}
if (overflow) {
- ASSERT(1 == pIn->numOfRows);
+ if (1 != pIn->numOfRows) {
+ sclError("invalid numOfRows %d", pIn->numOfRows);
+ return TSDB_CODE_APP_ERROR;
+ }
pOut->numOfRows = 0;
@@ -1938,7 +1933,6 @@ _bin_scalar_fn_t getBinScalarOperatorFn(int32_t binFunctionId) {
case OP_TYPE_JSON_CONTAINS:
return vectorJsonContains;
default:
- ASSERT(0);
return NULL;
}
}
diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c
index 2b22a4ed29..6f77769dec 100644
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@@ -69,8 +69,7 @@ _err:
}
void streamMetaClose(SStreamMeta* pMeta) {
- tdbCommit(pMeta->db, pMeta->txn);
- tdbPostCommit(pMeta->db, pMeta->txn);
+ tdbAbort(pMeta->db, pMeta->txn);
tdbTbClose(pMeta->pTaskDb);
tdbTbClose(pMeta->pCheckpointDb);
tdbClose(pMeta->db);
@@ -88,6 +87,7 @@ void streamMetaClose(SStreamMeta* pMeta) {
/*streamMetaReleaseTask(pMeta, pTask);*/
}
taosHashCleanup(pMeta->pTasks);
+ taosHashCleanup(pMeta->pRecoverStatus);
taosMemoryFree(pMeta->path);
taosMemoryFree(pMeta);
}
diff --git a/source/libs/stream/src/streamUpdate.c b/source/libs/stream/src/streamUpdate.c
index 1ce4a35dff..be12c72d00 100644
--- a/source/libs/stream/src/streamUpdate.c
+++ b/source/libs/stream/src/streamUpdate.c
@@ -85,9 +85,7 @@ static int64_t adjustWatermark(int64_t adjInterval, int64_t originInt, int64_t w
watermark = TMAX(originInt / adjInterval, 1) * adjInterval;
} else if (watermark > MAX_NUM_SCALABLE_BF * adjInterval) {
watermark = MAX_NUM_SCALABLE_BF * adjInterval;
- }/* else if (watermark < MIN_NUM_SCALABLE_BF * adjInterval) {
- watermark = MIN_NUM_SCALABLE_BF * adjInterval;
- }*/ // Todo(liuyao) save window info to tdb
+ }
return watermark;
}
diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index 3bf4a8d1cd..6793430923 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -228,6 +228,7 @@ int32_t syncNodeStart(SSyncNode* pSyncNode);
int32_t syncNodeStartStandBy(SSyncNode* pSyncNode);
void syncNodeClose(SSyncNode* pSyncNode);
void syncNodePreClose(SSyncNode* pSyncNode);
+void syncNodePostClose(SSyncNode* pSyncNode);
int32_t syncNodePropose(SSyncNode* pSyncNode, SRpcMsg* pMsg, bool isWeak, int64_t *seq);
int32_t syncNodeRestore(SSyncNode* pSyncNode);
void syncHbTimerDataFree(SSyncHbTimerData* pData);
diff --git a/source/libs/sync/inc/syncMessage.h b/source/libs/sync/inc/syncMessage.h
index 3bd94dbab5..49486bc12d 100644
--- a/source/libs/sync/inc/syncMessage.h
+++ b/source/libs/sync/inc/syncMessage.h
@@ -247,8 +247,8 @@ typedef struct SyncLocalCmd {
SRaftId destId;
int32_t cmd;
- SyncTerm sdNewTerm; // step down new term
- SyncIndex fcIndex; // follower commit index
+ SyncTerm currentTerm; // step down new term
+ SyncIndex commitIndex; // follower commit index
} SyncLocalCmd;
int32_t syncBuildTimeout(SRpcMsg* pMsg, ESyncTimeoutType ttype, uint64_t logicClock, int32_t ms, SSyncNode* pNode);
diff --git a/source/libs/sync/inc/syncPipeline.h b/source/libs/sync/inc/syncPipeline.h
index a0a0691694..55cb0d7db6 100644
--- a/source/libs/sync/inc/syncPipeline.h
+++ b/source/libs/sync/inc/syncPipeline.h
@@ -98,6 +98,7 @@ int32_t syncLogBufferReInit(SSyncLogBuffer* pBuf, SSyncNode* pNode);
// access
int64_t syncLogBufferGetEndIndex(SSyncLogBuffer* pBuf);
+SyncTerm syncLogBufferGetLastMatchTerm(SSyncLogBuffer* pBuf);
int32_t syncLogBufferAppend(SSyncLogBuffer* pBuf, SSyncNode* pNode, SSyncRaftEntry* pEntry);
int32_t syncLogBufferAccept(SSyncLogBuffer* pBuf, SSyncNode* pNode, SSyncRaftEntry* pEntry, SyncTerm prevTerm);
int64_t syncLogBufferProceed(SSyncLogBuffer* pBuf, SSyncNode* pNode, SyncTerm* pMatchTerm);
diff --git a/source/libs/sync/inc/syncSnapshot.h b/source/libs/sync/inc/syncSnapshot.h
index 974a8f968e..5277e7818f 100644
--- a/source/libs/sync/inc/syncSnapshot.h
+++ b/source/libs/sync/inc/syncSnapshot.h
@@ -57,7 +57,6 @@ void snapshotSenderDestroy(SSyncSnapshotSender *pSender);
bool snapshotSenderIsStart(SSyncSnapshotSender *pSender);
int32_t snapshotSenderStart(SSyncSnapshotSender *pSender);
void snapshotSenderStop(SSyncSnapshotSender *pSender, bool finish);
-int32_t snapshotSend(SSyncSnapshotSender *pSender);
int32_t snapshotReSend(SSyncSnapshotSender *pSender);
typedef struct SSyncSnapshotReceiver {
@@ -82,7 +81,6 @@ void snapshotReceiverDestroy(SSyncSnapshotReceiver *pReceiver)
void snapshotReceiverStart(SSyncSnapshotReceiver *pReceiver, SyncSnapshotSend *pBeginMsg);
void snapshotReceiverStop(SSyncSnapshotReceiver *pReceiver);
bool snapshotReceiverIsStart(SSyncSnapshotReceiver *pReceiver);
-void snapshotReceiverForceStop(SSyncSnapshotReceiver *pReceiver);
// on message
int32_t syncNodeOnSnapshot(SSyncNode *ths, const SRpcMsg *pMsg);
diff --git a/source/libs/sync/src/syncAppendEntries.c b/source/libs/sync/src/syncAppendEntries.c
index 1dc6905b88..026ebdb37c 100644
--- a/source/libs/sync/src/syncAppendEntries.c
+++ b/source/libs/sync/src/syncAppendEntries.c
@@ -90,6 +90,7 @@
//
int32_t syncNodeFollowerCommit(SSyncNode* ths, SyncIndex newCommitIndex) {
+ ASSERT(false && "deprecated");
if (ths->state != TAOS_SYNC_STATE_FOLLOWER) {
sNTrace(ths, "can not do follower commit");
return -1;
@@ -206,12 +207,13 @@ int32_t syncNodeOnAppendEntries(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
accepted = true;
_SEND_RESPONSE:
+ pEntry = NULL;
pReply->matchIndex = syncLogBufferProceed(ths->pLogBuf, ths, &pReply->lastMatchTerm);
bool matched = (pReply->matchIndex >= pReply->lastSendIndex);
if (accepted && matched) {
pReply->success = true;
// update commit index only after matching
- (void)syncNodeUpdateCommitIndex(ths, pMsg->commitIndex);
+ (void)syncNodeUpdateCommitIndex(ths, TMIN(pMsg->commitIndex, pReply->lastSendIndex));
}
// ack, i.e. send response
diff --git a/source/libs/sync/src/syncCommit.c b/source/libs/sync/src/syncCommit.c
index 5fdcbeb91c..152fddb7e6 100644
--- a/source/libs/sync/src/syncCommit.c
+++ b/source/libs/sync/src/syncCommit.c
@@ -44,6 +44,7 @@
// /\ UNCHANGED <>
//
void syncOneReplicaAdvance(SSyncNode* pSyncNode) {
+ ASSERT(false && "deprecated");
if (pSyncNode == NULL) {
sError("pSyncNode is NULL");
return;
diff --git a/source/libs/sync/src/syncEnv.c b/source/libs/sync/src/syncEnv.c
index 0d6d0f93f1..1fa67cfa4d 100644
--- a/source/libs/sync/src/syncEnv.c
+++ b/source/libs/sync/src/syncEnv.c
@@ -114,7 +114,7 @@ void syncHbTimerDataRemove(int64_t rid) { taosRemoveRef(gHbDataRefId, rid); }
SSyncHbTimerData *syncHbTimerDataAcquire(int64_t rid) {
SSyncHbTimerData *pData = taosAcquireRef(gHbDataRefId, rid);
- if (pData == NULL) {
+ if (pData == NULL && rid > 0) {
sInfo("failed to acquire hb-timer-data from refId:%" PRId64, rid);
terrno = TSDB_CODE_SYN_INTERNAL_ERROR;
}
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index bf220178a4..c2bf6dc837 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -124,6 +124,14 @@ void syncPreStop(int64_t rid) {
}
}
+void syncPostStop(int64_t rid) {
+ SSyncNode* pSyncNode = syncNodeAcquire(rid);
+ if (pSyncNode != NULL) {
+ syncNodePostClose(pSyncNode);
+ syncNodeRelease(pSyncNode);
+ }
+}
+
static bool syncNodeCheckNewConfig(SSyncNode* pSyncNode, const SSyncCfg* pCfg) {
if (!syncNodeInConfig(pSyncNode, pCfg)) return false;
return abs(pCfg->replicaNum - pSyncNode->replicaNum) <= 1;
@@ -1022,6 +1030,7 @@ SSyncNode* syncNodeOpen(SSyncInfo* pSyncInfo) {
}
}
pSyncNode->commitIndex = commitIndex;
+ sInfo("vgId:%d, sync node commitIndex initialized as %" PRId64, pSyncNode->vgId, pSyncNode->commitIndex);
if (syncNodeLogStoreRestoreOnNeed(pSyncNode) < 0) {
goto _error;
@@ -1162,9 +1171,10 @@ int32_t syncNodeRestore(SSyncNode* pSyncNode) {
}
ASSERT(endIndex == lastVer + 1);
- commitIndex = TMAX(pSyncNode->commitIndex, commitIndex);
+ pSyncNode->commitIndex = TMAX(pSyncNode->commitIndex, commitIndex);
+ sInfo("vgId:%d, restore sync until commitIndex:%" PRId64, pSyncNode->vgId, pSyncNode->commitIndex);
- if (syncLogBufferCommit(pSyncNode->pLogBuf, pSyncNode, commitIndex) < 0) {
+ if (syncLogBufferCommit(pSyncNode->pLogBuf, pSyncNode, pSyncNode->commitIndex) < 0) {
return -1;
}
@@ -1236,9 +1246,10 @@ void syncNodePreClose(SSyncNode* pSyncNode) {
}
}
+#if 0
if (pSyncNode->pNewNodeReceiver != NULL) {
if (snapshotReceiverIsStart(pSyncNode->pNewNodeReceiver)) {
- snapshotReceiverForceStop(pSyncNode->pNewNodeReceiver);
+ snapshotReceiverStop(pSyncNode->pNewNodeReceiver);
}
sDebug("vgId:%d, snapshot receiver destroy while preclose sync node, data:%p", pSyncNode->vgId,
@@ -1246,12 +1257,29 @@ void syncNodePreClose(SSyncNode* pSyncNode) {
snapshotReceiverDestroy(pSyncNode->pNewNodeReceiver);
pSyncNode->pNewNodeReceiver = NULL;
}
+#endif
// stop elect timer
syncNodeStopElectTimer(pSyncNode);
// stop heartbeat timer
syncNodeStopHeartbeatTimer(pSyncNode);
+
+ // clean rsp
+ syncRespCleanRsp(pSyncNode->pSyncRespMgr);
+}
+
+void syncNodePostClose(SSyncNode* pSyncNode) {
+ if (pSyncNode->pNewNodeReceiver != NULL) {
+ if (snapshotReceiverIsStart(pSyncNode->pNewNodeReceiver)) {
+ snapshotReceiverStop(pSyncNode->pNewNodeReceiver);
+ }
+
+ sDebug("vgId:%d, snapshot receiver destroy while preclose sync node, data:%p", pSyncNode->vgId,
+ pSyncNode->pNewNodeReceiver);
+ snapshotReceiverDestroy(pSyncNode->pNewNodeReceiver);
+ pSyncNode->pNewNodeReceiver = NULL;
+ }
}
void syncHbTimerDataFree(SSyncHbTimerData* pData) { taosMemoryFree(pData); }
@@ -1299,7 +1327,7 @@ void syncNodeClose(SSyncNode* pSyncNode) {
if (pSyncNode->pNewNodeReceiver != NULL) {
if (snapshotReceiverIsStart(pSyncNode->pNewNodeReceiver)) {
- snapshotReceiverForceStop(pSyncNode->pNewNodeReceiver);
+ snapshotReceiverStop(pSyncNode->pNewNodeReceiver);
}
sDebug("vgId:%d, snapshot receiver destroy while close, data:%p", pSyncNode->vgId, pSyncNode->pNewNodeReceiver);
@@ -1454,16 +1482,21 @@ int32_t syncNodeSendMsgById(const SRaftId* destRaftId, SSyncNode* pNode, SRpcMsg
}
}
+ int32_t code = -1;
if (pNode->syncSendMSg != NULL && epSet != NULL) {
syncUtilMsgHtoN(pMsg->pCont);
pMsg->info.noResp = 1;
- return pNode->syncSendMSg(epSet, pMsg);
- } else {
- sError("vgId:%d, sync send msg by id error, fp:%p epset:%p", pNode->vgId, pNode->syncSendMSg, epSet);
+ code = pNode->syncSendMSg(epSet, pMsg);
+ }
+
+ if (code < 0) {
+ sError("vgId:%d, sync send msg by id error, epset:%p dnode:%d addr:%" PRId64 " err:0x%x", pNode->vgId, epSet,
+ DID(destRaftId), destRaftId->addr, terrno);
rpcFreeCont(pMsg->pCont);
terrno = TSDB_CODE_SYN_INTERNAL_ERROR;
- return -1;
}
+
+ return code;
}
inline bool syncNodeInConfig(SSyncNode* pNode, const SSyncCfg* pCfg) {
@@ -1829,7 +1862,7 @@ void syncNodeBecomeLeader(SSyncNode* pSyncNode, const char* debugStr) {
// close receiver
if (pSyncNode != NULL && pSyncNode->pNewNodeReceiver != NULL &&
snapshotReceiverIsStart(pSyncNode->pNewNodeReceiver)) {
- snapshotReceiverForceStop(pSyncNode->pNewNodeReceiver);
+ snapshotReceiverStop(pSyncNode->pNewNodeReceiver);
}
// stop elect timer
@@ -2511,8 +2544,9 @@ int32_t syncNodeOnHeartbeat(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
SyncLocalCmd* pSyncMsg = rpcMsgLocalCmd.pCont;
pSyncMsg->cmd = SYNC_LOCAL_CMD_FOLLOWER_CMT;
- pSyncMsg->fcIndex = pMsg->commitIndex;
- SyncIndex fcIndex = pSyncMsg->fcIndex;
+ pSyncMsg->commitIndex = pMsg->commitIndex;
+ pSyncMsg->currentTerm = pMsg->term;
+ SyncIndex fcIndex = pSyncMsg->commitIndex;
if (ths->syncEqMsg != NULL && ths->msgcb != NULL) {
int32_t code = ths->syncEqMsg(ths->msgcb, &rpcMsgLocalCmd);
@@ -2533,7 +2567,8 @@ int32_t syncNodeOnHeartbeat(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
SyncLocalCmd* pSyncMsg = rpcMsgLocalCmd.pCont;
pSyncMsg->cmd = SYNC_LOCAL_CMD_STEP_DOWN;
- pSyncMsg->sdNewTerm = pMsg->term;
+ pSyncMsg->currentTerm = pMsg->term;
+ pSyncMsg->commitIndex = pMsg->commitIndex;
if (ths->syncEqMsg != NULL && ths->msgcb != NULL) {
int32_t code = ths->syncEqMsg(ths->msgcb, &rpcMsgLocalCmd);
@@ -2541,7 +2576,7 @@ int32_t syncNodeOnHeartbeat(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
sError("vgId:%d, sync enqueue step-down msg error, code:%d", ths->vgId, code);
rpcFreeCont(rpcMsgLocalCmd.pCont);
} else {
- sTrace("vgId:%d, sync enqueue step-down msg, new-term: %" PRId64, ths->vgId, pSyncMsg->sdNewTerm);
+ sTrace("vgId:%d, sync enqueue step-down msg, new-term: %" PRId64, ths->vgId, pSyncMsg->currentTerm);
}
}
}
@@ -2599,10 +2634,13 @@ int32_t syncNodeOnLocalCmd(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
syncLogRecvLocalCmd(ths, pMsg, "");
if (pMsg->cmd == SYNC_LOCAL_CMD_STEP_DOWN) {
- syncNodeStepDown(ths, pMsg->sdNewTerm);
+ syncNodeStepDown(ths, pMsg->currentTerm);
} else if (pMsg->cmd == SYNC_LOCAL_CMD_FOLLOWER_CMT) {
- (void)syncNodeUpdateCommitIndex(ths, pMsg->fcIndex);
+ SyncTerm matchTerm = syncLogBufferGetLastMatchTerm(ths->pLogBuf);
+ if (pMsg->currentTerm == matchTerm) {
+ (void)syncNodeUpdateCommitIndex(ths, pMsg->commitIndex);
+ }
if (syncLogBufferCommit(ths->pLogBuf, ths, ths->commitIndex) < 0) {
sError("vgId:%d, failed to commit raft log since %s. commit index: %" PRId64 "", ths->vgId, terrstr(),
ths->commitIndex);
@@ -2615,14 +2653,15 @@ int32_t syncNodeOnLocalCmd(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
}
int32_t syncNodeOnLocalCmdOld(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
+ ASSERT(false && "deprecated");
SyncLocalCmd* pMsg = pRpcMsg->pCont;
syncLogRecvLocalCmd(ths, pMsg, "");
if (pMsg->cmd == SYNC_LOCAL_CMD_STEP_DOWN) {
- syncNodeStepDown(ths, pMsg->sdNewTerm);
+ syncNodeStepDown(ths, pMsg->currentTerm);
} else if (pMsg->cmd == SYNC_LOCAL_CMD_FOLLOWER_CMT) {
- syncNodeFollowerCommit(ths, pMsg->fcIndex);
+ syncNodeFollowerCommit(ths, pMsg->commitIndex);
} else {
sError("error local cmd");
@@ -2667,16 +2706,12 @@ int32_t syncNodeOnClientRequest(SSyncNode* ths, SRpcMsg* pMsg, SyncIndex* pRetIn
}
int32_t code = syncNodeAppend(ths, pEntry);
- if (code < 0) {
- sNError(ths, "failed to append blocking msg");
- }
return code;
} else {
syncEntryDestroy(pEntry);
pEntry = NULL;
+ return -1;
}
-
- return -1;
}
int32_t syncNodeOnClientRequestOld(SSyncNode* ths, SRpcMsg* pMsg, SyncIndex* pRetIndex) {
diff --git a/source/libs/sync/src/syncPipeline.c b/source/libs/sync/src/syncPipeline.c
index 410986b87a..f878044bca 100644
--- a/source/libs/sync/src/syncPipeline.c
+++ b/source/libs/sync/src/syncPipeline.c
@@ -31,6 +31,10 @@ static bool syncIsMsgBlock(tmsg_t type) {
(type == TDMT_VND_UPDATE_TAG_VAL) || (type == TDMT_VND_ALTER_CONFIRM);
}
+FORCE_INLINE static int64_t syncGetRetryMaxWaitMs() {
+ return SYNC_LOG_REPL_RETRY_WAIT_MS * (1 << SYNC_MAX_RETRY_BACKOFF);
+}
+
int64_t syncLogBufferGetEndIndex(SSyncLogBuffer* pBuf) {
taosThreadMutexLock(&pBuf->mutex);
int64_t index = pBuf->endIndex;
@@ -264,20 +268,27 @@ int32_t syncLogBufferReInit(SSyncLogBuffer* pBuf, SSyncNode* pNode) {
return ret;
}
-FORCE_INLINE SyncTerm syncLogBufferGetLastMatchTerm(SSyncLogBuffer* pBuf) {
+FORCE_INLINE SyncTerm syncLogBufferGetLastMatchTermWithoutLock(SSyncLogBuffer* pBuf) {
SyncIndex index = pBuf->matchIndex;
SSyncRaftEntry* pEntry = pBuf->entries[(index + pBuf->size) % pBuf->size].pItem;
ASSERT(pEntry != NULL);
return pEntry->term;
}
+SyncTerm syncLogBufferGetLastMatchTerm(SSyncLogBuffer* pBuf) {
+ taosThreadMutexLock(&pBuf->mutex);
+ SyncTerm term = syncLogBufferGetLastMatchTermWithoutLock(pBuf);
+ taosThreadMutexUnlock(&pBuf->mutex);
+ return term;
+}
+
int32_t syncLogBufferAccept(SSyncLogBuffer* pBuf, SSyncNode* pNode, SSyncRaftEntry* pEntry, SyncTerm prevTerm) {
taosThreadMutexLock(&pBuf->mutex);
syncLogBufferValidate(pBuf);
int32_t ret = -1;
SyncIndex index = pEntry->index;
SyncIndex prevIndex = pEntry->index - 1;
- SyncTerm lastMatchTerm = syncLogBufferGetLastMatchTerm(pBuf);
+ SyncTerm lastMatchTerm = syncLogBufferGetLastMatchTermWithoutLock(pBuf);
SSyncRaftEntry* pExist = NULL;
bool inBuf = true;
@@ -329,6 +340,8 @@ int32_t syncLogBufferAccept(SSyncLogBuffer* pBuf, SSyncNode* pNode, SSyncRaftEnt
}
// update
+ ASSERT(pBuf->startIndex < index);
+ ASSERT(index - pBuf->startIndex < pBuf->size);
ASSERT(pBuf->entries[index % pBuf->size].pItem == NULL);
SSyncLogBufEntry tmp = {.pItem = pEntry, .prevLogIndex = prevIndex, .prevLogTerm = prevTerm};
pEntry = NULL;
@@ -456,6 +469,11 @@ int32_t syncLogFsmExecute(SSyncNode* pNode, SSyncFSM* pFsm, ESyncState role, Syn
pNode->vgId, pEntry->index, pEntry->term, TMSG_INFO(pEntry->originalRpcType), applyCode);
}
+ if (pEntry->originalRpcType == TDMT_VND_COMMIT) {
+ sInfo("vgId:%d, fsm execute vnode commit. index: %" PRId64 ", term: %" PRId64 "", pNode->vgId, pEntry->index,
+ pEntry->term);
+ }
+
SRpcMsg rpcMsg = {.code = applyCode};
syncEntry2OriginalRpc(pEntry, &rpcMsg);
@@ -552,7 +570,8 @@ int32_t syncLogBufferCommit(SSyncLogBuffer* pBuf, SSyncNode* pNode, int64_t comm
ret = 0;
_out:
// mark as restored if needed
- if (!pNode->restoreFinish && pBuf->commitIndex >= pNode->commitIndex) {
+ if (!pNode->restoreFinish && pBuf->commitIndex >= pNode->commitIndex && pEntry != NULL &&
+ pNode->pRaftStore->currentTerm <= pEntry->term) {
pNode->pFsm->FpRestoreFinishCb(pNode->pFsm);
pNode->restoreFinish = true;
sInfo("vgId:%d, restore finished. log buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64 ")", pNode->vgId,
@@ -613,6 +632,12 @@ int32_t syncLogReplMgrRetryOnNeed(SSyncLogReplMgr* pMgr, SSyncNode* pNode) {
}
if (pMgr->states[pos].acked) {
+ if (pMgr->matchIndex < index && pMgr->states[pos].timeMs + (syncGetRetryMaxWaitMs() << 3) < nowMs) {
+ syncLogReplMgrReset(pMgr);
+ sWarn("vgId:%d, reset sync log repl mgr since stagnation. index: %" PRId64 ", peer: %" PRIx64, pNode->vgId,
+ index, pDestId->addr);
+ goto _out;
+ }
continue;
}
@@ -639,10 +664,12 @@ int32_t syncLogReplMgrRetryOnNeed(SSyncLogReplMgr* pMgr, SSyncNode* pNode) {
_out:
if (retried) {
pMgr->retryBackoff = syncLogGetNextRetryBackoff(pMgr);
- sInfo("vgId:%d, resent %d sync log entries. dest: %" PRIx64 ", indexes: %" PRId64 " ..., terms: ... %" PRId64
- ", retryWaitMs: %" PRId64 ", repl mgr: [%" PRId64 " %" PRId64 ", %" PRId64 ")",
+ SSyncLogBuffer* pBuf = pNode->pLogBuf;
+ sInfo("vgId:%d, resend %d sync log entries. dest: %" PRIx64 ", indexes: %" PRId64 " ..., terms: ... %" PRId64
+ ", retryWaitMs: %" PRId64 ", mgr: [%" PRId64 " %" PRId64 ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64
+ " %" PRId64 ", %" PRId64 ")",
pNode->vgId, count, pDestId->addr, firstIndex, term, retryWaitMs, pMgr->startIndex, pMgr->matchIndex,
- pMgr->endIndex);
+ pMgr->endIndex, pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
}
return ret;
}
@@ -771,7 +798,7 @@ int32_t syncLogReplMgrReplicateOnce(SSyncLogReplMgr* pMgr, SSyncNode* pNode) {
int32_t syncLogReplMgrReplicateProbeOnce(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncIndex index) {
ASSERT(!pMgr->restored);
ASSERT(pMgr->startIndex >= 0);
- int64_t retryMaxWaitMs = SYNC_LOG_REPL_RETRY_WAIT_MS * (1 << SYNC_MAX_RETRY_BACKOFF);
+ int64_t retryMaxWaitMs = syncGetRetryMaxWaitMs();
int64_t nowMs = taosGetMonoTimestampMs();
if (pMgr->endIndex > pMgr->startIndex &&
@@ -799,11 +826,10 @@ int32_t syncLogReplMgrReplicateProbeOnce(SSyncLogReplMgr* pMgr, SSyncNode* pNode
pMgr->endIndex = index + 1;
SSyncLogBuffer* pBuf = pNode->pLogBuf;
- sTrace("vgId:%d, attempted to probe the %d'th peer with msg of index:%" PRId64 " term: %" PRId64
- ". pMgr(rs:%d): [%" PRId64 " %" PRId64 ", %" PRId64 "), pBuf: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64
- ")",
- pNode->vgId, pMgr->peerId, index, term, pMgr->restored, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex,
- pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
+ sInfo("vgId:%d, probe peer:%" PRIx64 " with msg of index:%" PRId64 " term: %" PRId64 ". mgr (rs:%d): [%" PRId64
+ " %" PRId64 ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64 ")",
+ pNode->vgId, pDestId->addr, index, term, pMgr->restored, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex,
+ pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
return 0;
}
@@ -815,9 +841,11 @@ int32_t syncLogReplMgrReplicateAttemptedOnce(SSyncLogReplMgr* pMgr, SSyncNode* p
int32_t count = 0;
int64_t nowMs = taosGetMonoTimestampMs();
int64_t limit = pMgr->size >> 1;
+ SyncTerm term = -1;
+ SyncIndex firstIndex = -1;
for (SyncIndex index = pMgr->endIndex; index <= pNode->pLogBuf->matchIndex; index++) {
- if (batchSize < count++ || limit <= index - pMgr->startIndex) {
+ if (batchSize < count || limit <= index - pMgr->startIndex) {
break;
}
if (pMgr->startIndex + 1 < index && pMgr->states[(index - 1) % pMgr->size].barrier) {
@@ -826,7 +854,6 @@ int32_t syncLogReplMgrReplicateAttemptedOnce(SSyncLogReplMgr* pMgr, SSyncNode* p
int64_t pos = index % pMgr->size;
SRaftId* pDestId = &pNode->replicasId[pMgr->peerId];
bool barrier = false;
- SyncTerm term = -1;
if (syncLogBufferReplicateOneTo(pMgr, pNode, index, &term, pDestId, &barrier) < 0) {
sError("vgId:%d, failed to replicate log entry since %s. index: %" PRId64 ", dest: 0x%016" PRIx64 "", pNode->vgId,
terrstr(), index, pDestId->addr);
@@ -837,6 +864,9 @@ int32_t syncLogReplMgrReplicateAttemptedOnce(SSyncLogReplMgr* pMgr, SSyncNode* p
pMgr->states[pos].term = term;
pMgr->states[pos].acked = false;
+ if (firstIndex == -1) firstIndex = index;
+ count++;
+
pMgr->endIndex = index + 1;
if (barrier) {
sInfo("vgId:%d, replicated sync barrier to dest: %" PRIx64 ". index: %" PRId64 ", term: %" PRId64
@@ -850,10 +880,11 @@ int32_t syncLogReplMgrReplicateAttemptedOnce(SSyncLogReplMgr* pMgr, SSyncNode* p
syncLogReplMgrRetryOnNeed(pMgr, pNode);
SSyncLogBuffer* pBuf = pNode->pLogBuf;
- sTrace("vgId:%d, attempted to replicate %d msgs to the %d'th peer. pMgr(rs:%d): [%" PRId64 " %" PRId64 ", %" PRId64
- "), pBuf: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64 ")",
- pNode->vgId, count, pMgr->peerId, pMgr->restored, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex,
- pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
+ sTrace("vgId:%d, replicated %d msgs to peer: %" PRIx64 ". indexes: %" PRId64 "..., terms: ...%" PRId64
+ ", mgr: (rs:%d) [%" PRId64 " %" PRId64 ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64
+ ")",
+ pNode->vgId, count, pDestId->addr, firstIndex, term, pMgr->restored, pMgr->startIndex, pMgr->matchIndex,
+ pMgr->endIndex, pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
return 0;
}
@@ -985,6 +1016,10 @@ void syncLogBufferDestroy(SSyncLogBuffer* pBuf) {
int32_t syncLogBufferRollback(SSyncLogBuffer* pBuf, SSyncNode* pNode, SyncIndex toIndex) {
ASSERT(pBuf->commitIndex < toIndex && toIndex <= pBuf->endIndex);
+ if (toIndex == pBuf->endIndex) {
+ return 0;
+ }
+
sInfo("vgId:%d, rollback sync log buffer. toindex: %" PRId64 ", buffer: [%" PRId64 " %" PRId64 " %" PRId64
", %" PRId64 ")",
pNode->vgId, toIndex, pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
diff --git a/source/libs/sync/src/syncRaftCfg.c b/source/libs/sync/src/syncRaftCfg.c
index 86ea1f48cc..806949c81e 100644
--- a/source/libs/sync/src/syncRaftCfg.c
+++ b/source/libs/sync/src/syncRaftCfg.c
@@ -71,31 +71,23 @@ int32_t syncWriteCfgFile(SSyncNode *pNode) {
char file[PATH_MAX] = {0};
snprintf(file, sizeof(file), "%s.bak", realfile);
- pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
- if (pFile == NULL) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- sError("vgId:%d, failed to open sync cfg file:%s since %s", pNode->vgId, realfile, terrstr());
- goto _OVER;
- }
-
terrno = TSDB_CODE_OUT_OF_MEMORY;
pJson = tjsonCreateObject();
if (pJson == NULL) goto _OVER;
if (tjsonAddObject(pJson, "RaftCfg", syncEncodeRaftCfg, pCfg) < 0) goto _OVER;
-
buffer = tjsonToString(pJson);
if (buffer == NULL) goto _OVER;
+ terrno = 0;
+
+ pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
+ if (pFile == NULL) goto _OVER;
int32_t len = strlen(buffer);
if (taosWriteFile(pFile, buffer, len) <= 0) goto _OVER;
if (taosFsyncFile(pFile) < 0) goto _OVER;
- taosCloseFile(&pFile);
- if (taosRenameFile(file, realfile) != 0) {
- terrno = TAOS_SYSTEM_ERROR(errno);
- sError("vgId:%d, failed to rename sync cfg file:%s to %s since %s", pNode->vgId, file, realfile, terrstr());
- goto _OVER;
- }
+ taosCloseFile(&pFile);
+ if (taosRenameFile(file, realfile) != 0) goto _OVER;
code = 0;
sInfo("vgId:%d, succeed to write sync cfg file:%s, len:%d", pNode->vgId, realfile, len);
@@ -106,6 +98,7 @@ _OVER:
if (pFile != NULL) taosCloseFile(&pFile);
if (code != 0) {
+ if (terrno == 0) terrno = TAOS_SYSTEM_ERROR(errno);
sError("vgId:%d, failed to write sync cfg file:%s since %s", pNode->vgId, realfile, terrstr());
}
return code;
diff --git a/source/libs/sync/src/syncRaftLog.c b/source/libs/sync/src/syncRaftLog.c
index 3f9f397ef5..03c3fe154d 100644
--- a/source/libs/sync/src/syncRaftLog.c
+++ b/source/libs/sync/src/syncRaftLog.c
@@ -219,6 +219,10 @@ static int32_t raftLogAppendEntry(struct SSyncLogStore* pLogStore, SSyncRaftEntr
ASSERT(pEntry->index == index);
+ if (pEntry->originalRpcType == TDMT_VND_COMMIT) {
+ walFsync(pWal, true);
+ }
+
sNTrace(pData->pSyncNode, "write index:%" PRId64 ", type:%s, origin type:%s, elapsed:%" PRId64, pEntry->index,
TMSG_INFO(pEntry->msgType), TMSG_INFO(pEntry->originalRpcType), tsElapsed);
return 0;
@@ -312,29 +316,6 @@ static int32_t raftLogTruncate(struct SSyncLogStore* pLogStore, SyncIndex fromIn
SSyncLogStoreData* pData = pLogStore->data;
SWal* pWal = pData->pWal;
- // need not truncate
- SyncIndex wallastVer = walGetLastVer(pWal);
- if (fromIndex > wallastVer) {
- return 0;
- }
-
- // need not truncate
- SyncIndex walCommitVer = walGetCommittedVer(pWal);
- if (fromIndex <= walCommitVer) {
- return 0;
- }
-
- // delete from cache
- for (SyncIndex index = fromIndex; index <= wallastVer; ++index) {
- SLRUCache* pCache = pData->pSyncNode->pLogStore->pCache;
- LRUHandle* h = taosLRUCacheLookup(pCache, &index, sizeof(index));
- if (h) {
- sNTrace(pData->pSyncNode, "cache delete index:%" PRId64, index);
-
- taosLRUCacheRelease(pData->pSyncNode->pLogStore->pCache, h, true);
- }
- }
-
int32_t code = walRollback(pWal, fromIndex);
if (code != 0) {
int32_t err = terrno;
diff --git a/source/libs/sync/src/syncSnapshot.c b/source/libs/sync/src/syncSnapshot.c
index b68b735f46..defb7402f4 100644
--- a/source/libs/sync/src/syncSnapshot.c
+++ b/source/libs/sync/src/syncSnapshot.c
@@ -150,7 +150,7 @@ void snapshotSenderStop(SSyncSnapshotSender *pSender, bool finish) {
// when sender receive ack, call this function to send msg from seq
// seq = ack + 1, already updated
-int32_t snapshotSend(SSyncSnapshotSender *pSender) {
+static int32_t snapshotSend(SSyncSnapshotSender *pSender) {
// free memory last time (current seq - 1)
if (pSender->pCurrentBlock != NULL) {
taosMemoryFree(pSender->pCurrentBlock);
@@ -342,23 +342,6 @@ void snapshotReceiverDestroy(SSyncSnapshotReceiver *pReceiver) {
bool snapshotReceiverIsStart(SSyncSnapshotReceiver *pReceiver) { return pReceiver->start; }
-// force stop
-void snapshotReceiverForceStop(SSyncSnapshotReceiver *pReceiver) {
- sRInfo(pReceiver, "snapshot receiver force stop, writer:%p");
-
- // force close, abandon incomplete data
- if (pReceiver->pWriter != NULL) {
- int32_t ret = pReceiver->pSyncNode->pFsm->FpSnapshotStopWrite(pReceiver->pSyncNode->pFsm, pReceiver->pWriter, false,
- &pReceiver->snapshot);
- if (ret != 0) {
- sRInfo(pReceiver, "snapshot receiver force stop failed since %s", terrstr());
- }
- pReceiver->pWriter = NULL;
- }
-
- pReceiver->start = false;
-}
-
static int32_t snapshotReceiverStartWriter(SSyncSnapshotReceiver *pReceiver, SyncSnapshotSend *pBeginMsg) {
if (pReceiver->pWriter != NULL) {
sRError(pReceiver, "vgId:%d, snapshot receiver writer is not null");
@@ -590,7 +573,7 @@ _START_RECEIVER:
if (snapshotReceiverIsStart(pReceiver)) {
sRInfo(pReceiver, "snapshot receiver already start and force stop pre one");
- snapshotReceiverForceStop(pReceiver);
+ snapshotReceiverStop(pReceiver);
}
snapshotReceiverStart(pReceiver, pMsg); // set start-time same with sender
@@ -842,7 +825,7 @@ int32_t syncNodeOnSnapshot(SSyncNode *pSyncNode, const SRpcMsg *pRpcMsg) {
} else if (pMsg->seq == SYNC_SNAPSHOT_SEQ_FORCE_CLOSE) {
// force close, no response
syncLogRecvSyncSnapshotSend(pSyncNode, pMsg, "process force stop");
- snapshotReceiverForceStop(pReceiver);
+ snapshotReceiverStop(pReceiver);
} else if (pMsg->seq > SYNC_SNAPSHOT_SEQ_BEGIN && pMsg->seq < SYNC_SNAPSHOT_SEQ_END) {
syncLogRecvSyncSnapshotSend(pSyncNode, pMsg, "process seq data");
code = syncNodeOnSnapshotReceive(pSyncNode, pMsg);
@@ -989,6 +972,13 @@ int32_t syncNodeOnSnapshotRsp(SSyncNode *pSyncNode, const SRpcMsg *pRpcMsg) {
return syncNodeOnSnapshotPreRsp(pSyncNode, pSender, pMsg);
}
+ if (pSender->pReader == NULL || pSender->finish) {
+ syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "snapshot sender invalid");
+ sSError(pSender, "snapshot sender invalid, pReader:%p finish:%d", pMsg->code, pSender->pReader, pSender->finish);
+ terrno = pMsg->code;
+ goto _ERROR;
+ }
+
if (pMsg->ack == SYNC_SNAPSHOT_SEQ_BEGIN) {
syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "process seq begin");
if (snapshotSenderUpdateProgress(pSender, pMsg) != 0) {
diff --git a/source/libs/sync/src/syncUtil.c b/source/libs/sync/src/syncUtil.c
index 0ec24d5326..e4a65837f7 100644
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
@@ -17,20 +17,20 @@
#include "syncUtil.h"
#include "syncIndexMgr.h"
#include "syncMessage.h"
+#include "syncPipeline.h"
#include "syncRaftCfg.h"
#include "syncRaftStore.h"
#include "syncSnapshot.h"
void syncCfg2SimpleStr(const SSyncCfg* pCfg, char* buf, int32_t bufLen) {
- int32_t len = snprintf(buf, bufLen, "{r-num:%d, my:%d, ", pCfg->replicaNum, pCfg->myIndex);
-
+ int32_t len = snprintf(buf, bufLen, "{num:%d, as:%d, [", pCfg->replicaNum, pCfg->myIndex);
for (int32_t i = 0; i < pCfg->replicaNum; ++i) {
+ len += snprintf(buf + len, bufLen - len, "%s:%d", pCfg->nodeInfo[i].nodeFqdn, pCfg->nodeInfo[i].nodePort);
if (i < pCfg->replicaNum - 1) {
- len += snprintf(buf + len, bufLen - len, "%s:%d, ", pCfg->nodeInfo[i].nodeFqdn, pCfg->nodeInfo[i].nodePort);
- } else {
- len += snprintf(buf + len, bufLen - len, "%s:%d}", pCfg->nodeInfo[i].nodeFqdn, pCfg->nodeInfo[i].nodePort);
+ len += snprintf(buf + len, bufLen - len, "%s", ", ");
}
}
+ len += snprintf(buf + len, bufLen - len, "%s", "]}");
}
void syncUtilNodeInfo2EpSet(const SNodeInfo* pInfo, SEpSet* pEpSet) {
@@ -89,32 +89,55 @@ bool syncUtilUserRollback(tmsg_t msgType) { return msgType != TDMT_SYNC_NOOP &&
// for leader
static void syncHearbeatReplyTime2Str(SSyncNode* pSyncNode, char* buf, int32_t bufLen) {
- int32_t len = 5;
-
+ int32_t len = 0;
+ len += snprintf(buf + len, bufLen - len, "%s", "{");
for (int32_t i = 0; i < pSyncNode->replicaNum; ++i) {
int64_t tsMs = syncIndexMgrGetRecvTime(pSyncNode->pMatchIndex, &(pSyncNode->replicasId[i]));
-
+ len += snprintf(buf + len, bufLen - len, "%d:%" PRId64, i, tsMs);
if (i < pSyncNode->replicaNum - 1) {
- len += snprintf(buf + len, bufLen - len, "%d:%" PRId64 ",", i, tsMs);
- } else {
- len += snprintf(buf + len, bufLen - len, "%d:%" PRId64 "}", i, tsMs);
+ len += snprintf(buf + len, bufLen - len, "%s", ",");
}
}
+ len += snprintf(buf + len, bufLen - len, "%s", "}");
}
// for follower
static void syncHearbeatTime2Str(SSyncNode* pSyncNode, char* buf, int32_t bufLen) {
- int32_t len = 4;
-
+ int32_t len = 0;
+ len += snprintf(buf + len, bufLen - len, "%s", "{");
for (int32_t i = 0; i < pSyncNode->replicaNum; ++i) {
int64_t tsMs = syncIndexMgrGetRecvTime(pSyncNode->pNextIndex, &(pSyncNode->replicasId[i]));
-
+ len += snprintf(buf + len, bufLen - len, "%d:%" PRId64, i, tsMs);
if (i < pSyncNode->replicaNum - 1) {
- len += snprintf(buf + len, bufLen - len, "%d:%" PRId64 ",", i, tsMs);
- } else {
- len += snprintf(buf + len, bufLen - len, "%d:%" PRId64 "}", i, tsMs);
+ len += snprintf(buf + len, bufLen - len, "%s", ",");
}
}
+ len += snprintf(buf + len, bufLen - len, "%s", "}");
+}
+
+static void syncLogBufferStates2Str(SSyncNode* pSyncNode, char* buf, int32_t bufLen) {
+ SSyncLogBuffer* pBuf = pSyncNode->pLogBuf;
+ if (pBuf == NULL) {
+ return;
+ }
+ int len = 0;
+ len += snprintf(buf + len, bufLen - len, "[%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64 ")", pBuf->startIndex,
+ pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
+}
+
+static void syncLogReplMgrStates2Str(SSyncNode* pSyncNode, char* buf, int32_t bufLen) {
+ int len = 0;
+ len += snprintf(buf + len, bufLen - len, "%s", "{");
+ for (int32_t i = 0; i < pSyncNode->replicaNum; i++) {
+ SSyncLogReplMgr* pMgr = pSyncNode->logReplMgrs[i];
+ if (pMgr == NULL) break;
+ len += snprintf(buf + len, bufLen - len, "%d:%d [%" PRId64 " %" PRId64 ", %" PRId64 ")", i, pMgr->restored,
+ pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex);
+ if (i + 1 < pSyncNode->replicaNum) {
+ len += snprintf(buf + len, bufLen - len, "%s", ", ");
+ }
+ }
+ len += snprintf(buf + len, bufLen - len, "%s", "}");
}
static void syncPeerState2Str(SSyncNode* pSyncNode, char* buf, int32_t bufLen) {
@@ -156,16 +179,19 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, SSyncNo
int32_t cacheHit = pNode->pLogStore->cacheHit;
int32_t cacheMiss = pNode->pLogStore->cacheMiss;
- char cfgStr[1024];
+ char cfgStr[1024] = "";
syncCfg2SimpleStr(&pNode->raftCfg.cfg, cfgStr, sizeof(cfgStr));
- char peerStr[1024] = "{";
- syncPeerState2Str(pNode, peerStr, sizeof(peerStr));
+ char replMgrStatesStr[1024] = "";
+ syncLogReplMgrStates2Str(pNode, replMgrStatesStr, sizeof(replMgrStatesStr));
- char hbrTimeStr[256] = "hbr:{";
+ char bufferStatesStr[256] = "";
+ syncLogBufferStates2Str(pNode, bufferStatesStr, sizeof(bufferStatesStr));
+
+ char hbrTimeStr[256] = "";
syncHearbeatReplyTime2Str(pNode, hbrTimeStr, sizeof(hbrTimeStr));
- char hbTimeStr[256] = "hb:{";
+ char hbTimeStr[256] = "";
syncHearbeatTime2Str(pNode, hbTimeStr, sizeof(hbTimeStr));
char eventLog[512]; // {0};
@@ -181,21 +207,21 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, SSyncNo
// restore error code
terrno = errCode;
-
+
if (pNode != NULL) {
taosPrintLog(flags, level, dflag,
"vgId:%d, %s, sync:%s, term:%" PRIu64 ", commit-index:%" PRId64 ", first-ver:%" PRId64
", last-ver:%" PRId64 ", min:%" PRId64 ", snap:%" PRId64 ", snap-term:%" PRIu64
- ", elect-times:%d, as-leader-times:%d, cfg-ch-times:%d, hit:%d, mis:%d, hb-slow:%d, hbr-slow:%d, "
+ ", elect-times:%d, as-leader-times:%d, cfg-ch-times:%d, hb-slow:%d, hbr-slow:%d, "
"aq-items:%d, snaping:%" PRId64 ", replicas:%d, last-cfg:%" PRId64
- ", chging:%d, restore:%d, quorum:%d, elect-lc-timer:%" PRId64 ", hb:%" PRId64 ", %s, %s, %s, %s",
+ ", chging:%d, restore:%d, quorum:%d, elect-lc-timer:%" PRId64 ", hb:%" PRId64
+ ", buffer:%s, repl-mgrs:%s, members:%s, hb:%s, hb-reply:%s",
pNode->vgId, eventLog, syncStr(pNode->state), currentTerm, pNode->commitIndex, logBeginIndex,
logLastIndex, pNode->minMatchIndex, snapshot.lastApplyIndex, snapshot.lastApplyTerm, pNode->electNum,
- pNode->becomeLeaderNum, pNode->configChangeNum, cacheHit, cacheMiss, pNode->hbSlowNum,
- pNode->hbrSlowNum, aqItems, pNode->snapshottingIndex, pNode->replicaNum,
- pNode->raftCfg.lastConfigIndex, pNode->changing, pNode->restoreFinish, syncNodeDynamicQuorum(pNode),
- pNode->electTimerLogicClock, pNode->heartbeatTimerLogicClockUser, peerStr, cfgStr, hbTimeStr,
- hbrTimeStr);
+ pNode->becomeLeaderNum, pNode->configChangeNum, pNode->hbSlowNum, pNode->hbrSlowNum, aqItems,
+ pNode->snapshottingIndex, pNode->replicaNum, pNode->raftCfg.lastConfigIndex, pNode->changing,
+ pNode->restoreFinish, syncNodeDynamicQuorum(pNode), pNode->electTimerLogicClock, pNode->heartbeatTimerLogicClockUser,
+ bufferStatesStr, replMgrStatesStr, cfgStr, hbTimeStr, hbrTimeStr);
}
}
@@ -216,7 +242,7 @@ void syncPrintSnapshotSenderLog(const char* flags, ELogLevel level, int32_t dfla
logBeginIndex = pNode->pLogStore->syncLogBeginIndex(pNode->pLogStore);
}
- char cfgStr[1024];
+ char cfgStr[1024] = "";
syncCfg2SimpleStr(&pNode->raftCfg.cfg, cfgStr, sizeof(cfgStr));
char peerStr[1024] = "{";
@@ -262,7 +288,7 @@ void syncPrintSnapshotReceiverLog(const char* flags, ELogLevel level, int32_t df
logBeginIndex = pNode->pLogStore->syncLogBeginIndex(pNode->pLogStore);
}
- char cfgStr[1024];
+ char cfgStr[1024] = "";
syncCfg2SimpleStr(&pNode->raftCfg.cfg, cfgStr, sizeof(cfgStr));
char peerStr[1024] = "{";
@@ -304,7 +330,7 @@ void syncLogRecvTimer(SSyncNode* pSyncNode, const SyncTimeout* pMsg, const char*
void syncLogRecvLocalCmd(SSyncNode* pSyncNode, const SyncLocalCmd* pMsg, const char* s) {
sNTrace(pSyncNode, "recv sync-local-cmd {cmd:%d-%s, sd-new-term:%" PRId64 ", fc-index:%" PRId64 "}, %s", pMsg->cmd,
- syncLocalCmdGetStr(pMsg->cmd), pMsg->sdNewTerm, pMsg->fcIndex, s);
+ syncLocalCmdGetStr(pMsg->cmd), pMsg->currentTerm, pMsg->commitIndex, s);
}
void syncLogSendAppendEntriesReply(SSyncNode* pSyncNode, const SyncAppendEntriesReply* pMsg, const char* s) {
diff --git a/source/libs/tdb/inc/tdb.h b/source/libs/tdb/inc/tdb.h
index 10a99bb1fa..0e20941b3a 100644
--- a/source/libs/tdb/inc/tdb.h
+++ b/source/libs/tdb/inc/tdb.h
@@ -74,7 +74,12 @@ int32_t tdbTbcUpsert(TBC *pTbc, const void *pKey, int nKey, const void *pData, i
int32_t tdbTxnOpen(TXN *pTxn, int64_t txnid, void *(*xMalloc)(void *, size_t), void (*xFree)(void *, void *),
void *xArg, int flags);
-int32_t tdbTxnClose(TXN *pTxn);
+int32_t tdbTxnCloseImpl(TXN *pTxn);
+#define tdbTxnClose(pTxn) \
+ do { \
+ tdbTxnCloseImpl(pTxn); \
+ (pTxn) = NULL; \
+ } while (0)
// other
void tdbFree(void *);
diff --git a/source/libs/tdb/src/db/tdbPager.c b/source/libs/tdb/src/db/tdbPager.c
index 9131eb0909..ced867e938 100644
--- a/source/libs/tdb/src/db/tdbPager.c
+++ b/source/libs/tdb/src/db/tdbPager.c
@@ -731,8 +731,8 @@ static int tdbPagerInitPage(SPager *pPager, SPage *pPage, int (*initPage)(SPage
int ret;
int lcode;
int nLoops;
- i64 nRead;
- SPgno pgno;
+ i64 nRead = 0;
+ SPgno pgno = 0;
int init = 0;
lcode = TDB_TRY_LOCK_PAGE(pPage);
diff --git a/source/libs/tdb/src/db/tdbTxn.c b/source/libs/tdb/src/db/tdbTxn.c
index bc23fdb759..0aeed3c140 100644
--- a/source/libs/tdb/src/db/tdbTxn.c
+++ b/source/libs/tdb/src/db/tdbTxn.c
@@ -31,13 +31,18 @@ int tdbTxnOpen(TXN *pTxn, int64_t txnid, void *(*xMalloc)(void *, size_t), void
return 0;
}
-int tdbTxnClose(TXN *pTxn) {
+int tdbTxnCloseImpl(TXN *pTxn) {
if (pTxn) {
if (pTxn->jPageSet) {
hashset_destroy(pTxn->jPageSet);
pTxn->jPageSet = NULL;
}
+ if (pTxn->jfd) {
+ tdbOsClose(pTxn->jfd);
+ ASSERT(pTxn->jfd == NULL);
+ }
+
tdbOsFree(pTxn);
}
diff --git a/source/libs/transport/inc/transComm.h b/source/libs/transport/inc/transComm.h
index bf9a6c0051..5f964f6b1a 100644
--- a/source/libs/transport/inc/transComm.h
+++ b/source/libs/transport/inc/transComm.h
@@ -100,14 +100,7 @@ typedef void* queue[2];
#define TRANS_READ_TIMEOUT 3000 // read timeout (ms)
#define TRANS_PACKET_LIMIT 1024 * 1024 * 512
-#define TRANS_MAGIC_NUM 0x5f375a86
-
-#define TRANS_NOVALID_PACKET(src) ((src) != TRANS_MAGIC_NUM ? 1 : 0)
-
-#define TRANS_PACKET_LIMIT 1024 * 1024 * 512
-
-#define TRANS_MAGIC_NUM 0x5f375a86
-
+#define TRANS_MAGIC_NUM 0x5f375a86
#define TRANS_NOVALID_PACKET(src) ((src) != TRANS_MAGIC_NUM ? 1 : 0)
typedef SRpcMsg STransMsg;
diff --git a/source/libs/transport/src/thttp.c b/source/libs/transport/src/thttp.c
index 00854b5ee5..cd508f6fe9 100644
--- a/source/libs/transport/src/thttp.c
+++ b/source/libs/transport/src/thttp.c
@@ -35,6 +35,7 @@ typedef struct SHttpModule {
typedef struct SHttpMsg {
queue q;
char* server;
+ char* uri;
int32_t port;
char* cont;
int32_t len;
@@ -63,26 +64,26 @@ static void httpHandleReq(SHttpMsg* msg);
static void httpHandleQuit(SHttpMsg* msg);
static int32_t httpSendQuit();
-static int32_t taosSendHttpReportImpl(const char* server, uint16_t port, char* pCont, int32_t contLen,
+static int32_t taosSendHttpReportImpl(const char* server, const char* uri, uint16_t port, char* pCont, int32_t contLen,
EHttpCompFlag flag);
-static int32_t taosBuildHttpHeader(const char* server, int32_t contLen, char* pHead, int32_t headLen,
+static int32_t taosBuildHttpHeader(const char* server, const char* uri, int32_t contLen, char* pHead, int32_t headLen,
EHttpCompFlag flag) {
if (flag == HTTP_FLAT) {
return snprintf(pHead, headLen,
- "POST /report HTTP/1.1\n"
+ "POST %s HTTP/1.1\n"
"Host: %s\n"
"Content-Type: application/json\n"
"Content-Length: %d\n\n",
- server, contLen);
+ uri, server, contLen);
} else if (flag == HTTP_GZIP) {
return snprintf(pHead, headLen,
- "POST /report HTTP/1.1\n"
+ "POST %s HTTP/1.1\n"
"Host: %s\n"
"Content-Type: application/json\n"
"Content-Encoding: gzip\n"
"Content-Length: %d\n\n",
- server, contLen);
+ uri, server, contLen);
} else {
terrno = TSDB_CODE_INVALID_CFG;
return -1;
@@ -181,6 +182,7 @@ static void httpDestroyMsg(SHttpMsg* msg) {
if (msg == NULL) return;
taosMemoryFree(msg->server);
+ taosMemoryFree(msg->uri);
taosMemoryFree(msg->cont);
taosMemoryFree(msg);
}
@@ -293,10 +295,11 @@ int32_t httpSendQuit() {
return 0;
}
-static int32_t taosSendHttpReportImpl(const char* server, uint16_t port, char* pCont, int32_t contLen,
+static int32_t taosSendHttpReportImpl(const char* server, const char* uri, uint16_t port, char* pCont, int32_t contLen,
EHttpCompFlag flag) {
SHttpMsg* msg = taosMemoryMalloc(sizeof(SHttpMsg));
msg->server = strdup(server);
+ msg->uri = strdup(uri);
msg->port = port;
msg->cont = taosMemoryMalloc(contLen);
memcpy(msg->cont, pCont, contLen);
@@ -309,12 +312,10 @@ static int32_t taosSendHttpReportImpl(const char* server, uint16_t port, char* p
httpDestroyMsg(msg);
tError("http-report already released");
return -1;
- } else {
- msg->http = load;
- transAsyncSend(load->asyncPool, &(msg->q));
}
-
- return 0;
+
+ msg->http = load;
+ return transAsyncSend(load->asyncPool, &(msg->q));
}
static void httpDestroyClientCb(uv_handle_t* handle) {
@@ -360,7 +361,7 @@ static void httpHandleReq(SHttpMsg* msg) {
int32_t len = 2048;
char* header = taosMemoryCalloc(1, len);
- int32_t headLen = taosBuildHttpHeader(msg->server, msg->len, header, len, msg->flag);
+ int32_t headLen = taosBuildHttpHeader(msg->server, msg->uri, msg->len, header, len, msg->flag);
if (headLen < 0) {
taosMemoryFree(header);
goto END;
@@ -380,6 +381,7 @@ static void httpHandleReq(SHttpMsg* msg) {
cli->port = msg->port;
cli->dest = dest;
+ taosMemoryFree(msg->uri);
taosMemoryFree(msg);
uv_tcp_init(http->loop, &cli->tcp);
@@ -406,9 +408,9 @@ END:
httpDestroyMsg(msg);
}
-int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag) {
+int32_t taosSendHttpReport(const char* server, const char* uri, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag) {
taosThreadOnce(&transHttpInit, transHttpEnvInit);
- return taosSendHttpReportImpl(server, port, pCont, contLen, flag);
+ return taosSendHttpReportImpl(server, uri, port, pCont, contLen, flag);
}
static void transHttpEnvInit() {
diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 2632d290e9..1a99db5f99 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -1126,7 +1126,7 @@ void cliHandleReq(SCliMsg* pMsg, SCliThrd* pThrd) {
int ret = uv_tcp_connect(&conn->connReq, (uv_tcp_t*)(conn->stream), (const struct sockaddr*)&addr, cliConnCb);
if (ret != 0) {
- tGTrace("%s conn %p failed to connect to %s:%d, reason:%s", pTransInst->label, conn, conn->ip, conn->port,
+ tGError("%s conn %p failed to connect to %s:%d, reason:%s", pTransInst->label, conn, conn->ip, conn->port,
uv_err_name(ret));
uv_timer_stop(conn->timer);
diff --git a/source/libs/wal/src/walMeta.c b/source/libs/wal/src/walMeta.c
index da8cf24627..4a0570bee3 100644
--- a/source/libs/wal/src/walMeta.c
+++ b/source/libs/wal/src/walMeta.c
@@ -289,19 +289,10 @@ void walAlignVersions(SWal* pWal) {
}
pWal->vers.lastVer = pWal->vers.snapshotVer;
}
- if (pWal->vers.commitVer < pWal->vers.snapshotVer) {
- wWarn("vgId:%d, commitVer:%" PRId64 " is less than snapshotVer:%" PRId64 ". align with it.", pWal->cfg.vgId,
- pWal->vers.commitVer, pWal->vers.snapshotVer);
- pWal->vers.commitVer = pWal->vers.snapshotVer;
- }
- if (pWal->vers.appliedVer < pWal->vers.snapshotVer) {
- wWarn("vgId:%d, appliedVer:%" PRId64 " is less than snapshotVer:%" PRId64 ". align with it.", pWal->cfg.vgId,
- pWal->vers.appliedVer, pWal->vers.snapshotVer);
- pWal->vers.appliedVer = pWal->vers.snapshotVer;
- }
-
- pWal->vers.commitVer = TMIN(pWal->vers.lastVer, pWal->vers.commitVer);
- pWal->vers.appliedVer = TMIN(pWal->vers.commitVer, pWal->vers.appliedVer);
+ // reset commitVer and appliedVer
+ pWal->vers.commitVer = pWal->vers.snapshotVer;
+ pWal->vers.appliedVer = pWal->vers.snapshotVer;
+ wInfo("vgId:%d, reset commitVer to %" PRId64, pWal->cfg.vgId, pWal->vers.commitVer);
}
bool walLogEntriesComplete(const SWal* pWal) {
diff --git a/source/libs/wal/src/walWrite.c b/source/libs/wal/src/walWrite.c
index 4233c089a4..f49c9a53af 100644
--- a/source/libs/wal/src/walWrite.c
+++ b/source/libs/wal/src/walWrite.c
@@ -103,7 +103,7 @@ int32_t walRollback(SWal *pWal, int64_t ver) {
wInfo("vgId:%d, wal rollback for version %" PRId64, pWal->cfg.vgId, ver);
int64_t code;
char fnameStr[WAL_FILE_LEN];
- if (ver > pWal->vers.lastVer || ver < pWal->vers.commitVer || ver <= pWal->vers.snapshotVer) {
+ if (ver > pWal->vers.lastVer || ver <= pWal->vers.commitVer || ver <= pWal->vers.snapshotVer) {
terrno = TSDB_CODE_WAL_INVALID_VER;
taosThreadMutexUnlock(&pWal->mutex);
return -1;
diff --git a/source/os/src/osFile.c b/source/os/src/osFile.c
index 3f527e9130..71b3125de8 100644
--- a/source/os/src/osFile.c
+++ b/source/os/src/osFile.c
@@ -191,7 +191,7 @@ int32_t taosStatFile(const char *path, int64_t *size, int32_t *mtime) {
int32_t code = _stati64(path, &fileStat);
#else
struct stat fileStat;
- int32_t code = stat(path, &fileStat);
+ int32_t code = stat(path, &fileStat);
#endif
if (code < 0) {
return code;
@@ -208,10 +208,9 @@ int32_t taosStatFile(const char *path, int64_t *size, int32_t *mtime) {
return 0;
}
int32_t taosDevInoFile(TdFilePtr pFile, int64_t *stDev, int64_t *stIno) {
- if (pFile == NULL) {
- return 0;
+ if (pFile == NULL || pFile->fd < 0) {
+ return -1;
}
- assert(pFile->fd >= 0); // Please check if you have closed the file.
#ifdef WINDOWS
@@ -233,7 +232,7 @@ int32_t taosDevInoFile(TdFilePtr pFile, int64_t *stDev, int64_t *stIno) {
#else
struct stat fileStat;
- int32_t code = fstat(pFile->fd, &fileStat);
+ int32_t code = fstat(pFile->fd, &fileStat);
if (code < 0) {
printf("taosFStatFile run fstat fail.");
return code;
@@ -265,7 +264,10 @@ TdFilePtr taosOpenFile(const char *path, int32_t tdFileOptions) {
} else {
mode = (tdFileOptions & TD_FILE_TEXT) ? "rt+" : "rb+";
}
- assert(!(tdFileOptions & TD_FILE_EXCL));
+ ASSERT(!(tdFileOptions & TD_FILE_EXCL));
+ if (tdFileOptions & TD_FILE_EXCL) {
+ return NULL;
+ }
fp = fopen(path, mode);
if (fp == NULL) {
return NULL;
@@ -364,7 +366,13 @@ int64_t taosReadFile(TdFilePtr pFile, void *buf, int64_t count) {
#if FILE_WITH_LOCK
taosThreadRwlockRdlock(&(pFile->rwlock));
#endif
- assert(pFile->fd >= 0); // Please check if you have closed the file.
+ ASSERT(pFile->fd >= 0); // Please check if you have closed the file.
+ if (pFile->fd < 0) {
+#if FILE_WITH_LOCK
+ taosThreadRwlockUnlock(&(pFile->rwlock));
+#endif
+ return -1;
+ }
int64_t leftbytes = count;
int64_t readbytes;
char *tbuf = (char *)buf;
@@ -408,7 +416,13 @@ int64_t taosPReadFile(TdFilePtr pFile, void *buf, int64_t count, int64_t offset)
#if FILE_WITH_LOCK
taosThreadRwlockRdlock(&(pFile->rwlock));
#endif
- assert(pFile->fd >= 0); // Please check if you have closed the file.
+ ASSERT(pFile->fd >= 0); // Please check if you have closed the file.
+ if (pFile->fd < 0) {
+#if FILE_WITH_LOCK
+ taosThreadRwlockUnlock(&(pFile->rwlock));
+#endif
+ return -1;
+ }
#ifdef WINDOWS
size_t pos = _lseeki64(pFile->fd, 0, SEEK_CUR);
_lseeki64(pFile->fd, offset, SEEK_SET);
@@ -431,6 +445,9 @@ int64_t taosWriteFile(TdFilePtr pFile, const void *buf, int64_t count) {
taosThreadRwlockWrlock(&(pFile->rwlock));
#endif
if (pFile->fd < 0) {
+#if FILE_WITH_LOCK
+ taosThreadRwlockUnlock(&(pFile->rwlock));
+#endif
return 0;
}
@@ -466,7 +483,13 @@ int64_t taosPWriteFile(TdFilePtr pFile, const void *buf, int64_t count, int64_t
#if FILE_WITH_LOCK
taosThreadRwlockWrlock(&(pFile->rwlock));
#endif
- assert(pFile->fd >= 0); // Please check if you have closed the file.
+ ASSERT(pFile->fd >= 0); // Please check if you have closed the file.
+ if (pFile->fd < 0) {
+#if FILE_WITH_LOCK
+ taosThreadRwlockUnlock(&(pFile->rwlock));
+#endif
+ return 0;
+ }
#ifdef WINDOWS
size_t pos = _lseeki64(pFile->fd, 0, SEEK_CUR);
_lseeki64(pFile->fd, offset, SEEK_SET);
@@ -485,7 +508,10 @@ int64_t taosLSeekFile(TdFilePtr pFile, int64_t offset, int32_t whence) {
#if FILE_WITH_LOCK
taosThreadRwlockRdlock(&(pFile->rwlock));
#endif
- assert(pFile->fd >= 0); // Please check if you have closed the file.
+ ASSERT(pFile->fd >= 0); // Please check if you have closed the file.
+ if (pFile->fd < 0) {
+ return -1;
+ }
#ifdef WINDOWS
int64_t ret = _lseeki64(pFile->fd, offset, whence);
#else
@@ -501,7 +527,10 @@ int32_t taosFStatFile(TdFilePtr pFile, int64_t *size, int32_t *mtime) {
if (pFile == NULL) {
return 0;
}
- assert(pFile->fd >= 0); // Please check if you have closed the file.
+ ASSERT(pFile->fd >= 0); // Please check if you have closed the file.
+ if (pFile->fd < 0) {
+ return -1;
+ }
struct stat fileStat;
#ifdef WINDOWS
@@ -525,6 +554,10 @@ int32_t taosFStatFile(TdFilePtr pFile, int64_t *size, int32_t *mtime) {
}
int32_t taosLockFile(TdFilePtr pFile) {
+ ASSERT(pFile->fd >= 0); // Please check if you have closed the file.
+ if (pFile->fd < 0) {
+ return -1;
+ }
#ifdef WINDOWS
BOOL fSuccess = FALSE;
LARGE_INTEGER fileSize;
@@ -543,17 +576,19 @@ int32_t taosLockFile(TdFilePtr pFile) {
}
return 0;
#else
- assert(pFile->fd >= 0); // Please check if you have closed the file.
-
return (int32_t)flock(pFile->fd, LOCK_EX | LOCK_NB);
#endif
}
int32_t taosUnLockFile(TdFilePtr pFile) {
+ ASSERT(pFile->fd >= 0);
+ if (pFile->fd < 0) {
+ return 0;
+ }
#ifdef WINDOWS
- BOOL fSuccess = FALSE;
- OVERLAPPED overlapped = {0};
- HANDLE hFile = (HANDLE)_get_osfhandle(pFile->fd);
+ BOOL fSuccess = FALSE;
+ OVERLAPPED overlapped = {0};
+ HANDLE hFile = (HANDLE)_get_osfhandle(pFile->fd);
fSuccess = UnlockFileEx(hFile, 0, ~0, ~0, &overlapped);
if (!fSuccess) {
@@ -561,19 +596,19 @@ int32_t taosUnLockFile(TdFilePtr pFile) {
}
return 0;
#else
- assert(pFile->fd >= 0); // Please check if you have closed the file.
-
return (int32_t)flock(pFile->fd, LOCK_UN | LOCK_NB);
#endif
}
int32_t taosFtruncateFile(TdFilePtr pFile, int64_t l_size) {
-#ifdef WINDOWS
+ if (pFile == NULL) {
+ return 0;
+ }
if (pFile->fd < 0) {
- errno = EBADF;
printf("Ftruncate file error, fd arg was negative\n");
return -1;
}
+#ifdef WINDOWS
HANDLE h = (HANDLE)_get_osfhandle(pFile->fd);
@@ -618,11 +653,6 @@ int32_t taosFtruncateFile(TdFilePtr pFile, int64_t l_size) {
return 0;
#else
- if (pFile == NULL) {
- return 0;
- }
- assert(pFile->fd >= 0); // Please check if you have closed the file.
-
return ftruncate(pFile->fd, l_size);
#endif
}
@@ -650,7 +680,10 @@ int64_t taosFSendFile(TdFilePtr pFileOut, TdFilePtr pFileIn, int64_t *offset, in
if (pFileOut == NULL || pFileIn == NULL) {
return 0;
}
- assert(pFileIn->fd >= 0 && pFileOut->fd >= 0);
+ ASSERT(pFileIn->fd >= 0 && pFileOut->fd >= 0);
+ if (pFileIn->fd < 0 || pFileOut->fd < 0) {
+ return 0;
+ }
#ifdef WINDOWS
@@ -743,11 +776,9 @@ int64_t taosFSendFile(TdFilePtr pFileOut, TdFilePtr pFileIn, int64_t *offset, in
}
void taosFprintfFile(TdFilePtr pFile, const char *format, ...) {
- if (pFile == NULL) {
+ if (pFile == NULL || pFile->fp == NULL) {
return;
}
- assert(pFile->fp != NULL);
-
va_list ap;
va_start(ap, format);
vfprintf(pFile->fp, format, ap);
@@ -772,7 +803,10 @@ int64_t taosGetLineFile(TdFilePtr pFile, char **__restrict ptrBuf) {
if (*ptrBuf != NULL) {
taosMemoryFreeClear(*ptrBuf);
}
- assert(pFile->fp != NULL);
+ ASSERT(pFile->fp != NULL);
+ if (pFile->fp == NULL) {
+ return -1;
+ }
#ifdef WINDOWS
*ptrBuf = taosMemoryMalloc(1024);
if (*ptrBuf == NULL) return -1;
@@ -792,7 +826,10 @@ int64_t taosGetsFile(TdFilePtr pFile, int32_t maxSize, char *__restrict buf) {
if (pFile == NULL || buf == NULL) {
return -1;
}
- assert(pFile->fp != NULL);
+ ASSERT(pFile->fp != NULL);
+ if (pFile->fp == NULL) {
+ return -1;
+ }
if (fgets(buf, maxSize, pFile->fp) == NULL) {
return -1;
}
@@ -801,9 +838,12 @@ int64_t taosGetsFile(TdFilePtr pFile, int32_t maxSize, char *__restrict buf) {
int32_t taosEOFFile(TdFilePtr pFile) {
if (pFile == NULL) {
- return 0;
+ return -1;
+ }
+ ASSERT(pFile->fp != NULL);
+ if (pFile->fp == NULL) {
+ return -1;
}
- assert(pFile->fp != NULL);
return feof(pFile->fp);
}
diff --git a/source/os/src/osLocale.c b/source/os/src/osLocale.c
index 7319181a77..b4a2845e96 100644
--- a/source/os/src/osLocale.c
+++ b/source/os/src/osLocale.c
@@ -71,7 +71,7 @@ char *taosCharsetReplace(char *charsetstr) {
* seems does not response as expected.
*
* In some Linux systems, setLocale(LC_CTYPE, "") may return NULL, in which case the launch of
- * both the TDengine Server and the Client may be interrupted.
+ * both the Server and the Client may be interrupted.
*
* In case that the setLocale failed to be executed, the right charset needs to be set.
*/
diff --git a/source/os/src/osMemory.c b/source/os/src/osMemory.c
index 2e68bd5ccd..3825b8e074 100644
--- a/source/os/src/osMemory.c
+++ b/source/os/src/osMemory.c
@@ -266,7 +266,10 @@ void *taosMemoryRealloc(void *ptr, int64_t size) {
if (ptr == NULL) return taosMemoryMalloc(size);
TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
- assert(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
+ ASSERT(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
+ if (tpTdMemoryInfo->symbol != TD_MEMORY_SYMBOL) {
++ return NULL;
++ }
TdMemoryInfo tdMemoryInfo;
memcpy(&tdMemoryInfo, pTdMemoryInfo, sizeof(TdMemoryInfo));
@@ -288,8 +291,10 @@ void *taosMemoryStrDup(const char *ptr) {
if (ptr == NULL) return NULL;
TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
- assert(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
-
+ ASSERT(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
+ if (pTdMemoryInfo->symbol != TD_MEMORY_SYMBOL) {
++ return NULL;
++ }
void *tmp = tstrdup(pTdMemoryInfo);
if (tmp == NULL) return NULL;
@@ -323,7 +328,10 @@ int64_t taosMemorySize(void *ptr) {
#ifdef USE_TD_MEMORY
TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
- assert(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
+ ASSERT(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
+ if (pTdMemoryInfo->symbol != TD_MEMORY_SYMBOL) {
++ return NULL;
++ }
return pTdMemoryInfo->memorySize;
#else
@@ -348,7 +356,7 @@ void taosMemoryTrim(int32_t size) {
void* taosMemoryMallocAlign(uint32_t alignment, int64_t size) {
#ifdef USE_TD_MEMORY
- assert(0);
+ ASSERT(0);
#else
#if defined(LINUX)
void* p = memalign(alignment, size);
diff --git a/source/os/src/osSemaphore.c b/source/os/src/osSemaphore.c
index 2f947d3252..cc018bf842 100644
--- a/source/os/src/osSemaphore.c
+++ b/source/os/src/osSemaphore.c
@@ -86,8 +86,8 @@ int32_t tsem_timewait(tsem_t* sem, int64_t ms) {
while ((rc = sem_timedwait(sem, &ts)) == -1 && errno == EINTR) continue;
return rc;
/* This should have timed out */
- // assert(errno == ETIMEDOUT);
- // assert(rc != 0);
+ // ASSERT(errno == ETIMEDOUT);
+ // ASSERT(rc != 0);
// GetSystemTimeAsFileTime(&ft_after);
// // We specified a non-zero wait. Time must advance.
// if (ft_before.dwLowDateTime == ft_after.dwLowDateTime && ft_before.dwHighDateTime == ft_after.dwHighDateTime)
diff --git a/source/os/src/osSocket.c b/source/os/src/osSocket.c
index 6611a937f2..715c2632e0 100644
--- a/source/os/src/osSocket.c
+++ b/source/os/src/osSocket.c
@@ -298,7 +298,7 @@ int32_t taosGetSockOpt(TdSocketPtr pSocket, int32_t level, int32_t optname, void
return -1;
}
#ifdef WINDOWS
- assert(0);
+ ASSERT(0);
return 0;
#else
return getsockopt(pSocket->fd, level, optname, optval, (int *)optlen);
@@ -662,7 +662,7 @@ int32_t taosKeepTcpAlive(TdSocketPtr pSocket) {
int taosGetLocalIp(const char *eth, char *ip) {
#if defined(WINDOWS)
// DO NOTHAING
- assert(0);
+ ASSERT(0);
return 0;
#else
int fd;
@@ -689,7 +689,7 @@ int taosGetLocalIp(const char *eth, char *ip) {
int taosValidIp(uint32_t ip) {
#if defined(WINDOWS)
// DO NOTHAING
- assert(0);
+ ASSERT(0);
return 0;
#else
int ret = -1;
@@ -924,7 +924,7 @@ uint32_t ip2uint(const char *const ip_addr) {
void taosBlockSIGPIPE() {
#ifdef WINDOWS
- // assert(0);
+ // ASSERT(0);
#else
sigset_t signal_mask;
sigemptyset(&signal_mask);
@@ -994,7 +994,7 @@ int32_t taosGetFqdn(char *fqdn) {
#else
printf("failed to get hostname, reason:%s\n", strerror(errno));
#endif
- assert(0);
+ ASSERT(0);
return -1;
}
@@ -1031,7 +1031,7 @@ void taosIgnSIGPIPE() { signal(SIGPIPE, SIG_IGN); }
void taosSetMaskSIGPIPE() {
#ifdef WINDOWS
- // assert(0);
+ // ASSERT(0);
#else
sigset_t signal_mask;
sigemptyset(&signal_mask);
diff --git a/source/os/src/osString.c b/source/os/src/osString.c
index 5419da1c0c..b9f537ad34 100644
--- a/source/os/src/osString.c
+++ b/source/os/src/osString.c
@@ -112,7 +112,7 @@ int32_t tasoUcs4Compare(TdUcs4 *f1_ucs4, TdUcs4 *f2_ucs4, int32_t bytes) {
}
TdUcs4 *tasoUcs4Copy(TdUcs4 *target_ucs4, TdUcs4 *source_ucs4, int32_t len_ucs4) {
- assert(taosMemorySize(target_ucs4) >= len_ucs4 * sizeof(TdUcs4));
+ ASSERT(taosMemorySize(target_ucs4) >= len_ucs4 * sizeof(TdUcs4));
return memcpy(target_ucs4, source_ucs4, len_ucs4 * sizeof(TdUcs4));
}
@@ -217,7 +217,7 @@ void taosReleaseConv(int32_t idx, iconv_t conv, ConvType type) {
bool taosMbsToUcs4(const char *mbs, size_t mbsLength, TdUcs4 *ucs4, int32_t ucs4_max_len, int32_t *len) {
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
- printf("Nchar cannot be read and written without iconv, please install iconv library and recompile TDengine.\n");
+ printf("Nchar cannot be read and written without iconv, please install iconv library and recompile.\n");
return -1;
#else
memset(ucs4, 0, ucs4_max_len);
@@ -245,7 +245,7 @@ bool taosMbsToUcs4(const char *mbs, size_t mbsLength, TdUcs4 *ucs4, int32_t ucs4
int32_t taosUcs4ToMbs(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs) {
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
- printf("Nchar cannot be read and written without iconv, please install iconv library and recompile TDengine.\n");
+ printf("Nchar cannot be read and written without iconv, please install iconv library and recompile.\n");
return -1;
#else
@@ -263,7 +263,7 @@ int32_t taosUcs4ToMbs(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs) {
}
bool taosValidateEncodec(const char *encodec) {
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
- printf("Nchar cannot be read and written without iconv, please install iconv library and recompile TDengine.\n");
+ printf("Nchar cannot be read and written without iconv, please install iconv library and recompile.\n");
return true;
#else
iconv_t cd = iconv_open(encodec, DEFAULT_UNICODE_ENCODEC);
@@ -355,8 +355,8 @@ int64_t taosStr2Int64(const char *str, char **pEnd, int32_t radix) {
if (errno == EINVAL) errno = 0;
#endif
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
#endif
return tmp;
}
@@ -367,8 +367,8 @@ uint64_t taosStr2UInt64(const char *str, char **pEnd, int32_t radix) {
if (errno == EINVAL) errno = 0;
#endif
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
#endif
return tmp;
}
@@ -379,8 +379,8 @@ int32_t taosStr2Int32(const char *str, char **pEnd, int32_t radix) {
if (errno == EINVAL) errno = 0;
#endif
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
#endif
return tmp;
}
@@ -391,8 +391,8 @@ uint32_t taosStr2UInt32(const char *str, char **pEnd, int32_t radix) {
if (errno == EINVAL) errno = 0;
#endif
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
#endif
return tmp;
}
@@ -403,10 +403,10 @@ int16_t taosStr2Int16(const char *str, char **pEnd, int32_t radix) {
if (errno == EINVAL) errno = 0;
#endif
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
- assert(tmp >= SHRT_MIN);
- assert(tmp <= SHRT_MAX);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
+ ASSERT(tmp >= SHRT_MIN);
+ ASSERT(tmp <= SHRT_MAX);
#endif
return (int16_t)tmp;
}
@@ -417,9 +417,9 @@ uint16_t taosStr2UInt16(const char *str, char **pEnd, int32_t radix) {
if (errno == EINVAL) errno = 0;
#endif
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
- assert(tmp <= USHRT_MAX);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
+ ASSERT(tmp <= USHRT_MAX);
#endif
return (uint16_t)tmp;
}
@@ -427,10 +427,10 @@ uint16_t taosStr2UInt16(const char *str, char **pEnd, int32_t radix) {
int8_t taosStr2Int8(const char *str, char **pEnd, int32_t radix) {
int32_t tmp = strtol(str, pEnd, radix);
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
- assert(tmp >= SCHAR_MIN);
- assert(tmp <= SCHAR_MAX);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
+ ASSERT(tmp >= SCHAR_MIN);
+ ASSERT(tmp <= SCHAR_MAX);
#endif
return tmp;
}
@@ -441,9 +441,9 @@ uint8_t taosStr2UInt8(const char *str, char **pEnd, int32_t radix) {
if (errno == EINVAL) errno = 0;
#endif
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
- assert(tmp <= UCHAR_MAX);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
+ ASSERT(tmp <= UCHAR_MAX);
#endif
return tmp;
}
@@ -451,9 +451,9 @@ uint8_t taosStr2UInt8(const char *str, char **pEnd, int32_t radix) {
double taosStr2Double(const char *str, char **pEnd) {
double tmp = strtod(str, pEnd);
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
- assert(tmp != HUGE_VAL);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
+ ASSERT(tmp != HUGE_VAL);
#endif
return tmp;
}
@@ -461,10 +461,10 @@ double taosStr2Double(const char *str, char **pEnd) {
float taosStr2Float(const char *str, char **pEnd) {
float tmp = strtof(str, pEnd);
#ifdef TD_CHECK_STR_TO_INT_ERROR
- assert(errno != ERANGE);
- assert(errno != EINVAL);
- assert(tmp != HUGE_VALF);
- assert(tmp != NAN);
+ ASSERT(errno != ERANGE);
+ ASSERT(errno != EINVAL);
+ ASSERT(tmp != HUGE_VALF);
+ ASSERT(tmp != NAN);
#endif
return tmp;
}
diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c
index 6c9bf40e4d..35e76f0e67 100644
--- a/source/os/src/osSysinfo.c
+++ b/source/os/src/osSysinfo.c
@@ -249,7 +249,7 @@ void taosGetSystemInfo() {
int32_t taosGetEmail(char *email, int32_t maxLen) {
#ifdef WINDOWS
- // assert(0);
+ // ASSERT(0);
#elif defined(_TD_DARWIN_64)
const char *filepath = "/usr/local/taos/email";
@@ -863,7 +863,7 @@ int32_t taosGetSystemUUID(char *uid, int32_t uidlen) {
char *taosGetCmdlineByPID(int pid) {
#ifdef WINDOWS
- assert(0);
+ ASSERT(0);
return "";
#elif defined(_TD_DARWIN_64)
static char cmdline[1024];
diff --git a/source/os/src/osSystem.c b/source/os/src/osSystem.c
index c972aebbca..7b6c77f7bc 100644
--- a/source/os/src/osSystem.c
+++ b/source/os/src/osSystem.c
@@ -90,7 +90,7 @@ typedef struct FILE TdCmd;
void* taosLoadDll(const char* filename) {
#if defined(WINDOWS)
- assert(0);
+ ASSERT(0);
return NULL;
#elif defined(_TD_DARWIN_64)
return NULL;
@@ -109,7 +109,7 @@ void* taosLoadDll(const char* filename) {
void* taosLoadSym(void* handle, char* name) {
#if defined(WINDOWS)
- assert(0);
+ ASSERT(0);
return NULL;
#elif defined(_TD_DARWIN_64)
return NULL;
@@ -130,7 +130,7 @@ void* taosLoadSym(void* handle, char* name) {
void taosCloseDll(void* handle) {
#if defined(WINDOWS)
- assert(0);
+ ASSERT(0);
return;
#elif defined(_TD_DARWIN_64)
return;
diff --git a/source/os/src/osThread.c b/source/os/src/osThread.c
index 32c58695cf..39ba92fdc5 100644
--- a/source/os/src/osThread.c
+++ b/source/os/src/osThread.c
@@ -233,7 +233,8 @@ int32_t taosThreadSpinDestroy(TdThreadSpinlock *lock) {
int32_t taosThreadSpinInit(TdThreadSpinlock *lock, int32_t pshared) {
#ifdef TD_USE_SPINLOCK_AS_MUTEX
- assert(pshared == 0);
+ ASSERT(pshared == 0);
+ if (pshared != 0) return -1;
return pthread_mutex_init((pthread_mutex_t *)lock, NULL);
#else
return pthread_spin_init((pthread_spinlock_t *)lock, pshared);
diff --git a/source/os/test/osTests.cpp b/source/os/test/osTests.cpp
index f831f457f9..2e24bb0526 100644
--- a/source/os/test/osTests.cpp
+++ b/source/os/test/osTests.cpp
@@ -33,7 +33,7 @@ TEST(osTest, osSystem) {
const char *flags = "UTL FATAL ";
ELogLevel level = DEBUG_FATAL;
int32_t dflag = 255; // tsLogEmbedded ? 255 : uDebugFlag
- taosPrintTrace(flags, level, dflag);
+ taosPrintTrace(flags, level, dflag, 0);
}
void fileOperateOnFree(void *param) {
diff --git a/source/util/src/tcompare.c b/source/util/src/tcompare.c
index ed254b651f..75d6a43b24 100644
--- a/source/util/src/tcompare.c
+++ b/source/util/src/tcompare.c
@@ -23,6 +23,7 @@
#include "tlog.h"
#include "tutil.h"
#include "types.h"
+#include "osString.h"
int32_t setChkInBytes1(const void *pLeft, const void *pRight) {
return NULL != taosHashGet((SHashObj *)pRight, pLeft, 1) ? 1 : 0;
@@ -208,16 +209,16 @@ int32_t compareLenPrefixedWStr(const void *pLeft, const void *pRight) {
int32_t len1 = varDataLen(pLeft);
int32_t len2 = varDataLen(pRight);
- if (len1 != len2) {
- return len1 > len2 ? 1 : -1;
- } else {
- int32_t ret = memcmp((TdUcs4 *)pLeft, (TdUcs4 *)pRight, len1);
- if (ret == 0) {
+ int32_t ret = tasoUcs4Compare((TdUcs4 *)varDataVal(pLeft), (TdUcs4 *)varDataVal(pRight), len1>len2 ? len2:len1);
+ if (ret == 0) {
+ if (len1 > len2)
+ return 1;
+ else if(len1 < len2)
+ return -1;
+ else
return 0;
- } else {
- return ret > 0 ? 1 : -1;
- }
}
+ return (ret < 0) ? -1 : 1;
}
int32_t compareLenPrefixedWStrDesc(const void *pLeft, const void *pRight) {
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index 08ab43494d..bab3edc870 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -138,6 +138,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSC_QUERY_KILLED, "Query killed")
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_NO_EXEC_NODE, "No available execution node in current query policy configuration")
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_NOT_STABLE_ERROR, "Table is not a super table")
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_STMT_CACHE_ERROR, "Stmt cache error")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INTERNAL_ERROR, "Internal error")
// mnode-common
TAOS_DEFINE_ERROR(TSDB_CODE_MND_NO_RIGHTS, "Insufficient privilege for operation")
@@ -319,6 +320,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_VND_COL_SUBSCRIBED, "Table column is subsc
TAOS_DEFINE_ERROR(TSDB_CODE_VND_NO_AVAIL_BUFPOOL, "No availabe buffer pool")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_STOPPED, "Vnode stopped")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_DUP_REQUEST, "Duplicate write request")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_QUERY_BUSY, "Query busy")
// tsdb
TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INVALID_TABLE_ID, "Invalid table ID")
@@ -578,6 +580,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_SML_INVALID_PRECISION_TYPE, "Invalid timestamp p
TAOS_DEFINE_ERROR(TSDB_CODE_SML_INVALID_DATA, "Invalid data format")
TAOS_DEFINE_ERROR(TSDB_CODE_SML_INVALID_DB_CONF, "Invalid schemaless db config")
TAOS_DEFINE_ERROR(TSDB_CODE_SML_NOT_SAME_TYPE, "Not the same type like before")
+TAOS_DEFINE_ERROR(TSDB_CODE_SML_INTERNAL_ERROR, "Internal error")
//tsma
TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INIT_FAILED, "Tsma init failed")
diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c
index 53d0cad5ea..34ad9ae6bc 100644
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -18,6 +18,8 @@
#include "os.h"
#include "tconfig.h"
#include "tutil.h"
+#include "tjson.h"
+#include "tglobal.h"
#define LOG_MAX_LINE_SIZE (1024)
#define LOG_MAX_LINE_BUFFER_SIZE (LOG_MAX_LINE_SIZE + 3)
@@ -808,7 +810,7 @@ bool taosAssertDebug(bool condition, const char *file, int32_t line, const char
taosPrintLogImp(1, 255, buffer, len);
taosPrintLog(flags, level, dflag, "tAssert at file %s:%d exit:%d", file, line, tsAssert);
- taosPrintTrace(flags, level, dflag);
+ taosPrintTrace(flags, level, dflag, -1);
if (tsAssert) {
// taosCloseLog();
@@ -824,6 +826,216 @@ bool taosAssertDebug(bool condition, const char *file, int32_t line, const char
return true;
}
+int32_t taosGenCrashJsonMsg(int signum, char** pMsg, int64_t clusterId, int64_t startTime) {
+ SJson* pJson = tjsonCreateObject();
+ if (pJson == NULL) return -1;
+ char tmp[4096] = {0};
+
+ tjsonAddDoubleToObject(pJson, "reportVersion", 1);
+
+ tjsonAddIntegerToObject(pJson, "clusterId", clusterId);
+ tjsonAddIntegerToObject(pJson, "startTime", startTime);
+
+ taosGetFqdn(tmp);
+ tjsonAddStringToObject(pJson, "fqdn", tmp);
+
+ tjsonAddIntegerToObject(pJson, "pid", taosGetPId());
+
+ taosGetAppName(tmp, NULL);
+ tjsonAddStringToObject(pJson, "appName", tmp);
+
+ if (taosGetOsReleaseName(tmp, sizeof(tmp)) == 0) {
+ tjsonAddStringToObject(pJson, "os", tmp);
+ }
+
+ float numOfCores = 0;
+ if (taosGetCpuInfo(tmp, sizeof(tmp), &numOfCores) == 0) {
+ tjsonAddStringToObject(pJson, "cpuModel", tmp);
+ tjsonAddDoubleToObject(pJson, "numOfCpu", numOfCores);
+ } else {
+ tjsonAddDoubleToObject(pJson, "numOfCpu", tsNumOfCores);
+ }
+
+ snprintf(tmp, sizeof(tmp), "%" PRId64 " kB", tsTotalMemoryKB);
+ tjsonAddStringToObject(pJson, "memory", tmp);
+
+ tjsonAddStringToObject(pJson, "version", version);
+ tjsonAddStringToObject(pJson, "buildInfo", buildinfo);
+ tjsonAddStringToObject(pJson, "gitInfo", gitinfo);
+
+ tjsonAddIntegerToObject(pJson, "crashSig", signum);
+ tjsonAddIntegerToObject(pJson, "crashTs", taosGetTimestampUs());
+
+#ifdef _TD_DARWIN_64
+ taosLogTraceToBuf(tmp, sizeof(tmp), 4);
+#elif !defined(WINDOWS)
+ taosLogTraceToBuf(tmp, sizeof(tmp), 3);
+#else
+ taosLogTraceToBuf(tmp, sizeof(tmp), 8);
+#endif
+
+ tjsonAddStringToObject(pJson, "stackInfo", tmp);
+
+ char* pCont = tjsonToString(pJson);
+ tjsonDelete(pJson);
+
+ *pMsg = pCont;
+
+ return TSDB_CODE_SUCCESS;
+}
+
+
+void taosLogCrashInfo(char* nodeType, char* pMsg, int64_t msgLen, int signum, void *sigInfo) {
+ const char *flags = "UTL FATAL ";
+ ELogLevel level = DEBUG_FATAL;
+ int32_t dflag = 255;
+ char filepath[PATH_MAX] = {0};
+ TdFilePtr pFile = NULL;
+
+ if (pMsg && msgLen > 0) {
+ snprintf(filepath, sizeof(filepath), "%s%s.%sCrashLog", tsLogDir, TD_DIRSEP, nodeType);
+
+ pFile = taosOpenFile(filepath, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_APPEND);
+ if (pFile == NULL) {
+ taosPrintLog(flags, level, dflag, "failed to open file:%s since %s", filepath, terrstr());
+ goto _return;
+ }
+
+ taosLockFile(pFile);
+
+ int64_t writeSize = taosWriteFile(pFile, &msgLen, sizeof(msgLen));
+ if (sizeof(msgLen) != writeSize) {
+ taosUnLockFile(pFile);
+ taosPrintLog(flags, level, dflag, "failed to write len to file:%s,%p wlen:%" PRId64 " tlen:%lu since %s",
+ filepath, pFile, writeSize, sizeof(msgLen), terrstr());
+ goto _return;
+ }
+
+ writeSize = taosWriteFile(pFile, pMsg, msgLen);
+ if (msgLen != writeSize) {
+ taosUnLockFile(pFile);
+ taosPrintLog(flags, level, dflag, "failed to write file:%s,%p wlen:%" PRId64 " tlen:%" PRId64 " since %s",
+ filepath, pFile, writeSize, msgLen, terrstr());
+ goto _return;
+ }
+
+ taosUnLockFile(pFile);
+ }
+
+_return:
+
+ if (pFile) taosCloseFile(&pFile);
+
+ terrno = TAOS_SYSTEM_ERROR(errno);
+ taosPrintLog(flags, level, dflag, "crash signal is %d", signum);
+
+#ifdef _TD_DARWIN_64
+ taosPrintTrace(flags, level, dflag, 4);
+#elif !defined(WINDOWS)
+ taosPrintLog(flags, level, dflag, "sender PID:%d cmdline:%s", ((siginfo_t *)sigInfo)->si_pid,
+ taosGetCmdlineByPID(((siginfo_t *)sigInfo)->si_pid));
+ taosPrintTrace(flags, level, dflag, 3);
+#else
+ taosPrintTrace(flags, level, dflag, 8);
+#endif
+
+ taosMemoryFree(pMsg);
+}
+
+void taosReadCrashInfo(char* filepath, char** pMsg, int64_t* pMsgLen, TdFilePtr* pFd) {
+ const char *flags = "UTL FATAL ";
+ ELogLevel level = DEBUG_FATAL;
+ int32_t dflag = 255;
+ TdFilePtr pFile = NULL;
+ bool truncateFile = false;
+ char* buf = NULL;
+
+ if (NULL == *pFd) {
+ int64_t filesize = 0;
+ if (taosStatFile(filepath, &filesize, NULL) < 0) {
+ if (ENOENT == errno) {
+ return;
+ }
+
+ terrno = TAOS_SYSTEM_ERROR(errno);
+ taosPrintLog(flags, level, dflag, "failed to stat file:%s since %s", filepath, terrstr());
+ return;
+ }
+
+ if (filesize <= 0) {
+ return;
+ }
+
+ pFile = taosOpenFile(filepath, TD_FILE_READ|TD_FILE_WRITE);
+ if (pFile == NULL) {
+ if (ENOENT == errno) {
+ return;
+ }
+
+ terrno = TAOS_SYSTEM_ERROR(errno);
+ taosPrintLog(flags, level, dflag, "failed to open file:%s since %s", filepath, terrstr());
+ return;
+ }
+
+ taosLockFile(pFile);
+ } else {
+ pFile = *pFd;
+ }
+
+ int64_t msgLen = 0;
+ int64_t readSize = taosReadFile(pFile, &msgLen, sizeof(msgLen));
+ if (sizeof(msgLen) != readSize) {
+ truncateFile = true;
+ if (readSize < 0) {
+ taosPrintLog(flags, level, dflag, "failed to read len from file:%s,%p wlen:%" PRId64 " tlen:%lu since %s",
+ filepath, pFile, readSize, sizeof(msgLen), terrstr());
+ }
+ goto _return;
+ }
+
+ buf = taosMemoryMalloc(msgLen);
+ if (NULL == buf) {
+ taosPrintLog(flags, level, dflag, "failed to malloc buf, size:%" PRId64, msgLen);
+ goto _return;
+ }
+
+ readSize = taosReadFile(pFile, buf, msgLen);
+ if (msgLen != readSize) {
+ truncateFile = true;
+ taosPrintLog(flags, level, dflag, "failed to read file:%s,%p wlen:%" PRId64 " tlen:%" PRId64 " since %s",
+ filepath, pFile, readSize, msgLen, terrstr());
+ goto _return;
+ }
+
+ *pMsg = buf;
+ *pMsgLen = msgLen;
+ *pFd = pFile;
+
+ return;
+
+_return:
+
+ if (truncateFile) {
+ taosFtruncateFile(pFile, 0);
+ }
+ taosUnLockFile(pFile);
+ taosCloseFile(&pFile);
+ taosMemoryFree(buf);
+
+ *pMsg = NULL;
+ *pMsgLen = 0;
+ *pFd = NULL;
+}
+
+void taosReleaseCrashLogFile(TdFilePtr pFile, bool truncateFile) {
+ if (truncateFile) {
+ taosFtruncateFile(pFile, 0);
+ }
+
+ taosUnLockFile(pFile);
+ taosCloseFile(&pFile);
+}
+
#ifdef NDEBUG
bool taosAssertRelease(bool condition) {
if (condition) return false;
@@ -833,7 +1045,7 @@ bool taosAssertRelease(bool condition) {
int32_t dflag = 255; // tsLogEmbedded ? 255 : uDebugFlag
taosPrintLog(flags, level, dflag, "tAssert called in release mode, exit:%d", tsAssert);
- taosPrintTrace(flags, level, dflag);
+ taosPrintTrace(flags, level, dflag, 0);
if (tsAssert) {
taosMsleep(300);
@@ -842,4 +1054,4 @@ bool taosAssertRelease(bool condition) {
return true;
}
-#endif
\ No newline at end of file
+#endif
diff --git a/source/util/src/tqueue.c b/source/util/src/tqueue.c
index 42b6358893..3769da6ccd 100644
--- a/source/util/src/tqueue.c
+++ b/source/util/src/tqueue.c
@@ -339,7 +339,6 @@ void taosRemoveFromQset(STaosQset *qset, STaosQueue *queue) {
STaosQueue *prev = qset->head;
tqueue = qset->head->next;
while (tqueue) {
- assert(tqueue->qset);
if (tqueue == queue) {
prev->next = tqueue->next;
break;
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index d55e4f919b..c2810dbffc 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -82,6 +82,7 @@
,,y,script,./test.sh -f tsim/insert/tcp.sim
,,y,script,./test.sh -f tsim/insert/update0.sim
,,y,script,./test.sh -f tsim/insert/update1_sort_merge.sim
+,,y,script,./test.sh -f tsim/insert/update2.sim
,,y,script,./test.sh -f tsim/parser/alter__for_community_version.sim
,,y,script,./test.sh -f tsim/parser/alter_column.sim
,,y,script,./test.sh -f tsim/parser/alter_stable.sim
@@ -246,6 +247,8 @@
,,y,script,./test.sh -f tsim/stream/fillIntervalPartitionBy.sim
,,y,script,./test.sh -f tsim/stream/fillIntervalPrevNext.sim
,,y,script,./test.sh -f tsim/stream/fillIntervalValue.sim
+,,y,script,./test.sh -f tsim/stream/tableAndTag0.sim
+,,y,script,./test.sh -f tsim/stream/tableAndTag1.sim
,,y,script,./test.sh -f tsim/trans/lossdata1.sim
,,y,script,./test.sh -f tsim/trans/create_db.sim
,,y,script,./test.sh -f tsim/tmq/basic1.sim
@@ -425,8 +428,8 @@
,,n,system-test,python3 ./test.py -f 0-others/compatibility.py
,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/alter_database.py
,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/influxdb_line_taosc_insert.py
-,,n,system-test,./pytest.sh python3 ./test.py -f 1-insert/opentsdb_telnet_line_taosc_insert.py
-,,n,system-test,./pytest.sh python3 ./test.py -f 1-insert/opentsdb_json_taosc_insert.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/opentsdb_telnet_line_taosc_insert.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/opentsdb_json_taosc_insert.py
,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/test_stmt_muti_insert_query.py
,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/test_stmt_set_tbname_tag.py
,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/alter_stable.py
diff --git a/tests/script/api/dbTableRoute.c b/tests/script/api/dbTableRoute.c
index 2cf721875a..bbf17c41e4 100644
--- a/tests/script/api/dbTableRoute.c
+++ b/tests/script/api/dbTableRoute.c
@@ -26,7 +26,10 @@
#include
#include "taos.h"
-int rtTables = 20;
+#define RT_TABLE_NUM 100
+
+int rtTables = RT_TABLE_NUM;
+int rtTableUs[RT_TABLE_NUM] = {0};
char hostName[128];
static void rtExecSQL(TAOS *taos, char *command) {
@@ -101,6 +104,22 @@ int rtPrepare(TAOS ** p, int prefix, int suffix) {
return 0;
}
+int32_t rtGetTimeOfDay(struct timeval *tv) {
+ return gettimeofday(tv, NULL);
+}
+static int64_t rtGetTimestampMs() {
+ struct timeval systemTime;
+ rtGetTimeOfDay(&systemTime);
+ return (int64_t)systemTime.tv_sec * 1000LL + (int64_t)systemTime.tv_usec/1000;
+}
+
+static int64_t rtGetTimestampUs() {
+ struct timeval systemTime;
+ rtGetTimeOfDay(&systemTime);
+ return (int64_t)systemTime.tv_sec * 1000000LL + (int64_t)systemTime.tv_usec;
+}
+
+
int rtGetDbRouteInfo(TAOS * taos) {
TAOS_DB_ROUTE_INFO dbInfo;
int code = taos_get_db_route_info(taos, "db1", &dbInfo);
@@ -126,7 +145,10 @@ int rtGetTableRouteInfo(TAOS * taos) {
char sql[1024] = {0};
for (int32_t i = 0; i < rtTables; ++i) {
sprintf(table, "tb%d", i);
+ int64_t startTs = rtGetTimestampUs();
int code = taos_get_table_vgId(taos, "db1", table, &vgId1);
+ int64_t endTs = rtGetTimestampUs();
+ rtTableUs[i] = (int)(endTs - startTs);
if (code) {
rtExit("taos_get_table_vgId", taos_errstr(NULL));
}
@@ -142,9 +164,61 @@ int rtGetTableRouteInfo(TAOS * taos) {
}
}
+ printf("table vgId use us:");
+
+ for (int32_t i = 0; i < rtTables; ++i) {
+ printf("%d ", rtTableUs[i]);
+ }
+
+ printf("\n");
+
return 0;
}
+int rtGetTablesRouteInfo(TAOS * taos) {
+ char *table = {0};
+ int *vgId1 = malloc(rtTables * sizeof(int));
+ int vgId2 = 0;
+ char sql[1024] = {0};
+ const char *tbs[RT_TABLE_NUM] = {0};
+
+ for (int32_t i = 0; i < rtTables; ++i) {
+ table = malloc(10);
+ sprintf(table, "tb%d", i);
+ tbs[i] = table;
+ }
+
+ int64_t startTs = rtGetTimestampUs();
+ int code = taos_get_tables_vgId(taos, "db1", tbs, rtTables, vgId1);
+ int64_t endTs = rtGetTimestampUs();
+ rtTableUs[0] = (int)(endTs - startTs);
+ if (code) {
+ rtExit("taos_get_tables_vgId", taos_errstr(NULL));
+ }
+
+ for (int32_t i = 0; i < rtTables; ++i) {
+ sprintf(sql, "select vgroup_id from information_schema.ins_tables where table_name=\"tb%d\"", i);
+
+ rtFetchVgId(taos, sql, &vgId2);
+ if (vgId1[i] != vgId2) {
+ fprintf(stderr, "!!!! table tb%d vgId mis-match, vgId(api):%d, vgId(sys):%d\n", i, vgId1[i], vgId2);
+ exit(1);
+ } else {
+ printf("table tb%d vgId %d\n", i, vgId1[i]);
+ }
+ }
+
+ printf("tables vgId use us:%d\n", rtTableUs[0]);
+
+ for (int32_t i = 0; i < rtTables; ++i) {
+ free((void*)tbs[i]);
+ }
+ free(vgId1);
+
+ return 0;
+}
+
+
void rtClose(TAOS * taos) {
taos_close(taos);
}
@@ -170,6 +244,16 @@ int rtRunCase2(void) {
return 0;
}
+int rtRunCase3(void) {
+ TAOS *taos = NULL;
+ rtPrepare(&taos, 0, 0);
+ rtGetTablesRouteInfo(taos);
+ rtClose(taos);
+
+ return 0;
+}
+
+
int main(int argc, char *argv[]) {
if (argc != 2) {
printf("usage: %s server-ip\n", argv[0]);
@@ -182,6 +266,7 @@ int main(int argc, char *argv[]) {
rtRunCase1();
rtRunCase2();
+ rtRunCase3();
int32_t l = 5;
while (l) {
diff --git a/tests/script/tsim/insert/update2.sim b/tests/script/tsim/insert/update2.sim
new file mode 100644
index 0000000000..d2b5b05267
--- /dev/null
+++ b/tests/script/tsim/insert/update2.sim
@@ -0,0 +1,221 @@
+################################################################################################
+# migrate from 2.0 insert_update2.sim
+################################################################################################
+
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 2000
+sql connect
+
+### 4096*0.8 - 1 = 3275
+$rowSuperBlk = 3275
+### 4096 - 3275 -1 - 1 = 819
+$rowSubBlk = 819
+$ts0 = 1672372800000
+$ts1 = 1672372900000
+$ts2 = 1672686800000
+
+$i = 0
+$db = db0
+$stb1 = stb1
+$tb1 = tb1
+$stb2 = stb2
+$tb2 = tb2
+
+print ====== create database
+sql drop database if exists $db
+sql create database $db keep 1000 duration 10
+print ====== create tables
+sql use $db
+sql create table $stb1 (ts timestamp, c1 bigint, c2 bigint, c3 bigint) tags(t1 int)
+sql create table $stb2 (ts timestamp, c1 bigint, c2 bigint, c3 bigint, c4 bigint, c5 bigint, c6 bigint, c7 bigint, c8 bigint, c9 bigint, c10 bigint, c11 bigint, c12 bigint, c13 bigint, c14 bigint, c15 bigint, c16 bigint, c17 bigint, c18 bigint, c19 bigint, c20 bigint, c21 bigint, c22 bigint, c23 bigint, c24 bigint, c25 bigint, c26 bigint, c27 bigint, c28 bigint, c29 bigint, c30 bigint) tags(t1 int)
+sql create table $tb1 using $stb1 tags(1)
+sql create table $tb2 using $stb2 tags(2)
+print ====== tables created
+
+
+print ========== step 1: merge dataRow in mem
+
+$i = 0
+while $i < $rowSuperBlk
+ $xs = $i * 10
+ $ts = $ts2 + $xs
+ sql insert into $tb1 (ts,c1) values ( $ts , $i )
+ $i = $i + 1
+endw
+
+sql insert into $tb1 values ( $ts0 , 1,NULL,0)
+sql insert into $tb1 (ts,c2,c3) values ( $ts0 , 1,1)
+
+sql select * from $tb1 where ts = $ts0
+if $rows != 1 then
+ return -1
+endi
+if $data01 != 1 then
+ return -1
+endi
+if $data02 != 1 then
+ return -1
+endi
+if $data03 != 1 then
+ return -1
+endi
+
+print ========== step 2: merge kvRow in mem
+$i = 0
+while $i < $rowSuperBlk
+ $xs = $i * 10
+ $ts = $ts2 + $xs
+ sql insert into $tb2 (ts,c1) values ( $ts , $i )
+ $i = $i + 1
+endw
+
+sql insert into $tb2 (ts,c3,c8,c10) values ( $ts0 , 1,NULL,0)
+sql insert into $tb2 (ts,c8,c10) values ( $ts0 , 1,1)
+
+sql select ts,c1,c3,c8,c10 from $tb2 where ts = $ts0
+if $rows != 1 then
+ return -1
+endi
+if $data01 != NULL then
+ return -1
+endi
+if $data02 != 1 then
+ return -1
+endi
+if $data03 != 1 then
+ return -1
+endi
+if $data04 != 1 then
+ return -1
+endi
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sleep 2000
+
+print ========== step 3: merge dataRow in file
+sql insert into $tb1 (ts,c1) values ( $ts0 , 2)
+print ========== step 4: merge kvRow in file
+sql insert into $tb2 (ts,c3) values ( $ts0 , 2)
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sleep 2000
+
+sql select * from $tb1 where ts = $ts0
+if $rows != 1 then
+ return -1
+endi
+if $data01 != 2 then
+ return -1
+endi
+if $data02 != 1 then
+ return -1
+endi
+if $data03 != 1 then
+ return -1
+endi
+
+sql select ts,c1,c3,c8,c10 from $tb2 where ts = $ts0
+if $rows != 1 then
+ return -1
+endi
+if $data01 != NULL then
+ return -1
+endi
+if $data02 != 2 then
+ return -1
+endi
+if $data03 != 1 then
+ return -1
+endi
+if $data04 != 1 then
+ return -1
+endi
+
+
+print ========== step 5: merge dataRow in file/mem
+$i = 0
+while $i < $rowSubBlk
+ $xs = $i * 1
+ $ts = $ts1 + $xs
+ sql insert into $tb1 (ts,c1) values ( $ts , $i )
+ $i = $i + 1
+endw
+print ========== step 6: merge kvRow in file/mem
+$i = 0
+while $i < $rowSubBlk
+ $xs = $i * 1
+ $ts = $ts1 + $xs
+ sql insert into $tb2 (ts,c1) values ( $ts , $i )
+ $i = $i + 1
+endw
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sleep 2000
+
+sql insert into $tb1 (ts,c3) values ( $ts0 , 3)
+sql insert into $tb2 (ts,c3) values ( $ts0 , 3)
+$tsN = $ts0 + 1
+sql insert into $tb1 (ts,c1,c3) values ( $tsN , 1,0)
+sql insert into $tb2 (ts,c3,c8) values ( $tsN , 100,200)
+$tsN = $ts0 + 2
+sql insert into $tb1 (ts,c1,c3) values ( $tsN , 1,0)
+sql insert into $tb2 (ts,c3,c8) values ( $tsN , 100,200)
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sleep 2000
+
+
+sql select * from $tb1 where ts = $ts0
+if $rows != 1 then
+ return -1
+endi
+if $data01 != 2 then
+ return -1
+endi
+if $data02 != 1 then
+ return -1
+endi
+if $data03 != 3 then
+ return -1
+endi
+
+sql select ts,c1,c3,c8,c10 from $tb2 where ts = $ts0
+if $rows != 1 then
+ return -1
+endi
+if $data01 != NULL then
+ return -1
+endi
+if $data02 != 3 then
+ return -1
+endi
+if $data03 != 1 then
+ return -1
+endi
+
+if $data04 != 1 then
+ return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/parser/regressiontest.sim b/tests/script/tsim/parser/regressiontest.sim
new file mode 100644
index 0000000000..98cb0248a1
--- /dev/null
+++ b/tests/script/tsim/parser/regressiontest.sim
@@ -0,0 +1,61 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+$dbPrefix = reg_db
+$tb = tb
+$rowNum = 8200
+
+$ts0 = 1537146000000
+$delta = 100
+print ========== reg.sim
+$i = 0
+$db = $dbPrefix . $i
+
+sql drop database if exists $db -x step1
+step1:
+sql create database $db vgroups 1;
+
+sql use $db
+sql create table $tb (ts timestamp, c1 int)
+
+$i = 0
+$ts = $ts0
+
+$x = 0
+while $x < $rowNum
+$xs = $x * $delta
+$ts = $ts0 + $xs
+sql insert into $tb values ( $ts , $x )
+$x = $x + 1
+endw
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+
+sql use $db
+sql delete from $tb where ts=1537146000000
+sql delete from $tb where ts=1537146409500
+
+print =========================> TS-2410
+sql select * from $tb limit 20 offset 4090
+print $data00
+print $data10
+print $data20
+print $data30
+print $data40
+print $data50
+print $data60
+print $data70
+print $data80
+print $data90
+
+if $data40 != @18-09-17 09:06:49.600@ then
+ return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/sma/rsmaCreateInsertQuery.sim b/tests/script/tsim/sma/rsmaCreateInsertQuery.sim
index 04cf09715c..508e6f88c1 100644
--- a/tests/script/tsim/sma/rsmaCreateInsertQuery.sim
+++ b/tests/script/tsim/sma/rsmaCreateInsertQuery.sim
@@ -82,8 +82,8 @@ endi
#===================================================================
-
#==================== reboot to trigger commit data to file
+sql flush database d0;
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/tsim/sma/rsmaPersistenceRecovery.sim b/tests/script/tsim/sma/rsmaPersistenceRecovery.sim
index faff48b61c..4117a2403d 100644
--- a/tests/script/tsim/sma/rsmaPersistenceRecovery.sim
+++ b/tests/script/tsim/sma/rsmaPersistenceRecovery.sim
@@ -85,6 +85,7 @@ endi
#==================== reboot to trigger commit data to file
+sql flush database d0;
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/tsim/stream/basic3.sim b/tests/script/tsim/stream/basic3.sim
index 41e19b19af..e598919e34 100644
--- a/tests/script/tsim/stream/basic3.sim
+++ b/tests/script/tsim/stream/basic3.sim
@@ -1,6 +1,7 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c debugflag 131
+system sh/cfg.sh -n dnode1 -c debugflag -v 131
+system sh/cfg.sh -n dnode1 -c keepColumnName -v 1
system sh/exec.sh -n dnode1 -s start
sleep 5000
@@ -9,7 +10,7 @@ sql connect
print ========== interval\session\state window
-sql CREATE DATABASE test1 BUFFER 96 CACHESIZE 1 CACHEMODEL 'none' COMP 2 DURATION 14400m WAL_FSYNC_PERIOD 3000 MAXROWS 4096 MINROWS 100 KEEP 5256000m,5256000m,5256000m PAGES 256 PAGESIZE 4 PRECISION 'ms' REPLICA 1 STRICT 'off' WAL_LEVEL 1 VGROUPS 2 SINGLE_STABLE 0;
+sql CREATE DATABASE test1 VGROUPS 2;
sql use test1;
sql CREATE STABLE st (time TIMESTAMP, ca DOUBLE, cb DOUBLE, cc int) TAGS (ta VARCHAR(10) );
@@ -29,6 +30,76 @@ sql create stream streamd4 into streamt4 as select tbname, _wstart,_wend, count(
sql create stream streamd5 into streamt5 as select tbname, _wstart,_wend, count(*), max(ca), min(cb) from st where time > "2022-01-01 00:00:00" and time < "2032-01-01 00:00:00" partition by tbname state_window(cc);
sql create stream streamd6 into streamt6 as select ca, _wstart,_wend, count(*), max(ca), min(cb) from t1 where time > "2022-01-01 00:00:00" and time < "2032-01-01 00:00:00" partition by ca state_window(cc);
+
+sql alter local 'keepColumnName' '1'
+
+sql CREATE STABLE `meters_test_data` (`ts` TIMESTAMP, `close` FLOAT, `parttime` TIMESTAMP, `parttime_str` VARCHAR(32)) TAGS (`id` VARCHAR(32));
+
+sql_error create stream realtime_meters fill_history 1 into realtime_meters as select last(parttime),first(close),last(close) from meters_test_data partition by tbname state_window(parttime_str);
+sql_error create stream streamd7 into streamt7 as select _wstart, _wend, count(*), first(ca), last(ca) from t1 interval(10s);
+sql_error create stream streamd71 into streamt71 as select _wstart, _wend, count(*) as ca, first(ca), last(ca) as c2 from t1 interval(10s);
+
+sql create stream streamd8 into streamt8 as select _wstart, _wend, count(*), first(ca) as c1, last(ca) as c2 from t1 interval(10s);
+sql desc streamt8;
+
+if $rows == 0 then
+ return -1
+endi
+
+sql create stream streamd9 into streamt9 as select _wstart, _wend, count(*), first(ca) as c1, last(ca) from t1 interval(10s);
+sql desc streamt9;
+
+if $rows == 0 then
+ return -1
+endi
+
+sql_error create stream streamd11 into streamd11 as select _wstart, _wend, count(*), last(ca), last(ca) from t1 interval(10s);
+
+sql alter local 'keepColumnName' '0'
+
+sql create stream realtime_meters fill_history 1 into realtime_meters as select last(parttime),first(close),last(close) from meters_test_data partition by tbname state_window(parttime_str);
+
+sql desc realtime_meters;
+
+if $rows == 0 then
+ return -1
+endi
+
+sql create stream streamd7 into streamt7 as select _wstart, _wend, count(*), first(ca), last(ca) from t1 interval(10s);
+
+sql desc streamt7;
+
+if $rows == 0 then
+ return -1
+endi
+
+sql create stream streamd71 into streamt71 as select _wstart, _wend, count(*) as ca, first(ca), last(ca) as c2 from t1 interval(10s);
+
+sql desc streamt71;
+
+if $rows == 0 then
+ return -1
+endi
+
+sql create stream streamd10 into streamd10 as select _wstart, _wend, count(*), first(ca), last(cb) as c2 from t1 interval(10s);
+
+sql desc streamd10;
+
+if $rows == 0 then
+ return -1
+endi
+
+sql_error create stream streamd11 into streamd11 as select _wstart, _wend, count(*), last(ca), last(ca) from t1 interval(10s);
+
+
+sql create stream streamd12 into streamd12 as select _wstart, _wend, count(*), last(ca), last(cb) as c2 from t1 interval(10s);
+
+sql desc streamd12;
+
+if $rows == 0 then
+ return -1
+endi
+
sleep 3000
sql drop stream if exists streamd1;
diff --git a/tests/script/tsim/stream/tableAndTag0.sim b/tests/script/tsim/stream/tableAndTag0.sim
new file mode 100644
index 0000000000..5e02171bee
--- /dev/null
+++ b/tests/script/tsim/stream/tableAndTag0.sim
@@ -0,0 +1,273 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+
+print ===== step1
+
+system sh/exec.sh -n dnode1 -s start
+sleep 50
+sql connect
+
+print ===== step2
+print ===== table name
+
+sql create database result vgroups 1;
+
+sql create database test vgroups 4;
+sql use test;
+
+
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql_error create stream streams1 trigger at_once into result.streamt SUBTABLE("aaa") as select _wstart, count(*) c1 from st interval(10s);
+sql create stream streams1 trigger at_once into result.streamt SUBTABLE(concat("aaa-", tbname)) as select _wstart, count(*) c1 from st partition by tbname interval(10s);
+sql insert into t1 values(1648791213000,1,2,3);
+sql insert into t2 values(1648791213000,1,2,3);
+
+$loop_count = 0
+loop0:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select table_name from information_schema.ins_tables where db_name="result" order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop0
+endi
+
+if $data00 != aaa-t1 then
+ print =====data00=$data00
+ goto loop0
+endi
+
+if $data10 != aaa-t2 then
+ print =====data10=$data10
+ goto loop0
+endi
+
+$loop_count = 0
+loop1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select * from result.streamt;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop1
+endi
+
+
+print ===== step3
+print ===== tag name
+
+sql create database result2 vgroups 1;
+
+sql create database test2 vgroups 4;
+sql use test2;
+
+
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql create stream streams2 trigger at_once into result2.streamt2 TAGS(cc varchar(100)) as select _wstart, count(*) c1 from st partition by concat("tag-", tbname) as cc interval(10s);
+sql insert into t1 values(1648791213000,1,2,3);
+sql insert into t2 values(1648791213000,1,2,3);
+
+
+$loop_count = 0
+loop2:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select tag_name from information_schema.ins_tags where db_name="result2" and stable_name = "streamt2" order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop2
+endi
+
+if $data00 != cc then
+ print data00 != cc
+ print =====data00=$data00
+ goto loop2
+endi
+
+if $data10 != cc then
+ print =====data10=$data10
+ goto loop2
+endi
+
+sql select cc from result2.streamt2 order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop2
+endi
+
+if $data00 != tag-t1 then
+ print data00 != tag-t1
+ print =====data00=$data00
+ goto loop2
+endi
+
+if $data10 != tag-t2 then
+ print =====data10=$data10
+ goto loop2
+endi
+
+$loop_count = 0
+loop3:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select * from result2.streamt2;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop3
+endi
+
+
+print ===== step4
+print ===== tag name + table name
+
+sql create database result3 vgroups 1;
+
+sql create database test3 vgroups 4;
+sql use test3;
+
+
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql create stream streams3 trigger at_once into result3.streamt3 TAGS(dd varchar(100)) SUBTABLE(concat("tbn-", tbname)) as select _wstart, count(*) c1 from st partition by concat("tag-", tbname) as dd, tbname interval(10s);
+sql insert into t1 values(1648791213000,1,2,3);
+sql insert into t2 values(1648791213000,1,2,3);
+
+
+$loop_count = 0
+loop4:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select tag_name from information_schema.ins_tags where db_name="result3" and stable_name = "streamt3" order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop4
+endi
+
+if $data00 != dd then
+ print =====data00=$data00
+ goto loop4
+endi
+
+if $data10 != dd then
+ print =====data10=$data10
+ goto loop4
+endi
+
+sql select dd from result3.streamt3 order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop4
+endi
+
+if $data00 != tag-t1 then
+ print =====data00=$data00
+ goto loop4
+endi
+
+if $data10 != tag-t2 then
+ print =====data10=$data10
+ goto loop4
+endi
+
+$loop_count = 0
+loop5:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select * from result3.streamt3;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop5
+endi
+
+$loop_count = 0
+loop6:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select table_name from information_schema.ins_tables where db_name="result3" order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop6
+endi
+
+if $data00 != tbn-t1 then
+ print =====data00=$data00
+ goto loop6
+endi
+
+if $data10 != tbn-t2 then
+ print =====data10=$data10
+ goto loop6
+endi
+
+
+print ======over
+
+system sh/stop_dnodes.sh
diff --git a/tests/script/tsim/stream/tableAndTag1.sim b/tests/script/tsim/stream/tableAndTag1.sim
new file mode 100644
index 0000000000..74f67c1fb3
--- /dev/null
+++ b/tests/script/tsim/stream/tableAndTag1.sim
@@ -0,0 +1,275 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+
+print ===== step1
+
+system sh/exec.sh -n dnode1 -s start
+sleep 50
+sql connect
+
+print ===== step2
+print ===== table name
+
+sql create database result vgroups 1;
+
+sql create database test vgroups 4;
+sql use test;
+
+
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql_error create stream streams1 trigger at_once into result.streamt SUBTABLE("aaa") as select _wstart, count(*) c1 from st interval(10s);
+sql create stream streams1 trigger at_once into result.streamt SUBTABLE( concat("aaa-", cast(a as varchar(10) ) ) ) as select _wstart, count(*) c1 from st partition by a interval(10s);
+print ===== insert into 1
+sql insert into t1 values(1648791213000,1,2,3);
+sql insert into t2 values(1648791213000,2,2,3);
+
+$loop_count = 0
+loop0:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select table_name from information_schema.ins_tables where db_name="result" order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ print $data20 $data30
+ goto loop0
+endi
+
+if $data00 != aaa-1 then
+ print =====data00=$data00
+ goto loop0
+endi
+
+if $data10 != aaa-2 then
+ print =====data10=$data10
+ goto loop0
+endi
+
+$loop_count = 0
+loop1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select * from result.streamt;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop1
+endi
+
+
+print ===== step3
+print ===== column name
+
+sql create database result2 vgroups 1;
+
+sql create database test2 vgroups 4;
+sql use test2;
+
+
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql create stream streams2 trigger at_once into result2.streamt2 TAGS(cc varchar(100)) as select _wstart, count(*) c1 from st partition by concat("col-", cast(a as varchar(10) ) ) as cc interval(10s);
+print ===== insert into 2
+sql insert into t1 values(1648791213000,1,2,3);
+sql insert into t2 values(1648791213000,2,2,3);
+
+
+$loop_count = 0
+loop2:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select tag_name from information_schema.ins_tags where db_name="result2" and stable_name = "streamt2" order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop2
+endi
+
+if $data00 != cc then
+ print =====data00=$data00
+ goto loop2
+endi
+
+if $data10 != cc then
+ print =====data10=$data10
+ goto loop2
+endi
+
+sql select cc from result2.streamt2 order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop2
+endi
+
+if $data00 != col-1 then
+ print =====data00=$data00
+ goto loop2
+endi
+
+if $data10 != col-2 then
+ print =====data10=$data10
+ goto loop2
+endi
+
+$loop_count = 0
+loop3:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select * from result2.streamt2;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop3
+endi
+
+
+print ===== step4
+print ===== column name + table name
+
+sql create database result3 vgroups 1;
+
+sql create database test3 vgroups 4;
+sql use test3;
+
+
+sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql create stream streams3 trigger at_once into result3.streamt3 TAGS(dd varchar(100)) SUBTABLE(concat("tbn-", cast(a as varchar(10) ) ) ) as select _wstart, count(*) c1 from st partition by concat("col-", cast(a as varchar(10) ) ) as dd, a interval(10s);
+print ===== insert into 3
+sql insert into t1 values(1648791213000,1,2,3);
+sql insert into t2 values(1648791213000,2,2,3);
+
+
+$loop_count = 0
+loop4:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select tag_name from information_schema.ins_tags where db_name="result3" and stable_name = "streamt3" order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop4
+endi
+
+if $data00 != dd then
+ print =====data00=$data00
+ goto loop4
+endi
+
+if $data10 != dd then
+ print =====data10=$data10
+ goto loop4
+endi
+
+sql select dd from result3.streamt3 order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop4
+endi
+
+if $data00 != col-1 then
+ print =====data00=$data00
+ goto loop4
+endi
+
+if $data10 != col-2 then
+ print =====data10=$data10
+ goto loop4
+endi
+
+$loop_count = 0
+loop5:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select * from result3.streamt3;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop5
+endi
+
+$loop_count = 0
+loop6:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+sql select table_name from information_schema.ins_tables where db_name="result3" order by 1;
+
+if $rows != 2 then
+ print =====rows=$rows
+ print $data00 $data10
+ goto loop6
+endi
+
+if $data00 != tbn-1 then
+ print =====data00=$data00
+ goto loop6
+endi
+
+if $data10 != tbn-2 then
+ print =====data10=$data10
+ goto loop6
+endi
+
+
+print ======over
+
+system sh/stop_dnodes.sh
diff --git a/tests/script/tsim/stream/windowClose.sim b/tests/script/tsim/stream/windowClose.sim
index 9fcdcfb959..d3bc25d731 100644
--- a/tests/script/tsim/stream/windowClose.sim
+++ b/tests/script/tsim/stream/windowClose.sim
@@ -68,7 +68,7 @@ sql select * from streamt2;
if $rows != 1 then
print ======streamt2=$rows
- return -1
+ goto loop1
endi
sql select * from streamt3;
@@ -80,7 +80,7 @@ endi
sql select * from streamt4;
if $rows != 1 then
print ======streamt4=$rows
- return -1
+ goto loop1
endi
sql select * from streamt5;
@@ -92,7 +92,7 @@ endi
sql select * from streamt6;
if $rows != 1 then
print ======streamt6=$rows
- return -1
+ goto loop1
endi
sql select * from streamt7;
@@ -104,7 +104,7 @@ endi
sql select * from streamt8;
if $rows != 1 then
print ======streamt8=$rows
- return -1
+ goto loop1
endi
sql select * from streamt9;
@@ -116,7 +116,7 @@ endi
sql select * from streamt10;
if $rows != 1 then
print ======streamt10=$rows
- return -1
+ goto loop1
endi
sql select * from streamt11;
@@ -125,4 +125,6 @@ if $rows != 2 then
goto loop1
endi
+print ======over
+
system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/system-test/2-query/json_tag.py b/tests/system-test/2-query/json_tag.py
index 1c2a6055bc..df460df5c3 100644
--- a/tests/system-test/2-query/json_tag.py
+++ b/tests/system-test/2-query/json_tag.py
@@ -408,8 +408,8 @@ class TDTestCase:
# test group by & order by json tag
tdSql.query(f"select ts,jtag->'tag1' from {dbname}.jsons1 partition by jtag->'tag1' order by jtag->'tag1' desc")
tdSql.checkRows(11)
- tdSql.checkData(0, 1, '"femail"')
- tdSql.checkData(2, 1, '"收到货"')
+ tdSql.checkData(0, 1, '"收到货"')
+ tdSql.checkData(2, 1, '"femail"')
tdSql.checkData(7, 1, "false")
@@ -421,9 +421,10 @@ class TDTestCase:
tdSql.query(f"select count(*),jtag->'tag1' from {dbname}.jsons1 group by jtag->'tag1' order by jtag->'tag1' desc")
tdSql.checkRows(8)
tdSql.checkData(0, 0, 2)
- tdSql.checkData(0, 1, '"femail"')
+ tdSql.checkData(0, 1, '"收到货"')
+ tdSql.checkData(1, 1, '"femail"')
tdSql.checkData(1, 0, 2)
- tdSql.checkData(1, 1, '"收到货"')
+
tdSql.checkData(2, 0, 1)
tdSql.checkData(2, 1, "11.000000000")
tdSql.checkData(5, 0, 1)
@@ -437,7 +438,7 @@ class TDTestCase:
tdSql.checkData(5, 0, 1)
tdSql.checkData(5, 1, "11.000000000")
tdSql.checkData(7, 0, 2)
- tdSql.checkData(7, 1, '"femail"')
+ tdSql.checkData(7, 1, '"收到货"')
# test stddev with group by json tag
tdSql.query(f"select stddev(dataint),jtag->'tag1' from {dbname}.jsons1 group by jtag->'tag1' order by jtag->'tag1'")
@@ -445,8 +446,8 @@ class TDTestCase:
tdSql.checkData(0, 1, None)
tdSql.checkData(4, 0, 0)
tdSql.checkData(4, 1, "5.000000000")
- tdSql.checkData(7, 0, 11)
- tdSql.checkData(7, 1, '"femail"')
+ tdSql.checkData(6, 0, 11)
+ tdSql.checkData(7, 1, '"收到货"')
res = tdSql.getColNameList(f"select stddev(dataint),jsons1.jtag->'tag1' from {dbname}.jsons1 group by jsons1.jtag->'tag1' order by jtag->'tag1'")
cname_list = []
diff --git a/tests/system-test/2-query/sml.py b/tests/system-test/2-query/sml.py
index d5439d05de..ec6309c71a 100644
--- a/tests/system-test/2-query/sml.py
+++ b/tests/system-test/2-query/sml.py
@@ -15,6 +15,9 @@ sys.path.append("./7-tmq")
from tmqCommon import *
class TDTestCase:
+ updatecfgDict = {'clientCfg': {'smlChildTableName': 'dataModelName', 'fqdn': 'localhost'}, 'fqdn': 'localhost'}
+ print("===================: ", updatecfgDict)
+
def init(self, conn, logSql, replicaVar=1):
self.replicaVar = int(replicaVar)
tdLog.debug(f"start to excute {__file__}")
@@ -22,8 +25,10 @@ class TDTestCase:
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
def checkFileContent(self, dbname="sml_db"):
+ simClientCfg="%s/taos.cfg"%tdDnodes.getSimCfgPath()
buildPath = tdCom.getBuildPath()
- cmdStr = '%s/build/bin/sml_test'%(buildPath)
+ cmdStr = '%s/build/bin/sml_test %s'%(buildPath, simClientCfg)
+ print("cmdStr:", cmdStr)
tdLog.info(cmdStr)
ret = os.system(cmdStr)
if ret != 0:
diff --git a/tools/shell/CMakeLists.txt b/tools/shell/CMakeLists.txt
index 1e7d0ed140..342d6410d2 100644
--- a/tools/shell/CMakeLists.txt
+++ b/tools/shell/CMakeLists.txt
@@ -26,6 +26,10 @@ ELSE ()
SET(LINK_WEBSOCKET "")
ENDIF ()
+IF (CUS_NAME OR CUS_PROMPT OR CUS_EMAIL)
+ ADD_DEFINITIONS(-I${CMAKE_CURRENT_SOURCE_DIR}/../../../enterprise/packaging)
+ENDIF (CUS_NAME OR CUS_PROMPT OR CUS_EMAIL)
+
if(TD_WINDOWS)
target_link_libraries(shell PUBLIC taos_static ${LINK_WEBSOCKET})
else()
diff --git a/tools/shell/inc/shellAuto.h b/tools/shell/inc/shellAuto.h
index b7bf5fa101..f3ea87e4a5 100644
--- a/tools/shell/inc/shellAuto.h
+++ b/tools/shell/inc/shellAuto.h
@@ -24,13 +24,13 @@ void pressTabKey(SShellCmd* cmd);
// press othr key
void pressOtherKey(char c);
-// init shell auto funciton , shell start call once
+// init shell auto function , shell start call once
bool shellAutoInit();
// set conn
void shellSetConn(TAOS* conn);
-// exit shell auto funciton, shell exit call once
+// exit shell auto function, shell exit call once
void shellAutoExit();
// callback autotab module
diff --git a/tools/shell/inc/shellInt.h b/tools/shell/inc/shellInt.h
index af724c1533..6b3bc56dc7 100644
--- a/tools/shell/inc/shellInt.h
+++ b/tools/shell/inc/shellInt.h
@@ -80,8 +80,9 @@ typedef struct {
} SShellArgs;
typedef struct {
- const char* clientVersion;
- const char* promptHeader;
+ const char *clientVersion;
+ char cusName[32];
+ char promptHeader[32];
const char* promptContinue;
const char* osname;
int32_t promptSize;
diff --git a/tools/shell/inc/shellTire.h b/tools/shell/inc/shellTire.h
index bdcf7bcfb3..e87c3ee4f3 100644
--- a/tools/shell/inc/shellTire.h
+++ b/tools/shell/inc/shellTire.h
@@ -19,7 +19,7 @@
//
// The prefix search tree is a efficient storage words and search words tree, it support 95 visible ascii code character
//
-#define FIRST_ASCII 40 // first visiable char is '0'
+#define FIRST_ASCII 40 // first visible char is '0'
#define LAST_ASCII 122 // last visilbe char is 'z'
// capacity save char is 95
diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
index 4d40de66bd..d899249b97 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -19,10 +19,25 @@
#include "shellInt.h"
-#define TAOS_CONSOLE_PROMPT_HEADER "taos> "
+#ifndef CUS_NAME
+ char cusName[] = "TDengine";
+#endif
+
+#ifndef CUS_PROMPT
+ char cusPrompt[] = "taos";
+#endif
+
+#ifndef CUS_EMAIL
+ char cusEmail[] = "";
+#endif
+
+#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
+#include "cus_name.h"
+#endif
+
#define TAOS_CONSOLE_PROMPT_CONTINUE " -> "
-#define SHELL_HOST "TDengine server FQDN to connect. The default host is localhost."
+#define SHELL_HOST "The server FQDN to connect. The default host is localhost."
#define SHELL_PORT "The TCP/IP port number to use for the connection."
#define SHELL_USER "The user name to use when connecting to the server."
#define SHELL_PASSWORD "The password to use when connecting to the server."
@@ -41,7 +56,6 @@
#define SHELL_PKT_LEN "Packet length used for net test, default is 1024 bytes."
#define SHELL_PKT_NUM "Packet numbers used for net test, default is 100."
#define SHELL_VERSION "Print program version."
-#define SHELL_EMAIL ""
#ifdef WEBSOCKET
#define SHELL_DSN "The dsn to use when connecting to cloud server."
@@ -78,7 +92,7 @@ void shellPrintHelp() {
#endif
printf("%s%s%s%s\r\n", indent, "-w,", indent, SHELL_WIDTH);
printf("%s%s%s%s\r\n", indent, "-V,", indent, SHELL_VERSION);
- printf("\r\n\r\nReport bugs to %s.\r\n", SHELL_EMAIL);
+ printf("\r\n\r\nReport bugs to %s.\r\n", cusEmail);
}
#ifdef LINUX
@@ -86,7 +100,7 @@ void shellPrintHelp() {
#include
const char *argp_program_version = version;
-const char *argp_program_bug_address = SHELL_EMAIL;
+const char *argp_program_bug_address = cusEmail;
static struct argp_option shellOptions[] = {
{"host", 'h', "HOST", 0, SHELL_HOST},
@@ -388,12 +402,13 @@ static int32_t shellCheckArgs() {
int32_t shellParseArgs(int32_t argc, char *argv[]) {
shellInitArgs(argc, argv);
- shell.info.clientVersion =
- "Welcome to the TDengine Command Line Interface, Client Version:%s\r\n"
- "Copyright (c) 2022 by TDengine, all rights reserved.\r\n\r\n";
- shell.info.promptHeader = TAOS_CONSOLE_PROMPT_HEADER;
+ shell.info.clientVersion =
+ "Welcome to the %s Command Line Interface, Client Version:%s\r\n"
+ "Copyright (c) 2022 by %s, all rights reserved.\r\n\r\n";
+ strcpy(shell.info.cusName, cusName);
+ sprintf(shell.info.promptHeader, "%s> ", cusPrompt);
shell.info.promptContinue = TAOS_CONSOLE_PROMPT_CONTINUE;
- shell.info.promptSize = 6;
+ shell.info.promptSize = strlen(shell.info.promptHeader);
snprintf(shell.info.programVersion, sizeof(shell.info.programVersion), "version: %s", version);
#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
diff --git a/tools/shell/src/shellAuto.c b/tools/shell/src/shellAuto.c
index 45ff694e72..81af5d7fe8 100644
--- a/tools/shell/src/shellAuto.c
+++ b/tools/shell/src/shellAuto.c
@@ -264,7 +264,7 @@ char* key_tags[] = {"tags("};
char* key_select[] = {"select "};
//
-// ------- gobal variant define ---------
+// ------- global variant define ---------
//
int32_t firstMatchIndex = -1; // first match shellCommands index
int32_t lastMatchIndex = -1; // last match shellCommands index
@@ -329,7 +329,15 @@ int cntDel = 0; // delete byte count after next press tab
// show auto tab introduction
void printfIntroduction() {
printf(" ****************************** Tab Completion **********************************\n");
- printf(" * The TDengine CLI supports tab completion for a variety of items, *\n");
+ char secondLine[160] = "\0";
+ sprintf(secondLine, " * The %s CLI supports tab completion for a variety of items, ",
+ shell.info.cusName);
+ printf("%s", secondLine);
+ int secondLineLen = strlen(secondLine);
+ while (84-(secondLineLen++) > 0) {
+ printf(" ");
+ }
+ printf("*\n");
printf(" * including database names, table names, function names and keywords. *\n");
printf(" * The full list of shortcut keys is as follows: *\n");
printf(" * [ TAB ] ...... complete the current word *\n");
@@ -344,7 +352,7 @@ void printfIntroduction() {
}
void showHelp() {
- printf("\nThe TDengine CLI supports the following commands:");
+ printf("\nThe %s CLI supports the following commands:", shell.info.cusName);
printf(
"\n\
----- A ----- \n\
@@ -595,7 +603,7 @@ void GenerateVarType(int type, char** p, int count) {
// -------------------- shell auto ----------------
//
-// init shell auto funciton , shell start call once
+// init shell auto function , shell start call once
bool shellAutoInit() {
// command
int32_t count = SHELL_COMMAND_COUNT();
@@ -628,7 +636,7 @@ bool shellAutoInit() {
// set conn
void shellSetConn(TAOS* conn) { varCon = conn; }
-// exit shell auto funciton, shell exit call once
+// exit shell auto function, shell exit call once
void shellAutoExit() {
// free command
int32_t count = SHELL_COMMAND_COUNT();
@@ -645,7 +653,7 @@ void shellAutoExit() {
}
}
taosThreadMutexUnlock(&tiresMutex);
- // destory
+ // destroy
taosThreadMutexDestroy(&tiresMutex);
// free threads
@@ -666,7 +674,7 @@ void shellAutoExit() {
//
// ------------------- auto ptr for tires --------------------------
//
-bool setNewAuotPtr(int type, STire* pNew) {
+bool setNewAutoPtr(int type, STire* pNew) {
if (pNew == NULL) return false;
taosThreadMutexLock(&tiresMutex);
@@ -709,13 +717,13 @@ void putBackAutoPtr(int type, STire* tire) {
if (tires[type] != tire) {
// update by out, can't put back , so free
if (--tire->ref == 1) {
- // support multi thread getAuotPtr
+ // support multi thread getAutoPtr
freeTire(tire);
}
} else {
tires[type]->ref--;
- assert(tires[type]->ref > 0);
+ ASSERT(tires[type]->ref > 0);
}
taosThreadMutexUnlock(&tiresMutex);
@@ -764,7 +772,7 @@ int writeVarNames(int type, TAOS_RES* tres) {
} while (row != NULL);
// replace old tire
- setNewAuotPtr(type, tire);
+ setNewAutoPtr(type, tire);
return numOfRows;
}
@@ -1032,7 +1040,7 @@ SWords* matchCommand(SWords* input, bool continueSearch) {
for (int32_t i = 0; i < count; i++) {
SWords* shellCommand = shellCommands + i;
if (continueSearch && lastMatchIndex != -1 && i <= lastMatchIndex) {
- // new match must greate than lastMatchIndex
+ // new match must greater than lastMatchIndex
if (varMode && i == lastMatchIndex) {
// do nothing, var match on lastMatchIndex
} else {
@@ -1161,7 +1169,7 @@ void createInputFromFirst(SWords* input, SWords* firstMatch) {
for (int i = 0; i < firstMatch->matchIndex && word; i++) {
// combine source from each word
strncpy(input->source + input->source_len, word->word, word->len);
- strcat(input->source, " "); // append blank splite
+ strcat(input->source, " "); // append blank space
input->source_len += word->len + 1; // 1 is blank length
// move next
word = word->next;
@@ -1390,7 +1398,7 @@ bool appendAfterSelect(TAOS* con, SShellCmd* cmd, char* sql, int32_t len) {
return true;
}
- // fill funciton
+ // fill function
if (fieldEnd) {
// fields is end , need match keyword
ret = fillWithType(con, cmd, last, WT_VAR_KEYWORD);
@@ -1573,7 +1581,7 @@ bool matchCreateTable(TAOS* con, SShellCmd* cmd) {
// tb options
if (!ret) {
- // find like create talbe st (...) tags(..)
+ // find like create table st (...) tags(..)
char* p1 = strchr(ps, ')'); // first ')' end
if (p1) {
if (strchr(p1 + 1, ')')) { // second ')' end
diff --git a/tools/shell/src/shellCommand.c b/tools/shell/src/shellCommand.c
index 5235030cf9..0e305f57e9 100644
--- a/tools/shell/src/shellCommand.c
+++ b/tools/shell/src/shellCommand.c
@@ -40,7 +40,7 @@ static void shellPositionCursorEnd(SShellCmd *cmd);
static void shellPrintChar(char c, int32_t times);
static void shellPositionCursor(int32_t step, int32_t direction);
static void shellUpdateBuffer(SShellCmd *cmd);
-static int32_t shellIsReadyGo(SShellCmd *cmd);
+static bool shellIsReadyGo(SShellCmd *cmd);
static void shellGetMbSizeInfo(const char *str, int32_t *size, int32_t *width);
static void shellResetCommand(SShellCmd *cmd, const char s[]);
void shellClearScreen(int32_t ecmd_pos, int32_t cursor_pos);
@@ -62,7 +62,8 @@ int32_t shellCountPrefixOnes(uint8_t c) {
}
void shellGetPrevCharSize(const char *str, int32_t pos, int32_t *size, int32_t *width) {
- assert(pos > 0);
+ ASSERT(pos > 0);
+ if (pos <= 0) return;
TdWchar wc;
*size = 0;
@@ -75,13 +76,14 @@ void shellGetPrevCharSize(const char *str, int32_t pos, int32_t *size, int32_t *
}
taosMbToWchar(&wc, str + pos, MB_CUR_MAX);
- // assert(rc == *size); // it will be core, if str is encode by utf8 and taos charset is gbk
+ // ASSERT(rc == *size); // it will be core, if str is encode by utf8 and taos charset is gbk
*width = taosWcharWidth(wc);
}
void shellGetNextCharSize(const char *str, int32_t pos, int32_t *size, int32_t *width) {
- assert(pos >= 0);
+ ASSERT(pos >= 0);
+ if(pos < 0) return;
TdWchar wc;
*size = taosMbToWchar(&wc, str + pos, MB_CUR_MAX);
@@ -89,7 +91,8 @@ void shellGetNextCharSize(const char *str, int32_t pos, int32_t *size, int32_t *
}
void shellInsertChar(SShellCmd *cmd, char *c, int32_t size) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
TdWchar wc;
if (taosMbToWchar(&wc, c, size) < 0) return;
@@ -135,7 +138,8 @@ void shellInsertStr(SShellCmd *cmd, char *str, int32_t size) {
}
void shellBackspaceChar(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
if (cmd->cursorOffset > 0) {
shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
@@ -155,7 +159,8 @@ void shellBackspaceChar(SShellCmd *cmd) {
}
void shellClearLineBefore(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
memmove(cmd->command, cmd->command + cmd->cursorOffset, cmd->commandSize - cmd->cursorOffset);
@@ -169,7 +174,8 @@ void shellClearLineBefore(SShellCmd *cmd) {
}
void shellClearLineAfter(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
cmd->commandSize -= cmd->endOffset - cmd->cursorOffset;
@@ -178,7 +184,8 @@ void shellClearLineAfter(SShellCmd *cmd) {
}
void shellDeleteChar(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
if (cmd->cursorOffset < cmd->commandSize) {
shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
@@ -196,7 +203,8 @@ void shellDeleteChar(SShellCmd *cmd) {
}
void shellMoveCursorLeft(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
if (cmd->cursorOffset > 0) {
shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
@@ -210,7 +218,8 @@ void shellMoveCursorLeft(SShellCmd *cmd) {
}
void shellMoveCursorRight(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
if (cmd->cursorOffset < cmd->commandSize) {
shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
@@ -224,7 +233,8 @@ void shellMoveCursorRight(SShellCmd *cmd) {
}
void shellPositionCursorHome(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
if (cmd->cursorOffset > 0) {
shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
@@ -244,7 +254,8 @@ void positionCursorMiddle(SShellCmd *cmd) {
}
void shellPositionCursorEnd(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
if (cmd->cursorOffset < cmd->commandSize) {
shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
@@ -279,7 +290,8 @@ void shellPositionCursor(int32_t step, int32_t direction) {
}
void shellUpdateBuffer(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
if (shellRegexMatch(cmd->buffer, "(\\s+$)|(^$)", REG_EXTENDED)) strcat(cmd->command, " ");
strcat(cmd->buffer, cmd->command);
@@ -293,8 +305,9 @@ void shellUpdateBuffer(SShellCmd *cmd) {
shellShowOnScreen(cmd);
}
-int32_t shellIsReadyGo(SShellCmd *cmd) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+bool shellIsReadyGo(SShellCmd *cmd) {
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return false;
char *total = (char *)taosMemoryCalloc(1, SHELL_MAX_COMMAND_SIZE);
memset(cmd->command + cmd->commandSize, 0, SHELL_MAX_COMMAND_SIZE - cmd->commandSize);
@@ -305,11 +318,11 @@ int32_t shellIsReadyGo(SShellCmd *cmd) {
"\\s*clear\\s*$)";
if (shellRegexMatch(total, reg_str, REG_EXTENDED | REG_ICASE)) {
taosMemoryFree(total);
- return 1;
+ return true;
}
taosMemoryFree(total);
- return 0;
+ return false;
}
void shellGetMbSizeInfo(const char *str, int32_t *size, int32_t *width) {
@@ -321,7 +334,8 @@ void shellGetMbSizeInfo(const char *str, int32_t *size, int32_t *width) {
}
void shellResetCommand(SShellCmd *cmd, const char s[]) {
- assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
+ if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
memset(cmd->buffer, 0, SHELL_MAX_COMMAND_SIZE);
@@ -399,7 +413,7 @@ void shellShowOnScreen(SShellCmd *cmd) {
int32_t ret = taosMbToWchar(&wc, str, MB_CUR_MAX);
if (ret < 0) break;
size += ret;
- /* assert(size >= 0); */
+ /* ASSERT(size >= 0); */
int32_t width = taosWcharWidth(wc);
if (remain_column > width) {
printf("%lc", wc);
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 986806fdd8..4a9cf83431 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -713,7 +713,7 @@ int32_t shellCalcColWidth(TAOS_FIELD *field, int32_t precision) {
}
default:
- assert(false);
+ ASSERT(false);
}
return 0;
@@ -1072,7 +1072,8 @@ void *shellThreadLoop(void *arg) {
}
int32_t shellExecute() {
- printf(shell.info.clientVersion, taos_get_client_info());
+ printf(shell.info.clientVersion, shell.info.cusName,
+ taos_get_client_info(), shell.info.cusName);
fflush(stdout);
SShellArgs *pArgs = &shell.args;
@@ -1127,7 +1128,7 @@ int32_t shellExecute() {
}
if (tsem_init(&shell.cancelSem, 0, 0) != 0) {
- printf("failed to create cancel semphore\r\n");
+ printf("failed to create cancel semaphore\r\n");
return -1;
}
diff --git a/tools/shell/src/shellUtil.c b/tools/shell/src/shellUtil.c
index 8c47d16555..e15b49efcc 100644
--- a/tools/shell/src/shellUtil.c
+++ b/tools/shell/src/shellUtil.c
@@ -50,19 +50,19 @@ bool shellRegexMatch(const char *s, const char *reg, int32_t cflags) {
int32_t shellCheckIntSize() {
if (sizeof(int8_t) != 1) {
- printf("taos int8 size is %d(!= 1)", (int)sizeof(int8_t));
+ printf("int8 size is %d(!= 1)", (int)sizeof(int8_t));
return -1;
}
if (sizeof(int16_t) != 2) {
- printf("taos int16 size is %d(!= 2)", (int)sizeof(int16_t));
+ printf("int16 size is %d(!= 2)", (int)sizeof(int16_t));
return -1;
}
if (sizeof(int32_t) != 4) {
- printf("taos int32 size is %d(!= 4)", (int)sizeof(int32_t));
+ printf("int32 size is %d(!= 4)", (int)sizeof(int32_t));
return -1;
}
if (sizeof(int64_t) != 8) {
- printf("taos int64 size is %d(!= 8)", (int)sizeof(int64_t));
+ printf("int64 size is %d(!= 8)", (int)sizeof(int64_t));
return -1;
}
return 0;
@@ -80,7 +80,7 @@ void shellGenerateAuth() {
void shellDumpConfig() {
SConfig *pCfg = taosGetCfg();
if (pCfg == NULL) {
- printf("TDengine read global config failed!\r\n");
+ printf("read global config failed!\r\n");
} else {
cfgDumpCfg(pCfg, 1, true);
}
diff --git a/tools/shell/src/shellWebsocket.c b/tools/shell/src/shellWebsocket.c
index bbb127b128..e3584b6890 100644
--- a/tools/shell/src/shellWebsocket.c
+++ b/tools/shell/src/shellWebsocket.c
@@ -235,7 +235,7 @@ void shellRunSingleCommandWebsocketImp(char *command) {
if (reconnectNum == 0) {
continue;
} else {
- fprintf(stderr, "TDengine server is disconnected, will try to reconnect\n");
+ fprintf(stderr, "The server is disconnected, will try to reconnect\n");
}
return;
}
diff --git a/utils/test/c/sml_test.c b/utils/test/c/sml_test.c
index 30d0ab27d8..01e3246ca4 100644
--- a/utils/test/c/sml_test.c
+++ b/utils/test/c/sml_test.c
@@ -211,8 +211,7 @@ int smlProcess_json3_Test() {
taos_free_result(pRes);
const char *sql[] = {
-// "[{\"metric\":\"sys.cpu.nice3\",\"timestamp\":0,\"value\":\"18\",\"tags\":{\"host\":\"web01\",\"id\":\"t1\",\"dc\":\"lga\"}}]"
- "{\"metric\": \"dcxnmr\", \"timestamp\": {\"value\": 1626006833639000000, \"type\": \"ns\"}, \"value\": {\"value\": false, \"type\": \"bool\"}, \"tags\": {\"t0\": {\"value\": false, \"type\": \"bool\"}, \"t1\": {\"value\": 127, \"type\": \"tinyint\"}, \"t2\": {\"value\": 32767, \"type\": \"smallint\"}, \"t3\": {\"value\": 2147483647, \"type\": \"int\"}, \"t4\": {\"value\": 9223372036854775807, \"type\": \"bigint\"}, \"t5\": {\"value\": 11.12345027923584, \"type\": \"float\"}, \"t6\": {\"value\": 22.123456789, \"type\": \"double\"}, \"t7\": {\"value\": \"binaryTagValue\", \"type\": \"binary\"}, \"t8\": {\"value\": \"abc{aaa\", \"type\": \"nchar\"}}}"
+ "[{\"metric\":\"sys.cpu.nice3\",\"timestamp\":0,\"value\":\"18\",\"tags\":{\"host\":\"web01\",\"id\":\"t1\",\"dc\":\"lga\"}}]"
};
char *sql1[1] = {0};
for(int i = 0; i < 1; i++){
@@ -741,26 +740,11 @@ int sml_dup_time_Test() {
taos_free_result(pRes);
const char *sql[] = {//"test_ms,t0=t c0=f 1626006833641",
- "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11."
- "12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" "
- "c0=false,c1=1i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22."
- "123456789f64,c7=\"xcxvwjvf\",c8=L\"ncharColValue\",c9=7u64 1626006833639000000",
- "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11."
- "12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" "
- "c0=T,c1=2i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22."
- "123456789f64,c7=\"fixrzcuq\",c8=L\"ncharColValue\",c9=7u64 1626006834639000000",
- "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11."
- "12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" "
- "c0=t,c1=3i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22."
- "123456789f64,c7=\"iupzdqub\",c8=L\"ncharColValue\",c9=7u64 1626006835639000000",
- "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11."
- "12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" "
- "c0=t,c1=4i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22."
- "123456789f64,c7=\"yvvtzzof\",c8=L\"ncharColValue\",c9=7u64 1626006836639000000",
- "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11."
- "12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" "
- "c0=t,c1=5i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22."
- "123456789f64,c7=\"vbxpilkj\",c8=L\"ncharColValue\",c9=7u64 1626006837639000000"};
+ "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" c0=f,c1=1i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=\"xcxvwjvf\",c8=L\"ncharColValue\",c9=7u64 1626006833639000000",
+ "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" c0=T,c1=2i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=\"fixrzcuq\",c8=L\"ncharColValue\",c9=7u64 1626006834639000000",
+ "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" c0=t,c1=3i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=\"iupzdqub\",c8=L\"ncharColValue\",c9=7u64 1626006835639000000",
+ "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" c0=t,c1=4i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=\"yvvtzzof\",c8=L\"ncharColValue\",c9=7u64 1626006836639000000",
+ "ubzlsr,id=qmtcvgd,t0=t,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" c0=t,c1=5i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=\"vbxpilkj\",c8=L\"ncharColValue\",c9=7u64 1626006837639000000"};
pRes = taos_query(taos, "use sml_db");
taos_free_result(pRes);
@@ -943,8 +927,10 @@ int sml_ttl_Test() {
pRes = taos_query(taos, "select `ttl` from information_schema.ins_tables where table_name='t_be97833a0e1f523fcdaeb6291d6fdf27'");
printf("%s result2:%s\n", __FUNCTION__, taos_errstr(pRes));
TAOS_ROW row = taos_fetch_row(pRes);
- int32_t ttl = *(int32_t*)row[0];
- ASSERT(ttl == 20);
+ if(row != NULL && *row != NULL){
+ int32_t ttl = *(int32_t*)row[0];
+ ASSERT(ttl == 20);
+ }
int code = taos_errno(pRes);
taos_free_result(pRes);
@@ -988,12 +974,64 @@ int sml_ttl_Test() {
// return sum;
//}
-int main(int argc, char *argv[]) {
+int sml_ts2385_Test() {
+ TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
+ TAOS_RES *pRes = taos_query(taos, "CREATE DATABASE IF NOT EXISTS ts2385");
+ taos_free_result(pRes);
+
+ const char *sql[] ={
+ "DataRTU,deviceId=2211230C94K0_1,dataModelName=DataRTU_2211230C94K0_1 s5=false,s18=false,k14=0,k2=0,k8=0,k10=0,s9=false,s19=false,k11=0,k13=0,s22=false,k15=0,m2=37.416671660000006,m8=600,m10=1532,m1=20.25,m13=0,s7=false,k7=0,m16=0,s17=false,k4=0,s11=false,s15=true,m7=600,m12=1490,s1=true,m14=0,s14=false,s16=true,k5=0,hex=\"7b3b00000001030301030200000000323231313233304339344b30002b01012a10028003000000070d05da025802580258025802580258045305fc05f505d200000000000000000afc7d\",k6=0,m3=600,s3=false,s24=false,k3=0,m6=600,m15=0,s12=false,k1=0,k16=0,s10=false,s21=false,k12=0,m5=600,s8=false,m4=600,m9=1107,s2=false,s13=false,s20=false,s23=false,k9=0,m11=1525,s4=false,s6=false 1672818929178749400",
+ "DataRTU,deviceId=2211230C94K0_1,dataModelName=DataRTU_2211230C94K0_1 k2=0,k11=0,m3=600,m12=1506,s17=false,m5=600,s11=false,s22=false,k6=0,m13=0,s16=true,k5=0,s21=false,m4=600,m7=600,s9=false,s10=false,s18=false,k7=0,m8=600,k1=0,hex=\"7b3a00000001030301030200000000323231313233304339344b30002b01012a10028003000000071105e8025802580258025802580258044905eb05ef05e200000000000000000afc7d\",m11=1519,m16=0,s19=false,s23=false,s24=false,s14=false,s6=false,k10=0,k15=0,k14=0,s2=false,s4=false,s8=false,s13=false,s15=true,s20=false,m2=38.000005040000005,s3=false,s7=false,k3=0,k8=0,k13=0,m6=600,m14=0,m15=0,k4=0,m1=20.450000000000003,m9=1097,s1=true,m10=1515,s5=false,s12=false,k9=0,k12=0,k16=0 1672818919126971000",
+ "DataRTU,deviceId=2211230C94K0_1,dataModelName=DataRTU_2211230C94K0_1 k7=0,k14=0,m3=600,m7=600,s5=false,k2=0,k3=0,k8=0,s3=false,s20=false,k15=0,m10=1482,s17=false,k1=0,k16=0,m15=0,s12=false,k9=0,m16=0,s11=false,m4=600,s10=false,s15=true,s24=false,m8=600,m13=0,s2=false,s18=false,k12=0,s14=false,s19=false,hex=\"7b3900000001030301030200000000323231313233304339344b30002b01012a10028003000000071505ef025802580258025802580258045005ca05b105d800000000000000000aa47d\",s1=true,s4=false,s7=false,s8=false,s13=false,m6=600,s6=false,s21=false,k11=0,m12=1496,m9=1104,s16=true,k5=0,s9=false,k10=0,k13=0,m2=38.291671730000004,s22=false,m5=600,m11=1457,m14=0,k4=0,m1=20.650000000000006,s23=false,k6=0 1672818909130866800",
+ "DataRTU,deviceId=2211230C94K0_1,dataModelName=DataRTU_2211230C94K0_1 m7=600,k4=0,k14=0,s22=false,k13=0,s2=false,m11=1510,m14=0,s4=false,s10=false,m1=21,m16=0,m13=0,s9=false,s13=false,s14=false,k10=0,m3=600,m9=1107,s18=false,s19=false,k2=0,hex=\"7b3600000001030301030200000000323231313233304339344b30002b01012a10028003000000071c0619025802580258025802580258045305dc05e6058d00000000000000000ad27d\",m2=40.04167187,m8=600,k7=0,k8=0,m10=1500,s23=false,k5=0,s11=false,s21=false,k9=0,m15=0,m12=1421,s1=true,s5=false,s8=false,m5=600,k16=0,k15=0,m6=600,s3=false,s6=false,s7=false,s15=true,s20=false,s24=false,k11=0,k1=0,k6=0,k12=0,m4=600,s16=true,s17=false,k3=0,s12=false 1672818879189483200",
+ "DataRTU,deviceId=2106070C11M0_2,dataModelName=DataRTU_2106070C11M0_2 m1=5691,k14=0,m6=0,s14=false,k8=0,s19=false,s20=false,k12=0,s17=false,k3=0,m8=0,s8=false,m7=0,s9=false,s4=false,s11=false,s13=false,s16=false,k5=0,k15=0,k16=0,s10=false,s23=false,s1=false,s2=false,s3=false,s12=false,s24=false,k2=0,k10=0,hex=\"7b1400000001030301030200000000323130363037304331314d30002b01022a080400000000000008af0c000000000000000000000000000000000000000000000000000000000ad47d\",m2=0,s7=false,s18=false,s21=false,m3=0,m5=0,k4=0,k11=0,m4=0,k1=0,k6=0,k13=0,s6=false,s15=false,s5=false,s22=false,k7=0,k9=0 1672818779549848800"
+ };
+ pRes = taos_query(taos, "use ts2385");
+ taos_free_result(pRes);
+
+ pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql) / sizeof(sql[0]), TSDB_SML_LINE_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+
+ printf("%s result:%s\n", __FUNCTION__, taos_errstr(pRes));
+ int code = taos_errno(pRes);
+ ASSERT(!code);
+ taos_free_result(pRes);
+
+ pRes = taos_query(taos, "select distinct tbname from `DataRTU` order by tbname");
+ printf("%s result2:%s\n", __FUNCTION__, taos_errstr(pRes));
+ int num = 0;
+ TAOS_ROW row = NULL;
+ while((row = taos_fetch_row(pRes))){
+ if(row[0] != NULL && num == 0){
+ ASSERT(strncmp((char *)row[0], "DataRTU_2106070C11M0_2", sizeof("DataRTU_2106070C11M0_2") - 1) == 0);
+ }
+
+ if(row[0] != NULL && num == 1){
+ ASSERT(strncmp((char *)row[0], "DataRTU_2211230C94K0_1", sizeof("DataRTU_2211230C94K0_1") - 1) == 0);
+ }
+ num++;
+ }
+ ASSERT(num == 2);
+
+ code = taos_errno(pRes);
+ taos_free_result(pRes);
+ taos_close(taos);
+
+ return code;
+}
+
+int main(int argc, char *argv[]) {
+ if(argc == 2){
+ taos_options(TSDB_OPTION_CONFIGDIR, argv[1]);
+ }
+
+ int ret = 0;
+ ret = sml_ts2385_Test();
+ ASSERT(!ret);
// for(int i = 0; i < sizeof(str)/sizeof(str[0]); i++){
// printf("str:%s \t %d\n", str[i], smlCalTypeSum(str[i], strlen(str[i])));
// }
- int ret = 0;
+// int ret = 0;
ret = sml_ttl_Test();
ASSERT(!ret);
ret = sml_ts2164_Test();