-
## TDengine 总体适用场景
作为一个 IoT 大数据平台，TDengine 的典型适用场景是在 IoT 范畴，而且用户有一定的数据量。本文后续的介绍主要针对这个范畴里面的系统。范畴之外的系统，比如 CRM，ERP 等，不在本文讨论范围内。
-
### 数据源特点和需求
从数据源角度，设计人员可以从下面几个角度分析 TDengine 在目标应用系统里面的适用性。
@@ -64,4 +63,3 @@ TDengine 的模块之一是时序数据库。但除此之外，为减少研发
|要求系统可靠运行| | | √ | TDengine 的系统架构非常稳定可靠，日常维护也简单便捷，对维护人员的要求简洁明了，最大程度上杜绝人为错误和事故。|
|要求运维学习成本可控| | | √ |同上。|
|要求市场有大量人才储备| √ | | | TDengine 作为新一代产品，目前人才市场里面有经验的人员还有限。但是学习成本低，我们作为厂家也提供运维的培训和辅助服务。|
-
diff --git a/documentation20/cn/03.architecture/docs.md b/documentation20/cn/03.architecture/docs.md
index b8ab2ca73ab51fca78becbf90435c85122982205..a92382169c62c9b79de69a92249b681a69c02139 100644
--- a/documentation20/cn/03.architecture/docs.md
+++ b/documentation20/cn/03.architecture/docs.md
@@ -250,7 +250,7 @@ vnode(虚拟数据节点)负责为采集的时序数据提供写入、查询和
创建DB时，系统并不会马上分配资源。但当创建一张表时，系统将看是否有已经分配的vnode, 且该vnode是否有空余的表空间，如果有，立即在该有空位的vnode创建表。如果没有，系统将从集群中，根据当前的负载情况，在一个dnode上创建一新的vnode, 然后创建表。如果DB有多个副本，系统不是只创建一个vnode，而是一个vgroup(虚拟数据节点组)。系统对vnode的数目没有任何限制，仅仅受限于物理节点本身的计算和存储资源。
-每张表的meda data（包含schema, 标签等）也存放于vnode里，而不是集中存放于mnode，实际上这是对Meta数据的分片，这样便于高效并行的进行标签过滤操作。
+每张表的meta data（包含schema, 标签等）也存放于vnode里，而不是集中存放于mnode，实际上这是对Meta数据的分片，这样便于高效并行的进行标签过滤操作。
### 数据分区
diff --git a/documentation20/cn/06.queries/docs.md b/documentation20/cn/06.queries/docs.md
index 294a9721e1dd4b9ea2e60308a48372dd83395010..32b74d1b23416814b39addb68303587ecc0ba3f8 100644
--- a/documentation20/cn/06.queries/docs.md
+++ b/documentation20/cn/06.queries/docs.md
@@ -3,7 +3,7 @@
## 主要查询功能
-TDengine 采用 SQL 作为查询语言。应用程序可以通过 C/C++, Java, Go, Python 连接器发送 SQL 语句，用户可以通过 TDengine 提供的命令行（Command Line Interface, CLI）工具 TAOS Shell 手动执行 SQL 即席查询（Ad-Hoc Query）。TDengine 支持如下查询功能：
+TDengine 采用 SQL 作为查询语言。应用程序可以通过 C/C++, Java, Go, C#, Python, Node.js 连接器发送 SQL 语句，用户可以通过 TDengine 提供的命令行（Command Line Interface, CLI）工具 TAOS Shell 手动执行 SQL 即席查询（Ad-Hoc Query）。TDengine 支持如下查询功能：
- 单列、多列数据查询
- 标签和数值的多种过滤条件：>, <, =, <>, like 等
diff --git a/documentation20/cn/08.connector/01.java/docs.md b/documentation20/cn/08.connector/01.java/docs.md
index 30d4474aec58f001d06781b3fd3d33c98c84cc10..110b902b2051a88e14eaa73627780e56be158928 100644
--- a/documentation20/cn/08.connector/01.java/docs.md
+++ b/documentation20/cn/08.connector/01.java/docs.md
@@ -68,18 +68,18 @@ INSERT INTO test.t1 USING test.weather (ts, temperature) TAGS('beijing') VALUES(
TDengine 目前支持时间戳、数字、字符、布尔类型，与 Java 对应类型转换如下：
-| TDengine DataType | Java DataType |
-| ----------------- | ------------------ |
-| TIMESTAMP | java.sql.Timestamp |
-| INT | java.lang.Integer |
-| BIGINT | java.lang.Long |
-| FLOAT | java.lang.Float |
-| DOUBLE | java.lang.Double |
-| SMALLINT | java.lang.Short |
-| TINYINT | java.lang.Byte |
-| BOOL | java.lang.Boolean |
-| BINARY | byte array |
-| NCHAR | java.lang.String |
+| TDengine DataType | JDBCType （driver 版本 < 2.0.24） | JDBCType （driver 版本 >= 2.0.24） |
+| ----------------- | ------------------ | ------------------ |
+| TIMESTAMP | java.lang.Long | java.sql.Timestamp |
+| INT | java.lang.Integer | java.lang.Integer |
+| BIGINT | java.lang.Long | java.lang.Long |
+| FLOAT | java.lang.Float | java.lang.Float |
+| DOUBLE | java.lang.Double | java.lang.Double |
+| SMALLINT | java.lang.Short | java.lang.Short |
+| TINYINT | java.lang.Byte | java.lang.Byte |
+| BOOL | java.lang.Boolean | java.lang.Boolean |
+| BINARY | java.lang.String | byte array |
+| NCHAR | java.lang.String | java.lang.String |
## 安装Java Connector
diff --git a/documentation20/en/01.evaluation/docs.md b/documentation20/en/01.evaluation/docs.md
index 8607cbb0250ed92d8ddc990280a993fa2f72afed..b296ae999fbf63f65422993dde4586b6bec08497 100644
--- a/documentation20/en/01.evaluation/docs.md
+++ b/documentation20/en/01.evaluation/docs.md
@@ -6,12 +6,12 @@ TDengine is an innovative Big Data processing product launched by TAOS Data in t
One of the modules of TDengine is the time-series database. However, in addition to this, to reduce the complexity of research and development and the difficulty of system operation, TDengine also provides functions such as caching, message queuing, subscription, stream computing, etc. TDengine provides a full-stack technical solution for the processing of IoT and Industrial Internet BigData. It is an efficient and easy-to-use IoT Big Data platform. Compared with typical Big Data platforms such as Hadoop, TDengine has the following distinct characteristics:
-- **Performance improvement over 10 times**: An innovative data storage structure is defined, with each single core can process at least 20,000 requests per second, insert millions of data points, and read more than 10 million data points, which is more than 10 times faster than other existing general database.
+- **Performance improvement over 10 times**: An innovative data storage structure is defined, with every single core that can process at least 20,000 requests per second, insert millions of data points, and read more than 10 million data points, which is more than 10 times faster than other existing general database.
- **Reduce the cost of hardware or cloud services to 1/5**: Due to its ultra-performance, TDengine’s computing resources consumption is less than 1/5 of other common Big Data solutions; through columnar storage and advanced compression algorithms, the storage consumption is less than 1/10 of other general databases.
- **Full-stack time-series data processing engine**: Integrate database, message queue, cache, stream computing, and other functions, and the applications do not need to integrate with software such as Kafka/Redis/HBase/Spark/HDFS, thus greatly reducing the complexity cost of application development and maintenance.
-- **Highly Available and Horizontal Scalable **: With the distributed architecture and consistency algorithm, via multi-replication and clustering features, TDengine ensures high availability and horizontal scalability to support the mission-critical applications.
+- **Highly Available and Horizontal Scalable**: With the distributed architecture and consistency algorithm, via multi-replication and clustering features, TDengine ensures high availability and horizontal scalability to support mission-critical applications.
- **Zero operation cost & zero learning cost**: Installing clusters is simple and quick, with real-time backup built-in, and no need to split libraries or tables. Similar to standard SQL, TDengine can support RESTful, Python/Java/C/C++/C#/Go/Node.js, and similar to MySQL with zero learning cost.
-- **Core is Open Sourced:** Except some auxiliary features, the core of TDengine is open sourced. Enterprise won't be locked by the database anymore. Ecosystem is more strong, product is more stable, and developer communities are more active.
+- **Core is Open Sourced:** Except for some auxiliary features, the core of TDengine is open-sourced. Enterprise won't be locked by the database anymore. The ecosystem is more strong, products are more stable, and developer communities are more active.
With TDengine, the total cost of ownership of typical IoT, Internet of Vehicles, and Industrial Internet Big Data platforms can be greatly reduced. However, since it makes full use of the characteristics of IoT time-series data, TDengine cannot be used to process general data from web crawlers, microblogs, WeChat, e-commerce, ERP, CRM, and other sources.
@@ -62,4 +62,4 @@ From the perspective of data sources, designers can analyze the applicability of
| ------------------------------------------------- | ------------------ | ----------------------- | ------------------- | ------------------------------------------------------------ |
| Require system with high-reliability | | | √ | TDengine has a very robust and reliable system architecture to implement simple and convenient daily operation with streamlined experiences for operators, thus human errors and accidents are eliminated to the greatest extent. |
| Require controllable operation learning cost | | | √ | As above. |
-| Require abundant talent supply | √ | | | As a new-generation product, it’s still difficult to find talents with TDengine experiences from market. However, the learning cost is low. As the vendor, we also provide extensive operation training and counselling services. |
\ No newline at end of file
+| Require abundant talent supply | √ | | | As a new-generation product, it’s still difficult to find talents with TDengine experiences from the market. However, the learning cost is low. As the vendor, we also provide extensive operation training and counseling services. |
diff --git a/documentation20/en/03.architecture/docs.md b/documentation20/en/03.architecture/docs.md
index b5b3d0e93250d218835e9804815735386ecf40f9..2c358b41ff3e6674b09dabe344a521ac4095351a 100644
--- a/documentation20/en/03.architecture/docs.md
+++ b/documentation20/en/03.architecture/docs.md
@@ -13,7 +13,6 @@ In typical industry IoT, Internet of Vehicles and Operation Monitoring scenarios
Collected Metrics
Tags
-
Device ID
Time Stamp
@@ -108,16 +107,16 @@ Each data record contains the device ID, timestamp, collected metrics (current,
As the data points are a series of data points over time, the data points generated by IoT, Internet of Vehicles, and Operation Monitoring have some strong common characteristics:
-1. metrics are always structured data;
-2. there are rarely delete/update operations on collected data;
-3. unlike traditional databases, transaction processing is not required;
-4. the ratio of writing over reading is much higher than typical Internet applications;
-5. data volume is stable and can be predicted according to the number of devices and sampling rate;
-6. the user pays attention to the trend of data, not a specific value at a specific time;
-7. there is always a data retention policy;
-8. the data query is always executed in a given time range and a subset of space;
-9. in addition to storage and query operations, various statistical and real-time computing are also required;
-10. data volume is huge, a system may generate over 10 billion data points in a day.
+1. Metrics are always structured data;
+2. There are rarely delete/update operations on collected data;
+3. Unlike traditional databases, transaction processing is not required;
+4. The ratio of writing over reading is much higher than typical Internet applications;
+5. Data volume is stable and can be predicted according to the number of devices and sampling rate;
+6. The user pays attention to the trend of data, not a specific value at a specific time;
+7. There is always a data retention policy;
+8. The data query is always executed in a given time range and a subset of space;
+9. In addition to storage and query operations, various statistical and real-time computing are also required;
+10. Data volume is huge, a system may generate over 10 billion data points in a day.
By utilizing the above characteristics, TDengine designs the storage and computing engine in a special and optimized way for time-series data, resulting in massive improvements in system efficiency.
@@ -156,11 +155,9 @@ The design of TDengine is based on the assumption that one single node or softwa
Logical structure diagram of TDengine distributed architecture as following:
-
Picture 1: TDengine architecture diagram
-
-
+
Figure 1: TDengine architecture diagram
-A complete TDengine system runs on one or more physical nodes. Logically, it includes data node (dnode), TDEngine application driver (taosc) and application (app). There are one or more data nodes in the system, which form a cluster. The application interacts with the TDengine cluster through taosc's API. The following is a brief introduction to each logical unit.
+A complete TDengine system runs on one or more physical nodes. Logically, it includes data node (dnode), TDEngine application driver (TAOSC) and application (app). There are one or more data nodes in the system, which form a cluster. The application interacts with the TDengine cluster through TAOSC's API. The following is a brief introduction to each logical unit.
**Physical node (pnode)**: A pnode is a computer that runs independently and has its own computing, storage and network capabilities. It can be a physical machine, virtual machine, or Docker container installed with OS. The physical node is identified by its configured FQDN (Fully Qualified Domain Name). TDengine relies entirely on FQDN for network communication. If you don't know about FQDN, please read the blog post "[All about FQDN of TDengine](https://www.taosdata.com/blog/2020/09/11/1824.html)".
@@ -172,7 +169,7 @@ A complete TDengine system runs on one or more physical nodes. Logically, it inc
**Virtual node group (VGroup)**: Vnodes on different data nodes can form a virtual node group to ensure the high availability of the system. The virtual node group is managed in a master/slave mechanism. Write operations can only be performed on the master vnode, and then replicated to slave vnodes, thus ensuring that one single replica of data is copied on multiple physical nodes. The number of virtual nodes in a vgroup equals the number of data replicas. If the number of replicas of a DB is N, the system must have at least N data nodes. The number of replicas can be specified by the parameter `replica` when creating DB, and the default is 1. Using the multi-replication feature of TDengine, the same high data reliability can be achieved without the need for expensive storage devices such as disk arrays. Virtual node group is created and managed by the management node, and the management node assigns a system unique ID, aka VGroup ID. If two virtual nodes have the same vnode group ID, means that they belong to the same group and the data is backed up to each other. The number of virtual nodes in a virtual node group can be dynamically changed, allowing only one, that is, no data replication. VGroup ID is never changed. Even if a virtual node group is deleted, its ID will not be reused.
-**TAOSC**: TAOSC is the driver provided by TDengine to applications, which is responsible for dealing with the interaction between application and cluster, and provides the native interface of C/C++ language, which is embedded in JDBC, C #, Python, Go, Node.js language connection libraries. Applications interact with the whole cluster through taosc instead of directly connecting to data nodes in the cluster. This module is responsible for obtaining and caching metadata; forwarding requests for insertion, query, etc. to the correct data node; when returning the results to the application, taosc also needs to be responsible for the final level of aggregation, sorting, filtering and other operations. For JDBC, C/C++/C #/Python/Go/Node.js interfaces, this module runs on the physical node where the application is located. At the same time, in order to support the fully distributed RESTful interface, taosc has a running instance on each dnode of TDengine cluster.
+**TAOSC**: TAOSC is the driver provided by TDengine to applications, which is responsible for dealing with the interaction between application and cluster, and provides the native interface of C/C++ language, which is embedded in JDBC, C #, Python, Go, Node.js language connection libraries. Applications interact with the whole cluster through TAOSC instead of directly connecting to data nodes in the cluster. This module is responsible for obtaining and caching metadata; forwarding requests for insertion, query, etc. to the correct data node; when returning the results to the application, TAOSC also needs to be responsible for the final level of aggregation, sorting, filtering and other operations. For JDBC, C/C++/C #/Python/Go/Node.js interfaces, this module runs on the physical node where the application is located. At the same time, in order to support the fully distributed RESTful interface, TAOSC has a running instance on each dnode of TDengine cluster.
### Node Communication
@@ -184,35 +181,39 @@ A complete TDengine system runs on one or more physical nodes. Logically, it inc
**Cluster external connection**: TDengine cluster can accommodate one single, multiple or even thousands of data nodes. The application only needs to initiate a connection to any data node in the cluster. The network parameter required for connection is the End Point (FQDN plus configured port number) of a data node. When starting the application taos through CLI, the FQDN of the data node can be specified through the option `-h`, and the configured port number can be specified through `-p`. If the port is not configured, the system configuration parameter serverPort of TDengine will be adopted.
-**Inter-cluster communication**: Data nodes connect with each other through TCP/UDP. When a data node starts, it will obtain the EP information of the dnode where the mnode is located, and then establish a connection with the mnode in the system to exchange information. There are three steps to obtain EP information of the mnode: 1. Check whether the mnodeEpList file exists, if it does not exist or cannot be opened normally to obtain EP information of the mnode, skip to the second step; 2: Check the system configuration file taos.cfg to obtain node configuration parameters firstEp and secondEp (the node specified by these two parameters can be a normal node without mnode, in this case, the node will try to redirect to the mnode node when connected). If these two configuration parameters do not exist or do not exist in taos.cfg, or are invalid, skip to the third step; 3: Set your own EP as a mnode EP and run it independently. After obtaining the mnode EP list, the data node initiates the connection. It will successfully join the working cluster after connection. If not successful, it will try the next item in the mnode EP list. If all attempts are made, but the connection still fails, sleep for a few seconds before trying again.
+**Inter-cluster communication**: Data nodes connect with each other through TCP/UDP. When a data node starts, it will obtain the EP information of the dnode where the mnode is located, and then establish a connection with the mnode in the system to exchange information. There are three steps to obtain EP information of the mnode:
+
+1. Check whether the mnodeEpList file exists, if it does not exist or cannot be opened normally to obtain EP information of the mnode, skip to the second step;
+2. Check the system configuration file taos.cfg to obtain node configuration parameters firstEp and secondEp (the node specified by these two parameters can be a normal node without mnode, in this case, the node will try to redirect to the mnode node when connected). If these two configuration parameters do not exist or do not exist in taos.cfg, or are invalid, skip to the third step;
+3. Set your own EP as a mnode EP and run it independently. After obtaining the mnode EP list, the data node initiates the connection. It will successfully join the working cluster after connection. If not successful, it will try the next item in the mnode EP list. If all attempts are made, but the connection still fails, sleep for a few seconds before trying again.
**The choice of MNODE**: TDengine logically has a management node, but there is no separated execution code. The server-side only has a set of execution code taosd. So which data node will be the management node? This is determined automatically by the system without any manual intervention. The principle is as follows: when a data node starts, it will check its End Point and compare it with the obtained mnode EP List. If its EP exists in it, the data node shall start the mnode module and become a mnode. If your own EP is not in the mnode EP List, the mnode module will not start. During the system operation, due to load balancing, downtime and other reasons, mnode may migrate to the new dnode, while totally transparent without manual intervention. The modification of configuration parameters is the decision made by mnode itself according to resources usage.
**Add new data nodes:** After the system has a data node, it has become a working system. There are two steps to add a new node into the cluster. Step1: Connect to the existing working data node using TDengine CLI, and then add the End Point of the new data node with the command "create dnode"; Step 2: In the system configuration parameter file taos.cfg of the new data node, set the firstEp and secondEp parameters to the EP of any two data nodes in the existing cluster. Please refer to the detailed user tutorial for detailed steps. In this way, the cluster will be established step by step.
-**Redirection**: No matter about dnode or taosc, the connection to the mnode shall be initiated first, but the mnode is automatically created and maintained by the system, so the user does not know which dnode is running the mnode. TDengine only requires a connection to any working dnode in the system. Because any running dnode maintains the currently running mnode EP List, when receiving a connecting request from the newly started dnode or taosc, if it’s not a mnode by self, it will reply to the mnode EP List back. After receiving this list, taosc or the newly started dnode will try to establish the connection again. When the mnode EP List changes, each data node quickly obtains the latest list and notifies taosc through messaging interaction among nodes.
+**Redirection**: No matter about dnode or TAOSC, the connection to the mnode shall be initiated first, but the mnode is automatically created and maintained by the system, so the user does not know which dnode is running the mnode. TDengine only requires a connection to any working dnode in the system. Because any running dnode maintains the currently running mnode EP List, when receiving a connecting request from the newly started dnode or TAOSC, if it’s not a mnode by self, it will reply to the mnode EP List back. After receiving this list, TAOSC or the newly started dnode will try to establish the connection again. When the mnode EP List changes, each data node quickly obtains the latest list and notifies TAOSC through messaging interaction among nodes.
### A Typical Data Writinfg Process
-To explain the relationship between vnode, mnode, taosc and application and their respective roles, the following is an analysis of a typical data writing process.
+To explain the relationship between vnode, mnode, TAOSC and application and their respective roles, the following is an analysis of a typical data writing process.
-
-
Picture 2 typical process of TDengine
+
+
Figure 2: Typical process of TDengine
1. Application initiates a request to insert data through JDBC, ODBC, or other APIs.
-2. taosc checks if meta data existing for the table in the cache. If so, go straight to Step 4. If not, taosc sends a get meta-data request to mnode.
-3. Mnode returns the meta-data of the table to taosc. Meta-data contains the schema of the table, and also the vgroup information to which the table belongs (the vnode ID and the End Point of the dnode where the table belongs. If the number of replicas is N, there will be N groups of End Points). If taosc does not receive a response from the mnode for a long time, and there are multiple mnodes, taosc will send a request to the next mnode.
-4. Taosc initiates an insert request to master vnode.
-5. After vnode inserts the data, it gives a reply to taosc, indicating that the insertion is successful. If taosc doesn't get a response from vnode for a long time, taosc will treat this node as offline. In this case, if there are multiple replicas of the inserted database, taosc will issue an insert request to the next vnode in vgroup.
-6. Taosc notifies APP that writing is successful.
+2. TAOSC checks if meta data existing for the table in the cache. If so, go straight to Step 4. If not, TAOSC sends a get meta-data request to mnode.
+3. Mnode returns the meta-data of the table to TAOSC. Meta-data contains the schema of the table, and also the vgroup information to which the table belongs (the vnode ID and the End Point of the dnode where the table belongs. If the number of replicas is N, there will be N groups of End Points). If TAOSC does not receive a response from the mnode for a long time, and there are multiple mnodes, TAOSC will send a request to the next mnode.
+4. TAOSC initiates an insert request to master vnode.
+5. After vnode inserts the data, it gives a reply to TAOSC, indicating that the insertion is successful. If TAOSC doesn't get a response from vnode for a long time, TAOSC will treat this node as offline. In this case, if there are multiple replicas of the inserted database, TAOSC will issue an insert request to the next vnode in vgroup.
+6. TAOSC notifies APP that writing is successful.
-For Step 2 and 3, when taosc starts, it does not know the End Point of mnode, so it will directly initiate a request to the configured serving End Point of the cluster. If the dnode that receives the request does not have a mnode configured, it will inform the mnode EP list in a reply message, so that taosc will re-issue a request to obtain meta-data to the EP of another new mnode.
+For Step 2 and 3, when TAOSC starts, it does not know the End Point of mnode, so it will directly initiate a request to the configured serving End Point of the cluster. If the dnode that receives the request does not have a mnode configured, it will inform the mnode EP list in a reply message, so that TAOSC will re-issue a request to obtain meta-data to the EP of another new mnode.
-For Step 4 and 5, without caching, taosc can't recognize the master in the virtual node group, so assumes that the first vnode is the master and sends a request to it. If this vnode is not the master, it will reply to the actual master as a new target where taosc shall send a request to. Once the reply of successful insertion is obtained, taosc will cache the information of master node.
+For Step 4 and 5, without caching, TAOSC can't recognize the master in the virtual node group, so assumes that the first vnode is the master and sends a request to it. If this vnode is not the master, it will reply to the actual master as a new target where TAOSC shall send a request to. Once the reply of successful insertion is obtained, TAOSC will cache the information of master node.
-The above is the process of inserting data, and the processes of querying and computing are the same. Taosc encapsulates and hides all these complicated processes, and it is transparent to applications.
+The above is the process of inserting data, and the processes of querying and computing are the same. TAOSC encapsulates and hides all these complicated processes, and it is transparent to applications.
-Through taosc caching mechanism, mnode needs to be accessed only when a table is accessed for the first time, so mnode will not become a system bottleneck. However, because schema and vgroup may change (such as load balancing), taosc will interact with mnode regularly to automatically update the cache.
+Through TAOSC caching mechanism, mnode needs to be accessed only when a table is accessed for the first time, so mnode will not become a system bottleneck. However, because schema and vgroup may change (such as load balancing), TAOSC will interact with mnode regularly to automatically update the cache.
## Storage Model and Data Partitioning/Sharding
@@ -259,13 +260,14 @@ The load balancing process does not require any manual intervention, and it is t
## Data Writing and Replication Process
-If a database has N replicas, thus a virtual node group has N virtual nodes, but only one as Master and all others are slaves. When the application writes a new record to system, only the Master vnode can accept the writing request. If a slave vnode receives a writing request, the system will notifies taosc to redirect.
+If a database has N replicas, thus a virtual node group has N virtual nodes, but only one as Master and all others are slaves. When the application writes a new record to system, only the Master vnode can accept the writing request. If a slave vnode receives a writing request, the system will notifies TAOSC to redirect.
### Master vnode Writing Process
Master Vnode uses a writing process as follows:
-Figure 3: TDengine Master writing process
+
+
Figure 3: TDengine Master writing process
1. Master vnode receives the application data insertion request, verifies, and moves to next step;
2. If the system configuration parameter `walLevel` is greater than 0, vnode will write the original request packet into database log file WAL. If walLevel is set to 2 and fsync is set to 0, TDengine will make WAL data written immediately to ensure that even system goes down, all data can be recovered from database log file;
@@ -278,12 +280,12 @@ Figure 3: TDengine Master writing process
For a slave vnode, the write process as follows:
-
-
-1. Slave vnode receives a data insertion request forwarded by Master vnode.
+1. Slave vnode receives a data insertion request forwarded by Master vnode;
2. If the system configuration parameter `walLevel` is greater than 0, vnode will write the original request packet into database log file WAL. If walLevel is set to 2 and fsync is set to 0, TDengine will make WAL data written immediately to ensure that even system goes down, all data can be recovered from database log file;
-3. Write into memory and add the record to “skip list”;
+3. Write into memory and add the record to “skip list”.
Compared with Master vnode, slave vnode has no forwarding or reply confirmation step, means two steps less. But writing into memory and WAL is exactly the same.
@@ -297,7 +299,7 @@ However, the asynchronous replication has a tiny time window where data can be l
1. Master vnode has finished its 5-step operations, confirmed the success of writing to APP, and then went down;
2. Slave vnode receives the write request, then processing fails before writing to the log in Step 2;
-3. Slave vnode will become the new master, thus losing one record
+3. Slave vnode will become the new master, thus losing one record.
In theory, for asynchronous replication, there is no guarantee to prevent data loss. However, this window is extremely small, only if mater and slave fail at the same time, and just confirm the successful write to the application before.
@@ -352,8 +354,6 @@ When data is written to disk, it is decided whether to compress the data accordi
By default, TDengine saves all data in /var/lib/taos directory, and the data files of each vnode are saved in a different directory under this directory. In order to expand the storage space, minimize the bottleneck of file reading and improve the data throughput rate, TDengine can configure the system parameter “dataDir” to allow multiple mounted hard disks to be used by system at the same time. In addition, TDengine also provides the function of tiered data storage, i.e. storage on different storage media according to the time stamps of data files. For example, the latest data is stored on SSD, the data for more than one week is stored on local hard disk, and the data for more than four weeks is stored on network storage device, thus reducing the storage cost and ensuring efficient data access. The movement of data on different storage media is automatically done by the system and completely transparent to applications. Tiered storage of data is also configured through the system parameter “dataDir”.
-
-
dataDir format is as follows:
```
dataDir data_path [tier_level]
@@ -361,8 +361,6 @@ dataDir data_path [tier_level]
Where data_path is the folder path of mount point and tier_level is the media storage-tier. The higher the media storage-tier, means the older the data file. Multiple hard disks can be mounted at the same storage-tier, and data files on the same storage-tier are distributed on all hard disks within the tier. TDengine supports up to 3 tiers of storage, so tier_level values are 0, 1, and 2. When configuring dataDir, there must be only one mount path without specifying tier_level, which is called special mount disk (path). The mount path defaults to level 0 storage media and contains special file links, which cannot be removed, otherwise it will have a devastating impact on the written data.
-
-
Suppose a physical node with six mountable hard disks/mnt/disk1,/mnt/disk2, …,/mnt/disk6, where disk1 and disk2 need to be designated as level 0 storage media, disk3 and disk4 are level 1 storage media, and disk5 and disk6 are level 2 storage media. Disk1 is a special mount disk, you can configure it in/etc/taos/taos.cfg as follows:
```
@@ -376,7 +374,6 @@ dataDir /mnt/disk6/taos 2
Mounted disks can also be a non-local network disk, as long as the system can access it.
-
Note: Tiered Storage is only supported in Enterprise Edition
## Data Query
@@ -416,14 +413,14 @@ For the data collected by device D1001, the number of records per hour is counte
TDengine creates a separate table for each data collection point, but in practical applications, it is often necessary to aggregate data from different data collection points. In order to perform aggregation operations efficiently, TDengine introduces the concept of STable. STable is used to represent a specific type of data collection point. It is a table set containing multiple tables. The schema of each table in the set is the same, but each table has its own static tag. The tags can be multiple and be added, deleted and modified at any time. Applications can aggregate or statistically operate all or a subset of tables under a STABLE by specifying tag filters, thus greatly simplifying the development of applications. The process is shown in the following figure:
-
Picture 4 Diagram of multi-table aggregation query
+
Figure 5: Diagram of multi-table aggregation query
1. Application sends a query condition to system;
-2. taosc sends the STable name to Meta Node(management node);
-3. Management node sends the vnode list owned by the STable back to taosc;
-4. taosc sends the computing request together with tag filters to multiple data nodes corresponding to these vnodes;
-5. Each vnode first finds out the set of tables within its own node that meet the tag filters from memory, then scans the stored time-series data, completes corresponding aggregation calculations, and returns result to taosc;
-6. taosc finally aggregates the results returned by multiple data nodes and send them back to application.
+2. TAOSC sends the STable name to Meta Node(management node);
+3. Management node sends the vnode list owned by the STable back to TAOSC;
+4. TAOSC sends the computing request together with tag filters to multiple data nodes corresponding to these vnodes;
+5. Each vnode first finds out the set of tables within its own node that meet the tag filters from memory, then scans the stored time-series data, completes corresponding aggregation calculations, and returns result to TAOSC;
+6. TAOSC finally aggregates the results returned by multiple data nodes and send them back to application.
Since TDengine stores tag data and time-series data separately in vnode, by filtering tag data in memory, the set of tables that need to participate in aggregation operation is first found, which greatly reduces the volume of data scanned and improves aggregation speed. At the same time, because the data is distributed in multiple vnodes/dnodes, the aggregation operation is carried out concurrently in multiple vnodes, which further improves the aggregation speed. Aggregation functions for ordinary tables and most operations are applicable to STables. The syntax is exactly the same. Please see TAOS SQL for details.
diff --git a/documentation20/en/06.queries/docs.md b/documentation20/en/06.queries/docs.md
index 7688a941f0fb5b685f592833322906e4c4760b79..d906443153bb7e83cee69da4588554893ce154a3 100644
--- a/documentation20/en/06.queries/docs.md
+++ b/documentation20/en/06.queries/docs.md
@@ -2,7 +2,7 @@
## Main Query Features
-TDengine uses SQL as the query language. Applications can send SQL statements through C/C++, Java, Go, Python connectors, and users can manually execute SQL Ad-Hoc Query through the Command Line Interface (CLI) tool TAOS Shell provided by TDengine. TDengine supports the following query functions:
+TDengine uses SQL as the query language. Applications can send SQL statements through C/C++, Java, Go, C#, Python, Node.js connectors, and users can manually execute SQL Ad-Hoc Query through the Command Line Interface (CLI) tool TAOS Shell provided by TDengine. TDengine supports the following query functions:
- Single-column and multi-column data query
- Multiple filters for tags and numeric values: >, <, =, < >, like, etc
@@ -96,4 +96,4 @@ Query OK, 5 row(s) in set (0.001521s)
In IoT scenario, it is difficult to synchronize the time stamp of collected data at each point, but many analysis algorithms (such as FFT) need to align the collected data strictly at equal intervals of time. In many systems, it’s required to write their own programs to process, but the down sampling operation of TDengine can be used to solve the problem easily. If there is no collected data in an interval, TDengine also provides interpolation calculation function.
-For details of syntax rules, please refer to the [Time-dimension Aggregation section of TAOS SQL](https://www.taosdata.com/en/documentation/taos-sql#aggregation).
\ No newline at end of file
+For details of syntax rules, please refer to the [Time-dimension Aggregation section of TAOS SQL](https://www.taosdata.com/en/documentation/taos-sql#aggregation).
diff --git a/documentation20/en/08.connector/docs.md b/documentation20/en/08.connector/docs.md
index 556996889bb16f52755cef086910fd2e96145f63..b4d2ee3a05850aa9b1a3c886ec26e4661b7f997b 100644
--- a/documentation20/en/08.connector/docs.md
+++ b/documentation20/en/08.connector/docs.md
@@ -413,11 +413,11 @@ See [video tutorials](https://www.taosdata.com/blog/2020/11/11/1963.html) for th
Users can find the connector package for python2 and python3 in the source code src/connector/python (or tar.gz/connector/python) folder. Users can install it through `pip` command:
-`pip install src/connector/python/linux/python2/`
+`pip install src/connector/python/`
or
- `pip3 install src/connector/python/linux/python3/`
+ `pip3 install src/connector/python/`
#### Windows
diff --git a/documentation20/en/12.taos-sql/docs.md b/documentation20/en/12.taos-sql/docs.md
index 2b0b4f2814ab37ae17569e0c52572f457fe53504..7aaeb6c32b25cef8f0d1bf2f67ef94c3a2a007ee 100644
--- a/documentation20/en/12.taos-sql/docs.md
+++ b/documentation20/en/12.taos-sql/docs.md
@@ -37,7 +37,7 @@ With TDengine, the most important thing is timestamp. When creating and insertin
- Epch Time: a timestamp value can also be a long integer representing milliseconds since 1970-01-01 08:00:00.000.
- Arithmetic operations can be applied to timestamp. For example: now-2h represents a timestamp which is 2 hours ago from the current server time. Units include u( microsecond), a (milliseconds), s (seconds), m (minutes), h (hours), d (days), w (weeks). In `select * from t1 where ts > now-2w and ts <= now-1w`, which queries data of the whole week before two weeks. To specify the interval of down sampling, you can also use n(calendar month) and y(calendar year) as time units.
-Default time precision of TDengine is millisecond, you can change it to microseocnd by setting parameter enableMicrosecond.
+TDengine's timestamp is set to millisecond accuracy by default. Microsecond/nanosecond accuracy can be set using CREATE DATABASE with PRECISION parameter. (Nanosecond resolution is supported from version 2.1.5.0 onwards.)
In TDengine, the following 10 data types can be used in data model of an ordinary table.
diff --git a/packaging/docker/dockerManifest.sh b/packaging/docker/dockerManifest.sh
index 98abe4e099d9bfe5b06d0a61d667391a9f667eb7..e4d3cda7f29fea96cabfe48f5b10ab668a085ea8 100755
--- a/packaging/docker/dockerManifest.sh
+++ b/packaging/docker/dockerManifest.sh
@@ -45,6 +45,7 @@ echo "version=${version}"
#docker manifest rm tdengine/tdengine:${version}
if [ "$verType" == "beta" ]; then
docker manifest inspect tdengine/tdengine-beta:latest
+ docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
docker manifest rm tdengine/tdengine-beta:latest
docker manifest create -a tdengine/tdengine-beta:${version} tdengine/tdengine-amd64-beta:${version} tdengine/tdengine-aarch64-beta:${version} tdengine/tdengine-aarch32-beta:${version}
docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
@@ -54,6 +55,7 @@ if [ "$verType" == "beta" ]; then
elif [ "$verType" == "stable" ]; then
docker manifest inspect tdengine/tdengine:latest
+ docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
docker manifest rm tdengine/tdengine:latest
docker manifest create -a tdengine/tdengine:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
diff --git a/packaging/release.sh b/packaging/release.sh
index 5ba6c01a0bd5689278bdb5c86b538b3c447f086a..44887c6cf749ecfecdef46799311de38dbbbed23 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -22,7 +22,7 @@ cpuType=x64 # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
osType=Linux # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
pagMode=full # [full | lite]
soMode=dynamic # [static | dynamic]
-dbName=taos # [taos | power | tq]
+dbName=taos # [taos | power | tq | pro]
allocator=glibc # [glibc | jemalloc]
verNumber=""
verNumberComp="1.0.0.0"
@@ -78,7 +78,7 @@ do
echo " -l [full | lite] "
echo " -a [glibc | jemalloc] "
echo " -s [static | dynamic] "
- echo " -d [taos | power | tq ] "
+ echo " -d [taos | power | tq | pro] "
echo " -n [version number] "
echo " -m [compatible version number] "
exit 0
@@ -253,6 +253,10 @@ if [ "$osType" != "Darwin" ]; then
${csudo} ./makepkg_tq.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
${csudo} ./makeclient_tq.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
${csudo} ./makearbi_tq.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+ elif [[ "$dbName" == "pro" ]]; then
+ ${csudo} ./makepkg_pro.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
+ ${csudo} ./makeclient_pro.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+ ${csudo} ./makearbi_pro.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
else
${csudo} ./makepkg_power.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
${csudo} ./makeclient_power.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
@@ -262,4 +266,3 @@ else
cd ${script_dir}/tools
./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${dbName}
fi
-
diff --git a/packaging/tools/install_arbi_pro.sh b/packaging/tools/install_arbi_pro.sh
new file mode 100755
index 0000000000000000000000000000000000000000..11165dbdd8bdf6afb4659250499cf1d9184c2395
--- /dev/null
+++ b/packaging/tools/install_arbi_pro.sh
@@ -0,0 +1,293 @@
+#!/bin/bash
+#
+# This file is used to install database on linux systems. The operating system
+# is required to use systemd to manage services at boot
+
+set -e
+#set -x
+
+# -----------------------Variables definition---------------------
+script_dir=$(dirname $(readlink -f "$0"))
+
+bin_link_dir="/usr/bin"
+#inc_link_dir="/usr/include"
+
+#install main path
+install_main_dir="/usr/local/tarbitrator"
+
+# old bin dir
+bin_dir="/usr/local/tarbitrator/bin"
+
+service_config_dir="/etc/systemd/system"
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+csudo=""
+if command -v sudo > /dev/null; then
+ csudo="sudo"
+fi
+
+update_flag=0
+
+initd_mod=0
+service_mod=2
+if pidof systemd &> /dev/null; then
+ service_mod=0
+elif $(which service &> /dev/null); then
+ service_mod=1
+ service_config_dir="/etc/init.d"
+ if $(which chkconfig &> /dev/null); then
+ initd_mod=1
+ elif $(which insserv &> /dev/null); then
+ initd_mod=2
+ elif $(which update-rc.d &> /dev/null); then
+ initd_mod=3
+ else
+ service_mod=2
+ fi
+else
+ service_mod=2
+fi
+
+
+# get the operating system type for using the corresponding init file
+# ubuntu/debian(deb), centos/fedora(rpm), others: opensuse, redhat, ..., no verification
+#osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+if [[ -e /etc/os-release ]]; then
+ osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2) ||:
+else
+ osinfo=""
+fi
+#echo "osinfo: ${osinfo}"
+os_type=0
+if echo $osinfo | grep -qwi "ubuntu" ; then
+# echo "This is ubuntu system"
+ os_type=1
+elif echo $osinfo | grep -qwi "debian" ; then
+# echo "This is debian system"
+ os_type=1
+elif echo $osinfo | grep -qwi "Kylin" ; then
+# echo "This is Kylin system"
+ os_type=1
+elif echo $osinfo | grep -qwi "centos" ; then
+# echo "This is centos system"
+ os_type=2
+elif echo $osinfo | grep -qwi "fedora" ; then
+# echo "This is fedora system"
+ os_type=2
+else
+ echo " osinfo: ${osinfo}"
+ echo " This is an officially unverified linux system,"
+ echo " if there are any problems with the installation and operation, "
+ echo " please feel free to contact hanatech.com.cn for support."
+ os_type=1
+fi
+
+function kill_tarbitrator() {
+ pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
+ if [ -n "$pid" ]; then
+ ${csudo} kill -9 $pid || :
+ fi
+}
+
+function install_main_path() {
+ #create install main dir and all sub dir
+ ${csudo} rm -rf ${install_main_dir} || :
+ ${csudo} mkdir -p ${install_main_dir}
+ ${csudo} mkdir -p ${install_main_dir}/bin
+ #${csudo} mkdir -p ${install_main_dir}/include
+ ${csudo} mkdir -p ${install_main_dir}/init.d
+}
+
+function install_bin() {
+ # Remove links
+ ${csudo} rm -f ${bin_link_dir}/rmtarbitrator || :
+ ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
+ ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+
+ #Make link
+ [ -x ${install_main_dir}/bin/remove_arbi_prodb.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_arbi_prodb.sh ${bin_link_dir}/rmtarbitrator || :
+ [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+}
+
+function install_header() {
+ ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h || :
+ ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
+ ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+ ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+}
+
+function clean_service_on_sysvinit() {
+ #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+ #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
+
+ if pidof tarbitrator &> /dev/null; then
+ ${csudo} service tarbitratord stop || :
+ fi
+
+ if ((${initd_mod}==1)); then
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} chkconfig --del tarbitratord || :
+ fi
+ elif ((${initd_mod}==2)); then
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} insserv -r tarbitratord || :
+ fi
+ elif ((${initd_mod}==3)); then
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} update-rc.d -f tarbitratord remove || :
+ fi
+ fi
+
+ ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+
+ if $(which init &> /dev/null); then
+ ${csudo} init q || :
+ fi
+}
+
+function install_service_on_sysvinit() {
+ clean_service_on_sysvinit
+ sleep 1
+
+ # Install prodbs service
+
+ if ((${os_type}==1)); then
+ ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+ ${csudo} cp ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+ elif ((${os_type}==2)); then
+ ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+ ${csudo} cp ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+ fi
+
+ if ((${initd_mod}==1)); then
+ ${csudo} chkconfig --add tarbitratord || :
+ ${csudo} chkconfig --level 2345 tarbitratord on || :
+ elif ((${initd_mod}==2)); then
+ ${csudo} insserv tarbitratord || :
+ ${csudo} insserv -d tarbitratord || :
+ elif ((${initd_mod}==3)); then
+ ${csudo} update-rc.d tarbitratord defaults || :
+ fi
+}
+
+function clean_service_on_systemd() {
+ tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+ if systemctl is-active --quiet tarbitratord; then
+ echo "tarbitrator is running, stopping it..."
+ ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+ fi
+ ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+
+ ${csudo} rm -f ${tarbitratord_service_config}
+}
+
+function install_service_on_systemd() {
+ clean_service_on_systemd
+
+ tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+
+ ${csudo} bash -c "echo '[Unit]' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'Description=ProDB arbitrator service' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'After=network-online.target' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'Wants=network-online.target' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo '[Service]' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'Type=simple' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'TimeoutStopSec=1000000s' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'LimitNOFILE=infinity' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'LimitNPROC=infinity' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'LimitCORE=infinity' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'TimeoutStartSec=0' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'StandardOutput=null' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'Restart=always' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'StartLimitBurst=3' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'StartLimitInterval=60s' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo '[Install]' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${tarbitratord_service_config}"
+ ${csudo} systemctl enable tarbitratord
+}
+
+function install_service() {
+ if ((${service_mod}==0)); then
+ install_service_on_systemd
+ elif ((${service_mod}==1)); then
+ install_service_on_sysvinit
+ else
+ # must manual stop taosd
+ kill_tarbitrator
+ fi
+}
+
+function update_prodb() {
+ # Start to update
+ echo -e "${GREEN}Start to update ProDB's arbitrator ...${NC}"
+ # Stop the service if running
+ if pidof tarbitrator &> /dev/null; then
+ if ((${service_mod}==0)); then
+ ${csudo} systemctl stop tarbitratord || :
+ elif ((${service_mod}==1)); then
+ ${csudo} service tarbitratord stop || :
+ else
+ kill_tarbitrator
+ fi
+ sleep 1
+ fi
+
+ install_main_path
+ #install_header
+ install_bin
+ install_service
+
+ echo
+ #echo -e "${GREEN_DARK}To configure ProDB ${NC}: edit /etc/taos/taos.cfg"
+ if ((${service_mod}==0)); then
+ echo -e "${GREEN_DARK}To start arbitrator ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+ elif ((${service_mod}==1)); then
+ echo -e "${GREEN_DARK}To start arbitrator ${NC}: ${csudo} service tarbitratord start${NC}"
+ else
+ echo -e "${GREEN_DARK}To start arbitrator ${NC}: ./tarbitrator${NC}"
+ fi
+ echo
+ echo -e "\033[44;32;1mProDB's arbitrator is updated successfully!${NC}"
+}
+
+function install_prodb() {
+ # Start to install
+ echo -e "${GREEN}Start to install ProDB's arbitrator ...${NC}"
+
+ install_main_path
+ #install_header
+ install_bin
+ install_service
+ echo
+ #echo -e "${GREEN_DARK}To configure ProDB ${NC}: edit /etc/taos/taos.cfg"
+ if ((${service_mod}==0)); then
+ echo -e "${GREEN_DARK}To start arbitrator ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+ elif ((${service_mod}==1)); then
+ echo -e "${GREEN_DARK}To start arbitrator ${NC}: ${csudo} service tarbitratord start${NC}"
+ else
+ echo -e "${GREEN_DARK}To start arbitrator ${NC}: tarbitrator${NC}"
+ fi
+
+ echo -e "\033[44;32;1mProDB's arbitrator is installed successfully!${NC}"
+ echo
+}
+
+
+## ==============================Main program starts from here============================
+# Install server and client
+if [ -x ${bin_dir}/tarbitrator ]; then
+ update_flag=1
+ update_prodb
+else
+ install_prodb
+fi
+
diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh
index aa09013e538253b8740a0aaf70d04358320a6dd8..3df7013b197baaf4d78bb0f0ae5d507d6be92715 100755
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -128,8 +128,12 @@ function install_lib() {
${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
fi
-
- ${csudo} ldconfig
+
+ if [ "$osType" != "Darwin" ]; then
+ ${csudo} ldconfig
+ else
+ ${csudo} update_dyld_shared_cache
+ fi
}
function install_header() {
diff --git a/packaging/tools/install_client_pro.sh b/packaging/tools/install_client_pro.sh
new file mode 100755
index 0000000000000000000000000000000000000000..fff8ae31200669ee3ab918a873e33fc32ece37c8
--- /dev/null
+++ b/packaging/tools/install_client_pro.sh
@@ -0,0 +1,248 @@
+#!/bin/bash
+#
+# This file is used to install ProDB client on linux systems. The operating system
+# is required to use systemd to manage services at boot
+
+set -e
+#set -x
+
+# -----------------------Variables definition---------------------
+
+osType=Linux
+pagMode=full
+
+if [ "$osType" != "Darwin" ]; then
+ script_dir=$(dirname $(readlink -f "$0"))
+ # Dynamic directory
+ data_dir="/var/lib/ProDB"
+ log_dir="/var/log/ProDB"
+else
+ script_dir=`dirname $0`
+ cd ${script_dir}
+ script_dir="$(pwd)"
+ data_dir="/var/lib/ProDB"
+ log_dir="~/ProDB/log"
+fi
+
+log_link_dir="/usr/local/ProDB/log"
+
+cfg_install_dir="/etc/ProDB"
+
+if [ "$osType" != "Darwin" ]; then
+ bin_link_dir="/usr/bin"
+ lib_link_dir="/usr/lib"
+ lib64_link_dir="/usr/lib64"
+ inc_link_dir="/usr/include"
+else
+ bin_link_dir="/usr/local/bin"
+ lib_link_dir="/usr/local/lib"
+ inc_link_dir="/usr/local/include"
+fi
+
+#install main path
+install_main_dir="/usr/local/ProDB"
+
+# old bin dir
+bin_dir="/usr/local/ProDB/bin"
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+csudo=""
+if command -v sudo > /dev/null; then
+ csudo="sudo"
+fi
+
+update_flag=0
+
+function kill_client() {
+ pid=$(ps -ef | grep "prodbc" | grep -v "grep" | awk '{print $2}')
+ if [ -n "$pid" ]; then
+ ${csudo} kill -9 $pid || :
+ fi
+}
+
+function install_main_path() {
+ #create install main dir and all sub dir
+ ${csudo} rm -rf ${install_main_dir} || :
+ ${csudo} mkdir -p ${install_main_dir}
+ ${csudo} mkdir -p ${install_main_dir}/cfg
+ ${csudo} mkdir -p ${install_main_dir}/bin
+ ${csudo} mkdir -p ${install_main_dir}/connector
+ ${csudo} mkdir -p ${install_main_dir}/driver
+ ${csudo} mkdir -p ${install_main_dir}/examples
+ ${csudo} mkdir -p ${install_main_dir}/include
+}
+
+function install_bin() {
+ # Remove links
+ ${csudo} rm -f ${bin_link_dir}/prodbc || :
+ if [ "$osType" != "Darwin" ]; then
+ ${csudo} rm -f ${bin_link_dir}/prodemo || :
+ ${csudo} rm -f ${bin_link_dir}/prodump || :
+ fi
+ ${csudo} rm -f ${bin_link_dir}/rmprodb || :
+ ${csudo} rm -f ${bin_link_dir}/set_core || :
+
+ ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+
+ #Make link
+ [ -x ${install_main_dir}/bin/prodbc ] && ${csudo} ln -s ${install_main_dir}/bin/prodbc ${bin_link_dir}/prodbc || :
+ if [ "$osType" != "Darwin" ]; then
+ [ -x ${install_main_dir}/bin/prodemo ] && ${csudo} ln -s ${install_main_dir}/bin/prodemo ${bin_link_dir}/prodemo || :
+ [ -x ${install_main_dir}/bin/prodump ] && ${csudo} ln -s ${install_main_dir}/bin/prodump ${bin_link_dir}/prodump || :
+ fi
+ [ -x ${install_main_dir}/bin/remove_client_prodb.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client_prodb.sh ${bin_link_dir}/rmprodb || :
+ [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+}
+
+function clean_lib() {
+ sudo rm -f /usr/lib/libtaos.* || :
+ sudo rm -rf ${lib_dir} || :
+}
+
+function install_lib() {
+ # Remove links
+ ${csudo} rm -f ${lib_link_dir}/libtaos.* || :
+ ${csudo} rm -f ${lib64_link_dir}/libtaos.* || :
+ #${csudo} rm -rf ${v15_java_app_dir} || :
+
+ ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+
+ if [ "$osType" != "Darwin" ]; then
+ ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
+ ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+
+ if [ -d "${lib64_link_dir}" ]; then
+ ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 || :
+ ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so || :
+ fi
+ else
+ ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
+ ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
+ fi
+
+ ${csudo} ldconfig
+}
+
+function install_header() {
+ ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h || :
+ ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
+ ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+ ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+}
+
+function install_config() {
+ #${csudo} rm -f ${install_main_dir}/cfg/taos.cfg || :
+
+ if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
+ ${csudo} mkdir -p ${cfg_install_dir}
+ [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
+ ${csudo} chmod 644 ${cfg_install_dir}/*
+ fi
+
+ ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
+ ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+}
+
+
+function install_log() {
+ ${csudo} rm -rf ${log_dir} || :
+
+ if [ "$osType" != "Darwin" ]; then
+ ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+ else
+ mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+ fi
+ ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+}
+
+function install_connector() {
+ ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+}
+
+function install_examples() {
+ if [ -d ${script_dir}/examples ]; then
+ ${csudo} cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
+ fi
+}
+
+function update_prodb() {
+ # Start to update
+ if [ ! -e prodb.tar.gz ]; then
+ echo "File prodb.tar.gz does not exist"
+ exit 1
+ fi
+ tar -zxf prodb.tar.gz
+
+ echo -e "${GREEN}Start to update ProDB client...${NC}"
+ # Stop the client shell if running
+ if pidof prodbc &> /dev/null; then
+ kill_client
+ sleep 1
+ fi
+
+ install_main_path
+
+ install_log
+ install_header
+ install_lib
+ if [ "$pagMode" != "lite" ]; then
+ install_connector
+ fi
+ install_examples
+ install_bin
+ install_config
+
+ echo
+ echo -e "\033[44;32;1mProDB client is updated successfully!${NC}"
+
+ rm -rf $(tar -tf prodb.tar.gz)
+}
+
+function install_prodb() {
+ # Start to install
+ if [ ! -e prodb.tar.gz ]; then
+ echo "File prodb.tar.gz does not exist"
+ exit 1
+ fi
+ tar -zxf prodb.tar.gz
+
+ echo -e "${GREEN}Start to install ProDB client...${NC}"
+
+ install_main_path
+ install_log
+ install_header
+ install_lib
+ if [ "$pagMode" != "lite" ]; then
+ install_connector
+ fi
+ install_examples
+ install_bin
+ install_config
+
+ echo
+ echo -e "\033[44;32;1mProDB client is installed successfully!${NC}"
+
+ rm -rf $(tar -tf prodb.tar.gz)
+}
+
+
+## ==============================Main program starts from here============================
+# Install or updata client and client
+# if server is already install, don't install client
+ if [ -e ${bin_dir}/prodbs ]; then
+ echo -e "\033[44;32;1mThere are already installed ProDB server, so don't need install client!${NC}"
+ exit 0
+ fi
+
+ if [ -x ${bin_dir}/prodbc ]; then
+ update_flag=1
+ update_prodb
+ else
+ install_prodb
+ fi
diff --git a/packaging/tools/install_pro.sh b/packaging/tools/install_pro.sh
new file mode 100755
index 0000000000000000000000000000000000000000..564561441646d4bd27f22c5abd9250a9c3377002
--- /dev/null
+++ b/packaging/tools/install_pro.sh
@@ -0,0 +1,948 @@
+#!/bin/bash
+#
+# This file is used to install database on linux systems. The operating system
+# is required to use systemd to manage services at boot
+
+set -e
+#set -x
+
+verMode=edge
+pagMode=full
+
+iplist=""
+serverFqdn=""
+# -----------------------Variables definition---------------------
+script_dir=$(dirname $(readlink -f "$0"))
+# Dynamic directory
+data_dir="/var/lib/ProDB"
+log_dir="/var/log/ProDB"
+
+data_link_dir="/usr/local/ProDB/data"
+log_link_dir="/usr/local/ProDB/log"
+
+cfg_install_dir="/etc/ProDB"
+
+bin_link_dir="/usr/bin"
+lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
+inc_link_dir="/usr/include"
+
+#install main path
+install_main_dir="/usr/local/ProDB"
+
+# old bin dir
+bin_dir="/usr/local/ProDB/bin"
+
+service_config_dir="/etc/systemd/system"
+nginx_port=6060
+nginx_dir="/usr/local/nginxd"
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+csudo=""
+if command -v sudo > /dev/null; then
+ csudo="sudo"
+fi
+
+update_flag=0
+
+initd_mod=0
+service_mod=2
+if pidof systemd &> /dev/null; then
+ service_mod=0
+elif $(which service &> /dev/null); then
+ service_mod=1
+ service_config_dir="/etc/init.d"
+ if $(which chkconfig &> /dev/null); then
+ initd_mod=1
+ elif $(which insserv &> /dev/null); then
+ initd_mod=2
+ elif $(which update-rc.d &> /dev/null); then
+ initd_mod=3
+ else
+ service_mod=2
+ fi
+else
+ service_mod=2
+fi
+
+
+# get the operating system type for using the corresponding init file
+# ubuntu/debian(deb), centos/fedora(rpm), others: opensuse, redhat, ..., no verification
+#osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+if [[ -e /etc/os-release ]]; then
+ osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2) ||:
+else
+ osinfo=""
+fi
+#echo "osinfo: ${osinfo}"
+os_type=0
+if echo $osinfo | grep -qwi "ubuntu" ; then
+# echo "This is ubuntu system"
+ os_type=1
+elif echo $osinfo | grep -qwi "debian" ; then
+# echo "This is debian system"
+ os_type=1
+elif echo $osinfo | grep -qwi "Kylin" ; then
+# echo "This is Kylin system"
+ os_type=1
+elif echo $osinfo | grep -qwi "centos" ; then
+# echo "This is centos system"
+ os_type=2
+elif echo $osinfo | grep -qwi "fedora" ; then
+# echo "This is fedora system"
+ os_type=2
+else
+ echo " osinfo: ${osinfo}"
+ echo " This is an officially unverified linux system,"
+ echo " if there are any problems with the installation and operation, "
+ echo " please feel free to contact hanatech.com.cn for support."
+ os_type=1
+fi
+
+
+# ============================= get input parameters =================================================
+
+# install.sh -v [server | client] -e [yes | no] -i [systemd | service | ...]
+
+# set parameters by default value
+interactiveFqdn=yes # [yes | no]
+verType=server # [server | client]
+initType=systemd # [systemd | service | ...]
+
+while getopts "hv:e:i:" arg
+do
+ case $arg in
+ e)
+ #echo "interactiveFqdn=$OPTARG"
+ interactiveFqdn=$( echo $OPTARG )
+ ;;
+ v)
+ #echo "verType=$OPTARG"
+ verType=$(echo $OPTARG)
+ ;;
+ i)
+ #echo "initType=$OPTARG"
+ initType=$(echo $OPTARG)
+ ;;
+ h)
+ echo "Usage: `basename $0` -v [server | client] -e [yes | no]"
+ exit 0
+ ;;
+ ?) #unknow option
+ echo "unkonw argument"
+ exit 1
+ ;;
+ esac
+done
+
+function kill_process() {
+ pid=$(ps -ef | grep "$1" | grep -v "grep" | awk '{print $2}')
+ if [ -n "$pid" ]; then
+ ${csudo} kill -9 $pid || :
+ fi
+}
+
+function install_main_path() {
+ #create install main dir and all sub dir
+ ${csudo} rm -rf ${install_main_dir} || :
+ ${csudo} mkdir -p ${install_main_dir}
+ ${csudo} mkdir -p ${install_main_dir}/cfg
+ ${csudo} mkdir -p ${install_main_dir}/bin
+ ${csudo} mkdir -p ${install_main_dir}/connector
+ ${csudo} mkdir -p ${install_main_dir}/driver
+ ${csudo} mkdir -p ${install_main_dir}/examples
+ ${csudo} mkdir -p ${install_main_dir}/include
+ ${csudo} mkdir -p ${install_main_dir}/init.d
+ if [ "$verMode" == "cluster" ]; then
+ ${csudo} mkdir -p ${nginx_dir}
+ fi
+}
+
+function install_bin() {
+ # Remove links
+ ${csudo} rm -f ${bin_link_dir}/prodbc || :
+ ${csudo} rm -f ${bin_link_dir}/prodbs || :
+ ${csudo} rm -f ${bin_link_dir}/prodemo || :
+ ${csudo} rm -f ${bin_link_dir}/rmprodb || :
+ ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
+ ${csudo} rm -f ${bin_link_dir}/set_core || :
+
+ ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+
+ #Make link
+ [ -x ${install_main_dir}/bin/prodbc ] && ${csudo} ln -s ${install_main_dir}/bin/prodbc ${bin_link_dir}/prodbc || :
+ [ -x ${install_main_dir}/bin/prodbs ] && ${csudo} ln -s ${install_main_dir}/bin/prodbs ${bin_link_dir}/prodbs || :
+ [ -x ${install_main_dir}/bin/prodemo ] && ${csudo} ln -s ${install_main_dir}/bin/prodemo ${bin_link_dir}/prodemo || :
+ [ -x ${install_main_dir}/bin/remove_pro.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_pro.sh ${bin_link_dir}/rmprodb || :
+ [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+ [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+
+ if [ "$verMode" == "cluster" ]; then
+ ${csudo} cp -r ${script_dir}/nginxd/* ${nginx_dir} && ${csudo} chmod 0555 ${nginx_dir}/*
+ ${csudo} mkdir -p ${nginx_dir}/logs
+ ${csudo} chmod 777 ${nginx_dir}/sbin/nginx
+ fi
+}
+
+function install_lib() {
+ # Remove links
+ ${csudo} rm -f ${lib_link_dir}/libtaos.* || :
+ ${csudo} rm -f ${lib64_link_dir}/libtaos.* || :
+ ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+
+ ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
+ ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+
+ if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
+ ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 || :
+ ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so || :
+ fi
+
+ if [ "$osType" != "Darwin" ]; then
+ ${csudo} ldconfig
+ else
+ ${csudo} update_dyld_shared_cache
+ fi
+}
+
+function install_header() {
+ ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h || :
+ ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
+ ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+ ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+}
+
+function install_jemalloc() {
+ jemalloc_dir=${script_dir}/jemalloc
+
+ if [ -d ${jemalloc_dir} ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/bin
+
+ if [ -f ${jemalloc_dir}/bin/jemalloc-config ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
+ fi
+ if [ -f ${jemalloc_dir}/bin/jemalloc.sh ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
+ fi
+ if [ -f ${jemalloc_dir}/bin/jeprof ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
+ fi
+ if [ -f ${jemalloc_dir}/include/jemalloc/jemalloc.h ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/include/jemalloc
+ ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
+ fi
+ if [ -f ${jemalloc_dir}/lib/libjemalloc.so.2 ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/lib
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
+ ${csudo} ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
+ ${csudo} /usr/bin/install -c -d /usr/local/lib
+ if [ -f ${jemalloc_dir}/lib/libjemalloc.a ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
+ fi
+ if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
+ fi
+ if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/lib/pkgconfig
+ ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
+ fi
+ fi
+ if [ -f ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/share/doc/jemalloc
+ ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
+ fi
+ if [ -f ${jemalloc_dir}/share/man/man3/jemalloc.3 ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
+ ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
+ fi
+
+ if [ -d /etc/ld.so.conf.d ]; then
+ ${csudo} echo "/usr/local/lib" > /etc/ld.so.conf.d/jemalloc.conf
+ ${csudo} ldconfig
+ else
+ echo "/etc/ld.so.conf.d not found!"
+ fi
+ fi
+}
+
+function add_newHostname_to_hosts() {
+ localIp="127.0.0.1"
+ OLD_IFS="$IFS"
+ IFS=" "
+ iphost=$(cat /etc/hosts | grep $1 | awk '{print $1}')
+ arr=($iphost)
+ IFS="$OLD_IFS"
+ for s in ${arr[@]}
+ do
+ if [[ "$s" == "$localIp" ]]; then
+ return
+ fi
+ done
+ ${csudo} echo "127.0.0.1 $1" >> /etc/hosts ||:
+}
+
+function set_hostname() {
+ echo -e -n "${GREEN}Please enter one hostname(must not be 'localhost')${NC}:"
+ read newHostname
+ while true; do
+ if [[ ! -z "$newHostname" && "$newHostname" != "localhost" ]]; then
+ break
+ else
+ read -p "Please enter one hostname(must not be 'localhost'):" newHostname
+ fi
+ done
+
+ ${csudo} hostname $newHostname ||:
+ retval=`echo $?`
+ if [[ $retval != 0 ]]; then
+ echo
+ echo "set hostname fail!"
+ return
+ fi
+
+ #ubuntu/centos /etc/hostname
+ if [[ -e /etc/hostname ]]; then
+ ${csudo} echo $newHostname > /etc/hostname ||:
+ fi
+
+ #debian: #HOSTNAME=yourname
+ if [[ -e /etc/sysconfig/network ]]; then
+ ${csudo} sed -i -r "s/#*\s*(HOSTNAME=\s*).*/\1$newHostname/" /etc/sysconfig/network ||:
+ fi
+
+ ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$newHostname/" ${cfg_install_dir}/taos.cfg
+ serverFqdn=$newHostname
+
+ if [[ -e /etc/hosts ]]; then
+ add_newHostname_to_hosts $newHostname
+ fi
+}
+
+function is_correct_ipaddr() {
+ newIp=$1
+ OLD_IFS="$IFS"
+ IFS=" "
+ arr=($iplist)
+ IFS="$OLD_IFS"
+ for s in ${arr[@]}
+ do
+ if [[ "$s" == "$newIp" ]]; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+function set_ipAsFqdn() {
+ iplist=$(ip address |grep inet |grep -v inet6 |grep -v 127.0.0.1 |awk '{print $2}' |awk -F "/" '{print $1}') ||:
+ if [ -z "$iplist" ]; then
+ iplist=$(ifconfig |grep inet |grep -v inet6 |grep -v 127.0.0.1 |awk '{print $2}' |awk -F ":" '{print $2}') ||:
+ fi
+
+ if [ -z "$iplist" ]; then
+ echo
+ echo -e -n "${GREEN}Unable to get local ip, use 127.0.0.1${NC}"
+ localFqdn="127.0.0.1"
+ # Write the local FQDN to configuration file
+ ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
+ serverFqdn=$localFqdn
+ echo
+ return
+ fi
+
+ echo -e -n "${GREEN}Please choose an IP from local IP list${NC}:"
+ echo
+ echo -e -n "${GREEN}$iplist${NC}"
+ echo
+ echo
+ echo -e -n "${GREEN}Notes: if IP is used as the node name, data can NOT be migrated to other machine directly${NC}:"
+ read localFqdn
+ while true; do
+ if [ ! -z "$localFqdn" ]; then
+ # Check if correct ip address
+ is_correct_ipaddr $localFqdn
+ retval=`echo $?`
+ if [[ $retval != 0 ]]; then
+ read -p "Please choose an IP from local IP list:" localFqdn
+ else
+ # Write the local FQDN to configuration file
+ ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
+ serverFqdn=$localFqdn
+ break
+ fi
+ else
+ read -p "Please choose an IP from local IP list:" localFqdn
+ fi
+ done
+}
+
+function local_fqdn_check() {
+ #serverFqdn=$(hostname)
+ echo
+ echo -e -n "System hostname is: ${GREEN}$serverFqdn${NC}"
+ echo
+ if [[ "$serverFqdn" == "" ]] || [[ "$serverFqdn" == "localhost" ]]; then
+ echo -e -n "${GREEN}It is strongly recommended to configure a hostname for this machine ${NC}"
+ echo
+
+ while true
+ do
+ read -r -p "Set hostname now? [Y/n] " input
+ if [ ! -n "$input" ]; then
+ set_hostname
+ break
+ else
+ case $input in
+ [yY][eE][sS]|[yY])
+ set_hostname
+ break
+ ;;
+
+ [nN][oO]|[nN])
+ set_ipAsFqdn
+ break
+ ;;
+
+ *)
+ echo "Invalid input..."
+ ;;
+ esac
+ fi
+ done
+ fi
+}
+
+function install_config() {
+ if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
+ ${csudo} mkdir -p ${cfg_install_dir}
+ [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
+ ${csudo} chmod 644 ${cfg_install_dir}/*
+ fi
+
+ ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
+ ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+
+ [ ! -z $1 ] && return 0 || : # only install client
+
+ if ((${update_flag}==1)); then
+ return 0
+ fi
+
+ if [ "$interactiveFqdn" == "no" ]; then
+ return 0
+ fi
+
+ local_fqdn_check
+
+ #FQDN_FORMAT="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
+ #FQDN_FORMAT="(:[1-6][0-9][0-9][0-9][0-9]$)"
+ #PORT_FORMAT="(/[1-6][0-9][0-9][0-9][0-9]?/)"
+ #FQDN_PATTERN=":[0-9]{1,5}$"
+
+ # first full-qualified domain name (FQDN) for ProDB cluster system
+ echo
+ echo -e -n "${GREEN}Enter FQDN:port (like h1.hanatech.com.cn:6030) of an existing ProDB cluster node to join${NC}"
+ echo
+ echo -e -n "${GREEN}OR leave it blank to build one${NC}:"
+ read firstEp
+ while true; do
+ if [ ! -z "$firstEp" ]; then
+ # check the format of the firstEp
+ #if [[ $firstEp == $FQDN_PATTERN ]]; then
+ # Write the first FQDN to configuration file
+ ${csudo} sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/taos.cfg
+ break
+ #else
+ # read -p "Please enter the correct FQDN:port: " firstEp
+ #fi
+ else
+ break
+ fi
+ done
+}
+
+
+function install_log() {
+ ${csudo} rm -rf ${log_dir} || :
+ ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+
+ ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+}
+
+function install_data() {
+ ${csudo} mkdir -p ${data_dir}
+
+ ${csudo} ln -s ${data_dir} ${install_main_dir}/data
+}
+
+function install_connector() {
+ ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+}
+
+function install_examples() {
+ if [ -d ${script_dir}/examples ]; then
+ ${csudo} cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
+ fi
+}
+
+function clean_service_on_sysvinit() {
+ if pidof prodbs &> /dev/null; then
+ ${csudo} service prodbs stop || :
+ fi
+
+ if pidof tarbitrator &> /dev/null; then
+ ${csudo} service tarbitratord stop || :
+ fi
+
+ if ((${initd_mod}==1)); then
+ if [ -e ${service_config_dir}/prodbs ]; then
+ ${csudo} chkconfig --del prodbs || :
+ fi
+
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} chkconfig --del tarbitratord || :
+ fi
+ elif ((${initd_mod}==2)); then
+ if [ -e ${service_config_dir}/prodbs ]; then
+ ${csudo} insserv -r prodbs || :
+ fi
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} insserv -r tarbitratord || :
+ fi
+ elif ((${initd_mod}==3)); then
+ if [ -e ${service_config_dir}/prodbs ]; then
+ ${csudo} update-rc.d -f prodbs remove || :
+ fi
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} update-rc.d -f tarbitratord remove || :
+ fi
+ fi
+
+ ${csudo} rm -f ${service_config_dir}/prodbs || :
+ ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+
+ if $(which init &> /dev/null); then
+ ${csudo} init q || :
+ fi
+}
+
+function install_service_on_sysvinit() {
+ clean_service_on_sysvinit
+ sleep 1
+
+ # Install prodbs service
+
+ if ((${os_type}==1)); then
+ ${csudo} cp -f ${script_dir}/init.d/prodbs.deb ${install_main_dir}/init.d/prodbs
+ ${csudo} cp ${script_dir}/init.d/prodbs.deb ${service_config_dir}/prodbs && ${csudo} chmod a+x ${service_config_dir}/prodbs
+ ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+ ${csudo} cp ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+ elif ((${os_type}==2)); then
+ ${csudo} cp -f ${script_dir}/init.d/prodbs.rpm ${install_main_dir}/init.d/prodbs
+ ${csudo} cp ${script_dir}/init.d/prodbs.rpm ${service_config_dir}/prodbs && ${csudo} chmod a+x ${service_config_dir}/prodbs
+ ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+ ${csudo} cp ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+ fi
+
+ if ((${initd_mod}==1)); then
+ ${csudo} chkconfig --add prodbs || :
+ ${csudo} chkconfig --level 2345 prodbs on || :
+ ${csudo} chkconfig --add tarbitratord || :
+ ${csudo} chkconfig --level 2345 tarbitratord on || :
+ elif ((${initd_mod}==2)); then
+ ${csudo} insserv prodbs || :
+ ${csudo} insserv -d prodbs || :
+ ${csudo} insserv tarbitratord || :
+ ${csudo} insserv -d tarbitratord || :
+ elif ((${initd_mod}==3)); then
+ ${csudo} update-rc.d prodbs defaults || :
+ ${csudo} update-rc.d tarbitratord defaults || :
+ fi
+}
+
+function clean_service_on_systemd() {
+ prodbs_service_config="${service_config_dir}/prodbs.service"
+ if systemctl is-active --quiet prodbs; then
+ echo "ProDB is running, stopping it..."
+ ${csudo} systemctl stop prodbs &> /dev/null || echo &> /dev/null
+ fi
+ ${csudo} systemctl disable prodbs &> /dev/null || echo &> /dev/null
+ ${csudo} rm -f ${prodbs_service_config}
+
+ tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+ if systemctl is-active --quiet tarbitratord; then
+ echo "tarbitrator is running, stopping it..."
+ ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+ fi
+ ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+ ${csudo} rm -f ${tarbitratord_service_config}
+
+ if [ "$verMode" == "cluster" ]; then
+ nginx_service_config="${service_config_dir}/nginxd.service"
+ if systemctl is-active --quiet nginxd; then
+ echo "Nginx for ProDB is running, stopping it..."
+ ${csudo} systemctl stop nginxd &> /dev/null || echo &> /dev/null
+ fi
+ ${csudo} systemctl disable nginxd &> /dev/null || echo &> /dev/null
+ ${csudo} rm -f ${nginx_service_config}
+ fi
+}
+
+function install_service_on_systemd() {
+ clean_service_on_systemd
+
+ prodbs_service_config="${service_config_dir}/prodbs.service"
+ ${csudo} bash -c "echo '[Unit]' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'Description=ProDB server service' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'After=network-online.target' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'Wants=network-online.target' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo '[Service]' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'Type=simple' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'ExecStart=/usr/bin/prodbs' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'ExecStartPre=/usr/local/ProDB/bin/startPre.sh' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'TimeoutStopSec=1000000s' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'LimitNOFILE=infinity' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'LimitNPROC=infinity' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'LimitCORE=infinity' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'TimeoutStartSec=0' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'StandardOutput=null' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'Restart=always' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'StartLimitBurst=3' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'StartLimitInterval=60s' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo '[Install]' >> ${prodbs_service_config}"
+ ${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${prodbs_service_config}"
+ ${csudo} systemctl enable prodbs
+
+ tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+ ${csudo} bash -c "echo '[Unit]' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'Description=ProDB arbitrator service' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'After=network-online.target' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'Wants=network-online.target' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo '[Service]' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'Type=simple' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'TimeoutStopSec=1000000s' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'LimitNOFILE=infinity' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'LimitNPROC=infinity' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'LimitCORE=infinity' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'TimeoutStartSec=0' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'StandardOutput=null' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'Restart=always' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'StartLimitBurst=3' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'StartLimitInterval=60s' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo '[Install]' >> ${tarbitratord_service_config}"
+ ${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${tarbitratord_service_config}"
+ #${csudo} systemctl enable tarbitratord
+
+ if [ "$verMode" == "cluster" ]; then
+ nginx_service_config="${service_config_dir}/nginxd.service"
+ ${csudo} bash -c "echo '[Unit]' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'Description=Nginx For PowrDB Service' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'After=network-online.target' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'Wants=network-online.target' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo >> ${nginx_service_config}"
+ ${csudo} bash -c "echo '[Service]' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'Type=forking' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'PIDFile=/usr/local/nginxd/logs/nginx.pid' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'ExecStart=/usr/local/nginxd/sbin/nginx' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'ExecStop=/usr/local/nginxd/sbin/nginx -s stop' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'TimeoutStopSec=1000000s' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'LimitNOFILE=infinity' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'LimitNPROC=infinity' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'LimitCORE=infinity' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'TimeoutStartSec=0' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'StandardOutput=null' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'Restart=always' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'StartLimitBurst=3' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'StartLimitInterval=60s' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo >> ${nginx_service_config}"
+ ${csudo} bash -c "echo '[Install]' >> ${nginx_service_config}"
+ ${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${nginx_service_config}"
+ if ! ${csudo} systemctl enable nginxd &> /dev/null; then
+ ${csudo} systemctl daemon-reexec
+ ${csudo} systemctl enable nginxd
+ fi
+ ${csudo} systemctl start nginxd
+ fi
+}
+
+function install_service() {
+ if ((${service_mod}==0)); then
+ install_service_on_systemd
+ elif ((${service_mod}==1)); then
+ install_service_on_sysvinit
+ else
+ # must manual stop prodbs
+ kill_process prodbs
+ fi
+}
+
+vercomp () {
+ if [[ $1 == $2 ]]; then
+ return 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
+ return 1
+ fi
+ if ((10#${ver1[i]} < 10#${ver2[i]}))
+ then
+ return 2
+ fi
+ done
+ return 0
+}
+
+function is_version_compatible() {
+ curr_version=`ls ${script_dir}/driver/libtaos.so* |cut -d '.' -f 3-6`
+
+ if [ -f ${script_dir}/driver/vercomp.txt ]; then
+ min_compatible_version=`cat ${script_dir}/driver/vercomp.txt`
+ else
+ min_compatible_version=$(${script_dir}/bin/prodbs -V | head -1 | cut -d ' ' -f 5)
+ fi
+
+ vercomp $curr_version $min_compatible_version
+ case $? in
+ 0) return 0;;
+ 1) return 0;;
+ 2) return 1;;
+ esac
+}
+
+function update_prodb() {
+ # Start to update
+ if [ ! -e prodb.tar.gz ]; then
+ echo "File prodb.tar.gz does not exist"
+ exit 1
+ fi
+ tar -zxf prodb.tar.gz
+ install_jemalloc
+
+ # Check if version compatible
+ if ! is_version_compatible; then
+ echo -e "${RED}Version incompatible${NC}"
+ return 1
+ fi
+
+ echo -e "${GREEN}Start to update ProDB...${NC}"
+ # Stop the service if running
+ if pidof prodbs &> /dev/null; then
+ if ((${service_mod}==0)); then
+ ${csudo} systemctl stop prodbs || :
+ elif ((${service_mod}==1)); then
+ ${csudo} service prodbs stop || :
+ else
+ kill_process prodbs
+ fi
+ sleep 1
+ fi
+ if [ "$verMode" == "cluster" ]; then
+ if pidof nginx &> /dev/null; then
+ if ((${service_mod}==0)); then
+ ${csudo} systemctl stop nginxd || :
+ elif ((${service_mod}==1)); then
+ ${csudo} service nginxd stop || :
+ else
+ kill_process nginx
+ fi
+ sleep 1
+ fi
+ fi
+
+ install_main_path
+
+ install_log
+ install_header
+ install_lib
+ if [ "$pagMode" != "lite" ]; then
+ install_connector
+ fi
+ install_examples
+ if [ -z $1 ]; then
+ install_bin
+ install_service
+ install_config
+
+ openresty_work=false
+ if [ "$verMode" == "cluster" ]; then
+ # Check if openresty is installed
+ # Check if nginx is installed successfully
+ if type curl &> /dev/null; then
+ if curl -sSf http://127.0.0.1:${nginx_port} &> /dev/null; then
+ echo -e "\033[44;32;1mNginx for ProDB is updated successfully!${NC}"
+ openresty_work=true
+ else
+ echo -e "\033[44;31;5mNginx for ProDB does not work! Please try again!\033[0m"
+ fi
+ fi
+ fi
+
+ #echo
+ #echo -e "\033[44;32;1mProDB is updated successfully!${NC}"
+ echo
+ echo -e "${GREEN_DARK}To configure ProDB ${NC}: edit /etc/ProDB/taos.cfg"
+ if ((${service_mod}==0)); then
+ echo -e "${GREEN_DARK}To start ProDB ${NC}: ${csudo} systemctl start prodbs${NC}"
+ elif ((${service_mod}==1)); then
+ echo -e "${GREEN_DARK}To start ProDB ${NC}: ${csudo} service prodbs start${NC}"
+ else
+ echo -e "${GREEN_DARK}To start ProDB ${NC}: ./prodbs${NC}"
+ fi
+
+ if [ ${openresty_work} = 'true' ]; then
+ echo -e "${GREEN_DARK}To access ProDB ${NC}: use ${GREEN_UNDERLINE}prodbc -h $serverFqdn${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
+ else
+ echo -e "${GREEN_DARK}To access ProDB ${NC}: use ${GREEN_UNDERLINE}prodbc -h $serverFqdn${NC} in shell${NC}"
+ fi
+
+ echo
+ echo -e "\033[44;32;1mProDB is updated successfully!${NC}"
+ else
+ install_bin
+ install_config
+
+ echo
+ echo -e "\033[44;32;1mProDB client is updated successfully!${NC}"
+ fi
+
+ rm -rf $(tar -tf prodb.tar.gz)
+}
+
+function install_prodb() {
+ # Start to install
+ if [ ! -e prodb.tar.gz ]; then
+ echo "File prodb.tar.gz does not exist"
+ exit 1
+ fi
+ tar -zxf prodb.tar.gz
+
+ echo -e "${GREEN}Start to install ProDB...${NC}"
+
+ install_main_path
+
+ if [ -z $1 ]; then
+ install_data
+ fi
+
+ install_log
+ install_header
+ install_lib
+ install_jemalloc
+ if [ "$pagMode" != "lite" ]; then
+ install_connector
+ fi
+ install_examples
+
+ if [ -z $1 ]; then # install service and client
+ # For installing new
+ install_bin
+ install_service
+
+ openresty_work=false
+ if [ "$verMode" == "cluster" ]; then
+ # Check if nginx is installed successfully
+ if type curl &> /dev/null; then
+ if curl -sSf http://127.0.0.1:${nginx_port} &> /dev/null; then
+ echo -e "\033[44;32;1mNginx for ProDB is installed successfully!${NC}"
+ openresty_work=true
+ else
+ echo -e "\033[44;31;5mNginx for ProDB does not work! Please try again!\033[0m"
+ fi
+ fi
+ fi
+
+ install_config
+
+ # Ask if to start the service
+ #echo
+ #echo -e "\033[44;32;1mProDB is installed successfully!${NC}"
+ echo
+ echo -e "${GREEN_DARK}To configure ProDB ${NC}: edit /etc/ProDB/taos.cfg"
+ if ((${service_mod}==0)); then
+ echo -e "${GREEN_DARK}To start ProDB ${NC}: ${csudo} systemctl start prodbs${NC}"
+ elif ((${service_mod}==1)); then
+ echo -e "${GREEN_DARK}To start ProDB ${NC}: ${csudo} service prodbs start${NC}"
+ else
+ echo -e "${GREEN_DARK}To start ProDB ${NC}: prodbs${NC}"
+ fi
+
+ if [ ! -z "$firstEp" ]; then
+ tmpFqdn=${firstEp%%:*}
+ substr=":"
+ if [[ $firstEp =~ $substr ]];then
+ tmpPort=${firstEp#*:}
+ else
+ tmpPort=""
+ fi
+ if [[ "$tmpPort" != "" ]];then
+ echo -e "${GREEN_DARK}To access ProDB ${NC}: prodbc -h $tmpFqdn -P $tmpPort${GREEN_DARK} to login into cluster, then${NC}"
+ else
+ echo -e "${GREEN_DARK}To access ProDB ${NC}: prodbc -h $tmpFqdn${GREEN_DARK} to login into cluster, then${NC}"
+ fi
+ echo -e "${GREEN_DARK}execute ${NC}: create dnode 'newDnodeFQDN:port'; ${GREEN_DARK}to add this new node${NC}"
+ echo
+ elif [ ! -z "$serverFqdn" ]; then
+ echo -e "${GREEN_DARK}To access ProDB ${NC}: prodbc -h $serverFqdn${GREEN_DARK} to login into ProDB server${NC}"
+ echo
+ fi
+ echo -e "\033[44;32;1mProDB is installed successfully!${NC}"
+ echo
+ else # Only install client
+ install_bin
+ install_config
+
+ echo
+ echo -e "\033[44;32;1mProDB client is installed successfully!${NC}"
+ fi
+
+ rm -rf $(tar -tf prodb.tar.gz)
+}
+
+
+## ==============================Main program starts from here============================
+serverFqdn=$(hostname)
+if [ "$verType" == "server" ]; then
+ # Install server and client
+ if [ -x ${bin_dir}/prodbs ]; then
+ update_flag=1
+ update_prodb
+ else
+ install_prodb
+ fi
+elif [ "$verType" == "client" ]; then
+ interactiveFqdn=no
+ # Only install client
+ if [ -x ${bin_dir}/prodbc ]; then
+ update_flag=1
+ update_prodb client
+ else
+ install_prodb client
+ fi
+else
+ echo "please input correct verType"
+fi
diff --git a/packaging/tools/makearbi_pro.sh b/packaging/tools/makearbi_pro.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6ce3765e44acc408ced9730c54b793338eb37b38
--- /dev/null
+++ b/packaging/tools/makearbi_pro.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# Generate arbitrator's tar.gz setup package for all os system
+
+set -e
+#set -x
+
+curr_dir=$(pwd)
+compile_dir=$1
+version=$2
+build_time=$3
+cpuType=$4
+osType=$5
+verMode=$6
+verType=$7
+pagMode=$8
+
+script_dir="$(dirname $(readlink -f $0))"
+top_dir="$(readlink -f ${script_dir}/../..)"
+
+# create compressed install file.
+build_dir="${compile_dir}/build"
+code_dir="${top_dir}/src"
+release_dir="${top_dir}/release"
+
+#package_name='linux'
+if [ "$verMode" == "cluster" ]; then
+ install_dir="${release_dir}/ProDB-enterprise-arbitrator-${version}"
+else
+ install_dir="${release_dir}/ProDB-arbitrator-${version}"
+fi
+
+# Directories and files.
+bin_files="${build_dir}/bin/tarbitrator ${script_dir}/remove_arbi_pro.sh"
+install_files="${script_dir}/install_arbi_pro.sh"
+
+#header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
+init_file_tarbitrator_deb=${script_dir}/../deb/tarbitratord
+init_file_tarbitrator_rpm=${script_dir}/../rpm/tarbitratord
+
+# make directories.
+mkdir -p ${install_dir} && cp ${install_files} ${install_dir} && chmod a+x ${install_dir}/install_arbi_pro.sh || :
+#mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc || :
+mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || :
+mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
+mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
+
+cd ${release_dir}
+
+if [ "$verMode" == "cluster" ]; then
+ pkg_name=${install_dir}-${osType}-${cpuType}
+elif [ "$verMode" == "edge" ]; then
+ pkg_name=${install_dir}-${osType}-${cpuType}
+else
+ echo "unknow verMode, nor cluster or edge"
+ exit 1
+fi
+
+if [ "$verType" == "beta" ]; then
+ pkg_name=${pkg_name}-${verType}
+elif [ "$verType" == "stable" ]; then
+ pkg_name=${pkg_name}
+else
+ echo "unknow verType, nor stabel or beta"
+ exit 1
+fi
+
+tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+ echo "tar ${pkg_name}.tar.gz error !!!"
+ exit $exitcode
+fi
+
+cd ${curr_dir}
diff --git a/packaging/tools/makeclient_pro.sh b/packaging/tools/makeclient_pro.sh
new file mode 100755
index 0000000000000000000000000000000000000000..599c91fbf082955887c677b750aa12f946c0890b
--- /dev/null
+++ b/packaging/tools/makeclient_pro.sh
@@ -0,0 +1,225 @@
+#!/bin/bash
+#
+# Generate tar.gz package for linux client in all os system
+set -e
+#set -x
+
+curr_dir=$(pwd)
+compile_dir=$1
+version=$2
+build_time=$3
+cpuType=$4
+osType=$5
+verMode=$6
+verType=$7
+pagMode=$8
+
+if [ "$osType" != "Darwin" ]; then
+ script_dir="$(dirname $(readlink -f $0))"
+ top_dir="$(readlink -f ${script_dir}/../..)"
+else
+ script_dir=`dirname $0`
+ cd ${script_dir}
+ script_dir="$(pwd)"
+ top_dir=${script_dir}/../..
+fi
+
+# create compressed install file.
+build_dir="${compile_dir}/build"
+code_dir="${top_dir}/src"
+release_dir="${top_dir}/release"
+
+#package_name='linux'
+
+if [ "$verMode" == "cluster" ]; then
+ install_dir="${release_dir}/ProDB-enterprise-client-${version}"
+else
+ install_dir="${release_dir}/ProDB-client-${version}"
+fi
+
+# Directories and files.
+
+if [ "$osType" != "Darwin" ]; then
+ lib_files="${build_dir}/lib/libtaos.so.${version}"
+else
+ bin_files="${build_dir}/bin/taos ${script_dir}/remove_client_pro.sh"
+ lib_files="${build_dir}/lib/libtaos.${version}.dylib"
+fi
+
+header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
+if [ "$verMode" == "cluster" ]; then
+ cfg_dir="${top_dir}/../enterprise/packaging/cfg"
+else
+ cfg_dir="${top_dir}/packaging/cfg"
+fi
+
+install_files="${script_dir}/install_client_pro.sh"
+
+# make directories.
+mkdir -p ${install_dir}
+mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
+mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg
+
+sed -i '/dataDir/ {s/taos/ProDB/g}' ${install_dir}/cfg/taos.cfg
+sed -i '/logDir/ {s/taos/ProDB/g}' ${install_dir}/cfg/taos.cfg
+sed -i "s/TDengine/ProDB/g" ${install_dir}/cfg/taos.cfg
+
+mkdir -p ${install_dir}/bin
+if [ "$osType" != "Darwin" ]; then
+ if [ "$pagMode" == "lite" ]; then
+ strip ${build_dir}/bin/taos
+ cp ${build_dir}/bin/taos ${install_dir}/bin/prodbc
+ cp ${script_dir}/remove_pro.sh ${install_dir}/bin
+ else
+ cp ${build_dir}/bin/taos ${install_dir}/bin/prodbc
+ cp ${script_dir}/remove_pro.sh ${install_dir}/bin
+ cp ${build_dir}/bin/taosdemo ${install_dir}/bin/prodemo
+ cp ${build_dir}/bin/taosdump ${install_dir}/bin/prodump
+ cp ${script_dir}/set_core.sh ${install_dir}/bin
+ cp ${script_dir}/get_client.sh ${install_dir}/bin
+ cp ${script_dir}/taosd-dump-cfg.gdb ${install_dir}/bin
+ fi
+else
+ cp ${bin_files} ${install_dir}/bin
+fi
+chmod a+x ${install_dir}/bin/* || :
+
+if [ -f ${build_dir}/bin/jemalloc-config ]; then
+ mkdir -p ${install_dir}/jemalloc/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}
+ cp ${build_dir}/bin/jemalloc-config ${install_dir}/jemalloc/bin
+ if [ -f ${build_dir}/bin/jemalloc.sh ]; then
+ cp ${build_dir}/bin/jemalloc.sh ${install_dir}/jemalloc/bin
+ fi
+ if [ -f ${build_dir}/bin/jeprof ]; then
+ cp ${build_dir}/bin/jeprof ${install_dir}/jemalloc/bin
+ fi
+ if [ -f ${build_dir}/include/jemalloc/jemalloc.h ]; then
+ cp ${build_dir}/include/jemalloc/jemalloc.h ${install_dir}/jemalloc/include/jemalloc
+ fi
+ if [ -f ${build_dir}/lib/libjemalloc.so.2 ]; then
+ cp ${build_dir}/lib/libjemalloc.so.2 ${install_dir}/jemalloc/lib
+ ln -sf libjemalloc.so.2 ${install_dir}/jemalloc/lib/libjemalloc.so
+ fi
+ if [ -f ${build_dir}/lib/libjemalloc.a ]; then
+ cp ${build_dir}/lib/libjemalloc.a ${install_dir}/jemalloc/lib
+ fi
+ if [ -f ${build_dir}/lib/libjemalloc_pic.a ]; then
+ cp ${build_dir}/lib/libjemalloc_pic.a ${install_dir}/jemalloc/lib
+ fi
+ if [ -f ${build_dir}/lib/pkgconfig/jemalloc.pc ]; then
+ cp ${build_dir}/lib/pkgconfig/jemalloc.pc ${install_dir}/jemalloc/lib/pkgconfig
+ fi
+ if [ -f ${build_dir}/share/doc/jemalloc/jemalloc.html ]; then
+ cp ${build_dir}/share/doc/jemalloc/jemalloc.html ${install_dir}/jemalloc/share/doc/jemalloc
+ fi
+ if [ -f ${build_dir}/share/man/man3/jemalloc.3 ]; then
+ cp ${build_dir}/share/man/man3/jemalloc.3 ${install_dir}/jemalloc/share/man/man3
+ fi
+fi
+
+cd ${install_dir}
+
+if [ "$osType" != "Darwin" ]; then
+ tar -zcv -f prodb.tar.gz * --remove-files || :
+else
+ tar -zcv -f prodb.tar.gz * || :
+ mv prodb.tar.gz ..
+ rm -rf ./*
+ mv ../prodb.tar.gz .
+fi
+
+cd ${curr_dir}
+cp ${install_files} ${install_dir}
+if [ "$osType" == "Darwin" ]; then
+ sed 's/osType=Linux/osType=Darwin/g' ${install_dir}/install_client_pro.sh >> install_client_prodb_temp.sh
+ mv install_client_prodb_temp.sh ${install_dir}/install_client_pro.sh
+fi
+if [ "$pagMode" == "lite" ]; then
+ sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install_client_pro.sh >> install_client_prodb_temp.sh
+ mv install_client_prodb_temp.sh ${install_dir}/install_client_pro.sh
+fi
+chmod a+x ${install_dir}/install_client_pro.sh
+
+# Copy example code
+mkdir -p ${install_dir}/examples
+examples_dir="${top_dir}/tests/examples"
+cp -r ${examples_dir}/c ${install_dir}/examples
+sed -i '/passwd/ {s/taosdata/prodb/g}' ${install_dir}/examples/c/*.c
+sed -i '/root/ {s/taosdata/prodb/g}' ${install_dir}/examples/c/*.c
+
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+ cp -r ${examples_dir}/JDBC ${install_dir}/examples
+ cp -r ${examples_dir}/matlab ${install_dir}/examples
+ mv ${install_dir}/examples/matlab/TDengineDemo.m ${install_dir}/examples/matlab/ProDBDemo.m
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/examples/matlab/ProDBDemo.m
+ cp -r ${examples_dir}/python ${install_dir}/examples
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/examples/python/read_example.py
+ cp -r ${examples_dir}/R ${install_dir}/examples
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/examples/R/command.txt
+ cp -r ${examples_dir}/go ${install_dir}/examples
+ mv ${install_dir}/examples/go/taosdemo.go ${install_dir}/examples/go/prodemo.go
+ sed -i '/root/ {s/taosdata/prodb/g}' ${install_dir}/examples/go/prodemo.go
+fi
+# Copy driver
+mkdir -p ${install_dir}/driver
+cp ${lib_files} ${install_dir}/driver
+
+# Copy connector
+connector_dir="${code_dir}/connector"
+mkdir -p ${install_dir}/connector
+
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+ if [ "$osType" != "Darwin" ]; then
+ cp ${build_dir}/lib/*.jar ${install_dir}/connector ||:
+ fi
+ if [ -d "${connector_dir}/grafanaplugin/dist" ]; then
+ cp -r ${connector_dir}/grafanaplugin/dist ${install_dir}/connector/grafanaplugin
+ else
+ echo "WARNING: grafanaplugin bunlded dir not found, please check if want to use it!"
+ fi
+ if find ${connector_dir}/go -mindepth 1 -maxdepth 1 | read; then
+ cp -r ${connector_dir}/go ${install_dir}/connector
+ else
+ echo "WARNING: go connector not found, please check if want to use it!"
+ fi
+ cp -r ${connector_dir}/python ${install_dir}/connector
+ mv ${install_dir}/connector/python/taos ${install_dir}/connector/python/prodb
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/connector/python/prodb/cinterface.py
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/connector/python/prodb/subscription.py
+ sed -i '/self._password/ {s/taosdata/prodb/g}' ${install_dir}/connector/python/prodb/connection.py
+fi
+
+cd ${release_dir}
+
+if [ "$verMode" == "cluster" ]; then
+ pkg_name=${install_dir}-${osType}-${cpuType}
+elif [ "$verMode" == "edge" ]; then
+ pkg_name=${install_dir}-${osType}-${cpuType}
+else
+ echo "unknow verMode, nor cluster or edge"
+ exit 1
+fi
+
+if [ "$pagMode" == "lite" ]; then
+ pkg_name=${pkg_name}-Lite
+fi
+
+if [ "$verType" == "beta" ]; then
+ pkg_name=${pkg_name}-${verType}
+elif [ "$verType" == "stable" ]; then
+ pkg_name=${pkg_name}
+else
+ echo "unknow verType, nor stable or beta"
+ exit 1
+fi
+
+if [ "$osType" != "Darwin" ]; then
+ tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+else
+ tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) || :
+ mv "$(basename ${pkg_name}).tar.gz" ..
+ rm -rf ./*
+ mv ../"$(basename ${pkg_name}).tar.gz" .
+fi
+
+cd ${curr_dir}
diff --git a/packaging/tools/makepkg_pro.sh b/packaging/tools/makepkg_pro.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ffe4566b42017a7bffa6166ae28e18ca29bd03cd
--- /dev/null
+++ b/packaging/tools/makepkg_pro.sh
@@ -0,0 +1,193 @@
+#!/bin/bash
+#
+# Generate tar.gz package for all os system
+
+set -e
+#set -x
+
+curr_dir=$(pwd)
+compile_dir=$1
+version=$2
+build_time=$3
+cpuType=$4
+osType=$5
+verMode=$6
+verType=$7
+pagMode=$8
+versionComp=$9
+
+script_dir="$(dirname $(readlink -f $0))"
+top_dir="$(readlink -f ${script_dir}/../..)"
+
+# create compressed install file.
+build_dir="${compile_dir}/build"
+code_dir="${top_dir}/src"
+release_dir="${top_dir}/release"
+
+#package_name='linux'
+if [ "$verMode" == "cluster" ]; then
+ install_dir="${release_dir}/ProDB-enterprise-server-${version}"
+else
+ install_dir="${release_dir}/ProDB-server-${version}"
+fi
+
+lib_files="${build_dir}/lib/libtaos.so.${version}"
+header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
+if [ "$verMode" == "cluster" ]; then
+ cfg_dir="${top_dir}/../enterprise/packaging/cfg"
+else
+ cfg_dir="${top_dir}/packaging/cfg"
+fi
+install_files="${script_dir}/install_pro.sh"
+nginx_dir="${code_dir}/../../enterprise/src/plugins/web"
+
+# make directories.
+mkdir -p ${install_dir}
+mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
+mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg
+
+#mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || :
+mkdir -p ${install_dir}/bin
+if [ "$pagMode" == "lite" ]; then
+ strip ${build_dir}/bin/taosd
+ strip ${build_dir}/bin/taos
+ cp ${build_dir}/bin/taos ${install_dir}/bin/prodbc
+ cp ${build_dir}/bin/taosd ${install_dir}/bin/prodbs
+ cp ${script_dir}/remove_pro.sh ${install_dir}/bin
+else
+ cp ${build_dir}/bin/taos ${install_dir}/bin/prodbc
+ cp ${build_dir}/bin/taosd ${install_dir}/bin/prodbs
+ cp ${script_dir}/remove_pro.sh ${install_dir}/bin
+ cp ${build_dir}/bin/taosdemo ${install_dir}/bin/prodemo
+ cp ${build_dir}/bin/taosdump ${install_dir}/bin/prodump
+ cp ${build_dir}/bin/tarbitrator ${install_dir}/bin
+ cp ${script_dir}/set_core.sh ${install_dir}/bin
+ cp ${script_dir}/get_client.sh ${install_dir}/bin
+ cp ${script_dir}/startPre.sh ${install_dir}/bin
+ cp ${script_dir}/taosd-dump-cfg.gdb ${install_dir}/bin
+fi
+chmod a+x ${install_dir}/bin/* || :
+
+if [ "$verMode" == "cluster" ]; then
+ sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove_pro.sh >> remove_prodb_temp.sh
+ mv remove_prodb_temp.sh ${install_dir}/bin/remove_pro.sh
+
+ mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
+ cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
+ rm -rf ${install_dir}/nginxd/png
+
+ sed -i "s/TDengine/ProDB/g" ${install_dir}/nginxd/admin/*.html
+ sed -i "s/TDengine/ProDB/g" ${install_dir}/nginxd/admin/js/*.js
+
+ sed -i '/dataDir/ {s/taos/ProDB/g}' ${install_dir}/cfg/taos.cfg
+ sed -i '/logDir/ {s/taos/ProDB/g}' ${install_dir}/cfg/taos.cfg
+ sed -i "s/TDengine/ProDB/g" ${install_dir}/cfg/taos.cfg
+
+ if [ "$cpuType" == "aarch64" ]; then
+ cp -f ${install_dir}/nginxd/sbin/arm/64bit/nginx ${install_dir}/nginxd/sbin/
+ elif [ "$cpuType" == "aarch32" ]; then
+ cp -f ${install_dir}/nginxd/sbin/arm/32bit/nginx ${install_dir}/nginxd/sbin/
+ fi
+ rm -rf ${install_dir}/nginxd/sbin/arm
+fi
+
+cd ${install_dir}
+tar -zcv -f prodb.tar.gz * --remove-files || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+ echo "tar prodb.tar.gz error !!!"
+ exit $exitcode
+fi
+
+cd ${curr_dir}
+cp ${install_files} ${install_dir}
+if [ "$verMode" == "cluster" ]; then
+ sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install_pro.sh >> install_prodb_temp.sh
+ mv install_prodb_temp.sh ${install_dir}/install_pro.sh
+fi
+if [ "$pagMode" == "lite" ]; then
+ sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >> install_prodb_temp.sh
+ mv install_prodb_temp.sh ${install_dir}/install_pro.sh
+fi
+chmod a+x ${install_dir}/install_pro.sh
+
+# Copy example code
+mkdir -p ${install_dir}/examples
+examples_dir="${top_dir}/tests/examples"
+cp -r ${examples_dir}/c ${install_dir}/examples
+sed -i '/passwd/ {s/taosdata/prodb/g}' ${install_dir}/examples/c/*.c
+sed -i '/root/ {s/taosdata/prodb/g}' ${install_dir}/examples/c/*.c
+
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+ cp -r ${examples_dir}/JDBC ${install_dir}/examples
+ cp -r ${examples_dir}/matlab ${install_dir}/examples
+ mv ${install_dir}/examples/matlab/TDengineDemo.m ${install_dir}/examples/matlab/ProDBDemo.m
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/examples/matlab/ProDBDemo.m
+ cp -r ${examples_dir}/python ${install_dir}/examples
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/examples/python/read_example.py
+ cp -r ${examples_dir}/R ${install_dir}/examples
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/examples/R/command.txt
+ cp -r ${examples_dir}/go ${install_dir}/examples
+ mv ${install_dir}/examples/go/taosdemo.go ${install_dir}/examples/go/prodemo.go
+ sed -i '/root/ {s/taosdata/prodb/g}' ${install_dir}/examples/go/prodemo.go
+fi
+# Copy driver
+mkdir -p ${install_dir}/driver && cp ${lib_files} ${install_dir}/driver && echo "${versionComp}" > ${install_dir}/driver/vercomp.txt
+
+# Copy connector
+connector_dir="${code_dir}/connector"
+mkdir -p ${install_dir}/connector
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+ cp ${build_dir}/lib/*.jar ${install_dir}/connector ||:
+
+ if [ -d "${connector_dir}/grafanaplugin/dist" ]; then
+ cp -r ${connector_dir}/grafanaplugin/dist ${install_dir}/connector/grafanaplugin
+ else
+ echo "WARNING: grafanaplugin bundled dir not found, please check if want to use it!"
+ fi
+ if find ${connector_dir}/go -mindepth 1 -maxdepth 1 | read; then
+ cp -r ${connector_dir}/go ${install_dir}/connector
+ else
+ echo "WARNING: go connector not found, please check if want to use it!"
+ fi
+ cp -r ${connector_dir}/python ${install_dir}/connector/
+ mv ${install_dir}/connector/python/taos ${install_dir}/connector/python/prodb
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/connector/python/prodb/cinterface.py
+
+ sed -i '/password/ {s/taosdata/prodb/g}' ${install_dir}/connector/python/prodb/subscription.py
+
+ sed -i '/self._password/ {s/taosdata/prodb/g}' ${install_dir}/connector/python/prodb/connection.py
+fi
+
+cd ${release_dir}
+
+if [ "$verMode" == "cluster" ]; then
+ pkg_name=${install_dir}-${osType}-${cpuType}
+elif [ "$verMode" == "edge" ]; then
+ pkg_name=${install_dir}-${osType}-${cpuType}
+else
+ echo "unknow verMode, nor cluster or edge"
+ exit 1
+fi
+
+if [ "$pagMode" == "lite" ]; then
+ pkg_name=${pkg_name}-Lite
+fi
+
+if [ "$verType" == "beta" ]; then
+ pkg_name=${pkg_name}-${verType}
+elif [ "$verType" == "stable" ]; then
+ pkg_name=${pkg_name}
+else
+ echo "unknow verType, nor stabel or beta"
+ exit 1
+fi
+
+tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+ echo "tar ${pkg_name}.tar.gz error !!!"
+ exit $exitcode
+fi
+
+cd ${curr_dir}
diff --git a/packaging/tools/remove_arbi_pro.sh b/packaging/tools/remove_arbi_pro.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ff10478881628bdaf027c618a1b89f204ebbdb35
--- /dev/null
+++ b/packaging/tools/remove_arbi_pro.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+#
+# Script to stop the service and uninstall ProDB's arbitrator
+
+set -e
+#set -x
+
+verMode=edge
+
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+NC='\033[0m'
+
+#install main path
+install_main_dir="/usr/local/tarbitrator"
+bin_link_dir="/usr/bin"
+
+service_config_dir="/etc/systemd/system"
+tarbitrator_service_name="tarbitratord"
+csudo=""
+if command -v sudo > /dev/null; then
+ csudo="sudo"
+fi
+
+initd_mod=0
+service_mod=2
+if pidof systemd &> /dev/null; then
+ service_mod=0
+elif $(which service &> /dev/null); then
+ service_mod=1
+ service_config_dir="/etc/init.d"
+ if $(which chkconfig &> /dev/null); then
+ initd_mod=1
+ elif $(which insserv &> /dev/null); then
+ initd_mod=2
+ elif $(which update-rc.d &> /dev/null); then
+ initd_mod=3
+ else
+ service_mod=2
+ fi
+else
+ service_mod=2
+fi
+
+function kill_tarbitrator() {
+ pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
+ if [ -n "$pid" ]; then
+ ${csudo} kill -9 $pid || :
+ fi
+}
+
+function clean_bin() {
+ # Remove link
+ ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
+}
+
+function clean_header() {
+ # Remove link
+ ${csudo} rm -f ${inc_link_dir}/taos.h || :
+ ${csudo} rm -f ${inc_link_dir}/taoserror.h || :
+}
+
+function clean_log() {
+ # Remove link
+ ${csudo} rm -rf /arbitrator.log || :
+}
+
+function clean_service_on_systemd() {
+ tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
+
+ if systemctl is-active --quiet ${tarbitrator_service_name}; then
+ echo "ProDB tarbitrator is running, stopping it..."
+ ${csudo} systemctl stop ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+ fi
+ ${csudo} systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+
+ ${csudo} rm -f ${tarbitratord_service_config}
+}
+
+function clean_service_on_sysvinit() {
+ if pidof tarbitrator &> /dev/null; then
+ echo "ProDB's tarbitrator is running, stopping it..."
+ ${csudo} service tarbitratord stop || :
+ fi
+
+ if ((${initd_mod}==1)); then
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} chkconfig --del tarbitratord || :
+ fi
+ elif ((${initd_mod}==2)); then
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} insserv -r tarbitratord || :
+ fi
+ elif ((${initd_mod}==3)); then
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} update-rc.d -f tarbitratord remove || :
+ fi
+ fi
+
+ ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+
+ if $(which init &> /dev/null); then
+ ${csudo} init q || :
+ fi
+}
+
+function clean_service() {
+ if ((${service_mod}==0)); then
+ clean_service_on_systemd
+ elif ((${service_mod}==1)); then
+ clean_service_on_sysvinit
+ else
+ # must manual stop
+ kill_tarbitrator
+ fi
+}
+
+# Stop service and disable booting start.
+clean_service
+# Remove binary file and links
+clean_bin
+# Remove header file.
+##clean_header
+# Remove log file
+clean_log
+
+${csudo} rm -rf ${install_main_dir}
+
+echo -e "${GREEN}ProDB's arbitrator is removed successfully!${NC}"
+echo
diff --git a/packaging/tools/remove_client_pro.sh b/packaging/tools/remove_client_pro.sh
new file mode 100755
index 0000000000000000000000000000000000000000..59e4e8997620af035821df5a975fe58f1357c9dc
--- /dev/null
+++ b/packaging/tools/remove_client_pro.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+#
+# Script to stop the client and uninstall database, but retain the config and log files.
+set -e
+# set -x
+
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+NC='\033[0m'
+
+#install main path
+install_main_dir="/usr/local/ProDB"
+
+log_link_dir="/usr/local/ProDB/log"
+cfg_link_dir="/usr/local/ProDB/cfg"
+bin_link_dir="/usr/bin"
+lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
+inc_link_dir="/usr/include"
+
+csudo=""
+if command -v sudo > /dev/null; then
+ csudo="sudo"
+fi
+
+function kill_client() {
+ if [ -n "$(pidof prodbc)" ]; then
+ ${csudo} kill -9 $pid || :
+ fi
+}
+
+function clean_bin() {
+ # Remove link
+ ${csudo} rm -f ${bin_link_dir}/prodbc || :
+ ${csudo} rm -f ${bin_link_dir}/prodemo || :
+ ${csudo} rm -f ${bin_link_dir}/prodump || :
+ ${csudo} rm -f ${bin_link_dir}/rmprodb || :
+ ${csudo} rm -f ${bin_link_dir}/set_core || :
+}
+
+function clean_lib() {
+ # Remove link
+ ${csudo} rm -f ${lib_link_dir}/libtaos.* || :
+ ${csudo} rm -f ${lib64_link_dir}/libtaos.* || :
+}
+
+function clean_header() {
+ # Remove link
+ ${csudo} rm -f ${inc_link_dir}/taos.h || :
+ ${csudo} rm -f ${inc_link_dir}/taoserror.h || :
+}
+
+function clean_config() {
+ # Remove link
+ ${csudo} rm -f ${cfg_link_dir}/* || :
+}
+
+function clean_log() {
+ # Remove link
+ ${csudo} rm -rf ${log_link_dir} || :
+}
+
+# Stop client.
+kill_client
+# Remove binary file and links
+clean_bin
+# Remove header file.
+clean_header
+# Remove lib file
+clean_lib
+# Remove link log directory
+clean_log
+# Remove link configuration file
+clean_config
+
+${csudo} rm -rf ${install_main_dir}
+
+echo -e "${GREEN}ProDB client is removed successfully!${NC}"
+echo
diff --git a/packaging/tools/remove_pro.sh b/packaging/tools/remove_pro.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f6dad22bc21b02a9d717d530c50bc19c5a718478
--- /dev/null
+++ b/packaging/tools/remove_pro.sh
@@ -0,0 +1,210 @@
+#!/bin/bash
+#
+# Script to stop the service and uninstall ProDB, but retain the config, data and log files.
+
+set -e
+#set -x
+
+verMode=edge
+
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+NC='\033[0m'
+
+#install main path
+install_main_dir="/usr/local/ProDB"
+data_link_dir="/usr/local/ProDB/data"
+log_link_dir="/usr/local/ProDB/log"
+cfg_link_dir="/usr/local/ProDB/cfg"
+bin_link_dir="/usr/bin"
+lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
+inc_link_dir="/usr/include"
+install_nginxd_dir="/usr/local/nginxd"
+
+service_config_dir="/etc/systemd/system"
+prodb_service_name="prodbs"
+tarbitrator_service_name="tarbitratord"
+nginx_service_name="nginxd"
+csudo=""
+if command -v sudo > /dev/null; then
+ csudo="sudo"
+fi
+
+initd_mod=0
+service_mod=2
+if pidof systemd &> /dev/null; then
+ service_mod=0
+elif $(which service &> /dev/null); then
+ service_mod=1
+ service_config_dir="/etc/init.d"
+ if $(which chkconfig &> /dev/null); then
+ initd_mod=1
+ elif $(which insserv &> /dev/null); then
+ initd_mod=2
+ elif $(which update-rc.d &> /dev/null); then
+ initd_mod=3
+ else
+ service_mod=2
+ fi
+else
+ service_mod=2
+fi
+
+function kill_prodbs() {
+ pid=$(ps -ef | grep "prodbs" | grep -v "grep" | awk '{print $2}')
+ if [ -n "$pid" ]; then
+ ${csudo} kill -9 $pid || :
+ fi
+}
+
+function kill_tarbitrator() {
+ pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
+ if [ -n "$pid" ]; then
+ ${csudo} kill -9 $pid || :
+ fi
+}
+
+function clean_bin() {
+ # Remove link
+ ${csudo} rm -f ${bin_link_dir}/prodbc || :
+ ${csudo} rm -f ${bin_link_dir}/prodbs || :
+ ${csudo} rm -f ${bin_link_dir}/prodemo || :
+ ${csudo} rm -f ${bin_link_dir}/prodump || :
+ ${csudo} rm -f ${bin_link_dir}/rmprodb || :
+ ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
+ ${csudo} rm -f ${bin_link_dir}/set_core || :
+}
+
+function clean_lib() {
+ # Remove link
+ ${csudo} rm -f ${lib_link_dir}/libtaos.* || :
+ ${csudo} rm -f ${lib64_link_dir}/libtaos.* || :
+}
+
+function clean_header() {
+ # Remove link
+ ${csudo} rm -f ${inc_link_dir}/taos.h || :
+ ${csudo} rm -f ${inc_link_dir}/taoserror.h || :
+}
+
+function clean_config() {
+ # Remove link
+ ${csudo} rm -f ${cfg_link_dir}/* || :
+}
+
+function clean_log() {
+ # Remove link
+ ${csudo} rm -rf ${log_link_dir} || :
+}
+
+function clean_service_on_systemd() {
+ prodb_service_config="${service_config_dir}/${prodb_service_name}.service"
+ if systemctl is-active --quiet ${prodb_service_name}; then
+ echo "ProDB prodbs is running, stopping it..."
+ ${csudo} systemctl stop ${prodb_service_name} &> /dev/null || echo &> /dev/null
+ fi
+ ${csudo} systemctl disable ${prodb_service_name} &> /dev/null || echo &> /dev/null
+ ${csudo} rm -f ${prodb_service_config}
+
+ tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
+ if systemctl is-active --quiet ${tarbitrator_service_name}; then
+ echo "ProDB tarbitrator is running, stopping it..."
+ ${csudo} systemctl stop ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+ fi
+ ${csudo} systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+ ${csudo} rm -f ${tarbitratord_service_config}
+
+ if [ "$verMode" == "cluster" ]; then
+ nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
+ if [ -d ${bin_dir}/web ]; then
+ if systemctl is-active --quiet ${nginx_service_name}; then
+ echo "Nginx for ProDB is running, stopping it..."
+ ${csudo} systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null
+ fi
+ ${csudo} systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null
+
+ ${csudo} rm -f ${nginx_service_config}
+ fi
+ fi
+}
+
+function clean_service_on_sysvinit() {
+ if pidof prodbs &> /dev/null; then
+ echo "ProDB prodbs is running, stopping it..."
+ ${csudo} service prodbs stop || :
+ fi
+
+ if pidof tarbitrator &> /dev/null; then
+ echo "ProDB tarbitrator is running, stopping it..."
+ ${csudo} service tarbitratord stop || :
+ fi
+
+ if ((${initd_mod}==1)); then
+ if [ -e ${service_config_dir}/prodbs ]; then
+ ${csudo} chkconfig --del prodbs || :
+ fi
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} chkconfig --del tarbitratord || :
+ fi
+ elif ((${initd_mod}==2)); then
+ if [ -e ${service_config_dir}/prodbs ]; then
+ ${csudo} insserv -r prodbs || :
+ fi
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} insserv -r tarbitratord || :
+ fi
+ elif ((${initd_mod}==3)); then
+ if [ -e ${service_config_dir}/prodbs ]; then
+ ${csudo} update-rc.d -f prodbs remove || :
+ fi
+ if [ -e ${service_config_dir}/tarbitratord ]; then
+ ${csudo} update-rc.d -f tarbitratord remove || :
+ fi
+ fi
+
+ ${csudo} rm -f ${service_config_dir}/prodbs || :
+ ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+
+ if $(which init &> /dev/null); then
+ ${csudo} init q || :
+ fi
+}
+
+function clean_service() {
+ if ((${service_mod}==0)); then
+ clean_service_on_systemd
+ elif ((${service_mod}==1)); then
+ clean_service_on_sysvinit
+ else
+ # must manual stop taosd
+ kill_prodbs
+ kill_tarbitrator
+ fi
+}
+
+# Stop service and disable booting start.
+clean_service
+# Remove binary file and links
+clean_bin
+# Remove header file.
+clean_header
+# Remove lib file
+clean_lib
+# Remove link log directory
+clean_log
+# Remove link configuration file
+clean_config
+# Remove data link directory
+${csudo} rm -rf ${data_link_dir} || :
+
+${csudo} rm -rf ${install_main_dir}
+${csudo} rm -rf ${install_nginxd_dir}
+if [[ -e /etc/os-release ]]; then
+ osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+else
+ osinfo=""
+fi
+
+echo -e "${GREEN}ProDB is removed successfully!${NC}"
+echo
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 0d06e5d39c0ed1916e0c2af7ccce5918e31ac42f..cf53977103c3a9760286e70447d826f7026d7e53 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -10,18 +10,19 @@ AUX_SOURCE_DIRECTORY(src SRC)
IF (TD_LINUX)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)
+ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)
# set the static lib name
ADD_LIBRARY(taos_static STATIC ${SRC})
- TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m rt ${VAR_TSZ})
+ TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m rt cJson ${VAR_TSZ})
SET_TARGET_PROPERTIES(taos_static PROPERTIES OUTPUT_NAME "taos_static")
SET_TARGET_PROPERTIES(taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
# generate dynamic library (*.so)
ADD_LIBRARY(taos SHARED ${SRC})
- TARGET_LINK_LIBRARIES(taos common query trpc tutil pthread m rt)
+ TARGET_LINK_LIBRARIES(taos common query trpc tutil pthread m rt cJson)
IF (TD_LINUX_64)
- TARGET_LINK_LIBRARIES(taos lua)
+ TARGET_LINK_LIBRARIES(taos lua cJson)
ENDIF ()
SET_TARGET_PROPERTIES(taos PROPERTIES CLEAN_DIRECT_OUTPUT 1)
@@ -36,16 +37,17 @@ IF (TD_LINUX)
ELSEIF (TD_DARWIN)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)
+ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)
# set the static lib name
ADD_LIBRARY(taos_static STATIC ${SRC})
- TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m lua)
+ TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m lua cJson)
SET_TARGET_PROPERTIES(taos_static PROPERTIES OUTPUT_NAME "taos_static")
SET_TARGET_PROPERTIES(taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
# generate dynamic library (*.dylib)
ADD_LIBRARY(taos SHARED ${SRC})
- TARGET_LINK_LIBRARIES(taos common query trpc tutil pthread m lua)
+ TARGET_LINK_LIBRARIES(taos common query trpc tutil pthread m lua cJson)
SET_TARGET_PROPERTIES(taos PROPERTIES CLEAN_DIRECT_OUTPUT 1)
#set version of .dylib
@@ -59,30 +61,32 @@ ELSEIF (TD_DARWIN)
ELSEIF (TD_WINDOWS)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows/win32)
+ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)
CONFIGURE_FILE("${TD_COMMUNITY_DIR}/src/client/src/taos.rc.in" "${TD_COMMUNITY_DIR}/src/client/src/taos.rc")
ADD_LIBRARY(taos_static STATIC ${SRC})
- TARGET_LINK_LIBRARIES(taos_static trpc tutil query)
+ TARGET_LINK_LIBRARIES(taos_static trpc tutil query cJson)
# generate dynamic library (*.dll)
ADD_LIBRARY(taos SHARED ${SRC} ${TD_COMMUNITY_DIR}/src/client/src/taos.rc)
IF (NOT TD_GODLL)
SET_TARGET_PROPERTIES(taos PROPERTIES LINK_FLAGS /DEF:${TD_COMMUNITY_DIR}/src/client/src/taos.def)
ENDIF ()
- TARGET_LINK_LIBRARIES(taos trpc tutil query lua)
+ TARGET_LINK_LIBRARIES(taos trpc tutil query lua cJson)
ELSEIF (TD_DARWIN)
SET(CMAKE_MACOSX_RPATH 1)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)
+ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)
ADD_LIBRARY(taos_static STATIC ${SRC})
- TARGET_LINK_LIBRARIES(taos_static query trpc tutil pthread m lua)
+ TARGET_LINK_LIBRARIES(taos_static query trpc tutil pthread m lua cJson)
SET_TARGET_PROPERTIES(taos_static PROPERTIES OUTPUT_NAME "taos_static")
# generate dynamic library (*.dylib)
ADD_LIBRARY(taos SHARED ${SRC})
- TARGET_LINK_LIBRARIES(taos query trpc tutil pthread m lua)
+ TARGET_LINK_LIBRARIES(taos query trpc tutil pthread m lua cJson)
SET_TARGET_PROPERTIES(taos PROPERTIES CLEAN_DIRECT_OUTPUT 1)
diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h
index ebd5de1ab3a7faa85badd81165168347aa65f7b5..c858bd5867c64da4c7397aed2035119ff414d112 100644
--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -92,7 +92,7 @@ typedef struct SMergeTsCtx {
}SMergeTsCtx;
typedef struct SVgroupTableInfo {
- SVgroupInfo vgInfo;
+ SVgroupMsg vgInfo;
SArray *itemList; // SArray
} SVgroupTableInfo;
@@ -174,7 +174,9 @@ void tscClearInterpInfo(SQueryInfo* pQueryInfo);
bool tscIsInsertData(char* sqlstr);
-int tscAllocPayload(SSqlCmd* pCmd, int size);
+// the memory is not reset in case of fast allocate payload function
+int32_t tscAllocPayloadFast(SSqlCmd *pCmd, size_t size);
+int32_t tscAllocPayload(SSqlCmd* pCmd, int size);
TAOS_FIELD tscCreateField(int8_t type, const char* name, int16_t bytes);
@@ -288,7 +290,11 @@ void doExecuteQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo);
SVgroupsInfo* tscVgroupInfoClone(SVgroupsInfo *pInfo);
void* tscVgroupInfoClear(SVgroupsInfo *pInfo);
+
+#if 0
void tscSVgroupInfoCopy(SVgroupInfo* dst, const SVgroupInfo* src);
+#endif
+
/**
* The create object function must be successful expect for the out of memory issue.
*
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index b8eb0a5286a7b72b3ddd1d34b103e5b6239a496c..dd4ff7eb57f20cfc8d31328630fbb14b7acf7017 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -234,7 +234,6 @@ typedef struct STableDataBlocks {
typedef struct {
STableMeta *pTableMeta;
SArray *vgroupIdList;
-// SVgroupsInfo *pVgroupsInfo;
} STableMetaVgroupInfo;
typedef struct SInsertStatementParam {
@@ -286,20 +285,14 @@ typedef struct {
int32_t resColumnId;
} SSqlCmd;
-typedef struct SResRec {
- int numOfRows;
- int numOfTotal;
-} SResRec;
-
typedef struct {
int32_t numOfRows; // num of results in current retrieval
- int64_t numOfRowsGroup; // num of results of current group
int64_t numOfTotal; // num of total results
int64_t numOfClauseTotal; // num of total result in current subclause
char * pRsp;
int32_t rspType;
int32_t rspLen;
- uint64_t qId;
+ uint64_t qId; // query id of SQInfo
int64_t useconds;
int64_t offset; // offset value from vnode during projection query of stable
int32_t row;
@@ -307,8 +300,6 @@ typedef struct {
int16_t precision;
bool completed;
int32_t code;
- int32_t numOfGroups;
- SResRec * pGroupRec;
char * data;
TAOS_ROW tsrow;
TAOS_ROW urow;
@@ -316,8 +307,7 @@ typedef struct {
char ** buffer; // Buffer used to put multibytes encoded using unicode (wchar_t)
SColumnIndex* pColumnIndex;
- TAOS_FIELD* final;
- SArithmeticSupport *pArithSup; // support the arithmetic expression calculation on agg functions
+ TAOS_FIELD* final;
struct SGlobalMerger *pMerger;
} SSqlRes;
@@ -377,7 +367,6 @@ typedef struct SSqlObj {
tsem_t rspSem;
SSqlCmd cmd;
SSqlRes res;
- bool isBind;
SSubqueryState subState;
struct SSqlObj **pSubs;
@@ -578,7 +567,7 @@ static FORCE_INLINE void convertToSKVRow(SMemRow dest, SMemRow src, SSchema *pSc
SKVRow kvRow = memRowKvBody(dest);
memRowSetType(dest, SMEM_ROW_KV);
- memRowSetKvVersion(kvRow, dataRowVersion(dataRow));
+ memRowSetKvVersion(dest, dataRowVersion(dataRow));
kvRowSetNCols(kvRow, nBoundCols);
kvRowSetLen(kvRow, (TDRowLenT)(TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * nBoundCols));
diff --git a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
index 7181c658ddcdfde3efe7df3c0784c20f18bd4c03..61ae5082f31cd9129a3cec1eaa1e0552ada7993b 100644
--- a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
+++ b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
@@ -41,6 +41,14 @@ JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_initImp
JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setOptions
(JNIEnv *, jclass, jint, jstring);
+/*
+ * Class: com_taosdata_jdbc_TSDBJNIConnector
+ * Method: setConfigImp
+ * Signature: (Ljava/lang/String;)Lcom/taosdata/jdbc/TSDBException;
+ */
+JNIEXPORT jobject JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setConfigImp
+ (JNIEnv *, jclass, jstring);
+
/*
* Class: com_taosdata_jdbc_TSDBJNIConnector
* Method: getTsCharset
diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index 506c8d64b9f4213713656ecd08612a103e0b1b2d..925b7d75db9f88c9905270aa365c60990e9f45a3 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -200,6 +200,64 @@ JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_initImp(JNIEnv *e
jniDebug("jni initialized successfully, config directory: %s", configDir);
}
+JNIEXPORT jobject createTSDBException(JNIEnv *env, int code, char *msg) {
+ // find class
+ jclass exception_clazz = (*env)->FindClass(env, "com/taosdata/jdbc/TSDBException");
+ // find methods
+ jmethodID init_method = (*env)->GetMethodID(env, exception_clazz, "", "()V");
+ jmethodID setCode_method = (*env)->GetMethodID(env, exception_clazz, "setCode", "(I)V");
+ jmethodID setMessage_method = (*env)->GetMethodID(env, exception_clazz, "setMessage", "(Ljava/lang/String;)V");
+ // new exception
+ jobject exception_obj = (*env)->NewObject(env, exception_clazz, init_method);
+ // set code
+ (*env)->CallVoidMethod(env, exception_obj, setCode_method, code);
+ // set message
+ jstring message = (*env)->NewStringUTF(env, msg);
+ (*env)->CallVoidMethod(env, exception_obj, setMessage_method, message);
+
+ return exception_obj;
+}
+
+/*
+ * Class: com_taosdata_jdbc_TSDBJNIConnector
+ * Method: setConfigImp
+ * Signature: (Ljava/lang/String;)Lcom/taosdata/jdbc/TSDBException;
+ */
+JNIEXPORT jobject JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setConfigImp(JNIEnv *env, jclass jobj,
+ jstring config) {
+ /*
+ if (config == NULL) {
+ jniDebug("config value is null");
+ return -1;
+ }
+
+ const char *cfg = (*env)->GetStringUTFChars(env, config, NULL);
+ if (!cfg) {
+ return -1;
+ }
+ return 0;
+ */
+
+ if (config == NULL) {
+ char *msg = "config value is null";
+ jniDebug("config value is null");
+ return createTSDBException(env, -1, msg);
+ }
+
+ const char *cfg = (*env)->GetStringUTFChars(env, config, NULL);
+ if (!cfg) {
+ char *msg = "config value is null";
+ jniDebug("config value is null");
+ return createTSDBException(env, -1, msg);
+ }
+
+ setConfRet result = taos_set_config(cfg);
+ int code = result.retCode;
+ char * msg = result.retMsg;
+
+ return createTSDBException(env, code, msg);
+}
+
JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setOptions(JNIEnv *env, jobject jobj, jint optionIndex,
jstring optionValue) {
if (optionValue == NULL) {
diff --git a/src/client/src/taos.def b/src/client/src/taos.def
index 7d3b8e80c20226c4a509c95ab5728f41852110f5..f1ff17a491e795120494b00f59a800aa6bbc889a 100644
--- a/src/client/src/taos.def
+++ b/src/client/src/taos.def
@@ -2,6 +2,7 @@ EXPORTS
taos_init
taos_cleanup
taos_options
+taos_set_config
taos_connect
taos_connect_auth
taos_close
diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 6b12cd0da04c0f791201182c793d647fc54c00b1..4a621d47c0dcae4c2765d53b0d5b650e22d64a58 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -60,17 +60,25 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, __async_cb_func_t fp, void* para
tscDebugL("0x%"PRIx64" SQL: %s", pSql->self, pSql->sqlstr);
pCmd->resColumnId = TSDB_RES_COL_ID;
+ taosAcquireRef(tscObjRef, pSql->self);
+
int32_t code = tsParseSql(pSql, true);
- if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) return;
+
+ if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+ taosReleaseRef(tscObjRef, pSql->self);
+ return;
+ }
if (code != TSDB_CODE_SUCCESS) {
pSql->res.code = code;
tscAsyncResultOnError(pSql);
+ taosReleaseRef(tscObjRef, pSql->self);
return;
}
SQueryInfo* pQueryInfo = tscGetQueryInfo(pCmd);
executeQuery(pSql, pQueryInfo);
+ taosReleaseRef(tscObjRef, pSql->self);
}
// TODO return the correct error code to client in tscQueueAsyncError
diff --git a/src/client/src/tscParseLineProtocol.c b/src/client/src/tscParseLineProtocol.c
index c9ad7361efa3ade3e3e221a0128a5ad1f3e22ccb..e26e439492cec9c83b624c2bbb2bbc3a95de97b0 100644
--- a/src/client/src/tscParseLineProtocol.c
+++ b/src/client/src/tscParseLineProtocol.c
@@ -2128,11 +2128,12 @@ int32_t tscParseLines(char* lines[], int numLines, SArray* points, SArray* faile
int taos_insert_lines(TAOS* taos, char* lines[], int numLines) {
int32_t code = 0;
- SSmlLinesInfo* info = calloc(1, sizeof(SSmlLinesInfo));
+ SSmlLinesInfo* info = tcalloc(1, sizeof(SSmlLinesInfo));
info->id = genLinesSmlId();
if (numLines <= 0 || numLines > 65536) {
tscError("SML:0x%"PRIx64" taos_insert_lines numLines should be between 1 and 65536. numLines: %d", info->id, numLines);
+ tfree(info);
code = TSDB_CODE_TSC_APP_ERROR;
return code;
}
@@ -2140,7 +2141,7 @@ int taos_insert_lines(TAOS* taos, char* lines[], int numLines) {
for (int i = 0; i < numLines; ++i) {
if (lines[i] == NULL) {
tscError("SML:0x%"PRIx64" taos_insert_lines line %d is NULL", info->id, i);
- free(info);
+ tfree(info);
code = TSDB_CODE_TSC_APP_ERROR;
return code;
}
@@ -2149,7 +2150,7 @@ int taos_insert_lines(TAOS* taos, char* lines[], int numLines) {
SArray* lpPoints = taosArrayInit(numLines, sizeof(TAOS_SML_DATA_POINT));
if (lpPoints == NULL) {
tscError("SML:0x%"PRIx64" taos_insert_lines failed to allocate memory", info->id);
- free(info);
+ tfree(info);
return TSDB_CODE_TSC_OUT_OF_MEMORY;
}
@@ -2177,7 +2178,7 @@ cleanup:
taosArrayDestroy(lpPoints);
- free(info);
+ tfree(info);
return code;
}
diff --git a/src/client/src/tscParseOpenTSDB.c b/src/client/src/tscParseOpenTSDB.c
index 397b5d3e97c2ed7fc1a42bd0e773bcff8f659c65..8e0322cab07ba462b7320cef02011b27b18785d5 100644
--- a/src/client/src/tscParseOpenTSDB.c
+++ b/src/client/src/tscParseOpenTSDB.c
@@ -3,6 +3,7 @@
#include
#include
+#include "cJSON.h"
#include "hash.h"
#include "taos.h"
@@ -12,9 +13,12 @@
#include "tscParseLine.h"
-#define MAX_TELNET_FILEDS_NUM 2
-#define OTS_TIMESTAMP_COLUMN_NAME "ts"
-#define OTS_METRIC_VALUE_COLUMN_NAME "value"
+#define OTD_MAX_FIELDS_NUM 2
+#define OTD_JSON_SUB_FIELDS_NUM 2
+#define OTD_JSON_FIELDS_NUM 4
+
+#define OTD_TIMESTAMP_COLUMN_NAME "ts"
+#define OTD_METRIC_VALUE_COLUMN_NAME "value"
/* telnet style API parser */
static uint64_t HandleId = 0;
@@ -77,12 +81,12 @@ static int32_t parseTelnetTimeStamp(TAOS_SML_KV **pTS, int *num_kvs, const char
const char *start, *cur;
int32_t ret = TSDB_CODE_SUCCESS;
int len = 0;
- char key[] = OTS_TIMESTAMP_COLUMN_NAME;
+ char key[] = OTD_TIMESTAMP_COLUMN_NAME;
char *value = NULL;
start = cur = *index;
//allocate fields for timestamp and value
- *pTS = tcalloc(MAX_TELNET_FILEDS_NUM, sizeof(TAOS_SML_KV));
+ *pTS = tcalloc(OTD_MAX_FIELDS_NUM, sizeof(TAOS_SML_KV));
while(*cur != '\0') {
if (*cur == ' ') {
@@ -123,7 +127,7 @@ static int32_t parseTelnetMetricValue(TAOS_SML_KV **pKVs, int *num_kvs, const ch
const char *start, *cur;
int32_t ret = TSDB_CODE_SUCCESS;
int len = 0;
- char key[] = OTS_METRIC_VALUE_COLUMN_NAME;
+ char key[] = OTD_METRIC_VALUE_COLUMN_NAME;
char *value = NULL;
start = cur = *index;
@@ -174,6 +178,9 @@ static int32_t parseTelnetTagKey(TAOS_SML_KV *pKV, const char **index, SHashObj
tscError("OTD:0x%"PRIx64" Tag key cannot exceeds 65 characters", info->id);
return TSDB_CODE_TSC_INVALID_COLUMN_LENGTH;
}
+ if (*cur == ' ') {
+ return TSDB_CODE_TSC_LINE_SYNTAX_ERROR;
+ }
if (*cur == '=') {
break;
}
@@ -207,8 +214,8 @@ static int32_t parseTelnetTagValue(TAOS_SML_KV *pKV, const char **index,
start = cur = *index;
while (1) {
- // ',' or '\0' identifies a value
- if (*cur == ',' || *cur == '\0') {
+ // whitespace or '\0' identifies a value
+ if (*cur == ' ' || *cur == '\0') {
// '\0' indicates end of value
*is_last_kv = (*cur == '\0') ? true : false;
break;
@@ -405,7 +412,7 @@ cleanup:
tscDebug("OTD:0x%"PRIx64" taos_insert_telnet_lines finish inserting %d lines. code: %d", info->id, numLines, code);
points = TARRAY_GET_START(lpPoints);
numPoints = taosArrayGetSize(lpPoints);
- for (int i=0; ivaluestring);
+ if (stableLen > TSDB_TABLE_NAME_LEN) {
+ tscError("OTD:0x%"PRIx64" Metric cannot exceeds 193 characters in JSON", info->id);
+ return TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
+ }
+
+ pSml->stableName = tcalloc(stableLen + 1, sizeof(char));
+ if (pSml->stableName == NULL){
+ return TSDB_CODE_TSC_OUT_OF_MEMORY;
+ }
+
+ if (isdigit(metric->valuestring[0])) {
+ tscError("OTD:0x%"PRIx64" Metric cannnot start with digit in JSON", info->id);
+ tfree(pSml->stableName);
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ tstrncpy(pSml->stableName, metric->valuestring, stableLen + 1);
+
+ return TSDB_CODE_SUCCESS;
+
+}
+
+int32_t parseTimestampFromJSONObj(cJSON *root, int64_t *tsVal, SSmlLinesInfo* info) {
+ int32_t size = cJSON_GetArraySize(root);
+ if (size != OTD_JSON_SUB_FIELDS_NUM) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ cJSON *value = cJSON_GetObjectItem(root, "value");
+ if (!cJSON_IsNumber(value)) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ cJSON *type = cJSON_GetObjectItem(root, "type");
+ if (!cJSON_IsString(type)) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ *tsVal = value->valueint;
+ //if timestamp value is 0 use current system time
+ if (*tsVal == 0) {
+ *tsVal = taosGetTimestampNs();
+ return TSDB_CODE_SUCCESS;
+ }
+
+ size_t typeLen = strlen(type->valuestring);
+ if (typeLen == 1 && type->valuestring[0] == 's') {
+ //seconds
+ *tsVal = (int64_t)(*tsVal * 1e9);
+ } else if (typeLen == 2 && type->valuestring[1] == 's') {
+ switch (type->valuestring[0]) {
+ case 'm':
+ //milliseconds
+ *tsVal = convertTimePrecision(*tsVal, TSDB_TIME_PRECISION_MILLI, TSDB_TIME_PRECISION_NANO);
+ break;
+ case 'u':
+ //microseconds
+ *tsVal = convertTimePrecision(*tsVal, TSDB_TIME_PRECISION_MICRO, TSDB_TIME_PRECISION_NANO);
+ break;
+ case 'n':
+ //nanoseconds
+ *tsVal = *tsVal * 1;
+ break;
+ default:
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+ }
+
+ return TSDB_CODE_SUCCESS;
+}
+
+int32_t parseTimestampFromJSON(cJSON *root, TAOS_SML_KV **pTS, int *num_kvs, SSmlLinesInfo* info) {
+ //Timestamp must be the first KV to parse
+ assert(*num_kvs == 0);
+ int64_t tsVal;
+ char key[] = OTD_TIMESTAMP_COLUMN_NAME;
+
+ cJSON *timestamp = cJSON_GetObjectItem(root, "timestamp");
+ if (cJSON_IsNumber(timestamp)) {
+ //timestamp value 0 indicates current system time
+ if (timestamp->valueint == 0) {
+ tsVal = taosGetTimestampNs();
+ } else {
+ tsVal = convertTimePrecision(timestamp->valueint, TSDB_TIME_PRECISION_MICRO, TSDB_TIME_PRECISION_NANO);
+ }
+ } else if (cJSON_IsObject(timestamp)) {
+ int32_t ret = parseTimestampFromJSONObj(timestamp, &tsVal, info);
+ if (ret != TSDB_CODE_SUCCESS) {
+ tscError("OTD:0x%"PRIx64" Failed to parse timestamp from JSON Obj", info->id);
+ return ret;
+ }
+ } else {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ //allocate fields for timestamp and value
+ *pTS = tcalloc(OTD_MAX_FIELDS_NUM, sizeof(TAOS_SML_KV));
+
+
+ (*pTS)->key = tcalloc(sizeof(key), 1);
+ memcpy((*pTS)->key, key, sizeof(key));
+
+ (*pTS)->type = TSDB_DATA_TYPE_TIMESTAMP;
+ (*pTS)->length = (int16_t)tDataTypes[(*pTS)->type].bytes;
+ (*pTS)->value = tcalloc((*pTS)->length, 1);
+ memcpy((*pTS)->value, &tsVal, (*pTS)->length);
+
+ *num_kvs += 1;
+ return TSDB_CODE_SUCCESS;
+
+}
+
+int32_t convertJSONBool(TAOS_SML_KV *pVal, char* typeStr, int64_t valueInt, SSmlLinesInfo* info) {
+ if (strcasecmp(typeStr, "bool") != 0) {
+ tscError("OTD:0x%"PRIx64" invalid type(%s) for JSON Bool", info->id, typeStr);
+ return TSDB_CODE_TSC_INVALID_JSON_TYPE;
+ }
+ pVal->type = TSDB_DATA_TYPE_BOOL;
+ pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
+ pVal->value = tcalloc(pVal->length, 1);
+ *(bool *)(pVal->value) = valueInt ? true : false;
+
+ return TSDB_CODE_SUCCESS;
+}
+
+int32_t convertJSONNumber(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLinesInfo* info) {
+ //tinyint
+ if (strcasecmp(typeStr, "i8") == 0 ||
+ strcasecmp(typeStr, "tinyint") == 0) {
+ if (!IS_VALID_TINYINT(value->valueint)) {
+ tscError("OTD:0x%"PRIx64" JSON value(%"PRId64") cannot fit in type(tinyint)", info->id, value->valueint);
+ return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
+ }
+ pVal->type = TSDB_DATA_TYPE_TINYINT;
+ pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
+ pVal->value = tcalloc(pVal->length, 1);
+ *(int8_t *)(pVal->value) = (int8_t)(value->valueint);
+ return TSDB_CODE_SUCCESS;
+ }
+ //smallint
+ if (strcasecmp(typeStr, "i16") == 0 ||
+ strcasecmp(typeStr, "smallint") == 0) {
+ if (!IS_VALID_SMALLINT(value->valueint)) {
+ tscError("OTD:0x%"PRIx64" JSON value(%"PRId64") cannot fit in type(smallint)", info->id, value->valueint);
+ return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
+ }
+ pVal->type = TSDB_DATA_TYPE_SMALLINT;
+ pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
+ pVal->value = tcalloc(pVal->length, 1);
+ *(int16_t *)(pVal->value) = (int16_t)(value->valueint);
+ return TSDB_CODE_SUCCESS;
+ }
+ //int
+ if (strcasecmp(typeStr, "i32") == 0 ||
+ strcasecmp(typeStr, "int") == 0) {
+ if (!IS_VALID_INT(value->valueint)) {
+ tscError("OTD:0x%"PRIx64" JSON value(%"PRId64") cannot fit in type(int)", info->id, value->valueint);
+ return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
+ }
+ pVal->type = TSDB_DATA_TYPE_INT;
+ pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
+ pVal->value = tcalloc(pVal->length, 1);
+ *(int32_t *)(pVal->value) = (int32_t)(value->valueint);
+ return TSDB_CODE_SUCCESS;
+ }
+ //bigint
+ if (strcasecmp(typeStr, "i64") == 0 ||
+ strcasecmp(typeStr, "bigint") == 0) {
+ if (!IS_VALID_BIGINT(value->valueint)) {
+ tscError("OTD:0x%"PRIx64" JSON value(%"PRId64") cannot fit in type(bigint)", info->id, value->valueint);
+ return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
+ }
+ pVal->type = TSDB_DATA_TYPE_BIGINT;
+ pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
+ pVal->value = tcalloc(pVal->length, 1);
+ *(int64_t *)(pVal->value) = (int64_t)(value->valueint);
+ return TSDB_CODE_SUCCESS;
+ }
+ //float
+ if (strcasecmp(typeStr, "f32") == 0 ||
+ strcasecmp(typeStr, "float") == 0) {
+ if (!IS_VALID_FLOAT(value->valuedouble)) {
+ tscError("OTD:0x%"PRIx64" JSON value(%f) cannot fit in type(float)", info->id, value->valuedouble);
+ return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
+ }
+ pVal->type = TSDB_DATA_TYPE_FLOAT;
+ pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
+ pVal->value = tcalloc(pVal->length, 1);
+ *(float *)(pVal->value) = (float)(value->valuedouble);
+ return TSDB_CODE_SUCCESS;
+ }
+ //double
+ if (strcasecmp(typeStr, "f64") == 0 ||
+ strcasecmp(typeStr, "double") == 0) {
+ if (!IS_VALID_DOUBLE(value->valuedouble)) {
+ tscError("OTD:0x%"PRIx64" JSON value(%f) cannot fit in type(double)", info->id, value->valuedouble);
+ return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE;
+ }
+ pVal->type = TSDB_DATA_TYPE_DOUBLE;
+ pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
+ pVal->value = tcalloc(pVal->length, 1);
+ *(double *)(pVal->value) = (double)(value->valuedouble);
+ return TSDB_CODE_SUCCESS;
+ }
+
+ //if reach here means type is unsupported
+ tscError("OTD:0x%"PRIx64" invalid type(%s) for JSON Number", info->id, typeStr);
+ return TSDB_CODE_TSC_INVALID_JSON_TYPE;
+}
+
+int32_t convertJSONString(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLinesInfo* info) {
+ if (strcasecmp(typeStr, "binary") == 0) {
+ pVal->type = TSDB_DATA_TYPE_BINARY;
+ } else if (strcasecmp(typeStr, "nchar") == 0) {
+ pVal->type = TSDB_DATA_TYPE_NCHAR;
+ } else {
+ tscError("OTD:0x%"PRIx64" invalid type(%s) for JSON String", info->id, typeStr);
+ return TSDB_CODE_TSC_INVALID_JSON_TYPE;
+ }
+ pVal->length = (int16_t)strlen(value->valuestring);
+ pVal->value = tcalloc(pVal->length + 1, 1);
+ memcpy(pVal->value, value->valuestring, pVal->length);
+ return TSDB_CODE_SUCCESS;
+}
+
+int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) {
+ int32_t ret = TSDB_CODE_SUCCESS;
+ int32_t size = cJSON_GetArraySize(root);
+
+ if (size != OTD_JSON_SUB_FIELDS_NUM) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ cJSON *value = cJSON_GetObjectItem(root, "value");
+ if (value == NULL) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ cJSON *type = cJSON_GetObjectItem(root, "type");
+ if (!cJSON_IsString(type)) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ switch (value->type) {
+ case cJSON_True:
+ case cJSON_False: {
+ ret = convertJSONBool(pVal, type->valuestring, value->valueint, info);
+ if (ret != TSDB_CODE_SUCCESS) {
+ return ret;
+ }
+ break;
+ }
+ case cJSON_Number: {
+ ret = convertJSONNumber(pVal, type->valuestring, value, info);
+ if (ret != TSDB_CODE_SUCCESS) {
+ return ret;
+ }
+ break;
+ }
+ case cJSON_String: {
+ ret = convertJSONString(pVal, type->valuestring, value, info);
+ if (ret != TSDB_CODE_SUCCESS) {
+ return ret;
+ }
+ break;
+ }
+ default:
+ return TSDB_CODE_TSC_INVALID_JSON_TYPE;
+ }
+
+ return TSDB_CODE_SUCCESS;
+}
+
+int32_t parseValueFromJSON(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) {
+ int type = root->type;
+
+ switch (type) {
+ case cJSON_True:
+ case cJSON_False: {
+ pVal->type = TSDB_DATA_TYPE_BOOL;
+ pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
+ pVal->value = tcalloc(pVal->length, 1);
+ *(bool *)(pVal->value) = root->valueint ? true : false;
+ break;
+ }
+ case cJSON_Number: {
+ //convert default JSON Number type to float
+ pVal->type = TSDB_DATA_TYPE_FLOAT;
+ pVal->length = (int16_t)tDataTypes[pVal->type].bytes;
+ pVal->value = tcalloc(pVal->length, 1);
+ *(float *)(pVal->value) = (float)(root->valuedouble);
+ break;
+ }
+ case cJSON_String: {
+ //convert default JSON String type to nchar
+ pVal->type = TSDB_DATA_TYPE_NCHAR;
+ //pVal->length = wcslen((wchar_t *)root->valuestring) * TSDB_NCHAR_SIZE;
+ pVal->length = (int16_t)strlen(root->valuestring);
+ pVal->value = tcalloc(pVal->length + 1, 1);
+ memcpy(pVal->value, root->valuestring, pVal->length);
+ break;
+ }
+ case cJSON_Object: {
+ int32_t ret = parseValueFromJSONObj(root, pVal, info);
+ if (ret != TSDB_CODE_SUCCESS) {
+ tscError("OTD:0x%"PRIx64" Failed to parse timestamp from JSON Obj", info->id);
+ return ret;
+ }
+ break;
+ }
+ default:
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ return TSDB_CODE_SUCCESS;
+}
+
+int32_t parseMetricValueFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, SSmlLinesInfo* info) {
+ //skip timestamp
+ TAOS_SML_KV *pVal = *pKVs + 1;
+ char key[] = OTD_METRIC_VALUE_COLUMN_NAME;
+
+ cJSON *metricVal = cJSON_GetObjectItem(root, "value");
+ if (metricVal == NULL) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ int32_t ret = parseValueFromJSON(metricVal, pVal, info);
+ if (ret != TSDB_CODE_SUCCESS) {
+ return ret;
+ }
+
+ pVal->key = tcalloc(sizeof(key), 1);
+ memcpy(pVal->key, key, sizeof(key));
+
+ *num_kvs += 1;
+ return TSDB_CODE_SUCCESS;
+
+}
+
+int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char **childTableName, SSmlLinesInfo* info) {
+ int32_t ret = TSDB_CODE_SUCCESS;
+
+ cJSON *tags = cJSON_GetObjectItem(root, "tags");
+ if (tags == NULL || tags->type != cJSON_Object) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ //only pick up the first ID value as child table name
+ cJSON *id = cJSON_GetObjectItem(tags, "ID");
+ if (id != NULL) {
+ size_t idLen = strlen(id->valuestring);
+ ret = isValidChildTableName(id->valuestring, (int16_t)idLen);
+ if (ret != TSDB_CODE_SUCCESS) {
+ return ret;
+ }
+ *childTableName = tcalloc(idLen + 1, sizeof(char));
+ memcpy(*childTableName, id->valuestring, idLen);
+ //remove all ID fields from tags list no case sensitive
+ while (id != NULL) {
+ cJSON_DeleteItemFromObject(tags, "ID");
+ id = cJSON_GetObjectItem(tags, "ID");
+ }
+ }
+
+ int32_t tagNum = cJSON_GetArraySize(tags);
+ //at least one tag pair required
+ if (tagNum <= 0) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ //allocate memory for tags
+ *pKVs = tcalloc(tagNum, sizeof(TAOS_SML_KV));
+ TAOS_SML_KV *pkv = *pKVs;
+
+ for (int32_t i = 0; i < tagNum; ++i) {
+ cJSON *tag = cJSON_GetArrayItem(tags, i);
+ if (tag == NULL) {
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+ //key
+ size_t keyLen = strlen(tag->string);
+ pkv->key = tcalloc(keyLen + 1, sizeof(char));
+ strncpy(pkv->key, tag->string, keyLen);
+ //value
+ ret = parseValueFromJSON(tag, pkv, info);
+ if (ret != TSDB_CODE_SUCCESS) {
+ return ret;
+ }
+ *num_kvs += 1;
+ pkv++;
+ }
+
+ return ret;
+
+}
+
+int32_t tscParseJSONPayload(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInfo* info) {
+ int32_t ret = TSDB_CODE_SUCCESS;
+
+ if (!cJSON_IsObject(root)) {
+ tscError("OTD:0x%"PRIx64" data point needs to be JSON object", info->id);
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ int32_t size = cJSON_GetArraySize(root);
+ //outmost json fields has to be exactly 4
+ if (size != OTD_JSON_FIELDS_NUM) {
+ tscError("OTD:0x%"PRIx64" Invalid number of JSON fields in data point %d", info->id, size);
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ //Parse metric
+ ret = parseMetricFromJSON(root, pSml, info);
+ if (ret != TSDB_CODE_SUCCESS) {
+ tscError("OTD:0x%"PRIx64" Unable to parse metric from JSON payload", info->id);
+ return ret;
+ }
+ tscDebug("OTD:0x%"PRIx64" Parse metric from JSON payload finished", info->id);
+
+ //Parse timestamp
+ ret = parseTimestampFromJSON(root, &pSml->fields, &pSml->fieldNum, info);
+ if (ret) {
+ tscError("OTD:0x%"PRIx64" Unable to parse timestamp from JSON payload", info->id);
+ return ret;
+ }
+ tscDebug("OTD:0x%"PRIx64" Parse timestamp from JSON payload finished", info->id);
+
+ //Parse metric value
+ ret = parseMetricValueFromJSON(root, &pSml->fields, &pSml->fieldNum, info);
+ if (ret) {
+ tscError("OTD:0x%"PRIx64" Unable to parse metric value from JSON payload", info->id);
+ return ret;
+ }
+ tscDebug("OTD:0x%"PRIx64" Parse metric value from JSON payload finished", info->id);
+
+ //Parse tags
+ ret = parseTagsFromJSON(root, &pSml->tags, &pSml->tagNum, &pSml->childTableName, info);
+ if (ret) {
+ tscError("OTD:0x%"PRIx64" Unable to parse tags from JSON payload", info->id);
+ return ret;
+ }
+ tscDebug("OTD:0x%"PRIx64" Parse tags from JSON payload finished", info->id);
+
+ return TSDB_CODE_SUCCESS;
+}
+
+int32_t tscParseMultiJSONPayload(char* payload, SArray* points, SSmlLinesInfo* info) {
+ int32_t payloadNum, ret;
+ ret = TSDB_CODE_SUCCESS;
+
+ if (payload == NULL) {
+ tscError("OTD:0x%"PRIx64" empty JSON Payload", info->id);
+ return TSDB_CODE_TSC_INVALID_JSON;
+ }
+
+ cJSON *root = cJSON_Parse(payload);
+ //multiple data points must be sent in JSON array
+ if (cJSON_IsObject(root)) {
+ payloadNum = 1;
+ } else if (cJSON_IsArray(root)) {
+ payloadNum = cJSON_GetArraySize(root);
+ } else {
+ tscError("OTD:0x%"PRIx64" Invalid JSON Payload", info->id);
+ ret = TSDB_CODE_TSC_INVALID_JSON;
+ goto PARSE_JSON_OVER;
+ }
+
+ for (int32_t i = 0; i < payloadNum; ++i) {
+ TAOS_SML_DATA_POINT point = {0};
+ cJSON *dataPoint = (payloadNum == 1) ? root : cJSON_GetArrayItem(root, i);
+
+ ret = tscParseJSONPayload(dataPoint, &point, info);
+ if (ret != TSDB_CODE_SUCCESS) {
+ tscError("OTD:0x%"PRIx64" JSON data point parse failed", info->id);
+ destroySmlDataPoint(&point);
+ goto PARSE_JSON_OVER;
+ } else {
+ tscDebug("OTD:0x%"PRIx64" JSON data point parse success", info->id);
+ }
+ taosArrayPush(points, &point);
+ }
+
+PARSE_JSON_OVER:
+ cJSON_Delete(root);
+ return ret;
+}
+
+int taos_insert_json_payload(TAOS* taos, char* payload) {
+ int32_t code = 0;
+
+ SSmlLinesInfo* info = tcalloc(1, sizeof(SSmlLinesInfo));
+ info->id = genUID();
+
+ if (payload == NULL) {
+ tscError("OTD:0x%"PRIx64" taos_insert_json_payload payload is NULL", info->id);
+ tfree(info);
+ code = TSDB_CODE_TSC_APP_ERROR;
+ return code;
+ }
+
+ SArray* lpPoints = taosArrayInit(1, sizeof(TAOS_SML_DATA_POINT));
+ if (lpPoints == NULL) {
+ tscError("OTD:0x%"PRIx64" taos_insert_json_payload failed to allocate memory", info->id);
+ tfree(info);
+ return TSDB_CODE_TSC_OUT_OF_MEMORY;
+ }
+
+ tscDebug("OTD:0x%"PRIx64" taos_insert_telnet_lines begin inserting %d points", info->id, 1);
+ code = tscParseMultiJSONPayload(payload, lpPoints, info);
+ size_t numPoints = taosArrayGetSize(lpPoints);
+
+ if (code != 0) {
+ goto cleanup;
+ }
+
+ TAOS_SML_DATA_POINT* points = TARRAY_GET_START(lpPoints);
+ code = tscSmlInsert(taos, points, (int)numPoints, info);
+ if (code != 0) {
+ tscError("OTD:0x%"PRIx64" taos_insert_json_payload error: %s", info->id, tstrerror((code)));
+ }
+
+cleanup:
+ tscDebug("OTD:0x%"PRIx64" taos_insert_json_payload finish inserting 1 Point. code: %d", info->id, code);
+ points = TARRAY_GET_START(lpPoints);
+ numPoints = taosArrayGetSize(lpPoints);
+ for (int i = 0; i < numPoints; ++i) {
+ destroySmlDataPoint(points+i);
+ }
+
+ taosArrayDestroy(lpPoints);
+
+ tfree(info);
+ return code;
+}
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index bbddc4bff925de1a7d0b67fd233b6e2e88a618a3..d0ac0ccf4ee4bfa381a78090409a761717ceb4b0 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -1491,7 +1491,6 @@ TAOS_STMT* taos_stmt_init(TAOS* taos) {
pSql->signature = pSql;
pSql->pTscObj = pObj;
pSql->maxRetry = TSDB_MAX_REPLICA;
- pSql->isBind = true;
pStmt->pSql = pSql;
pStmt->last = STMT_INIT;
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 87b6b076527a17b48dabfcf73e8423128a0e7128..a62a8ac3efca0836faab778224aa4a831e84e580 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -76,7 +76,6 @@ static int32_t getDelimiterIndex(SStrToken* pTableName);
static bool validateTableColumnInfo(SArray* pFieldList, SSqlCmd* pCmd);
static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pCmd);
-static int32_t setObjFullName(char* fullName, const char* account, SStrToken* pDB, SStrToken* tableName, int32_t* len);
static void getColumnName(tSqlExprItem* pItem, char* resultFieldName, char* rawName, int32_t nameLength);
static int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t colIndex, tSqlExprItem* pItem,
@@ -281,6 +280,8 @@ static uint8_t convertRelationalOperator(SStrToken *pToken) {
return TSDB_RELATION_LIKE;
case TK_MATCH:
return TSDB_RELATION_MATCH;
+ case TK_NMATCH:
+ return TSDB_RELATION_NMATCH;
case TK_ISNULL:
return TSDB_RELATION_ISNULL;
case TK_NOTNULL:
@@ -333,7 +334,7 @@ static int setColumnFilterInfoForTimestamp(SSqlCmd* pCmd, SQueryInfo* pQueryInfo
STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
- if (convertTimestampStrToInt64(pVar, tinfo.precision) < -1) {
+ if (convertTimestampStrToInt64(pVar, tinfo.precision) < 0) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
}
return TSDB_CODE_SUCCESS;
@@ -1696,57 +1697,6 @@ static int32_t getDelimiterIndex(SStrToken* pTableName) {
return -1;
}
-int32_t setObjFullName(char* fullName, const char* account, SStrToken* pDB, SStrToken* tableName, int32_t* xlen) {
- int32_t totalLen = 0;
-
- if (account != NULL) {
- int32_t len = (int32_t)strlen(account);
- strcpy(fullName, account);
- fullName[len] = TS_PATH_DELIMITER[0];
- totalLen += (len + 1);
- }
-
- /* db name is not specified, the tableName dose not include db name */
- if (pDB != NULL) {
- if (pDB->n >= TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN || pDB->n == 0) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
-
- memcpy(&fullName[totalLen], pDB->z, pDB->n);
- totalLen += pDB->n;
- }
-
- if (tableName != NULL) {
- if (pDB != NULL) {
- fullName[totalLen] = TS_PATH_DELIMITER[0];
- totalLen += 1;
-
- /* here we only check the table name length limitation */
- if (!tscValidateTableNameLength(tableName->n)) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
- } else { // pDB == NULL, the db prefix name is specified in tableName
- /* the length limitation includes tablename + dbname + sep */
- if (tableName->n >= TSDB_TABLE_NAME_LEN + TSDB_DB_NAME_LEN) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
- }
-
- memcpy(&fullName[totalLen], tableName->z, tableName->n);
- totalLen += tableName->n;
- }
-
- if (xlen != NULL) {
- *xlen = totalLen;
- }
-
- if (totalLen < TSDB_TABLE_FNAME_LEN) {
- fullName[totalLen] = 0;
- }
-
- return (totalLen < TSDB_TABLE_FNAME_LEN) ? TSDB_CODE_SUCCESS : TSDB_CODE_TSC_INVALID_OPERATION;
-}
-
void tscInsertPrimaryTsSourceColumn(SQueryInfo* pQueryInfo, uint64_t tableUid) {
SSchema s = {.type = TSDB_DATA_TYPE_TIMESTAMP, .bytes = TSDB_KEYSIZE, .colId = PRIMARYKEY_TIMESTAMP_COL_INDEX};
tscColumnListInsert(pQueryInfo->colList, PRIMARYKEY_TIMESTAMP_COL_INDEX, tableUid, &s);
@@ -2549,6 +2499,9 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
case TSDB_FUNC_MAX:
case TSDB_FUNC_DIFF:
case TSDB_FUNC_DERIVATIVE:
+ case TSDB_FUNC_CEIL:
+ case TSDB_FUNC_FLOOR:
+ case TSDB_FUNC_ROUND:
case TSDB_FUNC_STDDEV:
case TSDB_FUNC_LEASTSQR: {
// 1. valid the number of parameters
@@ -2739,6 +2692,10 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+ if (pParamElem->pNode->columnName.z == NULL) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
+ }
+
// functions can not be applied to tags
if ((index.columnIndex >= tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) || (index.columnIndex < 0)) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
@@ -3472,6 +3429,7 @@ static bool functionCompatibleCheck(SQueryInfo* pQueryInfo, bool joinQuery, bool
int32_t scalarUdf = 0;
int32_t prjNum = 0;
int32_t aggNum = 0;
+ int32_t scalNum = 0;
size_t numOfExpr = tscNumOfExprs(pQueryInfo);
assert(numOfExpr > 0);
@@ -3503,6 +3461,10 @@ static bool functionCompatibleCheck(SQueryInfo* pQueryInfo, bool joinQuery, bool
++prjNum;
}
+ if (functionId == TSDB_FUNC_CEIL || functionId == TSDB_FUNC_FLOOR || functionId == TSDB_FUNC_ROUND) {
+ ++scalNum;
+ }
+
if (functionId == TSDB_FUNC_PRJ && (pExpr1->base.colInfo.colId == PRIMARYKEY_TIMESTAMP_COL_INDEX || TSDB_COL_IS_UD_COL(pExpr1->base.colInfo.flag))) {
continue;
}
@@ -3524,15 +3486,19 @@ static bool functionCompatibleCheck(SQueryInfo* pQueryInfo, bool joinQuery, bool
}
}
- aggNum = (int32_t)size - prjNum - aggUdf - scalarUdf;
+ aggNum = (int32_t)size - prjNum - scalNum - aggUdf - scalarUdf;
assert(aggNum >= 0);
- if (aggUdf > 0 && (prjNum > 0 || aggNum > 0 || scalarUdf > 0)) {
+ if (aggUdf > 0 && (prjNum > 0 || aggNum > 0 || scalNum > 0 || scalarUdf > 0)) {
+ return false;
+ }
+
+ if (scalarUdf > 0 && (aggNum > 0 || scalNum > 0)) {
return false;
}
- if (scalarUdf > 0 && aggNum > 0) {
+ if (aggNum > 0 && scalNum > 0) {
return false;
}
@@ -3719,11 +3685,7 @@ static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo,
}
}
- if (pExpr->tokenId == TK_LE || pExpr->tokenId == TK_LT) {
- retVal = tVariantDump(&pRight->value, (char*)&pColumnFilter->upperBndd, colType, false);
-
- // TK_GT,TK_GE,TK_EQ,TK_NE are based on the pColumn->lowerBndd
- } else if (pExpr->tokenId == TK_IN) {
+ if (pExpr->tokenId == TK_IN) {
tVariant *pVal;
if (pRight->tokenId != TK_SET || !serializeExprListToVariant(pRight->Expr.paramList, &pVal, colType, timePrecision)) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
@@ -3749,6 +3711,10 @@ static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo,
size_t len = twcslen((wchar_t*)pColumnFilter->pz);
pColumnFilter->len = len * TSDB_NCHAR_SIZE;
+ } else if (pExpr->tokenId == TK_LE || pExpr->tokenId == TK_LT) {
+ retVal = tVariantDump(&pRight->value, (char*)&pColumnFilter->upperBndd, colType, false);
+
+ // TK_GT,TK_GE,TK_EQ,TK_NE are based on the pColumn->lowerBndd
} else {
retVal = tVariantDump(&pRight->value, (char*)&pColumnFilter->lowerBndd, colType, false);
}
@@ -3782,6 +3748,9 @@ static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo,
case TK_MATCH:
pColumnFilter->lowerRelOptr = TSDB_RELATION_MATCH;
break;
+ case TK_NMATCH:
+ pColumnFilter->lowerRelOptr = TSDB_RELATION_NMATCH;
+ break;
case TK_ISNULL:
pColumnFilter->lowerRelOptr = TSDB_RELATION_ISNULL;
break;
@@ -3804,9 +3773,6 @@ typedef struct SCondExpr {
tSqlExpr* pColumnCond;
- tSqlExpr* pTableCond;
- int16_t relType; // relation between table name in expression and other tag
- // filter condition expression, TK_AND or TK_OR
int16_t tableCondIndex;
tSqlExpr* pJoinExpr; // join condition
@@ -3815,49 +3781,6 @@ typedef struct SCondExpr {
static int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t timePrecision);
-static int32_t tablenameListToString(tSqlExpr* pExpr, SStringBuilder* sb) {
- SArray* pList = pExpr->Expr.paramList;
-
- int32_t size = (int32_t) taosArrayGetSize(pList);
- if (size <= 0) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
-
- if (size > 0) {
- taosStringBuilderAppendStringLen(sb, QUERY_COND_REL_PREFIX_IN, QUERY_COND_REL_PREFIX_IN_LEN);
- }
-
- for (int32_t i = 0; i < size; ++i) {
- tSqlExprItem* pSub = taosArrayGet(pList, i);
- tVariant* pVar = &pSub->pNode->value;
-
- taosStringBuilderAppendStringLen(sb, pVar->pz, pVar->nLen);
-
- if (i < size - 1) {
- taosStringBuilderAppendString(sb, TBNAME_LIST_SEP);
- }
-
- if (pVar->nLen <= 0 || !tscValidateTableNameLength(pVar->nLen)) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
- }
-
- return TSDB_CODE_SUCCESS;
-}
-
-static int32_t tablenameCondToString(tSqlExpr* pExpr, uint32_t opToken, SStringBuilder* sb) {
- assert(opToken == TK_LIKE || opToken == TK_MATCH);
- if (opToken == TK_LIKE) {
- taosStringBuilderAppendStringLen(sb, QUERY_COND_REL_PREFIX_LIKE, QUERY_COND_REL_PREFIX_LIKE_LEN);
- taosStringBuilderAppendString(sb, pExpr->value.pz);
- } else if (opToken == TK_MATCH) {
- taosStringBuilderAppendStringLen(sb, QUERY_COND_REL_PREFIX_MATCH, QUERY_COND_REL_PREFIX_MATCH_LEN);
- taosStringBuilderAppendString(sb, pExpr->value.pz);
- }
-
- return TSDB_CODE_SUCCESS;
-}
-
enum {
TSQL_EXPR_TS = 1,
TSQL_EXPR_TAG = 2,
@@ -3875,7 +3798,6 @@ static int32_t checkColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SCol
SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, pIndex->columnIndex);
int32_t ret = 0;
const char* msg1 = "non binary column not support like/match operator";
- const char* msg2 = "binary column not support this operator";
const char* msg3 = "bool column not support this operator";
const char* msg4 = "primary key not support this operator";
@@ -3896,19 +3818,8 @@ static int32_t checkColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SCol
pColFilter->filterstr =
((pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) ? 1 : 0);
- if (pColFilter->filterstr) {
- if (pExpr->tokenId != TK_EQ
- && pExpr->tokenId != TK_NE
- && pExpr->tokenId != TK_ISNULL
- && pExpr->tokenId != TK_NOTNULL
- && pExpr->tokenId != TK_LIKE
- && pExpr->tokenId != TK_MATCH
- && pExpr->tokenId != TK_IN) {
- ret = invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
- goto _err_ret;
- }
- } else {
- if (pExpr->tokenId == TK_LIKE || pExpr->tokenId == TK_MATCH) {
+ if (!pColFilter->filterstr) {
+ if (pExpr->tokenId == TK_LIKE || pExpr->tokenId == TK_MATCH || pExpr->tokenId == TK_NMATCH) {
ret = invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
goto _err_ret;
}
@@ -3937,40 +3848,6 @@ _err_ret:
return ret;
}
-static int32_t getTablenameCond(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSqlExpr* pTableCond, SStringBuilder* sb) {
- const char* msg0 = "invalid table name list";
- const char* msg1 = "not string following like";
-
- if (pTableCond == NULL) {
- return TSDB_CODE_SUCCESS;
- }
-
- tSqlExpr* pLeft = pTableCond->pLeft;
- tSqlExpr* pRight = pTableCond->pRight;
-
- if (!isTablenameToken(&pLeft->columnName)) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
-
- int32_t ret = TSDB_CODE_SUCCESS;
-
- if (pTableCond->tokenId == TK_IN) {
- ret = tablenameListToString(pRight, sb);
- } else if (pTableCond->tokenId == TK_LIKE || pTableCond->tokenId == TK_MATCH) {
- if (pRight->tokenId != TK_STRING) {
- return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
- }
-
- ret = tablenameCondToString(pRight, pTableCond->tokenId, sb);
- }
-
- if (ret != TSDB_CODE_SUCCESS) {
- invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg0);
- }
-
- return ret;
-}
-
static int32_t getColQueryCondExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSqlExpr** pExpr) {
int32_t ret = TSDB_CODE_SUCCESS;
@@ -4093,8 +3970,9 @@ static int32_t checkAndSetJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tS
index.columnIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
if (tscColumnExists(pTableMetaInfo->tagColList, pTagSchema1->colId, pTableMetaInfo->pTableMeta->id.uid) < 0) {
tscColumnListInsert(pTableMetaInfo->tagColList, index.columnIndex, pTableMeta->id.uid, pTagSchema1);
+ atomic_add_fetch_32(&pTableMetaInfo->joinTagNum, 1);
- if (taosArrayGetSize(pTableMetaInfo->tagColList) > 1) {
+ if (pTableMetaInfo->joinTagNum > 1) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
}
}
@@ -4126,7 +4004,9 @@ static int32_t checkAndSetJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tS
if (tscColumnExists(pTableMetaInfo->tagColList, pTagSchema2->colId, pTableMeta->id.uid) < 0) {
tscColumnListInsert(pTableMetaInfo->tagColList, index.columnIndex, pTableMeta->id.uid, pTagSchema2);
- if (taosArrayGetSize(pTableMetaInfo->tagColList) > 1) {
+ atomic_add_fetch_32(&pTableMetaInfo->joinTagNum, 1);
+
+ if (pTableMetaInfo->joinTagNum > 1) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
}
}
@@ -4409,18 +4289,6 @@ static bool validateJoinExprNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSqlExpr
return true;
}
-static bool validTableNameOptr(tSqlExpr* pExpr) {
- const char nameFilterOptr[] = {TK_IN, TK_LIKE, TK_MATCH};
-
- for (int32_t i = 0; i < tListLen(nameFilterOptr); ++i) {
- if (pExpr->tokenId == nameFilterOptr[i]) {
- return true;
- }
- }
-
- return false;
-}
-
static int32_t setExprToCond(tSqlExpr** parent, tSqlExpr* pExpr, const char* msg, int32_t parentOptr, char* msgBuf) {
if (*parent != NULL) {
if (parentOptr == TK_OR && msg != NULL) {
@@ -4505,13 +4373,13 @@ static int32_t validateLikeExpr(tSqlExpr* pExpr, STableMeta* pTableMeta, int32_t
// check for match expression
static int32_t validateMatchExpr(tSqlExpr* pExpr, STableMeta* pTableMeta, int32_t index, char* msgBuf) {
const char* msg1 = "regular expression string should be less than %d characters";
- const char* msg2 = "illegal column type for match";
+ const char* msg2 = "illegal column type for match/nmatch";
const char* msg3 = "invalid regular expression";
tSqlExpr* pLeft = pExpr->pLeft;
tSqlExpr* pRight = pExpr->pRight;
- if (pExpr->tokenId == TK_MATCH) {
+ if (pExpr->tokenId == TK_MATCH || pExpr->tokenId == TK_NMATCH) {
if (pRight->value.nLen > tsMaxRegexStringLen) {
char tmp[64] = {0};
sprintf(tmp, msg1, tsMaxRegexStringLen);
@@ -4519,15 +4387,28 @@ static int32_t validateMatchExpr(tSqlExpr* pExpr, STableMeta* pTableMeta, int32_
}
SSchema* pSchema = tscGetTableSchema(pTableMeta);
- if ((!isTablenameToken(&pLeft->columnName)) && !IS_VAR_DATA_TYPE(pSchema[index].type)) {
+ if ((!isTablenameToken(&pLeft->columnName)) &&(pSchema[index].type != TSDB_DATA_TYPE_BINARY)) {
return invalidOperationMsg(msgBuf, msg2);
}
+ if (!(pRight->type == SQL_NODE_VALUE && pRight->value.nType == TSDB_DATA_TYPE_BINARY)) {
+ return invalidOperationMsg(msgBuf, msg3);
+ }
+
int errCode = 0;
regex_t regex;
char regErrBuf[256] = {0};
- const char* pattern = pRight->value.pz;
+ //remove the quote at the begin end of original sql string.
+ uint32_t lenPattern = pRight->exprToken.n - 2;
+ char* pattern = malloc(lenPattern + 1);
+ strncpy(pattern, pRight->exprToken.z+1, lenPattern);
+ pattern[lenPattern] = '\0';
+
+ tfree(pRight->value.pz);
+ pRight->value.pz = pattern;
+ pRight->value.nLen = lenPattern;
+
int cflags = REG_EXTENDED;
if ((errCode = regcomp(®ex, pattern, cflags)) != 0) {
regerror(errCode, ®ex, regErrBuf, sizeof(regErrBuf));
@@ -4560,8 +4441,6 @@ static int32_t handleExprInQueryCond(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSql
const char* msg2 = "illegal column name";
const char* msg4 = "too many join tables";
const char* msg5 = "not support ordinary column join";
- const char* msg6 = "only one query condition on tbname allowed";
- const char* msg7 = "only in/like allowed in filter table name";
tSqlExpr* pLeft = (*pExpr)->pLeft;
tSqlExpr* pRight = (*pExpr)->pRight;
@@ -4678,54 +4557,30 @@ static int32_t handleExprInQueryCond(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSql
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
}
- // in case of in operator, keep it in a seprate attribute
- if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
- if (!validTableNameOptr(*pExpr)) {
- return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
- }
-
- if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
- return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
+ if (pRight != NULL && pRight->tokenId == TK_ID) { // join on tag columns for stable query
+ if (!validateJoinExprNode(pCmd, pQueryInfo, *pExpr, &index)) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
}
- if (pCondExpr->pTableCond == NULL) {
- pCondExpr->pTableCond = *pExpr;
- pCondExpr->relType = parentOptr;
- pCondExpr->tableCondIndex = index.tableIndex;
- } else {
- return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
+ pQueryInfo->type |= TSDB_QUERY_TYPE_JOIN_QUERY;
+ ret = setExprToCond(&pCondExpr->pJoinExpr, *pExpr, NULL, parentOptr, pCmd->payload);
+ *pExpr = NULL;
+ if (type) {
+ *type |= TSQL_EXPR_JOIN;
+ }
+ } else {
+ // do nothing
+ // ret = setExprToCond(pCmd, &pCondExpr->pTagCond,
+ // *pExpr, NULL, parentOptr);
+ tSqlExpr *rexpr = NULL;
+ if ((*pExpr)->tokenId == TK_NE && (pSchema->type != TSDB_DATA_TYPE_BINARY && pSchema->type != TSDB_DATA_TYPE_NCHAR && pSchema->type != TSDB_DATA_TYPE_BOOL)) {
+ handleNeOptr(&rexpr, *pExpr);
+ *pExpr = rexpr;
}
-
+
if (type) {
*type |= TSQL_EXPR_TAG;
}
- *pExpr = NULL;
- } else {
- if (pRight != NULL && pRight->tokenId == TK_ID) { // join on tag columns for stable query
- if (!validateJoinExprNode(pCmd, pQueryInfo, *pExpr, &index)) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
-
- pQueryInfo->type |= TSDB_QUERY_TYPE_JOIN_QUERY;
- ret = setExprToCond(&pCondExpr->pJoinExpr, *pExpr, NULL, parentOptr, pCmd->payload);
- *pExpr = NULL;
- if (type) {
- *type |= TSQL_EXPR_JOIN;
- }
- } else {
- // do nothing
- // ret = setExprToCond(pCmd, &pCondExpr->pTagCond,
- // *pExpr, NULL, parentOptr);
- tSqlExpr *rexpr = NULL;
- if ((*pExpr)->tokenId == TK_NE && (pSchema->type != TSDB_DATA_TYPE_BINARY && pSchema->type != TSDB_DATA_TYPE_NCHAR && pSchema->type != TSDB_DATA_TYPE_BOOL)) {
- handleNeOptr(&rexpr, *pExpr);
- *pExpr = rexpr;
- }
-
- if (type) {
- *type |= TSQL_EXPR_TAG;
- }
- }
}
} else { // query on other columns
if (type) {
@@ -4912,81 +4767,6 @@ int tableNameCompar(const void* lhs, const void* rhs) {
return ret > 0 ? 1 : -1;
}
-static int32_t setTableCondForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, const char* account,
- tSqlExpr* pExpr, int16_t tableCondIndex, SStringBuilder* sb) {
- const char* msg = "table name too long";
-
- if (pExpr == NULL) {
- return TSDB_CODE_SUCCESS;
- }
-
- STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, tableCondIndex);
-
- STagCond* pTagCond = &pQueryInfo->tagCond;
- pTagCond->tbnameCond.uid = pTableMetaInfo->pTableMeta->id.uid;
-
- assert(pExpr->tokenId == TK_LIKE || pExpr->tokenId == TK_MATCH || pExpr->tokenId == TK_IN);
-
- if (pExpr->tokenId == TK_LIKE || pExpr->tokenId == TK_MATCH) {
- char* str = taosStringBuilderGetResult(sb, NULL);
- pQueryInfo->tagCond.tbnameCond.cond = strdup(str);
- pQueryInfo->tagCond.tbnameCond.len = (int32_t) strlen(str);
- return TSDB_CODE_SUCCESS;
- } else {
- SStringBuilder sb1;
- memset(&sb1, 0, sizeof(sb1));
- taosStringBuilderAppendStringLen(&sb1, QUERY_COND_REL_PREFIX_IN, QUERY_COND_REL_PREFIX_IN_LEN);
-
- // remove the duplicated input table names
- int32_t num = 0;
- char* tableNameString = taosStringBuilderGetResult(sb, NULL);
-
- char** segments = strsplit(tableNameString + QUERY_COND_REL_PREFIX_IN_LEN, TBNAME_LIST_SEP, &num);
- qsort(segments, num, POINTER_BYTES, tableNameCompar);
-
- int32_t j = 1;
- for (int32_t i = 1; i < num; ++i) {
- if (strcmp(segments[i], segments[i - 1]) != 0) {
- segments[j++] = segments[i];
- }
- }
- num = j;
-
- char name[TSDB_DB_NAME_LEN] = {0};
- tNameGetDbName(&pTableMetaInfo->name, name);
- SStrToken dbToken = {.type = TK_STRING, .z = name, .n = (uint32_t)strlen(name)};
-
- for (int32_t i = 0; i < num; ++i) {
- if (i >= 1) {
- taosStringBuilderAppendStringLen(&sb1, TBNAME_LIST_SEP, 1);
- }
-
- char idBuf[TSDB_TABLE_FNAME_LEN] = {0};
- int32_t xlen = (int32_t)strlen(segments[i]);
- SStrToken t = {.z = segments[i], .n = xlen, .type = TK_STRING};
-
- int32_t ret = setObjFullName(idBuf, account, &dbToken, &t, &xlen);
- if (ret != TSDB_CODE_SUCCESS) {
- taosStringBuilderDestroy(&sb1);
- tfree(segments);
-
- invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg);
- return ret;
- }
-
- taosStringBuilderAppendString(&sb1, idBuf);
- }
-
- char* str = taosStringBuilderGetResult(&sb1, NULL);
- pQueryInfo->tagCond.tbnameCond.cond = strdup(str);
- pQueryInfo->tagCond.tbnameCond.len = (int32_t)strlen(str);
-
- taosStringBuilderDestroy(&sb1);
- tfree(segments);
- return TSDB_CODE_SUCCESS;
- }
-}
-
int32_t mergeTimeRange(SSqlCmd* pCmd, STimeWindow* res, STimeWindow* win, int32_t optr) {
const char* msg0 = "only one time stamp window allowed";
@@ -5126,10 +4906,6 @@ static int32_t validateJoinExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SCondExpr
}
static void cleanQueryExpr(SCondExpr* pCondExpr) {
- if (pCondExpr->pTableCond) {
- tSqlExprDestroy(pCondExpr->pTableCond);
- }
-
if (pCondExpr->pColumnCond) {
tSqlExprDestroy(pCondExpr->pColumnCond);
}
@@ -5425,7 +5201,7 @@ static int32_t getQueryTimeRange(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSqlExpr
//multiple tables's query time range mixed together
tExprNode* p = NULL;
- SFilterInfo *filter = NULL;
+ void *filter = NULL;
SArray* colList = taosArrayInit(10, sizeof(SColIndex));
ret = exprTreeFromSqlExpr(pCmd, &p, *pExpr, pQueryInfo, colList, NULL);
@@ -5467,7 +5243,6 @@ int32_t validateWhereNode(SQueryInfo* pQueryInfo, tSqlExpr** pExpr, SSqlObj* pSq
int32_t ret = TSDB_CODE_SUCCESS;
// tags query condition may be larger than 512bytes, therefore, we need to prepare enough large space
- SStringBuilder sb; memset(&sb, 0, sizeof(sb));
SCondExpr condExpr = {0};
if ((*pExpr)->pLeft == NULL || (*pExpr)->pRight == NULL) {
@@ -5500,12 +5275,12 @@ int32_t validateWhereNode(SQueryInfo* pQueryInfo, tSqlExpr** pExpr, SSqlObj* pSq
condExpr.pTagCond = (*pExpr);
*pExpr = NULL;
- // 1. check if it is a join query
+ // check if it is a join query
if ((ret = validateJoinExpr(&pSql->cmd, pQueryInfo, &condExpr)) != TSDB_CODE_SUCCESS) {
goto PARSE_WHERE_EXIT;
}
- // 2. get the query time range
+ // get the query time range
if ((ret = convertTimeRangeFromExpr(&pSql->cmd, pQueryInfo, condExpr.pTimewindow)) != TSDB_CODE_SUCCESS) {
goto PARSE_WHERE_EXIT;
}
@@ -5513,19 +5288,13 @@ int32_t validateWhereNode(SQueryInfo* pQueryInfo, tSqlExpr** pExpr, SSqlObj* pSq
if ((ret = getQueryTimeRange(&pSql->cmd, pQueryInfo, &condExpr.pTimewindow)) != TSDB_CODE_SUCCESS) {
goto PARSE_WHERE_EXIT;
}
-
- // 3. get the tag query condition
+ // get the tag query condition
if ((ret = getTagQueryCondExpr(&pSql->cmd, pQueryInfo, &condExpr)) != TSDB_CODE_SUCCESS) {
goto PARSE_WHERE_EXIT;
}
- // 4. get the table name query condition
- if ((ret = getTablenameCond(&pSql->cmd, pQueryInfo, condExpr.pTableCond, &sb)) != TSDB_CODE_SUCCESS) {
- goto PARSE_WHERE_EXIT;
- }
-
- // 5. other column query condition
+ // other column query condition
if ((ret = checkColumnQueryCondInfo(&pSql->cmd, pQueryInfo, condExpr.pColumnCond, TK_AND)) != TSDB_CODE_SUCCESS) {
goto PARSE_WHERE_EXIT;
}
@@ -5534,21 +5303,11 @@ int32_t validateWhereNode(SQueryInfo* pQueryInfo, tSqlExpr** pExpr, SSqlObj* pSq
goto PARSE_WHERE_EXIT;
}
-
- // 6. join condition
+ // join condition
if ((ret = getJoinCondInfo(&pSql->cmd, pQueryInfo, condExpr.pJoinExpr)) != TSDB_CODE_SUCCESS) {
goto PARSE_WHERE_EXIT;
}
- // 7. query condition for table name
- pQueryInfo->tagCond.relType = (condExpr.relType == TK_AND) ? TSDB_RELATION_AND : TSDB_RELATION_OR;
-
- ret = setTableCondForSTableQuery(&pSql->cmd, pQueryInfo, getAccountId(pSql), condExpr.pTableCond, condExpr.tableCondIndex, &sb);
- taosStringBuilderDestroy(&sb);
- if (ret) {
- goto PARSE_WHERE_EXIT;
- }
-
//if (!validateFilterExpr(pQueryInfo)) {
// ret = invalidOperationMsg(tscGetErrorMsgPayload(&pSql->cmd), msg2);
// goto PARSE_WHERE_EXIT;
@@ -5619,6 +5378,10 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
pRight->flags &= ~(1 << EXPR_FLAG_NS_TIMESTAMP);
}
+ if (pRight->value.nType == -1) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
+
tVariantDump(&pRight->value, (char*)&val, TSDB_DATA_TYPE_BIGINT, true);
}
@@ -6521,7 +6284,9 @@ int32_t validateFunctionsInIntervalOrGroupbyQuery(SSqlCmd* pCmd, SQueryInfo* pQu
}
int32_t f = pExpr->base.functionId;
- if ((f == TSDB_FUNC_PRJ && pExpr->base.numOfParams == 0) || f == TSDB_FUNC_DIFF || f == TSDB_FUNC_ARITHM || f == TSDB_FUNC_DERIVATIVE) {
+ if ((f == TSDB_FUNC_PRJ && pExpr->base.numOfParams == 0) || f == TSDB_FUNC_DIFF || f == TSDB_FUNC_ARITHM || f == TSDB_FUNC_DERIVATIVE ||
+ f == TSDB_FUNC_CEIL || f == TSDB_FUNC_FLOOR || f == TSDB_FUNC_ROUND)
+ {
isProjectionFunction = true;
break;
}
@@ -7123,6 +6888,7 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo, char* msg) {
const char* msg2 = "aggregation function should not be mixed up with projection";
bool tagTsColExists = false;
+ int16_t numOfScalar = 0;
int16_t numOfSelectivity = 0;
int16_t numOfAggregation = 0;
@@ -7156,6 +6922,8 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo, char* msg) {
if ((aAggs[functionId].status & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
numOfSelectivity++;
+ } else if ((aAggs[functionId].status & TSDB_FUNCSTATE_SCALAR) != 0) {
+ numOfScalar++;
} else {
numOfAggregation++;
}
@@ -8224,11 +7992,12 @@ static int32_t handleExprInHavingClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, S
&& pExpr->tokenId != TK_NOTNULL
&& pExpr->tokenId != TK_LIKE
&& pExpr->tokenId != TK_MATCH
+ && pExpr->tokenId != TK_NMATCH
) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
}
} else {
- if (pExpr->tokenId == TK_LIKE || pExpr->tokenId == TK_MATCH) {
+ if (pExpr->tokenId == TK_LIKE || pExpr->tokenId == TK_MATCH || pExpr->tokenId == TK_NMATCH) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
}
@@ -8685,7 +8454,7 @@ static int32_t doLoadAllTableMeta(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNod
if (p->vgroupIdList != NULL) {
size_t s = taosArrayGetSize(p->vgroupIdList);
- size_t vgroupsz = sizeof(SVgroupInfo) * s + sizeof(SVgroupsInfo);
+ size_t vgroupsz = sizeof(SVgroupMsg) * s + sizeof(SVgroupsInfo);
pTableMetaInfo->vgroupList = calloc(1, vgroupsz);
if (pTableMetaInfo->vgroupList == NULL) {
return TSDB_CODE_TSC_OUT_OF_MEMORY;
@@ -8700,14 +8469,11 @@ static int32_t doLoadAllTableMeta(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNod
taosHashGetClone(tscVgroupMap, id, sizeof(*id), NULL, &existVgroupInfo);
assert(existVgroupInfo.inUse >= 0);
- SVgroupInfo *pVgroup = &pTableMetaInfo->vgroupList->vgroups[j];
+ SVgroupMsg *pVgroup = &pTableMetaInfo->vgroupList->vgroups[j];
pVgroup->numOfEps = existVgroupInfo.numOfEps;
pVgroup->vgId = existVgroupInfo.vgId;
- for (int32_t k = 0; k < existVgroupInfo.numOfEps; ++k) {
- pVgroup->epAddr[k].port = existVgroupInfo.ep[k].port;
- pVgroup->epAddr[k].fqdn = strndup(existVgroupInfo.ep[k].fqdn, TSDB_FQDN_LEN);
- }
+ memcpy(&pVgroup->epAddr, &existVgroupInfo.ep, sizeof(pVgroup->epAddr));
}
}
}
@@ -9196,13 +8962,17 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
(*pExpr)->pVal = calloc(1, sizeof(tVariant));
tVariantAssign((*pExpr)->pVal, &pSqlExpr->value);
- STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
- if (pCols != NULL && taosArrayGetSize(pCols) > 0) {
- SColIndex* idx = taosArrayGet(pCols, 0);
- SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex);
- // convert time by precision
- if (pSchema != NULL && TSDB_DATA_TYPE_TIMESTAMP == pSchema->type && TSDB_DATA_TYPE_BINARY == (*pExpr)->pVal->nType) {
- ret = setColumnFilterInfoForTimestamp(pCmd, pQueryInfo, (*pExpr)->pVal);
+ STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, pQueryInfo->curTableIdx)->pTableMeta;
+ if (pCols != NULL) {
+ size_t colSize = taosArrayGetSize(pCols);
+
+ if (colSize > 0) {
+ SColIndex* idx = taosArrayGet(pCols, colSize - 1);
+ SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex);
+ // convert time by precision
+ if (pSchema != NULL && TSDB_DATA_TYPE_TIMESTAMP == pSchema->type && TSDB_DATA_TYPE_BINARY == (*pExpr)->pVal->nType) {
+ ret = setColumnFilterInfoForTimestamp(pCmd, pQueryInfo, (*pExpr)->pVal);
+ }
}
}
return ret;
@@ -9245,8 +9015,18 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
(*pExpr)->nodeType = TSQL_NODE_COL;
(*pExpr)->pSchema = calloc(1, sizeof(SSchema));
- SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, index.columnIndex);
- *(*pExpr)->pSchema = *pSchema;
+ SSchema* pSchema = NULL;
+
+ if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
+ pSchema = (*pExpr)->pSchema;
+ strcpy(pSchema->name, TSQL_TBNAME_L);
+ pSchema->type = TSDB_DATA_TYPE_BINARY;
+ pSchema->colId = TSDB_TBNAME_COLUMN_INDEX;
+ pSchema->bytes = -1;
+ } else {
+ pSchema = tscGetTableColumnSchema(pTableMeta, index.columnIndex);
+ *(*pExpr)->pSchema = *pSchema;
+ }
if (pCols != NULL) { // record the involved columns
SColIndex colIndex = {0};
@@ -9267,9 +9047,13 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS
if (colSize > 0) {
SColIndex* idx = taosArrayGet(pCols, colSize - 1);
- SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex);
- if (pSchema != NULL) {
- colType = pSchema->type;
+ if (idx->colIndex == TSDB_TBNAME_COLUMN_INDEX) {
+ colType = TSDB_DATA_TYPE_BINARY;
+ } else {
+ SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex);
+ if (pSchema != NULL) {
+ colType = pSchema->type;
+ }
}
}
}
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 9d523f273016e258940c67eaa1596153de0998eb..dcfbc857d5d6792b3796a098ea61046439fc5d0f 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -73,7 +73,7 @@ static int32_t removeDupVgid(int32_t *src, int32_t sz) {
return ret;
}
-static void tscSetDnodeEpSet(SRpcEpSet* pEpSet, SVgroupInfo* pVgroupInfo) {
+static void tscSetDnodeEpSet(SRpcEpSet* pEpSet, SVgroupMsg* pVgroupInfo) {
assert(pEpSet != NULL && pVgroupInfo != NULL && pVgroupInfo->numOfEps > 0);
// Issue the query to one of the vnode among a vgroup randomly.
@@ -93,6 +93,7 @@ static void tscSetDnodeEpSet(SRpcEpSet* pEpSet, SVgroupInfo* pVgroupInfo) {
existed = true;
}
}
+
assert(existed);
}
@@ -702,11 +703,6 @@ static int32_t tscEstimateQueryMsgSize(SSqlObj *pSql) {
}
}
- SCond* pCond = &pQueryInfo->tagCond.tbnameCond;
- if (pCond->len > 0) {
- srcColListSize += pCond->len;
- }
-
return MIN_QUERY_MSG_PKT_SIZE + minMsgSize() + sizeof(SQueryTableMsg) + srcColListSize + srcColFilterSize + srcTagFilterSize +
exprSize + tsBufSize + tableSerialize + sqlLen + 4096 + pQueryInfo->bufLen;
}
@@ -723,7 +719,7 @@ static char *doSerializeTableInfo(SQueryTableMsg *pQueryMsg, SSqlObj *pSql, STab
int32_t index = pTableMetaInfo->vgroupIndex;
assert(index >= 0);
- SVgroupInfo* pVgroupInfo = NULL;
+ SVgroupMsg* pVgroupInfo = NULL;
if (pTableMetaInfo->vgroupList && pTableMetaInfo->vgroupList->numOfVgroups > 0) {
assert(index < pTableMetaInfo->vgroupList->numOfVgroups);
pVgroupInfo = &pTableMetaInfo->vgroupList->vgroups[index];
@@ -861,8 +857,8 @@ static int32_t serializeSqlExpr(SSqlExpr* pExpr, STableMetaInfo* pTableMetaInfo,
(*pMsg) += sizeof(SSqlExpr);
for (int32_t j = 0; j < pExpr->numOfParams; ++j) { // todo add log
- pSqlExpr->param[j].nType = htons((uint16_t)pExpr->param[j].nType);
- pSqlExpr->param[j].nLen = htons(pExpr->param[j].nLen);
+ pSqlExpr->param[j].nType = htonl(pExpr->param[j].nType);
+ pSqlExpr->param[j].nLen = htonl(pExpr->param[j].nLen);
if (pExpr->param[j].nType == TSDB_DATA_TYPE_BINARY) {
memcpy((*pMsg), pExpr->param[j].pz, pExpr->param[j].nLen);
@@ -880,17 +876,22 @@ static int32_t serializeSqlExpr(SSqlExpr* pExpr, STableMetaInfo* pTableMetaInfo,
int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
SSqlCmd *pCmd = &pSql->cmd;
+ SQueryInfo *pQueryInfo = NULL;
+ STableMeta *pTableMeta = NULL;
+ STableMetaInfo *pTableMetaInfo = NULL;
+
int32_t code = TSDB_CODE_SUCCESS;
int32_t size = tscEstimateQueryMsgSize(pSql);
+ assert(size > 0);
- if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
+ if (TSDB_CODE_SUCCESS != tscAllocPayloadFast(pCmd, size)) {
tscError("%p failed to malloc for query msg", pSql);
return TSDB_CODE_TSC_INVALID_OPERATION; // todo add test for this
}
- SQueryInfo *pQueryInfo = tscGetQueryInfo(pCmd);
- STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
- STableMeta * pTableMeta = pTableMetaInfo->pTableMeta;
+ pQueryInfo = tscGetQueryInfo(pCmd);
+ pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+ pTableMeta = pTableMetaInfo->pTableMeta;
SQueryAttr query = {{0}};
tscCreateQueryFromQueryInfo(pQueryInfo, &query, pSql);
@@ -941,18 +942,15 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
pQueryMsg->pointInterpQuery = query.pointInterpQuery;
pQueryMsg->needReverseScan = query.needReverseScan;
pQueryMsg->stateWindow = query.stateWindow;
-
pQueryMsg->numOfTags = htonl(numOfTags);
pQueryMsg->sqlstrLen = htonl(sqlLen);
pQueryMsg->sw.gap = htobe64(query.sw.gap);
pQueryMsg->sw.primaryColId = htonl(PRIMARYKEY_TIMESTAMP_COL_INDEX);
pQueryMsg->secondStageOutput = htonl(query.numOfExpr2);
- pQueryMsg->numOfOutput = htons((int16_t)query.numOfOutput); // this is the stage one output column number
+ pQueryMsg->numOfOutput = htons((int16_t)query.numOfOutput); // this is the stage one output column number
pQueryMsg->numOfGroupCols = htons(pQueryInfo->groupbyExpr.numOfGroupCols);
- pQueryMsg->tagNameRelType = htons(pQueryInfo->tagCond.relType);
- pQueryMsg->tbnameCondLen = htonl(pQueryInfo->tagCond.tbnameCond.len);
pQueryMsg->queryType = htonl(pQueryInfo->type);
pQueryMsg->prevResultLen = htonl(pQueryInfo->bufLen);
@@ -968,7 +966,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
pQueryMsg->tableCols[i].type = htons(pCol->type);
//pQueryMsg->tableCols[i].flist.numOfFilters = htons(pCol->flist.numOfFilters);
pQueryMsg->tableCols[i].flist.numOfFilters = 0;
-
+ pQueryMsg->tableCols[i].flist.filterInfo = 0;
// append the filter information after the basic column information
//serializeColFilterInfo(pCol->flist.filterInfo, pCol->flist.numOfFilters, &pMsg);
}
@@ -981,6 +979,8 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
pMsg += pCond->len;
}
+ } else {
+ pQueryMsg->colCondLen = 0;
}
for (int32_t i = 0; i < query.numOfOutput; ++i) {
@@ -1060,6 +1060,8 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
pMsg += pCond->len;
}
+ } else {
+ pQueryMsg->tagCondLen = 0;
}
if (pQueryInfo->bufLen > 0) {
@@ -1067,12 +1069,6 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
pMsg += pQueryInfo->bufLen;
}
- SCond* pCond = &pQueryInfo->tagCond.tbnameCond;
- if (pCond->len > 0) {
- strncpy(pMsg, pCond->cond, pCond->len);
- pMsg += pCond->len;
- }
-
// compressed ts block
pQueryMsg->tsBuf.tsOffset = htonl((int32_t)(pMsg - pCmd->payload));
@@ -1089,6 +1085,9 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
pQueryMsg->tsBuf.tsOrder = htonl(pQueryInfo->tsBuf->tsOrder);
pQueryMsg->tsBuf.tsLen = htonl(pQueryMsg->tsBuf.tsLen);
pQueryMsg->tsBuf.tsNumOfBlocks = htonl(pQueryMsg->tsBuf.tsNumOfBlocks);
+ } else {
+ pQueryMsg->tsBuf.tsLen = 0;
+ pQueryMsg->tsBuf.tsNumOfBlocks = 0;
}
int32_t numOfOperator = (int32_t) taosArrayGetSize(queryOperator);
@@ -1126,6 +1125,9 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
pMsg += pUdfInfo->contLen;
}
+ } else {
+ pQueryMsg->udfContentOffset = 0;
+ pQueryMsg->udfContentLen = 0;
}
memcpy(pMsg, pSql->sqlstr, sqlLen);
@@ -2146,7 +2148,7 @@ static SVgroupsInfo* createVgroupInfoFromMsg(char* pMsg, int32_t* size, uint64_t
*size = (int32_t)(sizeof(SVgroupMsg) * pVgroupMsg->numOfVgroups + sizeof(SVgroupsMsg));
- size_t vgroupsz = sizeof(SVgroupInfo) * pVgroupMsg->numOfVgroups + sizeof(SVgroupsInfo);
+ size_t vgroupsz = sizeof(SVgroupMsg) * pVgroupMsg->numOfVgroups + sizeof(SVgroupsInfo);
SVgroupsInfo *pVgroupInfo = calloc(1, vgroupsz);
assert(pVgroupInfo != NULL);
@@ -2156,7 +2158,7 @@ static SVgroupsInfo* createVgroupInfoFromMsg(char* pMsg, int32_t* size, uint64_t
} else {
for (int32_t j = 0; j < pVgroupInfo->numOfVgroups; ++j) {
// just init, no need to lock
- SVgroupInfo *pVgroup = &pVgroupInfo->vgroups[j];
+ SVgroupMsg *pVgroup = &pVgroupInfo->vgroups[j];
SVgroupMsg *vmsg = &pVgroupMsg->vgroups[j];
vmsg->vgId = htonl(vmsg->vgId);
@@ -2168,7 +2170,8 @@ static SVgroupsInfo* createVgroupInfoFromMsg(char* pMsg, int32_t* size, uint64_t
pVgroup->vgId = vmsg->vgId;
for (int32_t k = 0; k < vmsg->numOfEps; ++k) {
pVgroup->epAddr[k].port = vmsg->epAddr[k].port;
- pVgroup->epAddr[k].fqdn = strndup(vmsg->epAddr[k].fqdn, TSDB_FQDN_LEN);
+ tstrncpy(pVgroup->epAddr[k].fqdn, vmsg->epAddr[k].fqdn, TSDB_FQDN_LEN);
+// pVgroup->epAddr[k].fqdn = strndup(vmsg->epAddr[k].fqdn, TSDB_FQDN_LEN);
}
doUpdateVgroupInfo(pVgroup->vgId, vmsg);
@@ -2618,7 +2621,11 @@ int tscProcessAlterTableMsgRsp(SSqlObj *pSql) {
tfree(pTableMetaInfo->pTableMeta);
if (isSuperTable) { // if it is a super table, iterate the hashTable and remove all the childTableMeta
- taosHashClear(tscTableMetaMap);
+ if (pSql->res.pRsp == NULL) {
+ tscDebug("0x%"PRIx64" unexpected resp from mnode, super table: %s failed to update super table meta ", pSql->self, name);
+ return 0;
+ }
+ return tscProcessTableMetaRsp(pSql);
}
return 0;
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index edc3dbfc82aa6c6c7dcbb9fa6548c9f49864e324..99a2a79dc60c89530eb9c2c7f6b5645ca0133ba1 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -623,13 +623,12 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
int16_t colId = tscGetJoinTagColIdByUid(&pQueryInfo->tagCond, pTableMetaInfo->pTableMeta->id.uid);
// set the tag column id for executor to extract correct tag value
-#ifndef _TD_NINGSI_60
- pExpr->base.param[0] = (tVariant) {.i64 = colId, .nType = TSDB_DATA_TYPE_BIGINT, .nLen = sizeof(int64_t)};
-#else
- pExpr->base.param[0].i64 = colId;
- pExpr->base.param[0].nType = TSDB_DATA_TYPE_BIGINT;
- pExpr->base.param[0].nLen = sizeof(int64_t);
-#endif
+ tVariant* pVariant = &pExpr->base.param[0];
+
+ pVariant->i64 = colId;
+ pVariant->nType = TSDB_DATA_TYPE_BIGINT;
+ pVariant->nLen = sizeof(int64_t);
+
pExpr->base.numOfParams = 1;
}
@@ -748,10 +747,11 @@ void tscBuildVgroupTableInfo(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, SArr
SVgroupTableInfo info = {{0}};
for (int32_t m = 0; m < pvg->numOfVgroups; ++m) {
if (tt->vgId == pvg->vgroups[m].vgId) {
- tscSVgroupInfoCopy(&info.vgInfo, &pvg->vgroups[m]);
+ memcpy(&info.vgInfo, &pvg->vgroups[m], sizeof(info.vgInfo));
break;
}
}
+
assert(info.vgInfo.numOfEps != 0);
vgTables = taosArrayInit(4, sizeof(STableIdInfo));
@@ -1347,7 +1347,11 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
pCmd->command = TSDB_SQL_SELECT;
tscResetForNextRetrieve(&pSql->res);
- assert(pSupporter->f == NULL);
+ if (pSupporter->f != NULL) {
+ fclose(pSupporter->f);
+ pSupporter->f = NULL;
+ }
+
taosGetTmpfilePath("ts-join", pSupporter->path);
// TODO check for failure
@@ -2463,7 +2467,7 @@ static void doConcurrentlySendSubQueries(SSqlObj* pSql) {
SSubqueryState *pState = &pSql->subState;
// concurrently sent the query requests.
- const int32_t MAX_REQUEST_PER_TASK = 8;
+ const int32_t MAX_REQUEST_PER_TASK = 4;
int32_t numOfTasks = (pState->numOfSub + MAX_REQUEST_PER_TASK - 1)/MAX_REQUEST_PER_TASK;
assert(numOfTasks >= 1);
@@ -2550,13 +2554,14 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
trs->pExtMemBuffer = pMemoryBuf;
trs->pOrderDescriptor = pDesc;
- trs->localBuffer = (tFilePage *)calloc(1, nBufferSize + sizeof(tFilePage));
+ trs->localBuffer = (tFilePage *)malloc(nBufferSize + sizeof(tFilePage));
if (trs->localBuffer == NULL) {
tscError("0x%"PRIx64" failed to malloc buffer for local buffer, orderOfSub:%d, reason:%s", pSql->self, i, strerror(errno));
tfree(trs);
break;
}
-
+
+ trs->localBuffer->num = 0;
trs->subqueryIndex = i;
trs->pParentSql = pSql;
@@ -2651,7 +2656,7 @@ static int32_t tscReissueSubquery(SRetrieveSupport *oriTrs, SSqlObj *pSql, int32
int32_t subqueryIndex = trsupport->subqueryIndex;
STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0);
- SVgroupInfo* pVgroup = &pTableMetaInfo->vgroupList->vgroups[0];
+ SVgroupMsg* pVgroup = &pTableMetaInfo->vgroupList->vgroups[0];
tExtMemBufferClear(trsupport->pExtMemBuffer[subqueryIndex]);
@@ -2879,7 +2884,6 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p
pParentSql->res.precision = pSql->res.precision;
pParentSql->res.numOfRows = 0;
pParentSql->res.row = 0;
- pParentSql->res.numOfGroups = 0;
tscFreeRetrieveSup(pSql);
@@ -2930,7 +2934,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
SSubqueryState* pState = &pParentSql->subState;
STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0);
- SVgroupInfo *pVgroup = &pTableMetaInfo->vgroupList->vgroups[0];
+ SVgroupMsg *pVgroup = &pTableMetaInfo->vgroupList->vgroups[0];
if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
@@ -3058,7 +3062,7 @@ void tscRetrieveDataRes(void *param, TAOS_RES *tres, int code) {
assert(pQueryInfo->numOfTables == 1);
STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0);
- SVgroupInfo* pVgroup = &pTableMetaInfo->vgroupList->vgroups[trsupport->subqueryIndex];
+ SVgroupMsg* pVgroup = &pTableMetaInfo->vgroupList->vgroups[trsupport->subqueryIndex];
// stable query killed or other subquery failed, all query stopped
if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
@@ -3404,7 +3408,6 @@ static void doBuildResFromSubqueries(SSqlObj* pSql) {
return;
}
-// tscRestoreFuncForSTableQuery(pQueryInfo);
int32_t rowSize = tscGetResRowLength(pQueryInfo->exprList);
assert(numOfRes * rowSize > 0);
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 8af340030cccee1431a82eb88344642011f2e019..b3b83db80a70c19f79d1cd6a732d729817436dd3 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -50,6 +50,7 @@ int tscLogFileNum = 10;
static pthread_mutex_t rpcObjMutex; // mutex to protect open the rpc obj concurrently
static pthread_once_t tscinit = PTHREAD_ONCE_INIT;
+static pthread_mutex_t setConfMutex = PTHREAD_MUTEX_INITIALIZER;
// pthread_once can not return result code, so result code is set to a global variable.
static volatile int tscInitRes = 0;
@@ -249,6 +250,7 @@ void taos_cleanup(void) {
pthread_mutex_destroy(&rpcObjMutex);
}
+ pthread_mutex_destroy(&setConfMutex);
taosCacheCleanup(tscVgroupListBuf);
tscVgroupListBuf = NULL;
@@ -437,3 +439,66 @@ int taos_options(TSDB_OPTION option, const void *arg, ...) {
atomic_store_32(&lock, 0);
return ret;
}
+
+#include "cJSON.h"
+static setConfRet taos_set_config_imp(const char *config){
+ setConfRet ret = {SET_CONF_RET_SUCC, {0}};
+ static bool setConfFlag = false;
+ if (setConfFlag) {
+ ret.retCode = SET_CONF_RET_ERR_ONLY_ONCE;
+ strcpy(ret.retMsg, "configuration can only set once");
+ return ret;
+ }
+ taosInitGlobalCfg();
+ cJSON *root = cJSON_Parse(config);
+ if (root == NULL){
+ ret.retCode = SET_CONF_RET_ERR_JSON_PARSE;
+ strcpy(ret.retMsg, "parse json error");
+ return ret;
+ }
+
+ int size = cJSON_GetArraySize(root);
+ if(!cJSON_IsObject(root) || size == 0) {
+ ret.retCode = SET_CONF_RET_ERR_JSON_INVALID;
+ strcpy(ret.retMsg, "json content is invalid, must be not empty object");
+ return ret;
+ }
+
+ if(size >= 1000) {
+ ret.retCode = SET_CONF_RET_ERR_TOO_LONG;
+ strcpy(ret.retMsg, "json object size is too long");
+ return ret;
+ }
+
+ for(int i = 0; i < size; i++){
+ cJSON *item = cJSON_GetArrayItem(root, i);
+ if(!item) {
+ ret.retCode = SET_CONF_RET_ERR_INNER;
+ strcpy(ret.retMsg, "inner error");
+ return ret;
+ }
+ if(!taosReadConfigOption(item->string, item->valuestring, NULL, NULL, TAOS_CFG_CSTATUS_OPTION, TSDB_CFG_CTYPE_B_CLIENT)){
+ ret.retCode = SET_CONF_RET_ERR_PART;
+ if (strlen(ret.retMsg) == 0){
+ snprintf(ret.retMsg, RET_MSG_LENGTH, "part error|%s", item->string);
+ }else{
+ int tmp = RET_MSG_LENGTH - 1 - (int)strlen(ret.retMsg);
+ size_t leftSize = tmp >= 0 ? tmp : 0;
+ strncat(ret.retMsg, "|", leftSize);
+ tmp = RET_MSG_LENGTH - 1 - (int)strlen(ret.retMsg);
+ leftSize = tmp >= 0 ? tmp : 0;
+ strncat(ret.retMsg, item->string, leftSize);
+ }
+ }
+ }
+ cJSON_Delete(root);
+ setConfFlag = true;
+ return ret;
+}
+
+setConfRet taos_set_config(const char *config){
+ pthread_mutex_lock(&setConfMutex);
+ setConfRet ret = taos_set_config_imp(config);
+ pthread_mutex_unlock(&setConfMutex);
+ return ret;
+}
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index fe3e330aa97bb217a596df6fe428c115f29103b5..60a6e241ccdfd48c7eb5a68f2dd7a251f76097a5 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -269,7 +269,10 @@ bool tscIsProjectionQueryOnSTable(SQueryInfo* pQueryInfo, int32_t tableIndex) {
functionId != TSDB_FUNC_DIFF &&
functionId != TSDB_FUNC_DERIVATIVE &&
functionId != TSDB_FUNC_TS_DUMMY &&
- functionId != TSDB_FUNC_TID_TAG) {
+ functionId != TSDB_FUNC_TID_TAG &&
+ functionId != TSDB_FUNC_CEIL &&
+ functionId != TSDB_FUNC_FLOOR &&
+ functionId != TSDB_FUNC_ROUND) {
return false;
}
}
@@ -811,7 +814,7 @@ typedef struct SDummyInputInfo {
SSDataBlock *block;
STableQueryInfo *pTableQueryInfo;
SSqlObj *pSql; // refactor: remove it
- SFilterInfo *pFilterInfo;
+ void *pFilterInfo;
} SDummyInputInfo;
typedef struct SJoinStatus {
@@ -827,7 +830,7 @@ typedef struct SJoinOperatorInfo {
SRspResultInfo resultInfo; // todo refactor, add this info for each operator
} SJoinOperatorInfo;
-static void doSetupSDataBlock(SSqlRes* pRes, SSDataBlock* pBlock, SFilterInfo* pFilterInfo) {
+static void doSetupSDataBlock(SSqlRes* pRes, SSDataBlock* pBlock, void* pFilterInfo) {
int32_t offset = 0;
char* pData = pRes->data;
@@ -844,8 +847,9 @@ static void doSetupSDataBlock(SSqlRes* pRes, SSDataBlock* pBlock, SFilterInfo* p
// filter data if needed
if (pFilterInfo) {
- //doSetFilterColumnInfo(pFilterInfo, numOfFilterCols, pBlock);
- filterSetColFieldData(pFilterInfo, pBlock->info.numOfCols, pBlock->pDataBlock);
+ SColumnDataParam param = {.numOfCols = pBlock->info.numOfCols, .pDataBlock = pBlock->pDataBlock};
+ filterSetColFieldData(pFilterInfo, ¶m, getColumnDataFromId);
+
bool gotNchar = false;
filterConverNcharColumns(pFilterInfo, pBlock->info.rows, &gotNchar);
int8_t* p = NULL;
@@ -1108,7 +1112,7 @@ static void destroyDummyInputOperator(void* param, int32_t numOfOutput) {
}
// todo this operator servers as the adapter for Operator tree and SqlRes result, remove it later
-SOperatorInfo* createDummyInputOperator(SSqlObj* pSql, SSchema* pSchema, int32_t numOfCols, SFilterInfo* pFilters) {
+SOperatorInfo* createDummyInputOperator(SSqlObj* pSql, SSchema* pSchema, int32_t numOfCols, void* pFilters) {
assert(numOfCols > 0);
STimeWindow win = {.skey = INT64_MIN, .ekey = INT64_MAX};
@@ -1250,7 +1254,7 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
// if it is a join query, create join operator here
int32_t numOfCol1 = pTableMeta->tableInfo.numOfColumns;
- SFilterInfo *pFilters = NULL;
+ void *pFilters = NULL;
STblCond *pCond = NULL;
if (px->colCond) {
pCond = tsGetTableFilter(px->colCond, pTableMeta->id.uid, 0);
@@ -1277,7 +1281,7 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
for(int32_t i = 1; i < px->numOfTables; ++i) {
STableMeta* pTableMeta1 = tscGetMetaInfo(px, i)->pTableMeta;
numOfCol1 = pTableMeta1->tableInfo.numOfColumns;
- SFilterInfo *pFilters1 = NULL;
+ void *pFilters1 = NULL;
SSchema* pSchema1 = tscGetTableSchema(pTableMeta1);
int32_t n = pTableMeta1->tableInfo.numOfColumns;
@@ -1347,14 +1351,7 @@ static void tscDestroyResPointerInfo(SSqlRes* pRes) {
tfree(pRes->buffer);
tfree(pRes->urow);
- tfree(pRes->pGroupRec);
tfree(pRes->pColumnIndex);
-
- if (pRes->pArithSup != NULL) {
- tfree(pRes->pArithSup->data);
- tfree(pRes->pArithSup);
- }
-
tfree(pRes->final);
pRes->data = NULL; // pRes->data points to the buffer of pRsp, no need to free
@@ -1472,7 +1469,12 @@ void tscFreeSubobj(SSqlObj* pSql) {
tscDebug("0x%"PRIx64" start to free sub SqlObj, numOfSub:%d", pSql->self, pSql->subState.numOfSub);
for(int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
- tscDebug("0x%"PRIx64" free sub SqlObj:0x%"PRIx64", index:%d", pSql->self, pSql->pSubs[i]->self, i);
+ if (pSql->pSubs[i] != NULL) {
+ tscDebug("0x%"PRIx64" free sub SqlObj:0x%"PRIx64", index:%d", pSql->self, pSql->pSubs[i]->self, i);
+ } else {
+ /* just for python error test case */
+ tscDebug("0x%"PRIx64" free sub SqlObj:0x0, index:%d", pSql->self, i);
+ }
taos_free_result(pSql->pSubs[i]);
pSql->pSubs[i] = NULL;
}
@@ -2087,32 +2089,35 @@ bool tscIsInsertData(char* sqlstr) {
} while (1);
}
-int tscAllocPayload(SSqlCmd* pCmd, int size) {
+int32_t tscAllocPayloadFast(SSqlCmd *pCmd, size_t size) {
if (pCmd->payload == NULL) {
assert(pCmd->allocSize == 0);
- pCmd->payload = (char*)calloc(1, size);
- if (pCmd->payload == NULL) {
+ pCmd->payload = malloc(size);
+ pCmd->allocSize = (uint32_t) size;
+ } else if (pCmd->allocSize < size) {
+ char* tmp = realloc(pCmd->payload, size);
+ if (tmp == NULL) {
return TSDB_CODE_TSC_OUT_OF_MEMORY;
}
- pCmd->allocSize = size;
- } else {
- if (pCmd->allocSize < (uint32_t)size) {
- char* b = realloc(pCmd->payload, size);
- if (b == NULL) {
- return TSDB_CODE_TSC_OUT_OF_MEMORY;
- }
+ pCmd->payload = tmp;
+ pCmd->allocSize = (uint32_t) size;
+ }
- pCmd->payload = b;
- pCmd->allocSize = size;
- }
+ assert(pCmd->allocSize >= size);
+ return TSDB_CODE_SUCCESS;
+}
+int32_t tscAllocPayload(SSqlCmd* pCmd, int size) {
+ assert(size > 0);
+
+ int32_t code = tscAllocPayloadFast(pCmd, (size_t) size);
+ if (code == TSDB_CODE_SUCCESS) {
memset(pCmd->payload, 0, pCmd->allocSize);
}
- assert(pCmd->allocSize >= (uint32_t)size && size > 0);
- return TSDB_CODE_SUCCESS;
+ return code;
}
TAOS_FIELD tscCreateField(int8_t type, const char* name, int16_t bytes) {
@@ -2902,16 +2907,6 @@ bool tscValidateColumnId(STableMetaInfo* pTableMetaInfo, int32_t colId, int32_t
int32_t tscTagCondCopy(STagCond* dest, const STagCond* src) {
memset(dest, 0, sizeof(STagCond));
- if (src->tbnameCond.cond != NULL) {
- dest->tbnameCond.cond = strdup(src->tbnameCond.cond);
- if (dest->tbnameCond.cond == NULL) {
- return -1;
- }
- }
-
- dest->tbnameCond.uid = src->tbnameCond.uid;
- dest->tbnameCond.len = src->tbnameCond.len;
-
dest->joinInfo.hasJoin = src->joinInfo.hasJoin;
for (int32_t i = 0; i < TSDB_MAX_JOIN_TABLE_NUM; ++i) {
@@ -2930,9 +2925,6 @@ int32_t tscTagCondCopy(STagCond* dest, const STagCond* src) {
}
}
-
- dest->relType = src->relType;
-
if (src->pCond == NULL) {
return 0;
}
@@ -3022,8 +3014,6 @@ void tscColCondRelease(SArray** pCond) {
void tscTagCondRelease(STagCond* pTagCond) {
- free(pTagCond->tbnameCond.cond);
-
if (pTagCond->pCond != NULL) {
size_t s = taosArrayGetSize(pTagCond->pCond);
for (int32_t i = 0; i < s; ++i) {
@@ -3369,11 +3359,11 @@ void tscFreeVgroupTableInfo(SArray* pVgroupTables) {
size_t num = taosArrayGetSize(pVgroupTables);
for (size_t i = 0; i < num; i++) {
SVgroupTableInfo* pInfo = taosArrayGet(pVgroupTables, i);
-
+#if 0
for(int32_t j = 0; j < pInfo->vgInfo.numOfEps; ++j) {
tfree(pInfo->vgInfo.epAddr[j].fqdn);
}
-
+#endif
taosArrayDestroy(pInfo->itemList);
}
@@ -3387,9 +3377,9 @@ void tscRemoveVgroupTableGroup(SArray* pVgroupTable, int32_t index) {
assert(size > index);
SVgroupTableInfo* pInfo = taosArrayGet(pVgroupTable, index);
- for(int32_t j = 0; j < pInfo->vgInfo.numOfEps; ++j) {
- tfree(pInfo->vgInfo.epAddr[j].fqdn);
- }
+// for(int32_t j = 0; j < pInfo->vgInfo.numOfEps; ++j) {
+// tfree(pInfo->vgInfo.epAddr[j].fqdn);
+// }
taosArrayDestroy(pInfo->itemList);
taosArrayRemove(pVgroupTable, index);
@@ -3399,9 +3389,12 @@ void tscVgroupTableCopy(SVgroupTableInfo* info, SVgroupTableInfo* pInfo) {
memset(info, 0, sizeof(SVgroupTableInfo));
info->vgInfo = pInfo->vgInfo;
+
+#if 0
for(int32_t j = 0; j < pInfo->vgInfo.numOfEps; ++j) {
info->vgInfo.epAddr[j].fqdn = strdup(pInfo->vgInfo.epAddr[j].fqdn);
}
+#endif
if (pInfo->itemList) {
info->itemList = taosArrayDup(pInfo->itemList);
@@ -3464,13 +3457,9 @@ STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, SName* name, STableM
}
pTableMetaInfo->pTableMeta = pTableMeta;
- if (pTableMetaInfo->pTableMeta == NULL) {
- pTableMetaInfo->tableMetaSize = 0;
- } else {
- pTableMetaInfo->tableMetaSize = tscGetTableMetaSize(pTableMeta);
- }
+ pTableMetaInfo->tableMetaSize = (pTableMetaInfo->pTableMeta == NULL)? 0:tscGetTableMetaSize(pTableMeta);
+
pTableMetaInfo->tableMetaCapacity = (size_t)(pTableMetaInfo->tableMetaSize);
-
if (vgroupList != NULL) {
pTableMetaInfo->vgroupList = tscVgroupInfoClone(vgroupList);
@@ -3718,8 +3707,8 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
goto _error;
}
- pNewQueryInfo->numOfFillVal = pQueryInfo->fieldsInfo.numOfOutput;
+ pNewQueryInfo->numOfFillVal = pQueryInfo->fieldsInfo.numOfOutput;
memcpy(pNewQueryInfo->fillVal, pQueryInfo->fillVal, pQueryInfo->fieldsInfo.numOfOutput * sizeof(int64_t));
}
@@ -3760,7 +3749,6 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, &pTableMetaInfo->name, pTableMeta, pTableMetaInfo->vgroupList,
pTableMetaInfo->tagColList, pTableMetaInfo->pVgroupTables);
-
} else { // transfer the ownership of pTableMeta to the newly create sql object.
STableMetaInfo* pPrevInfo = tscGetTableMetaInfoFromCmd(&pPrevSql->cmd, 0);
if (pPrevInfo->pTableMeta && pPrevInfo->pTableMeta->tableType < 0) {
@@ -3770,8 +3758,8 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
STableMeta* pPrevTableMeta = tscTableMetaDup(pPrevInfo->pTableMeta);
SVgroupsInfo* pVgroupsInfo = pPrevInfo->vgroupList;
- pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, &pTableMetaInfo->name, pPrevTableMeta, pVgroupsInfo, pTableMetaInfo->tagColList,
- pTableMetaInfo->pVgroupTables);
+ pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, &pTableMetaInfo->name, pPrevTableMeta, pVgroupsInfo,
+ pTableMetaInfo->tagColList, pTableMetaInfo->pVgroupTables);
}
// this case cannot be happened
@@ -4415,8 +4403,8 @@ SVgroupsInfo* tscVgroupInfoClone(SVgroupsInfo *vgroupList) {
return NULL;
}
- size_t size = sizeof(SVgroupsInfo) + sizeof(SVgroupInfo) * vgroupList->numOfVgroups;
- SVgroupsInfo* pNew = calloc(1, size);
+ size_t size = sizeof(SVgroupsInfo) + sizeof(SVgroupMsg) * vgroupList->numOfVgroups;
+ SVgroupsInfo* pNew = malloc(size);
if (pNew == NULL) {
return NULL;
}
@@ -4424,15 +4412,15 @@ SVgroupsInfo* tscVgroupInfoClone(SVgroupsInfo *vgroupList) {
pNew->numOfVgroups = vgroupList->numOfVgroups;
for(int32_t i = 0; i < vgroupList->numOfVgroups; ++i) {
- SVgroupInfo* pNewVInfo = &pNew->vgroups[i];
+ SVgroupMsg* pNewVInfo = &pNew->vgroups[i];
- SVgroupInfo* pvInfo = &vgroupList->vgroups[i];
+ SVgroupMsg* pvInfo = &vgroupList->vgroups[i];
pNewVInfo->vgId = pvInfo->vgId;
pNewVInfo->numOfEps = pvInfo->numOfEps;
for(int32_t j = 0; j < pvInfo->numOfEps; ++j) {
- pNewVInfo->epAddr[j].fqdn = strdup(pvInfo->epAddr[j].fqdn);
pNewVInfo->epAddr[j].port = pvInfo->epAddr[j].port;
+ tstrncpy(pNewVInfo->epAddr[j].fqdn, pvInfo->epAddr[j].fqdn, TSDB_FQDN_LEN);
}
}
@@ -4444,8 +4432,9 @@ void* tscVgroupInfoClear(SVgroupsInfo *vgroupList) {
return NULL;
}
+#if 0
for(int32_t i = 0; i < vgroupList->numOfVgroups; ++i) {
- SVgroupInfo* pVgroupInfo = &vgroupList->vgroups[i];
+ SVgroupMsg* pVgroupInfo = &vgroupList->vgroups[i];
for(int32_t j = 0; j < pVgroupInfo->numOfEps; ++j) {
tfree(pVgroupInfo->epAddr[j].fqdn);
@@ -4456,10 +4445,11 @@ void* tscVgroupInfoClear(SVgroupsInfo *vgroupList) {
}
}
+#endif
tfree(vgroupList);
return NULL;
}
-
+# if 0
void tscSVgroupInfoCopy(SVgroupInfo* dst, const SVgroupInfo* src) {
dst->vgId = src->vgId;
dst->numOfEps = src->numOfEps;
@@ -4472,6 +4462,8 @@ void tscSVgroupInfoCopy(SVgroupInfo* dst, const SVgroupInfo* src) {
}
}
+#endif
+
char* serializeTagData(STagData* pTagData, char* pMsg) {
int32_t n = (int32_t) strlen(pTagData->name);
*(int32_t*) pMsg = htonl(n);
@@ -4612,11 +4604,12 @@ STableMeta* tscTableMetaDup(STableMeta* pTableMeta) {
SVgroupsInfo* tscVgroupsInfoDup(SVgroupsInfo* pVgroupsInfo) {
assert(pVgroupsInfo != NULL);
- size_t size = sizeof(SVgroupInfo) * pVgroupsInfo->numOfVgroups + sizeof(SVgroupsInfo);
+ size_t size = sizeof(SVgroupMsg) * pVgroupsInfo->numOfVgroups + sizeof(SVgroupsInfo);
SVgroupsInfo* pInfo = calloc(1, size);
pInfo->numOfVgroups = pVgroupsInfo->numOfVgroups;
for (int32_t m = 0; m < pVgroupsInfo->numOfVgroups; ++m) {
- tscSVgroupInfoCopy(&pInfo->vgroups[m], &pVgroupsInfo->vgroups[m]);
+ memcpy(&pInfo->vgroups[m], &pVgroupsInfo->vgroups[m], sizeof(SVgroupMsg));
+// tscSVgroupInfoCopy(&pInfo->vgroups[m], &pVgroupsInfo->vgroups[m]);
}
return pInfo;
}
diff --git a/src/client/tests/CMakeLists.txt b/src/client/tests/CMakeLists.txt
index 24bfb44ac90e11e01ba99423aa68bd5a9511f746..5de18942acbb5b3ac59d2496728c500b63246fe9 100644
--- a/src/client/tests/CMakeLists.txt
+++ b/src/client/tests/CMakeLists.txt
@@ -17,5 +17,5 @@ IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
ADD_EXECUTABLE(cliTest ${SOURCE_LIST})
- TARGET_LINK_LIBRARIES(cliTest taos tutil common gtest pthread)
+ TARGET_LINK_LIBRARIES(cliTest taos cJson tutil common gtest pthread)
ENDIF()
diff --git a/src/client/tests/setConfigTest.cpp b/src/client/tests/setConfigTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..fb016715f6ad2f5311aa2d81b608c2043f86c4f0
--- /dev/null
+++ b/src/client/tests/setConfigTest.cpp
@@ -0,0 +1,71 @@
+#include
+#include
+
+#include "taos.h"
+#include "tglobal.h"
+#include "tconfig.h"
+
+/* test set config function */
+TEST(testCase, set_config_test1) {
+ const char *config = "{\"debugFlag\":\"131\"}";
+ setConfRet ret = taos_set_config(config);
+ ASSERT_EQ(ret.retCode, 0);
+ printf("msg:%d->%s", ret.retCode, ret.retMsg);
+
+ const char *config2 = "{\"debugFlag\":\"199\"}";
+ ret = taos_set_config(config2); // not take effect
+ ASSERT_EQ(ret.retCode, -5);
+ printf("msg:%d->%s", ret.retCode, ret.retMsg);
+
+ bool readResult = taosReadGlobalCfg(); // load file config, debugFlag not take effect
+ ASSERT_TRUE(readResult);
+ int32_t checkResult = taosCheckGlobalCfg();
+ ASSERT_EQ(checkResult, 0);
+
+ SGlobalCfg *cfg = taosGetConfigOption("debugFlag");
+ ASSERT_EQ(cfg->cfgStatus, TAOS_CFG_CSTATUS_OPTION);
+ int32_t result = *(int32_t *)cfg->ptr;
+ ASSERT_EQ(result, 131);
+}
+
+TEST(testCase, set_config_test2) {
+ const char *config = "{\"numOfCommitThreads\":\"10\"}";
+ taos_set_config(config);
+
+ bool readResult = taosReadGlobalCfg(); // load file config, debugFlag not take effect
+ ASSERT_TRUE(readResult);
+ int32_t checkResult = taosCheckGlobalCfg();
+ ASSERT_EQ(checkResult, 0);
+
+ SGlobalCfg *cfg = taosGetConfigOption("numOfCommitThreads");
+ int32_t result = *(int32_t*)cfg->ptr;
+ ASSERT_NE(result, 10); // numOfCommitThreads not type of TSDB_CFG_CTYPE_B_CLIENT
+}
+
+TEST(testCase, set_config_test3) {
+ const char *config = "{\"numOfCoitThreads\":\"10\", \"esdfa\":\"10\"}";
+ setConfRet ret = taos_set_config(config);
+ ASSERT_EQ(ret.retCode, -1);
+ printf("msg:%d->%s", ret.retCode, ret.retMsg);
+}
+
+TEST(testCase, set_config_test4) {
+ const char *config = "{null}";
+ setConfRet ret = taos_set_config(config);
+ ASSERT_EQ(ret.retCode, -4);
+ printf("msg:%d->%s", ret.retCode, ret.retMsg);
+}
+
+TEST(testCase, set_config_test5) {
+ const char *config = "\"ddd\"";
+ setConfRet ret = taos_set_config(config);
+ ASSERT_EQ(ret.retCode, -3);
+ printf("msg:%d->%s", ret.retCode, ret.retMsg);
+}
+
+TEST(testCase, set_config_test6) {
+ const char *config = "{\"numOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitThreadsnumOfCoitT3333dd\":\"10\", \"esdfa\":\"10\"}";
+ setConfRet ret = taos_set_config(config);
+ ASSERT_EQ(ret.retCode, -1);
+ printf("msg:%d->%s", ret.retCode, ret.retMsg);
+}
diff --git a/src/common/inc/texpr.h b/src/common/inc/texpr.h
index db71559df6334ed935a44f3822f78ff671e8dab2..bfeb3a6dfeee22f793c82748611c28ec537e8825 100644
--- a/src/common/inc/texpr.h
+++ b/src/common/inc/texpr.h
@@ -34,10 +34,12 @@ struct SSchema;
#define QUERY_COND_REL_PREFIX_IN "IN|"
#define QUERY_COND_REL_PREFIX_LIKE "LIKE|"
#define QUERY_COND_REL_PREFIX_MATCH "MATCH|"
+#define QUERY_COND_REL_PREFIX_NMATCH "NMATCH|"
#define QUERY_COND_REL_PREFIX_IN_LEN 3
#define QUERY_COND_REL_PREFIX_LIKE_LEN 5
#define QUERY_COND_REL_PREFIX_MATCH_LEN 6
+#define QUERY_COND_REL_PREFIX_NMATCH_LEN 7
typedef bool (*__result_filter_fn_t)(const void *, void *);
typedef void (*__do_filter_suppl_fn_t)(void *, void *);
@@ -86,7 +88,6 @@ void tExprTreeDestroy(tExprNode *pNode, void (*fp)(void *));
void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree);
tExprNode* exprTreeFromBinary(const void* data, size_t size);
-tExprNode* exprTreeFromTableName(const char* tbnameCond);
tExprNode* exprdup(tExprNode* pTree);
void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree);
diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index 360a83eea8df9392b059e73ac59075b27a96f7c3..604ce89432bcf662b319fb2ec11f55026450a2be 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -224,6 +224,8 @@ extern uint32_t maxRange;
extern uint32_t curRange;
extern char Compressor[];
#endif
+// long query
+extern int8_t tsDeadLockKillQuery;
typedef struct {
char dir[TSDB_FILENAME_LEN];
diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c
index 2c72b7bd591ab4cb2d11d1420ae97e7cc2123272..cc2bb8803badc2aae2e80200691be0439bac3afe 100644
--- a/src/common/src/texpr.c
+++ b/src/common/src/texpr.c
@@ -325,14 +325,6 @@ static void* exception_calloc(size_t nmemb, size_t size) {
return p;
}
-static void* exception_malloc(size_t size) {
- void* p = malloc(size);
- if (p == NULL) {
- THROW(TSDB_CODE_QRY_OUT_OF_MEMORY);
- }
- return p;
-}
-
static UNUSED_FUNC char* exception_strdup(const char* str) {
char* p = strdup(str);
if (p == NULL) {
@@ -395,88 +387,6 @@ tExprNode* exprTreeFromBinary(const void* data, size_t size) {
return exprTreeFromBinaryImpl(&br);
}
-tExprNode* exprTreeFromTableName(const char* tbnameCond) {
- if (!tbnameCond) {
- return NULL;
- }
-
- int32_t anchor = CLEANUP_GET_ANCHOR();
-
- tExprNode* expr = exception_calloc(1, sizeof(tExprNode));
- CLEANUP_PUSH_VOID_PTR_PTR(true, tExprTreeDestroy, expr, NULL);
-
- expr->nodeType = TSQL_NODE_EXPR;
-
- tExprNode* left = exception_calloc(1, sizeof(tExprNode));
- expr->_node.pLeft = left;
-
- left->nodeType = TSQL_NODE_COL;
- SSchema* pSchema = exception_calloc(1, sizeof(SSchema));
- left->pSchema = pSchema;
-
- *pSchema = *tGetTbnameColumnSchema();
-
- tExprNode* right = exception_calloc(1, sizeof(tExprNode));
- expr->_node.pRight = right;
-
- if (strncmp(tbnameCond, QUERY_COND_REL_PREFIX_LIKE, QUERY_COND_REL_PREFIX_LIKE_LEN) == 0) {
- right->nodeType = TSQL_NODE_VALUE;
- expr->_node.optr = TSDB_RELATION_LIKE;
- tVariant* pVal = exception_calloc(1, sizeof(tVariant));
- right->pVal = pVal;
- size_t len = strlen(tbnameCond + QUERY_COND_REL_PREFIX_LIKE_LEN) + 1;
- pVal->pz = exception_malloc(len);
- memcpy(pVal->pz, tbnameCond + QUERY_COND_REL_PREFIX_LIKE_LEN, len);
- pVal->nType = TSDB_DATA_TYPE_BINARY;
- pVal->nLen = (int32_t)len;
-
- } else if (strncmp(tbnameCond, QUERY_COND_REL_PREFIX_MATCH, QUERY_COND_REL_PREFIX_MATCH_LEN) == 0) {
- right->nodeType = TSQL_NODE_VALUE;
- expr->_node.optr = TSDB_RELATION_MATCH;
- tVariant* pVal = exception_calloc(1, sizeof(tVariant));
- right->pVal = pVal;
- size_t len = strlen(tbnameCond + QUERY_COND_REL_PREFIX_MATCH_LEN) + 1;
- pVal->pz = exception_malloc(len);
- memcpy(pVal->pz, tbnameCond + QUERY_COND_REL_PREFIX_MATCH_LEN, len);
- pVal->nType = TSDB_DATA_TYPE_BINARY;
- pVal->nLen = (int32_t)len;
-
- } else if (strncmp(tbnameCond, QUERY_COND_REL_PREFIX_IN, QUERY_COND_REL_PREFIX_IN_LEN) == 0) {
- right->nodeType = TSQL_NODE_VALUE;
- expr->_node.optr = TSDB_RELATION_IN;
- tVariant* pVal = exception_calloc(1, sizeof(tVariant));
- right->pVal = pVal;
- pVal->nType = TSDB_DATA_TYPE_POINTER_ARRAY;
- pVal->arr = taosArrayInit(2, POINTER_BYTES);
-
- const char* cond = tbnameCond + QUERY_COND_REL_PREFIX_IN_LEN;
- for (const char *e = cond; *e != 0; e++) {
- if (*e == TS_PATH_DELIMITER[0]) {
- cond = e + 1;
- } else if (*e == ',') {
- size_t len = e - cond;
- char* p = exception_malloc(len + VARSTR_HEADER_SIZE);
- STR_WITH_SIZE_TO_VARSTR(p, cond, (VarDataLenT)len);
- cond += len;
- taosArrayPush(pVal->arr, &p);
- }
- }
-
- if (*cond != 0) {
- size_t len = strlen(cond) + VARSTR_HEADER_SIZE;
-
- char* p = exception_malloc(len);
- STR_WITH_SIZE_TO_VARSTR(p, cond, (VarDataLenT)(len - VARSTR_HEADER_SIZE));
- taosArrayPush(pVal->arr, &p);
- }
-
- taosArraySortString(pVal->arr, taosArrayCompareString);
- }
-
- CLEANUP_EXECUTE_TO(anchor, false);
- return expr;
-}
-
void buildFilterSetFromBinary(void **q, const char *buf, int32_t len) {
SBufferReader br = tbufInitReader(buf, len, false);
uint32_t type = tbufReadUint32(&br);
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index 6e73227233591fa076893174b65a774f229ca4e5..339fa35bb3009db96c9c6e0cabea6b60881f05c5 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -279,6 +279,9 @@ uint32_t curRange = 100; // range
char Compressor[32] = "ZSTD_COMPRESSOR"; // ZSTD_COMPRESSOR or GZIP_COMPRESSOR
#endif
+// long query death-lock
+int8_t tsDeadLockKillQuery = 0;
+
int32_t (*monStartSystemFp)() = NULL;
void (*monStopSystemFp)() = NULL;
void (*monExecuteSQLFp)(char *sql) = NULL;
@@ -1036,6 +1039,16 @@ static void doInitGlobalConfig(void) {
cfg.unitType = TAOS_CFG_UTYPE_BYTE;
taosInitConfigOption(cfg);
+ cfg.option = "maxRegexStringLen";
+ cfg.ptr = &tsMaxRegexStringLen;
+ cfg.valType = TAOS_CFG_VTYPE_INT32;
+ cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_SHOW;
+ cfg.minValue = 0;
+ cfg.maxValue = TSDB_MAX_FIELD_LEN;
+ cfg.ptrLength = 0;
+ cfg.unitType = TAOS_CFG_UTYPE_BYTE;
+ taosInitConfigOption(cfg);
+
cfg.option = "maxNumOfOrderedRes";
cfg.ptr = &tsMaxNumOfOrderedResults;
cfg.valType = TAOS_CFG_VTYPE_INT32;
@@ -1613,7 +1626,17 @@ static void doInitGlobalConfig(void) {
cfg.unitType = TAOS_CFG_UTYPE_NONE;
taosInitConfigOption(cfg);
- assert(tsGlobalConfigNum <= TSDB_CFG_MAX_NUM);
+ // enable kill long query
+ cfg.option = "deadLockKillQuery";
+ cfg.ptr = &tsDeadLockKillQuery;
+ cfg.valType = TAOS_CFG_VTYPE_INT8;
+ cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+ cfg.minValue = 0;
+ cfg.maxValue = 1;
+ cfg.ptrLength = 1;
+ cfg.unitType = TAOS_CFG_UTYPE_NONE;
+ taosInitConfigOption(cfg);
+
#ifdef TD_TSZ
// lossy compress
cfg.option = "lossyColumns";
@@ -1667,6 +1690,9 @@ static void doInitGlobalConfig(void) {
cfg.ptrLength = 0;
cfg.unitType = TAOS_CFG_UTYPE_NONE;
taosInitConfigOption(cfg);
+ assert(tsGlobalConfigNum == TSDB_CFG_MAX_NUM);
+#else
+ assert(tsGlobalConfigNum == TSDB_CFG_MAX_NUM - 5);
#endif
}
diff --git a/src/connector/jdbc/CMakeLists.txt b/src/connector/jdbc/CMakeLists.txt
index e432dac1cea593b371a173f334e5313236091ab3..1e5cede714820f29defe3c6b458b2daf467bc4d2 100644
--- a/src/connector/jdbc/CMakeLists.txt
+++ b/src/connector/jdbc/CMakeLists.txt
@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
POST_BUILD
COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.34-dist.jar ${LIBRARY_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.35-dist.jar ${LIBRARY_OUTPUT_PATH}
COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
COMMENT "build jdbc driver")
ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})
diff --git a/src/connector/jdbc/deploy-pom.xml b/src/connector/jdbc/deploy-pom.xml
index ef57198e78d2268faba526d5506b0dc384f5766f..7caf46848d18c4491cdea1ab50df31d8d2d26daf 100755
--- a/src/connector/jdbc/deploy-pom.xml
+++ b/src/connector/jdbc/deploy-pom.xml
@@ -5,7 +5,7 @@
com.taosdata.jdbctaos-jdbcdriver
- 2.0.34
+ 2.0.35jarJDBCDriver
diff --git a/src/connector/jdbc/pom.xml b/src/connector/jdbc/pom.xml
index 6b9fc9d96ce16700ee1243ef7c148a423a965d0b..810a85f8a33b3f244dab81e349b9df786ec50c21 100644
--- a/src/connector/jdbc/pom.xml
+++ b/src/connector/jdbc/pom.xml
@@ -3,7 +3,7 @@
4.0.0com.taosdata.jdbctaos-jdbcdriver
- 2.0.34
+ 2.0.35jarJDBCDriverhttps://github.com/taosdata/TDengine/tree/master/src/connector/jdbc
@@ -113,6 +113,7 @@
**/AppMemoryLeakTest.java
+ **/JDBCTypeAndTypeCompareTest.java**/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java**/DatetimeBefore1970Test.java**/FailOverTest.java
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
index 521a88b128ff930510bf00cdcb6a12cbc3211742..307451e014c59c1c3419f1a9daff4f89e8b90d46 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
@@ -118,9 +118,6 @@ public class TSDBDriver extends AbstractDriver {
}
public Connection connect(String url, Properties info) throws SQLException {
- if (url == null)
- throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_URL_NOT_SET);
-
if (!acceptsURL(url))
return null;
@@ -135,8 +132,7 @@ public class TSDBDriver extends AbstractDriver {
throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PASSWORD_IS_REQUIRED);
try {
- TSDBJNIConnector.init((String) props.get(PROPERTY_KEY_CONFIG_DIR), (String) props.get(PROPERTY_KEY_LOCALE),
- (String) props.get(PROPERTY_KEY_CHARSET), (String) props.get(PROPERTY_KEY_TIME_ZONE));
+ TSDBJNIConnector.init(props);
return new TSDBConnection(props, this.dbMetaData);
} catch (SQLWarning sqlWarning) {
sqlWarning.printStackTrace();
@@ -205,6 +201,7 @@ public class TSDBDriver extends AbstractDriver {
String dbProductName = url.substring(0, beginningOfSlashes);
dbProductName = dbProductName.substring(dbProductName.indexOf(":") + 1);
dbProductName = dbProductName.substring(0, dbProductName.indexOf(":"));
+ urlProps.setProperty(TSDBDriver.PROPERTY_KEY_PRODUCT_NAME, dbProductName);
// parse database name
url = url.substring(beginningOfSlashes + 2);
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
index bdb3ea410005cadd865de1d9e080dd5b9f20834f..0970148b1dfb6c6c1fb85330e312bf2c8168b3c7 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
@@ -35,6 +35,7 @@ public class TSDBError {
TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNKNOWN_TIMESTAMP_PRECISION, "unknown timestamp precision");
TSDBErrorMap.put(TSDBErrorNumbers.ERROR_USER_IS_REQUIRED, "user is required");
TSDBErrorMap.put(TSDBErrorNumbers.ERROR_PASSWORD_IS_REQUIRED, "password is required");
+ TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_JSON_FORMAT, "invalid json format");
TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNKNOWN, "unknown error");
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
index 2207db6f9379595e68b8ed00ea8f7298ca3b45ad..0f4427fa20e272917df0327552efd1a80cd56b4d 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
@@ -31,6 +31,7 @@ public class TSDBErrorNumbers {
public static final int ERROR_RESTFul_Client_IOException = 0x2318;
public static final int ERROR_USER_IS_REQUIRED = 0x2319; // user is required
public static final int ERROR_PASSWORD_IS_REQUIRED = 0x231a; // password is required
+ public static final int ERROR_INVALID_JSON_FORMAT = 0x231b;
public static final int ERROR_UNKNOWN = 0x2350; //unknown error
@@ -72,6 +73,7 @@ public class TSDBErrorNumbers {
errorNumbers.add(ERROR_RESTFul_Client_IOException);
errorNumbers.add(ERROR_USER_IS_REQUIRED);
errorNumbers.add(ERROR_PASSWORD_IS_REQUIRED);
+ errorNumbers.add(ERROR_INVALID_JSON_FORMAT);
errorNumbers.add(ERROR_RESTFul_Client_Protocol_Exception);
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBException.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBException.java
new file mode 100644
index 0000000000000000000000000000000000000000..31299a1c6f37a8b75521a65e7de09f5162558dd6
--- /dev/null
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBException.java
@@ -0,0 +1,22 @@
+package com.taosdata.jdbc;
+
+public class TSDBException {
+ private int code;
+ private String message;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
index 4a9e80ba53b096f057840eab67e61418332dbf81..aaada2e78ec284f4019b29465a38db109cf9d80a 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@@ -16,18 +16,21 @@
*/
package com.taosdata.jdbc;
+import com.alibaba.fastjson.JSONObject;
import com.taosdata.jdbc.utils.TaosInfo;
import java.nio.ByteBuffer;
import java.sql.SQLException;
import java.sql.SQLWarning;
import java.util.List;
+import java.util.Properties;
/**
* JNI connector
*/
public class TSDBJNIConnector {
- private static volatile Boolean isInitialized = false;
+ private static final Object LOCK = new Object();
+ private static volatile boolean isInitialized;
private final TaosInfo taosInfo = TaosInfo.getInstance();
private long taos = TSDBConstants.JNI_NULL_POINTER; // Connection pointer used in C
@@ -38,24 +41,27 @@ public class TSDBJNIConnector {
System.loadLibrary("taos");
}
- public boolean isClosed() {
- return this.taos == TSDBConstants.JNI_NULL_POINTER;
- }
+ public static void init(Properties props) throws SQLWarning {
+ synchronized (LOCK) {
+ if (!isInitialized) {
- public boolean isResultsetClosed() {
- return this.isResultsetClosed;
- }
+ JSONObject configJSON = new JSONObject();
+ for (String key : props.stringPropertyNames()) {
+ configJSON.put(key, props.getProperty(key));
+ }
+ setConfigImp(configJSON.toJSONString());
- public static void init(String configDir, String locale, String charset, String timezone) throws SQLWarning {
- synchronized (isInitialized) {
- if (!isInitialized) {
- initImp(configDir);
+ initImp(props.getProperty(TSDBDriver.PROPERTY_KEY_CONFIG_DIR, null));
+
+ String locale = props.getProperty(TSDBDriver.PROPERTY_KEY_LOCALE);
if (setOptions(0, locale) < 0) {
throw TSDBError.createSQLWarning("Failed to set locale: " + locale + ". System default will be used.");
}
+ String charset = props.getProperty(TSDBDriver.PROPERTY_KEY_CHARSET);
if (setOptions(1, charset) < 0) {
throw TSDBError.createSQLWarning("Failed to set charset: " + charset + ". System default will be used.");
}
+ String timezone = props.getProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE);
if (setOptions(2, timezone) < 0) {
throw TSDBError.createSQLWarning("Failed to set timezone: " + timezone + ". System default will be used.");
}
@@ -65,11 +71,13 @@ public class TSDBJNIConnector {
}
}
- public static native void initImp(String configDir);
+ private static native void initImp(String configDir);
+
+ private static native int setOptions(int optionIndex, String optionValue);
- public static native int setOptions(int optionIndex, String optionValue);
+ private static native String getTsCharset();
- public static native String getTsCharset();
+ private static native TSDBException setConfigImp(String config);
public boolean connect(String host, int port, String dbName, String user, String password) throws SQLException {
if (this.taos != TSDBConstants.JNI_NULL_POINTER) {
@@ -159,6 +167,14 @@ public class TSDBJNIConnector {
private native long isUpdateQueryImp(long connection, long pSql);
+ public boolean isClosed() {
+ return this.taos == TSDBConstants.JNI_NULL_POINTER;
+ }
+
+ public boolean isResultsetClosed() {
+ return this.isResultsetClosed;
+ }
+
/**
* Free result set operation from C to release result set pointer by JNI
*/
@@ -351,4 +367,6 @@ public class TSDBJNIConnector {
}
private native int insertLinesImp(String[] lines, long conn);
+
+
}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SetConfigurationInJNITest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SetConfigurationInJNITest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6a983cd5bdd6d886dcac01f6085c70eade4f7cf5
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SetConfigurationInJNITest.java
@@ -0,0 +1,249 @@
+package com.taosdata.jdbc;
+
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+
+public class SetConfigurationInJNITest {
+
+ private String host = "127.0.0.1";
+ private String dbname = "test_set_config";
+
+ @Test
+ public void setConfigInUrl() {
+ try {
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata&debugFlag=143&rpcTimer=500");
+ Statement stmt = conn.createStatement();
+
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void setConfigInProperties() {
+ try {
+ Properties props = new Properties();
+ props.setProperty("debugFlag", "143");
+ props.setProperty("r pcTimer", "500");
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", props);
+
+ Statement stmt = conn.createStatement();
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ //test case1:set debugFlag=135
+ //expect:debugFlag:135
+ //result:pass
+ public void setConfigfordebugFlag() {
+ try {
+ Properties props = new Properties();
+ //set debugFlag=135
+ props.setProperty("debugFlag", "135");
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", props);
+
+ Statement stmt = conn.createStatement();
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ @Test
+ //test case2:set debugFlag=abc (wrong type)
+ //expect:debugFlag:135
+ //result:pass
+ public void setConfigforwrongtype() {
+ try {
+ Properties props = new Properties();
+ //set debugFlag=135
+ props.setProperty("debugFlag", "abc");
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", props);
+
+ Statement stmt = conn.createStatement();
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ @Test
+ //test case3:set rpcTimer=0 (smaller than the boundary conditions)
+ //expect:rpcTimer:300
+ //result:pass
+ public void setConfigrpcTimer() {
+ try {
+ Properties props = new Properties();
+ //set rpcTimer=0
+ props.setProperty("rpcTimer", "0");
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", props);
+
+ Statement stmt = conn.createStatement();
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ @Test
+ //test case4:set rpcMaxTime=10000 (bigger than the boundary conditions)
+ //expect:rpcMaxTime:600
+ //result:pass
+ public void setConfigforrpcMaxTime() {
+ try {
+ Properties props = new Properties();
+ //set rpcMaxTime=10000
+ props.setProperty("rpcMaxTime", "10000");
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", props);
+
+ Statement stmt = conn.createStatement();
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ @Test
+ //test case5:set numOfThreadsPerCore=aaa (wrong type)
+ //expect:numOfThreadsPerCore:1.0
+ //result:pass
+ public void setConfigfornumOfThreadsPerCore() {
+ try {
+ Properties props = new Properties();
+ //set numOfThreadsPerCore=aaa
+ props.setProperty("numOfThreadsPerCore", "aaa");
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", props);
+
+ Statement stmt = conn.createStatement();
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ @Test
+ //test case6:set numOfThreadsPerCore=100000 (bigger than the boundary conditions)
+ //expect:numOfThreadsPerCore:1.0
+ //result:pass
+ public void setConfignumOfThreadsPerCore() {
+ try {
+ Properties props = new Properties();
+ //set numOfThreadsPerCore=100000
+ props.setProperty("numOfThreadsPerCore", "100000");
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", props);
+
+ Statement stmt = conn.createStatement();
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ @Test
+ // test case7:set both true and wrong config(debugFlag=0,rpcDebugFlag=143,cDebugFlag=143,rpcTimer=100000)
+ // expect:rpcDebugFlag:143,cDebugFlag:143,rpcTimer:300
+ // result:pass
+ public void setConfigformaxTmrCtrl() {
+ try {
+ Properties props = new Properties();
+ props.setProperty("debugFlag", "0");
+ props.setProperty("rpcDebugFlag", "143");
+ props.setProperty("cDebugFlag", "143");
+ props.setProperty("rpcTimer", "100000");
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", props);
+
+ Statement stmt = conn.createStatement();
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ @Test
+ //test case 8:use url to set with wrong type(debugFlag=abc,rpcTimer=abc)
+ //expect:default value
+ //result:pass
+ public void setConfigInUrlwithwrongtype() {
+ try {
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata&debugFlag=abc&rpcTimer=abc");
+ Statement stmt = conn.createStatement();
+
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
+ stmt.execute("drop database if exists " + dbname);
+
+ stmt.close();
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java
index 88ff5d3a811e17aaabbeb0a451fbff010307ab6d..8be6ae6b1c566abcd7ec398e7df3f5308e29e1b1 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java
@@ -5,9 +5,9 @@ import org.junit.Test;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.sql.SQLException;
-import java.sql.SQLWarning;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -19,25 +19,25 @@ public class TSDBJNIConnectorTest {
@Test
public void test() {
try {
-
try {
//change sleepSeconds when debugging with attach to process to find PID
int sleepSeconds = -1;
- if (sleepSeconds>0) {
+ if (sleepSeconds > 0) {
RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean();
String jvmName = runtimeBean.getName();
long pid = Long.valueOf(jvmName.split("@")[0]);
System.out.println("JVM PID = " + pid);
- Thread.sleep(sleepSeconds*1000);
+ Thread.sleep(sleepSeconds * 1000);
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
// init
- TSDBJNIConnector.init("/etc/taos", null, null, null);
+ Properties properties = new Properties();
+ properties.setProperty(TSDBDriver.PROPERTY_KEY_CONFIG_DIR, "/etc/taos");
+ TSDBJNIConnector.init(properties);
// connect
TSDBJNIConnector connector = new TSDBJNIConnector();
@@ -45,12 +45,12 @@ public class TSDBJNIConnectorTest {
// setup
String setupSqlStrs[] = {"create database if not exists d precision \"us\"",
- "create table if not exists d.t(ts timestamp, f int)",
- "create database if not exists d2",
- "create table if not exists d2.t2(ts timestamp, f int)",
- "insert into d.t values(now+100s, 100)",
- "insert into d2.t2 values(now+200s, 200)"
- };
+ "create table if not exists d.t(ts timestamp, f int)",
+ "create database if not exists d2",
+ "create table if not exists d2.t2(ts timestamp, f int)",
+ "insert into d.t values(now+100s, 100)",
+ "insert into d2.t2 values(now+200s, 200)"
+ };
for (String setupSqlStr : setupSqlStrs) {
long setupSql = connector.executeQuery(setupSqlStr);
@@ -115,15 +115,13 @@ public class TSDBJNIConnectorTest {
}
// close statement
connector.executeQuery("use d");
- String[] lines = new String[] {"st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns",
- "st,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns"};
+ String[] lines = new String[]{"st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns",
+ "st,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns"};
connector.insertLines(lines);
// close connection
connector.closeConnection();
- } catch (SQLWarning throwables) {
- throwables.printStackTrace();
} catch (SQLException e) {
e.printStackTrace();
}
@@ -140,11 +138,7 @@ public class TSDBJNIConnectorTest {
throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_RESULT_SET_NULL);
} else if (code == TSDBConstants.JNI_NUM_OF_FIELDS_0) {
throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_NUM_OF_FIELDS_0);
- } else if (code == TSDBConstants.JNI_FETCH_END) {
- return false;
- } else {
- return true;
- }
+ } else return code != TSDBConstants.JNI_FETCH_END;
}
}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/JDBCTypeAndTypeCompareTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/JDBCTypeAndTypeCompareTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..eb3b2985dfaff1b956909a50ca23470279cb48ca
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/JDBCTypeAndTypeCompareTest.java
@@ -0,0 +1,34 @@
+package com.taosdata.jdbc.cases;
+
+import org.junit.Test;
+
+import java.sql.*;
+
+public class JDBCTypeAndTypeCompareTest {
+
+ @Test
+ public void test() throws SQLException {
+ Connection conn = DriverManager.getConnection("jdbc:TAOS://192.168.17.156:6030/", "root", "taosdata");
+ Statement stmt = conn.createStatement();
+
+ stmt.execute("drop database if exists test");
+ stmt.execute("create database if not exists test");
+ stmt.execute("use test");
+ stmt.execute("create table weather(ts timestamp, f1 int, f2 bigint, f3 float, f4 double, f5 smallint, f6 tinyint, f7 bool, f8 binary(10), f9 nchar(10) )");
+ stmt.execute("insert into weather values(now, 1, 2, 3.0, 4.0, 5, 6, true, 'test','test')");
+
+ ResultSet rs = stmt.executeQuery("select * from weather");
+ ResultSetMetaData meta = rs.getMetaData();
+ while (rs.next()) {
+ for (int i = 1; i <= meta.getColumnCount(); i++) {
+ String columnName = meta.getColumnName(i);
+ String columnTypeName = meta.getColumnTypeName(i);
+ Object value = rs.getObject(i);
+ System.out.printf("columnName : %s, columnTypeName: %s, JDBCType: %s\n", columnName, columnTypeName, value.getClass().getName());
+ }
+ }
+
+ stmt.close();
+ conn.close();
+ }
+}
diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py
index aad9d1fdbfd4f900fe2db96dadbf343ea922be22..c5737ea5a07b7678e058307dfe3b47546dd99909 100644
--- a/src/connector/python/taos/cinterface.py
+++ b/src/connector/python/taos/cinterface.py
@@ -835,8 +835,14 @@ def taos_insert_telnet_lines(connection, lines):
p_lines = lines_type(*lines)
errno = _libtaos.taos_insert_telnet_lines(connection, p_lines, num_of_lines)
if errno != 0:
- raise LinesError("insert telnet lines error", errno)
+ raise TelnetLinesError("insert telnet lines error", errno)
+def taos_insert_json_payload(connection, payload):
+ # type: (c_void_p, list[str] | tuple(str)) -> None
+ payload = payload.encode("utf-8")
+ errno = _libtaos.taos_insert_json_payload(connection, payload)
+ if errno != 0:
+ raise JsonPayloadError("insert json payload error", errno)
class CTaosInterface(object):
def __init__(self, config=None):
diff --git a/src/connector/python/taos/connection.py b/src/connector/python/taos/connection.py
index a8a71ecc3a8a5f2bdc960df364213e80018a70fe..35aca1fb26c1e612c3b3f6b1d8c794495bed0035 100644
--- a/src/connector/python/taos/connection.py
+++ b/src/connector/python/taos/connection.py
@@ -154,6 +154,25 @@ class TaosConnection(object):
"""
return taos_insert_telnet_lines(self._conn, lines)
+ def insert_json_payload(self, payload):
+ """OpenTSDB HTTP JSON format support
+
+ ## Example
+ "{
+ "metric": "cpu_load_0",
+ "timestamp": 1626006833610123,
+ "value": 55.5,
+ "tags":
+ {
+ "host": "ubuntu",
+ "interface": "eth0",
+ "Id": "tb0"
+ }
+ }"
+
+ """
+ return taos_insert_json_payload(self._conn, payload)
+
def cursor(self):
# type: () -> TaosCursor
"""Return a new Cursor object using the connection."""
diff --git a/src/connector/python/taos/error.py b/src/connector/python/taos/error.py
index a30adbb162f1c194bdfcf4cca5c43f01107a9776..f6a9d41f56a3fb071080daaae3bdd840190b154d 100644
--- a/src/connector/python/taos/error.py
+++ b/src/connector/python/taos/error.py
@@ -83,4 +83,14 @@ class ResultError(DatabaseError):
class LinesError(DatabaseError):
"""taos_insert_lines errors."""
- pass
\ No newline at end of file
+ pass
+
+class TelnetLinesError(DatabaseError):
+ """taos_insert_telnet_lines errors."""
+
+ pass
+
+class JsonPayloadError(DatabaseError):
+ """taos_insert_json_payload errors."""
+
+ pass
diff --git a/src/connector/python/taos/field.py b/src/connector/python/taos/field.py
index 445cd8afdba6f2512c73be95c9b0dbd8dc00da8a..b0bec58b932f2136b868739bb28fca04de759e3f 100644
--- a/src/connector/python/taos/field.py
+++ b/src/connector/python/taos/field.py
@@ -165,12 +165,14 @@ def _crow_binary_to_python_block(data, num_of_rows, nbytes=None, precision=Field
assert nbytes is not None
res = []
for i in range(abs(num_of_rows)):
- try:
- rbyte = ctypes.cast(data + nbytes * i, ctypes.POINTER(ctypes.c_short))[:1].pop()
- tmpstr = ctypes.c_char_p(data + nbytes * i + 2)
- res.append(tmpstr.value.decode()[0:rbyte])
- except ValueError:
+ rbyte = ctypes.cast(data + nbytes * i, ctypes.POINTER(ctypes.c_short))[:1].pop()
+ chars = ctypes.cast(c_char_p(data + nbytes * i + 2), ctypes.POINTER(c_char * rbyte))
+ buffer = create_string_buffer(rbyte + 1)
+ buffer[:rbyte] = chars[0][:rbyte]
+ if rbyte == 1 and buffer[0] == b'\xff':
res.append(None)
+ else:
+ res.append(cast(buffer, c_char_p).value.decode())
return res
@@ -179,11 +181,14 @@ def _crow_nchar_to_python_block(data, num_of_rows, nbytes=None, precision=FieldT
assert nbytes is not None
res = []
for i in range(abs(num_of_rows)):
- try:
- tmpstr = ctypes.c_char_p(data + nbytes * i + 2)
- res.append(tmpstr.value.decode())
- except ValueError:
+ rbyte = ctypes.cast(data + nbytes * i, ctypes.POINTER(ctypes.c_short))[:1].pop()
+ chars = ctypes.cast(c_char_p(data + nbytes * i + 2), ctypes.POINTER(c_char * rbyte))
+ buffer = create_string_buffer(rbyte + 1)
+ buffer[:rbyte] = chars[0][:rbyte]
+ if rbyte == 4 and buffer[:4] == b'\xff'*4:
res.append(None)
+ else:
+ res.append(cast(buffer, c_char_p).value.decode())
return res
diff --git a/src/inc/query.h b/src/inc/query.h
index fb9cbff8584892b4a6bc6e4a6ce046a7500aef39..0872e3dbaa517ded77dd758b30e69f273c13a580 100644
--- a/src/inc/query.h
+++ b/src/inc/query.h
@@ -76,6 +76,11 @@ void* qGetResultRetrieveMsg(qinfo_t qinfo);
*/
int32_t qKillQuery(qinfo_t qinfo);
+//kill by qid
+int32_t qKillQueryByQId(void* pMgmt, int64_t qId, int32_t waitMs, int32_t waitCount);
+
+bool qSolveCommitNoBlock(void* pRepo, void* pMgmt);
+
int32_t qQueryCompleted(qinfo_t qinfo);
/**
diff --git a/src/inc/taos.h b/src/inc/taos.h
index a71e4bf50c600a8c9963e616c5e79cbfbe164556..be5123797069696ffad817c0db7bc2c8c03e9606 100644
--- a/src/inc/taos.h
+++ b/src/inc/taos.h
@@ -62,6 +62,22 @@ typedef struct taosField {
int16_t bytes;
} TAOS_FIELD;
+typedef enum {
+ SET_CONF_RET_SUCC = 0,
+ SET_CONF_RET_ERR_PART = -1,
+ SET_CONF_RET_ERR_INNER = -2,
+ SET_CONF_RET_ERR_JSON_INVALID = -3,
+ SET_CONF_RET_ERR_JSON_PARSE = -4,
+ SET_CONF_RET_ERR_ONLY_ONCE = -5,
+ SET_CONF_RET_ERR_TOO_LONG = -6
+} SET_CONF_RET_CODE;
+
+#define RET_MSG_LENGTH 1024
+typedef struct setConfRet {
+ SET_CONF_RET_CODE retCode;
+ char retMsg[RET_MSG_LENGTH];
+} setConfRet;
+
#ifdef _TD_GO_DLL_
#define DLL_EXPORT __declspec(dllexport)
#else
@@ -71,6 +87,7 @@ typedef struct taosField {
DLL_EXPORT int taos_init();
DLL_EXPORT void taos_cleanup(void);
DLL_EXPORT int taos_options(TSDB_OPTION option, const void *arg, ...);
+DLL_EXPORT setConfRet taos_set_config(const char *config);
DLL_EXPORT TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port);
DLL_EXPORT TAOS *taos_connect_auth(const char *ip, const char *user, const char *auth, const char *db, uint16_t port);
DLL_EXPORT void taos_close(TAOS *taos);
@@ -174,6 +191,8 @@ DLL_EXPORT int taos_insert_lines(TAOS* taos, char* lines[], int numLines);
DLL_EXPORT int taos_insert_telnet_lines(TAOS* taos, char* lines[], int numLines);
+DLL_EXPORT int taos_insert_json_payload(TAOS* taos, char* payload);
+
#ifdef __cplusplus
}
#endif
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index b4d60aeba5b45b84835c7a6e345c8594ee221a03..d80caad88db865d83986e4c19d95603eadde9884 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -84,6 +84,8 @@ extern const int32_t TYPE_BYTES[15];
#define TSDB_DEFAULT_PASS "powerdb"
#elif (_TD_TQ_ == true)
#define TSDB_DEFAULT_PASS "tqueue"
+#elif (_TD_PRO_ == true)
+#define TSDB_DEFAULT_PASS "prodb"
#else
#define TSDB_DEFAULT_PASS "taosdata"
#endif
@@ -165,6 +167,7 @@ do { \
#define TSDB_RELATION_NOT 13
#define TSDB_RELATION_MATCH 14
+#define TSDB_RELATION_NMATCH 15
#define TSDB_BINARY_OP_ADD 30
#define TSDB_BINARY_OP_SUBTRACT 31
diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 882aca2b5259385c6c7f308d1764f8da9bea80e9..d59b88c7e698b3e965b5923efdc760e0289f7250 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -35,6 +35,7 @@ int32_t* taosGetErrno();
#define terrno (*taosGetErrno())
#define TSDB_CODE_SUCCESS 0
+#define TSDB_CODE_FAILED -1 // unknown or needn't tell detail error
// rpc
#define TSDB_CODE_RPC_ACTION_IN_PROGRESS TAOS_DEF_ERROR_CODE(0, 0x0001) //"Action in progress")
@@ -107,6 +108,9 @@ int32_t* taosGetErrno();
#define TSDB_CODE_TSC_INVALID_TAG_LENGTH TAOS_DEF_ERROR_CODE(0, 0x021E) //"Invalid tag length")
#define TSDB_CODE_TSC_INVALID_COLUMN_LENGTH TAOS_DEF_ERROR_CODE(0, 0x021F) //"Invalid column length")
#define TSDB_CODE_TSC_DUP_TAG_NAMES TAOS_DEF_ERROR_CODE(0, 0x0220) //"duplicated tag names")
+#define TSDB_CODE_TSC_INVALID_JSON TAOS_DEF_ERROR_CODE(0, 0x0221) //"Invalid JSON format")
+#define TSDB_CODE_TSC_INVALID_JSON_TYPE TAOS_DEF_ERROR_CODE(0, 0x0222) //"Invalid JSON data type")
+#define TSDB_CODE_TSC_VALUE_OUT_OF_RANGE TAOS_DEF_ERROR_CODE(0, 0x0223) //"Value out of range")
// mnode
#define TSDB_CODE_MND_MSG_NOT_PROCESSED TAOS_DEF_ERROR_CODE(0, 0x0300) //"Message not processed")
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 8f5269c158bd4a733d08b727ed0b3e3741821b25..c3c8625fec3290e2d39d64f53a173b43cf21d7e3 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -492,7 +492,6 @@ typedef struct {
SSessionWindow sw; // session window
uint16_t tagCondLen; // tag length in current query
uint16_t colCondLen; // column length in current query
- uint32_t tbnameCondLen; // table name filter condition string length
int16_t numOfGroupCols; // num of group by columns
int16_t orderByIdx;
int16_t orderType; // used in group by xx order by xxx
@@ -502,7 +501,6 @@ typedef struct {
int64_t offset;
uint32_t queryType; // denote another query process
int16_t numOfOutput; // final output columns numbers
- int16_t tagNameRelType; // relation of tag criteria and tbname criteria
int16_t fillType; // interpolate type
uint64_t fillVal; // default value array list
int32_t secondStageOutput;
@@ -766,27 +764,16 @@ typedef struct SSTableVgroupMsg {
int32_t numOfTables;
} SSTableVgroupMsg, SSTableVgroupRspMsg;
-typedef struct {
- int32_t vgId;
- int8_t numOfEps;
- SEpAddr1 epAddr[TSDB_MAX_REPLICA];
-} SVgroupInfo;
-
typedef struct {
int32_t vgId;
int8_t numOfEps;
SEpAddrMsg epAddr[TSDB_MAX_REPLICA];
} SVgroupMsg;
-typedef struct {
- int32_t numOfVgroups;
- SVgroupInfo vgroups[];
-} SVgroupsInfo;
-
typedef struct {
int32_t numOfVgroups;
SVgroupMsg vgroups[];
-} SVgroupsMsg;
+} SVgroupsMsg, SVgroupsInfo;
typedef struct STableMetaMsg {
int32_t contLen;
diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index 7abe3e99c720af1682fc103beec9a5d4caeb09eb..4e11e4f2478fe0616701e0d183d38455b9526514 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -39,6 +39,7 @@ extern "C" {
#define TSDB_STATUS_COMMIT_START 1
#define TSDB_STATUS_COMMIT_OVER 2
+#define TSDB_STATUS_COMMIT_NOBLOCK 3 //commit no block, need to be solved
// TSDB STATE DEFINITION
#define TSDB_STATE_OK 0x0
@@ -351,8 +352,7 @@ SArray *tsdbRetrieveDataBlock(TsdbQueryHandleT *pQueryHandle, SArray *pColumnIdL
* @param pTagCond. tag query condition
*/
int32_t tsdbQuerySTableByTagCond(STsdbRepo *tsdb, uint64_t uid, TSKEY key, const char *pTagCond, size_t len,
- int16_t tagNameRelType, const char *tbnameCond, STableGroupInfo *pGroupList,
- SColIndex *pColIndex, int32_t numOfCols);
+ STableGroupInfo *pGroupList, SColIndex *pColIndex, int32_t numOfCols);
/**
* destroy the created table group list, which is generated by tag query
@@ -413,6 +413,11 @@ int tsdbSyncRecv(void *pRepo, SOCKET socketFd);
// For TSDB Compact
int tsdbCompact(STsdbRepo *pRepo);
+// For TSDB Health Monitor
+
+// no problem return true
+bool tsdbNoProblem(STsdbRepo* pRepo);
+
#ifdef __cplusplus
}
#endif
diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h
index 501c7a4c699c94091c4c83b2d8e8c41afcfc8ab7..9b0ad2cf13b6df01bda56906891a4de677ff08a3 100644
--- a/src/inc/ttokendef.h
+++ b/src/inc/ttokendef.h
@@ -38,179 +38,180 @@
#define TK_IS 20
#define TK_LIKE 21
#define TK_MATCH 22
-#define TK_GLOB 23
-#define TK_BETWEEN 24
-#define TK_IN 25
-#define TK_GT 26
-#define TK_GE 27
-#define TK_LT 28
-#define TK_LE 29
-#define TK_BITAND 30
-#define TK_BITOR 31
-#define TK_LSHIFT 32
-#define TK_RSHIFT 33
-#define TK_PLUS 34
-#define TK_MINUS 35
-#define TK_DIVIDE 36
-#define TK_TIMES 37
-#define TK_STAR 38
-#define TK_SLASH 39
-#define TK_REM 40
-#define TK_CONCAT 41
-#define TK_UMINUS 42
-#define TK_UPLUS 43
-#define TK_BITNOT 44
-#define TK_SHOW 45
-#define TK_DATABASES 46
-#define TK_TOPICS 47
-#define TK_FUNCTIONS 48
-#define TK_MNODES 49
-#define TK_DNODES 50
-#define TK_ACCOUNTS 51
-#define TK_USERS 52
-#define TK_MODULES 53
-#define TK_QUERIES 54
-#define TK_CONNECTIONS 55
-#define TK_STREAMS 56
-#define TK_VARIABLES 57
-#define TK_SCORES 58
-#define TK_GRANTS 59
-#define TK_VNODES 60
-#define TK_DOT 61
-#define TK_CREATE 62
-#define TK_TABLE 63
-#define TK_STABLE 64
-#define TK_DATABASE 65
-#define TK_TABLES 66
-#define TK_STABLES 67
-#define TK_VGROUPS 68
-#define TK_DROP 69
-#define TK_TOPIC 70
-#define TK_FUNCTION 71
-#define TK_DNODE 72
-#define TK_USER 73
-#define TK_ACCOUNT 74
-#define TK_USE 75
-#define TK_DESCRIBE 76
-#define TK_DESC 77
-#define TK_ALTER 78
-#define TK_PASS 79
-#define TK_PRIVILEGE 80
-#define TK_LOCAL 81
-#define TK_COMPACT 82
-#define TK_LP 83
-#define TK_RP 84
-#define TK_IF 85
-#define TK_EXISTS 86
-#define TK_AS 87
-#define TK_OUTPUTTYPE 88
-#define TK_AGGREGATE 89
-#define TK_BUFSIZE 90
-#define TK_PPS 91
-#define TK_TSERIES 92
-#define TK_DBS 93
-#define TK_STORAGE 94
-#define TK_QTIME 95
-#define TK_CONNS 96
-#define TK_STATE 97
-#define TK_COMMA 98
-#define TK_KEEP 99
-#define TK_CACHE 100
-#define TK_REPLICA 101
-#define TK_QUORUM 102
-#define TK_DAYS 103
-#define TK_MINROWS 104
-#define TK_MAXROWS 105
-#define TK_BLOCKS 106
-#define TK_CTIME 107
-#define TK_WAL 108
-#define TK_FSYNC 109
-#define TK_COMP 110
-#define TK_PRECISION 111
-#define TK_UPDATE 112
-#define TK_CACHELAST 113
-#define TK_PARTITIONS 114
-#define TK_UNSIGNED 115
-#define TK_TAGS 116
-#define TK_USING 117
-#define TK_NULL 118
-#define TK_NOW 119
-#define TK_SELECT 120
-#define TK_UNION 121
-#define TK_ALL 122
-#define TK_DISTINCT 123
-#define TK_FROM 124
-#define TK_VARIABLE 125
-#define TK_INTERVAL 126
-#define TK_EVERY 127
-#define TK_SESSION 128
-#define TK_STATE_WINDOW 129
-#define TK_FILL 130
-#define TK_SLIDING 131
-#define TK_ORDER 132
-#define TK_BY 133
-#define TK_ASC 134
-#define TK_GROUP 135
-#define TK_HAVING 136
-#define TK_LIMIT 137
-#define TK_OFFSET 138
-#define TK_SLIMIT 139
-#define TK_SOFFSET 140
-#define TK_WHERE 141
-#define TK_RESET 142
-#define TK_QUERY 143
-#define TK_SYNCDB 144
-#define TK_ADD 145
-#define TK_COLUMN 146
-#define TK_MODIFY 147
-#define TK_TAG 148
-#define TK_CHANGE 149
-#define TK_SET 150
-#define TK_KILL 151
-#define TK_CONNECTION 152
-#define TK_STREAM 153
-#define TK_COLON 154
-#define TK_ABORT 155
-#define TK_AFTER 156
-#define TK_ATTACH 157
-#define TK_BEFORE 158
-#define TK_BEGIN 159
-#define TK_CASCADE 160
-#define TK_CLUSTER 161
-#define TK_CONFLICT 162
-#define TK_COPY 163
-#define TK_DEFERRED 164
-#define TK_DELIMITERS 165
-#define TK_DETACH 166
-#define TK_EACH 167
-#define TK_END 168
-#define TK_EXPLAIN 169
-#define TK_FAIL 170
-#define TK_FOR 171
-#define TK_IGNORE 172
-#define TK_IMMEDIATE 173
-#define TK_INITIALLY 174
-#define TK_INSTEAD 175
-#define TK_KEY 176
-#define TK_OF 177
-#define TK_RAISE 178
-#define TK_REPLACE 179
-#define TK_RESTRICT 180
-#define TK_ROW 181
-#define TK_STATEMENT 182
-#define TK_TRIGGER 183
-#define TK_VIEW 184
-#define TK_IPTOKEN 185
-#define TK_SEMI 186
-#define TK_NONE 187
-#define TK_PREV 188
-#define TK_LINEAR 189
-#define TK_IMPORT 190
-#define TK_TBNAME 191
-#define TK_JOIN 192
-#define TK_INSERT 193
-#define TK_INTO 194
-#define TK_VALUES 195
+#define TK_NMATCH 23
+#define TK_GLOB 24
+#define TK_BETWEEN 25
+#define TK_IN 26
+#define TK_GT 27
+#define TK_GE 28
+#define TK_LT 29
+#define TK_LE 30
+#define TK_BITAND 31
+#define TK_BITOR 32
+#define TK_LSHIFT 33
+#define TK_RSHIFT 34
+#define TK_PLUS 35
+#define TK_MINUS 36
+#define TK_DIVIDE 37
+#define TK_TIMES 38
+#define TK_STAR 39
+#define TK_SLASH 40
+#define TK_REM 41
+#define TK_CONCAT 42
+#define TK_UMINUS 43
+#define TK_UPLUS 44
+#define TK_BITNOT 45
+#define TK_SHOW 46
+#define TK_DATABASES 47
+#define TK_TOPICS 48
+#define TK_FUNCTIONS 49
+#define TK_MNODES 50
+#define TK_DNODES 51
+#define TK_ACCOUNTS 52
+#define TK_USERS 53
+#define TK_MODULES 54
+#define TK_QUERIES 55
+#define TK_CONNECTIONS 56
+#define TK_STREAMS 57
+#define TK_VARIABLES 58
+#define TK_SCORES 59
+#define TK_GRANTS 60
+#define TK_VNODES 61
+#define TK_DOT 62
+#define TK_CREATE 63
+#define TK_TABLE 64
+#define TK_STABLE 65
+#define TK_DATABASE 66
+#define TK_TABLES 67
+#define TK_STABLES 68
+#define TK_VGROUPS 69
+#define TK_DROP 70
+#define TK_TOPIC 71
+#define TK_FUNCTION 72
+#define TK_DNODE 73
+#define TK_USER 74
+#define TK_ACCOUNT 75
+#define TK_USE 76
+#define TK_DESCRIBE 77
+#define TK_DESC 78
+#define TK_ALTER 79
+#define TK_PASS 80
+#define TK_PRIVILEGE 81
+#define TK_LOCAL 82
+#define TK_COMPACT 83
+#define TK_LP 84
+#define TK_RP 85
+#define TK_IF 86
+#define TK_EXISTS 87
+#define TK_AS 88
+#define TK_OUTPUTTYPE 89
+#define TK_AGGREGATE 90
+#define TK_BUFSIZE 91
+#define TK_PPS 92
+#define TK_TSERIES 93
+#define TK_DBS 94
+#define TK_STORAGE 95
+#define TK_QTIME 96
+#define TK_CONNS 97
+#define TK_STATE 98
+#define TK_COMMA 99
+#define TK_KEEP 100
+#define TK_CACHE 101
+#define TK_REPLICA 102
+#define TK_QUORUM 103
+#define TK_DAYS 104
+#define TK_MINROWS 105
+#define TK_MAXROWS 106
+#define TK_BLOCKS 107
+#define TK_CTIME 108
+#define TK_WAL 109
+#define TK_FSYNC 110
+#define TK_COMP 111
+#define TK_PRECISION 112
+#define TK_UPDATE 113
+#define TK_CACHELAST 114
+#define TK_PARTITIONS 115
+#define TK_UNSIGNED 116
+#define TK_TAGS 117
+#define TK_USING 118
+#define TK_NULL 119
+#define TK_NOW 120
+#define TK_SELECT 121
+#define TK_UNION 122
+#define TK_ALL 123
+#define TK_DISTINCT 124
+#define TK_FROM 125
+#define TK_VARIABLE 126
+#define TK_INTERVAL 127
+#define TK_EVERY 128
+#define TK_SESSION 129
+#define TK_STATE_WINDOW 130
+#define TK_FILL 131
+#define TK_SLIDING 132
+#define TK_ORDER 133
+#define TK_BY 134
+#define TK_ASC 135
+#define TK_GROUP 136
+#define TK_HAVING 137
+#define TK_LIMIT 138
+#define TK_OFFSET 139
+#define TK_SLIMIT 140
+#define TK_SOFFSET 141
+#define TK_WHERE 142
+#define TK_RESET 143
+#define TK_QUERY 144
+#define TK_SYNCDB 145
+#define TK_ADD 146
+#define TK_COLUMN 147
+#define TK_MODIFY 148
+#define TK_TAG 149
+#define TK_CHANGE 150
+#define TK_SET 151
+#define TK_KILL 152
+#define TK_CONNECTION 153
+#define TK_STREAM 154
+#define TK_COLON 155
+#define TK_ABORT 156
+#define TK_AFTER 157
+#define TK_ATTACH 158
+#define TK_BEFORE 159
+#define TK_BEGIN 160
+#define TK_CASCADE 161
+#define TK_CLUSTER 162
+#define TK_CONFLICT 163
+#define TK_COPY 164
+#define TK_DEFERRED 165
+#define TK_DELIMITERS 166
+#define TK_DETACH 167
+#define TK_EACH 168
+#define TK_END 169
+#define TK_EXPLAIN 170
+#define TK_FAIL 171
+#define TK_FOR 172
+#define TK_IGNORE 173
+#define TK_IMMEDIATE 174
+#define TK_INITIALLY 175
+#define TK_INSTEAD 176
+#define TK_KEY 177
+#define TK_OF 178
+#define TK_RAISE 179
+#define TK_REPLACE 180
+#define TK_RESTRICT 181
+#define TK_ROW 182
+#define TK_STATEMENT 183
+#define TK_TRIGGER 184
+#define TK_VIEW 185
+#define TK_IPTOKEN 186
+#define TK_SEMI 187
+#define TK_NONE 188
+#define TK_PREV 189
+#define TK_LINEAR 190
+#define TK_IMPORT 191
+#define TK_TBNAME 192
+#define TK_JOIN 193
+#define TK_INSERT 194
+#define TK_INTO 195
+#define TK_VALUES 196
#define TK_SPACE 300
diff --git a/src/kit/shell/CMakeLists.txt b/src/kit/shell/CMakeLists.txt
index bf2bbca14d25aff3b3717c7b9785f1dc470a013a..bca1b72a1bc2c1f5b3da311baad38cd1d55ddaed 100644
--- a/src/kit/shell/CMakeLists.txt
+++ b/src/kit/shell/CMakeLists.txt
@@ -19,9 +19,9 @@ ELSE ()
ENDIF ()
IF (TD_SOMODE_STATIC)
- TARGET_LINK_LIBRARIES(shell taos_static lua ${LINK_JEMALLOC})
+ TARGET_LINK_LIBRARIES(shell taos_static cJson lua ${LINK_JEMALLOC})
ELSE ()
- TARGET_LINK_LIBRARIES(shell taos lua ${LINK_JEMALLOC})
+ TARGET_LINK_LIBRARIES(shell taos cJson lua ${LINK_JEMALLOC})
ENDIF ()
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
@@ -30,7 +30,7 @@ ELSEIF (TD_WINDOWS)
LIST(APPEND SRC ./src/shellMain.c)
LIST(APPEND SRC ./src/shellWindows.c)
ADD_EXECUTABLE(shell ${SRC})
- TARGET_LINK_LIBRARIES(shell taos_static)
+ TARGET_LINK_LIBRARIES(shell taos_static cJson)
IF (TD_POWER)
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME power)
@@ -46,7 +46,7 @@ ELSEIF (TD_DARWIN)
LIST(APPEND SRC ./src/shellCheck.c)
ADD_EXECUTABLE(shell ${SRC})
# linking with dylib
- TARGET_LINK_LIBRARIES(shell taos)
+ TARGET_LINK_LIBRARIES(shell taos cJson)
# linking taos statically
# TARGET_LINK_LIBRARIES(shell taos_static)
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index efc37403b46f2bfdd8e40eecd2ff53d00af6cd8a..d30b868bd59d8891db06f78e80cad8cb8eca10be 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -44,6 +44,13 @@ char PROMPT_HEADER[] = "tq> ";
char CONTINUE_PROMPT[] = " -> ";
int prompt_size = 4;
+#elif (_TD_PRO_ == true)
+char CLIENT_VERSION[] = "Welcome to the ProDB shell from %s, Client Version:%s\n"
+ "Copyright (c) 2020 by Hanatech, Inc. All rights reserved.\n\n";
+char PROMPT_HEADER[] = "ProDB> ";
+
+char CONTINUE_PROMPT[] = " -> ";
+int prompt_size = 7;
#else
char CLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
"Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
@@ -569,7 +576,7 @@ static void shellPrintNChar(const char *str, int length, int width) {
while (pos < length) {
wchar_t wc;
int bytes = mbtowc(&wc, str + pos, MB_CUR_MAX);
- if (bytes == 0) {
+ if (bytes <= 0) {
break;
}
pos += bytes;
diff --git a/src/kit/taosdemo/CMakeLists.txt b/src/kit/taosdemo/CMakeLists.txt
index 2034093ad5841c267b722930681127d745d27153..bdfdf74715a07d5fca1a4e73b75842ffa47b6e68 100644
--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
@@ -8,12 +8,14 @@ IF (GIT_FOUND)
MESSAGE("Git found")
EXECUTE_PROCESS(
COMMAND ${GIT_EXECUTABLE} log --pretty=oneline -n 1 ${CMAKE_CURRENT_LIST_DIR}/taosdemo.c
+ WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
RESULT_VARIABLE RESULT
OUTPUT_VARIABLE TAOSDEMO_COMMIT_SHA1)
IF ("${TAOSDEMO_COMMIT_SHA1}" STREQUAL "")
- MESSAGE("taosdemo's latest commit in short is:" ${TAOSDEMO_COMMIT_SHA1})
+ SET(TAOSDEMO_COMMIT_SHA1 "unknown")
ELSE ()
STRING(SUBSTRING "${TAOSDEMO_COMMIT_SHA1}" 0 7 TAOSDEMO_COMMIT_SHA1)
+ STRING(STRIP "${TAOSDEMO_COMMIT_SHA1}" TAOSDEMO_COMMIT_SHA1)
ENDIF ()
EXECUTE_PROCESS(
COMMAND ${GIT_EXECUTABLE} status -z -s ${CMAKE_CURRENT_LIST_DIR}/taosdemo.c
@@ -25,14 +27,13 @@ IF (GIT_FOUND)
RESULT_VARIABLE RESULT
OUTPUT_VARIABLE TAOSDEMO_STATUS)
ENDIF (TD_LINUX)
- MESSAGE("taosdemo.c status: " ${TAOSDEMO_STATUS})
ELSE()
MESSAGE("Git not found")
SET(TAOSDEMO_COMMIT_SHA1 "unknown")
SET(TAOSDEMO_STATUS "unknown")
ENDIF (GIT_FOUND)
-STRING(STRIP "${TAOSDEMO_COMMIT_SHA1}" TAOSDEMO_COMMIT_SHA1)
+
MESSAGE("taosdemo's latest commit in short is:" ${TAOSDEMO_COMMIT_SHA1})
STRING(STRIP "${TAOSDEMO_STATUS}" TAOSDEMO_STATUS)
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 0b742c7f1c10d405e5738ac99c81d34ddbe36766..1c346307eea7310ea6d5f469f36acc63f7d8ccbb 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -79,10 +79,10 @@ extern char configDir[];
#define DEFAULT_START_TIME 1500000000000
#define MAX_PREPARED_RAND 1000000
-#define INT_BUFF_LEN 11
+#define INT_BUFF_LEN 12
#define BIGINT_BUFF_LEN 21
-#define SMALLINT_BUFF_LEN 6
-#define TINYINT_BUFF_LEN 4
+#define SMALLINT_BUFF_LEN 7
+#define TINYINT_BUFF_LEN 5
#define BOOL_BUFF_LEN 6
#define FLOAT_BUFF_LEN 22
#define DOUBLE_BUFF_LEN 42
@@ -104,13 +104,13 @@ extern char configDir[];
#define DATATYPE_BUFF_LEN (SMALL_BUFF_LEN*3)
#define NOTE_BUFF_LEN (SMALL_BUFF_LEN*16)
+#define DEFAULT_NTHREADS 8
#define DEFAULT_TIMESTAMP_STEP 1
#define DEFAULT_INTERLACE_ROWS 0
#define DEFAULT_DATATYPE_NUM 1
#define DEFAULT_CHILDTABLES 10000
-
-#define STMT_BIND_PARAM_BATCH 0
+#define STMT_BIND_PARAM_BATCH 1
char* g_sampleDataBuf = NULL;
#if STMT_BIND_PARAM_BATCH == 1
@@ -125,17 +125,17 @@ enum TEST_MODE {
INVAID_TEST
};
-typedef enum CREATE_SUB_TALBE_MOD_EN {
+typedef enum CREATE_SUB_TABLE_MOD_EN {
PRE_CREATE_SUBTBL,
AUTO_CREATE_SUBTBL,
NO_CREATE_SUBTBL
-} CREATE_SUB_TALBE_MOD_EN;
+} CREATE_SUB_TABLE_MOD_EN;
-typedef enum TALBE_EXISTS_EN {
+typedef enum TABLE_EXISTS_EN {
TBL_NO_EXISTS,
TBL_ALREADY_EXISTS,
TBL_EXISTS_BUTT
-} TALBE_EXISTS_EN;
+} TABLE_EXISTS_EN;
enum enumSYNC_MODE {
SYNC_MODE,
@@ -228,7 +228,7 @@ typedef struct SArguments_S {
char * sqlFile;
bool use_metric;
bool drop_database;
- bool insert_only;
+ bool aggr_func;
bool answer_yes;
bool debug_print;
bool verbose_print;
@@ -244,14 +244,14 @@ typedef struct SArguments_S {
uint64_t insert_interval;
uint64_t timestamp_step;
int64_t query_times;
- uint32_t interlace_rows;
+ uint32_t interlaceRows;
uint32_t reqPerReq; // num_of_records_per_req
uint64_t max_sql_len;
int64_t ntables;
int64_t insertRows;
int abort;
uint32_t disorderRatio; // 0: no disorder, >0: x%
- int disorderRange; // ms, us or ns. accordig to database precision
+ int disorderRange; // ms, us or ns. according to database precision
uint32_t method_of_delete;
uint64_t totalInsertRows;
uint64_t totalAffectedRows;
@@ -376,8 +376,7 @@ typedef struct SDbs_S {
char password[SHELL_MAX_PASSWORD_LEN];
char resultFile[MAX_FILE_NAME_LEN];
bool use_metric;
- bool insert_only;
- bool do_aggreFunc;
+ bool aggr_func;
bool asyncMode;
uint32_t threadCount;
@@ -392,7 +391,7 @@ typedef struct SDbs_S {
} SDbs;
typedef struct SpecifiedQueryInfo_S {
- uint64_t queryInterval; // 0: unlimit > 0 loop/s
+ uint64_t queryInterval; // 0: unlimited > 0 loop/s
uint32_t concurrent;
int sqlCount;
uint32_t asyncMode; // 0: sync, 1: async
@@ -413,7 +412,7 @@ typedef struct SpecifiedQueryInfo_S {
typedef struct SuperQueryInfo_S {
char stbName[TSDB_TABLE_NAME_LEN];
- uint64_t queryInterval; // 0: unlimit > 0 loop/s
+ uint64_t queryInterval; // 0: unlimited > 0 loop/s
uint32_t threadCnt;
uint32_t asyncMode; // 0: sync, 1: async
uint64_t subscribeInterval; // ms
@@ -451,14 +450,13 @@ typedef struct SQueryMetaInfo_S {
typedef struct SThreadInfo_S {
TAOS * taos;
TAOS_STMT *stmt;
+ int64_t *bind_ts;
#if STMT_BIND_PARAM_BATCH == 1
- int64_t *bind_ts;
int64_t *bind_ts_array;
char *bindParams;
char *is_null;
#else
- int64_t *bind_ts;
char* sampleBindArray;
#endif
@@ -592,23 +590,32 @@ static void init_rand_data();
/* ************ Global variables ************ */
int32_t g_randint[MAX_PREPARED_RAND];
+uint32_t g_randuint[MAX_PREPARED_RAND];
int64_t g_randbigint[MAX_PREPARED_RAND];
+uint64_t g_randubigint[MAX_PREPARED_RAND];
float g_randfloat[MAX_PREPARED_RAND];
double g_randdouble[MAX_PREPARED_RAND];
char *g_randbool_buff = NULL;
char *g_randint_buff = NULL;
+char *g_randuint_buff = NULL;
char *g_rand_voltage_buff = NULL;
char *g_randbigint_buff = NULL;
+char *g_randubigint_buff = NULL;
char *g_randsmallint_buff = NULL;
+char *g_randusmallint_buff = NULL;
char *g_randtinyint_buff = NULL;
+char *g_randutinyint_buff = NULL;
char *g_randfloat_buff = NULL;
char *g_rand_current_buff = NULL;
char *g_rand_phase_buff = NULL;
char *g_randdouble_buff = NULL;
-char *g_aggreFunc[] = {"*", "count(*)", "avg(col0)", "sum(col0)",
- "max(col0)", "min(col0)", "first(col0)", "last(col0)"};
+char *g_aggreFuncDemo[] = {"*", "count(*)", "avg(current)", "sum(current)",
+ "max(current)", "min(current)", "first(current)", "last(current)"};
+
+char *g_aggreFunc[] = {"*", "count(*)", "avg(C0)", "sum(C0)",
+ "max(C0)", "min(C0)", "first(C0)", "last(C0)"};
SArguments g_args = {
NULL, // metaFile
@@ -621,6 +628,8 @@ SArguments g_args = {
"powerdb", // password
#elif (_TD_TQ_ == true)
"tqueue", // password
+#elif (_TD_PRO_ == true)
+ "prodb", // password
#else
"taosdata", // password
#endif
@@ -630,7 +639,7 @@ SArguments g_args = {
NULL, // sqlFile
true, // use_metric
true, // drop_database
- true, // insert_only
+ false, // aggr_func
false, // debug_print
false, // verbose_print
false, // performance statistic print
@@ -648,11 +657,11 @@ SArguments g_args = {
64, // binwidth
4, // columnCount, timestamp + float + int + float
20 + FLOAT_BUFF_LEN + INT_BUFF_LEN + FLOAT_BUFF_LEN, // lenOfOneRow
- 8, // num_of_connections/thread
+ DEFAULT_NTHREADS,// nthreads
0, // insert_interval
DEFAULT_TIMESTAMP_STEP, // timestamp_step
1, // query_times
- DEFAULT_INTERLACE_ROWS, // interlace_rows;
+ DEFAULT_INTERLACE_ROWS, // interlaceRows;
30000, // reqPerReq
(1024*1024), // max_sql_len
DEFAULT_CHILDTABLES, // ntables
@@ -738,10 +747,10 @@ static void printVersion() {
char taosdemo_status[] = TAOSDEMO_STATUS;
if (strlen(taosdemo_status) == 0) {
- printf("taosdemo verison %s-%s\n",
+ printf("taosdemo version %s-%s\n",
tdengine_ver, taosdemo_ver);
} else {
- printf("taosdemo verison %s-%s, status:%s\n",
+ printf("taosdemo version %s-%s, status:%s\n",
tdengine_ver, taosdemo_ver, taosdemo_status);
}
}
@@ -750,19 +759,24 @@ static void printHelp() {
char indent[10] = " ";
printf("%s\n\n", "Usage: taosdemo [OPTION...]");
printf("%s%s%s%s\n", indent, "-f, --file=FILE", "\t\t",
- "The meta file to the execution procedure. Default is './meta.json'.");
+ "The meta file to the execution procedure.");
printf("%s%s%s%s\n", indent, "-u, --user=USER", "\t\t",
"The user name to use when connecting to the server.");
#ifdef _TD_POWER_
printf("%s%s%s%s\n", indent, "-p, --password", "\t\t",
- "The password to use when connecting to the server. Default is 'powerdb'");
+ "The password to use when connecting to the server. By default is 'powerdb'");
printf("%s%s%s%s\n", indent, "-c, --config-dir=CONFIG_DIR", "\t",
- "Configuration directory. Default is '/etc/power/'.");
+ "Configuration directory. By default is '/etc/power/'.");
#elif (_TD_TQ_ == true)
printf("%s%s%s%s\n", indent, "-p, --password", "\t\t",
- "The password to use when connecting to the server. Default is 'tqueue'");
+ "The password to use when connecting to the server. By default is 'tqueue'");
+ printf("%s%s%s%s\n", indent, "-c, --config-dir=CONFIG_DIR", "\t",
+ "Configuration directory. By default is '/etc/tq/'.");
+#elif (_TD_PRO_ == true)
+ printf("%s%s%s%s\n", indent, "-p, --password", "\t\t",
+ "The password to use when connecting to the server. By default is 'prodb'");
printf("%s%s%s%s\n", indent, "-c, --config-dir=CONFIG_DIR", "\t",
- "Configuration directory. Default is '/etc/tq/'.");
+ "Configuration directory. By default is '/etc/ProDB/'.");
#else
printf("%s%s%s%s\n", indent, "-p, --password", "\t\t",
"The password to use when connecting to the server.");
@@ -774,24 +788,24 @@ static void printHelp() {
printf("%s%s%s%s\n", indent, "-P, --port=PORT", "\t\t",
"The TCP/IP port number to use for the connection.");
printf("%s%s%s%s\n", indent, "-I, --interface=INTERFACE", "\t",
- "The interface (taosc, rest, and stmt) taosdemo uses. Default is 'taosc'.");
+ "The interface (taosc, rest, and stmt) taosdemo uses. By default use 'taosc'.");
printf("%s%s%s%s\n", indent, "-d, --database=DATABASE", "\t",
- "Destination database. Default is 'test'.");
+ "Destination database. By default is 'test'.");
printf("%s%s%s%s\n", indent, "-a, --replica=REPLICA", "\t\t",
- "Set the replica parameters of the database, Default 1, min: 1, max: 3.");
+ "Set the replica parameters of the database, By default use 1, min: 1, max: 3.");
printf("%s%s%s%s\n", indent, "-m, --table-prefix=TABLEPREFIX", "\t",
- "Table prefix name. Default is 'd'.");
+ "Table prefix name. By default use 'd'.");
printf("%s%s%s%s\n", indent, "-s, --sql-file=FILE", "\t\t",
"The select sql file.");
printf("%s%s%s%s\n", indent, "-N, --normal-table", "\t\t", "Use normal table flag.");
printf("%s%s%s%s\n", indent, "-o, --output=FILE", "\t\t",
- "Direct output to the named file. Default is './output.txt'.");
+ "Direct output to the named file. By default use './output.txt'.");
printf("%s%s%s%s\n", indent, "-q, --query-mode=MODE", "\t\t",
- "Query mode -- 0: SYNC, 1: ASYNC. Default is SYNC.");
+ "Query mode -- 0: SYNC, 1: ASYNC. By default use SYNC.");
printf("%s%s%s%s\n", indent, "-b, --data-type=DATATYPE", "\t",
- "The data_type of columns, default: FLOAT, INT, FLOAT.");
+ "The data_type of columns, By default use: FLOAT, INT, FLOAT.");
printf("%s%s%s%s%d\n", indent, "-w, --binwidth=WIDTH", "\t\t",
- "The width of data_type 'BINARY' or 'NCHAR'. Default is ",
+ "The width of data_type 'BINARY' or 'NCHAR'. By default use ",
g_args.binwidth);
printf("%s%s%s%s%d%s%d\n", indent, "-l, --columns=COLUMNS", "\t\t",
"The number of columns per record. Demo mode by default is ",
@@ -800,32 +814,32 @@ static void printHelp() {
MAX_NUM_COLUMNS);
printf("%s%s%s%s\n", indent, indent, indent,
"\t\t\t\tAll of the new column(s) type is INT. If use -b to specify column type, -l will be ignored.");
- printf("%s%s%s%s\n", indent, "-T, --threads=NUMBER", "\t\t",
- "The number of threads. Default is 10.");
+ printf("%s%s%s%s%d.\n", indent, "-T, --threads=NUMBER", "\t\t",
+ "The number of threads. By default use ", DEFAULT_NTHREADS);
printf("%s%s%s%s\n", indent, "-i, --insert-interval=NUMBER", "\t",
- "The sleep time (ms) between insertion. Default is 0.");
+ "The sleep time (ms) between insertion. By default is 0.");
printf("%s%s%s%s%d.\n", indent, "-S, --time-step=TIME_STEP", "\t",
- "The timestamp step between insertion. Default is ",
+ "The timestamp step between insertion. By default is ",
DEFAULT_TIMESTAMP_STEP);
printf("%s%s%s%s%d.\n", indent, "-B, --interlace-rows=NUMBER", "\t",
- "The interlace rows of insertion. Default is ",
+ "The interlace rows of insertion. By default is ",
DEFAULT_INTERLACE_ROWS);
printf("%s%s%s%s\n", indent, "-r, --rec-per-req=NUMBER", "\t",
- "The number of records per request. Default is 30000.");
+ "The number of records per request. By default is 30000.");
printf("%s%s%s%s\n", indent, "-t, --tables=NUMBER", "\t\t",
- "The number of tables. Default is 10000.");
+ "The number of tables. By default is 10000.");
printf("%s%s%s%s\n", indent, "-n, --records=NUMBER", "\t\t",
- "The number of records per table. Default is 10000.");
+ "The number of records per table. By default is 10000.");
printf("%s%s%s%s\n", indent, "-M, --random", "\t\t\t",
"The value of records generated are totally random.");
- printf("%s\n", "\t\t\t\tThe default is to simulate power equipment senario.");
- printf("%s%s%s%s\n", indent, "-x, --no-insert", "\t\t",
- "No-insert flag.");
- printf("%s%s%s%s\n", indent, "-y, --answer-yes", "\t\t", "Default input yes for prompt.");
+ printf("%s\n", "\t\t\t\tBy default to simulate power equipment scenario.");
+ printf("%s%s%s%s\n", indent, "-x, --aggr-func", "\t\t",
+ "Test aggregation functions after insertion.");
+ printf("%s%s%s%s\n", indent, "-y, --answer-yes", "\t\t", "Input yes for prompt.");
printf("%s%s%s%s\n", indent, "-O, --disorder=NUMBER", "\t\t",
- "Insert order mode--0: In order, 1 ~ 50: disorder ratio. Default is in order.");
+ "Insert order mode--0: In order, 1 ~ 50: disorder ratio. By default is in order.");
printf("%s%s%s%s\n", indent, "-R, --disorder-range=NUMBER", "\t",
- "Out of order data's range, ms, default is 1000.");
+ "Out of order data's range. Unit is ms. By default is 1000.");
printf("%s%s%s%s\n", indent, "-g, --debug", "\t\t\t",
"Print debug info.");
printf("%s%s%s%s\n", indent, "-?, --help\t", "\t\t",
@@ -863,7 +877,7 @@ static void errorWrongValue(char *program, char *wrong_arg, char *wrong_value)
fprintf(stderr, "Try `taosdemo --help' or `taosdemo --usage' for more information.\n");
}
-static void errorUnreconized(char *program, char *wrong_arg)
+static void errorUnrecognized(char *program, char *wrong_arg)
{
fprintf(stderr, "%s: unrecognized options '%s'\n", program, wrong_arg);
fprintf(stderr, "Try `taosdemo --help' or `taosdemo --usage' for more information.\n");
@@ -920,7 +934,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
} else if (0 == strncmp(argv[i], "--file=", strlen("--file="))) {
arguments->metaFile = (char *)(argv[i] + strlen("--file="));
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-c", strlen("-c")))
@@ -942,7 +956,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
} else if (0 == strncmp(argv[i], "--config-dir=", strlen("--config-dir="))) {
tstrncpy(configDir, (char *)(argv[i] + strlen("--config-dir=")), TSDB_FILENAME_LEN);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-h", strlen("-h")))
@@ -964,7 +978,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
} else if (0 == strncmp(argv[i], "--host=", strlen("--host="))) {
arguments->host = (char *)(argv[i] + strlen("--host="));
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if (strcmp(argv[i], "-PP") == 0) {
@@ -998,7 +1012,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->port = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-I", strlen("-I")))
@@ -1059,7 +1073,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
i++;
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-u", strlen("-u")))
@@ -1081,7 +1095,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->user = argv[++i];
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-p", strlen("-p")))
@@ -1115,7 +1129,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->output_file = argv[++i];
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-s", strlen("-s")))
@@ -1137,7 +1151,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->sqlFile = argv[++i];
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-q", strlen("-q")))
@@ -1175,7 +1189,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->async_mode = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-T", strlen("-T")))
@@ -1213,7 +1227,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->nthreads = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-i", strlen("-i")))
@@ -1251,7 +1265,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->insert_interval = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-S", strlen("-S")))
@@ -1289,7 +1303,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->async_mode = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if (strcmp(argv[i], "-qt") == 0) {
@@ -1310,17 +1324,17 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
errorPrintReqArg2(argv[0], "B");
exit(EXIT_FAILURE);
}
- arguments->interlace_rows = atoi(argv[++i]);
+ arguments->interlaceRows = atoi(argv[++i]);
} else if (0 == strncmp(argv[i], "--interlace-rows=", strlen("--interlace-rows="))) {
if (isStringNumber((char *)(argv[i] + strlen("--interlace-rows=")))) {
- arguments->interlace_rows = atoi((char *)(argv[i]+strlen("--interlace-rows=")));
+ arguments->interlaceRows = atoi((char *)(argv[i]+strlen("--interlace-rows=")));
} else {
errorPrintReqArg2(argv[0], "--interlace-rows");
exit(EXIT_FAILURE);
}
} else if (0 == strncmp(argv[i], "-B", strlen("-B"))) {
if (isStringNumber((char *)(argv[i] + strlen("-B")))) {
- arguments->interlace_rows = atoi((char *)(argv[i]+strlen("-B")));
+ arguments->interlaceRows = atoi((char *)(argv[i]+strlen("-B")));
} else {
errorPrintReqArg2(argv[0], "-B");
exit(EXIT_FAILURE);
@@ -1333,9 +1347,9 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
errorPrintReqArg2(argv[0], "--interlace-rows");
exit(EXIT_FAILURE);
}
- arguments->interlace_rows = atoi(argv[++i]);
+ arguments->interlaceRows = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-r", strlen("-r")))
@@ -1373,7 +1387,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->reqPerReq = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-t", strlen("-t")))
@@ -1411,7 +1425,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->ntables = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
@@ -1451,7 +1465,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->insertRows = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-d", strlen("-d")))
@@ -1473,7 +1487,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->database = argv[++i];
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-l", strlen("-l")))
@@ -1512,12 +1526,12 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->columnCount = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
if (arguments->columnCount > MAX_NUM_COLUMNS) {
- printf("WARNING: max acceptible columns count is %d\n", MAX_NUM_COLUMNS);
+ printf("WARNING: max acceptable columns count is %d\n", MAX_NUM_COLUMNS);
prompt();
arguments->columnCount = MAX_NUM_COLUMNS;
}
@@ -1552,7 +1566,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
dataType = argv[++i];
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
@@ -1567,7 +1581,11 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
&& strcasecmp(dataType, "DOUBLE")
&& strcasecmp(dataType, "BINARY")
&& strcasecmp(dataType, "TIMESTAMP")
- && strcasecmp(dataType, "NCHAR")) {
+ && strcasecmp(dataType, "NCHAR")
+ && strcasecmp(dataType, "UTINYINT")
+ && strcasecmp(dataType, "USMALLINT")
+ && strcasecmp(dataType, "UINT")
+ && strcasecmp(dataType, "UBIGINT")) {
printHelp();
errorPrint("%s", "-b: Invalid data_type!\n");
exit(EXIT_FAILURE);
@@ -1593,6 +1611,14 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
arguments->data_type[0] = TSDB_DATA_TYPE_BOOL;
} else if (0 == strcasecmp(dataType, "TIMESTAMP")) {
arguments->data_type[0] = TSDB_DATA_TYPE_TIMESTAMP;
+ } else if (0 == strcasecmp(dataType, "UTINYINT")) {
+ arguments->data_type[0] = TSDB_DATA_TYPE_UTINYINT;
+ } else if (0 == strcasecmp(dataType, "USMALLINT")) {
+ arguments->data_type[0] = TSDB_DATA_TYPE_USMALLINT;
+ } else if (0 == strcasecmp(dataType, "UINT")) {
+ arguments->data_type[0] = TSDB_DATA_TYPE_UINT;
+ } else if (0 == strcasecmp(dataType, "UBIGINT")) {
+ arguments->data_type[0] = TSDB_DATA_TYPE_UBIGINT;
} else {
arguments->data_type[0] = TSDB_DATA_TYPE_NULL;
}
@@ -1614,7 +1640,11 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
&& strcasecmp(token, "DOUBLE")
&& strcasecmp(token, "BINARY")
&& strcasecmp(token, "TIMESTAMP")
- && strcasecmp(token, "NCHAR")) {
+ && strcasecmp(token, "NCHAR")
+ && strcasecmp(token, "UTINYINT")
+ && strcasecmp(token, "USMALLINT")
+ && strcasecmp(token, "UINT")
+ && strcasecmp(token, "UBIGINT")) {
printHelp();
free(g_dupstr);
errorPrint("%s", "-b: Invalid data_type!\n");
@@ -1630,7 +1660,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
} else if (0 == strcasecmp(token, "BIGINT")) {
arguments->data_type[index] = TSDB_DATA_TYPE_BIGINT;
} else if (0 == strcasecmp(token, "DOUBLE")) {
- arguments->data_type[index] = TSDB_DATA_TYPE_FLOAT;
+ arguments->data_type[index] = TSDB_DATA_TYPE_DOUBLE;
} else if (0 == strcasecmp(token, "TINYINT")) {
arguments->data_type[index] = TSDB_DATA_TYPE_TINYINT;
} else if (0 == strcasecmp(token, "BINARY")) {
@@ -1641,6 +1671,14 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
arguments->data_type[index] = TSDB_DATA_TYPE_BOOL;
} else if (0 == strcasecmp(token, "TIMESTAMP")) {
arguments->data_type[index] = TSDB_DATA_TYPE_TIMESTAMP;
+ } else if (0 == strcasecmp(token, "UTINYINT")) {
+ arguments->data_type[index] = TSDB_DATA_TYPE_UTINYINT;
+ } else if (0 == strcasecmp(token, "USMALLINT")) {
+ arguments->data_type[index] = TSDB_DATA_TYPE_USMALLINT;
+ } else if (0 == strcasecmp(token, "UINT")) {
+ arguments->data_type[index] = TSDB_DATA_TYPE_UINT;
+ } else if (0 == strcasecmp(token, "UBIGINT")) {
+ arguments->data_type[index] = TSDB_DATA_TYPE_UBIGINT;
} else {
arguments->data_type[index] = TSDB_DATA_TYPE_NULL;
}
@@ -1687,7 +1725,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->binwidth = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-m", strlen("-m")))
@@ -1709,18 +1747,19 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->tb_prefix = argv[++i];
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((strcmp(argv[i], "-N") == 0)
|| (0 == strcmp(argv[i], "--normal-table"))) {
+ arguments->demo_mode = false;
arguments->use_metric = false;
} else if ((strcmp(argv[i], "-M") == 0)
|| (0 == strcmp(argv[i], "--random"))) {
arguments->demo_mode = false;
} else if ((strcmp(argv[i], "-x") == 0)
- || (0 == strcmp(argv[i], "--no-insert"))) {
- arguments->insert_only = false;
+ || (0 == strcmp(argv[i], "--aggr-func"))) {
+ arguments->aggr_func = true;
} else if ((strcmp(argv[i], "-y") == 0)
|| (0 == strcmp(argv[i], "--answer-yes"))) {
arguments->answer_yes = true;
@@ -1774,7 +1813,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->disorderRange = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
} else if ((0 == strncmp(argv[i], "-O", strlen("-O")))
@@ -1812,7 +1851,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->disorderRatio = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
@@ -1866,7 +1905,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
}
arguments->replica = atoi(argv[++i]);
} else {
- errorUnreconized(argv[0], argv[i]);
+ errorUnrecognized(argv[0], argv[i]);
exit(EXIT_FAILURE);
}
@@ -1878,7 +1917,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
} else if (strcmp(argv[i], "-D") == 0) {
arguments->method_of_delete = atoi(argv[++i]);
if (arguments->method_of_delete > 3) {
- errorPrint("%s", "\n\t-D need a valud (0~3) number following!\n");
+ errorPrint("%s", "\n\t-D need a value (0~3) number following!\n");
exit(EXIT_FAILURE);
}
} else if ((strcmp(argv[i], "--version") == 0)
@@ -1893,7 +1932,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
printf(" Usage: taosdemo [-f JSONFILE] [-u USER] [-p PASSWORD] [-c CONFIG_DIR]\n\
[-h HOST] [-P PORT] [-I INTERFACE] [-d DATABASE] [-a REPLICA]\n\
[-m TABLEPREFIX] [-s SQLFILE] [-N] [-o OUTPUTFILE] [-q QUERYMODE]\n\
- [-b DATATYPES] [-w WIDTH_OF_BINARY] [-l COLUNNS] [-T THREADNUMBER]\n\
+ [-b DATATYPES] [-w WIDTH_OF_BINARY] [-l COLUMNS] [-T THREADNUMBER]\n\
[-i SLEEPTIME] [-S TIME_STEP] [-B INTERLACE_ROWS] [-t TABLES]\n\
[-n RECORDS] [-M] [-x] [-y] [-O ORDERMODE] [-R RANGE] [-a REPLIcA][-g]\n\
[--help] [--usage] [--version]\n");
@@ -1943,18 +1982,22 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
break;
case TSDB_DATA_TYPE_INT:
+ case TSDB_DATA_TYPE_UINT:
g_args.lenOfOneRow += INT_BUFF_LEN;
break;
case TSDB_DATA_TYPE_BIGINT:
+ case TSDB_DATA_TYPE_UBIGINT:
g_args.lenOfOneRow += BIGINT_BUFF_LEN;
break;
case TSDB_DATA_TYPE_SMALLINT:
+ case TSDB_DATA_TYPE_USMALLINT:
g_args.lenOfOneRow += SMALLINT_BUFF_LEN;
break;
case TSDB_DATA_TYPE_TINYINT:
+ case TSDB_DATA_TYPE_UTINYINT:
g_args.lenOfOneRow += TINYINT_BUFF_LEN;
break;
@@ -2186,6 +2229,23 @@ static int32_t rand_tinyint()
return g_randint[cursor % MAX_PREPARED_RAND] % 128;
}
+static char *rand_utinyint_str()
+{
+ static int cursor;
+ cursor++;
+ if (cursor > (MAX_PREPARED_RAND - 1)) cursor = 0;
+ return g_randutinyint_buff +
+ ((cursor % MAX_PREPARED_RAND) * TINYINT_BUFF_LEN);
+}
+
+static int32_t rand_utinyint()
+{
+ static int cursor;
+ cursor++;
+ if (cursor > (MAX_PREPARED_RAND - 1)) cursor = 0;
+ return g_randuint[cursor % MAX_PREPARED_RAND] % 255;
+}
+
static char *rand_smallint_str()
{
static int cursor;
@@ -2200,7 +2260,24 @@ static int32_t rand_smallint()
static int cursor;
cursor++;
if (cursor > (MAX_PREPARED_RAND - 1)) cursor = 0;
- return g_randint[cursor % MAX_PREPARED_RAND] % 32767;
+ return g_randint[cursor % MAX_PREPARED_RAND] % 32768;
+}
+
+static char *rand_usmallint_str()
+{
+ static int cursor;
+ cursor++;
+ if (cursor > (MAX_PREPARED_RAND - 1)) cursor = 0;
+ return g_randusmallint_buff +
+ ((cursor % MAX_PREPARED_RAND) * SMALLINT_BUFF_LEN);
+}
+
+static int32_t rand_usmallint()
+{
+ static int cursor;
+ cursor++;
+ if (cursor > (MAX_PREPARED_RAND - 1)) cursor = 0;
+ return g_randuint[cursor % MAX_PREPARED_RAND] % 65535;
}
static char *rand_int_str()
@@ -2219,6 +2296,22 @@ static int32_t rand_int()
return g_randint[cursor % MAX_PREPARED_RAND];
}
+static char *rand_uint_str()
+{
+ static int cursor;
+ cursor++;
+ if (cursor > (MAX_PREPARED_RAND - 1)) cursor = 0;
+ return g_randuint_buff + ((cursor % MAX_PREPARED_RAND) * INT_BUFF_LEN);
+}
+
+static int32_t rand_uint()
+{
+ static int cursor;
+ cursor++;
+ if (cursor > (MAX_PREPARED_RAND - 1)) cursor = 0;
+ return g_randuint[cursor % MAX_PREPARED_RAND];
+}
+
static char *rand_bigint_str()
{
static int cursor;
@@ -2236,6 +2329,23 @@ static int64_t rand_bigint()
return g_randbigint[cursor % MAX_PREPARED_RAND];
}
+static char *rand_ubigint_str()
+{
+ static int cursor;
+ cursor++;
+ if (cursor > (MAX_PREPARED_RAND - 1)) cursor = 0;
+ return g_randubigint_buff +
+ ((cursor % MAX_PREPARED_RAND) * BIGINT_BUFF_LEN);
+}
+
+static int64_t rand_ubigint()
+{
+ static int cursor;
+ cursor++;
+ if (cursor > (MAX_PREPARED_RAND - 1)) cursor = 0;
+ return g_randubigint[cursor % MAX_PREPARED_RAND];
+}
+
static char *rand_float_str()
{
static int cursor;
@@ -2373,9 +2483,18 @@ static void init_rand_data() {
assert(g_rand_phase_buff);
g_randdouble_buff = calloc(1, DOUBLE_BUFF_LEN * MAX_PREPARED_RAND);
assert(g_randdouble_buff);
+ g_randuint_buff = calloc(1, INT_BUFF_LEN * MAX_PREPARED_RAND);
+ assert(g_randuint_buff);
+ g_randutinyint_buff = calloc(1, TINYINT_BUFF_LEN * MAX_PREPARED_RAND);
+ assert(g_randutinyint_buff);
+ g_randusmallint_buff = calloc(1, SMALLINT_BUFF_LEN * MAX_PREPARED_RAND);
+ assert(g_randusmallint_buff);
+ g_randubigint_buff = calloc(1, BIGINT_BUFF_LEN * MAX_PREPARED_RAND);
+ assert(g_randubigint_buff);
for (int i = 0; i < MAX_PREPARED_RAND; i++) {
- g_randint[i] = (int)(taosRandom() % 65535);
+ g_randint[i] = (int)(taosRandom() % RAND_MAX - (RAND_MAX >> 1));
+ g_randuint[i] = (int)(taosRandom());
sprintf(g_randint_buff + i * INT_BUFF_LEN, "%d",
g_randint[i]);
sprintf(g_rand_voltage_buff + i * INT_BUFF_LEN, "%d",
@@ -2384,15 +2503,24 @@ static void init_rand_data() {
sprintf(g_randbool_buff + i * BOOL_BUFF_LEN, "%s",
((g_randint[i] % 2) & 1)?"true":"false");
sprintf(g_randsmallint_buff + i * SMALLINT_BUFF_LEN, "%d",
- g_randint[i] % 32767);
+ g_randint[i] % 32768);
sprintf(g_randtinyint_buff + i * TINYINT_BUFF_LEN, "%d",
g_randint[i] % 128);
-
- g_randbigint[i] = (int64_t)(taosRandom() % 2147483648);
+ sprintf(g_randuint_buff + i * INT_BUFF_LEN, "%d",
+ g_randuint[i]);
+ sprintf(g_randusmallint_buff + i * SMALLINT_BUFF_LEN, "%d",
+ g_randuint[i] % 65535);
+ sprintf(g_randutinyint_buff + i * TINYINT_BUFF_LEN, "%d",
+ g_randuint[i] % 255);
+
+ g_randbigint[i] = (int64_t)(taosRandom() % RAND_MAX - (RAND_MAX >> 1));
+ g_randubigint[i] = (uint64_t)(taosRandom());
sprintf(g_randbigint_buff + i * BIGINT_BUFF_LEN, "%"PRId64"",
g_randbigint[i]);
+ sprintf(g_randubigint_buff + i * BIGINT_BUFF_LEN, "%"PRId64"",
+ g_randubigint[i]);
- g_randfloat[i] = (float)(taosRandom() / 1000.0);
+ g_randfloat[i] = (float)(taosRandom() / 1000.0) * (taosRandom() % 2 > 0.5 ? 1 : -1);
sprintf(g_randfloat_buff + i * FLOAT_BUFF_LEN, "%f",
g_randfloat[i]);
sprintf(g_rand_current_buff + i * FLOAT_BUFF_LEN, "%f",
@@ -2402,7 +2530,7 @@ static void init_rand_data() {
(float)((115 + g_randint[i] % 10
+ g_randfloat[i]/1000000000)/360));
- g_randdouble[i] = (double)(taosRandom() / 1000000.0);
+ g_randdouble[i] = (double)(taosRandom() / 1000000.0) * (taosRandom() % 2 > 0.5 ? 1 : -1);
sprintf(g_randdouble_buff + i * DOUBLE_BUFF_LEN, "%f",
g_randdouble[i]);
}
@@ -2431,10 +2559,11 @@ static void init_rand_data() {
static int printfInsertMeta() {
SHOW_PARSE_RESULT_START();
- if (g_args.demo_mode)
- printf("\ntaosdemo is simulating data generated by power equipments monitoring...\n\n");
- else
+ if (g_args.demo_mode) {
+ printf("\ntaosdemo is simulating data generated by power equipment monitoring...\n\n");
+ } else {
printf("\ntaosdemo is simulating random data as you request..\n\n");
+ }
if (g_args.iface != INTERFACE_BUT) {
// first time if no iface specified
@@ -2466,9 +2595,9 @@ static int printfInsertMeta() {
printf(" database[%d] name: \033[33m%s\033[0m\n",
i, g_Dbs.db[i].dbName);
if (0 == g_Dbs.db[i].drop) {
- printf(" drop: \033[33mno\033[0m\n");
+ printf(" drop: \033[33m no\033[0m\n");
} else {
- printf(" drop: \033[33myes\033[0m\n");
+ printf(" drop: \033[33m yes\033[0m\n");
}
if (g_Dbs.db[i].dbCfg.blocks > 0) {
@@ -2577,9 +2706,9 @@ static int printfInsertMeta() {
g_Dbs.db[i].superTbls[j].insertRows);
/*
if (0 == g_Dbs.db[i].superTbls[j].multiThreadWriteOneTbl) {
- printf(" multiThreadWriteOneTbl: \033[33mno\033[0m\n");
+ printf(" multiThreadWriteOneTbl: \033[33m no\033[0m\n");
}else {
- printf(" multiThreadWriteOneTbl: \033[33myes\033[0m\n");
+ printf(" multiThreadWriteOneTbl: \033[33m yes\033[0m\n");
}
*/
printf(" interlaceRows: \033[33m%u\033[0m\n",
@@ -2964,18 +3093,34 @@ static void xDumpFieldToFile(FILE* fp, const char* val,
fprintf(fp, "%d", *((int8_t *)val));
break;
+ case TSDB_DATA_TYPE_UTINYINT:
+ fprintf(fp, "%d", *((uint8_t *)val));
+ break;
+
case TSDB_DATA_TYPE_SMALLINT:
fprintf(fp, "%d", *((int16_t *)val));
break;
+ case TSDB_DATA_TYPE_USMALLINT:
+ fprintf(fp, "%d", *((uint16_t *)val));
+ break;
+
case TSDB_DATA_TYPE_INT:
fprintf(fp, "%d", *((int32_t *)val));
break;
+ case TSDB_DATA_TYPE_UINT:
+ fprintf(fp, "%d", *((uint32_t *)val));
+ break;
+
case TSDB_DATA_TYPE_BIGINT:
fprintf(fp, "%"PRId64"", *((int64_t *)val));
break;
+ case TSDB_DATA_TYPE_UBIGINT:
+ fprintf(fp, "%"PRId64"", *((uint64_t *)val));
+ break;
+
case TSDB_DATA_TYPE_FLOAT:
fprintf(fp, "%.5f", GET_FLOAT_VAL(val));
break;
@@ -3462,7 +3607,23 @@ static char* generateTagValuesForStb(SSuperTable* stbInfo, int64_t tableSeq) {
} else if (0 == strncasecmp(stbInfo->tags[i].dataType,
"timestamp", strlen("timestamp"))) {
dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
- "%"PRId64",", rand_bigint());
+ "%"PRId64",", rand_ubigint());
+ } else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+ "utinyint", strlen("utinyint"))) {
+ dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+ "%d,", rand_utinyint());
+ } else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+ "usmallint", strlen("usmallint"))) {
+ dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+ "%d,", rand_usmallint());
+ } else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+ "uint", strlen("uint"))) {
+ dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+ "%d,", rand_uint());
+ } else if (0 == strncasecmp(stbInfo->tags[i].dataType,
+ "ubigint", strlen("ubigint"))) {
+ dataLen += snprintf(dataBuf + dataLen, TSDB_MAX_SQL_LEN - dataLen,
+ "%"PRId64",", rand_ubigint());
} else {
errorPrint2("No support data type: %s\n", stbInfo->tags[i].dataType);
tmfree(dataBuf);
@@ -3492,18 +3653,22 @@ static int calcRowLen(SSuperTable* superTbls) {
break;
case TSDB_DATA_TYPE_INT:
+ case TSDB_DATA_TYPE_UINT:
lenOfOneRow += INT_BUFF_LEN;
break;
case TSDB_DATA_TYPE_BIGINT:
+ case TSDB_DATA_TYPE_UBIGINT:
lenOfOneRow += BIGINT_BUFF_LEN;
break;
case TSDB_DATA_TYPE_SMALLINT:
+ case TSDB_DATA_TYPE_USMALLINT:
lenOfOneRow += SMALLINT_BUFF_LEN;
break;
case TSDB_DATA_TYPE_TINYINT:
+ case TSDB_DATA_TYPE_UTINYINT:
lenOfOneRow += TINYINT_BUFF_LEN;
break;
@@ -3534,27 +3699,41 @@ static int calcRowLen(SSuperTable* superTbls) {
int tagIndex;
int lenOfTagOfOneRow = 0;
for (tagIndex = 0; tagIndex < superTbls->tagCount; tagIndex++) {
- char* dataType = superTbls->tags[tagIndex].dataType;
-
- if (strcasecmp(dataType, "BINARY") == 0) {
+ char * dataType = superTbls->tags[tagIndex].dataType;
+ switch (superTbls->tags[tagIndex].data_type)
+ {
+ case TSDB_DATA_TYPE_BINARY:
lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 3;
- } else if (strcasecmp(dataType, "NCHAR") == 0) {
+ break;
+ case TSDB_DATA_TYPE_NCHAR:
lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + 3;
- } else if (strcasecmp(dataType, "INT") == 0) {
+ break;
+ case TSDB_DATA_TYPE_INT:
+ case TSDB_DATA_TYPE_UINT:
lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + INT_BUFF_LEN;
- } else if (strcasecmp(dataType, "BIGINT") == 0) {
+ break;
+ case TSDB_DATA_TYPE_BIGINT:
+ case TSDB_DATA_TYPE_UBIGINT:
lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + BIGINT_BUFF_LEN;
- } else if (strcasecmp(dataType, "SMALLINT") == 0) {
+ break;
+ case TSDB_DATA_TYPE_SMALLINT:
+ case TSDB_DATA_TYPE_USMALLINT:
lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + SMALLINT_BUFF_LEN;
- } else if (strcasecmp(dataType, "TINYINT") == 0) {
+ break;
+ case TSDB_DATA_TYPE_TINYINT:
+ case TSDB_DATA_TYPE_UTINYINT:
lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + TINYINT_BUFF_LEN;
- } else if (strcasecmp(dataType, "BOOL") == 0) {
+ break;
+ case TSDB_DATA_TYPE_BOOL:
lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + BOOL_BUFF_LEN;
- } else if (strcasecmp(dataType, "FLOAT") == 0) {
+ break;
+ case TSDB_DATA_TYPE_FLOAT:
lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + FLOAT_BUFF_LEN;
- } else if (strcasecmp(dataType, "DOUBLE") == 0) {
+ break;
+ case TSDB_DATA_TYPE_DOUBLE:
lenOfTagOfOneRow += superTbls->tags[tagIndex].dataLen + DOUBLE_BUFF_LEN;
- } else {
+ break;
+ default:
errorPrint2("get error tag type : %s\n", dataType);
exit(EXIT_FAILURE);
}
@@ -3577,10 +3756,8 @@ static int getChildNameOfSuperTableWithLimitAndOffset(TAOS * taos,
char* childTblName = *childTblNameOfSuperTbl;
- if (offset >= 0) {
- snprintf(limitBuf, 100, " limit %"PRId64" offset %"PRIu64"",
- limit, offset);
- }
+ snprintf(limitBuf, 100, " limit %"PRId64" offset %"PRIu64"",
+ limit, offset);
//get all child table name use cmd: select tbname from superTblName;
snprintf(command, 1024, "select tbname from %s.%s %s",
@@ -3689,40 +3866,60 @@ static int getSuperTableFromServer(TAOS * taos, char* dbName,
tstrncpy(superTbls->tags[tagIndex].field,
(char *)row[TSDB_DESCRIBE_METRIC_FIELD_INDEX],
fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
- tstrncpy(superTbls->tags[tagIndex].dataType,
- (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
- min(DATATYPE_BUFF_LEN,
- fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
- if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"INT", strlen("INT"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_INT;
- } else if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"TINYINT", strlen("TINYINT"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_TINYINT;
- } else if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"SMALLINT", strlen("SMALLINT"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_SMALLINT;
- } else if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"BIGINT", strlen("BIGINT"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_BIGINT;
- } else if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"FLOAT", strlen("FLOAT"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_FLOAT;
- } else if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"DOUBLE", strlen("DOUBLE"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_DOUBLE;
- } else if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"BINARY", strlen("BINARY"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_BINARY;
- } else if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"NCHAR", strlen("NCHAR"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_NCHAR;
- } else if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"BOOL", strlen("BOOL"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_BOOL;
- } else if (0 == strncasecmp(superTbls->tags[tagIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"TIMESTAMP", strlen("TIMESTAMP"))) {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_TIMESTAMP;
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "TINYINT UNSIGNED", strlen("TINYINT UNSIGNED"))) {
+ superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_UTINYINT;
+ tstrncpy(superTbls->tags[tagIndex].dataType,"UTINYINT",
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "SMALLINT UNSIGNED", strlen("SMALLINT UNSIGNED"))) {
+ superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_USMALLINT;
+ tstrncpy(superTbls->tags[tagIndex].dataType,"USMALLINT",
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "INT UNSIGNED", strlen("INT UNSIGNED"))) {
+ superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_UINT;
+ tstrncpy(superTbls->tags[tagIndex].dataType,"UINT",
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
+ }else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "BIGINT UNSIGNED", strlen("BIGINT UNSIGNED"))) {
+ superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_UBIGINT;
+ tstrncpy(superTbls->tags[tagIndex].dataType,"UBIGINT",
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
} else {
superTbls->tags[tagIndex].data_type = TSDB_DATA_TYPE_NULL;
}
@@ -3732,46 +3929,78 @@ static int getSuperTableFromServer(TAOS * taos, char* dbName,
(char *)row[TSDB_DESCRIBE_METRIC_NOTE_INDEX],
min(NOTE_BUFF_LEN,
fields[TSDB_DESCRIBE_METRIC_NOTE_INDEX].bytes) + 1);
+ if (strstr((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX], "UNSIGNED") == NULL)
+ {
+ tstrncpy(superTbls->tags[tagIndex].dataType,
+ (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
+ }
tagIndex++;
} else {
tstrncpy(superTbls->columns[columnIndex].field,
(char *)row[TSDB_DESCRIBE_METRIC_FIELD_INDEX],
fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
- tstrncpy(superTbls->columns[columnIndex].dataType,
- (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
- min(DATATYPE_BUFF_LEN,
- fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
- if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
- "INT", strlen("INT"))) {
+
+ if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "INT", strlen("INT")) &&
+ strstr((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX], "UNSIGNED") == NULL) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_INT;
- } else if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
- "TINYINT", strlen("TINYINT"))) {
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "TINYINT", strlen("TINYINT")) &&
+ strstr((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX], "UNSIGNED") == NULL) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_TINYINT;
- } else if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
- "SMALLINT", strlen("SMALLINT"))) {
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "SMALLINT", strlen("SMALLINT")) &&
+ strstr((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX], "UNSIGNED") == NULL) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_SMALLINT;
- } else if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
- "BIGINT", strlen("BIGINT"))) {
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "BIGINT", strlen("BIGINT")) &&
+ strstr((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX], "UNSIGNED") == NULL) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_BIGINT;
- } else if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"FLOAT", strlen("FLOAT"))) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_FLOAT;
- } else if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"DOUBLE", strlen("DOUBLE"))) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_DOUBLE;
- } else if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"BINARY", strlen("BINARY"))) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_BINARY;
- } else if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"NCHAR", strlen("NCHAR"))) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_NCHAR;
- } else if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"BOOL", strlen("BOOL"))) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_BOOL;
- } else if (0 == strncasecmp(superTbls->columns[columnIndex].dataType,
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
"TIMESTAMP", strlen("TIMESTAMP"))) {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_TIMESTAMP;
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "TINYINT UNSIGNED", strlen("TINYINT UNSIGNED"))) {
+ superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_UTINYINT;
+ tstrncpy(superTbls->columns[columnIndex].dataType,"UTINYINT",
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "SMALLINT UNSIGNED", strlen("SMALLINT UNSIGNED"))) {
+ superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_USMALLINT;
+ tstrncpy(superTbls->columns[columnIndex].dataType,"USMALLINT",
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "INT UNSIGNED", strlen("INT UNSIGNED"))) {
+ superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_UINT;
+ tstrncpy(superTbls->columns[columnIndex].dataType,"UINT",
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
+ } else if (0 == strncasecmp((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ "BIGINT UNSIGNED", strlen("BIGINT UNSIGNED"))) {
+ superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_UBIGINT;
+ tstrncpy(superTbls->columns[columnIndex].dataType,"UBIGINT",
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
} else {
superTbls->columns[columnIndex].data_type = TSDB_DATA_TYPE_NULL;
}
@@ -3781,6 +4010,13 @@ static int getSuperTableFromServer(TAOS * taos, char* dbName,
(char *)row[TSDB_DESCRIBE_METRIC_NOTE_INDEX],
min(NOTE_BUFF_LEN,
fields[TSDB_DESCRIBE_METRIC_NOTE_INDEX].bytes) + 1);
+
+ if (strstr((char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX], "UNSIGNED") == NULL) {
+ tstrncpy(superTbls->columns[columnIndex].dataType,
+ (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
+ min(DATATYPE_BUFF_LEN,
+ fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes) + 1);
+ }
columnIndex++;
}
@@ -3905,6 +4141,30 @@ static int createSuperTable(
lenOfOneRow += TIMESTAMP_BUFF_LEN;
break;
+ case TSDB_DATA_TYPE_UTINYINT:
+ len += snprintf(cols + len, COL_BUFFER_LEN - len, ",C%d %s",
+ colIndex, "TINYINT UNSIGNED");
+ lenOfOneRow += TINYINT_BUFF_LEN;
+ break;
+
+ case TSDB_DATA_TYPE_USMALLINT:
+ len += snprintf(cols + len, COL_BUFFER_LEN - len, ",C%d %s",
+ colIndex, "SMALLINT UNSIGNED");
+ lenOfOneRow += SMALLINT_BUFF_LEN;
+ break;
+
+ case TSDB_DATA_TYPE_UINT:
+ len += snprintf(cols + len, COL_BUFFER_LEN - len, ",C%d %s",
+ colIndex, "INT UNSIGNED");
+ lenOfOneRow += INT_BUFF_LEN;
+ break;
+
+ case TSDB_DATA_TYPE_UBIGINT:
+ len += snprintf(cols + len, COL_BUFFER_LEN - len, ",C%d %s",
+ colIndex, "BIGINT UNSIGNED");
+ lenOfOneRow += BIGINT_BUFF_LEN;
+ break;
+
default:
taos_close(taos);
free(command);
@@ -3995,6 +4255,22 @@ static int createSuperTable(
len += snprintf(tags + len, TSDB_MAX_TAGS_LEN - len,
"T%d %s,", tagIndex, "DOUBLE");
lenOfTagOfOneRow += superTbl->tags[tagIndex].dataLen + DOUBLE_BUFF_LEN;
+ } else if (strcasecmp(dataType, "UTINYINT") == 0) {
+ len += snprintf(tags + len, TSDB_MAX_TAGS_LEN - len,
+ "T%d %s,", tagIndex, "TINYINT UNSIGNED");
+ lenOfTagOfOneRow += superTbl->tags[tagIndex].dataLen + TINYINT_BUFF_LEN;
+ } else if (strcasecmp(dataType, "USMALLINT") == 0) {
+ len += snprintf(tags + len, TSDB_MAX_TAGS_LEN - len,
+ "T%d %s,", tagIndex, "SMALLINT UNSIGNED");
+ lenOfTagOfOneRow += superTbl->tags[tagIndex].dataLen + SMALLINT_BUFF_LEN;
+ } else if (strcasecmp(dataType, "UINT") == 0) {
+ len += snprintf(tags + len, TSDB_MAX_TAGS_LEN - len,
+ "T%d %s,", tagIndex, "INT UNSIGNED");
+ lenOfTagOfOneRow += superTbl->tags[tagIndex].dataLen + INT_BUFF_LEN;
+ } else if (strcasecmp(dataType, "UBIGINT") == 0) {
+ len += snprintf(tags + len, TSDB_MAX_TAGS_LEN - len,
+ "T%d %s,", tagIndex, "BIGINT UNSIGNED");
+ lenOfTagOfOneRow += superTbl->tags[tagIndex].dataLen + BIGINT_BUFF_LEN;
} else {
taos_close(taos);
free(command);
@@ -4150,19 +4426,17 @@ int createDatabasesAndStables(char *command) {
errorPrint("create super table %"PRIu64" failed!\n\n", j);
continue;
}
- }
-
- ret = getSuperTableFromServer(taos, g_Dbs.db[i].dbName,
+ } else {
+ ret = getSuperTableFromServer(taos, g_Dbs.db[i].dbName,
&g_Dbs.db[i].superTbls[j]);
- if (0 != ret) {
- errorPrint2("\nget super table %s.%s info failed!\n\n",
- g_Dbs.db[i].dbName, g_Dbs.db[i].superTbls[j].stbName);
- continue;
+ if (0 != ret) {
+ errorPrint2("\nget super table %s.%s info failed!\n\n",
+ g_Dbs.db[i].dbName, g_Dbs.db[i].superTbls[j].stbName);
+ continue;
+ }
}
-
validStbCount ++;
}
-
g_Dbs.db[i].superTblCount = validStbCount;
}
@@ -4655,6 +4929,18 @@ static bool getColumnAndTagTypeFromInsertJsonFile(
} else if (0 == strncasecmp(superTbls->columns[c].dataType,
"TIMESTAMP", strlen("TIMESTAMP"))) {
superTbls->columns[c].data_type = TSDB_DATA_TYPE_TIMESTAMP;
+ } else if (0 == strncasecmp(superTbls->columns[c].dataType,
+ "UTINYINT", strlen("UTINYINT"))) {
+ superTbls->columns[c].data_type = TSDB_DATA_TYPE_UTINYINT;
+ } else if (0 == strncasecmp(superTbls->columns[c].dataType,
+ "USMALLINT", strlen("USMALLINT"))) {
+ superTbls->columns[c].data_type = TSDB_DATA_TYPE_USMALLINT;
+ } else if (0 == strncasecmp(superTbls->columns[c].dataType,
+ "UINT", strlen("UINT"))) {
+ superTbls->columns[c].data_type = TSDB_DATA_TYPE_UINT;
+ } else if (0 == strncasecmp(superTbls->columns[c].dataType,
+ "UBIGINT", strlen("UBIGINT"))) {
+ superTbls->columns[c].data_type = TSDB_DATA_TYPE_UBIGINT;
} else {
superTbls->columns[c].data_type = TSDB_DATA_TYPE_NULL;
}
@@ -4760,6 +5046,18 @@ static bool getColumnAndTagTypeFromInsertJsonFile(
} else if (0 == strncasecmp(superTbls->tags[t].dataType,
"TIMESTAMP", strlen("TIMESTAMP"))) {
superTbls->tags[t].data_type = TSDB_DATA_TYPE_TIMESTAMP;
+ } else if (0 == strncasecmp(superTbls->tags[t].dataType,
+ "UTINYINT", strlen("UTINYINT"))) {
+ superTbls->tags[t].data_type = TSDB_DATA_TYPE_UTINYINT;
+ } else if (0 == strncasecmp(superTbls->tags[t].dataType,
+ "USMALLINT", strlen("USMALLINT"))) {
+ superTbls->tags[t].data_type = TSDB_DATA_TYPE_USMALLINT;
+ } else if (0 == strncasecmp(superTbls->tags[t].dataType,
+ "UINT", strlen("UINT"))) {
+ superTbls->tags[t].data_type = TSDB_DATA_TYPE_UINT;
+ } else if (0 == strncasecmp(superTbls->tags[t].dataType,
+ "UBIGINT", strlen("UBIGINT"))) {
+ superTbls->tags[t].data_type = TSDB_DATA_TYPE_UBIGINT;
} else {
superTbls->tags[t].data_type = TSDB_DATA_TYPE_NULL;
}
@@ -4859,15 +5157,15 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
cJSON* interlaceRows = cJSON_GetObjectItem(root, "interlace_rows");
if (interlaceRows && interlaceRows->type == cJSON_Number) {
if (interlaceRows->valueint < 0) {
- errorPrint("%s", "failed to read json, interlace_rows input mistake\n");
+ errorPrint("%s", "failed to read json, interlaceRows input mistake\n");
goto PARSE_OVER;
}
- g_args.interlace_rows = interlaceRows->valueint;
+ g_args.interlaceRows = interlaceRows->valueint;
} else if (!interlaceRows) {
- g_args.interlace_rows = 0; // 0 means progressive mode, > 0 mean interlace mode. max value is less or equ num_of_records_per_req
+ g_args.interlaceRows = 0; // 0 means progressive mode, > 0 mean interlace mode. max value is less or equ num_of_records_per_req
} else {
- errorPrint("%s", "failed to read json, interlace_rows input mistake\n");
+ errorPrint("%s", "failed to read json, interlaceRows input mistake\n");
goto PARSE_OVER;
}
@@ -4929,13 +5227,13 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
}
// rows per table need be less than insert batch
- if (g_args.interlace_rows > g_args.reqPerReq) {
+ if (g_args.interlaceRows > g_args.reqPerReq) {
printf("NOTICE: interlace rows value %u > num_of_records_per_req %u\n\n",
- g_args.interlace_rows, g_args.reqPerReq);
+ g_args.interlaceRows, g_args.reqPerReq);
printf(" interlace rows value will be set to num_of_records_per_req %u\n\n",
g_args.reqPerReq);
prompt();
- g_args.interlace_rows = g_args.reqPerReq;
+ g_args.interlaceRows = g_args.reqPerReq;
}
cJSON* dbs = cJSON_GetObjectItem(root, "databases");
@@ -5137,7 +5435,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
goto PARSE_OVER;
}
- // super_talbes
+ // super_tables
cJSON *stables = cJSON_GetObjectItem(dbinfos, "super_tables");
if (!stables || stables->type != cJSON_Array) {
errorPrint("%s", "failed to read json, super_tables not found\n");
@@ -5433,7 +5731,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
g_Dbs.db[i].superTbls[j].interlaceRows = g_Dbs.db[i].superTbls[j].insertRows;
}
} else if (!stbInterlaceRows) {
- g_Dbs.db[i].superTbls[j].interlaceRows = 0; // 0 means progressive mode, > 0 mean interlace mode. max value is less or equ num_of_records_per_req
+ g_Dbs.db[i].superTbls[j].interlaceRows = g_args.interlaceRows; // 0 means progressive mode, > 0 mean interlace mode. max value is less or equ num_of_records_per_req
} else {
errorPrint(
"%s", "failed to read json, interlace rows input mistake\n");
@@ -5474,7 +5772,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
goto PARSE_OVER;
}
} else if (!insertInterval) {
- verbosePrint("%s() LN%d: stable insert interval be overrided by global %"PRIu64".\n",
+ verbosePrint("%s() LN%d: stable insert interval be overrode by global %"PRIu64".\n",
__func__, __LINE__, g_args.insert_interval);
g_Dbs.db[i].superTbls[j].insertInterval = g_args.insert_interval;
} else {
@@ -6177,9 +6475,22 @@ static int64_t generateStbRowData(
tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, INT_BUFF_LEN));
break;
+ case TSDB_DATA_TYPE_UINT:
+ tmp = rand_uint_str();
+ tmpLen = strlen(tmp);
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, INT_BUFF_LEN));
+ break;
+
case TSDB_DATA_TYPE_BIGINT:
tmp = rand_bigint_str();
- tstrncpy(pstr + dataLen, tmp, BIGINT_BUFF_LEN);
+ tmpLen = strlen(tmp);
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, BIGINT_BUFF_LEN));
+ break;
+
+ case TSDB_DATA_TYPE_UBIGINT:
+ tmp = rand_ubigint_str();
+ tmpLen = strlen(tmp);
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, BIGINT_BUFF_LEN));
break;
case TSDB_DATA_TYPE_FLOAT:
@@ -6193,38 +6504,49 @@ static int64_t generateStbRowData(
tmp = rand_float_str();
}
tmpLen = strlen(tmp);
- tstrncpy(pstr + dataLen, tmp, min(tmpLen +1, FLOAT_BUFF_LEN));
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, FLOAT_BUFF_LEN));
break;
case TSDB_DATA_TYPE_DOUBLE:
tmp = rand_double_str();
tmpLen = strlen(tmp);
- tstrncpy(pstr + dataLen, tmp, min(tmpLen +1, DOUBLE_BUFF_LEN));
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, DOUBLE_BUFF_LEN));
break;
case TSDB_DATA_TYPE_SMALLINT:
tmp = rand_smallint_str();
tmpLen = strlen(tmp);
- tstrncpy(pstr + dataLen, tmp,
- min(tmpLen + 1, SMALLINT_BUFF_LEN));
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, SMALLINT_BUFF_LEN));
+ break;
+
+ case TSDB_DATA_TYPE_USMALLINT:
+ tmp = rand_usmallint_str();
+ tmpLen = strlen(tmp);
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, SMALLINT_BUFF_LEN));
break;
case TSDB_DATA_TYPE_TINYINT:
tmp = rand_tinyint_str();
tmpLen = strlen(tmp);
- tstrncpy(pstr + dataLen, tmp, min(tmpLen +1, TINYINT_BUFF_LEN));
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, TINYINT_BUFF_LEN));
+ break;
+
+ case TSDB_DATA_TYPE_UTINYINT:
+ tmp = rand_utinyint_str();
+ tmpLen = strlen(tmp);
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, TINYINT_BUFF_LEN));
break;
case TSDB_DATA_TYPE_BOOL:
tmp = rand_bool_str();
tmpLen = strlen(tmp);
- tstrncpy(pstr + dataLen, tmp, min(tmpLen +1, BOOL_BUFF_LEN));
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, BOOL_BUFF_LEN));
break;
case TSDB_DATA_TYPE_TIMESTAMP:
tmp = rand_bigint_str();
tmpLen = strlen(tmp);
- tstrncpy(pstr + dataLen, tmp, min(tmpLen +1, BIGINT_BUFF_LEN));
+ tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, BIGINT_BUFF_LEN));
break;
case TSDB_DATA_TYPE_NULL:
@@ -6235,9 +6557,8 @@ static int64_t generateStbRowData(
stbInfo->columns[i].dataType);
exit(EXIT_FAILURE);
}
-
if (tmp) {
- dataLen += strlen(tmp);
+ dataLen += tmpLen;
}
}
@@ -6245,7 +6566,7 @@ static int64_t generateStbRowData(
return 0;
}
- tstrncpy(pstr + dataLen, ")", 2);
+ dataLen += snprintf(pstr + dataLen, 2, ")");
verbosePrint("%s() LN%d, dataLen:%"PRId64"\n", __func__, __LINE__, dataLen);
verbosePrint("%s() LN%d, recBuf:\n\t%s\n", __func__, __LINE__, recBuf);
@@ -6322,6 +6643,22 @@ static int64_t generateData(char *recBuf, char *data_type,
free(s);
break;
+ case TSDB_DATA_TYPE_UTINYINT:
+ pstr += sprintf(pstr, ",%d", rand_utinyint() );
+ break;
+
+ case TSDB_DATA_TYPE_USMALLINT:
+ pstr += sprintf(pstr, ",%d", rand_usmallint());
+ break;
+
+ case TSDB_DATA_TYPE_UINT:
+ pstr += sprintf(pstr, ",%d", rand_uint());
+ break;
+
+ case TSDB_DATA_TYPE_UBIGINT:
+ pstr += sprintf(pstr, ",%"PRId64"", rand_ubigint());
+ break;
+
case TSDB_DATA_TYPE_NULL:
break;
@@ -6393,10 +6730,18 @@ static int generateSampleFromRand(
pos += sprintf(buff + pos, "%s,", tmp);
break;
+ case TSDB_DATA_TYPE_UINT:
+ pos += sprintf(buff + pos, "%s,", rand_uint_str());
+ break;
+
case TSDB_DATA_TYPE_BIGINT:
pos += sprintf(buff + pos, "%s,", rand_bigint_str());
break;
+ case TSDB_DATA_TYPE_UBIGINT:
+ pos += sprintf(buff + pos, "%s,", rand_ubigint_str());
+ break;
+
case TSDB_DATA_TYPE_FLOAT:
if (g_args.demo_mode) {
if (c == 0) {
@@ -6418,10 +6763,18 @@ static int generateSampleFromRand(
pos += sprintf(buff + pos, "%s,", rand_smallint_str());
break;
+ case TSDB_DATA_TYPE_USMALLINT:
+ pos += sprintf(buff + pos, "%s,", rand_usmallint_str());
+ break;
+
case TSDB_DATA_TYPE_TINYINT:
pos += sprintf(buff + pos, "%s,", rand_tinyint_str());
break;
+ case TSDB_DATA_TYPE_UTINYINT:
+ pos += sprintf(buff + pos, "%s,", rand_utinyint_str());
+ break;
+
case TSDB_DATA_TYPE_BOOL:
pos += sprintf(buff + pos, "%s,", rand_bool_str());
break;
@@ -6945,13 +7298,17 @@ static int32_t prepareStmtBindArrayByType(
char *value)
{
int32_t *bind_int;
+ uint32_t *bind_uint;
int64_t *bind_bigint;
+ uint64_t *bind_ubigint;
float *bind_float;
double *bind_double;
int8_t *bind_bool;
int64_t *bind_ts2;
int16_t *bind_smallint;
+ uint16_t *bind_usmallint;
int8_t *bind_tinyint;
+ uint8_t *bind_utinyint;
switch(data_type) {
case TSDB_DATA_TYPE_BINARY:
@@ -7016,6 +7373,22 @@ static int32_t prepareStmtBindArrayByType(
bind->length = &bind->buffer_length;
bind->is_null = NULL;
break;
+
+ case TSDB_DATA_TYPE_UINT:
+ bind_uint = malloc(sizeof(uint32_t));
+ assert(bind_uint);
+
+ if (value) {
+ *bind_uint = atoi(value);
+ } else {
+ *bind_uint = rand_int();
+ }
+ bind->buffer_type = TSDB_DATA_TYPE_UINT;
+ bind->buffer_length = sizeof(uint32_t);
+ bind->buffer = bind_uint;
+ bind->length = &bind->buffer_length;
+ bind->is_null = NULL;
+ break;
case TSDB_DATA_TYPE_BIGINT:
bind_bigint = malloc(sizeof(int64_t));
@@ -7033,6 +7406,22 @@ static int32_t prepareStmtBindArrayByType(
bind->is_null = NULL;
break;
+ case TSDB_DATA_TYPE_UBIGINT:
+ bind_ubigint = malloc(sizeof(uint64_t));
+ assert(bind_ubigint);
+
+ if (value) {
+ *bind_ubigint = atoll(value);
+ } else {
+ *bind_ubigint = rand_bigint();
+ }
+ bind->buffer_type = TSDB_DATA_TYPE_UBIGINT;
+ bind->buffer_length = sizeof(uint64_t);
+ bind->buffer = bind_ubigint;
+ bind->length = &bind->buffer_length;
+ bind->is_null = NULL;
+ break;
+
case TSDB_DATA_TYPE_FLOAT:
bind_float = malloc(sizeof(float));
assert(bind_float);
@@ -7081,6 +7470,22 @@ static int32_t prepareStmtBindArrayByType(
bind->is_null = NULL;
break;
+ case TSDB_DATA_TYPE_USMALLINT:
+ bind_usmallint = malloc(sizeof(uint16_t));
+ assert(bind_usmallint);
+
+ if (value) {
+ *bind_usmallint = (uint16_t)atoi(value);
+ } else {
+ *bind_usmallint = rand_smallint();
+ }
+ bind->buffer_type = TSDB_DATA_TYPE_SMALLINT;
+ bind->buffer_length = sizeof(uint16_t);
+ bind->buffer = bind_usmallint;
+ bind->length = &bind->buffer_length;
+ bind->is_null = NULL;
+ break;
+
case TSDB_DATA_TYPE_TINYINT:
bind_tinyint = malloc(sizeof(int8_t));
assert(bind_tinyint);
@@ -7097,6 +7502,22 @@ static int32_t prepareStmtBindArrayByType(
bind->is_null = NULL;
break;
+ case TSDB_DATA_TYPE_UTINYINT:
+ bind_utinyint = malloc(sizeof(uint8_t));
+ assert(bind_utinyint);
+
+ if (value) {
+ *bind_utinyint = (int8_t)atoi(value);
+ } else {
+ *bind_utinyint = rand_tinyint();
+ }
+ bind->buffer_type = TSDB_DATA_TYPE_UTINYINT;
+ bind->buffer_length = sizeof(uint8_t);
+ bind->buffer = bind_utinyint;
+ bind->length = &bind->buffer_length;
+ bind->is_null = NULL;
+ break;
+
case TSDB_DATA_TYPE_BOOL:
bind_bool = malloc(sizeof(int8_t));
assert(bind_bool);
@@ -7171,11 +7592,15 @@ static int32_t prepareStmtBindArrayByTypeForRand(
char *value)
{
int32_t *bind_int;
+ uint32_t *bind_uint;
int64_t *bind_bigint;
+ uint64_t *bind_ubigint;
float *bind_float;
double *bind_double;
int16_t *bind_smallint;
+ uint16_t *bind_usmallint;
int8_t *bind_tinyint;
+ uint8_t *bind_utinyint;
int8_t *bind_bool;
int64_t *bind_ts2;
@@ -7245,16 +7670,33 @@ static int32_t prepareStmtBindArrayByTypeForRand(
*ptr += bind->buffer_length;
break;
- case TSDB_DATA_TYPE_BIGINT:
- bind_bigint = (int64_t *)*ptr;
+ case TSDB_DATA_TYPE_UINT:
+ bind_uint = (uint32_t *)*ptr;
if (value) {
- *bind_bigint = atoll(value);
+ *bind_uint = atoi(value);
} else {
- *bind_bigint = rand_bigint();
+ *bind_uint = rand_int();
}
- bind->buffer_type = TSDB_DATA_TYPE_BIGINT;
- bind->buffer_length = sizeof(int64_t);
+ bind->buffer_type = TSDB_DATA_TYPE_UINT;
+ bind->buffer_length = sizeof(uint32_t);
+ bind->buffer = bind_uint;
+ bind->length = &bind->buffer_length;
+ bind->is_null = NULL;
+
+ *ptr += bind->buffer_length;
+ break;
+
+ case TSDB_DATA_TYPE_BIGINT:
+ bind_bigint = (int64_t *)*ptr;
+
+ if (value) {
+ *bind_bigint = atoll(value);
+ } else {
+ *bind_bigint = rand_bigint();
+ }
+ bind->buffer_type = TSDB_DATA_TYPE_BIGINT;
+ bind->buffer_length = sizeof(int64_t);
bind->buffer = bind_bigint;
bind->length = &bind->buffer_length;
bind->is_null = NULL;
@@ -7262,6 +7704,23 @@ static int32_t prepareStmtBindArrayByTypeForRand(
*ptr += bind->buffer_length;
break;
+ case TSDB_DATA_TYPE_UBIGINT:
+ bind_ubigint = (uint64_t *)*ptr;
+
+ if (value) {
+ *bind_ubigint = atoll(value);
+ } else {
+ *bind_ubigint = rand_bigint();
+ }
+ bind->buffer_type = TSDB_DATA_TYPE_UBIGINT;
+ bind->buffer_length = sizeof(uint64_t);
+ bind->buffer = bind_ubigint;
+ bind->length = &bind->buffer_length;
+ bind->is_null = NULL;
+
+ *ptr += bind->buffer_length;
+ break;
+
case TSDB_DATA_TYPE_FLOAT:
bind_float = (float *)*ptr;
@@ -7313,6 +7772,23 @@ static int32_t prepareStmtBindArrayByTypeForRand(
*ptr += bind->buffer_length;
break;
+ case TSDB_DATA_TYPE_USMALLINT:
+ bind_usmallint = (uint16_t *)*ptr;
+
+ if (value) {
+ *bind_usmallint = (uint16_t)atoi(value);
+ } else {
+ *bind_usmallint = rand_smallint();
+ }
+ bind->buffer_type = TSDB_DATA_TYPE_USMALLINT;
+ bind->buffer_length = sizeof(uint16_t);
+ bind->buffer = bind_usmallint;
+ bind->length = &bind->buffer_length;
+ bind->is_null = NULL;
+
+ *ptr += bind->buffer_length;
+ break;
+
case TSDB_DATA_TYPE_TINYINT:
bind_tinyint = (int8_t *)*ptr;
@@ -7330,6 +7806,23 @@ static int32_t prepareStmtBindArrayByTypeForRand(
*ptr += bind->buffer_length;
break;
+ case TSDB_DATA_TYPE_UTINYINT:
+ bind_utinyint = (uint8_t *)*ptr;
+
+ if (value) {
+ *bind_utinyint = (uint8_t)atoi(value);
+ } else {
+ *bind_utinyint = rand_tinyint();
+ }
+ bind->buffer_type = TSDB_DATA_TYPE_UTINYINT;
+ bind->buffer_length = sizeof(uint8_t);
+ bind->buffer = bind_utinyint;
+ bind->length = &bind->buffer_length;
+ bind->is_null = NULL;
+
+ *ptr += bind->buffer_length;
+ break;
+
case TSDB_DATA_TYPE_BOOL:
bind_bool = (int8_t *)*ptr;
@@ -7451,6 +7944,7 @@ static int32_t prepareStmtWithoutStb(
g_args.binwidth,
pThreadInfo->time_precision,
NULL)) {
+ free(bindArray);
return -1;
}
}
@@ -7724,6 +8218,7 @@ static int execBindParamBatch(
break;
case TSDB_DATA_TYPE_INT:
+ case TSDB_DATA_TYPE_UINT:
param->buffer_length = sizeof(int32_t);
param->buffer = (stbInfo)?
(void *)((uintptr_t)*(uintptr_t*)(stbInfo->sampleBindBatchArray+sizeof(char*)*(c-1))
@@ -7733,6 +8228,7 @@ static int execBindParamBatch(
break;
case TSDB_DATA_TYPE_TINYINT:
+ case TSDB_DATA_TYPE_UTINYINT:
param->buffer_length = sizeof(int8_t);
param->buffer = (stbInfo)?
(void *)((uintptr_t)*(uintptr_t*)(
@@ -7745,6 +8241,7 @@ static int execBindParamBatch(
break;
case TSDB_DATA_TYPE_SMALLINT:
+ case TSDB_DATA_TYPE_USMALLINT:
param->buffer_length = sizeof(int16_t);
param->buffer = (stbInfo)?
(void *)((uintptr_t)*(uintptr_t*)(stbInfo->sampleBindBatchArray+sizeof(char*)*(c-1))
@@ -7754,6 +8251,7 @@ static int execBindParamBatch(
break;
case TSDB_DATA_TYPE_BIGINT:
+ case TSDB_DATA_TYPE_UBIGINT:
param->buffer_length = sizeof(int64_t);
param->buffer = (stbInfo)?
(void *)((uintptr_t)*(uintptr_t*)(stbInfo->sampleBindBatchArray+sizeof(char*)*(c-1))
@@ -7900,24 +8398,28 @@ static int parseSamplefileToStmtBatch(
switch(data_type) {
case TSDB_DATA_TYPE_INT:
+ case TSDB_DATA_TYPE_UINT:
tmpP = calloc(1, sizeof(int) * MAX_SAMPLES);
assert(tmpP);
*(uintptr_t*)(sampleBindBatchArray+ sizeof(uintptr_t*)*c) = (uintptr_t)tmpP;
break;
case TSDB_DATA_TYPE_TINYINT:
+ case TSDB_DATA_TYPE_UTINYINT:
tmpP = calloc(1, sizeof(int8_t) * MAX_SAMPLES);
assert(tmpP);
*(uintptr_t*)(sampleBindBatchArray+ sizeof(uintptr_t*)*c) = (uintptr_t)tmpP;
break;
case TSDB_DATA_TYPE_SMALLINT:
+ case TSDB_DATA_TYPE_USMALLINT:
tmpP = calloc(1, sizeof(int16_t) * MAX_SAMPLES);
assert(tmpP);
*(uintptr_t*)(sampleBindBatchArray+ sizeof(uintptr_t*)*c) = (uintptr_t)tmpP;
break;
case TSDB_DATA_TYPE_BIGINT:
+ case TSDB_DATA_TYPE_UBIGINT:
tmpP = calloc(1, sizeof(int64_t) * MAX_SAMPLES);
assert(tmpP);
*(uintptr_t*)(sampleBindBatchArray+ sizeof(uintptr_t*)*c) = (uintptr_t)tmpP;
@@ -7996,6 +8498,7 @@ static int parseSamplefileToStmtBatch(
switch(data_type) {
case TSDB_DATA_TYPE_INT:
+ case TSDB_DATA_TYPE_UINT:
*((int32_t*)((uintptr_t)*(uintptr_t*)(sampleBindBatchArray
+sizeof(char*)*c)+sizeof(int32_t)*i)) =
atoi(tmpStr);
@@ -8014,18 +8517,21 @@ static int parseSamplefileToStmtBatch(
break;
case TSDB_DATA_TYPE_TINYINT:
+ case TSDB_DATA_TYPE_UTINYINT:
*((int8_t*)((uintptr_t)*(uintptr_t*)(sampleBindBatchArray
+sizeof(char*)*c)+sizeof(int8_t)*i)) =
(int8_t)atoi(tmpStr);
break;
case TSDB_DATA_TYPE_SMALLINT:
+ case TSDB_DATA_TYPE_USMALLINT:
*((int16_t*)((uintptr_t)*(uintptr_t*)(sampleBindBatchArray
+sizeof(char*)*c)+sizeof(int16_t)*i)) =
(int16_t)atoi(tmpStr);
break;
case TSDB_DATA_TYPE_BIGINT:
+ case TSDB_DATA_TYPE_UBIGINT:
*((int64_t*)((uintptr_t)*(uintptr_t*)(sampleBindBatchArray
+sizeof(char*)*c)+sizeof(int64_t)*i)) =
(int64_t)atol(tmpStr);
@@ -8105,7 +8611,7 @@ static int parseSampleToStmt(
SSuperTable *stbInfo, uint32_t timePrec)
{
pThreadInfo->sampleBindArray =
- calloc(1, sizeof(char *) * MAX_SAMPLES);
+ (char *)calloc(1, sizeof(char *) * MAX_SAMPLES);
if (pThreadInfo->sampleBindArray == NULL) {
errorPrint2("%s() LN%d, Failed to allocate %"PRIu64" bind array buffer\n",
__func__, __LINE__,
@@ -8173,6 +8679,7 @@ static int parseSampleToStmt(
timePrec,
bindBuffer)) {
free(bindBuffer);
+ free(bindArray);
return -1;
}
free(bindBuffer);
@@ -8295,7 +8802,7 @@ static uint32_t execBindParam(
}
#endif
-static int32_t prepareStbStmtWithSample(
+static int32_t prepareStbStmt(
threadInfo *pThreadInfo,
char *tableName,
int64_t tableSeq,
@@ -8431,67 +8938,496 @@ static int32_t generateProgressiveDataWithoutStb(
memset(buffer, 0, *pRemainderBufLen);
- int64_t headLen = generateSQLHeadWithoutStb(
- tableName, pThreadInfo->db_name,
- buffer, *pRemainderBufLen);
+ int64_t headLen = generateSQLHeadWithoutStb(
+ tableName, pThreadInfo->db_name,
+ buffer, *pRemainderBufLen);
+
+ if (headLen <= 0) {
+ return 0;
+ }
+ pstr += headLen;
+ *pRemainderBufLen -= headLen;
+
+ int64_t dataLen;
+
+ return generateDataTailWithoutStb(
+ g_args.reqPerReq, pstr, *pRemainderBufLen, insertRows, recordFrom,
+ startTime,
+ /*pSamplePos, */&dataLen);
+}
+
+static void printStatPerThread(threadInfo *pThreadInfo)
+{
+ if (0 == pThreadInfo->totalDelay)
+ pThreadInfo->totalDelay = 1;
+
+ fprintf(stderr, "====thread[%d] completed total inserted rows: %"PRIu64 ", total affected rows: %"PRIu64". %.2f records/second====\n",
+ pThreadInfo->threadID,
+ pThreadInfo->totalInsertRows,
+ pThreadInfo->totalAffectedRows,
+ (double)(pThreadInfo->totalAffectedRows/((double)pThreadInfo->totalDelay/1000000.0))
+ );
+}
+
+#if STMT_BIND_PARAM_BATCH == 1
+// stmt sync write interlace data
+static void* syncWriteInterlaceStmtBatch(threadInfo *pThreadInfo, uint32_t interlaceRows) {
+ debugPrint("[%d] %s() LN%d: ### stmt interlace write\n",
+ pThreadInfo->threadID, __func__, __LINE__);
+
+ int64_t insertRows;
+ int64_t timeStampStep;
+ uint64_t insert_interval;
+
+ SSuperTable* stbInfo = pThreadInfo->stbInfo;
+
+ if (stbInfo) {
+ insertRows = stbInfo->insertRows;
+ timeStampStep = stbInfo->timeStampStep;
+ insert_interval = stbInfo->insertInterval;
+ } else {
+ insertRows = g_args.insertRows;
+ timeStampStep = g_args.timestamp_step;
+ insert_interval = g_args.insert_interval;
+ }
+
+ debugPrint("[%d] %s() LN%d: start_table_from=%"PRIu64" ntables=%"PRId64" insertRows=%"PRIu64"\n",
+ pThreadInfo->threadID, __func__, __LINE__,
+ pThreadInfo->start_table_from,
+ pThreadInfo->ntables, insertRows);
+
+ uint64_t timesInterlace = (insertRows / interlaceRows) + 1;
+ uint32_t precalcBatch = interlaceRows;
+
+ if (precalcBatch > g_args.reqPerReq)
+ precalcBatch = g_args.reqPerReq;
+
+ if (precalcBatch > MAX_SAMPLES)
+ precalcBatch = MAX_SAMPLES;
+
+ pThreadInfo->totalInsertRows = 0;
+ pThreadInfo->totalAffectedRows = 0;
+
+ uint64_t st = 0;
+ uint64_t et = UINT64_MAX;
+
+ uint64_t lastPrintTime = taosGetTimestampMs();
+ uint64_t startTs = taosGetTimestampMs();
+ uint64_t endTs;
+
+ uint64_t tableSeq = pThreadInfo->start_table_from;
+ int64_t startTime;
+
+ bool flagSleep = true;
+ uint64_t sleepTimeTotal = 0;
+
+ int percentComplete = 0;
+ int64_t totalRows = insertRows * pThreadInfo->ntables;
+ pThreadInfo->samplePos = 0;
+
+ for (int64_t interlace = 0;
+ interlace < timesInterlace; interlace ++) {
+ if ((flagSleep) && (insert_interval)) {
+ st = taosGetTimestampMs();
+ flagSleep = false;
+ }
+
+ int64_t generated = 0;
+ int64_t samplePos;
+
+ for (; tableSeq < pThreadInfo->start_table_from + pThreadInfo->ntables; tableSeq ++) {
+ char tableName[TSDB_TABLE_NAME_LEN];
+ getTableName(tableName, pThreadInfo, tableSeq);
+ if (0 == strlen(tableName)) {
+ errorPrint2("[%d] %s() LN%d, getTableName return null\n",
+ pThreadInfo->threadID, __func__, __LINE__);
+ return NULL;
+ }
+
+ samplePos = pThreadInfo->samplePos;
+ startTime = pThreadInfo->start_time
+ + interlace * interlaceRows * timeStampStep;
+ uint64_t remainRecPerTbl =
+ insertRows - interlaceRows * interlace;
+ uint64_t recPerTbl = 0;
+
+ uint64_t remainPerInterlace;
+ if (remainRecPerTbl > interlaceRows) {
+ remainPerInterlace = interlaceRows;
+ } else {
+ remainPerInterlace = remainRecPerTbl;
+ }
+
+ while(remainPerInterlace > 0) {
+
+ uint32_t batch;
+ if (remainPerInterlace > precalcBatch) {
+ batch = precalcBatch;
+ } else {
+ batch = remainPerInterlace;
+ }
+ debugPrint("[%d] %s() LN%d, tableName:%s, batch:%d startTime:%"PRId64"\n",
+ pThreadInfo->threadID,
+ __func__, __LINE__,
+ tableName, batch, startTime);
+
+ if (stbInfo) {
+ generated = prepareStbStmt(
+ pThreadInfo,
+ tableName,
+ tableSeq,
+ batch,
+ insertRows, 0,
+ startTime,
+ &samplePos);
+ } else {
+ generated = prepareStmtWithoutStb(
+ pThreadInfo,
+ tableName,
+ batch,
+ insertRows,
+ interlaceRows * interlace + recPerTbl,
+ startTime);
+ }
+
+ debugPrint("[%d] %s() LN%d, generated records is %"PRId64"\n",
+ pThreadInfo->threadID, __func__, __LINE__, generated);
+ if (generated < 0) {
+ errorPrint2("[%d] %s() LN%d, generated records is %"PRId64"\n",
+ pThreadInfo->threadID, __func__, __LINE__, generated);
+ goto free_of_interlace_stmt;
+ } else if (generated == 0) {
+ break;
+ }
+
+ recPerTbl += generated;
+ remainPerInterlace -= generated;
+ pThreadInfo->totalInsertRows += generated;
+
+ verbosePrint("[%d] %s() LN%d totalInsertRows=%"PRIu64"\n",
+ pThreadInfo->threadID, __func__, __LINE__,
+ pThreadInfo->totalInsertRows);
+
+ startTs = taosGetTimestampUs();
+
+ int64_t affectedRows = execInsert(pThreadInfo, generated);
+
+ endTs = taosGetTimestampUs();
+ uint64_t delay = endTs - startTs;
+ performancePrint("%s() LN%d, insert execution time is %10.2f ms\n",
+ __func__, __LINE__, delay / 1000.0);
+ verbosePrint("[%d] %s() LN%d affectedRows=%"PRId64"\n",
+ pThreadInfo->threadID,
+ __func__, __LINE__, affectedRows);
+
+ if (delay > pThreadInfo->maxDelay) pThreadInfo->maxDelay = delay;
+ if (delay < pThreadInfo->minDelay) pThreadInfo->minDelay = delay;
+ pThreadInfo->cntDelay++;
+ pThreadInfo->totalDelay += delay;
+
+ if (generated != affectedRows) {
+ errorPrint2("[%d] %s() LN%d execInsert() insert %"PRId64", affected rows: %"PRId64"\n\n",
+ pThreadInfo->threadID, __func__, __LINE__,
+ generated, affectedRows);
+ goto free_of_interlace_stmt;
+ }
+
+ pThreadInfo->totalAffectedRows += affectedRows;
+
+ int currentPercent = pThreadInfo->totalAffectedRows * 100 / totalRows;
+ if (currentPercent > percentComplete ) {
+ printf("[%d]:%d%%\n", pThreadInfo->threadID, currentPercent);
+ percentComplete = currentPercent;
+ }
+ int64_t currentPrintTime = taosGetTimestampMs();
+ if (currentPrintTime - lastPrintTime > 30*1000) {
+ printf("thread[%d] has currently inserted rows: %"PRIu64 ", affected rows: %"PRIu64 "\n",
+ pThreadInfo->threadID,
+ pThreadInfo->totalInsertRows,
+ pThreadInfo->totalAffectedRows);
+ lastPrintTime = currentPrintTime;
+ }
+
+ startTime += (generated * timeStampStep);
+ }
+ }
+ pThreadInfo->samplePos = samplePos;
+
+ if (tableSeq == pThreadInfo->start_table_from
+ + pThreadInfo->ntables) {
+ // turn to first table
+ tableSeq = pThreadInfo->start_table_from;
+
+ flagSleep = true;
+ }
+
+ if ((insert_interval) && flagSleep) {
+ et = taosGetTimestampMs();
+
+ if (insert_interval > (et - st) ) {
+ uint64_t sleepTime = insert_interval - (et -st);
+ performancePrint("%s() LN%d sleep: %"PRId64" ms for insert interval\n",
+ __func__, __LINE__, sleepTime);
+ taosMsleep(sleepTime); // ms
+ sleepTimeTotal += insert_interval;
+ }
+ }
+ }
+ if (percentComplete < 100)
+ printf("[%d]:%d%%\n", pThreadInfo->threadID, percentComplete);
+
+free_of_interlace_stmt:
+ printStatPerThread(pThreadInfo);
+ return NULL;
+}
+#else
+// stmt sync write interlace data
+static void* syncWriteInterlaceStmt(threadInfo *pThreadInfo, uint32_t interlaceRows) {
+ debugPrint("[%d] %s() LN%d: ### stmt interlace write\n",
+ pThreadInfo->threadID, __func__, __LINE__);
+
+ int64_t insertRows;
+ uint64_t maxSqlLen;
+ int64_t timeStampStep;
+ uint64_t insert_interval;
+
+ SSuperTable* stbInfo = pThreadInfo->stbInfo;
+
+ if (stbInfo) {
+ insertRows = stbInfo->insertRows;
+ maxSqlLen = stbInfo->maxSqlLen;
+ timeStampStep = stbInfo->timeStampStep;
+ insert_interval = stbInfo->insertInterval;
+ } else {
+ insertRows = g_args.insertRows;
+ maxSqlLen = g_args.max_sql_len;
+ timeStampStep = g_args.timestamp_step;
+ insert_interval = g_args.insert_interval;
+ }
+
+ debugPrint("[%d] %s() LN%d: start_table_from=%"PRIu64" ntables=%"PRId64" insertRows=%"PRIu64"\n",
+ pThreadInfo->threadID, __func__, __LINE__,
+ pThreadInfo->start_table_from,
+ pThreadInfo->ntables, insertRows);
+
+ uint32_t batchPerTbl = interlaceRows;
+ uint32_t batchPerTblTimes;
+
+ if (interlaceRows > g_args.reqPerReq)
+ interlaceRows = g_args.reqPerReq;
+
+ if ((interlaceRows > 0) && (pThreadInfo->ntables > 1)) {
+ batchPerTblTimes =
+ g_args.reqPerReq / interlaceRows;
+ } else {
+ batchPerTblTimes = 1;
+ }
+
+ pThreadInfo->totalInsertRows = 0;
+ pThreadInfo->totalAffectedRows = 0;
+
+ uint64_t st = 0;
+ uint64_t et = UINT64_MAX;
+
+ uint64_t lastPrintTime = taosGetTimestampMs();
+ uint64_t startTs = taosGetTimestampMs();
+ uint64_t endTs;
+
+ uint64_t tableSeq = pThreadInfo->start_table_from;
+ int64_t startTime = pThreadInfo->start_time;
+
+ uint64_t generatedRecPerTbl = 0;
+ bool flagSleep = true;
+ uint64_t sleepTimeTotal = 0;
+
+ int percentComplete = 0;
+ int64_t totalRows = insertRows * pThreadInfo->ntables;
+
+ while(pThreadInfo->totalInsertRows < pThreadInfo->ntables * insertRows) {
+ if ((flagSleep) && (insert_interval)) {
+ st = taosGetTimestampMs();
+ flagSleep = false;
+ }
+
+ uint32_t recOfBatch = 0;
+
+ int32_t generated;
+ for (uint64_t i = 0; i < batchPerTblTimes; i ++) {
+ char tableName[TSDB_TABLE_NAME_LEN];
+
+ getTableName(tableName, pThreadInfo, tableSeq);
+ if (0 == strlen(tableName)) {
+ errorPrint2("[%d] %s() LN%d, getTableName return null\n",
+ pThreadInfo->threadID, __func__, __LINE__);
+ return NULL;
+ }
+
+ debugPrint("[%d] %s() LN%d, tableName:%s, batch:%d startTime:%"PRId64"\n",
+ pThreadInfo->threadID,
+ __func__, __LINE__,
+ tableName, batchPerTbl, startTime);
+ if (stbInfo) {
+ generated = prepareStbStmt(
+ pThreadInfo,
+ tableName,
+ tableSeq,
+ batchPerTbl,
+ insertRows, 0,
+ startTime,
+ &(pThreadInfo->samplePos));
+ } else {
+ generated = prepareStmtWithoutStb(
+ pThreadInfo,
+ tableName,
+ batchPerTbl,
+ insertRows, i,
+ startTime);
+ }
+
+ debugPrint("[%d] %s() LN%d, generated records is %d\n",
+ pThreadInfo->threadID, __func__, __LINE__, generated);
+ if (generated < 0) {
+ errorPrint2("[%d] %s() LN%d, generated records is %d\n",
+ pThreadInfo->threadID, __func__, __LINE__, generated);
+ goto free_of_interlace_stmt;
+ } else if (generated == 0) {
+ break;
+ }
+
+ tableSeq ++;
+ recOfBatch += batchPerTbl;
+
+ pThreadInfo->totalInsertRows += batchPerTbl;
+
+ verbosePrint("[%d] %s() LN%d batchPerTbl=%d recOfBatch=%d\n",
+ pThreadInfo->threadID, __func__, __LINE__,
+ batchPerTbl, recOfBatch);
+
+ if (tableSeq == pThreadInfo->start_table_from + pThreadInfo->ntables) {
+ // turn to first table
+ tableSeq = pThreadInfo->start_table_from;
+ generatedRecPerTbl += batchPerTbl;
+
+ startTime = pThreadInfo->start_time
+ + generatedRecPerTbl * timeStampStep;
+
+ flagSleep = true;
+ if (generatedRecPerTbl >= insertRows)
+ break;
+
+ int64_t remainRows = insertRows - generatedRecPerTbl;
+ if ((remainRows > 0) && (batchPerTbl > remainRows))
+ batchPerTbl = remainRows;
+
+ if (pThreadInfo->ntables * batchPerTbl < g_args.reqPerReq)
+ break;
+ }
+
+ verbosePrint("[%d] %s() LN%d generatedRecPerTbl=%"PRId64" insertRows=%"PRId64"\n",
+ pThreadInfo->threadID, __func__, __LINE__,
+ generatedRecPerTbl, insertRows);
+
+ if ((g_args.reqPerReq - recOfBatch) < batchPerTbl)
+ break;
+ }
+
+ verbosePrint("[%d] %s() LN%d recOfBatch=%d totalInsertRows=%"PRIu64"\n",
+ pThreadInfo->threadID, __func__, __LINE__, recOfBatch,
+ pThreadInfo->totalInsertRows);
+
+ startTs = taosGetTimestampUs();
+
+ if (recOfBatch == 0) {
+ errorPrint2("[%d] %s() LN%d Failed to insert records of batch %d\n",
+ pThreadInfo->threadID, __func__, __LINE__,
+ batchPerTbl);
+ if (batchPerTbl > 0) {
+ errorPrint("\tIf the batch is %d, the length of the SQL to insert a row must be less then %"PRId64"\n",
+ batchPerTbl, maxSqlLen / batchPerTbl);
+ }
+ goto free_of_interlace_stmt;
+ }
+ int64_t affectedRows = execInsert(pThreadInfo, recOfBatch);
+
+ endTs = taosGetTimestampUs();
+ uint64_t delay = endTs - startTs;
+ performancePrint("%s() LN%d, insert execution time is %10.2f ms\n",
+ __func__, __LINE__, delay / 1000.0);
+ verbosePrint("[%d] %s() LN%d affectedRows=%"PRId64"\n",
+ pThreadInfo->threadID,
+ __func__, __LINE__, affectedRows);
+
+ if (delay > pThreadInfo->maxDelay) pThreadInfo->maxDelay = delay;
+ if (delay < pThreadInfo->minDelay) pThreadInfo->minDelay = delay;
+ pThreadInfo->cntDelay++;
+ pThreadInfo->totalDelay += delay;
+
+ if (recOfBatch != affectedRows) {
+ errorPrint2("[%d] %s() LN%d execInsert insert %d, affected rows: %"PRId64"\n\n",
+ pThreadInfo->threadID, __func__, __LINE__,
+ recOfBatch, affectedRows);
+ goto free_of_interlace_stmt;
+ }
+
+ pThreadInfo->totalAffectedRows += affectedRows;
+
+ int currentPercent = pThreadInfo->totalAffectedRows * 100 / totalRows;
+ if (currentPercent > percentComplete ) {
+ printf("[%d]:%d%%\n", pThreadInfo->threadID, currentPercent);
+ percentComplete = currentPercent;
+ }
+ int64_t currentPrintTime = taosGetTimestampMs();
+ if (currentPrintTime - lastPrintTime > 30*1000) {
+ printf("thread[%d] has currently inserted rows: %"PRIu64 ", affected rows: %"PRIu64 "\n",
+ pThreadInfo->threadID,
+ pThreadInfo->totalInsertRows,
+ pThreadInfo->totalAffectedRows);
+ lastPrintTime = currentPrintTime;
+ }
+
+ if ((insert_interval) && flagSleep) {
+ et = taosGetTimestampMs();
- if (headLen <= 0) {
- return 0;
+ if (insert_interval > (et - st) ) {
+ uint64_t sleepTime = insert_interval - (et -st);
+ performancePrint("%s() LN%d sleep: %"PRId64" ms for insert interval\n",
+ __func__, __LINE__, sleepTime);
+ taosMsleep(sleepTime); // ms
+ sleepTimeTotal += insert_interval;
+ }
+ }
}
- pstr += headLen;
- *pRemainderBufLen -= headLen;
-
- int64_t dataLen;
+ if (percentComplete < 100)
+ printf("[%d]:%d%%\n", pThreadInfo->threadID, percentComplete);
- return generateDataTailWithoutStb(
- g_args.reqPerReq, pstr, *pRemainderBufLen, insertRows, recordFrom,
- startTime,
- /*pSamplePos, */&dataLen);
+free_of_interlace_stmt:
+ printStatPerThread(pThreadInfo);
+ return NULL;
}
-static void printStatPerThread(threadInfo *pThreadInfo)
-{
- if (0 == pThreadInfo->totalDelay)
- pThreadInfo->totalDelay = 1;
-
- fprintf(stderr, "====thread[%d] completed total inserted rows: %"PRIu64 ", total affected rows: %"PRIu64". %.2f records/second====\n",
- pThreadInfo->threadID,
- pThreadInfo->totalInsertRows,
- pThreadInfo->totalAffectedRows,
- (double)(pThreadInfo->totalAffectedRows/((double)pThreadInfo->totalDelay/1000000.0))
- );
-}
+#endif
// sync write interlace data
-static void* syncWriteInterlace(threadInfo *pThreadInfo) {
+static void* syncWriteInterlace(threadInfo *pThreadInfo, uint32_t interlaceRows) {
debugPrint("[%d] %s() LN%d: ### interlace write\n",
pThreadInfo->threadID, __func__, __LINE__);
int64_t insertRows;
- uint32_t interlaceRows;
uint64_t maxSqlLen;
- int64_t nTimeStampStep;
+ int64_t timeStampStep;
uint64_t insert_interval;
SSuperTable* stbInfo = pThreadInfo->stbInfo;
if (stbInfo) {
insertRows = stbInfo->insertRows;
-
- if ((stbInfo->interlaceRows == 0)
- && (g_args.interlace_rows > 0)) {
- interlaceRows = g_args.interlace_rows;
- } else {
- interlaceRows = stbInfo->interlaceRows;
- }
maxSqlLen = stbInfo->maxSqlLen;
- nTimeStampStep = stbInfo->timeStampStep;
+ timeStampStep = stbInfo->timeStampStep;
insert_interval = stbInfo->insertInterval;
} else {
insertRows = g_args.insertRows;
- interlaceRows = g_args.interlace_rows;
maxSqlLen = g_args.max_sql_len;
- nTimeStampStep = g_args.timestamp_step;
+ timeStampStep = g_args.timestamp_step;
insert_interval = g_args.insert_interval;
}
@@ -8499,10 +9435,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
pThreadInfo->threadID, __func__, __LINE__,
pThreadInfo->start_table_from,
pThreadInfo->ntables, insertRows);
-
- if (interlaceRows > insertRows)
- interlaceRows = insertRows;
-
+#if 1
if (interlaceRows > g_args.reqPerReq)
interlaceRows = g_args.reqPerReq;
@@ -8515,7 +9448,22 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
} else {
batchPerTblTimes = 1;
}
+#else
+ uint32_t batchPerTbl;
+ if (interlaceRows > g_args.reqPerReq)
+ batchPerTbl = g_args.reqPerReq;
+ else
+ batchPerTbl = interlaceRows;
+
+ uint32_t batchPerTblTimes;
+ if ((interlaceRows > 0) && (pThreadInfo->ntables > 1)) {
+ batchPerTblTimes =
+ interlaceRows / batchPerTbl;
+ } else {
+ batchPerTblTimes = 1;
+ }
+#endif
pThreadInfo->buffer = calloc(maxSqlLen, 1);
if (NULL == pThreadInfo->buffer) {
errorPrint2( "%s() LN%d, Failed to alloc %"PRIu64" Bytes, reason:%s\n",
@@ -8548,6 +9496,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
st = taosGetTimestampMs();
flagSleep = false;
}
+
// generate data
memset(pThreadInfo->buffer, 0, maxSqlLen);
uint64_t remainderBufLen = maxSqlLen;
@@ -8576,47 +9525,23 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
uint64_t oldRemainderLen = remainderBufLen;
if (stbInfo) {
- if (stbInfo->iface == STMT_IFACE) {
- generated = prepareStbStmtWithSample(
- pThreadInfo,
- tableName,
- tableSeq,
- batchPerTbl,
- insertRows, 0,
- startTime,
- &(pThreadInfo->samplePos));
- } else {
- generated = generateStbInterlaceData(
- pThreadInfo,
- tableName, batchPerTbl, i,
- batchPerTblTimes,
- tableSeq,
- pstr,
- insertRows,
- startTime,
- &remainderBufLen);
- }
+ generated = generateStbInterlaceData(
+ pThreadInfo,
+ tableName, batchPerTbl, i,
+ batchPerTblTimes,
+ tableSeq,
+ pstr,
+ insertRows,
+ startTime,
+ &remainderBufLen);
} else {
- if (g_args.iface == STMT_IFACE) {
- debugPrint("[%d] %s() LN%d, tableName:%s, batch:%d startTime:%"PRId64"\n",
- pThreadInfo->threadID,
- __func__, __LINE__,
- tableName, batchPerTbl, startTime);
- generated = prepareStmtWithoutStb(
- pThreadInfo,
- tableName,
- batchPerTbl,
- insertRows, i,
- startTime);
- } else {
- generated = generateInterlaceDataWithoutStb(
- tableName, batchPerTbl,
- tableSeq,
- pThreadInfo->db_name, pstr,
- insertRows,
- startTime,
- &remainderBufLen);
- }
+ generated = generateInterlaceDataWithoutStb(
+ tableName, batchPerTbl,
+ tableSeq,
+ pThreadInfo->db_name, pstr,
+ insertRows,
+ startTime,
+ &remainderBufLen);
}
debugPrint("[%d] %s() LN%d, generated records is %d\n",
@@ -8645,7 +9570,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
generatedRecPerTbl += batchPerTbl;
startTime = pThreadInfo->start_time
- + generatedRecPerTbl * nTimeStampStep;
+ + generatedRecPerTbl * timeStampStep;
flagSleep = true;
if (generatedRecPerTbl >= insertRows)
@@ -8746,6 +9671,144 @@ free_of_interlace:
return NULL;
}
+static void* syncWriteProgressiveStmt(threadInfo *pThreadInfo) {
+ debugPrint("%s() LN%d: ### stmt progressive write\n", __func__, __LINE__);
+
+ SSuperTable* stbInfo = pThreadInfo->stbInfo;
+ int64_t timeStampStep =
+ stbInfo?stbInfo->timeStampStep:g_args.timestamp_step;
+ int64_t insertRows =
+ (stbInfo)?stbInfo->insertRows:g_args.insertRows;
+ verbosePrint("%s() LN%d insertRows=%"PRId64"\n",
+ __func__, __LINE__, insertRows);
+
+ uint64_t lastPrintTime = taosGetTimestampMs();
+ uint64_t startTs = taosGetTimestampMs();
+ uint64_t endTs;
+
+ pThreadInfo->totalInsertRows = 0;
+ pThreadInfo->totalAffectedRows = 0;
+
+ pThreadInfo->samplePos = 0;
+
+ int percentComplete = 0;
+ int64_t totalRows = insertRows * pThreadInfo->ntables;
+
+ for (uint64_t tableSeq = pThreadInfo->start_table_from;
+ tableSeq <= pThreadInfo->end_table_to;
+ tableSeq ++) {
+ int64_t start_time = pThreadInfo->start_time;
+
+ for (uint64_t i = 0; i < insertRows;) {
+ char tableName[TSDB_TABLE_NAME_LEN];
+ getTableName(tableName, pThreadInfo, tableSeq);
+ verbosePrint("%s() LN%d: tid=%d seq=%"PRId64" tableName=%s\n",
+ __func__, __LINE__,
+ pThreadInfo->threadID, tableSeq, tableName);
+ if (0 == strlen(tableName)) {
+ errorPrint2("[%d] %s() LN%d, getTableName return null\n",
+ pThreadInfo->threadID, __func__, __LINE__);
+ return NULL;
+ }
+
+ // measure prepare + insert
+ startTs = taosGetTimestampUs();
+
+ int32_t generated;
+ if (stbInfo) {
+ generated = prepareStbStmt(
+ pThreadInfo,
+ tableName,
+ tableSeq,
+ (g_args.reqPerReq>stbInfo->insertRows)?
+ stbInfo->insertRows:
+ g_args.reqPerReq,
+ insertRows, i, start_time,
+ &(pThreadInfo->samplePos));
+ } else {
+ generated = prepareStmtWithoutStb(
+ pThreadInfo,
+ tableName,
+ g_args.reqPerReq,
+ insertRows, i,
+ start_time);
+ }
+
+ verbosePrint("[%d] %s() LN%d generated=%d\n",
+ pThreadInfo->threadID,
+ __func__, __LINE__, generated);
+
+ if (generated > 0)
+ i += generated;
+ else
+ goto free_of_stmt_progressive;
+
+ start_time += generated * timeStampStep;
+ pThreadInfo->totalInsertRows += generated;
+
+ // only measure insert
+ // startTs = taosGetTimestampUs();
+
+ int32_t affectedRows = execInsert(pThreadInfo, generated);
+
+ endTs = taosGetTimestampUs();
+ uint64_t delay = endTs - startTs;
+ performancePrint("%s() LN%d, insert execution time is %10.f ms\n",
+ __func__, __LINE__, delay/1000.0);
+ verbosePrint("[%d] %s() LN%d affectedRows=%d\n",
+ pThreadInfo->threadID,
+ __func__, __LINE__, affectedRows);
+
+ if (delay > pThreadInfo->maxDelay) pThreadInfo->maxDelay = delay;
+ if (delay < pThreadInfo->minDelay) pThreadInfo->minDelay = delay;
+ pThreadInfo->cntDelay++;
+ pThreadInfo->totalDelay += delay;
+
+ if (affectedRows < 0) {
+ errorPrint2("%s() LN%d, affected rows: %d\n",
+ __func__, __LINE__, affectedRows);
+ goto free_of_stmt_progressive;
+ }
+
+ pThreadInfo->totalAffectedRows += affectedRows;
+
+ int currentPercent = pThreadInfo->totalAffectedRows * 100 / totalRows;
+ if (currentPercent > percentComplete ) {
+ printf("[%d]:%d%%\n", pThreadInfo->threadID, currentPercent);
+ percentComplete = currentPercent;
+ }
+ int64_t currentPrintTime = taosGetTimestampMs();
+ if (currentPrintTime - lastPrintTime > 30*1000) {
+ printf("thread[%d] has currently inserted rows: %"PRId64 ", affected rows: %"PRId64 "\n",
+ pThreadInfo->threadID,
+ pThreadInfo->totalInsertRows,
+ pThreadInfo->totalAffectedRows);
+ lastPrintTime = currentPrintTime;
+ }
+
+ if (i >= insertRows)
+ break;
+ } // insertRows
+
+ if ((g_args.verbose_print) &&
+ (tableSeq == pThreadInfo->ntables - 1) && (stbInfo)
+ && (0 == strncasecmp(
+ stbInfo->dataSource,
+ "sample", strlen("sample")))) {
+ verbosePrint("%s() LN%d samplePos=%"PRId64"\n",
+ __func__, __LINE__, pThreadInfo->samplePos);
+ }
+ } // tableSeq
+
+ if (percentComplete < 100) {
+ printf("[%d]:%d%%\n", pThreadInfo->threadID, percentComplete);
+ }
+
+free_of_stmt_progressive:
+ tmfree(pThreadInfo->buffer);
+ printStatPerThread(pThreadInfo);
+ return NULL;
+}
// sync insertion progressive data
static void* syncWriteProgressive(threadInfo *pThreadInfo) {
debugPrint("%s() LN%d: ### progressive write\n", __func__, __LINE__);
@@ -8812,7 +9875,7 @@ static void* syncWriteProgressive(threadInfo *pThreadInfo) {
int32_t generated;
if (stbInfo) {
if (stbInfo->iface == STMT_IFACE) {
- generated = prepareStbStmtWithSample(
+ generated = prepareStbStmt(
pThreadInfo,
tableName,
tableSeq,
@@ -8932,26 +9995,40 @@ static void* syncWrite(void *sarg) {
setThreadName("syncWrite");
- uint32_t interlaceRows;
+ uint32_t interlaceRows = 0;
if (stbInfo) {
- if ((stbInfo->interlaceRows == 0)
- && (g_args.interlace_rows > 0)) {
- interlaceRows = g_args.interlace_rows;
- } else {
+ if (stbInfo->interlaceRows < stbInfo->insertRows)
interlaceRows = stbInfo->interlaceRows;
- }
} else {
- interlaceRows = g_args.interlace_rows;
+ if (g_args.interlaceRows < g_args.insertRows)
+ interlaceRows = g_args.interlaceRows;
}
if (interlaceRows > 0) {
// interlace mode
- return syncWriteInterlace(pThreadInfo);
+ if (stbInfo) {
+ if (STMT_IFACE == stbInfo->iface) {
+#if STMT_BIND_PARAM_BATCH == 1
+ return syncWriteInterlaceStmtBatch(pThreadInfo, interlaceRows);
+#else
+ return syncWriteInterlaceStmt(pThreadInfo, interlaceRows);
+#endif
+ } else {
+ return syncWriteInterlace(pThreadInfo, interlaceRows);
+ }
+ }
} else {
- // progressive mode
- return syncWriteProgressive(pThreadInfo);
+ // progressive mode
+ if (((stbInfo) && (STMT_IFACE == stbInfo->iface))
+ || (STMT_IFACE == g_args.iface)) {
+ return syncWriteProgressiveStmt(pThreadInfo);
+ } else {
+ return syncWriteProgressive(pThreadInfo);
+ }
}
+
+ return NULL;
}
static void callBack(void *param, TAOS_RES *res, int code) {
@@ -9082,24 +10159,24 @@ static void startMultiThreadInsertData(int threads, char* db_name,
}
}
- int64_t start_time;
+ int64_t startTime;
if (stbInfo) {
if (0 == strncasecmp(stbInfo->startTimestamp, "now", 3)) {
- start_time = taosGetTimestamp(timePrec);
+ startTime = taosGetTimestamp(timePrec);
} else {
if (TSDB_CODE_SUCCESS != taosParseTime(
stbInfo->startTimestamp,
- &start_time,
+ &startTime,
strlen(stbInfo->startTimestamp),
timePrec, 0)) {
ERROR_EXIT("failed to parse time!\n");
}
}
} else {
- start_time = DEFAULT_START_TIME;
+ startTime = DEFAULT_START_TIME;
}
- debugPrint("%s() LN%d, start_time= %"PRId64"\n",
- __func__, __LINE__, start_time);
+ debugPrint("%s() LN%d, startTime= %"PRId64"\n",
+ __func__, __LINE__, startTime);
// read sample data from file first
int ret;
@@ -9219,34 +10296,23 @@ static void startMultiThreadInsertData(int threads, char* db_name,
}
pthread_t *pids = calloc(1, threads * sizeof(pthread_t));
- assert(pids != NULL);
-
threadInfo *infos = calloc(1, threads * sizeof(threadInfo));
+ assert(pids != NULL);
assert(infos != NULL);
- memset(pids, 0, threads * sizeof(pthread_t));
- memset(infos, 0, threads * sizeof(threadInfo));
-
char *stmtBuffer = calloc(1, BUFFER_SIZE);
assert(stmtBuffer);
#if STMT_BIND_PARAM_BATCH == 1
- uint32_t interlaceRows;
+ uint32_t interlaceRows = 0;
uint32_t batch;
if (stbInfo) {
- if ((stbInfo->interlaceRows == 0)
- && (g_args.interlace_rows > 0)) {
- interlaceRows = g_args.interlace_rows;
-
- if (interlaceRows > stbInfo->insertRows) {
- interlaceRows = stbInfo->insertRows;
- }
- } else {
+ if (stbInfo->interlaceRows < stbInfo->insertRows)
interlaceRows = stbInfo->interlaceRows;
- }
} else {
- interlaceRows = g_args.interlace_rows;
+ if (g_args.interlaceRows < g_args.insertRows)
+ interlaceRows = g_args.interlaceRows;
}
if (interlaceRows > 0) {
@@ -9300,7 +10366,7 @@ static void startMultiThreadInsertData(int threads, char* db_name,
pThreadInfo->time_precision = timePrec;
pThreadInfo->stbInfo = stbInfo;
- pThreadInfo->start_time = start_time;
+ pThreadInfo->start_time = startTime;
pThreadInfo->minDelay = UINT64_MAX;
if ((NULL == stbInfo) ||
@@ -9408,13 +10474,12 @@ static void startMultiThreadInsertData(int threads, char* db_name,
taos_stmt_close(pThreadInfo->stmt);
}
-#if STMT_BIND_PARAM_BATCH == 1
tmfree((char *)pThreadInfo->bind_ts);
+#if STMT_BIND_PARAM_BATCH == 1
tmfree((char *)pThreadInfo->bind_ts_array);
tmfree(pThreadInfo->bindParams);
tmfree(pThreadInfo->is_null);
#else
- tmfree((char *)pThreadInfo->bind_ts);
if (pThreadInfo->sampleBindArray) {
for (int k = 0; k < MAX_SAMPLES; k++) {
uintptr_t *tmp = (uintptr_t *)(*(uintptr_t *)(
@@ -9509,15 +10574,14 @@ static void startMultiThreadInsertData(int threads, char* db_name,
free(infos);
}
-static void *readTable(void *sarg) {
-#if 1
+static void *queryNtableAggrFunc(void *sarg) {
threadInfo *pThreadInfo = (threadInfo *)sarg;
TAOS *taos = pThreadInfo->taos;
- setThreadName("readTable");
+ setThreadName("queryNtableAggrFunc");
char *command = calloc(1, BUFFER_SIZE);
assert(command);
- uint64_t sTime = pThreadInfo->start_time;
+ uint64_t startTime = pThreadInfo->start_time;
char *tb_prefix = pThreadInfo->tb_prefix;
FILE *fp = fopen(pThreadInfo->filePath, "a");
if (NULL == fp) {
@@ -9534,12 +10598,22 @@ static void *readTable(void *sarg) {
insertRows = g_args.insertRows;
// }
- int64_t ntables = pThreadInfo->ntables; // rinfo->end_table_to - rinfo->start_table_from + 1;
+ int64_t ntables = pThreadInfo->ntables; // pThreadInfo->end_table_to - pThreadInfo->start_table_from + 1;
int64_t totalData = insertRows * ntables;
- bool do_aggreFunc = g_Dbs.do_aggreFunc;
+ bool aggr_func = g_Dbs.aggr_func;
+
+ char **aggreFunc;
+ int n;
- int n = do_aggreFunc ? (sizeof(g_aggreFunc) / sizeof(g_aggreFunc[0])) : 2;
- if (!do_aggreFunc) {
+ if (g_args.demo_mode) {
+ aggreFunc = g_aggreFuncDemo;
+ n = aggr_func?(sizeof(g_aggreFuncDemo) / sizeof(g_aggreFuncDemo[0])) : 2;
+ } else {
+ aggreFunc = g_aggreFunc;
+ n = aggr_func?(sizeof(g_aggreFunc) / sizeof(g_aggreFunc[0])) : 2;
+ }
+
+ if (!aggr_func) {
printf("\nThe first field is either Binary or Bool. Aggregation functions are not supported.\n");
}
printf("%"PRId64" records:\n", totalData);
@@ -9550,9 +10624,11 @@ static void *readTable(void *sarg) {
uint64_t count = 0;
for (int64_t i = 0; i < ntables; i++) {
sprintf(command, "SELECT %s FROM %s%"PRId64" WHERE ts>= %" PRIu64,
- g_aggreFunc[j], tb_prefix, i, sTime);
+ aggreFunc[j], tb_prefix, i, startTime);
- double t = taosGetTimestampMs();
+ double t = taosGetTimestampUs();
+ debugPrint("%s() LN%d, sql command: %s\n",
+ __func__, __LINE__, command);
TAOS_RES *pSql = taos_query(taos, command);
int32_t code = taos_errno(pSql);
@@ -9569,29 +10645,27 @@ static void *readTable(void *sarg) {
count++;
}
- t = taosGetTimestampMs() - t;
+ t = taosGetTimestampUs() - t;
totalT += t;
taos_free_result(pSql);
}
fprintf(fp, "|%10s | %"PRId64" | %12.2f | %10.2f |\n",
- g_aggreFunc[j][0] == '*' ? " * " : g_aggreFunc[j], totalData,
- (double)(ntables * insertRows) / totalT, totalT * 1000);
- printf("select %10s took %.6f second(s)\n", g_aggreFunc[j], totalT * 1000);
+ aggreFunc[j][0] == '*' ? " * " : aggreFunc[j], totalData,
+ (double)(ntables * insertRows) / totalT, totalT / 1000000);
+ printf("select %10s took %.6f second(s)\n", aggreFunc[j], totalT / 1000000);
}
fprintf(fp, "\n");
fclose(fp);
free(command);
-#endif
return NULL;
}
-static void *readMetric(void *sarg) {
-#if 1
+static void *queryStableAggrFunc(void *sarg) {
threadInfo *pThreadInfo = (threadInfo *)sarg;
TAOS *taos = pThreadInfo->taos;
- setThreadName("readMetric");
+ setThreadName("queryStableAggrFunc");
char *command = calloc(1, BUFFER_SIZE);
assert(command);
@@ -9603,14 +10677,25 @@ static void *readMetric(void *sarg) {
}
int64_t insertRows = pThreadInfo->stbInfo->insertRows;
- int64_t ntables = pThreadInfo->ntables; // rinfo->end_table_to - rinfo->start_table_from + 1;
+ int64_t ntables = pThreadInfo->ntables; // pThreadInfo->end_table_to - pThreadInfo->start_table_from + 1;
int64_t totalData = insertRows * ntables;
- bool do_aggreFunc = g_Dbs.do_aggreFunc;
+ bool aggr_func = g_Dbs.aggr_func;
+
+ char **aggreFunc;
+ int n;
+
+ if (g_args.demo_mode) {
+ aggreFunc = g_aggreFuncDemo;
+ n = aggr_func?(sizeof(g_aggreFuncDemo) / sizeof(g_aggreFuncDemo[0])) : 2;
+ } else {
+ aggreFunc = g_aggreFunc;
+ n = aggr_func?(sizeof(g_aggreFunc) / sizeof(g_aggreFunc[0])) : 2;
+ }
- int n = do_aggreFunc ? (sizeof(g_aggreFunc) / sizeof(g_aggreFunc[0])) : 2;
- if (!do_aggreFunc) {
+ if (!aggr_func) {
printf("\nThe first field is either Binary or Bool. Aggregation functions are not supported.\n");
}
+
printf("%"PRId64" records:\n", totalData);
fprintf(fp, "Querying On %"PRId64" records:\n", totalData);
@@ -9622,18 +10707,29 @@ static void *readMetric(void *sarg) {
for (int64_t i = 1; i <= m; i++) {
if (i == 1) {
- sprintf(tempS, "t1 = %"PRId64"", i);
+ if (g_args.demo_mode) {
+ sprintf(tempS, "groupid = %"PRId64"", i);
+ } else {
+ sprintf(tempS, "t0 = %"PRId64"", i);
+ }
} else {
- sprintf(tempS, " or t1 = %"PRId64" ", i);
+ if (g_args.demo_mode) {
+ sprintf(tempS, " or groupid = %"PRId64" ", i);
+ } else {
+ sprintf(tempS, " or t0 = %"PRId64" ", i);
+ }
}
strncat(condition, tempS, COND_BUF_LEN - 1);
- sprintf(command, "SELECT %s FROM meters WHERE %s", g_aggreFunc[j], condition);
+ sprintf(command, "SELECT %s FROM meters WHERE %s", aggreFunc[j], condition);
printf("Where condition: %s\n", condition);
+
+ debugPrint("%s() LN%d, sql command: %s\n",
+ __func__, __LINE__, command);
fprintf(fp, "%s\n", command);
- double t = taosGetTimestampMs();
+ double t = taosGetTimestampUs();
TAOS_RES *pSql = taos_query(taos, command);
int32_t code = taos_errno(pSql);
@@ -9650,11 +10746,11 @@ static void *readMetric(void *sarg) {
while(taos_fetch_row(pSql) != NULL) {
count++;
}
- t = taosGetTimestampMs() - t;
+ t = taosGetTimestampUs() - t;
fprintf(fp, "| Speed: %12.2f(per s) | Latency: %.4f(ms) |\n",
- ntables * insertRows / (t * 1000.0), t);
- printf("select %10s took %.6f second(s)\n\n", g_aggreFunc[j], t * 1000.0);
+ ntables * insertRows / (t / 1000), t);
+ printf("select %10s took %.6f second(s)\n\n", aggreFunc[j], t / 1000000);
taos_free_result(pSql);
}
@@ -9662,7 +10758,7 @@ static void *readMetric(void *sarg) {
}
fclose(fp);
free(command);
-#endif
+
return NULL;
}
@@ -9709,7 +10805,7 @@ static int insertTestProcess() {
}
free(cmdBuffer);
- // pretreatement
+ // pretreatment
if (prepareSampleData() != 0) {
if (g_fpOfInsertResult)
fclose(g_fpOfInsertResult);
@@ -10141,7 +11237,7 @@ static void stable_sub_callback(
if (param)
fetchResult(res, (threadInfo *)param);
- // tao_unscribe() will free result.
+ // tao_unsubscribe() will free result.
}
static void specified_sub_callback(
@@ -10154,7 +11250,7 @@ static void specified_sub_callback(
if (param)
fetchResult(res, (threadInfo *)param);
- // tao_unscribe() will free result.
+ // tao_unsubscribe() will free result.
}
static TAOS_SUB* subscribeImpl(
@@ -10494,12 +11590,12 @@ static int subscribeTestProcess() {
//==== create threads for query for specified table
if (g_queryInfo.specifiedQueryInfo.sqlCount <= 0) {
- debugPrint("%s() LN%d, sepcified query sqlCount %d.\n",
+ debugPrint("%s() LN%d, specified query sqlCount %d.\n",
__func__, __LINE__,
g_queryInfo.specifiedQueryInfo.sqlCount);
} else {
if (g_queryInfo.specifiedQueryInfo.concurrent <= 0) {
- errorPrint2("%s() LN%d, sepcified query sqlCount %d.\n",
+ errorPrint2("%s() LN%d, specified query sqlCount %d.\n",
__func__, __LINE__,
g_queryInfo.specifiedQueryInfo.sqlCount);
exit(EXIT_FAILURE);
@@ -10669,9 +11765,8 @@ static void setParaFromArg() {
tstrncpy(g_Dbs.resultFile, g_args.output_file, MAX_FILE_NAME_LEN);
g_Dbs.use_metric = g_args.use_metric;
- g_Dbs.insert_only = g_args.insert_only;
- g_Dbs.do_aggreFunc = true;
+ g_Dbs.aggr_func = g_args.aggr_func;
char dataString[TSDB_MAX_BYTES_PER_ROW];
char *data_type = g_args.data_type;
@@ -10682,7 +11777,7 @@ static void setParaFromArg() {
if ((data_type[0] == TSDB_DATA_TYPE_BINARY)
|| (data_type[0] == TSDB_DATA_TYPE_BOOL)
|| (data_type[0] == TSDB_DATA_TYPE_NCHAR)) {
- g_Dbs.do_aggreFunc = false;
+ g_Dbs.aggr_func = false;
}
if (g_args.use_metric) {
@@ -10864,7 +11959,7 @@ static void testMetaFile() {
}
}
-static void queryResult() {
+static void queryAggrFunc() {
// query data
pthread_t read_id;
@@ -10873,7 +11968,6 @@ static void queryResult() {
pThreadInfo->start_time = DEFAULT_START_TIME; // 2017-07-14 10:40:00.000
pThreadInfo->start_table_from = 0;
- //pThreadInfo->do_aggreFunc = g_Dbs.do_aggreFunc;
if (g_args.use_metric) {
pThreadInfo->ntables = g_Dbs.db[0].superTbls[0].childTblCount;
pThreadInfo->end_table_to = g_Dbs.db[0].superTbls[0].childTblCount - 1;
@@ -10902,9 +11996,9 @@ static void queryResult() {
tstrncpy(pThreadInfo->filePath, g_Dbs.resultFile, MAX_FILE_NAME_LEN);
if (!g_Dbs.use_metric) {
- pthread_create(&read_id, NULL, readTable, pThreadInfo);
+ pthread_create(&read_id, NULL, queryNtableAggrFunc, pThreadInfo);
} else {
- pthread_create(&read_id, NULL, readMetric, pThreadInfo);
+ pthread_create(&read_id, NULL, queryStableAggrFunc, pThreadInfo);
}
pthread_join(read_id, NULL);
taos_close(pThreadInfo->taos);
@@ -10926,8 +12020,9 @@ static void testCmdLine() {
g_args.test_mode = INSERT_TEST;
insertTestProcess();
- if (false == g_Dbs.insert_only)
- queryResult();
+ if (g_Dbs.aggr_func) {
+ queryAggrFunc();
+ }
}
int main(int argc, char *argv[]) {
diff --git a/src/kit/taosdump/CMakeLists.txt b/src/kit/taosdump/CMakeLists.txt
index 51f4748eab462c8e883e83cd5923f38dd7fb9b5a..c3c914e96fc096f59aa701d3496455c754356aa8 100644
--- a/src/kit/taosdump/CMakeLists.txt
+++ b/src/kit/taosdump/CMakeLists.txt
@@ -9,9 +9,9 @@ AUX_SOURCE_DIRECTORY(. SRC)
IF (TD_LINUX)
ADD_EXECUTABLE(taosdump ${SRC})
IF (TD_SOMODE_STATIC)
- TARGET_LINK_LIBRARIES(taosdump taos_static)
+ TARGET_LINK_LIBRARIES(taosdump taos_static cJson)
ELSE ()
- TARGET_LINK_LIBRARIES(taosdump taos)
+ TARGET_LINK_LIBRARIES(taosdump taos cJson)
ENDIF ()
ENDIF ()
@@ -19,8 +19,8 @@ IF (TD_DARWIN)
# missing for macosx
# ADD_EXECUTABLE(taosdump ${SRC})
# IF (TD_SOMODE_STATIC)
- # TARGET_LINK_LIBRARIES(taosdump taos_static)
+ # TARGET_LINK_LIBRARIES(taosdump taos_static cJson)
# ELSE ()
- # TARGET_LINK_LIBRARIES(taosdump taos)
+ # TARGET_LINK_LIBRARIES(taosdump taos cJson)
# ENDIF ()
ENDIF ()
diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
index ae2193a82eb447f0e948abc1757c21cab46ccf34..2f5bf8f6d52bb9e4cc8fabdcbaa727b014f88e64 100644
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@@ -60,7 +60,14 @@ typedef struct {
fprintf(stderr, "VERB: "fmt, __VA_ARGS__); } while(0)
#define errorPrint(fmt, ...) \
- do { fprintf(stderr, "\033[31m"); fprintf(stderr, "ERROR: "fmt, __VA_ARGS__); fprintf(stderr, "\033[0m"); } while(0)
+ do { fprintf(stderr, "\033[31m"); \
+ fprintf(stderr, "ERROR: "fmt, __VA_ARGS__); \
+ fprintf(stderr, "\033[0m"); } while(0)
+
+#define okPrint(fmt, ...) \
+ do { fprintf(stderr, "\033[32m"); \
+ fprintf(stderr, "OK: "fmt, __VA_ARGS__); \
+ fprintf(stderr, "\033[0m"); } while(0)
static bool isStringNumber(char *input)
{
@@ -181,6 +188,7 @@ typedef struct {
int32_t threadIndex;
int32_t totalThreads;
char dbName[TSDB_DB_NAME_LEN];
+ int precision;
void *taosCon;
int64_t rowsOfDumpOut;
int64_t tablesOfDumpOut;
@@ -209,7 +217,7 @@ static char doc[] = "";
/* to force a line-break, e.g.\n<-- here."; */
/* A description of the arguments we accept. */
-static char args_doc[] = "dbname [tbname ...]\n--databases dbname ...\n--all-databases\n-i inpath\n-o outpath";
+static char args_doc[] = "dbname [tbname ...]\n--databases db1,db2,... \n--all-databases\n-i inpath\n-o outpath";
/* Keys for options without short-options. */
#define OPT_ABORT 1 /* –abort */
@@ -238,7 +246,7 @@ static struct argp_option options[] = {
{"encode", 'e', "ENCODE", 0, "Input file encoding.", 1},
// dump unit options
{"all-databases", 'A', 0, 0, "Dump all databases.", 2},
- {"databases", 'D', 0, 0, "Dump assigned databases", 2},
+ {"databases", 'D', "DATABASES", 0, "Dump inputed databases. Use comma to seprate databases\' name.", 2},
{"allow-sys", 'a', 0, 0, "Allow to dump sys database", 2},
// dump format options
{"schemaonly", 's', 0, 0, "Only dump schema.", 2},
@@ -246,11 +254,6 @@ static struct argp_option options[] = {
{"avro", 'v', 0, 0, "Dump apache avro format data file. By default, dump sql command sequence.", 2},
{"start-time", 'S', "START_TIME", 0, "Start time to dump. Either epoch or ISO8601/RFC3339 format is acceptable. ISO8601 format example: 2017-10-01T00:00:00.000+0800 or 2017-10-0100:00:00:000+0800 or '2017-10-01 00:00:00.000+0800'", 4},
{"end-time", 'E', "END_TIME", 0, "End time to dump. Either epoch or ISO8601/RFC3339 format is acceptable. ISO8601 format example: 2017-10-01T00:00:00.000+0800 or 2017-10-0100:00:00.000+0800 or '2017-10-01 00:00:00.000+0800'", 5},
-#if TSDB_SUPPORT_NANOSECOND == 1
- {"precision", 'C', "PRECISION", 0, "Specify precision for converting human-readable time to epoch. Valid value is one of ms, us, and ns. Default is ms.", 6},
-#else
- {"precision", 'C', "PRECISION", 0, "Use specified precision to convert human-readable time. Valid value is one of ms and us. Default is ms.", 6},
-#endif
{"data-batch", 'B', "DATA_BATCH", 0, "Number of data point per insert statement. Max value is 32766. Default is 1.", 3},
{"max-sql-len", 'L', "SQL_LEN", 0, "Max length of one sql. Default is 65480.", 3},
{"table-batch", 't', "TABLE_BATCH", 0, "Number of table dumpout into one output file. Default is 1.", 3},
@@ -276,13 +279,17 @@ typedef struct arguments {
// dump unit option
bool all_databases;
bool databases;
+ char *databasesSeq;
// dump format option
bool schemaonly;
bool with_property;
bool avro;
int64_t start_time;
+ char humanStartTime[28];
int64_t end_time;
+ char humanEndTime[28];
char precision[8];
+
int32_t data_batch;
int32_t max_sql_len;
int32_t table_batch; // num of table which will be dump into one output file.
@@ -296,6 +303,8 @@ typedef struct arguments {
bool debug_print;
bool verbose_print;
bool performance_print;
+
+ int dbCount;
} SArguments;
/* Our argp parser. */
@@ -318,13 +327,17 @@ static void taosDumpCreateTableClause(STableDef *tableDes, int numOfCols,
static void taosDumpCreateMTableClause(STableDef *tableDes, char *metric,
int numOfCols, FILE *fp, char* dbName);
static int32_t taosDumpTable(char *tbName, char *metric,
- FILE *fp, TAOS* taosCon, char* dbName);
+ FILE *fp, TAOS* taosCon, char* dbName, int precision);
static int taosDumpTableData(FILE *fp, char *tbName,
TAOS* taosCon, char* dbName,
+ int precision,
char *jsonAvroSchema);
static int taosCheckParam(struct arguments *arguments);
static void taosFreeDbInfos();
-static void taosStartDumpOutWorkThreads(int32_t numOfThread, char *dbName);
+static void taosStartDumpOutWorkThreads(
+ int32_t numOfThread,
+ char *dbName,
+ int precision);
struct arguments g_args = {
// connection option
@@ -343,14 +356,17 @@ struct arguments g_args = {
"./dump_result.txt",
NULL,
// dump unit option
- false,
- false,
+ false, // all_databases
+ false, // databases
+ NULL, // databasesSeq
// dump format option
- false, // schemeonly
+ false, // schemaonly
true, // with_property
false, // avro format
- -INT64_MAX, // start_time
+ -INT64_MAX + 1, // start_time
+ {0}, // humanStartTime
INT64_MAX, // end_time
+ {0}, // humanEndTime
"ms", // precision
1, // data_batch
TSDB_MAX_SQL_LEN, // max_sql_len
@@ -364,16 +380,38 @@ struct arguments g_args = {
false, // isDumpIn
false, // debug_print
false, // verbose_print
- false // performance_print
+ false, // performance_print
+ 0, // dbCount
};
+UNUSED_FUNC void errorWrongValue(char *program, char *wrong_arg, char *wrong_value)
+{
+ fprintf(stderr, "%s %s: %s is an invalid value\n", program, wrong_arg, wrong_value);
+ fprintf(stderr, "Try `taosdemo --help' or `taosdemo --usage' for more information.\n");
+}
+
+static void errorUnrecognized(char *program, char *wrong_arg)
+{
+ fprintf(stderr, "%s: unrecognized options '%s'\n", program, wrong_arg);
+ fprintf(stderr, "Try `taosdemo --help' or `taosdemo --usage' for more information.\n");
+}
+
+static void errorPrintReqArg(char *program, char *wrong_arg)
+{
+ fprintf(stderr,
+ "%s: option requires an argument -- '%s'\n",
+ program, wrong_arg);
+ fprintf(stderr,
+ "Try `taosdemo --help' or `taosdemo --usage' for more information.\n");
+}
+
static void errorPrintReqArg2(char *program, char *wrong_arg)
{
fprintf(stderr,
"%s: option requires a number argument '-%s'\n",
program, wrong_arg);
fprintf(stderr,
- "Try `taosdump --help' or `taosdump --usage' for more information.\n");
+ "Try `taosdemo --help' or `taosdemo --usage' for more information.\n");
}
static void errorPrintReqArg3(char *program, char *wrong_arg)
@@ -382,7 +420,7 @@ static void errorPrintReqArg3(char *program, char *wrong_arg)
"%s: option '%s' requires an argument\n",
program, wrong_arg);
fprintf(stderr,
- "Try `taosdump --help' or `taosdump --usage' for more information.\n");
+ "Try `taosdemo --help' or `taosdemo --usage' for more information.\n");
}
/* Parse a single option. */
@@ -472,12 +510,8 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
break;
case 'S':
// parse time here.
- g_args.start_time = atol(arg);
break;
case 'E':
- g_args.end_time = atol(arg);
- break;
- case 'C':
break;
case 'B':
g_args.data_batch = atoi(arg);
@@ -550,7 +584,7 @@ static int queryDbImpl(TAOS *taos, char *command) {
return 0;
}
-static void parse_precision_first(
+UNUSED_FUNC static void parse_precision_first(
int argc, char *argv[], SArguments *arguments) {
for (int i = 1; i < argc; i++) {
if (strcmp(argv[i], "-C") == 0) {
@@ -607,8 +641,36 @@ static void parse_args(
} else if (strcmp(argv[i], "-PP") == 0) {
arguments->performance_print = true;
strcpy(argv[i], "");
- } else if (strcmp(argv[i], "-A") == 0) {
+ } else if ((strcmp(argv[i], "-A") == 0)
+ || (0 == strncmp(
+ argv[i], "--all-database",
+ strlen("--all-database")))) {
g_args.all_databases = true;
+ } else if ((strncmp(argv[i], "-D", strlen("-D")) == 0)
+ || (0 == strncmp(
+ argv[i], "--database",
+ strlen("--database")))) {
+ if (2 == strlen(argv[i])) {
+ if (argc == i+1) {
+ errorPrintReqArg(argv[0], "D");
+ exit(EXIT_FAILURE);
+ }
+ arguments->databasesSeq = argv[++i];
+ } else if (0 == strncmp(argv[i], "--databases=", strlen("--databases="))) {
+ arguments->databasesSeq = (char *)(argv[i] + strlen("--databases="));
+ } else if (0 == strncmp(argv[i], "-D", strlen("-D"))) {
+ arguments->databasesSeq = (char *)(argv[i] + strlen("-D"));
+ } else if (strlen("--databases") == strlen(argv[i])) {
+ if (argc == i+1) {
+ errorPrintReqArg3(argv[0], "--databases");
+ exit(EXIT_FAILURE);
+ }
+ arguments->databasesSeq = argv[++i];
+ } else {
+ errorUnrecognized(argv[0], argv[i]);
+ exit(EXIT_FAILURE);
+ }
+ g_args.databases = true;
} else {
continue;
}
@@ -616,6 +678,73 @@ static void parse_args(
}
}
+static void copyHumanTimeToArg(char *timeStr, bool isStartTime)
+{
+ if (isStartTime)
+ strcpy(g_args.humanStartTime, timeStr);
+ else
+ strcpy(g_args.humanEndTime, timeStr);
+}
+
+static void copyTimestampToArg(char *timeStr, bool isStartTime)
+{
+ if (isStartTime)
+ g_args.start_time = atol(timeStr);
+ else
+ g_args.end_time = atol(timeStr);
+}
+
+static void parse_timestamp(
+ int argc, char *argv[], SArguments *arguments) {
+ for (int i = 1; i < argc; i++) {
+ char *tmp;
+ bool isStartTime = false;
+ bool isEndTime = false;
+
+ if (strcmp(argv[i], "-S") == 0) {
+ isStartTime = true;
+ } else if (strcmp(argv[i], "-E") == 0) {
+ isEndTime = true;
+ }
+
+ if (isStartTime || isEndTime) {
+ if (NULL == argv[i+1]) {
+ errorPrint("%s need a valid value following!\n", argv[i]);
+ exit(-1);
+ }
+ tmp = strdup(argv[i+1]);
+
+ if (strchr(tmp, ':') && strchr(tmp, '-')) {
+ copyHumanTimeToArg(tmp, isStartTime);
+ } else {
+ copyTimestampToArg(tmp, isStartTime);
+ }
+ }
+ }
+}
+
+static int getPrecisionByString(char *precision)
+{
+ if (0 == strncasecmp(precision,
+ "ms", 2)) {
+ return TSDB_TIME_PRECISION_MILLI;
+ } else if (0 == strncasecmp(precision,
+ "us", 2)) {
+ return TSDB_TIME_PRECISION_MICRO;
+#if TSDB_SUPPORT_NANOSECOND == 1
+ } else if (0 == strncasecmp(precision,
+ "ns", 2)) {
+ return TSDB_TIME_PRECISION_NANO;
+#endif
+ } else {
+ errorPrint("Invalid time precision: %s",
+ precision);
+ }
+
+ return -1;
+}
+
+/*
static void parse_timestamp(
int argc, char *argv[], SArguments *arguments) {
for (int i = 1; i < argc; i++) {
@@ -634,6 +763,7 @@ static void parse_timestamp(
int64_t tmpEpoch;
if (strchr(tmp, ':') && strchr(tmp, '-')) {
+ strcpy(g_args.humanStartTime, tmp)
int32_t timePrec;
if (0 == strncasecmp(arguments->precision,
"ms", strlen("ms"))) {
@@ -672,6 +802,7 @@ static void parse_timestamp(
}
}
}
+*/
int main(int argc, char *argv[]) {
static char verType[32] = {0};
@@ -682,7 +813,7 @@ int main(int argc, char *argv[]) {
/* Parse our arguments; every option seen by parse_opt will be
reflected in arguments. */
if (argc > 1) {
- parse_precision_first(argc, argv, &g_args);
+// parse_precision_first(argc, argv, &g_args);
parse_timestamp(argc, argv, &g_args);
parse_args(argc, argv, &g_args);
}
@@ -710,11 +841,14 @@ int main(int argc, char *argv[]) {
printf("encode: %s\n", g_args.encode);
printf("all_databases: %s\n", g_args.all_databases?"true":"false");
printf("databases: %d\n", g_args.databases);
+ printf("databasesSeq: %s\n", g_args.databasesSeq);
printf("schemaonly: %s\n", g_args.schemaonly?"true":"false");
printf("with_property: %s\n", g_args.with_property?"true":"false");
printf("avro format: %s\n", g_args.avro?"true":"false");
printf("start_time: %" PRId64 "\n", g_args.start_time);
+ printf("human readable start time: %s \n", g_args.humanStartTime);
printf("end_time: %" PRId64 "\n", g_args.end_time);
+ printf("human readable end time: %s \n", g_args.humanEndTime);
printf("precision: %s\n", g_args.precision);
printf("data_batch: %d\n", g_args.data_batch);
printf("max_sql_len: %d\n", g_args.max_sql_len);
@@ -755,11 +889,14 @@ int main(int argc, char *argv[]) {
fprintf(g_fpOfResult, "encode: %s\n", g_args.encode);
fprintf(g_fpOfResult, "all_databases: %s\n", g_args.all_databases?"true":"false");
fprintf(g_fpOfResult, "databases: %d\n", g_args.databases);
+ fprintf(g_fpOfResult, "databasesSeq: %s\n", g_args.databasesSeq);
fprintf(g_fpOfResult, "schemaonly: %s\n", g_args.schemaonly?"true":"false");
fprintf(g_fpOfResult, "with_property: %s\n", g_args.with_property?"true":"false");
fprintf(g_fpOfResult, "avro format: %s\n", g_args.avro?"true":"false");
fprintf(g_fpOfResult, "start_time: %" PRId64 "\n", g_args.start_time);
+ fprintf(g_fpOfResult, "human readable start time: %s \n", g_args.humanStartTime);
fprintf(g_fpOfResult, "end_time: %" PRId64 "\n", g_args.end_time);
+ fprintf(g_fpOfResult, "human readable end time: %s \n", g_args.humanEndTime);
fprintf(g_fpOfResult, "precision: %s\n", g_args.precision);
fprintf(g_fpOfResult, "data_batch: %d\n", g_args.data_batch);
fprintf(g_fpOfResult, "max_sql_len: %d\n", g_args.max_sql_len);
@@ -816,7 +953,8 @@ int main(int argc, char *argv[]) {
static void taosFreeDbInfos() {
if (g_dbInfos == NULL) return;
- for (int i = 0; i < 128; i++) tfree(g_dbInfos[i]);
+ for (int i = 0; i < g_args.dbCount; i++)
+ tfree(g_dbInfos[i]);
tfree(g_dbInfos);
}
@@ -1046,6 +1184,90 @@ static int32_t taosSaveTableOfMetricToTempFile(
return 0;
}
+static int inDatabasesSeq(
+ char *name,
+ int len)
+{
+ if (strstr(g_args.databasesSeq, ",") == NULL) {
+ if (0 == strncmp(g_args.databasesSeq, name, len)) {
+ return 0;
+ }
+ } else {
+ char *dupSeq = strdup(g_args.databasesSeq);
+ char *running = dupSeq;
+ char *dbname = strsep(&running, ",");
+ while (dbname) {
+ if (0 == strncmp(dbname, name, len)) {
+ tfree(dupSeq);
+ return 0;
+ }
+
+ dbname = strsep(&running, ",");
+ }
+
+ }
+
+ return -1;
+}
+
+static int getDbCount()
+{
+ int count = 0;
+
+ TAOS *taos = NULL;
+ TAOS_RES *result = NULL;
+ char *command = "show databases";
+ TAOS_ROW row;
+
+ /* Connect to server */
+ taos = taos_connect(g_args.host, g_args.user, g_args.password,
+ NULL, g_args.port);
+ if (NULL == taos) {
+ errorPrint("Failed to connect to TDengine server %s\n", g_args.host);
+ return 0;
+ }
+
+ result = taos_query(taos, command);
+ int32_t code = taos_errno(result);
+
+ if (0 != code) {
+ errorPrint("%s() LN%d, failed to run command: %s, reason: %s\n",
+ __func__, __LINE__, command, taos_errstr(result));
+ return 0;
+ }
+
+ TAOS_FIELD *fields = taos_fetch_fields(result);
+
+ while ((row = taos_fetch_row(result)) != NULL) {
+ // sys database name : 'log', but subsequent version changed to 'log'
+ if ((strncasecmp(row[TSDB_SHOW_DB_NAME_INDEX], "log",
+ fields[TSDB_SHOW_DB_NAME_INDEX].bytes) == 0)
+ && (!g_args.allow_sys)) {
+ continue;
+ }
+
+ if (g_args.databases) { // input multi dbs
+ if (inDatabasesSeq(
+ (char *)row[TSDB_SHOW_DB_NAME_INDEX],
+ fields[TSDB_SHOW_DB_NAME_INDEX].bytes) != 0)
+ continue;
+ } else if (!g_args.all_databases) { // only input one db
+ if (strncasecmp(g_args.arg_list[0],
+ (char *)row[TSDB_SHOW_DB_NAME_INDEX],
+ fields[TSDB_SHOW_DB_NAME_INDEX].bytes) != 0)
+ continue;
+ }
+
+ count++;
+ }
+
+ if (count == 0) {
+ errorPrint("%d databases valid to dump\n", count);
+ }
+
+ return count;
+}
+
static int taosDumpOut() {
TAOS *taos = NULL;
TAOS_RES *result = NULL;
@@ -1070,7 +1292,14 @@ static int taosDumpOut() {
return -1;
}
- g_dbInfos = (SDbInfo **)calloc(128, sizeof(SDbInfo *));
+ g_args.dbCount = getDbCount();
+
+ if (0 == g_args.dbCount) {
+ errorPrint("%d databases valid to dump\n", g_args.dbCount);
+ return -1;
+ }
+
+ g_dbInfos = (SDbInfo **)calloc(g_args.dbCount, sizeof(SDbInfo *));
if (g_dbInfos == NULL) {
errorPrint("%s() LN%d, failed to allocate memory\n",
__func__, __LINE__);
@@ -1117,24 +1346,18 @@ static int taosDumpOut() {
}
if (g_args.databases) { // input multi dbs
- for (int i = 0; g_args.arg_list[i]; i++) {
- if (strncasecmp(g_args.arg_list[i],
- (char *)row[TSDB_SHOW_DB_NAME_INDEX],
- fields[TSDB_SHOW_DB_NAME_INDEX].bytes) == 0)
- goto _dump_db_point;
+ if (inDatabasesSeq(
+ (char *)row[TSDB_SHOW_DB_NAME_INDEX],
+ fields[TSDB_SHOW_DB_NAME_INDEX].bytes) != 0) {
+ continue;
}
- continue;
} else if (!g_args.all_databases) { // only input one db
if (strncasecmp(g_args.arg_list[0],
(char *)row[TSDB_SHOW_DB_NAME_INDEX],
- fields[TSDB_SHOW_DB_NAME_INDEX].bytes) == 0)
- goto _dump_db_point;
- else
+ fields[TSDB_SHOW_DB_NAME_INDEX].bytes) != 0)
continue;
}
-_dump_db_point:
-
g_dbInfos[count] = (SDbInfo *)calloc(1, sizeof(SDbInfo));
if (g_dbInfos[count] == NULL) {
errorPrint("%s() LN%d, failed to allocate %"PRIu64" memory\n",
@@ -1142,38 +1365,55 @@ _dump_db_point:
goto _exit_failure;
}
+ okPrint("%s exists\n", (char *)row[TSDB_SHOW_DB_NAME_INDEX]);
tstrncpy(g_dbInfos[count]->name, (char *)row[TSDB_SHOW_DB_NAME_INDEX],
- min(TSDB_DB_NAME_LEN, fields[TSDB_SHOW_DB_NAME_INDEX].bytes + 1));
+ min(TSDB_DB_NAME_LEN,
+ fields[TSDB_SHOW_DB_NAME_INDEX].bytes + 1));
if (g_args.with_property) {
- g_dbInfos[count]->ntables = *((int32_t *)row[TSDB_SHOW_DB_NTABLES_INDEX]);
- g_dbInfos[count]->vgroups = *((int32_t *)row[TSDB_SHOW_DB_VGROUPS_INDEX]);
- g_dbInfos[count]->replica = *((int16_t *)row[TSDB_SHOW_DB_REPLICA_INDEX]);
- g_dbInfos[count]->quorum = *((int16_t *)row[TSDB_SHOW_DB_QUORUM_INDEX]);
- g_dbInfos[count]->days = *((int16_t *)row[TSDB_SHOW_DB_DAYS_INDEX]);
-
- tstrncpy(g_dbInfos[count]->keeplist, (char *)row[TSDB_SHOW_DB_KEEP_INDEX],
+ g_dbInfos[count]->ntables =
+ *((int32_t *)row[TSDB_SHOW_DB_NTABLES_INDEX]);
+ g_dbInfos[count]->vgroups =
+ *((int32_t *)row[TSDB_SHOW_DB_VGROUPS_INDEX]);
+ g_dbInfos[count]->replica =
+ *((int16_t *)row[TSDB_SHOW_DB_REPLICA_INDEX]);
+ g_dbInfos[count]->quorum =
+ *((int16_t *)row[TSDB_SHOW_DB_QUORUM_INDEX]);
+ g_dbInfos[count]->days =
+ *((int16_t *)row[TSDB_SHOW_DB_DAYS_INDEX]);
+
+ tstrncpy(g_dbInfos[count]->keeplist,
+ (char *)row[TSDB_SHOW_DB_KEEP_INDEX],
min(32, fields[TSDB_SHOW_DB_KEEP_INDEX].bytes + 1));
//g_dbInfos[count]->daysToKeep = *((int16_t *)row[TSDB_SHOW_DB_KEEP_INDEX]);
//g_dbInfos[count]->daysToKeep1;
//g_dbInfos[count]->daysToKeep2;
- g_dbInfos[count]->cache = *((int32_t *)row[TSDB_SHOW_DB_CACHE_INDEX]);
- g_dbInfos[count]->blocks = *((int32_t *)row[TSDB_SHOW_DB_BLOCKS_INDEX]);
- g_dbInfos[count]->minrows = *((int32_t *)row[TSDB_SHOW_DB_MINROWS_INDEX]);
- g_dbInfos[count]->maxrows = *((int32_t *)row[TSDB_SHOW_DB_MAXROWS_INDEX]);
- g_dbInfos[count]->wallevel = *((int8_t *)row[TSDB_SHOW_DB_WALLEVEL_INDEX]);
- g_dbInfos[count]->fsync = *((int32_t *)row[TSDB_SHOW_DB_FSYNC_INDEX]);
- g_dbInfos[count]->comp = (int8_t)(*((int8_t *)row[TSDB_SHOW_DB_COMP_INDEX]));
- g_dbInfos[count]->cachelast = (int8_t)(*((int8_t *)row[TSDB_SHOW_DB_CACHELAST_INDEX]));
-
- tstrncpy(g_dbInfos[count]->precision, (char *)row[TSDB_SHOW_DB_PRECISION_INDEX],
- min(8, fields[TSDB_SHOW_DB_PRECISION_INDEX].bytes + 1));
- //g_dbInfos[count]->precision = *((int8_t *)row[TSDB_SHOW_DB_PRECISION_INDEX]);
- g_dbInfos[count]->update = *((int8_t *)row[TSDB_SHOW_DB_UPDATE_INDEX]);
+ g_dbInfos[count]->cache =
+ *((int32_t *)row[TSDB_SHOW_DB_CACHE_INDEX]);
+ g_dbInfos[count]->blocks =
+ *((int32_t *)row[TSDB_SHOW_DB_BLOCKS_INDEX]);
+ g_dbInfos[count]->minrows =
+ *((int32_t *)row[TSDB_SHOW_DB_MINROWS_INDEX]);
+ g_dbInfos[count]->maxrows =
+ *((int32_t *)row[TSDB_SHOW_DB_MAXROWS_INDEX]);
+ g_dbInfos[count]->wallevel =
+ *((int8_t *)row[TSDB_SHOW_DB_WALLEVEL_INDEX]);
+ g_dbInfos[count]->fsync =
+ *((int32_t *)row[TSDB_SHOW_DB_FSYNC_INDEX]);
+ g_dbInfos[count]->comp =
+ (int8_t)(*((int8_t *)row[TSDB_SHOW_DB_COMP_INDEX]));
+ g_dbInfos[count]->cachelast =
+ (int8_t)(*((int8_t *)row[TSDB_SHOW_DB_CACHELAST_INDEX]));
+
+ tstrncpy(g_dbInfos[count]->precision,
+ (char *)row[TSDB_SHOW_DB_PRECISION_INDEX],
+ DB_PRECISION_LEN);
+ g_dbInfos[count]->update =
+ *((int8_t *)row[TSDB_SHOW_DB_UPDATE_INDEX]);
}
count++;
if (g_args.databases) {
- if (count > g_args.arg_list_len) break;
+ if (count > g_args.dbCount) break;
} else if (!g_args.all_databases) {
if (count >= 1) break;
@@ -1190,7 +1430,7 @@ _dump_db_point:
taosDumpDb(g_dbInfos[i], fp, taos);
}
} else {
- if (g_args.arg_list_len == 1) { // case: taosdump
+ if (g_args.dbCount == 1) { // case: taosdump
taosDumpDb(g_dbInfos[0], fp, taos);
} else { // case: taosdump tablex tabley ...
taosDumpCreateDbClause(g_dbInfos[0], g_args.with_property, fp);
@@ -1209,14 +1449,14 @@ _dump_db_point:
fprintf(fp, "USE %s;\n\n", g_dbInfos[0]->name);
- int32_t totalNumOfThread = 1; // 0: all normal talbe into .tables.tmp.0
+ int32_t totalNumOfThread = 1; // 0: all normal table into .tables.tmp.0
int normalTblFd = -1;
int32_t retCode;
int superTblCnt = 0 ;
for (int i = 1; g_args.arg_list[i]; i++) {
if (taosGetTableRecordInfo(g_args.arg_list[i],
&tableRecordInfo, taos) < 0) {
- errorPrint("input the invalide table %s\n",
+ errorPrint("input the invalid table %s\n",
g_args.arg_list[i]);
continue;
}
@@ -1263,8 +1503,10 @@ _dump_db_point:
}
// start multi threads to dumpout
+
taosStartDumpOutWorkThreads(totalNumOfThread,
- g_dbInfos[0]->name);
+ g_dbInfos[0]->name,
+ getPrecisionByString(g_dbInfos[0]->precision));
char tmpFileName[MAX_FILE_NAME_LEN];
_clean_tmp_file:
@@ -1341,11 +1583,10 @@ static int taosGetTableDes(
return count;
}
- // if chidl-table have tag, using select tagName from table to get tagValue
+ // if child-table have tag, using select tagName from table to get tagValue
for (int i = 0 ; i < count; i++) {
if (strcmp(stableDes->cols[i].note, "TAG") != 0) continue;
-
sprintf(sqlstr, "select %s from %s.%s",
stableDes->cols[i].field, dbName, table);
@@ -1454,7 +1695,7 @@ static int convertSchemaToAvroSchema(STableDef *stableDes, char **avroSchema)
static int32_t taosDumpTable(
char *tbName, char *metric,
- FILE *fp, TAOS* taosCon, char* dbName) {
+ FILE *fp, TAOS* taosCon, char* dbName, int precision) {
int count = 0;
STableDef *tableDes = (STableDef *)calloc(1, sizeof(STableDef)
@@ -1505,7 +1746,7 @@ static int32_t taosDumpTable(
int32_t ret = 0;
if (!g_args.schemaonly) {
- ret = taosDumpTableData(fp, tbName, taosCon, dbName,
+ ret = taosDumpTableData(fp, tbName, taosCon, dbName, precision,
jsonAvroSchema);
}
@@ -1596,7 +1837,8 @@ static void* taosDumpOutWorkThreadFp(void *arg)
int ret = taosDumpTable(
tableRecord.name, tableRecord.metric,
- fp, pThread->taosCon, pThread->dbName);
+ fp, pThread->taosCon, pThread->dbName,
+ pThread->precision);
if (ret >= 0) {
// TODO: sum table count and table rows by self
pThread->tablesOfDumpOut++;
@@ -1645,7 +1887,7 @@ static void* taosDumpOutWorkThreadFp(void *arg)
return NULL;
}
-static void taosStartDumpOutWorkThreads(int32_t numOfThread, char *dbName)
+static void taosStartDumpOutWorkThreads(int32_t numOfThread, char *dbName, int precision)
{
pthread_attr_t thattr;
SThreadParaObj *threadObj =
@@ -1664,6 +1906,7 @@ static void taosStartDumpOutWorkThreads(int32_t numOfThread, char *dbName)
pThread->threadIndex = t;
pThread->totalThreads = numOfThread;
tstrncpy(pThread->dbName, dbName, TSDB_DB_NAME_LEN);
+ pThread->precision = precision;
pThread->taosCon = taos_connect(g_args.host, g_args.user, g_args.password,
NULL, g_args.port);
if (pThread->taosCon == NULL) {
@@ -1913,7 +2156,8 @@ static int taosDumpDb(SDbInfo *dbInfo, FILE *fp, TAOS *taosCon) {
}
// start multi threads to dumpout
- taosStartDumpOutWorkThreads(numOfThread, dbInfo->name);
+ taosStartDumpOutWorkThreads(numOfThread, dbInfo->name,
+ getPrecisionByString(dbInfo->precision));
for (int loopCnt = 0; loopCnt < numOfThread; loopCnt++) {
sprintf(tmpBuf, ".tables.tmp.%d", loopCnt);
(void)remove(tmpBuf);
@@ -2191,14 +2435,38 @@ static int64_t writeResultToSql(TAOS_RES *res, FILE *fp, char *dbName, char *tbN
}
static int taosDumpTableData(FILE *fp, char *tbName,
- TAOS* taosCon, char* dbName,
+ TAOS* taosCon, char* dbName, int precision,
char *jsonAvroSchema) {
int64_t totalRows = 0;
char sqlstr[1024] = {0};
+
+ int64_t start_time, end_time;
+ if (strlen(g_args.humanStartTime)) {
+ if (TSDB_CODE_SUCCESS != taosParseTime(
+ g_args.humanStartTime, &start_time, strlen(g_args.humanStartTime),
+ precision, 0)) {
+ errorPrint("Input %s, time format error!\n", g_args.humanStartTime);
+ return -1;
+ }
+ } else {
+ start_time = g_args.start_time;
+ }
+
+ if (strlen(g_args.humanEndTime)) {
+ if (TSDB_CODE_SUCCESS != taosParseTime(
+ g_args.humanEndTime, &end_time, strlen(g_args.humanEndTime),
+ precision, 0)) {
+ errorPrint("Input %s, time format error!\n", g_args.humanEndTime);
+ return -1;
+ }
+ } else {
+ end_time = g_args.end_time;
+ }
+
sprintf(sqlstr,
"select * from %s.%s where _c0 >= %" PRId64 " and _c0 <= %" PRId64 " order by _c0 asc;",
- dbName, tbName, g_args.start_time, g_args.end_time);
+ dbName, tbName, start_time, end_time);
TAOS_RES* res = taos_query(taosCon, sqlstr);
int32_t code = taos_errno(res);
@@ -2231,12 +2499,6 @@ static int taosCheckParam(struct arguments *arguments) {
return -1;
}
- if (g_args.arg_list_len == 0) {
- if ((!g_args.all_databases) && (!g_args.isDumpIn)) {
- errorPrint("%s", "taosdump requires parameters for database and operation\n");
- return -1;
- }
- }
/*
if (g_args.isDumpIn && (strcmp(g_args.outpath, DEFAULT_DUMP_FILE) != 0)) {
fprintf(stderr, "duplicate parameter input and output file path\n");
@@ -2443,7 +2705,7 @@ static int taosGetFilesNum(const char *directoryName,
}
if (fileNum <= 0) {
- errorPrint("directory:%s is empry\n", directoryName);
+ errorPrint("directory:%s is empty\n", directoryName);
exit(-1);
}
@@ -2620,9 +2882,9 @@ static int taosDumpInOneFile(TAOS* taos, FILE* fp, char* fcharset,
memcpy(cmd + cmd_len, line, read_len);
cmd[read_len + cmd_len]= '\0';
if (queryDbImpl(taos, cmd)) {
- errorPrint("%s() LN%d, error sql: linenu:%d, file:%s\n",
+ errorPrint("%s() LN%d, error sql: lineno:%d, file:%s\n",
__func__, __LINE__, lineNo, fileName);
- fprintf(g_fpOfResult, "error sql: linenu:%d, file:%s\n", lineNo, fileName);
+ fprintf(g_fpOfResult, "error sql: lineno:%d, file:%s\n", lineNo, fileName);
}
memset(cmd, 0, TSDB_MAX_ALLOWED_SQL_LEN);
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 68529ab8a240c2313ae9417bef9f4112759b0c9f..a6158906a7cc77b57244594fe51881e5df0b68c8 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1231,7 +1231,9 @@ static int32_t mnodeAddSuperTableTagCb(SMnodeMsg *pMsg, int32_t code) {
SSTableObj *pStable = (SSTableObj *)pMsg->pTable;
mLInfo("msg:%p, app:%p stable %s, add tag result:%s, numOfTags:%d", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
tstrerror(code), pStable->numOfTags);
-
+ if (code == TSDB_CODE_SUCCESS) {
+ code = mnodeGetSuperTableMeta(pMsg);
+ }
return code;
}
@@ -1287,6 +1289,9 @@ static int32_t mnodeDropSuperTableTagCb(SMnodeMsg *pMsg, int32_t code) {
SSTableObj *pStable = (SSTableObj *)pMsg->pTable;
mLInfo("msg:%p, app:%p stable %s, drop tag result:%s", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
tstrerror(code));
+ if (code == TSDB_CODE_SUCCESS) {
+ code = mnodeGetSuperTableMeta(pMsg);
+ }
return code;
}
@@ -1321,6 +1326,9 @@ static int32_t mnodeModifySuperTableTagNameCb(SMnodeMsg *pMsg, int32_t code) {
SSTableObj *pStable = (SSTableObj *)pMsg->pTable;
mLInfo("msg:%p, app:%p stable %s, modify tag result:%s", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
tstrerror(code));
+ if (code == TSDB_CODE_SUCCESS) {
+ code = mnodeGetSuperTableMeta(pMsg);
+ }
return code;
}
@@ -1376,6 +1384,9 @@ static int32_t mnodeAddSuperTableColumnCb(SMnodeMsg *pMsg, int32_t code) {
SSTableObj *pStable = (SSTableObj *)pMsg->pTable;
mLInfo("msg:%p, app:%p stable %s, add column result:%s", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
tstrerror(code));
+ if (code == TSDB_CODE_SUCCESS) {
+ code = mnodeGetSuperTableMeta(pMsg);
+ }
return code;
}
@@ -1444,6 +1455,9 @@ static int32_t mnodeDropSuperTableColumnCb(SMnodeMsg *pMsg, int32_t code) {
SSTableObj *pStable = (SSTableObj *)pMsg->pTable;
mLInfo("msg:%p, app:%p stable %s, delete column result:%s", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
tstrerror(code));
+ if (code == TSDB_CODE_SUCCESS) {
+ code = mnodeGetSuperTableMeta(pMsg);
+ }
return code;
}
@@ -1489,6 +1503,9 @@ static int32_t mnodeChangeSuperTableColumnCb(SMnodeMsg *pMsg, int32_t code) {
SSTableObj *pStable = (SSTableObj *)pMsg->pTable;
mLInfo("msg:%p, app:%p stable %s, change column result:%s", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
tstrerror(code));
+ if (code == TSDB_CODE_SUCCESS) {
+ code = mnodeGetSuperTableMeta(pMsg);
+ }
return code;
}
diff --git a/src/os/src/linux/linuxEnv.c b/src/os/src/linux/linuxEnv.c
index 650a45aae42c8d2dfba63d8f4e7e6ec35b385ae8..35ca64d79f8b7a883014fd6ca980300ede22d6e2 100644
--- a/src/os/src/linux/linuxEnv.c
+++ b/src/os/src/linux/linuxEnv.c
@@ -32,6 +32,13 @@ void osInit() {
strcpy(tsDataDir, "/var/lib/tq");
strcpy(tsLogDir, "/var/log/tq");
strcpy(tsScriptDir, "/etc/tq");
+#elif (_TD_PRO_ == true)
+ if (configDir[0] == 0) {
+ strcpy(configDir, "/etc/ProDB");
+ }
+ strcpy(tsDataDir, "/var/lib/ProDB");
+ strcpy(tsLogDir, "/var/log/ProDB");
+ strcpy(tsScriptDir, "/etc/ProDB");
#else
if (configDir[0] == 0) {
strcpy(configDir, "/etc/taos");
diff --git a/src/os/src/windows/wEnv.c b/src/os/src/windows/wEnv.c
index b35cb8f040aec5ff4b4fb12665d0842e72958ba1..6f46bb43c75ff2c9735fc53a11bce585c1c213f6 100644
--- a/src/os/src/windows/wEnv.c
+++ b/src/os/src/windows/wEnv.c
@@ -39,6 +39,14 @@ void osInit() {
strcpy(tsDataDir, "C:/TQ/data");
strcpy(tsLogDir, "C:/TQ/log");
strcpy(tsScriptDir, "C:/TQ/script");
+#elif (_TD_PRO_ == true)
+ if (configDir[0] == 0) {
+ strcpy(configDir, "C:/ProDB/cfg");
+ }
+ strcpy(tsVnodeDir, "C:/ProDB/data");
+ strcpy(tsDataDir, "C:/ProDB/data");
+ strcpy(tsLogDir, "C:/ProDB/log");
+ strcpy(tsScriptDir, "C:/ProDB/script");
#else
if (configDir[0] == 0) {
strcpy(configDir, "C:/TDengine/cfg");
diff --git a/src/os/tests/CMakeLists.txt b/src/os/tests/CMakeLists.txt
index 3c477641899994bf34237e93122c3d83f0365fad..9ec5076b7201b2d5ed9b2b6eb682eea7d6a83827 100644
--- a/src/os/tests/CMakeLists.txt
+++ b/src/os/tests/CMakeLists.txt
@@ -17,5 +17,5 @@ IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
ADD_EXECUTABLE(osTest ${SOURCE_LIST})
- TARGET_LINK_LIBRARIES(osTest taos os tutil common gtest pthread)
+ TARGET_LINK_LIBRARIES(osTest taos os cJson tutil common gtest pthread)
ENDIF()
diff --git a/src/plugins/http/inc/httpUtil.h b/src/plugins/http/inc/httpUtil.h
index 54c95b6980f8241c3ea6c8e563e0e42c7c737286..21690ebca96d35423e126a9e747d8ce6bb5a43a0 100644
--- a/src/plugins/http/inc/httpUtil.h
+++ b/src/plugins/http/inc/httpUtil.h
@@ -17,6 +17,7 @@
#define TDENGINE_HTTP_UTIL_H
bool httpCheckUsedbSql(char *sql);
+bool httpCheckAlterSql(char *sql);
void httpTimeToString(int32_t t, char *buf, int32_t buflen);
bool httpUrlMatch(HttpContext *pContext, int32_t pos, char *cmp);
diff --git a/src/plugins/http/src/httpHandle.c b/src/plugins/http/src/httpHandle.c
index d51c774ff269d5790868727941a632d133dd6733..9719d93824b50064ec1cf23677c641428434592c 100644
--- a/src/plugins/http/src/httpHandle.c
+++ b/src/plugins/http/src/httpHandle.c
@@ -35,6 +35,7 @@ bool httpProcessData(HttpContext* pContext) {
if (!httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_HANDLING)) {
httpTrace("context:%p, fd:%d, state:%s not in ready state, stop process request", pContext, pContext->fd,
httpContextStateStr(pContext->state));
+ pContext->error = true;
httpCloseContextByApp(pContext);
return false;
}
diff --git a/src/plugins/http/src/httpParser.c b/src/plugins/http/src/httpParser.c
index 62b1737f6fe7128ee132727b2870fca5f62b737a..7066f19769754e78dffeed6a40b672584c0310f1 100644
--- a/src/plugins/http/src/httpParser.c
+++ b/src/plugins/http/src/httpParser.c
@@ -1157,10 +1157,6 @@ static int32_t httpParseChar(HttpParser *parser, const char c, int32_t *again) {
httpOnError(parser, HTTP_CODE_INTERNAL_SERVER_ERROR, TSDB_CODE_HTTP_PARSE_ERROR_STATE);
}
- if (ok != 0) {
- pContext->error = true;
- }
-
return ok;
}
diff --git a/src/plugins/http/src/httpResp.c b/src/plugins/http/src/httpResp.c
index 79e728dd456fb8a340e50f9d7e9cbd3c409614db..1d05b455cb5c66e4f492140e1f337210da04caef 100644
--- a/src/plugins/http/src/httpResp.c
+++ b/src/plugins/http/src/httpResp.c
@@ -147,6 +147,8 @@ void httpSendErrorResp(HttpContext *pContext, int32_t errNo) {
httpCode = pContext->parser->httpCode;
}
+ pContext->error = true;
+
char *httpCodeStr = httpGetStatusDesc(httpCode);
httpSendErrorRespImp(pContext, httpCode, httpCodeStr, errNo & 0XFFFF, tstrerror(errNo));
}
diff --git a/src/plugins/http/src/httpRestJson.c b/src/plugins/http/src/httpRestJson.c
index 47f2d4ff5bcc513aafb8ea8f4e2a85db5a35b12a..13596b0e8a4ea4d183cc4bf75917fd08a9dd7290 100644
--- a/src/plugins/http/src/httpRestJson.c
+++ b/src/plugins/http/src/httpRestJson.c
@@ -16,6 +16,7 @@
#define _DEFAULT_SOURCE
#include "os.h"
#include "tglobal.h"
+#include "tsclient.h"
#include "httpLog.h"
#include "httpJson.h"
#include "httpRestHandle.h"
@@ -62,13 +63,21 @@ void restStartSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result)
httpJsonItemToken(jsonBuf);
httpJsonToken(jsonBuf, JsonArrStt);
+ SSqlObj *pObj = (SSqlObj *) result;
+ bool isAlterSql = (pObj->sqlstr == NULL) ? false : httpCheckAlterSql(pObj->sqlstr);
+
if (num_fields == 0) {
httpJsonItemToken(jsonBuf);
httpJsonString(jsonBuf, REST_JSON_AFFECT_ROWS, REST_JSON_AFFECT_ROWS_LEN);
} else {
- for (int32_t i = 0; i < num_fields; ++i) {
+ if (isAlterSql == true) {
httpJsonItemToken(jsonBuf);
- httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+ httpJsonString(jsonBuf, REST_JSON_AFFECT_ROWS, REST_JSON_AFFECT_ROWS_LEN);
+ } else {
+ for (int32_t i = 0; i < num_fields; ++i) {
+ httpJsonItemToken(jsonBuf);
+ httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+ }
}
}
@@ -99,8 +108,14 @@ void restStartSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result)
httpJsonItemToken(jsonBuf);
httpJsonToken(jsonBuf, JsonArrStt);
- httpJsonItemToken(jsonBuf);
- httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+ if (isAlterSql == true) {
+ httpJsonItemToken(jsonBuf);
+ httpJsonString(jsonBuf, REST_JSON_AFFECT_ROWS, REST_JSON_AFFECT_ROWS_LEN);
+ } else {
+ httpJsonItemToken(jsonBuf);
+ httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+ }
+
httpJsonItemToken(jsonBuf);
httpJsonInt(jsonBuf, fields[i].type);
httpJsonItemToken(jsonBuf);
diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c
index f02859f165499b0c69b095599dd47890e644c604..13a0835c3960333c6d12aa443025de5fb95d565e 100644
--- a/src/plugins/http/src/httpServer.c
+++ b/src/plugins/http/src/httpServer.c
@@ -191,8 +191,6 @@ static void httpProcessHttpData(void *param) {
if (httpReadData(pContext)) {
(*(pThread->processData))(pContext);
atomic_fetch_add_32(&pServer->requestNum, 1);
- } else {
- httpReleaseContext(pContext/*, false*/);
}
}
}
@@ -402,13 +400,17 @@ static bool httpReadData(HttpContext *pContext) {
} else if (nread < 0) {
if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
httpDebug("context:%p, fd:%d, read from socket error:%d, wait another event", pContext, pContext->fd, errno);
- return false; // later again
+ continue; // later again
} else {
httpError("context:%p, fd:%d, read from socket error:%d, close connect", pContext, pContext->fd, errno);
+ taosCloseSocket(pContext->fd);
+ httpReleaseContext(pContext/*, false */);
return false;
}
} else {
httpError("context:%p, fd:%d, nread:%d, wait another event", pContext, pContext->fd, nread);
+ taosCloseSocket(pContext->fd);
+ httpReleaseContext(pContext/*, false */);
return false;
}
}
diff --git a/src/plugins/http/src/httpSql.c b/src/plugins/http/src/httpSql.c
index 0dd451f72dbd78233ac8f73d552b6815e3a3fab8..602767a6563b3ca3430501c0dbcee65333f1d44b 100644
--- a/src/plugins/http/src/httpSql.c
+++ b/src/plugins/http/src/httpSql.c
@@ -405,7 +405,6 @@ void httpProcessRequestCb(void *param, TAOS_RES *result, int32_t code) {
if (pContext->session == NULL) {
httpSendErrorResp(pContext, TSDB_CODE_HTTP_SESSION_FULL);
- httpCloseContextByApp(pContext);
} else {
httpExecCmd(pContext);
}
diff --git a/src/plugins/http/src/httpUtil.c b/src/plugins/http/src/httpUtil.c
index ade50bdad6bf6b0a7a2d43bb354851d90686be49..f30ac7326eef20f4abf5558b288f16f6ee313b42 100644
--- a/src/plugins/http/src/httpUtil.c
+++ b/src/plugins/http/src/httpUtil.c
@@ -21,6 +21,7 @@
#include "httpResp.h"
#include "httpSql.h"
#include "httpUtil.h"
+#include "ttoken.h"
bool httpCheckUsedbSql(char *sql) {
if (strstr(sql, "use ") != NULL) {
@@ -29,6 +30,17 @@ bool httpCheckUsedbSql(char *sql) {
return false;
}
+bool httpCheckAlterSql(char *sql) {
+ int32_t index = 0;
+
+ do {
+ SStrToken t0 = tStrGetToken(sql, &index, false);
+ if (t0.type != TK_LP) {
+ return t0.type == TK_ALTER;
+ }
+ } while (1);
+}
+
void httpTimeToString(int32_t t, char *buf, int32_t buflen) {
memset(buf, 0, (size_t)buflen);
char ts[32] = {0};
diff --git a/src/query/inc/qAggMain.h b/src/query/inc/qAggMain.h
index d4116fbfb2daec9b47c4a891c3c886728e6ca515..4f7821708c3e9b3c3d0eb975125e1ad12c5f82a4 100644
--- a/src/query/inc/qAggMain.h
+++ b/src/query/inc/qAggMain.h
@@ -70,14 +70,14 @@ extern "C" {
#define TSDB_FUNC_DERIVATIVE 32
#define TSDB_FUNC_BLKINFO 33
-
-#define TSDB_FUNC_HISTOGRAM 34
-#define TSDB_FUNC_HLL 35
-#define TSDB_FUNC_MODE 36
-#define TSDB_FUNC_SAMPLE 37
-#define TSDB_FUNC_CEIL 38
-#define TSDB_FUNC_FLOOR 39
-#define TSDB_FUNC_ROUND 40
+#define TSDB_FUNC_CEIL 34
+#define TSDB_FUNC_FLOOR 35
+#define TSDB_FUNC_ROUND 36
+
+#define TSDB_FUNC_HISTOGRAM 37
+#define TSDB_FUNC_HLL 38
+#define TSDB_FUNC_MODE 39
+#define TSDB_FUNC_SAMPLE 40
#define TSDB_FUNC_MAVG 41
#define TSDB_FUNC_CSUM 42
@@ -88,6 +88,7 @@ extern "C" {
#define TSDB_FUNCSTATE_OF 0x10u // outer forward
#define TSDB_FUNCSTATE_NEED_TS 0x20u // timestamp is required during query processing
#define TSDB_FUNCSTATE_SELECTIVITY 0x40u // selectivity functions, can exists along with tag columns
+#define TSDB_FUNCSTATE_SCALAR 0x80u
#define TSDB_BASE_FUNC_SO TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_OF
#define TSDB_BASE_FUNC_MO TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_OF
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
index 31db6492f69c35904970cc5f48cc4a10c9fecd39..82f4f34a57c7d6d10a021fb2e426ff83cb3604e6 100644
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
@@ -86,11 +86,18 @@ typedef struct SResultRow {
char *key; // start key of current result row
} SResultRow;
+typedef struct SResultRowCell {
+ uint64_t groupId;
+ SResultRow *pRow;
+} SResultRowCell;
+
typedef struct SGroupResInfo {
int32_t totalGroup;
int32_t currentGroup;
int32_t index;
SArray* pRows; // SArray
+ bool ordered;
+ int32_t position;
} SGroupResInfo;
/**
@@ -257,7 +264,7 @@ typedef struct SQueryAttr {
SOrderedPrjQueryInfo prjInfo; // limit value for each vgroup, only available in global order projection query.
SSingleColumnFilterInfo* pFilterInfo;
- SFilterInfo *pFilters;
+ void *pFilters;
void* tsdb;
SMemRef memRef;
@@ -284,8 +291,9 @@ typedef struct SQueryRuntimeEnv {
SDiskbasedResultBuf* pResultBuf; // query result buffer based on blocked-wised disk file
SHashObj* pResultRowHashTable; // quick locate the window object for each result
SHashObj* pResultRowListSet; // used to check if current ResultRowInfo has ResultRow object or not
+ SArray* pResultRowArrayList; // The array list that contains the Result rows
char* keyBuf; // window key buffer
- SResultRowPool* pool; // window result object pool
+ SResultRowPool* pool; // The window result objects pool, all the resultRow Objects are allocated and managed by this object.
char** prevRow;
SArray* prevResult; // intermediate result, SArray
@@ -391,7 +399,6 @@ typedef struct SQueryParam {
char *sql;
char *tagCond;
char *colCond;
- char *tbnameCond;
char *prevResult;
SArray *pTableIdList;
SSqlExpr **pExpr;
@@ -399,7 +406,7 @@ typedef struct SQueryParam {
SExprInfo *pExprs;
SExprInfo *pSecExprs;
- SFilterInfo *pFilters;
+ void *pFilters;
SColIndex *pGroupColIndex;
SColumnInfo *pTagColumnInfo;
@@ -409,6 +416,11 @@ typedef struct SQueryParam {
SUdfInfo *pUdfInfo;
} SQueryParam;
+typedef struct SColumnDataParam{
+ int32_t numOfCols;
+ SArray* pDataBlock;
+} SColumnDataParam;
+
typedef struct STableScanInfo {
void *pQueryHandle;
int32_t numOfBlocks;
@@ -632,11 +644,11 @@ int32_t createQueryFunc(SQueriedTableInfo* pTableInfo, int32_t numOfOutput, SExp
int32_t createIndirectQueryFuncExprFromMsg(SQueryTableMsg *pQueryMsg, int32_t numOfOutput, SExprInfo **pExprInfo,
SSqlExpr **pExpr, SExprInfo *prevExpr, SUdfInfo *pUdfInfo);
-int32_t createQueryFilter(char *data, uint16_t len, SFilterInfo** pFilters);
+int32_t createQueryFilter(char *data, uint16_t len, void** pFilters);
SGroupbyExpr *createGroupbyExprFromMsg(SQueryTableMsg *pQueryMsg, SColIndex *pColIndex, int32_t *code);
SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SGroupbyExpr *pGroupbyExpr, SExprInfo *pExprs,
- SExprInfo *pSecExprs, STableGroupInfo *pTableGroupInfo, SColumnInfo* pTagCols, SFilterInfo* pFilters, int32_t vgId, char* sql, uint64_t qId, SUdfInfo* pUdfInfo);
+ SExprInfo *pSecExprs, STableGroupInfo *pTableGroupInfo, SColumnInfo* pTagCols, void* pFilters, int32_t vgId, char* sql, uint64_t qId, SUdfInfo* pUdfInfo);
int32_t initQInfo(STsBufInfo* pTsBufInfo, void* tsdb, void* sourceOptr, SQInfo* pQInfo, SQueryParam* param, char* start,
int32_t prevResultLen, void* merger);
@@ -676,5 +688,6 @@ void freeQueryAttr(SQueryAttr *pQuery);
int32_t getMaximumIdleDurationSec();
void doInvokeUdf(SUdfInfo* pUdfInfo, SQLFunctionCtx *pCtx, int32_t idx, int32_t type);
+int32_t getColumnDataFromId(void *param, int32_t id, void **data);
#endif // TDENGINE_QEXECUTOR_H
diff --git a/src/query/inc/qFilter.h b/src/query/inc/qFilter.h
index af45b816f9e6725579403069843295895cf57cc8..c34a56cc1cd6e135947eee897f87d060880f15c7 100644
--- a/src/query/inc/qFilter.h
+++ b/src/query/inc/qFilter.h
@@ -83,6 +83,12 @@ enum {
RANGE_TYPE_MR_CTX = 3,
};
+enum {
+ FI_ACTION_NO_NEED = 1,
+ FI_ACTION_CONTINUE,
+ FI_ACTION_STOP,
+};
+
typedef struct OptrStr {
uint16_t optr;
char *str;
@@ -106,6 +112,7 @@ typedef struct SFilterColRange {
typedef bool (*rangeCompFunc) (const void *, const void *, const void *, const void *, __compar_fn_t);
typedef int32_t(*filter_desc_compare_func)(const void *, const void *);
typedef bool(*filter_exec_func)(void *, int32_t, int8_t**, SDataStatis *, int16_t);
+typedef int32_t (*filer_get_col_from_id)(void *, int32_t, void **);
typedef struct SFilterRangeCompare {
int64_t s;
@@ -323,14 +330,16 @@ typedef struct SFilterInfo {
#define FILTER_EMPTY_RES(i) FILTER_GET_FLAG((i)->status, FI_STATUS_EMPTY)
-extern int32_t filterInitFromTree(tExprNode* tree, SFilterInfo **pinfo, uint32_t options);
+extern int32_t filterInitFromTree(tExprNode* tree, void **pinfo, uint32_t options);
extern bool filterExecute(SFilterInfo *info, int32_t numOfRows, int8_t** p, SDataStatis *statis, int16_t numOfCols);
-extern int32_t filterSetColFieldData(SFilterInfo *info, int32_t numOfCols, SArray* pDataBlock);
+extern int32_t filterSetColFieldData(SFilterInfo *info, void *param, filer_get_col_from_id fp);
extern int32_t filterGetTimeRange(SFilterInfo *info, STimeWindow *win);
extern int32_t filterConverNcharColumns(SFilterInfo* pFilterInfo, int32_t rows, bool *gotNchar);
extern int32_t filterFreeNcharColumns(SFilterInfo* pFilterInfo);
extern void filterFreeInfo(SFilterInfo *info);
extern bool filterRangeExecute(SFilterInfo *info, SDataStatis *pDataStatis, int32_t numOfCols, int32_t numOfRows);
+extern int32_t filterIsIndexedColumnQuery(SFilterInfo* info, int32_t idxId, bool *res);
+extern int32_t filterGetIndexedColumnInfo(SFilterInfo* info, char** val, int32_t *order, int32_t *flag);
#ifdef __cplusplus
}
diff --git a/src/query/inc/qTableMeta.h b/src/query/inc/qTableMeta.h
index 746c5f8569ac98c465e8283a2401e27c18cadcc4..948a1ae91e01331c4f566ac5089485f717fc5632 100644
--- a/src/query/inc/qTableMeta.h
+++ b/src/query/inc/qTableMeta.h
@@ -38,12 +38,6 @@ typedef struct SJoinInfo {
} SJoinInfo;
typedef struct STagCond {
- // relation between tbname list and query condition, including : TK_AND or TK_OR
- int16_t relType;
-
- // tbname query condition, only support tbname query condition on one table
- SCond tbnameCond;
-
// join condition, only support two tables join currently
SJoinInfo joinInfo;
@@ -93,6 +87,7 @@ typedef struct STableMetaInfo {
SName name;
char aliasName[TSDB_TABLE_NAME_LEN]; // alias name of table specified in query sql
SArray *tagColList; // SArray, involved tag columns
+ int32_t joinTagNum;
} STableMetaInfo;
struct SQInfo; // global merge operator
@@ -100,7 +95,7 @@ struct SQueryAttr; // query object
typedef struct STableFilter {
uint64_t uid;
- SFilterInfo info;
+ void *info;
} STableFilter;
typedef struct SQueryInfo {
diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y
index d72bcacddcdfe1c9e1a59eff3f94b474a4e4839e..336e8620f210351471bddb9c94d56fcaa7f8a0fc 100644
--- a/src/query/inc/sql.y
+++ b/src/query/inc/sql.y
@@ -11,7 +11,7 @@
%left OR.
%left AND.
%right NOT.
-%left EQ NE ISNULL NOTNULL IS LIKE MATCH GLOB BETWEEN IN.
+%left EQ NE ISNULL NOTNULL IS LIKE MATCH NMATCH GLOB BETWEEN IN.
%left GT GE LT LE.
%left BITAND BITOR LSHIFT RSHIFT.
%left PLUS MINUS.
@@ -753,6 +753,7 @@ expr(A) ::= expr(X) LIKE expr(Y). {A = tSqlExprCreate(X, Y, TK_LIKE); }
// match expression
expr(A) ::= expr(X) MATCH expr(Y). {A = tSqlExprCreate(X, Y, TK_MATCH); }
+expr(A) ::= expr(X) NMATCH expr(Y). {A = tSqlExprCreate(X, Y, TK_NMATCH); }
//in expression
expr(A) ::= expr(X) IN LP exprlist(Y) RP. {A = tSqlExprCreate(X, (tSqlExpr*)Y, TK_IN); }
@@ -919,5 +920,5 @@ cmd ::= KILL QUERY INTEGER(X) COLON(Z) INTEGER(Y). {X.n += (Z.n + Y.n); s
%fallback ID ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT COPY DATABASE DEFERRED
DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR GLOB IGNORE IMMEDIATE INITIALLY INSTEAD
- LIKE MATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL
+ LIKE MATCH NMATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL
NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT TBNAME JOIN STABLE NULL INSERT INTO VALUES.
diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c
index c0c6d7a1404dbef6bdb00bd676a30fcfc908671a..1fd682aebd6ac7899ca0a88f6a4744cd4ebbb006 100644
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -179,7 +179,9 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TS_DUMMY || functionId == TSDB_FUNC_TAG_DUMMY ||
functionId == TSDB_FUNC_DIFF || functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TAGPRJ ||
- functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_INTERP) {
+ functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_INTERP || functionId == TSDB_FUNC_CEIL ||
+ functionId == TSDB_FUNC_FLOOR || functionId == TSDB_FUNC_ROUND)
+ {
*type = (int16_t)dataType;
*bytes = (int16_t)dataBytes;
@@ -405,7 +407,7 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
// TODO use hash table
int32_t isValidFunction(const char* name, int32_t len) {
- for(int32_t i = 0; i <= TSDB_FUNC_BLKINFO; ++i) {
+ for(int32_t i = 0; i <= TSDB_FUNC_ROUND; ++i) {
int32_t nameLen = (int32_t) strlen(aAggs[i].name);
if (len != nameLen) {
continue;
@@ -4256,6 +4258,231 @@ void blockinfo_func_finalizer(SQLFunctionCtx* pCtx) {
doFinalizer(pCtx);
}
+#define CFR_SET_VAL(type, data, pCtx, func, i, step, notNullElems) \
+ do { \
+ type *pData = (type *) data; \
+ type *pOutput = (type *) pCtx->pOutput; \
+ \
+ for (; i < pCtx->size && i >= 0; i += step) { \
+ if (pCtx->hasNull && isNull((const char*) &pData[i], pCtx->inputType)) { \
+ continue; \
+ } \
+ \
+ *pOutput++ = (type) func((double) pData[i]); \
+ \
+ notNullElems++; \
+ } \
+ } while (0)
+
+#define CFR_SET_VAL_DOUBLE(data, pCtx, func, i, step, notNullElems) \
+ do { \
+ double *pData = (double *) data; \
+ double *pOutput = (double *) pCtx->pOutput; \
+ \
+ for (; i < pCtx->size && i >= 0; i += step) { \
+ if (pCtx->hasNull && isNull((const char*) &pData[i], pCtx->inputType)) { \
+ continue; \
+ } \
+ \
+ SET_DOUBLE_VAL(pOutput, func(pData[i])); \
+ pOutput++; \
+ \
+ notNullElems++; \
+ } \
+ } while (0)
+
+static void ceil_function(SQLFunctionCtx *pCtx) {
+ void *data = GET_INPUT_DATA_LIST(pCtx);
+
+ int32_t notNullElems = 0;
+
+ int32_t step = GET_FORWARD_DIRECTION_FACTOR(pCtx->order);
+ int32_t i = (pCtx->order == TSDB_ORDER_ASC) ? 0 : pCtx->size - 1;
+
+ switch (pCtx->inputType) {
+ case TSDB_DATA_TYPE_INT: {
+ CFR_SET_VAL(int32_t, data, pCtx, ceil, i, step, notNullElems);
+ break;
+ };
+ case TSDB_DATA_TYPE_UINT: {
+ CFR_SET_VAL(uint32_t, data, pCtx, ceil, i, step, notNullElems);
+ break;
+ };
+ case TSDB_DATA_TYPE_BIGINT: {
+ CFR_SET_VAL(int64_t, data, pCtx, ceil, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_UBIGINT: {
+ CFR_SET_VAL(uint64_t, data, pCtx, ceil, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_DOUBLE: {
+ CFR_SET_VAL_DOUBLE(data, pCtx, ceil, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_FLOAT: {
+ CFR_SET_VAL(float, data, pCtx, ceil, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_SMALLINT: {
+ CFR_SET_VAL(int16_t, data, pCtx, ceil, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_USMALLINT: {
+ CFR_SET_VAL(uint16_t, data, pCtx, ceil, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_TINYINT: {
+ CFR_SET_VAL(int8_t, data, pCtx, ceil, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_UTINYINT: {
+ CFR_SET_VAL(uint8_t, data, pCtx, ceil, i, step, notNullElems);
+ break;
+ }
+ default:
+ qError("error input type");
+ }
+
+ if (notNullElems <= 0) {
+ /*
+ * current block may be null value
+ */
+ assert(pCtx->hasNull);
+ } else {
+ GET_RES_INFO(pCtx)->numOfRes += notNullElems;
+ }
+}
+
+static void floor_function(SQLFunctionCtx *pCtx) {
+ void *data = GET_INPUT_DATA_LIST(pCtx);
+
+ int32_t notNullElems = 0;
+
+ int32_t step = GET_FORWARD_DIRECTION_FACTOR(pCtx->order);
+ int32_t i = (pCtx->order == TSDB_ORDER_ASC) ? 0 : pCtx->size - 1;
+
+ switch (pCtx->inputType) {
+ case TSDB_DATA_TYPE_INT: {
+ CFR_SET_VAL(int32_t, data, pCtx, floor, i, step, notNullElems);
+ break;
+ };
+ case TSDB_DATA_TYPE_UINT: {
+ CFR_SET_VAL(uint32_t, data, pCtx, floor, i, step, notNullElems);
+ break;
+ };
+ case TSDB_DATA_TYPE_BIGINT: {
+ CFR_SET_VAL(int64_t, data, pCtx, floor, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_UBIGINT: {
+ CFR_SET_VAL(uint64_t, data, pCtx, floor, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_DOUBLE: {
+ CFR_SET_VAL_DOUBLE(data, pCtx, floor, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_FLOAT: {
+ CFR_SET_VAL(float, data, pCtx, floor, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_SMALLINT: {
+ CFR_SET_VAL(int16_t, data, pCtx, floor, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_USMALLINT: {
+ CFR_SET_VAL(uint16_t, data, pCtx, floor, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_TINYINT: {
+ CFR_SET_VAL(int8_t, data, pCtx, floor, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_UTINYINT: {
+ CFR_SET_VAL(uint8_t, data, pCtx, floor, i, step, notNullElems);
+ break;
+ }
+ default:
+ qError("error input type");
+ }
+
+ if (notNullElems <= 0) {
+ /*
+ * current block may be null value
+ */
+ assert(pCtx->hasNull);
+ } else {
+ GET_RES_INFO(pCtx)->numOfRes += notNullElems;
+ }
+}
+
+static void round_function(SQLFunctionCtx *pCtx) {
+ void *data = GET_INPUT_DATA_LIST(pCtx);
+
+ int32_t notNullElems = 0;
+
+ int32_t step = GET_FORWARD_DIRECTION_FACTOR(pCtx->order);
+ int32_t i = (pCtx->order == TSDB_ORDER_ASC) ? 0 : pCtx->size - 1;
+
+ switch (pCtx->inputType) {
+ case TSDB_DATA_TYPE_INT: {
+ CFR_SET_VAL(int32_t, data, pCtx, round, i, step, notNullElems);
+ break;
+ };
+ case TSDB_DATA_TYPE_UINT: {
+ CFR_SET_VAL(uint32_t, data, pCtx, round, i, step, notNullElems);
+ break;
+ };
+ case TSDB_DATA_TYPE_BIGINT: {
+ CFR_SET_VAL(int64_t, data, pCtx, round, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_UBIGINT: {
+ CFR_SET_VAL(uint64_t, data, pCtx, round, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_DOUBLE: {
+ CFR_SET_VAL_DOUBLE(data, pCtx, round, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_FLOAT: {
+ CFR_SET_VAL(float, data, pCtx, round, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_SMALLINT: {
+ CFR_SET_VAL(int16_t, data, pCtx, round, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_USMALLINT: {
+ CFR_SET_VAL(uint16_t, data, pCtx, round, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_TINYINT: {
+ CFR_SET_VAL(int8_t, data, pCtx, round, i, step, notNullElems);
+ break;
+ }
+ case TSDB_DATA_TYPE_UTINYINT: {
+ CFR_SET_VAL(uint8_t, data, pCtx, round, i, step, notNullElems);
+ break;
+ }
+ default:
+ qError("error input type");
+ }
+
+ if (notNullElems <= 0) {
+ /*
+ * current block may be null value
+ */
+ assert(pCtx->hasNull);
+ } else {
+ GET_RES_INFO(pCtx)->numOfRes += notNullElems;
+ }
+}
+
+#undef CFR_SET_VAL
+#undef CFR_SET_VAL_DOUBLE
+
/////////////////////////////////////////////////////////////////////////////////////////////
/*
* function compatible list.
@@ -4274,8 +4501,8 @@ int32_t functionCompatList[] = {
4, -1, -1, 1, 1, 1, 1, 1, 1, -1,
// tag, colprj, tagprj, arithmetic, diff, first_dist, last_dist, stddev_dst, interp rate irate
1, 1, 1, 1, -1, 1, 1, 1, 5, 1, 1,
- // tid_tag, derivative, blk_info
- 6, 8, 7,
+ // tid_tag, derivative, blk_info,ceil, floor, round
+ 6, 8, 7, 1, 1, 1
};
SAggFunctionInfo aAggs[] = {{
@@ -4678,7 +4905,7 @@ SAggFunctionInfo aAggs[] = {{
dataBlockRequired,
},
{
- // 33
+ // 33
"_block_dist", // return table id and the corresponding tags for join match and subscribe
TSDB_FUNC_BLKINFO,
TSDB_FUNC_BLKINFO,
@@ -4688,4 +4915,40 @@ SAggFunctionInfo aAggs[] = {{
blockinfo_func_finalizer,
block_func_merge,
dataBlockRequired,
+ },
+ {
+ // 34
+ "ceil",
+ TSDB_FUNC_CEIL,
+ TSDB_FUNC_CEIL,
+ TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_NEED_TS | TSDB_FUNCSTATE_SCALAR,
+ function_setup,
+ ceil_function,
+ doFinalizer,
+ noop1,
+ dataBlockRequired
+ },
+ {
+ // 35
+ "floor",
+ TSDB_FUNC_FLOOR,
+ TSDB_FUNC_FLOOR,
+ TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_NEED_TS | TSDB_FUNCSTATE_SCALAR,
+ function_setup,
+ floor_function,
+ doFinalizer,
+ noop1,
+ dataBlockRequired
+ },
+ {
+ // 36
+ "round",
+ TSDB_FUNC_ROUND,
+ TSDB_FUNC_ROUND,
+ TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_NEED_TS | TSDB_FUNCSTATE_SCALAR,
+ function_setup,
+ round_function,
+ doFinalizer,
+ noop1,
+ dataBlockRequired
}};
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 8fefed51c8c8e80d6a6f05d0da74dc1c6075d1bd..982996d70d6e8c05c45425e737b57a08daf331c9 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -405,6 +405,25 @@ static bool isSelectivityWithTagsQuery(SQLFunctionCtx *pCtx, int32_t numOfOutput
return (numOfSelectivity > 0 && hasTags);
}
+static bool isScalarWithTagsQuery(SQLFunctionCtx *pCtx, int32_t numOfOutput) {
+ bool hasTags = false;
+ int32_t numOfScalar = 0;
+
+ for (int32_t i = 0; i < numOfOutput; ++i) {
+ int32_t functId = pCtx[i].functionId;
+ if (functId == TSDB_FUNC_TAG_DUMMY || functId == TSDB_FUNC_TS_DUMMY) {
+ hasTags = true;
+ continue;
+ }
+
+ if ((aAggs[functId].status & TSDB_FUNCSTATE_SCALAR) != 0) {
+ numOfScalar++;
+ }
+ }
+
+ return (numOfScalar > 0 && hasTags);
+}
+
static bool isProjQuery(SQueryAttr *pQueryAttr) {
for (int32_t i = 0; i < pQueryAttr->numOfOutput; ++i) {
int32_t functId = pQueryAttr->pExpr1[i].base.functionId;
@@ -544,6 +563,8 @@ static SResultRow* doSetResultOutBufByKey(SQueryRuntimeEnv* pRuntimeEnv, SResult
// add a new result set for a new group
taosHashPut(pRuntimeEnv->pResultRowHashTable, pRuntimeEnv->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes), &pResult, POINTER_BYTES);
+ SResultRowCell cell = {.groupId = tableGroupId, .pRow = pResult};
+ taosArrayPush(pRuntimeEnv->pResultRowArrayList, &cell);
} else {
pResult = *p1;
}
@@ -1937,7 +1958,7 @@ void setBlockStatisInfo(SQLFunctionCtx *pCtx, SSDataBlock* pSDataBlock, SColInde
// set the output buffer for the selectivity + tag query
static int32_t setCtxTagColumnInfo(SQLFunctionCtx *pCtx, int32_t numOfOutput) {
- if (!isSelectivityWithTagsQuery(pCtx, numOfOutput)) {
+ if (!isSelectivityWithTagsQuery(pCtx, numOfOutput) && !isScalarWithTagsQuery(pCtx, numOfOutput)) {
return TSDB_CODE_SUCCESS;
}
@@ -1956,7 +1977,7 @@ static int32_t setCtxTagColumnInfo(SQLFunctionCtx *pCtx, int32_t numOfOutput) {
if (functionId == TSDB_FUNC_TAG_DUMMY || functionId == TSDB_FUNC_TS_DUMMY) {
tagLen += pCtx[i].outputBytes;
pTagCtx[num++] = &pCtx[i];
- } else if ((aAggs[functionId].status & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
+ } else if ((aAggs[functionId].status & TSDB_FUNCSTATE_SELECTIVITY) != 0 || (aAggs[functionId].status & TSDB_FUNCSTATE_SCALAR) != 0) {
p = &pCtx[i];
} else if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG) {
// tag function may be the group by tag column
@@ -2107,9 +2128,10 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
pRuntimeEnv->pQueryAttr = pQueryAttr;
pRuntimeEnv->pResultRowHashTable = taosHashInit(numOfTables, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
- pRuntimeEnv->pResultRowListSet = taosHashInit(numOfTables, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
+ pRuntimeEnv->pResultRowListSet = taosHashInit(numOfTables * 10, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
pRuntimeEnv->keyBuf = malloc(pQueryAttr->maxTableColumnWidth + sizeof(int64_t) + POINTER_BYTES);
pRuntimeEnv->pool = initResultRowPool(getResultRowSize(pRuntimeEnv));
+ pRuntimeEnv->pResultRowArrayList = taosArrayInit(numOfTables, sizeof(SResultRowCell));
pRuntimeEnv->prevRow = malloc(POINTER_BYTES * pQueryAttr->numOfCols + pQueryAttr->srcRowSize);
pRuntimeEnv->tagVal = malloc(pQueryAttr->tagLen);
@@ -2384,6 +2406,7 @@ static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
pRuntimeEnv->pool = destroyResultRowPool(pRuntimeEnv->pool);
taosArrayDestroyEx(pRuntimeEnv->prevResult, freeInterResult);
+ taosArrayDestroy(pRuntimeEnv->pResultRowArrayList);
pRuntimeEnv->prevResult = NULL;
}
@@ -2398,11 +2421,11 @@ bool isQueryKilled(SQInfo *pQInfo) {
// query has been executed more than tsShellActivityTimer, and the retrieve has not arrived
// abort current query execution.
- if (pQInfo->owner != 0 && ((taosGetTimestampSec() - pQInfo->startExecTs) > getMaximumIdleDurationSec()) &&
+ if (pQInfo->owner != 0 && ((taosGetTimestampSec() - pQInfo->startExecTs/1000) > getMaximumIdleDurationSec()) &&
(!needBuildResAfterQueryComplete(pQInfo))) {
assert(pQInfo->startExecTs != 0);
- qDebug("QInfo:%" PRIu64 " retrieve not arrive beyond %d sec, abort current query execution, start:%" PRId64
+ qDebug("QInfo:%" PRIu64 " retrieve not arrive beyond %d ms, abort current query execution, start:%" PRId64
", current:%d", pQInfo->qId, 1, pQInfo->startExecTs, taosGetTimestampSec());
return true;
}
@@ -2946,6 +2969,10 @@ void filterRowsInDataBlock(SQueryRuntimeEnv* pRuntimeEnv, SSingleColumnFilterInf
}
if (!tsBufNextPos(pRuntimeEnv->pTsBuf)) {
+ if (i < (numOfRows - 1)) {
+ all = false;
+ }
+
break;
}
}
@@ -2987,11 +3014,15 @@ void filterColRowsInDataBlock(SQueryRuntimeEnv* pRuntimeEnv, SSDataBlock* pBlock
p[offset] = true;
}
- if (!tsBufNextPos(pRuntimeEnv->pTsBuf)) {
+ if (!tsBufNextPos(pRuntimeEnv->pTsBuf)) {
+ if (i < (numOfRows - 1)) {
+ all = false;
+ }
+
break;
}
}
-
+
// save the cursor status
pRuntimeEnv->current->cur = tsBufGetCursor(pRuntimeEnv->pTsBuf);
} else {
@@ -3053,6 +3084,22 @@ void doSetFilterColumnInfo(SSingleColumnFilterInfo* pFilterInfo, int32_t numOfFi
}
}
+FORCE_INLINE int32_t getColumnDataFromId(void *param, int32_t id, void **data) {
+ int32_t numOfCols = ((SColumnDataParam *)param)->numOfCols;
+ SArray* pDataBlock = ((SColumnDataParam *)param)->pDataBlock;
+
+ for (int32_t j = 0; j < numOfCols; ++j) {
+ SColumnInfoData* pColInfo = taosArrayGet(pDataBlock, j);
+ if (id == pColInfo->info.colId) {
+ *data = pColInfo->pData;
+ break;
+ }
+ }
+
+ return TSDB_CODE_SUCCESS;
+}
+
+
int32_t loadDataBlockOnDemand(SQueryRuntimeEnv* pRuntimeEnv, STableScanInfo* pTableScanInfo, SSDataBlock* pBlock,
uint32_t* status) {
*status = BLK_DATA_NO_NEEDED;
@@ -3207,7 +3254,8 @@ int32_t loadDataBlockOnDemand(SQueryRuntimeEnv* pRuntimeEnv, STableScanInfo* pTa
}
if (pQueryAttr->pFilters != NULL) {
- filterSetColFieldData(pQueryAttr->pFilters, pBlock->info.numOfCols, pBlock->pDataBlock);
+ SColumnDataParam param = {.numOfCols = pBlock->info.numOfCols, .pDataBlock = pBlock->pDataBlock};
+ filterSetColFieldData(pQueryAttr->pFilters, ¶m, getColumnDataFromId);
}
if (pQueryAttr->pFilters != NULL || pRuntimeEnv->pTsBuf != NULL) {
@@ -4808,7 +4856,6 @@ int32_t doInitQInfo(SQInfo* pQInfo, STSBuf* pTsBuf, void* tsdb, void* sourceOptr
SQueryAttr *pQueryAttr = pQInfo->runtimeEnv.pQueryAttr;
pQueryAttr->tsdb = tsdb;
-
if (tsdb != NULL) {
int32_t code = setupQueryHandle(tsdb, pRuntimeEnv, pQInfo->qId, pQueryAttr->stableQuery);
if (code != TSDB_CODE_SUCCESS) {
@@ -6379,6 +6426,7 @@ static SSDataBlock* hashGroupbyAggregate(void* param, bool* newgroup) {
if (!pRuntimeEnv->pQueryAttr->stableQuery) {
sortGroupResByOrderList(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pInfo->binfo.pRes);
}
+
toSSDataBlock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pInfo->binfo.pRes);
if (pInfo->binfo.pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pRuntimeEnv->groupResInfo)) {
@@ -7494,7 +7542,6 @@ int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SQueryParam* param) {
pQueryMsg->order = htons(pQueryMsg->order);
pQueryMsg->orderColId = htons(pQueryMsg->orderColId);
pQueryMsg->queryType = htonl(pQueryMsg->queryType);
- pQueryMsg->tagNameRelType = htons(pQueryMsg->tagNameRelType);
pQueryMsg->numOfCols = htons(pQueryMsg->numOfCols);
pQueryMsg->numOfOutput = htons(pQueryMsg->numOfOutput);
@@ -7509,7 +7556,6 @@ int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SQueryParam* param) {
pQueryMsg->tsBuf.tsOrder = htonl(pQueryMsg->tsBuf.tsOrder);
pQueryMsg->numOfTags = htonl(pQueryMsg->numOfTags);
- pQueryMsg->tbnameCondLen = htonl(pQueryMsg->tbnameCondLen);
pQueryMsg->secondStageOutput = htonl(pQueryMsg->secondStageOutput);
pQueryMsg->sqlstrLen = htonl(pQueryMsg->sqlstrLen);
pQueryMsg->prevResultLen = htonl(pQueryMsg->prevResultLen);
@@ -7600,8 +7646,8 @@ int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SQueryParam* param) {
pMsg += sizeof(SSqlExpr);
for (int32_t j = 0; j < pExprMsg->numOfParams; ++j) {
- pExprMsg->param[j].nType = htons(pExprMsg->param[j].nType);
- pExprMsg->param[j].nLen = htons(pExprMsg->param[j].nLen);
+ pExprMsg->param[j].nType = htonl(pExprMsg->param[j].nType);
+ pExprMsg->param[j].nLen = htonl(pExprMsg->param[j].nLen);
if (pExprMsg->param[j].nType == TSDB_DATA_TYPE_BINARY) {
pExprMsg->param[j].pz = pMsg;
@@ -7648,8 +7694,8 @@ int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SQueryParam* param) {
pMsg += sizeof(SSqlExpr);
for (int32_t j = 0; j < pExprMsg->numOfParams; ++j) {
- pExprMsg->param[j].nType = htons(pExprMsg->param[j].nType);
- pExprMsg->param[j].nLen = htons(pExprMsg->param[j].nLen);
+ pExprMsg->param[j].nType = htonl(pExprMsg->param[j].nType);
+ pExprMsg->param[j].nLen = htonl(pExprMsg->param[j].nLen);
if (pExprMsg->param[j].nType == TSDB_DATA_TYPE_BINARY) {
pExprMsg->param[j].pz = pMsg;
@@ -7753,17 +7799,6 @@ int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SQueryParam* param) {
pMsg += pQueryMsg->prevResultLen;
}
- if (pQueryMsg->tbnameCondLen > 0) {
- param->tbnameCond = calloc(1, pQueryMsg->tbnameCondLen + 1);
- if (param->tbnameCond == NULL) {
- code = TSDB_CODE_QRY_OUT_OF_MEMORY;
- goto _cleanup;
- }
-
- strncpy(param->tbnameCond, pMsg, pQueryMsg->tbnameCondLen);
- pMsg += pQueryMsg->tbnameCondLen;
- }
-
//skip ts buf
if ((pQueryMsg->tsBuf.tsOffset + pQueryMsg->tsBuf.tsLen) > 0) {
pMsg = (char *)pQueryMsg + pQueryMsg->tsBuf.tsOffset + pQueryMsg->tsBuf.tsLen;
@@ -8144,7 +8179,7 @@ int32_t createQueryFunc(SQueriedTableInfo* pTableInfo, int32_t numOfOutput, SExp
return TSDB_CODE_SUCCESS;
}
-int32_t createQueryFilter(char *data, uint16_t len, SFilterInfo** pFilters) {
+int32_t createQueryFilter(char *data, uint16_t len, void** pFilters) {
tExprNode* expr = NULL;
TRY(TSDB_MAX_TAG_CONDITIONS) {
@@ -8398,7 +8433,7 @@ FORCE_INLINE bool checkQIdEqual(void *qHandle, uint64_t qId) {
}
SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SGroupbyExpr* pGroupbyExpr, SExprInfo* pExprs,
- SExprInfo* pSecExprs, STableGroupInfo* pTableGroupInfo, SColumnInfo* pTagCols, SFilterInfo* pFilters, int32_t vgId,
+ SExprInfo* pSecExprs, STableGroupInfo* pTableGroupInfo, SColumnInfo* pTagCols, void* pFilters, int32_t vgId,
char* sql, uint64_t qId, SUdfInfo* pUdfInfo) {
int16_t numOfCols = pQueryMsg->numOfCols;
int16_t numOfOutput = pQueryMsg->numOfOutput;
@@ -8409,6 +8444,7 @@ SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SGroupbyExpr* pGroupbyExpr, S
}
pQInfo->qId = qId;
+ pQInfo->startExecTs = 0;
pQInfo->runtimeEnv.pUdfInfo = pUdfInfo;
@@ -8647,7 +8683,6 @@ int32_t initQInfo(STsBufInfo* pTsBufInfo, void* tsdb, void* sourceOptr, SQInfo*
SArray* prevResult = NULL;
if (prevResultLen > 0) {
prevResult = interResFromBinary(param->prevResult, prevResultLen);
-
pRuntimeEnv->prevResult = prevResult;
}
diff --git a/src/query/src/qFilter.c b/src/query/src/qFilter.c
index a6988d7adc403cd518e6fce91899a515305ab5c0..c7a7ea963d5635c76030d2199ac99a60924d99a7 100644
--- a/src/query/src/qFilter.c
+++ b/src/query/src/qFilter.c
@@ -28,13 +28,14 @@ OptrStr gOptrStr[] = {
{TSDB_RELATION_GREATER_EQUAL, ">="},
{TSDB_RELATION_NOT_EQUAL, "!="},
{TSDB_RELATION_LIKE, "like"},
- {TSDB_RELATION_MATCH, "match"},
{TSDB_RELATION_ISNULL, "is null"},
{TSDB_RELATION_NOTNULL, "not null"},
{TSDB_RELATION_IN, "in"},
{TSDB_RELATION_AND, "and"},
{TSDB_RELATION_OR, "or"},
- {TSDB_RELATION_NOT, "not"}
+ {TSDB_RELATION_NOT, "not"},
+ {TSDB_RELATION_MATCH, "match"},
+ {TSDB_RELATION_NMATCH, "nmatch"},
};
static FORCE_INLINE int32_t filterFieldColDescCompare(const void *desc1, const void *desc2) {
@@ -157,7 +158,7 @@ int8_t filterGetRangeCompFuncFromOptrs(uint8_t optr, uint8_t optr2) {
__compar_fn_t gDataCompare[] = {compareInt32Val, compareInt8Val, compareInt16Val, compareInt64Val, compareFloatVal,
compareDoubleVal, compareLenPrefixedStr, compareStrPatternComp, compareFindItemInSet, compareWStrPatternComp,
compareLenPrefixedWStr, compareUint8Val, compareUint16Val, compareUint32Val, compareUint64Val,
- setCompareBytes1, setCompareBytes2, setCompareBytes4, setCompareBytes8, compareStrRegexComp,
+ setCompareBytes1, setCompareBytes2, setCompareBytes4, setCompareBytes8, compareStrRegexCompMatch, compareStrRegexCompNMatch
};
int8_t filterGetCompFuncIdx(int32_t type, int32_t optr) {
@@ -198,6 +199,8 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr) {
case TSDB_DATA_TYPE_BINARY: {
if (optr == TSDB_RELATION_MATCH) {
comparFn = 19;
+ } else if (optr == TSDB_RELATION_NMATCH) {
+ comparFn = 20;
} else if (optr == TSDB_RELATION_LIKE) { /* wildcard query using like operator */
comparFn = 7;
} else if (optr == TSDB_RELATION_IN) {
@@ -212,6 +215,8 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr) {
case TSDB_DATA_TYPE_NCHAR: {
if (optr == TSDB_RELATION_MATCH) {
comparFn = 19;
+ } else if (optr == TSDB_RELATION_NMATCH) {
+ comparFn = 20;
} else if (optr == TSDB_RELATION_LIKE) {
comparFn = 9;
} else if (optr == TSDB_RELATION_IN) {
@@ -932,7 +937,7 @@ int32_t filterAddUnitToGroup(SFilterGroup *group, uint16_t unitIdx) {
return TSDB_CODE_SUCCESS;
}
-int32_t filterConvertSetFromBinary(void **q, const char *buf, int32_t len, uint32_t tType) {
+int32_t filterConvertSetFromBinary(void **q, const char *buf, int32_t len, uint32_t tType, bool tolower) {
SBufferReader br = tbufInitReader(buf, len, false);
uint32_t sType = tbufReadUint32(&br);
SHashObj *pObj = taosHashInit(256, taosGetDefaultHashFunction(tType), true, false);
@@ -1108,6 +1113,10 @@ int32_t filterConvertSetFromBinary(void **q, const char *buf, int32_t len, uint3
}
t = varDataLen(tmp);
pvar = varDataVal(tmp);
+
+ if (tolower) {
+ strntolower_s(pvar, pvar, (int32_t)t);
+ }
break;
}
case TSDB_DATA_TYPE_NCHAR: {
@@ -1152,7 +1161,7 @@ int32_t filterAddGroupUnitFromNode(SFilterInfo *info, tExprNode* tree, SArray *g
if (tree->_node.optr == TSDB_RELATION_IN && (!IS_VAR_DATA_TYPE(type))) {
void *data = NULL;
- filterConvertSetFromBinary((void **)&data, var->pz, var->nLen, type);
+ filterConvertSetFromBinary((void **)&data, var->pz, var->nLen, type, false);
CHK_LRET(data == NULL, TSDB_CODE_QRY_APP_ERROR, "failed to convert in param");
if (taosHashGetSize((SHashObj *)data) <= 0) {
@@ -1479,19 +1488,6 @@ _return:
return code;
}
-#if 0
-int32_t filterInitUnitFunc(SFilterInfo *info) {
- for (uint16_t i = 0; i < info->unitNum; ++i) {
- SFilterUnit* unit = &info->units[i];
-
- info->cunits[i].func = getComparFunc(FILTER_UNIT_DATA_TYPE(unit), unit->compare.optr);
- }
-
- return TSDB_CODE_SUCCESS;
-}
-#endif
-
-
void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) {
if (qDebugFlag & DEBUG_DEBUG) {
CHK_LRETV(info == NULL, "%s - FilterInfo: EMPTY", msg);
@@ -1806,7 +1802,10 @@ int32_t filterInitValFieldData(SFilterInfo *info) {
}
if (unit->compare.optr == TSDB_RELATION_IN) {
- filterConvertSetFromBinary((void **)&fi->data, var->pz, var->nLen, type);
+ SSchema *sch = FILTER_UNIT_COL_DESC(info, unit);
+ bool tolower = (sch->colId == -1) ? true : false;
+
+ filterConvertSetFromBinary((void **)&fi->data, var->pz, var->nLen, type, tolower);
CHK_LRET(fi->data == NULL, TSDB_CODE_QRY_APP_ERROR, "failed to convert in param");
FILTER_SET_FLAG(fi->flag, FLD_DATA_IS_HASH);
@@ -1879,6 +1878,9 @@ bool filterDoCompare(__compar_fn_t func, uint8_t optr, void *left, void *right)
case TSDB_RELATION_MATCH: {
return ret == 0;
}
+ case TSDB_RELATION_NMATCH: {
+ return ret == 0;
+ }
case TSDB_RELATION_IN: {
return ret == 1;
}
@@ -2536,8 +2538,6 @@ int32_t filterPostProcessRange(SFilterInfo *info) {
int32_t filterGenerateComInfo(SFilterInfo *info) {
- uint16_t n = 0;
-
info->cunits = malloc(info->unitNum * sizeof(*info->cunits));
info->blkUnitRes = malloc(sizeof(*info->blkUnitRes) * info->unitNum);
info->blkUnits = malloc(sizeof(*info->blkUnits) * (info->unitNum + 1) * info->groupNum);
@@ -2565,24 +2565,6 @@ int32_t filterGenerateComInfo(SFilterInfo *info) {
info->cunits[i].dataSize = FILTER_UNIT_COL_SIZE(info, unit);
info->cunits[i].dataType = FILTER_UNIT_DATA_TYPE(unit);
}
-
- uint16_t cgroupNum = info->groupNum + 1;
-
- for (uint16_t i = 0; i < info->groupNum; ++i) {
- cgroupNum += info->groups[i].unitNum;
- }
-
- info->cgroups = malloc(cgroupNum * sizeof(*info->cgroups));
-
- for (uint16_t i = 0; i < info->groupNum; ++i) {
- info->cgroups[n++] = info->groups[i].unitNum;
-
- for (uint16_t m = 0; m < info->groups[i].unitNum; ++m) {
- info->cgroups[n++] = info->groups[i].unitIdxs[m];
- }
- }
-
- info->cgroups[n] = 0;
return TSDB_CODE_SUCCESS;
}
@@ -2656,10 +2638,12 @@ int32_t filterRmUnitByRange(SFilterInfo *info, SDataStatis *pDataStatis, int32_t
SDataStatis* pDataBlockst = &pDataStatis[index];
void *minVal, *maxVal;
+ float minv = 0;
+ float maxv = 0;
if (cunit->dataType == TSDB_DATA_TYPE_FLOAT) {
- float minv = (float)(*(double *)(&pDataBlockst->min));
- float maxv = (float)(*(double *)(&pDataBlockst->max));
+ minv = (float)(*(double *)(&pDataBlockst->min));
+ maxv = (float)(*(double *)(&pDataBlockst->max));
minVal = &minv;
maxVal = &maxv;
@@ -2778,8 +2762,10 @@ bool filterExecuteBasedOnStatisImpl(void *pinfo, int32_t numOfRows, int8_t** p,
bool all = true;
uint16_t *unitIdx = NULL;
- *p = calloc(numOfRows, sizeof(int8_t));
-
+ if (*p == NULL) {
+ *p = calloc(numOfRows, sizeof(int8_t));
+ }
+
for (int32_t i = 0; i < numOfRows; ++i) {
//FILTER_UNIT_CLR_F(info);
@@ -2881,12 +2867,14 @@ static FORCE_INLINE bool filterExecuteImplIsNull(void *pinfo, int32_t numOfRows,
return all;
}
- *p = calloc(numOfRows, sizeof(int8_t));
+ if (*p == NULL) {
+ *p = calloc(numOfRows, sizeof(int8_t));
+ }
for (int32_t i = 0; i < numOfRows; ++i) {
uint16_t uidx = info->groups[0].unitIdxs[0];
void *colData = (char *)info->cunits[uidx].colData + info->cunits[uidx].dataSize * i;
- (*p)[i] = isNull(colData, info->cunits[uidx].dataType);
+ (*p)[i] = ((colData == NULL) || isNull(colData, info->cunits[uidx].dataType));
if ((*p)[i] == 0) {
all = false;
}
@@ -2902,12 +2890,14 @@ static FORCE_INLINE bool filterExecuteImplNotNull(void *pinfo, int32_t numOfRows
return all;
}
- *p = calloc(numOfRows, sizeof(int8_t));
-
+ if (*p == NULL) {
+ *p = calloc(numOfRows, sizeof(int8_t));
+ }
+
for (int32_t i = 0; i < numOfRows; ++i) {
uint16_t uidx = info->groups[0].unitIdxs[0];
void *colData = (char *)info->cunits[uidx].colData + info->cunits[uidx].dataSize * i;
- (*p)[i] = !isNull(colData, info->cunits[uidx].dataType);
+ (*p)[i] = ((colData != NULL) && !isNull(colData, info->cunits[uidx].dataType));
if ((*p)[i] == 0) {
all = false;
}
@@ -2930,10 +2920,12 @@ bool filterExecuteImplRange(void *pinfo, int32_t numOfRows, int8_t** p, SDataSta
return all;
}
- *p = calloc(numOfRows, sizeof(int8_t));
+ if (*p == NULL) {
+ *p = calloc(numOfRows, sizeof(int8_t));
+ }
for (int32_t i = 0; i < numOfRows; ++i) {
- if (isNull(colData, info->cunits[0].dataType)) {
+ if (colData == NULL || isNull(colData, info->cunits[0].dataType)) {
all = false;
colData += dataSize;
continue;
@@ -2958,13 +2950,16 @@ bool filterExecuteImplMisc(void *pinfo, int32_t numOfRows, int8_t** p, SDataStat
if (filterExecuteBasedOnStatis(info, numOfRows, p, statis, numOfCols, &all) == 0) {
return all;
}
-
- *p = calloc(numOfRows, sizeof(int8_t));
+
+ if (*p == NULL) {
+ *p = calloc(numOfRows, sizeof(int8_t));
+ }
for (int32_t i = 0; i < numOfRows; ++i) {
uint16_t uidx = info->groups[0].unitIdxs[0];
void *colData = (char *)info->cunits[uidx].colData + info->cunits[uidx].dataSize * i;
- if (isNull(colData, info->cunits[uidx].dataType)) {
+ if (colData == NULL || isNull(colData, info->cunits[uidx].dataType)) {
+ (*p)[i] = 0;
all = false;
continue;
}
@@ -2988,8 +2983,10 @@ bool filterExecuteImpl(void *pinfo, int32_t numOfRows, int8_t** p, SDataStatis *
return all;
}
- *p = calloc(numOfRows, sizeof(int8_t));
-
+ if (*p == NULL) {
+ *p = calloc(numOfRows, sizeof(int8_t));
+ }
+
for (int32_t i = 0; i < numOfRows; ++i) {
//FILTER_UNIT_CLR_F(info);
@@ -3005,7 +3002,7 @@ bool filterExecuteImpl(void *pinfo, int32_t numOfRows, int8_t** p, SDataStatis *
//} else {
uint8_t optr = cunit->optr;
- if (isNull(colData, cunit->dataType)) {
+ if (colData == NULL || isNull(colData, cunit->dataType)) {
(*p)[i] = optr == TSDB_RELATION_ISNULL ? true : false;
} else {
if (optr == TSDB_RELATION_NOTNULL) {
@@ -3124,7 +3121,7 @@ _return:
return TSDB_CODE_SUCCESS;
}
-int32_t filterSetColFieldData(SFilterInfo *info, int32_t numOfCols, SArray* pDataBlock) {
+int32_t filterSetColFieldData(SFilterInfo *info, void *param, filer_get_col_from_id fp) {
CHK_LRET(info == NULL, TSDB_CODE_QRY_APP_ERROR, "info NULL");
CHK_LRET(info->fields[FLD_TYPE_COLUMN].num <= 0, TSDB_CODE_QRY_APP_ERROR, "no column fileds");
@@ -3135,15 +3132,8 @@ int32_t filterSetColFieldData(SFilterInfo *info, int32_t numOfCols, SArray* pDat
for (uint16_t i = 0; i < info->fields[FLD_TYPE_COLUMN].num; ++i) {
SFilterField* fi = &info->fields[FLD_TYPE_COLUMN].fields[i];
SSchema* sch = fi->desc;
-
- for (int32_t j = 0; j < numOfCols; ++j) {
- SColumnInfoData* pColInfo = taosArrayGet(pDataBlock, j);
- if (sch->colId == pColInfo->info.colId) {
- fi->data = pColInfo->pData;
-
- break;
- }
- }
+
+ (*fp)(param, sch->colId, &fi->data);
}
filterUpdateComUnits(info);
@@ -3152,7 +3142,7 @@ int32_t filterSetColFieldData(SFilterInfo *info, int32_t numOfCols, SArray* pDat
}
-int32_t filterInitFromTree(tExprNode* tree, SFilterInfo **pinfo, uint32_t options) {
+int32_t filterInitFromTree(tExprNode* tree, void **pinfo, uint32_t options) {
int32_t code = TSDB_CODE_SUCCESS;
SFilterInfo *info = NULL;
@@ -3189,8 +3179,6 @@ int32_t filterInitFromTree(tExprNode* tree, SFilterInfo **pinfo, uint32_t option
taosArrayDestroy(group);
return code;
}
-
- //ERR_JRET(filterInitUnitFunc(info));
}
info->unitRes = malloc(info->unitNum * sizeof(*info->unitRes));
@@ -3249,30 +3237,35 @@ bool filterRangeExecute(SFilterInfo *info, SDataStatis *pDataStatis, int32_t num
break;
}
- if ((pDataStatis[index].numOfNull <= 0) && (ctx->isnull && !ctx->notnull && !ctx->isrange)) {
- ret = false;
- break;
- }
-
- // all data in current column are NULL, no need to check its boundary value
- if (pDataStatis[index].numOfNull == numOfRows) {
-
- // if isNULL query exists, load the null data column
- if ((ctx->notnull || ctx->isrange) && (!ctx->isnull)) {
+ if (pDataStatis[index].numOfNull <= 0) {
+ if (ctx->isnull && !ctx->notnull && !ctx->isrange) {
ret = false;
break;
}
+ } else if (pDataStatis[index].numOfNull > 0) {
+ if (pDataStatis[index].numOfNull == numOfRows) {
+ if ((ctx->notnull || ctx->isrange) && (!ctx->isnull)) {
+ ret = false;
+ break;
+ }
- continue;
+ continue;
+ } else {
+ if (ctx->isnull) {
+ continue;
+ }
+ }
}
SDataStatis* pDataBlockst = &pDataStatis[index];
SFilterRangeNode *r = ctx->rs;
+ float minv = 0;
+ float maxv = 0;
if (ctx->type == TSDB_DATA_TYPE_FLOAT) {
- float minv = (float)(*(double *)(&pDataBlockst->min));
- float maxv = (float)(*(double *)(&pDataBlockst->max));
+ minv = (float)(*(double *)(&pDataBlockst->min));
+ maxv = (float)(*(double *)(&pDataBlockst->max));
minVal = &minv;
maxVal = &maxv;
@@ -3433,6 +3426,52 @@ int32_t filterFreeNcharColumns(SFilterInfo* info) {
return TSDB_CODE_SUCCESS;
}
+int32_t filterIsIndexedColumnQuery(SFilterInfo* info, int32_t idxId, bool *res) {
+ CHK_LRET(info == NULL, TSDB_CODE_QRY_APP_ERROR, "null parameter");
+
+ CHK_JMP(info->fields[FLD_TYPE_COLUMN].num > 1 || info->fields[FLD_TYPE_COLUMN].num <= 0);
+
+ CHK_JMP(info->unitNum > 1 || info->unitNum <= 0);
+
+ CHK_JMP(FILTER_GET_COL_FIELD_ID(FILTER_GET_COL_FIELD(info, 0)) != idxId);
+
+ int32_t optr = FILTER_UNIT_OPTR(info->units);
+
+ CHK_JMP(optr == TSDB_RELATION_LIKE || optr == TSDB_RELATION_IN || optr == TSDB_RELATION_MATCH
+ || optr == TSDB_RELATION_ISNULL || optr == TSDB_RELATION_NOTNULL);
+
+ *res = true;
+
+ return TSDB_CODE_SUCCESS;
+
+_return:
+ *res = false;
+
+ return TSDB_CODE_SUCCESS;
+}
+
+
+int32_t filterGetIndexedColumnInfo(SFilterInfo* info, char** val, int32_t *order, int32_t *flag) {
+ SFilterComUnit *cunit = info->cunits;
+ uint8_t optr = cunit->optr;
+
+ *val = cunit->valData;
+ *order = TSDB_ORDER_ASC;
+
+ if (optr == TSDB_RELATION_LESS || optr == TSDB_RELATION_LESS_EQUAL) {
+ *order = TSDB_ORDER_DESC;
+ }
+
+ if (optr == TSDB_RELATION_NOT_EQUAL) {
+ *order = TSDB_ORDER_ASC|TSDB_ORDER_DESC;
+ }
+
+ if (cunit->valData2 == cunit->valData && optr != TSDB_RELATION_EQUAL) {
+ FILTER_SET_FLAG(*flag, FI_ACTION_NO_NEED);
+ }
+
+ return TSDB_CODE_SUCCESS;
+}
diff --git a/src/query/src/qPlan.c b/src/query/src/qPlan.c
index 1988fc9df7710f15770ca8a9994542d9f4bc8c66..abfa20714b333754478e5c48b9265f839b05a4b1 100644
--- a/src/query/src/qPlan.c
+++ b/src/query/src/qPlan.c
@@ -645,6 +645,12 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
} else {
op = OP_Project;
taosArrayPush(plan, &op);
+
+ if (pQueryAttr->pExpr2 != NULL) {
+ op = OP_Project;
+ taosArrayPush(plan, &op);
+ }
+
if (pQueryAttr->distinct) {
op = OP_Distinct;
taosArrayPush(plan, &op);
diff --git a/src/query/src/qUtil.c b/src/query/src/qUtil.c
index 4caf351799adbf000265566fb22617067efb725d..bc27e094db3dcb85ffa73810e922d73cd42ab3a0 100644
--- a/src/query/src/qUtil.c
+++ b/src/query/src/qUtil.c
@@ -436,13 +436,13 @@ static int32_t tableResultComparFn(const void *pLeft, const void *pRight, void *
}
STableQueryInfo** pList = supporter->pTableQueryInfo;
-
- SResultRowInfo *pWindowResInfo1 = &(pList[left]->resInfo);
- SResultRow * pWindowRes1 = getResultRow(pWindowResInfo1, leftPos);
+ SResultRow* pWindowRes1 = pList[left]->resInfo.pResult[leftPos];
+// SResultRow * pWindowRes1 = getResultRow(&(pList[left]->resInfo), leftPos);
TSKEY leftTimestamp = pWindowRes1->win.skey;
- SResultRowInfo *pWindowResInfo2 = &(pList[right]->resInfo);
- SResultRow * pWindowRes2 = getResultRow(pWindowResInfo2, rightPos);
+// SResultRowInfo *pWindowResInfo2 = &(pList[right]->resInfo);
+// SResultRow * pWindowRes2 = getResultRow(pWindowResInfo2, rightPos);
+ SResultRow* pWindowRes2 = pList[right]->resInfo.pResult[rightPos];
TSKEY rightTimestamp = pWindowRes2->win.skey;
if (leftTimestamp == rightTimestamp) {
@@ -456,7 +456,77 @@ static int32_t tableResultComparFn(const void *pLeft, const void *pRight, void *
}
}
-static int32_t mergeIntoGroupResultImpl(SQueryRuntimeEnv *pRuntimeEnv, SGroupResInfo* pGroupResInfo, SArray *pTableList,
+int32_t tsAscOrder(const void* p1, const void* p2) {
+ SResultRowCell* pc1 = (SResultRowCell*) p1;
+ SResultRowCell* pc2 = (SResultRowCell*) p2;
+
+ if (pc1->groupId == pc2->groupId) {
+ if (pc1->pRow->win.skey == pc2->pRow->win.skey) {
+ return 0;
+ } else {
+ return (pc1->pRow->win.skey < pc2->pRow->win.skey)? -1:1;
+ }
+ } else {
+ return (pc1->groupId < pc2->groupId)? -1:1;
+ }
+}
+
+int32_t tsDescOrder(const void* p1, const void* p2) {
+ SResultRowCell* pc1 = (SResultRowCell*) p1;
+ SResultRowCell* pc2 = (SResultRowCell*) p2;
+
+ if (pc1->groupId == pc2->groupId) {
+ if (pc1->pRow->win.skey == pc2->pRow->win.skey) {
+ return 0;
+ } else {
+ return (pc1->pRow->win.skey < pc2->pRow->win.skey)? 1:-1;
+ }
+ } else {
+ return (pc1->groupId < pc2->groupId)? -1:1;
+ }
+}
+
+void orderTheResultRows(SQueryRuntimeEnv* pRuntimeEnv) {
+ __compar_fn_t fn = NULL;
+ if (pRuntimeEnv->pQueryAttr->order.order == TSDB_ORDER_ASC) {
+ fn = tsAscOrder;
+ } else {
+ fn = tsDescOrder;
+ }
+
+ taosArraySort(pRuntimeEnv->pResultRowArrayList, fn);
+}
+
+static int32_t mergeIntoGroupResultImplRv(SQueryRuntimeEnv *pRuntimeEnv, SGroupResInfo* pGroupResInfo, uint64_t groupId, int32_t* rowCellInfoOffset) {
+ if (!pGroupResInfo->ordered) {
+ orderTheResultRows(pRuntimeEnv);
+ pGroupResInfo->ordered = true;
+ }
+
+ if (pGroupResInfo->pRows == NULL) {
+ pGroupResInfo->pRows = taosArrayInit(100, POINTER_BYTES);
+ }
+
+ size_t len = taosArrayGetSize(pRuntimeEnv->pResultRowArrayList);
+ for(; pGroupResInfo->position < len; ++pGroupResInfo->position) {
+ SResultRowCell* pResultRowCell = taosArrayGet(pRuntimeEnv->pResultRowArrayList, pGroupResInfo->position);
+ if (pResultRowCell->groupId != groupId) {
+ break;
+ }
+
+ int64_t num = getNumOfResultWindowRes(pRuntimeEnv, pResultRowCell->pRow, rowCellInfoOffset);
+ if (num <= 0) {
+ continue;
+ }
+
+ taosArrayPush(pGroupResInfo->pRows, &pResultRowCell->pRow);
+ pResultRowCell->pRow->numOfRows = (uint32_t) num;
+ }
+
+ return TSDB_CODE_SUCCESS;
+}
+
+static UNUSED_FUNC int32_t mergeIntoGroupResultImpl(SQueryRuntimeEnv *pRuntimeEnv, SGroupResInfo* pGroupResInfo, SArray *pTableList,
int32_t* rowCellInfoOffset) {
bool ascQuery = QUERY_IS_ASC_QUERY(pRuntimeEnv->pQueryAttr);
@@ -562,12 +632,7 @@ int32_t mergeIntoGroupResult(SGroupResInfo* pGroupResInfo, SQueryRuntimeEnv* pRu
int64_t st = taosGetTimestampUs();
while (pGroupResInfo->currentGroup < pGroupResInfo->totalGroup) {
- SArray *group = GET_TABLEGROUP(pRuntimeEnv, pGroupResInfo->currentGroup);
-
- int32_t ret = mergeIntoGroupResultImpl(pRuntimeEnv, pGroupResInfo, group, offset);
- if (ret != TSDB_CODE_SUCCESS) {
- return ret;
- }
+ mergeIntoGroupResultImplRv(pRuntimeEnv, pGroupResInfo, pGroupResInfo->currentGroup, offset);
// this group generates at least one result, return results
if (taosArrayGetSize(pGroupResInfo->pRows) > 0) {
@@ -583,7 +648,6 @@ int32_t mergeIntoGroupResult(SGroupResInfo* pGroupResInfo, SQueryRuntimeEnv* pRu
qDebug("QInfo:%"PRIu64" merge res data into group, index:%d, total group:%d, elapsed time:%" PRId64 "us", GET_QID(pRuntimeEnv),
pGroupResInfo->currentGroup, pGroupResInfo->totalGroup, elapsedTime);
-// pQInfo->summary.firstStageMergeTime += elapsedTime;
return TSDB_CODE_SUCCESS;
}
diff --git a/src/query/src/queryMain.c b/src/query/src/queryMain.c
index d56c12ab8735d0683db146f7000429d4d554dda5..c6e6eddce7d8f56095d5d78f4d1f84ed1d4f3c97 100644
--- a/src/query/src/queryMain.c
+++ b/src/query/src/queryMain.c
@@ -35,7 +35,7 @@ typedef struct SQueryMgmt {
bool closed;
} SQueryMgmt;
-static void queryMgmtKillQueryFn(void* handle) {
+static void queryMgmtKillQueryFn(void* handle, void* param1) {
void** fp = (void**)handle;
qKillQuery(*fp);
}
@@ -53,7 +53,6 @@ static void freeqinfoFn(void *qhandle) {
void freeParam(SQueryParam *param) {
tfree(param->sql);
tfree(param->tagCond);
- tfree(param->tbnameCond);
tfree(param->pTableIdList);
taosArrayDestroy(param->pOperator);
tfree(param->pExprs);
@@ -140,7 +139,7 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qi
qDebug("qmsg:%p query stable, uid:%"PRIu64", tid:%d", pQueryMsg, id->uid, id->tid);
code = tsdbQuerySTableByTagCond(tsdb, id->uid, pQueryMsg->window.skey, param.tagCond, pQueryMsg->tagCondLen,
- pQueryMsg->tagNameRelType, param.tbnameCond, &tableGroupInfo, param.pGroupColIndex, numOfGroupByCols);
+ &tableGroupInfo, param.pGroupColIndex, numOfGroupByCols);
if (code != TSDB_CODE_SUCCESS) {
qError("qmsg:%p failed to query stable, reason: %s", pQueryMsg, tstrerror(code));
@@ -215,6 +214,51 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qi
return code;
}
+#ifdef TEST_IMPL
+// wait moment
+int waitMoment(SQInfo* pQInfo){
+ if(pQInfo->sql) {
+ int ms = 0;
+ char* pcnt = strstr(pQInfo->sql, " count(*)");
+ if(pcnt) return 0;
+
+ char* pos = strstr(pQInfo->sql, " t_");
+ if(pos){
+ pos += 3;
+ ms = atoi(pos);
+ while(*pos >= '0' && *pos <= '9'){
+ pos ++;
+ }
+ char unit_char = *pos;
+ if(unit_char == 'h'){
+ ms *= 3600*1000;
+ } else if(unit_char == 'm'){
+ ms *= 60*1000;
+ } else if(unit_char == 's'){
+ ms *= 1000;
+ }
+ }
+ if(ms == 0) return 0;
+ printf("test wait sleep %dms. sql=%s ...\n", ms, pQInfo->sql);
+
+ if(ms < 1000) {
+ taosMsleep(ms);
+ } else {
+ int used_ms = 0;
+ while(used_ms < ms) {
+ taosMsleep(1000);
+ used_ms += 1000;
+ if(isQueryKilled(pQInfo)){
+ printf("test check query is canceled, sleep break.%s\n", pQInfo->sql);
+ break;
+ }
+ }
+ }
+ }
+ return 1;
+}
+#endif
+
bool qTableQuery(qinfo_t qinfo, uint64_t *qId) {
SQInfo *pQInfo = (SQInfo *)qinfo;
assert(pQInfo && pQInfo->signature == pQInfo);
@@ -228,7 +272,8 @@ bool qTableQuery(qinfo_t qinfo, uint64_t *qId) {
}
*qId = pQInfo->qId;
- pQInfo->startExecTs = taosGetTimestampSec();
+ if(pQInfo->startExecTs == 0)
+ pQInfo->startExecTs = taosGetTimestampMs();
if (isQueryKilled(pQInfo)) {
qDebug("QInfo:0x%"PRIx64" it is already killed, abort", pQInfo->qId);
@@ -259,7 +304,9 @@ bool qTableQuery(qinfo_t qinfo, uint64_t *qId) {
int64_t st = taosGetTimestampUs();
pRuntimeEnv->outputBuf = pRuntimeEnv->proot->exec(pRuntimeEnv->proot, &newgroup);
pQInfo->summary.elapsedTime += (taosGetTimestampUs() - st);
-
+#ifdef TEST_IMPL
+ waitMoment(pQInfo);
+#endif
publishOperatorProfEvent(pRuntimeEnv->proot, QUERY_PROF_AFTER_OPERATOR_EXEC);
pRuntimeEnv->resultInfo.total += GET_NUM_OF_RESULTS(pRuntimeEnv);
@@ -479,7 +526,7 @@ void qQueryMgmtNotifyClosed(void* pQMgmt) {
pQueryMgmt->closed = true;
pthread_mutex_unlock(&pQueryMgmt->lock);
- taosCacheRefresh(pQueryMgmt->qinfoPool, queryMgmtKillQueryFn);
+ taosCacheRefresh(pQueryMgmt->qinfoPool, queryMgmtKillQueryFn, NULL);
}
void qQueryMgmtReOpen(void *pQMgmt) {
@@ -574,3 +621,148 @@ void** qReleaseQInfo(void* pMgmt, void* pQInfo, bool freeHandle) {
taosCacheRelease(pQueryMgmt->qinfoPool, pQInfo, freeHandle);
return 0;
}
+
+//kill by qid
+int32_t qKillQueryByQId(void* pMgmt, int64_t qId, int32_t waitMs, int32_t waitCount) {
+ int32_t error = TSDB_CODE_SUCCESS;
+ void** handle = qAcquireQInfo(pMgmt, qId);
+ if(handle == NULL) return terrno;
+
+ SQInfo* pQInfo = (SQInfo*)(*handle);
+ if (pQInfo == NULL || !isValidQInfo(pQInfo)) {
+ return TSDB_CODE_QRY_INVALID_QHANDLE;
+ }
+ qWarn("QId:0x%"PRIx64" be killed(no memory commit).", pQInfo->qId);
+ setQueryKilled(pQInfo);
+
+ // wait query stop
+ int32_t loop = 0;
+ while (pQInfo->owner != 0) {
+ taosMsleep(waitMs);
+ if(loop++ > waitCount){
+ error = TSDB_CODE_FAILED;
+ break;
+ }
+ }
+
+ qReleaseQInfo(pMgmt, (void **)&handle, true);
+ return error;
+}
+
+// local struct
+typedef struct {
+ int64_t qId;
+ int64_t startExecTs;
+} SLongQuery;
+
+// callbark for sort compare
+static int compareLongQuery(const void* p1, const void* p2) {
+ // sort desc
+ SLongQuery* plq1 = *(SLongQuery**)p1;
+ SLongQuery* plq2 = *(SLongQuery**)p2;
+ if(plq1->startExecTs == plq2->startExecTs) {
+ return 0;
+ } else if(plq1->startExecTs > plq2->startExecTs) {
+ return 1;
+ } else {
+ return -1;
+ }
+}
+
+// callback for taosCacheRefresh
+static void cbFoundItem(void* handle, void* param1) {
+ SQInfo * qInfo = *(SQInfo**) handle;
+ if(qInfo == NULL) return ;
+ SArray* qids = (SArray*) param1;
+ if(qids == NULL) return ;
+
+ bool usedMem = true;
+ bool usedIMem = true;
+ SMemTable* mem = qInfo->query.memRef.snapshot.omem;
+ SMemTable* imem = qInfo->query.memRef.snapshot.imem;
+ if(mem == NULL || T_REF_VAL_GET(mem) == 0)
+ usedMem = false;
+ if(imem == NULL || T_REF_VAL_GET(mem) == 0)
+ usedIMem = false ;
+
+ if(!usedMem && !usedIMem)
+ return ;
+
+ // push to qids
+ SLongQuery* plq = (SLongQuery*)malloc(sizeof(SLongQuery));
+ plq->qId = qInfo->qId;
+ plq->startExecTs = qInfo->startExecTs;
+ taosArrayPush(qids, &plq);
+}
+
+// longquery
+void* qObtainLongQuery(void* param){
+ SQueryMgmt* qMgmt = (SQueryMgmt*)param;
+ if(qMgmt == NULL || qMgmt->qinfoPool == NULL)
+ return NULL;
+ SArray* qids = taosArrayInit(4, sizeof(int64_t*));
+ if(qids == NULL) return NULL;
+ // Get each item
+ taosCacheRefresh(qMgmt->qinfoPool, cbFoundItem, qids);
+
+ size_t cnt = taosArrayGetSize(qids);
+ if(cnt == 0) {
+ taosArrayDestroy(qids);
+ return NULL;
+ }
+ if(cnt > 1)
+ taosArraySort(qids, compareLongQuery);
+
+ return qids;
+}
+
+//solve tsdb no block to commit
+bool qFixedNoBlock(void* pRepo, void* pMgmt, int32_t longQueryMs) {
+ SQueryMgmt *pQueryMgmt = pMgmt;
+ bool fixed = false;
+
+ // qid top list
+ SArray *qids = (SArray*)qObtainLongQuery(pQueryMgmt);
+ if(qids == NULL) return false;
+
+ // kill Query
+ int64_t now = taosGetTimestampMs();
+ size_t cnt = taosArrayGetSize(qids);
+ size_t i;
+ SLongQuery* plq;
+ for(i=0; i < cnt; i++) {
+ plq = (SLongQuery* )taosArrayGetP(qids, i);
+ if(plq->startExecTs > now) continue;
+ if(now - plq->startExecTs >= longQueryMs) {
+ qKillQueryByQId(pMgmt, plq->qId, 500, 10); // wait 50*100 ms
+ if(tsdbNoProblem(pRepo)) {
+ fixed = true;
+ qWarn("QId:0x%"PRIx64" fixed problem after kill this query.", plq->qId);
+ break;
+ }
+ }
+ }
+
+ // free qids
+ for(i=0; i < cnt; i++) {
+ free(taosArrayGetP(qids, i));
+ }
+ taosArrayDestroy(qids);
+ return fixed;
+}
+
+//solve tsdb no block to commit
+bool qSolveCommitNoBlock(void* pRepo, void* pMgmt) {
+ qWarn("pRepo=%p start solve problem.", pRepo);
+ if(qFixedNoBlock(pRepo, pMgmt, 10*60*1000)) {
+ return true;
+ }
+ if(qFixedNoBlock(pRepo, pMgmt, 2*60*1000)){
+ return true;
+ }
+ if(qFixedNoBlock(pRepo, pMgmt, 30*1000)){
+ return true;
+ }
+ qWarn("pRepo=%p solve problem failed.", pRepo);
+ return false;
+}
diff --git a/src/query/src/sql.c b/src/query/src/sql.c
index f66c2968a6cebf805579dc3fe4c123331f9ecfc8..e89b6232f7e42b764df7660f06dcd207bfe6e4de 100644
--- a/src/query/src/sql.c
+++ b/src/query/src/sql.c
@@ -102,29 +102,29 @@
#endif
/************* Begin control #defines *****************************************/
#define YYCODETYPE unsigned short int
-#define YYNOCODE 277
+#define YYNOCODE 278
#define YYACTIONTYPE unsigned short int
#define ParseTOKENTYPE SStrToken
typedef union {
int yyinit;
ParseTOKENTYPE yy0;
- SCreateTableSql* yy56;
- int yy70;
- SCreatedTableInfo yy84;
- SRelationInfo* yy114;
- int32_t yy202;
- SIntervalVal yy222;
- SSqlNode* yy224;
- SCreateDbInfo yy246;
- tSqlExpr* yy260;
- TAOS_FIELD yy363;
- SSessionWindowVal yy365;
- SCreateAcctInfo yy377;
- int64_t yy387;
- SArray* yy403;
- SLimitVal yy404;
- tVariant yy488;
- SWindowStateVal yy544;
+ SRelationInfo* yy8;
+ SWindowStateVal yy40;
+ SSqlNode* yy56;
+ SCreateDbInfo yy90;
+ int yy96;
+ int32_t yy104;
+ SSessionWindowVal yy147;
+ SCreatedTableInfo yy152;
+ SLimitVal yy166;
+ SCreateAcctInfo yy171;
+ TAOS_FIELD yy183;
+ int64_t yy325;
+ SIntervalVal yy400;
+ SArray* yy421;
+ tVariant yy430;
+ SCreateTableSql* yy438;
+ tSqlExpr* yy439;
} YYMINORTYPE;
#ifndef YYSTACKDEPTH
#define YYSTACKDEPTH 100
@@ -140,18 +140,18 @@ typedef union {
#define ParseCTX_FETCH
#define ParseCTX_STORE
#define YYFALLBACK 1
-#define YYNSTATE 366
-#define YYNRULE 293
-#define YYNRULE_WITH_ACTION 293
-#define YYNTOKEN 196
-#define YY_MAX_SHIFT 365
-#define YY_MIN_SHIFTREDUCE 574
-#define YY_MAX_SHIFTREDUCE 866
-#define YY_ERROR_ACTION 867
-#define YY_ACCEPT_ACTION 868
-#define YY_NO_ACTION 869
-#define YY_MIN_REDUCE 870
-#define YY_MAX_REDUCE 1162
+#define YYNSTATE 368
+#define YYNRULE 294
+#define YYNRULE_WITH_ACTION 294
+#define YYNTOKEN 197
+#define YY_MAX_SHIFT 367
+#define YY_MIN_SHIFTREDUCE 576
+#define YY_MAX_SHIFTREDUCE 869
+#define YY_ERROR_ACTION 870
+#define YY_ACCEPT_ACTION 871
+#define YY_NO_ACTION 872
+#define YY_MIN_REDUCE 873
+#define YY_MAX_REDUCE 1166
/************* End control #defines *******************************************/
#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
@@ -218,291 +218,292 @@ typedef union {
** yy_default[] Default action for each state.
**
*********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (766)
+#define YY_ACTTAB_COUNT (773)
static const YYACTIONTYPE yy_action[] = {
- /* 0 */ 1020, 626, 239, 626, 364, 233, 1026, 1039, 210, 627,
- /* 10 */ 662, 627, 38, 58, 59, 38, 62, 63, 1048, 1138,
- /* 20 */ 253, 52, 51, 236, 61, 322, 66, 64, 67, 65,
- /* 30 */ 1039, 810, 245, 813, 57, 56, 1026, 23, 55, 54,
- /* 40 */ 53, 58, 59, 626, 62, 63, 237, 246, 253, 52,
- /* 50 */ 51, 627, 61, 322, 66, 64, 67, 65, 868, 365,
- /* 60 */ 235, 1022, 57, 56, 1023, 250, 55, 54, 53, 988,
- /* 70 */ 976, 977, 978, 979, 980, 981, 982, 983, 984, 985,
- /* 80 */ 986, 987, 989, 990, 156, 29, 1045, 81, 575, 576,
- /* 90 */ 577, 578, 579, 580, 581, 582, 583, 584, 585, 586,
- /* 100 */ 587, 588, 154, 163, 234, 172, 58, 59, 1039, 62,
- /* 110 */ 63, 1012, 804, 253, 52, 51, 72, 61, 322, 66,
- /* 120 */ 64, 67, 65, 284, 275, 210, 352, 57, 56, 262,
- /* 130 */ 163, 55, 54, 53, 58, 60, 1139, 62, 63, 75,
- /* 140 */ 177, 253, 52, 51, 626, 61, 322, 66, 64, 67,
- /* 150 */ 65, 817, 627, 282, 281, 57, 56, 267, 73, 55,
- /* 160 */ 54, 53, 59, 163, 62, 63, 271, 270, 253, 52,
- /* 170 */ 51, 320, 61, 322, 66, 64, 67, 65, 1087, 76,
- /* 180 */ 294, 247, 57, 56, 207, 1026, 55, 54, 53, 62,
- /* 190 */ 63, 38, 249, 253, 52, 51, 320, 61, 322, 66,
- /* 200 */ 64, 67, 65, 296, 710, 92, 87, 57, 56, 769,
- /* 210 */ 770, 55, 54, 53, 44, 318, 359, 358, 317, 316,
- /* 220 */ 315, 357, 314, 313, 312, 356, 311, 355, 354, 24,
- /* 230 */ 163, 252, 819, 342, 341, 808, 243, 811, 1086, 814,
- /* 240 */ 1023, 252, 819, 45, 208, 808, 213, 811, 254, 814,
- /* 250 */ 57, 56, 210, 220, 55, 54, 53, 96, 262, 138,
- /* 260 */ 137, 136, 219, 1139, 231, 232, 327, 87, 323, 178,
- /* 270 */ 99, 5, 41, 181, 231, 232, 360, 957, 180, 105,
- /* 280 */ 110, 101, 109, 363, 362, 147, 66, 64, 67, 65,
- /* 290 */ 1009, 1010, 35, 1013, 57, 56, 919, 307, 55, 54,
- /* 300 */ 53, 256, 929, 191, 45, 93, 1014, 734, 210, 191,
- /* 310 */ 731, 38, 732, 68, 733, 261, 262, 214, 44, 1139,
- /* 320 */ 359, 358, 124, 68, 215, 357, 274, 1024, 79, 356,
- /* 330 */ 1134, 355, 354, 1133, 352, 227, 122, 116, 127, 258,
- /* 340 */ 259, 750, 809, 126, 812, 132, 135, 125, 820, 815,
- /* 350 */ 920, 1025, 38, 38, 129, 816, 244, 191, 820, 815,
- /* 360 */ 1023, 201, 199, 197, 38, 816, 80, 38, 196, 142,
- /* 370 */ 141, 140, 139, 996, 14, 994, 995, 257, 95, 255,
- /* 380 */ 997, 330, 329, 786, 998, 38, 999, 1000, 38, 324,
- /* 390 */ 38, 263, 84, 260, 85, 337, 336, 331, 332, 38,
- /* 400 */ 1011, 1023, 1023, 55, 54, 53, 94, 1132, 98, 333,
- /* 410 */ 1, 179, 334, 1023, 3, 192, 1023, 153, 151, 150,
- /* 420 */ 82, 747, 276, 735, 736, 34, 754, 766, 776, 278,
- /* 430 */ 338, 278, 777, 339, 1023, 340, 39, 1023, 806, 1023,
- /* 440 */ 785, 158, 69, 720, 344, 299, 26, 9, 1023, 251,
- /* 450 */ 722, 301, 721, 841, 821, 625, 78, 39, 302, 39,
- /* 460 */ 229, 16, 818, 15, 69, 97, 69, 25, 25, 25,
- /* 470 */ 115, 6, 114, 1158, 18, 807, 17, 739, 737, 740,
- /* 480 */ 738, 20, 121, 19, 120, 22, 230, 21, 709, 134,
- /* 490 */ 133, 211, 823, 212, 216, 1150, 209, 1097, 217, 218,
- /* 500 */ 222, 223, 224, 221, 206, 1096, 241, 1093, 1092, 242,
- /* 510 */ 343, 272, 155, 48, 1047, 1058, 1055, 1056, 1060, 157,
- /* 520 */ 1040, 279, 1079, 162, 290, 1078, 173, 1021, 174, 1019,
- /* 530 */ 175, 176, 934, 283, 238, 152, 167, 165, 304, 305,
- /* 540 */ 765, 1037, 164, 306, 309, 310, 285, 46, 204, 42,
- /* 550 */ 321, 928, 287, 328, 1157, 112, 1156, 77, 1153, 297,
- /* 560 */ 182, 335, 1149, 74, 50, 166, 295, 168, 293, 291,
- /* 570 */ 118, 289, 286, 1148, 1145, 183, 954, 43, 40, 47,
- /* 580 */ 205, 916, 128, 914, 130, 131, 49, 912, 911, 264,
- /* 590 */ 194, 195, 908, 907, 906, 905, 904, 903, 902, 198,
- /* 600 */ 200, 899, 897, 895, 893, 202, 890, 203, 308, 886,
- /* 610 */ 353, 123, 277, 83, 88, 345, 288, 1080, 346, 347,
- /* 620 */ 348, 349, 228, 350, 351, 248, 303, 361, 866, 265,
- /* 630 */ 266, 865, 269, 225, 226, 268, 864, 847, 846, 933,
- /* 640 */ 932, 106, 107, 273, 278, 10, 298, 742, 280, 86,
- /* 650 */ 30, 910, 909, 89, 767, 143, 159, 144, 955, 186,
- /* 660 */ 184, 185, 188, 187, 189, 190, 901, 2, 145, 992,
- /* 670 */ 900, 892, 171, 169, 33, 170, 956, 146, 891, 4,
- /* 680 */ 778, 160, 161, 772, 90, 240, 774, 1002, 91, 292,
- /* 690 */ 31, 11, 32, 12, 13, 27, 300, 28, 98, 100,
- /* 700 */ 103, 36, 102, 640, 37, 104, 675, 673, 672, 671,
- /* 710 */ 669, 668, 667, 664, 630, 319, 108, 7, 824, 822,
- /* 720 */ 325, 8, 326, 111, 113, 70, 71, 117, 39, 712,
- /* 730 */ 119, 711, 708, 656, 654, 646, 652, 648, 650, 644,
- /* 740 */ 642, 678, 677, 676, 674, 670, 666, 665, 193, 628,
- /* 750 */ 592, 870, 869, 869, 869, 869, 869, 869, 869, 869,
- /* 760 */ 869, 869, 869, 869, 148, 149,
+ /* 0 */ 23, 628, 366, 235, 1051, 208, 241, 712, 211, 629,
+ /* 10 */ 1029, 871, 367, 59, 60, 173, 63, 64, 1042, 1142,
+ /* 20 */ 255, 53, 52, 51, 628, 62, 324, 67, 65, 68,
+ /* 30 */ 66, 157, 629, 286, 238, 58, 57, 344, 343, 56,
+ /* 40 */ 55, 54, 59, 60, 247, 63, 64, 252, 1029, 255,
+ /* 50 */ 53, 52, 51, 209, 62, 324, 67, 65, 68, 66,
+ /* 60 */ 999, 1042, 997, 998, 58, 57, 664, 1000, 56, 55,
+ /* 70 */ 54, 1001, 1048, 1002, 1003, 58, 57, 277, 1015, 56,
+ /* 80 */ 55, 54, 59, 60, 164, 63, 64, 38, 82, 255,
+ /* 90 */ 53, 52, 51, 88, 62, 324, 67, 65, 68, 66,
+ /* 100 */ 284, 283, 249, 752, 58, 57, 1029, 211, 56, 55,
+ /* 110 */ 54, 38, 59, 61, 806, 63, 64, 1042, 1143, 255,
+ /* 120 */ 53, 52, 51, 628, 62, 324, 67, 65, 68, 66,
+ /* 130 */ 45, 629, 237, 239, 58, 57, 1026, 164, 56, 55,
+ /* 140 */ 54, 60, 1023, 63, 64, 771, 772, 255, 53, 52,
+ /* 150 */ 51, 95, 62, 324, 67, 65, 68, 66, 38, 1090,
+ /* 160 */ 1025, 296, 58, 57, 322, 83, 56, 55, 54, 577,
+ /* 170 */ 578, 579, 580, 581, 582, 583, 584, 585, 586, 587,
+ /* 180 */ 588, 589, 590, 155, 322, 236, 63, 64, 756, 248,
+ /* 190 */ 255, 53, 52, 51, 628, 62, 324, 67, 65, 68,
+ /* 200 */ 66, 251, 629, 245, 354, 58, 57, 1026, 215, 56,
+ /* 210 */ 55, 54, 1089, 44, 320, 361, 360, 319, 318, 317,
+ /* 220 */ 359, 316, 315, 314, 358, 313, 357, 356, 808, 38,
+ /* 230 */ 1, 180, 24, 991, 979, 980, 981, 982, 983, 984,
+ /* 240 */ 985, 986, 987, 988, 989, 990, 992, 993, 256, 214,
+ /* 250 */ 38, 254, 821, 922, 100, 810, 222, 813, 164, 816,
+ /* 260 */ 192, 211, 139, 138, 137, 221, 809, 254, 821, 329,
+ /* 270 */ 88, 810, 1143, 813, 246, 816, 1028, 29, 1026, 67,
+ /* 280 */ 65, 68, 66, 38, 1162, 233, 234, 58, 57, 325,
+ /* 290 */ 1017, 56, 55, 54, 38, 333, 56, 55, 54, 1026,
+ /* 300 */ 269, 233, 234, 258, 5, 41, 182, 45, 211, 273,
+ /* 310 */ 272, 181, 106, 111, 102, 110, 164, 73, 736, 1143,
+ /* 320 */ 932, 733, 812, 734, 815, 735, 263, 192, 334, 276,
+ /* 330 */ 309, 80, 1026, 94, 69, 123, 117, 128, 229, 335,
+ /* 340 */ 362, 960, 127, 1026, 133, 136, 126, 202, 200, 198,
+ /* 350 */ 69, 260, 261, 130, 197, 143, 142, 141, 140, 74,
+ /* 360 */ 44, 97, 361, 360, 788, 923, 38, 359, 38, 822,
+ /* 370 */ 817, 358, 192, 357, 356, 38, 818, 38, 38, 259,
+ /* 380 */ 811, 257, 814, 332, 331, 822, 817, 264, 125, 298,
+ /* 390 */ 264, 93, 818, 326, 1012, 1013, 35, 1016, 178, 14,
+ /* 400 */ 354, 179, 265, 96, 262, 264, 339, 338, 154, 152,
+ /* 410 */ 151, 336, 749, 340, 81, 1026, 1027, 1026, 3, 193,
+ /* 420 */ 341, 787, 342, 346, 1026, 278, 1026, 1026, 365, 364,
+ /* 430 */ 148, 85, 86, 99, 76, 737, 738, 768, 9, 39,
+ /* 440 */ 778, 779, 722, 819, 301, 724, 216, 303, 1014, 723,
+ /* 450 */ 34, 159, 844, 823, 70, 26, 39, 253, 39, 70,
+ /* 460 */ 79, 98, 627, 70, 135, 134, 25, 25, 280, 280,
+ /* 470 */ 16, 116, 15, 115, 77, 18, 25, 17, 741, 6,
+ /* 480 */ 742, 274, 739, 304, 740, 20, 122, 19, 121, 22,
+ /* 490 */ 217, 21, 711, 1100, 1137, 1136, 1135, 825, 231, 156,
+ /* 500 */ 232, 820, 212, 213, 218, 210, 1099, 219, 220, 224,
+ /* 510 */ 225, 226, 223, 207, 1154, 243, 1096, 1095, 244, 345,
+ /* 520 */ 1050, 1061, 1043, 48, 1058, 1059, 1063, 153, 281, 158,
+ /* 530 */ 163, 292, 1024, 175, 1082, 174, 1081, 279, 84, 285,
+ /* 540 */ 1022, 310, 176, 240, 177, 171, 167, 937, 306, 307,
+ /* 550 */ 308, 767, 311, 312, 1040, 165, 166, 46, 287, 289,
+ /* 560 */ 297, 299, 205, 168, 42, 78, 75, 50, 323, 931,
+ /* 570 */ 330, 1161, 113, 1160, 295, 169, 293, 291, 1157, 183,
+ /* 580 */ 337, 1153, 119, 288, 1152, 1149, 184, 957, 43, 40,
+ /* 590 */ 47, 206, 919, 129, 49, 917, 131, 132, 915, 914,
+ /* 600 */ 266, 195, 196, 911, 910, 909, 908, 907, 906, 905,
+ /* 610 */ 199, 201, 902, 900, 898, 896, 203, 893, 204, 889,
+ /* 620 */ 355, 124, 89, 290, 1083, 347, 348, 349, 350, 351,
+ /* 630 */ 352, 353, 363, 869, 230, 250, 305, 267, 268, 868,
+ /* 640 */ 270, 227, 228, 271, 867, 850, 107, 936, 935, 108,
+ /* 650 */ 849, 275, 280, 300, 10, 282, 744, 87, 30, 90,
+ /* 660 */ 913, 912, 904, 186, 958, 190, 185, 187, 144, 191,
+ /* 670 */ 189, 188, 145, 146, 147, 903, 995, 895, 4, 894,
+ /* 680 */ 959, 769, 160, 33, 780, 170, 172, 2, 161, 162,
+ /* 690 */ 774, 91, 242, 776, 92, 1005, 294, 11, 12, 31,
+ /* 700 */ 32, 13, 27, 302, 28, 99, 101, 104, 36, 103,
+ /* 710 */ 642, 37, 105, 677, 675, 674, 673, 671, 670, 669,
+ /* 720 */ 666, 321, 109, 632, 7, 826, 824, 8, 327, 328,
+ /* 730 */ 112, 114, 71, 72, 118, 714, 39, 120, 713, 710,
+ /* 740 */ 658, 656, 648, 654, 650, 652, 646, 644, 680, 679,
+ /* 750 */ 678, 676, 672, 668, 667, 194, 630, 594, 873, 872,
+ /* 760 */ 872, 872, 872, 872, 872, 872, 872, 872, 872, 872,
+ /* 770 */ 872, 149, 150,
};
static const YYCODETYPE yy_lookahead[] = {
- /* 0 */ 198, 1, 244, 1, 198, 199, 248, 246, 265, 9,
- /* 10 */ 5, 9, 198, 13, 14, 198, 16, 17, 198, 276,
- /* 20 */ 20, 21, 22, 262, 24, 25, 26, 27, 28, 29,
- /* 30 */ 246, 5, 244, 7, 34, 35, 248, 265, 38, 39,
- /* 40 */ 40, 13, 14, 1, 16, 17, 262, 245, 20, 21,
- /* 50 */ 22, 9, 24, 25, 26, 27, 28, 29, 196, 197,
- /* 60 */ 243, 247, 34, 35, 247, 205, 38, 39, 40, 222,
- /* 70 */ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232,
- /* 80 */ 233, 234, 235, 236, 198, 83, 266, 87, 46, 47,
- /* 90 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- /* 100 */ 58, 59, 60, 198, 62, 252, 13, 14, 246, 16,
- /* 110 */ 17, 0, 84, 20, 21, 22, 98, 24, 25, 26,
- /* 120 */ 27, 28, 29, 270, 262, 265, 91, 34, 35, 198,
- /* 130 */ 198, 38, 39, 40, 13, 14, 276, 16, 17, 98,
- /* 140 */ 209, 20, 21, 22, 1, 24, 25, 26, 27, 28,
- /* 150 */ 29, 125, 9, 267, 268, 34, 35, 143, 140, 38,
- /* 160 */ 39, 40, 14, 198, 16, 17, 152, 153, 20, 21,
- /* 170 */ 22, 85, 24, 25, 26, 27, 28, 29, 273, 138,
- /* 180 */ 275, 244, 34, 35, 265, 248, 38, 39, 40, 16,
- /* 190 */ 17, 198, 205, 20, 21, 22, 85, 24, 25, 26,
- /* 200 */ 27, 28, 29, 271, 5, 273, 83, 34, 35, 126,
- /* 210 */ 127, 38, 39, 40, 99, 100, 101, 102, 103, 104,
- /* 220 */ 105, 106, 107, 108, 109, 110, 111, 112, 113, 45,
- /* 230 */ 198, 1, 2, 34, 35, 5, 243, 7, 273, 9,
- /* 240 */ 247, 1, 2, 120, 265, 5, 62, 7, 205, 9,
- /* 250 */ 34, 35, 265, 69, 38, 39, 40, 206, 198, 75,
- /* 260 */ 76, 77, 78, 276, 34, 35, 82, 83, 38, 209,
- /* 270 */ 206, 63, 64, 65, 34, 35, 220, 221, 70, 71,
- /* 280 */ 72, 73, 74, 66, 67, 68, 26, 27, 28, 29,
- /* 290 */ 239, 240, 241, 242, 34, 35, 204, 89, 38, 39,
- /* 300 */ 40, 69, 204, 211, 120, 273, 242, 2, 265, 211,
- /* 310 */ 5, 198, 7, 83, 9, 69, 198, 265, 99, 276,
- /* 320 */ 101, 102, 79, 83, 265, 106, 142, 209, 144, 110,
- /* 330 */ 265, 112, 113, 265, 91, 151, 63, 64, 65, 34,
- /* 340 */ 35, 38, 5, 70, 7, 72, 73, 74, 118, 119,
- /* 350 */ 204, 248, 198, 198, 81, 125, 243, 211, 118, 119,
- /* 360 */ 247, 63, 64, 65, 198, 125, 206, 198, 70, 71,
- /* 370 */ 72, 73, 74, 222, 83, 224, 225, 145, 87, 147,
- /* 380 */ 229, 149, 150, 77, 233, 198, 235, 236, 198, 15,
- /* 390 */ 198, 145, 84, 147, 84, 149, 150, 243, 243, 198,
- /* 400 */ 240, 247, 247, 38, 39, 40, 249, 265, 117, 243,
- /* 410 */ 207, 208, 243, 247, 202, 203, 247, 63, 64, 65,
- /* 420 */ 263, 98, 84, 118, 119, 83, 123, 84, 84, 121,
- /* 430 */ 243, 121, 84, 243, 247, 243, 98, 247, 1, 247,
- /* 440 */ 134, 98, 98, 84, 243, 84, 98, 124, 247, 61,
- /* 450 */ 84, 84, 84, 84, 84, 84, 83, 98, 116, 98,
- /* 460 */ 265, 146, 125, 148, 98, 98, 98, 98, 98, 98,
- /* 470 */ 146, 83, 148, 248, 146, 38, 148, 5, 5, 7,
- /* 480 */ 7, 146, 146, 148, 148, 146, 265, 148, 115, 79,
- /* 490 */ 80, 265, 118, 265, 265, 248, 265, 238, 265, 265,
- /* 500 */ 265, 265, 265, 265, 265, 238, 238, 238, 238, 238,
- /* 510 */ 238, 198, 198, 264, 198, 198, 198, 198, 198, 198,
- /* 520 */ 246, 246, 274, 198, 198, 274, 250, 246, 198, 198,
- /* 530 */ 198, 198, 198, 269, 269, 61, 257, 259, 198, 198,
- /* 540 */ 125, 261, 260, 198, 198, 198, 269, 198, 198, 198,
- /* 550 */ 198, 198, 269, 198, 198, 198, 198, 137, 198, 132,
- /* 560 */ 198, 198, 198, 139, 136, 258, 135, 256, 130, 129,
- /* 570 */ 198, 128, 131, 198, 198, 198, 198, 198, 198, 198,
- /* 580 */ 198, 198, 198, 198, 198, 198, 141, 198, 198, 198,
- /* 590 */ 198, 198, 198, 198, 198, 198, 198, 198, 198, 198,
- /* 600 */ 198, 198, 198, 198, 198, 198, 198, 198, 90, 198,
- /* 610 */ 114, 97, 200, 200, 200, 96, 200, 200, 52, 93,
- /* 620 */ 95, 56, 200, 94, 92, 200, 200, 85, 5, 154,
- /* 630 */ 5, 5, 5, 200, 200, 154, 5, 101, 100, 210,
- /* 640 */ 210, 206, 206, 143, 121, 83, 116, 84, 98, 122,
- /* 650 */ 83, 200, 200, 98, 84, 201, 83, 201, 219, 213,
- /* 660 */ 218, 217, 214, 216, 215, 212, 200, 207, 201, 237,
- /* 670 */ 200, 200, 253, 255, 251, 254, 221, 201, 200, 202,
- /* 680 */ 84, 83, 98, 84, 83, 1, 84, 237, 83, 83,
- /* 690 */ 98, 133, 98, 133, 83, 83, 116, 83, 117, 79,
- /* 700 */ 71, 88, 87, 5, 88, 87, 9, 5, 5, 5,
- /* 710 */ 5, 5, 5, 5, 86, 15, 79, 83, 118, 84,
- /* 720 */ 25, 83, 60, 148, 148, 16, 16, 148, 98, 5,
- /* 730 */ 148, 5, 84, 5, 5, 5, 5, 5, 5, 5,
- /* 740 */ 5, 5, 5, 5, 5, 5, 5, 5, 98, 86,
- /* 750 */ 61, 0, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 760 */ 277, 277, 277, 277, 21, 21, 277, 277, 277, 277,
- /* 770 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 780 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 790 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 800 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 810 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 820 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 830 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 840 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 850 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 860 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 870 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 880 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 890 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 900 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 910 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 920 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 930 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 940 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 950 */ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
- /* 960 */ 277, 277,
+ /* 0 */ 266, 1, 199, 200, 199, 266, 245, 5, 266, 9,
+ /* 10 */ 249, 197, 198, 13, 14, 253, 16, 17, 247, 277,
+ /* 20 */ 20, 21, 22, 23, 1, 25, 26, 27, 28, 29,
+ /* 30 */ 30, 199, 9, 271, 263, 35, 36, 35, 36, 39,
+ /* 40 */ 40, 41, 13, 14, 245, 16, 17, 206, 249, 20,
+ /* 50 */ 21, 22, 23, 266, 25, 26, 27, 28, 29, 30,
+ /* 60 */ 223, 247, 225, 226, 35, 36, 5, 230, 39, 40,
+ /* 70 */ 41, 234, 267, 236, 237, 35, 36, 263, 0, 39,
+ /* 80 */ 40, 41, 13, 14, 199, 16, 17, 199, 88, 20,
+ /* 90 */ 21, 22, 23, 84, 25, 26, 27, 28, 29, 30,
+ /* 100 */ 268, 269, 245, 39, 35, 36, 249, 266, 39, 40,
+ /* 110 */ 41, 199, 13, 14, 85, 16, 17, 247, 277, 20,
+ /* 120 */ 21, 22, 23, 1, 25, 26, 27, 28, 29, 30,
+ /* 130 */ 121, 9, 244, 263, 35, 36, 248, 199, 39, 40,
+ /* 140 */ 41, 14, 199, 16, 17, 127, 128, 20, 21, 22,
+ /* 150 */ 23, 250, 25, 26, 27, 28, 29, 30, 199, 274,
+ /* 160 */ 248, 276, 35, 36, 86, 264, 39, 40, 41, 47,
+ /* 170 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ /* 180 */ 58, 59, 60, 61, 86, 63, 16, 17, 124, 246,
+ /* 190 */ 20, 21, 22, 23, 1, 25, 26, 27, 28, 29,
+ /* 200 */ 30, 206, 9, 244, 92, 35, 36, 248, 266, 39,
+ /* 210 */ 40, 41, 274, 100, 101, 102, 103, 104, 105, 106,
+ /* 220 */ 107, 108, 109, 110, 111, 112, 113, 114, 1, 199,
+ /* 230 */ 208, 209, 46, 223, 224, 225, 226, 227, 228, 229,
+ /* 240 */ 230, 231, 232, 233, 234, 235, 236, 237, 206, 63,
+ /* 250 */ 199, 1, 2, 205, 207, 5, 70, 7, 199, 9,
+ /* 260 */ 212, 266, 76, 77, 78, 79, 39, 1, 2, 83,
+ /* 270 */ 84, 5, 277, 7, 244, 9, 249, 84, 248, 27,
+ /* 280 */ 28, 29, 30, 199, 249, 35, 36, 35, 36, 39,
+ /* 290 */ 243, 39, 40, 41, 199, 244, 39, 40, 41, 248,
+ /* 300 */ 144, 35, 36, 70, 64, 65, 66, 121, 266, 153,
+ /* 310 */ 154, 71, 72, 73, 74, 75, 199, 99, 2, 277,
+ /* 320 */ 205, 5, 5, 7, 7, 9, 70, 212, 244, 143,
+ /* 330 */ 90, 145, 248, 274, 84, 64, 65, 66, 152, 244,
+ /* 340 */ 221, 222, 71, 248, 73, 74, 75, 64, 65, 66,
+ /* 350 */ 84, 35, 36, 82, 71, 72, 73, 74, 75, 141,
+ /* 360 */ 100, 207, 102, 103, 78, 205, 199, 107, 199, 119,
+ /* 370 */ 120, 111, 212, 113, 114, 199, 126, 199, 199, 146,
+ /* 380 */ 5, 148, 7, 150, 151, 119, 120, 199, 80, 272,
+ /* 390 */ 199, 274, 126, 15, 240, 241, 242, 243, 210, 84,
+ /* 400 */ 92, 210, 146, 88, 148, 199, 150, 151, 64, 65,
+ /* 410 */ 66, 244, 99, 244, 207, 248, 210, 248, 203, 204,
+ /* 420 */ 244, 135, 244, 244, 248, 85, 248, 248, 67, 68,
+ /* 430 */ 69, 85, 85, 118, 99, 119, 120, 85, 125, 99,
+ /* 440 */ 85, 85, 85, 126, 85, 85, 266, 85, 241, 85,
+ /* 450 */ 84, 99, 85, 85, 99, 99, 99, 62, 99, 99,
+ /* 460 */ 84, 99, 85, 99, 80, 81, 99, 99, 122, 122,
+ /* 470 */ 147, 147, 149, 149, 139, 147, 99, 149, 5, 84,
+ /* 480 */ 7, 199, 5, 117, 7, 147, 147, 149, 149, 147,
+ /* 490 */ 266, 149, 116, 239, 266, 266, 266, 119, 266, 199,
+ /* 500 */ 266, 126, 266, 266, 266, 266, 239, 266, 266, 266,
+ /* 510 */ 266, 266, 266, 266, 249, 239, 239, 239, 239, 239,
+ /* 520 */ 199, 199, 247, 265, 199, 199, 199, 62, 247, 199,
+ /* 530 */ 199, 199, 247, 199, 275, 251, 275, 201, 201, 270,
+ /* 540 */ 199, 91, 199, 270, 199, 255, 259, 199, 199, 199,
+ /* 550 */ 199, 126, 199, 199, 262, 261, 260, 199, 270, 270,
+ /* 560 */ 136, 133, 199, 258, 199, 138, 140, 137, 199, 199,
+ /* 570 */ 199, 199, 199, 199, 131, 257, 130, 129, 199, 199,
+ /* 580 */ 199, 199, 199, 132, 199, 199, 199, 199, 199, 199,
+ /* 590 */ 199, 199, 199, 199, 142, 199, 199, 199, 199, 199,
+ /* 600 */ 199, 199, 199, 199, 199, 199, 199, 199, 199, 199,
+ /* 610 */ 199, 199, 199, 199, 199, 199, 199, 199, 199, 199,
+ /* 620 */ 115, 98, 201, 201, 201, 97, 53, 94, 96, 57,
+ /* 630 */ 95, 93, 86, 5, 201, 201, 201, 155, 5, 5,
+ /* 640 */ 155, 201, 201, 5, 5, 102, 207, 211, 211, 207,
+ /* 650 */ 101, 144, 122, 117, 84, 99, 85, 123, 84, 99,
+ /* 660 */ 201, 201, 201, 218, 220, 216, 219, 214, 202, 213,
+ /* 670 */ 215, 217, 202, 202, 202, 201, 238, 201, 203, 201,
+ /* 680 */ 222, 85, 84, 252, 85, 256, 254, 208, 84, 99,
+ /* 690 */ 85, 84, 1, 85, 84, 238, 84, 134, 134, 99,
+ /* 700 */ 99, 84, 84, 117, 84, 118, 80, 72, 89, 88,
+ /* 710 */ 5, 89, 88, 9, 5, 5, 5, 5, 5, 5,
+ /* 720 */ 5, 15, 80, 87, 84, 119, 85, 84, 26, 61,
+ /* 730 */ 149, 149, 16, 16, 149, 5, 99, 149, 5, 85,
+ /* 740 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ /* 750 */ 5, 5, 5, 5, 5, 99, 87, 62, 0, 278,
+ /* 760 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 770 */ 278, 21, 21, 278, 278, 278, 278, 278, 278, 278,
+ /* 780 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 790 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 800 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 810 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 820 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 830 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 840 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 850 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 860 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 870 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 880 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 890 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 900 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 910 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 920 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 930 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 940 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 950 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+ /* 960 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
};
-#define YY_SHIFT_COUNT (365)
+#define YY_SHIFT_COUNT (367)
#define YY_SHIFT_MIN (0)
-#define YY_SHIFT_MAX (751)
+#define YY_SHIFT_MAX (758)
static const unsigned short int yy_shift_ofst[] = {
- /* 0 */ 184, 115, 115, 219, 219, 86, 230, 240, 240, 2,
- /* 10 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143,
- /* 20 */ 143, 143, 143, 0, 42, 240, 305, 305, 305, 123,
- /* 30 */ 123, 143, 143, 83, 143, 111, 143, 143, 143, 143,
- /* 40 */ 243, 86, 35, 35, 5, 766, 766, 766, 240, 240,
- /* 50 */ 240, 240, 240, 240, 240, 240, 240, 240, 240, 240,
- /* 60 */ 240, 240, 240, 240, 240, 240, 240, 240, 240, 305,
- /* 70 */ 305, 305, 199, 199, 199, 199, 199, 199, 199, 143,
- /* 80 */ 143, 143, 303, 143, 143, 143, 123, 123, 143, 143,
- /* 90 */ 143, 143, 306, 306, 323, 123, 143, 143, 143, 143,
- /* 100 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143,
- /* 110 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143,
- /* 120 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143,
- /* 130 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143,
- /* 140 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143,
- /* 150 */ 143, 143, 143, 143, 143, 474, 474, 474, 415, 415,
- /* 160 */ 415, 415, 474, 474, 420, 424, 427, 428, 431, 438,
- /* 170 */ 440, 443, 441, 445, 474, 474, 474, 518, 518, 496,
- /* 180 */ 86, 86, 474, 474, 514, 519, 566, 526, 525, 565,
- /* 190 */ 529, 532, 496, 5, 474, 474, 542, 542, 474, 542,
- /* 200 */ 474, 542, 474, 474, 766, 766, 28, 93, 93, 121,
- /* 210 */ 93, 148, 173, 208, 260, 260, 260, 260, 260, 273,
- /* 220 */ 298, 216, 216, 216, 216, 232, 246, 14, 291, 365,
- /* 230 */ 365, 26, 337, 217, 354, 338, 308, 310, 343, 344,
- /* 240 */ 348, 18, 41, 359, 361, 366, 367, 368, 342, 369,
- /* 250 */ 370, 437, 388, 374, 371, 315, 324, 328, 472, 473,
- /* 260 */ 335, 336, 373, 339, 410, 623, 475, 625, 626, 481,
- /* 270 */ 627, 631, 536, 538, 500, 523, 530, 562, 527, 563,
- /* 280 */ 567, 550, 555, 570, 573, 596, 598, 599, 584, 601,
- /* 290 */ 602, 605, 684, 606, 592, 558, 594, 560, 611, 530,
- /* 300 */ 612, 580, 614, 581, 620, 613, 615, 629, 698, 616,
- /* 310 */ 618, 697, 702, 703, 704, 705, 706, 707, 708, 628,
- /* 320 */ 700, 637, 634, 635, 600, 638, 695, 662, 709, 575,
- /* 330 */ 576, 630, 630, 630, 630, 710, 579, 582, 630, 630,
- /* 340 */ 630, 724, 726, 648, 630, 728, 729, 730, 731, 732,
- /* 350 */ 733, 734, 735, 736, 737, 738, 739, 740, 741, 742,
- /* 360 */ 650, 663, 743, 744, 689, 751,
+ /* 0 */ 186, 113, 113, 260, 260, 98, 250, 266, 266, 193,
+ /* 10 */ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+ /* 20 */ 23, 23, 23, 0, 122, 266, 316, 316, 316, 9,
+ /* 30 */ 9, 23, 23, 18, 23, 78, 23, 23, 23, 23,
+ /* 40 */ 308, 98, 112, 112, 61, 773, 773, 773, 266, 266,
+ /* 50 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ /* 60 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ /* 70 */ 316, 316, 316, 2, 2, 2, 2, 2, 2, 2,
+ /* 80 */ 23, 23, 23, 64, 23, 23, 23, 9, 9, 23,
+ /* 90 */ 23, 23, 23, 286, 286, 313, 9, 23, 23, 23,
+ /* 100 */ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+ /* 110 */ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+ /* 120 */ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+ /* 130 */ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+ /* 140 */ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+ /* 150 */ 23, 23, 23, 23, 23, 23, 465, 465, 465, 425,
+ /* 160 */ 425, 425, 425, 465, 465, 427, 426, 428, 430, 424,
+ /* 170 */ 443, 446, 448, 451, 452, 465, 465, 465, 450, 450,
+ /* 180 */ 505, 98, 98, 465, 465, 523, 528, 573, 533, 532,
+ /* 190 */ 572, 535, 538, 505, 61, 465, 465, 546, 546, 465,
+ /* 200 */ 546, 465, 546, 465, 465, 773, 773, 29, 69, 69,
+ /* 210 */ 99, 69, 127, 170, 240, 252, 252, 252, 252, 252,
+ /* 220 */ 252, 271, 283, 40, 40, 40, 40, 233, 256, 156,
+ /* 230 */ 315, 257, 257, 317, 375, 361, 344, 340, 346, 347,
+ /* 240 */ 352, 355, 356, 218, 335, 357, 359, 360, 362, 364,
+ /* 250 */ 366, 367, 368, 227, 395, 378, 377, 323, 324, 328,
+ /* 260 */ 473, 477, 338, 339, 376, 342, 384, 628, 482, 633,
+ /* 270 */ 634, 485, 638, 639, 543, 549, 507, 530, 536, 570,
+ /* 280 */ 534, 571, 574, 556, 560, 596, 598, 599, 604, 605,
+ /* 290 */ 590, 607, 608, 610, 691, 612, 600, 563, 601, 564,
+ /* 300 */ 617, 536, 618, 586, 620, 587, 626, 619, 621, 635,
+ /* 310 */ 705, 622, 624, 704, 709, 710, 711, 712, 713, 714,
+ /* 320 */ 715, 636, 706, 642, 640, 641, 606, 643, 702, 668,
+ /* 330 */ 716, 581, 582, 637, 637, 637, 637, 717, 585, 588,
+ /* 340 */ 637, 637, 637, 730, 733, 654, 637, 735, 736, 737,
+ /* 350 */ 738, 739, 740, 741, 742, 743, 744, 745, 746, 747,
+ /* 360 */ 748, 749, 656, 669, 750, 751, 695, 758,
};
-#define YY_REDUCE_COUNT (205)
-#define YY_REDUCE_MIN (-257)
-#define YY_REDUCE_MAX (478)
+#define YY_REDUCE_COUNT (206)
+#define YY_REDUCE_MIN (-266)
+#define YY_REDUCE_MAX (479)
static const short yy_reduce_ofst[] = {
- /* 0 */ -138, -153, -153, 151, 151, 51, -140, -13, 43, -114,
- /* 10 */ -183, -95, -68, -7, 113, 154, 155, 166, 169, 187,
- /* 20 */ 190, 192, 201, -180, -194, -257, -242, -212, -63, -239,
- /* 30 */ -216, -35, 32, -147, -198, 64, -69, 60, 118, -186,
- /* 40 */ 92, 160, 98, 146, 56, 157, 203, 212, -228, -81,
- /* 50 */ -21, 52, 59, 65, 68, 142, 195, 221, 226, 228,
- /* 60 */ 229, 231, 233, 234, 235, 236, 237, 238, 239, 103,
- /* 70 */ 225, 247, 259, 267, 268, 269, 270, 271, 272, 313,
- /* 80 */ 314, 316, 249, 317, 318, 319, 274, 275, 320, 321,
- /* 90 */ 325, 326, 248, 251, 276, 281, 330, 331, 332, 333,
- /* 100 */ 334, 340, 341, 345, 346, 347, 349, 350, 351, 352,
- /* 110 */ 353, 355, 356, 357, 358, 360, 362, 363, 364, 372,
- /* 120 */ 375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
- /* 130 */ 385, 386, 387, 389, 390, 391, 392, 393, 394, 395,
- /* 140 */ 396, 397, 398, 399, 400, 401, 402, 403, 404, 405,
- /* 150 */ 406, 407, 408, 409, 411, 412, 413, 414, 264, 265,
- /* 160 */ 277, 283, 416, 417, 280, 282, 278, 307, 279, 311,
- /* 170 */ 418, 421, 419, 423, 422, 425, 426, 429, 430, 432,
- /* 180 */ 435, 436, 433, 434, 439, 442, 444, 446, 447, 448,
- /* 190 */ 449, 453, 450, 455, 451, 452, 454, 456, 466, 467,
- /* 200 */ 470, 476, 471, 478, 460, 477,
+ /* 0 */ -186, 10, 10, -163, -163, 154, -159, -5, 42, -168,
+ /* 10 */ -112, -115, 117, -41, 30, 51, 84, 95, 167, 169,
+ /* 20 */ 176, 178, 179, -195, -197, -258, -239, -201, -143, -229,
+ /* 30 */ -130, -62, 59, -238, -57, 47, 188, 191, 206, -88,
+ /* 40 */ 48, 207, 115, 160, 119, -99, 22, 215, -266, -261,
+ /* 50 */ -213, -58, 180, 224, 228, 229, 230, 232, 234, 236,
+ /* 60 */ 237, 238, 239, 241, 242, 243, 244, 245, 246, 247,
+ /* 70 */ 27, 35, 265, 254, 267, 276, 277, 278, 279, 280,
+ /* 80 */ 282, 300, 321, 258, 322, 325, 326, 275, 281, 327,
+ /* 90 */ 330, 331, 332, 259, 261, 284, 285, 334, 341, 343,
+ /* 100 */ 345, 348, 349, 350, 351, 353, 354, 358, 363, 365,
+ /* 110 */ 369, 370, 371, 372, 373, 374, 379, 380, 381, 382,
+ /* 120 */ 383, 385, 386, 387, 388, 389, 390, 391, 392, 393,
+ /* 130 */ 394, 396, 397, 398, 399, 400, 401, 402, 403, 404,
+ /* 140 */ 405, 406, 407, 408, 409, 410, 411, 412, 413, 414,
+ /* 150 */ 415, 416, 417, 418, 419, 420, 336, 337, 421, 269,
+ /* 160 */ 273, 288, 289, 422, 423, 292, 294, 296, 287, 305,
+ /* 170 */ 318, 429, 290, 432, 431, 433, 434, 435, 436, 437,
+ /* 180 */ 438, 439, 442, 440, 441, 444, 447, 445, 453, 454,
+ /* 190 */ 455, 449, 456, 457, 458, 459, 460, 466, 470, 461,
+ /* 200 */ 471, 474, 472, 476, 478, 479, 475,
};
static const YYACTIONTYPE yy_default[] = {
- /* 0 */ 867, 991, 930, 1001, 917, 927, 1141, 1141, 1141, 867,
- /* 10 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 20 */ 867, 867, 867, 1049, 887, 1141, 867, 867, 867, 867,
- /* 30 */ 867, 867, 867, 1064, 867, 927, 867, 867, 867, 867,
- /* 40 */ 937, 927, 937, 937, 867, 1044, 975, 993, 867, 867,
- /* 50 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 60 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 70 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 80 */ 867, 867, 1051, 1057, 1054, 867, 867, 867, 1059, 867,
- /* 90 */ 867, 867, 1083, 1083, 1042, 867, 867, 867, 867, 867,
- /* 100 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 110 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 120 */ 867, 867, 867, 867, 867, 867, 867, 867, 915, 867,
- /* 130 */ 913, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 140 */ 867, 867, 867, 867, 867, 867, 867, 898, 867, 867,
- /* 150 */ 867, 867, 867, 867, 885, 889, 889, 889, 867, 867,
- /* 160 */ 867, 867, 889, 889, 1090, 1094, 1076, 1088, 1084, 1071,
- /* 170 */ 1069, 1067, 1075, 1098, 889, 889, 889, 935, 935, 931,
- /* 180 */ 927, 927, 889, 889, 953, 951, 949, 941, 947, 943,
- /* 190 */ 945, 939, 918, 867, 889, 889, 925, 925, 889, 925,
- /* 200 */ 889, 925, 889, 889, 975, 993, 867, 1099, 1089, 867,
- /* 210 */ 1140, 1129, 1128, 867, 1136, 1135, 1127, 1126, 1125, 867,
- /* 220 */ 867, 1121, 1124, 1123, 1122, 867, 867, 867, 867, 1131,
- /* 230 */ 1130, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 240 */ 867, 1095, 1091, 867, 867, 867, 867, 867, 867, 867,
- /* 250 */ 867, 867, 1101, 867, 867, 867, 867, 867, 867, 867,
- /* 260 */ 867, 867, 1003, 867, 867, 867, 867, 867, 867, 867,
- /* 270 */ 867, 867, 867, 867, 867, 1041, 867, 867, 867, 867,
- /* 280 */ 867, 1053, 1052, 867, 867, 867, 867, 867, 867, 867,
- /* 290 */ 867, 867, 867, 867, 1085, 867, 1077, 867, 867, 1015,
- /* 300 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 310 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 320 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 330 */ 867, 1159, 1154, 1155, 1152, 867, 867, 867, 1151, 1146,
- /* 340 */ 1147, 867, 867, 867, 1144, 867, 867, 867, 867, 867,
- /* 350 */ 867, 867, 867, 867, 867, 867, 867, 867, 867, 867,
- /* 360 */ 959, 867, 896, 894, 867, 867,
+ /* 0 */ 870, 994, 933, 1004, 920, 930, 1145, 1145, 1145, 870,
+ /* 10 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 20 */ 870, 870, 870, 1052, 890, 1145, 870, 870, 870, 870,
+ /* 30 */ 870, 870, 870, 1067, 870, 930, 870, 870, 870, 870,
+ /* 40 */ 940, 930, 940, 940, 870, 1047, 978, 996, 870, 870,
+ /* 50 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 60 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 70 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 80 */ 870, 870, 870, 1054, 1060, 1057, 870, 870, 870, 1062,
+ /* 90 */ 870, 870, 870, 1086, 1086, 1045, 870, 870, 870, 870,
+ /* 100 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 110 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 120 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 918,
+ /* 130 */ 870, 916, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 140 */ 870, 870, 870, 870, 870, 870, 870, 870, 901, 870,
+ /* 150 */ 870, 870, 870, 870, 870, 888, 892, 892, 892, 870,
+ /* 160 */ 870, 870, 870, 892, 892, 1093, 1097, 1079, 1091, 1087,
+ /* 170 */ 1074, 1072, 1070, 1078, 1101, 892, 892, 892, 938, 938,
+ /* 180 */ 934, 930, 930, 892, 892, 956, 954, 952, 944, 950,
+ /* 190 */ 946, 948, 942, 921, 870, 892, 892, 928, 928, 892,
+ /* 200 */ 928, 892, 928, 892, 892, 978, 996, 870, 1102, 1092,
+ /* 210 */ 870, 1144, 1132, 1131, 870, 1140, 1139, 1138, 1130, 1129,
+ /* 220 */ 1128, 870, 870, 1124, 1127, 1126, 1125, 870, 870, 870,
+ /* 230 */ 870, 1134, 1133, 870, 870, 870, 870, 870, 870, 870,
+ /* 240 */ 870, 870, 870, 1098, 1094, 870, 870, 870, 870, 870,
+ /* 250 */ 870, 870, 870, 870, 1104, 870, 870, 870, 870, 870,
+ /* 260 */ 870, 870, 870, 870, 1006, 870, 870, 870, 870, 870,
+ /* 270 */ 870, 870, 870, 870, 870, 870, 870, 1044, 870, 870,
+ /* 280 */ 870, 870, 870, 1056, 1055, 870, 870, 870, 870, 870,
+ /* 290 */ 870, 870, 870, 870, 870, 870, 1088, 870, 1080, 870,
+ /* 300 */ 870, 1018, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 310 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 320 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 330 */ 870, 870, 870, 1163, 1158, 1159, 1156, 870, 870, 870,
+ /* 340 */ 1155, 1150, 1151, 870, 870, 870, 1148, 870, 870, 870,
+ /* 350 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 870,
+ /* 360 */ 870, 870, 962, 870, 899, 897, 870, 870,
};
/********** End of lemon-generated parsing tables *****************************/
@@ -545,6 +546,7 @@ static const YYCODETYPE yyFallback[] = {
0, /* IS => nothing */
1, /* LIKE => ID */
1, /* MATCH => ID */
+ 1, /* NMATCH => ID */
1, /* GLOB => ID */
0, /* BETWEEN => nothing */
0, /* IN => nothing */
@@ -828,260 +830,261 @@ static const char *const yyTokenName[] = {
/* 20 */ "IS",
/* 21 */ "LIKE",
/* 22 */ "MATCH",
- /* 23 */ "GLOB",
- /* 24 */ "BETWEEN",
- /* 25 */ "IN",
- /* 26 */ "GT",
- /* 27 */ "GE",
- /* 28 */ "LT",
- /* 29 */ "LE",
- /* 30 */ "BITAND",
- /* 31 */ "BITOR",
- /* 32 */ "LSHIFT",
- /* 33 */ "RSHIFT",
- /* 34 */ "PLUS",
- /* 35 */ "MINUS",
- /* 36 */ "DIVIDE",
- /* 37 */ "TIMES",
- /* 38 */ "STAR",
- /* 39 */ "SLASH",
- /* 40 */ "REM",
- /* 41 */ "CONCAT",
- /* 42 */ "UMINUS",
- /* 43 */ "UPLUS",
- /* 44 */ "BITNOT",
- /* 45 */ "SHOW",
- /* 46 */ "DATABASES",
- /* 47 */ "TOPICS",
- /* 48 */ "FUNCTIONS",
- /* 49 */ "MNODES",
- /* 50 */ "DNODES",
- /* 51 */ "ACCOUNTS",
- /* 52 */ "USERS",
- /* 53 */ "MODULES",
- /* 54 */ "QUERIES",
- /* 55 */ "CONNECTIONS",
- /* 56 */ "STREAMS",
- /* 57 */ "VARIABLES",
- /* 58 */ "SCORES",
- /* 59 */ "GRANTS",
- /* 60 */ "VNODES",
- /* 61 */ "DOT",
- /* 62 */ "CREATE",
- /* 63 */ "TABLE",
- /* 64 */ "STABLE",
- /* 65 */ "DATABASE",
- /* 66 */ "TABLES",
- /* 67 */ "STABLES",
- /* 68 */ "VGROUPS",
- /* 69 */ "DROP",
- /* 70 */ "TOPIC",
- /* 71 */ "FUNCTION",
- /* 72 */ "DNODE",
- /* 73 */ "USER",
- /* 74 */ "ACCOUNT",
- /* 75 */ "USE",
- /* 76 */ "DESCRIBE",
- /* 77 */ "DESC",
- /* 78 */ "ALTER",
- /* 79 */ "PASS",
- /* 80 */ "PRIVILEGE",
- /* 81 */ "LOCAL",
- /* 82 */ "COMPACT",
- /* 83 */ "LP",
- /* 84 */ "RP",
- /* 85 */ "IF",
- /* 86 */ "EXISTS",
- /* 87 */ "AS",
- /* 88 */ "OUTPUTTYPE",
- /* 89 */ "AGGREGATE",
- /* 90 */ "BUFSIZE",
- /* 91 */ "PPS",
- /* 92 */ "TSERIES",
- /* 93 */ "DBS",
- /* 94 */ "STORAGE",
- /* 95 */ "QTIME",
- /* 96 */ "CONNS",
- /* 97 */ "STATE",
- /* 98 */ "COMMA",
- /* 99 */ "KEEP",
- /* 100 */ "CACHE",
- /* 101 */ "REPLICA",
- /* 102 */ "QUORUM",
- /* 103 */ "DAYS",
- /* 104 */ "MINROWS",
- /* 105 */ "MAXROWS",
- /* 106 */ "BLOCKS",
- /* 107 */ "CTIME",
- /* 108 */ "WAL",
- /* 109 */ "FSYNC",
- /* 110 */ "COMP",
- /* 111 */ "PRECISION",
- /* 112 */ "UPDATE",
- /* 113 */ "CACHELAST",
- /* 114 */ "PARTITIONS",
- /* 115 */ "UNSIGNED",
- /* 116 */ "TAGS",
- /* 117 */ "USING",
- /* 118 */ "NULL",
- /* 119 */ "NOW",
- /* 120 */ "SELECT",
- /* 121 */ "UNION",
- /* 122 */ "ALL",
- /* 123 */ "DISTINCT",
- /* 124 */ "FROM",
- /* 125 */ "VARIABLE",
- /* 126 */ "INTERVAL",
- /* 127 */ "EVERY",
- /* 128 */ "SESSION",
- /* 129 */ "STATE_WINDOW",
- /* 130 */ "FILL",
- /* 131 */ "SLIDING",
- /* 132 */ "ORDER",
- /* 133 */ "BY",
- /* 134 */ "ASC",
- /* 135 */ "GROUP",
- /* 136 */ "HAVING",
- /* 137 */ "LIMIT",
- /* 138 */ "OFFSET",
- /* 139 */ "SLIMIT",
- /* 140 */ "SOFFSET",
- /* 141 */ "WHERE",
- /* 142 */ "RESET",
- /* 143 */ "QUERY",
- /* 144 */ "SYNCDB",
- /* 145 */ "ADD",
- /* 146 */ "COLUMN",
- /* 147 */ "MODIFY",
- /* 148 */ "TAG",
- /* 149 */ "CHANGE",
- /* 150 */ "SET",
- /* 151 */ "KILL",
- /* 152 */ "CONNECTION",
- /* 153 */ "STREAM",
- /* 154 */ "COLON",
- /* 155 */ "ABORT",
- /* 156 */ "AFTER",
- /* 157 */ "ATTACH",
- /* 158 */ "BEFORE",
- /* 159 */ "BEGIN",
- /* 160 */ "CASCADE",
- /* 161 */ "CLUSTER",
- /* 162 */ "CONFLICT",
- /* 163 */ "COPY",
- /* 164 */ "DEFERRED",
- /* 165 */ "DELIMITERS",
- /* 166 */ "DETACH",
- /* 167 */ "EACH",
- /* 168 */ "END",
- /* 169 */ "EXPLAIN",
- /* 170 */ "FAIL",
- /* 171 */ "FOR",
- /* 172 */ "IGNORE",
- /* 173 */ "IMMEDIATE",
- /* 174 */ "INITIALLY",
- /* 175 */ "INSTEAD",
- /* 176 */ "KEY",
- /* 177 */ "OF",
- /* 178 */ "RAISE",
- /* 179 */ "REPLACE",
- /* 180 */ "RESTRICT",
- /* 181 */ "ROW",
- /* 182 */ "STATEMENT",
- /* 183 */ "TRIGGER",
- /* 184 */ "VIEW",
- /* 185 */ "IPTOKEN",
- /* 186 */ "SEMI",
- /* 187 */ "NONE",
- /* 188 */ "PREV",
- /* 189 */ "LINEAR",
- /* 190 */ "IMPORT",
- /* 191 */ "TBNAME",
- /* 192 */ "JOIN",
- /* 193 */ "INSERT",
- /* 194 */ "INTO",
- /* 195 */ "VALUES",
- /* 196 */ "program",
- /* 197 */ "cmd",
- /* 198 */ "ids",
- /* 199 */ "dbPrefix",
- /* 200 */ "cpxName",
- /* 201 */ "ifexists",
- /* 202 */ "alter_db_optr",
- /* 203 */ "alter_topic_optr",
- /* 204 */ "acct_optr",
- /* 205 */ "exprlist",
- /* 206 */ "ifnotexists",
- /* 207 */ "db_optr",
- /* 208 */ "topic_optr",
- /* 209 */ "typename",
- /* 210 */ "bufsize",
- /* 211 */ "pps",
- /* 212 */ "tseries",
- /* 213 */ "dbs",
- /* 214 */ "streams",
- /* 215 */ "storage",
- /* 216 */ "qtime",
- /* 217 */ "users",
- /* 218 */ "conns",
- /* 219 */ "state",
- /* 220 */ "intitemlist",
- /* 221 */ "intitem",
- /* 222 */ "keep",
- /* 223 */ "cache",
- /* 224 */ "replica",
- /* 225 */ "quorum",
- /* 226 */ "days",
- /* 227 */ "minrows",
- /* 228 */ "maxrows",
- /* 229 */ "blocks",
- /* 230 */ "ctime",
- /* 231 */ "wal",
- /* 232 */ "fsync",
- /* 233 */ "comp",
- /* 234 */ "prec",
- /* 235 */ "update",
- /* 236 */ "cachelast",
- /* 237 */ "partitions",
- /* 238 */ "signed",
- /* 239 */ "create_table_args",
- /* 240 */ "create_stable_args",
- /* 241 */ "create_table_list",
- /* 242 */ "create_from_stable",
- /* 243 */ "columnlist",
- /* 244 */ "tagitemlist",
- /* 245 */ "tagNamelist",
- /* 246 */ "select",
- /* 247 */ "column",
- /* 248 */ "tagitem",
- /* 249 */ "selcollist",
- /* 250 */ "from",
- /* 251 */ "where_opt",
- /* 252 */ "interval_option",
- /* 253 */ "sliding_opt",
- /* 254 */ "session_option",
- /* 255 */ "windowstate_option",
- /* 256 */ "fill_opt",
- /* 257 */ "groupby_opt",
- /* 258 */ "having_opt",
- /* 259 */ "orderby_opt",
- /* 260 */ "slimit_opt",
- /* 261 */ "limit_opt",
- /* 262 */ "union",
- /* 263 */ "sclp",
- /* 264 */ "distinct",
- /* 265 */ "expr",
- /* 266 */ "as",
- /* 267 */ "tablelist",
- /* 268 */ "sub",
- /* 269 */ "tmvar",
- /* 270 */ "intervalKey",
- /* 271 */ "sortlist",
- /* 272 */ "sortitem",
- /* 273 */ "item",
- /* 274 */ "sortorder",
- /* 275 */ "grouplist",
- /* 276 */ "expritem",
+ /* 23 */ "NMATCH",
+ /* 24 */ "GLOB",
+ /* 25 */ "BETWEEN",
+ /* 26 */ "IN",
+ /* 27 */ "GT",
+ /* 28 */ "GE",
+ /* 29 */ "LT",
+ /* 30 */ "LE",
+ /* 31 */ "BITAND",
+ /* 32 */ "BITOR",
+ /* 33 */ "LSHIFT",
+ /* 34 */ "RSHIFT",
+ /* 35 */ "PLUS",
+ /* 36 */ "MINUS",
+ /* 37 */ "DIVIDE",
+ /* 38 */ "TIMES",
+ /* 39 */ "STAR",
+ /* 40 */ "SLASH",
+ /* 41 */ "REM",
+ /* 42 */ "CONCAT",
+ /* 43 */ "UMINUS",
+ /* 44 */ "UPLUS",
+ /* 45 */ "BITNOT",
+ /* 46 */ "SHOW",
+ /* 47 */ "DATABASES",
+ /* 48 */ "TOPICS",
+ /* 49 */ "FUNCTIONS",
+ /* 50 */ "MNODES",
+ /* 51 */ "DNODES",
+ /* 52 */ "ACCOUNTS",
+ /* 53 */ "USERS",
+ /* 54 */ "MODULES",
+ /* 55 */ "QUERIES",
+ /* 56 */ "CONNECTIONS",
+ /* 57 */ "STREAMS",
+ /* 58 */ "VARIABLES",
+ /* 59 */ "SCORES",
+ /* 60 */ "GRANTS",
+ /* 61 */ "VNODES",
+ /* 62 */ "DOT",
+ /* 63 */ "CREATE",
+ /* 64 */ "TABLE",
+ /* 65 */ "STABLE",
+ /* 66 */ "DATABASE",
+ /* 67 */ "TABLES",
+ /* 68 */ "STABLES",
+ /* 69 */ "VGROUPS",
+ /* 70 */ "DROP",
+ /* 71 */ "TOPIC",
+ /* 72 */ "FUNCTION",
+ /* 73 */ "DNODE",
+ /* 74 */ "USER",
+ /* 75 */ "ACCOUNT",
+ /* 76 */ "USE",
+ /* 77 */ "DESCRIBE",
+ /* 78 */ "DESC",
+ /* 79 */ "ALTER",
+ /* 80 */ "PASS",
+ /* 81 */ "PRIVILEGE",
+ /* 82 */ "LOCAL",
+ /* 83 */ "COMPACT",
+ /* 84 */ "LP",
+ /* 85 */ "RP",
+ /* 86 */ "IF",
+ /* 87 */ "EXISTS",
+ /* 88 */ "AS",
+ /* 89 */ "OUTPUTTYPE",
+ /* 90 */ "AGGREGATE",
+ /* 91 */ "BUFSIZE",
+ /* 92 */ "PPS",
+ /* 93 */ "TSERIES",
+ /* 94 */ "DBS",
+ /* 95 */ "STORAGE",
+ /* 96 */ "QTIME",
+ /* 97 */ "CONNS",
+ /* 98 */ "STATE",
+ /* 99 */ "COMMA",
+ /* 100 */ "KEEP",
+ /* 101 */ "CACHE",
+ /* 102 */ "REPLICA",
+ /* 103 */ "QUORUM",
+ /* 104 */ "DAYS",
+ /* 105 */ "MINROWS",
+ /* 106 */ "MAXROWS",
+ /* 107 */ "BLOCKS",
+ /* 108 */ "CTIME",
+ /* 109 */ "WAL",
+ /* 110 */ "FSYNC",
+ /* 111 */ "COMP",
+ /* 112 */ "PRECISION",
+ /* 113 */ "UPDATE",
+ /* 114 */ "CACHELAST",
+ /* 115 */ "PARTITIONS",
+ /* 116 */ "UNSIGNED",
+ /* 117 */ "TAGS",
+ /* 118 */ "USING",
+ /* 119 */ "NULL",
+ /* 120 */ "NOW",
+ /* 121 */ "SELECT",
+ /* 122 */ "UNION",
+ /* 123 */ "ALL",
+ /* 124 */ "DISTINCT",
+ /* 125 */ "FROM",
+ /* 126 */ "VARIABLE",
+ /* 127 */ "INTERVAL",
+ /* 128 */ "EVERY",
+ /* 129 */ "SESSION",
+ /* 130 */ "STATE_WINDOW",
+ /* 131 */ "FILL",
+ /* 132 */ "SLIDING",
+ /* 133 */ "ORDER",
+ /* 134 */ "BY",
+ /* 135 */ "ASC",
+ /* 136 */ "GROUP",
+ /* 137 */ "HAVING",
+ /* 138 */ "LIMIT",
+ /* 139 */ "OFFSET",
+ /* 140 */ "SLIMIT",
+ /* 141 */ "SOFFSET",
+ /* 142 */ "WHERE",
+ /* 143 */ "RESET",
+ /* 144 */ "QUERY",
+ /* 145 */ "SYNCDB",
+ /* 146 */ "ADD",
+ /* 147 */ "COLUMN",
+ /* 148 */ "MODIFY",
+ /* 149 */ "TAG",
+ /* 150 */ "CHANGE",
+ /* 151 */ "SET",
+ /* 152 */ "KILL",
+ /* 153 */ "CONNECTION",
+ /* 154 */ "STREAM",
+ /* 155 */ "COLON",
+ /* 156 */ "ABORT",
+ /* 157 */ "AFTER",
+ /* 158 */ "ATTACH",
+ /* 159 */ "BEFORE",
+ /* 160 */ "BEGIN",
+ /* 161 */ "CASCADE",
+ /* 162 */ "CLUSTER",
+ /* 163 */ "CONFLICT",
+ /* 164 */ "COPY",
+ /* 165 */ "DEFERRED",
+ /* 166 */ "DELIMITERS",
+ /* 167 */ "DETACH",
+ /* 168 */ "EACH",
+ /* 169 */ "END",
+ /* 170 */ "EXPLAIN",
+ /* 171 */ "FAIL",
+ /* 172 */ "FOR",
+ /* 173 */ "IGNORE",
+ /* 174 */ "IMMEDIATE",
+ /* 175 */ "INITIALLY",
+ /* 176 */ "INSTEAD",
+ /* 177 */ "KEY",
+ /* 178 */ "OF",
+ /* 179 */ "RAISE",
+ /* 180 */ "REPLACE",
+ /* 181 */ "RESTRICT",
+ /* 182 */ "ROW",
+ /* 183 */ "STATEMENT",
+ /* 184 */ "TRIGGER",
+ /* 185 */ "VIEW",
+ /* 186 */ "IPTOKEN",
+ /* 187 */ "SEMI",
+ /* 188 */ "NONE",
+ /* 189 */ "PREV",
+ /* 190 */ "LINEAR",
+ /* 191 */ "IMPORT",
+ /* 192 */ "TBNAME",
+ /* 193 */ "JOIN",
+ /* 194 */ "INSERT",
+ /* 195 */ "INTO",
+ /* 196 */ "VALUES",
+ /* 197 */ "program",
+ /* 198 */ "cmd",
+ /* 199 */ "ids",
+ /* 200 */ "dbPrefix",
+ /* 201 */ "cpxName",
+ /* 202 */ "ifexists",
+ /* 203 */ "alter_db_optr",
+ /* 204 */ "alter_topic_optr",
+ /* 205 */ "acct_optr",
+ /* 206 */ "exprlist",
+ /* 207 */ "ifnotexists",
+ /* 208 */ "db_optr",
+ /* 209 */ "topic_optr",
+ /* 210 */ "typename",
+ /* 211 */ "bufsize",
+ /* 212 */ "pps",
+ /* 213 */ "tseries",
+ /* 214 */ "dbs",
+ /* 215 */ "streams",
+ /* 216 */ "storage",
+ /* 217 */ "qtime",
+ /* 218 */ "users",
+ /* 219 */ "conns",
+ /* 220 */ "state",
+ /* 221 */ "intitemlist",
+ /* 222 */ "intitem",
+ /* 223 */ "keep",
+ /* 224 */ "cache",
+ /* 225 */ "replica",
+ /* 226 */ "quorum",
+ /* 227 */ "days",
+ /* 228 */ "minrows",
+ /* 229 */ "maxrows",
+ /* 230 */ "blocks",
+ /* 231 */ "ctime",
+ /* 232 */ "wal",
+ /* 233 */ "fsync",
+ /* 234 */ "comp",
+ /* 235 */ "prec",
+ /* 236 */ "update",
+ /* 237 */ "cachelast",
+ /* 238 */ "partitions",
+ /* 239 */ "signed",
+ /* 240 */ "create_table_args",
+ /* 241 */ "create_stable_args",
+ /* 242 */ "create_table_list",
+ /* 243 */ "create_from_stable",
+ /* 244 */ "columnlist",
+ /* 245 */ "tagitemlist",
+ /* 246 */ "tagNamelist",
+ /* 247 */ "select",
+ /* 248 */ "column",
+ /* 249 */ "tagitem",
+ /* 250 */ "selcollist",
+ /* 251 */ "from",
+ /* 252 */ "where_opt",
+ /* 253 */ "interval_option",
+ /* 254 */ "sliding_opt",
+ /* 255 */ "session_option",
+ /* 256 */ "windowstate_option",
+ /* 257 */ "fill_opt",
+ /* 258 */ "groupby_opt",
+ /* 259 */ "having_opt",
+ /* 260 */ "orderby_opt",
+ /* 261 */ "slimit_opt",
+ /* 262 */ "limit_opt",
+ /* 263 */ "union",
+ /* 264 */ "sclp",
+ /* 265 */ "distinct",
+ /* 266 */ "expr",
+ /* 267 */ "as",
+ /* 268 */ "tablelist",
+ /* 269 */ "sub",
+ /* 270 */ "tmvar",
+ /* 271 */ "intervalKey",
+ /* 272 */ "sortlist",
+ /* 273 */ "sortitem",
+ /* 274 */ "item",
+ /* 275 */ "sortorder",
+ /* 276 */ "grouplist",
+ /* 277 */ "expritem",
};
#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
@@ -1356,32 +1359,33 @@ static const char *const yyRuleName[] = {
/* 264 */ "expr ::= expr REM expr",
/* 265 */ "expr ::= expr LIKE expr",
/* 266 */ "expr ::= expr MATCH expr",
- /* 267 */ "expr ::= expr IN LP exprlist RP",
- /* 268 */ "exprlist ::= exprlist COMMA expritem",
- /* 269 */ "exprlist ::= expritem",
- /* 270 */ "expritem ::= expr",
- /* 271 */ "expritem ::=",
- /* 272 */ "cmd ::= RESET QUERY CACHE",
- /* 273 */ "cmd ::= SYNCDB ids REPLICA",
- /* 274 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
- /* 275 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
- /* 276 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist",
- /* 277 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
- /* 278 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
- /* 279 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
- /* 280 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
- /* 281 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist",
- /* 282 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
- /* 283 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
- /* 284 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist",
- /* 285 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
- /* 286 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
- /* 287 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
- /* 288 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem",
- /* 289 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist",
- /* 290 */ "cmd ::= KILL CONNECTION INTEGER",
- /* 291 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
- /* 292 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
+ /* 267 */ "expr ::= expr NMATCH expr",
+ /* 268 */ "expr ::= expr IN LP exprlist RP",
+ /* 269 */ "exprlist ::= exprlist COMMA expritem",
+ /* 270 */ "exprlist ::= expritem",
+ /* 271 */ "expritem ::= expr",
+ /* 272 */ "expritem ::=",
+ /* 273 */ "cmd ::= RESET QUERY CACHE",
+ /* 274 */ "cmd ::= SYNCDB ids REPLICA",
+ /* 275 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
+ /* 276 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
+ /* 277 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist",
+ /* 278 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
+ /* 279 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
+ /* 280 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
+ /* 281 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
+ /* 282 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist",
+ /* 283 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
+ /* 284 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
+ /* 285 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist",
+ /* 286 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
+ /* 287 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
+ /* 288 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
+ /* 289 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem",
+ /* 290 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist",
+ /* 291 */ "cmd ::= KILL CONNECTION INTEGER",
+ /* 292 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
+ /* 293 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
};
#endif /* NDEBUG */
@@ -1507,76 +1511,76 @@ static void yy_destructor(
** inside the C code.
*/
/********* Begin destructor definitions ***************************************/
- case 205: /* exprlist */
- case 249: /* selcollist */
- case 263: /* sclp */
+ case 206: /* exprlist */
+ case 250: /* selcollist */
+ case 264: /* sclp */
{
-#line 761 "sql.y"
-tSqlExprListDestroy((yypminor->yy403));
-#line 1517 "sql.c"
+#line 762 "sql.y"
+tSqlExprListDestroy((yypminor->yy421));
+#line 1521 "sql.c"
}
break;
- case 220: /* intitemlist */
- case 222: /* keep */
- case 243: /* columnlist */
- case 244: /* tagitemlist */
- case 245: /* tagNamelist */
- case 256: /* fill_opt */
- case 257: /* groupby_opt */
- case 259: /* orderby_opt */
- case 271: /* sortlist */
- case 275: /* grouplist */
+ case 221: /* intitemlist */
+ case 223: /* keep */
+ case 244: /* columnlist */
+ case 245: /* tagitemlist */
+ case 246: /* tagNamelist */
+ case 257: /* fill_opt */
+ case 258: /* groupby_opt */
+ case 260: /* orderby_opt */
+ case 272: /* sortlist */
+ case 276: /* grouplist */
{
#line 256 "sql.y"
-taosArrayDestroy((yypminor->yy403));
-#line 1533 "sql.c"
+taosArrayDestroy((yypminor->yy421));
+#line 1537 "sql.c"
}
break;
- case 241: /* create_table_list */
+ case 242: /* create_table_list */
{
#line 364 "sql.y"
-destroyCreateTableSql((yypminor->yy56));
-#line 1540 "sql.c"
+destroyCreateTableSql((yypminor->yy438));
+#line 1544 "sql.c"
}
break;
- case 246: /* select */
+ case 247: /* select */
{
#line 484 "sql.y"
-destroySqlNode((yypminor->yy224));
-#line 1547 "sql.c"
+destroySqlNode((yypminor->yy56));
+#line 1551 "sql.c"
}
break;
- case 250: /* from */
- case 267: /* tablelist */
- case 268: /* sub */
+ case 251: /* from */
+ case 268: /* tablelist */
+ case 269: /* sub */
{
#line 539 "sql.y"
-destroyRelationInfo((yypminor->yy114));
-#line 1556 "sql.c"
+destroyRelationInfo((yypminor->yy8));
+#line 1560 "sql.c"
}
break;
- case 251: /* where_opt */
- case 258: /* having_opt */
- case 265: /* expr */
- case 276: /* expritem */
+ case 252: /* where_opt */
+ case 259: /* having_opt */
+ case 266: /* expr */
+ case 277: /* expritem */
{
#line 691 "sql.y"
-tSqlExprDestroy((yypminor->yy260));
-#line 1566 "sql.c"
+tSqlExprDestroy((yypminor->yy439));
+#line 1570 "sql.c"
}
break;
- case 262: /* union */
+ case 263: /* union */
{
#line 492 "sql.y"
-destroyAllSqlNode((yypminor->yy403));
-#line 1573 "sql.c"
+destroyAllSqlNode((yypminor->yy421));
+#line 1577 "sql.c"
}
break;
- case 272: /* sortitem */
+ case 273: /* sortitem */
{
#line 624 "sql.y"
-tVariantDestroy(&(yypminor->yy488));
-#line 1580 "sql.c"
+tVariantDestroy(&(yypminor->yy430));
+#line 1584 "sql.c"
}
break;
/********* End destructor definitions *****************************************/
@@ -1865,299 +1869,300 @@ static void yy_shift(
/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
** of that rule */
static const YYCODETYPE yyRuleInfoLhs[] = {
- 196, /* (0) program ::= cmd */
- 197, /* (1) cmd ::= SHOW DATABASES */
- 197, /* (2) cmd ::= SHOW TOPICS */
- 197, /* (3) cmd ::= SHOW FUNCTIONS */
- 197, /* (4) cmd ::= SHOW MNODES */
- 197, /* (5) cmd ::= SHOW DNODES */
- 197, /* (6) cmd ::= SHOW ACCOUNTS */
- 197, /* (7) cmd ::= SHOW USERS */
- 197, /* (8) cmd ::= SHOW MODULES */
- 197, /* (9) cmd ::= SHOW QUERIES */
- 197, /* (10) cmd ::= SHOW CONNECTIONS */
- 197, /* (11) cmd ::= SHOW STREAMS */
- 197, /* (12) cmd ::= SHOW VARIABLES */
- 197, /* (13) cmd ::= SHOW SCORES */
- 197, /* (14) cmd ::= SHOW GRANTS */
- 197, /* (15) cmd ::= SHOW VNODES */
- 197, /* (16) cmd ::= SHOW VNODES ids */
- 199, /* (17) dbPrefix ::= */
- 199, /* (18) dbPrefix ::= ids DOT */
- 200, /* (19) cpxName ::= */
- 200, /* (20) cpxName ::= DOT ids */
- 197, /* (21) cmd ::= SHOW CREATE TABLE ids cpxName */
- 197, /* (22) cmd ::= SHOW CREATE STABLE ids cpxName */
- 197, /* (23) cmd ::= SHOW CREATE DATABASE ids */
- 197, /* (24) cmd ::= SHOW dbPrefix TABLES */
- 197, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE ids */
- 197, /* (26) cmd ::= SHOW dbPrefix STABLES */
- 197, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE ids */
- 197, /* (28) cmd ::= SHOW dbPrefix VGROUPS */
- 197, /* (29) cmd ::= SHOW dbPrefix VGROUPS ids */
- 197, /* (30) cmd ::= DROP TABLE ifexists ids cpxName */
- 197, /* (31) cmd ::= DROP STABLE ifexists ids cpxName */
- 197, /* (32) cmd ::= DROP DATABASE ifexists ids */
- 197, /* (33) cmd ::= DROP TOPIC ifexists ids */
- 197, /* (34) cmd ::= DROP FUNCTION ids */
- 197, /* (35) cmd ::= DROP DNODE ids */
- 197, /* (36) cmd ::= DROP USER ids */
- 197, /* (37) cmd ::= DROP ACCOUNT ids */
- 197, /* (38) cmd ::= USE ids */
- 197, /* (39) cmd ::= DESCRIBE ids cpxName */
- 197, /* (40) cmd ::= DESC ids cpxName */
- 197, /* (41) cmd ::= ALTER USER ids PASS ids */
- 197, /* (42) cmd ::= ALTER USER ids PRIVILEGE ids */
- 197, /* (43) cmd ::= ALTER DNODE ids ids */
- 197, /* (44) cmd ::= ALTER DNODE ids ids ids */
- 197, /* (45) cmd ::= ALTER LOCAL ids */
- 197, /* (46) cmd ::= ALTER LOCAL ids ids */
- 197, /* (47) cmd ::= ALTER DATABASE ids alter_db_optr */
- 197, /* (48) cmd ::= ALTER TOPIC ids alter_topic_optr */
- 197, /* (49) cmd ::= ALTER ACCOUNT ids acct_optr */
- 197, /* (50) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
- 197, /* (51) cmd ::= COMPACT VNODES IN LP exprlist RP */
- 198, /* (52) ids ::= ID */
- 198, /* (53) ids ::= STRING */
- 201, /* (54) ifexists ::= IF EXISTS */
- 201, /* (55) ifexists ::= */
- 206, /* (56) ifnotexists ::= IF NOT EXISTS */
- 206, /* (57) ifnotexists ::= */
- 197, /* (58) cmd ::= CREATE DNODE ids */
- 197, /* (59) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
- 197, /* (60) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
- 197, /* (61) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */
- 197, /* (62) cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
- 197, /* (63) cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
- 197, /* (64) cmd ::= CREATE USER ids PASS ids */
- 210, /* (65) bufsize ::= */
- 210, /* (66) bufsize ::= BUFSIZE INTEGER */
- 211, /* (67) pps ::= */
- 211, /* (68) pps ::= PPS INTEGER */
- 212, /* (69) tseries ::= */
- 212, /* (70) tseries ::= TSERIES INTEGER */
- 213, /* (71) dbs ::= */
- 213, /* (72) dbs ::= DBS INTEGER */
- 214, /* (73) streams ::= */
- 214, /* (74) streams ::= STREAMS INTEGER */
- 215, /* (75) storage ::= */
- 215, /* (76) storage ::= STORAGE INTEGER */
- 216, /* (77) qtime ::= */
- 216, /* (78) qtime ::= QTIME INTEGER */
- 217, /* (79) users ::= */
- 217, /* (80) users ::= USERS INTEGER */
- 218, /* (81) conns ::= */
- 218, /* (82) conns ::= CONNS INTEGER */
- 219, /* (83) state ::= */
- 219, /* (84) state ::= STATE ids */
- 204, /* (85) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
- 220, /* (86) intitemlist ::= intitemlist COMMA intitem */
- 220, /* (87) intitemlist ::= intitem */
- 221, /* (88) intitem ::= INTEGER */
- 222, /* (89) keep ::= KEEP intitemlist */
- 223, /* (90) cache ::= CACHE INTEGER */
- 224, /* (91) replica ::= REPLICA INTEGER */
- 225, /* (92) quorum ::= QUORUM INTEGER */
- 226, /* (93) days ::= DAYS INTEGER */
- 227, /* (94) minrows ::= MINROWS INTEGER */
- 228, /* (95) maxrows ::= MAXROWS INTEGER */
- 229, /* (96) blocks ::= BLOCKS INTEGER */
- 230, /* (97) ctime ::= CTIME INTEGER */
- 231, /* (98) wal ::= WAL INTEGER */
- 232, /* (99) fsync ::= FSYNC INTEGER */
- 233, /* (100) comp ::= COMP INTEGER */
- 234, /* (101) prec ::= PRECISION STRING */
- 235, /* (102) update ::= UPDATE INTEGER */
- 236, /* (103) cachelast ::= CACHELAST INTEGER */
- 237, /* (104) partitions ::= PARTITIONS INTEGER */
- 207, /* (105) db_optr ::= */
- 207, /* (106) db_optr ::= db_optr cache */
- 207, /* (107) db_optr ::= db_optr replica */
- 207, /* (108) db_optr ::= db_optr quorum */
- 207, /* (109) db_optr ::= db_optr days */
- 207, /* (110) db_optr ::= db_optr minrows */
- 207, /* (111) db_optr ::= db_optr maxrows */
- 207, /* (112) db_optr ::= db_optr blocks */
- 207, /* (113) db_optr ::= db_optr ctime */
- 207, /* (114) db_optr ::= db_optr wal */
- 207, /* (115) db_optr ::= db_optr fsync */
- 207, /* (116) db_optr ::= db_optr comp */
- 207, /* (117) db_optr ::= db_optr prec */
- 207, /* (118) db_optr ::= db_optr keep */
- 207, /* (119) db_optr ::= db_optr update */
- 207, /* (120) db_optr ::= db_optr cachelast */
- 208, /* (121) topic_optr ::= db_optr */
- 208, /* (122) topic_optr ::= topic_optr partitions */
- 202, /* (123) alter_db_optr ::= */
- 202, /* (124) alter_db_optr ::= alter_db_optr replica */
- 202, /* (125) alter_db_optr ::= alter_db_optr quorum */
- 202, /* (126) alter_db_optr ::= alter_db_optr keep */
- 202, /* (127) alter_db_optr ::= alter_db_optr blocks */
- 202, /* (128) alter_db_optr ::= alter_db_optr comp */
- 202, /* (129) alter_db_optr ::= alter_db_optr update */
- 202, /* (130) alter_db_optr ::= alter_db_optr cachelast */
- 203, /* (131) alter_topic_optr ::= alter_db_optr */
- 203, /* (132) alter_topic_optr ::= alter_topic_optr partitions */
- 209, /* (133) typename ::= ids */
- 209, /* (134) typename ::= ids LP signed RP */
- 209, /* (135) typename ::= ids UNSIGNED */
- 238, /* (136) signed ::= INTEGER */
- 238, /* (137) signed ::= PLUS INTEGER */
- 238, /* (138) signed ::= MINUS INTEGER */
- 197, /* (139) cmd ::= CREATE TABLE create_table_args */
- 197, /* (140) cmd ::= CREATE TABLE create_stable_args */
- 197, /* (141) cmd ::= CREATE STABLE create_stable_args */
- 197, /* (142) cmd ::= CREATE TABLE create_table_list */
- 241, /* (143) create_table_list ::= create_from_stable */
- 241, /* (144) create_table_list ::= create_table_list create_from_stable */
- 239, /* (145) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
- 240, /* (146) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
- 242, /* (147) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
- 242, /* (148) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
- 245, /* (149) tagNamelist ::= tagNamelist COMMA ids */
- 245, /* (150) tagNamelist ::= ids */
- 239, /* (151) create_table_args ::= ifnotexists ids cpxName AS select */
- 243, /* (152) columnlist ::= columnlist COMMA column */
- 243, /* (153) columnlist ::= column */
- 247, /* (154) column ::= ids typename */
- 244, /* (155) tagitemlist ::= tagitemlist COMMA tagitem */
- 244, /* (156) tagitemlist ::= tagitem */
- 248, /* (157) tagitem ::= INTEGER */
- 248, /* (158) tagitem ::= FLOAT */
- 248, /* (159) tagitem ::= STRING */
- 248, /* (160) tagitem ::= BOOL */
- 248, /* (161) tagitem ::= NULL */
- 248, /* (162) tagitem ::= NOW */
- 248, /* (163) tagitem ::= MINUS INTEGER */
- 248, /* (164) tagitem ::= MINUS FLOAT */
- 248, /* (165) tagitem ::= PLUS INTEGER */
- 248, /* (166) tagitem ::= PLUS FLOAT */
- 246, /* (167) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */
- 246, /* (168) select ::= LP select RP */
- 262, /* (169) union ::= select */
- 262, /* (170) union ::= union UNION ALL select */
- 197, /* (171) cmd ::= union */
- 246, /* (172) select ::= SELECT selcollist */
- 263, /* (173) sclp ::= selcollist COMMA */
- 263, /* (174) sclp ::= */
- 249, /* (175) selcollist ::= sclp distinct expr as */
- 249, /* (176) selcollist ::= sclp STAR */
- 266, /* (177) as ::= AS ids */
- 266, /* (178) as ::= ids */
- 266, /* (179) as ::= */
- 264, /* (180) distinct ::= DISTINCT */
- 264, /* (181) distinct ::= */
- 250, /* (182) from ::= FROM tablelist */
- 250, /* (183) from ::= FROM sub */
- 268, /* (184) sub ::= LP union RP */
- 268, /* (185) sub ::= LP union RP ids */
- 268, /* (186) sub ::= sub COMMA LP union RP ids */
- 267, /* (187) tablelist ::= ids cpxName */
- 267, /* (188) tablelist ::= ids cpxName ids */
- 267, /* (189) tablelist ::= tablelist COMMA ids cpxName */
- 267, /* (190) tablelist ::= tablelist COMMA ids cpxName ids */
- 269, /* (191) tmvar ::= VARIABLE */
- 252, /* (192) interval_option ::= intervalKey LP tmvar RP */
- 252, /* (193) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */
- 252, /* (194) interval_option ::= */
- 270, /* (195) intervalKey ::= INTERVAL */
- 270, /* (196) intervalKey ::= EVERY */
- 254, /* (197) session_option ::= */
- 254, /* (198) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
- 255, /* (199) windowstate_option ::= */
- 255, /* (200) windowstate_option ::= STATE_WINDOW LP ids RP */
- 256, /* (201) fill_opt ::= */
- 256, /* (202) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
- 256, /* (203) fill_opt ::= FILL LP ID RP */
- 253, /* (204) sliding_opt ::= SLIDING LP tmvar RP */
- 253, /* (205) sliding_opt ::= */
- 259, /* (206) orderby_opt ::= */
- 259, /* (207) orderby_opt ::= ORDER BY sortlist */
- 271, /* (208) sortlist ::= sortlist COMMA item sortorder */
- 271, /* (209) sortlist ::= item sortorder */
- 273, /* (210) item ::= ids cpxName */
- 274, /* (211) sortorder ::= ASC */
- 274, /* (212) sortorder ::= DESC */
- 274, /* (213) sortorder ::= */
- 257, /* (214) groupby_opt ::= */
- 257, /* (215) groupby_opt ::= GROUP BY grouplist */
- 275, /* (216) grouplist ::= grouplist COMMA item */
- 275, /* (217) grouplist ::= item */
- 258, /* (218) having_opt ::= */
- 258, /* (219) having_opt ::= HAVING expr */
- 261, /* (220) limit_opt ::= */
- 261, /* (221) limit_opt ::= LIMIT signed */
- 261, /* (222) limit_opt ::= LIMIT signed OFFSET signed */
- 261, /* (223) limit_opt ::= LIMIT signed COMMA signed */
- 260, /* (224) slimit_opt ::= */
- 260, /* (225) slimit_opt ::= SLIMIT signed */
- 260, /* (226) slimit_opt ::= SLIMIT signed SOFFSET signed */
- 260, /* (227) slimit_opt ::= SLIMIT signed COMMA signed */
- 251, /* (228) where_opt ::= */
- 251, /* (229) where_opt ::= WHERE expr */
- 265, /* (230) expr ::= LP expr RP */
- 265, /* (231) expr ::= ID */
- 265, /* (232) expr ::= ID DOT ID */
- 265, /* (233) expr ::= ID DOT STAR */
- 265, /* (234) expr ::= INTEGER */
- 265, /* (235) expr ::= MINUS INTEGER */
- 265, /* (236) expr ::= PLUS INTEGER */
- 265, /* (237) expr ::= FLOAT */
- 265, /* (238) expr ::= MINUS FLOAT */
- 265, /* (239) expr ::= PLUS FLOAT */
- 265, /* (240) expr ::= STRING */
- 265, /* (241) expr ::= NOW */
- 265, /* (242) expr ::= VARIABLE */
- 265, /* (243) expr ::= PLUS VARIABLE */
- 265, /* (244) expr ::= MINUS VARIABLE */
- 265, /* (245) expr ::= BOOL */
- 265, /* (246) expr ::= NULL */
- 265, /* (247) expr ::= ID LP exprlist RP */
- 265, /* (248) expr ::= ID LP STAR RP */
- 265, /* (249) expr ::= expr IS NULL */
- 265, /* (250) expr ::= expr IS NOT NULL */
- 265, /* (251) expr ::= expr LT expr */
- 265, /* (252) expr ::= expr GT expr */
- 265, /* (253) expr ::= expr LE expr */
- 265, /* (254) expr ::= expr GE expr */
- 265, /* (255) expr ::= expr NE expr */
- 265, /* (256) expr ::= expr EQ expr */
- 265, /* (257) expr ::= expr BETWEEN expr AND expr */
- 265, /* (258) expr ::= expr AND expr */
- 265, /* (259) expr ::= expr OR expr */
- 265, /* (260) expr ::= expr PLUS expr */
- 265, /* (261) expr ::= expr MINUS expr */
- 265, /* (262) expr ::= expr STAR expr */
- 265, /* (263) expr ::= expr SLASH expr */
- 265, /* (264) expr ::= expr REM expr */
- 265, /* (265) expr ::= expr LIKE expr */
- 265, /* (266) expr ::= expr MATCH expr */
- 265, /* (267) expr ::= expr IN LP exprlist RP */
- 205, /* (268) exprlist ::= exprlist COMMA expritem */
- 205, /* (269) exprlist ::= expritem */
- 276, /* (270) expritem ::= expr */
- 276, /* (271) expritem ::= */
- 197, /* (272) cmd ::= RESET QUERY CACHE */
- 197, /* (273) cmd ::= SYNCDB ids REPLICA */
- 197, /* (274) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
- 197, /* (275) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
- 197, /* (276) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
- 197, /* (277) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
- 197, /* (278) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
- 197, /* (279) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
- 197, /* (280) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
- 197, /* (281) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
- 197, /* (282) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
- 197, /* (283) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
- 197, /* (284) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
- 197, /* (285) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
- 197, /* (286) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
- 197, /* (287) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
- 197, /* (288) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
- 197, /* (289) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
- 197, /* (290) cmd ::= KILL CONNECTION INTEGER */
- 197, /* (291) cmd ::= KILL STREAM INTEGER COLON INTEGER */
- 197, /* (292) cmd ::= KILL QUERY INTEGER COLON INTEGER */
+ 197, /* (0) program ::= cmd */
+ 198, /* (1) cmd ::= SHOW DATABASES */
+ 198, /* (2) cmd ::= SHOW TOPICS */
+ 198, /* (3) cmd ::= SHOW FUNCTIONS */
+ 198, /* (4) cmd ::= SHOW MNODES */
+ 198, /* (5) cmd ::= SHOW DNODES */
+ 198, /* (6) cmd ::= SHOW ACCOUNTS */
+ 198, /* (7) cmd ::= SHOW USERS */
+ 198, /* (8) cmd ::= SHOW MODULES */
+ 198, /* (9) cmd ::= SHOW QUERIES */
+ 198, /* (10) cmd ::= SHOW CONNECTIONS */
+ 198, /* (11) cmd ::= SHOW STREAMS */
+ 198, /* (12) cmd ::= SHOW VARIABLES */
+ 198, /* (13) cmd ::= SHOW SCORES */
+ 198, /* (14) cmd ::= SHOW GRANTS */
+ 198, /* (15) cmd ::= SHOW VNODES */
+ 198, /* (16) cmd ::= SHOW VNODES ids */
+ 200, /* (17) dbPrefix ::= */
+ 200, /* (18) dbPrefix ::= ids DOT */
+ 201, /* (19) cpxName ::= */
+ 201, /* (20) cpxName ::= DOT ids */
+ 198, /* (21) cmd ::= SHOW CREATE TABLE ids cpxName */
+ 198, /* (22) cmd ::= SHOW CREATE STABLE ids cpxName */
+ 198, /* (23) cmd ::= SHOW CREATE DATABASE ids */
+ 198, /* (24) cmd ::= SHOW dbPrefix TABLES */
+ 198, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE ids */
+ 198, /* (26) cmd ::= SHOW dbPrefix STABLES */
+ 198, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE ids */
+ 198, /* (28) cmd ::= SHOW dbPrefix VGROUPS */
+ 198, /* (29) cmd ::= SHOW dbPrefix VGROUPS ids */
+ 198, /* (30) cmd ::= DROP TABLE ifexists ids cpxName */
+ 198, /* (31) cmd ::= DROP STABLE ifexists ids cpxName */
+ 198, /* (32) cmd ::= DROP DATABASE ifexists ids */
+ 198, /* (33) cmd ::= DROP TOPIC ifexists ids */
+ 198, /* (34) cmd ::= DROP FUNCTION ids */
+ 198, /* (35) cmd ::= DROP DNODE ids */
+ 198, /* (36) cmd ::= DROP USER ids */
+ 198, /* (37) cmd ::= DROP ACCOUNT ids */
+ 198, /* (38) cmd ::= USE ids */
+ 198, /* (39) cmd ::= DESCRIBE ids cpxName */
+ 198, /* (40) cmd ::= DESC ids cpxName */
+ 198, /* (41) cmd ::= ALTER USER ids PASS ids */
+ 198, /* (42) cmd ::= ALTER USER ids PRIVILEGE ids */
+ 198, /* (43) cmd ::= ALTER DNODE ids ids */
+ 198, /* (44) cmd ::= ALTER DNODE ids ids ids */
+ 198, /* (45) cmd ::= ALTER LOCAL ids */
+ 198, /* (46) cmd ::= ALTER LOCAL ids ids */
+ 198, /* (47) cmd ::= ALTER DATABASE ids alter_db_optr */
+ 198, /* (48) cmd ::= ALTER TOPIC ids alter_topic_optr */
+ 198, /* (49) cmd ::= ALTER ACCOUNT ids acct_optr */
+ 198, /* (50) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
+ 198, /* (51) cmd ::= COMPACT VNODES IN LP exprlist RP */
+ 199, /* (52) ids ::= ID */
+ 199, /* (53) ids ::= STRING */
+ 202, /* (54) ifexists ::= IF EXISTS */
+ 202, /* (55) ifexists ::= */
+ 207, /* (56) ifnotexists ::= IF NOT EXISTS */
+ 207, /* (57) ifnotexists ::= */
+ 198, /* (58) cmd ::= CREATE DNODE ids */
+ 198, /* (59) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
+ 198, /* (60) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
+ 198, /* (61) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */
+ 198, /* (62) cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
+ 198, /* (63) cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
+ 198, /* (64) cmd ::= CREATE USER ids PASS ids */
+ 211, /* (65) bufsize ::= */
+ 211, /* (66) bufsize ::= BUFSIZE INTEGER */
+ 212, /* (67) pps ::= */
+ 212, /* (68) pps ::= PPS INTEGER */
+ 213, /* (69) tseries ::= */
+ 213, /* (70) tseries ::= TSERIES INTEGER */
+ 214, /* (71) dbs ::= */
+ 214, /* (72) dbs ::= DBS INTEGER */
+ 215, /* (73) streams ::= */
+ 215, /* (74) streams ::= STREAMS INTEGER */
+ 216, /* (75) storage ::= */
+ 216, /* (76) storage ::= STORAGE INTEGER */
+ 217, /* (77) qtime ::= */
+ 217, /* (78) qtime ::= QTIME INTEGER */
+ 218, /* (79) users ::= */
+ 218, /* (80) users ::= USERS INTEGER */
+ 219, /* (81) conns ::= */
+ 219, /* (82) conns ::= CONNS INTEGER */
+ 220, /* (83) state ::= */
+ 220, /* (84) state ::= STATE ids */
+ 205, /* (85) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
+ 221, /* (86) intitemlist ::= intitemlist COMMA intitem */
+ 221, /* (87) intitemlist ::= intitem */
+ 222, /* (88) intitem ::= INTEGER */
+ 223, /* (89) keep ::= KEEP intitemlist */
+ 224, /* (90) cache ::= CACHE INTEGER */
+ 225, /* (91) replica ::= REPLICA INTEGER */
+ 226, /* (92) quorum ::= QUORUM INTEGER */
+ 227, /* (93) days ::= DAYS INTEGER */
+ 228, /* (94) minrows ::= MINROWS INTEGER */
+ 229, /* (95) maxrows ::= MAXROWS INTEGER */
+ 230, /* (96) blocks ::= BLOCKS INTEGER */
+ 231, /* (97) ctime ::= CTIME INTEGER */
+ 232, /* (98) wal ::= WAL INTEGER */
+ 233, /* (99) fsync ::= FSYNC INTEGER */
+ 234, /* (100) comp ::= COMP INTEGER */
+ 235, /* (101) prec ::= PRECISION STRING */
+ 236, /* (102) update ::= UPDATE INTEGER */
+ 237, /* (103) cachelast ::= CACHELAST INTEGER */
+ 238, /* (104) partitions ::= PARTITIONS INTEGER */
+ 208, /* (105) db_optr ::= */
+ 208, /* (106) db_optr ::= db_optr cache */
+ 208, /* (107) db_optr ::= db_optr replica */
+ 208, /* (108) db_optr ::= db_optr quorum */
+ 208, /* (109) db_optr ::= db_optr days */
+ 208, /* (110) db_optr ::= db_optr minrows */
+ 208, /* (111) db_optr ::= db_optr maxrows */
+ 208, /* (112) db_optr ::= db_optr blocks */
+ 208, /* (113) db_optr ::= db_optr ctime */
+ 208, /* (114) db_optr ::= db_optr wal */
+ 208, /* (115) db_optr ::= db_optr fsync */
+ 208, /* (116) db_optr ::= db_optr comp */
+ 208, /* (117) db_optr ::= db_optr prec */
+ 208, /* (118) db_optr ::= db_optr keep */
+ 208, /* (119) db_optr ::= db_optr update */
+ 208, /* (120) db_optr ::= db_optr cachelast */
+ 209, /* (121) topic_optr ::= db_optr */
+ 209, /* (122) topic_optr ::= topic_optr partitions */
+ 203, /* (123) alter_db_optr ::= */
+ 203, /* (124) alter_db_optr ::= alter_db_optr replica */
+ 203, /* (125) alter_db_optr ::= alter_db_optr quorum */
+ 203, /* (126) alter_db_optr ::= alter_db_optr keep */
+ 203, /* (127) alter_db_optr ::= alter_db_optr blocks */
+ 203, /* (128) alter_db_optr ::= alter_db_optr comp */
+ 203, /* (129) alter_db_optr ::= alter_db_optr update */
+ 203, /* (130) alter_db_optr ::= alter_db_optr cachelast */
+ 204, /* (131) alter_topic_optr ::= alter_db_optr */
+ 204, /* (132) alter_topic_optr ::= alter_topic_optr partitions */
+ 210, /* (133) typename ::= ids */
+ 210, /* (134) typename ::= ids LP signed RP */
+ 210, /* (135) typename ::= ids UNSIGNED */
+ 239, /* (136) signed ::= INTEGER */
+ 239, /* (137) signed ::= PLUS INTEGER */
+ 239, /* (138) signed ::= MINUS INTEGER */
+ 198, /* (139) cmd ::= CREATE TABLE create_table_args */
+ 198, /* (140) cmd ::= CREATE TABLE create_stable_args */
+ 198, /* (141) cmd ::= CREATE STABLE create_stable_args */
+ 198, /* (142) cmd ::= CREATE TABLE create_table_list */
+ 242, /* (143) create_table_list ::= create_from_stable */
+ 242, /* (144) create_table_list ::= create_table_list create_from_stable */
+ 240, /* (145) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
+ 241, /* (146) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
+ 243, /* (147) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
+ 243, /* (148) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
+ 246, /* (149) tagNamelist ::= tagNamelist COMMA ids */
+ 246, /* (150) tagNamelist ::= ids */
+ 240, /* (151) create_table_args ::= ifnotexists ids cpxName AS select */
+ 244, /* (152) columnlist ::= columnlist COMMA column */
+ 244, /* (153) columnlist ::= column */
+ 248, /* (154) column ::= ids typename */
+ 245, /* (155) tagitemlist ::= tagitemlist COMMA tagitem */
+ 245, /* (156) tagitemlist ::= tagitem */
+ 249, /* (157) tagitem ::= INTEGER */
+ 249, /* (158) tagitem ::= FLOAT */
+ 249, /* (159) tagitem ::= STRING */
+ 249, /* (160) tagitem ::= BOOL */
+ 249, /* (161) tagitem ::= NULL */
+ 249, /* (162) tagitem ::= NOW */
+ 249, /* (163) tagitem ::= MINUS INTEGER */
+ 249, /* (164) tagitem ::= MINUS FLOAT */
+ 249, /* (165) tagitem ::= PLUS INTEGER */
+ 249, /* (166) tagitem ::= PLUS FLOAT */
+ 247, /* (167) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */
+ 247, /* (168) select ::= LP select RP */
+ 263, /* (169) union ::= select */
+ 263, /* (170) union ::= union UNION ALL select */
+ 198, /* (171) cmd ::= union */
+ 247, /* (172) select ::= SELECT selcollist */
+ 264, /* (173) sclp ::= selcollist COMMA */
+ 264, /* (174) sclp ::= */
+ 250, /* (175) selcollist ::= sclp distinct expr as */
+ 250, /* (176) selcollist ::= sclp STAR */
+ 267, /* (177) as ::= AS ids */
+ 267, /* (178) as ::= ids */
+ 267, /* (179) as ::= */
+ 265, /* (180) distinct ::= DISTINCT */
+ 265, /* (181) distinct ::= */
+ 251, /* (182) from ::= FROM tablelist */
+ 251, /* (183) from ::= FROM sub */
+ 269, /* (184) sub ::= LP union RP */
+ 269, /* (185) sub ::= LP union RP ids */
+ 269, /* (186) sub ::= sub COMMA LP union RP ids */
+ 268, /* (187) tablelist ::= ids cpxName */
+ 268, /* (188) tablelist ::= ids cpxName ids */
+ 268, /* (189) tablelist ::= tablelist COMMA ids cpxName */
+ 268, /* (190) tablelist ::= tablelist COMMA ids cpxName ids */
+ 270, /* (191) tmvar ::= VARIABLE */
+ 253, /* (192) interval_option ::= intervalKey LP tmvar RP */
+ 253, /* (193) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */
+ 253, /* (194) interval_option ::= */
+ 271, /* (195) intervalKey ::= INTERVAL */
+ 271, /* (196) intervalKey ::= EVERY */
+ 255, /* (197) session_option ::= */
+ 255, /* (198) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
+ 256, /* (199) windowstate_option ::= */
+ 256, /* (200) windowstate_option ::= STATE_WINDOW LP ids RP */
+ 257, /* (201) fill_opt ::= */
+ 257, /* (202) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
+ 257, /* (203) fill_opt ::= FILL LP ID RP */
+ 254, /* (204) sliding_opt ::= SLIDING LP tmvar RP */
+ 254, /* (205) sliding_opt ::= */
+ 260, /* (206) orderby_opt ::= */
+ 260, /* (207) orderby_opt ::= ORDER BY sortlist */
+ 272, /* (208) sortlist ::= sortlist COMMA item sortorder */
+ 272, /* (209) sortlist ::= item sortorder */
+ 274, /* (210) item ::= ids cpxName */
+ 275, /* (211) sortorder ::= ASC */
+ 275, /* (212) sortorder ::= DESC */
+ 275, /* (213) sortorder ::= */
+ 258, /* (214) groupby_opt ::= */
+ 258, /* (215) groupby_opt ::= GROUP BY grouplist */
+ 276, /* (216) grouplist ::= grouplist COMMA item */
+ 276, /* (217) grouplist ::= item */
+ 259, /* (218) having_opt ::= */
+ 259, /* (219) having_opt ::= HAVING expr */
+ 262, /* (220) limit_opt ::= */
+ 262, /* (221) limit_opt ::= LIMIT signed */
+ 262, /* (222) limit_opt ::= LIMIT signed OFFSET signed */
+ 262, /* (223) limit_opt ::= LIMIT signed COMMA signed */
+ 261, /* (224) slimit_opt ::= */
+ 261, /* (225) slimit_opt ::= SLIMIT signed */
+ 261, /* (226) slimit_opt ::= SLIMIT signed SOFFSET signed */
+ 261, /* (227) slimit_opt ::= SLIMIT signed COMMA signed */
+ 252, /* (228) where_opt ::= */
+ 252, /* (229) where_opt ::= WHERE expr */
+ 266, /* (230) expr ::= LP expr RP */
+ 266, /* (231) expr ::= ID */
+ 266, /* (232) expr ::= ID DOT ID */
+ 266, /* (233) expr ::= ID DOT STAR */
+ 266, /* (234) expr ::= INTEGER */
+ 266, /* (235) expr ::= MINUS INTEGER */
+ 266, /* (236) expr ::= PLUS INTEGER */
+ 266, /* (237) expr ::= FLOAT */
+ 266, /* (238) expr ::= MINUS FLOAT */
+ 266, /* (239) expr ::= PLUS FLOAT */
+ 266, /* (240) expr ::= STRING */
+ 266, /* (241) expr ::= NOW */
+ 266, /* (242) expr ::= VARIABLE */
+ 266, /* (243) expr ::= PLUS VARIABLE */
+ 266, /* (244) expr ::= MINUS VARIABLE */
+ 266, /* (245) expr ::= BOOL */
+ 266, /* (246) expr ::= NULL */
+ 266, /* (247) expr ::= ID LP exprlist RP */
+ 266, /* (248) expr ::= ID LP STAR RP */
+ 266, /* (249) expr ::= expr IS NULL */
+ 266, /* (250) expr ::= expr IS NOT NULL */
+ 266, /* (251) expr ::= expr LT expr */
+ 266, /* (252) expr ::= expr GT expr */
+ 266, /* (253) expr ::= expr LE expr */
+ 266, /* (254) expr ::= expr GE expr */
+ 266, /* (255) expr ::= expr NE expr */
+ 266, /* (256) expr ::= expr EQ expr */
+ 266, /* (257) expr ::= expr BETWEEN expr AND expr */
+ 266, /* (258) expr ::= expr AND expr */
+ 266, /* (259) expr ::= expr OR expr */
+ 266, /* (260) expr ::= expr PLUS expr */
+ 266, /* (261) expr ::= expr MINUS expr */
+ 266, /* (262) expr ::= expr STAR expr */
+ 266, /* (263) expr ::= expr SLASH expr */
+ 266, /* (264) expr ::= expr REM expr */
+ 266, /* (265) expr ::= expr LIKE expr */
+ 266, /* (266) expr ::= expr MATCH expr */
+ 266, /* (267) expr ::= expr NMATCH expr */
+ 266, /* (268) expr ::= expr IN LP exprlist RP */
+ 206, /* (269) exprlist ::= exprlist COMMA expritem */
+ 206, /* (270) exprlist ::= expritem */
+ 277, /* (271) expritem ::= expr */
+ 277, /* (272) expritem ::= */
+ 198, /* (273) cmd ::= RESET QUERY CACHE */
+ 198, /* (274) cmd ::= SYNCDB ids REPLICA */
+ 198, /* (275) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+ 198, /* (276) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+ 198, /* (277) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
+ 198, /* (278) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+ 198, /* (279) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+ 198, /* (280) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+ 198, /* (281) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+ 198, /* (282) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
+ 198, /* (283) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+ 198, /* (284) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+ 198, /* (285) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
+ 198, /* (286) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+ 198, /* (287) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+ 198, /* (288) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+ 198, /* (289) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
+ 198, /* (290) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
+ 198, /* (291) cmd ::= KILL CONNECTION INTEGER */
+ 198, /* (292) cmd ::= KILL STREAM INTEGER COLON INTEGER */
+ 198, /* (293) cmd ::= KILL QUERY INTEGER COLON INTEGER */
};
/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
@@ -2430,32 +2435,33 @@ static const signed char yyRuleInfoNRhs[] = {
-3, /* (264) expr ::= expr REM expr */
-3, /* (265) expr ::= expr LIKE expr */
-3, /* (266) expr ::= expr MATCH expr */
- -5, /* (267) expr ::= expr IN LP exprlist RP */
- -3, /* (268) exprlist ::= exprlist COMMA expritem */
- -1, /* (269) exprlist ::= expritem */
- -1, /* (270) expritem ::= expr */
- 0, /* (271) expritem ::= */
- -3, /* (272) cmd ::= RESET QUERY CACHE */
- -3, /* (273) cmd ::= SYNCDB ids REPLICA */
- -7, /* (274) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
- -7, /* (275) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
- -7, /* (276) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
- -7, /* (277) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
- -7, /* (278) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
- -8, /* (279) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
- -9, /* (280) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
- -7, /* (281) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
- -7, /* (282) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
- -7, /* (283) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
- -7, /* (284) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
- -7, /* (285) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
- -7, /* (286) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
- -8, /* (287) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
- -9, /* (288) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
- -7, /* (289) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
- -3, /* (290) cmd ::= KILL CONNECTION INTEGER */
- -5, /* (291) cmd ::= KILL STREAM INTEGER COLON INTEGER */
- -5, /* (292) cmd ::= KILL QUERY INTEGER COLON INTEGER */
+ -3, /* (267) expr ::= expr NMATCH expr */
+ -5, /* (268) expr ::= expr IN LP exprlist RP */
+ -3, /* (269) exprlist ::= exprlist COMMA expritem */
+ -1, /* (270) exprlist ::= expritem */
+ -1, /* (271) expritem ::= expr */
+ 0, /* (272) expritem ::= */
+ -3, /* (273) cmd ::= RESET QUERY CACHE */
+ -3, /* (274) cmd ::= SYNCDB ids REPLICA */
+ -7, /* (275) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+ -7, /* (276) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+ -7, /* (277) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
+ -7, /* (278) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+ -7, /* (279) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+ -8, /* (280) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+ -9, /* (281) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+ -7, /* (282) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
+ -7, /* (283) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+ -7, /* (284) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+ -7, /* (285) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
+ -7, /* (286) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+ -7, /* (287) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+ -8, /* (288) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+ -9, /* (289) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
+ -7, /* (290) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
+ -3, /* (291) cmd ::= KILL CONNECTION INTEGER */
+ -5, /* (292) cmd ::= KILL STREAM INTEGER COLON INTEGER */
+ -5, /* (293) cmd ::= KILL QUERY INTEGER COLON INTEGER */
};
static void yy_accept(yyParser*); /* Forward Declaration */
@@ -2551,108 +2557,108 @@ static YYACTIONTYPE yy_reduce(
case 141: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==141);
#line 63 "sql.y"
{}
-#line 2555 "sql.c"
+#line 2561 "sql.c"
break;
case 1: /* cmd ::= SHOW DATABASES */
#line 66 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_DB, 0, 0);}
-#line 2560 "sql.c"
+#line 2566 "sql.c"
break;
case 2: /* cmd ::= SHOW TOPICS */
#line 67 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_TP, 0, 0);}
-#line 2565 "sql.c"
+#line 2571 "sql.c"
break;
case 3: /* cmd ::= SHOW FUNCTIONS */
#line 68 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_FUNCTION, 0, 0);}
-#line 2570 "sql.c"
+#line 2576 "sql.c"
break;
case 4: /* cmd ::= SHOW MNODES */
#line 69 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_MNODE, 0, 0);}
-#line 2575 "sql.c"
+#line 2581 "sql.c"
break;
case 5: /* cmd ::= SHOW DNODES */
#line 70 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_DNODE, 0, 0);}
-#line 2580 "sql.c"
+#line 2586 "sql.c"
break;
case 6: /* cmd ::= SHOW ACCOUNTS */
#line 71 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_ACCT, 0, 0);}
-#line 2585 "sql.c"
+#line 2591 "sql.c"
break;
case 7: /* cmd ::= SHOW USERS */
#line 72 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_USER, 0, 0);}
-#line 2590 "sql.c"
+#line 2596 "sql.c"
break;
case 8: /* cmd ::= SHOW MODULES */
#line 74 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_MODULE, 0, 0); }
-#line 2595 "sql.c"
+#line 2601 "sql.c"
break;
case 9: /* cmd ::= SHOW QUERIES */
#line 75 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_QUERIES, 0, 0); }
-#line 2600 "sql.c"
+#line 2606 "sql.c"
break;
case 10: /* cmd ::= SHOW CONNECTIONS */
#line 76 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_CONNS, 0, 0);}
-#line 2605 "sql.c"
+#line 2611 "sql.c"
break;
case 11: /* cmd ::= SHOW STREAMS */
#line 77 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_STREAMS, 0, 0); }
-#line 2610 "sql.c"
+#line 2616 "sql.c"
break;
case 12: /* cmd ::= SHOW VARIABLES */
#line 78 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_VARIABLES, 0, 0); }
-#line 2615 "sql.c"
+#line 2621 "sql.c"
break;
case 13: /* cmd ::= SHOW SCORES */
#line 79 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_SCORES, 0, 0); }
-#line 2620 "sql.c"
+#line 2626 "sql.c"
break;
case 14: /* cmd ::= SHOW GRANTS */
#line 80 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_GRANTS, 0, 0); }
-#line 2625 "sql.c"
+#line 2631 "sql.c"
break;
case 15: /* cmd ::= SHOW VNODES */
#line 82 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, 0, 0); }
-#line 2630 "sql.c"
+#line 2636 "sql.c"
break;
case 16: /* cmd ::= SHOW VNODES ids */
#line 83 "sql.y"
{ setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &yymsp[0].minor.yy0, 0); }
-#line 2635 "sql.c"
+#line 2641 "sql.c"
break;
case 17: /* dbPrefix ::= */
#line 87 "sql.y"
{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.type = 0;}
-#line 2640 "sql.c"
+#line 2646 "sql.c"
break;
case 18: /* dbPrefix ::= ids DOT */
#line 88 "sql.y"
{yylhsminor.yy0 = yymsp[-1].minor.yy0; }
-#line 2645 "sql.c"
+#line 2651 "sql.c"
yymsp[-1].minor.yy0 = yylhsminor.yy0;
break;
case 19: /* cpxName ::= */
#line 91 "sql.y"
{yymsp[1].minor.yy0.n = 0; }
-#line 2651 "sql.c"
+#line 2657 "sql.c"
break;
case 20: /* cpxName ::= DOT ids */
#line 92 "sql.y"
{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n += 1; }
-#line 2656 "sql.c"
+#line 2662 "sql.c"
break;
case 21: /* cmd ::= SHOW CREATE TABLE ids cpxName */
#line 94 "sql.y"
@@ -2660,7 +2666,7 @@ static YYACTIONTYPE yy_reduce(
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
setDCLSqlElems(pInfo, TSDB_SQL_SHOW_CREATE_TABLE, 1, &yymsp[-1].minor.yy0);
}
-#line 2664 "sql.c"
+#line 2670 "sql.c"
break;
case 22: /* cmd ::= SHOW CREATE STABLE ids cpxName */
#line 98 "sql.y"
@@ -2668,35 +2674,35 @@ static YYACTIONTYPE yy_reduce(
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
setDCLSqlElems(pInfo, TSDB_SQL_SHOW_CREATE_STABLE, 1, &yymsp[-1].minor.yy0);
}
-#line 2672 "sql.c"
+#line 2678 "sql.c"
break;
case 23: /* cmd ::= SHOW CREATE DATABASE ids */
#line 103 "sql.y"
{
setDCLSqlElems(pInfo, TSDB_SQL_SHOW_CREATE_DATABASE, 1, &yymsp[0].minor.yy0);
}
-#line 2679 "sql.c"
+#line 2685 "sql.c"
break;
case 24: /* cmd ::= SHOW dbPrefix TABLES */
#line 107 "sql.y"
{
setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-1].minor.yy0, 0);
}
-#line 2686 "sql.c"
+#line 2692 "sql.c"
break;
case 25: /* cmd ::= SHOW dbPrefix TABLES LIKE ids */
#line 111 "sql.y"
{
setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0);
}
-#line 2693 "sql.c"
+#line 2699 "sql.c"
break;
case 26: /* cmd ::= SHOW dbPrefix STABLES */
#line 115 "sql.y"
{
setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &yymsp[-1].minor.yy0, 0);
}
-#line 2700 "sql.c"
+#line 2706 "sql.c"
break;
case 27: /* cmd ::= SHOW dbPrefix STABLES LIKE ids */
#line 119 "sql.y"
@@ -2705,7 +2711,7 @@ static YYACTIONTYPE yy_reduce(
tSetDbName(&token, &yymsp[-3].minor.yy0);
setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &token, &yymsp[0].minor.yy0);
}
-#line 2709 "sql.c"
+#line 2715 "sql.c"
break;
case 28: /* cmd ::= SHOW dbPrefix VGROUPS */
#line 125 "sql.y"
@@ -2714,7 +2720,7 @@ static YYACTIONTYPE yy_reduce(
tSetDbName(&token, &yymsp[-1].minor.yy0);
setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, 0);
}
-#line 2718 "sql.c"
+#line 2724 "sql.c"
break;
case 29: /* cmd ::= SHOW dbPrefix VGROUPS ids */
#line 131 "sql.y"
@@ -2723,7 +2729,7 @@ static YYACTIONTYPE yy_reduce(
tSetDbName(&token, &yymsp[-2].minor.yy0);
setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, &yymsp[0].minor.yy0);
}
-#line 2727 "sql.c"
+#line 2733 "sql.c"
break;
case 30: /* cmd ::= DROP TABLE ifexists ids cpxName */
#line 138 "sql.y"
@@ -2731,7 +2737,7 @@ static YYACTIONTYPE yy_reduce(
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &yymsp[-1].minor.yy0, &yymsp[-2].minor.yy0, -1, -1);
}
-#line 2735 "sql.c"
+#line 2741 "sql.c"
break;
case 31: /* cmd ::= DROP STABLE ifexists ids cpxName */
#line 144 "sql.y"
@@ -2739,42 +2745,42 @@ static YYACTIONTYPE yy_reduce(
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &yymsp[-1].minor.yy0, &yymsp[-2].minor.yy0, -1, TSDB_SUPER_TABLE);
}
-#line 2743 "sql.c"
+#line 2749 "sql.c"
break;
case 32: /* cmd ::= DROP DATABASE ifexists ids */
#line 149 "sql.y"
{ setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &yymsp[0].minor.yy0, &yymsp[-1].minor.yy0, TSDB_DB_TYPE_DEFAULT, -1); }
-#line 2748 "sql.c"
+#line 2754 "sql.c"
break;
case 33: /* cmd ::= DROP TOPIC ifexists ids */
#line 150 "sql.y"
{ setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &yymsp[0].minor.yy0, &yymsp[-1].minor.yy0, TSDB_DB_TYPE_TOPIC, -1); }
-#line 2753 "sql.c"
+#line 2759 "sql.c"
break;
case 34: /* cmd ::= DROP FUNCTION ids */
#line 151 "sql.y"
{ setDropFuncInfo(pInfo, TSDB_SQL_DROP_FUNCTION, &yymsp[0].minor.yy0); }
-#line 2758 "sql.c"
+#line 2764 "sql.c"
break;
case 35: /* cmd ::= DROP DNODE ids */
#line 153 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &yymsp[0].minor.yy0); }
-#line 2763 "sql.c"
+#line 2769 "sql.c"
break;
case 36: /* cmd ::= DROP USER ids */
#line 154 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_DROP_USER, 1, &yymsp[0].minor.yy0); }
-#line 2768 "sql.c"
+#line 2774 "sql.c"
break;
case 37: /* cmd ::= DROP ACCOUNT ids */
#line 155 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &yymsp[0].minor.yy0); }
-#line 2773 "sql.c"
+#line 2779 "sql.c"
break;
case 38: /* cmd ::= USE ids */
#line 158 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_USE_DB, 1, &yymsp[0].minor.yy0);}
-#line 2778 "sql.c"
+#line 2784 "sql.c"
break;
case 39: /* cmd ::= DESCRIBE ids cpxName */
case 40: /* cmd ::= DESC ids cpxName */ yytestcase(yyruleno==40);
@@ -2783,113 +2789,113 @@ static YYACTIONTYPE yy_reduce(
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
setDCLSqlElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &yymsp[-1].minor.yy0);
}
-#line 2787 "sql.c"
+#line 2793 "sql.c"
break;
case 41: /* cmd ::= ALTER USER ids PASS ids */
#line 170 "sql.y"
{ setAlterUserSql(pInfo, TSDB_ALTER_USER_PASSWD, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, NULL); }
-#line 2792 "sql.c"
+#line 2798 "sql.c"
break;
case 42: /* cmd ::= ALTER USER ids PRIVILEGE ids */
#line 171 "sql.y"
{ setAlterUserSql(pInfo, TSDB_ALTER_USER_PRIVILEGES, &yymsp[-2].minor.yy0, NULL, &yymsp[0].minor.yy0);}
-#line 2797 "sql.c"
+#line 2803 "sql.c"
break;
case 43: /* cmd ::= ALTER DNODE ids ids */
#line 172 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
-#line 2802 "sql.c"
+#line 2808 "sql.c"
break;
case 44: /* cmd ::= ALTER DNODE ids ids ids */
#line 173 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &yymsp[-2].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
-#line 2807 "sql.c"
+#line 2813 "sql.c"
break;
case 45: /* cmd ::= ALTER LOCAL ids */
#line 174 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &yymsp[0].minor.yy0); }
-#line 2812 "sql.c"
+#line 2818 "sql.c"
break;
case 46: /* cmd ::= ALTER LOCAL ids ids */
#line 175 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
-#line 2817 "sql.c"
+#line 2823 "sql.c"
break;
case 47: /* cmd ::= ALTER DATABASE ids alter_db_optr */
case 48: /* cmd ::= ALTER TOPIC ids alter_topic_optr */ yytestcase(yyruleno==48);
#line 176 "sql.y"
-{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy246, &t);}
-#line 2823 "sql.c"
+{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy90, &t);}
+#line 2829 "sql.c"
break;
case 49: /* cmd ::= ALTER ACCOUNT ids acct_optr */
#line 179 "sql.y"
-{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy377);}
-#line 2828 "sql.c"
+{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy171);}
+#line 2834 "sql.c"
break;
case 50: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
#line 180 "sql.y"
-{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy377);}
-#line 2833 "sql.c"
+{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy171);}
+#line 2839 "sql.c"
break;
case 51: /* cmd ::= COMPACT VNODES IN LP exprlist RP */
#line 184 "sql.y"
-{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy403);}
-#line 2838 "sql.c"
+{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy421);}
+#line 2844 "sql.c"
break;
case 52: /* ids ::= ID */
case 53: /* ids ::= STRING */ yytestcase(yyruleno==53);
#line 190 "sql.y"
{yylhsminor.yy0 = yymsp[0].minor.yy0; }
-#line 2844 "sql.c"
+#line 2850 "sql.c"
yymsp[0].minor.yy0 = yylhsminor.yy0;
break;
case 54: /* ifexists ::= IF EXISTS */
#line 194 "sql.y"
{ yymsp[-1].minor.yy0.n = 1;}
-#line 2850 "sql.c"
+#line 2856 "sql.c"
break;
case 55: /* ifexists ::= */
case 57: /* ifnotexists ::= */ yytestcase(yyruleno==57);
case 181: /* distinct ::= */ yytestcase(yyruleno==181);
#line 195 "sql.y"
{ yymsp[1].minor.yy0.n = 0;}
-#line 2857 "sql.c"
+#line 2863 "sql.c"
break;
case 56: /* ifnotexists ::= IF NOT EXISTS */
#line 198 "sql.y"
{ yymsp[-2].minor.yy0.n = 1;}
-#line 2862 "sql.c"
+#line 2868 "sql.c"
break;
case 58: /* cmd ::= CREATE DNODE ids */
#line 203 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);}
-#line 2867 "sql.c"
+#line 2873 "sql.c"
break;
case 59: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
#line 205 "sql.y"
-{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy377);}
-#line 2872 "sql.c"
+{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy171);}
+#line 2878 "sql.c"
break;
case 60: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */
case 61: /* cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ yytestcase(yyruleno==61);
#line 206 "sql.y"
-{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy246, &yymsp[-2].minor.yy0);}
-#line 2878 "sql.c"
+{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy90, &yymsp[-2].minor.yy0);}
+#line 2884 "sql.c"
break;
case 62: /* cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
#line 208 "sql.y"
-{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy363, &yymsp[0].minor.yy0, 1);}
-#line 2883 "sql.c"
+{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy183, &yymsp[0].minor.yy0, 1);}
+#line 2889 "sql.c"
break;
case 63: /* cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
#line 209 "sql.y"
-{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy363, &yymsp[0].minor.yy0, 2);}
-#line 2888 "sql.c"
+{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy183, &yymsp[0].minor.yy0, 2);}
+#line 2894 "sql.c"
break;
case 64: /* cmd ::= CREATE USER ids PASS ids */
#line 210 "sql.y"
{ setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}
-#line 2893 "sql.c"
+#line 2899 "sql.c"
break;
case 65: /* bufsize ::= */
case 67: /* pps ::= */ yytestcase(yyruleno==67);
@@ -2903,7 +2909,7 @@ static YYACTIONTYPE yy_reduce(
case 83: /* state ::= */ yytestcase(yyruleno==83);
#line 212 "sql.y"
{ yymsp[1].minor.yy0.n = 0; }
-#line 2907 "sql.c"
+#line 2913 "sql.c"
break;
case 66: /* bufsize ::= BUFSIZE INTEGER */
case 68: /* pps ::= PPS INTEGER */ yytestcase(yyruleno==68);
@@ -2917,37 +2923,37 @@ static YYACTIONTYPE yy_reduce(
case 84: /* state ::= STATE ids */ yytestcase(yyruleno==84);
#line 213 "sql.y"
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
-#line 2921 "sql.c"
+#line 2927 "sql.c"
break;
case 85: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */
#line 243 "sql.y"
{
- yylhsminor.yy377.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
- yylhsminor.yy377.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
- yylhsminor.yy377.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
- yylhsminor.yy377.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
- yylhsminor.yy377.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
- yylhsminor.yy377.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
- yylhsminor.yy377.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
- yylhsminor.yy377.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
- yylhsminor.yy377.stat = yymsp[0].minor.yy0;
+ yylhsminor.yy171.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
+ yylhsminor.yy171.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
+ yylhsminor.yy171.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
+ yylhsminor.yy171.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
+ yylhsminor.yy171.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
+ yylhsminor.yy171.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
+ yylhsminor.yy171.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
+ yylhsminor.yy171.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
+ yylhsminor.yy171.stat = yymsp[0].minor.yy0;
}
-#line 2936 "sql.c"
- yymsp[-8].minor.yy377 = yylhsminor.yy377;
+#line 2942 "sql.c"
+ yymsp[-8].minor.yy171 = yylhsminor.yy171;
break;
case 86: /* intitemlist ::= intitemlist COMMA intitem */
case 155: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==155);
#line 259 "sql.y"
-{ yylhsminor.yy403 = tVariantListAppend(yymsp[-2].minor.yy403, &yymsp[0].minor.yy488, -1); }
-#line 2943 "sql.c"
- yymsp[-2].minor.yy403 = yylhsminor.yy403;
+{ yylhsminor.yy421 = tVariantListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy430, -1); }
+#line 2949 "sql.c"
+ yymsp[-2].minor.yy421 = yylhsminor.yy421;
break;
case 87: /* intitemlist ::= intitem */
case 156: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==156);
#line 260 "sql.y"
-{ yylhsminor.yy403 = tVariantListAppend(NULL, &yymsp[0].minor.yy488, -1); }
-#line 2950 "sql.c"
- yymsp[0].minor.yy403 = yylhsminor.yy403;
+{ yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[0].minor.yy430, -1); }
+#line 2956 "sql.c"
+ yymsp[0].minor.yy421 = yylhsminor.yy421;
break;
case 88: /* intitem ::= INTEGER */
case 157: /* tagitem ::= INTEGER */ yytestcase(yyruleno==157);
@@ -2955,14 +2961,14 @@ static YYACTIONTYPE yy_reduce(
case 159: /* tagitem ::= STRING */ yytestcase(yyruleno==159);
case 160: /* tagitem ::= BOOL */ yytestcase(yyruleno==160);
#line 262 "sql.y"
-{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy488, &yymsp[0].minor.yy0); }
-#line 2960 "sql.c"
- yymsp[0].minor.yy488 = yylhsminor.yy488;
+{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0); }
+#line 2966 "sql.c"
+ yymsp[0].minor.yy430 = yylhsminor.yy430;
break;
case 89: /* keep ::= KEEP intitemlist */
#line 266 "sql.y"
-{ yymsp[-1].minor.yy403 = yymsp[0].minor.yy403; }
-#line 2966 "sql.c"
+{ yymsp[-1].minor.yy421 = yymsp[0].minor.yy421; }
+#line 2972 "sql.c"
break;
case 90: /* cache ::= CACHE INTEGER */
case 91: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==91);
@@ -2981,182 +2987,182 @@ static YYACTIONTYPE yy_reduce(
case 104: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==104);
#line 268 "sql.y"
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
-#line 2985 "sql.c"
+#line 2991 "sql.c"
break;
case 105: /* db_optr ::= */
#line 285 "sql.y"
-{setDefaultCreateDbOption(&yymsp[1].minor.yy246); yymsp[1].minor.yy246.dbType = TSDB_DB_TYPE_DEFAULT;}
-#line 2990 "sql.c"
+{setDefaultCreateDbOption(&yymsp[1].minor.yy90); yymsp[1].minor.yy90.dbType = TSDB_DB_TYPE_DEFAULT;}
+#line 2996 "sql.c"
break;
case 106: /* db_optr ::= db_optr cache */
#line 287 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 2995 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3001 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 107: /* db_optr ::= db_optr replica */
case 124: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==124);
#line 288 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3002 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3008 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 108: /* db_optr ::= db_optr quorum */
case 125: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==125);
#line 289 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3009 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3015 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 109: /* db_optr ::= db_optr days */
#line 290 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3015 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3021 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 110: /* db_optr ::= db_optr minrows */
#line 291 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
-#line 3021 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
+#line 3027 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 111: /* db_optr ::= db_optr maxrows */
#line 292 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
-#line 3027 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
+#line 3033 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 112: /* db_optr ::= db_optr blocks */
case 127: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==127);
#line 293 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3034 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3040 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 113: /* db_optr ::= db_optr ctime */
#line 294 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3040 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3046 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 114: /* db_optr ::= db_optr wal */
#line 295 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3046 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3052 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 115: /* db_optr ::= db_optr fsync */
#line 296 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3052 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3058 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 116: /* db_optr ::= db_optr comp */
case 128: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==128);
#line 297 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3059 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3065 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 117: /* db_optr ::= db_optr prec */
#line 298 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.precision = yymsp[0].minor.yy0; }
-#line 3065 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.precision = yymsp[0].minor.yy0; }
+#line 3071 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 118: /* db_optr ::= db_optr keep */
case 126: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==126);
#line 299 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.keep = yymsp[0].minor.yy403; }
-#line 3072 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.keep = yymsp[0].minor.yy421; }
+#line 3078 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 119: /* db_optr ::= db_optr update */
case 129: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==129);
#line 300 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3079 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3085 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 120: /* db_optr ::= db_optr cachelast */
case 130: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==130);
#line 301 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3086 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3092 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 121: /* topic_optr ::= db_optr */
case 131: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==131);
#line 305 "sql.y"
-{ yylhsminor.yy246 = yymsp[0].minor.yy246; yylhsminor.yy246.dbType = TSDB_DB_TYPE_TOPIC; }
-#line 3093 "sql.c"
- yymsp[0].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[0].minor.yy90; yylhsminor.yy90.dbType = TSDB_DB_TYPE_TOPIC; }
+#line 3099 "sql.c"
+ yymsp[0].minor.yy90 = yylhsminor.yy90;
break;
case 122: /* topic_optr ::= topic_optr partitions */
case 132: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==132);
#line 306 "sql.y"
-{ yylhsminor.yy246 = yymsp[-1].minor.yy246; yylhsminor.yy246.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3100 "sql.c"
- yymsp[-1].minor.yy246 = yylhsminor.yy246;
+{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3106 "sql.c"
+ yymsp[-1].minor.yy90 = yylhsminor.yy90;
break;
case 123: /* alter_db_optr ::= */
#line 309 "sql.y"
-{ setDefaultCreateDbOption(&yymsp[1].minor.yy246); yymsp[1].minor.yy246.dbType = TSDB_DB_TYPE_DEFAULT;}
-#line 3106 "sql.c"
+{ setDefaultCreateDbOption(&yymsp[1].minor.yy90); yymsp[1].minor.yy90.dbType = TSDB_DB_TYPE_DEFAULT;}
+#line 3112 "sql.c"
break;
case 133: /* typename ::= ids */
#line 329 "sql.y"
{
yymsp[0].minor.yy0.type = 0;
- tSetColumnType (&yylhsminor.yy363, &yymsp[0].minor.yy0);
+ tSetColumnType (&yylhsminor.yy183, &yymsp[0].minor.yy0);
}
-#line 3114 "sql.c"
- yymsp[0].minor.yy363 = yylhsminor.yy363;
+#line 3120 "sql.c"
+ yymsp[0].minor.yy183 = yylhsminor.yy183;
break;
case 134: /* typename ::= ids LP signed RP */
#line 335 "sql.y"
{
- if (yymsp[-1].minor.yy387 <= 0) {
+ if (yymsp[-1].minor.yy325 <= 0) {
yymsp[-3].minor.yy0.type = 0;
- tSetColumnType(&yylhsminor.yy363, &yymsp[-3].minor.yy0);
+ tSetColumnType(&yylhsminor.yy183, &yymsp[-3].minor.yy0);
} else {
- yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy387; // negative value of name length
- tSetColumnType(&yylhsminor.yy363, &yymsp[-3].minor.yy0);
+ yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy325; // negative value of name length
+ tSetColumnType(&yylhsminor.yy183, &yymsp[-3].minor.yy0);
}
}
-#line 3128 "sql.c"
- yymsp[-3].minor.yy363 = yylhsminor.yy363;
+#line 3134 "sql.c"
+ yymsp[-3].minor.yy183 = yylhsminor.yy183;
break;
case 135: /* typename ::= ids UNSIGNED */
#line 346 "sql.y"
{
yymsp[-1].minor.yy0.type = 0;
yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z);
- tSetColumnType (&yylhsminor.yy363, &yymsp[-1].minor.yy0);
+ tSetColumnType (&yylhsminor.yy183, &yymsp[-1].minor.yy0);
}
-#line 3138 "sql.c"
- yymsp[-1].minor.yy363 = yylhsminor.yy363;
+#line 3144 "sql.c"
+ yymsp[-1].minor.yy183 = yylhsminor.yy183;
break;
case 136: /* signed ::= INTEGER */
#line 353 "sql.y"
-{ yylhsminor.yy387 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3144 "sql.c"
- yymsp[0].minor.yy387 = yylhsminor.yy387;
+{ yylhsminor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3150 "sql.c"
+ yymsp[0].minor.yy325 = yylhsminor.yy325;
break;
case 137: /* signed ::= PLUS INTEGER */
#line 354 "sql.y"
-{ yymsp[-1].minor.yy387 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-#line 3150 "sql.c"
+{ yymsp[-1].minor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+#line 3156 "sql.c"
break;
case 138: /* signed ::= MINUS INTEGER */
#line 355 "sql.y"
-{ yymsp[-1].minor.yy387 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
-#line 3155 "sql.c"
+{ yymsp[-1].minor.yy325 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
+#line 3161 "sql.c"
break;
case 142: /* cmd ::= CREATE TABLE create_table_list */
#line 361 "sql.y"
-{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy56;}
-#line 3160 "sql.c"
+{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy438;}
+#line 3166 "sql.c"
break;
case 143: /* create_table_list ::= create_from_stable */
#line 365 "sql.y"
@@ -3164,121 +3170,121 @@ static YYACTIONTYPE yy_reduce(
SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql));
pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo));
- taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy84);
+ taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy152);
pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE;
- yylhsminor.yy56 = pCreateTable;
+ yylhsminor.yy438 = pCreateTable;
}
-#line 3172 "sql.c"
- yymsp[0].minor.yy56 = yylhsminor.yy56;
+#line 3178 "sql.c"
+ yymsp[0].minor.yy438 = yylhsminor.yy438;
break;
case 144: /* create_table_list ::= create_table_list create_from_stable */
#line 374 "sql.y"
{
- taosArrayPush(yymsp[-1].minor.yy56->childTableInfo, &yymsp[0].minor.yy84);
- yylhsminor.yy56 = yymsp[-1].minor.yy56;
+ taosArrayPush(yymsp[-1].minor.yy438->childTableInfo, &yymsp[0].minor.yy152);
+ yylhsminor.yy438 = yymsp[-1].minor.yy438;
}
-#line 3181 "sql.c"
- yymsp[-1].minor.yy56 = yylhsminor.yy56;
+#line 3187 "sql.c"
+ yymsp[-1].minor.yy438 = yylhsminor.yy438;
break;
case 145: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
#line 380 "sql.y"
{
- yylhsminor.yy56 = tSetCreateTableInfo(yymsp[-1].minor.yy403, NULL, NULL, TSQL_CREATE_TABLE);
- setSqlInfo(pInfo, yylhsminor.yy56, NULL, TSDB_SQL_CREATE_TABLE);
+ yylhsminor.yy438 = tSetCreateTableInfo(yymsp[-1].minor.yy421, NULL, NULL, TSQL_CREATE_TABLE);
+ setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE);
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
setCreatedTableName(pInfo, &yymsp[-4].minor.yy0, &yymsp[-5].minor.yy0);
}
-#line 3193 "sql.c"
- yymsp[-5].minor.yy56 = yylhsminor.yy56;
+#line 3199 "sql.c"
+ yymsp[-5].minor.yy438 = yylhsminor.yy438;
break;
case 146: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
#line 390 "sql.y"
{
- yylhsminor.yy56 = tSetCreateTableInfo(yymsp[-5].minor.yy403, yymsp[-1].minor.yy403, NULL, TSQL_CREATE_STABLE);
- setSqlInfo(pInfo, yylhsminor.yy56, NULL, TSDB_SQL_CREATE_TABLE);
+ yylhsminor.yy438 = tSetCreateTableInfo(yymsp[-5].minor.yy421, yymsp[-1].minor.yy421, NULL, TSQL_CREATE_STABLE);
+ setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE);
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
setCreatedTableName(pInfo, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
}
-#line 3205 "sql.c"
- yymsp[-9].minor.yy56 = yylhsminor.yy56;
+#line 3211 "sql.c"
+ yymsp[-9].minor.yy438 = yylhsminor.yy438;
break;
case 147: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
#line 401 "sql.y"
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
- yylhsminor.yy84 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy403, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
+ yylhsminor.yy152 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy421, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
}
-#line 3215 "sql.c"
- yymsp[-9].minor.yy84 = yylhsminor.yy84;
+#line 3221 "sql.c"
+ yymsp[-9].minor.yy152 = yylhsminor.yy152;
break;
case 148: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
#line 407 "sql.y"
{
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n;
- yylhsminor.yy84 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy403, yymsp[-1].minor.yy403, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0);
+ yylhsminor.yy152 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy421, yymsp[-1].minor.yy421, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0);
}
-#line 3225 "sql.c"
- yymsp[-12].minor.yy84 = yylhsminor.yy84;
+#line 3231 "sql.c"
+ yymsp[-12].minor.yy152 = yylhsminor.yy152;
break;
case 149: /* tagNamelist ::= tagNamelist COMMA ids */
#line 415 "sql.y"
-{taosArrayPush(yymsp[-2].minor.yy403, &yymsp[0].minor.yy0); yylhsminor.yy403 = yymsp[-2].minor.yy403; }
-#line 3231 "sql.c"
- yymsp[-2].minor.yy403 = yylhsminor.yy403;
+{taosArrayPush(yymsp[-2].minor.yy421, &yymsp[0].minor.yy0); yylhsminor.yy421 = yymsp[-2].minor.yy421; }
+#line 3237 "sql.c"
+ yymsp[-2].minor.yy421 = yylhsminor.yy421;
break;
case 150: /* tagNamelist ::= ids */
#line 416 "sql.y"
-{yylhsminor.yy403 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy403, &yymsp[0].minor.yy0);}
-#line 3237 "sql.c"
- yymsp[0].minor.yy403 = yylhsminor.yy403;
+{yylhsminor.yy421 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy421, &yymsp[0].minor.yy0);}
+#line 3243 "sql.c"
+ yymsp[0].minor.yy421 = yylhsminor.yy421;
break;
case 151: /* create_table_args ::= ifnotexists ids cpxName AS select */
#line 420 "sql.y"
{
- yylhsminor.yy56 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy224, TSQL_CREATE_STREAM);
- setSqlInfo(pInfo, yylhsminor.yy56, NULL, TSDB_SQL_CREATE_TABLE);
+ yylhsminor.yy438 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy56, TSQL_CREATE_STREAM);
+ setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE);
yymsp[-3].minor.yy0.n += yymsp[-2].minor.yy0.n;
setCreatedTableName(pInfo, &yymsp[-3].minor.yy0, &yymsp[-4].minor.yy0);
}
-#line 3249 "sql.c"
- yymsp[-4].minor.yy56 = yylhsminor.yy56;
+#line 3255 "sql.c"
+ yymsp[-4].minor.yy438 = yylhsminor.yy438;
break;
case 152: /* columnlist ::= columnlist COMMA column */
#line 431 "sql.y"
-{taosArrayPush(yymsp[-2].minor.yy403, &yymsp[0].minor.yy363); yylhsminor.yy403 = yymsp[-2].minor.yy403; }
-#line 3255 "sql.c"
- yymsp[-2].minor.yy403 = yylhsminor.yy403;
+{taosArrayPush(yymsp[-2].minor.yy421, &yymsp[0].minor.yy183); yylhsminor.yy421 = yymsp[-2].minor.yy421; }
+#line 3261 "sql.c"
+ yymsp[-2].minor.yy421 = yylhsminor.yy421;
break;
case 153: /* columnlist ::= column */
#line 432 "sql.y"
-{yylhsminor.yy403 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy403, &yymsp[0].minor.yy363);}
-#line 3261 "sql.c"
- yymsp[0].minor.yy403 = yylhsminor.yy403;
+{yylhsminor.yy421 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy421, &yymsp[0].minor.yy183);}
+#line 3267 "sql.c"
+ yymsp[0].minor.yy421 = yylhsminor.yy421;
break;
case 154: /* column ::= ids typename */
#line 436 "sql.y"
{
- tSetColumnInfo(&yylhsminor.yy363, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy363);
+ tSetColumnInfo(&yylhsminor.yy183, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy183);
}
-#line 3269 "sql.c"
- yymsp[-1].minor.yy363 = yylhsminor.yy363;
+#line 3275 "sql.c"
+ yymsp[-1].minor.yy183 = yylhsminor.yy183;
break;
case 161: /* tagitem ::= NULL */
#line 451 "sql.y"
-{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy488, &yymsp[0].minor.yy0); }
-#line 3275 "sql.c"
- yymsp[0].minor.yy488 = yylhsminor.yy488;
+{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0); }
+#line 3281 "sql.c"
+ yymsp[0].minor.yy430 = yylhsminor.yy430;
break;
case 162: /* tagitem ::= NOW */
#line 452 "sql.y"
-{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&yylhsminor.yy488, &yymsp[0].minor.yy0);}
-#line 3281 "sql.c"
- yymsp[0].minor.yy488 = yylhsminor.yy488;
+{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0);}
+#line 3287 "sql.c"
+ yymsp[0].minor.yy430 = yylhsminor.yy430;
break;
case 163: /* tagitem ::= MINUS INTEGER */
case 164: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==164);
@@ -3289,219 +3295,219 @@ static YYACTIONTYPE yy_reduce(
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type;
toTSDBType(yymsp[-1].minor.yy0.type);
- tVariantCreate(&yylhsminor.yy488, &yymsp[-1].minor.yy0);
+ tVariantCreate(&yylhsminor.yy430, &yymsp[-1].minor.yy0);
}
-#line 3295 "sql.c"
- yymsp[-1].minor.yy488 = yylhsminor.yy488;
+#line 3301 "sql.c"
+ yymsp[-1].minor.yy430 = yylhsminor.yy430;
break;
case 167: /* select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */
#line 485 "sql.y"
{
- yylhsminor.yy224 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy403, yymsp[-11].minor.yy114, yymsp[-10].minor.yy260, yymsp[-4].minor.yy403, yymsp[-2].minor.yy403, &yymsp[-9].minor.yy222, &yymsp[-7].minor.yy365, &yymsp[-6].minor.yy544, &yymsp[-8].minor.yy0, yymsp[-5].minor.yy403, &yymsp[0].minor.yy404, &yymsp[-1].minor.yy404, yymsp[-3].minor.yy260);
+ yylhsminor.yy56 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy421, yymsp[-11].minor.yy8, yymsp[-10].minor.yy439, yymsp[-4].minor.yy421, yymsp[-2].minor.yy421, &yymsp[-9].minor.yy400, &yymsp[-7].minor.yy147, &yymsp[-6].minor.yy40, &yymsp[-8].minor.yy0, yymsp[-5].minor.yy421, &yymsp[0].minor.yy166, &yymsp[-1].minor.yy166, yymsp[-3].minor.yy439);
}
-#line 3303 "sql.c"
- yymsp[-13].minor.yy224 = yylhsminor.yy224;
+#line 3309 "sql.c"
+ yymsp[-13].minor.yy56 = yylhsminor.yy56;
break;
case 168: /* select ::= LP select RP */
#line 489 "sql.y"
-{yymsp[-2].minor.yy224 = yymsp[-1].minor.yy224;}
-#line 3309 "sql.c"
+{yymsp[-2].minor.yy56 = yymsp[-1].minor.yy56;}
+#line 3315 "sql.c"
break;
case 169: /* union ::= select */
#line 493 "sql.y"
-{ yylhsminor.yy403 = setSubclause(NULL, yymsp[0].minor.yy224); }
-#line 3314 "sql.c"
- yymsp[0].minor.yy403 = yylhsminor.yy403;
+{ yylhsminor.yy421 = setSubclause(NULL, yymsp[0].minor.yy56); }
+#line 3320 "sql.c"
+ yymsp[0].minor.yy421 = yylhsminor.yy421;
break;
case 170: /* union ::= union UNION ALL select */
#line 494 "sql.y"
-{ yylhsminor.yy403 = appendSelectClause(yymsp[-3].minor.yy403, yymsp[0].minor.yy224); }
-#line 3320 "sql.c"
- yymsp[-3].minor.yy403 = yylhsminor.yy403;
+{ yylhsminor.yy421 = appendSelectClause(yymsp[-3].minor.yy421, yymsp[0].minor.yy56); }
+#line 3326 "sql.c"
+ yymsp[-3].minor.yy421 = yylhsminor.yy421;
break;
case 171: /* cmd ::= union */
#line 496 "sql.y"
-{ setSqlInfo(pInfo, yymsp[0].minor.yy403, NULL, TSDB_SQL_SELECT); }
-#line 3326 "sql.c"
+{ setSqlInfo(pInfo, yymsp[0].minor.yy421, NULL, TSDB_SQL_SELECT); }
+#line 3332 "sql.c"
break;
case 172: /* select ::= SELECT selcollist */
#line 503 "sql.y"
{
- yylhsminor.yy224 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy403, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ yylhsminor.yy56 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy421, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
}
-#line 3333 "sql.c"
- yymsp[-1].minor.yy224 = yylhsminor.yy224;
+#line 3339 "sql.c"
+ yymsp[-1].minor.yy56 = yylhsminor.yy56;
break;
case 173: /* sclp ::= selcollist COMMA */
#line 515 "sql.y"
-{yylhsminor.yy403 = yymsp[-1].minor.yy403;}
-#line 3339 "sql.c"
- yymsp[-1].minor.yy403 = yylhsminor.yy403;
+{yylhsminor.yy421 = yymsp[-1].minor.yy421;}
+#line 3345 "sql.c"
+ yymsp[-1].minor.yy421 = yylhsminor.yy421;
break;
case 174: /* sclp ::= */
case 206: /* orderby_opt ::= */ yytestcase(yyruleno==206);
#line 516 "sql.y"
-{yymsp[1].minor.yy403 = 0;}
-#line 3346 "sql.c"
+{yymsp[1].minor.yy421 = 0;}
+#line 3352 "sql.c"
break;
case 175: /* selcollist ::= sclp distinct expr as */
#line 517 "sql.y"
{
- yylhsminor.yy403 = tSqlExprListAppend(yymsp[-3].minor.yy403, yymsp[-1].minor.yy260, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
+ yylhsminor.yy421 = tSqlExprListAppend(yymsp[-3].minor.yy421, yymsp[-1].minor.yy439, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
}
-#line 3353 "sql.c"
- yymsp[-3].minor.yy403 = yylhsminor.yy403;
+#line 3359 "sql.c"
+ yymsp[-3].minor.yy421 = yylhsminor.yy421;
break;
case 176: /* selcollist ::= sclp STAR */
#line 521 "sql.y"
{
tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL);
- yylhsminor.yy403 = tSqlExprListAppend(yymsp[-1].minor.yy403, pNode, 0, 0);
+ yylhsminor.yy421 = tSqlExprListAppend(yymsp[-1].minor.yy421, pNode, 0, 0);
}
-#line 3362 "sql.c"
- yymsp[-1].minor.yy403 = yylhsminor.yy403;
+#line 3368 "sql.c"
+ yymsp[-1].minor.yy421 = yylhsminor.yy421;
break;
case 177: /* as ::= AS ids */
#line 529 "sql.y"
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
-#line 3368 "sql.c"
+#line 3374 "sql.c"
break;
case 178: /* as ::= ids */
#line 530 "sql.y"
{ yylhsminor.yy0 = yymsp[0].minor.yy0; }
-#line 3373 "sql.c"
+#line 3379 "sql.c"
yymsp[0].minor.yy0 = yylhsminor.yy0;
break;
case 179: /* as ::= */
#line 531 "sql.y"
{ yymsp[1].minor.yy0.n = 0; }
-#line 3379 "sql.c"
+#line 3385 "sql.c"
break;
case 180: /* distinct ::= DISTINCT */
#line 534 "sql.y"
{ yylhsminor.yy0 = yymsp[0].minor.yy0; }
-#line 3384 "sql.c"
+#line 3390 "sql.c"
yymsp[0].minor.yy0 = yylhsminor.yy0;
break;
case 182: /* from ::= FROM tablelist */
case 183: /* from ::= FROM sub */ yytestcase(yyruleno==183);
#line 540 "sql.y"
-{yymsp[-1].minor.yy114 = yymsp[0].minor.yy114;}
-#line 3391 "sql.c"
+{yymsp[-1].minor.yy8 = yymsp[0].minor.yy8;}
+#line 3397 "sql.c"
break;
case 184: /* sub ::= LP union RP */
#line 545 "sql.y"
-{yymsp[-2].minor.yy114 = addSubqueryElem(NULL, yymsp[-1].minor.yy403, NULL);}
-#line 3396 "sql.c"
+{yymsp[-2].minor.yy8 = addSubqueryElem(NULL, yymsp[-1].minor.yy421, NULL);}
+#line 3402 "sql.c"
break;
case 185: /* sub ::= LP union RP ids */
#line 546 "sql.y"
-{yymsp[-3].minor.yy114 = addSubqueryElem(NULL, yymsp[-2].minor.yy403, &yymsp[0].minor.yy0);}
-#line 3401 "sql.c"
+{yymsp[-3].minor.yy8 = addSubqueryElem(NULL, yymsp[-2].minor.yy421, &yymsp[0].minor.yy0);}
+#line 3407 "sql.c"
break;
case 186: /* sub ::= sub COMMA LP union RP ids */
#line 547 "sql.y"
-{yylhsminor.yy114 = addSubqueryElem(yymsp[-5].minor.yy114, yymsp[-2].minor.yy403, &yymsp[0].minor.yy0);}
-#line 3406 "sql.c"
- yymsp[-5].minor.yy114 = yylhsminor.yy114;
+{yylhsminor.yy8 = addSubqueryElem(yymsp[-5].minor.yy8, yymsp[-2].minor.yy421, &yymsp[0].minor.yy0);}
+#line 3412 "sql.c"
+ yymsp[-5].minor.yy8 = yylhsminor.yy8;
break;
case 187: /* tablelist ::= ids cpxName */
#line 551 "sql.y"
{
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
- yylhsminor.yy114 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL);
+ yylhsminor.yy8 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL);
}
-#line 3415 "sql.c"
- yymsp[-1].minor.yy114 = yylhsminor.yy114;
+#line 3421 "sql.c"
+ yymsp[-1].minor.yy8 = yylhsminor.yy8;
break;
case 188: /* tablelist ::= ids cpxName ids */
#line 556 "sql.y"
{
yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
- yylhsminor.yy114 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
+ yylhsminor.yy8 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
}
-#line 3424 "sql.c"
- yymsp[-2].minor.yy114 = yylhsminor.yy114;
+#line 3430 "sql.c"
+ yymsp[-2].minor.yy8 = yylhsminor.yy8;
break;
case 189: /* tablelist ::= tablelist COMMA ids cpxName */
#line 561 "sql.y"
{
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
- yylhsminor.yy114 = setTableNameList(yymsp[-3].minor.yy114, &yymsp[-1].minor.yy0, NULL);
+ yylhsminor.yy8 = setTableNameList(yymsp[-3].minor.yy8, &yymsp[-1].minor.yy0, NULL);
}
-#line 3433 "sql.c"
- yymsp[-3].minor.yy114 = yylhsminor.yy114;
+#line 3439 "sql.c"
+ yymsp[-3].minor.yy8 = yylhsminor.yy8;
break;
case 190: /* tablelist ::= tablelist COMMA ids cpxName ids */
#line 566 "sql.y"
{
yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
- yylhsminor.yy114 = setTableNameList(yymsp[-4].minor.yy114, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
+ yylhsminor.yy8 = setTableNameList(yymsp[-4].minor.yy8, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
}
-#line 3442 "sql.c"
- yymsp[-4].minor.yy114 = yylhsminor.yy114;
+#line 3448 "sql.c"
+ yymsp[-4].minor.yy8 = yylhsminor.yy8;
break;
case 191: /* tmvar ::= VARIABLE */
#line 573 "sql.y"
{yylhsminor.yy0 = yymsp[0].minor.yy0;}
-#line 3448 "sql.c"
+#line 3454 "sql.c"
yymsp[0].minor.yy0 = yylhsminor.yy0;
break;
case 192: /* interval_option ::= intervalKey LP tmvar RP */
#line 576 "sql.y"
-{yylhsminor.yy222.interval = yymsp[-1].minor.yy0; yylhsminor.yy222.offset.n = 0; yylhsminor.yy222.token = yymsp[-3].minor.yy202;}
-#line 3454 "sql.c"
- yymsp[-3].minor.yy222 = yylhsminor.yy222;
+{yylhsminor.yy400.interval = yymsp[-1].minor.yy0; yylhsminor.yy400.offset.n = 0; yylhsminor.yy400.token = yymsp[-3].minor.yy104;}
+#line 3460 "sql.c"
+ yymsp[-3].minor.yy400 = yylhsminor.yy400;
break;
case 193: /* interval_option ::= intervalKey LP tmvar COMMA tmvar RP */
#line 577 "sql.y"
-{yylhsminor.yy222.interval = yymsp[-3].minor.yy0; yylhsminor.yy222.offset = yymsp[-1].minor.yy0; yylhsminor.yy222.token = yymsp[-5].minor.yy202;}
-#line 3460 "sql.c"
- yymsp[-5].minor.yy222 = yylhsminor.yy222;
+{yylhsminor.yy400.interval = yymsp[-3].minor.yy0; yylhsminor.yy400.offset = yymsp[-1].minor.yy0; yylhsminor.yy400.token = yymsp[-5].minor.yy104;}
+#line 3466 "sql.c"
+ yymsp[-5].minor.yy400 = yylhsminor.yy400;
break;
case 194: /* interval_option ::= */
#line 578 "sql.y"
-{memset(&yymsp[1].minor.yy222, 0, sizeof(yymsp[1].minor.yy222));}
-#line 3466 "sql.c"
+{memset(&yymsp[1].minor.yy400, 0, sizeof(yymsp[1].minor.yy400));}
+#line 3472 "sql.c"
break;
case 195: /* intervalKey ::= INTERVAL */
#line 581 "sql.y"
-{yymsp[0].minor.yy202 = TK_INTERVAL;}
-#line 3471 "sql.c"
+{yymsp[0].minor.yy104 = TK_INTERVAL;}
+#line 3477 "sql.c"
break;
case 196: /* intervalKey ::= EVERY */
#line 582 "sql.y"
-{yymsp[0].minor.yy202 = TK_EVERY; }
-#line 3476 "sql.c"
+{yymsp[0].minor.yy104 = TK_EVERY; }
+#line 3482 "sql.c"
break;
case 197: /* session_option ::= */
#line 585 "sql.y"
-{yymsp[1].minor.yy365.col.n = 0; yymsp[1].minor.yy365.gap.n = 0;}
-#line 3481 "sql.c"
+{yymsp[1].minor.yy147.col.n = 0; yymsp[1].minor.yy147.gap.n = 0;}
+#line 3487 "sql.c"
break;
case 198: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
#line 586 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- yymsp[-6].minor.yy365.col = yymsp[-4].minor.yy0;
- yymsp[-6].minor.yy365.gap = yymsp[-1].minor.yy0;
+ yymsp[-6].minor.yy147.col = yymsp[-4].minor.yy0;
+ yymsp[-6].minor.yy147.gap = yymsp[-1].minor.yy0;
}
-#line 3490 "sql.c"
+#line 3496 "sql.c"
break;
case 199: /* windowstate_option ::= */
#line 593 "sql.y"
-{ yymsp[1].minor.yy544.col.n = 0; yymsp[1].minor.yy544.col.z = NULL;}
-#line 3495 "sql.c"
+{ yymsp[1].minor.yy40.col.n = 0; yymsp[1].minor.yy40.col.z = NULL;}
+#line 3501 "sql.c"
break;
case 200: /* windowstate_option ::= STATE_WINDOW LP ids RP */
#line 594 "sql.y"
-{ yymsp[-3].minor.yy544.col = yymsp[-1].minor.yy0; }
-#line 3500 "sql.c"
+{ yymsp[-3].minor.yy40.col = yymsp[-1].minor.yy0; }
+#line 3506 "sql.c"
break;
case 201: /* fill_opt ::= */
#line 598 "sql.y"
-{ yymsp[1].minor.yy403 = 0; }
-#line 3505 "sql.c"
+{ yymsp[1].minor.yy421 = 0; }
+#line 3511 "sql.c"
break;
case 202: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
#line 599 "sql.y"
@@ -3510,49 +3516,49 @@ static YYACTIONTYPE yy_reduce(
toTSDBType(yymsp[-3].minor.yy0.type);
tVariantCreate(&A, &yymsp[-3].minor.yy0);
- tVariantListInsert(yymsp[-1].minor.yy403, &A, -1, 0);
- yymsp[-5].minor.yy403 = yymsp[-1].minor.yy403;
+ tVariantListInsert(yymsp[-1].minor.yy421, &A, -1, 0);
+ yymsp[-5].minor.yy421 = yymsp[-1].minor.yy421;
}
-#line 3517 "sql.c"
+#line 3523 "sql.c"
break;
case 203: /* fill_opt ::= FILL LP ID RP */
#line 608 "sql.y"
{
toTSDBType(yymsp[-1].minor.yy0.type);
- yymsp[-3].minor.yy403 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
+ yymsp[-3].minor.yy421 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
}
-#line 3525 "sql.c"
+#line 3531 "sql.c"
break;
case 204: /* sliding_opt ::= SLIDING LP tmvar RP */
#line 614 "sql.y"
{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; }
-#line 3530 "sql.c"
+#line 3536 "sql.c"
break;
case 205: /* sliding_opt ::= */
#line 615 "sql.y"
{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; }
-#line 3535 "sql.c"
+#line 3541 "sql.c"
break;
case 207: /* orderby_opt ::= ORDER BY sortlist */
#line 627 "sql.y"
-{yymsp[-2].minor.yy403 = yymsp[0].minor.yy403;}
-#line 3540 "sql.c"
+{yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;}
+#line 3546 "sql.c"
break;
case 208: /* sortlist ::= sortlist COMMA item sortorder */
#line 629 "sql.y"
{
- yylhsminor.yy403 = tVariantListAppend(yymsp[-3].minor.yy403, &yymsp[-1].minor.yy488, yymsp[0].minor.yy70);
+ yylhsminor.yy421 = tVariantListAppend(yymsp[-3].minor.yy421, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96);
}
-#line 3547 "sql.c"
- yymsp[-3].minor.yy403 = yylhsminor.yy403;
+#line 3553 "sql.c"
+ yymsp[-3].minor.yy421 = yylhsminor.yy421;
break;
case 209: /* sortlist ::= item sortorder */
#line 633 "sql.y"
{
- yylhsminor.yy403 = tVariantListAppend(NULL, &yymsp[-1].minor.yy488, yymsp[0].minor.yy70);
+ yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96);
}
-#line 3555 "sql.c"
- yymsp[-1].minor.yy403 = yylhsminor.yy403;
+#line 3561 "sql.c"
+ yymsp[-1].minor.yy421 = yylhsminor.yy421;
break;
case 210: /* item ::= ids cpxName */
#line 638 "sql.y"
@@ -3560,349 +3566,355 @@ static YYACTIONTYPE yy_reduce(
toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
- tVariantCreate(&yylhsminor.yy488, &yymsp[-1].minor.yy0);
+ tVariantCreate(&yylhsminor.yy430, &yymsp[-1].minor.yy0);
}
-#line 3566 "sql.c"
- yymsp[-1].minor.yy488 = yylhsminor.yy488;
+#line 3572 "sql.c"
+ yymsp[-1].minor.yy430 = yylhsminor.yy430;
break;
case 211: /* sortorder ::= ASC */
#line 646 "sql.y"
-{ yymsp[0].minor.yy70 = TSDB_ORDER_ASC; }
-#line 3572 "sql.c"
+{ yymsp[0].minor.yy96 = TSDB_ORDER_ASC; }
+#line 3578 "sql.c"
break;
case 212: /* sortorder ::= DESC */
#line 647 "sql.y"
-{ yymsp[0].minor.yy70 = TSDB_ORDER_DESC;}
-#line 3577 "sql.c"
+{ yymsp[0].minor.yy96 = TSDB_ORDER_DESC;}
+#line 3583 "sql.c"
break;
case 213: /* sortorder ::= */
#line 648 "sql.y"
-{ yymsp[1].minor.yy70 = TSDB_ORDER_ASC; }
-#line 3582 "sql.c"
+{ yymsp[1].minor.yy96 = TSDB_ORDER_ASC; }
+#line 3588 "sql.c"
break;
case 214: /* groupby_opt ::= */
#line 656 "sql.y"
-{ yymsp[1].minor.yy403 = 0;}
-#line 3587 "sql.c"
+{ yymsp[1].minor.yy421 = 0;}
+#line 3593 "sql.c"
break;
case 215: /* groupby_opt ::= GROUP BY grouplist */
#line 657 "sql.y"
-{ yymsp[-2].minor.yy403 = yymsp[0].minor.yy403;}
-#line 3592 "sql.c"
+{ yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;}
+#line 3598 "sql.c"
break;
case 216: /* grouplist ::= grouplist COMMA item */
#line 659 "sql.y"
{
- yylhsminor.yy403 = tVariantListAppend(yymsp[-2].minor.yy403, &yymsp[0].minor.yy488, -1);
+ yylhsminor.yy421 = tVariantListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy430, -1);
}
-#line 3599 "sql.c"
- yymsp[-2].minor.yy403 = yylhsminor.yy403;
+#line 3605 "sql.c"
+ yymsp[-2].minor.yy421 = yylhsminor.yy421;
break;
case 217: /* grouplist ::= item */
#line 663 "sql.y"
{
- yylhsminor.yy403 = tVariantListAppend(NULL, &yymsp[0].minor.yy488, -1);
+ yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[0].minor.yy430, -1);
}
-#line 3607 "sql.c"
- yymsp[0].minor.yy403 = yylhsminor.yy403;
+#line 3613 "sql.c"
+ yymsp[0].minor.yy421 = yylhsminor.yy421;
break;
case 218: /* having_opt ::= */
case 228: /* where_opt ::= */ yytestcase(yyruleno==228);
- case 271: /* expritem ::= */ yytestcase(yyruleno==271);
+ case 272: /* expritem ::= */ yytestcase(yyruleno==272);
#line 670 "sql.y"
-{yymsp[1].minor.yy260 = 0;}
-#line 3615 "sql.c"
+{yymsp[1].minor.yy439 = 0;}
+#line 3621 "sql.c"
break;
case 219: /* having_opt ::= HAVING expr */
case 229: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==229);
#line 671 "sql.y"
-{yymsp[-1].minor.yy260 = yymsp[0].minor.yy260;}
-#line 3621 "sql.c"
+{yymsp[-1].minor.yy439 = yymsp[0].minor.yy439;}
+#line 3627 "sql.c"
break;
case 220: /* limit_opt ::= */
case 224: /* slimit_opt ::= */ yytestcase(yyruleno==224);
#line 675 "sql.y"
-{yymsp[1].minor.yy404.limit = -1; yymsp[1].minor.yy404.offset = 0;}
-#line 3627 "sql.c"
+{yymsp[1].minor.yy166.limit = -1; yymsp[1].minor.yy166.offset = 0;}
+#line 3633 "sql.c"
break;
case 221: /* limit_opt ::= LIMIT signed */
case 225: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==225);
#line 676 "sql.y"
-{yymsp[-1].minor.yy404.limit = yymsp[0].minor.yy387; yymsp[-1].minor.yy404.offset = 0;}
-#line 3633 "sql.c"
+{yymsp[-1].minor.yy166.limit = yymsp[0].minor.yy325; yymsp[-1].minor.yy166.offset = 0;}
+#line 3639 "sql.c"
break;
case 222: /* limit_opt ::= LIMIT signed OFFSET signed */
#line 678 "sql.y"
-{ yymsp[-3].minor.yy404.limit = yymsp[-2].minor.yy387; yymsp[-3].minor.yy404.offset = yymsp[0].minor.yy387;}
-#line 3638 "sql.c"
+{ yymsp[-3].minor.yy166.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy166.offset = yymsp[0].minor.yy325;}
+#line 3644 "sql.c"
break;
case 223: /* limit_opt ::= LIMIT signed COMMA signed */
#line 680 "sql.y"
-{ yymsp[-3].minor.yy404.limit = yymsp[0].minor.yy387; yymsp[-3].minor.yy404.offset = yymsp[-2].minor.yy387;}
-#line 3643 "sql.c"
+{ yymsp[-3].minor.yy166.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy166.offset = yymsp[-2].minor.yy325;}
+#line 3649 "sql.c"
break;
case 226: /* slimit_opt ::= SLIMIT signed SOFFSET signed */
#line 686 "sql.y"
-{yymsp[-3].minor.yy404.limit = yymsp[-2].minor.yy387; yymsp[-3].minor.yy404.offset = yymsp[0].minor.yy387;}
-#line 3648 "sql.c"
+{yymsp[-3].minor.yy166.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy166.offset = yymsp[0].minor.yy325;}
+#line 3654 "sql.c"
break;
case 227: /* slimit_opt ::= SLIMIT signed COMMA signed */
#line 688 "sql.y"
-{yymsp[-3].minor.yy404.limit = yymsp[0].minor.yy387; yymsp[-3].minor.yy404.offset = yymsp[-2].minor.yy387;}
-#line 3653 "sql.c"
+{yymsp[-3].minor.yy166.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy166.offset = yymsp[-2].minor.yy325;}
+#line 3659 "sql.c"
break;
case 230: /* expr ::= LP expr RP */
#line 701 "sql.y"
-{yylhsminor.yy260 = yymsp[-1].minor.yy260; yylhsminor.yy260->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy260->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);}
-#line 3658 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = yymsp[-1].minor.yy439; yylhsminor.yy439->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy439->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);}
+#line 3664 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 231: /* expr ::= ID */
#line 703 "sql.y"
-{ yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);}
-#line 3664 "sql.c"
- yymsp[0].minor.yy260 = yylhsminor.yy260;
+{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);}
+#line 3670 "sql.c"
+ yymsp[0].minor.yy439 = yylhsminor.yy439;
break;
case 232: /* expr ::= ID DOT ID */
#line 704 "sql.y"
-{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);}
-#line 3670 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);}
+#line 3676 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 233: /* expr ::= ID DOT STAR */
#line 705 "sql.y"
-{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);}
-#line 3676 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);}
+#line 3682 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 234: /* expr ::= INTEGER */
#line 707 "sql.y"
-{ yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);}
-#line 3682 "sql.c"
- yymsp[0].minor.yy260 = yylhsminor.yy260;
+{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);}
+#line 3688 "sql.c"
+ yymsp[0].minor.yy439 = yylhsminor.yy439;
break;
case 235: /* expr ::= MINUS INTEGER */
case 236: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==236);
#line 708 "sql.y"
-{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);}
-#line 3689 "sql.c"
- yymsp[-1].minor.yy260 = yylhsminor.yy260;
+{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);}
+#line 3695 "sql.c"
+ yymsp[-1].minor.yy439 = yylhsminor.yy439;
break;
case 237: /* expr ::= FLOAT */
#line 710 "sql.y"
-{ yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);}
-#line 3695 "sql.c"
- yymsp[0].minor.yy260 = yylhsminor.yy260;
+{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);}
+#line 3701 "sql.c"
+ yymsp[0].minor.yy439 = yylhsminor.yy439;
break;
case 238: /* expr ::= MINUS FLOAT */
case 239: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==239);
#line 711 "sql.y"
-{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);}
-#line 3702 "sql.c"
- yymsp[-1].minor.yy260 = yylhsminor.yy260;
+{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);}
+#line 3708 "sql.c"
+ yymsp[-1].minor.yy439 = yylhsminor.yy439;
break;
case 240: /* expr ::= STRING */
#line 713 "sql.y"
-{ yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);}
-#line 3708 "sql.c"
- yymsp[0].minor.yy260 = yylhsminor.yy260;
+{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);}
+#line 3714 "sql.c"
+ yymsp[0].minor.yy439 = yylhsminor.yy439;
break;
case 241: /* expr ::= NOW */
#line 714 "sql.y"
-{ yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); }
-#line 3714 "sql.c"
- yymsp[0].minor.yy260 = yylhsminor.yy260;
+{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); }
+#line 3720 "sql.c"
+ yymsp[0].minor.yy439 = yylhsminor.yy439;
break;
case 242: /* expr ::= VARIABLE */
#line 715 "sql.y"
-{ yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);}
-#line 3720 "sql.c"
- yymsp[0].minor.yy260 = yylhsminor.yy260;
+{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);}
+#line 3726 "sql.c"
+ yymsp[0].minor.yy439 = yylhsminor.yy439;
break;
case 243: /* expr ::= PLUS VARIABLE */
case 244: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==244);
#line 716 "sql.y"
-{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);}
-#line 3727 "sql.c"
- yymsp[-1].minor.yy260 = yylhsminor.yy260;
+{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);}
+#line 3733 "sql.c"
+ yymsp[-1].minor.yy439 = yylhsminor.yy439;
break;
case 245: /* expr ::= BOOL */
#line 718 "sql.y"
-{ yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);}
-#line 3733 "sql.c"
- yymsp[0].minor.yy260 = yylhsminor.yy260;
+{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);}
+#line 3739 "sql.c"
+ yymsp[0].minor.yy439 = yylhsminor.yy439;
break;
case 246: /* expr ::= NULL */
#line 719 "sql.y"
-{ yylhsminor.yy260 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);}
-#line 3739 "sql.c"
- yymsp[0].minor.yy260 = yylhsminor.yy260;
+{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);}
+#line 3745 "sql.c"
+ yymsp[0].minor.yy439 = yylhsminor.yy439;
break;
case 247: /* expr ::= ID LP exprlist RP */
#line 722 "sql.y"
-{ tStrTokenAppend(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy260 = tSqlExprCreateFunction(yymsp[-1].minor.yy403, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
-#line 3745 "sql.c"
- yymsp[-3].minor.yy260 = yylhsminor.yy260;
+{ tStrTokenAppend(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy439 = tSqlExprCreateFunction(yymsp[-1].minor.yy421, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
+#line 3751 "sql.c"
+ yymsp[-3].minor.yy439 = yylhsminor.yy439;
break;
case 248: /* expr ::= ID LP STAR RP */
#line 725 "sql.y"
-{ tStrTokenAppend(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy260 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
-#line 3751 "sql.c"
- yymsp[-3].minor.yy260 = yylhsminor.yy260;
+{ tStrTokenAppend(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy439 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
+#line 3757 "sql.c"
+ yymsp[-3].minor.yy439 = yylhsminor.yy439;
break;
case 249: /* expr ::= expr IS NULL */
#line 728 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, NULL, TK_ISNULL);}
-#line 3757 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, NULL, TK_ISNULL);}
+#line 3763 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 250: /* expr ::= expr IS NOT NULL */
#line 729 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-3].minor.yy260, NULL, TK_NOTNULL);}
-#line 3763 "sql.c"
- yymsp[-3].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-3].minor.yy439, NULL, TK_NOTNULL);}
+#line 3769 "sql.c"
+ yymsp[-3].minor.yy439 = yylhsminor.yy439;
break;
case 251: /* expr ::= expr LT expr */
#line 732 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_LT);}
-#line 3769 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_LT);}
+#line 3775 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 252: /* expr ::= expr GT expr */
#line 733 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_GT);}
-#line 3775 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_GT);}
+#line 3781 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 253: /* expr ::= expr LE expr */
#line 734 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_LE);}
-#line 3781 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_LE);}
+#line 3787 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 254: /* expr ::= expr GE expr */
#line 735 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_GE);}
-#line 3787 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_GE);}
+#line 3793 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 255: /* expr ::= expr NE expr */
#line 736 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_NE);}
-#line 3793 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_NE);}
+#line 3799 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 256: /* expr ::= expr EQ expr */
#line 737 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_EQ);}
-#line 3799 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_EQ);}
+#line 3805 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 257: /* expr ::= expr BETWEEN expr AND expr */
#line 739 "sql.y"
-{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy260); yylhsminor.yy260 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy260, yymsp[-2].minor.yy260, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy260, TK_LE), TK_AND);}
-#line 3805 "sql.c"
- yymsp[-4].minor.yy260 = yylhsminor.yy260;
+{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy439); yylhsminor.yy439 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy439, yymsp[-2].minor.yy439, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy439, TK_LE), TK_AND);}
+#line 3811 "sql.c"
+ yymsp[-4].minor.yy439 = yylhsminor.yy439;
break;
case 258: /* expr ::= expr AND expr */
#line 741 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_AND);}
-#line 3811 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_AND);}
+#line 3817 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 259: /* expr ::= expr OR expr */
#line 742 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_OR); }
-#line 3817 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_OR); }
+#line 3823 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 260: /* expr ::= expr PLUS expr */
#line 745 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_PLUS); }
-#line 3823 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_PLUS); }
+#line 3829 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 261: /* expr ::= expr MINUS expr */
#line 746 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_MINUS); }
-#line 3829 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_MINUS); }
+#line 3835 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 262: /* expr ::= expr STAR expr */
#line 747 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_STAR); }
-#line 3835 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_STAR); }
+#line 3841 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 263: /* expr ::= expr SLASH expr */
#line 748 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_DIVIDE);}
-#line 3841 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_DIVIDE);}
+#line 3847 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 264: /* expr ::= expr REM expr */
#line 749 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_REM); }
-#line 3847 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_REM); }
+#line 3853 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 265: /* expr ::= expr LIKE expr */
#line 752 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_LIKE); }
-#line 3853 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_LIKE); }
+#line 3859 "sql.c"
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
case 266: /* expr ::= expr MATCH expr */
#line 755 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-2].minor.yy260, yymsp[0].minor.yy260, TK_MATCH); }
-#line 3859 "sql.c"
- yymsp[-2].minor.yy260 = yylhsminor.yy260;
- break;
- case 267: /* expr ::= expr IN LP exprlist RP */
-#line 758 "sql.y"
-{yylhsminor.yy260 = tSqlExprCreate(yymsp[-4].minor.yy260, (tSqlExpr*)yymsp[-1].minor.yy403, TK_IN); }
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_MATCH); }
#line 3865 "sql.c"
- yymsp[-4].minor.yy260 = yylhsminor.yy260;
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
- case 268: /* exprlist ::= exprlist COMMA expritem */
-#line 766 "sql.y"
-{yylhsminor.yy403 = tSqlExprListAppend(yymsp[-2].minor.yy403,yymsp[0].minor.yy260,0, 0);}
+ case 267: /* expr ::= expr NMATCH expr */
+#line 756 "sql.y"
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_NMATCH); }
#line 3871 "sql.c"
- yymsp[-2].minor.yy403 = yylhsminor.yy403;
+ yymsp[-2].minor.yy439 = yylhsminor.yy439;
break;
- case 269: /* exprlist ::= expritem */
-#line 767 "sql.y"
-{yylhsminor.yy403 = tSqlExprListAppend(0,yymsp[0].minor.yy260,0, 0);}
+ case 268: /* expr ::= expr IN LP exprlist RP */
+#line 759 "sql.y"
+{yylhsminor.yy439 = tSqlExprCreate(yymsp[-4].minor.yy439, (tSqlExpr*)yymsp[-1].minor.yy421, TK_IN); }
#line 3877 "sql.c"
- yymsp[0].minor.yy403 = yylhsminor.yy403;
+ yymsp[-4].minor.yy439 = yylhsminor.yy439;
break;
- case 270: /* expritem ::= expr */
-#line 768 "sql.y"
-{yylhsminor.yy260 = yymsp[0].minor.yy260;}
+ case 269: /* exprlist ::= exprlist COMMA expritem */
+#line 767 "sql.y"
+{yylhsminor.yy421 = tSqlExprListAppend(yymsp[-2].minor.yy421,yymsp[0].minor.yy439,0, 0);}
#line 3883 "sql.c"
- yymsp[0].minor.yy260 = yylhsminor.yy260;
+ yymsp[-2].minor.yy421 = yylhsminor.yy421;
break;
- case 272: /* cmd ::= RESET QUERY CACHE */
-#line 772 "sql.y"
-{ setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
+ case 270: /* exprlist ::= expritem */
+#line 768 "sql.y"
+{yylhsminor.yy421 = tSqlExprListAppend(0,yymsp[0].minor.yy439,0, 0);}
#line 3889 "sql.c"
+ yymsp[0].minor.yy421 = yylhsminor.yy421;
+ break;
+ case 271: /* expritem ::= expr */
+#line 769 "sql.y"
+{yylhsminor.yy439 = yymsp[0].minor.yy439;}
+#line 3895 "sql.c"
+ yymsp[0].minor.yy439 = yylhsminor.yy439;
+ break;
+ case 273: /* cmd ::= RESET QUERY CACHE */
+#line 773 "sql.y"
+{ setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
+#line 3901 "sql.c"
break;
- case 273: /* cmd ::= SYNCDB ids REPLICA */
-#line 775 "sql.y"
+ case 274: /* cmd ::= SYNCDB ids REPLICA */
+#line 776 "sql.y"
{ setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);}
-#line 3894 "sql.c"
+#line 3906 "sql.c"
break;
- case 274: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
-#line 778 "sql.y"
+ case 275: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+#line 779 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy403, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 3903 "sql.c"
+#line 3915 "sql.c"
break;
- case 275: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
-#line 784 "sql.y"
+ case 276: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+#line 785 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -3912,28 +3924,28 @@ static YYACTIONTYPE yy_reduce(
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 3916 "sql.c"
+#line 3928 "sql.c"
break;
- case 276: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
-#line 794 "sql.y"
+ case 277: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
+#line 795 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy403, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 3925 "sql.c"
+#line 3937 "sql.c"
break;
- case 277: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
-#line 801 "sql.y"
+ case 278: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+#line 802 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy403, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 3934 "sql.c"
+#line 3946 "sql.c"
break;
- case 278: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
-#line 806 "sql.y"
+ case 279: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+#line 807 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -3943,10 +3955,10 @@ static YYACTIONTYPE yy_reduce(
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 3947 "sql.c"
+#line 3959 "sql.c"
break;
- case 279: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
-#line 816 "sql.y"
+ case 280: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+#line 817 "sql.y"
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
@@ -3959,42 +3971,42 @@ static YYACTIONTYPE yy_reduce(
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 3963 "sql.c"
+#line 3975 "sql.c"
break;
- case 280: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
-#line 829 "sql.y"
+ case 281: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+#line 830 "sql.y"
{
yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
toTSDBType(yymsp[-2].minor.yy0.type);
SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
- A = tVariantListAppend(A, &yymsp[0].minor.yy488, -1);
+ A = tVariantListAppend(A, &yymsp[0].minor.yy430, -1);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 3977 "sql.c"
+#line 3989 "sql.c"
break;
- case 281: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
-#line 840 "sql.y"
+ case 282: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
+#line 841 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy403, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 3986 "sql.c"
+#line 3998 "sql.c"
break;
- case 282: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
-#line 847 "sql.y"
+ case 283: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+#line 848 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy403, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 3995 "sql.c"
+#line 4007 "sql.c"
break;
- case 283: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
-#line 853 "sql.y"
+ case 284: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+#line 854 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -4004,28 +4016,28 @@ static YYACTIONTYPE yy_reduce(
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 4008 "sql.c"
+#line 4020 "sql.c"
break;
- case 284: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
-#line 863 "sql.y"
+ case 285: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
+#line 864 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy403, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 4017 "sql.c"
+#line 4029 "sql.c"
break;
- case 285: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
-#line 870 "sql.y"
+ case 286: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+#line 871 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy403, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 4026 "sql.c"
+#line 4038 "sql.c"
break;
- case 286: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
-#line 875 "sql.y"
+ case 287: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+#line 876 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -4035,10 +4047,10 @@ static YYACTIONTYPE yy_reduce(
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 4039 "sql.c"
+#line 4051 "sql.c"
break;
- case 287: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
-#line 885 "sql.y"
+ case 288: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+#line 886 "sql.y"
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
@@ -4051,45 +4063,45 @@ static YYACTIONTYPE yy_reduce(
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 4055 "sql.c"
+#line 4067 "sql.c"
break;
- case 288: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
-#line 898 "sql.y"
+ case 289: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
+#line 899 "sql.y"
{
yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
toTSDBType(yymsp[-2].minor.yy0.type);
SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
- A = tVariantListAppend(A, &yymsp[0].minor.yy488, -1);
+ A = tVariantListAppend(A, &yymsp[0].minor.yy430, -1);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 4069 "sql.c"
+#line 4081 "sql.c"
break;
- case 289: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
-#line 909 "sql.y"
+ case 290: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
+#line 910 "sql.y"
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy403, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
-#line 4078 "sql.c"
+#line 4090 "sql.c"
break;
- case 290: /* cmd ::= KILL CONNECTION INTEGER */
-#line 916 "sql.y"
+ case 291: /* cmd ::= KILL CONNECTION INTEGER */
+#line 917 "sql.y"
{setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);}
-#line 4083 "sql.c"
+#line 4095 "sql.c"
break;
- case 291: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
-#line 917 "sql.y"
+ case 292: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
+#line 918 "sql.y"
{yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);}
-#line 4088 "sql.c"
+#line 4100 "sql.c"
break;
- case 292: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
-#line 918 "sql.y"
+ case 293: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
+#line 919 "sql.y"
{yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);}
-#line 4093 "sql.c"
+#line 4105 "sql.c"
break;
default:
break;
@@ -4174,7 +4186,7 @@ static void yy_syntax_error(
}
assert(len <= outputBufLen);
-#line 4178 "sql.c"
+#line 4190 "sql.c"
/************ End %syntax_error code ******************************************/
ParseARG_STORE /* Suppress warning about unused %extra_argument variable */
ParseCTX_STORE
@@ -4201,7 +4213,7 @@ static void yy_accept(
** parser accepts */
/*********** Begin %parse_accept code *****************************************/
#line 61 "sql.y"
-#line 4205 "sql.c"
+#line 4217 "sql.c"
/*********** End %parse_accept code *******************************************/
ParseARG_STORE /* Suppress warning about unused %extra_argument variable */
ParseCTX_STORE
diff --git a/src/query/tests/CMakeLists.txt b/src/query/tests/CMakeLists.txt
index 349d511f1570e3df835494ebd4e3e86d7795c873..8c4b9c2e6a2e9a5f6835baf411ecc94e6889fcbe 100644
--- a/src/query/tests/CMakeLists.txt
+++ b/src/query/tests/CMakeLists.txt
@@ -18,7 +18,7 @@ IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
ADD_EXECUTABLE(queryTest ${SOURCE_LIST})
- TARGET_LINK_LIBRARIES(queryTest taos query gtest pthread)
+ TARGET_LINK_LIBRARIES(queryTest taos cJson query gtest pthread)
ENDIF()
SET_SOURCE_FILES_PROPERTIES(./astTest.cpp PROPERTIES COMPILE_FLAGS -w)
diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index e958a8e5ec5b6542d609028ee052d21a9a84d397..9ea5fd539244820f111a3fbb3c60aee088e727c5 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -407,7 +407,7 @@ void rpcSendRequest(void *shandle, const SRpcEpSet *pEpSet, SRpcMsg *pMsg, int64
if (type == TSDB_MSG_TYPE_QUERY || type == TSDB_MSG_TYPE_CM_RETRIEVE
|| type == TSDB_MSG_TYPE_FETCH || type == TSDB_MSG_TYPE_CM_STABLE_VGROUP
|| type == TSDB_MSG_TYPE_CM_TABLES_META || type == TSDB_MSG_TYPE_CM_TABLE_META
- || type == TSDB_MSG_TYPE_CM_SHOW || type == TSDB_MSG_TYPE_DM_STATUS)
+ || type == TSDB_MSG_TYPE_CM_SHOW || type == TSDB_MSG_TYPE_DM_STATUS || type == TSDB_MSG_TYPE_CM_ALTER_TABLE)
pContext->connType = RPC_CONN_TCPC;
pContext->rid = taosAddRef(tsRpcRefId, pContext);
diff --git a/src/tsdb/CMakeLists.txt b/src/tsdb/CMakeLists.txt
index c5b77df5a25f9f0b1e9294228520f171b9befddd..efbed6f0a6e8218c3a0b46d2913f6a792bf48ce4 100644
--- a/src/tsdb/CMakeLists.txt
+++ b/src/tsdb/CMakeLists.txt
@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
PROJECT(TDengine)
INCLUDE_DIRECTORIES(inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
AUX_SOURCE_DIRECTORY(src SRC)
ADD_LIBRARY(tsdb ${SRC})
TARGET_LINK_LIBRARIES(tsdb tfs common tutil)
diff --git a/src/tsdb/inc/tsdbBuffer.h b/src/tsdb/inc/tsdbBuffer.h
index ec6b057aef142fb938993b3a27717c5e64937258..4b650d3993a54f6a98caf00a3605feb37e972ebd 100644
--- a/src/tsdb/inc/tsdbBuffer.h
+++ b/src/tsdb/inc/tsdbBuffer.h
@@ -29,6 +29,7 @@ typedef struct {
int tBufBlocks;
int nBufBlocks;
int nRecycleBlocks;
+ int nElasticBlocks;
int64_t index;
SList* bufBlockList;
} STsdbBufPool;
@@ -41,6 +42,10 @@ int tsdbOpenBufPool(STsdbRepo* pRepo);
void tsdbCloseBufPool(STsdbRepo* pRepo);
SListNode* tsdbAllocBufBlockFromPool(STsdbRepo* pRepo);
int tsdbExpandPool(STsdbRepo* pRepo, int32_t oldTotalBlocks);
-void tsdbRecycleBufferBlock(STsdbBufPool* pPool, SListNode *pNode);
+void tsdbRecycleBufferBlock(STsdbBufPool* pPool, SListNode *pNode, bool bELastic);
+
+// health cite
+STsdbBufBlock *tsdbNewBufBlock(int bufBlockSize);
+void tsdbFreeBufBlock(STsdbBufBlock *pBufBlock);
#endif /* _TD_TSDB_BUFFER_H_ */
diff --git a/src/tsdb/inc/tsdbHealth.h b/src/tsdb/inc/tsdbHealth.h
new file mode 100644
index 0000000000000000000000000000000000000000..324f4312e05fc0ca0200c319728bf692bf476bf6
--- /dev/null
+++ b/src/tsdb/inc/tsdbHealth.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#ifndef _TD_TSDB_HEALTH_H_
+#define _TD_TSDB_HEALTH_H_
+
+bool tsdbUrgeQueryFree(STsdbRepo* pRepo);
+int32_t tsdbInsertNewBlock(STsdbRepo* pRepo);
+
+bool tsdbIdleMemEnough();
+bool tsdbAllowNewBlock(STsdbRepo* pRepo);
+
+#endif /* _TD_TSDB_BUFFER_H_ */
diff --git a/src/tsdb/inc/tsdbMeta.h b/src/tsdb/inc/tsdbMeta.h
index 51801c843c279f10e9e0895a0f2dee2839a3f6a2..8ce5e7ade80b2006ac8c39fec178994073c5a26d 100644
--- a/src/tsdb/inc/tsdbMeta.h
+++ b/src/tsdb/inc/tsdbMeta.h
@@ -100,7 +100,7 @@ static FORCE_INLINE int tsdbCompareSchemaVersion(const void *key1, const void *k
}
static FORCE_INLINE STSchema* tsdbGetTableSchemaImpl(STable* pTable, bool lock, bool copy, int16_t _version) {
- STable* pDTable = (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE) ? pTable->pSuper : pTable;
+ STable* pDTable = (pTable->pSuper != NULL) ? pTable->pSuper : pTable; // for performance purpose
STSchema* pSchema = NULL;
STSchema* pTSchema = NULL;
diff --git a/src/tsdb/inc/tsdbint.h b/src/tsdb/inc/tsdbint.h
index 532907ae01be576e40feea2969761846f07170b3..80e92975799f47d68ff72ef80a52efb6fe901b5e 100644
--- a/src/tsdb/inc/tsdbint.h
+++ b/src/tsdb/inc/tsdbint.h
@@ -97,6 +97,7 @@ struct STsdbRepo {
SMergeBuf mergeBuf; //used when update=2
int8_t compactState; // compact state: inCompact/noCompact/waitingCompact?
+ pthread_t* pthread;
};
#define REPO_ID(r) (r)->config.tsdbId
diff --git a/src/tsdb/src/tsdbBuffer.c b/src/tsdb/src/tsdbBuffer.c
index e675bf6f9de04021112d43a1db70cf56cf430f08..70589031f6516a129a5a683b0e76edb23b814e15 100644
--- a/src/tsdb/src/tsdbBuffer.c
+++ b/src/tsdb/src/tsdbBuffer.c
@@ -14,12 +14,10 @@
*/
#include "tsdbint.h"
+#include "tsdbHealth.h"
#define POOL_IS_EMPTY(b) (listNEles((b)->bufBlockList) == 0)
-static STsdbBufBlock *tsdbNewBufBlock(int bufBlockSize);
-static void tsdbFreeBufBlock(STsdbBufBlock *pBufBlock);
-
// ---------------- INTERNAL FUNCTIONS ----------------
STsdbBufPool *tsdbNewBufPool() {
STsdbBufPool *pBufPool = (STsdbBufPool *)calloc(1, sizeof(*pBufPool));
@@ -65,10 +63,10 @@ int tsdbOpenBufPool(STsdbRepo *pRepo) {
STsdbBufPool *pPool = pRepo->pPool;
ASSERT(pPool != NULL);
-
pPool->bufBlockSize = pCfg->cacheBlockSize * 1024 * 1024; // MB
pPool->tBufBlocks = pCfg->totalBlocks;
pPool->nBufBlocks = 0;
+ pPool->nElasticBlocks = 0;
pPool->index = 0;
pPool->nRecycleBlocks = 0;
@@ -120,6 +118,18 @@ SListNode *tsdbAllocBufBlockFromPool(STsdbRepo *pRepo) {
STsdbBufPool *pBufPool = pRepo->pPool;
while (POOL_IS_EMPTY(pBufPool)) {
+ if(tsDeadLockKillQuery) {
+ // supply new Block
+ if(tsdbInsertNewBlock(pRepo) > 0) {
+ tsdbWarn("vgId:%d add new elastic block . elasticBlocks=%d cur free Blocks=%d", REPO_ID(pRepo), pBufPool->nElasticBlocks, pBufPool->bufBlockList->numOfEles);
+ break;
+ } else {
+ // no newBlock, kill query free
+ if(!tsdbUrgeQueryFree(pRepo))
+ tsdbWarn("vgId:%d Urge query free thread start failed.", REPO_ID(pRepo));
+ }
+ }
+
pRepo->repoLocked = false;
pthread_cond_wait(&(pBufPool->poolNotEmpty), &(pRepo->mutex));
pRepo->repoLocked = true;
@@ -139,11 +149,11 @@ SListNode *tsdbAllocBufBlockFromPool(STsdbRepo *pRepo) {
}
// ---------------- LOCAL FUNCTIONS ----------------
-static STsdbBufBlock *tsdbNewBufBlock(int bufBlockSize) {
+STsdbBufBlock *tsdbNewBufBlock(int bufBlockSize) {
STsdbBufBlock *pBufBlock = (STsdbBufBlock *)malloc(sizeof(*pBufBlock) + bufBlockSize);
if (pBufBlock == NULL) {
terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
- goto _err;
+ return NULL;
}
pBufBlock->blockId = 0;
@@ -151,13 +161,9 @@ static STsdbBufBlock *tsdbNewBufBlock(int bufBlockSize) {
pBufBlock->remain = bufBlockSize;
return pBufBlock;
-
-_err:
- tsdbFreeBufBlock(pBufBlock);
- return NULL;
}
-static void tsdbFreeBufBlock(STsdbBufBlock *pBufBlock) { tfree(pBufBlock); }
+ void tsdbFreeBufBlock(STsdbBufBlock *pBufBlock) { tfree(pBufBlock); }
int tsdbExpandPool(STsdbRepo* pRepo, int32_t oldTotalBlocks) {
if (oldTotalBlocks == pRepo->config.totalBlocks) {
@@ -193,10 +199,16 @@ err:
return err;
}
-void tsdbRecycleBufferBlock(STsdbBufPool* pPool, SListNode *pNode) {
+void tsdbRecycleBufferBlock(STsdbBufPool* pPool, SListNode *pNode, bool bELastic) {
STsdbBufBlock *pBufBlock = NULL;
tdListNodeGetData(pPool->bufBlockList, pNode, (void *)(&pBufBlock));
tsdbFreeBufBlock(pBufBlock);
free(pNode);
- pPool->nBufBlocks--;
-}
+ if(bELastic)
+ {
+ pPool->nElasticBlocks--;
+ tsdbWarn("pPool=%p elastic block reduce one . nElasticBlocks=%d cur free Blocks=%d", pPool, pPool->nElasticBlocks, pPool->bufBlockList->numOfEles);
+ }
+ else
+ pPool->nBufBlocks--;
+}
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbHealth.c b/src/tsdb/src/tsdbHealth.c
new file mode 100644
index 0000000000000000000000000000000000000000..8198c480334912b1ce373ceca7b82409f5a644f2
--- /dev/null
+++ b/src/tsdb/src/tsdbHealth.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#include "os.h"
+#include "taosmsg.h"
+#include "tarray.h"
+#include "query.h"
+#include "tglobal.h"
+#include "tlist.h"
+#include "tsdbint.h"
+#include "tsdbBuffer.h"
+#include "tsdbLog.h"
+#include "tsdbHealth.h"
+#include "ttimer.h"
+#include "tthread.h"
+
+
+// return malloc new block count
+int32_t tsdbInsertNewBlock(STsdbRepo * pRepo) {
+ STsdbBufPool *pPool = pRepo->pPool;
+ int32_t cnt = 0;
+
+ if(tsdbAllowNewBlock(pRepo)) {
+ STsdbBufBlock *pBufBlock = tsdbNewBufBlock(pPool->bufBlockSize);
+ if (pBufBlock) {
+ if (tdListAppend(pPool->bufBlockList, (void *)(&pBufBlock)) < 0) {
+ // append error
+ tsdbFreeBufBlock(pBufBlock);
+ } else {
+ pPool->nElasticBlocks ++;
+ cnt ++ ;
+ }
+ }
+ }
+ return cnt;
+}
+
+// switch anther thread to run
+void* cbKillQueryFree(void* param) {
+ STsdbRepo* pRepo = (STsdbRepo*)param;
+ // vnode
+ if(pRepo->appH.notifyStatus) {
+ pRepo->appH.notifyStatus(pRepo->appH.appH, TSDB_STATUS_COMMIT_NOBLOCK, TSDB_CODE_SUCCESS);
+ }
+
+ // free
+ if(pRepo->pthread){
+ void* p = pRepo->pthread;
+ pRepo->pthread = NULL;
+ free(p);
+ }
+
+ return NULL;
+}
+
+// return true do free , false do nothing
+bool tsdbUrgeQueryFree(STsdbRepo * pRepo) {
+ // check previous running
+ if(pRepo->pthread && taosThreadRunning(pRepo->pthread)) {
+ tsdbWarn("vgId:%d pre urge thread is runing. nBlocks=%d nElasticBlocks=%d", REPO_ID(pRepo), pRepo->pPool->nBufBlocks, pRepo->pPool->nElasticBlocks);
+ return false;
+ }
+ // create new
+ pRepo->pthread = taosCreateThread(cbKillQueryFree, pRepo);
+ if(pRepo->pthread == NULL) {
+ tsdbError("vgId:%d create urge thread error.", REPO_ID(pRepo));
+ return false;
+ }
+ return true;
+}
+
+bool tsdbAllowNewBlock(STsdbRepo* pRepo) {
+ int32_t nMaxElastic = pRepo->config.totalBlocks/3;
+ STsdbBufPool* pPool = pRepo->pPool;
+ if(pPool->nElasticBlocks >= nMaxElastic) {
+ tsdbWarn("vgId:%d tsdbAllowNewBlock return fasle. nElasticBlock(%d) >= MaxElasticBlocks(%d)", REPO_ID(pRepo), pPool->nElasticBlocks, nMaxElastic);
+ return false;
+ }
+ return true;
+}
+
+bool tsdbNoProblem(STsdbRepo* pRepo) {
+ if(listNEles(pRepo->pPool->bufBlockList) == 0)
+ return false;
+ return true;
+}
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index b2e6fe89161d0e9bceaf74a46807f51ec402fb2a..c2021963e0d0c8be4ed42588549153dcd20be63c 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -16,6 +16,8 @@
// no test file errors here
#include "taosdef.h"
#include "tsdbint.h"
+#include "ttimer.h"
+#include "tthread.h"
#define IS_VALID_PRECISION(precision) \
(((precision) >= TSDB_TIME_PRECISION_MILLI) && ((precision) <= TSDB_TIME_PRECISION_NANO))
@@ -126,6 +128,10 @@ int tsdbCloseRepo(STsdbRepo *repo, int toCommit) {
terrno = TSDB_CODE_SUCCESS;
tsdbStopStream(pRepo);
+ if(pRepo->pthread){
+ taosDestoryThread(pRepo->pthread);
+ pRepo->pthread = NULL;
+ }
if (toCommit) {
tsdbSyncCommit(repo);
@@ -547,6 +553,7 @@ static STsdbRepo *tsdbNewRepo(STsdbCfg *pCfg, STsdbAppH *pAppH) {
pRepo->appH = *pAppH;
}
pRepo->repoLocked = false;
+ pRepo->pthread = NULL;
int code = pthread_mutex_init(&(pRepo->mutex), NULL);
if (code != 0) {
diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
index e766d97a97a5905db87691426d282a219eef9d68..3890dca5b96c26009dcf3ca72205ca4b1725aa29 100644
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -99,17 +99,22 @@ int tsdbUnRefMemTable(STsdbRepo *pRepo, SMemTable *pMemTable) {
STsdbBufPool *pBufPool = pRepo->pPool;
SListNode *pNode = NULL;
- bool recycleBlocks = pBufPool->nRecycleBlocks > 0;
+ bool addNew = false;
if (tsdbLockRepo(pRepo) < 0) return -1;
while ((pNode = tdListPopHead(pMemTable->bufBlockList)) != NULL) {
if (pBufPool->nRecycleBlocks > 0) {
- tsdbRecycleBufferBlock(pBufPool, pNode);
+ tsdbRecycleBufferBlock(pBufPool, pNode, false);
pBufPool->nRecycleBlocks -= 1;
} else {
- tdListAppendNode(pBufPool->bufBlockList, pNode);
+ if(pBufPool->nElasticBlocks > 0 && listNEles(pBufPool->bufBlockList) > 2) {
+ tsdbRecycleBufferBlock(pBufPool, pNode, true);
+ } else {
+ tdListAppendNode(pBufPool->bufBlockList, pNode);
+ addNew = true;
+ }
}
}
- if (!recycleBlocks) {
+ if (addNew) {
int code = pthread_cond_signal(&pBufPool->poolNotEmpty);
if (code != 0) {
if (tsdbUnlockRepo(pRepo) < 0) return -1;
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index c1b935e0ee3cdbd3177710fbddf8994283319b36..4aab9dff7debc0b0f193e38d77222f1752196c65 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -25,6 +25,7 @@
#include "tlosertree.h"
#include "tsdbint.h"
#include "texpr.h"
+#include "qFilter.h"
#define EXTRA_BYTES 2
#define ASCENDING_TRAVERSE(o) (o == TSDB_ORDER_ASC)
@@ -167,6 +168,7 @@ static int32_t doGetExternalRow(STsdbQueryHandle* pQueryHandle, int16_t type, SM
static void* doFreeColumnInfoData(SArray* pColumnInfoData);
static void* destroyTableCheckInfo(SArray* pTableCheckInfo);
static bool tsdbGetExternalRow(TsdbQueryHandleT pHandle);
+static int32_t tsdbQueryTableList(STable* pTable, SArray* pRes, void* filterInfo);
static void tsdbInitDataBlockLoadInfo(SDataBlockLoadInfo* pBlockLoadInfo) {
pBlockLoadInfo->slot = -1;
@@ -288,8 +290,6 @@ static SArray* createCheckInfoFromTableGroup(STsdbQueryHandle* pQueryHandle, STa
STableKeyInfo* pKeyInfo = (STableKeyInfo*) taosArrayGet(group, j);
STableCheckInfo info = { .lastKey = pKeyInfo->lastKey, .pTableObj = pKeyInfo->pTable };
- info.tableId = ((STable*)(pKeyInfo->pTable))->tableId;
-
assert(info.pTableObj != NULL && (info.pTableObj->type == TSDB_NORMAL_TABLE ||
info.pTableObj->type == TSDB_CHILD_TABLE || info.pTableObj->type == TSDB_STREAM_TABLE));
@@ -2218,7 +2218,7 @@ static int32_t createDataBlocksInfo(STsdbQueryHandle* pQueryHandle, int32_t numO
SBlock* pBlock = pTableCheck->pCompInfo->blocks;
sup.numOfBlocksPerTable[numOfQualTables] = pTableCheck->numOfBlocks;
- char* buf = calloc(1, sizeof(STableBlockInfo) * pTableCheck->numOfBlocks);
+ char* buf = malloc(sizeof(STableBlockInfo) * pTableCheck->numOfBlocks);
if (buf == NULL) {
cleanBlockOrderSupporter(&sup, numOfQualTables);
return TSDB_CODE_TDB_OUT_OF_MEMORY;
@@ -2690,21 +2690,6 @@ static int32_t getAllTableList(STable* pSuperTable, SArray* list) {
return TSDB_CODE_SUCCESS;
}
-static void destroyHelper(void* param) {
- if (param == NULL) {
- return;
- }
-
- tQueryInfo* pInfo = (tQueryInfo*)param;
- if (pInfo->optr != TSDB_RELATION_IN) {
- tfree(pInfo->q);
- } else {
- taosHashCleanup((SHashObj *)(pInfo->q));
- }
-
- free(param);
-}
-
static bool loadBlockOfActiveTable(STsdbQueryHandle* pQueryHandle) {
if (pQueryHandle->checkFiles) {
// check if the query range overlaps with the file data block
@@ -3618,8 +3603,6 @@ SArray* createTableGroup(SArray* pTableList, STSchema* pTagSchema, SColIndex* pC
for(int32_t i = 0; i < size; ++i) {
STableKeyInfo *pKeyInfo = taosArrayGet(pTableList, i);
- assert(((STable*)pKeyInfo->pTable)->type == TSDB_CHILD_TABLE);
-
tsdbRefTable(pKeyInfo->pTable);
STableKeyInfo info = {.pTable = pKeyInfo->pTable, .lastKey = skey};
@@ -3641,106 +3624,8 @@ SArray* createTableGroup(SArray* pTableList, STSchema* pTagSchema, SColIndex* pC
return pTableGroup;
}
-static bool tableFilterFp(const void* pNode, void* param) {
- tQueryInfo* pInfo = (tQueryInfo*) param;
-
- STable* pTable = (STable*)(SL_GET_NODE_DATA((SSkipListNode*)pNode));
-
- char* val = NULL;
- if (pInfo->sch.colId == TSDB_TBNAME_COLUMN_INDEX) {
- val = (char*) TABLE_NAME(pTable);
- } else {
- val = tdGetKVRowValOfCol(pTable->tagVal, pInfo->sch.colId);
- }
-
- if (pInfo->optr == TSDB_RELATION_ISNULL || pInfo->optr == TSDB_RELATION_NOTNULL) {
- if (pInfo->optr == TSDB_RELATION_ISNULL) {
- return (val == NULL) || isNull(val, pInfo->sch.type);
- } else if (pInfo->optr == TSDB_RELATION_NOTNULL) {
- return (val != NULL) && (!isNull(val, pInfo->sch.type));
- }
- } else if (pInfo->optr == TSDB_RELATION_IN) {
- int type = pInfo->sch.type;
- if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) {
- int64_t v;
- GET_TYPED_DATA(v, int64_t, pInfo->sch.type, val);
- return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v));
- } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
- uint64_t v;
- GET_TYPED_DATA(v, uint64_t, pInfo->sch.type, val);
- return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v));
- }
- else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) {
- double v;
- GET_TYPED_DATA(v, double, pInfo->sch.type, val);
- return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v));
- } else if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR){
- return NULL != taosHashGet((SHashObj *)pInfo->q, varDataVal(val), varDataLen(val));
- }
-
- }
-
- int32_t ret = 0;
- if (val == NULL) { //the val is possible to be null, so check it out carefully
- ret = -1; // val is missing in table tags value pairs
- } else {
- ret = pInfo->compare(val, pInfo->q);
- }
-
- switch (pInfo->optr) {
- case TSDB_RELATION_EQUAL: {
- return ret == 0;
- }
- case TSDB_RELATION_NOT_EQUAL: {
- return ret != 0;
- }
- case TSDB_RELATION_GREATER_EQUAL: {
- return ret >= 0;
- }
- case TSDB_RELATION_GREATER: {
- return ret > 0;
- }
- case TSDB_RELATION_LESS_EQUAL: {
- return ret <= 0;
- }
- case TSDB_RELATION_LESS: {
- return ret < 0;
- }
- case TSDB_RELATION_LIKE: {
- return ret == 0;
- }
- case TSDB_RELATION_MATCH: {
- return ret == 0;
- }
- case TSDB_RELATION_IN: {
- return ret == 1;
- }
-
- default:
- assert(false);
- }
-
- return true;
-}
-
-static void getTableListfromSkipList(tExprNode *pExpr, SSkipList *pSkipList, SArray *result, SExprTraverseSupp *param);
-
-static int32_t doQueryTableList(STable* pSTable, SArray* pRes, tExprNode* pExpr) {
- // query according to the expression tree
- SExprTraverseSupp supp = {
- .nodeFilterFn = (__result_filter_fn_t) tableFilterFp,
- .setupInfoFn = filterPrepare,
- .pExtInfo = pSTable->tagSchema,
- };
-
- getTableListfromSkipList(pExpr, pSTable->pIndex, pRes, &supp);
- tExprTreeDestroy(pExpr, destroyHelper);
- return TSDB_CODE_SUCCESS;
-}
-
-int32_t tsdbQuerySTableByTagCond(STsdbRepo* tsdb, uint64_t uid, TSKEY skey, const char* pTagCond, size_t len,
- int16_t tagNameRelType, const char* tbnameCond, STableGroupInfo* pGroupInfo,
- SColIndex* pColIndex, int32_t numOfCols) {
+int32_t tsdbQuerySTableByTagCond(STsdbRepo* tsdb, uint64_t uid, TSKEY skey, const char* pTagCond, size_t len,
+ STableGroupInfo* pGroupInfo, SColIndex* pColIndex, int32_t numOfCols) {
if (tsdbRLockRepoMeta(tsdb) < 0) goto _error;
STable* pTable = tsdbGetTableByUid(tsdbGetMeta(tsdb), uid);
@@ -3766,7 +3651,7 @@ int32_t tsdbQuerySTableByTagCond(STsdbRepo* tsdb, uint64_t uid, TSKEY skey, cons
STSchema* pTagSchema = tsdbGetTableTagSchema(pTable);
// no tags and tbname condition, all child tables of this stable are involved
- if (tbnameCond == NULL && (pTagCond == NULL || len == 0)) {
+ if (pTagCond == NULL || len == 0) {
int32_t ret = getAllTableList(pTable, res);
if (ret != TSDB_CODE_SUCCESS) {
tsdbUnlockRepoMeta(tsdb);
@@ -3788,25 +3673,7 @@ int32_t tsdbQuerySTableByTagCond(STsdbRepo* tsdb, uint64_t uid, TSKEY skey, cons
tExprNode* expr = NULL;
TRY(TSDB_MAX_TAG_CONDITIONS) {
- expr = exprTreeFromTableName(tbnameCond);
- if (expr == NULL) {
- expr = exprTreeFromBinary(pTagCond, len);
- } else {
- CLEANUP_PUSH_VOID_PTR_PTR(true, tExprTreeDestroy, expr, NULL);
- tExprNode* tagExpr = exprTreeFromBinary(pTagCond, len);
- if (tagExpr != NULL) {
- CLEANUP_PUSH_VOID_PTR_PTR(true, tExprTreeDestroy, tagExpr, NULL);
- tExprNode* tbnameExpr = expr;
- expr = calloc(1, sizeof(tExprNode));
- if (expr == NULL) {
- THROW( TSDB_CODE_TDB_OUT_OF_MEMORY );
- }
- expr->nodeType = TSQL_NODE_EXPR;
- expr->_node.optr = (uint8_t)tagNameRelType;
- expr->_node.pLeft = tagExpr;
- expr->_node.pRight = tbnameExpr;
- }
- }
+ expr = exprTreeFromBinary(pTagCond, len);
CLEANUP_EXECUTE();
} CATCH( code ) {
@@ -3818,7 +3685,20 @@ int32_t tsdbQuerySTableByTagCond(STsdbRepo* tsdb, uint64_t uid, TSKEY skey, cons
// TODO: more error handling
} END_TRY
- doQueryTableList(pTable, res, expr);
+ void *filterInfo = NULL;
+
+ ret = filterInitFromTree(expr, &filterInfo, 0);
+ if (ret != TSDB_CODE_SUCCESS) {
+ terrno = ret;
+ goto _error;
+ }
+
+ tsdbQueryTableList(pTable, res, filterInfo);
+
+ filterFreeInfo(filterInfo);
+
+ tExprTreeDestroy(expr, NULL);
+
pGroupInfo->numOfTables = (uint32_t)taosArrayGetSize(res);
pGroupInfo->pGroupList = createTableGroup(res, pTagSchema, pColIndex, numOfCols, skey);
@@ -4002,254 +3882,115 @@ void tsdbDestroyTableGroup(STableGroupInfo *pGroupList) {
pGroupList->numOfTables = 0;
}
-static void applyFilterToSkipListNode(SSkipList *pSkipList, tExprNode *pExpr, SArray *pResult, SExprTraverseSupp *param) {
- SSkipListIterator* iter = tSkipListCreateIter(pSkipList);
- // Scan each node in the skiplist by using iterator
- while (tSkipListIterNext(iter)) {
- SSkipListNode *pNode = tSkipListIterGet(iter);
- if (exprTreeApplyFilter(pExpr, pNode, param)) {
- taosArrayPush(pResult, &(SL_GET_NODE_DATA(pNode)));
- }
- }
-
- tSkipListDestroyIter(iter);
-}
-
-typedef struct {
- char* v;
- int32_t optr;
-} SEndPoint;
-
-typedef struct {
- SEndPoint* start;
- SEndPoint* end;
-} SQueryCond;
-
-// todo check for malloc failure
-static int32_t setQueryCond(tQueryInfo *queryColInfo, SQueryCond* pCond) {
- int32_t optr = queryColInfo->optr;
-
- if (optr == TSDB_RELATION_GREATER || optr == TSDB_RELATION_GREATER_EQUAL ||
- optr == TSDB_RELATION_EQUAL || optr == TSDB_RELATION_NOT_EQUAL) {
- pCond->start = calloc(1, sizeof(SEndPoint));
- pCond->start->optr = queryColInfo->optr;
- pCond->start->v = queryColInfo->q;
- } else if (optr == TSDB_RELATION_LESS || optr == TSDB_RELATION_LESS_EQUAL) {
- pCond->end = calloc(1, sizeof(SEndPoint));
- pCond->end->optr = queryColInfo->optr;
- pCond->end->v = queryColInfo->q;
- } else if (optr == TSDB_RELATION_IN) {
- pCond->start = calloc(1, sizeof(SEndPoint));
- pCond->start->optr = queryColInfo->optr;
- pCond->start->v = queryColInfo->q;
- } else if (optr == TSDB_RELATION_LIKE) {
- assert(0);
- } else if (optr == TSDB_RELATION_MATCH) {
- assert(0);
+static FORCE_INLINE int32_t tsdbGetTagDataFromId(void *param, int32_t id, void **data) {
+ STable* pTable = (STable*)(SL_GET_NODE_DATA((SSkipListNode *)param));
+
+ if (id == TSDB_TBNAME_COLUMN_INDEX) {
+ *data = TABLE_NAME(pTable);
+ } else {
+ *data = tdGetKVRowValOfCol(pTable->tagVal, id);
}
return TSDB_CODE_SUCCESS;
}
-static void queryIndexedColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, SArray* result) {
- SSkipListIterator* iter = NULL;
-
- SQueryCond cond = {0};
- if (setQueryCond(pQueryInfo, &cond) != TSDB_CODE_SUCCESS) {
- //todo handle error
- }
-
- if (cond.start != NULL) {
- iter = tSkipListCreateIterFromVal(pSkipList, (char*) cond.start->v, pSkipList->type, TSDB_ORDER_ASC);
- } else {
- iter = tSkipListCreateIterFromVal(pSkipList, (char*)(cond.end ? cond.end->v: NULL), pSkipList->type, TSDB_ORDER_DESC);
- }
-
- if (cond.start != NULL) {
- int32_t optr = cond.start->optr;
-
- if (optr == TSDB_RELATION_EQUAL) { // equals
- while(tSkipListIterNext(iter)) {
- SSkipListNode* pNode = tSkipListIterGet(iter);
-
- int32_t ret = pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.start->v);
- if (ret != 0) {
- break;
- }
-
- STableKeyInfo info = {.pTable = (void*)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
- taosArrayPush(result, &info);
- }
- } else if (optr == TSDB_RELATION_GREATER || optr == TSDB_RELATION_GREATER_EQUAL) { // greater equal
- bool comp = true;
- int32_t ret = 0;
-
- while(tSkipListIterNext(iter)) {
- SSkipListNode* pNode = tSkipListIterGet(iter);
-
- if (comp) {
- ret = pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.start->v);
- assert(ret >= 0);
- }
-
- if (ret == 0 && optr == TSDB_RELATION_GREATER) {
- continue;
- } else {
- STableKeyInfo info = {.pTable = (void*)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
- taosArrayPush(result, &info);
- comp = false;
- }
- }
- } else if (optr == TSDB_RELATION_NOT_EQUAL) { // not equal
- bool comp = true;
-
- while(tSkipListIterNext(iter)) {
- SSkipListNode* pNode = tSkipListIterGet(iter);
- comp = comp && (pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.start->v) == 0);
- if (comp) {
- continue;
- }
-
- STableKeyInfo info = {.pTable = (void*)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
- taosArrayPush(result, &info);
- }
- tSkipListDestroyIter(iter);
- comp = true;
- iter = tSkipListCreateIterFromVal(pSkipList, (char*) cond.start->v, pSkipList->type, TSDB_ORDER_DESC);
- while(tSkipListIterNext(iter)) {
- SSkipListNode* pNode = tSkipListIterGet(iter);
- comp = comp && (pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.start->v) == 0);
- if (comp) {
- continue;
- }
-
- STableKeyInfo info = {.pTable = (void*)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
- taosArrayPush(result, &info);
- }
+static void queryIndexedColumn(SSkipList* pSkipList, void* filterInfo, SArray* res) {
+ SSkipListIterator* iter = NULL;
+ char *startVal = NULL;
+ int32_t order = 0;
+ int32_t inRange = 0;
+ int32_t flag = 0;
+ bool all = false;
+ int8_t *addToResult = NULL;
- } else if (optr == TSDB_RELATION_IN) {
- while(tSkipListIterNext(iter)) {
- SSkipListNode* pNode = tSkipListIterGet(iter);
+ filterGetIndexedColumnInfo(filterInfo, &startVal, &order, &flag);
- int32_t ret = pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.start->v);
- if (ret != 0) {
- break;
- }
+ tsdbDebug("filter index column start, order:%d, flag:%d", order, flag);
- STableKeyInfo info = {.pTable = (void*)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
- taosArrayPush(result, &info);
- }
-
+ while (order) {
+ if (FILTER_GET_FLAG(order, TSDB_ORDER_ASC)) {
+ iter = tSkipListCreateIterFromVal(pSkipList, startVal, pSkipList->type, TSDB_ORDER_ASC);
+ FILTER_CLR_FLAG(order, TSDB_ORDER_ASC);
} else {
- assert(0);
+ iter = tSkipListCreateIterFromVal(pSkipList, startVal, pSkipList->type, TSDB_ORDER_DESC);
+ FILTER_CLR_FLAG(order, TSDB_ORDER_DESC);
}
- } else {
- int32_t optr = cond.end ? cond.end->optr : TSDB_RELATION_INVALID;
- if (optr == TSDB_RELATION_LESS || optr == TSDB_RELATION_LESS_EQUAL) {
- bool comp = true;
- int32_t ret = 0;
-
- while (tSkipListIterNext(iter)) {
- SSkipListNode *pNode = tSkipListIterGet(iter);
-
- if (comp) {
- ret = pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.end->v);
- assert(ret <= 0);
- }
+
+ while (tSkipListIterNext(iter)) {
+ SSkipListNode *pNode = tSkipListIterGet(iter);
- if (ret == 0 && optr == TSDB_RELATION_LESS) {
- continue;
- } else {
- STableKeyInfo info = {.pTable = (void *)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
- taosArrayPush(result, &info);
- comp = false; // no need to compare anymore
- }
+ if (inRange == 0 || !FILTER_GET_FLAG(flag, FI_ACTION_NO_NEED)) {
+ tsdbDebug("filter index column, filter it");
+ filterSetColFieldData(filterInfo, pNode, tsdbGetTagDataFromId);
+ all = filterExecute(filterInfo, 1, &addToResult, NULL, 0);
}
- } else {
- assert(pQueryInfo->optr == TSDB_RELATION_ISNULL || pQueryInfo->optr == TSDB_RELATION_NOTNULL);
+
+ char *pData = SL_GET_NODE_DATA(pNode);
- while (tSkipListIterNext(iter)) {
- SSkipListNode *pNode = tSkipListIterGet(iter);
+ tsdbDebug("filter index column, table:%s, result:%d", ((STable *)pData)->name->data, all);
- bool isnull = isNull(SL_GET_NODE_KEY(pSkipList, pNode), pQueryInfo->sch.type);
- if ((pQueryInfo->optr == TSDB_RELATION_ISNULL && isnull) ||
- (pQueryInfo->optr == TSDB_RELATION_NOTNULL && (!isnull))) {
- STableKeyInfo info = {.pTable = (void *)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
- taosArrayPush(result, &info);
- }
+ if (all || (addToResult && *addToResult)) {
+ STableKeyInfo info = {.pTable = (void*)pData, .lastKey = TSKEY_INITIAL_VAL};
+ taosArrayPush(res, &info);
+ inRange = 1;
+ } else if (inRange){
+ break;
}
}
+
+ inRange = 0;
+
+ tfree(addToResult);
+ tSkipListDestroyIter(iter);
}
- free(cond.start);
- free(cond.end);
- tSkipListDestroyIter(iter);
+ tsdbDebug("filter index column end");
}
-static void queryIndexlessColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, SArray* res, __result_filter_fn_t filterFp) {
+static void queryIndexlessColumn(SSkipList* pSkipList, void* filterInfo, SArray* res) {
SSkipListIterator* iter = tSkipListCreateIter(pSkipList);
+ int8_t *addToResult = NULL;
while (tSkipListIterNext(iter)) {
- bool addToResult = false;
SSkipListNode *pNode = tSkipListIterGet(iter);
+ filterSetColFieldData(filterInfo, pNode, tsdbGetTagDataFromId);
+
char *pData = SL_GET_NODE_DATA(pNode);
- tstr *name = (tstr*) tsdbGetTableName((void*) pData);
-
- // todo speed up by using hash
- if (pQueryInfo->sch.colId == TSDB_TBNAME_COLUMN_INDEX) {
- if (pQueryInfo->optr == TSDB_RELATION_IN) {
- addToResult = pQueryInfo->compare(name, pQueryInfo->q);
- } else if (pQueryInfo->optr == TSDB_RELATION_LIKE || pQueryInfo->optr == TSDB_RELATION_MATCH) {
- addToResult = !pQueryInfo->compare(name, pQueryInfo->q);
- }
- } else {
- addToResult = filterFp(pNode, pQueryInfo);
- }
- if (addToResult) {
+ bool all = filterExecute(filterInfo, 1, &addToResult, NULL, 0);
+
+ if (all || (addToResult && *addToResult)) {
STableKeyInfo info = {.pTable = (void*)pData, .lastKey = TSKEY_INITIAL_VAL};
taosArrayPush(res, &info);
- }
+ }
}
+ tfree(addToResult);
+
tSkipListDestroyIter(iter);
}
-// Apply the filter expression to each node in the skiplist to acquire the qualified nodes in skip list
-void getTableListfromSkipList(tExprNode *pExpr, SSkipList *pSkipList, SArray *result, SExprTraverseSupp *param) {
- if (pExpr == NULL) {
- return;
- }
-
- tExprNode *pLeft = pExpr->_node.pLeft;
- tExprNode *pRight = pExpr->_node.pRight;
- // column project
- if (pLeft->nodeType != TSQL_NODE_EXPR && pRight->nodeType != TSQL_NODE_EXPR) {
- assert(pLeft->nodeType == TSQL_NODE_COL && (pRight->nodeType == TSQL_NODE_VALUE || pRight->nodeType == TSQL_NODE_DUMMY));
-
- param->setupInfoFn(pExpr, param->pExtInfo);
+static int32_t tsdbQueryTableList(STable* pTable, SArray* pRes, void* filterInfo) {
+ STSchema* pTSSchema = pTable->tagSchema;
+ bool indexQuery = false;
+ SSkipList *pSkipList = pTable->pIndex;
+
+ filterIsIndexedColumnQuery(filterInfo, pTSSchema->columns->colId, &indexQuery);
+
+ if (indexQuery) {
+ queryIndexedColumn(pSkipList, filterInfo, pRes);
+ } else {
+ queryIndexlessColumn(pSkipList, filterInfo, pRes);
+ }
- tQueryInfo *pQueryInfo = pExpr->_node.info;
- if (pQueryInfo->indexed && (pQueryInfo->optr != TSDB_RELATION_LIKE && pQueryInfo->optr != TSDB_RELATION_MATCH
- && pQueryInfo->optr != TSDB_RELATION_IN)) {
- queryIndexedColumn(pSkipList, pQueryInfo, result);
- } else {
- queryIndexlessColumn(pSkipList, pQueryInfo, result, param->nodeFilterFn);
- }
+ return TSDB_CODE_SUCCESS;
+}
- return;
- }
- // The value of hasPK is always 0.
- uint8_t weight = pLeft->_node.hasPK + pRight->_node.hasPK;
- assert(weight == 0 && pSkipList != NULL && taosArrayGetSize(result) == 0);
- //apply the hierarchical filter expression to every node in skiplist to find the qualified nodes
- applyFilterToSkipListNode(pSkipList, pExpr, result, param);
-}
diff --git a/src/util/inc/tcache.h b/src/util/inc/tcache.h
index e41b544d00e55f7eece904c5957ef9c06063e6c3..40069d7d273caa14ce3b80467b25d68ea476fb75 100644
--- a/src/util/inc/tcache.h
+++ b/src/util/inc/tcache.h
@@ -33,6 +33,7 @@ extern "C" {
#endif
typedef void (*__cache_free_fn_t)(void*);
+typedef void (*__cache_trav_fn_t)(void*, void*);
typedef struct SCacheStatis {
int64_t missCount;
@@ -176,7 +177,7 @@ void taosCacheCleanup(SCacheObj *pCacheObj);
* @param fp
* @return
*/
-void taosCacheRefresh(SCacheObj *pCacheObj, __cache_free_fn_t fp);
+void taosCacheRefresh(SCacheObj *pCacheObj, __cache_trav_fn_t fp, void* param1);
/**
* stop background refresh worker thread
diff --git a/src/util/inc/tcompare.h b/src/util/inc/tcompare.h
index ef4c1096023bd670335603dee6ab274470de3ed7..1125516d34c65da1b5d0c47dadd126aa0b1959fa 100644
--- a/src/util/inc/tcompare.h
+++ b/src/util/inc/tcompare.h
@@ -84,6 +84,8 @@ int32_t compareLenPrefixedStr(const void *pLeft, const void *pRight);
int32_t compareLenPrefixedWStr(const void *pLeft, const void *pRight);
int32_t compareStrPatternComp(const void* pLeft, const void* pRight);
int32_t compareStrRegexComp(const void* pLeft, const void* pRight);
+int32_t compareStrRegexCompMatch(const void* pLeft, const void* pRight);
+int32_t compareStrRegexCompNMatch(const void* pLeft, const void* pRight);
int32_t compareFindItemInSet(const void *pLeft, const void* pRight);
int32_t compareWStrPatternComp(const void* pLeft, const void* pRight);
diff --git a/src/util/inc/tconfig.h b/src/util/inc/tconfig.h
index d03ce6e0f1f34478951a84b2ab18020f5cbec92b..2c632d4a17f5394dc28df72414948855b89bc001 100644
--- a/src/util/inc/tconfig.h
+++ b/src/util/inc/tconfig.h
@@ -20,7 +20,7 @@
extern "C" {
#endif
-#define TSDB_CFG_MAX_NUM 116 // 110 + 6 with lossy option
+#define TSDB_CFG_MAX_NUM 123
#define TSDB_CFG_PRINT_LEN 23
#define TSDB_CFG_OPTION_LEN 24
#define TSDB_CFG_VALUE_LEN 41
@@ -89,6 +89,7 @@ void taosDumpGlobalCfg();
void taosInitConfigOption(SGlobalCfg cfg);
SGlobalCfg * taosGetConfigOption(const char *option);
+bool taosReadConfigOption(const char *option, char *value, char *value2, char *value3, int8_t cfgStatus, int8_t sourceType);
#ifdef __cplusplus
}
diff --git a/src/util/inc/tlosertree.h b/src/util/inc/tlosertree.h
index 4c731625dd5c7950c321b2180ca913e49362059b..58f2ca8c5c81408b35c2c9435357deeb2b0f13a4 100644
--- a/src/util/inc/tlosertree.h
+++ b/src/util/inc/tlosertree.h
@@ -26,7 +26,7 @@ typedef int (*__merge_compare_fn_t)(const void *, const void *, void *param);
typedef struct SLoserTreeNode {
int32_t index;
- void * pData;
+ void *pData;
} SLoserTreeNode;
typedef struct SLoserTreeInfo {
@@ -34,8 +34,7 @@ typedef struct SLoserTreeInfo {
int32_t totalEntries;
__merge_compare_fn_t comparFn;
void * param;
-
- SLoserTreeNode *pNode;
+ SLoserTreeNode *pNode;
} SLoserTreeInfo;
uint32_t tLoserTreeCreate(SLoserTreeInfo **pTree, int32_t numOfEntries, void *param, __merge_compare_fn_t compareFn);
diff --git a/src/util/inc/tthread.h b/src/util/inc/tthread.h
new file mode 100644
index 0000000000000000000000000000000000000000..7443ad706dcbef529d857fe823cddd0cc1efbdd3
--- /dev/null
+++ b/src/util/inc/tthread.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#ifndef TDENGINE_TTHREAD_H
+#define TDENGINE_TTHREAD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "taosdef.h"
+
+// create new thread
+pthread_t* taosCreateThread( void *(*__start_routine) (void *), void* param);
+// destory thread
+bool taosDestoryThread(pthread_t* pthread);
+// thread running return true
+bool taosThreadRunning(pthread_t* pthread);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TDENGINE_TTHREAD_H
diff --git a/src/util/src/hash.c b/src/util/src/hash.c
index a22ce34a0e3030f409948cfcf3e739335d6417cb..6577a0a0f4710951cf240f792d68f1afb2d37569 100644
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
@@ -741,17 +741,19 @@ void taosHashTableResize(SHashObj *pHashObj) {
}
SHashNode *doCreateHashNode(const void *key, size_t keyLen, const void *pData, size_t dsize, uint32_t hashVal) {
- SHashNode *pNewNode = calloc(1, sizeof(SHashNode) + keyLen + dsize);
+ SHashNode *pNewNode = malloc(sizeof(SHashNode) + keyLen + dsize);
if (pNewNode == NULL) {
uError("failed to allocate memory, reason:%s", strerror(errno));
return NULL;
}
- pNewNode->keyLen = (uint32_t)keyLen;
+ pNewNode->keyLen = (uint32_t)keyLen;
pNewNode->hashVal = hashVal;
pNewNode->dataLen = (uint32_t) dsize;
- pNewNode->count = 1;
+ pNewNode->count = 1;
+ pNewNode->removed = 0;
+ pNewNode->next = NULL;
memcpy(GET_HASH_NODE_DATA(pNewNode), pData, dsize);
memcpy(GET_HASH_NODE_KEY(pNewNode), key, keyLen);
diff --git a/src/util/src/tarray.c b/src/util/src/tarray.c
index 2d6c513cb57ce1d524a1fb69df68702e624ede7b..007ce0682974d06bf506a82d8bbbc809092eb9e4 100644
--- a/src/util/src/tarray.c
+++ b/src/util/src/tarray.c
@@ -24,11 +24,12 @@ void* taosArrayInit(size_t size, size_t elemSize) {
size = TARRAY_MIN_SIZE;
}
- SArray* pArray = calloc(1, sizeof(SArray));
+ SArray* pArray = malloc(sizeof(SArray));
if (pArray == NULL) {
return NULL;
}
+ pArray->size = 0;
pArray->pData = calloc(size, elemSize);
if (pArray->pData == NULL) {
free(pArray);
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 6665c25a90a7fcb0db83766b88c9c9c7fe047fbf..589d3d4fa57c42b472319673a72d2e7ab599689f 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -505,7 +505,8 @@ void taosCacheRelease(SCacheObj *pCacheObj, void **data, bool _remove) {
typedef struct SHashTravSupp {
SCacheObj* pCacheObj;
int64_t time;
- __cache_free_fn_t fp;
+ __cache_trav_fn_t fp;
+ void* param1;
} SHashTravSupp;
static bool travHashTableEmptyFn(void* param, void* data) {
@@ -667,17 +668,17 @@ bool travHashTableFn(void* param, void* data) {
}
if (ps->fp) {
- (ps->fp)(pNode->data);
+ (ps->fp)(pNode->data, ps->param1);
}
// do not remove element in hash table
return true;
}
-static void doCacheRefresh(SCacheObj* pCacheObj, int64_t time, __cache_free_fn_t fp) {
+static void doCacheRefresh(SCacheObj* pCacheObj, int64_t time, __cache_trav_fn_t fp, void* param1) {
assert(pCacheObj != NULL);
- SHashTravSupp sup = {.pCacheObj = pCacheObj, .fp = fp, .time = time};
+ SHashTravSupp sup = {.pCacheObj = pCacheObj, .fp = fp, .time = time, .param1 = param1};
taosHashCondTraverse(pCacheObj->pHashTable, travHashTableFn, &sup);
}
@@ -748,7 +749,7 @@ void* taosCacheTimedRefresh(void *handle) {
// refresh data in hash table
if (elemInHash > 0) {
int64_t now = taosGetTimestampMs();
- doCacheRefresh(pCacheObj, now, NULL);
+ doCacheRefresh(pCacheObj, now, NULL, NULL);
}
taosTrashcanEmpty(pCacheObj, false);
@@ -766,13 +767,13 @@ void* taosCacheTimedRefresh(void *handle) {
return NULL;
}
-void taosCacheRefresh(SCacheObj *pCacheObj, __cache_free_fn_t fp) {
+void taosCacheRefresh(SCacheObj *pCacheObj, __cache_trav_fn_t fp, void* param1) {
if (pCacheObj == NULL) {
return;
}
int64_t now = taosGetTimestampMs();
- doCacheRefresh(pCacheObj, now, fp);
+ doCacheRefresh(pCacheObj, now, fp, param1);
}
void taosStopCacheRefreshWorker(void) {
diff --git a/src/util/src/tcompare.c b/src/util/src/tcompare.c
index 4c76724921404b2a799479c86166cd462220a99c..179fbd05a5a8f5ddfb28b68130f87e26ed4e522f 100644
--- a/src/util/src/tcompare.c
+++ b/src/util/src/tcompare.c
@@ -233,14 +233,20 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
int32_t i = 0;
int32_t j = 0;
+ int32_t o = 0;
+ int32_t m = 0;
while ((c = patterStr[i++]) != 0) {
if (c == pInfo->matchAll) { /* Match "*" */
while ((c = patterStr[i++]) == pInfo->matchAll || c == pInfo->matchOne) {
- if (c == pInfo->matchOne && (j > size || str[j++] == 0)) {
- // empty string, return not match
- return TSDB_PATTERN_NOWILDCARDMATCH;
+ if (c == pInfo->matchOne) {
+ if (j > size || str[j++] == 0) {
+ // empty string, return not match
+ return TSDB_PATTERN_NOWILDCARDMATCH;
+ } else {
+ ++o;
+ }
}
}
@@ -249,9 +255,10 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
}
char next[3] = {toupper(c), tolower(c), 0};
+ m = o;
while (1) {
- size_t n = strcspn(str, next);
- str += n;
+ size_t n = strcspn(str + m, next);
+ str += m + n;
if (str[0] == 0 || (n >= size)) {
break;
@@ -261,12 +268,14 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
if (ret != TSDB_PATTERN_NOMATCH) {
return ret;
}
+ m = 0;
}
return TSDB_PATTERN_NOWILDCARDMATCH;
}
c1 = str[j++];
-
+ ++o;
+
if (j <= size) {
if (c == '\\' && patterStr[i] == '_' && c1 == '_') { i++; continue; }
if (c == c1 || tolower(c) == tolower(c1) || (c == pInfo->matchOne && c1 != 0)) {
@@ -292,7 +301,7 @@ int WCSPatternMatch(const wchar_t *patterStr, const wchar_t *str, size_t size, c
if (c == matchAll) { /* Match "%" */
while ((c = patterStr[i++]) == matchAll || c == matchOne) {
- if (c == matchOne && (j > size || str[j++] == 0)) {
+ if (c == matchOne && (j >= size || str[j++] == 0)) {
return TSDB_PATTERN_NOWILDCARDMATCH;
}
}
@@ -350,6 +359,14 @@ int32_t compareStrPatternComp(const void* pLeft, const void* pRight) {
return (ret == TSDB_PATTERN_MATCH) ? 0 : 1;
}
+int32_t compareStrRegexCompMatch(const void* pLeft, const void* pRight) {
+ return compareStrRegexComp(pLeft, pRight);
+}
+
+int32_t compareStrRegexCompNMatch(const void* pLeft, const void* pRight) {
+ return compareStrRegexComp(pLeft, pRight) ? 0 : 1;
+}
+
int32_t compareStrRegexComp(const void* pLeft, const void* pRight) {
size_t sz = varDataLen(pRight);
char *pattern = malloc(sz + 1);
@@ -449,7 +466,9 @@ __compar_fn_t getComparFunc(int32_t type, int32_t optr) {
case TSDB_DATA_TYPE_DOUBLE: comparFn = compareDoubleVal; break;
case TSDB_DATA_TYPE_BINARY: {
if (optr == TSDB_RELATION_MATCH) {
- comparFn = compareStrRegexComp;
+ comparFn = compareStrRegexCompMatch;
+ } else if (optr == TSDB_RELATION_NMATCH) {
+ comparFn = compareStrRegexCompNMatch;
} else if (optr == TSDB_RELATION_LIKE) { /* wildcard query using like operator */
comparFn = compareStrPatternComp;
} else if (optr == TSDB_RELATION_IN) {
@@ -463,7 +482,9 @@ __compar_fn_t getComparFunc(int32_t type, int32_t optr) {
case TSDB_DATA_TYPE_NCHAR: {
if (optr == TSDB_RELATION_MATCH) {
- comparFn = compareStrRegexComp;
+ comparFn = compareStrRegexCompMatch;
+ } else if (optr == TSDB_RELATION_NMATCH) {
+ comparFn = compareStrRegexCompNMatch;
} else if (optr == TSDB_RELATION_LIKE) {
comparFn = compareWStrPatternComp;
} else if (optr == TSDB_RELATION_IN) {
diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c
index 5a3dc3f9bcdee41f974e48f22b27beb2a1eb5a35..9ce6876fd6d2c555acf5450a9128f787ccd300c8 100644
--- a/src/util/src/tconfig.c
+++ b/src/util/src/tconfig.c
@@ -26,6 +26,11 @@
SGlobalCfg tsGlobalConfig[TSDB_CFG_MAX_NUM] = {{0}};
int32_t tsGlobalConfigNum = 0;
+#define ATOI_JUDGE if ( !value && strcmp(input_value, "0") != 0) { \
+ uError("atoi error, input value:%s",input_value); \
+ return false; \
+ }
+
static char *tsGlobalUnit[] = {
" ",
"(%)",
@@ -44,12 +49,14 @@ char *tsCfgStatusStr[] = {
"program argument list"
};
-static void taosReadFloatConfig(SGlobalCfg *cfg, char *input_value) {
+static bool taosReadFloatConfig(SGlobalCfg *cfg, char *input_value) {
float value = (float)atof(input_value);
+ ATOI_JUDGE
float *option = (float *)cfg->ptr;
if (value < cfg->minValue || value > cfg->maxValue) {
uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%f",
cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+ return false;
} else {
if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
*option = value;
@@ -57,16 +64,20 @@ static void taosReadFloatConfig(SGlobalCfg *cfg, char *input_value) {
} else {
uWarn("config option:%s, input value:%s, is configured by %s, use %f", cfg->option, input_value,
tsCfgStatusStr[cfg->cfgStatus], *option);
+ return false;
}
}
+ return true;
}
-static void taosReadDoubleConfig(SGlobalCfg *cfg, char *input_value) {
+static bool taosReadDoubleConfig(SGlobalCfg *cfg, char *input_value) {
double value = atof(input_value);
+ ATOI_JUDGE
double *option = (double *)cfg->ptr;
if (value < cfg->minValue || value > cfg->maxValue) {
uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%f",
cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+ return false;
} else {
if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
*option = value;
@@ -74,17 +85,21 @@ static void taosReadDoubleConfig(SGlobalCfg *cfg, char *input_value) {
} else {
uWarn("config option:%s, input value:%s, is configured by %s, use %f", cfg->option, input_value,
tsCfgStatusStr[cfg->cfgStatus], *option);
+ return false;
}
}
+ return true;
}
-static void taosReadInt32Config(SGlobalCfg *cfg, char *input_value) {
+static bool taosReadInt32Config(SGlobalCfg *cfg, char *input_value) {
int32_t value = atoi(input_value);
+ ATOI_JUDGE
int32_t *option = (int32_t *)cfg->ptr;
if (value < cfg->minValue || value > cfg->maxValue) {
uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%d",
cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+ return false;
} else {
if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
*option = value;
@@ -92,16 +107,20 @@ static void taosReadInt32Config(SGlobalCfg *cfg, char *input_value) {
} else {
uWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, input_value,
tsCfgStatusStr[cfg->cfgStatus], *option);
+ return false;
}
}
+ return true;
}
-static void taosReadInt16Config(SGlobalCfg *cfg, char *input_value) {
+static bool taosReadInt16Config(SGlobalCfg *cfg, char *input_value) {
int32_t value = atoi(input_value);
+ ATOI_JUDGE
int16_t *option = (int16_t *)cfg->ptr;
if (value < cfg->minValue || value > cfg->maxValue) {
uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%d",
cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+ return false;
} else {
if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
*option = (int16_t)value;
@@ -109,16 +128,20 @@ static void taosReadInt16Config(SGlobalCfg *cfg, char *input_value) {
} else {
uWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, input_value,
tsCfgStatusStr[cfg->cfgStatus], *option);
+ return false;
}
}
+ return true;
}
-static void taosReadUInt16Config(SGlobalCfg *cfg, char *input_value) {
+static bool taosReadUInt16Config(SGlobalCfg *cfg, char *input_value) {
int32_t value = atoi(input_value);
+ ATOI_JUDGE
uint16_t *option = (uint16_t *)cfg->ptr;
if (value < cfg->minValue || value > cfg->maxValue) {
uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%d",
cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+ return false;
} else {
if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
*option = (uint16_t)value;
@@ -126,16 +149,20 @@ static void taosReadUInt16Config(SGlobalCfg *cfg, char *input_value) {
} else {
uWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, input_value,
tsCfgStatusStr[cfg->cfgStatus], *option);
+ return false;
}
}
+ return true;
}
-static void taosReadInt8Config(SGlobalCfg *cfg, char *input_value) {
+static bool taosReadInt8Config(SGlobalCfg *cfg, char *input_value) {
int32_t value = atoi(input_value);
+ ATOI_JUDGE
int8_t *option = (int8_t *)cfg->ptr;
if (value < cfg->minValue || value > cfg->maxValue) {
uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%d",
cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+ return false;
} else {
if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
*option = (int8_t)value;
@@ -143,8 +170,10 @@ static void taosReadInt8Config(SGlobalCfg *cfg, char *input_value) {
} else {
uWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, input_value,
tsCfgStatusStr[cfg->cfgStatus], *option);
+ return false;
}
}
+ return true;
}
static bool taosReadDirectoryConfig(SGlobalCfg *cfg, char *input_value) {
@@ -191,12 +220,13 @@ static bool taosReadDirectoryConfig(SGlobalCfg *cfg, char *input_value) {
return true;
}
-static void taosReadIpStrConfig(SGlobalCfg *cfg, char *input_value) {
+static bool taosReadIpStrConfig(SGlobalCfg *cfg, char *input_value) {
uint32_t value = taosInetAddr(input_value);
char * option = (char *)cfg->ptr;
if (value == INADDR_NONE) {
uError("config option:%s, input value:%s, is not a valid ip address, use default value:%s",
cfg->option, input_value, option);
+ return false;
} else {
if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
strncpy(option, input_value, cfg->ptrLength);
@@ -204,16 +234,19 @@ static void taosReadIpStrConfig(SGlobalCfg *cfg, char *input_value) {
} else {
uWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, input_value,
tsCfgStatusStr[cfg->cfgStatus], option);
+ return false;
}
}
+ return true;
}
-static void taosReadStringConfig(SGlobalCfg *cfg, char *input_value) {
+static bool taosReadStringConfig(SGlobalCfg *cfg, char *input_value) {
int length = (int) strlen(input_value);
char *option = (char *)cfg->ptr;
if (length <= 0 || length > cfg->ptrLength) {
uError("config option:%s, input value:%s, length out of range[0, %d], use default value:%s",
cfg->option, input_value, cfg->ptrLength, option);
+ return false;
} else {
if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
strncpy(option, input_value, cfg->ptrLength);
@@ -221,8 +254,10 @@ static void taosReadStringConfig(SGlobalCfg *cfg, char *input_value) {
} else {
uWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, input_value,
tsCfgStatusStr[cfg->cfgStatus], option);
+ return false;
}
}
+ return true;
}
static void taosReadLogOption(char *option, char *value) {
@@ -258,51 +293,59 @@ SGlobalCfg *taosGetConfigOption(const char *option) {
return NULL;
}
-static void taosReadConfigOption(const char *option, char *value, char *value2, char *value3) {
+bool taosReadConfigOption(const char *option, char *value, char *value2, char *value3,
+ int8_t cfgStatus, int8_t sourceType) {
+ bool ret = false;
for (int i = 0; i < tsGlobalConfigNum; ++i) {
SGlobalCfg *cfg = tsGlobalConfig + i;
if (!(cfg->cfgType & TSDB_CFG_CTYPE_B_CONFIG)) continue;
+ if (sourceType != 0 && !(cfg->cfgType & sourceType)) continue;
if (strcasecmp(cfg->option, option) != 0) continue;
switch (cfg->valType) {
case TAOS_CFG_VTYPE_INT8:
- taosReadInt8Config(cfg, value);
+ ret = taosReadInt8Config(cfg, value);
break;
case TAOS_CFG_VTYPE_INT16:
- taosReadInt16Config(cfg, value);
+ ret = taosReadInt16Config(cfg, value);
break;
case TAOS_CFG_VTYPE_INT32:
- taosReadInt32Config(cfg, value);
+ ret = taosReadInt32Config(cfg, value);
break;
case TAOS_CFG_VTYPE_UINT16:
- taosReadUInt16Config(cfg, value);
+ ret = taosReadUInt16Config(cfg, value);
break;
case TAOS_CFG_VTYPE_FLOAT:
- taosReadFloatConfig(cfg, value);
+ ret = taosReadFloatConfig(cfg, value);
break;
case TAOS_CFG_VTYPE_DOUBLE:
- taosReadDoubleConfig(cfg, value);
+ ret = taosReadDoubleConfig(cfg, value);
break;
case TAOS_CFG_VTYPE_STRING:
- taosReadStringConfig(cfg, value);
+ ret = taosReadStringConfig(cfg, value);
break;
case TAOS_CFG_VTYPE_IPSTR:
- taosReadIpStrConfig(cfg, value);
+ ret = taosReadIpStrConfig(cfg, value);
break;
case TAOS_CFG_VTYPE_DIRECTORY:
- taosReadDirectoryConfig(cfg, value);
+ ret = taosReadDirectoryConfig(cfg, value);
break;
case TAOS_CFG_VTYPE_DATA_DIRCTORY:
if (taosReadDirectoryConfig(cfg, value)) {
- taosReadDataDirCfg(value, value2, value3);
+ taosReadDataDirCfg(value, value2, value3);
+ ret = true;
}
+ ret = false;
break;
default:
uError("config option:%s, input value:%s, can't be recognized", option, value);
- break;
+ ret = false;
+ }
+ if(ret && cfgStatus == TAOS_CFG_CSTATUS_OPTION){
+ cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
}
- break;
}
+ return ret;
}
void taosInitConfigOption(SGlobalCfg cfg) {
@@ -336,6 +379,9 @@ void taosReadGlobalLogCfg() {
#elif (_TD_TQ_ == true)
printf("configDir:%s not there, use default value: /etc/tq", configDir);
strcpy(configDir, "/etc/tq");
+ #elif (_TD_PRO_ == true)
+ printf("configDir:%s not there, use default value: /etc/ProDB", configDir);
+ strcpy(configDir, "/etc/ProDB");
#else
printf("configDir:%s not there, use default value: /etc/taos", configDir);
strcpy(configDir, "/etc/taos");
@@ -437,7 +483,7 @@ bool taosReadGlobalCfg() {
if (vlen3 != 0) value3[vlen3] = 0;
}
- taosReadConfigOption(option, value, value2, value3);
+ taosReadConfigOption(option, value, value2, value3, TAOS_CFG_CSTATUS_FILE, 0);
}
fclose(fp);
@@ -560,4 +606,4 @@ void taosDumpGlobalCfg() {
taosDumpCfg(cfg);
}
-}
+}
\ No newline at end of file
diff --git a/src/util/src/terror.c b/src/util/src/terror.c
index 8fb39cd1702fe670e44f2e0db1639a0f48ab5ab0..e3d022a6b0a4a929b6c06b2c305fb71b6980a865 100644
--- a/src/util/src/terror.c
+++ b/src/util/src/terror.c
@@ -116,6 +116,9 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSC_DUP_COL_NAMES, "duplicated column nam
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_TAG_LENGTH, "Invalid tag length")
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_COLUMN_LENGTH, "Invalid column length")
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_DUP_TAG_NAMES, "duplicated tag names")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_JSON, "Invalid JSON format")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_JSON_TYPE, "Invalid JSON data type")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_VALUE_OUT_OF_RANGE, "Value out of range")
// mnode
TAOS_DEFINE_ERROR(TSDB_CODE_MND_MSG_NOT_PROCESSED, "Message not processed")
diff --git a/src/util/src/tlog.c b/src/util/src/tlog.c
index 1ce3eadf58432337511d0d600848ad334b96fc91..0d335ca2664ffee75a79144b97181a5b625df66d 100644
--- a/src/util/src/tlog.c
+++ b/src/util/src/tlog.c
@@ -85,6 +85,8 @@ int64_t dbgWSize = 0;
char tsLogDir[TSDB_FILENAME_LEN] = "/var/log/power";
#elif (_TD_TQ_ == true)
char tsLogDir[TSDB_FILENAME_LEN] = "/var/log/tq";
+#elif (_TD_PRO_ == true)
+char tsLogDir[TSDB_FILENAME_LEN] = "/var/log/ProDB";
#else
char tsLogDir[PATH_MAX] = "/var/log/taos";
#endif
diff --git a/src/util/src/tlosertree.c b/src/util/src/tlosertree.c
index e793548407ad37e2021fdba7db106db3a48fcaf0..0f104c4b63a36880a79ad564a0f837f9b09e7819 100644
--- a/src/util/src/tlosertree.c
+++ b/src/util/src/tlosertree.c
@@ -90,12 +90,13 @@ void tLoserTreeAdjust(SLoserTreeInfo* pTree, int32_t idx) {
SLoserTreeNode kLeaf = pTree->pNode[idx];
while (parentId > 0) {
- if (pTree->pNode[parentId].index == -1) {
+ SLoserTreeNode* pCur = &pTree->pNode[parentId];
+ if (pCur->index == -1) {
pTree->pNode[parentId] = kLeaf;
return;
}
- int32_t ret = pTree->comparFn(&pTree->pNode[parentId], &kLeaf, pTree->param);
+ int32_t ret = pTree->comparFn(pCur, &kLeaf, pTree->param);
if (ret < 0) {
SLoserTreeNode t = pTree->pNode[parentId];
pTree->pNode[parentId] = kLeaf;
diff --git a/src/util/src/tthread.c b/src/util/src/tthread.c
new file mode 100644
index 0000000000000000000000000000000000000000..043b2de2f241297d209041294428dde2c55e974e
--- /dev/null
+++ b/src/util/src/tthread.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#include "os.h"
+#include "tthread.h"
+#include "tglobal.h"
+#include "taosdef.h"
+#include "tutil.h"
+#include "tulog.h"
+#include "taoserror.h"
+
+// create new thread
+pthread_t* taosCreateThread( void *(*__start_routine) (void *), void* param) {
+ pthread_t* pthread = (pthread_t*)malloc(sizeof(pthread_t));
+ pthread_attr_t thattr;
+ pthread_attr_init(&thattr);
+ pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+ int32_t ret = pthread_create(pthread, &thattr, __start_routine, param);
+ pthread_attr_destroy(&thattr);
+
+ if (ret != 0) {
+ free(pthread);
+ return NULL;
+ }
+ return pthread;
+}
+
+// destory thread
+bool taosDestoryThread(pthread_t* pthread) {
+ if(pthread == NULL) return false;
+ if(taosThreadRunning(pthread)) {
+ pthread_cancel(*pthread);
+ pthread_join(*pthread, NULL);
+ }
+
+ free(pthread);
+ return true;
+}
+
+// thread running return true
+bool taosThreadRunning(pthread_t* pthread) {
+ if(pthread == NULL) return false;
+ int ret = pthread_kill(*pthread, 0);
+ if(ret == ESRCH)
+ return false;
+ if(ret == EINVAL)
+ return false;
+ // alive
+ return true;
+}
diff --git a/src/util/src/ttokenizer.c b/src/util/src/ttokenizer.c
index 04f2d7fc04cafb5514e4f7df1e6063cad9c096da..289c4a6ef5d5db1a04fdb33985ed4de959375f8d 100644
--- a/src/util/src/ttokenizer.c
+++ b/src/util/src/ttokenizer.c
@@ -195,6 +195,7 @@ static SKeyword keywordTable[] = {
{"INITIALLY", TK_INITIALLY},
{"INSTEAD", TK_INSTEAD},
{"MATCH", TK_MATCH},
+ {"NMATCH", TK_NMATCH},
{"KEY", TK_KEY},
{"OF", TK_OF},
{"RAISE", TK_RAISE},
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index f826c1aecd336a0eedeb3f02df0a7acc61895bb2..c823880ae2028c4bcfe26dbfc5cd60af62443722 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -560,5 +560,10 @@ static int32_t vnodeProcessTsdbStatus(void *arg, int32_t status, int32_t eno) {
return vnodeSaveVersion(pVnode);
}
+ // timer thread callback
+ if(status == TSDB_STATUS_COMMIT_NOBLOCK) {
+ qSolveCommitNoBlock(pVnode->tsdb, pVnode->qMgmt);
+ }
+
return 0;
}
diff --git a/tests/connectorTest/C#Test/nanosupport/TDengineDriver.cs b/tests/connectorTest/C#Test/nanosupport/TDengineDriver.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e6c3a598adc0bc4bcf5ea84953f649b418199555
--- /dev/null
+++ b/tests/connectorTest/C#Test/nanosupport/TDengineDriver.cs
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+namespace TDengineDriver
+{
+ enum TDengineDataType
+ {
+ TSDB_DATA_TYPE_NULL = 0, // 1 bytes
+ TSDB_DATA_TYPE_BOOL = 1, // 1 bytes
+ TSDB_DATA_TYPE_TINYINT = 2, // 1 bytes
+ TSDB_DATA_TYPE_SMALLINT = 3, // 2 bytes
+ TSDB_DATA_TYPE_INT = 4, // 4 bytes
+ TSDB_DATA_TYPE_BIGINT = 5, // 8 bytes
+ TSDB_DATA_TYPE_FLOAT = 6, // 4 bytes
+ TSDB_DATA_TYPE_DOUBLE = 7, // 8 bytes
+ TSDB_DATA_TYPE_BINARY = 8, // string
+ TSDB_DATA_TYPE_TIMESTAMP = 9,// 8 bytes
+ TSDB_DATA_TYPE_NCHAR = 10, // unicode string
+ TSDB_DATA_TYPE_UTINYINT = 11,// 1 byte
+ TSDB_DATA_TYPE_USMALLINT= 12,// 2 bytes
+ TSDB_DATA_TYPE_UINT = 13, // 4 bytes
+ TSDB_DATA_TYPE_UBIGINT= 14 // 8 bytes
+ }
+
+ enum TDengineInitOption
+ {
+ TSDB_OPTION_LOCALE = 0,
+ TSDB_OPTION_CHARSET = 1,
+ TSDB_OPTION_TIMEZONE = 2,
+ TDDB_OPTION_CONFIGDIR = 3,
+ TDDB_OPTION_SHELL_ACTIVITY_TIMER = 4
+ }
+
+ class TDengineMeta
+ {
+ public string name;
+ public short size;
+ public byte type;
+ public string TypeName()
+ {
+ switch ((TDengineDataType)type)
+ {
+ case TDengineDataType.TSDB_DATA_TYPE_BOOL:
+ return "BOOL";
+ case TDengineDataType.TSDB_DATA_TYPE_TINYINT:
+ return "TINYINT";
+ case TDengineDataType.TSDB_DATA_TYPE_SMALLINT:
+ return "SMALLINT";
+ case TDengineDataType.TSDB_DATA_TYPE_INT:
+ return "INT";
+ case TDengineDataType.TSDB_DATA_TYPE_BIGINT:
+ return "BIGINT";
+ case TDengineDataType.TSDB_DATA_TYPE_UTINYINT:
+ return "TINYINT UNSIGNED";
+ case TDengineDataType.TSDB_DATA_TYPE_USMALLINT:
+ return "SMALLINT UNSIGNED";
+ case TDengineDataType.TSDB_DATA_TYPE_UINT:
+ return "INT UNSIGNED";
+ case TDengineDataType.TSDB_DATA_TYPE_UBIGINT:
+ return "BIGINT UNSIGNED";
+ case TDengineDataType.TSDB_DATA_TYPE_FLOAT:
+ return "FLOAT";
+ case TDengineDataType.TSDB_DATA_TYPE_DOUBLE:
+ return "DOUBLE";
+ case TDengineDataType.TSDB_DATA_TYPE_BINARY:
+ return "STRING";
+ case TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP:
+ return "TIMESTAMP";
+ case TDengineDataType.TSDB_DATA_TYPE_NCHAR:
+ return "NCHAR";
+ default:
+ return "undefine";
+ }
+ }
+ }
+
+ class TDengine
+ {
+ public const int TSDB_CODE_SUCCESS = 0;
+
+ [DllImport("taos", EntryPoint = "taos_init", CallingConvention = CallingConvention.Cdecl)]
+ static extern public void Init();
+
+ [DllImport("taos", EntryPoint = "taos_cleanup", CallingConvention = CallingConvention.Cdecl)]
+ static extern public void Cleanup();
+
+ [DllImport("taos", EntryPoint = "taos_options", CallingConvention = CallingConvention.Cdecl)]
+ static extern public void Options(int option, string value);
+
+ [DllImport("taos", EntryPoint = "taos_connect", CallingConvention = CallingConvention.Cdecl)]
+ static extern public IntPtr Connect(string ip, string user, string password, string db, short port);
+
+ [DllImport("taos", EntryPoint = "taos_errstr", CallingConvention = CallingConvention.Cdecl)]
+ static extern private IntPtr taos_errstr(IntPtr res);
+ static public string Error(IntPtr res)
+ {
+ IntPtr errPtr = taos_errstr(res);
+ return Marshal.PtrToStringAnsi(errPtr);
+ }
+
+ [DllImport("taos", EntryPoint = "taos_errno", CallingConvention = CallingConvention.Cdecl)]
+ static extern public int ErrorNo(IntPtr res);
+
+ [DllImport("taos", EntryPoint = "taos_query", CallingConvention = CallingConvention.Cdecl)]
+ static extern public IntPtr Query(IntPtr conn, string sqlstr);
+
+ [DllImport("taos", EntryPoint = "taos_affected_rows", CallingConvention = CallingConvention.Cdecl)]
+ static extern public int AffectRows(IntPtr res);
+
+ [DllImport("taos", EntryPoint = "taos_field_count", CallingConvention = CallingConvention.Cdecl)]
+ static extern public int FieldCount(IntPtr res);
+
+ [DllImport("taos", EntryPoint = "taos_fetch_fields", CallingConvention = CallingConvention.Cdecl)]
+ static extern private IntPtr taos_fetch_fields(IntPtr res);
+ static public List FetchFields(IntPtr res)
+ {
+ const int fieldSize = 68;
+
+ List metas = new List();
+ if (res == IntPtr.Zero)
+ {
+ return metas;
+ }
+
+ int fieldCount = FieldCount(res);
+ IntPtr fieldsPtr = taos_fetch_fields(res);
+
+ for (int i = 0; i < fieldCount; ++i)
+ {
+ int offset = i * fieldSize;
+
+ TDengineMeta meta = new TDengineMeta();
+ meta.name = Marshal.PtrToStringAnsi(fieldsPtr + offset);
+ meta.type = Marshal.ReadByte(fieldsPtr + offset + 65);
+ meta.size = Marshal.ReadInt16(fieldsPtr + offset + 66);
+ metas.Add(meta);
+ }
+
+ return metas;
+ }
+
+ [DllImport("taos", EntryPoint = "taos_fetch_row", CallingConvention = CallingConvention.Cdecl)]
+ static extern public IntPtr FetchRows(IntPtr res);
+
+ [DllImport("taos", EntryPoint = "taos_free_result", CallingConvention = CallingConvention.Cdecl)]
+ static extern public IntPtr FreeResult(IntPtr res);
+
+ [DllImport("taos", EntryPoint = "taos_close", CallingConvention = CallingConvention.Cdecl)]
+ static extern public int Close(IntPtr taos);
+ //get precisionin parameter restultset
+ [DllImport("taos", EntryPoint = "taos_result_precision", CallingConvention = CallingConvention.Cdecl)]
+ static extern public int ResultPrecision(IntPtr taos);
+ }
+}
diff --git a/tests/connectorTest/C#Test/nanosupport/nanotest.cs b/tests/connectorTest/C#Test/nanosupport/nanotest.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b9eaefef8c740f8196a715282c8c28ffd79bbdac
--- /dev/null
+++ b/tests/connectorTest/C#Test/nanosupport/nanotest.cs
@@ -0,0 +1,502 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+using System;
+using System.Text;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Collections;
+namespace TDengineDriver
+{
+ class TDengineNanoTest
+ {
+ //connect parameters
+ private string host="localhost";
+ private string configDir="/etc/taos";
+ private string user="root";
+ private string password="taosdata";
+ private short port = 0;
+
+ //sql parameters
+ private string dbName;
+ private string tbName;
+ private string precision;
+
+ private bool isInsertData;
+ private bool isQueryData;
+
+ private long tableCount;
+ private long totalRows;
+ private long batchRows;
+ private long beginTimestamp = 1551369600000L;
+
+ private IntPtr conn = IntPtr.Zero;
+ private long rowsInserted = 0;
+
+ static void Main(string[] args)
+ {
+ TDengineNanoTest tester = new TDengineNanoTest();
+ //tester.ReadArgument(args);
+
+ tester.InitTDengine();
+ tester.ConnectTDengine();
+ tester.execute("reset query cache");
+ tester.execute("drop database if exists db");
+ tester.execute("create database db precision 'ns'");
+ tester.executeQuery("show databases;");
+ //tester.checkData(0,16,"ns");
+ tester.execute("use db");
+
+ Console.WriteLine("testing nanosecond support in 1st timestamp");
+ tester.execute("create table tb (ts timestamp, speed int)");
+ tester.execute("insert into tb values('2021-06-10 0:00:00.100000001', 1);");
+ tester.execute("insert into tb values(1623254400150000000, 2);");
+ tester.execute("import into tb values(1623254400300000000, 3);");
+ tester.execute("import into tb values(1623254400299999999, 4);");
+ tester.execute("insert into tb values(1623254400300000001, 5);");
+ tester.execute("insert into tb values(1623254400999999999, 7);");
+ tester.executeQuery("select * from tb;");
+
+ Console.WriteLine("expect data is ");
+
+ tester.executeQuery("select * from tb;");
+
+ // Console.WriteLine("expected is : {0}", width);
+ // tdSql.checkData(0,0,"2021-06-10 0:00:00.100000001");
+ // tdSql.checkData(1,0,"2021-06-10 0:00:00.150000000");
+ // tdSql.checkData(2,0,"2021-06-10 0:00:00.299999999");
+ // tdSql.checkData(3,1,3);
+ // tdSql.checkData(4,1,5);
+ // tdSql.checkData(5,1,7);
+ // tdSql.checkRows(6);
+
+ tester.executeQuery("select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;");
+ Console.WriteLine("expected is : 1 " );
+ tester.executeQuery("select count(*) from tb where ts > '2021-06-10 0:00:00.100000001' and ts < '2021-06-10 0:00:00.160000000';");
+ Console.WriteLine("expected is : 1 " );
+
+ tester.executeQuery("select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000;");
+ Console.WriteLine("expected is : 1 " );
+ tester.executeQuery("select count(*) from tb where ts > '2021-06-10 0:00:00.100000000' and ts < '2021-06-10 0:00:00.150000000';");
+ Console.WriteLine("expected is : 1 " );
+
+ tester.executeQuery("select count(*) from tb where ts > 1623254400400000000;");
+ Console.WriteLine("expected is : 1 " );
+ tester.executeQuery("select count(*) from tb where ts < '2021-06-10 00:00:00.400000000';");
+ Console.WriteLine("expected is : 5 " );
+
+ tester.executeQuery("select count(*) from tb where ts > now + 400000000b;");
+ Console.WriteLine("expected is : 0 " );
+
+ tester.executeQuery("select count(*) from tb where ts >= '2021-06-10 0:00:00.100000001';");
+ Console.WriteLine("expected is : 6 " );
+
+ tester.executeQuery("select count(*) from tb where ts <= 1623254400300000000;");
+ Console.WriteLine("expected is : 4 " );
+
+ tester.executeQuery("select count(*) from tb where ts = '2021-06-10 0:00:00.000000000';");
+ Console.WriteLine("expected is : 0 " );
+
+ tester.executeQuery("select count(*) from tb where ts = 1623254400150000000;");
+ Console.WriteLine("expected is : 1 " );
+
+ tester.executeQuery("select count(*) from tb where ts = '2021-06-10 0:00:00.100000001';");
+ Console.WriteLine("expected is : 1 " );
+
+ tester.executeQuery("select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000;");
+ Console.WriteLine("expected is : 5 " );
+
+ tester.executeQuery("select count(*) from tb where ts between '2021-06-10 0:00:00.299999999' and '2021-06-10 0:00:00.300000001';");
+ Console.WriteLine("expected is : 3 " );
+
+ tester.executeQuery("select avg(speed) from tb interval(5000000000b);");
+ Console.WriteLine("expected is : 1 " );
+
+ tester.executeQuery("select avg(speed) from tb interval(100000000b)");
+ Console.WriteLine("expected is : 4 " );
+
+ // tdSql.error("select avg(speed) from tb interval(1b);")
+ // tdSql.error("select avg(speed) from tb interval(999b);")
+
+ tester.executeQuery("select avg(speed) from tb interval(1000b);");
+ Console.WriteLine("expected is : 5 rows " );
+
+ tester.executeQuery("select avg(speed) from tb interval(1u);");
+ Console.WriteLine("expected is : 5 rows " );
+
+ tester.executeQuery("select avg(speed) from tb interval(100000000b) sliding (100000000b);");
+ Console.WriteLine("expected is : 4 rows " );
+
+ tester.executeQuery("select last(*) from tb");
+ Console.WriteLine("expected is :1623254400999999999 " );
+
+ // tdSql.checkData(0,0, "2021-06-10 0:00:00.999999999")
+ // tdSql.checkData(0,0, 1623254400999999999)
+
+ tester.executeQuery("select first(*) from tb");
+ Console.WriteLine("expected is : 1623254400100000001" );
+ // tdSql.checkData(0,0, 1623254400100000001);
+ // tdSql.checkData(0,0, "2021-06-10 0:00:00.100000001");
+
+ tester.execute("insert into tb values(now + 500000000b, 6);");
+ tester.executeQuery("select * from tb;");
+ // tdSql.checkRows(7);
+
+ tester.execute("create table tb2 (ts timestamp, speed int, ts2 timestamp);");
+ tester.execute("insert into tb2 values('2021-06-10 0:00:00.100000001', 1, '2021-06-11 0:00:00.100000001');");
+ tester.execute("insert into tb2 values(1623254400150000000, 2, 1623340800150000000);");
+ tester.execute("import into tb2 values(1623254400300000000, 3, 1623340800300000000);");
+ tester.execute("import into tb2 values(1623254400299999999, 4, 1623340800299999999);");
+ tester.execute("insert into tb2 values(1623254400300000001, 5, 1623340800300000001);");
+ tester.execute("insert into tb2 values(1623254400999999999, 7, 1623513600999999999);");
+
+ tester.executeQuery("select * from tb2;");
+ // tdSql.checkData(0,0,"2021-06-10 0:00:00.100000001");
+ // tdSql.checkData(1,0,"2021-06-10 0:00:00.150000000");
+ // tdSql.checkData(2,1,4);
+ // tdSql.checkData(3,1,3);
+ // tdSql.checkData(4,2,"2021-06-11 00:00:00.300000001");
+ // tdSql.checkData(5,2,"2021-06-13 00:00:00.999999999");
+ // tdSql.checkRows(6);
+ tester.executeQuery("select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000;");
+ Console.WriteLine("expected is : 1 " );
+ // tdSql.checkData(0,0,1);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 > '2021-06-11 0:00:00.100000000' and ts2 < '2021-06-11 0:00:00.100000002';");
+ Console.WriteLine("expected is : 1 " );
+ // tdSql.checkData(0,0,1);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 > 1623340800500000000;");
+ Console.WriteLine("expected is : 1 " );
+ // tdSql.checkData(0,0,1);
+ tester.executeQuery("select count(*) from tb2 where ts2 < '2021-06-11 0:00:00.400000000';");
+ Console.WriteLine("expected is : 5 " );
+ // tdSql.checkData(0,0,5);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 > now + 400000000b;");
+ Console.WriteLine("expected is : 0 " );
+ // tdSql.checkRows(0);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 >= '2021-06-11 0:00:00.100000001';");
+ Console.WriteLine("expected is : 6 " );
+ // tdSql.checkData(0,0,6);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 <= 1623340800400000000;");
+ Console.WriteLine("expected is : 5 " );
+ // tdSql.checkData(0,0,5);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 = '2021-06-11 0:00:00.000000000';");
+ Console.WriteLine("expected is : 0 " );
+ // tdSql.checkRows(0);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 = '2021-06-11 0:00:00.300000001';");
+ Console.WriteLine("expected is : 1 " );
+ // tdSql.checkData(0,0,1);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 = 1623340800300000001;");
+ Console.WriteLine("expected is : 1 " );
+ // tdSql.checkData(0,0,1);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;");
+ Console.WriteLine("expected is : 5 " );
+ // tdSql.checkData(0,0,5);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 between '2021-06-11 0:00:00.299999999' and '2021-06-11 0:00:00.300000001';");
+ Console.WriteLine("expected is : 3 " );
+ // tdSql.checkData(0,0,3);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 <> 1623513600999999999;");
+ Console.WriteLine("expected is : 5 " );
+ // tdSql.checkData(0,0,5);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 <> '2021-06-11 0:00:00.100000001';");
+ Console.WriteLine("expected is : 5 " );
+ // tdSql.checkData(0,0,5);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 <> '2021-06-11 0:00:00.100000000';");
+ Console.WriteLine("expected is : 6 " );
+ // tdSql.checkData(0,0,6);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 != 1623513600999999999;");
+ Console.WriteLine("expected is : 5 " );
+ // tdSql.checkData(0,0,5);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 != '2021-06-11 0:00:00.100000001';");
+ Console.WriteLine("expected is : 5 " );
+ // tdSql.checkData(0,0,5);
+
+ tester.executeQuery("select count(*) from tb2 where ts2 != '2021-06-11 0:00:00.100000000';");
+ Console.WriteLine("expected is : 6 " );
+ // tdSql.checkData(0,0,6);
+
+ tester.execute("insert into tb2 values(now + 500000000b, 6, now +2d);");
+ tester.executeQuery("select * from tb2;");
+ Console.WriteLine("expected is : 7 rows" );
+ // tdSql.checkRows(7);
+
+ // tdLog.debug("testing ill nanosecond format handling");
+ tester.execute("create table tb3 (ts timestamp, speed int);");
+ // tdSql.error("insert into tb3 values(16232544001500000, 2);");
+ tester.execute("insert into tb3 values('2021-06-10 0:00:00.123456', 2);");
+ tester.executeQuery("select * from tb3 where ts = '2021-06-10 0:00:00.123456000';");
+ // tdSql.checkRows(1);
+ Console.WriteLine("expected is : 1 rows " );
+
+ tester.execute("insert into tb3 values('2021-06-10 0:00:00.123456789000', 2);");
+ tester.executeQuery("select * from tb3 where ts = '2021-06-10 0:00:00.123456789';");
+ // tdSql.checkRows(1);
+ Console.WriteLine("expected is : 1 rows " );
+
+ // check timezone support
+ Console.WriteLine("nsdb" );
+ tester.execute("drop database if exists nsdb;");
+ tester.execute("create database nsdb precision 'ns';");
+ tester.execute("use nsdb;");
+ tester.execute("create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);");
+ tester.execute("insert into tb1 using st tags('2021-06-10 0:00:00.123456789' , 1 ) values('2021-06-10T0:00:00.123456789+07:00' , 1.0);" );
+ tester.executeQuery("select first(*) from tb1;");
+ Console.WriteLine("expected is : 1623258000123456789 " );
+ // tdSql.checkData(0,0,1623258000123456789);
+
+
+
+ Console.WriteLine("usdb" );
+ tester.execute("create database usdb precision 'us';");
+ tester.execute("use usdb;");
+ tester.execute("create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);");
+ tester.execute("insert into tb1 using st tags('2021-06-10 0:00:00.123456' , 1 ) values('2021-06-10T0:00:00.123456+07:00' , 1.0);" );
+ tester.executeQuery("select first(*) from tb1;");
+
+ Console.WriteLine("expected is : 1623258000123456 " );
+
+ Console.WriteLine("msdb" );
+ tester.execute("drop database if exists msdb;");
+ tester.execute("create database msdb precision 'ms';");
+ tester.execute("use msdb;");
+ tester.execute("create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);");
+ tester.execute("insert into tb1 using st tags('2021-06-10 0:00:00.123' , 1 ) values('2021-06-10T0:00:00.123+07:00' , 1.0);" );
+ tester.executeQuery("select first(*) from tb1;");
+ Console.WriteLine("expected is : 1623258000123 " );
+
+
+
+ tester.CloseConnection();
+ tester.cleanup();
+
+
+ }
+
+ public void InitTDengine()
+ {
+ TDengine.Options((int)TDengineInitOption.TDDB_OPTION_CONFIGDIR, this.configDir);
+ TDengine.Options((int)TDengineInitOption.TDDB_OPTION_SHELL_ACTIVITY_TIMER, "60");
+ Console.WriteLine("init...");
+ TDengine.Init();
+ Console.WriteLine("get connection starting...");
+ }
+
+ public void ConnectTDengine()
+ {
+ string db = "";
+ this.conn = TDengine.Connect(this.host, this.user, this.password, db, this.port);
+ if (this.conn == IntPtr.Zero)
+ {
+ Console.WriteLine("connection failed: " + this.host);
+ ExitProgram();
+ }
+ else
+ {
+ Console.WriteLine("[ OK ] Connection established.");
+ }
+ }
+ //EXECUTE SQL
+ public void execute(string sql)
+ {
+ DateTime dt1 = DateTime.Now;
+ IntPtr res = TDengine.Query(this.conn, sql.ToString());
+ DateTime dt2 = DateTime.Now;
+ TimeSpan span = dt2 - dt1;
+
+ if ((res == IntPtr.Zero) || (TDengine.ErrorNo(res) != 0))
+ {
+ Console.Write(sql.ToString() + " failure, ");
+ if (res != IntPtr.Zero) {
+ Console.Write("reason: " + TDengine.Error(res));
+ }
+ Console.WriteLine("");
+ ExitProgram();
+ }
+ else
+ {
+ Console.WriteLine(sql.ToString() + " success");
+ }
+ TDengine.FreeResult(res);
+ }
+ //EXECUTE QUERY
+ public void executeQuery(string sql)
+ {
+
+ DateTime dt1 = DateTime.Now;
+ long queryRows = 0;
+ IntPtr res = TDengine.Query(conn, sql);
+ getPrecision(res);
+ if ((res == IntPtr.Zero) || (TDengine.ErrorNo(res) != 0))
+ {
+ Console.Write(sql.ToString() + " failure, ");
+ if (res != IntPtr.Zero) {
+ Console.Write("reason: " + TDengine.Error(res));
+ }
+ Console.WriteLine("");
+ ExitProgram();
+ }
+ DateTime dt2 = DateTime.Now;
+ TimeSpan span = dt2 - dt1;
+ Console.WriteLine("[OK] time cost: " + span.ToString() + "ms, execute statement ====> " + sql.ToString());
+ int fieldCount = TDengine.FieldCount(res);
+
+ List metas = TDengine.FetchFields(res);
+ for (int j = 0; j < metas.Count; j++)
+ {
+ TDengineMeta meta = (TDengineMeta)metas[j];
+ }
+
+ IntPtr rowdata;
+ StringBuilder builder = new StringBuilder();
+ while ((rowdata = TDengine.FetchRows(res)) != IntPtr.Zero)
+ {
+ queryRows++;
+ for (int fields = 0; fields < fieldCount; ++fields)
+ {
+ TDengineMeta meta = metas[fields];
+ int offset = IntPtr.Size * fields;
+ IntPtr data = Marshal.ReadIntPtr(rowdata, offset);
+
+ builder.Append("---");
+
+ if (data == IntPtr.Zero)
+ {
+ builder.Append("NULL");
+ continue;
+ }
+
+ switch ((TDengineDataType)meta.type)
+ {
+ case TDengineDataType.TSDB_DATA_TYPE_BOOL:
+ bool v1 = Marshal.ReadByte(data) == 0 ? false : true;
+ builder.Append(v1);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_TINYINT:
+ byte v2 = Marshal.ReadByte(data);
+ builder.Append(v2);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_SMALLINT:
+ short v3 = Marshal.ReadInt16(data);
+ builder.Append(v3);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_INT:
+ int v4 = Marshal.ReadInt32(data);
+ builder.Append(v4);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_BIGINT:
+ long v5 = Marshal.ReadInt64(data);
+ builder.Append(v5);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_FLOAT:
+ float v6 = (float)Marshal.PtrToStructure(data, typeof(float));
+ builder.Append(v6);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_DOUBLE:
+ double v7 = (double)Marshal.PtrToStructure(data, typeof(double));
+ builder.Append(v7);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_BINARY:
+ string v8 = Marshal.PtrToStringAnsi(data);
+ builder.Append(v8);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP:
+ long v9 = Marshal.ReadInt64(data);
+ builder.Append(v9);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_NCHAR:
+ string v10 = Marshal.PtrToStringAnsi(data);
+ builder.Append(v10);
+ break;
+ }
+ }
+ builder.Append("---");
+
+ if (queryRows <= 10)
+ {
+ Console.WriteLine(builder.ToString());
+ }
+ builder.Clear();
+ }
+
+ if (TDengine.ErrorNo(res) != 0)
+ {
+ Console.Write("Query is not complete, Error {0:G}", TDengine.ErrorNo(res), TDengine.Error(res));
+ }
+ Console.WriteLine("");
+
+ TDengine.FreeResult(res);
+
+ }
+
+ public void CloseConnection()
+ {
+ if (this.conn != IntPtr.Zero)
+ {
+ TDengine.Close(this.conn);
+ Console.WriteLine("connection closed.");
+ }
+ }
+
+ static void ExitProgram()
+ {
+ System.Environment.Exit(0);
+ }
+
+ public void cleanup()
+ {
+ Console.WriteLine("clean up...");
+ System.Environment.Exit(0);
+ }
+
+ // method to get db precision
+ public void getPrecision(IntPtr res)
+ {
+ int psc=TDengine.ResultPrecision(res);
+ switch(psc)
+ {
+ case 0:
+ Console.WriteLine("db：[{0:G}]'s precision is {1:G}",this.dbName,"millisecond");
+ break;
+ case 1:
+ Console.WriteLine("db：[{0:G}]'s precision is {1:G}",this.dbName,"microsecond");
+ break;
+ case 2:
+ Console.WriteLine("db：[{0:G}]'s precision is {1:G}",this.dbName,"nanosecond");
+ break;
+ }
+
+ }
+
+ // public void checkData(int x ,int y , long ts ){
+
+ // }
+
+ }
+}
+
diff --git a/tests/connectorTest/nodejsTest/nanosupport/nanosecondTest.js b/tests/connectorTest/nodejsTest/nanosupport/nanosecondTest.js
new file mode 100644
index 0000000000000000000000000000000000000000..11812ac84b91d5c639a3b3bd73c8b81838c5cc23
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nanosupport/nanosecondTest.js
@@ -0,0 +1,290 @@
+const taos = require('td2.0-connector');
+var conn = taos.connect({host:"localhost", user:"root", password:"taosdata", config:"/etc/taos",port:6030})
+var c1 = conn.cursor();
+
+
+function checkData(sql,row,col,data){
+
+
+ console.log(sql)
+ c1.execute(sql)
+ var d = c1.fetchall();
+ let checkdata = d[row][col];
+ if (checkdata == data) {
+
+ console.log('check pass')
+ }
+ else{
+ console.log('check failed')
+ console.log('checked is :',checkdata)
+ console.log("expected is :",data)
+
+
+ }
+}
+
+
+// nano basic case
+
+c1.execute('reset query cache')
+c1.execute('drop database if exists db')
+c1.execute('create database db precision "ns";')
+c1.execute('use db');
+c1.execute('create table tb (ts timestamp, speed int)')
+c1.execute('insert into tb values(\'2021-06-10 00:00:00.100000001\', 1);')
+c1.execute('insert into tb values(1623254400150000000, 2);')
+c1.execute('import into tb values(1623254400300000000, 3);')
+c1.execute('import into tb values(1623254400299999999, 4);')
+c1.execute('insert into tb values(1623254400300000001, 5);')
+c1.execute('insert into tb values(1623254400999999999, 7);')
+c1.execute('insert into tb values(1623254400123456789, 8);')
+sql = 'select * from tb;'
+
+console.log('*******************************************')
+console.log('this is area about checkdata result')
+//check data about insert data
+checkData(sql,0,0,'2021-06-10 00:00:00.100000001')
+checkData(sql,1,0,'2021-06-10 00:00:00.123456789')
+checkData(sql,2,0,'2021-06-10 00:00:00.150000000')
+checkData(sql,3,0,'2021-06-10 00:00:00.299999999')
+checkData(sql,4,0,'2021-06-10 00:00:00.300000000')
+checkData(sql,5,0,'2021-06-10 00:00:00.300000001')
+checkData(sql,6,0,'2021-06-10 00:00:00.999999999')
+checkData(sql,0,1,1)
+checkData(sql,1,1,8)
+checkData(sql,2,1,2)
+checkData(sql,5,1,5)
+
+
+
+// us basic case
+
+c1.execute('reset query cache')
+c1.execute('drop database if exists usdb')
+c1.execute('create database usdb precision "us";')
+c1.execute('use usdb');
+c1.execute('create table tb (ts timestamp, speed int)')
+c1.execute('insert into tb values(\'2021-06-10 00:00:00.100001\', 1);')
+c1.execute('insert into tb values(1623254400150000, 2);')
+c1.execute('import into tb values(1623254400300000, 3);')
+c1.execute('import into tb values(1623254400299999, 4);')
+c1.execute('insert into tb values(1623254400300001, 5);')
+c1.execute('insert into tb values(1623254400999999, 7);')
+c1.execute('insert into tb values(1623254400123789, 8);')
+sql = 'select * from tb;'
+
+console.log('*******************************************')
+
+//check data about insert data
+checkData(sql,0,0,'2021-06-10 00:00:00.100001')
+checkData(sql,1,0,'2021-06-10 00:00:00.123789')
+checkData(sql,2,0,'2021-06-10 00:00:00.150000')
+checkData(sql,3,0,'2021-06-10 00:00:00.299999')
+checkData(sql,4,0,'2021-06-10 00:00:00.300000')
+checkData(sql,5,0,'2021-06-10 00:00:00.300001')
+checkData(sql,6,0,'2021-06-10 00:00:00.999999')
+checkData(sql,0,1,1)
+checkData(sql,1,1,8)
+checkData(sql,2,1,2)
+checkData(sql,5,1,5)
+
+console.log('*******************************************')
+
+// ms basic case
+
+c1.execute('reset query cache')
+c1.execute('drop database if exists msdb')
+c1.execute('create database msdb precision "ms";')
+c1.execute('use msdb');
+c1.execute('create table tb (ts timestamp, speed int)')
+c1.execute('insert into tb values(\'2021-06-10 00:00:00.101\', 1);')
+c1.execute('insert into tb values(1623254400150, 2);')
+c1.execute('import into tb values(1623254400300, 3);')
+c1.execute('import into tb values(1623254400299, 4);')
+c1.execute('insert into tb values(1623254400301, 5);')
+c1.execute('insert into tb values(1623254400789, 7);')
+c1.execute('insert into tb values(1623254400999, 8);')
+sql = 'select * from tb;'
+
+console.log('*******************************************')
+console.log('this is area about checkdata result')
+//check data about insert data
+checkData(sql,0,0,'2021-06-10 00:00:00.101')
+checkData(sql,1,0,'2021-06-10 00:00:00.150')
+checkData(sql,2,0,'2021-06-10 00:00:00.299')
+checkData(sql,3,0,'2021-06-10 00:00:00.300')
+checkData(sql,4,0,'2021-06-10 00:00:00.301')
+checkData(sql,5,0,'2021-06-10 00:00:00.789')
+checkData(sql,6,0,'2021-06-10 00:00:00.999')
+checkData(sql,0,1,1)
+checkData(sql,1,1,2)
+checkData(sql,2,1,4)
+checkData(sql,5,1,7)
+
+console.log('*******************************************')
+
+// offfical query result to show
+// console.log('this is area about fetch all data')
+// var query = c1.query(sql)
+// var promise = query.execute();
+// promise.then(function(result) {
+// result.pretty();
+// });
+
+console.log('*******************************************')
+c1.execute('use db')
+
+sql2 = 'select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;'
+checkData(sql2,0,0,1)
+
+sql3 = 'select count(*) from tb where ts > \'2021-06-10 0:00:00.100000001\' and ts < \'2021-06-10 0:00:00.160000000\';'
+checkData(sql3,0,0,2)
+
+sql4 = 'select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000;'
+checkData(sql4,0,0,2)
+
+sql5 = 'select count(*) from tb where ts > \'2021-06-10 0:00:00.100000000\' and ts < \'2021-06-10 0:00:00.150000000\';'
+checkData(sql5,0,0,2)
+
+sql6 = 'select count(*) from tb where ts > 1623254400400000000;'
+checkData(sql6,0,0,1)
+
+sql7 = 'select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\';'
+checkData(sql7,0,0,6)
+
+sql8 = 'select count(*) from tb where ts > now + 400000000b;'
+c1.execute(sql8)
+
+sql9 = 'select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\';'
+checkData(sql9,0,0,7)
+
+sql10 = 'select count(*) from tb where ts <= 1623254400300000000;'
+checkData(sql10,0,0,5)
+
+sql11 = 'select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\';'
+c1.execute(sql11)
+
+sql12 = 'select count(*) from tb where ts = 1623254400150000000;'
+checkData(sql12,0,0,1)
+
+sql13 = 'select count(*) from tb where ts = \'2021-06-10 0:00:00.100000001\';'
+checkData(sql13,0,0,1)
+
+sql14 = 'select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000;'
+checkData(sql14,0,0,6)
+
+sql15 = 'select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\';'
+checkData(sql15,0,0,3)
+
+sql16 = 'select avg(speed) from tb interval(5000000000b);'
+checkData(sql16,0,0,'2021-06-10 00:00:00.000000000')
+
+sql17 = 'select avg(speed) from tb interval(100000000b)'
+checkData(sql17,0,1,3.6666666666666665)
+checkData(sql17,1,1,4.000000000)
+
+checkData(sql17,2,0,'2021-06-10 00:00:00.300000000')
+checkData(sql17,3,0,'2021-06-10 00:00:00.900000000')
+
+console.log("print break ")
+
+// sql18 = 'select avg(speed) from tb interval(999b)'
+// c1.execute(sql18)
+
+console.log("print break2 ")
+sql19 = 'select avg(speed) from tb interval(1u);'
+checkData(sql19,2,1,2.000000000)
+checkData(sql19,3,0,'2021-06-10 00:00:00.299999000')
+
+sql20 = 'select avg(speed) from tb interval(100000000b) sliding (100000000b);'
+checkData(sql20,2,1,4.000000000)
+checkData(sql20,3,0,'2021-06-10 00:00:00.900000000')
+
+sql21 = 'select last(*) from tb;'
+checkData(sql21,0,0,'2021-06-10 00:00:00.999999999')
+
+sql22 = 'select first(*) from tb;'
+checkData(sql22,0,0,'2021-06-10 00:00:00.100000001')
+
+// timezone support
+
+console.log('testing nanosecond support in other timestamps')
+
+c1.execute('create table tb2 (ts timestamp, speed int, ts2 timestamp);')
+c1.execute('insert into tb2 values(\'2021-06-10 0:00:00.100000001\', 1, \'2021-06-11 0:00:00.100000001\');')
+c1.execute('insert into tb2 values(1623254400150000000, 2, 1623340800150000000);')
+c1.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000);')
+c1.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999);')
+c1.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001);')
+c1.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999);')
+
+sql23 = 'select * from tb2;'
+checkData(sql23,0,0,'2021-06-10 00:00:00.100000001')
+checkData(sql23,1,0,'2021-06-10 00:00:00.150000000')
+checkData(sql23,2,1,4)
+checkData(sql23,3,1,3)
+checkData(sql23,4,2,'2021-06-11 00:00:00.300000001')
+checkData(sql23,5,2,'2021-06-13 00:00:00.999999999')
+
+sql24 = 'select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\';'
+checkData(sql24,0,0,6)
+
+sql25 = 'select count(*) from tb2 where ts2 <= 1623340800400000000;'
+checkData(sql25,0,0,5)
+
+sql26 = 'select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.300000001\';'
+checkData(sql26,0,0,1)
+
+sql27 = 'select count(*) from tb2 where ts2 = 1623340800300000001;'
+checkData(sql27,0,0,1)
+
+sql28 = 'select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;'
+checkData(sql28,0,0,5)
+
+sql29 = 'select count(*) from tb2 where ts2 between \'2021-06-11 0:00:00.299999999\' and \'2021-06-11 0:00:00.300000001\';'
+checkData(sql29,0,0,3)
+
+sql30 = 'select count(*) from tb2 where ts2 <> 1623513600999999999;'
+checkData(sql30,0,0,5)
+
+sql31 = 'select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\';'
+checkData(sql31,0,0,5)
+
+sql32 = 'select count(*) from tb2 where ts2 != 1623513600999999999;'
+checkData(sql32,0,0,5)
+
+sql33 = 'select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\';'
+checkData(sql33,0,0,5)
+
+c1.execute('insert into tb2 values(now + 500000000b, 6, now +2d);')
+
+sql34 = 'select count(*) from tb2;'
+checkData(sql34,0,0,7)
+
+
+// check timezone support
+
+c1.execute('use db;')
+c1.execute('create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);')
+c1.execute('insert into stb1 using st tags("2021-06-10 0:00:00.123456789" , 1 ) values("2021-06-10T0:00:00.123456789+07:00" , 1.0);' )
+sql35 = 'select first(*) from stb1;'
+checkData(sql35,0,0,'2021-06-10 01:00:00.123456789')
+
+c1.execute('use usdb;')
+c1.execute('create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);')
+c1.execute('insert into stb1 using st tags("2021-06-10 0:00:00.123456" , 1 ) values("2021-06-10T0:00:00.123456+07:00" , 1.0);' )
+sql36 = 'select first(*) from stb1;'
+checkData(sql36,0,0,'2021-06-10 01:00:00.123456')
+
+c1.execute('use msdb;')
+c1.execute('create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);')
+c1.execute('insert into stb1 using st tags("2021-06-10 0:00:00.123456" , 1 ) values("2021-06-10T0:00:00.123456+07:00" , 1.0);' )
+sql36 = 'select first(*) from stb1;'
+checkData(sql36,0,0,'2021-06-10 01:00:00.123')
+
+
+
+
+
+
+
diff --git a/tests/connectorTest/nodejsTest/nodetaos/cinterface.js b/tests/connectorTest/nodejsTest/nodetaos/cinterface.js
new file mode 100644
index 0000000000000000000000000000000000000000..03d27e5593ccb15d8ff47cd3c3dedba765d14fc1
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nodetaos/cinterface.js
@@ -0,0 +1,587 @@
+/**
+ * C Interface with TDengine Module
+ * @module CTaosInterface
+ */
+
+const ref = require('ref-napi');
+const os = require('os');
+const ffi = require('ffi-napi');
+const ArrayType = require('ref-array-napi');
+const Struct = require('ref-struct-napi');
+const FieldTypes = require('./constants');
+const errors = require('./error');
+const TaosObjects = require('./taosobjects');
+const { NULL_POINTER } = require('ref-napi');
+
+module.exports = CTaosInterface;
+
+function convertTimestamp(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
+ data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
+ let res = [];
+ let currOffset = 0;
+ while (currOffset < data.length) {
+ let time = data.readInt64LE(currOffset);
+ currOffset += nbytes;
+ res.push(new TaosObjects.TaosTimestamp(time, precision));
+ }
+ return res;
+}
+function convertBool(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
+ data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
+ let res = new Array(data.length);
+ for (let i = 0; i < data.length; i++) {
+ if (data[i] == 0) {
+ res[i] = false;
+ }
+ else if (data[i] == 1) {
+ res[i] = true;
+ }
+ else if (data[i] == FieldTypes.C_BOOL_NULL) {
+ res[i] = null;
+ }
+ }
+ return res;
+}
+function convertTinyint(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
+ data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
+ let res = [];
+ let currOffset = 0;
+ while (currOffset < data.length) {
+ let d = data.readIntLE(currOffset, 1);
+ res.push(d == FieldTypes.C_TINYINT_NULL ? null : d);
+ currOffset += nbytes;
+ }
+ return res;
+}
+function convertSmallint(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
+ data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
+ let res = [];
+ let currOffset = 0;
+ while (currOffset < data.length) {
+ let d = data.readIntLE(currOffset, 2);
+ res.push(d == FieldTypes.C_SMALLINT_NULL ? null : d);
+ currOffset += nbytes;
+ }
+ return res;
+}
+function convertInt(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
+ data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
+ let res = [];
+ let currOffset = 0;
+ while (currOffset < data.length) {
+ let d = data.readInt32LE(currOffset);
+ res.push(d == FieldTypes.C_INT_NULL ? null : d);
+ currOffset += nbytes;
+ }
+ return res;
+}
+function convertBigint(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
+ data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
+ let res = [];
+ let currOffset = 0;
+ while (currOffset < data.length) {
+ let d = data.readInt64LE(currOffset);
+ res.push(d == FieldTypes.C_BIGINT_NULL ? null : BigInt(d));
+ currOffset += nbytes;
+ }
+ return res;
+}
+function convertFloat(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
+ data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
+ let res = [];
+ let currOffset = 0;
+ while (currOffset < data.length) {
+ let d = parseFloat(data.readFloatLE(currOffset).toFixed(5));
+ res.push(isNaN(d) ? null : d);
+ currOffset += nbytes;
+ }
+ return res;
+}
+function convertDouble(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
+ data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
+ let res = [];
+ let currOffset = 0;
+ while (currOffset < data.length) {
+ let d = parseFloat(data.readDoubleLE(currOffset).toFixed(16));
+ res.push(isNaN(d) ? null : d);
+ currOffset += nbytes;
+ }
+ return res;
+}
+
+function convertNchar(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
+ data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
+ let res = [];
+
+ let currOffset = 0;
+ while (currOffset < data.length) {
+ let len = data.readIntLE(currOffset, 2);
+ let dataEntry = data.slice(currOffset + 2, currOffset + len + 2); //one entry in a row under a column;
+ res.push(dataEntry.toString("utf-8"));
+ currOffset += nbytes;
+ }
+ return res;
+}
+
+// Object with all the relevant converters from pblock data to javascript readable data
+let convertFunctions = {
+ [FieldTypes.C_BOOL]: convertBool,
+ [FieldTypes.C_TINYINT]: convertTinyint,
+ [FieldTypes.C_SMALLINT]: convertSmallint,
+ [FieldTypes.C_INT]: convertInt,
+ [FieldTypes.C_BIGINT]: convertBigint,
+ [FieldTypes.C_FLOAT]: convertFloat,
+ [FieldTypes.C_DOUBLE]: convertDouble,
+ [FieldTypes.C_BINARY]: convertNchar,
+ [FieldTypes.C_TIMESTAMP]: convertTimestamp,
+ [FieldTypes.C_NCHAR]: convertNchar
+}
+
+// Define TaosField structure
+var char_arr = ArrayType(ref.types.char);
+var TaosField = Struct({
+ 'name': char_arr,
+});
+TaosField.fields.name.type.size = 65;
+TaosField.defineProperty('type', ref.types.char);
+TaosField.defineProperty('bytes', ref.types.short);
+
+
+/**
+ *
+ * @param {Object} config - Configuration options for the interface
+ * @return {CTaosInterface}
+ * @class CTaosInterface
+ * @classdesc The CTaosInterface is the interface through which Node.JS communicates data back and forth with TDengine. It is not advised to
+ * access this class directly and use it unless you understand what these functions do.
+ */
+function CTaosInterface(config = null, pass = false) {
+ ref.types.char_ptr = ref.refType(ref.types.char);
+ ref.types.void_ptr = ref.refType(ref.types.void);
+ ref.types.void_ptr2 = ref.refType(ref.types.void_ptr);
+ /*Declare a bunch of functions first*/
+ /* Note, pointers to TAOS_RES, TAOS, are ref.types.void_ptr. The connection._conn buffer is supplied for pointers to TAOS * */
+
+ if ('win32' == os.platform()) {
+ taoslibname = 'taos';
+ } else {
+ taoslibname = 'libtaos';
+ }
+ this.libtaos = ffi.Library(taoslibname, {
+ 'taos_options': [ref.types.int, [ref.types.int, ref.types.void_ptr]],
+ 'taos_init': [ref.types.void, []],
+ //TAOS *taos_connect(char *ip, char *user, char *pass, char *db, int port)
+ 'taos_connect': [ref.types.void_ptr, [ref.types.char_ptr, ref.types.char_ptr, ref.types.char_ptr, ref.types.char_ptr, ref.types.int]],
+ //void taos_close(TAOS *taos)
+ 'taos_close': [ref.types.void, [ref.types.void_ptr]],
+ //int *taos_fetch_lengths(TAOS_RES *res);
+ 'taos_fetch_lengths': [ref.types.void_ptr, [ref.types.void_ptr]],
+ //int taos_query(TAOS *taos, char *sqlstr)
+ 'taos_query': [ref.types.void_ptr, [ref.types.void_ptr, ref.types.char_ptr]],
+ //int taos_affected_rows(TAOS_RES *res)
+ 'taos_affected_rows': [ref.types.int, [ref.types.void_ptr]],
+ //int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows)
+ 'taos_fetch_block': [ref.types.int, [ref.types.void_ptr, ref.types.void_ptr]],
+ //int taos_num_fields(TAOS_RES *res);
+ 'taos_num_fields': [ref.types.int, [ref.types.void_ptr]],
+ //TAOS_ROW taos_fetch_row(TAOS_RES *res)
+ //TAOS_ROW is void **, but we set the return type as a reference instead to get the row
+ 'taos_fetch_row': [ref.refType(ref.types.void_ptr2), [ref.types.void_ptr]],
+ 'taos_print_row': [ref.types.int, [ref.types.char_ptr, ref.types.void_ptr, ref.types.void_ptr, ref.types.int]],
+ //int taos_result_precision(TAOS_RES *res)
+ 'taos_result_precision': [ref.types.int, [ref.types.void_ptr]],
+ //void taos_free_result(TAOS_RES *res)
+ 'taos_free_result': [ref.types.void, [ref.types.void_ptr]],
+ //int taos_field_count(TAOS *taos)
+ 'taos_field_count': [ref.types.int, [ref.types.void_ptr]],
+ //TAOS_FIELD *taos_fetch_fields(TAOS_RES *res)
+ 'taos_fetch_fields': [ref.refType(TaosField), [ref.types.void_ptr]],
+ //int taos_errno(TAOS *taos)
+ 'taos_errno': [ref.types.int, [ref.types.void_ptr]],
+ //char *taos_errstr(TAOS *taos)
+ 'taos_errstr': [ref.types.char_ptr, [ref.types.void_ptr]],
+ //void taos_stop_query(TAOS_RES *res);
+ 'taos_stop_query': [ref.types.void, [ref.types.void_ptr]],
+ //char *taos_get_server_info(TAOS *taos);
+ 'taos_get_server_info': [ref.types.char_ptr, [ref.types.void_ptr]],
+ //char *taos_get_client_info();
+ 'taos_get_client_info': [ref.types.char_ptr, []],
+
+ // ASYNC
+ // void taos_query_a(TAOS *taos, char *sqlstr, void (*fp)(void *, TAOS_RES *, int), void *param)
+ 'taos_query_a': [ref.types.void, [ref.types.void_ptr, ref.types.char_ptr, ref.types.void_ptr, ref.types.void_ptr]],
+ // void taos_fetch_rows_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, int numOfRows), void *param);
+ 'taos_fetch_rows_a': [ref.types.void, [ref.types.void_ptr, ref.types.void_ptr, ref.types.void_ptr]],
+
+ // Subscription
+ //TAOS_SUB *taos_subscribe(TAOS* taos, int restart, const char* topic, const char *sql, TAOS_SUBSCRIBE_CALLBACK fp, void *param, int interval)
+ 'taos_subscribe': [ref.types.void_ptr, [ref.types.void_ptr, ref.types.int, ref.types.char_ptr, ref.types.char_ptr, ref.types.void_ptr, ref.types.void_ptr, ref.types.int]],
+ // TAOS_RES *taos_consume(TAOS_SUB *tsub)
+ 'taos_consume': [ref.types.void_ptr, [ref.types.void_ptr]],
+ //void taos_unsubscribe(TAOS_SUB *tsub);
+ 'taos_unsubscribe': [ref.types.void, [ref.types.void_ptr]],
+
+ // Continuous Query
+ //TAOS_STREAM *taos_open_stream(TAOS *taos, char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
+ // int64_t stime, void *param, void (*callback)(void *));
+ 'taos_open_stream': [ref.types.void_ptr, [ref.types.void_ptr, ref.types.char_ptr, ref.types.void_ptr, ref.types.int64, ref.types.void_ptr, ref.types.void_ptr]],
+ //void taos_close_stream(TAOS_STREAM *tstr);
+ 'taos_close_stream': [ref.types.void, [ref.types.void_ptr]]
+
+ });
+ if (pass == false) {
+ if (config == null) {
+ this._config = ref.alloc(ref.types.char_ptr, ref.NULL);
+ }
+ else {
+ try {
+ this._config = ref.allocCString(config);
+ }
+ catch (err) {
+ throw "Attribute Error: config is expected as a str";
+ }
+ }
+ if (config != null) {
+ this.libtaos.taos_options(3, this._config);
+ }
+ this.libtaos.taos_init();
+ }
+ return this;
+}
+CTaosInterface.prototype.config = function config() {
+ return this._config;
+}
+CTaosInterface.prototype.connect = function connect(host = null, user = "root", password = "taosdata", db = null, port = 0) {
+ let _host, _user, _password, _db, _port;
+ try {
+ _host = host != null ? ref.allocCString(host) : ref.NULL;
+ }
+ catch (err) {
+ throw "Attribute Error: host is expected as a str";
+ }
+ try {
+ _user = ref.allocCString(user)
+ }
+ catch (err) {
+ throw "Attribute Error: user is expected as a str";
+ }
+ try {
+ _password = ref.allocCString(password);
+ }
+ catch (err) {
+ throw "Attribute Error: password is expected as a str";
+ }
+ try {
+ _db = db != null ? ref.allocCString(db) : ref.NULL;
+ }
+ catch (err) {
+ throw "Attribute Error: db is expected as a str";
+ }
+ try {
+ _port = ref.alloc(ref.types.int, port);
+ }
+ catch (err) {
+ throw TypeError("port is expected as an int")
+ }
+ let connection = this.libtaos.taos_connect(_host, _user, _password, _db, _port);
+ if (ref.isNull(connection)) {
+ throw new errors.TDError('Failed to connect to TDengine');
+ }
+ else {
+ console.log('Successfully connected to TDengine');
+ }
+ return connection;
+}
+CTaosInterface.prototype.close = function close(connection) {
+ this.libtaos.taos_close(connection);
+ console.log("Connection is closed");
+}
+CTaosInterface.prototype.query = function query(connection, sql) {
+ return this.libtaos.taos_query(connection, ref.allocCString(sql));
+}
+CTaosInterface.prototype.affectedRows = function affectedRows(result) {
+ return this.libtaos.taos_affected_rows(result);
+}
+CTaosInterface.prototype.useResult = function useResult(result) {
+
+ let fields = [];
+ let pfields = this.fetchFields(result);
+ if (ref.isNull(pfields) == false) {
+ pfields = ref.reinterpret(pfields, this.fieldsCount(result) * 68, 0);
+ for (let i = 0; i < pfields.length; i += 68) {
+ //0 - 63 = name //64 - 65 = bytes, 66 - 67 = type
+ fields.push({
+ name: ref.readCString(ref.reinterpret(pfields, 65, i)),
+ type: pfields[i + 65],
+ bytes: pfields[i + 66]
+ })
+ }
+ }
+ return fields;
+}
+CTaosInterface.prototype.fetchBlock = function fetchBlock(result, fields) {
+ let pblock = ref.NULL_POINTER;
+ let num_of_rows = this.libtaos.taos_fetch_block(result, pblock);
+ if (ref.isNull(pblock.deref()) == true) {
+ return { block: null, num_of_rows: 0 };
+ }
+
+ var fieldL = this.libtaos.taos_fetch_lengths(result);
+ let precision = this.libtaos.taos_result_precision(result);
+
+ var fieldlens = [];
+
+ if (ref.isNull(fieldL) == false) {
+ for (let i = 0; i < fields.length; i++) {
+ let plen = ref.reinterpret(fieldL, 4, i * 4);
+ let len = plen.readInt32LE(0);
+ fieldlens.push(len);
+ }
+ }
+
+ let blocks = new Array(fields.length);
+ blocks.fill(null);
+ num_of_rows = Math.abs(num_of_rows);
+ let offset = 0;
+ let ptr = pblock.deref();
+
+ for (let i = 0; i < fields.length; i++) {
+ pdata = ref.reinterpret(ptr, 8, i * 8);
+ if (ref.isNull(pdata.readPointer())) {
+ blocks[i] = new Array();
+ } else {
+ pdata = ref.ref(pdata.readPointer());
+ if (!convertFunctions[fields[i]['type']]) {
+ throw new errors.DatabaseError("Invalid data type returned from database");
+ }
+ blocks[i] = convertFunctions[fields[i]['type']](pdata, num_of_rows, fieldlens[i], offset, precision);
+ }
+ }
+ return { blocks: blocks, num_of_rows }
+}
+CTaosInterface.prototype.fetchRow = function fetchRow(result, fields) {
+ let row = this.libtaos.taos_fetch_row(result);
+ return row;
+}
+CTaosInterface.prototype.freeResult = function freeResult(result) {
+ this.libtaos.taos_free_result(result);
+ result = null;
+}
+/** Number of fields returned in this result handle, must use with async */
+CTaosInterface.prototype.numFields = function numFields(result) {
+ return this.libtaos.taos_num_fields(result);
+}
+// Fetch fields count by connection, the latest query
+CTaosInterface.prototype.fieldsCount = function fieldsCount(result) {
+ return this.libtaos.taos_field_count(result);
+}
+CTaosInterface.prototype.fetchFields = function fetchFields(result) {
+ return this.libtaos.taos_fetch_fields(result);
+}
+CTaosInterface.prototype.errno = function errno(result) {
+ return this.libtaos.taos_errno(result);
+}
+CTaosInterface.prototype.errStr = function errStr(result) {
+ return ref.readCString(this.libtaos.taos_errstr(result));
+}
+// Async
+CTaosInterface.prototype.query_a = function query_a(connection, sql, callback, param = ref.ref(ref.NULL)) {
+ // void taos_query_a(TAOS *taos, char *sqlstr, void (*fp)(void *param, TAOS_RES *, int), void *param)
+ callback = ffi.Callback(ref.types.void, [ref.types.void_ptr, ref.types.void_ptr, ref.types.int], callback);
+ this.libtaos.taos_query_a(connection, ref.allocCString(sql), callback, param);
+ return param;
+}
+/** Asynchrnously fetches the next block of rows. Wraps callback and transfers a 4th argument to the cursor, the row data as blocks in javascript form
+ * Note: This isn't a recursive function, in order to fetch all data either use the TDengine cursor object, TaosQuery object, or implement a recrusive
+ * function yourself using the libtaos.taos_fetch_rows_a function
+ */
+CTaosInterface.prototype.fetch_rows_a = function fetch_rows_a(result, callback, param = ref.ref(ref.NULL)) {
+ // void taos_fetch_rows_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, int numOfRows), void *param);
+ var cti = this;
+ // wrap callback with a function so interface can access the numOfRows value, needed in order to properly process the binary data
+ let asyncCallbackWrapper = function (param2, result2, numOfRows2) {
+ // Data preparation to pass to cursor. Could be bottleneck in query execution callback times.
+ let row = cti.libtaos.taos_fetch_row(result2);
+ let fields = cti.fetchFields_a(result2);
+
+ let precision = cti.libtaos.taos_result_precision(result2);
+ let blocks = new Array(fields.length);
+ blocks.fill(null);
+ numOfRows2 = Math.abs(numOfRows2);
+ let offset = 0;
+ var fieldL = cti.libtaos.taos_fetch_lengths(result);
+ var fieldlens = [];
+ if (ref.isNull(fieldL) == false) {
+
+ for (let i = 0; i < fields.length; i++) {
+ let plen = ref.reinterpret(fieldL, 8, i * 8);
+ let len = ref.get(plen, 0, ref.types.int32);
+ fieldlens.push(len);
+ }
+ }
+ if (numOfRows2 > 0) {
+ for (let i = 0; i < fields.length; i++) {
+ if (ref.isNull(pdata.readPointer())) {
+ blocks[i] = new Array();
+ } else {
+ if (!convertFunctions[fields[i]['type']]) {
+ throw new errors.DatabaseError("Invalid data type returned from database");
+ }
+ let prow = ref.reinterpret(row, 8, i * 8);
+ prow = prow.readPointer();
+ prow = ref.ref(prow);
+ blocks[i] = convertFunctions[fields[i]['type']](prow, 1, fieldlens[i], offset, precision);
+ //offset += fields[i]['bytes'] * numOfRows2;
+ }
+ }
+ }
+ callback(param2, result2, numOfRows2, blocks);
+ }
+ asyncCallbackWrapper = ffi.Callback(ref.types.void, [ref.types.void_ptr, ref.types.void_ptr, ref.types.int], asyncCallbackWrapper);
+ this.libtaos.taos_fetch_rows_a(result, asyncCallbackWrapper, param);
+ return param;
+}
+// Fetch field meta data by result handle
+CTaosInterface.prototype.fetchFields_a = function fetchFields_a(result) {
+ let pfields = this.fetchFields(result);
+ let pfieldscount = this.numFields(result);
+ let fields = [];
+ if (ref.isNull(pfields) == false) {
+ pfields = ref.reinterpret(pfields, 68 * pfieldscount, 0);
+ for (let i = 0; i < pfields.length; i += 68) {
+ //0 - 64 = name //65 = type, 66 - 67 = bytes
+ fields.push({
+ name: ref.readCString(ref.reinterpret(pfields, 65, i)),
+ type: pfields[i + 65],
+ bytes: pfields[i + 66]
+ })
+ }
+ }
+ return fields;
+}
+// Stop a query by result handle
+CTaosInterface.prototype.stopQuery = function stopQuery(result) {
+ if (result != null) {
+ this.libtaos.taos_stop_query(result);
+ }
+ else {
+ throw new errors.ProgrammingError("No result handle passed to stop query");
+ }
+}
+CTaosInterface.prototype.getServerInfo = function getServerInfo(connection) {
+ return ref.readCString(this.libtaos.taos_get_server_info(connection));
+}
+CTaosInterface.prototype.getClientInfo = function getClientInfo() {
+ return ref.readCString(this.libtaos.taos_get_client_info());
+}
+
+// Subscription
+CTaosInterface.prototype.subscribe = function subscribe(connection, restart, topic, sql, interval) {
+ let topicOrig = topic;
+ let sqlOrig = sql;
+ try {
+ sql = sql != null ? ref.allocCString(sql) : ref.alloc(ref.types.char_ptr, ref.NULL);
+ }
+ catch (err) {
+ throw "Attribute Error: sql is expected as a str";
+ }
+ try {
+ topic = topic != null ? ref.allocCString(topic) : ref.alloc(ref.types.char_ptr, ref.NULL);
+ }
+ catch (err) {
+ throw TypeError("topic is expected as a str");
+ }
+
+ restart = ref.alloc(ref.types.int, restart);
+
+ let subscription = this.libtaos.taos_subscribe(connection, restart, topic, sql, null, null, interval);
+ if (ref.isNull(subscription)) {
+ throw new errors.TDError('Failed to subscribe to TDengine | Database: ' + dbOrig + ', Table: ' + tableOrig);
+ }
+ else {
+ console.log('Successfully subscribed to TDengine - Topic: ' + topicOrig);
+ }
+ return subscription;
+}
+
+CTaosInterface.prototype.consume = function consume(subscription) {
+ let result = this.libtaos.taos_consume(subscription);
+ let fields = [];
+ let pfields = this.fetchFields(result);
+ if (ref.isNull(pfields) == false) {
+ pfields = ref.reinterpret(pfields, this.numFields(result) * 68, 0);
+ for (let i = 0; i < pfields.length; i += 68) {
+ //0 - 63 = name //64 - 65 = bytes, 66 - 67 = type
+ fields.push({
+ name: ref.readCString(ref.reinterpret(pfields, 64, i)),
+ bytes: pfields[i + 64],
+ type: pfields[i + 66]
+ })
+ }
+ }
+
+ let data = [];
+ while (true) {
+ let { blocks, num_of_rows } = this.fetchBlock(result, fields);
+ if (num_of_rows == 0) {
+ break;
+ }
+ for (let i = 0; i < num_of_rows; i++) {
+ data.push([]);
+ let rowBlock = new Array(fields.length);
+ for (let j = 0; j < fields.length; j++) {
+ rowBlock[j] = blocks[j][i];
+ }
+ data[data.length - 1] = (rowBlock);
+ }
+ }
+ return { data: data, fields: fields, result: result };
+}
+CTaosInterface.prototype.unsubscribe = function unsubscribe(subscription) {
+ //void taos_unsubscribe(TAOS_SUB *tsub);
+ this.libtaos.taos_unsubscribe(subscription);
+}
+
+// Continuous Query
+CTaosInterface.prototype.openStream = function openStream(connection, sql, callback, stime, stoppingCallback, param = ref.ref(ref.NULL)) {
+ try {
+ sql = ref.allocCString(sql);
+ }
+ catch (err) {
+ throw "Attribute Error: sql string is expected as a str";
+ }
+ var cti = this;
+ let asyncCallbackWrapper = function (param2, result2, row) {
+ let fields = cti.fetchFields_a(result2);
+ let precision = cti.libtaos.taos_result_precision(result2);
+ let blocks = new Array(fields.length);
+ blocks.fill(null);
+ let numOfRows2 = 1;
+ let offset = 0;
+ if (numOfRows2 > 0) {
+ for (let i = 0; i < fields.length; i++) {
+ if (!convertFunctions[fields[i]['type']]) {
+ throw new errors.DatabaseError("Invalid data type returned from database");
+ }
+ blocks[i] = convertFunctions[fields[i]['type']](row, numOfRows2, fields[i]['bytes'], offset, precision);
+ offset += fields[i]['bytes'] * numOfRows2;
+ }
+ }
+ callback(param2, result2, blocks, fields);
+ }
+ asyncCallbackWrapper = ffi.Callback(ref.types.void, [ref.types.void_ptr, ref.types.void_ptr, ref.refType(ref.types.void_ptr2)], asyncCallbackWrapper);
+ asyncStoppingCallbackWrapper = ffi.Callback(ref.types.void, [ref.types.void_ptr], stoppingCallback);
+ let streamHandle = this.libtaos.taos_open_stream(connection, sql, asyncCallbackWrapper, stime, param, asyncStoppingCallbackWrapper);
+ if (ref.isNull(streamHandle)) {
+ throw new errors.TDError('Failed to open a stream with TDengine');
+ return false;
+ }
+ else {
+ console.log("Succesfully opened stream");
+ return streamHandle;
+ }
+}
+CTaosInterface.prototype.closeStream = function closeStream(stream) {
+ this.libtaos.taos_close_stream(stream);
+ console.log("Closed stream");
+}
diff --git a/tests/connectorTest/nodejsTest/nodetaos/connection.js b/tests/connectorTest/nodejsTest/nodetaos/connection.js
new file mode 100644
index 0000000000000000000000000000000000000000..08186f87053ad0ed0982ec8941f0cf38c4ad0467
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nodetaos/connection.js
@@ -0,0 +1,84 @@
+const TDengineCursor = require('./cursor')
+const CTaosInterface = require('./cinterface')
+module.exports = TDengineConnection;
+
+/**
+ * TDengine Connection Class
+ * @param {object} options - Options for configuring the connection with TDengine
+ * @return {TDengineConnection}
+ * @class TDengineConnection
+ * @constructor
+ * @example
+ * //Initialize a new connection
+ * var conn = new TDengineConnection({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:0})
+ *
+ */
+function TDengineConnection(options) {
+ this._conn = null;
+ this._host = null;
+ this._user = "root"; //The default user
+ this._password = "taosdata"; //The default password
+ this._database = null;
+ this._port = 0;
+ this._config = null;
+ this._chandle = null;
+ this._configConn(options)
+ return this;
+}
+/**
+ * Configure the connection to TDengine
+ * @private
+ * @memberof TDengineConnection
+ */
+TDengineConnection.prototype._configConn = function _configConn(options) {
+ if (options['host']) {
+ this._host = options['host'];
+ }
+ if (options['user']) {
+ this._user = options['user'];
+ }
+ if (options['password']) {
+ this._password = options['password'];
+ }
+ if (options['database']) {
+ this._database = options['database'];
+ }
+ if (options['port']) {
+ this._port = options['port'];
+ }
+ if (options['config']) {
+ this._config = options['config'];
+ }
+ this._chandle = new CTaosInterface(this._config);
+ this._conn = this._chandle.connect(this._host, this._user, this._password, this._database, this._port);
+}
+/** Close the connection to TDengine */
+TDengineConnection.prototype.close = function close() {
+ this._chandle.close(this._conn);
+}
+/**
+ * Initialize a new cursor to interact with TDengine with
+ * @return {TDengineCursor}
+ */
+TDengineConnection.prototype.cursor = function cursor() {
+ //Pass the connection object to the cursor
+ return new TDengineCursor(this);
+}
+TDengineConnection.prototype.commit = function commit() {
+ return this;
+}
+TDengineConnection.prototype.rollback = function rollback() {
+ return this;
+}
+/**
+ * Clear the results from connector
+ * @private
+ */
+/*
+ TDengineConnection.prototype._clearResultSet = function _clearResultSet() {
+ var result = this._chandle.useResult(this._conn).result;
+ if (result) {
+ this._chandle.freeResult(result)
+ }
+}
+*/
diff --git a/tests/connectorTest/nodejsTest/nodetaos/constants.js b/tests/connectorTest/nodejsTest/nodetaos/constants.js
new file mode 100644
index 0000000000000000000000000000000000000000..cd6a0c9fbaff51e7f0ecd3ab06907b7b1fb7dcb1
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nodetaos/constants.js
@@ -0,0 +1,76 @@
+/**
+ * Contains the the definitions/values assigned to various field types
+ * @module FieldTypes
+ */
+/**
+ * TDengine Field Types and their type codes
+ * @typedef {Object} FieldTypes
+ * @global
+ * @property {number} C_NULL - Null
+ * @property {number} C_BOOL - Boolean. Note, 0x02 is the C_BOOL_NULL value.
+ * @property {number} C_TINYINT - Tiny Int, values in the range [-2^7+1, 2^7-1]. Note, -2^7 has been used as the C_TINYINT_NULL value
+ * @property {number} C_SMALLINT - Small Int, values in the range [-2^15+1, 2^15-1]. Note, -2^15 has been used as the C_SMALLINT_NULL value
+ * @property {number} C_INT - Int, values in the range [-2^31+1, 2^31-1]. Note, -2^31 has been used as the C_INT_NULL value
+ * @property {number} C_BIGINT - Big Int, values in the range [-2^59, 2^59].
+ * @property {number} C_FLOAT - Float, values in the range [-3.4E38, 3.4E38], accurate up to 6-7 decimal places.
+ * @property {number} C_DOUBLE - Double, values in the range [-1.7E308, 1.7E308], accurate up to 15-16 decimal places.
+ * @property {number} C_BINARY - Binary, encoded in utf-8.
+ * @property {number} C_TIMESTAMP - Timestamp in format "YYYY:MM:DD HH:MM:SS.MMM". Measured in number of milliseconds passed after
+ 1970-01-01 08:00:00.000 GMT.
+ * @property {number} C_NCHAR - NChar field type encoded in ASCII, a wide string.
+ *
+ *
+ *
+ * @property {number} C_TIMESTAMP_MILLI - The code for millisecond timestamps, as returned by libtaos.taos_result_precision(result).
+ * @property {number} C_TIMESTAMP_MICRO - The code for microsecond timestamps, as returned by libtaos.taos_result_precision(result).
+ */
+module.exports = {
+ C_NULL : 0,
+ C_BOOL : 1,
+ C_TINYINT : 2,
+ C_SMALLINT : 3,
+ C_INT : 4,
+ C_BIGINT : 5,
+ C_FLOAT : 6,
+ C_DOUBLE : 7,
+ C_BINARY : 8,
+ C_TIMESTAMP : 9,
+ C_NCHAR : 10,
+ // NULL value definition
+ // NOTE: These values should change according to C definition in tsdb.h
+ C_BOOL_NULL : 2,
+ C_TINYINT_NULL : -128,
+ C_SMALLINT_NULL : -32768,
+ C_INT_NULL : -2147483648,
+ C_BIGINT_NULL : -9223372036854775808,
+ C_FLOAT_NULL : 2146435072,
+ C_DOUBLE_NULL : -9223370937343148032,
+ C_NCHAR_NULL : 4294967295,
+ C_BINARY_NULL : 255,
+ C_TIMESTAMP_MILLI : 0,
+ C_TIMESTAMP_MICRO : 1,
+ getType,
+}
+
+const typeCodesToName = {
+ 0 : 'Null',
+ 1 : 'Boolean',
+ 2 : 'Tiny Int',
+ 3 : 'Small Int',
+ 4 : 'Int',
+ 5 : 'Big Int',
+ 6 : 'Float',
+ 7 : 'Double',
+ 8 : 'Binary',
+ 9 : 'Timestamp',
+ 10 : 'Nchar',
+}
+
+/**
+ * @function
+ * @param {number} typecode - The code to get the name of the type for
+ * @return {string} Name of the field type
+ */
+function getType(typecode) {
+ return typeCodesToName[typecode];
+}
diff --git a/tests/connectorTest/nodejsTest/nodetaos/cursor.js b/tests/connectorTest/nodejsTest/nodetaos/cursor.js
new file mode 100644
index 0000000000000000000000000000000000000000..f879d89d487eae9290fd9fc70259699f27937928
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nodetaos/cursor.js
@@ -0,0 +1,476 @@
+const ref = require('ref-napi');
+require('./globalfunc.js')
+const CTaosInterface = require('./cinterface')
+const errors = require('./error')
+const TaosQuery = require('./taosquery')
+const { PerformanceObserver, performance } = require('perf_hooks');
+module.exports = TDengineCursor;
+
+/**
+ * @typedef {Object} Buffer - A Node.js buffer. Please refer to {@link https://nodejs.org/api/buffer.html} for more details
+ * @global
+ */
+
+/**
+ * @class TDengineCursor
+ * @classdesc The TDengine Cursor works directly with the C Interface which works with TDengine. It refrains from
+ * returning parsed data and majority of functions return the raw data such as cursor.fetchall() as compared to the TaosQuery class which
+ * has functions that "prettify" the data and add more functionality and can be used through cursor.query("your query"). Instead of
+ * promises, the class and its functions use callbacks.
+ * @param {TDengineConnection} - The TDengine Connection this cursor uses to interact with TDengine
+ * @property {data} - Latest retrieved data from query execution. It is an empty array by default
+ * @property {fields} - Array of the field objects in order from left to right of the latest data retrieved
+ * @since 1.0.0
+ */
+function TDengineCursor(connection = null) {
+ //All parameters are store for sync queries only.
+ this._rowcount = -1;
+ this._connection = null;
+ this._result = null;
+ this._fields = null;
+ this.data = [];
+ this.fields = null;
+ if (connection != null) {
+ this._connection = connection
+ this._chandle = connection._chandle //pass through, just need library loaded.
+ }
+ else {
+ throw new errors.ProgrammingError("A TDengineConnection object is required to be passed to the TDengineCursor");
+ }
+
+}
+/**
+ * Get the row counts of the latest query
+ * @since 1.0.0
+ * @return {number} Rowcount
+ */
+TDengineCursor.prototype.rowcount = function rowcount() {
+ return this._rowcount;
+}
+/**
+ * Close the cursor by setting its connection to null and freeing results from the connection and resetting the results it has stored
+ * @return {boolean} Whether or not the cursor was succesfully closed
+ * @since 1.0.0
+ */
+TDengineCursor.prototype.close = function close() {
+ if (this._connection == null) {
+ return false;
+ }
+ this._connection._clearResultSet();
+ this._reset_result();
+ this._connection = null;
+ return true;
+}
+/**
+ * Create a TaosQuery object to perform a query to TDengine and retrieve data.
+ * @param {string} operation - The operation string to perform a query on
+ * @param {boolean} execute - Whether or not to immedietely perform the query. Default is false.
+ * @return {TaosQuery | Promise} A TaosQuery object
+ * @example
+ * var query = cursor.query("select count(*) from meterinfo.meters");
+ * query.execute();
+ * @since 1.0.6
+ */
+TDengineCursor.prototype.query = function query(operation, execute = false) {
+ return new TaosQuery(operation, this, execute);
+}
+
+/**
+ * Execute a query. Also stores all the field meta data returned from the query into cursor.fields. It is preferable to use cursor.query() to create
+ * queries and execute them instead of using the cursor object directly.
+ * @param {string} operation - The query operation to execute in the taos shell
+ * @param {Object} options - Execution options object. quiet : true turns off logging from queries
+ * @param {boolean} options.quiet - True if you want to surpress logging such as "Query OK, 1 row(s) ..."
+ * @param {function} callback - A callback function to execute after the query is made to TDengine
+ * @return {number | Buffer} Number of affected rows or a Buffer that points to the results of the query
+ * @since 1.0.0
+ */
+TDengineCursor.prototype.execute = function execute(operation, options, callback) {
+ if (operation == undefined) {
+ throw new errors.ProgrammingError('No operation passed as argument');
+ return null;
+ }
+
+ if (typeof options == 'function') {
+ callback = options;
+ }
+ if (typeof options != 'object') options = {}
+ if (this._connection == null) {
+ throw new errors.ProgrammingError('Cursor is not connected');
+ }
+
+ this._reset_result();
+
+ let stmt = operation;
+ let time = 0;
+ let res;
+ if (options['quiet'] != true) {
+ const obs = new PerformanceObserver((items) => {
+ time = items.getEntries()[0].duration;
+ performance.clearMarks();
+ });
+ obs.observe({ entryTypes: ['measure'] });
+ performance.mark('A');
+ this._result = this._chandle.query(this._connection._conn, stmt);
+ performance.mark('B');
+ performance.measure('query', 'A', 'B');
+ }
+ else {
+ this._result = this._chandle.query(this._connection._conn, stmt);
+ }
+ res = this._chandle.errno(this._result);
+ if (res == 0) {
+ let fieldCount = this._chandle.fieldsCount(this._result);
+ if (fieldCount == 0) {
+ let affectedRowCount = this._chandle.affectedRows(this._result);
+ let response = this._createAffectedResponse(affectedRowCount, time)
+ if (options['quiet'] != true) {
+ console.log(response);
+ }
+ wrapCB(callback);
+ return affectedRowCount; //return num of affected rows, common with insert, use statements
+ }
+ else {
+ this._fields = this._chandle.useResult(this._result);
+ this.fields = this._fields;
+ wrapCB(callback);
+
+ return this._result; //return a pointer to the result
+ }
+ }
+ else {
+ throw new errors.ProgrammingError(this._chandle.errStr(this._result))
+ }
+
+}
+TDengineCursor.prototype._createAffectedResponse = function (num, time) {
+ return "Query OK, " + num + " row(s) affected (" + (time * 0.001).toFixed(8) + "s)";
+}
+TDengineCursor.prototype._createSetResponse = function (num, time) {
+ return "Query OK, " + num + " row(s) in set (" + (time * 0.001).toFixed(8) + "s)";
+}
+TDengineCursor.prototype.executemany = function executemany() {
+
+}
+TDengineCursor.prototype.fetchone = function fetchone() {
+
+}
+TDengineCursor.prototype.fetchmany = function fetchmany() {
+
+}
+/**
+ * Fetches all results from a query and also stores results into cursor.data. It is preferable to use cursor.query() to create
+ * queries and execute them instead of using the cursor object directly.
+ * @param {function} callback - callback function executing on the complete fetched data
+ * @return {Array} The resultant array, with entries corresponding to each retreived row from the query results, sorted in
+ * order by the field name ordering in the table.
+ * @since 1.0.0
+ * @example
+ * cursor.execute('select * from db.table');
+ * var data = cursor.fetchall(function(results) {
+ * results.forEach(row => console.log(row));
+ * })
+ */
+TDengineCursor.prototype.fetchall = function fetchall(options, callback) {
+ if (this._result == null || this._fields == null) {
+ throw new errors.OperationalError("Invalid use of fetchall, either result or fields from query are null. First execute a query first");
+ }
+
+ let num_of_rows = this._chandle.affectedRows(this._result);
+ let data = new Array(num_of_rows);
+
+ this._rowcount = 0;
+
+ let time = 0;
+ const obs = new PerformanceObserver((items) => {
+ time += items.getEntries()[0].duration;
+ performance.clearMarks();
+ });
+ obs.observe({ entryTypes: ['measure'] });
+ performance.mark('A');
+ while (true) {
+ let blockAndRows = this._chandle.fetchBlock(this._result, this._fields);
+ // console.log(blockAndRows);
+ // break;
+ let block = blockAndRows.blocks;
+ let num_of_rows = blockAndRows.num_of_rows;
+ if (num_of_rows == 0) {
+ break;
+ }
+ this._rowcount += num_of_rows;
+ let numoffields = this._fields.length;
+ for (let i = 0; i < num_of_rows; i++) {
+ // data.push([]);
+
+ let rowBlock = new Array(numoffields);
+ for (let j = 0; j < numoffields; j++) {
+ rowBlock[j] = block[j][i];
+ }
+ data[this._rowcount - num_of_rows + i] = (rowBlock);
+ // data.push(rowBlock);
+ }
+
+ }
+
+ performance.mark('B');
+ performance.measure('query', 'A', 'B');
+ let response = this._createSetResponse(this._rowcount, time)
+ console.log(response);
+
+ // this._connection._clearResultSet();
+ let fields = this.fields;
+ this._reset_result();
+ this.data = data;
+ this.fields = fields;
+
+ wrapCB(callback, data);
+
+ return data;
+}
+/**
+ * Asynchrnously execute a query to TDengine. NOTE, insertion requests must be done in sync if on the same table.
+ * @param {string} operation - The query operation to execute in the taos shell
+ * @param {Object} options - Execution options object. quiet : true turns off logging from queries
+ * @param {boolean} options.quiet - True if you want to surpress logging such as "Query OK, 1 row(s) ..."
+ * @param {function} callback - A callback function to execute after the query is made to TDengine
+ * @return {number | Buffer} Number of affected rows or a Buffer that points to the results of the query
+ * @since 1.0.0
+ */
+TDengineCursor.prototype.execute_a = function execute_a(operation, options, callback, param) {
+ if (operation == undefined) {
+ throw new errors.ProgrammingError('No operation passed as argument');
+ return null;
+ }
+ if (typeof options == 'function') {
+ //we expect the parameter after callback to be param
+ param = callback;
+ callback = options;
+ }
+ if (typeof options != 'object') options = {}
+ if (this._connection == null) {
+ throw new errors.ProgrammingError('Cursor is not connected');
+ }
+ if (typeof callback != 'function') {
+ throw new errors.ProgrammingError("No callback function passed to execute_a function");
+ }
+ // Async wrapper for callback;
+ var cr = this;
+
+ let asyncCallbackWrapper = function (param2, res2, resCode) {
+ if (typeof callback == 'function') {
+ callback(param2, res2, resCode);
+ }
+
+ if (resCode >= 0) {
+ // let fieldCount = cr._chandle.numFields(res2);
+ // if (fieldCount == 0) {
+ // //cr._chandle.freeResult(res2);
+ // return res2;
+ // }
+ // else {
+ // return res2;
+ // }
+ return res2;
+
+ }
+ else {
+ throw new errors.ProgrammingError("Error occuring with use of execute_a async function. Status code was returned with failure");
+ }
+ }
+
+ let stmt = operation;
+ let time = 0;
+
+ // Use ref module to write to buffer in cursor.js instead of taosquery to maintain a difference in levels. Have taosquery stay high level
+ // through letting it pass an object as param
+ var buf = ref.alloc('Object');
+ ref.writeObject(buf, 0, param);
+ const obs = new PerformanceObserver((items) => {
+ time = items.getEntries()[0].duration;
+ performance.clearMarks();
+ });
+ obs.observe({ entryTypes: ['measure'] });
+ performance.mark('A');
+ this._chandle.query_a(this._connection._conn, stmt, asyncCallbackWrapper, buf);
+ performance.mark('B');
+ performance.measure('query', 'A', 'B');
+ return param;
+
+
+}
+/**
+ * Fetches all results from an async query. It is preferable to use cursor.query_a() to create
+ * async queries and execute them instead of using the cursor object directly.
+ * @param {Object} options - An options object containing options for this function
+ * @param {function} callback - callback function that is callbacked on the COMPLETE fetched data (it is calledback only once!).
+ * Must be of form function (param, result, rowCount, rowData)
+ * @param {Object} param - A parameter that is also passed to the main callback function. Important! Param must be an object, and the key "data" cannot be used
+ * @return {{param:Object, result:Buffer}} An object with the passed parameters object and the buffer instance that is a pointer to the result handle.
+ * @since 1.2.0
+ * @example
+ * cursor.execute('select * from db.table');
+ * var data = cursor.fetchall(function(results) {
+ * results.forEach(row => console.log(row));
+ * })
+ */
+TDengineCursor.prototype.fetchall_a = function fetchall_a(result, options, callback, param = {}) {
+ if (typeof options == 'function') {
+ //we expect the parameter after callback to be param
+ param = callback;
+ callback = options;
+ }
+ if (typeof options != 'object') options = {}
+ if (this._connection == null) {
+ throw new errors.ProgrammingError('Cursor is not connected');
+ }
+ if (typeof callback != 'function') {
+ throw new errors.ProgrammingError('No callback function passed to fetchall_a function')
+ }
+ if (param.data) {
+ throw new errors.ProgrammingError("You aren't allowed to set the key 'data' for the parameters object");
+ }
+ let buf = ref.alloc('Object');
+ param.data = [];
+ var cr = this;
+
+ // This callback wrapper accumulates the data from the fetch_rows_a function from the cinterface. It is accumulated by passing the param2
+ // object which holds accumulated data in the data key.
+ let asyncCallbackWrapper = function asyncCallbackWrapper(param2, result2, numOfRows2, rowData) {
+ param2 = ref.readObject(param2); //return the object back from the pointer
+ if (numOfRows2 > 0 && rowData.length != 0) {
+ // Keep fetching until now rows left.
+ let buf2 = ref.alloc('Object');
+ param2.data.push(rowData);
+ ref.writeObject(buf2, 0, param2);
+ cr._chandle.fetch_rows_a(result2, asyncCallbackWrapper, buf2);
+ }
+ else {
+ let finalData = param2.data;
+ let fields = cr._chandle.fetchFields_a(result2);
+ let data = [];
+ for (let i = 0; i < finalData.length; i++) {
+ let num_of_rows = finalData[i][0].length; //fetched block number i;
+ let block = finalData[i];
+ for (let j = 0; j < num_of_rows; j++) {
+ data.push([]);
+ let rowBlock = new Array(fields.length);
+ for (let k = 0; k < fields.length; k++) {
+ rowBlock[k] = block[k][j];
+ }
+ data[data.length - 1] = rowBlock;
+ }
+ }
+ cr._chandle.freeResult(result2); // free result, avoid seg faults and mem leaks!
+ callback(param2, result2, numOfRows2, { data: data, fields: fields });
+
+ }
+ }
+ ref.writeObject(buf, 0, param);
+ param = this._chandle.fetch_rows_a(result, asyncCallbackWrapper, buf); //returned param
+ return { param: param, result: result };
+}
+/**
+ * Stop a query given the result handle.
+ * @param {Buffer} result - The buffer that acts as the result handle
+ * @since 1.3.0
+ */
+TDengineCursor.prototype.stopQuery = function stopQuery(result) {
+ this._chandle.stopQuery(result);
+}
+TDengineCursor.prototype._reset_result = function _reset_result() {
+ this._rowcount = -1;
+ if (this._result != null) {
+ this._chandle.freeResult(this._result);
+ }
+ this._result = null;
+ this._fields = null;
+ this.data = [];
+ this.fields = null;
+}
+/**
+ * Get server info such as version number
+ * @return {string}
+ * @since 1.3.0
+ */
+TDengineCursor.prototype.getServerInfo = function getServerInfo() {
+ return this._chandle.getServerInfo(this._connection._conn);
+}
+/**
+ * Get client info such as version number
+ * @return {string}
+ * @since 1.3.0
+ */
+TDengineCursor.prototype.getClientInfo = function getClientInfo() {
+ return this._chandle.getClientInfo();
+}
+/**
+ * Subscribe to a table from a database in TDengine.
+ * @param {Object} config - A configuration object containing the configuration options for the subscription
+ * @param {string} config.restart - whether or not to continue a subscription if it already exits, otherwise start from beginning
+ * @param {string} config.topic - The unique identifier of a subscription
+ * @param {string} config.sql - A sql statement for data query
+ * @param {string} config.interval - The pulling interval
+ * @return {Buffer} A buffer pointing to the subscription session handle
+ * @since 1.3.0
+ */
+TDengineCursor.prototype.subscribe = function subscribe(config) {
+ let restart = config.restart ? 1 : 0;
+ return this._chandle.subscribe(this._connection._conn, restart, config.topic, config.sql, config.interval);
+};
+/**
+ * An infinite loop that consumes the latest data and calls a callback function that is provided.
+ * @param {Buffer} subscription - A buffer object pointing to the subscription session handle
+ * @param {function} callback - The callback function that takes the row data, field/column meta data, and the subscription session handle as input
+ * @since 1.3.0
+ */
+TDengineCursor.prototype.consumeData = async function consumeData(subscription, callback) {
+ while (true) {
+ let { data, fields, result } = this._chandle.consume(subscription);
+ callback(data, fields, result);
+ }
+}
+/**
+ * Unsubscribe the provided buffer object pointing to the subscription session handle
+ * @param {Buffer} subscription - A buffer object pointing to the subscription session handle that is to be unsubscribed
+ * @since 1.3.0
+ */
+TDengineCursor.prototype.unsubscribe = function unsubscribe(subscription) {
+ this._chandle.unsubscribe(subscription);
+}
+/**
+ * Open a stream with TDengine to run the sql query periodically in the background
+ * @param {string} sql - The query to run
+ * @param {function} callback - The callback function to run after each query, accepting inputs as param, result handle, data, fields meta data
+ * @param {number} stime - The time of the stream starts in the form of epoch milliseconds. If 0 is given, the start time is set as the current time.
+ * @param {function} stoppingCallback - The callback function to run when the continuous query stops. It takes no inputs
+ * @param {object} param - A parameter that is passed to the main callback function
+ * @return {Buffer} A buffer pointing to the stream handle
+ * @since 1.3.0
+ */
+TDengineCursor.prototype.openStream = function openStream(sql, callback, stime = 0, stoppingCallback, param = {}) {
+ let buf = ref.alloc('Object');
+ ref.writeObject(buf, 0, param);
+
+ let asyncCallbackWrapper = function (param2, result2, blocks, fields) {
+ let data = [];
+ let num_of_rows = blocks[0].length;
+ for (let j = 0; j < num_of_rows; j++) {
+ data.push([]);
+ let rowBlock = new Array(fields.length);
+ for (let k = 0; k < fields.length; k++) {
+ rowBlock[k] = blocks[k][j];
+ }
+ data[data.length - 1] = rowBlock;
+ }
+ callback(param2, result2, blocks, fields);
+ }
+ return this._chandle.openStream(this._connection._conn, sql, asyncCallbackWrapper, stime, stoppingCallback, buf);
+}
+/**
+ * Close a stream
+ * @param {Buffer} - A buffer pointing to the handle of the stream to be closed
+ * @since 1.3.0
+ */
+TDengineCursor.prototype.closeStream = function closeStream(stream) {
+ this._chandle.closeStream(stream);
+}
diff --git a/tests/connectorTest/nodejsTest/nodetaos/error.js b/tests/connectorTest/nodejsTest/nodetaos/error.js
new file mode 100644
index 0000000000000000000000000000000000000000..8ab91a50c7d81a4675246617e0969ee8c81c514e
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nodetaos/error.js
@@ -0,0 +1,96 @@
+
+/**
+ * TDengine Error Class
+ * @ignore
+ */
+class TDError extends Error {
+ constructor(args) {
+ super(args)
+ this.name = "TDError";
+ }
+}
+/** Exception raised for important warnings like data truncations while inserting.
+ * @ignore
+ */
+class Warning extends Error {
+ constructor(args) {
+ super(args)
+ this.name = "Warning";
+ }
+}
+/** Exception raised for errors that are related to the database interface rather than the database itself.
+ * @ignore
+ */
+class InterfaceError extends TDError {
+ constructor(args) {
+ super(args)
+ this.name = "TDError.InterfaceError";
+ }
+}
+/** Exception raised for errors that are related to the database.
+ * @ignore
+ */
+class DatabaseError extends TDError {
+ constructor(args) {
+ super(args)
+ this.name = "TDError.DatabaseError";
+ }
+}
+/** Exception raised for errors that are due to problems with the processed data like division by zero, numeric value out of range.
+ * @ignore
+ */
+class DataError extends DatabaseError {
+ constructor(args) {
+ super(args)
+ this.name = "TDError.DatabaseError.DataError";
+ }
+}
+/** Exception raised for errors that are related to the database's operation and not necessarily under the control of the programmer
+ * @ignore
+ */
+class OperationalError extends DatabaseError {
+ constructor(args) {
+ super(args)
+ this.name = "TDError.DatabaseError.OperationalError";
+ }
+}
+/** Exception raised when the relational integrity of the database is affected.
+ * @ignore
+ */
+class IntegrityError extends DatabaseError {
+ constructor(args) {
+ super(args)
+ this.name = "TDError.DatabaseError.IntegrityError";
+ }
+}
+/** Exception raised when the database encounters an internal error.
+ * @ignore
+ */
+class InternalError extends DatabaseError {
+ constructor(args) {
+ super(args)
+ this.name = "TDError.DatabaseError.InternalError";
+ }
+}
+/** Exception raised for programming errors.
+ * @ignore
+ */
+class ProgrammingError extends DatabaseError {
+ constructor(args) {
+ super(args)
+ this.name = "TDError.DatabaseError.ProgrammingError";
+ }
+}
+/** Exception raised in case a method or database API was used which is not supported by the database.
+ * @ignore
+ */
+class NotSupportedError extends DatabaseError {
+ constructor(args) {
+ super(args)
+ this.name = "TDError.DatabaseError.NotSupportedError";
+ }
+}
+
+module.exports = {
+ TDError, Warning, InterfaceError, DatabaseError, DataError, OperationalError, IntegrityError, InternalError, ProgrammingError, NotSupportedError
+};
diff --git a/tests/connectorTest/nodejsTest/nodetaos/globalfunc.js b/tests/connectorTest/nodejsTest/nodetaos/globalfunc.js
new file mode 100644
index 0000000000000000000000000000000000000000..cf7344c868ee94831eba47ff55369a684e34b02f
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nodetaos/globalfunc.js
@@ -0,0 +1,14 @@
+/* Wrap a callback, reduce code amount */
+function wrapCB(callback, input) {
+ if (typeof callback === 'function') {
+ callback(input);
+ }
+ return;
+}
+global.wrapCB = wrapCB;
+function toTaosTSString(date) {
+ date = new Date(date);
+ let tsArr = date.toISOString().split("T")
+ return tsArr[0] + " " + tsArr[1].substring(0, tsArr[1].length-1);
+}
+global.toTaosTSString = toTaosTSString;
diff --git a/tests/connectorTest/nodejsTest/nodetaos/taosobjects.js b/tests/connectorTest/nodejsTest/nodetaos/taosobjects.js
new file mode 100644
index 0000000000000000000000000000000000000000..3bc0fe0aca060a32daa7a5cebd2dbfb99ac29a7c
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nodetaos/taosobjects.js
@@ -0,0 +1,152 @@
+const FieldTypes = require('./constants');
+const util = require('util');
+/**
+ * Various objects such as TaosRow and TaosColumn that help make parsing data easier
+ * @module TaosObjects
+ *
+ */
+
+/**
+ * The TaosRow object. Contains the data from a retrieved row from a database and functions that parse the data.
+ * @typedef {Object} TaosRow - A row of data retrieved from a table.
+ * @global
+ * @example
+ * var trow = new TaosRow(row);
+ * console.log(trow.data);
+ */
+function TaosRow(row) {
+ this.data = row;
+ this.length = row.length;
+ return this;
+}
+
+/**
+ * @typedef {Object} TaosField - A field/column's metadata from a table.
+ * @global
+ * @example
+ * var tfield = new TaosField(field);
+ * console.log(tfield.name);
+ */
+
+function TaosField(field) {
+ this._field = field;
+ this.name = field.name;
+ this.type = FieldTypes.getType(field.type);
+ return this;
+}
+
+/**
+ * A TaosTimestamp object, which is the standard date object with added functionality
+ * @global
+ * @memberof TaosObjects
+ * @param {Date} date - A Javascript date time object or the time in milliseconds past 1970-1-1 00:00:00.000
+ */
+class TaosTimestamp extends Date {
+ constructor(date, precision = 0) {
+ if (precision === 1) {
+ super(Math.floor(date / 1000));
+ this.precisionExtras = date % 1000;
+ } else if (precision === 2) {
+ // use BigInt to fix: 1623254400999999999 / 1000000 = 1623254401000 which not expected
+ super(parseInt(BigInt(date) / 1000000n));
+ // use BigInt to fix: 1625801548423914405 % 1000000 = 914496 which not expected (914405)
+ this.precisionExtras = parseInt(BigInt(date) % 1000000n);
+ } else {
+ super(parseInt(date));
+ }
+ this.precision = precision;
+ }
+
+ /**
+ * TDengine raw timestamp.
+ * @returns raw taos timestamp (int64)
+ */
+ taosTimestamp() {
+ if (this.precision == 1) {
+ return (this * 1000 + this.precisionExtras);
+ } else if (this.precision == 2) {
+ return (this * 1000000 + this.precisionExtras);
+ } else {
+ return Math.floor(this);
+ }
+ }
+
+ /**
+ * Gets the microseconds of a Date.
+ * @return {Int} A microseconds integer
+ */
+ getMicroseconds() {
+ if (this.precision == 1) {
+ return this.getMilliseconds() * 1000 + this.precisionExtras;
+ } else if (this.precision == 2) {
+ return this.getMilliseconds() * 1000 + this.precisionExtras / 1000;
+ } else {
+ return 0;
+ }
+ }
+ /**
+ * Gets the nanoseconds of a TaosTimestamp.
+ * @return {Int} A nanoseconds integer
+ */
+ getNanoseconds() {
+ if (this.precision == 1) {
+ return this.getMilliseconds() * 1000000 + this.precisionExtras * 1000;
+ } else if (this.precision == 2) {
+ return this.getMilliseconds() * 1000000 + this.precisionExtras;
+ } else {
+ return 0;
+ }
+ }
+
+ /**
+ * @returns {String} a string for timestamp string format
+ */
+ _precisionExtra() {
+ if (this.precision == 1) {
+ return String(this.precisionExtras).padStart(3, '0');
+ } else if (this.precision == 2) {
+ return String(this.precisionExtras).padStart(6, '0');
+ } else {
+ return '';
+ }
+ }
+ /**
+ * @function Returns the date into a string usable by TDengine
+ * @return {string} A Taos Timestamp String
+ */
+ toTaosString() {
+ var tzo = -this.getTimezoneOffset(),
+ dif = tzo >= 0 ? '+' : '-',
+ pad = function (num) {
+ var norm = Math.floor(Math.abs(num));
+ return (norm < 10 ? '0' : '') + norm;
+ },
+ pad2 = function (num) {
+ var norm = Math.floor(Math.abs(num));
+ if (norm < 10) return '00' + norm;
+ if (norm < 100) return '0' + norm;
+ if (norm < 1000) return norm;
+ };
+ return this.getFullYear() +
+ '-' + pad(this.getMonth() + 1) +
+ '-' + pad(this.getDate()) +
+ ' ' + pad(this.getHours()) +
+ ':' + pad(this.getMinutes()) +
+ ':' + pad(this.getSeconds()) +
+ '.' + pad2(this.getMilliseconds()) +
+ '' + this._precisionExtra();
+ }
+
+ /**
+ * Custom console.log
+ * @returns {String} string format for debug
+ */
+ [util.inspect.custom](depth, opts) {
+ return this.toTaosString() + JSON.stringify({ precision: this.precision, precisionExtras: this.precisionExtras }, opts);
+ }
+ toString() {
+ return this.toTaosString();
+ }
+}
+
+module.exports = { TaosRow, TaosField, TaosTimestamp }
diff --git a/tests/connectorTest/nodejsTest/nodetaos/taosquery.js b/tests/connectorTest/nodejsTest/nodetaos/taosquery.js
new file mode 100644
index 0000000000000000000000000000000000000000..eeede3ff6885e27c1d1c569a7a410f88109c9acd
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nodetaos/taosquery.js
@@ -0,0 +1,112 @@
+var TaosResult = require('./taosresult')
+require('./globalfunc.js')
+module.exports = TaosQuery;
+
+
+/**
+ * @class TaosQuery
+ * @classdesc The TaosQuery class is one level above the TDengine Cursor in that it makes sure to generally return promises from functions, and wrap
+ * all data with objects such as wrapping a row of data with Taos Row. This is meant to enable an higher level API that allows additional
+ * functionality and save time whilst also making it easier to debug and enter less problems with the use of promises.
+ * @param {string} query - Query to construct object from
+ * @param {TDengineCursor} cursor - The cursor from which this query will execute from
+ * @param {boolean} execute - Whether or not to immedietely execute the query synchronously and fetch all results. Default is false.
+ * @property {string} query - The current query in string format the TaosQuery object represents
+ * @return {TaosQuery}
+ * @since 1.0.6
+ */
+function TaosQuery(query = "", cursor = null, execute = false) {
+ this.query = query;
+ this._cursor = cursor;
+ if (execute == true) {
+ return this.execute();
+ }
+ return this;
+}
+
+/**
+ * Executes the query object and returns a Promise
+ * @memberof TaosQuery
+ * @return {Promise} A promise that resolves with a TaosResult object, or rejects with an error
+ * @since 1.0.6
+ */
+TaosQuery.prototype.execute = async function execute() {
+ var taosQuery = this; //store the current instance of taosQuery to avoid async issues?
+ var executionPromise = new Promise(function(resolve, reject) {
+ let data = [];
+ let fields = [];
+ let result;
+ try {
+ taosQuery._cursor.execute(taosQuery.query);
+ if (taosQuery._cursor._fields) fields = taosQuery._cursor._fields;
+ if (taosQuery._cursor._result != null) data = taosQuery._cursor.fetchall();
+ result = new TaosResult(data, fields)
+ }
+ catch(err) {
+ reject(err);
+ }
+ resolve(result)
+
+ });
+ return executionPromise;
+}
+
+/**
+ * Executes the query object asynchronously and returns a Promise. Completes query to completion.
+ * @memberof TaosQuery
+ * @param {Object} options - Execution options
+ * @return {Promise} A promise that resolves with a TaosResult object, or rejects with an error
+ * @since 1.2.0
+ */
+TaosQuery.prototype.execute_a = async function execute_a(options = {}) {
+ var executionPromise = new Promise( (resolve, reject) => {
+
+ });
+ var fres;
+ var frej;
+ var fetchPromise = new Promise( (resolve, reject) => {
+ fres = resolve;
+ frej = reject;
+ });
+ let asyncCallbackFetchall = async function(param, res, numOfRows, blocks) {
+ if (numOfRows > 0) {
+ // Likely a query like insert
+ fres();
+ }
+ else {
+ fres(new TaosResult(blocks.data, blocks.fields));
+ }
+ }
+ let asyncCallback = async function(param, res, code) {
+ //upon success, we fetchall results
+ this._cursor.fetchall_a(res, options, asyncCallbackFetchall, {});
+ }
+ this._cursor.execute_a(this.query, asyncCallback.bind(this), {});
+ return fetchPromise;
+}
+
+/**
+ * Bind arguments to the query and automatically parses them into the right format
+ * @param {array | ...args} args - A number of arguments to bind to each ? in the query
+ * @return {TaosQuery}
+ * @example
+ * // An example of binding a javascript date and a number to a query
+ * var query = cursor.query("select count(*) from meterinfo.meters where ts <= ? and areaid = ?").bind(new Date(), 3);
+ * var promise1 = query.execute();
+ * promise1.then(function(result) {
+ * result.pretty(); // Log the prettified version of the results.
+ * });
+ * @since 1.0.6
+ */
+TaosQuery.prototype.bind = function bind(f, ...args) {
+ if (typeof f == 'object' && f.constructor.name != 'Array') args.unshift(f); //param is not an array object
+ else if (typeof f != 'object') args.unshift(f);
+ else { args = f; }
+ args.forEach(function(arg) {
+ if (arg.constructor.name == 'TaosTimestamp') arg = "\"" + arg.toTaosString() + "\"";
+ else if (arg.constructor.name == 'Date') arg = "\"" + toTaosTSString(arg) + "\"";
+ else if (typeof arg == 'string') arg = "\"" + arg + "\"";
+ this.query = this.query.replace(/\?/,arg);
+ }, this);
+ return this;
+}
diff --git a/tests/connectorTest/nodejsTest/nodetaos/taosresult.js b/tests/connectorTest/nodejsTest/nodetaos/taosresult.js
new file mode 100644
index 0000000000000000000000000000000000000000..4138ebbec6e1b792691d17a25b7c18d35b6a922a
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/nodetaos/taosresult.js
@@ -0,0 +1,85 @@
+require('./globalfunc.js')
+const TaosObjects = require('./taosobjects');
+const TaosRow = TaosObjects.TaosRow;
+const TaosField = TaosObjects.TaosField;
+
+module.exports = TaosResult;
+/**
+ * @class TaosResult
+ * @classdesc A TaosResult class consts of the row data and the fields metadata, all wrapped under various objects for higher functionality.
+ * @param {Array} data - Array of result rows
+ * @param {Array} fields - Array of field meta data
+ * @property {Array} data - Array of TaosRows forming the result data (this does not include field meta data)
+ * @property {Array} fields - Array of TaosFields forming the fields meta data array.
+ * @return {TaosResult}
+ * @since 1.0.6
+ */
+function TaosResult(data, fields) {
+ this.data = data.map(row => new TaosRow(row));
+ this.rowcount = this.data.length;
+ this.fields = fields.map(field => new TaosField(field));
+}
+/**
+ * Pretty print data and the fields meta data as if you were using the taos shell
+ * @memberof TaosResult
+ * @function pretty
+ * @since 1.0.6
+ */
+
+TaosResult.prototype.pretty = function pretty() {
+ let fieldsStr = "";
+ let sizing = [];
+ this.fields.forEach((field,i) => {
+ if (field._field.type == 8 || field._field.type == 10){
+ sizing.push(Math.max(field.name.length, field._field.bytes));
+ }
+ else {
+ sizing.push(Math.max(field.name.length, suggestedMinWidths[field._field.type]));
+ }
+ fieldsStr += fillEmpty(Math.floor(sizing[i]/2 - field.name.length / 2)) + field.name + fillEmpty(Math.ceil(sizing[i]/2 - field.name.length / 2)) + " | ";
+ });
+ var sumLengths = sizing.reduce((a,b)=> a+=b,(0)) + sizing.length * 3;
+
+ console.log("\n" + fieldsStr);
+ console.log(printN("=",sumLengths));
+ this.data.forEach(row => {
+ let rowStr = "";
+ row.data.forEach((entry, i) => {
+ if (this.fields[i]._field.type == 9) {
+ entry = entry.toTaosString();
+ } else {
+ entry = entry == null ? 'null' : entry.toString();
+ }
+ rowStr += entry
+ rowStr += fillEmpty(sizing[i] - entry.length) + " | ";
+ });
+ console.log(rowStr);
+ });
+}
+const suggestedMinWidths = {
+ 0: 4,
+ 1: 4,
+ 2: 4,
+ 3: 6,
+ 4: 11,
+ 5: 12,
+ 6: 24,
+ 7: 24,
+ 8: 10,
+ 9: 25,
+ 10: 10,
+}
+function printN(s, n) {
+ let f = "";
+ for (let i = 0; i < n; i ++) {
+ f += s;
+ }
+ return f;
+}
+function fillEmpty(n) {
+ let str = "";
+ for (let i = 0; i < n; i++) {
+ str += " ";
+ }
+ return str;
+}
diff --git a/tests/connectorTest/nodejsTest/readme.md b/tests/connectorTest/nodejsTest/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..26a28afbdd514ad97e969302e7d790f6240bb770
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/readme.md
@@ -0,0 +1,161 @@
+# TDengine Node.js connector
+[](https://github.com/taosdata/TDengine/tree/master/src/connector/nodejs) [](https://github.com/taosdata/TDengine/#what-is-tdengine)
+
+This is the Node.js library that lets you connect to [TDengine](https://www.github.com/taosdata/tdengine) 2.0 version. It is built so that you can use as much of it as you want or as little of it as you want through providing an extensive API. If you want the raw data in the form of an array of arrays for the row data retrieved from a table, you can do that. If you want to wrap that data with objects that allow you easily manipulate and display data such as using a prettifier function, you can do that!
+
+## Installation
+
+To get started, just type in the following to install the connector through [npm](https://www.npmjs.com/)
+
+```cmd
+npm install td2.0-connector
+```
+
+To interact with TDengine, we make use of the [node-gyp](https://github.com/nodejs/node-gyp) library. To install, you will need to install the following depending on platform (the following instructions are quoted from node-gyp)
+
+### On Linux
+
+- `python` (`v2.7` recommended, `v3.x.x` is **not** supported)
+- `make`
+- A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org)
+- `node` (between `v10.x` and `v11.x`, other version has some dependency compatibility problems)
+
+### On macOS
+
+- `python` (`v2.7` recommended, `v3.x.x` is **not** supported) (already installed on macOS)
+
+- Xcode
+
+ - You also need to install the
+
+ ```
+ Command Line Tools
+ ```
+
+ via Xcode. You can find this under the menu
+
+ ```
+ Xcode -> Preferences -> Locations
+ ```
+
+ (or by running
+
+ ```
+ xcode-select --install
+ ```
+
+ in your Terminal)
+
+ - This step will install `gcc` and the related toolchain containing `make`
+
+### On Windows
+
+#### Option 1
+
+Install all the required tools and configurations using Microsoft's [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools) using `npm install --global --production windows-build-tools` from an elevated PowerShell or CMD.exe (run as Administrator).
+
+#### Option 2
+
+Install tools and configuration manually:
+
+- Install Visual C++ Build Environment: [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools) (using "Visual C++ build tools" workload) or [Visual Studio 2017 Community](https://visualstudio.microsoft.com/pl/thank-you-downloading-visual-studio/?sku=Community) (using the "Desktop development with C++" workload)
+- Install [Python 2.7](https://www.python.org/downloads/) (`v3.x.x` is not supported), and run `npm config set python python2.7` (or see below for further instructions on specifying the proper Python version and path.)
+- Launch cmd, `npm config set msvs_version 2017`
+
+If the above steps didn't work for you, please visit [Microsoft's Node.js Guidelines for Windows](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules) for additional tips.
+
+To target native ARM64 Node.js on Windows 10 on ARM, add the components "Visual C++ compilers and libraries for ARM64" and "Visual C++ ATL for ARM64".
+
+## Usage
+
+The following is a short summary of the basic usage of the connector, the full api and documentation can be found [here](http://docs.taosdata.com/node)
+
+### Connection
+
+To use the connector, first require the library ```td2.0-connector```. Running the function ```taos.connect``` with the connection options passed in as an object will return a TDengine connection object. The required connection option is ```host```, other options if not set, will be the default values as shown below.
+
+A cursor also needs to be initialized in order to interact with TDengine from Node.js.
+
+```javascript
+const taos = require('td2.0-connector');
+var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:0})
+var cursor = conn.cursor(); // Initializing a new cursor
+```
+
+Close a connection
+
+```javascript
+conn.close();
+```
+
+### Queries
+
+We can now start executing simple queries through the ```cursor.query``` function, which returns a TaosQuery object.
+
+```javascript
+var query = cursor.query('show databases;')
+```
+
+We can get the results of the queries through the ```query.execute()``` function, which returns a promise that resolves with a TaosResult object, which contains the raw data and additional functionalities such as pretty printing the results.
+
+```javascript
+var promise = query.execute();
+promise.then(function(result) {
+ result.pretty(); //logs the results to the console as if you were in the taos shell
+});
+```
+
+You can also query by binding parameters to a query by filling in the question marks in a string as so. The query will automatically parse what was binded and convert it to the proper format for use with TDengine
+```javascript
+var query = cursor.query('select * from meterinfo.meters where ts <= ? and areaid = ?;').bind(new Date(), 5);
+query.execute().then(function(result) {
+ result.pretty();
+})
+```
+
+The TaosQuery object can also be immediately executed upon creation by passing true as the second argument, returning a promise instead of a TaosQuery.
+```javascript
+var promise = cursor.query('select * from meterinfo.meters where v1 = 30;', true)
+promise.then(function(result) {
+ result.pretty();
+})
+```
+
+If you want to execute queries without objects being wrapped around the data, use ```cursor.execute()``` directly and ```cursor.fetchall()``` to retrieve data if there is any.
+```javascript
+cursor.execute('select count(*), avg(v1), min(v2) from meterinfo.meters where ts >= \"2019-07-20 00:00:00.000\";');
+var data = cursor.fetchall();
+console.log(cursor.fields); // Latest query's Field metadata is stored in cursor.fields
+console.log(cursor.data); // Latest query's result data is stored in cursor.data, also returned by fetchall.
+```
+
+### Async functionality
+
+Async queries can be performed using the same functions such as `cursor.execute`, `TaosQuery.query`, but now with `_a` appended to them.
+
+Say you want to execute an two async query on two separate tables, using `cursor.query`, you can do that and get a TaosQuery object, which upon executing with the `execute_a` function, returns a promise that resolves with a TaosResult object.
+
+```javascript
+var promise1 = cursor.query('select count(*), avg(v1), avg(v2) from meter1;').execute_a()
+var promise2 = cursor.query('select count(*), avg(v1), avg(v2) from meter2;').execute_a();
+promise1.then(function(result) {
+ result.pretty();
+})
+promise2.then(function(result) {
+ result.pretty();
+})
+```
+
+## Example
+
+An example of using the NodeJS connector to create a table with weather data and create and execute queries can be found [here](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example.js) (The preferred method for using the connector)
+
+An example of using the NodeJS connector to achieve the same things but without all the object wrappers that wrap around the data returned to achieve higher functionality can be found [here](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example-raw.js)
+
+## Contributing to TDengine
+
+Please follow the [contribution guidelines](https://github.com/taosdata/TDengine/blob/master/CONTRIBUTING.md) to contribute to the project.
+
+## License
+
+[GNU AGPL v3.0](http://www.gnu.org/licenses/agpl-3.0.html)
diff --git a/tests/connectorTest/nodejsTest/tdengine.js b/tests/connectorTest/nodejsTest/tdengine.js
new file mode 100644
index 0000000000000000000000000000000000000000..047c744a4fc90c6306e851eaa529a7f9f578fe12
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/tdengine.js
@@ -0,0 +1,4 @@
+var TDengineConnection = require('./nodetaos/connection.js')
+module.exports.connect = function (connection={}) {
+ return new TDengineConnection(connection);
+}
diff --git a/tests/connectorTest/nodejsTest/test/performance.js b/tests/connectorTest/nodejsTest/test/performance.js
new file mode 100644
index 0000000000000000000000000000000000000000..ea197f034435e28edd67df8d5f4b141f410fed81
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/test/performance.js
@@ -0,0 +1,89 @@
+function memoryUsageData() {
+ let s = process.memoryUsage()
+ for (key in s) {
+ s[key] = (s[key]/1000000).toFixed(3) + "MB";
+ }
+ return s;
+}
+console.log("initial mem usage:", memoryUsageData());
+
+const { PerformanceObserver, performance } = require('perf_hooks');
+const taos = require('../tdengine');
+var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:0});
+var c1 = conn.cursor();
+
+// Initialize env
+c1.execute('create database if not exists td_connector_test;');
+c1.execute('use td_connector_test;')
+c1.execute('create table if not exists all_types (ts timestamp, _int int, _bigint bigint, _float float, _double double, _binary binary(40), _smallint smallint, _tinyint tinyint, _bool bool, _nchar nchar(40));');
+c1.execute('create table if not exists stabletest (ts timestamp, v1 int, v2 int, v3 int, v4 double) tags (id int, location binary(20));')
+
+
+// Insertion into single table Performance Test
+var dataPrepTime = 0;
+var insertTime = 0;
+var insertTime5000 = 0;
+var avgInsert5ktime = 0;
+const obs = new PerformanceObserver((items) => {
+ let entry = items.getEntries()[0];
+
+ if (entry.name == 'Data Prep') {
+ dataPrepTime += entry.duration;
+ }
+ else if (entry.name == 'Insert'){
+ insertTime += entry.duration
+ }
+ else {
+ console.log(entry.name + ': ' + (entry.duration/1000).toFixed(8) + 's');
+ }
+ performance.clearMarks();
+});
+obs.observe({ entryTypes: ['measure'] });
+
+function R(l,r) {
+ return Math.random() * (r - l) - r;
+}
+function randomBool() {
+ if (Math.random() < 0.5) {
+ return true;
+ }
+ return false;
+}
+function insertN(n) {
+ for (let i = 0; i < n; i++) {
+ performance.mark('A3');
+ let insertData = ["now + " + i + "m", // Timestamp
+ parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // Int
+ parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // BigInt
+ parseFloat( R(-3.4E38, 3.4E38) ), // Float
+ parseFloat( R(-1.7E308, 1.7E308) ), // Double
+ "\"Long Binary\"", // Binary
+ parseInt( R(-32767, 32767) ), // Small Int
+ parseInt( R(-127, 127) ), // Tiny Int
+ randomBool(),
+ "\"Nchars 一些中文字幕\""]; // Bool
+ let query = 'insert into td_connector_test.all_types values(' + insertData.join(',') + ' );';
+ performance.mark('B3');
+ performance.measure('Data Prep', 'A3', 'B3');
+ performance.mark('A2');
+ c1.execute(query, {quiet:true});
+ performance.mark('B2');
+ performance.measure('Insert', 'A2', 'B2');
+ if ( i % 5000 == 4999) {
+ console.log("Insert # " + (i+1));
+ console.log('Insert 5k records: ' + ((insertTime - insertTime5000)/1000).toFixed(8) + 's');
+ insertTime5000 = insertTime;
+ avgInsert5ktime = (avgInsert5ktime/1000 * Math.floor(i / 5000) + insertTime5000/1000) / Math.ceil( i / 5000);
+ console.log('DataPrepTime So Far: ' + (dataPrepTime/1000).toFixed(8) + 's | Inserting time So Far: ' + (insertTime/1000).toFixed(8) + 's | Avg. Insert 5k time: ' + avgInsert5ktime.toFixed(8));
+
+
+ }
+ }
+}
+performance.mark('insert 1E5')
+insertN(1E5);
+performance.mark('insert 1E5 2')
+performance.measure('Insert With Logs', 'insert 1E5', 'insert 1E5 2');
+console.log('DataPrepTime: ' + (dataPrepTime/1000).toFixed(8) + 's | Inserting time: ' + (insertTime/1000).toFixed(8) + 's');
+dataPrepTime = 0; insertTime = 0;
+//'insert into td_connector_test.all_types values (now, null,null,null,null,null,null,null,null,null);'
diff --git a/tests/connectorTest/nodejsTest/test/test.js b/tests/connectorTest/nodejsTest/test/test.js
new file mode 100644
index 0000000000000000000000000000000000000000..caf05955da4c960ebedc872f400c17d18be767dd
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/test/test.js
@@ -0,0 +1,170 @@
+const taos = require('../tdengine');
+var conn = taos.connect();
+var c1 = conn.cursor();
+let stime = new Date();
+let interval = 1000;
+
+function convertDateToTS(date) {
+ let tsArr = date.toISOString().split("T")
+ return "\"" + tsArr[0] + " " + tsArr[1].substring(0, tsArr[1].length-1) + "\"";
+}
+function R(l,r) {
+ return Math.random() * (r - l) - r;
+}
+function randomBool() {
+ if (Math.random() < 0.5) {
+ return true;
+ }
+ return false;
+}
+
+// Initialize
+//c1.execute('drop database td_connector_test;');
+c1.execute('create database if not exists td_connector_test;');
+c1.execute('use td_connector_test;')
+c1.execute('create table if not exists all_types (ts timestamp, _int int, _bigint bigint, _float float, _double double, _binary binary(40), _smallint smallint, _tinyint tinyint, _bool bool, _nchar nchar(40));');
+c1.execute('create table if not exists stabletest (ts timestamp, v1 int, v2 int, v3 int, v4 double) tags (id int, location binary(20));')
+
+// Shell Test : The following uses the cursor to imitate the taos shell
+
+// Insert
+for (let i = 0; i < 10000; i++) {
+ let insertData = ["now+" + i + "s", // Timestamp
+ parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // Int
+ parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // BigInt
+ parseFloat( R(-3.4E38, 3.4E38) ), // Float
+ parseFloat( R(-1.7E30, 1.7E30) ), // Double
+ "\"Long Binary\"", // Binary
+ parseInt( R(-32767, 32767) ), // Small Int
+ parseInt( R(-127, 127) ), // Tiny Int
+ randomBool(),
+ "\"Nchars\""]; // Bool
+ c1.execute('insert into td_connector_test.all_types values(' + insertData.join(',') + ' );', {quiet:true});
+ if (i % 1000 == 0) {
+ console.log("Insert # " , i);
+ }
+}
+
+// Select
+console.log('select * from td_connector_test.all_types limit 3 offset 100;');
+c1.execute('select * from td_connector_test.all_types limit 2 offset 100;');
+
+var d = c1.fetchall();
+console.log(c1.fields);
+console.log(d);
+
+// Functions
+console.log('select count(*), avg(_int), sum(_float), max(_bigint), min(_double) from td_connector_test.all_types;')
+c1.execute('select count(*), avg(_int), sum(_float), max(_bigint), min(_double) from td_connector_test.all_types;');
+var d = c1.fetchall();
+console.log(c1.fields);
+console.log(d);
+
+// Immediate Execution like the Shell
+
+c1.query('select count(*), stddev(_double), min(_tinyint) from all_types where _tinyint > 50 and _int < 0;', true).then(function(result){
+ result.pretty();
+})
+
+c1.query('select _tinyint, _bool from all_types where _tinyint > 50 and _int < 0 limit 50;', true).then(function(result){
+ result.pretty();
+})
+
+c1.query('select stddev(_double), stddev(_bigint), stddev(_float) from all_types;', true).then(function(result){
+ result.pretty();
+})
+c1.query('select stddev(_double), stddev(_bigint), stddev(_float) from all_types interval(1m) limit 100;', true).then(function(result){
+ result.pretty();
+})
+
+// Binding arguments, and then using promise
+var q = c1.query('select _nchar from td_connector_test.all_types where ts >= ? and _int > ? limit 100 offset 40;').bind(new Date(1231), 100)
+console.log(q.query);
+q.execute().then(function(r) {
+ r.pretty();
+});
+
+
+// test query null value
+c1.execute("create table if not exists td_connector_test.weather(ts timestamp, temperature float, humidity int) tags(location nchar(64))");
+c1.execute("insert into t1 using weather tags('北京') values(now, 11.11, 11)");
+c1.execute("insert into t1(ts, temperature) values(now, 22.22)");
+c1.execute("insert into t1(ts, humidity) values(now, 33)");
+c1.query('select * from test.t1', true).then(function (result) {
+ result.pretty();
+});
+
+var q = c1.query('select * from td_connector_test.weather');
+console.log(q.query);
+q.execute().then(function(r) {
+ r.pretty();
+});
+
+function sleep(sleepTime) {
+ for(var start = +new Date; +new Date - start <= sleepTime; ) { }
+}
+
+sleep(10000);
+
+// Raw Async Testing (Callbacks, not promises)
+function cb2(param, result, rowCount, rd) {
+ console.log('CB2 Callbacked!');
+ console.log("RES *", result);
+ console.log("Async fetched", rowCount, " rows");
+ console.log("Passed Param: ", param);
+ console.log("Fields ", rd.fields);
+ console.log("Data ", rd.data);
+}
+function cb1(param,result,code) {
+ console.log('CB1 Callbacked!');
+ console.log("RES * ", result);
+ console.log("Status: ", code);
+ console.log("Passed Param ", param);
+ c1.fetchall_a(result, cb2, param);
+}
+
+c1.execute_a("describe td_connector_test.all_types;", cb1, {myparam:3.141});
+
+function cb4(param, result, rowCount, rd) {
+ console.log('CB4 Callbacked!');
+ console.log("RES *", result);
+ console.log("Async fetched", rowCount, "rows");
+ console.log("Passed Param: ", param);
+ console.log("Fields", rd.fields);
+ console.log("Data", rd.data);
+}
+// Without directly calling fetchall_a
+var thisRes;
+function cb3(param,result,code) {
+ console.log('CB3 Callbacked!');
+ console.log("RES *", result);
+ console.log("Status:", code);
+ console.log("Passed Param", param);
+ thisRes = result;
+}
+//Test calling execute and fetchall seperately and not through callbacks
+var param = c1.execute_a("describe td_connector_test.all_types;", cb3, {e:2.718});
+console.log("Passed Param outside of callback: ", param);
+console.log(param);
+setTimeout(function(){
+ c1.fetchall_a(thisRes, cb4, param);
+},100);
+
+
+// Async through promises
+var aq = c1.query('select count(*) from td_connector_test.all_types;',false);
+aq.execute_a().then(function(data) {
+ data.pretty();
+});
+
+c1.query('describe td_connector_test.stabletest').execute_a().then(function(r){
+ r.pretty()
+});
+
+setTimeout(function(){
+ c1.query('drop database td_connector_test;');
+},200);
+
+setTimeout(function(){
+ conn.close();
+},2000);
diff --git a/tests/connectorTest/nodejsTest/test/testMicroseconds.js b/tests/connectorTest/nodejsTest/test/testMicroseconds.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc65b3d919f92b3b4d7e0e216c6c8ac64a294d7f
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/test/testMicroseconds.js
@@ -0,0 +1,49 @@
+const taos = require('../tdengine');
+var conn = taos.connect();
+var c1 = conn.cursor();
+let stime = new Date();
+let interval = 1000;
+
+function convertDateToTS(date) {
+ let tsArr = date.toISOString().split("T")
+ return "\"" + tsArr[0] + " " + tsArr[1].substring(0, tsArr[1].length - 1) + "\"";
+}
+function R(l, r) {
+ return Math.random() * (r - l) - r;
+}
+function randomBool() {
+ if (Math.random() < 0.5) {
+ return true;
+ }
+ return false;
+}
+
+// Initialize
+//c1.execute('drop database td_connector_test;');
+const dbname = 'nodejs_test_us';
+c1.execute('create database if not exists ' + dbname + ' precision "us"');
+c1.execute('use ' + dbname)
+c1.execute('create table if not exists tstest (ts timestamp, _int int);');
+c1.execute('insert into tstest values(1625801548423914, 0)');
+// Select
+console.log('select * from tstest');
+c1.execute('select * from tstest');
+
+var d = c1.fetchall();
+console.log(c1.fields);
+let ts = d[0][0];
+console.log(ts);
+
+if (ts.taosTimestamp() != 1625801548423914) {
+ throw "microseconds not match!";
+}
+if (ts.getMicroseconds() % 1000 !== 914) {
+ throw "micronsecond precision error";
+}
+setTimeout(function () {
+ c1.query('drop database nodejs_us_test;');
+}, 200);
+
+setTimeout(function () {
+ conn.close();
+}, 2000);
diff --git a/tests/connectorTest/nodejsTest/test/testNanoseconds.js b/tests/connectorTest/nodejsTest/test/testNanoseconds.js
new file mode 100644
index 0000000000000000000000000000000000000000..85a7600b01f2c908f22e621488f22678083149ea
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/test/testNanoseconds.js
@@ -0,0 +1,49 @@
+const taos = require('../tdengine');
+var conn = taos.connect();
+var c1 = conn.cursor();
+let stime = new Date();
+let interval = 1000;
+
+function convertDateToTS(date) {
+ let tsArr = date.toISOString().split("T")
+ return "\"" + tsArr[0] + " " + tsArr[1].substring(0, tsArr[1].length - 1) + "\"";
+}
+function R(l, r) {
+ return Math.random() * (r - l) - r;
+}
+function randomBool() {
+ if (Math.random() < 0.5) {
+ return true;
+ }
+ return false;
+}
+
+// Initialize
+//c1.execute('drop database td_connector_test;');
+const dbname = 'nodejs_test_ns';
+c1.execute('create database if not exists ' + dbname + ' precision "ns"');
+c1.execute('use ' + dbname)
+c1.execute('create table if not exists tstest (ts timestamp, _int int);');
+c1.execute('insert into tstest values(1625801548423914405, 0)');
+// Select
+console.log('select * from tstest');
+c1.execute('select * from tstest');
+
+var d = c1.fetchall();
+console.log(c1.fields);
+let ts = d[0][0];
+console.log(ts);
+
+if (ts.taosTimestamp() != 1625801548423914405) {
+ throw "nanosecond not match!";
+}
+if (ts.getNanoseconds() % 1000000 !== 914405) {
+ throw "nanosecond precision error";
+}
+setTimeout(function () {
+ c1.query('drop database nodejs_ns_test;');
+}, 200);
+
+setTimeout(function () {
+ conn.close();
+}, 2000);
diff --git a/tests/connectorTest/nodejsTest/test/testSubscribe.js b/tests/connectorTest/nodejsTest/test/testSubscribe.js
new file mode 100644
index 0000000000000000000000000000000000000000..30fb3f425683f0113873534f2b67255db811edcc
--- /dev/null
+++ b/tests/connectorTest/nodejsTest/test/testSubscribe.js
@@ -0,0 +1,16 @@
+const taos = require('../tdengine');
+var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:10});
+var c1 = conn.cursor();
+let stime = new Date();
+let interval = 1000;
+c1.execute('use td_connector_test');
+let sub = c1.subscribe({
+ restart: true,
+ sql: "select AVG(_int) from td_connector_test.all_Types;",
+ topic: 'all_Types',
+ interval: 1000
+});
+
+c1.consumeData(sub, (data, fields) => {
+ console.log(data);
+});
\ No newline at end of file
diff --git a/tests/connectorTest/odbcTest/nanosupport/nanoTest_odbc.py b/tests/connectorTest/odbcTest/nanosupport/nanoTest_odbc.py
new file mode 100644
index 0000000000000000000000000000000000000000..e6a4bc73aef3e19bc56e817325acd62d21156d67
--- /dev/null
+++ b/tests/connectorTest/odbcTest/nanosupport/nanoTest_odbc.py
@@ -0,0 +1,111 @@
+import pyodbc
+import argparse
+import sys
+
+parser = argparse.ArgumentParser(description='Access TDengine via ODBC.')
+parser.add_argument('--DSN', help='DSN to use')
+parser.add_argument('--UID', help='UID to use')
+parser.add_argument('--PWD', help='PWD to use')
+parser.add_argument('--Server', help='Server to use')
+parser.add_argument('-C', metavar='CONNSTR', help='Connection string to use')
+
+args = parser.parse_args()
+
+a = 'DSN=%s'%args.DSN if args.DSN else None
+b = 'UID=%s'%args.UID if args.UID else None
+c = 'PWD=%s'%args.PWD if args.PWD else None
+d = 'Server=%s'%args.Server if args.Server else None
+conn_str = ';'.join(filter(None, [a,b,c,d])) if args.DSN else None
+conn_str = conn_str if conn_str else args.C
+if not conn_str:
+ parser.print_help(file=sys.stderr)
+ exit()
+
+print('connecting: [%s]' % conn_str)
+cnxn = pyodbc.connect(conn_str, autocommit=True)
+cnxn.setdecoding(pyodbc.SQL_CHAR, encoding='utf-8')
+
+cursor = cnxn.cursor()
+cursor.execute("drop database if exists db");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create database db");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create table db.mt (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, bin binary(10), blob nchar(10))");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("insert into db.mt values('2020-10-13 06:44:00.123', 1, 127, 32767, 2147483647, 32769, 123.456, 789.987, 'hello', 'helloworld')")
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("insert into db.mt values(?,?,?,?,?,?,?,?,?,?)", "2020-10-13 07:06:00.234", 0, 127, 32767, 32768, 32769, 123.456, 789.987, "hel后lo".encode('utf-8'), "wo哈rlxd129")
+##cursor.execute("insert into db.mt values(?,?,?,?,?,?,?,?,?,?)", 1502535178128, 9223372036854775807, 127, 32767, 32768, 32769, 123.456, 789.987, "hel后lo".encode('utf-8'), "wo哈rlxd123");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("""
+INSERT INTO db.mt (ts,b,v1,v2,v4,v8,f4,f8,bin,blob) values (?,?,?,?,?,?,?,?,?,?)
+""",
+"2020-12-12 00:00:00",
+'true',
+'-127',
+'-32767',
+'-2147483647',
+'-9223372036854775807',
+'-1.23e10',
+'-11.23e6',
+'abcdefghij'.encode('utf-8'),
+"人啊大发测试及abc")
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("drop database if exists db");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create database db");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create table db.t (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, bin binary(4), blob nchar(4))");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("insert into db.t values('2020-10-13 06:44:00', 1, 127, 32767, 32768, 32769, 123.456, 789.987, 'hell', 'w我你z')")
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create table db.v (ts timestamp, v1 tinyint, v2 smallint, name nchar(10), ts2 timestamp)")
+cursor.close()
+
+params = [ ('2020-10-16 00:00:00.123', 19, '2111-01-02 01:02:03.123'),
+ ('2020-10-16 00:00:01', 41, '2111-01-02 01:02:03.423'),
+ ('2020-10-16 00:00:02', 57, '2111-01-02 01:02:03.153'),
+ ('2020-10-16 00:00:03.009', 26, '2111-01-02 01:02:03.623') ]
+cursor = cnxn.cursor()
+cursor.fast_executemany = True
+print('py:...................')
+cursor.executemany("insert into db.v (ts, v1, ts2) values (?, ?, ?)", params)
+print('py:...................')
+cursor.close()
+
+## cursor = cnxn.cursor()
+## cursor.execute("SELECT * from db.v where v1 > ?", 4)
+## row = cursor.fetchone()
+## while row:
+## print(row)
+## row = cursor.fetchone()
+## cursor.close()
+##
+## cursor = cnxn.cursor()
+## cursor.execute("SELECT * from db.v where v1 > ?", '5')
+## row = cursor.fetchone()
+## while row:
+## print(row)
+## row = cursor.fetchone()
+## cursor.close()
+
diff --git a/tests/connectorTest/odbcTest/nanosupport/odbc.go b/tests/connectorTest/odbcTest/nanosupport/odbc.go
new file mode 100644
index 0000000000000000000000000000000000000000..4d9c760c4e87a4a899051edc74692ecca8a19d15
--- /dev/null
+++ b/tests/connectorTest/odbcTest/nanosupport/odbc.go
@@ -0,0 +1,84 @@
+package main
+
+import (
+ "context"
+ "database/sql"
+ "flag"
+ "log"
+ "os"
+ "os/signal"
+ "time"
+ _ "github.com/alexbrainman/odbc"
+)
+
+var pool *sql.DB // Database connection pool.
+
+func main() {
+ id := flag.Int64("id", 32768, "person ID to find")
+ dsn := flag.String("dsn", os.Getenv("DSN"), "connection data source name")
+ flag.Parse()
+
+ if len(*dsn) == 0 {
+ log.Fatal("missing dsn flag")
+ }
+ if *id == 0 {
+ log.Fatal("missing person ID")
+ }
+ var err error
+
+ // Opening a driver typically will not attempt to connect to the database.
+ pool, err = sql.Open("odbc", *dsn)
+ if err != nil {
+ // This will not be a connection error, but a DSN parse error or
+ // another initialization error.
+ log.Fatal("unable to use data source name", err)
+ }
+ defer pool.Close()
+
+ pool.SetConnMaxLifetime(0)
+ pool.SetMaxIdleConns(3)
+ pool.SetMaxOpenConns(3)
+
+ ctx, stop := context.WithCancel(context.Background())
+ defer stop()
+
+ appSignal := make(chan os.Signal, 3)
+ signal.Notify(appSignal, os.Interrupt)
+
+ go func() {
+ select {
+ case <-appSignal:
+ stop()
+ }
+ }()
+
+ Ping(ctx)
+
+ Query(ctx, *id)
+}
+
+// Ping the database to verify DSN provided by the user is valid and the
+// server accessible. If the ping fails exit the program with an error.
+func Ping(ctx context.Context) {
+ ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
+ defer cancel()
+
+ if err := pool.PingContext(ctx); err != nil {
+ log.Fatalf("unable to connect to database: %v", err)
+ }
+}
+
+// Query the database for the information requested and prints the results.
+// If the query fails exit the program with an error.
+func Query(ctx context.Context, id int64) {
+ ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+ defer cancel()
+
+ var name string
+ err := pool.QueryRowContext(ctx, "select name from m.t").Scan(&name)
+ if err != nil {
+ log.Fatal("unable to execute search query", err)
+ }
+ log.Println("name=", name)
+}
+
diff --git a/tests/connectorTest/odbcTest/nanosupport/odbc.py b/tests/connectorTest/odbcTest/nanosupport/odbc.py
new file mode 100644
index 0000000000000000000000000000000000000000..cee0cf1a13f6360790de368637e2b6a05de3564f
--- /dev/null
+++ b/tests/connectorTest/odbcTest/nanosupport/odbc.py
@@ -0,0 +1,115 @@
+import pyodbc
+import argparse
+import sys
+
+parser = argparse.ArgumentParser(description='Access TDengine via ODBC.')
+parser.add_argument('--DSN', help='DSN to use')
+parser.add_argument('--UID', help='UID to use')
+parser.add_argument('--PWD', help='PWD to use')
+parser.add_argument('--Server', help='Server to use')
+parser.add_argument('-C', metavar='CONNSTR', help='Connection string to use')
+
+args = parser.parse_args()
+
+a = 'DSN=%s'%args.DSN if args.DSN else None
+b = 'UID=%s'%args.UID if args.UID else None
+c = 'PWD=%s'%args.PWD if args.PWD else None
+d = 'Server=%s'%args.Server if args.Server else None
+conn_str = ';'.join(filter(None, [a,b,c,d])) if args.DSN else None
+conn_str = conn_str if conn_str else args.C
+if not conn_str:
+ parser.print_help(file=sys.stderr)
+ exit()
+
+print('connecting: [%s]' % conn_str)
+cnxn = pyodbc.connect(conn_str, autocommit=True)
+cnxn.setdecoding(pyodbc.SQL_CHAR, encoding='utf-8')
+
+cursor = cnxn.cursor()
+cursor.execute("drop database if exists db");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create database db");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create table db.mt (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, bin binary(10), blob nchar(10))");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("insert into db.mt values('2020-10-13 06:44:00.123', 1, 127, 32767, 2147483647, 32769, 123.456, 789.987, 'hello', 'helloworld')")
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("insert into db.mt values(?,?,?,?,?,?,?,?,?,?)", "2020-10-13 07:06:00.234", 0, 127, 32767, 32768, 32769, 123.456, 789.987, "hel后lo".encode('utf-8'), "wo哈rlxd129")
+##cursor.execute("insert into db.mt values(?,?,?,?,?,?,?,?,?,?)", 1502535178128, 9223372036854775807, 127, 32767, 32768, 32769, 123.456, 789.987, "hel后lo".encode('utf-8'), "wo哈rlxd123");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("""
+INSERT INTO db.mt (ts,b,v1,v2,v4,v8,f4,f8,bin,blob) values (?,?,?,?,?,?,?,?,?,?)
+""",
+"2020-12-12 00:00:00",
+'true',
+'-127',
+'-32767',
+'-2147483647',
+'-9223372036854775807',
+'-1.23e10',
+'-11.23e6',
+'abcdefghij'.encode('utf-8'),
+"人啊大发测试及abc")
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("drop database if exists db");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create database db");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create table db.t (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, bin binary(4), blob nchar(4))");
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("insert into db.t values('2020-10-13 06:44:00', 1, 127, 32767, 32768, 32769, 123.456, 789.987, 'hell', 'w我你z')")
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("create table db.v (ts timestamp, v1 tinyint, v2 smallint, name nchar(10), ts2 timestamp)")
+cursor.close()
+
+cursor = cnxn.cursor()
+cursor.execute("select * from db.v")
+cursor.close()
+
+params = [ ('2020-10-16 00:00:00.123', 19, '2111-01-02 01:02:03.123'),
+ ('2020-10-16 00:00:01', 41, '2111-01-02 01:02:03.423'),
+ ('2020-10-16 00:00:02', 57, '2111-01-02 01:02:03.153'),
+ ('2020-10-16 00:00:03.009', 26, '2111-01-02 01:02:03.623') ]
+cursor = cnxn.cursor()
+cursor.fast_executemany = True
+print('py:...................')
+cursor.executemany("insert into db.v (ts, v1, ts2) values (?, ?, ?)", params)
+print('py:...................')
+cursor.close()
+
+## cursor = cnxn.cursor()
+## cursor.execute("SELECT * from db.v where v1 > ?", 4)
+## row = cursor.fetchone()
+## while row:
+## print(row)
+## row = cursor.fetchone()
+## cursor.close()
+##
+## cursor = cnxn.cursor()
+## cursor.execute("SELECT * from db.v where v1 > ?", '5')
+## row = cursor.fetchone()
+## while row:
+## print(row)
+## row = cursor.fetchone()
+## cursor.close()
+
diff --git a/tests/examples/JDBC/JDBCDemo/pom.xml b/tests/examples/JDBC/JDBCDemo/pom.xml
index fed00c147b87621c70d60ea206b06f1b0f3e8d8f..8cf0356721f8ffd568e87fa4a77c86eb0f90a62b 100644
--- a/tests/examples/JDBC/JDBCDemo/pom.xml
+++ b/tests/examples/JDBC/JDBCDemo/pom.xml
@@ -17,7 +17,7 @@
com.taosdata.jdbctaos-jdbcdriver
- 2.0.31
+ 2.0.34
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcDemo.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcDemo.java
index d4ea5f919d2882e4f82b817380172eff20d7c611..5bc23403087578c0791b0a5e6fca74a47aad8184 100644
--- a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcDemo.java
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcDemo.java
@@ -7,6 +7,9 @@ public class JdbcDemo {
private static String host;
private static final String dbName = "test";
private static final String tbName = "weather";
+ private static final String user = "root";
+ private static final String password = "taosdata";
+
private Connection connection;
public static void main(String[] args) {
@@ -30,10 +33,9 @@ public class JdbcDemo {
}
private void init() {
- final String url = "jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata";
+ final String url = "jdbc:TAOS://" + host + ":6030/?user=" + user + "&password=" + password;
// get connection
try {
- Class.forName("com.taosdata.jdbc.TSDBDriver");
Properties properties = new Properties();
properties.setProperty("charset", "UTF-8");
properties.setProperty("locale", "en_US.UTF-8");
@@ -42,8 +44,7 @@ public class JdbcDemo {
connection = DriverManager.getConnection(url, properties);
if (connection != null)
System.out.println("[ OK ] Connection established.");
- } catch (ClassNotFoundException | SQLException e) {
- System.out.println("[ ERROR! ] Connection establish failed.");
+ } catch (SQLException e) {
e.printStackTrace();
}
}
@@ -74,7 +75,7 @@ public class JdbcDemo {
}
private void select() {
- final String sql = "select * from "+ dbName + "." + tbName;
+ final String sql = "select * from " + dbName + "." + tbName;
executeQuery(sql);
}
@@ -89,8 +90,6 @@ public class JdbcDemo {
}
}
- /************************************************************************/
-
private void executeQuery(String sql) {
long start = System.currentTimeMillis();
try (Statement statement = connection.createStatement()) {
@@ -117,7 +116,6 @@ public class JdbcDemo {
}
}
-
private void printSql(String sql, boolean succeed, long cost) {
System.out.println("[ " + (succeed ? "OK" : "ERROR!") + " ] time cost: " + cost + " ms, execute statement ====> " + sql);
}
@@ -132,7 +130,6 @@ public class JdbcDemo {
long end = System.currentTimeMillis();
printSql(sql, false, (end - start));
e.printStackTrace();
-
}
}
@@ -141,5 +138,4 @@ public class JdbcDemo {
System.exit(0);
}
-
-}
\ No newline at end of file
+}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java
index 5bf980f6d84e53438573812aa9f07d8d463f08c3..d89476b8ca718dab24202e2320e842366533a763 100644
--- a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java
@@ -4,14 +4,15 @@ import java.sql.*;
import java.util.Properties;
public class JdbcRestfulDemo {
- private static final String host = "127.0.0.1";
+ private static final String host = "localhost";
+ private static final String dbname = "test";
+ private static final String user = "root";
+ private static final String password = "taosdata";
public static void main(String[] args) {
try {
- // load JDBC-restful driver
- Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
// use port 6041 in url when use JDBC-restful
- String url = "jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata";
+ String url = "jdbc:TAOS-RS://" + host + ":6041/?user=" + user + "&password=" + password;
Properties properties = new Properties();
properties.setProperty("charset", "UTF-8");
@@ -21,12 +22,12 @@ public class JdbcRestfulDemo {
Connection conn = DriverManager.getConnection(url, properties);
Statement stmt = conn.createStatement();
- stmt.execute("drop database if exists restful_test");
- stmt.execute("create database if not exists restful_test");
- stmt.execute("use restful_test");
- stmt.execute("create table restful_test.weather(ts timestamp, temperature float) tags(location nchar(64))");
- stmt.executeUpdate("insert into t1 using restful_test.weather tags('北京') values(now, 18.2)");
- ResultSet rs = stmt.executeQuery("select * from restful_test.weather");
+ stmt.execute("drop database if exists " + dbname);
+ stmt.execute("create database if not exists " + dbname);
+ stmt.execute("use " + dbname);
+ stmt.execute("create table " + dbname + ".weather(ts timestamp, temperature float) tags(location nchar(64))");
+ stmt.executeUpdate("insert into t1 using " + dbname + ".weather tags('北京') values(now, 18.2)");
+ ResultSet rs = stmt.executeQuery("select * from " + dbname + ".weather");
ResultSetMetaData meta = rs.getMetaData();
while (rs.next()) {
for (int i = 1; i <= meta.getColumnCount(); i++) {
@@ -38,8 +39,6 @@ public class JdbcRestfulDemo {
rs.close();
stmt.close();
conn.close();
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
} catch (SQLException e) {
e.printStackTrace();
}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/SubscribeDemo.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/SubscribeDemo.java
index def4c649027034028d222bfedb71e37d82b99380..4c499b0b3abb518b48b222eca9bbbcb388bd2008 100644
--- a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/SubscribeDemo.java
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/SubscribeDemo.java
@@ -34,9 +34,8 @@ public class SubscribeDemo {
System.out.println(usage);
return;
}
- /*********************************************************************************************/
+
try {
- Class.forName("com.taosdata.jdbc.TSDBDriver");
Properties properties = new Properties();
properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
diff --git a/tests/examples/JDBC/springbootdemo/pom.xml b/tests/examples/JDBC/springbootdemo/pom.xml
index 6c83718896cc2e5716f599ba08212d3dc8292133..9126813b67e71691692109920f891a6fb4cc5ab5 100644
--- a/tests/examples/JDBC/springbootdemo/pom.xml
+++ b/tests/examples/JDBC/springbootdemo/pom.xml
@@ -60,12 +60,15 @@
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
com.taosdata.jdbctaos-jdbcdriver
- 2.0.28
-
-
+ 2.0.34
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/SpringbootdemoApplication.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/SpringbootdemoApplication.java
index fa10f3b0929e4c25c1379f489f73fc12ad9c1917..53edaa5796cccc7e4a4f274048c83a9ca7bbc7bb 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/SpringbootdemoApplication.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/SpringbootdemoApplication.java
@@ -4,7 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-@MapperScan(basePackages = {"com.taosdata.example.springbootdemo.dao"})
+@MapperScan(basePackages = {"com.taosdata.example.springbootdemo"})
@SpringBootApplication
public class SpringbootdemoApplication {
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
index cf14f5d84ace6348f38709ac3d3668ee8d2a0797..ed720fe6c02dd3a7eba6e645ea1e76d704c04d0c 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
@@ -15,35 +15,21 @@ public class WeatherController {
@Autowired
private WeatherService weatherService;
- /**
- * create database and table
- *
- * @return
- */
+ @GetMapping("/lastOne")
+ public Weather lastOne() {
+ return weatherService.lastOne();
+ }
+
@GetMapping("/init")
public int init() {
return weatherService.init();
}
- /**
- * Pagination Query
- *
- * @param limit
- * @param offset
- * @return
- */
@GetMapping("/{limit}/{offset}")
public List queryWeather(@PathVariable Long limit, @PathVariable Long offset) {
return weatherService.query(limit, offset);
}
- /**
- * upload single weather info
- *
- * @param temperature
- * @param humidity
- * @return
- */
@PostMapping("/{temperature}/{humidity}")
public int saveWeather(@PathVariable float temperature, @PathVariable float humidity) {
return weatherService.save(temperature, humidity);
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
index ad6733558a9d548be196cf8c9c0c63dc96227b39..d9202b45b4cc3dddf8e5a082ac339c1f88d4ec01 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
@@ -8,6 +8,8 @@ import java.util.Map;
public interface WeatherMapper {
+ Map lastOne();
+
void dropDB();
void createDB();
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
index 2d3e0540650f35c1018992795ac33fb6cb7c4837..91938ca24e3cf9c3e0f2895cf40f214d484c55d5 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
@@ -9,20 +9,48 @@
+
+
- drop database if exists test
+ drop
+ database if exists test
- create database if not exists test
+ create
+ database if not exists test
- create table if not exists test.weather(ts timestamp, temperature float, humidity float) tags(location nchar(64), groupId int)
+ create table if not exists test.weather
+ (
+ ts
+ timestamp,
+ temperature
+ float,
+ humidity
+ float,
+ note
+ binary
+ (
+ 64
+ )) tags
+ (
+ location nchar
+ (
+ 64
+ ), groupId int)
- create table if not exists test.t#{groupId} using test.weather tags(#{location}, #{groupId})
+ create table if not exists test.t#{groupId} using test.weather tags
+ (
+ #{location},
+ #{groupId}
+ )
- insert into test.t#{groupId} (ts, temperature, humidity) values (#{ts}, ${temperature}, ${humidity})
+ insert into test.t#{groupId} (ts, temperature, humidity, note)
+ values (#{ts}, ${temperature}, ${humidity}, #{note})
-
-
-
+
+
+
\ No newline at end of file
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/domain/Weather.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/domain/Weather.java
index c11b9a6f50655788d1e35eb9607a101d2d06c872..e4238127bd32b0f6ad21a514f3a1f07f6069b6d5 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/domain/Weather.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/domain/Weather.java
@@ -11,6 +11,7 @@ public class Weather {
private Float temperature;
private Float humidity;
private String location;
+ private String note;
private int groupId;
public Weather() {
@@ -61,4 +62,12 @@ public class Weather {
public void setGroupId(int groupId) {
this.groupId = groupId;
}
+
+ public String getNote() {
+ return note;
+ }
+
+ public void setNote(String note) {
+ this.note = note;
+ }
}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
index 26d09c7d128015739cdb0a87956affa4910b4b4e..2264b200afc3e0c2b7dd8e496e607649f940581d 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
@@ -29,6 +29,7 @@ public class WeatherService {
Weather weather = new Weather(new Timestamp(ts + (thirtySec * i)), 30 * random.nextFloat(), random.nextInt(100));
weather.setLocation(locations[random.nextInt(locations.length)]);
weather.setGroupId(i % locations.length);
+ weather.setNote("note-" + i);
weatherMapper.createTable(weather);
count += weatherMapper.insert(weather);
}
@@ -58,4 +59,21 @@ public class WeatherService {
public List avg() {
return weatherMapper.avg();
}
+
+ public Weather lastOne() {
+ Map result = weatherMapper.lastOne();
+
+ long ts = (long) result.get("ts");
+ float temperature = (float) result.get("temperature");
+ float humidity = (float) result.get("humidity");
+ String note = (String) result.get("note");
+ int groupId = (int) result.get("groupid");
+ String location = (String) result.get("location");
+
+ Weather weather = new Weather(new Timestamp(ts), temperature, humidity);
+ weather.setNote(note);
+ weather.setGroupId(groupId);
+ weather.setLocation(location);
+ return weather;
+ }
}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/util/TaosAspect.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/util/TaosAspect.java
new file mode 100644
index 0000000000000000000000000000000000000000..80dad1bd7d669ba6b912c7e5fa816c29b7e37c87
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/util/TaosAspect.java
@@ -0,0 +1,36 @@
+package com.taosdata.example.springbootdemo.util;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+import java.sql.Timestamp;
+import java.util.Map;
+
+@Aspect
+@Component
+public class TaosAspect {
+
+ @Around("execution(java.util.Map com.taosdata.example.springbootdemo.dao.*.*(..))")
+ public Object handleType(ProceedingJoinPoint joinPoint) {
+ Map result = null;
+ try {
+ result = (Map) joinPoint.proceed();
+ for (String key : result.keySet()) {
+ Object obj = result.get(key);
+ if (obj instanceof byte[]) {
+ obj = new String((byte[]) obj);
+ result.put(key, obj);
+ }
+ if (obj instanceof Timestamp) {
+ obj = ((Timestamp) obj).getTime();
+ result.put(key, obj);
+ }
+ }
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ return result;
+ }
+}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
index 4d7e64d10576388827502a459df9e68da2721dbb..06daa81bbb06450d99ab3f6e640c9795c0ad5d2e 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
+++ b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
@@ -1,22 +1,20 @@
# datasource config - JDBC-JNI
#spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver
-#spring.datasource.url=jdbc:TAOS://127.0.0.1:6030/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+#spring.datasource.url=jdbc:TAOS://localhost:6030/?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
#spring.datasource.username=root
#spring.datasource.password=taosdata
-
# datasource config - JDBC-RESTful
spring.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-spring.datasource.url=jdbc:TAOS-RS://master:6041/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+spring.datasource.url=jdbc:TAOS-RS://localhsot:6041/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
spring.datasource.username=root
spring.datasource.password=taosdata
-
spring.datasource.druid.initial-size=5
spring.datasource.druid.min-idle=5
spring.datasource.druid.max-active=5
spring.datasource.druid.max-wait=30000
spring.datasource.druid.validation-query=select server_status();
-
+spring.aop.auto=true
+spring.aop.proxy-target-class=true
#mybatis
mybatis.mapper-locations=classpath:mapper/*.xml
-
logging.level.com.taosdata.jdbc.springbootdemo.dao=debug
diff --git a/tests/examples/c/-g b/tests/examples/c/-g
new file mode 100755
index 0000000000000000000000000000000000000000..3909909e8fe531a7b6d35ca315b8277e7270bb02
Binary files /dev/null and b/tests/examples/c/-g differ
diff --git a/tests/examples/c/apitest.c b/tests/examples/c/apitest.c
index 621950a834c515962f35e000279bc91e4c25b5e0..03123afb3584ea94417c88e55edd9f8e232b0fe9 100644
--- a/tests/examples/c/apitest.c
+++ b/tests/examples/c/apitest.c
@@ -2,6 +2,7 @@
// to compile: gcc -o apitest apitest.c -ltaos
#include "taoserror.h"
+#include "cJSON.h"
#include
#include
@@ -1020,7 +1021,7 @@ int32_t verify_schema_less(TAOS* taos) {
void verify_telnet_insert(TAOS* taos) {
TAOS_RES *result;
- result = taos_query(taos, "drop database if exists test;");
+ result = taos_query(taos, "drop database if exists db;");
taos_free_result(result);
usleep(100000);
result = taos_query(taos, "create database db precision 'ms';");
@@ -1032,13 +1033,13 @@ void verify_telnet_insert(TAOS* taos) {
/* metric */
char* lines0[] = {
- "stb0_0 1626006833639000000ns 4i8 host=\"host0\",interface=\"eth0\"",
- "stb0_1 1626006833639000000ns 4i8 host=\"host0\",interface=\"eth0\"",
- "stb0_2 1626006833639000000ns 4i8 host=\"host0\",interface=\"eth0\"",
+ "stb0_0 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
+ "stb0_1 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
+ "stb0_2 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
};
code = taos_insert_telnet_lines(taos, lines0, 3);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines0 code: %d, %s.\n", code, tstrerror(code));
}
/* timestamp */
@@ -1052,18 +1053,18 @@ void verify_telnet_insert(TAOS* taos) {
};
code = taos_insert_telnet_lines(taos, lines1, 6);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines1 code: %d, %s.\n", code, tstrerror(code));
}
/* metric value */
- //tinyin
+ //tinyint
char* lines2_0[] = {
"stb2_0 1626006833651ms -127i8 host=\"host0\"",
"stb2_0 1626006833652ms 127i8 host=\"host0\""
};
code = taos_insert_telnet_lines(taos, lines2_0, 2);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines2_0 code: %d, %s.\n", code, tstrerror(code));
}
//smallint
@@ -1073,7 +1074,7 @@ void verify_telnet_insert(TAOS* taos) {
};
code = taos_insert_telnet_lines(taos, lines2_1, 2);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines2_1 code: %d, %s.\n", code, tstrerror(code));
}
//int
@@ -1083,7 +1084,7 @@ void verify_telnet_insert(TAOS* taos) {
};
code = taos_insert_telnet_lines(taos, lines2_2, 2);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines2_2 code: %d, %s.\n", code, tstrerror(code));
}
//bigint
@@ -1093,7 +1094,7 @@ void verify_telnet_insert(TAOS* taos) {
};
code = taos_insert_telnet_lines(taos, lines2_3, 2);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines2_3 code: %d, %s.\n", code, tstrerror(code));
}
//float
@@ -1112,7 +1113,7 @@ void verify_telnet_insert(TAOS* taos) {
};
code = taos_insert_telnet_lines(taos, lines2_4, 11);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines2_4 code: %d, %s.\n", code, tstrerror(code));
}
//double
@@ -1130,7 +1131,7 @@ void verify_telnet_insert(TAOS* taos) {
};
code = taos_insert_telnet_lines(taos, lines2_5, 10);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines2_5 code: %d, %s.\n", code, tstrerror(code));
}
//bool
@@ -1148,7 +1149,7 @@ void verify_telnet_insert(TAOS* taos) {
};
code = taos_insert_telnet_lines(taos, lines2_6, 10);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines2_6 code: %d, %s.\n", code, tstrerror(code));
}
//binary
@@ -1159,7 +1160,7 @@ void verify_telnet_insert(TAOS* taos) {
};
code = taos_insert_telnet_lines(taos, lines2_7, 3);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines2_7 code: %d, %s.\n", code, tstrerror(code));
}
//nchar
@@ -1169,34 +1170,767 @@ void verify_telnet_insert(TAOS* taos) {
};
code = taos_insert_telnet_lines(taos, lines2_8, 2);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines2_8 code: %d, %s.\n", code, tstrerror(code));
}
/* tags */
//tag value types
char* lines3_0[] = {
- "stb3_0 1626006833610ms 1 t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=3.4E38f32,t6=1.7E308f64,t7=true,t8=\"binary_val_1\",t9=L\"标签值1\"",
- "stb3_0 1626006833610ms 2 t1=-127i8,t2=-32767i16,t3=-2147483647i32,t4=-9223372036854775807i64,t5=-3.4E38f32,t6=-1.7E308f64,t7=false,t8=\"binary_val_2\",t9=L\"标签值2\""
+ "stb3_0 1626006833610ms 1 t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=3.4E38f32 t6=1.7E308f64 t7=true t8=\"binary_val_1\" t9=L\"标签值1\"",
+ "stb3_0 1626006833610ms 2 t1=-127i8 t2=-32767i16 t3=-2147483647i32 t4=-9223372036854775807i64 t5=-3.4E38f32 t6=-1.7E308f64 t7=false t8=\"binary_val_2\" t9=L\"标签值2\""
};
code = taos_insert_telnet_lines(taos, lines3_0, 2);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines3_0 code: %d, %s.\n", code, tstrerror(code));
}
//tag ID as child table name
char* lines3_1[] = {
- "stb3_1 1626006833610ms 1 id=\"child_table1\",host=\"host1\"",
- "stb3_1 1626006833610ms 2 host=\"host2\",iD=\"child_table2\"",
- "stb3_1 1626006833610ms 3 ID=\"child_table3\",host=\"host3\""
+ "stb3_1 1626006833610ms 1 id=\"child_table1\" host=\"host1\"",
+ "stb3_1 1626006833610ms 2 host=\"host2\" iD=\"child_table2\"",
+ "stb3_1 1626006833610ms 3 ID=\"child_table3\" host=\"host3\""
};
code = taos_insert_telnet_lines(taos, lines3_1, 3);
if (code) {
- printf("code: %d, %s.\n", code, tstrerror(code));
+ printf("lines3_1 code: %d, %s.\n", code, tstrerror(code));
}
return;
}
+void verify_json_insert(TAOS* taos) {
+ TAOS_RES *result;
+
+ result = taos_query(taos, "drop database if exists db;");
+ taos_free_result(result);
+ usleep(100000);
+ result = taos_query(taos, "create database db precision 'ms';");
+ taos_free_result(result);
+ usleep(100000);
+
+ (void)taos_select_db(taos, "db");
+ int32_t code = 0;
+
+ char *message =
+ "{ \
+ \"metric\":\"cpu_load_0\", \
+ \"timestamp\": 1626006833610123, \
+ \"value\": 55.5, \
+ \"tags\": \
+ { \
+ \"host\": \"ubuntu\", \
+ \"interface1\": \"eth0\", \
+ \"Id\": \"tb0\" \
+ } \
+ }";
+
+ code = taos_insert_json_payload(taos, message);
+ if (code) {
+ printf("payload_0 code: %d, %s.\n", code, tstrerror(code));
+ }
+
+ char *message1 =
+ "[ \
+ { \
+ \"metric\":\"cpu_load_1\", \
+ \"timestamp\": 1626006833610123, \
+ \"value\": 55.5, \
+ \"tags\": \
+ { \
+ \"host\": \"ubuntu\", \
+ \"interface\": \"eth1\", \
+ \"Id\": \"tb1\" \
+ } \
+ }, \
+ { \
+ \"metric\":\"cpu_load_2\", \
+ \"timestamp\": 1626006833610123, \
+ \"value\": 55.5, \
+ \"tags\": \
+ { \
+ \"host\": \"ubuntu\", \
+ \"interface\": \"eth2\", \
+ \"Id\": \"tb2\" \
+ } \
+ } \
+ ]";
+
+ code = taos_insert_json_payload(taos, message1);
+ if (code) {
+ printf("payload_1 code: %d, %s.\n", code, tstrerror(code));
+ }
+
+ char *message2 =
+ "[ \
+ { \
+ \"metric\":\"cpu_load_3\", \
+ \"timestamp\": \
+ { \
+ \"value\": 1626006833610123, \
+ \"type\": \"us\" \
+ }, \
+ \"value\": \
+ { \
+ \"value\": 55, \
+ \"type\": \"int\" \
+ }, \
+ \"tags\": \
+ { \
+ \"host\": \
+ { \
+ \"value\": \"ubuntu\", \
+ \"type\": \"binary\" \
+ }, \
+ \"interface\": \
+ { \
+ \"value\": \"eth3\", \
+ \"type\": \"nchar\" \
+ }, \
+ \"ID\": \"tb3\", \
+ \"port\": \
+ { \
+ \"value\": 4040, \
+ \"type\": \"int\" \
+ } \
+ } \
+ }, \
+ { \
+ \"metric\":\"cpu_load_4\", \
+ \"timestamp\": 1626006833610123, \
+ \"value\": 66.6, \
+ \"tags\": \
+ { \
+ \"host\": \"ubuntu\", \
+ \"interface\": \"eth4\", \
+ \"Id\": \"tb4\" \
+ } \
+ } \
+ ]";
+ code = taos_insert_json_payload(taos, message2);
+ if (code) {
+ printf("payload_2 code: %d, %s.\n", code, tstrerror(code));
+ }
+
+
+ cJSON *payload, *tags;
+ char *payload_str;
+
+ /* Default format */
+ //number
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb0_0");
+ cJSON_AddNumberToObject(payload, "timestamp", 1626006833610123);
+ cJSON_AddNumberToObject(payload, "value", 10);
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload0_0 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //true
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb0_1");
+ cJSON_AddNumberToObject(payload, "timestamp", 1626006833610123);
+ cJSON_AddTrueToObject(payload, "value");
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload0_1 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //false
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb0_2");
+ cJSON_AddNumberToObject(payload, "timestamp", 1626006833610123);
+ cJSON_AddFalseToObject(payload, "value");
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload0_2 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //string
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb0_3");
+ cJSON_AddNumberToObject(payload, "timestamp", 1626006833610123);
+ cJSON_AddStringToObject(payload, "value", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload0_3 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //timestamp 0 -> current time
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb0_4");
+ cJSON_AddNumberToObject(payload, "timestamp", 0);
+ cJSON_AddNumberToObject(payload, "value", 123);
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload0_4 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //ID
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb0_5");
+ cJSON_AddNumberToObject(payload, "timestamp", 0);
+ cJSON_AddNumberToObject(payload, "value", 123);
+ tags = cJSON_CreateObject();
+ cJSON_AddStringToObject(tags, "ID", "tb0_5");
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddStringToObject(tags, "iD", "tb000");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddStringToObject(tags, "id", "tb555");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload0_5 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ /* Nested format */
+ //timestamp
+ cJSON *timestamp;
+ //seconds
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb1_0");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ cJSON_AddNumberToObject(payload, "value", 10);
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload1_0 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //milleseconds
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb1_1");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833610);
+ cJSON_AddStringToObject(timestamp, "type", "ms");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ cJSON_AddNumberToObject(payload, "value", 10);
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload1_1 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //microseconds
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb1_2");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833610123);
+ cJSON_AddStringToObject(timestamp, "type", "us");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ cJSON_AddNumberToObject(payload, "value", 10);
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload1_2 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //nanoseconds
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb1_3");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833610123321);
+ cJSON_AddStringToObject(timestamp, "type", "ns");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ cJSON_AddNumberToObject(payload, "value", 10);
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload1_3 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //now
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb1_4");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 0);
+ cJSON_AddStringToObject(timestamp, "type", "ns");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ cJSON_AddNumberToObject(payload, "value", 10);
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload1_4 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //metric value
+ cJSON *metric_val;
+ //bool
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb2_0");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddTrueToObject(metric_val, "value");
+ cJSON_AddStringToObject(metric_val, "type", "bool");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload2_0 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //tinyint
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb2_1");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddNumberToObject(metric_val, "value", 127);
+ cJSON_AddStringToObject(metric_val, "type", "tinyint");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload2_1 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //smallint
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb2_2");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddNumberToObject(metric_val, "value", 32767);
+ cJSON_AddStringToObject(metric_val, "type", "smallint");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload2_2 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //int
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb2_3");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddNumberToObject(metric_val, "value", 2147483647);
+ cJSON_AddStringToObject(metric_val, "type", "int");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload2_3 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //bigint
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb2_4");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddNumberToObject(metric_val, "value", 9223372036854775807);
+ cJSON_AddStringToObject(metric_val, "type", "bigint");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload2_4 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //float
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb2_5");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddNumberToObject(metric_val, "value", 11.12345);
+ cJSON_AddStringToObject(metric_val, "type", "float");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload2_5 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //double
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb2_6");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddNumberToObject(metric_val, "value", 22.123456789);
+ cJSON_AddStringToObject(metric_val, "type", "double");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload2_6 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //binary
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb2_7");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddStringToObject(metric_val, "value", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddStringToObject(metric_val, "type", "binary");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload2_7 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //nchar
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb2_8");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddStringToObject(metric_val, "value", "你好");
+ cJSON_AddStringToObject(metric_val, "type", "nchar");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tags, "t1");
+ cJSON_AddFalseToObject(tags, "t2");
+ cJSON_AddNumberToObject(tags, "t3", 10);
+ cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>");
+ cJSON_AddItemToObject(payload, "tags", tags);
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload2_8 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+
+ //tag value
+ cJSON *tag;
+
+ payload = cJSON_CreateObject();
+ cJSON_AddStringToObject(payload, "metric", "stb3_0");
+
+ timestamp = cJSON_CreateObject();
+ cJSON_AddNumberToObject(timestamp, "value", 1626006833);
+ cJSON_AddStringToObject(timestamp, "type", "s");
+ cJSON_AddItemToObject(payload, "timestamp", timestamp);
+
+ metric_val = cJSON_CreateObject();
+ cJSON_AddStringToObject(metric_val, "value", "hello");
+ cJSON_AddStringToObject(metric_val, "type", "nchar");
+ cJSON_AddItemToObject(payload, "value", metric_val);
+
+ tags = cJSON_CreateObject();
+
+ tag = cJSON_CreateObject();
+ cJSON_AddTrueToObject(tag, "value");
+ cJSON_AddStringToObject(tag, "type", "bool");
+ cJSON_AddItemToObject(tags, "t1", tag);
+
+ tag = cJSON_CreateObject();
+ cJSON_AddFalseToObject(tag, "value");
+ cJSON_AddStringToObject(tag, "type", "bool");
+ cJSON_AddItemToObject(tags, "t2", tag);
+
+ tag = cJSON_CreateObject();
+ cJSON_AddNumberToObject(tag, "value", 127);
+ cJSON_AddStringToObject(tag, "type", "tinyint");
+ cJSON_AddItemToObject(tags, "t3", tag);
+
+ tag = cJSON_CreateObject();
+ cJSON_AddNumberToObject(tag, "value", 32767);
+ cJSON_AddStringToObject(tag, "type", "smallint");
+ cJSON_AddItemToObject(tags, "t4", tag);
+
+ tag = cJSON_CreateObject();
+ cJSON_AddNumberToObject(tag, "value", 2147483647);
+ cJSON_AddStringToObject(tag, "type", "int");
+ cJSON_AddItemToObject(tags, "t5", tag);
+
+ tag = cJSON_CreateObject();
+ cJSON_AddNumberToObject(tag, "value", 9223372036854775807);
+ cJSON_AddStringToObject(tag, "type", "bigint");
+ cJSON_AddItemToObject(tags, "t6", tag);
+
+ tag = cJSON_CreateObject();
+ cJSON_AddNumberToObject(tag, "value", 11.12345);
+ cJSON_AddStringToObject(tag, "type", "float");
+ cJSON_AddItemToObject(tags, "t7", tag);
+
+ tag = cJSON_CreateObject();
+ cJSON_AddNumberToObject(tag, "value", 22.1234567890);
+ cJSON_AddStringToObject(tag, "type", "double");
+ cJSON_AddItemToObject(tags, "t8", tag);
+
+ tag = cJSON_CreateObject();
+ cJSON_AddStringToObject(tag, "value", "binary_val");
+ cJSON_AddStringToObject(tag, "type", "binary");
+ cJSON_AddItemToObject(tags, "t9", tag);
+
+ tag = cJSON_CreateObject();
+ cJSON_AddStringToObject(tag, "value", "你好");
+ cJSON_AddStringToObject(tag, "type", "nchar");
+ cJSON_AddItemToObject(tags, "t10", tag);
+
+ cJSON_AddItemToObject(payload, "tags", tags);
+
+ payload_str = cJSON_Print(payload);
+ //printf("%s\n", payload_str);
+
+ code = taos_insert_json_payload(taos, payload_str);
+ if (code) {
+ printf("payload3_0 code: %d, %s.\n", code, tstrerror(code));
+ }
+ free(payload_str);
+ cJSON_Delete(payload);
+}
+
int main(int argc, char *argv[]) {
const char* host = "127.0.0.1";
const char* user = "root";
@@ -1220,6 +1954,9 @@ int main(int argc, char *argv[]) {
printf("************ verify telnet-insert *************\n");
verify_telnet_insert(taos);
+ printf("************ verify json-insert *************\n");
+ verify_json_insert(taos);
+
printf("************ verify query *************\n");
verify_query(taos);
diff --git a/tests/examples/c/clientcfgtest-taosd.c b/tests/examples/c/clientcfgtest-taosd.c
new file mode 100644
index 0000000000000000000000000000000000000000..fbfbd8935a34481c23e806bbe461882ed9a10437
--- /dev/null
+++ b/tests/examples/c/clientcfgtest-taosd.c
@@ -0,0 +1,33 @@
+#include
+#include
+#include
+#include
+#include
+#include "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "tulog.h"
+#include "tsocket.h"
+#include "tutil.h"
+extern SGlobalCfg *taosGetConfigOption(const char *option) ;
+int main( int argc, char *argv[]){
+
+ printf("start to test\n");
+
+ //case1:
+ //Test config to wrong type
+ const char config1[128] = "{\"cache\":\"4\"}";//input the parameter which want to be configured
+ taos_set_config(config1); //configure the parameter
+
+ SGlobalCfg *cfg1 ;
+
+ cfg1 = taosGetConfigOption("cache");//check the option result
+ if(cfg1->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config cache to '4'success!\n");
+ else
+ printf("config cache failure!\n");
+ return 0 ;
+
+}
diff --git a/tests/examples/c/clientcfgtest-wrongjson.c b/tests/examples/c/clientcfgtest-wrongjson.c
new file mode 100644
index 0000000000000000000000000000000000000000..eecb5dae6d27c213731afdea005af3fc265dd47f
--- /dev/null
+++ b/tests/examples/c/clientcfgtest-wrongjson.c
@@ -0,0 +1,62 @@
+#include
+#include
+#include
+#include
+#include
+#include "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "tulog.h"
+#include "tsocket.h"
+#include "tutil.h"
+extern SGlobalCfg *taosGetConfigOption(const char *option) ;
+int main( int argc, char *argv[]){
+
+ printf("start to test\n");
+
+ //case1:
+ //Test config with wrong JSON
+ //The result is failure
+ const char config1[128] = "{\"firstEp\":\"BCC-2:6030\",\"debugFlag\":\135\"}";//input the parameter which want to be configured
+ taos_set_config(config1); //configure the parameter
+
+ SGlobalCfg *cfg1 ;
+ cfg1 = taosGetConfigOption("firstEp");//check the option result
+ if(cfg1->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config firstEp 'BCC-2:6030'success!\n");
+ else
+ printf("config firstEp failure!\n");
+ SGlobalCfg *cfg2 ;
+ cfg2 = taosGetConfigOption("debugFlag");//check the option result
+ if(cfg1->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config debugFlag '135'success!\n");
+ else
+ printf("config debugFlag failure!\n");
+
+
+ //case2:
+ //repair the JSON and try again
+ //The result is success
+ const char config2[128] = "{\"firstEp\":\"BCC-2:6030\",\"debugFlag\":\"135\"}";//input the parameter which want to be configured
+ taos_set_config(config2); //configure the parameter
+
+ SGlobalCfg *cfg3 ;
+
+ cfg3 = taosGetConfigOption("firstEp");//check the option result
+ if(cfg3->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config firstEp 'BCC-2:6030'success!\n");
+ else
+ printf("config firstEp failure!\n");
+
+ SGlobalCfg *cfg4 ;
+
+ cfg4 = taosGetConfigOption("debugFlag");//check the option result
+ if(cfg4->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config debugFlag '135'success!\n");
+ else
+ printf("config debugFlag failure!\n");
+ return 0 ;
+
+}
diff --git a/tests/examples/c/clientcfgtest-wrongtype.c b/tests/examples/c/clientcfgtest-wrongtype.c
new file mode 100644
index 0000000000000000000000000000000000000000..d88cbeebe8e5114ed4836e77b9494de1cc54aba8
--- /dev/null
+++ b/tests/examples/c/clientcfgtest-wrongtype.c
@@ -0,0 +1,48 @@
+#include
+#include
+#include
+#include
+#include
+#include "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "tulog.h"
+#include "tsocket.h"
+#include "tutil.h"
+extern SGlobalCfg *taosGetConfigOption(const char *option) ;
+int main( int argc, char *argv[]){
+
+ printf("start to test\n");
+
+ //case1:
+ //Test config to wrong type
+ //The result is failure
+ const char config1[128] = "{\"debugFlag\":\"9999999999999999999999999\"}";//input the parameter which want to be configured
+ taos_set_config(config1); //configure the parameter
+
+ SGlobalCfg *cfg1 ;
+
+ cfg1 = taosGetConfigOption("debugFlag");//check the option result
+ if(cfg1->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config debugFlag '9999999999999999999999999\n");
+ else
+ printf("config debugFlag failure!\n");
+
+ //case2:
+ //Try again with right parameter
+ //The result is failure
+ const char config2[128] = "{\"debugFlag\":\"135\"}";//input the parameter which want to be configured
+ taos_set_config(config2); //configure the parameter
+
+ SGlobalCfg *cfg2 ;
+
+ cfg2 = taosGetConfigOption("debugFlag");//check the option result
+ if(cfg2->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config debugflag '135'success!\n");
+ else
+ printf("config debugflag failure!\n");
+ return 0 ;
+
+}
diff --git a/tests/examples/c/clientcfgtest-wrongvalue.c b/tests/examples/c/clientcfgtest-wrongvalue.c
new file mode 100644
index 0000000000000000000000000000000000000000..f0d44a47f62696d14844ea12276b74da7d0ff408
--- /dev/null
+++ b/tests/examples/c/clientcfgtest-wrongvalue.c
@@ -0,0 +1,46 @@
+#include
+#include
+#include
+#include
+#include
+#include "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "tulog.h"
+#include "tsocket.h"
+#include "tutil.h"
+extern SGlobalCfg *taosGetConfigOption(const char *option) ;
+int main( int argc, char *argv[]){
+
+ printf("start to test\n");
+
+ //case1:
+ //Test config to wrong type
+ const char config1[128] = "{\"rpcTimer\":\"0\"}";//input the parameter which want to be configured
+ taos_set_config(config1); //configure the parameter
+
+ SGlobalCfg *cfg1 ;
+
+ cfg1 = taosGetConfigOption("rpcTimer");//check the option result
+ if(cfg1->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config rpcTimer to '0'success!\n");
+ else
+ printf("config rpcTimer failure!\n");
+
+ //case2:
+ //Try again with right parameter
+ const char config2[128] = "{\"rpcTimer\":\"400\"}";//input the parameter which want to be configured
+ taos_set_config(config2); //configure the parameter
+
+ SGlobalCfg *cfg2 ;
+
+ cfg2 = taosGetConfigOption("rpcTimer");//check the option result
+ if(cfg2->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config rpcTimer '400'success!\n");
+ else
+ printf("config rpcTimer failure!\n");
+ return 0 ;
+
+}
diff --git a/tests/examples/c/clientcfgtest.c b/tests/examples/c/clientcfgtest.c
new file mode 100644
index 0000000000000000000000000000000000000000..5f8f51cdb1156a25544273fc6419f65b86ea4ecc
--- /dev/null
+++ b/tests/examples/c/clientcfgtest.c
@@ -0,0 +1,55 @@
+#include
+#include
+#include
+#include
+#include
+#include "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "tulog.h"
+#include "tsocket.h"
+#include "tutil.h"
+extern SGlobalCfg *taosGetConfigOption(const char *option) ;
+int main( int argc, char *argv[]){
+
+ printf("start to test\n");
+
+ //case1:
+ //Test config firstEp success
+ const char config1[128] = "{\"firstEp\":\"BCC-2:6030\",\"debugFlag\":\"135\"}";//input the parameter which want to be configured
+ taos_set_config(config1); //configure the parameter
+
+ SGlobalCfg *cfg1 ;
+
+ cfg1 = taosGetConfigOption("firstEp");//check the option result
+ if(cfg1->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config firstEp 'BCC-2:6030'success!\n");
+ else
+ printf("config firstEp failure!\n");
+
+
+ SGlobalCfg *cfg2 ;
+
+ cfg2 = taosGetConfigOption("debugFlag");//check the option result
+ if(cfg2->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config debugFlag '135' success!\n");
+ else
+ printf("config debugFlag failure!\n");
+ //case2:
+ //Test config only useful at the first time
+ //The result is failure
+ const char config2[128] = "{\"fqdn\":\"BCC-3\"}";//input the parameter which want to be configured
+ taos_set_config(config2); //configure the parameter
+
+ SGlobalCfg *cfg3 ;
+
+ cfg2 = taosGetConfigOption("fqdn");//check the option result
+ if(cfg2->cfgStatus == 3) //If cfgStatus is 3,it means configure is success
+ printf("config fqdn to 'BCC-3'success!\n");
+ else
+ printf("config fqdn failure!\n");
+ return 0 ;
+
+}
diff --git a/tests/examples/c/makefile b/tests/examples/c/makefile
index 304623c27af27cd23a301af134647fb3b9746d64..f364eb76fc34ab0975c00dcae2b8348e58b38517 100644
--- a/tests/examples/c/makefile
+++ b/tests/examples/c/makefile
@@ -6,8 +6,8 @@ TARGET=exe
LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt
CFLAGS = -O3 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \
-Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \
- -Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99
-
+ -Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \
+ -I../../../deps/cJson/inc
all: $(TARGET)
exe:
@@ -17,6 +17,12 @@ exe:
gcc $(CFLAGS) ./stream.c -o $(ROOT)stream $(LFLAGS)
gcc $(CFLAGS) ./subscribe.c -o $(ROOT)subscribe $(LFLAGS)
gcc $(CFLAGS) ./apitest.c -o $(ROOT)apitest $(LFLAGS)
+ gcc $(CFLAGS) ./clientcfgtest.c -o $(ROOT)clientcfgtest $(LFLAGS)
+ gcc $(CFLAGS) ./clientcfgtest-wrongtype.c -o $(ROOT)clientcfgtest-wrongtype $(LFLAGS)
+ gcc $(CFLAGS) ./clientcfgtest-wrongjson.c -o $(ROOT)clientcfgtest-wrongjson $(LFLAGS)
+ gcc $(CFLAGS) ./clientcfgtest-wrongvalue.c -o $(ROOT)clientcfgtest-wrongvalue $(LFLAGS)
+ gcc $(CFLAGS) ./clientcfgtest-taosd.c -o $(ROOT)clientcfgtest-taosd $(LFLAGS)
+
clean:
rm $(ROOT)asyncdemo
@@ -26,3 +32,9 @@ clean:
rm $(ROOT)stream
rm $(ROOT)subscribe
rm $(ROOT)apitest
+ rm $(ROOT)clientcfgtest
+ rm $(ROOT)clientcfgtest-wrongtype
+ rm $(ROOT)clientcfgtest-wrongjson
+ rm $(ROOT)clientcfgtest-wrongvalue
+ rm $(ROOT)clientcfgtest-taosd
+
diff --git a/tests/gotest/batchtest.bat b/tests/gotest/batchtest.bat
index efd8961bb0be2eb6f20e291114b92b00469b984f..2a96ee31eb6211dbc5f300fbb2f3d62c03df3061 100755
--- a/tests/gotest/batchtest.bat
+++ b/tests/gotest/batchtest.bat
@@ -1,3 +1,4 @@
+
@echo off
echo ==== start Go connector test cases test ====
cd /d %~dp0
@@ -18,3 +19,10 @@ rem case002.bat
:: cd case002
:: case002.bat
+
+
+rem cd nanosupport
+rem nanoCase.bat
+
+:: cd nanosupport
+:: nanoCase.bat
\ No newline at end of file
diff --git a/tests/gotest/batchtest.sh b/tests/gotest/batchtest.sh
index 8f5a7fe8f032134e55c9d9675361590ed6d5b19b..503d77b226885b10e3874a3e0718789bed34b200 100755
--- a/tests/gotest/batchtest.sh
+++ b/tests/gotest/batchtest.sh
@@ -19,3 +19,4 @@ go env -w GOPROXY=https://goproxy.io,direct
bash ./case001/case001.sh $severIp $serverPort
bash ./case002/case002.sh $severIp $serverPort
#bash ./case003/case003.sh $severIp $serverPort
+bash ./nanosupport/nanoCase.sh $severIp $serverPort
diff --git a/tests/gotest/case001/case001.go b/tests/gotest/case001/case001.go
index 9d35888f313461a2ce90c7a6ed4ef2791229866c..29bc92f2a0668b3f576145d5bd6d08ed37c82f1b 100644
--- a/tests/gotest/case001/case001.go
+++ b/tests/gotest/case001/case001.go
@@ -12,7 +12,6 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-
package main
import (
diff --git a/tests/gotest/case001/case001.sh b/tests/gotest/case001/case001.sh
index 94e5bb44e03a1f7d2704752fcf9c080abcb4f23f..831e9f83ac482c0a2c668e2ad0d16c4bf59f19aa 100644
--- a/tests/gotest/case001/case001.sh
+++ b/tests/gotest/case001/case001.sh
@@ -15,8 +15,7 @@ script_dir="$(dirname $(readlink -f $0))"
###### step 3: start build
cd $script_dir
rm -f go.*
-go mod init demotest > /dev/null 2>&1
-go mod tidy > /dev/null 2>&1
-go build > /dev/null 2>&1
+go mod init demotest
+go build
sleep 1s
./demotest -h $1 -p $2
diff --git a/tests/gotest/case002/case002.bat b/tests/gotest/case002/case002.bat
index ebec576e724ccb14319dd380c9783a783ac0db62..385677acae826e248a410472bfc7a022ff3003ab 100644
--- a/tests/gotest/case002/case002.bat
+++ b/tests/gotest/case002/case002.bat
@@ -1,5 +1,5 @@
@echo off
-echo ==== start run cases001.go
+echo ==== start run cases002.go
del go.*
go mod init demotest
diff --git a/tests/gotest/case002/case002.go b/tests/gotest/case002/case002.go
index c69da04cb271c24e33953ca8fdfea71c67349b4f..e2ba5ea28ee4f92cfbdca27c78d47268a387c693 100644
--- a/tests/gotest/case002/case002.go
+++ b/tests/gotest/case002/case002.go
@@ -43,10 +43,9 @@ func main() {
os.Exit(1)
}
defer db.Close()
- db.Exec("drop if exists database test")
- db.Exec("create if not exists database test")
+ db.Exec("drop database if exists test")
+ db.Exec("create database if not exists test ")
db.Exec("use test")
- db.Exec("drop if exists database test")
db.Exec("create table test (ts timestamp ,level int)")
for i := 0; i < 10; i++ {
sqlcmd := fmt.Sprintf("insert into test values(%d,%d)", ts+i, i)
diff --git a/tests/gotest/case002/case002.sh b/tests/gotest/case002/case002.sh
index 94e5bb44e03a1f7d2704752fcf9c080abcb4f23f..d98337cce7cfeb51ec9305226b20abdd7b360a46 100644
--- a/tests/gotest/case002/case002.sh
+++ b/tests/gotest/case002/case002.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-echo "==== start run cases001.go"
+echo "==== start run cases002.go"
set +e
#set -x
diff --git a/tests/gotest/nanosupport/connector/executor.go b/tests/gotest/nanosupport/connector/executor.go
new file mode 100644
index 0000000000000000000000000000000000000000..218ea29af3b34a8cfb5ab56585eeb07bc467d209
--- /dev/null
+++ b/tests/gotest/nanosupport/connector/executor.go
@@ -0,0 +1,208 @@
+package connector
+
+import (
+ "context"
+ "fmt"
+ "reflect"
+ "time"
+
+ "github.com/taosdata/go-utils/log"
+ "github.com/taosdata/go-utils/tdengine/config"
+ "github.com/taosdata/go-utils/tdengine/connector"
+ tdengineExecutor "github.com/taosdata/go-utils/tdengine/executor"
+)
+
+type Executor struct {
+ executor *tdengineExecutor.Executor
+ ctx context.Context
+}
+
+var Logger = log.NewLogger("taos test")
+
+func NewExecutor(conf *config.TDengineGo, db string, showSql bool) (*Executor, error) {
+ tdengineConnector, err := connector.NewTDengineConnector("go", conf)
+ if err != nil {
+ return nil, err
+ }
+ executor := tdengineExecutor.NewExecutor(tdengineConnector, db, showSql, Logger)
+ return &Executor{
+ executor: executor,
+ ctx: context.Background(),
+ }, nil
+}
+
+func (e *Executor) Execute(sql string) (int64, error) {
+ return e.executor.DoExec(e.ctx, sql)
+}
+func (e *Executor) Query(sql string) (*connector.Data, error) {
+ fmt.Println("query :", sql)
+ return e.executor.DoQuery(e.ctx, sql)
+}
+func (e *Executor) CheckData(row, col int, value interface{}, data *connector.Data) (bool, error) {
+ if data == nil {
+ return false, fmt.Errorf("data is nil")
+ }
+ if col >= len(data.Head) {
+ return false, fmt.Errorf("col out of data")
+ }
+ if row >= len(data.Data) {
+ return false, fmt.Errorf("row out of data")
+ }
+ dataValue := data.Data[row][col]
+
+ if dataValue == nil && value != nil {
+ return false, fmt.Errorf("dataValue is nil but value is not nil")
+ }
+ if dataValue == nil && value == nil {
+ return true, nil
+ }
+ if reflect.TypeOf(dataValue) != reflect.TypeOf(value) {
+ return false, fmt.Errorf("type not match expect %s got %s", reflect.TypeOf(value), reflect.TypeOf(dataValue))
+ }
+ switch value.(type) {
+ case time.Time:
+ t, _ := dataValue.(time.Time)
+ if value.(time.Time).Nanosecond() != t.Nanosecond() {
+ return false, fmt.Errorf("value not match expect %d got %d", value.(time.Time).Nanosecond(), t.Nanosecond())
+ }
+ case string:
+ if value.(string) != dataValue.(string) {
+ return false, fmt.Errorf("value not match expect %s got %s", value.(string), dataValue.(string))
+ }
+ case int8:
+ if value.(int8) != dataValue.(int8) {
+ return false, fmt.Errorf("value not match expect %d got %d", value.(int8), dataValue.(int8))
+ }
+ case int16:
+ if value.(int16) != dataValue.(int16) {
+ return false, fmt.Errorf("value not match expect %d got %d", value.(int16), dataValue.(int16))
+ }
+ case int32:
+ if value.(int32) != dataValue.(int32) {
+ return false, fmt.Errorf("value not match expect %d got %d", value.(int32), dataValue.(int32))
+ }
+ case int64:
+ if value.(int64) != dataValue.(int64) {
+ return false, fmt.Errorf("value not match expect %d got %d", value.(int64), dataValue.(int64))
+ }
+ case float32:
+ if value.(float32) != dataValue.(float32) {
+ return false, fmt.Errorf("value not match expect %f got %f", value.(float32), dataValue.(float32))
+ }
+ case float64:
+ if value.(float64) != dataValue.(float64) {
+ return false, fmt.Errorf("value not match expect %f got %f", value.(float32), dataValue.(float32))
+ }
+ case bool:
+ if value.(bool) != dataValue.(bool) {
+ return false, fmt.Errorf("value not match expect %t got %t", value.(bool), dataValue.(bool))
+ }
+ default:
+ return false, fmt.Errorf("unsupport type %v", reflect.TypeOf(value))
+ }
+ return true, nil
+}
+
+func (e *Executor) CheckData2(row, col int, value interface{}, data *connector.Data) {
+
+ match, err := e.CheckData(row, col, value, data)
+ fmt.Println("expect data is :", value)
+ fmt.Println("go got data is :", data.Data[row][col])
+ if err != nil {
+ fmt.Println(err)
+ }
+ if !match {
+ fmt.Println(" data not match")
+
+ }
+
+ /*
+ fmt.Println(value)
+ if data == nil {
+ // return false, fmt.Errorf("data is nil")
+ // fmt.Println("check failed")
+ }
+ if col >= len(data.Head) {
+ // return false, fmt.Errorf("col out of data")
+ // fmt.Println("check failed")
+ }
+ if row >= len(data.Data) {
+ // return false, fmt.Errorf("row out of data")
+ // fmt.Println("check failed")
+ }
+ dataValue := data.Data[row][col]
+
+ if dataValue == nil && value != nil {
+ // return false, fmt.Errorf("dataValue is nil but value is not nil")
+ // fmt.Println("check failed")
+ }
+ if dataValue == nil && value == nil {
+ // return true, nil
+ fmt.Println("check pass")
+ }
+ if reflect.TypeOf(dataValue) != reflect.TypeOf(value) {
+ // return false, fmt.Errorf("type not match expect %s got %s", reflect.TypeOf(value), reflect.TypeOf(dataValue))
+ fmt.Println("check failed")
+ }
+ switch value.(type) {
+ case time.Time:
+ t, _ := dataValue.(time.Time)
+ if value.(time.Time).Nanosecond() != t.Nanosecond() {
+ // return false, fmt.Errorf("value not match expect %d got %d", value.(time.Time).Nanosecond(), t.Nanosecond())
+ // fmt.Println("check failed")
+ }
+ case string:
+ if value.(string) != dataValue.(string) {
+ // return false, fmt.Errorf("value not match expect %s got %s", value.(string), dataValue.(string))
+ // fmt.Println("check failed")
+ }
+ case int8:
+ if value.(int8) != dataValue.(int8) {
+ // return false, fmt.Errorf("value not match expect %d got %d", value.(int8), dataValue.(int8))
+ // fmt.Println("check failed")
+ }
+ case int16:
+ if value.(int16) != dataValue.(int16) {
+ // return false, fmt.Errorf("value not match expect %d got %d", value.(int16), dataValue.(int16))
+ // fmt.Println("check failed")
+ }
+ case int32:
+ if value.(int32) != dataValue.(int32) {
+ // return false, fmt.Errorf("value not match expect %d got %d", value.(int32), dataValue.(int32))
+ // fmt.Println("check failed")
+ }
+ case int64:
+ if value.(int64) != dataValue.(int64) {
+ // return false, fmt.Errorf("value not match expect %d got %d", value.(int64), dataValue.(int64))
+ // fmt.Println("check failed")
+ }
+ case float32:
+ if value.(float32) != dataValue.(float32) {
+ // return false, fmt.Errorf("value not match expect %f got %f", value.(float32), dataValue.(float32))
+ // fmt.Println("check failed")
+ }
+ case float64:
+ if value.(float64) != dataValue.(float64) {
+ // return false, fmt.Errorf("value not match expect %f got %f", value.(float32), dataValue.(float32))
+ // fmt.Println("check failed")
+ }
+ case bool:
+ if value.(bool) != dataValue.(bool) {
+ // return false, fmt.Errorf("value not match expect %t got %t", value.(bool), dataValue.(bool))
+ // fmt.Println("check failed")
+ }
+ default:
+ // return false, fmt.Errorf("unsupport type %v", reflect.TypeOf(value))
+ // fmt.Println("check failed")
+ }
+ // return true, nil
+ // fmt.Println("check pass")
+ */
+}
+
+func (e *Executor) CheckRow(count int, data *connector.Data) {
+
+ if len(data.Data) != count {
+ fmt.Println("check failed !")
+ }
+}
diff --git a/tests/gotest/nanosupport/nanoCase.bat b/tests/gotest/nanosupport/nanoCase.bat
new file mode 100644
index 0000000000000000000000000000000000000000..86bddd5b02c5399d5b8d70bd08020e96a7d1c0e5
--- /dev/null
+++ b/tests/gotest/nanosupport/nanoCase.bat
@@ -0,0 +1,9 @@
+@echo off
+echo ==== start run nanosupport.go
+
+del go.*
+go mod init nano
+go mod tidy
+go build
+nano.exe -h %1 -p %2
+cd ..
diff --git a/tests/gotest/nanosupport/nanoCase.sh b/tests/gotest/nanosupport/nanoCase.sh
new file mode 100644
index 0000000000000000000000000000000000000000..bec8929f14c0a56e7c4074efa39d1e1e881fb12e
--- /dev/null
+++ b/tests/gotest/nanosupport/nanoCase.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+echo "==== start run nanosupport.go "
+
+set +e
+#set -x
+
+script_dir="$(dirname $(readlink -f $0))"
+#echo "pwd: $script_dir, para0: $0"
+
+#execName=$0
+#execName=`echo ${execName##*/}`
+#goName=`echo ${execName%.*}`
+
+###### step 3: start build
+cd $script_dir
+rm -f go.*
+go mod init nano
+go mod tidy
+go build
+sleep 10s
+./nano -h $1 -p $2
diff --git a/tests/gotest/nanosupport/nanosupport.go b/tests/gotest/nanosupport/nanosupport.go
new file mode 100644
index 0000000000000000000000000000000000000000..e2f24a73c0a6db3c94b90879c73d0f05e2476307
--- /dev/null
+++ b/tests/gotest/nanosupport/nanosupport.go
@@ -0,0 +1,269 @@
+package main
+
+import (
+ "fmt"
+ "log"
+ "nano/connector"
+ "time"
+
+ "github.com/taosdata/go-utils/tdengine/config"
+)
+
+func main() {
+ e, err := connector.NewExecutor(&config.TDengineGo{
+ Address: "root:taosdata@/tcp(127.0.0.1:6030)/",
+ MaxIdle: 20,
+ MaxOpen: 30,
+ MaxLifetime: 30,
+ }, "db", false)
+ if err != nil {
+ panic(err)
+ }
+ prepareData(e)
+ data, err := e.Query("select * from tb")
+ if err != nil {
+ panic(err)
+ }
+
+ layout := "2006-01-02 15:04:05.999999999"
+ t0, _ := time.Parse(layout, "2021-06-10 00:00:00.100000001")
+ t1, _ := time.Parse(layout, "2021-06-10 00:00:00.150000000")
+ t2, _ := time.Parse(layout, "2021-06-10 00:00:00.299999999")
+ t3, _ := time.Parse(layout, "2021-06-10 00:00:00.300000000")
+ t4, _ := time.Parse(layout, "2021-06-10 00:00:00.300000001")
+ t5, _ := time.Parse(layout, "2021-06-10 00:00:00.999999999")
+
+ e.CheckData2(0, 0, t0, data)
+ e.CheckData2(1, 0, t1, data)
+ e.CheckData2(2, 0, t2, data)
+ e.CheckData2(3, 0, t3, data)
+ e.CheckData2(4, 0, t4, data)
+ e.CheckData2(5, 0, t5, data)
+ e.CheckData2(3, 1, int32(3), data)
+ e.CheckData2(4, 1, int32(5), data)
+ e.CheckData2(5, 1, int32(7), data)
+
+ fmt.Println(" start check nano support!")
+
+ data, _ = e.Query("select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;")
+ e.CheckData2(0, 0, int64(1), data)
+
+ data, _ = e.Query("select count(*) from tb where ts > \"2021-06-10 0:00:00.100000001\" and ts < \"2021-06-10 0:00:00.160000000\";")
+ e.CheckData2(0, 0, int64(1), data)
+
+ data, _ = e.Query("select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000;")
+ e.CheckData2(0, 0, int64(1), data)
+ data, _ = e.Query("select count(*) from tb where ts > \"2021-06-10 0:00:00.100000000\" and ts < \"2021-06-10 0:00:00.150000000\";")
+ e.CheckData2(0, 0, int64(1), data)
+
+ data, _ = e.Query("select count(*) from tb where ts > 1623254400400000000;")
+ e.CheckData2(0, 0, int64(1), data)
+ data, _ = e.Query("select count(*) from tb where ts < \"2021-06-10 00:00:00.400000000\";")
+ e.CheckData2(0, 0, int64(5), data)
+
+ data, _ = e.Query("select count(*) from tb where ts < now + 400000000b;")
+ e.CheckData2(0, 0, int64(6), data)
+
+ data, _ = e.Query("select count(*) from tb where ts >= \"2021-06-10 0:00:00.100000001\";")
+ e.CheckData2(0, 0, int64(6), data)
+
+ data, _ = e.Query("select count(*) from tb where ts <= 1623254400300000000;")
+ e.CheckData2(0, 0, int64(4), data)
+
+ data, _ = e.Query("select count(*) from tb where ts = \"2021-06-10 0:00:00.000000000\";")
+
+ data, _ = e.Query("select count(*) from tb where ts = 1623254400150000000;")
+ e.CheckData2(0, 0, int64(1), data)
+
+ data, _ = e.Query("select count(*) from tb where ts = \"2021-06-10 0:00:00.100000001\";")
+ e.CheckData2(0, 0, int64(1), data)
+
+ data, _ = e.Query("select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000;")
+ e.CheckData2(0, 0, int64(5), data)
+
+ data, _ = e.Query("select count(*) from tb where ts between \"2021-06-10 0:00:00.299999999\" and \"2021-06-10 0:00:00.300000001\";")
+ e.CheckData2(0, 0, int64(3), data)
+
+ data, _ = e.Query("select avg(speed) from tb interval(5000000000b);")
+ e.CheckRow(1, data)
+
+ data, _ = e.Query("select avg(speed) from tb interval(100000000b)")
+ e.CheckRow(4, data)
+
+ data, _ = e.Query("select avg(speed) from tb interval(1000b);")
+ e.CheckRow(5, data)
+
+ data, _ = e.Query("select avg(speed) from tb interval(1u);")
+ e.CheckRow(5, data)
+
+ data, _ = e.Query("select avg(speed) from tb interval(100000000b) sliding (100000000b);")
+ e.CheckRow(4, data)
+
+ data, _ = e.Query("select last(*) from tb")
+ tt, _ := time.Parse(layout, "2021-06-10 0:00:00.999999999")
+ e.CheckData2(0, 0, tt, data)
+
+ data, _ = e.Query("select first(*) from tb")
+ tt1, _ := time.Parse(layout, "2021-06-10 0:00:00.100000001")
+ e.CheckData2(0, 0, tt1, data)
+
+ e.Execute("insert into tb values(now + 500000000b, 6);")
+ data, _ = e.Query("select * from tb;")
+ e.CheckRow(7, data)
+
+ e.Execute("create table tb2 (ts timestamp, speed int, ts2 timestamp);")
+ e.Execute("insert into tb2 values(\"2021-06-10 0:00:00.100000001\", 1, \"2021-06-11 0:00:00.100000001\");")
+ e.Execute("insert into tb2 values(1623254400150000000, 2, 1623340800150000000);")
+ e.Execute("import into tb2 values(1623254400300000000, 3, 1623340800300000000);")
+ e.Execute("import into tb2 values(1623254400299999999, 4, 1623340800299999999);")
+ e.Execute("insert into tb2 values(1623254400300000001, 5, 1623340800300000001);")
+ e.Execute("insert into tb2 values(1623254400999999999, 7, 1623513600999999999);")
+
+ data, _ = e.Query("select * from tb2;")
+ tt2, _ := time.Parse(layout, "2021-06-10 0:00:00.100000001")
+ tt3, _ := time.Parse(layout, "2021-06-10 0:00:00.150000000")
+
+ e.CheckData2(0, 0, tt2, data)
+ e.CheckData2(1, 0, tt3, data)
+ e.CheckData2(2, 1, int32(4), data)
+ e.CheckData2(3, 1, int32(3), data)
+ tt4, _ := time.Parse(layout, "2021-06-11 00:00:00.300000001")
+ e.CheckData2(4, 2, tt4, data)
+ e.CheckRow(6, data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000;")
+ e.CheckData2(0, 0, int64(1), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 > \"2021-06-11 0:00:00.100000000\" and ts2 < \"2021-06-11 0:00:00.100000002\";")
+ e.CheckData2(0, 0, int64(1), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 > 1623340800500000000;")
+ e.CheckData2(0, 0, int64(1), data)
+ data, _ = e.Query("select count(*) from tb2 where ts2 < \"2021-06-11 0:00:00.400000000\";")
+ e.CheckData2(0, 0, int64(5), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 < now + 400000000b;")
+ e.CheckData2(0, 0, int64(6), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 >= \"2021-06-11 0:00:00.100000001\";")
+ e.CheckData2(0, 0, int64(6), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 <= 1623340800400000000;")
+ e.CheckData2(0, 0, int64(5), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 = \"2021-06-11 0:00:00.000000000\";")
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 = \"2021-06-11 0:00:00.300000001\";")
+ e.CheckData2(0, 0, int64(1), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 = 1623340800300000001;")
+ e.CheckData2(0, 0, int64(1), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;")
+ e.CheckData2(0, 0, int64(5), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 between \"2021-06-11 0:00:00.299999999\" and \"2021-06-11 0:00:00.300000001\";")
+ e.CheckData2(0, 0, int64(3), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 <> 1623513600999999999;")
+ e.CheckData2(0, 0, int64(5), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 <> \"2021-06-11 0:00:00.100000001\";")
+ e.CheckData2(0, 0, int64(5), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 <> \"2021-06-11 0:00:00.100000000\";")
+ e.CheckData2(0, 0, int64(6), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 != 1623513600999999999;")
+ e.CheckData2(0, 0, int64(5), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 != \"2021-06-11 0:00:00.100000001\";")
+ e.CheckData2(0, 0, int64(5), data)
+
+ data, _ = e.Query("select count(*) from tb2 where ts2 != \"2021-06-11 0:00:00.100000000\";")
+ e.CheckData2(0, 0, int64(6), data)
+
+ e.Execute("insert into tb2 values(now + 500000000b, 6, now +2d);")
+ data, _ = e.Query("select * from tb2;")
+ e.CheckRow(7, data)
+
+ e.Execute("create table tb3 (ts timestamp, speed int);")
+ _, err = e.Execute("insert into tb3 values(16232544001500000, 2);")
+ if err != nil {
+ fmt.Println("check pass! ")
+ }
+
+ e.Execute("insert into tb3 values(\"2021-06-10 0:00:00.123456\", 2);")
+ data, _ = e.Query("select * from tb3 where ts = \"2021-06-10 0:00:00.123456000\";")
+ e.CheckRow(1, data)
+
+ e.Execute("insert into tb3 values(\"2021-06-10 0:00:00.123456789000\", 2);")
+ data, _ = e.Query("select * from tb3 where ts = \"2021-06-10 0:00:00.123456789\";")
+ e.CheckRow(1, data)
+
+ // check timezone support
+
+ e.Execute("drop database if exists nsdb;")
+ e.Execute("create database nsdb precision 'ns';")
+ e.Execute("use nsdb;")
+ e.Execute("create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);")
+ e.Execute("insert into tb1 using st tags('2021-06-10 0:00:00.123456789' , 1 ) values('2021-06-10T0:00:00.123456789+07:00' , 1.0);")
+ data, _ = e.Query("select first(*) from tb1;")
+
+ ttt, _ := time.Parse(layout, "2021-06-10 01:00:00.123456789")
+ e.CheckData2(0, 0, ttt, data)
+
+ e.Execute("create database usdb precision 'us';")
+ e.Execute("use usdb;")
+ e.Execute("create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);")
+ e.Execute("insert into tb1 using st tags('2021-06-10 0:00:00.123456' , 1 ) values('2021-06-10T0:00:00.123456+07:00' , 1.0);")
+ data, _ = e.Query("select first(*) from tb1;")
+ ttt2, _ := time.Parse(layout, "2021-06-10 01:00:00.123456")
+ e.CheckData2(0, 0, ttt2, data)
+
+ e.Execute("drop database if exists msdb;")
+ e.Execute("create database msdb precision 'ms';")
+ e.Execute("use msdb;")
+ e.Execute("create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);")
+ e.Execute("insert into tb1 using st tags('2021-06-10 0:00:00.123' , 1 ) values('2021-06-10T0:00:00.123+07:00' , 1.0);")
+ data, _ = e.Query("select first(*) from tb1;")
+ ttt3, _ := time.Parse(layout, "2021-06-10 01:00:00.123")
+ e.CheckData2(0, 0, ttt3, data)
+ fmt.Println("all test done!")
+
+}
+
+func prepareData(e *connector.Executor) {
+ sqlList := []string{
+ "reset query cache;",
+ "drop database if exists db;",
+ "create database db;",
+ "use db;",
+ "reset query cache;",
+ "drop database if exists db;",
+ "create database db precision 'ns';",
+ "show databases;",
+ "use db;",
+ "create table tb (ts timestamp, speed int);",
+ "insert into tb values('2021-06-10 0:00:00.100000001', 1);",
+ "insert into tb values(1623254400150000000, 2);",
+ "import into tb values(1623254400300000000, 3);",
+ "import into tb values(1623254400299999999, 4);",
+ "insert into tb values(1623254400300000001, 5);",
+ "insert into tb values(1623254400999999999, 7);",
+ }
+ for _, sql := range sqlList {
+ err := executeSql(e, sql)
+ if err != nil {
+ log.Fatalf("prepare data error:%v, sql:%s", err, sql)
+ }
+ }
+}
+
+func executeSql(e *connector.Executor, sql string) error {
+ _, err := e.Execute(sql)
+ if err != nil {
+ return err
+ }
+ return nil
+}
diff --git a/tests/pytest/crash_gen/valgrind_taos.supp b/tests/pytest/crash_gen/valgrind_taos.supp
index ec44a85d5b29c0471db64b0362126804ae73adec..8c35778018b9c34789f862f6a728e487694357f4 100644
--- a/tests/pytest/crash_gen/valgrind_taos.supp
+++ b/tests/pytest/crash_gen/valgrind_taos.supp
@@ -18109,3 +18109,108 @@
fun:_PyEval_EvalCodeWithName
fun:_PyFunction_Vectorcall
}
+{
+
+ Memcheck:Leak
+ match-leak-kinds: definite
+ fun:malloc
+ fun:lib_build_and_cache_attr
+ fun:lib_getattr
+ fun:PyObject_GetAttr
+ fun:_PyEval_EvalFrameDefault
+ fun:_PyFunction_Vectorcall
+ fun:_PyEval_EvalFrameDefault
+ fun:_PyEval_EvalCodeWithName
+ fun:PyEval_EvalCode
+ obj:/usr/bin/python3.8
+ obj:/usr/bin/python3.8
+ fun:PyVectorcall_Call
+}
+{
+
+ Memcheck:Leak
+ match-leak-kinds: definite
+ fun:malloc
+ fun:lib_build_and_cache_attr
+ fun:lib_getattr
+ fun:PyObject_GetAttr
+ obj:/usr/bin/python3.8
+ obj:/usr/bin/python3.8
+ fun:_PyEval_EvalFrameDefault
+ fun:_PyFunction_Vectorcall
+ fun:_PyEval_EvalFrameDefault
+ obj:/usr/bin/python3.8
+ fun:_PyEval_EvalFrameDefault
+ obj:/usr/bin/python3.8
+}
+{
+
+ Memcheck:Leak
+ match-leak-kinds: definite
+ fun:malloc
+ fun:_my_Py_InitModule
+ fun:b_init_cffi_1_0_external_module
+ obj:/usr/bin/python3.8
+ obj:/usr/bin/python3.8
+ fun:PyObject_CallMethod
+ fun:PyInit__constant_time
+ fun:_PyImport_LoadDynamicModuleWithSpec
+ obj:/usr/bin/python3.8
+ obj:/usr/bin/python3.8
+ fun:PyVectorcall_Call
+ fun:_PyEval_EvalFrameDefault
+ fun:_PyEval_EvalCodeWithName
+}
+{
+
+ Memcheck:Leak
+ match-leak-kinds: definite
+ fun:malloc
+ fun:lib_build_cpython_func.isra.87
+ fun:lib_build_and_cache_attr
+ fun:lib_getattr
+ fun:PyObject_GetAttr
+ obj:/usr/bin/python3.8
+ obj:/usr/bin/python3.8
+ fun:_PyEval_EvalFrameDefault
+ fun:_PyFunction_Vectorcall
+ fun:_PyEval_EvalFrameDefault
+ obj:/usr/bin/python3.8
+ fun:_PyEval_EvalFrameDefault
+}
+{
+
+ Memcheck:Leak
+ match-leak-kinds: definite
+ fun:malloc
+ fun:_my_Py_InitModule
+ fun:b_init_cffi_1_0_external_module
+ obj:/usr/bin/python3.8
+ obj:/usr/bin/python3.8
+ fun:PyObject_CallMethod
+ fun:PyInit__openssl
+ fun:_PyImport_LoadDynamicModuleWithSpec
+ obj:/usr/bin/python3.8
+ obj:/usr/bin/python3.8
+ fun:PyVectorcall_Call
+ fun:_PyEval_EvalFrameDefault
+ fun:_PyEval_EvalCodeWithName
+}
+{
+
+ Memcheck:Leak
+ match-leak-kinds: definite
+ fun:malloc
+ fun:_PyObject_GC_New
+ fun:ffi_internal_new
+ fun:b_init_cffi_1_0_external_module
+ obj:/usr/bin/python3.8
+ obj:/usr/bin/python3.8
+ fun:PyObject_CallMethod
+ fun:PyInit__constant_time
+ fun:_PyImport_LoadDynamicModuleWithSpec
+ obj:/usr/bin/python3.8
+ obj:/usr/bin/python3.8
+ fun:PyVectorcall_Call
+ fun:_PyEval_EvalFrameDefault
+}
\ No newline at end of file
diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index 06ec3c6bfabfe4d9c378c9d17dda944990f624a8..b8bb94b26d5117cb9e99468dfa94155ca70c4193 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -181,7 +181,10 @@ python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoIns
python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoQuery.py
python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanosubscribe.py
python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestInsertTime_step.py
-python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdumpTestNanoSupport.py
+python3 test.py -f tools/taosdumpTestNanoSupport.py
+
+#
+python3 ./test.py -f tsdb/tsdbComp.py
# update
python3 ./test.py -f update/allow_update.py
@@ -267,9 +270,10 @@ python3 ./test.py -f query/queryStateWindow.py
# python3 ./test.py -f query/nestedQuery/queryWithOrderLimit.py
python3 ./test.py -f query/nestquery_last_row.py
python3 ./test.py -f query/queryCnameDisplay.py
-python3 ./test.py -f query/operator_cost.py
+# python3 ./test.py -f query/operator_cost.py
# python3 ./test.py -f query/long_where_query.py
python3 test.py -f query/nestedQuery/queryWithSpread.py
+python3 ./test.py -f query/bug6586.py
#stream
python3 ./test.py -f stream/metric_1.py
@@ -356,6 +360,9 @@ python3 ./test.py -f functions/queryTestCases.py
python3 ./test.py -f functions/function_stateWindow.py
python3 ./test.py -f functions/function_derivative.py
python3 ./test.py -f functions/function_irate.py
+python3 ./test.py -f functions/function_ceil.py
+python3 ./test.py -f functions/function_floor.py
+python3 ./test.py -f functions/function_round.py
python3 ./test.py -f insert/unsignedInt.py
python3 ./test.py -f insert/unsignedBigint.py
@@ -385,7 +392,7 @@ python3 test.py -f alter/alter_cacheLastRow.py
python3 ./test.py -f query/querySession.py
python3 test.py -f alter/alter_create_exception.py
python3 ./test.py -f insert/flushwhiledrop.py
-python3 ./test.py -f insert/schemalessInsert.py
+#python3 ./test.py -f insert/schemalessInsert.py
python3 ./test.py -f alter/alterColMultiTimes.py
python3 ./test.py -f query/queryWildcardLength.py
python3 ./test.py -f query/queryTbnameUpperLower.py
diff --git a/tests/pytest/functions/function_ceil.py b/tests/pytest/functions/function_ceil.py
new file mode 100644
index 0000000000000000000000000000000000000000..9197b0eec45a2154c2345a5b2fc469e54b1e41f9
--- /dev/null
+++ b/tests/pytest/functions/function_ceil.py
@@ -0,0 +1,1518 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+import random
+
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor())
+
+ def randomInt(self):
+ return random.randint(-2147483647, 2147483647)
+
+ def randomUInt(self):
+ return random.randint(0, 4294967294)
+
+ def randomBigint(self):
+ return random.randint(-2**63 + 1, 2**63 - 1)
+
+ def randomUBigint(self):
+ return random.randint(0, 18446744073709551614)
+
+ def randomDouble(self):
+ return random.random()
+
+ def randomNchar(self):
+ return random.choice('abcdefghijklmnopqrstuvwxyz')
+
+ def randomSmallint(self):
+ return random.randint(-32767, 32767)
+
+ def randomUSmallint(self):
+ return random.randint(0, 65534)
+
+ def randomTinyint(self):
+ return random.randint(-127, 127)
+
+ def randomUTinyint(self):
+ return random.randint(0, 254)
+
+ def run(self):
+ select_command = [
+ "ceil(ts)",
+ "ceil(timestamp_col)",
+ "ceil(int_col)",
+ "ceil(bigint_col)",
+ "ceil(float_col)",
+ "ceil(double_col)",
+ "ceil(binary_col)",
+ "ceil(smallint_col)",
+ "ceil(tinyint_col)",
+ "ceil(bool_col)",
+ "ceil(nchar_col)",
+ "ceil(uint_col)",
+ "ceil(ubigint_col)",
+ "ceil(usmallint_col)",
+ "ceil(utinyint_col)",
+ "ceil(timestamp_tag)",
+ "ceil(int_tag)",
+ "ceil(bigint_tag)",
+ "ceil(float_tag)",
+ "ceil(double_tag)",
+ "ceil(binary_tag)",
+ "ceil(smallint_tag)",
+ "ceil(tinyint_tag)",
+ "ceil(bool_tag)",
+ "ceil(nchar_tag)",
+ "ceil(uint_tag)",
+ "ceil(ubigint_tag)",
+ "ceil(usmallint_tag)",
+ "ceil(utinyint_tag)",
+ "count(ceil(int_col))",
+ "count(ceil(bigint_col))",
+ "count(ceil(float_col))",
+ "count(ceil(double_col))",
+ "count(ceil(smallint_col))",
+ "count(ceil(tinyint_col))",
+ "count(ceil(uint_col))",
+ "count(ceil(ubigint_col))",
+ "count(ceil(usmallint_col))",
+ "count(ceil(utinyint_col))",
+ "avg(ceil(int_col))",
+ "avg(ceil(bigint_col))",
+ "avg(ceil(float_col))",
+ "avg(ceil(double_col))",
+ "avg(ceil(smallint_col))",
+ "avg(ceil(tinyint_col))",
+ "avg(ceil(uint_col))",
+ "avg(ceil(ubigint_col))",
+ "avg(ceil(usmallint_col))",
+ "avg(ceil(utinyint_col))",
+ "twa(ceil(int_col))",
+ "twa(ceil(bigint_col))",
+ "twa(ceil(float_col))",
+ "twa(ceil(double_col))",
+ "twa(ceil(smallint_col))",
+ "twa(ceil(tinyint_col))",
+ "twa(ceil(uint_col))",
+ "twa(ceil(ubigint_col))",
+ "twa(ceil(usmallint_col))",
+ "twa(ceil(utinyint_col))",
+ "sum(ceil(int_col))",
+ "sum(ceil(bigint_col))",
+ "sum(ceil(float_col))",
+ "sum(ceil(double_col))",
+ "sum(ceil(smallint_col))",
+ "sum(ceil(tinyint_col))",
+ "sum(ceil(uint_col))",
+ "sum(ceil(ubigint_col))",
+ "sum(ceil(usmallint_col))",
+ "sum(ceil(utinyint_col))",
+ "stddev(ceil(int_col))",
+ "stddev(ceil(bigint_col))",
+ "stddev(ceil(float_col))",
+ "stddev(ceil(double_col))",
+ "stddev(ceil(smallint_col))",
+ "stddev(ceil(tinyint_col))",
+ "stddev(ceil(uint_col))",
+ "stddev(ceil(ubigint_col))",
+ "stddev(ceil(usmallint_col))",
+ "stddev(ceil(utinyint_col))",
+ "irate(ceil(int_col))",
+ "irate(ceil(bigint_col))",
+ "irate(ceil(float_col))",
+ "irate(ceil(double_col))",
+ "irate(ceil(smallint_col))",
+ "irate(ceil(tinyint_col))",
+ "irate(ceil(uint_col))",
+ "irate(ceil(ubigint_col))",
+ "irate(ceil(usmallint_col))",
+ "irate(ceil(utinyint_col))",
+ "leastsquares(ceil(int_col), 1, 1)",
+ "leastsquares(ceil(bigint_col), 1, 1)",
+ "leastsquares(ceil(float_col), 1, 1)",
+ "leastsquares(ceil(double_col), 1, 1)",
+ "leastsquares(ceil(smallint_col), 1, 1)",
+ "leastsquares(ceil(tinyint_col), 1, 1)",
+ "leastsquares(ceil(uint_col), 1, 1)",
+ "leastsquares(ceil(ubigint_col), 1, 1)",
+ "leastsquares(ceil(usmallint_col), 1, 1)",
+ "leastsquares(ceil(utinyint_col), 1, 1)",
+ "min(ceil(int_col))",
+ "min(ceil(bigint_col))",
+ "min(ceil(float_col))",
+ "min(ceil(double_col))",
+ "min(ceil(smallint_col))",
+ "min(ceil(tinyint_col))",
+ "min(ceil(uint_col))",
+ "min(ceil(ubigint_col))",
+ "min(ceil(usmallint_col))",
+ "min(ceil(utinyint_col))",
+ "max(ceil(int_col))",
+ "max(ceil(bigint_col))",
+ "max(ceil(float_col))",
+ "max(ceil(double_col))",
+ "max(ceil(smallint_col))",
+ "max(ceil(tinyint_col))",
+ "max(ceil(uint_col))",
+ "max(ceil(ubigint_col))",
+ "max(ceil(usmallint_col))",
+ "max(ceil(utinyint_col))",
+ "first(ceil(int_col))",
+ "first(ceil(bigint_col))",
+ "first(ceil(float_col))",
+ "first(ceil(double_col))",
+ "first(ceil(smallint_col))",
+ "first(ceil(tinyint_col))",
+ "first(ceil(uint_col))",
+ "first(ceil(ubigint_col))",
+ "first(ceil(usmallint_col))",
+ "first(ceil(utinyint_col))",
+ "last(ceil(int_col))",
+ "last(ceil(bigint_col))",
+ "last(ceil(float_col))",
+ "last(ceil(double_col))",
+ "last(ceil(smallint_col))",
+ "last(ceil(tinyint_col))",
+ "last(ceil(uint_col))",
+ "last(ceil(ubigint_col))",
+ "last(ceil(usmallint_col))",
+ "last(ceil(utinyint_col))",
+ "top(ceil(int_col), 1)",
+ "top(ceil(bigint_col), 1)",
+ "top(ceil(float_col), 1)",
+ "top(ceil(double_col), 1)",
+ "top(ceil(smallint_col), 1)",
+ "top(ceil(tinyint_col), 1)",
+ "top(ceil(uint_col), 1)",
+ "top(ceil(ubigint_col), 1)",
+ "top(ceil(usmallint_col), 1)",
+ "top(ceil(utinyint_col), 1)",
+ "bottom(ceil(int_col), 1)",
+ "bottom(ceil(bigint_col), 1)",
+ "bottom(ceil(float_col), 1)",
+ "bottom(ceil(double_col), 1)",
+ "bottom(ceil(smallint_col), 1)",
+ "bottom(ceil(tinyint_col), 1)",
+ "bottom(ceil(uint_col), 1)",
+ "bottom(ceil(ubigint_col), 1)",
+ "bottom(ceil(usmallint_col), 1)",
+ "bottom(ceil(utinyint_col), 1)",
+ "percentile(ceil(int_col), 20)",
+ "percentile(ceil(bigint_col), 20)",
+ "percentile(ceil(float_col), 20)",
+ "percentile(ceil(double_col), 20)",
+ "percentile(ceil(smallint_col), 20)",
+ "percentile(ceil(tinyint_col), 20)",
+ "percentile(ceil(uint_col), 20)",
+ "percentile(ceil(ubigint_col), 20)",
+ "percentile(ceil(usmallint_col), 20)",
+ "percentile(ceil(utinyint_col), 20)",
+ "apercentile(ceil(int_col), 20)",
+ "apercentile(ceil(bigint_col), 20)",
+ "apercentile(ceil(float_col), 20)",
+ "apercentile(ceil(double_col), 20)",
+ "apercentile(ceil(smallint_col), 20)",
+ "apercentile(ceil(tinyint_col), 20)",
+ "apercentile(ceil(uint_col), 20)",
+ "apercentile(ceil(ubigint_col), 20)",
+ "apercentile(ceil(usmallint_col), 20)",
+ "apercentile(ceil(utinyint_col), 20)",
+ "last_row(ceil(int_col))",
+ "last_row(ceil(bigint_col))",
+ "last_row(ceil(float_col))",
+ "last_row(ceil(double_col))",
+ "last_row(ceil(smallint_col))",
+ "last_row(ceil(tinyint_col))",
+ "last_row(ceil(uint_col))",
+ "last_row(ceil(ubigint_col))",
+ "last_row(ceil(usmallint_col))",
+ "last_row(ceil(utinyint_col))",
+ "interp(ceil(int_col))",
+ "interp(ceil(bigint_col))",
+ "interp(ceil(float_col))",
+ "interp(ceil(double_col))",
+ "interp(ceil(smallint_col))",
+ "interp(ceil(tinyint_col))",
+ "interp(ceil(uint_col))",
+ "interp(ceil(ubigint_col))",
+ "interp(ceil(usmallint_col))",
+ "interp(ceil(utinyint_col))",
+ "diff(ceil(int_col))",
+ "diff(ceil(bigint_col))",
+ "diff(ceil(float_col))",
+ "diff(ceil(double_col))",
+ "diff(ceil(smallint_col))",
+ "diff(ceil(tinyint_col))",
+ "diff(ceil(uint_col))",
+ "diff(ceil(ubigint_col))",
+ "diff(ceil(usmallint_col))",
+ "diff(ceil(utinyint_col))",
+ "spread(ceil(int_col))",
+ "spread(ceil(bigint_col))",
+ "spread(ceil(float_col))",
+ "spread(ceil(double_col))",
+ "spread(ceil(smallint_col))",
+ "spread(ceil(tinyint_col))",
+ "spread(ceil(uint_col))",
+ "spread(ceil(ubigint_col))",
+ "spread(ceil(usmallint_col))",
+ "spread(ceil(utinyint_col))",
+ "derivative(ceil(int_col), 1s, 0)",
+ "derivative(ceil(bigint_col), 1s, 0)",
+ "derivative(ceil(float_col), 1s, 0)",
+ "derivative(ceil(double_col), 1s, 0)",
+ "derivative(ceil(smallint_col), 1s, 0)",
+ "derivative(ceil(tinyint_col), 1s, 0)",
+ "derivative(ceil(uint_col), 1s, 0)",
+ "derivative(ceil(ubigint_col), 1s, 0)",
+ "derivative(ceil(usmallint_col), 1s, 0)",
+ "derivative(ceil(utinyint_col), 1s, 0)",
+ "ceil(int_col) - ceil(int_col)",
+ "ceil(bigint_col) - ceil(bigint_col)",
+ "ceil(float_col) - ceil(float_col)",
+ "ceil(double_col) - ceil(double_col)",
+ "ceil(smallint_col) - ceil(smallint_col)",
+ "ceil(tinyint_col) - ceil(tinyint_col)",
+ "ceil(uint_col) - ceil(uint_col)",
+ "ceil(ubigint_col) - ceil(ubigint_col)",
+ "ceil(usmallint_col) - ceil(usmallint_col)",
+ "ceil(utinyint_col) - ceil(utinyint_col)",
+ "ceil(int_col) / ceil(int_col)",
+ "ceil(bigint_col) / ceil(bigint_col)",
+ "ceil(float_col) / ceil(float_col)",
+ "ceil(double_col) / ceil(double_col)",
+ "ceil(smallint_col) / ceil(smallint_col)",
+ "ceil(tinyint_col) / ceil(tinyint_col)",
+ "ceil(uint_col) / ceil(uint_col)",
+ "ceil(ubigint_col) / ceil(ubigint_col)",
+ "ceil(usmallint_col) / ceil(usmallint_col)",
+ "ceil(utinyint_col) / ceil(utinyint_col)",
+ "ceil(int_col) * ceil(int_col)",
+ "ceil(bigint_col) * ceil(bigint_col)",
+ "ceil(float_col) * ceil(float_col)",
+ "ceil(double_col) * ceil(double_col)",
+ "ceil(smallint_col) * ceil(smallint_col)",
+ "ceil(tinyint_col) * ceil(tinyint_col)",
+ "ceil(uint_col) * ceil(uint_col)",
+ "ceil(ubigint_col) * ceil(ubigint_col)",
+ "ceil(usmallint_col) * ceil(usmallint_col)",
+ "ceil(utinyint_col) * ceil(utinyint_col)",
+ "ceil(count(ts))",
+ "ceil(count(timestamp_col))",
+ "ceil(count(int_col))",
+ "ceil(count(bigint_col))",
+ "ceil(count(float_col))",
+ "ceil(count(double_col))",
+ "ceil(count(binary_col))",
+ "ceil(count(smallint_col))",
+ "ceil(count(tinyint_col))",
+ "ceil(count(bool_col))",
+ "ceil(count(nchar_col))",
+ "ceil(count(uint_col))",
+ "ceil(count(ubigint_col))",
+ "ceil(count(usmallint_col))",
+ "ceil(count(utinyint_col))",
+ "ceil(count(timestamp_tag))",
+ "ceil(count(int_tag))",
+ "ceil(count(bigint_tag))",
+ "ceil(count(float_tag))",
+ "ceil(count(double_tag))",
+ "ceil(count(binary_tag))",
+ "ceil(count(smallint_tag))",
+ "ceil(count(tinyint_tag))",
+ "ceil(count(bool_tag))",
+ "ceil(count(nchar_tag))",
+ "ceil(count(uint_tag))",
+ "ceil(count(ubigint_tag))",
+ "ceil(count(usmallint_tag))",
+ "ceil(count(utinyint_tag))",
+ "ceil(avg(ts))",
+ "ceil(avg(timestamp_col))",
+ "ceil(avg(int_col))",
+ "ceil(avg(bigint_col))",
+ "ceil(avg(float_col))",
+ "ceil(avg(double_col))",
+ "ceil(avg(binary_col))",
+ "ceil(avg(smallint_col))",
+ "ceil(avg(tinyint_col))",
+ "ceil(avg(bool_col))",
+ "ceil(avg(nchar_col))",
+ "ceil(avg(uint_col))",
+ "ceil(avg(ubigint_col))",
+ "ceil(avg(usmallint_col))",
+ "ceil(avg(utinyint_col))",
+ "ceil(avg(timestamp_tag))",
+ "ceil(avg(int_tag))",
+ "ceil(avg(bigint_tag))",
+ "ceil(avg(float_tag))",
+ "ceil(avg(double_tag))",
+ "ceil(avg(binary_tag))",
+ "ceil(avg(smallint_tag))",
+ "ceil(avg(tinyint_tag))",
+ "ceil(avg(bool_tag))",
+ "ceil(avg(nchar_tag))",
+ "ceil(avg(uint_tag))",
+ "ceil(avg(ubigint_tag))",
+ "ceil(avg(usmallint_tag))",
+ "ceil(avg(utinyint_tag))",
+ "ceil(twa(ts))",
+ "ceil(twa(timestamp_col))",
+ "ceil(twa(int_col))",
+ "ceil(twa(bigint_col))",
+ "ceil(twa(float_col))",
+ "ceil(twa(double_col))",
+ "ceil(twa(binary_col))",
+ "ceil(twa(smallint_col))",
+ "ceil(twa(tinyint_col))",
+ "ceil(twa(bool_col))",
+ "ceil(twa(nchar_col))",
+ "ceil(twa(uint_col))",
+ "ceil(twa(ubigint_col))",
+ "ceil(twa(usmallint_col))",
+ "ceil(twa(utinyint_col))",
+ "ceil(twa(timestamp_tag))",
+ "ceil(twa(int_tag))",
+ "ceil(twa(bigint_tag))",
+ "ceil(twa(float_tag))",
+ "ceil(twa(double_tag))",
+ "ceil(twa(binary_tag))",
+ "ceil(twa(smallint_tag))",
+ "ceil(twa(tinyint_tag))",
+ "ceil(twa(bool_tag))",
+ "ceil(twa(nchar_tag))",
+ "ceil(twa(uint_tag))",
+ "ceil(twa(ubigint_tag))",
+ "ceil(twa(usmallint_tag))",
+ "ceil(twa(utinyint_tag))",
+ "ceil(sum(ts))",
+ "ceil(sum(timestamp_col))",
+ "ceil(sum(int_col))",
+ "ceil(sum(bigint_col))",
+ "ceil(sum(float_col))",
+ "ceil(sum(double_col))",
+ "ceil(sum(binary_col))",
+ "ceil(sum(smallint_col))",
+ "ceil(sum(tinyint_col))",
+ "ceil(sum(bool_col))",
+ "ceil(sum(nchar_col))",
+ "ceil(sum(uint_col))",
+ "ceil(sum(ubigint_col))",
+ "ceil(sum(usmallint_col))",
+ "ceil(sum(utinyint_col))",
+ "ceil(sum(timestamp_tag))",
+ "ceil(sum(int_tag))",
+ "ceil(sum(bigint_tag))",
+ "ceil(sum(float_tag))",
+ "ceil(sum(double_tag))",
+ "ceil(sum(binary_tag))",
+ "ceil(sum(smallint_tag))",
+ "ceil(sum(tinyint_tag))",
+ "ceil(sum(bool_tag))",
+ "ceil(sum(nchar_tag))",
+ "ceil(sum(uint_tag))",
+ "ceil(sum(ubigint_tag))",
+ "ceil(sum(usmallint_tag))",
+ "ceil(sum(utinyint_tag))",
+ "ceil(stddev(ts))",
+ "ceil(stddev(timestamp_col))",
+ "ceil(stddev(int_col))",
+ "ceil(stddev(bigint_col))",
+ "ceil(stddev(float_col))",
+ "ceil(stddev(double_col))",
+ "ceil(stddev(binary_col))",
+ "ceil(stddev(smallint_col))",
+ "ceil(stddev(tinyint_col))",
+ "ceil(stddev(bool_col))",
+ "ceil(stddev(nchar_col))",
+ "ceil(stddev(uint_col))",
+ "ceil(stddev(ubigint_col))",
+ "ceil(stddev(usmallint_col))",
+ "ceil(stddev(utinyint_col))",
+ "ceil(stddev(timestamp_tag))",
+ "ceil(stddev(int_tag))",
+ "ceil(stddev(bigint_tag))",
+ "ceil(stddev(float_tag))",
+ "ceil(stddev(double_tag))",
+ "ceil(stddev(binary_tag))",
+ "ceil(stddev(smallint_tag))",
+ "ceil(stddev(tinyint_tag))",
+ "ceil(stddev(bool_tag))",
+ "ceil(stddev(nchar_tag))",
+ "ceil(stddev(uint_tag))",
+ "ceil(stddev(ubigint_tag))",
+ "ceil(stddev(usmallint_tag))",
+ "ceil(stddev(utinyint_tag))",
+ "ceil(leastsquares(ts, 1, 1))",
+ "ceil(leastsquares(timestamp_col, 1, 1))",
+ "ceil(leastsquares(int_col, 1, 1))",
+ "ceil(leastsquares(bigint_col, 1, 1))",
+ "ceil(leastsquares(float_col, 1, 1))",
+ "ceil(leastsquares(double_col, 1, 1))",
+ "ceil(leastsquares(binary_col, 1, 1))",
+ "ceil(leastsquares(smallint_col, 1, 1))",
+ "ceil(leastsquares(tinyint_col, 1, 1))",
+ "ceil(leastsquares(bool_col, 1, 1))",
+ "ceil(leastsquares(nchar_col, 1, 1))",
+ "ceil(leastsquares(uint_col, 1, 1))",
+ "ceil(leastsquares(ubigint_col, 1, 1))",
+ "ceil(leastsquares(usmallint_col, 1, 1))",
+ "ceil(leastsquares(utinyint_col, 1, 1))",
+ "ceil(leastsquares(timestamp_tag, 1, 1))",
+ "ceil(leastsquares(int_tag, 1, 1))",
+ "ceil(leastsquares(bigint_tag, 1, 1))",
+ "ceil(leastsquares(float_tag, 1, 1))",
+ "ceil(leastsquares(double_tag, 1, 1))",
+ "ceil(leastsquares(binary_tag, 1, 1))",
+ "ceil(leastsquares(smallint_tag, 1, 1))",
+ "ceil(leastsquares(tinyint_tag, 1, 1))",
+ "ceil(leastsquares(bool_tag, 1, 1))",
+ "ceil(leastsquares(nchar_tag, 1, 1))",
+ "ceil(leastsquares(uint_tag, 1, 1))",
+ "ceil(leastsquares(ubigint_tag, 1, 1))",
+ "ceil(leastsquares(usmallint_tag, 1, 1))",
+ "ceil(leastsquares(utinyint_tag, 1, 1))",
+ "ceil(irate(ts))",
+ "ceil(irate(timestamp_col))",
+ "ceil(irate(int_col))",
+ "ceil(irate(bigint_col))",
+ "ceil(irate(float_col))",
+ "ceil(irate(double_col))",
+ "ceil(irate(binary_col))",
+ "ceil(irate(smallint_col))",
+ "ceil(irate(tinyint_col))",
+ "ceil(irate(bool_col))",
+ "ceil(irate(nchar_col))",
+ "ceil(irate(uint_col))",
+ "ceil(irate(ubigint_col))",
+ "ceil(irate(usmallint_col))",
+ "ceil(irate(utinyint_col))",
+ "ceil(irate(timestamp_tag))",
+ "ceil(irate(int_tag))",
+ "ceil(irate(bigint_tag))",
+ "ceil(irate(float_tag))",
+ "ceil(irate(double_tag))",
+ "ceil(irate(binary_tag))",
+ "ceil(irate(smallint_tag))",
+ "ceil(irate(tinyint_tag))",
+ "ceil(irate(bool_tag))",
+ "ceil(irate(nchar_tag))",
+ "ceil(irate(uint_tag))",
+ "ceil(irate(ubigint_tag))",
+ "ceil(irate(usmallint_tag))",
+ "ceil(irate(utinyint_tag))",
+ "ceil(min(ts))",
+ "ceil(min(timestamp_col))",
+ "ceil(min(int_col))",
+ "ceil(min(bigint_col))",
+ "ceil(min(float_col))",
+ "ceil(min(double_col))",
+ "ceil(min(binary_col))",
+ "ceil(min(smallint_col))",
+ "ceil(min(tinyint_col))",
+ "ceil(min(bool_col))",
+ "ceil(min(nchar_col))",
+ "ceil(min(uint_col))",
+ "ceil(min(ubigint_col))",
+ "ceil(min(usmallint_col))",
+ "ceil(min(utinyint_col))",
+ "ceil(min(timestamp_tag))",
+ "ceil(min(int_tag))",
+ "ceil(min(bigint_tag))",
+ "ceil(min(float_tag))",
+ "ceil(min(double_tag))",
+ "ceil(min(binary_tag))",
+ "ceil(min(smallint_tag))",
+ "ceil(min(tinyint_tag))",
+ "ceil(min(bool_tag))",
+ "ceil(min(nchar_tag))",
+ "ceil(min(uint_tag))",
+ "ceil(min(ubigint_tag))",
+ "ceil(min(usmallint_tag))",
+ "ceil(min(utinyint_tag))",
+ "ceil(max(ts))",
+ "ceil(max(timestamp_col))",
+ "ceil(max(int_col))",
+ "ceil(max(bigint_col))",
+ "ceil(max(float_col))",
+ "ceil(max(double_col))",
+ "ceil(max(binary_col))",
+ "ceil(max(smallint_col))",
+ "ceil(max(tinyint_col))",
+ "ceil(max(bool_col))",
+ "ceil(max(nchar_col))",
+ "ceil(max(uint_col))",
+ "ceil(max(ubigint_col))",
+ "ceil(max(usmallint_col))",
+ "ceil(max(utinyint_col))",
+ "ceil(max(timestamp_tag))",
+ "ceil(max(int_tag))",
+ "ceil(max(bigint_tag))",
+ "ceil(max(float_tag))",
+ "ceil(max(double_tag))",
+ "ceil(max(binary_tag))",
+ "ceil(max(smallint_tag))",
+ "ceil(max(tinyint_tag))",
+ "ceil(max(bool_tag))",
+ "ceil(max(nchar_tag))",
+ "ceil(max(uint_tag))",
+ "ceil(max(ubigint_tag))",
+ "ceil(max(usmallint_tag))",
+ "ceil(max(utinyint_tag))",
+ "ceil(first(ts))",
+ "ceil(first(timestamp_col))",
+ "ceil(first(int_col))",
+ "ceil(first(bigint_col))",
+ "ceil(first(float_col))",
+ "ceil(first(double_col))",
+ "ceil(first(binary_col))",
+ "ceil(first(smallint_col))",
+ "ceil(first(tinyint_col))",
+ "ceil(first(bool_col))",
+ "ceil(first(nchar_col))",
+ "ceil(first(uint_col))",
+ "ceil(first(ubigint_col))",
+ "ceil(first(usmallint_col))",
+ "ceil(first(utinyint_col))",
+ "ceil(first(timestamp_tag))",
+ "ceil(first(int_tag))",
+ "ceil(first(bigint_tag))",
+ "ceil(first(float_tag))",
+ "ceil(first(double_tag))",
+ "ceil(first(binary_tag))",
+ "ceil(first(smallint_tag))",
+ "ceil(first(tinyint_tag))",
+ "ceil(first(bool_tag))",
+ "ceil(first(nchar_tag))",
+ "ceil(first(uint_tag))",
+ "ceil(first(ubigint_tag))",
+ "ceil(first(usmallint_tag))",
+ "ceil(first(utinyint_tag))",
+ "ceil(last(ts))",
+ "ceil(last(timestamp_col))",
+ "ceil(last(int_col))",
+ "ceil(last(bigint_col))",
+ "ceil(last(float_col))",
+ "ceil(last(double_col))",
+ "ceil(last(binary_col))",
+ "ceil(last(smallint_col))",
+ "ceil(last(tinyint_col))",
+ "ceil(last(bool_col))",
+ "ceil(last(nchar_col))",
+ "ceil(last(uint_col))",
+ "ceil(last(ubigint_col))",
+ "ceil(last(usmallint_col))",
+ "ceil(last(utinyint_col))",
+ "ceil(last(timestamp_tag))",
+ "ceil(last(int_tag))",
+ "ceil(last(bigint_tag))",
+ "ceil(last(float_tag))",
+ "ceil(last(double_tag))",
+ "ceil(last(binary_tag))",
+ "ceil(last(smallint_tag))",
+ "ceil(last(tinyint_tag))",
+ "ceil(last(bool_tag))",
+ "ceil(last(nchar_tag))",
+ "ceil(last(uint_tag))",
+ "ceil(last(ubigint_tag))",
+ "ceil(last(usmallint_tag))",
+ "ceil(last(utinyint_tag))",
+ "ceil(top(ts, 1))",
+ "ceil(top(timestamp_col, 1))",
+ "ceil(top(int_col, 1))",
+ "ceil(top(bigint_col, 1))",
+ "ceil(top(float_col, 1))",
+ "ceil(top(double_col, 1))",
+ "ceil(top(binary_col, 1))",
+ "ceil(top(smallint_col, 1))",
+ "ceil(top(tinyint_col, 1))",
+ "ceil(top(bool_col, 1))",
+ "ceil(top(nchar_col, 1))",
+ "ceil(top(uint_col, 1))",
+ "ceil(top(ubigint_col, 1))",
+ "ceil(top(usmallint_col, 1))",
+ "ceil(top(utinyint_col, 1))",
+ "ceil(top(timestamp_tag, 1))",
+ "ceil(top(int_tag, 1))",
+ "ceil(top(bigint_tag, 1))",
+ "ceil(top(float_tag, 1))",
+ "ceil(top(double_tag, 1))",
+ "ceil(top(binary_tag, 1))",
+ "ceil(top(smallint_tag, 1))",
+ "ceil(top(tinyint_tag, 1))",
+ "ceil(top(bool_tag, 1))",
+ "ceil(top(nchar_tag, 1))",
+ "ceil(top(uint_tag, 1))",
+ "ceil(top(ubigint_tag, 1))",
+ "ceil(top(usmallint_tag, 1))",
+ "ceil(top(utinyint_tag, 1))",
+ "ceil(bottom(ts, 1))",
+ "ceil(bottom(timestamp_col, 1))",
+ "ceil(bottom(int_col, 1))",
+ "ceil(bottom(bigint_col, 1))",
+ "ceil(bottom(float_col, 1))",
+ "ceil(bottom(double_col, 1))",
+ "ceil(bottom(binary_col, 1))",
+ "ceil(bottom(smallint_col, 1))",
+ "ceil(bottom(tinyint_col, 1))",
+ "ceil(bottom(bool_col, 1))",
+ "ceil(bottom(nchar_col, 1))",
+ "ceil(bottom(uint_col, 1))",
+ "ceil(bottom(ubigint_col, 1))",
+ "ceil(bottom(usmallint_col, 1))",
+ "ceil(bottom(utinyint_col, 1))",
+ "ceil(bottom(timestamp_tag, 1))",
+ "ceil(bottom(int_tag, 1))",
+ "ceil(bottom(bigint_tag, 1))",
+ "ceil(bottom(float_tag, 1))",
+ "ceil(bottom(double_tag, 1))",
+ "ceil(bottom(binary_tag, 1))",
+ "ceil(bottom(smallint_tag, 1))",
+ "ceil(bottom(tinyint_tag, 1))",
+ "ceil(bottom(bool_tag, 1))",
+ "ceil(bottom(nchar_tag, 1))",
+ "ceil(bottom(uint_tag, 1))",
+ "ceil(bottom(ubigint_tag, 1))",
+ "ceil(bottom(usmallint_tag, 1))",
+ "ceil(bottom(utinyint_tag, 1))",
+ "ceil(percentile(ts, 1))",
+ "ceil(percentile(timestamp_col, 1))",
+ "ceil(percentile(int_col, 1))",
+ "ceil(percentile(bigint_col, 1))",
+ "ceil(percentile(float_col, 1))",
+ "ceil(percentile(double_col, 1))",
+ "ceil(percentile(binary_col, 1))",
+ "ceil(percentile(smallint_col, 1))",
+ "ceil(percentile(tinyint_col, 1))",
+ "ceil(percentile(bool_col, 1))",
+ "ceil(percentile(nchar_col, 1))",
+ "ceil(percentile(uint_col, 1))",
+ "ceil(percentile(ubigint_col, 1))",
+ "ceil(percentile(usmallint_col, 1))",
+ "ceil(percentile(utinyint_col, 1))",
+ "ceil(percentile(timestamp_tag, 1))",
+ "ceil(percentile(int_tag, 1))",
+ "ceil(percentile(bigint_tag, 1))",
+ "ceil(percentile(float_tag, 1))",
+ "ceil(percentile(double_tag, 1))",
+ "ceil(percentile(binary_tag, 1))",
+ "ceil(percentile(smallint_tag, 1))",
+ "ceil(percentile(tinyint_tag, 1))",
+ "ceil(percentile(bool_tag, 1))",
+ "ceil(percentile(nchar_tag, 1))",
+ "ceil(percentile(uint_tag, 1))",
+ "ceil(percentile(ubigint_tag, 1))",
+ "ceil(percentile(usmallint_tag, 1))",
+ "ceil(percentile(utinyint_tag, 1))",
+ "ceil(apercentile(ts, 1))",
+ "ceil(apercentile(timestamp_col, 1))",
+ "ceil(apercentile(int_col, 1))",
+ "ceil(apercentile(bigint_col, 1))",
+ "ceil(apercentile(float_col, 1))",
+ "ceil(apercentile(double_col, 1))",
+ "ceil(apercentile(binary_col, 1))",
+ "ceil(apercentile(smallint_col, 1))",
+ "ceil(apercentile(tinyint_col, 1))",
+ "ceil(apercentile(bool_col, 1))",
+ "ceil(apercentile(nchar_col, 1))",
+ "ceil(apercentile(uint_col, 1))",
+ "ceil(apercentile(ubigint_col, 1))",
+ "ceil(apercentile(usmallint_col, 1))",
+ "ceil(apercentile(utinyint_col, 1))",
+ "ceil(apercentile(timestamp_tag, 1))",
+ "ceil(apercentile(int_tag, 1))",
+ "ceil(apercentile(bigint_tag, 1))",
+ "ceil(apercentile(float_tag, 1))",
+ "ceil(apercentile(double_tag, 1))",
+ "ceil(apercentile(binary_tag, 1))",
+ "ceil(apercentile(smallint_tag, 1))",
+ "ceil(apercentile(tinyint_tag, 1))",
+ "ceil(apercentile(bool_tag, 1))",
+ "ceil(apercentile(nchar_tag, 1))",
+ "ceil(apercentile(uint_tag, 1))",
+ "ceil(apercentile(ubigint_tag, 1))",
+ "ceil(apercentile(usmallint_tag, 1))",
+ "ceil(apercentile(utinyint_tag, 1))",
+ "ceil(last_row(ts))",
+ "ceil(last_row(timestamp_col))",
+ "ceil(last_row(int_col))",
+ "ceil(last_row(bigint_col))",
+ "ceil(last_row(float_col))",
+ "ceil(last_row(double_col))",
+ "ceil(last_row(binary_col))",
+ "ceil(last_row(smallint_col))",
+ "ceil(last_row(tinyint_col))",
+ "ceil(last_row(bool_col))",
+ "ceil(last_row(nchar_col))",
+ "ceil(last_row(uint_col))",
+ "ceil(last_row(ubigint_col))",
+ "ceil(last_row(usmallint_col))",
+ "ceil(last_row(utinyint_col))",
+ "ceil(last_row(timestamp_tag))",
+ "ceil(last_row(int_tag))",
+ "ceil(last_row(bigint_tag))",
+ "ceil(last_row(float_tag))",
+ "ceil(last_row(double_tag))",
+ "ceil(last_row(binary_tag))",
+ "ceil(last_row(smallint_tag))",
+ "ceil(last_row(tinyint_tag))",
+ "ceil(last_row(bool_tag))",
+ "ceil(last_row(nchar_tag))",
+ "ceil(last_row(uint_tag))",
+ "ceil(last_row(ubigint_tag))",
+ "ceil(last_row(usmallint_tag))",
+ "ceil(last_row(utinyint_tag))",
+ "ceil(interp(ts))",
+ "ceil(interp(timestamp_col))",
+ "ceil(interp(int_col))",
+ "ceil(interp(bigint_col))",
+ "ceil(interp(float_col))",
+ "ceil(interp(double_col))",
+ "ceil(interp(binary_col))",
+ "ceil(interp(smallint_col))",
+ "ceil(interp(tinyint_col))",
+ "ceil(interp(bool_col))",
+ "ceil(interp(nchar_col))",
+ "ceil(interp(uint_col))",
+ "ceil(interp(ubigint_col))",
+ "ceil(interp(usmallint_col))",
+ "ceil(interp(utinyint_col))",
+ "ceil(interp(timestamp_tag))",
+ "ceil(interp(int_tag))",
+ "ceil(interp(bigint_tag))",
+ "ceil(interp(float_tag))",
+ "ceil(interp(double_tag))",
+ "ceil(interp(binary_tag))",
+ "ceil(interp(smallint_tag))",
+ "ceil(interp(tinyint_tag))",
+ "ceil(interp(bool_tag))",
+ "ceil(interp(nchar_tag))",
+ "ceil(interp(uint_tag))",
+ "ceil(interp(ubigint_tag))",
+ "ceil(interp(usmallint_tag))",
+ "ceil(interp(utinyint_tag))",
+ "ceil(diff(ts))",
+ "ceil(diff(timestamp_col))",
+ "ceil(diff(int_col))",
+ "ceil(diff(bigint_col))",
+ "ceil(diff(float_col))",
+ "ceil(diff(double_col))",
+ "ceil(diff(binary_col))",
+ "ceil(diff(smallint_col))",
+ "ceil(diff(tinyint_col))",
+ "ceil(diff(bool_col))",
+ "ceil(diff(nchar_col))",
+ "ceil(diff(uint_col))",
+ "ceil(diff(ubigint_col))",
+ "ceil(diff(usmallint_col))",
+ "ceil(diff(utinyint_col))",
+ "ceil(diff(timestamp_tag))",
+ "ceil(diff(int_tag))",
+ "ceil(diff(bigint_tag))",
+ "ceil(diff(float_tag))",
+ "ceil(diff(double_tag))",
+ "ceil(diff(binary_tag))",
+ "ceil(diff(smallint_tag))",
+ "ceil(diff(tinyint_tag))",
+ "ceil(diff(bool_tag))",
+ "ceil(diff(nchar_tag))",
+ "ceil(diff(uint_tag))",
+ "ceil(diff(ubigint_tag))",
+ "ceil(diff(usmallint_tag))",
+ "ceil(diff(utinyint_tag))",
+ "ceil(spread(ts))",
+ "ceil(spread(timestamp_col))",
+ "ceil(spread(int_col))",
+ "ceil(spread(bigint_col))",
+ "ceil(spread(float_col))",
+ "ceil(spread(double_col))",
+ "ceil(spread(binary_col))",
+ "ceil(spread(smallint_col))",
+ "ceil(spread(tinyint_col))",
+ "ceil(spread(bool_col))",
+ "ceil(spread(nchar_col))",
+ "ceil(spread(uint_col))",
+ "ceil(spread(ubigint_col))",
+ "ceil(spread(usmallint_col))",
+ "ceil(spread(utinyint_col))",
+ "ceil(spread(timestamp_tag))",
+ "ceil(spread(int_tag))",
+ "ceil(spread(bigint_tag))",
+ "ceil(spread(float_tag))",
+ "ceil(spread(double_tag))",
+ "ceil(spread(binary_tag))",
+ "ceil(spread(smallint_tag))",
+ "ceil(spread(tinyint_tag))",
+ "ceil(spread(bool_tag))",
+ "ceil(spread(nchar_tag))",
+ "ceil(spread(uint_tag))",
+ "ceil(spread(ubigint_tag))",
+ "ceil(spread(usmallint_tag))",
+ "ceil(spread(utinyint_tag))",
+ "ceil(derivative(ts, 1s, 0))",
+ "ceil(derivative(timestamp_col, 1s, 0))",
+ "ceil(derivative(int_col, 1s, 0))",
+ "ceil(derivative(bigint_col, 1s, 0))",
+ "ceil(derivative(float_col, 1s, 0))",
+ "ceil(derivative(double_col, 1s, 0))",
+ "ceil(derivative(binary_col, 1s, 0))",
+ "ceil(derivative(smallint_col, 1s, 0))",
+ "ceil(derivative(tinyint_col, 1s, 0))",
+ "ceil(derivative(bool_col, 1s, 0))",
+ "ceil(derivative(nchar_col, 1s, 0))",
+ "ceil(derivative(uint_col, 1s, 0))",
+ "ceil(derivative(ubigint_col, 1s, 0))",
+ "ceil(derivative(usmallint_col, 1s, 0))",
+ "ceil(derivative(utinyint_col, 1s, 0))",
+ "ceil(derivative(timestamp_tag, 1s, 0))",
+ "ceil(derivative(int_tag, 1s, 0))",
+ "ceil(derivative(bigint_tag, 1s, 0))",
+ "ceil(derivative(float_tag, 1s, 0))",
+ "ceil(derivative(double_tag, 1s, 0))",
+ "ceil(derivative(binary_tag, 1s, 0))",
+ "ceil(derivative(smallint_tag, 1s, 0))",
+ "ceil(derivative(tinyint_tag, 1s, 0))",
+ "ceil(derivative(bool_tag, 1s, 0))",
+ "ceil(derivative(nchar_tag, 1s, 0))",
+ "ceil(derivative(uint_tag, 1s, 0))",
+ "ceil(derivative(ubigint_tag, 1s, 0))",
+ "ceil(derivative(usmallint_tag, 1s, 0))",
+ "ceil(derivative(utinyint_tag, 1s, 0))",
+ "ceil(ts + ts)",
+ "ceil(timestamp_col + timestamp_col)",
+ "ceil(int_col + int_col)",
+ "ceil(bigint_col + bigint_col)",
+ "ceil(float_col + float_col)",
+ "ceil(double_col + double_col)",
+ "ceil(binary_col + binary_col)",
+ "ceil(smallint_col + smallint_col)",
+ "ceil(tinyint_col + tinyint_col)",
+ "ceil(bool_col + bool_col)",
+ "ceil(nchar_col + nchar_col)",
+ "ceil(uint_col + uint_col)",
+ "ceil(ubigint_col + ubigint_col)",
+ "ceil(usmallint_col + usmallint_col)",
+ "ceil(utinyint_col + utinyint_col)",
+ "ceil(timestamp_tag + timestamp_tag)",
+ "ceil(int_tag + int_tag)",
+ "ceil(bigint_tag + bigint_tag)",
+ "ceil(float_tag + float_tag)",
+ "ceil(double_tag + double_tag)",
+ "ceil(binary_tag + binary_tag)",
+ "ceil(smallint_tag + smallint_tag)",
+ "ceil(tinyint_tag + tinyint_tag)",
+ "ceil(bool_tag + bool_tag)",
+ "ceil(nchar_tag + nchar_tag)",
+ "ceil(uint_tag + uint_tag)",
+ "ceil(ubigint_tag + ubigint_tag)",
+ "ceil(usmallint_tag + usmallint_tag)",
+ "ceil(utinyint_tag + utinyint_tag)",
+ "ceil(ts - ts)",
+ "ceil(timestamp_col - timestamp_col)",
+ "ceil(int_col - int_col)",
+ "ceil(bigint_col - bigint_col)",
+ "ceil(float_col - float_col)",
+ "ceil(double_col - double_col)",
+ "ceil(binary_col - binary_col)",
+ "ceil(smallint_col - smallint_col)",
+ "ceil(tinyint_col - tinyint_col)",
+ "ceil(bool_col - bool_col)",
+ "ceil(nchar_col - nchar_col)",
+ "ceil(uint_col - uint_col)",
+ "ceil(ubigint_col - ubigint_col)",
+ "ceil(usmallint_col - usmallint_col)",
+ "ceil(utinyint_col - utinyint_col)",
+ "ceil(timestamp_tag - timestamp_tag)",
+ "ceil(int_tag - int_tag)",
+ "ceil(bigint_tag - bigint_tag)",
+ "ceil(float_tag - float_tag)",
+ "ceil(double_tag - double_tag)",
+ "ceil(binary_tag - binary_tag)",
+ "ceil(smallint_tag - smallint_tag)",
+ "ceil(tinyint_tag - tinyint_tag)",
+ "ceil(bool_tag - bool_tag)",
+ "ceil(nchar_tag - nchar_tag)",
+ "ceil(uint_tag - uint_tag)",
+ "ceil(ubigint_tag - ubigint_tag)",
+ "ceil(usmallint_tag - usmallint_tag)",
+ "ceil(utinyint_tag - utinyint_tag)",
+ "ceil(ts * ts)",
+ "ceil(timestamp_col * timestamp_col)",
+ "ceil(int_col * int_col)",
+ "ceil(bigint_col * bigint_col)",
+ "ceil(float_col * float_col)",
+ "ceil(double_col * double_col)",
+ "ceil(binary_col * binary_col)",
+ "ceil(smallint_col * smallint_col)",
+ "ceil(tinyint_col * tinyint_col)",
+ "ceil(bool_col * bool_col)",
+ "ceil(nchar_col * nchar_col)",
+ "ceil(uint_col * uint_col)",
+ "ceil(ubigint_col * ubigint_col)",
+ "ceil(usmallint_col * usmallint_col)",
+ "ceil(utinyint_col * utinyint_col)",
+ "ceil(timestamp_tag * timestamp_tag)",
+ "ceil(int_tag * int_tag)",
+ "ceil(bigint_tag * bigint_tag)",
+ "ceil(float_tag * float_tag)",
+ "ceil(double_tag * double_tag)",
+ "ceil(binary_tag * binary_tag)",
+ "ceil(smallint_tag * smallint_tag)",
+ "ceil(tinyint_tag * tinyint_tag)",
+ "ceil(bool_tag * bool_tag)",
+ "ceil(nchar_tag * nchar_tag)",
+ "ceil(uint_tag * uint_tag)",
+ "ceil(ubigint_tag * ubigint_tag)",
+ "ceil(usmallint_tag * usmallint_tag)",
+ "ceil(utinyint_tag * utinyint_tag)",
+ "ceil(ts / ts)",
+ "ceil(timestamp_col / timestamp_col)",
+ "ceil(int_col / int_col)",
+ "ceil(bigint_col / bigint_col)",
+ "ceil(float_col / float_col)",
+ "ceil(double_col / double_col)",
+ "ceil(binary_col / binary_col)",
+ "ceil(smallint_col / smallint_col)",
+ "ceil(tinyint_col / tinyint_col)",
+ "ceil(bool_col / bool_col)",
+ "ceil(nchar_col / nchar_col)",
+ "ceil(uint_col / uint_col)",
+ "ceil(ubigint_col / ubigint_col)",
+ "ceil(usmallint_col / usmallint_col)",
+ "ceil(utinyint_col / utinyint_col)",
+ "ceil(timestamp_tag / timestamp_tag)",
+ "ceil(int_tag / int_tag)",
+ "ceil(bigint_tag / bigint_tag)",
+ "ceil(float_tag / float_tag)",
+ "ceil(double_tag / double_tag)",
+ "ceil(binary_tag / binary_tag)",
+ "ceil(smallint_tag / smallint_tag)",
+ "ceil(tinyint_tag / tinyint_tag)",
+ "ceil(bool_tag / bool_tag)",
+ "ceil(nchar_tag / nchar_tag)",
+ "ceil(uint_tag / uint_tag)",
+ "ceil(ubigint_tag / ubigint_tag)",
+ "ceil(usmallint_tag / usmallint_tag)",
+ "ceil(utinyint_tag / utinyint_tag)",
+ "int_col, ceil(int_col), int_col",
+ "bigint_col, ceil(bigint_col), bigint_col",
+ "float_col, ceil(float_col), float_col",
+ "double_col, ceil(double_col), double_col",
+ "smallint_col, ceil(smallint_col), smallint_col",
+ "tinyint_col, ceil(tinyint_col), tinyint_col",
+ "uint_col, ceil(uint_col), uint_col",
+ "ubigint_col, ceil(ubigint_col), ubigint_col",
+ "usmallint_col, ceil(usmallint_col), usmallint_col",
+ "utinyint_col, ceil(utinyint_col), utinyint_col",
+ "count(int_col), ceil(int_col), count(int_col)",
+ "count(bigint_col), ceil(bigint_col), count(bigint_col)",
+ "count(float_col), ceil(float_col), count(float_col)",
+ "count(double_col), ceil(double_col), count(double_col)",
+ "count(smallint_col), ceil(smallint_col), count(smallint_col)",
+ "count(tinyint_col), ceil(tinyint_col), count(tinyint_col)",
+ "count(uint_col), ceil(uint_col), count(uint_col)",
+ "count(ubigint_col), ceil(ubigint_col), count(ubigint_col)",
+ "count(usmallint_col), ceil(usmallint_col), count(usmallint_col)",
+ "count(utinyint_col), ceil(utinyint_col), count(utinyint_col)",
+ "avg(int_col), ceil(int_col), avg(int_col)",
+ "avg(bigint_col), ceil(bigint_col), avg(bigint_col)",
+ "avg(float_col), ceil(float_col), avg(float_col)",
+ "avg(double_col), ceil(double_col), avg(double_col)",
+ "avg(smallint_col), ceil(smallint_col), avg(smallint_col)",
+ "avg(tinyint_col), ceil(tinyint_col), avg(tinyint_col)",
+ "avg(uint_col), ceil(uint_col), avg(uint_col)",
+ "avg(ubigint_col), ceil(ubigint_col), avg(ubigint_col)",
+ "avg(usmallint_col), ceil(usmallint_col), avg(usmallint_col)",
+ "avg(utinyint_col), ceil(utinyint_col), avg(utinyint_col)",
+ "twa(int_col), ceil(int_col), twa(int_col)",
+ "twa(bigint_col), ceil(bigint_col), twa(bigint_col)",
+ "twa(float_col), ceil(float_col), twa(float_col)",
+ "twa(double_col), ceil(double_col), twa(double_col)",
+ "twa(smallint_col), ceil(smallint_col), twa(smallint_col)",
+ "twa(tinyint_col), ceil(tinyint_col), twa(tinyint_col)",
+ "twa(uint_col), ceil(uint_col), twa(uint_col)",
+ "twa(ubigint_col), ceil(ubigint_col), twa(ubigint_col)",
+ "twa(usmallint_col), ceil(usmallint_col), twa(usmallint_col)",
+ "twa(utinyint_col), ceil(utinyint_col), twa(utinyint_col)",
+ "sum(int_col), ceil(int_col), sum(int_col)",
+ "sum(bigint_col), ceil(bigint_col), sum(bigint_col)",
+ "sum(float_col), ceil(float_col), sum(float_col)",
+ "sum(double_col), ceil(double_col), sum(double_col)",
+ "sum(smallint_col), ceil(smallint_col), sum(smallint_col)",
+ "sum(tinyint_col), ceil(tinyint_col), sum(tinyint_col)",
+ "sum(uint_col), ceil(uint_col), sum(uint_col)",
+ "sum(ubigint_col), ceil(ubigint_col), sum(ubigint_col)",
+ "sum(usmallint_col), ceil(usmallint_col), sum(usmallint_col)",
+ "sum(utinyint_col), ceil(utinyint_col), sum(utinyint_col)",
+ "stddev(int_col), ceil(int_col), stddev(int_col)",
+ "stddev(bigint_col), ceil(bigint_col), stddev(bigint_col)",
+ "stddev(float_col), ceil(float_col), stddev(float_col)",
+ "stddev(double_col), ceil(double_col), stddev(double_col)",
+ "stddev(smallint_col), ceil(smallint_col), stddev(smallint_col)",
+ "stddev(tinyint_col), ceil(tinyint_col), stddev(tinyint_col)",
+ "stddev(uint_col), ceil(uint_col), stddev(uint_col)",
+ "stddev(ubigint_col), ceil(ubigint_col), stddev(ubigint_col)",
+ "stddev(usmallint_col), ceil(usmallint_col), stddev(usmallint_col)",
+ "stddev(utinyint_col), ceil(utinyint_col), stddev(utinyint_col)",
+ "irate(int_col), ceil(int_col), irate(int_col)",
+ "irate(bigint_col), ceil(bigint_col), irate(bigint_col)",
+ "irate(float_col), ceil(float_col), irate(float_col)",
+ "irate(double_col), ceil(double_col), irate(double_col)",
+ "irate(smallint_col), ceil(smallint_col), irate(smallint_col)",
+ "irate(tinyint_col), ceil(tinyint_col), irate(tinyint_col)",
+ "irate(uint_col), ceil(uint_col), irate(uint_col)",
+ "irate(ubigint_col), ceil(ubigint_col), irate(ubigint_col)",
+ "irate(usmallint_col), ceil(usmallint_col), irate(usmallint_col)",
+ "irate(utinyint_col), ceil(utinyint_col), irate(utinyint_col)",
+ "min(int_col), ceil(int_col), min(int_col)",
+ "min(bigint_col), ceil(bigint_col), min(bigint_col)",
+ "min(float_col), ceil(float_col), min(float_col)",
+ "min(double_col), ceil(double_col), min(double_col)",
+ "min(smallint_col), ceil(smallint_col), min(smallint_col)",
+ "min(tinyint_col), ceil(tinyint_col), min(tinyint_col)",
+ "min(uint_col), ceil(uint_col), min(uint_col)",
+ "min(ubigint_col), ceil(ubigint_col), min(ubigint_col)",
+ "min(usmallint_col), ceil(usmallint_col), min(usmallint_col)",
+ "min(utinyint_col), ceil(utinyint_col), min(utinyint_col)",
+ "max(int_col), ceil(int_col), max(int_col)",
+ "max(bigint_col), ceil(bigint_col), max(bigint_col)",
+ "max(float_col), ceil(float_col), max(float_col)",
+ "max(double_col), ceil(double_col), max(double_col)",
+ "max(smallint_col), ceil(smallint_col), max(smallint_col)",
+ "max(tinyint_col), ceil(tinyint_col), max(tinyint_col)",
+ "max(uint_col), ceil(uint_col), max(uint_col)",
+ "max(ubigint_col), ceil(ubigint_col), max(ubigint_col)",
+ "max(usmallint_col), ceil(usmallint_col), max(usmallint_col)",
+ "max(utinyint_col), ceil(utinyint_col), max(utinyint_col)",
+ "first(int_col), ceil(int_col), first(int_col)",
+ "first(bigint_col), ceil(bigint_col), first(bigint_col)",
+ "first(float_col), ceil(float_col), first(float_col)",
+ "first(double_col), ceil(double_col), first(double_col)",
+ "first(smallint_col), ceil(smallint_col), first(smallint_col)",
+ "first(tinyint_col), ceil(tinyint_col), first(tinyint_col)",
+ "first(uint_col), ceil(uint_col), first(uint_col)",
+ "first(ubigint_col), ceil(ubigint_col), first(ubigint_col)",
+ "first(usmallint_col), ceil(usmallint_col), first(usmallint_col)",
+ "first(utinyint_col), ceil(utinyint_col), first(utinyint_col)",
+ "last(int_col), ceil(int_col), last(int_col)",
+ "last(bigint_col), ceil(bigint_col), last(bigint_col)",
+ "last(float_col), ceil(float_col), last(float_col)",
+ "last(double_col), ceil(double_col), last(double_col)",
+ "last(smallint_col), ceil(smallint_col), last(smallint_col)",
+ "last(tinyint_col), ceil(tinyint_col), last(tinyint_col)",
+ "last(uint_col), ceil(uint_col), last(uint_col)",
+ "last(ubigint_col), ceil(ubigint_col), last(ubigint_col)",
+ "last(usmallint_col), ceil(usmallint_col), last(usmallint_col)",
+ "last(utinyint_col), ceil(utinyint_col), last(utinyint_col)",
+ "last_row(int_col), ceil(int_col), last_row(int_col)",
+ "last_row(bigint_col), ceil(bigint_col), last_row(bigint_col)",
+ "last_row(float_col), ceil(float_col), last_row(float_col)",
+ "last_row(double_col), ceil(double_col), last_row(double_col)",
+ "last_row(smallint_col), ceil(smallint_col), last_row(smallint_col)",
+ "last_row(tinyint_col), ceil(tinyint_col), last_row(tinyint_col)",
+ "last_row(uint_col), ceil(uint_col), last_row(uint_col)",
+ "last_row(ubigint_col), ceil(ubigint_col), last_row(ubigint_col)",
+ "last_row(usmallint_col), ceil(usmallint_col), last_row(usmallint_col)",
+ "last_row(utinyint_col), ceil(utinyint_col), last_row(utinyint_col)",
+ "interp(int_col), ceil(int_col), interp(int_col)",
+ "interp(bigint_col), ceil(bigint_col), interp(bigint_col)",
+ "interp(float_col), ceil(float_col), interp(float_col)",
+ "interp(double_col), ceil(double_col), interp(double_col)",
+ "interp(smallint_col), ceil(smallint_col), interp(smallint_col)",
+ "interp(tinyint_col), ceil(tinyint_col), interp(tinyint_col)",
+ "interp(uint_col), ceil(uint_col), interp(uint_col)",
+ "interp(ubigint_col), ceil(ubigint_col), interp(ubigint_col)",
+ "interp(usmallint_col), ceil(usmallint_col), interp(usmallint_col)",
+ "interp(utinyint_col), ceil(utinyint_col), interp(utinyint_col)",
+ "diff(int_col), ceil(int_col), diff(int_col)",
+ "diff(bigint_col), ceil(bigint_col), diff(bigint_col)",
+ "diff(float_col), ceil(float_col), diff(float_col)",
+ "diff(double_col), ceil(double_col), diff(double_col)",
+ "diff(smallint_col), ceil(smallint_col), diff(smallint_col)",
+ "diff(tinyint_col), ceil(tinyint_col), diff(tinyint_col)",
+ "diff(uint_col), ceil(uint_col), diff(uint_col)",
+ "diff(ubigint_col), ceil(ubigint_col), diff(ubigint_col)",
+ "diff(usmallint_col), ceil(usmallint_col), diff(usmallint_col)",
+ "diff(utinyint_col), ceil(utinyint_col), diff(utinyint_col)",
+ "spread(int_col), ceil(int_col), spread(int_col)",
+ "spread(bigint_col), ceil(bigint_col), spread(bigint_col)",
+ "spread(float_col), ceil(float_col), spread(float_col)",
+ "spread(double_col), ceil(double_col), spread(double_col)",
+ "spread(smallint_col), ceil(smallint_col), spread(smallint_col)",
+ "spread(tinyint_col), ceil(tinyint_col), spread(tinyint_col)",
+ "spread(uint_col), ceil(uint_col), spread(uint_col)",
+ "spread(ubigint_col), ceil(ubigint_col), spread(ubigint_col)",
+ "spread(usmallint_col), ceil(usmallint_col), spread(usmallint_col)",
+ "spread(utinyint_col), ceil(utinyint_col), spread(utinyint_col)",
+ "leastsquares(int_col, 1, 1), ceil(int_col), leastsquares(int_col, 1, 1)",
+ "leastsquares(bigint_col, 1, 1), ceil(bigint_col), leastsquares(bigint_col, 1, 1)",
+ "leastsquares(float_col, 1, 1), ceil(float_col), leastsquares(float_col, 1, 1)",
+ "leastsquares(double_col, 1, 1), ceil(double_col), leastsquares(double_col, 1, 1)",
+ "leastsquares(smallint_col, 1, 1), ceil(smallint_col), leastsquares(smallint_col, 1, 1)",
+ "leastsquares(tinyint_col, 1, 1), ceil(tinyint_col), leastsquares(tinyint_col, 1, 1)",
+ "leastsquares(uint_col, 1, 1), ceil(uint_col), leastsquares(uint_col, 1, 1)",
+ "leastsquares(ubigint_col, 1, 1), ceil(ubigint_col), leastsquares(ubigint_col, 1, 1)",
+ "leastsquares(usmallint_col, 1, 1), ceil(usmallint_col), leastsquares(usmallint_col, 1, 1)",
+ "leastsquares(utinyint_col, 1, 1), ceil(utinyint_col), leastsquares(utinyint_col, 1, 1)",
+ "top(int_col, 1), ceil(int_col), top(int_col, 1)",
+ "top(bigint_col, 1), ceil(bigint_col), top(bigint_col, 1)",
+ "top(float_col, 1), ceil(float_col), top(float_col, 1)",
+ "top(double_col, 1), ceil(double_col), top(double_col, 1)",
+ "top(smallint_col, 1), ceil(smallint_col), top(smallint_col, 1)",
+ "top(tinyint_col, 1), ceil(tinyint_col), top(tinyint_col, 1)",
+ "top(uint_col, 1), ceil(uint_col), top(uint_col, 1)",
+ "top(ubigint_col, 1), ceil(ubigint_col), top(ubigint_col, 1)",
+ "top(usmallint_col, 1), ceil(usmallint_col), top(usmallint_col, 1)",
+ "top(utinyint_col, 1), ceil(utinyint_col), top(utinyint_col, 1)",
+ "bottom(int_col, 1), ceil(int_col), bottom(int_col, 1)",
+ "bottom(bigint_col, 1), ceil(bigint_col), bottom(bigint_col, 1)",
+ "bottom(float_col, 1), ceil(float_col), bottom(float_col, 1)",
+ "bottom(double_col, 1), ceil(double_col), bottom(double_col, 1)",
+ "bottom(smallint_col, 1), ceil(smallint_col), bottom(smallint_col, 1)",
+ "bottom(tinyint_col, 1), ceil(tinyint_col), bottom(tinyint_col, 1)",
+ "bottom(uint_col, 1), ceil(uint_col), bottom(uint_col, 1)",
+ "bottom(ubigint_col, 1), ceil(ubigint_col), bottom(ubigint_col, 1)",
+ "bottom(usmallint_col, 1), ceil(usmallint_col), bottom(usmallint_col, 1)",
+ "bottom(utinyint_col, 1), ceil(utinyint_col), bottom(utinyint_col, 1)",
+ "percentile(int_col, 1), ceil(int_col), percentile(int_col, 1)",
+ "percentile(bigint_col, 1), ceil(bigint_col), percentile(bigint_col, 1)",
+ "percentile(float_col, 1), ceil(float_col), percentile(float_col, 1)",
+ "percentile(double_col, 1), ceil(double_col), percentile(double_col, 1)",
+ "percentile(smallint_col, 1), ceil(smallint_col), percentile(smallint_col, 1)",
+ "percentile(tinyint_col, 1), ceil(tinyint_col), percentile(tinyint_col, 1)",
+ "percentile(uint_col, 1), ceil(uint_col), percentile(uint_col, 1)",
+ "percentile(ubigint_col, 1), ceil(ubigint_col), percentile(ubigint_col, 1)",
+ "percentile(usmallint_col, 1), ceil(usmallint_col), percentile(usmallint_col, 1)",
+ "percentile(utinyint_col, 1), ceil(utinyint_col), percentile(utinyint_col, 1)",
+ "apercentile(int_col, 1), ceil(int_col), apercentile(int_col, 1)",
+ "apercentile(bigint_col, 1), ceil(bigint_col), apercentile(bigint_col, 1)",
+ "apercentile(float_col, 1), ceil(float_col), apercentile(float_col, 1)",
+ "apercentile(double_col, 1), ceil(double_col), apercentile(double_col, 1)",
+ "apercentile(smallint_col, 1), ceil(smallint_col), apercentile(smallint_col, 1)",
+ "apercentile(tinyint_col, 1), ceil(tinyint_col), apercentile(tinyint_col, 1)",
+ "apercentile(uint_col, 1), ceil(uint_col), apercentile(uint_col, 1)",
+ "apercentile(ubigint_col, 1), ceil(ubigint_col), apercentile(ubigint_col, 1)",
+ "apercentile(usmallint_col, 1), ceil(usmallint_col), apercentile(usmallint_col, 1)",
+ "apercentile(utinyint_col, 1), ceil(utinyint_col), apercentile(utinyint_col, 1)",
+ "derivative(int_col, 1s, 0), ceil(int_col), derivative(int_col, 1s, 0)",
+ "derivative(bigint_col, 1s, 0), ceil(bigint_col), derivative(bigint_col, 1s, 0)",
+ "derivative(float_col, 1s, 0), ceil(float_col), derivative(float_col, 1s, 0)",
+ "derivative(double_col, 1s, 0), ceil(double_col), derivative(double_col, 1s, 0)",
+ "derivative(smallint_col, 1s, 0), ceil(smallint_col), derivative(smallint_col, 1s, 0)",
+ "derivative(tinyint_col, 1s, 0), ceil(tinyint_col), derivative(tinyint_col, 1s, 0)",
+ "derivative(uint_col, 1s, 0), ceil(uint_col), derivative(uint_col, 1s, 0)",
+ "derivative(ubigint_col, 1s, 0), ceil(ubigint_col), derivative(ubigint_col, 1s, 0)",
+ "derivative(usmallint_col, 1s, 0), ceil(usmallint_col), derivative(usmallint_col, 1s, 0)",
+ "derivative(utinyint_col, 1s, 0), ceil(utinyint_col), derivative(utinyint_col, 1s, 0)",
+ "1, ceil(int_col), 1",
+ "1, ceil(bigint_col), 1",
+ "1, ceil(float_col), 1",
+ "1, ceil(double_col), 1",
+ "1, ceil(smallint_col), 1",
+ "1, ceil(tinyint_col), 1",
+ "1, ceil(uint_col), 1",
+ "1, ceil(ubigint_col), 1",
+ "1, ceil(usmallint_col), 1",
+ "1, ceil(utinyint_col), 1",
+ "ceil(int_col) as anyName",
+ "ceil(bigint_col) as anyName",
+ "ceil(float_col) as anyName",
+ "ceil(double_col) as anyName",
+ "ceil(smallint_col) as anyName",
+ "ceil(tinyint_col) as anyName",
+ "ceil(uint_col) as anyName",
+ "ceil(ubigint_col) as anyName",
+ "ceil(usmallint_col) as anyName",
+ "ceil(utinyint_col) as anyName",
+ "distinct ceil(int_col)",
+ "distinct ceil(bigint_col)",
+ "distinct ceil(float_col)",
+ "distinct ceil(double_col)",
+ "distinct ceil(smallint_col)",
+ "distinct ceil(tinyint_col)",
+ "distinct ceil(uint_col)",
+ "distinct ceil(ubigint_col)",
+ "distinct ceil(usmallint_col)",
+ "distinct ceil(utinyint_col)",
+ ]
+ simple_select_command = [
+ "ceil(super.int_col)",
+ "ceil(super.bigint_col)",
+ "ceil(super.float_col)",
+ "ceil(super.double_col)",
+ "ceil(super.smallint_col)",
+ "ceil(super.tinyint_col)",
+ "ceil(super.uint_col)",
+ "ceil(super.ubigint_col)",
+ "ceil(super.usmallint_col)",
+ "ceil(super.utinyint_col)",
+ "ceil(t1.int_col)",
+ "ceil(t1.bigint_col)",
+ "ceil(t1.float_col)",
+ "ceil(t1.double_col)",
+ "ceil(t1.smallint_col)",
+ "ceil(t1.tinyint_col)",
+ "ceil(t1.uint_col)",
+ "ceil(t1.ubigint_col)",
+ "ceil(t1.usmallint_col)",
+ "ceil(t1.utinyint_col)",
+ ]
+ from_command = [" from super", " from t1"]
+ advance_from_command = [
+ " from super", " from t1",
+ " from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"
+ ]
+ filter_command = [
+ "", " session(ts, 1s)", " state_window(int_col)", " interval (1s)",
+ " interval (1s) sliding (1s)", " group by (ts)"
+ ]
+ fill_command = [
+ "", " fill(prev)", " fill(next)", " fill(null)", " fill(1)",
+ " fill(linear)"
+ ]
+ tdSql.prepare()
+ tdSql.execute(
+ "create stable super (ts timestamp, timestamp_col timestamp, int_col int, bigint_col bigint, float_col float,\
+ double_col double, binary_col binary(8), smallint_col smallint, tinyint_col tinyint, bool_col bool, nchar_col nchar(8), \
+ uint_col int unsigned, ubigint_col bigint unsigned, usmallint_col smallint unsigned, utinyint_col tinyint unsigned) tags (int_tag int, bigint_tag bigint, \
+ float_tag float, double_tag double, binary_tag binary(8), smallint_tag smallint, tinyint_tag tinyint, bool_tag bool, nchar_tag nchar(8),\
+ uint_tag int unsigned, ubigint_tag bigint unsigned, usmallint_tag smallint unsigned, utinyint_tag tinyint unsigned)"
+ )
+ tdSql.execute(
+ "create stable superb (ts timestamp, timestamp_col timestamp, int_col int, bigint_col bigint, float_col float,\
+ double_col double, binary_col binary(8), smallint_col smallint, tinyint_col tinyint, bool_col bool, nchar_col nchar(8), \
+ uint_col int unsigned, ubigint_col bigint unsigned, usmallint_col smallint unsigned, utinyint_col tinyint unsigned) tags (int_tag int, bigint_tag bigint, \
+ float_tag float, double_tag double, binary_tag binary(8), smallint_tag smallint, tinyint_tag tinyint, bool_tag bool, nchar_tag nchar(8),\
+ uint_tag int unsigned, ubigint_tag bigint unsigned, usmallint_tag smallint unsigned, utinyint_tag tinyint unsigned)"
+ )
+ tdSql.execute(
+ "create table t1 using super tags (1, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomBigint(), self.randomDouble(), self.randomDouble(),
+ self.randomNchar(), self.randomSmallint(), self.randomTinyint(),
+ self.randomNchar(), self.randomUInt(), self.randomUBigint(),
+ self.randomUSmallint(), self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215891, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215892, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215893, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215894, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "create table t2 using superb tags (1, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomBigint(), self.randomDouble(), self.randomDouble(),
+ self.randomNchar(), self.randomSmallint(), self.randomTinyint(),
+ self.randomNchar(), self.randomUInt(), self.randomUBigint(),
+ self.randomUSmallint(), self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215891, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215892, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215893, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215894, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+
+ for s in range(len(select_command)):
+ for f in range(len(from_command)):
+ sql = "select " + select_command[s] + from_command[f]
+ if (select_command[s] == "ceil(int_col)"\
+ or select_command[s] == "ceil(bigint_col)"\
+ or select_command[s] == "ceil(smallint_col)" \
+ or select_command[s] == "ceil(float_col)"\
+ or select_command[s] == "ceil(double_col)"\
+ or select_command[s] == "ceil(tinyint_col)"\
+ or select_command[s] == "ceil(uint_col)"\
+ or select_command[s] == "ceil(ubigint_col)"\
+ or select_command[s] == "ceil(usmallint_col)"\
+ or select_command[s] == "ceil(utinyint_col)"\
+ or select_command[s] == "1, ceil(int_col), 1"\
+ or select_command[s] == "1, ceil(bigint_col), 1"\
+ or select_command[s] == "1, ceil(float_col), 1"\
+ or select_command[s] == "1, ceil(double_col), 1"\
+ or select_command[s] == "1, ceil(smallint_col), 1"\
+ or select_command[s] == "1, ceil(tinyint_col), 1"\
+ or select_command[s] == "1, ceil(uint_col), 1"\
+ or select_command[s] == "1, ceil(ubigint_col), 1"\
+ or select_command[s] == "1, ceil(usmallint_col), 1"\
+ or select_command[s] == "1, ceil(utinyint_col), 1"\
+ or select_command[s] == "int_col, ceil(int_col), int_col"\
+ or select_command[s] == "bigint_col, ceil(bigint_col), bigint_col"\
+ or select_command[s] == "float_col, ceil(float_col), float_col"\
+ or select_command[s] == "double_col, ceil(double_col), double_col"\
+ or select_command[s] == "smallint_col, ceil(smallint_col), smallint_col"\
+ or select_command[s] == "tinyint_col, ceil(tinyint_col), tinyint_col"\
+ or select_command[s] == "uint_col, ceil(uint_col), uint_col"\
+ or select_command[s] == "ubigint_col, ceil(ubigint_col), ubigint_col"\
+ or select_command[s] == "usmallint_col, ceil(usmallint_col), usmallint_col"\
+ or select_command[s] == "utinyint_col, ceil(utinyint_col), utinyint_col"\
+ or select_command[s] == "ceil(int_col) as anyName"\
+ or select_command[s] == "ceil(bigint_col) as anyName"\
+ or select_command[s] == "ceil(float_col) as anyName"\
+ or select_command[s] == "ceil(double_col) as anyName"\
+ or select_command[s] == "ceil(smallint_col) as anyName"\
+ or select_command[s] == "ceil(tinyint_col) as anyName"\
+ or select_command[s] == "ceil(uint_col) as anyName"\
+ or select_command[s] == "ceil(ubigint_col) as anyName"\
+ or select_command[s] == "ceil(usmallint_col) as anyName"\
+ or select_command[s] == "ceil(utinyint_col) as anyName"\
+ or select_command[s] == "ceil(int_col) + ceil(int_col)"\
+ or select_command[s] == "ceil(bigint_col) + ceil(bigint_col)"\
+ or select_command[s] == "ceil(float_col) + ceil(float_col)"\
+ or select_command[s] == "ceil(double_col) + ceil(double_col)"\
+ or select_command[s] == "ceil(smallint_col) + ceil(smallint_col)"\
+ or select_command[s] == "ceil(tinyint_col) + ceil(tinyint_col)"\
+ or select_command[s] == "ceil(uint_col) + ceil(uint_col)"\
+ or select_command[s] == "ceil(ubigint_col) + ceil(ubigint_col)"\
+ or select_command[s] == "ceil(usmallint_col) + ceil(usmallint_col)"\
+ or select_command[s] == "ceil(utinyint_col) + ceil(utinyint_col)"\
+ or select_command[s] == "ceil(int_col) + ceil(int_col)"\
+ or select_command[s] == "ceil(bigint_col) + ceil(bigint_col)"\
+ or select_command[s] == "ceil(float_col) + ceil(float_col)"\
+ or select_command[s] == "ceil(double_col) + ceil(double_col)"\
+ or select_command[s] == "ceil(smallint_col) + ceil(smallint_col)"\
+ or select_command[s] == "ceil(tinyint_col) + ceil(tinyint_col)"\
+ or select_command[s] == "ceil(uint_col) + ceil(uint_col)"\
+ or select_command[s] == "ceil(ubigint_col) + ceil(ubigint_col)"\
+ or select_command[s] == "ceil(usmallint_col) + ceil(usmallint_col)"\
+ or select_command[s] == "ceil(utinyint_col) + cei(utinyint_col)"\
+ or select_command[s] == "ceil(int_col) - ceil(int_col)"\
+ or select_command[s] == "ceil(bigint_col) - ceil(bigint_col)"\
+ or select_command[s] == "ceil(float_col) - ceil(float_col)"\
+ or select_command[s] == "ceil(double_col) - ceil(double_col)"\
+ or select_command[s] == "ceil(smallint_col) - ceil(smallint_col)"\
+ or select_command[s] == "ceil(tinyint_col) - ceil(tinyint_col)"\
+ or select_command[s] == "ceil(uint_col) - ceil(uint_col)"\
+ or select_command[s] == "ceil(ubigint_col) - ceil(ubigint_col)"\
+ or select_command[s] == "ceil(usmallint_col) - ceil(usmallint_col)"\
+ or select_command[s] == "ceil(utinyint_col) - ceil(utinyint_col)"\
+ or select_command[s] == "ceil(int_col) * ceil(int_col)"\
+ or select_command[s] == "ceil(bigint_col) * ceil(bigint_col)"\
+ or select_command[s] == "ceil(float_col) * ceil(float_col)"\
+ or select_command[s] == "ceil(double_col) * ceil(double_col)"\
+ or select_command[s] == "ceil(smallint_col) * ceil(smallint_col)"\
+ or select_command[s] == "ceil(tinyint_col) * ceil(tinyint_col)"\
+ or select_command[s] == "ceil(uint_col) * ceil(uint_col)"\
+ or select_command[s] == "ceil(ubigint_col) * ceil(ubigint_col)"\
+ or select_command[s] == "ceil(usmallint_col) * ceil(usmallint_col)"\
+ or select_command[s] == "ceil(utinyint_col) * ceil(utinyint_col)"\
+ or select_command[s] == "ceil(int_col) / ceil(int_col)"\
+ or select_command[s] == "ceil(bigint_col) / ceil(bigint_col)"\
+ or select_command[s] == "ceil(float_col) / ceil(float_col)"\
+ or select_command[s] == "ceil(double_col) / ceil(double_col)"\
+ or select_command[s] == "ceil(smallint_col) / ceil(smallint_col)"\
+ or select_command[s] == "ceil(tinyint_col) / ceil(tinyint_col)"\
+ or select_command[s] == "ceil(uint_col) / ceil(uint_col)"\
+ or select_command[s] == "ceil(ubigint_col) / ceil(ubigint_col)"\
+ or select_command[s] == "ceil(usmallint_col) / ceil(usmallint_col)"\
+ or select_command[s] == "ceil(utinyint_col) / ceil(utinyint_col)"):
+ tdSql.query(sql)
+ else:
+ tdSql.error(sql)
+ for sim in range(len(simple_select_command)):
+ for fr in range(len(advance_from_command)):
+ for filter in range(len(filter_command)):
+ for fill in range(len(fill_command)):
+ sql = "select " + simple_select_command[
+ sim] + advance_from_command[fr] + filter_command[
+ filter] + fill_command[fill]
+ if sql == "select ceil(t1.int_col) from t1"\
+ or sql == "select ceil(super.int_col) from super"\
+ or sql == "select ceil(t1.bigint_col) from t1"\
+ or sql == "select ceil(super.bigint_col) from super"\
+ or sql == "select ceil(t1.smallint_col) from t1"\
+ or sql == "select ceil(super.smallint_col) from super"\
+ or sql == "select ceil(t1.tinyint_col) from t1"\
+ or sql == "select ceil(super.tinyint_col) from super"\
+ or sql == "select ceil(t1.float_col) from t1"\
+ or sql == "select ceil(super.float_col) from super"\
+ or sql == "select ceil(t1.double_col) from t1"\
+ or sql == "select ceil(super.double_col) from super"\
+ or sql == "select ceil(t1.uint_col) from t1"\
+ or sql == "select ceil(super.uint_col) from super"\
+ or sql == "select ceil(t1.ubigint_col) from t1"\
+ or sql == "select ceil(super.ubigint_col) from super"\
+ or sql == "select ceil(t1.usmallint_col) from t1"\
+ or sql == "select ceil(super.usmallint_col) from super"\
+ or sql == "select ceil(t1.utinyint_col) from t1"\
+ or sql == "select ceil(super.utinyint_col) from super"\
+ or sql == "select ceil(super.int_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select ceil(super.bigint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select ceil(super.smallint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select ceil(super.tinyint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select ceil(super.float_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select ceil(super.double_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select ceil(super.uint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select ceil(super.ubigint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select ceil(super.usmallint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select ceil(super.utinyint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag":
+ tdSql.query(sql)
+ else:
+ tdSql.error(sql)
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_floor.py b/tests/pytest/functions/function_floor.py
new file mode 100644
index 0000000000000000000000000000000000000000..305e3b798a74376766a14cd824ded617db3cc8a2
--- /dev/null
+++ b/tests/pytest/functions/function_floor.py
@@ -0,0 +1,1518 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+import random
+
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor())
+
+ def randomInt(self):
+ return random.randint(-2147483647, 2147483647)
+
+ def randomUInt(self):
+ return random.randint(0, 4294967294)
+
+ def randomBigint(self):
+ return random.randint(-2**63 + 1, 2**63 - 1)
+
+ def randomUBigint(self):
+ return random.randint(0, 18446744073709551614)
+
+ def randomDouble(self):
+ return random.random()
+
+ def randomNchar(self):
+ return random.choice('abcdefghijklmnopqrstuvwxyz')
+
+ def randomSmallint(self):
+ return random.randint(-32767, 32767)
+
+ def randomUSmallint(self):
+ return random.randint(0, 65534)
+
+ def randomTinyint(self):
+ return random.randint(-127, 127)
+
+ def randomUTinyint(self):
+ return random.randint(0, 254)
+
+ def run(self):
+ select_command = [
+ "floor(ts)",
+ "floor(timestamp_col)",
+ "floor(int_col)",
+ "floor(bigint_col)",
+ "floor(float_col)",
+ "floor(double_col)",
+ "floor(binary_col)",
+ "floor(smallint_col)",
+ "floor(tinyint_col)",
+ "floor(bool_col)",
+ "floor(nchar_col)",
+ "floor(uint_col)",
+ "floor(ubigint_col)",
+ "floor(usmallint_col)",
+ "floor(utinyint_col)",
+ "floor(timestamp_tag)",
+ "floor(int_tag)",
+ "floor(bigint_tag)",
+ "floor(float_tag)",
+ "floor(double_tag)",
+ "floor(binary_tag)",
+ "floor(smallint_tag)",
+ "floor(tinyint_tag)",
+ "floor(bool_tag)",
+ "floor(nchar_tag)",
+ "floor(uint_tag)",
+ "floor(ubigint_tag)",
+ "floor(usmallint_tag)",
+ "floor(utinyint_tag)",
+ "count(floor(int_col))",
+ "count(floor(bigint_col))",
+ "count(floor(float_col))",
+ "count(floor(double_col))",
+ "count(floor(smallint_col))",
+ "count(floor(tinyint_col))",
+ "count(floor(uint_col))",
+ "count(floor(ubigint_col))",
+ "count(floor(usmallint_col))",
+ "count(floor(utinyint_col))",
+ "avg(floor(int_col))",
+ "avg(floor(bigint_col))",
+ "avg(floor(float_col))",
+ "avg(floor(double_col))",
+ "avg(floor(smallint_col))",
+ "avg(floor(tinyint_col))",
+ "avg(floor(uint_col))",
+ "avg(floor(ubigint_col))",
+ "avg(floor(usmallint_col))",
+ "avg(floor(utinyint_col))",
+ "twa(floor(int_col))",
+ "twa(floor(bigint_col))",
+ "twa(floor(float_col))",
+ "twa(floor(double_col))",
+ "twa(floor(smallint_col))",
+ "twa(floor(tinyint_col))",
+ "twa(floor(uint_col))",
+ "twa(floor(ubigint_col))",
+ "twa(floor(usmallint_col))",
+ "twa(floor(utinyint_col))",
+ "sum(floor(int_col))",
+ "sum(floor(bigint_col))",
+ "sum(floor(float_col))",
+ "sum(floor(double_col))",
+ "sum(floor(smallint_col))",
+ "sum(floor(tinyint_col))",
+ "sum(floor(uint_col))",
+ "sum(floor(ubigint_col))",
+ "sum(floor(usmallint_col))",
+ "sum(floor(utinyint_col))",
+ "stddev(floor(int_col))",
+ "stddev(floor(bigint_col))",
+ "stddev(floor(float_col))",
+ "stddev(floor(double_col))",
+ "stddev(floor(smallint_col))",
+ "stddev(floor(tinyint_col))",
+ "stddev(floor(uint_col))",
+ "stddev(floor(ubigint_col))",
+ "stddev(floor(usmallint_col))",
+ "stddev(floor(utinyint_col))",
+ "irate(floor(int_col))",
+ "irate(floor(bigint_col))",
+ "irate(floor(float_col))",
+ "irate(floor(double_col))",
+ "irate(floor(smallint_col))",
+ "irate(floor(tinyint_col))",
+ "irate(floor(uint_col))",
+ "irate(floor(ubigint_col))",
+ "irate(floor(usmallint_col))",
+ "irate(floor(utinyint_col))",
+ "leastsquares(floor(int_col), 1, 1)",
+ "leastsquares(floor(bigint_col), 1, 1)",
+ "leastsquares(floor(float_col), 1, 1)",
+ "leastsquares(floor(double_col), 1, 1)",
+ "leastsquares(floor(smallint_col), 1, 1)",
+ "leastsquares(floor(tinyint_col), 1, 1)",
+ "leastsquares(floor(uint_col), 1, 1)",
+ "leastsquares(floor(ubigint_col), 1, 1)",
+ "leastsquares(floor(usmallint_col), 1, 1)",
+ "leastsquares(floor(utinyint_col), 1, 1)",
+ "min(floor(int_col))",
+ "min(floor(bigint_col))",
+ "min(floor(float_col))",
+ "min(floor(double_col))",
+ "min(floor(smallint_col))",
+ "min(floor(tinyint_col))",
+ "min(floor(uint_col))",
+ "min(floor(ubigint_col))",
+ "min(floor(usmallint_col))",
+ "min(floor(utinyint_col))",
+ "max(floor(int_col))",
+ "max(floor(bigint_col))",
+ "max(floor(float_col))",
+ "max(floor(double_col))",
+ "max(floor(smallint_col))",
+ "max(floor(tinyint_col))",
+ "max(floor(uint_col))",
+ "max(floor(ubigint_col))",
+ "max(floor(usmallint_col))",
+ "max(floor(utinyint_col))",
+ "first(floor(int_col))",
+ "first(floor(bigint_col))",
+ "first(floor(float_col))",
+ "first(floor(double_col))",
+ "first(floor(smallint_col))",
+ "first(floor(tinyint_col))",
+ "first(floor(uint_col))",
+ "first(floor(ubigint_col))",
+ "first(floor(usmallint_col))",
+ "first(floor(utinyint_col))",
+ "last(floor(int_col))",
+ "last(floor(bigint_col))",
+ "last(floor(float_col))",
+ "last(floor(double_col))",
+ "last(floor(smallint_col))",
+ "last(floor(tinyint_col))",
+ "last(floor(uint_col))",
+ "last(floor(ubigint_col))",
+ "last(floor(usmallint_col))",
+ "last(floor(utinyint_col))",
+ "top(floor(int_col), 1)",
+ "top(floor(bigint_col), 1)",
+ "top(floor(float_col), 1)",
+ "top(floor(double_col), 1)",
+ "top(floor(smallint_col), 1)",
+ "top(floor(tinyint_col), 1)",
+ "top(floor(uint_col), 1)",
+ "top(floor(ubigint_col), 1)",
+ "top(floor(usmallint_col), 1)",
+ "top(floor(utinyint_col), 1)",
+ "bottom(floor(int_col), 1)",
+ "bottom(floor(bigint_col), 1)",
+ "bottom(floor(float_col), 1)",
+ "bottom(floor(double_col), 1)",
+ "bottom(floor(smallint_col), 1)",
+ "bottom(floor(tinyint_col), 1)",
+ "bottom(floor(uint_col), 1)",
+ "bottom(floor(ubigint_col), 1)",
+ "bottom(floor(usmallint_col), 1)",
+ "bottom(floor(utinyint_col), 1)",
+ "percentile(floor(int_col), 20)",
+ "percentile(floor(bigint_col), 20)",
+ "percentile(floor(float_col), 20)",
+ "percentile(floor(double_col), 20)",
+ "percentile(floor(smallint_col), 20)",
+ "percentile(floor(tinyint_col), 20)",
+ "percentile(floor(uint_col), 20)",
+ "percentile(floor(ubigint_col), 20)",
+ "percentile(floor(usmallint_col), 20)",
+ "percentile(floor(utinyint_col), 20)",
+ "apercentile(floor(int_col), 20)",
+ "apercentile(floor(bigint_col), 20)",
+ "apercentile(floor(float_col), 20)",
+ "apercentile(floor(double_col), 20)",
+ "apercentile(floor(smallint_col), 20)",
+ "apercentile(floor(tinyint_col), 20)",
+ "apercentile(floor(uint_col), 20)",
+ "apercentile(floor(ubigint_col), 20)",
+ "apercentile(floor(usmallint_col), 20)",
+ "apercentile(floor(utinyint_col), 20)",
+ "last_row(floor(int_col))",
+ "last_row(floor(bigint_col))",
+ "last_row(floor(float_col))",
+ "last_row(floor(double_col))",
+ "last_row(floor(smallint_col))",
+ "last_row(floor(tinyint_col))",
+ "last_row(floor(uint_col))",
+ "last_row(floor(ubigint_col))",
+ "last_row(floor(usmallint_col))",
+ "last_row(floor(utinyint_col))",
+ "interp(floor(int_col))",
+ "interp(floor(bigint_col))",
+ "interp(floor(float_col))",
+ "interp(floor(double_col))",
+ "interp(floor(smallint_col))",
+ "interp(floor(tinyint_col))",
+ "interp(floor(uint_col))",
+ "interp(floor(ubigint_col))",
+ "interp(floor(usmallint_col))",
+ "interp(floor(utinyint_col))",
+ "diff(floor(int_col))",
+ "diff(floor(bigint_col))",
+ "diff(floor(float_col))",
+ "diff(floor(double_col))",
+ "diff(floor(smallint_col))",
+ "diff(floor(tinyint_col))",
+ "diff(floor(uint_col))",
+ "diff(floor(ubigint_col))",
+ "diff(floor(usmallint_col))",
+ "diff(floor(utinyint_col))",
+ "spread(floor(int_col))",
+ "spread(floor(bigint_col))",
+ "spread(floor(float_col))",
+ "spread(floor(double_col))",
+ "spread(floor(smallint_col))",
+ "spread(floor(tinyint_col))",
+ "spread(floor(uint_col))",
+ "spread(floor(ubigint_col))",
+ "spread(floor(usmallint_col))",
+ "spread(floor(utinyint_col))",
+ "derivative(floor(int_col), 1s, 0)",
+ "derivative(floor(bigint_col), 1s, 0)",
+ "derivative(floor(float_col), 1s, 0)",
+ "derivative(floor(double_col), 1s, 0)",
+ "derivative(floor(smallint_col), 1s, 0)",
+ "derivative(floor(tinyint_col), 1s, 0)",
+ "derivative(floor(uint_col), 1s, 0)",
+ "derivative(floor(ubigint_col), 1s, 0)",
+ "derivative(floor(usmallint_col), 1s, 0)",
+ "derivative(floor(utinyint_col), 1s, 0)",
+ "floor(int_col) - floor(int_col)",
+ "floor(bigint_col) - floor(bigint_col)",
+ "floor(float_col) - floor(float_col)",
+ "floor(double_col) - floor(double_col)",
+ "floor(smallint_col) - floor(smallint_col)",
+ "floor(tinyint_col) - floor(tinyint_col)",
+ "floor(uint_col) - floor(uint_col)",
+ "floor(ubigint_col) - floor(ubigint_col)",
+ "floor(usmallint_col) - floor(usmallint_col)",
+ "floor(utinyint_col) - floor(utinyint_col)",
+ "floor(int_col) / floor(int_col)",
+ "floor(bigint_col) / floor(bigint_col)",
+ "floor(float_col) / floor(float_col)",
+ "floor(double_col) / floor(double_col)",
+ "floor(smallint_col) / floor(smallint_col)",
+ "floor(tinyint_col) / floor(tinyint_col)",
+ "floor(uint_col) / floor(uint_col)",
+ "floor(ubigint_col) / floor(ubigint_col)",
+ "floor(usmallint_col) / floor(usmallint_col)",
+ "floor(utinyint_col) / floor(utinyint_col)",
+ "floor(int_col) * floor(int_col)",
+ "floor(bigint_col) * floor(bigint_col)",
+ "floor(float_col) * floor(float_col)",
+ "floor(double_col) * floor(double_col)",
+ "floor(smallint_col) * floor(smallint_col)",
+ "floor(tinyint_col) * floor(tinyint_col)",
+ "floor(uint_col) * floor(uint_col)",
+ "floor(ubigint_col) * floor(ubigint_col)",
+ "floor(usmallint_col) * floor(usmallint_col)",
+ "floor(utinyint_col) * floor(utinyint_col)",
+ "floor(count(ts))",
+ "floor(count(timestamp_col))",
+ "floor(count(int_col))",
+ "floor(count(bigint_col))",
+ "floor(count(float_col))",
+ "floor(count(double_col))",
+ "floor(count(binary_col))",
+ "floor(count(smallint_col))",
+ "floor(count(tinyint_col))",
+ "floor(count(bool_col))",
+ "floor(count(nchar_col))",
+ "floor(count(uint_col))",
+ "floor(count(ubigint_col))",
+ "floor(count(usmallint_col))",
+ "floor(count(utinyint_col))",
+ "floor(count(timestamp_tag))",
+ "floor(count(int_tag))",
+ "floor(count(bigint_tag))",
+ "floor(count(float_tag))",
+ "floor(count(double_tag))",
+ "floor(count(binary_tag))",
+ "floor(count(smallint_tag))",
+ "floor(count(tinyint_tag))",
+ "floor(count(bool_tag))",
+ "floor(count(nchar_tag))",
+ "floor(count(uint_tag))",
+ "floor(count(ubigint_tag))",
+ "floor(count(usmallint_tag))",
+ "floor(count(utinyint_tag))",
+ "floor(avg(ts))",
+ "floor(avg(timestamp_col))",
+ "floor(avg(int_col))",
+ "floor(avg(bigint_col))",
+ "floor(avg(float_col))",
+ "floor(avg(double_col))",
+ "floor(avg(binary_col))",
+ "floor(avg(smallint_col))",
+ "floor(avg(tinyint_col))",
+ "floor(avg(bool_col))",
+ "floor(avg(nchar_col))",
+ "floor(avg(uint_col))",
+ "floor(avg(ubigint_col))",
+ "floor(avg(usmallint_col))",
+ "floor(avg(utinyint_col))",
+ "floor(avg(timestamp_tag))",
+ "floor(avg(int_tag))",
+ "floor(avg(bigint_tag))",
+ "floor(avg(float_tag))",
+ "floor(avg(double_tag))",
+ "floor(avg(binary_tag))",
+ "floor(avg(smallint_tag))",
+ "floor(avg(tinyint_tag))",
+ "floor(avg(bool_tag))",
+ "floor(avg(nchar_tag))",
+ "floor(avg(uint_tag))",
+ "floor(avg(ubigint_tag))",
+ "floor(avg(usmallint_tag))",
+ "floor(avg(utinyint_tag))",
+ "floor(twa(ts))",
+ "floor(twa(timestamp_col))",
+ "floor(twa(int_col))",
+ "floor(twa(bigint_col))",
+ "floor(twa(float_col))",
+ "floor(twa(double_col))",
+ "floor(twa(binary_col))",
+ "floor(twa(smallint_col))",
+ "floor(twa(tinyint_col))",
+ "floor(twa(bool_col))",
+ "floor(twa(nchar_col))",
+ "floor(twa(uint_col))",
+ "floor(twa(ubigint_col))",
+ "floor(twa(usmallint_col))",
+ "floor(twa(utinyint_col))",
+ "floor(twa(timestamp_tag))",
+ "floor(twa(int_tag))",
+ "floor(twa(bigint_tag))",
+ "floor(twa(float_tag))",
+ "floor(twa(double_tag))",
+ "floor(twa(binary_tag))",
+ "floor(twa(smallint_tag))",
+ "floor(twa(tinyint_tag))",
+ "floor(twa(bool_tag))",
+ "floor(twa(nchar_tag))",
+ "floor(twa(uint_tag))",
+ "floor(twa(ubigint_tag))",
+ "floor(twa(usmallint_tag))",
+ "floor(twa(utinyint_tag))",
+ "floor(sum(ts))",
+ "floor(sum(timestamp_col))",
+ "floor(sum(int_col))",
+ "floor(sum(bigint_col))",
+ "floor(sum(float_col))",
+ "floor(sum(double_col))",
+ "floor(sum(binary_col))",
+ "floor(sum(smallint_col))",
+ "floor(sum(tinyint_col))",
+ "floor(sum(bool_col))",
+ "floor(sum(nchar_col))",
+ "floor(sum(uint_col))",
+ "floor(sum(ubigint_col))",
+ "floor(sum(usmallint_col))",
+ "floor(sum(utinyint_col))",
+ "floor(sum(timestamp_tag))",
+ "floor(sum(int_tag))",
+ "floor(sum(bigint_tag))",
+ "floor(sum(float_tag))",
+ "floor(sum(double_tag))",
+ "floor(sum(binary_tag))",
+ "floor(sum(smallint_tag))",
+ "floor(sum(tinyint_tag))",
+ "floor(sum(bool_tag))",
+ "floor(sum(nchar_tag))",
+ "floor(sum(uint_tag))",
+ "floor(sum(ubigint_tag))",
+ "floor(sum(usmallint_tag))",
+ "floor(sum(utinyint_tag))",
+ "floor(stddev(ts))",
+ "floor(stddev(timestamp_col))",
+ "floor(stddev(int_col))",
+ "floor(stddev(bigint_col))",
+ "floor(stddev(float_col))",
+ "floor(stddev(double_col))",
+ "floor(stddev(binary_col))",
+ "floor(stddev(smallint_col))",
+ "floor(stddev(tinyint_col))",
+ "floor(stddev(bool_col))",
+ "floor(stddev(nchar_col))",
+ "floor(stddev(uint_col))",
+ "floor(stddev(ubigint_col))",
+ "floor(stddev(usmallint_col))",
+ "floor(stddev(utinyint_col))",
+ "floor(stddev(timestamp_tag))",
+ "floor(stddev(int_tag))",
+ "floor(stddev(bigint_tag))",
+ "floor(stddev(float_tag))",
+ "floor(stddev(double_tag))",
+ "floor(stddev(binary_tag))",
+ "floor(stddev(smallint_tag))",
+ "floor(stddev(tinyint_tag))",
+ "floor(stddev(bool_tag))",
+ "floor(stddev(nchar_tag))",
+ "floor(stddev(uint_tag))",
+ "floor(stddev(ubigint_tag))",
+ "floor(stddev(usmallint_tag))",
+ "floor(stddev(utinyint_tag))",
+ "floor(leastsquares(ts, 1, 1))",
+ "floor(leastsquares(timestamp_col, 1, 1))",
+ "floor(leastsquares(int_col, 1, 1))",
+ "floor(leastsquares(bigint_col, 1, 1))",
+ "floor(leastsquares(float_col, 1, 1))",
+ "floor(leastsquares(double_col, 1, 1))",
+ "floor(leastsquares(binary_col, 1, 1))",
+ "floor(leastsquares(smallint_col, 1, 1))",
+ "floor(leastsquares(tinyint_col, 1, 1))",
+ "floor(leastsquares(bool_col, 1, 1))",
+ "floor(leastsquares(nchar_col, 1, 1))",
+ "floor(leastsquares(uint_col, 1, 1))",
+ "floor(leastsquares(ubigint_col, 1, 1))",
+ "floor(leastsquares(usmallint_col, 1, 1))",
+ "floor(leastsquares(utinyint_col, 1, 1))",
+ "floor(leastsquares(timestamp_tag, 1, 1))",
+ "floor(leastsquares(int_tag, 1, 1))",
+ "floor(leastsquares(bigint_tag, 1, 1))",
+ "floor(leastsquares(float_tag, 1, 1))",
+ "floor(leastsquares(double_tag, 1, 1))",
+ "floor(leastsquares(binary_tag, 1, 1))",
+ "floor(leastsquares(smallint_tag, 1, 1))",
+ "floor(leastsquares(tinyint_tag, 1, 1))",
+ "floor(leastsquares(bool_tag, 1, 1))",
+ "floor(leastsquares(nchar_tag, 1, 1))",
+ "floor(leastsquares(uint_tag, 1, 1))",
+ "floor(leastsquares(ubigint_tag, 1, 1))",
+ "floor(leastsquares(usmallint_tag, 1, 1))",
+ "floor(leastsquares(utinyint_tag, 1, 1))",
+ "floor(irate(ts))",
+ "floor(irate(timestamp_col))",
+ "floor(irate(int_col))",
+ "floor(irate(bigint_col))",
+ "floor(irate(float_col))",
+ "floor(irate(double_col))",
+ "floor(irate(binary_col))",
+ "floor(irate(smallint_col))",
+ "floor(irate(tinyint_col))",
+ "floor(irate(bool_col))",
+ "floor(irate(nchar_col))",
+ "floor(irate(uint_col))",
+ "floor(irate(ubigint_col))",
+ "floor(irate(usmallint_col))",
+ "floor(irate(utinyint_col))",
+ "floor(irate(timestamp_tag))",
+ "floor(irate(int_tag))",
+ "floor(irate(bigint_tag))",
+ "floor(irate(float_tag))",
+ "floor(irate(double_tag))",
+ "floor(irate(binary_tag))",
+ "floor(irate(smallint_tag))",
+ "floor(irate(tinyint_tag))",
+ "floor(irate(bool_tag))",
+ "floor(irate(nchar_tag))",
+ "floor(irate(uint_tag))",
+ "floor(irate(ubigint_tag))",
+ "floor(irate(usmallint_tag))",
+ "floor(irate(utinyint_tag))",
+ "floor(min(ts))",
+ "floor(min(timestamp_col))",
+ "floor(min(int_col))",
+ "floor(min(bigint_col))",
+ "floor(min(float_col))",
+ "floor(min(double_col))",
+ "floor(min(binary_col))",
+ "floor(min(smallint_col))",
+ "floor(min(tinyint_col))",
+ "floor(min(bool_col))",
+ "floor(min(nchar_col))",
+ "floor(min(uint_col))",
+ "floor(min(ubigint_col))",
+ "floor(min(usmallint_col))",
+ "floor(min(utinyint_col))",
+ "floor(min(timestamp_tag))",
+ "floor(min(int_tag))",
+ "floor(min(bigint_tag))",
+ "floor(min(float_tag))",
+ "floor(min(double_tag))",
+ "floor(min(binary_tag))",
+ "floor(min(smallint_tag))",
+ "floor(min(tinyint_tag))",
+ "floor(min(bool_tag))",
+ "floor(min(nchar_tag))",
+ "floor(min(uint_tag))",
+ "floor(min(ubigint_tag))",
+ "floor(min(usmallint_tag))",
+ "floor(min(utinyint_tag))",
+ "floor(max(ts))",
+ "floor(max(timestamp_col))",
+ "floor(max(int_col))",
+ "floor(max(bigint_col))",
+ "floor(max(float_col))",
+ "floor(max(double_col))",
+ "floor(max(binary_col))",
+ "floor(max(smallint_col))",
+ "floor(max(tinyint_col))",
+ "floor(max(bool_col))",
+ "floor(max(nchar_col))",
+ "floor(max(uint_col))",
+ "floor(max(ubigint_col))",
+ "floor(max(usmallint_col))",
+ "floor(max(utinyint_col))",
+ "floor(max(timestamp_tag))",
+ "floor(max(int_tag))",
+ "floor(max(bigint_tag))",
+ "floor(max(float_tag))",
+ "floor(max(double_tag))",
+ "floor(max(binary_tag))",
+ "floor(max(smallint_tag))",
+ "floor(max(tinyint_tag))",
+ "floor(max(bool_tag))",
+ "floor(max(nchar_tag))",
+ "floor(max(uint_tag))",
+ "floor(max(ubigint_tag))",
+ "floor(max(usmallint_tag))",
+ "floor(max(utinyint_tag))",
+ "floor(first(ts))",
+ "floor(first(timestamp_col))",
+ "floor(first(int_col))",
+ "floor(first(bigint_col))",
+ "floor(first(float_col))",
+ "floor(first(double_col))",
+ "floor(first(binary_col))",
+ "floor(first(smallint_col))",
+ "floor(first(tinyint_col))",
+ "floor(first(bool_col))",
+ "floor(first(nchar_col))",
+ "floor(first(uint_col))",
+ "floor(first(ubigint_col))",
+ "floor(first(usmallint_col))",
+ "floor(first(utinyint_col))",
+ "floor(first(timestamp_tag))",
+ "floor(first(int_tag))",
+ "floor(first(bigint_tag))",
+ "floor(first(float_tag))",
+ "floor(first(double_tag))",
+ "floor(first(binary_tag))",
+ "floor(first(smallint_tag))",
+ "floor(first(tinyint_tag))",
+ "floor(first(bool_tag))",
+ "floor(first(nchar_tag))",
+ "floor(first(uint_tag))",
+ "floor(first(ubigint_tag))",
+ "floor(first(usmallint_tag))",
+ "floor(first(utinyint_tag))",
+ "floor(last(ts))",
+ "floor(last(timestamp_col))",
+ "floor(last(int_col))",
+ "floor(last(bigint_col))",
+ "floor(last(float_col))",
+ "floor(last(double_col))",
+ "floor(last(binary_col))",
+ "floor(last(smallint_col))",
+ "floor(last(tinyint_col))",
+ "floor(last(bool_col))",
+ "floor(last(nchar_col))",
+ "floor(last(uint_col))",
+ "floor(last(ubigint_col))",
+ "floor(last(usmallint_col))",
+ "floor(last(utinyint_col))",
+ "floor(last(timestamp_tag))",
+ "floor(last(int_tag))",
+ "floor(last(bigint_tag))",
+ "floor(last(float_tag))",
+ "floor(last(double_tag))",
+ "floor(last(binary_tag))",
+ "floor(last(smallint_tag))",
+ "floor(last(tinyint_tag))",
+ "floor(last(bool_tag))",
+ "floor(last(nchar_tag))",
+ "floor(last(uint_tag))",
+ "floor(last(ubigint_tag))",
+ "floor(last(usmallint_tag))",
+ "floor(last(utinyint_tag))",
+ "floor(top(ts, 1))",
+ "floor(top(timestamp_col, 1))",
+ "floor(top(int_col, 1))",
+ "floor(top(bigint_col, 1))",
+ "floor(top(float_col, 1))",
+ "floor(top(double_col, 1))",
+ "floor(top(binary_col, 1))",
+ "floor(top(smallint_col, 1))",
+ "floor(top(tinyint_col, 1))",
+ "floor(top(bool_col, 1))",
+ "floor(top(nchar_col, 1))",
+ "floor(top(uint_col, 1))",
+ "floor(top(ubigint_col, 1))",
+ "floor(top(usmallint_col, 1))",
+ "floor(top(utinyint_col, 1))",
+ "floor(top(timestamp_tag, 1))",
+ "floor(top(int_tag, 1))",
+ "floor(top(bigint_tag, 1))",
+ "floor(top(float_tag, 1))",
+ "floor(top(double_tag, 1))",
+ "floor(top(binary_tag, 1))",
+ "floor(top(smallint_tag, 1))",
+ "floor(top(tinyint_tag, 1))",
+ "floor(top(bool_tag, 1))",
+ "floor(top(nchar_tag, 1))",
+ "floor(top(uint_tag, 1))",
+ "floor(top(ubigint_tag, 1))",
+ "floor(top(usmallint_tag, 1))",
+ "floor(top(utinyint_tag, 1))",
+ "floor(bottom(ts, 1))",
+ "floor(bottom(timestamp_col, 1))",
+ "floor(bottom(int_col, 1))",
+ "floor(bottom(bigint_col, 1))",
+ "floor(bottom(float_col, 1))",
+ "floor(bottom(double_col, 1))",
+ "floor(bottom(binary_col, 1))",
+ "floor(bottom(smallint_col, 1))",
+ "floor(bottom(tinyint_col, 1))",
+ "floor(bottom(bool_col, 1))",
+ "floor(bottom(nchar_col, 1))",
+ "floor(bottom(uint_col, 1))",
+ "floor(bottom(ubigint_col, 1))",
+ "floor(bottom(usmallint_col, 1))",
+ "floor(bottom(utinyint_col, 1))",
+ "floor(bottom(timestamp_tag, 1))",
+ "floor(bottom(int_tag, 1))",
+ "floor(bottom(bigint_tag, 1))",
+ "floor(bottom(float_tag, 1))",
+ "floor(bottom(double_tag, 1))",
+ "floor(bottom(binary_tag, 1))",
+ "floor(bottom(smallint_tag, 1))",
+ "floor(bottom(tinyint_tag, 1))",
+ "floor(bottom(bool_tag, 1))",
+ "floor(bottom(nchar_tag, 1))",
+ "floor(bottom(uint_tag, 1))",
+ "floor(bottom(ubigint_tag, 1))",
+ "floor(bottom(usmallint_tag, 1))",
+ "floor(bottom(utinyint_tag, 1))",
+ "floor(percentile(ts, 1))",
+ "floor(percentile(timestamp_col, 1))",
+ "floor(percentile(int_col, 1))",
+ "floor(percentile(bigint_col, 1))",
+ "floor(percentile(float_col, 1))",
+ "floor(percentile(double_col, 1))",
+ "floor(percentile(binary_col, 1))",
+ "floor(percentile(smallint_col, 1))",
+ "floor(percentile(tinyint_col, 1))",
+ "floor(percentile(bool_col, 1))",
+ "floor(percentile(nchar_col, 1))",
+ "floor(percentile(uint_col, 1))",
+ "floor(percentile(ubigint_col, 1))",
+ "floor(percentile(usmallint_col, 1))",
+ "floor(percentile(utinyint_col, 1))",
+ "floor(percentile(timestamp_tag, 1))",
+ "floor(percentile(int_tag, 1))",
+ "floor(percentile(bigint_tag, 1))",
+ "floor(percentile(float_tag, 1))",
+ "floor(percentile(double_tag, 1))",
+ "floor(percentile(binary_tag, 1))",
+ "floor(percentile(smallint_tag, 1))",
+ "floor(percentile(tinyint_tag, 1))",
+ "floor(percentile(bool_tag, 1))",
+ "floor(percentile(nchar_tag, 1))",
+ "floor(percentile(uint_tag, 1))",
+ "floor(percentile(ubigint_tag, 1))",
+ "floor(percentile(usmallint_tag, 1))",
+ "floor(percentile(utinyint_tag, 1))",
+ "floor(apercentile(ts, 1))",
+ "floor(apercentile(timestamp_col, 1))",
+ "floor(apercentile(int_col, 1))",
+ "floor(apercentile(bigint_col, 1))",
+ "floor(apercentile(float_col, 1))",
+ "floor(apercentile(double_col, 1))",
+ "floor(apercentile(binary_col, 1))",
+ "floor(apercentile(smallint_col, 1))",
+ "floor(apercentile(tinyint_col, 1))",
+ "floor(apercentile(bool_col, 1))",
+ "floor(apercentile(nchar_col, 1))",
+ "floor(apercentile(uint_col, 1))",
+ "floor(apercentile(ubigint_col, 1))",
+ "floor(apercentile(usmallint_col, 1))",
+ "floor(apercentile(utinyint_col, 1))",
+ "floor(apercentile(timestamp_tag, 1))",
+ "floor(apercentile(int_tag, 1))",
+ "floor(apercentile(bigint_tag, 1))",
+ "floor(apercentile(float_tag, 1))",
+ "floor(apercentile(double_tag, 1))",
+ "floor(apercentile(binary_tag, 1))",
+ "floor(apercentile(smallint_tag, 1))",
+ "floor(apercentile(tinyint_tag, 1))",
+ "floor(apercentile(bool_tag, 1))",
+ "floor(apercentile(nchar_tag, 1))",
+ "floor(apercentile(uint_tag, 1))",
+ "floor(apercentile(ubigint_tag, 1))",
+ "floor(apercentile(usmallint_tag, 1))",
+ "floor(apercentile(utinyint_tag, 1))",
+ "floor(last_row(ts))",
+ "floor(last_row(timestamp_col))",
+ "floor(last_row(int_col))",
+ "floor(last_row(bigint_col))",
+ "floor(last_row(float_col))",
+ "floor(last_row(double_col))",
+ "floor(last_row(binary_col))",
+ "floor(last_row(smallint_col))",
+ "floor(last_row(tinyint_col))",
+ "floor(last_row(bool_col))",
+ "floor(last_row(nchar_col))",
+ "floor(last_row(uint_col))",
+ "floor(last_row(ubigint_col))",
+ "floor(last_row(usmallint_col))",
+ "floor(last_row(utinyint_col))",
+ "floor(last_row(timestamp_tag))",
+ "floor(last_row(int_tag))",
+ "floor(last_row(bigint_tag))",
+ "floor(last_row(float_tag))",
+ "floor(last_row(double_tag))",
+ "floor(last_row(binary_tag))",
+ "floor(last_row(smallint_tag))",
+ "floor(last_row(tinyint_tag))",
+ "floor(last_row(bool_tag))",
+ "floor(last_row(nchar_tag))",
+ "floor(last_row(uint_tag))",
+ "floor(last_row(ubigint_tag))",
+ "floor(last_row(usmallint_tag))",
+ "floor(last_row(utinyint_tag))",
+ "floor(interp(ts))",
+ "floor(interp(timestamp_col))",
+ "floor(interp(int_col))",
+ "floor(interp(bigint_col))",
+ "floor(interp(float_col))",
+ "floor(interp(double_col))",
+ "floor(interp(binary_col))",
+ "floor(interp(smallint_col))",
+ "floor(interp(tinyint_col))",
+ "floor(interp(bool_col))",
+ "floor(interp(nchar_col))",
+ "floor(interp(uint_col))",
+ "floor(interp(ubigint_col))",
+ "floor(interp(usmallint_col))",
+ "floor(interp(utinyint_col))",
+ "floor(interp(timestamp_tag))",
+ "floor(interp(int_tag))",
+ "floor(interp(bigint_tag))",
+ "floor(interp(float_tag))",
+ "floor(interp(double_tag))",
+ "floor(interp(binary_tag))",
+ "floor(interp(smallint_tag))",
+ "floor(interp(tinyint_tag))",
+ "floor(interp(bool_tag))",
+ "floor(interp(nchar_tag))",
+ "floor(interp(uint_tag))",
+ "floor(interp(ubigint_tag))",
+ "floor(interp(usmallint_tag))",
+ "floor(interp(utinyint_tag))",
+ "floor(diff(ts))",
+ "floor(diff(timestamp_col))",
+ "floor(diff(int_col))",
+ "floor(diff(bigint_col))",
+ "floor(diff(float_col))",
+ "floor(diff(double_col))",
+ "floor(diff(binary_col))",
+ "floor(diff(smallint_col))",
+ "floor(diff(tinyint_col))",
+ "floor(diff(bool_col))",
+ "floor(diff(nchar_col))",
+ "floor(diff(uint_col))",
+ "floor(diff(ubigint_col))",
+ "floor(diff(usmallint_col))",
+ "floor(diff(utinyint_col))",
+ "floor(diff(timestamp_tag))",
+ "floor(diff(int_tag))",
+ "floor(diff(bigint_tag))",
+ "floor(diff(float_tag))",
+ "floor(diff(double_tag))",
+ "floor(diff(binary_tag))",
+ "floor(diff(smallint_tag))",
+ "floor(diff(tinyint_tag))",
+ "floor(diff(bool_tag))",
+ "floor(diff(nchar_tag))",
+ "floor(diff(uint_tag))",
+ "floor(diff(ubigint_tag))",
+ "floor(diff(usmallint_tag))",
+ "floor(diff(utinyint_tag))",
+ "floor(spread(ts))",
+ "floor(spread(timestamp_col))",
+ "floor(spread(int_col))",
+ "floor(spread(bigint_col))",
+ "floor(spread(float_col))",
+ "floor(spread(double_col))",
+ "floor(spread(binary_col))",
+ "floor(spread(smallint_col))",
+ "floor(spread(tinyint_col))",
+ "floor(spread(bool_col))",
+ "floor(spread(nchar_col))",
+ "floor(spread(uint_col))",
+ "floor(spread(ubigint_col))",
+ "floor(spread(usmallint_col))",
+ "floor(spread(utinyint_col))",
+ "floor(spread(timestamp_tag))",
+ "floor(spread(int_tag))",
+ "floor(spread(bigint_tag))",
+ "floor(spread(float_tag))",
+ "floor(spread(double_tag))",
+ "floor(spread(binary_tag))",
+ "floor(spread(smallint_tag))",
+ "floor(spread(tinyint_tag))",
+ "floor(spread(bool_tag))",
+ "floor(spread(nchar_tag))",
+ "floor(spread(uint_tag))",
+ "floor(spread(ubigint_tag))",
+ "floor(spread(usmallint_tag))",
+ "floor(spread(utinyint_tag))",
+ "floor(derivative(ts, 1s, 0))",
+ "floor(derivative(timestamp_col, 1s, 0))",
+ "floor(derivative(int_col, 1s, 0))",
+ "floor(derivative(bigint_col, 1s, 0))",
+ "floor(derivative(float_col, 1s, 0))",
+ "floor(derivative(double_col, 1s, 0))",
+ "floor(derivative(binary_col, 1s, 0))",
+ "floor(derivative(smallint_col, 1s, 0))",
+ "floor(derivative(tinyint_col, 1s, 0))",
+ "floor(derivative(bool_col, 1s, 0))",
+ "floor(derivative(nchar_col, 1s, 0))",
+ "floor(derivative(uint_col, 1s, 0))",
+ "floor(derivative(ubigint_col, 1s, 0))",
+ "floor(derivative(usmallint_col, 1s, 0))",
+ "floor(derivative(utinyint_col, 1s, 0))",
+ "floor(derivative(timestamp_tag, 1s, 0))",
+ "floor(derivative(int_tag, 1s, 0))",
+ "floor(derivative(bigint_tag, 1s, 0))",
+ "floor(derivative(float_tag, 1s, 0))",
+ "floor(derivative(double_tag, 1s, 0))",
+ "floor(derivative(binary_tag, 1s, 0))",
+ "floor(derivative(smallint_tag, 1s, 0))",
+ "floor(derivative(tinyint_tag, 1s, 0))",
+ "floor(derivative(bool_tag, 1s, 0))",
+ "floor(derivative(nchar_tag, 1s, 0))",
+ "floor(derivative(uint_tag, 1s, 0))",
+ "floor(derivative(ubigint_tag, 1s, 0))",
+ "floor(derivative(usmallint_tag, 1s, 0))",
+ "floor(derivative(utinyint_tag, 1s, 0))",
+ "floor(ts + ts)",
+ "floor(timestamp_col + timestamp_col)",
+ "floor(int_col + int_col)",
+ "floor(bigint_col + bigint_col)",
+ "floor(float_col + float_col)",
+ "floor(double_col + double_col)",
+ "floor(binary_col + binary_col)",
+ "floor(smallint_col + smallint_col)",
+ "floor(tinyint_col + tinyint_col)",
+ "floor(bool_col + bool_col)",
+ "floor(nchar_col + nchar_col)",
+ "floor(uint_col + uint_col)",
+ "floor(ubigint_col + ubigint_col)",
+ "floor(usmallint_col + usmallint_col)",
+ "floor(utinyint_col + utinyint_col)",
+ "floor(timestamp_tag + timestamp_tag)",
+ "floor(int_tag + int_tag)",
+ "floor(bigint_tag + bigint_tag)",
+ "floor(float_tag + float_tag)",
+ "floor(double_tag + double_tag)",
+ "floor(binary_tag + binary_tag)",
+ "floor(smallint_tag + smallint_tag)",
+ "floor(tinyint_tag + tinyint_tag)",
+ "floor(bool_tag + bool_tag)",
+ "floor(nchar_tag + nchar_tag)",
+ "floor(uint_tag + uint_tag)",
+ "floor(ubigint_tag + ubigint_tag)",
+ "floor(usmallint_tag + usmallint_tag)",
+ "floor(utinyint_tag + utinyint_tag)",
+ "floor(ts - ts)",
+ "floor(timestamp_col - timestamp_col)",
+ "floor(int_col - int_col)",
+ "floor(bigint_col - bigint_col)",
+ "floor(float_col - float_col)",
+ "floor(double_col - double_col)",
+ "floor(binary_col - binary_col)",
+ "floor(smallint_col - smallint_col)",
+ "floor(tinyint_col - tinyint_col)",
+ "floor(bool_col - bool_col)",
+ "floor(nchar_col - nchar_col)",
+ "floor(uint_col - uint_col)",
+ "floor(ubigint_col - ubigint_col)",
+ "floor(usmallint_col - usmallint_col)",
+ "floor(utinyint_col - utinyint_col)",
+ "floor(timestamp_tag - timestamp_tag)",
+ "floor(int_tag - int_tag)",
+ "floor(bigint_tag - bigint_tag)",
+ "floor(float_tag - float_tag)",
+ "floor(double_tag - double_tag)",
+ "floor(binary_tag - binary_tag)",
+ "floor(smallint_tag - smallint_tag)",
+ "floor(tinyint_tag - tinyint_tag)",
+ "floor(bool_tag - bool_tag)",
+ "floor(nchar_tag - nchar_tag)",
+ "floor(uint_tag - uint_tag)",
+ "floor(ubigint_tag - ubigint_tag)",
+ "floor(usmallint_tag - usmallint_tag)",
+ "floor(utinyint_tag - utinyint_tag)",
+ "floor(ts * ts)",
+ "floor(timestamp_col * timestamp_col)",
+ "floor(int_col * int_col)",
+ "floor(bigint_col * bigint_col)",
+ "floor(float_col * float_col)",
+ "floor(double_col * double_col)",
+ "floor(binary_col * binary_col)",
+ "floor(smallint_col * smallint_col)",
+ "floor(tinyint_col * tinyint_col)",
+ "floor(bool_col * bool_col)",
+ "floor(nchar_col * nchar_col)",
+ "floor(uint_col * uint_col)",
+ "floor(ubigint_col * ubigint_col)",
+ "floor(usmallint_col * usmallint_col)",
+ "floor(utinyint_col * utinyint_col)",
+ "floor(timestamp_tag * timestamp_tag)",
+ "floor(int_tag * int_tag)",
+ "floor(bigint_tag * bigint_tag)",
+ "floor(float_tag * float_tag)",
+ "floor(double_tag * double_tag)",
+ "floor(binary_tag * binary_tag)",
+ "floor(smallint_tag * smallint_tag)",
+ "floor(tinyint_tag * tinyint_tag)",
+ "floor(bool_tag * bool_tag)",
+ "floor(nchar_tag * nchar_tag)",
+ "floor(uint_tag * uint_tag)",
+ "floor(ubigint_tag * ubigint_tag)",
+ "floor(usmallint_tag * usmallint_tag)",
+ "floor(utinyint_tag * utinyint_tag)",
+ "floor(ts / ts)",
+ "floor(timestamp_col / timestamp_col)",
+ "floor(int_col / int_col)",
+ "floor(bigint_col / bigint_col)",
+ "floor(float_col / float_col)",
+ "floor(double_col / double_col)",
+ "floor(binary_col / binary_col)",
+ "floor(smallint_col / smallint_col)",
+ "floor(tinyint_col / tinyint_col)",
+ "floor(bool_col / bool_col)",
+ "floor(nchar_col / nchar_col)",
+ "floor(uint_col / uint_col)",
+ "floor(ubigint_col / ubigint_col)",
+ "floor(usmallint_col / usmallint_col)",
+ "floor(utinyint_col / utinyint_col)",
+ "floor(timestamp_tag / timestamp_tag)",
+ "floor(int_tag / int_tag)",
+ "floor(bigint_tag / bigint_tag)",
+ "floor(float_tag / float_tag)",
+ "floor(double_tag / double_tag)",
+ "floor(binary_tag / binary_tag)",
+ "floor(smallint_tag / smallint_tag)",
+ "floor(tinyint_tag / tinyint_tag)",
+ "floor(bool_tag / bool_tag)",
+ "floor(nchar_tag / nchar_tag)",
+ "floor(uint_tag / uint_tag)",
+ "floor(ubigint_tag / ubigint_tag)",
+ "floor(usmallint_tag / usmallint_tag)",
+ "floor(utinyint_tag / utinyint_tag)",
+ "int_col, floor(int_col), int_col",
+ "bigint_col, floor(bigint_col), bigint_col",
+ "float_col, floor(float_col), float_col",
+ "double_col, floor(double_col), double_col",
+ "smallint_col, floor(smallint_col), smallint_col",
+ "tinyint_col, floor(tinyint_col), tinyint_col",
+ "uint_col, floor(uint_col), uint_col",
+ "ubigint_col, floor(ubigint_col), ubigint_col",
+ "usmallint_col, floor(usmallint_col), usmallint_col",
+ "utinyint_col, floor(utinyint_col), utinyint_col",
+ "count(int_col), floor(int_col), count(int_col)",
+ "count(bigint_col), floor(bigint_col), count(bigint_col)",
+ "count(float_col), floor(float_col), count(float_col)",
+ "count(double_col), floor(double_col), count(double_col)",
+ "count(smallint_col), floor(smallint_col), count(smallint_col)",
+ "count(tinyint_col), floor(tinyint_col), count(tinyint_col)",
+ "count(uint_col), floor(uint_col), count(uint_col)",
+ "count(ubigint_col), floor(ubigint_col), count(ubigint_col)",
+ "count(usmallint_col), floor(usmallint_col), count(usmallint_col)",
+ "count(utinyint_col), floor(utinyint_col), count(utinyint_col)",
+ "avg(int_col), floor(int_col), avg(int_col)",
+ "avg(bigint_col), floor(bigint_col), avg(bigint_col)",
+ "avg(float_col), floor(float_col), avg(float_col)",
+ "avg(double_col), floor(double_col), avg(double_col)",
+ "avg(smallint_col), floor(smallint_col), avg(smallint_col)",
+ "avg(tinyint_col), floor(tinyint_col), avg(tinyint_col)",
+ "avg(uint_col), floor(uint_col), avg(uint_col)",
+ "avg(ubigint_col), floor(ubigint_col), avg(ubigint_col)",
+ "avg(usmallint_col), floor(usmallint_col), avg(usmallint_col)",
+ "avg(utinyint_col), floor(utinyint_col), avg(utinyint_col)",
+ "twa(int_col), floor(int_col), twa(int_col)",
+ "twa(bigint_col), floor(bigint_col), twa(bigint_col)",
+ "twa(float_col), floor(float_col), twa(float_col)",
+ "twa(double_col), floor(double_col), twa(double_col)",
+ "twa(smallint_col), floor(smallint_col), twa(smallint_col)",
+ "twa(tinyint_col), floor(tinyint_col), twa(tinyint_col)",
+ "twa(uint_col), floor(uint_col), twa(uint_col)",
+ "twa(ubigint_col), floor(ubigint_col), twa(ubigint_col)",
+ "twa(usmallint_col), floor(usmallint_col), twa(usmallint_col)",
+ "twa(utinyint_col), floor(utinyint_col), twa(utinyint_col)",
+ "sum(int_col), floor(int_col), sum(int_col)",
+ "sum(bigint_col), floor(bigint_col), sum(bigint_col)",
+ "sum(float_col), floor(float_col), sum(float_col)",
+ "sum(double_col), floor(double_col), sum(double_col)",
+ "sum(smallint_col), floor(smallint_col), sum(smallint_col)",
+ "sum(tinyint_col), floor(tinyint_col), sum(tinyint_col)",
+ "sum(uint_col), floor(uint_col), sum(uint_col)",
+ "sum(ubigint_col), floor(ubigint_col), sum(ubigint_col)",
+ "sum(usmallint_col), floor(usmallint_col), sum(usmallint_col)",
+ "sum(utinyint_col), floor(utinyint_col), sum(utinyint_col)",
+ "stddev(int_col), floor(int_col), stddev(int_col)",
+ "stddev(bigint_col), floor(bigint_col), stddev(bigint_col)",
+ "stddev(float_col), floor(float_col), stddev(float_col)",
+ "stddev(double_col), floor(double_col), stddev(double_col)",
+ "stddev(smallint_col), floor(smallint_col), stddev(smallint_col)",
+ "stddev(tinyint_col), floor(tinyint_col), stddev(tinyint_col)",
+ "stddev(uint_col), floor(uint_col), stddev(uint_col)",
+ "stddev(ubigint_col), floor(ubigint_col), stddev(ubigint_col)",
+ "stddev(usmallint_col), floor(usmallint_col), stddev(usmallint_col)",
+ "stddev(utinyint_col), floor(utinyint_col), stddev(utinyint_col)",
+ "irate(int_col), floor(int_col), irate(int_col)",
+ "irate(bigint_col), floor(bigint_col), irate(bigint_col)",
+ "irate(float_col), floor(float_col), irate(float_col)",
+ "irate(double_col), floor(double_col), irate(double_col)",
+ "irate(smallint_col), floor(smallint_col), irate(smallint_col)",
+ "irate(tinyint_col), floor(tinyint_col), irate(tinyint_col)",
+ "irate(uint_col), floor(uint_col), irate(uint_col)",
+ "irate(ubigint_col), floor(ubigint_col), irate(ubigint_col)",
+ "irate(usmallint_col), floor(usmallint_col), irate(usmallint_col)",
+ "irate(utinyint_col), floor(utinyint_col), irate(utinyint_col)",
+ "min(int_col), floor(int_col), min(int_col)",
+ "min(bigint_col), floor(bigint_col), min(bigint_col)",
+ "min(float_col), floor(float_col), min(float_col)",
+ "min(double_col), floor(double_col), min(double_col)",
+ "min(smallint_col), floor(smallint_col), min(smallint_col)",
+ "min(tinyint_col), floor(tinyint_col), min(tinyint_col)",
+ "min(uint_col), floor(uint_col), min(uint_col)",
+ "min(ubigint_col), floor(ubigint_col), min(ubigint_col)",
+ "min(usmallint_col), floor(usmallint_col), min(usmallint_col)",
+ "min(utinyint_col), floor(utinyint_col), min(utinyint_col)",
+ "max(int_col), floor(int_col), max(int_col)",
+ "max(bigint_col), floor(bigint_col), max(bigint_col)",
+ "max(float_col), floor(float_col), max(float_col)",
+ "max(double_col), floor(double_col), max(double_col)",
+ "max(smallint_col), floor(smallint_col), max(smallint_col)",
+ "max(tinyint_col), floor(tinyint_col), max(tinyint_col)",
+ "max(uint_col), floor(uint_col), max(uint_col)",
+ "max(ubigint_col), floor(ubigint_col), max(ubigint_col)",
+ "max(usmallint_col), floor(usmallint_col), max(usmallint_col)",
+ "max(utinyint_col), floor(utinyint_col), max(utinyint_col)",
+ "first(int_col), floor(int_col), first(int_col)",
+ "first(bigint_col), floor(bigint_col), first(bigint_col)",
+ "first(float_col), floor(float_col), first(float_col)",
+ "first(double_col), floor(double_col), first(double_col)",
+ "first(smallint_col), floor(smallint_col), first(smallint_col)",
+ "first(tinyint_col), floor(tinyint_col), first(tinyint_col)",
+ "first(uint_col), floor(uint_col), first(uint_col)",
+ "first(ubigint_col), floor(ubigint_col), first(ubigint_col)",
+ "first(usmallint_col), floor(usmallint_col), first(usmallint_col)",
+ "first(utinyint_col), floor(utinyint_col), first(utinyint_col)",
+ "last(int_col), floor(int_col), last(int_col)",
+ "last(bigint_col), floor(bigint_col), last(bigint_col)",
+ "last(float_col), floor(float_col), last(float_col)",
+ "last(double_col), floor(double_col), last(double_col)",
+ "last(smallint_col), floor(smallint_col), last(smallint_col)",
+ "last(tinyint_col), floor(tinyint_col), last(tinyint_col)",
+ "last(uint_col), floor(uint_col), last(uint_col)",
+ "last(ubigint_col), floor(ubigint_col), last(ubigint_col)",
+ "last(usmallint_col), floor(usmallint_col), last(usmallint_col)",
+ "last(utinyint_col), floor(utinyint_col), last(utinyint_col)",
+ "last_row(int_col), floor(int_col), last_row(int_col)",
+ "last_row(bigint_col), floor(bigint_col), last_row(bigint_col)",
+ "last_row(float_col), floor(float_col), last_row(float_col)",
+ "last_row(double_col), floor(double_col), last_row(double_col)",
+ "last_row(smallint_col), floor(smallint_col), last_row(smallint_col)",
+ "last_row(tinyint_col), floor(tinyint_col), last_row(tinyint_col)",
+ "last_row(uint_col), floor(uint_col), last_row(uint_col)",
+ "last_row(ubigint_col), floor(ubigint_col), last_row(ubigint_col)",
+ "last_row(usmallint_col), floor(usmallint_col), last_row(usmallint_col)",
+ "last_row(utinyint_col), floor(utinyint_col), last_row(utinyint_col)",
+ "interp(int_col), floor(int_col), interp(int_col)",
+ "interp(bigint_col), floor(bigint_col), interp(bigint_col)",
+ "interp(float_col), floor(float_col), interp(float_col)",
+ "interp(double_col), floor(double_col), interp(double_col)",
+ "interp(smallint_col), floor(smallint_col), interp(smallint_col)",
+ "interp(tinyint_col), floor(tinyint_col), interp(tinyint_col)",
+ "interp(uint_col), floor(uint_col), interp(uint_col)",
+ "interp(ubigint_col), floor(ubigint_col), interp(ubigint_col)",
+ "interp(usmallint_col), floor(usmallint_col), interp(usmallint_col)",
+ "interp(utinyint_col), floor(utinyint_col), interp(utinyint_col)",
+ "diff(int_col), floor(int_col), diff(int_col)",
+ "diff(bigint_col), floor(bigint_col), diff(bigint_col)",
+ "diff(float_col), floor(float_col), diff(float_col)",
+ "diff(double_col), floor(double_col), diff(double_col)",
+ "diff(smallint_col), floor(smallint_col), diff(smallint_col)",
+ "diff(tinyint_col), floor(tinyint_col), diff(tinyint_col)",
+ "diff(uint_col), floor(uint_col), diff(uint_col)",
+ "diff(ubigint_col), floor(ubigint_col), diff(ubigint_col)",
+ "diff(usmallint_col), floor(usmallint_col), diff(usmallint_col)",
+ "diff(utinyint_col), floor(utinyint_col), diff(utinyint_col)",
+ "spread(int_col), floor(int_col), spread(int_col)",
+ "spread(bigint_col), floor(bigint_col), spread(bigint_col)",
+ "spread(float_col), floor(float_col), spread(float_col)",
+ "spread(double_col), floor(double_col), spread(double_col)",
+ "spread(smallint_col), floor(smallint_col), spread(smallint_col)",
+ "spread(tinyint_col), floor(tinyint_col), spread(tinyint_col)",
+ "spread(uint_col), floor(uint_col), spread(uint_col)",
+ "spread(ubigint_col), floor(ubigint_col), spread(ubigint_col)",
+ "spread(usmallint_col), floor(usmallint_col), spread(usmallint_col)",
+ "spread(utinyint_col), floor(utinyint_col), spread(utinyint_col)",
+ "leastsquares(int_col, 1, 1), floor(int_col), leastsquares(int_col, 1, 1)",
+ "leastsquares(bigint_col, 1, 1), floor(bigint_col), leastsquares(bigint_col, 1, 1)",
+ "leastsquares(float_col, 1, 1), floor(float_col), leastsquares(float_col, 1, 1)",
+ "leastsquares(double_col, 1, 1), floor(double_col), leastsquares(double_col, 1, 1)",
+ "leastsquares(smallint_col, 1, 1), floor(smallint_col), leastsquares(smallint_col, 1, 1)",
+ "leastsquares(tinyint_col, 1, 1), floor(tinyint_col), leastsquares(tinyint_col, 1, 1)",
+ "leastsquares(uint_col, 1, 1), floor(uint_col), leastsquares(uint_col, 1, 1)",
+ "leastsquares(ubigint_col, 1, 1), floor(ubigint_col), leastsquares(ubigint_col, 1, 1)",
+ "leastsquares(usmallint_col, 1, 1), floor(usmallint_col), leastsquares(usmallint_col, 1, 1)",
+ "leastsquares(utinyint_col, 1, 1), floor(utinyint_col), leastsquares(utinyint_col, 1, 1)",
+ "top(int_col, 1), floor(int_col), top(int_col, 1)",
+ "top(bigint_col, 1), floor(bigint_col), top(bigint_col, 1)",
+ "top(float_col, 1), floor(float_col), top(float_col, 1)",
+ "top(double_col, 1), floor(double_col), top(double_col, 1)",
+ "top(smallint_col, 1), floor(smallint_col), top(smallint_col, 1)",
+ "top(tinyint_col, 1), floor(tinyint_col), top(tinyint_col, 1)",
+ "top(uint_col, 1), floor(uint_col), top(uint_col, 1)",
+ "top(ubigint_col, 1), floor(ubigint_col), top(ubigint_col, 1)",
+ "top(usmallint_col, 1), floor(usmallint_col), top(usmallint_col, 1)",
+ "top(utinyint_col, 1), floor(utinyint_col), top(utinyint_col, 1)",
+ "bottom(int_col, 1), floor(int_col), bottom(int_col, 1)",
+ "bottom(bigint_col, 1), floor(bigint_col), bottom(bigint_col, 1)",
+ "bottom(float_col, 1), floor(float_col), bottom(float_col, 1)",
+ "bottom(double_col, 1), floor(double_col), bottom(double_col, 1)",
+ "bottom(smallint_col, 1), floor(smallint_col), bottom(smallint_col, 1)",
+ "bottom(tinyint_col, 1), floor(tinyint_col), bottom(tinyint_col, 1)",
+ "bottom(uint_col, 1), floor(uint_col), bottom(uint_col, 1)",
+ "bottom(ubigint_col, 1), floor(ubigint_col), bottom(ubigint_col, 1)",
+ "bottom(usmallint_col, 1), floor(usmallint_col), bottom(usmallint_col, 1)",
+ "bottom(utinyint_col, 1), floor(utinyint_col), bottom(utinyint_col, 1)",
+ "percentile(int_col, 1), floor(int_col), percentile(int_col, 1)",
+ "percentile(bigint_col, 1), floor(bigint_col), percentile(bigint_col, 1)",
+ "percentile(float_col, 1), floor(float_col), percentile(float_col, 1)",
+ "percentile(double_col, 1), floor(double_col), percentile(double_col, 1)",
+ "percentile(smallint_col, 1), floor(smallint_col), percentile(smallint_col, 1)",
+ "percentile(tinyint_col, 1), floor(tinyint_col), percentile(tinyint_col, 1)",
+ "percentile(uint_col, 1), floor(uint_col), percentile(uint_col, 1)",
+ "percentile(ubigint_col, 1), floor(ubigint_col), percentile(ubigint_col, 1)",
+ "percentile(usmallint_col, 1), floor(usmallint_col), percentile(usmallint_col, 1)",
+ "percentile(utinyint_col, 1), floor(utinyint_col), percentile(utinyint_col, 1)",
+ "apercentile(int_col, 1), floor(int_col), apercentile(int_col, 1)",
+ "apercentile(bigint_col, 1), floor(bigint_col), apercentile(bigint_col, 1)",
+ "apercentile(float_col, 1), floor(float_col), apercentile(float_col, 1)",
+ "apercentile(double_col, 1), floor(double_col), apercentile(double_col, 1)",
+ "apercentile(smallint_col, 1), floor(smallint_col), apercentile(smallint_col, 1)",
+ "apercentile(tinyint_col, 1), floor(tinyint_col), apercentile(tinyint_col, 1)",
+ "apercentile(uint_col, 1), floor(uint_col), apercentile(uint_col, 1)",
+ "apercentile(ubigint_col, 1), floor(ubigint_col), apercentile(ubigint_col, 1)",
+ "apercentile(usmallint_col, 1), floor(usmallint_col), apercentile(usmallint_col, 1)",
+ "apercentile(utinyint_col, 1), floor(utinyint_col), apercentile(utinyint_col, 1)",
+ "derivative(int_col, 1s, 0), floor(int_col), derivative(int_col, 1s, 0)",
+ "derivative(bigint_col, 1s, 0), floor(bigint_col), derivative(bigint_col, 1s, 0)",
+ "derivative(float_col, 1s, 0), floor(float_col), derivative(float_col, 1s, 0)",
+ "derivative(double_col, 1s, 0), floor(double_col), derivative(double_col, 1s, 0)",
+ "derivative(smallint_col, 1s, 0), floor(smallint_col), derivative(smallint_col, 1s, 0)",
+ "derivative(tinyint_col, 1s, 0), floor(tinyint_col), derivative(tinyint_col, 1s, 0)",
+ "derivative(uint_col, 1s, 0), floor(uint_col), derivative(uint_col, 1s, 0)",
+ "derivative(ubigint_col, 1s, 0), floor(ubigint_col), derivative(ubigint_col, 1s, 0)",
+ "derivative(usmallint_col, 1s, 0), floor(usmallint_col), derivative(usmallint_col, 1s, 0)",
+ "derivative(utinyint_col, 1s, 0), floor(utinyint_col), derivative(utinyint_col, 1s, 0)",
+ "1, floor(int_col), 1",
+ "1, floor(bigint_col), 1",
+ "1, floor(float_col), 1",
+ "1, floor(double_col), 1",
+ "1, floor(smallint_col), 1",
+ "1, floor(tinyint_col), 1",
+ "1, floor(uint_col), 1",
+ "1, floor(ubigint_col), 1",
+ "1, floor(usmallint_col), 1",
+ "1, floor(utinyint_col), 1",
+ "floor(int_col) as anyName",
+ "floor(bigint_col) as anyName",
+ "floor(float_col) as anyName",
+ "floor(double_col) as anyName",
+ "floor(smallint_col) as anyName",
+ "floor(tinyint_col) as anyName",
+ "floor(uint_col) as anyName",
+ "floor(ubigint_col) as anyName",
+ "floor(usmallint_col) as anyName",
+ "floor(utinyint_col) as anyName",
+ "distinct floor(int_col)",
+ "distinct floor(bigint_col)",
+ "distinct floor(float_col)",
+ "distinct floor(double_col)",
+ "distinct floor(smallint_col)",
+ "distinct floor(tinyint_col)",
+ "distinct floor(uint_col)",
+ "distinct floor(ubigint_col)",
+ "distinct floor(usmallint_col)",
+ "distinct floor(utinyint_col)",
+ ]
+ simple_select_command = [
+ "floor(super.int_col)",
+ "floor(super.bigint_col)",
+ "floor(super.float_col)",
+ "floor(super.double_col)",
+ "floor(super.smallint_col)",
+ "floor(super.tinyint_col)",
+ "floor(super.uint_col)",
+ "floor(super.ubigint_col)",
+ "floor(super.usmallint_col)",
+ "floor(super.utinyint_col)",
+ "floor(t1.int_col)",
+ "floor(t1.bigint_col)",
+ "floor(t1.float_col)",
+ "floor(t1.double_col)",
+ "floor(t1.smallint_col)",
+ "floor(t1.tinyint_col)",
+ "floor(t1.uint_col)",
+ "floor(t1.ubigint_col)",
+ "floor(t1.usmallint_col)",
+ "floor(t1.utinyint_col)",
+ ]
+ from_command = [" from super", " from t1"]
+ advance_from_command = [
+ " from super", " from t1",
+ " from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"
+ ]
+ filter_command = [
+ "", " session(ts, 1s)", " state_window(int_col)", " interval (1s)",
+ " interval (1s) sliding (1s)", " group by (ts)"
+ ]
+ fill_command = [
+ "", " fill(prev)", " fill(next)", " fill(null)", " fill(1)",
+ " fill(linear)"
+ ]
+ tdSql.prepare()
+ tdSql.execute(
+ "create stable super (ts timestamp, timestamp_col timestamp, int_col int, bigint_col bigint, float_col float,\
+ double_col double, binary_col binary(8), smallint_col smallint, tinyint_col tinyint, bool_col bool, nchar_col nchar(8), \
+ uint_col int unsigned, ubigint_col bigint unsigned, usmallint_col smallint unsigned, utinyint_col tinyint unsigned) tags (int_tag int, bigint_tag bigint, \
+ float_tag float, double_tag double, binary_tag binary(8), smallint_tag smallint, tinyint_tag tinyint, bool_tag bool, nchar_tag nchar(8),\
+ uint_tag int unsigned, ubigint_tag bigint unsigned, usmallint_tag smallint unsigned, utinyint_tag tinyint unsigned)"
+ )
+ tdSql.execute(
+ "create stable superb (ts timestamp, timestamp_col timestamp, int_col int, bigint_col bigint, float_col float,\
+ double_col double, binary_col binary(8), smallint_col smallint, tinyint_col tinyint, bool_col bool, nchar_col nchar(8), \
+ uint_col int unsigned, ubigint_col bigint unsigned, usmallint_col smallint unsigned, utinyint_col tinyint unsigned) tags (int_tag int, bigint_tag bigint, \
+ float_tag float, double_tag double, binary_tag binary(8), smallint_tag smallint, tinyint_tag tinyint, bool_tag bool, nchar_tag nchar(8),\
+ uint_tag int unsigned, ubigint_tag bigint unsigned, usmallint_tag smallint unsigned, utinyint_tag tinyint unsigned)"
+ )
+ tdSql.execute(
+ "create table t1 using super tags (1, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomBigint(), self.randomDouble(), self.randomDouble(),
+ self.randomNchar(), self.randomSmallint(), self.randomTinyint(),
+ self.randomNchar(), self.randomUInt(), self.randomUBigint(),
+ self.randomUSmallint(), self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215891, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215892, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215893, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215894, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "create table t2 using superb tags (1, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomBigint(), self.randomDouble(), self.randomDouble(),
+ self.randomNchar(), self.randomSmallint(), self.randomTinyint(),
+ self.randomNchar(), self.randomUInt(), self.randomUBigint(),
+ self.randomUSmallint(), self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215891, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215892, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215893, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215894, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+
+ for s in range(len(select_command)):
+ for f in range(len(from_command)):
+ sql = "select " + select_command[s] + from_command[f]
+ if (select_command[s] == "floor(int_col)"\
+ or select_command[s] == "floor(bigint_col)"\
+ or select_command[s] == "floor(smallint_col)" \
+ or select_command[s] == "floor(float_col)"\
+ or select_command[s] == "floor(double_col)"\
+ or select_command[s] == "floor(tinyint_col)"\
+ or select_command[s] == "floor(uint_col)"\
+ or select_command[s] == "floor(ubigint_col)"\
+ or select_command[s] == "floor(usmallint_col)"\
+ or select_command[s] == "floor(utinyint_col)"\
+ or select_command[s] == "1, floor(int_col), 1"\
+ or select_command[s] == "1, floor(bigint_col), 1"\
+ or select_command[s] == "1, floor(float_col), 1"\
+ or select_command[s] == "1, floor(double_col), 1"\
+ or select_command[s] == "1, floor(smallint_col), 1"\
+ or select_command[s] == "1, floor(tinyint_col), 1"\
+ or select_command[s] == "1, floor(uint_col), 1"\
+ or select_command[s] == "1, floor(ubigint_col), 1"\
+ or select_command[s] == "1, floor(usmallint_col), 1"\
+ or select_command[s] == "1, floor(utinyint_col), 1"\
+ or select_command[s] == "int_col, floor(int_col), int_col"\
+ or select_command[s] == "bigint_col, floor(bigint_col), bigint_col"\
+ or select_command[s] == "float_col, floor(float_col), float_col"\
+ or select_command[s] == "double_col, floor(double_col), double_col"\
+ or select_command[s] == "smallint_col, floor(smallint_col), smallint_col"\
+ or select_command[s] == "tinyint_col, floor(tinyint_col), tinyint_col"\
+ or select_command[s] == "uint_col, floor(uint_col), uint_col"\
+ or select_command[s] == "ubigint_col, floor(ubigint_col), ubigint_col"\
+ or select_command[s] == "usmallint_col, floor(usmallint_col), usmallint_col"\
+ or select_command[s] == "utinyint_col, floor(utinyint_col), utinyint_col"\
+ or select_command[s] == "floor(int_col) as anyName"\
+ or select_command[s] == "floor(bigint_col) as anyName"\
+ or select_command[s] == "floor(float_col) as anyName"\
+ or select_command[s] == "floor(double_col) as anyName"\
+ or select_command[s] == "floor(smallint_col) as anyName"\
+ or select_command[s] == "floor(tinyint_col) as anyName"\
+ or select_command[s] == "floor(uint_col) as anyName"\
+ or select_command[s] == "floor(ubigint_col) as anyName"\
+ or select_command[s] == "floor(usmallint_col) as anyName"\
+ or select_command[s] == "floor(utinyint_col) as anyName"\
+ or select_command[s] == "floor(int_col) + floor(int_col)"\
+ or select_command[s] == "floor(bigint_col) + floor(bigint_col)"\
+ or select_command[s] == "floor(float_col) + floor(float_col)"\
+ or select_command[s] == "floor(double_col) + floor(double_col)"\
+ or select_command[s] == "floor(smallint_col) + floor(smallint_col)"\
+ or select_command[s] == "floor(tinyint_col) + floor(tinyint_col)"\
+ or select_command[s] == "floor(uint_col) + floor(uint_col)"\
+ or select_command[s] == "floor(ubigint_col) + floor(ubigint_col)"\
+ or select_command[s] == "floor(usmallint_col) + floor(usmallint_col)"\
+ or select_command[s] == "floor(utinyint_col) + floor(utinyint_col)"\
+ or select_command[s] == "floor(int_col) + floor(int_col)"\
+ or select_command[s] == "floor(bigint_col) + floor(bigint_col)"\
+ or select_command[s] == "floor(float_col) + floor(float_col)"\
+ or select_command[s] == "floor(double_col) + floor(double_col)"\
+ or select_command[s] == "floor(smallint_col) + floor(smallint_col)"\
+ or select_command[s] == "floor(tinyint_col) + floor(tinyint_col)"\
+ or select_command[s] == "floor(uint_col) + floor(uint_col)"\
+ or select_command[s] == "floor(ubigint_col) + floor(ubigint_col)"\
+ or select_command[s] == "floor(usmallint_col) + floor(usmallint_col)"\
+ or select_command[s] == "floor(utinyint_col) + cei(utinyint_col)"\
+ or select_command[s] == "floor(int_col) - floor(int_col)"\
+ or select_command[s] == "floor(bigint_col) - floor(bigint_col)"\
+ or select_command[s] == "floor(float_col) - floor(float_col)"\
+ or select_command[s] == "floor(double_col) - floor(double_col)"\
+ or select_command[s] == "floor(smallint_col) - floor(smallint_col)"\
+ or select_command[s] == "floor(tinyint_col) - floor(tinyint_col)"\
+ or select_command[s] == "floor(uint_col) - floor(uint_col)"\
+ or select_command[s] == "floor(ubigint_col) - floor(ubigint_col)"\
+ or select_command[s] == "floor(usmallint_col) - floor(usmallint_col)"\
+ or select_command[s] == "floor(utinyint_col) - floor(utinyint_col)"\
+ or select_command[s] == "floor(int_col) * floor(int_col)"\
+ or select_command[s] == "floor(bigint_col) * floor(bigint_col)"\
+ or select_command[s] == "floor(float_col) * floor(float_col)"\
+ or select_command[s] == "floor(double_col) * floor(double_col)"\
+ or select_command[s] == "floor(smallint_col) * floor(smallint_col)"\
+ or select_command[s] == "floor(tinyint_col) * floor(tinyint_col)"\
+ or select_command[s] == "floor(uint_col) * floor(uint_col)"\
+ or select_command[s] == "floor(ubigint_col) * floor(ubigint_col)"\
+ or select_command[s] == "floor(usmallint_col) * floor(usmallint_col)"\
+ or select_command[s] == "floor(utinyint_col) * floor(utinyint_col)"\
+ or select_command[s] == "floor(int_col) / floor(int_col)"\
+ or select_command[s] == "floor(bigint_col) / floor(bigint_col)"\
+ or select_command[s] == "floor(float_col) / floor(float_col)"\
+ or select_command[s] == "floor(double_col) / floor(double_col)"\
+ or select_command[s] == "floor(smallint_col) / floor(smallint_col)"\
+ or select_command[s] == "floor(tinyint_col) / floor(tinyint_col)"\
+ or select_command[s] == "floor(uint_col) / floor(uint_col)"\
+ or select_command[s] == "floor(ubigint_col) / floor(ubigint_col)"\
+ or select_command[s] == "floor(usmallint_col) / floor(usmallint_col)"\
+ or select_command[s] == "floor(utinyint_col) / floor(utinyint_col)"):
+ tdSql.query(sql)
+ else:
+ tdSql.error(sql)
+ for sim in range(len(simple_select_command)):
+ for fr in range(len(advance_from_command)):
+ for filter in range(len(filter_command)):
+ for fill in range(len(fill_command)):
+ sql = "select " + simple_select_command[
+ sim] + advance_from_command[fr] + filter_command[
+ filter] + fill_command[fill]
+ if sql == "select floor(t1.int_col) from t1"\
+ or sql == "select floor(super.int_col) from super"\
+ or sql == "select floor(t1.bigint_col) from t1"\
+ or sql == "select floor(super.bigint_col) from super"\
+ or sql == "select floor(t1.smallint_col) from t1"\
+ or sql == "select floor(super.smallint_col) from super"\
+ or sql == "select floor(t1.tinyint_col) from t1"\
+ or sql == "select floor(super.tinyint_col) from super"\
+ or sql == "select floor(t1.float_col) from t1"\
+ or sql == "select floor(super.float_col) from super"\
+ or sql == "select floor(t1.double_col) from t1"\
+ or sql == "select floor(super.double_col) from super"\
+ or sql == "select floor(t1.uint_col) from t1"\
+ or sql == "select floor(super.uint_col) from super"\
+ or sql == "select floor(t1.ubigint_col) from t1"\
+ or sql == "select floor(super.ubigint_col) from super"\
+ or sql == "select floor(t1.usmallint_col) from t1"\
+ or sql == "select floor(super.usmallint_col) from super"\
+ or sql == "select floor(t1.utinyint_col) from t1"\
+ or sql == "select floor(super.utinyint_col) from super"\
+ or sql == "select floor(super.int_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select floor(super.bigint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select floor(super.smallint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select floor(super.tinyint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select floor(super.float_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select floor(super.double_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select floor(super.uint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select floor(super.ubigint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select floor(super.usmallint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select floor(super.utinyint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag":
+ tdSql.query(sql)
+ else:
+ tdSql.error(sql)
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_round.py b/tests/pytest/functions/function_round.py
new file mode 100644
index 0000000000000000000000000000000000000000..93cace49ad8d16c6491584ed530b3dff07ef6fe4
--- /dev/null
+++ b/tests/pytest/functions/function_round.py
@@ -0,0 +1,1518 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+import random
+
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor())
+
+ def randomInt(self):
+ return random.randint(-2147483647, 2147483647)
+
+ def randomUInt(self):
+ return random.randint(0, 4294967294)
+
+ def randomBigint(self):
+ return random.randint(-2**63 + 1, 2**63 - 1)
+
+ def randomUBigint(self):
+ return random.randint(0, 18446744073709551614)
+
+ def randomDouble(self):
+ return random.random()
+
+ def randomNchar(self):
+ return random.choice('abcdefghijklmnopqrstuvwxyz')
+
+ def randomSmallint(self):
+ return random.randint(-32767, 32767)
+
+ def randomUSmallint(self):
+ return random.randint(0, 65534)
+
+ def randomTinyint(self):
+ return random.randint(-127, 127)
+
+ def randomUTinyint(self):
+ return random.randint(0, 254)
+
+ def run(self):
+ select_command = [
+ "round(ts)",
+ "round(timestamp_col)",
+ "round(int_col)",
+ "round(bigint_col)",
+ "round(float_col)",
+ "round(double_col)",
+ "round(binary_col)",
+ "round(smallint_col)",
+ "round(tinyint_col)",
+ "round(bool_col)",
+ "round(nchar_col)",
+ "round(uint_col)",
+ "round(ubigint_col)",
+ "round(usmallint_col)",
+ "round(utinyint_col)",
+ "round(timestamp_tag)",
+ "round(int_tag)",
+ "round(bigint_tag)",
+ "round(float_tag)",
+ "round(double_tag)",
+ "round(binary_tag)",
+ "round(smallint_tag)",
+ "round(tinyint_tag)",
+ "round(bool_tag)",
+ "round(nchar_tag)",
+ "round(uint_tag)",
+ "round(ubigint_tag)",
+ "round(usmallint_tag)",
+ "round(utinyint_tag)",
+ "count(round(int_col))",
+ "count(round(bigint_col))",
+ "count(round(float_col))",
+ "count(round(double_col))",
+ "count(round(smallint_col))",
+ "count(round(tinyint_col))",
+ "count(round(uint_col))",
+ "count(round(ubigint_col))",
+ "count(round(usmallint_col))",
+ "count(round(utinyint_col))",
+ "avg(round(int_col))",
+ "avg(round(bigint_col))",
+ "avg(round(float_col))",
+ "avg(round(double_col))",
+ "avg(round(smallint_col))",
+ "avg(round(tinyint_col))",
+ "avg(round(uint_col))",
+ "avg(round(ubigint_col))",
+ "avg(round(usmallint_col))",
+ "avg(round(utinyint_col))",
+ "twa(round(int_col))",
+ "twa(round(bigint_col))",
+ "twa(round(float_col))",
+ "twa(round(double_col))",
+ "twa(round(smallint_col))",
+ "twa(round(tinyint_col))",
+ "twa(round(uint_col))",
+ "twa(round(ubigint_col))",
+ "twa(round(usmallint_col))",
+ "twa(round(utinyint_col))",
+ "sum(round(int_col))",
+ "sum(round(bigint_col))",
+ "sum(round(float_col))",
+ "sum(round(double_col))",
+ "sum(round(smallint_col))",
+ "sum(round(tinyint_col))",
+ "sum(round(uint_col))",
+ "sum(round(ubigint_col))",
+ "sum(round(usmallint_col))",
+ "sum(round(utinyint_col))",
+ "stddev(round(int_col))",
+ "stddev(round(bigint_col))",
+ "stddev(round(float_col))",
+ "stddev(round(double_col))",
+ "stddev(round(smallint_col))",
+ "stddev(round(tinyint_col))",
+ "stddev(round(uint_col))",
+ "stddev(round(ubigint_col))",
+ "stddev(round(usmallint_col))",
+ "stddev(round(utinyint_col))",
+ "irate(round(int_col))",
+ "irate(round(bigint_col))",
+ "irate(round(float_col))",
+ "irate(round(double_col))",
+ "irate(round(smallint_col))",
+ "irate(round(tinyint_col))",
+ "irate(round(uint_col))",
+ "irate(round(ubigint_col))",
+ "irate(round(usmallint_col))",
+ "irate(round(utinyint_col))",
+ "leastsquares(round(int_col), 1, 1)",
+ "leastsquares(round(bigint_col), 1, 1)",
+ "leastsquares(round(float_col), 1, 1)",
+ "leastsquares(round(double_col), 1, 1)",
+ "leastsquares(round(smallint_col), 1, 1)",
+ "leastsquares(round(tinyint_col), 1, 1)",
+ "leastsquares(round(uint_col), 1, 1)",
+ "leastsquares(round(ubigint_col), 1, 1)",
+ "leastsquares(round(usmallint_col), 1, 1)",
+ "leastsquares(round(utinyint_col), 1, 1)",
+ "min(round(int_col))",
+ "min(round(bigint_col))",
+ "min(round(float_col))",
+ "min(round(double_col))",
+ "min(round(smallint_col))",
+ "min(round(tinyint_col))",
+ "min(round(uint_col))",
+ "min(round(ubigint_col))",
+ "min(round(usmallint_col))",
+ "min(round(utinyint_col))",
+ "max(round(int_col))",
+ "max(round(bigint_col))",
+ "max(round(float_col))",
+ "max(round(double_col))",
+ "max(round(smallint_col))",
+ "max(round(tinyint_col))",
+ "max(round(uint_col))",
+ "max(round(ubigint_col))",
+ "max(round(usmallint_col))",
+ "max(round(utinyint_col))",
+ "first(round(int_col))",
+ "first(round(bigint_col))",
+ "first(round(float_col))",
+ "first(round(double_col))",
+ "first(round(smallint_col))",
+ "first(round(tinyint_col))",
+ "first(round(uint_col))",
+ "first(round(ubigint_col))",
+ "first(round(usmallint_col))",
+ "first(round(utinyint_col))",
+ "last(round(int_col))",
+ "last(round(bigint_col))",
+ "last(round(float_col))",
+ "last(round(double_col))",
+ "last(round(smallint_col))",
+ "last(round(tinyint_col))",
+ "last(round(uint_col))",
+ "last(round(ubigint_col))",
+ "last(round(usmallint_col))",
+ "last(round(utinyint_col))",
+ "top(round(int_col), 1)",
+ "top(round(bigint_col), 1)",
+ "top(round(float_col), 1)",
+ "top(round(double_col), 1)",
+ "top(round(smallint_col), 1)",
+ "top(round(tinyint_col), 1)",
+ "top(round(uint_col), 1)",
+ "top(round(ubigint_col), 1)",
+ "top(round(usmallint_col), 1)",
+ "top(round(utinyint_col), 1)",
+ "bottom(round(int_col), 1)",
+ "bottom(round(bigint_col), 1)",
+ "bottom(round(float_col), 1)",
+ "bottom(round(double_col), 1)",
+ "bottom(round(smallint_col), 1)",
+ "bottom(round(tinyint_col), 1)",
+ "bottom(round(uint_col), 1)",
+ "bottom(round(ubigint_col), 1)",
+ "bottom(round(usmallint_col), 1)",
+ "bottom(round(utinyint_col), 1)",
+ "percentile(round(int_col), 20)",
+ "percentile(round(bigint_col), 20)",
+ "percentile(round(float_col), 20)",
+ "percentile(round(double_col), 20)",
+ "percentile(round(smallint_col), 20)",
+ "percentile(round(tinyint_col), 20)",
+ "percentile(round(uint_col), 20)",
+ "percentile(round(ubigint_col), 20)",
+ "percentile(round(usmallint_col), 20)",
+ "percentile(round(utinyint_col), 20)",
+ "apercentile(round(int_col), 20)",
+ "apercentile(round(bigint_col), 20)",
+ "apercentile(round(float_col), 20)",
+ "apercentile(round(double_col), 20)",
+ "apercentile(round(smallint_col), 20)",
+ "apercentile(round(tinyint_col), 20)",
+ "apercentile(round(uint_col), 20)",
+ "apercentile(round(ubigint_col), 20)",
+ "apercentile(round(usmallint_col), 20)",
+ "apercentile(round(utinyint_col), 20)",
+ "last_row(round(int_col))",
+ "last_row(round(bigint_col))",
+ "last_row(round(float_col))",
+ "last_row(round(double_col))",
+ "last_row(round(smallint_col))",
+ "last_row(round(tinyint_col))",
+ "last_row(round(uint_col))",
+ "last_row(round(ubigint_col))",
+ "last_row(round(usmallint_col))",
+ "last_row(round(utinyint_col))",
+ "interp(round(int_col))",
+ "interp(round(bigint_col))",
+ "interp(round(float_col))",
+ "interp(round(double_col))",
+ "interp(round(smallint_col))",
+ "interp(round(tinyint_col))",
+ "interp(round(uint_col))",
+ "interp(round(ubigint_col))",
+ "interp(round(usmallint_col))",
+ "interp(round(utinyint_col))",
+ "diff(round(int_col))",
+ "diff(round(bigint_col))",
+ "diff(round(float_col))",
+ "diff(round(double_col))",
+ "diff(round(smallint_col))",
+ "diff(round(tinyint_col))",
+ "diff(round(uint_col))",
+ "diff(round(ubigint_col))",
+ "diff(round(usmallint_col))",
+ "diff(round(utinyint_col))",
+ "spread(round(int_col))",
+ "spread(round(bigint_col))",
+ "spread(round(float_col))",
+ "spread(round(double_col))",
+ "spread(round(smallint_col))",
+ "spread(round(tinyint_col))",
+ "spread(round(uint_col))",
+ "spread(round(ubigint_col))",
+ "spread(round(usmallint_col))",
+ "spread(round(utinyint_col))",
+ "derivative(round(int_col), 1s, 0)",
+ "derivative(round(bigint_col), 1s, 0)",
+ "derivative(round(float_col), 1s, 0)",
+ "derivative(round(double_col), 1s, 0)",
+ "derivative(round(smallint_col), 1s, 0)",
+ "derivative(round(tinyint_col), 1s, 0)",
+ "derivative(round(uint_col), 1s, 0)",
+ "derivative(round(ubigint_col), 1s, 0)",
+ "derivative(round(usmallint_col), 1s, 0)",
+ "derivative(round(utinyint_col), 1s, 0)",
+ "round(int_col) - round(int_col)",
+ "round(bigint_col) - round(bigint_col)",
+ "round(float_col) - round(float_col)",
+ "round(double_col) - round(double_col)",
+ "round(smallint_col) - round(smallint_col)",
+ "round(tinyint_col) - round(tinyint_col)",
+ "round(uint_col) - round(uint_col)",
+ "round(ubigint_col) - round(ubigint_col)",
+ "round(usmallint_col) - round(usmallint_col)",
+ "round(utinyint_col) - round(utinyint_col)",
+ "round(int_col) / round(int_col)",
+ "round(bigint_col) / round(bigint_col)",
+ "round(float_col) / round(float_col)",
+ "round(double_col) / round(double_col)",
+ "round(smallint_col) / round(smallint_col)",
+ "round(tinyint_col) / round(tinyint_col)",
+ "round(uint_col) / round(uint_col)",
+ "round(ubigint_col) / round(ubigint_col)",
+ "round(usmallint_col) / round(usmallint_col)",
+ "round(utinyint_col) / round(utinyint_col)",
+ "round(int_col) * round(int_col)",
+ "round(bigint_col) * round(bigint_col)",
+ "round(float_col) * round(float_col)",
+ "round(double_col) * round(double_col)",
+ "round(smallint_col) * round(smallint_col)",
+ "round(tinyint_col) * round(tinyint_col)",
+ "round(uint_col) * round(uint_col)",
+ "round(ubigint_col) * round(ubigint_col)",
+ "round(usmallint_col) * round(usmallint_col)",
+ "round(utinyint_col) * round(utinyint_col)",
+ "round(count(ts))",
+ "round(count(timestamp_col))",
+ "round(count(int_col))",
+ "round(count(bigint_col))",
+ "round(count(float_col))",
+ "round(count(double_col))",
+ "round(count(binary_col))",
+ "round(count(smallint_col))",
+ "round(count(tinyint_col))",
+ "round(count(bool_col))",
+ "round(count(nchar_col))",
+ "round(count(uint_col))",
+ "round(count(ubigint_col))",
+ "round(count(usmallint_col))",
+ "round(count(utinyint_col))",
+ "round(count(timestamp_tag))",
+ "round(count(int_tag))",
+ "round(count(bigint_tag))",
+ "round(count(float_tag))",
+ "round(count(double_tag))",
+ "round(count(binary_tag))",
+ "round(count(smallint_tag))",
+ "round(count(tinyint_tag))",
+ "round(count(bool_tag))",
+ "round(count(nchar_tag))",
+ "round(count(uint_tag))",
+ "round(count(ubigint_tag))",
+ "round(count(usmallint_tag))",
+ "round(count(utinyint_tag))",
+ "round(avg(ts))",
+ "round(avg(timestamp_col))",
+ "round(avg(int_col))",
+ "round(avg(bigint_col))",
+ "round(avg(float_col))",
+ "round(avg(double_col))",
+ "round(avg(binary_col))",
+ "round(avg(smallint_col))",
+ "round(avg(tinyint_col))",
+ "round(avg(bool_col))",
+ "round(avg(nchar_col))",
+ "round(avg(uint_col))",
+ "round(avg(ubigint_col))",
+ "round(avg(usmallint_col))",
+ "round(avg(utinyint_col))",
+ "round(avg(timestamp_tag))",
+ "round(avg(int_tag))",
+ "round(avg(bigint_tag))",
+ "round(avg(float_tag))",
+ "round(avg(double_tag))",
+ "round(avg(binary_tag))",
+ "round(avg(smallint_tag))",
+ "round(avg(tinyint_tag))",
+ "round(avg(bool_tag))",
+ "round(avg(nchar_tag))",
+ "round(avg(uint_tag))",
+ "round(avg(ubigint_tag))",
+ "round(avg(usmallint_tag))",
+ "round(avg(utinyint_tag))",
+ "round(twa(ts))",
+ "round(twa(timestamp_col))",
+ "round(twa(int_col))",
+ "round(twa(bigint_col))",
+ "round(twa(float_col))",
+ "round(twa(double_col))",
+ "round(twa(binary_col))",
+ "round(twa(smallint_col))",
+ "round(twa(tinyint_col))",
+ "round(twa(bool_col))",
+ "round(twa(nchar_col))",
+ "round(twa(uint_col))",
+ "round(twa(ubigint_col))",
+ "round(twa(usmallint_col))",
+ "round(twa(utinyint_col))",
+ "round(twa(timestamp_tag))",
+ "round(twa(int_tag))",
+ "round(twa(bigint_tag))",
+ "round(twa(float_tag))",
+ "round(twa(double_tag))",
+ "round(twa(binary_tag))",
+ "round(twa(smallint_tag))",
+ "round(twa(tinyint_tag))",
+ "round(twa(bool_tag))",
+ "round(twa(nchar_tag))",
+ "round(twa(uint_tag))",
+ "round(twa(ubigint_tag))",
+ "round(twa(usmallint_tag))",
+ "round(twa(utinyint_tag))",
+ "round(sum(ts))",
+ "round(sum(timestamp_col))",
+ "round(sum(int_col))",
+ "round(sum(bigint_col))",
+ "round(sum(float_col))",
+ "round(sum(double_col))",
+ "round(sum(binary_col))",
+ "round(sum(smallint_col))",
+ "round(sum(tinyint_col))",
+ "round(sum(bool_col))",
+ "round(sum(nchar_col))",
+ "round(sum(uint_col))",
+ "round(sum(ubigint_col))",
+ "round(sum(usmallint_col))",
+ "round(sum(utinyint_col))",
+ "round(sum(timestamp_tag))",
+ "round(sum(int_tag))",
+ "round(sum(bigint_tag))",
+ "round(sum(float_tag))",
+ "round(sum(double_tag))",
+ "round(sum(binary_tag))",
+ "round(sum(smallint_tag))",
+ "round(sum(tinyint_tag))",
+ "round(sum(bool_tag))",
+ "round(sum(nchar_tag))",
+ "round(sum(uint_tag))",
+ "round(sum(ubigint_tag))",
+ "round(sum(usmallint_tag))",
+ "round(sum(utinyint_tag))",
+ "round(stddev(ts))",
+ "round(stddev(timestamp_col))",
+ "round(stddev(int_col))",
+ "round(stddev(bigint_col))",
+ "round(stddev(float_col))",
+ "round(stddev(double_col))",
+ "round(stddev(binary_col))",
+ "round(stddev(smallint_col))",
+ "round(stddev(tinyint_col))",
+ "round(stddev(bool_col))",
+ "round(stddev(nchar_col))",
+ "round(stddev(uint_col))",
+ "round(stddev(ubigint_col))",
+ "round(stddev(usmallint_col))",
+ "round(stddev(utinyint_col))",
+ "round(stddev(timestamp_tag))",
+ "round(stddev(int_tag))",
+ "round(stddev(bigint_tag))",
+ "round(stddev(float_tag))",
+ "round(stddev(double_tag))",
+ "round(stddev(binary_tag))",
+ "round(stddev(smallint_tag))",
+ "round(stddev(tinyint_tag))",
+ "round(stddev(bool_tag))",
+ "round(stddev(nchar_tag))",
+ "round(stddev(uint_tag))",
+ "round(stddev(ubigint_tag))",
+ "round(stddev(usmallint_tag))",
+ "round(stddev(utinyint_tag))",
+ "round(leastsquares(ts, 1, 1))",
+ "round(leastsquares(timestamp_col, 1, 1))",
+ "round(leastsquares(int_col, 1, 1))",
+ "round(leastsquares(bigint_col, 1, 1))",
+ "round(leastsquares(float_col, 1, 1))",
+ "round(leastsquares(double_col, 1, 1))",
+ "round(leastsquares(binary_col, 1, 1))",
+ "round(leastsquares(smallint_col, 1, 1))",
+ "round(leastsquares(tinyint_col, 1, 1))",
+ "round(leastsquares(bool_col, 1, 1))",
+ "round(leastsquares(nchar_col, 1, 1))",
+ "round(leastsquares(uint_col, 1, 1))",
+ "round(leastsquares(ubigint_col, 1, 1))",
+ "round(leastsquares(usmallint_col, 1, 1))",
+ "round(leastsquares(utinyint_col, 1, 1))",
+ "round(leastsquares(timestamp_tag, 1, 1))",
+ "round(leastsquares(int_tag, 1, 1))",
+ "round(leastsquares(bigint_tag, 1, 1))",
+ "round(leastsquares(float_tag, 1, 1))",
+ "round(leastsquares(double_tag, 1, 1))",
+ "round(leastsquares(binary_tag, 1, 1))",
+ "round(leastsquares(smallint_tag, 1, 1))",
+ "round(leastsquares(tinyint_tag, 1, 1))",
+ "round(leastsquares(bool_tag, 1, 1))",
+ "round(leastsquares(nchar_tag, 1, 1))",
+ "round(leastsquares(uint_tag, 1, 1))",
+ "round(leastsquares(ubigint_tag, 1, 1))",
+ "round(leastsquares(usmallint_tag, 1, 1))",
+ "round(leastsquares(utinyint_tag, 1, 1))",
+ "round(irate(ts))",
+ "round(irate(timestamp_col))",
+ "round(irate(int_col))",
+ "round(irate(bigint_col))",
+ "round(irate(float_col))",
+ "round(irate(double_col))",
+ "round(irate(binary_col))",
+ "round(irate(smallint_col))",
+ "round(irate(tinyint_col))",
+ "round(irate(bool_col))",
+ "round(irate(nchar_col))",
+ "round(irate(uint_col))",
+ "round(irate(ubigint_col))",
+ "round(irate(usmallint_col))",
+ "round(irate(utinyint_col))",
+ "round(irate(timestamp_tag))",
+ "round(irate(int_tag))",
+ "round(irate(bigint_tag))",
+ "round(irate(float_tag))",
+ "round(irate(double_tag))",
+ "round(irate(binary_tag))",
+ "round(irate(smallint_tag))",
+ "round(irate(tinyint_tag))",
+ "round(irate(bool_tag))",
+ "round(irate(nchar_tag))",
+ "round(irate(uint_tag))",
+ "round(irate(ubigint_tag))",
+ "round(irate(usmallint_tag))",
+ "round(irate(utinyint_tag))",
+ "round(min(ts))",
+ "round(min(timestamp_col))",
+ "round(min(int_col))",
+ "round(min(bigint_col))",
+ "round(min(float_col))",
+ "round(min(double_col))",
+ "round(min(binary_col))",
+ "round(min(smallint_col))",
+ "round(min(tinyint_col))",
+ "round(min(bool_col))",
+ "round(min(nchar_col))",
+ "round(min(uint_col))",
+ "round(min(ubigint_col))",
+ "round(min(usmallint_col))",
+ "round(min(utinyint_col))",
+ "round(min(timestamp_tag))",
+ "round(min(int_tag))",
+ "round(min(bigint_tag))",
+ "round(min(float_tag))",
+ "round(min(double_tag))",
+ "round(min(binary_tag))",
+ "round(min(smallint_tag))",
+ "round(min(tinyint_tag))",
+ "round(min(bool_tag))",
+ "round(min(nchar_tag))",
+ "round(min(uint_tag))",
+ "round(min(ubigint_tag))",
+ "round(min(usmallint_tag))",
+ "round(min(utinyint_tag))",
+ "round(max(ts))",
+ "round(max(timestamp_col))",
+ "round(max(int_col))",
+ "round(max(bigint_col))",
+ "round(max(float_col))",
+ "round(max(double_col))",
+ "round(max(binary_col))",
+ "round(max(smallint_col))",
+ "round(max(tinyint_col))",
+ "round(max(bool_col))",
+ "round(max(nchar_col))",
+ "round(max(uint_col))",
+ "round(max(ubigint_col))",
+ "round(max(usmallint_col))",
+ "round(max(utinyint_col))",
+ "round(max(timestamp_tag))",
+ "round(max(int_tag))",
+ "round(max(bigint_tag))",
+ "round(max(float_tag))",
+ "round(max(double_tag))",
+ "round(max(binary_tag))",
+ "round(max(smallint_tag))",
+ "round(max(tinyint_tag))",
+ "round(max(bool_tag))",
+ "round(max(nchar_tag))",
+ "round(max(uint_tag))",
+ "round(max(ubigint_tag))",
+ "round(max(usmallint_tag))",
+ "round(max(utinyint_tag))",
+ "round(first(ts))",
+ "round(first(timestamp_col))",
+ "round(first(int_col))",
+ "round(first(bigint_col))",
+ "round(first(float_col))",
+ "round(first(double_col))",
+ "round(first(binary_col))",
+ "round(first(smallint_col))",
+ "round(first(tinyint_col))",
+ "round(first(bool_col))",
+ "round(first(nchar_col))",
+ "round(first(uint_col))",
+ "round(first(ubigint_col))",
+ "round(first(usmallint_col))",
+ "round(first(utinyint_col))",
+ "round(first(timestamp_tag))",
+ "round(first(int_tag))",
+ "round(first(bigint_tag))",
+ "round(first(float_tag))",
+ "round(first(double_tag))",
+ "round(first(binary_tag))",
+ "round(first(smallint_tag))",
+ "round(first(tinyint_tag))",
+ "round(first(bool_tag))",
+ "round(first(nchar_tag))",
+ "round(first(uint_tag))",
+ "round(first(ubigint_tag))",
+ "round(first(usmallint_tag))",
+ "round(first(utinyint_tag))",
+ "round(last(ts))",
+ "round(last(timestamp_col))",
+ "round(last(int_col))",
+ "round(last(bigint_col))",
+ "round(last(float_col))",
+ "round(last(double_col))",
+ "round(last(binary_col))",
+ "round(last(smallint_col))",
+ "round(last(tinyint_col))",
+ "round(last(bool_col))",
+ "round(last(nchar_col))",
+ "round(last(uint_col))",
+ "round(last(ubigint_col))",
+ "round(last(usmallint_col))",
+ "round(last(utinyint_col))",
+ "round(last(timestamp_tag))",
+ "round(last(int_tag))",
+ "round(last(bigint_tag))",
+ "round(last(float_tag))",
+ "round(last(double_tag))",
+ "round(last(binary_tag))",
+ "round(last(smallint_tag))",
+ "round(last(tinyint_tag))",
+ "round(last(bool_tag))",
+ "round(last(nchar_tag))",
+ "round(last(uint_tag))",
+ "round(last(ubigint_tag))",
+ "round(last(usmallint_tag))",
+ "round(last(utinyint_tag))",
+ "round(top(ts, 1))",
+ "round(top(timestamp_col, 1))",
+ "round(top(int_col, 1))",
+ "round(top(bigint_col, 1))",
+ "round(top(float_col, 1))",
+ "round(top(double_col, 1))",
+ "round(top(binary_col, 1))",
+ "round(top(smallint_col, 1))",
+ "round(top(tinyint_col, 1))",
+ "round(top(bool_col, 1))",
+ "round(top(nchar_col, 1))",
+ "round(top(uint_col, 1))",
+ "round(top(ubigint_col, 1))",
+ "round(top(usmallint_col, 1))",
+ "round(top(utinyint_col, 1))",
+ "round(top(timestamp_tag, 1))",
+ "round(top(int_tag, 1))",
+ "round(top(bigint_tag, 1))",
+ "round(top(float_tag, 1))",
+ "round(top(double_tag, 1))",
+ "round(top(binary_tag, 1))",
+ "round(top(smallint_tag, 1))",
+ "round(top(tinyint_tag, 1))",
+ "round(top(bool_tag, 1))",
+ "round(top(nchar_tag, 1))",
+ "round(top(uint_tag, 1))",
+ "round(top(ubigint_tag, 1))",
+ "round(top(usmallint_tag, 1))",
+ "round(top(utinyint_tag, 1))",
+ "round(bottom(ts, 1))",
+ "round(bottom(timestamp_col, 1))",
+ "round(bottom(int_col, 1))",
+ "round(bottom(bigint_col, 1))",
+ "round(bottom(float_col, 1))",
+ "round(bottom(double_col, 1))",
+ "round(bottom(binary_col, 1))",
+ "round(bottom(smallint_col, 1))",
+ "round(bottom(tinyint_col, 1))",
+ "round(bottom(bool_col, 1))",
+ "round(bottom(nchar_col, 1))",
+ "round(bottom(uint_col, 1))",
+ "round(bottom(ubigint_col, 1))",
+ "round(bottom(usmallint_col, 1))",
+ "round(bottom(utinyint_col, 1))",
+ "round(bottom(timestamp_tag, 1))",
+ "round(bottom(int_tag, 1))",
+ "round(bottom(bigint_tag, 1))",
+ "round(bottom(float_tag, 1))",
+ "round(bottom(double_tag, 1))",
+ "round(bottom(binary_tag, 1))",
+ "round(bottom(smallint_tag, 1))",
+ "round(bottom(tinyint_tag, 1))",
+ "round(bottom(bool_tag, 1))",
+ "round(bottom(nchar_tag, 1))",
+ "round(bottom(uint_tag, 1))",
+ "round(bottom(ubigint_tag, 1))",
+ "round(bottom(usmallint_tag, 1))",
+ "round(bottom(utinyint_tag, 1))",
+ "round(percentile(ts, 1))",
+ "round(percentile(timestamp_col, 1))",
+ "round(percentile(int_col, 1))",
+ "round(percentile(bigint_col, 1))",
+ "round(percentile(float_col, 1))",
+ "round(percentile(double_col, 1))",
+ "round(percentile(binary_col, 1))",
+ "round(percentile(smallint_col, 1))",
+ "round(percentile(tinyint_col, 1))",
+ "round(percentile(bool_col, 1))",
+ "round(percentile(nchar_col, 1))",
+ "round(percentile(uint_col, 1))",
+ "round(percentile(ubigint_col, 1))",
+ "round(percentile(usmallint_col, 1))",
+ "round(percentile(utinyint_col, 1))",
+ "round(percentile(timestamp_tag, 1))",
+ "round(percentile(int_tag, 1))",
+ "round(percentile(bigint_tag, 1))",
+ "round(percentile(float_tag, 1))",
+ "round(percentile(double_tag, 1))",
+ "round(percentile(binary_tag, 1))",
+ "round(percentile(smallint_tag, 1))",
+ "round(percentile(tinyint_tag, 1))",
+ "round(percentile(bool_tag, 1))",
+ "round(percentile(nchar_tag, 1))",
+ "round(percentile(uint_tag, 1))",
+ "round(percentile(ubigint_tag, 1))",
+ "round(percentile(usmallint_tag, 1))",
+ "round(percentile(utinyint_tag, 1))",
+ "round(apercentile(ts, 1))",
+ "round(apercentile(timestamp_col, 1))",
+ "round(apercentile(int_col, 1))",
+ "round(apercentile(bigint_col, 1))",
+ "round(apercentile(float_col, 1))",
+ "round(apercentile(double_col, 1))",
+ "round(apercentile(binary_col, 1))",
+ "round(apercentile(smallint_col, 1))",
+ "round(apercentile(tinyint_col, 1))",
+ "round(apercentile(bool_col, 1))",
+ "round(apercentile(nchar_col, 1))",
+ "round(apercentile(uint_col, 1))",
+ "round(apercentile(ubigint_col, 1))",
+ "round(apercentile(usmallint_col, 1))",
+ "round(apercentile(utinyint_col, 1))",
+ "round(apercentile(timestamp_tag, 1))",
+ "round(apercentile(int_tag, 1))",
+ "round(apercentile(bigint_tag, 1))",
+ "round(apercentile(float_tag, 1))",
+ "round(apercentile(double_tag, 1))",
+ "round(apercentile(binary_tag, 1))",
+ "round(apercentile(smallint_tag, 1))",
+ "round(apercentile(tinyint_tag, 1))",
+ "round(apercentile(bool_tag, 1))",
+ "round(apercentile(nchar_tag, 1))",
+ "round(apercentile(uint_tag, 1))",
+ "round(apercentile(ubigint_tag, 1))",
+ "round(apercentile(usmallint_tag, 1))",
+ "round(apercentile(utinyint_tag, 1))",
+ "round(last_row(ts))",
+ "round(last_row(timestamp_col))",
+ "round(last_row(int_col))",
+ "round(last_row(bigint_col))",
+ "round(last_row(float_col))",
+ "round(last_row(double_col))",
+ "round(last_row(binary_col))",
+ "round(last_row(smallint_col))",
+ "round(last_row(tinyint_col))",
+ "round(last_row(bool_col))",
+ "round(last_row(nchar_col))",
+ "round(last_row(uint_col))",
+ "round(last_row(ubigint_col))",
+ "round(last_row(usmallint_col))",
+ "round(last_row(utinyint_col))",
+ "round(last_row(timestamp_tag))",
+ "round(last_row(int_tag))",
+ "round(last_row(bigint_tag))",
+ "round(last_row(float_tag))",
+ "round(last_row(double_tag))",
+ "round(last_row(binary_tag))",
+ "round(last_row(smallint_tag))",
+ "round(last_row(tinyint_tag))",
+ "round(last_row(bool_tag))",
+ "round(last_row(nchar_tag))",
+ "round(last_row(uint_tag))",
+ "round(last_row(ubigint_tag))",
+ "round(last_row(usmallint_tag))",
+ "round(last_row(utinyint_tag))",
+ "round(interp(ts))",
+ "round(interp(timestamp_col))",
+ "round(interp(int_col))",
+ "round(interp(bigint_col))",
+ "round(interp(float_col))",
+ "round(interp(double_col))",
+ "round(interp(binary_col))",
+ "round(interp(smallint_col))",
+ "round(interp(tinyint_col))",
+ "round(interp(bool_col))",
+ "round(interp(nchar_col))",
+ "round(interp(uint_col))",
+ "round(interp(ubigint_col))",
+ "round(interp(usmallint_col))",
+ "round(interp(utinyint_col))",
+ "round(interp(timestamp_tag))",
+ "round(interp(int_tag))",
+ "round(interp(bigint_tag))",
+ "round(interp(float_tag))",
+ "round(interp(double_tag))",
+ "round(interp(binary_tag))",
+ "round(interp(smallint_tag))",
+ "round(interp(tinyint_tag))",
+ "round(interp(bool_tag))",
+ "round(interp(nchar_tag))",
+ "round(interp(uint_tag))",
+ "round(interp(ubigint_tag))",
+ "round(interp(usmallint_tag))",
+ "round(interp(utinyint_tag))",
+ "round(diff(ts))",
+ "round(diff(timestamp_col))",
+ "round(diff(int_col))",
+ "round(diff(bigint_col))",
+ "round(diff(float_col))",
+ "round(diff(double_col))",
+ "round(diff(binary_col))",
+ "round(diff(smallint_col))",
+ "round(diff(tinyint_col))",
+ "round(diff(bool_col))",
+ "round(diff(nchar_col))",
+ "round(diff(uint_col))",
+ "round(diff(ubigint_col))",
+ "round(diff(usmallint_col))",
+ "round(diff(utinyint_col))",
+ "round(diff(timestamp_tag))",
+ "round(diff(int_tag))",
+ "round(diff(bigint_tag))",
+ "round(diff(float_tag))",
+ "round(diff(double_tag))",
+ "round(diff(binary_tag))",
+ "round(diff(smallint_tag))",
+ "round(diff(tinyint_tag))",
+ "round(diff(bool_tag))",
+ "round(diff(nchar_tag))",
+ "round(diff(uint_tag))",
+ "round(diff(ubigint_tag))",
+ "round(diff(usmallint_tag))",
+ "round(diff(utinyint_tag))",
+ "round(spread(ts))",
+ "round(spread(timestamp_col))",
+ "round(spread(int_col))",
+ "round(spread(bigint_col))",
+ "round(spread(float_col))",
+ "round(spread(double_col))",
+ "round(spread(binary_col))",
+ "round(spread(smallint_col))",
+ "round(spread(tinyint_col))",
+ "round(spread(bool_col))",
+ "round(spread(nchar_col))",
+ "round(spread(uint_col))",
+ "round(spread(ubigint_col))",
+ "round(spread(usmallint_col))",
+ "round(spread(utinyint_col))",
+ "round(spread(timestamp_tag))",
+ "round(spread(int_tag))",
+ "round(spread(bigint_tag))",
+ "round(spread(float_tag))",
+ "round(spread(double_tag))",
+ "round(spread(binary_tag))",
+ "round(spread(smallint_tag))",
+ "round(spread(tinyint_tag))",
+ "round(spread(bool_tag))",
+ "round(spread(nchar_tag))",
+ "round(spread(uint_tag))",
+ "round(spread(ubigint_tag))",
+ "round(spread(usmallint_tag))",
+ "round(spread(utinyint_tag))",
+ "round(derivative(ts, 1s, 0))",
+ "round(derivative(timestamp_col, 1s, 0))",
+ "round(derivative(int_col, 1s, 0))",
+ "round(derivative(bigint_col, 1s, 0))",
+ "round(derivative(float_col, 1s, 0))",
+ "round(derivative(double_col, 1s, 0))",
+ "round(derivative(binary_col, 1s, 0))",
+ "round(derivative(smallint_col, 1s, 0))",
+ "round(derivative(tinyint_col, 1s, 0))",
+ "round(derivative(bool_col, 1s, 0))",
+ "round(derivative(nchar_col, 1s, 0))",
+ "round(derivative(uint_col, 1s, 0))",
+ "round(derivative(ubigint_col, 1s, 0))",
+ "round(derivative(usmallint_col, 1s, 0))",
+ "round(derivative(utinyint_col, 1s, 0))",
+ "round(derivative(timestamp_tag, 1s, 0))",
+ "round(derivative(int_tag, 1s, 0))",
+ "round(derivative(bigint_tag, 1s, 0))",
+ "round(derivative(float_tag, 1s, 0))",
+ "round(derivative(double_tag, 1s, 0))",
+ "round(derivative(binary_tag, 1s, 0))",
+ "round(derivative(smallint_tag, 1s, 0))",
+ "round(derivative(tinyint_tag, 1s, 0))",
+ "round(derivative(bool_tag, 1s, 0))",
+ "round(derivative(nchar_tag, 1s, 0))",
+ "round(derivative(uint_tag, 1s, 0))",
+ "round(derivative(ubigint_tag, 1s, 0))",
+ "round(derivative(usmallint_tag, 1s, 0))",
+ "round(derivative(utinyint_tag, 1s, 0))",
+ "round(ts + ts)",
+ "round(timestamp_col + timestamp_col)",
+ "round(int_col + int_col)",
+ "round(bigint_col + bigint_col)",
+ "round(float_col + float_col)",
+ "round(double_col + double_col)",
+ "round(binary_col + binary_col)",
+ "round(smallint_col + smallint_col)",
+ "round(tinyint_col + tinyint_col)",
+ "round(bool_col + bool_col)",
+ "round(nchar_col + nchar_col)",
+ "round(uint_col + uint_col)",
+ "round(ubigint_col + ubigint_col)",
+ "round(usmallint_col + usmallint_col)",
+ "round(utinyint_col + utinyint_col)",
+ "round(timestamp_tag + timestamp_tag)",
+ "round(int_tag + int_tag)",
+ "round(bigint_tag + bigint_tag)",
+ "round(float_tag + float_tag)",
+ "round(double_tag + double_tag)",
+ "round(binary_tag + binary_tag)",
+ "round(smallint_tag + smallint_tag)",
+ "round(tinyint_tag + tinyint_tag)",
+ "round(bool_tag + bool_tag)",
+ "round(nchar_tag + nchar_tag)",
+ "round(uint_tag + uint_tag)",
+ "round(ubigint_tag + ubigint_tag)",
+ "round(usmallint_tag + usmallint_tag)",
+ "round(utinyint_tag + utinyint_tag)",
+ "round(ts - ts)",
+ "round(timestamp_col - timestamp_col)",
+ "round(int_col - int_col)",
+ "round(bigint_col - bigint_col)",
+ "round(float_col - float_col)",
+ "round(double_col - double_col)",
+ "round(binary_col - binary_col)",
+ "round(smallint_col - smallint_col)",
+ "round(tinyint_col - tinyint_col)",
+ "round(bool_col - bool_col)",
+ "round(nchar_col - nchar_col)",
+ "round(uint_col - uint_col)",
+ "round(ubigint_col - ubigint_col)",
+ "round(usmallint_col - usmallint_col)",
+ "round(utinyint_col - utinyint_col)",
+ "round(timestamp_tag - timestamp_tag)",
+ "round(int_tag - int_tag)",
+ "round(bigint_tag - bigint_tag)",
+ "round(float_tag - float_tag)",
+ "round(double_tag - double_tag)",
+ "round(binary_tag - binary_tag)",
+ "round(smallint_tag - smallint_tag)",
+ "round(tinyint_tag - tinyint_tag)",
+ "round(bool_tag - bool_tag)",
+ "round(nchar_tag - nchar_tag)",
+ "round(uint_tag - uint_tag)",
+ "round(ubigint_tag - ubigint_tag)",
+ "round(usmallint_tag - usmallint_tag)",
+ "round(utinyint_tag - utinyint_tag)",
+ "round(ts * ts)",
+ "round(timestamp_col * timestamp_col)",
+ "round(int_col * int_col)",
+ "round(bigint_col * bigint_col)",
+ "round(float_col * float_col)",
+ "round(double_col * double_col)",
+ "round(binary_col * binary_col)",
+ "round(smallint_col * smallint_col)",
+ "round(tinyint_col * tinyint_col)",
+ "round(bool_col * bool_col)",
+ "round(nchar_col * nchar_col)",
+ "round(uint_col * uint_col)",
+ "round(ubigint_col * ubigint_col)",
+ "round(usmallint_col * usmallint_col)",
+ "round(utinyint_col * utinyint_col)",
+ "round(timestamp_tag * timestamp_tag)",
+ "round(int_tag * int_tag)",
+ "round(bigint_tag * bigint_tag)",
+ "round(float_tag * float_tag)",
+ "round(double_tag * double_tag)",
+ "round(binary_tag * binary_tag)",
+ "round(smallint_tag * smallint_tag)",
+ "round(tinyint_tag * tinyint_tag)",
+ "round(bool_tag * bool_tag)",
+ "round(nchar_tag * nchar_tag)",
+ "round(uint_tag * uint_tag)",
+ "round(ubigint_tag * ubigint_tag)",
+ "round(usmallint_tag * usmallint_tag)",
+ "round(utinyint_tag * utinyint_tag)",
+ "round(ts / ts)",
+ "round(timestamp_col / timestamp_col)",
+ "round(int_col / int_col)",
+ "round(bigint_col / bigint_col)",
+ "round(float_col / float_col)",
+ "round(double_col / double_col)",
+ "round(binary_col / binary_col)",
+ "round(smallint_col / smallint_col)",
+ "round(tinyint_col / tinyint_col)",
+ "round(bool_col / bool_col)",
+ "round(nchar_col / nchar_col)",
+ "round(uint_col / uint_col)",
+ "round(ubigint_col / ubigint_col)",
+ "round(usmallint_col / usmallint_col)",
+ "round(utinyint_col / utinyint_col)",
+ "round(timestamp_tag / timestamp_tag)",
+ "round(int_tag / int_tag)",
+ "round(bigint_tag / bigint_tag)",
+ "round(float_tag / float_tag)",
+ "round(double_tag / double_tag)",
+ "round(binary_tag / binary_tag)",
+ "round(smallint_tag / smallint_tag)",
+ "round(tinyint_tag / tinyint_tag)",
+ "round(bool_tag / bool_tag)",
+ "round(nchar_tag / nchar_tag)",
+ "round(uint_tag / uint_tag)",
+ "round(ubigint_tag / ubigint_tag)",
+ "round(usmallint_tag / usmallint_tag)",
+ "round(utinyint_tag / utinyint_tag)",
+ "int_col, round(int_col), int_col",
+ "bigint_col, round(bigint_col), bigint_col",
+ "float_col, round(float_col), float_col",
+ "double_col, round(double_col), double_col",
+ "smallint_col, round(smallint_col), smallint_col",
+ "tinyint_col, round(tinyint_col), tinyint_col",
+ "uint_col, round(uint_col), uint_col",
+ "ubigint_col, round(ubigint_col), ubigint_col",
+ "usmallint_col, round(usmallint_col), usmallint_col",
+ "utinyint_col, round(utinyint_col), utinyint_col",
+ "count(int_col), round(int_col), count(int_col)",
+ "count(bigint_col), round(bigint_col), count(bigint_col)",
+ "count(float_col), round(float_col), count(float_col)",
+ "count(double_col), round(double_col), count(double_col)",
+ "count(smallint_col), round(smallint_col), count(smallint_col)",
+ "count(tinyint_col), round(tinyint_col), count(tinyint_col)",
+ "count(uint_col), round(uint_col), count(uint_col)",
+ "count(ubigint_col), round(ubigint_col), count(ubigint_col)",
+ "count(usmallint_col), round(usmallint_col), count(usmallint_col)",
+ "count(utinyint_col), round(utinyint_col), count(utinyint_col)",
+ "avg(int_col), round(int_col), avg(int_col)",
+ "avg(bigint_col), round(bigint_col), avg(bigint_col)",
+ "avg(float_col), round(float_col), avg(float_col)",
+ "avg(double_col), round(double_col), avg(double_col)",
+ "avg(smallint_col), round(smallint_col), avg(smallint_col)",
+ "avg(tinyint_col), round(tinyint_col), avg(tinyint_col)",
+ "avg(uint_col), round(uint_col), avg(uint_col)",
+ "avg(ubigint_col), round(ubigint_col), avg(ubigint_col)",
+ "avg(usmallint_col), round(usmallint_col), avg(usmallint_col)",
+ "avg(utinyint_col), round(utinyint_col), avg(utinyint_col)",
+ "twa(int_col), round(int_col), twa(int_col)",
+ "twa(bigint_col), round(bigint_col), twa(bigint_col)",
+ "twa(float_col), round(float_col), twa(float_col)",
+ "twa(double_col), round(double_col), twa(double_col)",
+ "twa(smallint_col), round(smallint_col), twa(smallint_col)",
+ "twa(tinyint_col), round(tinyint_col), twa(tinyint_col)",
+ "twa(uint_col), round(uint_col), twa(uint_col)",
+ "twa(ubigint_col), round(ubigint_col), twa(ubigint_col)",
+ "twa(usmallint_col), round(usmallint_col), twa(usmallint_col)",
+ "twa(utinyint_col), round(utinyint_col), twa(utinyint_col)",
+ "sum(int_col), round(int_col), sum(int_col)",
+ "sum(bigint_col), round(bigint_col), sum(bigint_col)",
+ "sum(float_col), round(float_col), sum(float_col)",
+ "sum(double_col), round(double_col), sum(double_col)",
+ "sum(smallint_col), round(smallint_col), sum(smallint_col)",
+ "sum(tinyint_col), round(tinyint_col), sum(tinyint_col)",
+ "sum(uint_col), round(uint_col), sum(uint_col)",
+ "sum(ubigint_col), round(ubigint_col), sum(ubigint_col)",
+ "sum(usmallint_col), round(usmallint_col), sum(usmallint_col)",
+ "sum(utinyint_col), round(utinyint_col), sum(utinyint_col)",
+ "stddev(int_col), round(int_col), stddev(int_col)",
+ "stddev(bigint_col), round(bigint_col), stddev(bigint_col)",
+ "stddev(float_col), round(float_col), stddev(float_col)",
+ "stddev(double_col), round(double_col), stddev(double_col)",
+ "stddev(smallint_col), round(smallint_col), stddev(smallint_col)",
+ "stddev(tinyint_col), round(tinyint_col), stddev(tinyint_col)",
+ "stddev(uint_col), round(uint_col), stddev(uint_col)",
+ "stddev(ubigint_col), round(ubigint_col), stddev(ubigint_col)",
+ "stddev(usmallint_col), round(usmallint_col), stddev(usmallint_col)",
+ "stddev(utinyint_col), round(utinyint_col), stddev(utinyint_col)",
+ "irate(int_col), round(int_col), irate(int_col)",
+ "irate(bigint_col), round(bigint_col), irate(bigint_col)",
+ "irate(float_col), round(float_col), irate(float_col)",
+ "irate(double_col), round(double_col), irate(double_col)",
+ "irate(smallint_col), round(smallint_col), irate(smallint_col)",
+ "irate(tinyint_col), round(tinyint_col), irate(tinyint_col)",
+ "irate(uint_col), round(uint_col), irate(uint_col)",
+ "irate(ubigint_col), round(ubigint_col), irate(ubigint_col)",
+ "irate(usmallint_col), round(usmallint_col), irate(usmallint_col)",
+ "irate(utinyint_col), round(utinyint_col), irate(utinyint_col)",
+ "min(int_col), round(int_col), min(int_col)",
+ "min(bigint_col), round(bigint_col), min(bigint_col)",
+ "min(float_col), round(float_col), min(float_col)",
+ "min(double_col), round(double_col), min(double_col)",
+ "min(smallint_col), round(smallint_col), min(smallint_col)",
+ "min(tinyint_col), round(tinyint_col), min(tinyint_col)",
+ "min(uint_col), round(uint_col), min(uint_col)",
+ "min(ubigint_col), round(ubigint_col), min(ubigint_col)",
+ "min(usmallint_col), round(usmallint_col), min(usmallint_col)",
+ "min(utinyint_col), round(utinyint_col), min(utinyint_col)",
+ "max(int_col), round(int_col), max(int_col)",
+ "max(bigint_col), round(bigint_col), max(bigint_col)",
+ "max(float_col), round(float_col), max(float_col)",
+ "max(double_col), round(double_col), max(double_col)",
+ "max(smallint_col), round(smallint_col), max(smallint_col)",
+ "max(tinyint_col), round(tinyint_col), max(tinyint_col)",
+ "max(uint_col), round(uint_col), max(uint_col)",
+ "max(ubigint_col), round(ubigint_col), max(ubigint_col)",
+ "max(usmallint_col), round(usmallint_col), max(usmallint_col)",
+ "max(utinyint_col), round(utinyint_col), max(utinyint_col)",
+ "first(int_col), round(int_col), first(int_col)",
+ "first(bigint_col), round(bigint_col), first(bigint_col)",
+ "first(float_col), round(float_col), first(float_col)",
+ "first(double_col), round(double_col), first(double_col)",
+ "first(smallint_col), round(smallint_col), first(smallint_col)",
+ "first(tinyint_col), round(tinyint_col), first(tinyint_col)",
+ "first(uint_col), round(uint_col), first(uint_col)",
+ "first(ubigint_col), round(ubigint_col), first(ubigint_col)",
+ "first(usmallint_col), round(usmallint_col), first(usmallint_col)",
+ "first(utinyint_col), round(utinyint_col), first(utinyint_col)",
+ "last(int_col), round(int_col), last(int_col)",
+ "last(bigint_col), round(bigint_col), last(bigint_col)",
+ "last(float_col), round(float_col), last(float_col)",
+ "last(double_col), round(double_col), last(double_col)",
+ "last(smallint_col), round(smallint_col), last(smallint_col)",
+ "last(tinyint_col), round(tinyint_col), last(tinyint_col)",
+ "last(uint_col), round(uint_col), last(uint_col)",
+ "last(ubigint_col), round(ubigint_col), last(ubigint_col)",
+ "last(usmallint_col), round(usmallint_col), last(usmallint_col)",
+ "last(utinyint_col), round(utinyint_col), last(utinyint_col)",
+ "last_row(int_col), round(int_col), last_row(int_col)",
+ "last_row(bigint_col), round(bigint_col), last_row(bigint_col)",
+ "last_row(float_col), round(float_col), last_row(float_col)",
+ "last_row(double_col), round(double_col), last_row(double_col)",
+ "last_row(smallint_col), round(smallint_col), last_row(smallint_col)",
+ "last_row(tinyint_col), round(tinyint_col), last_row(tinyint_col)",
+ "last_row(uint_col), round(uint_col), last_row(uint_col)",
+ "last_row(ubigint_col), round(ubigint_col), last_row(ubigint_col)",
+ "last_row(usmallint_col), round(usmallint_col), last_row(usmallint_col)",
+ "last_row(utinyint_col), round(utinyint_col), last_row(utinyint_col)",
+ "interp(int_col), round(int_col), interp(int_col)",
+ "interp(bigint_col), round(bigint_col), interp(bigint_col)",
+ "interp(float_col), round(float_col), interp(float_col)",
+ "interp(double_col), round(double_col), interp(double_col)",
+ "interp(smallint_col), round(smallint_col), interp(smallint_col)",
+ "interp(tinyint_col), round(tinyint_col), interp(tinyint_col)",
+ "interp(uint_col), round(uint_col), interp(uint_col)",
+ "interp(ubigint_col), round(ubigint_col), interp(ubigint_col)",
+ "interp(usmallint_col), round(usmallint_col), interp(usmallint_col)",
+ "interp(utinyint_col), round(utinyint_col), interp(utinyint_col)",
+ "diff(int_col), round(int_col), diff(int_col)",
+ "diff(bigint_col), round(bigint_col), diff(bigint_col)",
+ "diff(float_col), round(float_col), diff(float_col)",
+ "diff(double_col), round(double_col), diff(double_col)",
+ "diff(smallint_col), round(smallint_col), diff(smallint_col)",
+ "diff(tinyint_col), round(tinyint_col), diff(tinyint_col)",
+ "diff(uint_col), round(uint_col), diff(uint_col)",
+ "diff(ubigint_col), round(ubigint_col), diff(ubigint_col)",
+ "diff(usmallint_col), round(usmallint_col), diff(usmallint_col)",
+ "diff(utinyint_col), round(utinyint_col), diff(utinyint_col)",
+ "spread(int_col), round(int_col), spread(int_col)",
+ "spread(bigint_col), round(bigint_col), spread(bigint_col)",
+ "spread(float_col), round(float_col), spread(float_col)",
+ "spread(double_col), round(double_col), spread(double_col)",
+ "spread(smallint_col), round(smallint_col), spread(smallint_col)",
+ "spread(tinyint_col), round(tinyint_col), spread(tinyint_col)",
+ "spread(uint_col), round(uint_col), spread(uint_col)",
+ "spread(ubigint_col), round(ubigint_col), spread(ubigint_col)",
+ "spread(usmallint_col), round(usmallint_col), spread(usmallint_col)",
+ "spread(utinyint_col), round(utinyint_col), spread(utinyint_col)",
+ "leastsquares(int_col, 1, 1), round(int_col), leastsquares(int_col, 1, 1)",
+ "leastsquares(bigint_col, 1, 1), round(bigint_col), leastsquares(bigint_col, 1, 1)",
+ "leastsquares(float_col, 1, 1), round(float_col), leastsquares(float_col, 1, 1)",
+ "leastsquares(double_col, 1, 1), round(double_col), leastsquares(double_col, 1, 1)",
+ "leastsquares(smallint_col, 1, 1), round(smallint_col), leastsquares(smallint_col, 1, 1)",
+ "leastsquares(tinyint_col, 1, 1), round(tinyint_col), leastsquares(tinyint_col, 1, 1)",
+ "leastsquares(uint_col, 1, 1), round(uint_col), leastsquares(uint_col, 1, 1)",
+ "leastsquares(ubigint_col, 1, 1), round(ubigint_col), leastsquares(ubigint_col, 1, 1)",
+ "leastsquares(usmallint_col, 1, 1), round(usmallint_col), leastsquares(usmallint_col, 1, 1)",
+ "leastsquares(utinyint_col, 1, 1), round(utinyint_col), leastsquares(utinyint_col, 1, 1)",
+ "top(int_col, 1), round(int_col), top(int_col, 1)",
+ "top(bigint_col, 1), round(bigint_col), top(bigint_col, 1)",
+ "top(float_col, 1), round(float_col), top(float_col, 1)",
+ "top(double_col, 1), round(double_col), top(double_col, 1)",
+ "top(smallint_col, 1), round(smallint_col), top(smallint_col, 1)",
+ "top(tinyint_col, 1), round(tinyint_col), top(tinyint_col, 1)",
+ "top(uint_col, 1), round(uint_col), top(uint_col, 1)",
+ "top(ubigint_col, 1), round(ubigint_col), top(ubigint_col, 1)",
+ "top(usmallint_col, 1), round(usmallint_col), top(usmallint_col, 1)",
+ "top(utinyint_col, 1), round(utinyint_col), top(utinyint_col, 1)",
+ "bottom(int_col, 1), round(int_col), bottom(int_col, 1)",
+ "bottom(bigint_col, 1), round(bigint_col), bottom(bigint_col, 1)",
+ "bottom(float_col, 1), round(float_col), bottom(float_col, 1)",
+ "bottom(double_col, 1), round(double_col), bottom(double_col, 1)",
+ "bottom(smallint_col, 1), round(smallint_col), bottom(smallint_col, 1)",
+ "bottom(tinyint_col, 1), round(tinyint_col), bottom(tinyint_col, 1)",
+ "bottom(uint_col, 1), round(uint_col), bottom(uint_col, 1)",
+ "bottom(ubigint_col, 1), round(ubigint_col), bottom(ubigint_col, 1)",
+ "bottom(usmallint_col, 1), round(usmallint_col), bottom(usmallint_col, 1)",
+ "bottom(utinyint_col, 1), round(utinyint_col), bottom(utinyint_col, 1)",
+ "percentile(int_col, 1), round(int_col), percentile(int_col, 1)",
+ "percentile(bigint_col, 1), round(bigint_col), percentile(bigint_col, 1)",
+ "percentile(float_col, 1), round(float_col), percentile(float_col, 1)",
+ "percentile(double_col, 1), round(double_col), percentile(double_col, 1)",
+ "percentile(smallint_col, 1), round(smallint_col), percentile(smallint_col, 1)",
+ "percentile(tinyint_col, 1), round(tinyint_col), percentile(tinyint_col, 1)",
+ "percentile(uint_col, 1), round(uint_col), percentile(uint_col, 1)",
+ "percentile(ubigint_col, 1), round(ubigint_col), percentile(ubigint_col, 1)",
+ "percentile(usmallint_col, 1), round(usmallint_col), percentile(usmallint_col, 1)",
+ "percentile(utinyint_col, 1), round(utinyint_col), percentile(utinyint_col, 1)",
+ "apercentile(int_col, 1), round(int_col), apercentile(int_col, 1)",
+ "apercentile(bigint_col, 1), round(bigint_col), apercentile(bigint_col, 1)",
+ "apercentile(float_col, 1), round(float_col), apercentile(float_col, 1)",
+ "apercentile(double_col, 1), round(double_col), apercentile(double_col, 1)",
+ "apercentile(smallint_col, 1), round(smallint_col), apercentile(smallint_col, 1)",
+ "apercentile(tinyint_col, 1), round(tinyint_col), apercentile(tinyint_col, 1)",
+ "apercentile(uint_col, 1), round(uint_col), apercentile(uint_col, 1)",
+ "apercentile(ubigint_col, 1), round(ubigint_col), apercentile(ubigint_col, 1)",
+ "apercentile(usmallint_col, 1), round(usmallint_col), apercentile(usmallint_col, 1)",
+ "apercentile(utinyint_col, 1), round(utinyint_col), apercentile(utinyint_col, 1)",
+ "derivative(int_col, 1s, 0), round(int_col), derivative(int_col, 1s, 0)",
+ "derivative(bigint_col, 1s, 0), round(bigint_col), derivative(bigint_col, 1s, 0)",
+ "derivative(float_col, 1s, 0), round(float_col), derivative(float_col, 1s, 0)",
+ "derivative(double_col, 1s, 0), round(double_col), derivative(double_col, 1s, 0)",
+ "derivative(smallint_col, 1s, 0), round(smallint_col), derivative(smallint_col, 1s, 0)",
+ "derivative(tinyint_col, 1s, 0), round(tinyint_col), derivative(tinyint_col, 1s, 0)",
+ "derivative(uint_col, 1s, 0), round(uint_col), derivative(uint_col, 1s, 0)",
+ "derivative(ubigint_col, 1s, 0), round(ubigint_col), derivative(ubigint_col, 1s, 0)",
+ "derivative(usmallint_col, 1s, 0), round(usmallint_col), derivative(usmallint_col, 1s, 0)",
+ "derivative(utinyint_col, 1s, 0), round(utinyint_col), derivative(utinyint_col, 1s, 0)",
+ "1, round(int_col), 1",
+ "1, round(bigint_col), 1",
+ "1, round(float_col), 1",
+ "1, round(double_col), 1",
+ "1, round(smallint_col), 1",
+ "1, round(tinyint_col), 1",
+ "1, round(uint_col), 1",
+ "1, round(ubigint_col), 1",
+ "1, round(usmallint_col), 1",
+ "1, round(utinyint_col), 1",
+ "round(int_col) as anyName",
+ "round(bigint_col) as anyName",
+ "round(float_col) as anyName",
+ "round(double_col) as anyName",
+ "round(smallint_col) as anyName",
+ "round(tinyint_col) as anyName",
+ "round(uint_col) as anyName",
+ "round(ubigint_col) as anyName",
+ "round(usmallint_col) as anyName",
+ "round(utinyint_col) as anyName",
+ "distinct round(int_col)",
+ "distinct round(bigint_col)",
+ "distinct round(float_col)",
+ "distinct round(double_col)",
+ "distinct round(smallint_col)",
+ "distinct round(tinyint_col)",
+ "distinct round(uint_col)",
+ "distinct round(ubigint_col)",
+ "distinct round(usmallint_col)",
+ "distinct round(utinyint_col)",
+ ]
+ simple_select_command = [
+ "round(super.int_col)",
+ "round(super.bigint_col)",
+ "round(super.float_col)",
+ "round(super.double_col)",
+ "round(super.smallint_col)",
+ "round(super.tinyint_col)",
+ "round(super.uint_col)",
+ "round(super.ubigint_col)",
+ "round(super.usmallint_col)",
+ "round(super.utinyint_col)",
+ "round(t1.int_col)",
+ "round(t1.bigint_col)",
+ "round(t1.float_col)",
+ "round(t1.double_col)",
+ "round(t1.smallint_col)",
+ "round(t1.tinyint_col)",
+ "round(t1.uint_col)",
+ "round(t1.ubigint_col)",
+ "round(t1.usmallint_col)",
+ "round(t1.utinyint_col)",
+ ]
+ from_command = [" from super", " from t1"]
+ advance_from_command = [
+ " from super", " from t1",
+ " from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"
+ ]
+ filter_command = [
+ "", " session(ts, 1s)", " state_window(int_col)", " interval (1s)",
+ " interval (1s) sliding (1s)", " group by (ts)"
+ ]
+ fill_command = [
+ "", " fill(prev)", " fill(next)", " fill(null)", " fill(1)",
+ " fill(linear)"
+ ]
+ tdSql.prepare()
+ tdSql.execute(
+ "create stable super (ts timestamp, timestamp_col timestamp, int_col int, bigint_col bigint, float_col float,\
+ double_col double, binary_col binary(8), smallint_col smallint, tinyint_col tinyint, bool_col bool, nchar_col nchar(8), \
+ uint_col int unsigned, ubigint_col bigint unsigned, usmallint_col smallint unsigned, utinyint_col tinyint unsigned) tags (int_tag int, bigint_tag bigint, \
+ float_tag float, double_tag double, binary_tag binary(8), smallint_tag smallint, tinyint_tag tinyint, bool_tag bool, nchar_tag nchar(8),\
+ uint_tag int unsigned, ubigint_tag bigint unsigned, usmallint_tag smallint unsigned, utinyint_tag tinyint unsigned)"
+ )
+ tdSql.execute(
+ "create stable superb (ts timestamp, timestamp_col timestamp, int_col int, bigint_col bigint, float_col float,\
+ double_col double, binary_col binary(8), smallint_col smallint, tinyint_col tinyint, bool_col bool, nchar_col nchar(8), \
+ uint_col int unsigned, ubigint_col bigint unsigned, usmallint_col smallint unsigned, utinyint_col tinyint unsigned) tags (int_tag int, bigint_tag bigint, \
+ float_tag float, double_tag double, binary_tag binary(8), smallint_tag smallint, tinyint_tag tinyint, bool_tag bool, nchar_tag nchar(8),\
+ uint_tag int unsigned, ubigint_tag bigint unsigned, usmallint_tag smallint unsigned, utinyint_tag tinyint unsigned)"
+ )
+ tdSql.execute(
+ "create table t1 using super tags (1, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomBigint(), self.randomDouble(), self.randomDouble(),
+ self.randomNchar(), self.randomSmallint(), self.randomTinyint(),
+ self.randomNchar(), self.randomUInt(), self.randomUBigint(),
+ self.randomUSmallint(), self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215891, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215892, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215893, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t1 values (1629796215894, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "create table t2 using superb tags (1, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomBigint(), self.randomDouble(), self.randomDouble(),
+ self.randomNchar(), self.randomSmallint(), self.randomTinyint(),
+ self.randomNchar(), self.randomUInt(), self.randomUBigint(),
+ self.randomUSmallint(), self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215891, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215892, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215893, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 1, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+ tdSql.execute(
+ "insert into t2 values (1629796215894, 1629796215891, %d, %d, %f, %f, '%s', %d, %d, 0, '%s', %d, %d, %d, %d)"
+ % (self.randomInt(), self.randomBigint(), self.randomDouble(),
+ self.randomDouble(), self.randomNchar(), self.randomSmallint(),
+ self.randomTinyint(), self.randomNchar(), self.randomUInt(),
+ self.randomUBigint(), self.randomUSmallint(),
+ self.randomUTinyint()))
+
+ for s in range(len(select_command)):
+ for f in range(len(from_command)):
+ sql = "select " + select_command[s] + from_command[f]
+ if (select_command[s] == "round(int_col)"\
+ or select_command[s] == "round(bigint_col)"\
+ or select_command[s] == "round(smallint_col)" \
+ or select_command[s] == "round(float_col)"\
+ or select_command[s] == "round(double_col)"\
+ or select_command[s] == "round(tinyint_col)"\
+ or select_command[s] == "round(uint_col)"\
+ or select_command[s] == "round(ubigint_col)"\
+ or select_command[s] == "round(usmallint_col)"\
+ or select_command[s] == "round(utinyint_col)"\
+ or select_command[s] == "1, round(int_col), 1"\
+ or select_command[s] == "1, round(bigint_col), 1"\
+ or select_command[s] == "1, round(float_col), 1"\
+ or select_command[s] == "1, round(double_col), 1"\
+ or select_command[s] == "1, round(smallint_col), 1"\
+ or select_command[s] == "1, round(tinyint_col), 1"\
+ or select_command[s] == "1, round(uint_col), 1"\
+ or select_command[s] == "1, round(ubigint_col), 1"\
+ or select_command[s] == "1, round(usmallint_col), 1"\
+ or select_command[s] == "1, round(utinyint_col), 1"\
+ or select_command[s] == "int_col, round(int_col), int_col"\
+ or select_command[s] == "bigint_col, round(bigint_col), bigint_col"\
+ or select_command[s] == "float_col, round(float_col), float_col"\
+ or select_command[s] == "double_col, round(double_col), double_col"\
+ or select_command[s] == "smallint_col, round(smallint_col), smallint_col"\
+ or select_command[s] == "tinyint_col, round(tinyint_col), tinyint_col"\
+ or select_command[s] == "uint_col, round(uint_col), uint_col"\
+ or select_command[s] == "ubigint_col, round(ubigint_col), ubigint_col"\
+ or select_command[s] == "usmallint_col, round(usmallint_col), usmallint_col"\
+ or select_command[s] == "utinyint_col, round(utinyint_col), utinyint_col"\
+ or select_command[s] == "round(int_col) as anyName"\
+ or select_command[s] == "round(bigint_col) as anyName"\
+ or select_command[s] == "round(float_col) as anyName"\
+ or select_command[s] == "round(double_col) as anyName"\
+ or select_command[s] == "round(smallint_col) as anyName"\
+ or select_command[s] == "round(tinyint_col) as anyName"\
+ or select_command[s] == "round(uint_col) as anyName"\
+ or select_command[s] == "round(ubigint_col) as anyName"\
+ or select_command[s] == "round(usmallint_col) as anyName"\
+ or select_command[s] == "round(utinyint_col) as anyName"\
+ or select_command[s] == "round(int_col) + round(int_col)"\
+ or select_command[s] == "round(bigint_col) + round(bigint_col)"\
+ or select_command[s] == "round(float_col) + round(float_col)"\
+ or select_command[s] == "round(double_col) + round(double_col)"\
+ or select_command[s] == "round(smallint_col) + round(smallint_col)"\
+ or select_command[s] == "round(tinyint_col) + round(tinyint_col)"\
+ or select_command[s] == "round(uint_col) + round(uint_col)"\
+ or select_command[s] == "round(ubigint_col) + round(ubigint_col)"\
+ or select_command[s] == "round(usmallint_col) + round(usmallint_col)"\
+ or select_command[s] == "round(utinyint_col) + round(utinyint_col)"\
+ or select_command[s] == "round(int_col) + round(int_col)"\
+ or select_command[s] == "round(bigint_col) + round(bigint_col)"\
+ or select_command[s] == "round(float_col) + round(float_col)"\
+ or select_command[s] == "round(double_col) + round(double_col)"\
+ or select_command[s] == "round(smallint_col) + round(smallint_col)"\
+ or select_command[s] == "round(tinyint_col) + round(tinyint_col)"\
+ or select_command[s] == "round(uint_col) + round(uint_col)"\
+ or select_command[s] == "round(ubigint_col) + round(ubigint_col)"\
+ or select_command[s] == "round(usmallint_col) + round(usmallint_col)"\
+ or select_command[s] == "round(utinyint_col) + cei(utinyint_col)"\
+ or select_command[s] == "round(int_col) - round(int_col)"\
+ or select_command[s] == "round(bigint_col) - round(bigint_col)"\
+ or select_command[s] == "round(float_col) - round(float_col)"\
+ or select_command[s] == "round(double_col) - round(double_col)"\
+ or select_command[s] == "round(smallint_col) - round(smallint_col)"\
+ or select_command[s] == "round(tinyint_col) - round(tinyint_col)"\
+ or select_command[s] == "round(uint_col) - round(uint_col)"\
+ or select_command[s] == "round(ubigint_col) - round(ubigint_col)"\
+ or select_command[s] == "round(usmallint_col) - round(usmallint_col)"\
+ or select_command[s] == "round(utinyint_col) - round(utinyint_col)"\
+ or select_command[s] == "round(int_col) * round(int_col)"\
+ or select_command[s] == "round(bigint_col) * round(bigint_col)"\
+ or select_command[s] == "round(float_col) * round(float_col)"\
+ or select_command[s] == "round(double_col) * round(double_col)"\
+ or select_command[s] == "round(smallint_col) * round(smallint_col)"\
+ or select_command[s] == "round(tinyint_col) * round(tinyint_col)"\
+ or select_command[s] == "round(uint_col) * round(uint_col)"\
+ or select_command[s] == "round(ubigint_col) * round(ubigint_col)"\
+ or select_command[s] == "round(usmallint_col) * round(usmallint_col)"\
+ or select_command[s] == "round(utinyint_col) * round(utinyint_col)"\
+ or select_command[s] == "round(int_col) / round(int_col)"\
+ or select_command[s] == "round(bigint_col) / round(bigint_col)"\
+ or select_command[s] == "round(float_col) / round(float_col)"\
+ or select_command[s] == "round(double_col) / round(double_col)"\
+ or select_command[s] == "round(smallint_col) / round(smallint_col)"\
+ or select_command[s] == "round(tinyint_col) / round(tinyint_col)"\
+ or select_command[s] == "round(uint_col) / round(uint_col)"\
+ or select_command[s] == "round(ubigint_col) / round(ubigint_col)"\
+ or select_command[s] == "round(usmallint_col) / round(usmallint_col)"\
+ or select_command[s] == "round(utinyint_col) / round(utinyint_col)"):
+ tdSql.query(sql)
+ else:
+ tdSql.error(sql)
+ for sim in range(len(simple_select_command)):
+ for fr in range(len(advance_from_command)):
+ for filter in range(len(filter_command)):
+ for fill in range(len(fill_command)):
+ sql = "select " + simple_select_command[
+ sim] + advance_from_command[fr] + filter_command[
+ filter] + fill_command[fill]
+ if sql == "select round(t1.int_col) from t1"\
+ or sql == "select round(super.int_col) from super"\
+ or sql == "select round(t1.bigint_col) from t1"\
+ or sql == "select round(super.bigint_col) from super"\
+ or sql == "select round(t1.smallint_col) from t1"\
+ or sql == "select round(super.smallint_col) from super"\
+ or sql == "select round(t1.tinyint_col) from t1"\
+ or sql == "select round(super.tinyint_col) from super"\
+ or sql == "select round(t1.float_col) from t1"\
+ or sql == "select round(super.float_col) from super"\
+ or sql == "select round(t1.double_col) from t1"\
+ or sql == "select round(super.double_col) from super"\
+ or sql == "select round(t1.uint_col) from t1"\
+ or sql == "select round(super.uint_col) from super"\
+ or sql == "select round(t1.ubigint_col) from t1"\
+ or sql == "select round(super.ubigint_col) from super"\
+ or sql == "select round(t1.usmallint_col) from t1"\
+ or sql == "select round(super.usmallint_col) from super"\
+ or sql == "select round(t1.utinyint_col) from t1"\
+ or sql == "select round(super.utinyint_col) from super"\
+ or sql == "select round(super.int_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select round(super.bigint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select round(super.smallint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select round(super.tinyint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select round(super.float_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select round(super.double_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select round(super.uint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select round(super.ubigint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select round(super.usmallint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag"\
+ or sql == "select round(super.utinyint_col) from super, superb where super.ts = superb.ts and super.int_tag = superb.int_tag":
+ tdSql.query(sql)
+ else:
+ tdSql.error(sql)
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/queryTestCases.py b/tests/pytest/functions/queryTestCases.py
index 1311ad6b3c83e1d4a0ec6fdf73a707a44bd5297c..a20b89d47c5fc09d032e72335edb9544eb50e0aa 100644
--- a/tests/pytest/functions/queryTestCases.py
+++ b/tests/pytest/functions/queryTestCases.py
@@ -15,6 +15,7 @@ import sys
import subprocess
import random
import math
+import numpy as np
from util.log import *
from util.cases import *
@@ -57,16 +58,33 @@ class TDTestCase:
def td3690(self):
tdLog.printNoPrefix("==========TD-3690==========")
+
+ tdSql.prepare()
+
+ tdSql.execute("show variables")
+ res_off = tdSql.cursor.fetchall()
+ resList = np.array(res_off)
+ index = np.where(resList == "offlineThreshold")
+ index_value = np.dstack((index[0])).squeeze()
tdSql.query("show variables")
- tdSql.checkData(53, 1, 864000)
+ tdSql.checkData(index_value, 1, 864000)
def td4082(self):
tdLog.printNoPrefix("==========TD-4082==========")
+
+ tdSql.prepare()
+
cfgfile = self.getCfgFile()
max_compressMsgSize = 100000000
+ tdSql.execute("show variables")
+ res_com = tdSql.cursor.fetchall()
+ rescomlist = np.array(res_com)
+ cpms_index = np.where(rescomlist == "compressMsgSize")
+ index_value = np.dstack((cpms_index[0])).squeeze()
+
tdSql.query("show variables")
- tdSql.checkData(26, 1, -1)
+ tdSql.checkData(index_value, 1, -1)
tdSql.query("show dnodes")
index = tdSql.getData(0, 0)
@@ -80,7 +98,7 @@ class TDTestCase:
tdDnodes.start(index)
tdSql.query("show variables")
- tdSql.checkData(26, 1, 100000000)
+ tdSql.checkData(index_value, 1, 100000000)
tdDnodes.stop(index)
cmd = f"sed -i '$s/{max_compressMsgSize}/{max_compressMsgSize+10}/g' {cfgfile} "
@@ -91,7 +109,7 @@ class TDTestCase:
tdDnodes.start(index)
tdSql.query("show variables")
- tdSql.checkData(26, 1, -1)
+ tdSql.checkData(index_value, 1, -1)
tdDnodes.stop(index)
cmd = f"sed -i '$d' {cfgfile}"
@@ -104,8 +122,12 @@ class TDTestCase:
def td4097(self):
tdLog.printNoPrefix("==========TD-4097==========")
+
tdSql.execute("drop database if exists db")
tdSql.execute("drop database if exists db1")
+ tdDnodes.stop(1)
+ tdDnodes.start(1)
+
tdSql.execute("create database if not exists db keep 3650")
tdSql.execute("create database if not exists db1 keep 3650")
tdSql.execute("create database if not exists new keep 3650")
@@ -267,10 +289,22 @@ class TDTestCase:
# keep ~ [days,365000]
tdSql.execute("drop database if exists db")
tdSql.execute("create database if not exists db")
+
+ tdSql.execute("show variables")
+ res_kp = tdSql.cursor.fetchall()
+ resList = np.array(res_kp)
+ keep_index = np.where(resList == "keep")
+ index_value = np.dstack((keep_index[0])).squeeze()
+
tdSql.query("show variables")
- tdSql.checkData(38, 1, 3650)
+ tdSql.checkData(index_value, 1, 3650)
+
tdSql.query("show databases")
- tdSql.checkData(0,7,"3650,3650,3650")
+ selfPath = os.path.dirname(os.path.realpath(__file__))
+ if ("community" in selfPath):
+ tdSql.checkData(0, 7, "3650,3650,3650")
+ else:
+ tdSql.checkData(0, 7, 3650)
days = tdSql.getData(0, 6)
tdSql.error("alter database db keep 3650001")
@@ -289,14 +323,22 @@ class TDTestCase:
tdSql.execute("alter database db keep 36500")
tdSql.query("show databases")
- tdSql.checkData(0, 7, "3650,3650,36500")
+ if ("community" in selfPath):
+ tdSql.checkData(0, 7, "36500,36500,36500")
+ else:
+ tdSql.checkData(0, 7, 36500)
+
tdSql.execute("drop database if exists db")
tdSql.execute("create database if not exists db1")
tdSql.query("show databases")
- tdSql.checkData(0, 7, "3650,3650,3650")
+ if ("community" in selfPath):
+ tdSql.checkData(0, 7, "3650,3650,3650")
+ else:
+ tdSql.checkData(0, 7, 3650)
+
tdSql.query("show variables")
- tdSql.checkData(38, 1, 3650)
+ tdSql.checkData(index_value, 1, 3650)
tdSql.execute("alter database db1 keep 365")
tdSql.execute("drop database if exists db1")
@@ -552,7 +594,7 @@ class TDTestCase:
tdSql.execute("use db")
tdSql.execute("create stable db.stb1 (ts timestamp, c1 int) tags(t0 tinyint, t1 int)")
tdSql.execute("create stable db.stb2 (ts timestamp, c1 int) tags(t0 binary(16), t1 binary(16))")
- numtab=2000000
+ numtab=20000
for i in range(numtab):
sql = f"create table db.t{i} using db.stb1 tags({i%128}, {100+i})"
tdSql.execute(sql)
@@ -698,9 +740,7 @@ class TDTestCase:
tdSql.query(f"select distinct c1 c2, c2 c3 from t1 where c1 <{tbnum}")
tdSql.checkRows(3)
tdSql.error("select distinct c1, c2 from stb1 order by ts")
- #tdSql.checkRows(tbnum*3+1)
tdSql.error("select distinct c1, c2 from t1 order by ts")
- #tdSql.checkRows(4)
tdSql.error("select distinct c1, ts from stb1 group by c2")
tdSql.error("select distinct c1, ts from t1 group by c2")
tdSql.error("select distinct c1, max(c2) from stb1 ")
@@ -729,7 +769,7 @@ class TDTestCase:
tdSql.query(f"select distinct c1,c2 from (select * from t1 where c1 < {tbnum}) ")
tdSql.checkRows(3)
tdSql.query(f"select distinct c1,c2 from (select * from stb1 where t2 !=0 and t2 != 1) ")
- tdSql.checkRows(4)
+ tdSql.checkRows(0)
tdSql.error("select distinct c1, c2 from (select distinct c1, c2 from stb1 where t0 > 2 and t1 < 3) ")
tdSql.error("select c1, c2 from (select distinct c1, c2 from stb1 where t0 > 2 and t1 < 3) ")
tdSql.query("select distinct c1, c2 from (select c2, c1 from stb1 where c1 > 2 ) where c1 < 4")
@@ -975,6 +1015,84 @@ class TDTestCase:
tdSql.error("select ts as t, bottom(t1, 3) from t1 order by c3")
+ tdSql.error("select ts as t, top(c1, 0) from t1")
+ tdSql.query("select ts as t, top(c1, 5) from t1")
+ tdSql.checkRows(5)
+ tdSql.checkCols(3)
+ for i in range(5):
+ data=tdSql.getData(i, 0)
+ tdSql.checkData(i, 1, data)
+ tdSql.query("select ts as t, top(c1, 5) from stb1")
+ tdSql.checkRows(5)
+ tdSql.query("select ts as t, top(c1, 5) from stb1 group by tbname")
+ tdSql.checkRows(500)
+ tdSql.query("select ts as t, top(c1, 8) from t1")
+ tdSql.checkRows(6)
+ tdSql.query("select ts as t, top(c2, 8) from t1")
+ tdSql.checkRows(6)
+ tdSql.error("select ts as t, top(c3, 5) from t1")
+ tdSql.error("select ts as t, top(c4, 5) from t1")
+ tdSql.query("select ts as t, top(c5, 8) from t1")
+ tdSql.checkRows(6)
+ tdSql.error("select ts as t, top(c6, 5) from t1")
+ tdSql.error("select ts as t, top(c5, 8) as b from t1 order by b")
+ tdSql.error("select ts as t, top(t1, 1) from t1")
+ tdSql.error("select ts as t, top(t1, 1) from stb1")
+ tdSql.error("select ts as t, top(t1, 3) from stb1 order by c3")
+ tdSql.error("select ts as t, top(t1, 3) from t1 order by c3")
+
+ tdDnodes.stop(1)
+ tdDnodes.start(1)
+
+ tdSql.query("select ts as t, diff(c1) from t1")
+ tdSql.checkRows(5)
+ tdSql.checkCols(3)
+ for i in range(5):
+ data=tdSql.getData(i, 0)
+ tdSql.checkData(i, 1, data)
+ tdSql.query("select ts as t, diff(c1) from stb1 group by tbname")
+ tdSql.checkRows(500)
+ tdSql.checkCols(4)
+ tdSql.query("select ts as t, diff(c1) from t1")
+ tdSql.query("select ts as t, diff(c1) from t1")
+ tdSql.error("select ts as t, diff(c1) from stb1")
+ tdSql.query("select ts as t, diff(c2) from t1")
+ tdSql.checkRows(5)
+ tdSql.error("select ts as t, diff(c3) from t1")
+ tdSql.error("select ts as t, diff(c4) from t1")
+ tdSql.query("select ts as t, diff(c5) from t1")
+ tdSql.checkRows(5)
+ tdSql.error("select ts as t, diff(c6) from t1")
+ tdSql.error("select ts as t, diff(t1) from t1")
+ tdSql.error("select ts as t, diff(c1, c2) from t1")
+
+ tdSql.error("select ts as t, bottom(c1, 0) from t1")
+ tdSql.query("select ts as t, bottom(c1, 5) from t1")
+ tdSql.checkRows(5)
+ tdSql.checkCols(3)
+ for i in range(5):
+ data=tdSql.getData(i, 0)
+ tdSql.checkData(i, 1, data)
+ tdSql.query("select ts as t, bottom(c1, 5) from stb1")
+ tdSql.checkRows(5)
+ tdSql.query("select ts as t, bottom(c1, 5) from stb1 group by tbname")
+ tdSql.checkRows(500)
+ tdSql.query("select ts as t, bottom(c1, 8) from t1")
+ tdSql.checkRows(6)
+ tdSql.query("select ts as t, bottom(c2, 8) from t1")
+ tdSql.checkRows(6)
+ tdSql.error("select ts as t, bottom(c3, 5) from t1")
+ tdSql.error("select ts as t, bottom(c4, 5) from t1")
+ tdSql.query("select ts as t, bottom(c5, 8) from t1")
+ tdSql.checkRows(6)
+ tdSql.error("select ts as t, bottom(c6, 5) from t1")
+ tdSql.error("select ts as t, bottom(c5, 8) as b from t1 order by b")
+ tdSql.error("select ts as t, bottom(t1, 1) from t1")
+ tdSql.error("select ts as t, bottom(t1, 1) from stb1")
+ tdSql.error("select ts as t, bottom(t1, 3) from stb1 order by c3")
+ tdSql.error("select ts as t, bottom(t1, 3) from t1 order by c3")
+
+
tdSql.error("select ts as t, top(c1, 0) from t1")
tdSql.query("select ts as t, top(c1, 5) from t1")
tdSql.checkRows(5)
@@ -1011,15 +1129,15 @@ class TDTestCase:
# self.td4082()
# self.td4288()
# self.td4724()
- # self.td5798()
# self.td5935()
- self.td6068()
+ # self.td6068()
# develop branch
- # self.td4097()
- # self.td4889()
+ self.td4097()
+ self.td4889()
+ self.td5798()
# self.td5168()
- # self.td5433()
+ self.td5433()
def stop(self):
tdSql.close()
diff --git a/tests/pytest/functions/showOfflineThresholdIs864000.py b/tests/pytest/functions/showOfflineThresholdIs864000.py
index 8ec25cef26b3c97bc55f2f4df3fe8cf55a19125c..7462d4cd72f600674fcb82aa1224019787d23fd5 100644
--- a/tests/pytest/functions/showOfflineThresholdIs864000.py
+++ b/tests/pytest/functions/showOfflineThresholdIs864000.py
@@ -12,6 +12,8 @@
# -*- coding: utf-8 -*-
import sys
+import numpy as np
+
from util.log import *
from util.cases import *
from util.sql import *
@@ -24,8 +26,17 @@ class TDTestCase:
tdSql.init(conn.cursor(), logSql)
def run(self):
+ # tdSql.query("show variables")
+ # tdSql.checkData(54, 1, 864000)
+ tdSql.execute("show variables")
+ res = tdSql.cursor.fetchall()
+ resList = np.array(res)
+ index = np.where(resList == "offlineThreshold")
+ index_value = np.dstack((index[0])).squeeze()
tdSql.query("show variables")
- tdSql.checkData(55, 1, 864000)
+ tdSql.checkData(index_value, 1, 864000)
+ pass
+
def stop(self):
tdSql.close()
diff --git a/tests/pytest/import_merge/import_update_0.py b/tests/pytest/import_merge/import_update_0.py
index 71f33c56704fdead8df07583dd105b00eb9e4a23..66e0d7d14420251a227e5f0c2bacec219273d032 100644
--- a/tests/pytest/import_merge/import_update_0.py
+++ b/tests/pytest/import_merge/import_update_0.py
@@ -55,7 +55,7 @@ class TDTestCase:
tdSql.execute('''drop database if exists test_updata_0 ;''')
# update 0 不更新 ; update 1 覆盖更新 ;update 2 合并更新
tdLog.info("========== test database updata = 0 ==========")
- tdSql.execute('''create database test_updata_0 update 0 minrows 10 maxrows 200 ;''')
+ tdSql.execute('''create database test_updata_0 update 0 minrows 10 maxrows 200 keep 36500;''')
tdSql.execute('''use test_updata_0;''')
tdSql.execute('''create stable stable_1
(ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint,
diff --git a/tests/pytest/import_merge/import_update_1.py b/tests/pytest/import_merge/import_update_1.py
index e72de2eb236a4190ec12fcc1315da849d5f21235..7edfd610c2e6eac6588ae78f81c939118845973d 100644
--- a/tests/pytest/import_merge/import_update_1.py
+++ b/tests/pytest/import_merge/import_update_1.py
@@ -55,7 +55,7 @@ class TDTestCase:
tdSql.execute('''drop database if exists test_updata_1 ;''')
# update 0 不更新 ; update 1 覆盖更新 ;update 2 合并更新
tdLog.info("========== test database updata = 1 ==========")
- tdSql.execute('''create database test_updata_1 update 1 minrows 10 maxrows 200 ;''')
+ tdSql.execute('''create database test_updata_1 update 1 minrows 10 maxrows 200 keep 36500;''')
tdSql.execute('''use test_updata_1;''')
tdSql.execute('''create stable stable_1
(ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint,
diff --git a/tests/pytest/import_merge/import_update_2.py b/tests/pytest/import_merge/import_update_2.py
index cfa3dbd26c0a0edfbd64d3d34b1bfa6ed23a266a..a0efe31ab25f68a898a124e0be22c369fedabf7f 100644
--- a/tests/pytest/import_merge/import_update_2.py
+++ b/tests/pytest/import_merge/import_update_2.py
@@ -55,7 +55,7 @@ class TDTestCase:
tdSql.execute('''drop database if exists test_updata_2 ;''')
# update 0 不更新 ; update 1 覆盖更新 ;update 2 合并更新
tdLog.info("========== test database updata = 2 ==========")
- tdSql.execute('''create database test_updata_2 update 2 minrows 10 maxrows 200 ;''')
+ tdSql.execute('''create database test_updata_2 update 2 minrows 10 maxrows 200 keep 36500;''')
tdSql.execute('''use test_updata_2;''')
tdSql.execute('''create stable stable_1
(ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint,
diff --git a/tests/pytest/insert/insertJSONPayload.py b/tests/pytest/insert/insertJSONPayload.py
new file mode 100644
index 0000000000000000000000000000000000000000..30f34446a93237f9b7b610efc9b1b5507ba09f4a
--- /dev/null
+++ b/tests/pytest/insert/insertJSONPayload.py
@@ -0,0 +1,568 @@
+###################################################################
+# Copyright (c) 2021 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+ self._conn = conn
+
+ def run(self):
+ print("running {}".format(__file__))
+ tdSql.execute("drop database if exists test")
+ tdSql.execute("create database if not exists test precision 'us'")
+ tdSql.execute('use test')
+
+
+ ### Default format ###
+ ### metric value ###
+ print("============= step1 : test metric value types ================")
+ payload = '''
+ {
+ "metric": "stb0_0",
+ "timestamp": 1626006833610123,
+ "value": 10,
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb0_0")
+ tdSql.checkData(1, 1, "FLOAT")
+
+ payload = '''
+ {
+ "metric": "stb0_1",
+ "timestamp": 1626006833610123,
+ "value": true,
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb0_1")
+ tdSql.checkData(1, 1, "BOOL")
+
+ payload = '''
+ {
+ "metric": "stb0_2",
+ "timestamp": 1626006833610123,
+ "value": false,
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb0_2")
+ tdSql.checkData(1, 1, "BOOL")
+
+ payload = '''
+ {
+ "metric": "stb0_3",
+ "timestamp": 1626006833610123,
+ "value": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>",
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb0_3")
+ tdSql.checkData(1, 1, "NCHAR")
+
+ ### timestamp 0 ###
+ payload = '''
+ {
+ "metric": "stb0_4",
+ "timestamp": 0,
+ "value": 123,
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+
+ ### ID ###
+ payload = '''
+ {
+ "metric": "stb0_5",
+ "timestamp": 0,
+ "value": 123,
+ "tags": {
+ "ID": "tb0_5",
+ "t1": true,
+ "iD": "tb000",
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>",
+ "id": "tb555"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("select tbname from stb0_5")
+ tdSql.checkData(0, 0, "tb0_5")
+
+ ### Nested format ###
+ ### timestamp ###
+ #seconds
+ payload = '''
+ {
+ "metric": "stb1_0",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": 10,
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("select ts from stb1_0")
+ tdSql.checkData(0, 0, "2021-07-11 20:33:53.000000")
+
+ #milliseconds
+ payload = '''
+ {
+ "metric": "stb1_1",
+ "timestamp": {
+ "value": 1626006833610,
+ "type": "ms"
+ },
+ "value": 10,
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("select ts from stb1_1")
+ tdSql.checkData(0, 0, "2021-07-11 20:33:53.610000")
+
+ #microseconds
+ payload = '''
+ {
+ "metric": "stb1_2",
+ "timestamp": {
+ "value": 1626006833610123,
+ "type": "us"
+ },
+ "value": 10,
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("select ts from stb1_2")
+ tdSql.checkData(0, 0, "2021-07-11 20:33:53.610123")
+
+ #nanoseconds
+ payload = '''
+ {
+ "metric": "stb1_3",
+ "timestamp": {
+ "value": 1.6260068336101233e+18,
+ "type": "ns"
+ },
+ "value": 10,
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("select ts from stb1_3")
+ tdSql.checkData(0, 0, "2021-07-11 20:33:53.610123")
+
+ #now
+ tdSql.execute('use test')
+ payload = '''
+ {
+ "metric": "stb1_4",
+ "timestamp": {
+ "value": 0,
+ "type": "ns"
+ },
+ "value": 10,
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ ### metric value ###
+ payload = '''
+ {
+ "metric": "stb2_0",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": true,
+ "type": "bool"
+ },
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb2_0")
+ tdSql.checkData(1, 1, "BOOL")
+
+ payload = '''
+ {
+ "metric": "stb2_1",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": 127,
+ "type": "tinyint"
+ },
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb2_1")
+ tdSql.checkData(1, 1, "TINYINT")
+
+ payload = '''
+ {
+ "metric": "stb2_2",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": 32767,
+ "type": "smallint"
+ },
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb2_2")
+ tdSql.checkData(1, 1, "SMALLINT")
+
+ payload = '''
+ {
+ "metric": "stb2_3",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": 2147483647,
+ "type": "int"
+ },
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb2_3")
+ tdSql.checkData(1, 1, "INT")
+
+ payload = '''
+ {
+ "metric": "stb2_4",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": 9.2233720368547758e+18,
+ "type": "bigint"
+ },
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb2_4")
+ tdSql.checkData(1, 1, "BIGINT")
+
+ payload = '''
+ {
+ "metric": "stb2_5",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": 11.12345,
+ "type": "float"
+ },
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb2_5")
+ tdSql.checkData(1, 1, "FLOAT")
+
+ payload = '''
+ {
+ "metric": "stb2_6",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": 22.123456789,
+ "type": "double"
+ },
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb2_6")
+ tdSql.checkData(1, 1, "DOUBLE")
+
+ payload = '''
+ {
+ "metric": "stb2_7",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>",
+ "type": "binary"
+ },
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb2_7")
+ tdSql.checkData(1, 1, "BINARY")
+
+ payload = '''
+ {
+ "metric": "stb2_8",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": "你好",
+ "type": "nchar"
+ },
+ "tags": {
+ "t1": true,
+ "t2": false,
+ "t3": 10,
+ "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb2_8")
+ tdSql.checkData(1, 1, "NCHAR")
+
+ ### tag value ###
+
+ payload = '''
+ {
+ "metric": "stb3_0",
+ "timestamp": {
+ "value": 1626006833,
+ "type": "s"
+ },
+ "value": {
+ "value": "hello",
+ "type": "nchar"
+ },
+ "tags": {
+ "t1": {
+ "value": true,
+ "type": "bool"
+ },
+ "t2": {
+ "value": 127,
+ "type": "tinyint"
+ },
+ "t3": {
+ "value": 32767,
+ "type": "smallint"
+ },
+ "t4": {
+ "value": 2147483647,
+ "type": "int"
+ },
+ "t5": {
+ "value": 9.2233720368547758e+18,
+ "type": "bigint"
+ },
+ "t6": {
+ "value": 11.12345,
+ "type": "float"
+ },
+ "t7": {
+ "value": 22.123456789,
+ "type": "double"
+ },
+ "t8": {
+ "value": "binary_val",
+ "type": "binary"
+ },
+ "t9": {
+ "value": "你好",
+ "type": "nchar"
+ }
+ }
+ }
+ '''
+ code = self._conn.insert_json_payload(payload)
+ print("insert_json_payload result {}".format(code))
+
+ tdSql.query("describe stb3_0")
+ tdSql.checkData(2, 1, "BOOL")
+ tdSql.checkData(3, 1, "TINYINT")
+ tdSql.checkData(4, 1, "SMALLINT")
+ tdSql.checkData(5, 1, "INT")
+ tdSql.checkData(6, 1, "BIGINT")
+ tdSql.checkData(7, 1, "FLOAT")
+ tdSql.checkData(8, 1, "DOUBLE")
+ tdSql.checkData(9, 1, "BINARY")
+ tdSql.checkData(10, 1, "NCHAR")
+
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/insertTelnetLines.py b/tests/pytest/insert/insertTelnetLines.py
index 8ebb6bd3df4bcd4abfbb8c42cf5024fe066fcce3..4041b309a1007c1177f26d28b022f4e314dcf9ba 100644
--- a/tests/pytest/insert/insertTelnetLines.py
+++ b/tests/pytest/insert/insertTelnetLines.py
@@ -33,9 +33,9 @@ class TDTestCase:
### metric ###
print("============= step1 : test metric ================")
lines0 = [
- "stb0_0 1626006833639000000ns 4i8 host=\"host0\",interface=\"eth0\"",
- "stb0_1 1626006833639000000ns 4i8 host=\"host0\",interface=\"eth0\"",
- "stb0_2 1626006833639000000ns 4i8 host=\"host0\",interface=\"eth0\"",
+ "stb0_0 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
+ "stb0_1 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
+ "stb0_2 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"",
]
code = self._conn.insert_telnet_lines(lines0)
@@ -245,8 +245,8 @@ class TDTestCase:
print("============= step3 : test tags ================")
#tag value types
lines3_0 = [
- "stb3_0 1626006833610ms 1 t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=3.4E38f32,t6=1.7E308f64,t7=true,t8=\"binary_val_1\",t9=L\"标签值1\"",
- "stb3_0 1626006833610ms 2 t1=-127i8,t2=-32767i16,t3=-2147483647i32,t4=-9223372036854775807i64,t5=-3.4E38f32,t6=-1.7E308f64,t7=false,t8=\"binary_val_2\",t9=L\"标签值2\""
+ "stb3_0 1626006833610ms 1 t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=3.4E38f32 t6=1.7E308f64 t7=true t8=\"binary_val_1\" t9=L\"标签值1\"",
+ "stb3_0 1626006833610ms 2 t1=-127i8 t2=-32767i16 t3=-2147483647i32 t4=-9223372036854775807i64 t5=-3.4E38f32 t6=-1.7E308f64 t7=false t8=\"binary_val_2\" t9=L\"标签值2\""
]
code = self._conn.insert_telnet_lines(lines3_0)
@@ -288,9 +288,9 @@ class TDTestCase:
#tag ID as child table name
lines3_1 = [
- "stb3_1 1626006833610ms 1 id=\"child_table1\",host=\"host1\"",
- "stb3_1 1626006833610ms 2 host=\"host2\",iD=\"child_table2\"",
- "stb3_1 1626006833610ms 3 ID=\"child_table3\",host=\"host3\""
+ "stb3_1 1626006833610ms 1 id=\"child_table1\" host=\"host1\"",
+ "stb3_1 1626006833610ms 2 host=\"host2\" iD=\"child_table2\"",
+ "stb3_1 1626006833610ms 3 ID=\"child_table3\" host=\"host3\""
]
code = self._conn.insert_telnet_lines(lines3_1)
diff --git a/tests/pytest/insert/openTsdbTelnetLinesInsert.py b/tests/pytest/insert/openTsdbTelnetLinesInsert.py
index e0d1c0d9669e77e236d4b1591b302a717c5a93d1..26d25941950602978334da0234aa40ce3d4a6c3b 100644
--- a/tests/pytest/insert/openTsdbTelnetLinesInsert.py
+++ b/tests/pytest/insert/openTsdbTelnetLinesInsert.py
@@ -13,10 +13,8 @@
import traceback
import random
-import string
-from taos.error import LinesError
+from taos.error import TelnetLinesError
import time
-from copy import deepcopy
import numpy as np
from util.log import *
from util.cases import *
@@ -24,7 +22,6 @@ from util.sql import *
from util.common import tdCom
import threading
-
class TDTestCase:
def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__)
@@ -41,13 +38,13 @@ class TDTestCase:
tdSql.execute(f'use {name}')
def timeTrans(self, time_value):
- if time_value.endswith("ns"):
+ if time_value.lower().endswith("ns"):
ts = int(''.join(list(filter(str.isdigit, time_value))))/1000000000
- elif time_value.endswith("us") or time_value.isdigit() and int(time_value) != 0:
+ elif time_value.lower().endswith("us") or time_value.isdigit() and int(time_value) != 0:
ts = int(''.join(list(filter(str.isdigit, time_value))))/1000000
- elif time_value.endswith("ms"):
+ elif time_value.lower().endswith("ms"):
ts = int(''.join(list(filter(str.isdigit, time_value))))/1000
- elif time_value.endswith("s") and list(time_value)[-1] not in "num":
+ elif time_value.lower().endswith("s") and list(time_value)[-1] not in "num":
ts = int(''.join(list(filter(str.isdigit, time_value))))/1
elif int(time_value) == 0:
ts = time.time()
@@ -70,43 +67,49 @@ class TDTestCase:
return int(time.mktime(time.strptime(datetime_input, "%Y-%m-%d %H:%M:%S.%f")))
def getTdTypeValue(self, value):
- if value.endswith("i8"):
+ if value.lower().endswith("i8"):
td_type = "TINYINT"
td_tag_value = ''.join(list(value)[:-2])
- elif value.endswith("i16"):
+ elif value.lower().endswith("i16"):
td_type = "SMALLINT"
td_tag_value = ''.join(list(value)[:-3])
- elif value.endswith("i32"):
+ elif value.lower().endswith("i32"):
td_type = "INT"
td_tag_value = ''.join(list(value)[:-3])
- elif value.endswith("i64"):
+ elif value.lower().endswith("i64"):
td_type = "BIGINT"
td_tag_value = ''.join(list(value)[:-3])
- elif value.endswith("u64"):
+ elif value.lower().endswith("u64"):
td_type = "BIGINT UNSIGNED"
td_tag_value = ''.join(list(value)[:-3])
- elif value.endswith("f32"):
+ elif value.lower().endswith("f32"):
td_type = "FLOAT"
td_tag_value = ''.join(list(value)[:-3])
td_tag_value = '{}'.format(np.float32(td_tag_value))
- elif value.endswith("f64"):
+ elif value.lower().endswith("f64"):
td_type = "DOUBLE"
td_tag_value = ''.join(list(value)[:-3])
- elif value.startswith('L"'):
+ elif value.lower().startswith('l"'):
td_type = "NCHAR"
td_tag_value = ''.join(list(value)[2:-1])
elif value.startswith('"') and value.endswith('"'):
td_type = "BINARY"
td_tag_value = ''.join(list(value)[1:-1])
- elif value.lower() == "t" or value == "true" or value == "True" or value == "TRUE":
+ elif value.lower() == "t" or value.lower() == "true":
td_type = "BOOL"
td_tag_value = "True"
- elif value.lower() == "f" or value == "false" or value == "False" or value == "FALSE":
+ elif value.lower() == "f" or value.lower() == "false":
td_type = "BOOL"
td_tag_value = "False"
- else:
- td_type = "FLOAT"
+ elif value.isdigit():
+ td_type = "BIGINT"
td_tag_value = value
+ else:
+ td_type = "DOUBLE"
+ if "e" in value.lower():
+ td_tag_value = str(float(value))
+ else:
+ td_tag_value = value
return td_type, td_tag_value
def typeTrans(self, type_list):
@@ -139,9 +142,7 @@ class TDTestCase:
def inputHandle(self, input_sql):
input_sql_split_list = input_sql.split(" ")
stb_name = input_sql_split_list[0]
-
- #'stb2_5 1626006833610ms 3f64 host="host0"',
- stb_tag_list = input_sql_split_list[3].split(',')
+ stb_tag_list = input_sql_split_list[3:]
stb_col_value = input_sql_split_list[2]
ts_value = self.timeTrans(input_sql_split_list[1])
@@ -191,7 +192,8 @@ class TDTestCase:
t4="9223372036854775807i64", t5="11.12345f32", t6="22.123456789f64", t7="\"binaryTagValue\"",
t8="L\"ncharTagValue\"", ts="1626006833639000000ns",
id_noexist_tag=None, id_change_tag=None, id_upper_tag=None, id_double_tag=None,
- t_add_tag=None, t_mul_tag=None, t_multi_tag=None, t_blank_tag=None):
+ t_add_tag=None, t_mul_tag=None, t_multi_tag=None, c_blank_tag=None, t_blank_tag=None,
+ chinese_tag=None, multi_field_tag=None, point_trans_tag=None):
if stb_name == "":
stb_name = tdCom.getLongName(len=6, mode="letters")
if tb_name == "":
@@ -204,25 +206,33 @@ class TDTestCase:
id = "ID"
else:
id = "id"
- sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}\",t0={t0},t1={t1},t2={t2},t3={t3},t4={t4},t5={t5},t6={t6},t7={t7},t8={t8}'
+ sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}\" t0={t0} t1={t1} t2={t2} t3={t3} t4={t4} t5={t5} t6={t6} t7={t7} t8={t8}'
if id_noexist_tag is not None:
- sql_seq = f'{stb_name} {ts} {value} t0={t0},t1={t1},t2={t2},t3={t3},t4={t4},t5={t5},t6={t6},t7={t7},t8={t8}'
+ sql_seq = f'{stb_name} {ts} {value} t0={t0} t1={t1} t2={t2} t3={t3} t4={t4} t5={t5} t6={t6} t7={t7} t8={t8}'
if t_add_tag is not None:
- sql_seq = f'{stb_name} {ts} {value} t0={t0},t1={t1},t2={t2},t3={t3},t4={t4},t5={t5},t6={t6},t7={t7},t8={t8},t9={t8}'
+ sql_seq = f'{stb_name} {ts} {value} t0={t0} t1={t1} t2={t2} t3={t3} t4={t4} t5={t5} t6={t6} t7={t7} t8={t8} t9={t8}'
if id_change_tag is not None:
- sql_seq = f'{stb_name} {ts} {value} t0={t0},{id}=\"{tb_name}\",t1={t1},t2={t2},t3={t3},t4={t4},t5={t5},t6={t6},t7={t7},t8={t8}'
+ sql_seq = f'{stb_name} {ts} {value} t0={t0} {id}=\"{tb_name}\" t1={t1} t2={t2} t3={t3} t4={t4} t5={t5} t6={t6} t7={t7} t8={t8}'
if id_double_tag is not None:
- sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}_1\",t0={t0},t1={t1},{id}=\"{tb_name}_2\",t2={t2},t3={t3},t4={t4},t5={t5},t6={t6},t7={t7},t8={t8}'
+ sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}_1\" t0={t0} t1={t1} {id}=\"{tb_name}_2\" t2={t2} t3={t3} t4={t4} t5={t5} t6={t6} t7={t7} t8={t8}'
if t_add_tag is not None:
- sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}\",t0={t0},t1={t1},t2={t2},t3={t3},t4={t4},t5={t5},t6={t6},t7={t7},t8={t8},t11={t1},t10={t8}'
+ sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}\" t0={t0} t1={t1} t2={t2} t3={t3} t4={t4} t5={t5} t6={t6} t7={t7} t8={t8} t11={t1} t10={t8}'
if t_mul_tag is not None:
- sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}\",t0={t0},t1={t1},t2={t2},t3={t3},t4={t4},t5={t5},t6={t6}'
+ sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}\" t0={t0} t1={t1} t2={t2} t3={t3} t4={t4} t5={t5} t6={t6}'
if id_noexist_tag is not None:
- sql_seq = f'{stb_name} {ts} {value} t0={t0},t1={t1},t2={t2},t3={t3},t4={t4},t5={t5},t6={t6}'
+ sql_seq = f'{stb_name} {ts} {value} t0={t0} t1={t1} t2={t2} t3={t3} t4={t4} t5={t5} t6={t6}'
if t_multi_tag is not None:
- sql_seq = f'{stb_name} {ts} {value},{value} {id}=\"{tb_name}\",t0={t0},t1={t1},t2={t2},t3={t3},t4={t4},t5={t5},t6={t6}'
+ sql_seq = f'{stb_name} {ts} {value} {value} {id}=\"{tb_name}\" t0={t0} t1={t1} t2={t2} t3={t3} t4={t4} t5={t5} t6={t6}'
+ if c_blank_tag is not None:
+ sql_seq = f'{stb_name} {ts} {id}=\"{tb_name}\" t0={t0} t1={t1} t2={t2} t3={t3} t4={t4} t5={t5} t6={t6} t7={t7} t8={t8}'
if t_blank_tag is not None:
- sql_seq = f'{stb_name} {ts} {id}=\"{tb_name}\",t0={t0},t1={t1},t2={t2},t3={t3},t4={t4},t5={t5},t6={t6},t7={t7},t8={t8}'
+ sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}\"'
+ if chinese_tag is not None:
+ sql_seq = f'{stb_name} {ts} L"涛思数据" t0={t0} t1=L"涛思数据"'
+ if multi_field_tag is not None:
+ sql_seq = f'{stb_name} {ts} {value} {id}=\"{tb_name}\" t0={t0} {value}'
+ if point_trans_tag is not None:
+ sql_seq = f'point.trans.test {ts} {value} t0={t0}'
return sql_seq, stb_name
def genMulTagColStr(self, genType, count=1):
@@ -234,7 +244,7 @@ class TDTestCase:
if genType == "tag":
for i in range(0, count):
if i < (count-1):
- tag_str += f't{i}=f,'
+ tag_str += f't{i}=f '
else:
tag_str += f't{i}=f'
return tag_str
@@ -248,7 +258,7 @@ class TDTestCase:
tag_str = self.genMulTagColStr("tag", tag_count)
col_str = self.genMulTagColStr("col")
ts = "1626006833640000000ns"
- long_sql = stb_name + ' ' + ts + ' ' + col_str + ' ' + f'id=\"{tb_name}\"' + ',' + tag_str
+ long_sql = stb_name + ' ' + ts + ' ' + col_str + ' ' + f'id=\"{tb_name}\"' + ' ' + tag_str
return long_sql, stb_name
def getNoIdTbName(self, stb_name):
@@ -259,8 +269,6 @@ class TDTestCase:
def resHandle(self, query_sql, query_tag):
tdSql.execute('reset query cache')
row_info = tdSql.query(query_sql, query_tag)
- print(query_sql)
- print(row_info)
col_info = tdSql.getColNameList(query_sql, query_tag)
res_row_list = []
sub_list = []
@@ -277,22 +285,6 @@ class TDTestCase:
self._conn.insert_telnet_lines([input_sql])
query_sql = f"{query_sql} {stb_name} {condition}"
res_row_list, res_field_list_without_ts, res_type_list = self.resHandle(query_sql, True)
- res = tdSql.query(f'select * from {stb_name}', True)
- print(res)
-
- res = tdSql.query(f'select * from {stb_name}', True)
- print(res)
- time.sleep(2)
- res = tdSql.query(f'select * from {stb_name}', True)
- print(res)
- time.sleep(2)
- res = tdSql.query(f'select * from {stb_name}', True)
- print(res)
- time.sleep(2)
- res = tdSql.query(f'select * from {stb_name}', True)
- print(res)
-
-
if ts == 0:
res_ts = self.dateToTs(res_row_list[0][0])
current_time = time.time()
@@ -312,7 +304,6 @@ class TDTestCase:
tdSql.checkEqual(res_field_list_without_ts, expect_list[1])
for i in range(len(res_type_list)):
tdSql.checkEqual(res_type_list[i], expect_list[2][i])
- # tdSql.checkEqual(res_type_list, expect_list[2])
def initCheckCase(self):
"""
@@ -341,19 +332,16 @@ class TDTestCase:
binary_symbols = '\"abcd`~!@#$%^&*()_-{[}]|:;<.>?lfjal"\'\'"\"'
'''
tdCom.cleanTb()
- binary_symbols = '"aaa"'
- # binary_symbols = '"abcd`~!@#$%^&*()_-{[}]|:;<.>?lfjal"'
+ binary_symbols = '"abcd`~!@#$%^&*()_-{[}]|:;<.>?lfjal"'
nchar_symbols = f'L{binary_symbols}'
input_sql1, stb_name1 = self.genFullTypeSql(value=binary_symbols, t7=binary_symbols, t8=nchar_symbols)
-
- # input_sql2, stb_name2 = self.genFullTypeSql(value=nchar_symbols, t7=binary_symbols, t8=nchar_symbols)
+ input_sql2, stb_name2 = self.genFullTypeSql(value=nchar_symbols, t7=binary_symbols, t8=nchar_symbols)
self.resCmp(input_sql1, stb_name1)
- # self.resCmp(input_sql2, stb_name2)
+ self.resCmp(input_sql2, stb_name2)
def tsCheckCase(self):
"""
test ts list --> ["1626006833639000000ns", "1626006833639019us", "1626006833640ms", "1626006834s", "1626006822639022"]
- # ! us级时间戳都为0时，数据库中查询显示，但python接口拿到的结果不显示 .000000的情况请确认，目前修改时间处理代码可以通过
"""
tdCom.cleanTb()
ts_list = ["1626006833639000000ns", "1626006833639019us", "1626006833640ms", "1626006834s", "1626006822639022", 0]
@@ -406,9 +394,10 @@ class TDTestCase:
tdCom.cleanTb()
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
-
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
+
def idIllegalNameCheckCase(self):
"""
test illegal id name
@@ -420,8 +409,9 @@ class TDTestCase:
input_sql = self.genFullTypeSql(tb_name=f"\"aaa{i}bbb\"")[0]
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
def idStartWithNumCheckCase(self):
"""
@@ -431,8 +421,9 @@ class TDTestCase:
input_sql = self.genFullTypeSql(tb_name=f"\"1aaabbb\"")[0]
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
def nowTsCheckCase(self):
"""
@@ -442,8 +433,9 @@ class TDTestCase:
input_sql = self.genFullTypeSql(ts="now")[0]
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
def dateFormatTsCheckCase(self):
"""
@@ -453,8 +445,9 @@ class TDTestCase:
input_sql = self.genFullTypeSql(ts="2021-07-21\ 19:01:46.920")[0]
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
def illegalTsCheckCase(self):
"""
@@ -464,8 +457,9 @@ class TDTestCase:
input_sql = self.genFullTypeSql(ts="16260068336390us19")[0]
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
def tagValueLengthCheckCase(self):
"""
@@ -480,8 +474,9 @@ class TDTestCase:
input_sql = self.genFullTypeSql(t1=t1)[0]
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
#i16
for t2 in ["-32767i16", "32767i16"]:
@@ -491,8 +486,9 @@ class TDTestCase:
input_sql = self.genFullTypeSql(t2=t2)[0]
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
#i32
for t3 in ["-2147483647i32", "2147483647i32"]:
@@ -502,8 +498,9 @@ class TDTestCase:
input_sql = self.genFullTypeSql(t3=t3)[0]
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
#i64
for t4 in ["-9223372036854775807i64", "9223372036854775807i64"]:
@@ -513,8 +510,9 @@ class TDTestCase:
input_sql = self.genFullTypeSql(t4=t4)[0]
try:
self._conn.insert_telnet_lines([input_sql])
- except LinesError:
- pass
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
# f32
for t5 in [f"{-3.4028234663852885981170418348451692544*(10**38)}f32", f"{3.4028234663852885981170418348451692544*(10**38)}f32"]:
@@ -526,7 +524,7 @@ class TDTestCase:
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
@@ -535,37 +533,36 @@ class TDTestCase:
input_sql, stb_name = self.genFullTypeSql(t6=t6)
self.resCmp(input_sql, stb_name)
# * limit set to 1.797693134862316*(10**308)
- for c6 in [f'{-1.797693134862316*(10**308)}f64', f'{-1.797693134862316*(10**308)}f64']:
- input_sql = self.genFullTypeSql(c6=c6)[0]
+ for t6 in [f'{-1.797693134862316*(10**308)}f64', f'{-1.797693134862316*(10**308)}f64']:
+ input_sql = self.genFullTypeSql(t6=t6)[0]
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# binary
stb_name = tdCom.getLongName(7, "letters")
- input_sql = f'{stb_name} 1626006833639000000ns t t0=t,t1="{tdCom.getLongName(16374, "letters")}"'
+ input_sql = f'{stb_name} 1626006833639000000ns t t0=t t1="{tdCom.getLongName(16374, "letters")}"'
self._conn.insert_telnet_lines([input_sql])
- input_sql = f'{stb_name} 1626006833639000000ns t t0=t,t1="{tdCom.getLongName(16375, "letters")}"'
+ input_sql = f'{stb_name} 1626006833639000000ns t t0=t t1="{tdCom.getLongName(16375, "letters")}"'
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
- pass
-
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
# nchar
# * legal nchar could not be larger than 16374/4
stb_name = tdCom.getLongName(7, "letters")
- input_sql = f'{stb_name} 1626006833639000000ns t t0=t,t1=L"{tdCom.getLongName(4093, "letters")}"'
+ input_sql = f'{stb_name} 1626006833639000000ns t t0=t t1=L"{tdCom.getLongName(4093, "letters")}"'
self._conn.insert_telnet_lines([input_sql])
- input_sql = f'{stb_name} 1626006833639000000ns t t0=t,t1=L"{tdCom.getLongName(4094, "letters")}"'
+ input_sql = f'{stb_name} 1626006833639000000ns t t0=t t1=L"{tdCom.getLongName(4094, "letters")}"'
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
def colValueLengthCheckCase(self):
@@ -574,102 +571,116 @@ class TDTestCase:
"""
tdCom.cleanTb()
# i8
- for c1 in ["-127i8", "127i8"]:
- input_sql, stb_name = self.genFullTypeSql(c1=c1)
+ for value in ["-127i8", "127i8"]:
+ input_sql, stb_name = self.genFullTypeSql(value=value)
self.resCmp(input_sql, stb_name)
-
- for c1 in ["-128i8", "128i8"]:
- input_sql = self.genFullTypeSql(c1=c1)[0]
+ tdCom.cleanTb()
+ for value in ["-128i8", "128i8"]:
+ input_sql = self.genFullTypeSql(value=value)[0]
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# i16
- for c2 in ["-32767i16"]:
- input_sql, stb_name = self.genFullTypeSql(c2=c2)
+ tdCom.cleanTb()
+ for value in ["-32767i16"]:
+ input_sql, stb_name = self.genFullTypeSql(value=value)
self.resCmp(input_sql, stb_name)
- for c2 in ["-32768i16", "32768i16"]:
- input_sql = self.genFullTypeSql(c2=c2)[0]
+ tdCom.cleanTb()
+ for value in ["-32768i16", "32768i16"]:
+ input_sql = self.genFullTypeSql(value=value)[0]
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# i32
- for c3 in ["-2147483647i32"]:
- input_sql, stb_name = self.genFullTypeSql(c3=c3)
+ tdCom.cleanTb()
+ for value in ["-2147483647i32"]:
+ input_sql, stb_name = self.genFullTypeSql(value=value)
self.resCmp(input_sql, stb_name)
- for c3 in ["-2147483648i32", "2147483648i32"]:
- input_sql = self.genFullTypeSql(c3=c3)[0]
+ tdCom.cleanTb()
+ for value in ["-2147483648i32", "2147483648i32"]:
+ input_sql = self.genFullTypeSql(value=value)[0]
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# i64
- for c4 in ["-9223372036854775807i64"]:
- input_sql, stb_name = self.genFullTypeSql(c4=c4)
+ tdCom.cleanTb()
+ for value in ["-9223372036854775807i64"]:
+ input_sql, stb_name = self.genFullTypeSql(value=value)
self.resCmp(input_sql, stb_name)
- for c4 in ["-9223372036854775808i64", "9223372036854775808i64"]:
- input_sql = self.genFullTypeSql(c4=c4)[0]
+ tdCom.cleanTb()
+ for value in ["-9223372036854775808i64", "9223372036854775808i64"]:
+ input_sql = self.genFullTypeSql(value=value)[0]
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# f32
- for c5 in [f"{-3.4028234663852885981170418348451692544*(10**38)}f32", f"{3.4028234663852885981170418348451692544*(10**38)}f32"]:
- input_sql, stb_name = self.genFullTypeSql(c5=c5)
+ tdCom.cleanTb()
+ for value in [f"{-3.4028234663852885981170418348451692544*(10**38)}f32", f"{3.4028234663852885981170418348451692544*(10**38)}f32"]:
+ input_sql, stb_name = self.genFullTypeSql(value=value)
self.resCmp(input_sql, stb_name)
# * limit set to 4028234664*(10**38)
- for c5 in [f"{-3.4028234664*(10**38)}f32", f"{3.4028234664*(10**38)}f32"]:
- input_sql = self.genFullTypeSql(c5=c5)[0]
+ tdCom.cleanTb()
+ for value in [f"{-3.4028234664*(10**38)}f32", f"{3.4028234664*(10**38)}f32"]:
+ input_sql = self.genFullTypeSql(value=value)[0]
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# f64
- for c6 in [f'{-1.79769313486231570814527423731704356798070567525844996598917476803157260780*(10**308)}f64', f'{-1.79769313486231570814527423731704356798070567525844996598917476803157260780*(10**308)}f64']:
- input_sql, stb_name = self.genFullTypeSql(c6=c6)
+ tdCom.cleanTb()
+ for value in [f'{-1.79769313486231570814527423731704356798070567525844996598917476803157260780*(10**308)}f64', f'{-1.79769313486231570814527423731704356798070567525844996598917476803157260780*(10**308)}f64']:
+ input_sql, stb_name = self.genFullTypeSql(value=value)
self.resCmp(input_sql, stb_name)
# * limit set to 1.797693134862316*(10**308)
- for c6 in [f'{-1.797693134862316*(10**308)}f64', f'{-1.797693134862316*(10**308)}f64']:
- input_sql = self.genFullTypeSql(c6=c6)[0]
+ tdCom.cleanTb()
+ for value in [f'{-1.797693134862316*(10**308)}f64', f'{-1.797693134862316*(10**308)}f64']:
+ input_sql = self.genFullTypeSql(value=value)[0]
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# # binary
+ tdCom.cleanTb()
stb_name = tdCom.getLongName(7, "letters")
input_sql = f'{stb_name} 1626006833639000000ns "{tdCom.getLongName(16374, "letters")}" t0=t'
self._conn.insert_telnet_lines([input_sql])
+ tdCom.cleanTb()
input_sql = f'{stb_name} 1626006833639000000ns "{tdCom.getLongName(16375, "letters")}" t0=t'
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# nchar
# * legal nchar could not be larger than 16374/4
+ tdCom.cleanTb()
stb_name = tdCom.getLongName(7, "letters")
input_sql = f'{stb_name} 1626006833639000000ns L"{tdCom.getLongName(4093, "letters")}" t0=t'
self._conn.insert_telnet_lines([input_sql])
+ tdCom.cleanTb()
input_sql = f'{stb_name} 1626006833639000000ns L"{tdCom.getLongName(4094, "letters")}" t0=t'
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
def tagColIllegalValueCheckCase(self):
@@ -680,18 +691,10 @@ class TDTestCase:
tdCom.cleanTb()
# bool
for i in ["TrUe", "tRue", "trUe", "truE", "FalsE", "fAlse", "faLse", "falSe", "falsE"]:
- input_sql1 = self.genFullTypeSql(t0=i)[0]
- try:
- self._conn.insert_telnet_lines([input_sql1])
- raise Exception("should not reach here")
- except LinesError as err:
- tdSql.checkNotEqual(err.errno, 0)
- input_sql2 = self.genFullTypeSql(value=i)[0]
- try:
- self._conn.insert_telnet_lines([input_sql2])
- raise Exception("should not reach here")
- except LinesError as err:
- tdSql.checkNotEqual(err.errno, 0)
+ input_sql1, stb_name = self.genFullTypeSql(t0=i)
+ self.resCmp(input_sql1, stb_name)
+ input_sql2, stb_name = self.genFullTypeSql(value=i)
+ self.resCmp(input_sql2, stb_name)
# i8 i16 i32 i64 f32 f64
for input_sql in [
@@ -705,31 +708,50 @@ class TDTestCase:
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# check binary and nchar blank
- stb_name = tdCom.getLongName(7, "letters")
-
- input_sql1 = f'{stb_name} 1626006833639000000ns "abc aaa" t0=t'
- input_sql2 = f'{stb_name} 1626006833639000000ns L"abc aaa" t0=t'
- input_sql3 = f'{stb_name} 1626006833639000000ns t t0="abc aaa"'
- input_sql4 = f'{stb_name} 1626006833639000000ns t t0=L"abc aaa"'
+ input_sql1 = f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns "abc aaa" t0=t'
+ input_sql2 = f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns L"abc aaa" t0=t'
+ input_sql3 = f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns t t0="abc aaa"'
+ input_sql4 = f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns t t0=L"abc aaa"'
for input_sql in [input_sql1, input_sql2, input_sql3, input_sql4]:
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
# check accepted binary and nchar symbols
# # * ~!@#$¥%^&*()-+={}|[]、「」:;
for symbol in list('~!@#$¥%^&*()-+={}|[]、「」:;'):
- input_sql1 = f'{stb_name} 1626006833639000000ns "abc{symbol}aaa" t0=t'
- input_sql2 = f'{stb_name} 1626006833639000000ns t t0=t,t1="abc{symbol}aaa"'
+ input_sql1 = f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns "abc{symbol}aaa" t0=t'
+ input_sql2 = f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns t t0=t t1="abc{symbol}aaa"'
self._conn.insert_telnet_lines([input_sql1])
self._conn.insert_telnet_lines([input_sql2])
-
+
+ def blankCheckCase(self):
+ '''
+ check blank case
+ '''
+ tdCom.cleanTb()
+ input_sql_list = [f'{tdCom.getLongName(7, "letters")} {tdCom.getLongName(7, "letters")} 1626006833639000000ns "abcaaa" t0=t',
+ f'{tdCom.getLongName(7, "letters")} 16260068336 39000000ns L"bcdaaa" t1=f',
+ f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns t t0="abc aaa"',
+ f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns t t0=L"abc aaa"',
+ f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns "abc aaa" t0=L"abcaaa"',
+ f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns L"abc aaa" t0=L"abcaaa"',
+ f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns L"abaaa" t0=L"abcaaa1"',
+ f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns L"abaaa" t0=L"abcaaa2"',
+ f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns L"abaaa" t0=t t1="abc t2="taa""',
+ f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns L"abaaa" t0=L"abcaaa3"']
+ for input_sql in input_sql_list:
+ try:
+ self._conn.insert_telnet_lines([input_sql])
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
def duplicateIdTagColInsertCheckCase(self):
"""
@@ -740,7 +762,7 @@ class TDTestCase:
try:
self._conn.insert_telnet_lines([input_sql_id])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
input_sql = self.genFullTypeSql()[0]
@@ -748,7 +770,7 @@ class TDTestCase:
try:
self._conn.insert_telnet_lines([input_sql_tag])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
##### stb exist #####
@@ -756,6 +778,7 @@ class TDTestCase:
"""
case no id when stb exist
"""
+ print("noIdStbExistCheckCase")
tdCom.cleanTb()
input_sql, stb_name = self.genFullTypeSql(tb_name="sub_table_0123456", t0="f", value="f")
self.resCmp(input_sql, stb_name)
@@ -763,7 +786,6 @@ class TDTestCase:
self.resCmp(input_sql, stb_name, condition='where tbname like "t_%"')
tdSql.query(f"select * from {stb_name}")
tdSql.checkRows(2)
- # TODO cover other case
def duplicateInsertExistCheckCase(self):
"""
@@ -779,22 +801,24 @@ class TDTestCase:
"""
check length increase
"""
+ print("tagColBinaryNcharLengthCheckCase")
tdCom.cleanTb()
input_sql, stb_name = self.genFullTypeSql()
self.resCmp(input_sql, stb_name)
tb_name = tdCom.getLongName(5, "letters")
- input_sql, stb_name = self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name,t7="\"binaryTagValuebinaryTagValue\"", t8="L\"ncharTagValuencharTagValue\"", c7="\"binaryTagValuebinaryTagValue\"", c8="L\"ncharTagValuencharTagValue\"")
+ input_sql, stb_name = self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name,t7="\"binaryTagValuebinaryTagValue\"", t8="L\"ncharTagValuencharTagValue\"")
self.resCmp(input_sql, stb_name, condition=f'where tbname like "{tb_name}"')
def tagColAddDupIDCheckCase(self):
"""
- check column and tag count add, stb and tb duplicate
+ check tag count add, stb and tb duplicate
* tag: alter table ...
* col: when update==0 and ts is same, unchange
* so this case tag&&value will be added,
* col is added without value when update==0
* col is added with value when update==1
"""
+ print("tagColAddDupIDCheckCase")
tdCom.cleanTb()
tb_name = tdCom.getLongName(7, "letters")
for db_update_tag in [0, 1]:
@@ -802,25 +826,27 @@ class TDTestCase:
self.createDb("test_update", db_update_tag=db_update_tag)
input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name, t0="f", value="f")
self.resCmp(input_sql, stb_name)
- self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t0="f", value="f", ct_add_tag=True)
+ self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t0="f", value="f", t_add_tag=True)
if db_update_tag == 1 :
self.resCmp(input_sql, stb_name, condition=f'where tbname like "{tb_name}"')
else:
self.resCmp(input_sql, stb_name, condition=f'where tbname like "{tb_name}"', none_check_tag=True)
+ self.createDb()
def tagColAddCheckCase(self):
"""
- check column and tag count add
+ check tag count add
"""
+ print("tagColAddCheckCase")
tdCom.cleanTb()
tb_name = tdCom.getLongName(7, "letters")
input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name, t0="f", value="f")
self.resCmp(input_sql, stb_name)
tb_name_1 = tdCom.getLongName(7, "letters")
- input_sql, stb_name = self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name_1, t0="f", value="f", ct_add_tag=True)
+ input_sql, stb_name = self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name_1, t0="f", value="f", t_add_tag=True)
self.resCmp(input_sql, stb_name, condition=f'where tbname like "{tb_name_1}"')
- res_row_list = self.resHandle(f"select c10,c11,t10,t11 from {tb_name}", True)[0]
- tdSql.checkEqual(res_row_list[0], ['None', 'None', 'None', 'None'])
+ res_row_list = self.resHandle(f"select t10,t11 from {tb_name}", True)[0]
+ tdSql.checkEqual(res_row_list[0], ['None', 'None'])
self.resCmp(input_sql, stb_name, condition=f'where tbname like "{tb_name}"', none_check_tag=True)
def tagMd5Check(self):
@@ -838,7 +864,7 @@ class TDTestCase:
tdSql.query(f"select * from {stb_name}")
tdSql.checkRows(1)
tdSql.checkEqual(tb_name1, tb_name2)
- input_sql, stb_name = self.genFullTypeSql(stb_name=stb_name, t0="f", value="f", id_noexist_tag=True, ct_add_tag=True)
+ input_sql, stb_name = self.genFullTypeSql(stb_name=stb_name, t0="f", value="f", id_noexist_tag=True, t_add_tag=True)
self._conn.insert_telnet_lines([input_sql])
tb_name3 = self.getNoIdTbName(stb_name)
tdSql.query(f"select * from {stb_name}")
@@ -853,39 +879,25 @@ class TDTestCase:
tdCom.cleanTb()
stb_name = tdCom.getLongName(7, "letters")
tb_name = f'{stb_name}_1'
- input_sql = f'{stb_name},id="{tb_name}",t0=t c0=f 1626006833639000000ns'
+
+ input_sql = f'{stb_name} 1626006833639000000ns f id="{tb_name}" t0=t'
self._conn.insert_telnet_lines([input_sql])
# * every binary and nchar must be length+2, so here is two tag, max length could not larger than 16384-2*2
- input_sql = f'{stb_name},t0=t,t1="{tdCom.getLongName(16374, "letters")}",t2="{tdCom.getLongName(5, "letters")}" c0=f 1626006833639000000ns'
+ input_sql = f'{stb_name} 1626006833639000000ns f t0=t t1="{tdCom.getLongName(16374, "letters")}" t2="{tdCom.getLongName(5, "letters")}"'
self._conn.insert_telnet_lines([input_sql])
tdSql.query(f"select * from {stb_name}")
tdSql.checkRows(2)
- input_sql = f'{stb_name},t0=t,t1="{tdCom.getLongName(16374, "letters")}",t2="{tdCom.getLongName(6, "letters")}" c0=f 1626006833639000000ns'
+ input_sql = f'{stb_name} 1626006833639000000ns f t0=t t1="{tdCom.getLongName(16374, "letters")}" t2="{tdCom.getLongName(6, "letters")}"'
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError:
- pass
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
tdSql.query(f"select * from {stb_name}")
tdSql.checkRows(2)
- # # * check col，col+ts max in describe ---> 16143
- input_sql = f'{stb_name},t0=t c0=f,c1="{tdCom.getLongName(16374, "letters")}",c2="{tdCom.getLongName(16374, "letters")}",c3="{tdCom.getLongName(16374, "letters")}",c4="{tdCom.getLongName(12, "letters")}" 1626006833639000000ns'
- self._conn.insert_telnet_lines([input_sql])
-
- tdSql.query(f"select * from {stb_name}")
- tdSql.checkRows(3)
- input_sql = f'{stb_name},t0=t c0=f,c1="{tdCom.getLongName(16374, "letters")}",c2="{tdCom.getLongName(16374, "letters")}",c3="{tdCom.getLongName(16374, "letters")}",c4="{tdCom.getLongName(13, "letters")}" 1626006833639000000ns'
- try:
- self._conn.insert_telnet_lines([input_sql])
- raise Exception("should not reach here")
- except LinesError as err:
- tdSql.checkNotEqual(err.errno, 0)
- tdSql.query(f"select * from {stb_name}")
- tdSql.checkRows(3)
-
# * tag nchar max is 16374/4, col+ts nchar max 49151
def tagColNcharMaxLengthCheckCase(self):
"""
@@ -894,36 +906,23 @@ class TDTestCase:
tdCom.cleanTb()
stb_name = tdCom.getLongName(7, "letters")
tb_name = f'{stb_name}_1'
- input_sql = f'{stb_name},id="{tb_name}",t0=t c0=f 1626006833639000000ns'
- code = self._conn.insert_telnet_lines([input_sql])
+ input_sql = f'{stb_name} 1626006833639000000ns f id="{tb_name}" t0=t'
+ self._conn.insert_telnet_lines([input_sql])
# * legal nchar could not be larger than 16374/4
- input_sql = f'{stb_name},t0=t,t1=L"{tdCom.getLongName(4093, "letters")}",t2=L"{tdCom.getLongName(1, "letters")}" c0=f 1626006833639000000ns'
+ input_sql = f'{stb_name} 1626006833639000000ns f t0=t t1=L"{tdCom.getLongName(4093, "letters")}" t2=L"{tdCom.getLongName(1, "letters")}"'
self._conn.insert_telnet_lines([input_sql])
tdSql.query(f"select * from {stb_name}")
tdSql.checkRows(2)
- input_sql = f'{stb_name},t0=t,t1=L"{tdCom.getLongName(4093, "letters")}",t2=L"{tdCom.getLongName(2, "letters")}" c0=f 1626006833639000000ns'
+ input_sql = f'{stb_name} 1626006833639000000ns f t0=t t1=L"{tdCom.getLongName(4093, "letters")}" t2=L"{tdCom.getLongName(2, "letters")}"'
try:
self._conn.insert_telnet_lines([input_sql])
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
tdSql.query(f"select * from {stb_name}")
tdSql.checkRows(2)
- input_sql = f'{stb_name},t0=t c0=f,c1=L"{tdCom.getLongName(4093, "letters")}",c2=L"{tdCom.getLongName(4093, "letters")}",c3=L"{tdCom.getLongName(4093, "letters")}",c4=L"{tdCom.getLongName(4, "letters")}" 1626006833639000000ns'
- self._conn.insert_telnet_lines([input_sql])
- tdSql.query(f"select * from {stb_name}")
- tdSql.checkRows(3)
- input_sql = f'{stb_name},t0=t c0=f,c1=L"{tdCom.getLongName(4093, "letters")}",c2=L"{tdCom.getLongName(4093, "letters")}",c3=L"{tdCom.getLongName(4093, "letters")}",c4=L"{tdCom.getLongName(5, "letters")}" 1626006833639000000ns'
- try:
- self._conn.insert_telnet_lines([input_sql])
- raise Exception("should not reach here")
- except LinesError as err:
- tdSql.checkNotEqual(err.errno, 0)
- tdSql.query(f"select * from {stb_name}")
- tdSql.checkRows(3)
-
def batchInsertCheckCase(self):
"""
test batch insert
@@ -931,17 +930,24 @@ class TDTestCase:
tdCom.cleanTb()
stb_name = tdCom.getLongName(8, "letters")
tdSql.execute(f'create stable {stb_name}(ts timestamp, f int) tags(t1 bigint)')
- lines = ["st123456,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns",
- "st123456,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns",
- f"{stb_name},t2=5f64,t3=L\"ste\" c1=true,c2=4i64,c3=\"iam\" 1626056811823316532ns",
- "stf567890,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns",
- "st123456,t1=4i64,t2=5f64,t3=\"t4\" c1=3i64,c3=L\"passitagain\",c2=true,c4=5f64 1626006833642000000ns",
- f"{stb_name},t2=5f64,t3=L\"ste2\" c3=\"iamszhou\",c4=false 1626056811843316532ns",
- f"{stb_name},t2=5f64,t3=L\"ste2\" c3=\"iamszhou\",c4=false,c5=32i8,c6=64i16,c7=32i32,c8=88.88f32 1626056812843316532ns",
- "st123456,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns",
- "st123456,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641000000ns"
+
+ lines = ["st123456 1626006833639000000ns 1i64 t1=3i64 t2=4f64 t3=\"t3\"",
+ "st123456 1626006833640000000ns 2i64 t1=4i64 t3=\"t4\" t2=5f64 t4=5f64",
+ f'{stb_name} 1626056811823316532ns 3i64 t2=5f64 t3=L\"ste\"',
+ "stf567890 1626006933640000000ns 4i64 t1=4i64 t3=\"t4\" t2=5f64 t4=5f64",
+ "st123456 1626006833642000000ns 5i64 t1=4i64 t2=5f64 t3=\"t4\"",
+ f'{stb_name} 1626056811843316532ns 6i64 t2=5f64 t3=L\"ste2\"',
+ f'{stb_name} 1626056812843316532ns 7i64 t2=5f64 t3=L\"ste2\"',
+ "st123456 1626006933640000000ns 8i64 t1=4i64 t3=\"t4\" t2=5f64 t4=5f64",
+ "st123456 1626006933641000000ns 9i64 t1=4i64 t3=\"t4\" t2=5f64 t4=5f64"
]
self._conn.insert_telnet_lines(lines)
+ tdSql.query('show stables')
+ tdSql.checkRows(3)
+ tdSql.query('show tables')
+ tdSql.checkRows(6)
+ tdSql.query('select * from st123456')
+ tdSql.checkRows(5)
def multiInsertCheckCase(self, count):
"""
@@ -952,9 +958,11 @@ class TDTestCase:
stb_name = tdCom.getLongName(8, "letters")
tdSql.execute(f'create stable {stb_name}(ts timestamp, f int) tags(t1 bigint)')
for i in range(count):
- input_sql = self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True)[0]
+ input_sql = self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True)[0]
sql_list.append(input_sql)
self._conn.insert_telnet_lines(sql_list)
+ tdSql.query('show tables')
+ tdSql.checkRows(count)
def batchErrorInsertCheckCase(self):
"""
@@ -962,14 +970,107 @@ class TDTestCase:
"""
tdCom.cleanTb()
stb_name = tdCom.getLongName(8, "letters")
- lines = ["st123456,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns",
- f"{stb_name},t2=5f64,t3=L\"ste\" c1=tRue,c2=4i64,c3=\"iam\" 1626056811823316532ns"]
+ lines = ["st123456 1626006833639000000ns 3i 64 t1=3i64 t2=4f64 t3=\"t3\"",
+ f"{stb_name} 1626056811823316532ns tRue t2=5f64 t3=L\"ste\""]
try:
self._conn.insert_telnet_lines(lines)
raise Exception("should not reach here")
- except LinesError as err:
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
+
+ def multiColsInsertCheckCase(self):
+ """
+ test multi cols insert
+ """
+ tdCom.cleanTb()
+ input_sql = self.genFullTypeSql(t_multi_tag=True)[0]
+ try:
+ self._conn.insert_telnet_lines([input_sql])
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
+
+ def blankColInsertCheckCase(self):
+ """
+ test blank col insert
+ """
+ tdCom.cleanTb()
+ input_sql = self.genFullTypeSql(c_blank_tag=True)[0]
+ try:
+ self._conn.insert_telnet_lines([input_sql])
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
+
+ def blankTagInsertCheckCase(self):
+ """
+ test blank tag insert
+ """
+ tdCom.cleanTb()
+ input_sql = self.genFullTypeSql(t_blank_tag=True)[0]
+ try:
+ self._conn.insert_telnet_lines([input_sql])
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
+ tdSql.checkNotEqual(err.errno, 0)
+
+ def chineseCheckCase(self):
+ """
+ check nchar ---> chinese
+ """
+ tdCom.cleanTb()
+ input_sql, stb_name = self.genFullTypeSql(chinese_tag=True)
+ self.resCmp(input_sql, stb_name)
+
+ def multiFieldCheckCase(self):
+ '''
+ multi_field
+ '''
+ tdCom.cleanTb()
+ input_sql = self.genFullTypeSql(multi_field_tag=True)[0]
+ try:
+ self._conn.insert_telnet_lines([input_sql])
+ raise Exception("should not reach here")
+ except TelnetLinesError as err:
tdSql.checkNotEqual(err.errno, 0)
+ def errorTypeCheckCase(self):
+ stb_name = tdCom.getLongName(8, "letters")
+ input_sql_list = [f'{stb_name}_1 1626006833639000000Ns "hkgjiwdj" t0=f t1=127I8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_2 1626006833639000001nS "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_3 1626006833639000002NS "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_4 1626006833639019Us "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647I32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_5 1626006833639018uS "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807I64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_6 1626006833639017US "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807I64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_7 1626006833640Ms "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789F64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_8 1626006833641mS "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_9 1626006833642MS "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_10 1626006834S "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=l"ncharTagValue"', \
+ f'{stb_name}_11 1626006834S "hkgjiwdj" t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"']
+ for input_sql in input_sql_list:
+ stb_name = input_sql.split(" ")[0]
+ self.resCmp(input_sql, stb_name)
+
+ def pointTransCheckCase(self):
+ """
+ metric value "." trans to "_"
+ """
+ tdCom.cleanTb()
+ input_sql = self.genFullTypeSql(point_trans_tag=True)[0]
+ stb_name = input_sql.split(" ")[0].replace(".", "_")
+ self.resCmp(input_sql, stb_name)
+
+ def defaultTypeCheckCase(self):
+ stb_name = tdCom.getLongName(8, "letters")
+ input_sql_list = [f'{stb_name}_1 1626006833639000000Ns 9223372036854775807 t0=f t1=127 t2=32767i16 t3=2147483647i32 t4=9223372036854775807 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_2 1626006834S 22.123456789 t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_3 1626006834S 10e5 t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=10e5 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_4 1626006834S 10.0e5 t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=10.0e5 t7="vozamcts" t8=L"ncharTagValue"', \
+ f'{stb_name}_5 1626006834S -10.0e5 t0=f t1=127i8 t2=32767I16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=-10.0e5 t7="vozamcts" t8=L"ncharTagValue"']
+ for input_sql in input_sql_list:
+ stb_name = input_sql.split(" ")[0]
+ self.resCmp(input_sql, stb_name)
+
def genSqlList(self, count=5, stb_name="", tb_name=""):
"""
stb --> supertable
@@ -984,36 +1085,36 @@ class TDTestCase:
"""
d_stb_d_tb_list = list()
s_stb_s_tb_list = list()
- s_stb_s_tb_a_col_a_tag_list = list()
- s_stb_s_tb_m_col_m_tag_list = list()
+ s_stb_s_tb_a_tag_list = list()
+ s_stb_s_tb_m_tag_list = list()
s_stb_d_tb_list = list()
- s_stb_d_tb_a_col_m_tag_list = list()
- s_stb_d_tb_a_tag_m_col_list = list()
+ s_stb_d_tb_m_tag_list = list()
+ s_stb_d_tb_a_tag_list = list()
s_stb_s_tb_d_ts_list = list()
- s_stb_s_tb_d_ts_a_col_m_tag_list = list()
- s_stb_s_tb_d_ts_a_tag_m_col_list = list()
+ s_stb_s_tb_d_ts_m_tag_list = list()
+ s_stb_s_tb_d_ts_a_tag_list = list()
s_stb_d_tb_d_ts_list = list()
- s_stb_d_tb_d_ts_a_col_m_tag_list = list()
- s_stb_d_tb_d_ts_a_tag_m_col_list = list()
+ s_stb_d_tb_d_ts_m_tag_list = list()
+ s_stb_d_tb_d_ts_a_tag_list = list()
for i in range(count):
- d_stb_d_tb_list.append(self.genFullTypeSql(t0="f", c0="f"))
- s_stb_s_tb_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"'))
- s_stb_s_tb_a_col_a_tag_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', ct_add_tag=True))
- s_stb_s_tb_m_col_m_tag_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', ct_min_tag=True))
- s_stb_d_tb_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True))
- s_stb_d_tb_a_col_m_tag_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, ct_am_tag=True))
- s_stb_d_tb_a_tag_m_col_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, ct_ma_tag=True))
- s_stb_s_tb_d_ts_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', ts=0))
- s_stb_s_tb_d_ts_a_col_m_tag_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', ts=0, ct_am_tag=True))
- s_stb_s_tb_d_ts_a_tag_m_col_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', ts=0, ct_ma_tag=True))
- s_stb_d_tb_d_ts_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, ts=0))
- s_stb_d_tb_d_ts_a_col_m_tag_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, ts=0, ct_am_tag=True))
- s_stb_d_tb_d_ts_a_tag_m_col_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', c7=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, ts=0, ct_ma_tag=True))
-
- return d_stb_d_tb_list, s_stb_s_tb_list, s_stb_s_tb_a_col_a_tag_list, s_stb_s_tb_m_col_m_tag_list, \
- s_stb_d_tb_list, s_stb_d_tb_a_col_m_tag_list, s_stb_d_tb_a_tag_m_col_list, s_stb_s_tb_d_ts_list, \
- s_stb_s_tb_d_ts_a_col_m_tag_list, s_stb_s_tb_d_ts_a_tag_m_col_list, s_stb_d_tb_d_ts_list, \
- s_stb_d_tb_d_ts_a_col_m_tag_list, s_stb_d_tb_d_ts_a_tag_m_col_list
+ d_stb_d_tb_list.append(self.genFullTypeSql(t0="f", value="f"))
+ s_stb_s_tb_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"'))
+ s_stb_s_tb_a_tag_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', t_add_tag=True))
+ s_stb_s_tb_m_tag_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', t_mul_tag=True))
+ s_stb_d_tb_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True))
+ s_stb_d_tb_m_tag_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, t_mul_tag=True))
+ s_stb_d_tb_a_tag_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, t_add_tag=True))
+ s_stb_s_tb_d_ts_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', ts=0))
+ s_stb_s_tb_d_ts_m_tag_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', ts=0, t_mul_tag=True))
+ s_stb_s_tb_d_ts_a_tag_list.append(self.genFullTypeSql(stb_name=stb_name, tb_name=tb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', ts=0, t_add_tag=True))
+ s_stb_d_tb_d_ts_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, ts=0))
+ s_stb_d_tb_d_ts_m_tag_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, ts=0, t_mul_tag=True))
+ s_stb_d_tb_d_ts_a_tag_list.append(self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True, ts=0, t_add_tag=True))
+
+ return d_stb_d_tb_list, s_stb_s_tb_list, s_stb_s_tb_a_tag_list, s_stb_s_tb_m_tag_list, \
+ s_stb_d_tb_list, s_stb_d_tb_m_tag_list, s_stb_d_tb_a_tag_list, s_stb_s_tb_d_ts_list, \
+ s_stb_s_tb_d_ts_m_tag_list, s_stb_s_tb_d_ts_a_tag_list, s_stb_d_tb_d_ts_list, \
+ s_stb_d_tb_d_ts_m_tag_list, s_stb_d_tb_d_ts_a_tag_list
def genMultiThreadSeq(self, sql_list):
@@ -1045,7 +1146,7 @@ class TDTestCase:
"""
tdCom.cleanTb()
tb_name = tdCom.getLongName(7, "letters")
- input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name)
+ input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name, value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
s_stb_s_tb_list = self.genSqlList(stb_name=stb_name, tb_name=tb_name)[1]
self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_list))
@@ -1056,16 +1157,16 @@ class TDTestCase:
tdSql.query(f"select * from {stb_name};")
tdSql.checkRows(1)
- def sStbStbDdataAtcInsertMultiThreadCheckCase(self):
+ def sStbStbDdataAtInsertMultiThreadCheckCase(self):
"""
thread input same stb tb, different data, add columes and tags, result keep first data
"""
tdCom.cleanTb()
tb_name = tdCom.getLongName(7, "letters")
- input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name)
+ input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name, value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
- s_stb_s_tb_a_col_a_tag_list = self.genSqlList(stb_name=stb_name, tb_name=tb_name)[2]
- self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_a_col_a_tag_list))
+ s_stb_s_tb_a_tag_list = self.genSqlList(stb_name=stb_name, tb_name=tb_name)[2]
+ self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_a_tag_list))
tdSql.query(f"show tables;")
tdSql.checkRows(1)
expected_tb_name = self.getNoIdTbName(stb_name)[0]
@@ -1073,16 +1174,16 @@ class TDTestCase:
tdSql.query(f"select * from {stb_name};")
tdSql.checkRows(1)
- def sStbStbDdataMtcInsertMultiThreadCheckCase(self):
+ def sStbStbDdataMtInsertMultiThreadCheckCase(self):
"""
thread input same stb tb, different data, minus columes and tags, result keep first data
"""
tdCom.cleanTb()
tb_name = tdCom.getLongName(7, "letters")
- input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name)
+ input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name, value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
- s_stb_s_tb_m_col_m_tag_list = self.genSqlList(stb_name=stb_name, tb_name=tb_name)[3]
- self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_m_col_m_tag_list))
+ s_stb_s_tb_m_tag_list = self.genSqlList(stb_name=stb_name, tb_name=tb_name)[3]
+ self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_m_tag_list))
tdSql.query(f"show tables;")
tdSql.checkRows(1)
expected_tb_name = self.getNoIdTbName(stb_name)[0]
@@ -1095,40 +1196,38 @@ class TDTestCase:
thread input same stb, different tb, different data
"""
tdCom.cleanTb()
- input_sql, stb_name = self.genFullTypeSql()
+ input_sql, stb_name = self.genFullTypeSql(value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
s_stb_d_tb_list = self.genSqlList(stb_name=stb_name)[4]
self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_list))
tdSql.query(f"show tables;")
tdSql.checkRows(6)
- def sStbDtbDdataAcMtInsertMultiThreadCheckCase(self):
- """
- #! concurrency conflict
- """
+ def sStbDtbDdataMtInsertMultiThreadCheckCase(self):
"""
thread input same stb, different tb, different data, add col, mul tag
"""
tdCom.cleanTb()
- input_sql, stb_name = self.genFullTypeSql()
+ input_sql, stb_name = self.genFullTypeSql(value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
- s_stb_d_tb_a_col_m_tag_list = self.genSqlList(stb_name=stb_name)[5]
- self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_a_col_m_tag_list))
+ s_stb_d_tb_m_tag_list = [(f'{stb_name} 1626006833639000000ns "omfdhyom" t0=F t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'yzwswz'), \
+ (f'{stb_name} 1626006833639000000ns "vqowydbc" t0=F t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'yzwswz'), \
+ (f'{stb_name} 1626006833639000000ns "plgkckpv" t0=F t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'yzwswz'), \
+ (f'{stb_name} 1626006833639000000ns "cujyqvlj" t0=F t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'yzwswz'), \
+ (f'{stb_name} 1626006833639000000ns "twjxisat" t0=T t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'yzwswz')]
+ self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_m_tag_list))
tdSql.query(f"show tables;")
- tdSql.checkRows(6)
+ tdSql.checkRows(3)
- def sStbDtbDdataAtMcInsertMultiThreadCheckCase(self):
- """
- #! concurrency conflict
- """
+ def sStbDtbDdataAtInsertMultiThreadCheckCase(self):
"""
thread input same stb, different tb, different data, add tag, mul col
"""
tdCom.cleanTb()
- input_sql, stb_name = self.genFullTypeSql()
+ input_sql, stb_name = self.genFullTypeSql(value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
- s_stb_d_tb_a_tag_m_col_list = self.genSqlList(stb_name=stb_name)[6]
- self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_a_tag_m_col_list))
+ s_stb_d_tb_a_tag_list = self.genSqlList(stb_name=stb_name)[6]
+ self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_a_tag_list))
tdSql.query(f"show tables;")
tdSql.checkRows(6)
@@ -1138,167 +1237,154 @@ class TDTestCase:
"""
tdCom.cleanTb()
tb_name = tdCom.getLongName(7, "letters")
- input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name)
+ input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name, value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
- s_stb_s_tb_d_ts_list = self.genSqlList(stb_name=stb_name, tb_name=tb_name)[7]
+ s_stb_s_tb_d_ts_list = [(f'{stb_name} 0 "hkgjiwdj" id="{tb_name}" t0=f t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vozamcts" t8=L"ncharTagValue"', 'dwpthv'), \
+ (f'{stb_name} 0 "rljjrrul" id="{tb_name}" t0=False t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="bmcanhbs" t8=L"ncharTagValue"', 'dwpthv'), \
+ (f'{stb_name} 0 "basanglx" id="{tb_name}" t0=False t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="enqkyvmb" t8=L"ncharTagValue"', 'dwpthv'), \
+ (f'{stb_name} 0 "clsajzpp" id="{tb_name}" t0=F t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="eivaegjk" t8=L"ncharTagValue"', 'dwpthv'), \
+ (f'{stb_name} 0 "jitwseso" id="{tb_name}" t0=T t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="yhlwkddq" t8=L"ncharTagValue"', 'dwpthv')]
self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_d_ts_list))
tdSql.query(f"show tables;")
tdSql.checkRows(1)
tdSql.query(f"select * from {stb_name}")
tdSql.checkRows(6)
- def sStbStbDdataDtsAcMtInsertMultiThreadCheckCase(self):
+ def sStbStbDdataDtsMtInsertMultiThreadCheckCase(self):
"""
thread input same stb tb, different ts, add col, mul tag
"""
tdCom.cleanTb()
tb_name = tdCom.getLongName(7, "letters")
- input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name)
+ input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name, value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
- s_stb_s_tb_d_ts_a_col_m_tag_list = self.genSqlList(stb_name=stb_name, tb_name=tb_name)[8]
- self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_d_ts_a_col_m_tag_list))
+ s_stb_s_tb_d_ts_m_tag_list = self.genSqlList(stb_name=stb_name, tb_name=tb_name)[8]
+ self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_d_ts_m_tag_list))
tdSql.query(f"show tables;")
tdSql.checkRows(1)
tdSql.query(f"select * from {stb_name}")
tdSql.checkRows(6)
tdSql.query(f"select * from {stb_name} where t8 is not NULL")
tdSql.checkRows(6)
- tdSql.query(f"select * from {tb_name} where c11 is not NULL;")
- tdSql.checkRows(5)
- def sStbStbDdataDtsAtMcInsertMultiThreadCheckCase(self):
+ def sStbStbDdataDtsAtInsertMultiThreadCheckCase(self):
"""
thread input same stb tb, different ts, add tag, mul col
"""
tdCom.cleanTb()
tb_name = tdCom.getLongName(7, "letters")
- input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name)
+ input_sql, stb_name = self.genFullTypeSql(tb_name=tb_name, value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
- s_stb_s_tb_d_ts_a_tag_m_col_list = self.genSqlList(stb_name=stb_name, tb_name=tb_name)[9]
- self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_d_ts_a_tag_m_col_list))
+ s_stb_s_tb_d_ts_a_tag_list = [(f'{stb_name} 0 "clummqfy" id="{tb_name}" t0=False t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="hpxzrdiw" t8=L"ncharTagValue" t11=127i8 t10=L"ncharTagValue"', 'bokaxl'), \
+ (f'{stb_name} 0 "yqeztggb" id="{tb_name}" t0=F t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="gdtblmrc" t8=L"ncharTagValue" t11=127i8 t10=L"ncharTagValue"', 'bokaxl'), \
+ (f'{stb_name} 0 "gbkinqdk" id="{tb_name}" t0=f t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="iqniuvco" t8=L"ncharTagValue" t11=127i8 t10=L"ncharTagValue"', 'bokaxl'), \
+ (f'{stb_name} 0 "ldxxejbd" id="{tb_name}" t0=f t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="vxkipags" t8=L"ncharTagValue" t11=127i8 t10=L"ncharTagValue"', 'bokaxl'), \
+ (f'{stb_name} 0 "tlvzwjes" id="{tb_name}" t0=true t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64 t7="enwrlrtj" t8=L"ncharTagValue" t11=127i8 t10=L"ncharTagValue"', 'bokaxl')]
+ self.multiThreadRun(self.genMultiThreadSeq(s_stb_s_tb_d_ts_a_tag_list))
tdSql.query(f"show tables;")
tdSql.checkRows(1)
tdSql.query(f"select * from {stb_name}")
tdSql.checkRows(6)
- for c in ["c7", "c8", "c9"]:
- tdSql.query(f"select * from {stb_name} where {c} is NULL")
- tdSql.checkRows(5)
for t in ["t10", "t11"]:
tdSql.query(f"select * from {stb_name} where {t} is not NULL;")
- tdSql.checkRows(6)
+ tdSql.checkRows(0)
def sStbDtbDdataDtsInsertMultiThreadCheckCase(self):
"""
thread input same stb, different tb, data, ts
"""
tdCom.cleanTb()
- input_sql, stb_name = self.genFullTypeSql()
+ input_sql, stb_name = self.genFullTypeSql(value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
s_stb_d_tb_d_ts_list = self.genSqlList(stb_name=stb_name)[10]
self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_d_ts_list))
tdSql.query(f"show tables;")
tdSql.checkRows(6)
- def sStbDtbDdataDtsAcMtInsertMultiThreadCheckCase(self):
- """
- # ! concurrency conflict
- """
+ def sStbDtbDdataDtsMtInsertMultiThreadCheckCase(self):
"""
thread input same stb, different tb, data, ts, add col, mul tag
"""
tdCom.cleanTb()
- input_sql, stb_name = self.genFullTypeSql()
+ input_sql, stb_name = self.genFullTypeSql(value="\"binaryTagValue\"")
self.resCmp(input_sql, stb_name)
- s_stb_d_tb_d_ts_a_col_m_tag_list = self.genSqlList(stb_name=stb_name)[11]
- self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_d_ts_a_col_m_tag_list))
+ s_stb_d_tb_d_ts_m_tag_list = [(f'{stb_name} 0 "mnpmtzul" t0=f t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'pcppkg'), \
+ (f'{stb_name} 0 "zbvwckcd" t0=True t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'pcppkg'), \
+ (f'{stb_name} 0 "vymcjfwc" t0=F t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'pcppkg'), \
+ (f'{stb_name} 0 "laumkwfn" t0=False t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'pcppkg'), \
+ (f'{stb_name} 0 "nyultzxr" t0=false t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64', 'pcppkg')]
+ self.multiThreadRun(self.genMultiThreadSeq(s_stb_d_tb_d_ts_m_tag_list))
tdSql.query(f"show tables;")
- tdSql.checkRows(6)
-
+ tdSql.checkRows(3)
def test(self):
- # input_sql1 = "stb2_5 1626006833610ms 3f64 host=\"host0\",host2=L\"host2\""
- # input_sql2 = "rfasta,id=\"rfasta_1\",t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64 c0=True,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64 1626006933640000000ns"
try:
- input_sql, stb_name = self.genFullTypeSql()
- self.resCmp(input_sql, stb_name)
- except LinesError as err:
+ input_sql = f'test_nchar 0 L"涛思数据" t0=f t1=L"涛思数据" t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64'
+ self._conn.insert_telnet_lines([input_sql])
+ except TelnetLinesError as err:
print(err.errno)
- # self._conn.insert_telnet_lines([input_sql2])
- # input_sql3 = f'abcd,id="cc¥Ec",t0=True,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7="ndsfdrum",t8=L"ncharTagValue" c0=f,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7="igwoehkm",c8=L"ncharColValue",c9=7u64 0'
- # print(input_sql3)
- # input_sql4 = 'hmemeb,id="kilrcrldgf",t0=F,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7="fysodjql",t8=L"ncharTagValue" c0=True,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7="waszbfvc",c8=L"ncharColValue",c9=7u64 0'
- # code = self._conn.insert_telnet_lines([input_sql3])
- # print(code)
- # self._conn.insert_telnet_lines([input_sql4])
def runAll(self):
- # self.initCheckCase()
- # self.boolTypeCheckCase()
+ self.initCheckCase()
+ self.boolTypeCheckCase()
self.symbolsCheckCase()
-
-
-
-
- # self.tsCheckCase()
- # self.idSeqCheckCase()
- # self.idUpperCheckCase()
- # self.noIdCheckCase()
- # self.maxColTagCheckCase()
-
- # self.idIllegalNameCheckCase()
- # self.idStartWithNumCheckCase()
- # self.nowTsCheckCase()
- # self.dateFormatTsCheckCase()
- # self.illegalTsCheckCase()
- # self.tagValueLengthCheckCase()
- # self.colValueLengthCheckCase()
- # self.tagColIllegalValueCheckCase()
- # self.duplicateIdTagColInsertCheckCase()
- # self.noIdStbExistCheckCase()
- # self.duplicateInsertExistCheckCase()
- # self.tagColBinaryNcharLengthCheckCase()
- # self.tagColAddDupIDCheckCase()
- # self.tagColAddCheckCase()
- # self.tagMd5Check()
- # self.tagColBinaryMaxLengthCheckCase()
- # # self.tagColNcharMaxLengthCheckCase()
- # self.batchInsertCheckCase()
- # self.multiInsertCheckCase(1000)
- # self.batchErrorInsertCheckCase()
+ self.tsCheckCase()
+ self.idSeqCheckCase()
+ self.idUpperCheckCase()
+ self.noIdCheckCase()
+ self.maxColTagCheckCase()
+ self.idIllegalNameCheckCase()
+ self.idStartWithNumCheckCase()
+ self.nowTsCheckCase()
+ self.dateFormatTsCheckCase()
+ self.illegalTsCheckCase()
+ self.tagValueLengthCheckCase()
+ self.colValueLengthCheckCase()
+ self.tagColIllegalValueCheckCase()
+ self.blankCheckCase()
+ self.duplicateIdTagColInsertCheckCase()
+ self.noIdStbExistCheckCase()
+ self.duplicateInsertExistCheckCase()
+ self.tagColBinaryNcharLengthCheckCase()
+ self.tagColAddDupIDCheckCase()
+ self.tagColAddCheckCase()
+ self.tagMd5Check()
+ self.tagColBinaryMaxLengthCheckCase()
+ self.tagColNcharMaxLengthCheckCase()
+ self.batchInsertCheckCase()
+ self.multiInsertCheckCase(10)
+ self.batchErrorInsertCheckCase()
+ self.multiColsInsertCheckCase()
+ self.blankColInsertCheckCase()
+ self.blankTagInsertCheckCase()
+ self.chineseCheckCase()
+ self.multiFieldCheckCase()
+ self.errorTypeCheckCase()
+ self.pointTransCheckCase()
+ self.defaultTypeCheckCase()
# # MultiThreads
- # self.stbInsertMultiThreadCheckCase()
- # self.sStbStbDdataInsertMultiThreadCheckCase()
- # self.sStbStbDdataAtcInsertMultiThreadCheckCase()
- # self.sStbStbDdataMtcInsertMultiThreadCheckCase()
- # self.sStbDtbDdataInsertMultiThreadCheckCase()
-
- # # # ! concurrency conflict
- # # self.sStbDtbDdataAcMtInsertMultiThreadCheckCase()
- # # self.sStbDtbDdataAtMcInsertMultiThreadCheckCase()
-
- # self.sStbStbDdataDtsInsertMultiThreadCheckCase()
-
- # # # ! concurrency conflict
- # # self.sStbStbDdataDtsAcMtInsertMultiThreadCheckCase()
- # # self.sStbStbDdataDtsAtMcInsertMultiThreadCheckCase()
-
- # self.sStbDtbDdataDtsInsertMultiThreadCheckCase()
-
- # # ! concurrency conflict
- # # self.sStbDtbDdataDtsAcMtInsertMultiThreadCheckCase()
-
-
+ self.stbInsertMultiThreadCheckCase()
+ self.sStbStbDdataInsertMultiThreadCheckCase()
+ self.sStbStbDdataAtInsertMultiThreadCheckCase()
+ self.sStbStbDdataMtInsertMultiThreadCheckCase()
+ self.sStbDtbDdataInsertMultiThreadCheckCase()
+ self.sStbDtbDdataMtInsertMultiThreadCheckCase()
+ self.sStbDtbDdataAtInsertMultiThreadCheckCase()
+ self.sStbStbDdataDtsInsertMultiThreadCheckCase()
+ self.sStbStbDdataDtsMtInsertMultiThreadCheckCase()
+ self.sStbStbDdataDtsAtInsertMultiThreadCheckCase()
+ self.sStbDtbDdataDtsInsertMultiThreadCheckCase()
+ self.sStbDtbDdataDtsMtInsertMultiThreadCheckCase()
def run(self):
print("running {}".format(__file__))
self.createDb()
try:
self.runAll()
+ # self.test()
except Exception as err:
print(''.join(traceback.format_exception(None, err, err.__traceback__)))
raise err
- # self.tagColIllegalValueCheckCase()
- # self.test()
def stop(self):
tdSql.close()
diff --git a/tests/pytest/manualTest/TD-5114/continueCreateDn.py b/tests/pytest/manualTest/TD-5114/continueCreateDn.py
index 4b724f0587a6a2bbe3f477e8a47e283c0924a29e..9494ee5f3685d3ddaeb1848a58878d63fa7a54b6 100644
--- a/tests/pytest/manualTest/TD-5114/continueCreateDn.py
+++ b/tests/pytest/manualTest/TD-5114/continueCreateDn.py
@@ -42,7 +42,7 @@ class TwoClients:
tdSql.execute("drop database if exists db3")
- # insert data with taosc
+ # insert data with c connector
for i in range(10):
os.system("taosdemo -f manualTest/TD-5114/insertDataDb3Replica2.json -y ")
# # check data correct
diff --git a/tests/pytest/query/bug6586.py b/tests/pytest/query/bug6586.py
new file mode 100644
index 0000000000000000000000000000000000000000..87d7199dd06a42eed1345311bdfb833ba4cfe93a
--- /dev/null
+++ b/tests/pytest/query/bug6586.py
@@ -0,0 +1,42 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ def run(self):
+ # TD-6586 Binary type value return None with python connector
+ # PR: https://github.com/taosdata/TDengine/pull/7913/files
+
+ tdSql.execute("create database if not exists binary_convertion")
+ tdSql.execute("use binary_convertion")
+ tdSql.execute("create stable stb (ts timestamp,value binary(3)) tags (t0 bool,t1 tinyint,t2 smallint,t3 int,t4 bigint,t5 float,t6 double,t7 binary(3),t8 nchar(3))")
+ tdSql.execute("create table if not exists tb1 using stb(t0,t1,t2,t3,t4,t5,t6,t7,t8) tags (1,127,32767,2147483647,9223372036854775807,11.123450279,22.123456789,'aaa','aaa')")
+ tdSql.execute("insert into tb1 (ts,value) values (1600000000000, \"aaa\")")
+ res = tdSql.query('select * from stb', True)
+ expected_res = [(datetime.datetime(2020, 9, 13, 20, 26, 40), 'aaa', True, 127, 32767, 2147483647, 9223372036854775807, 11.12345027923584, 22.123456789, 'aaa', 'aaa')]
+ tdSql.checkEqual(res, expected_res)
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/filterOtherTypes.py b/tests/pytest/query/filterOtherTypes.py
index f80552138deb6850a87c63bed0c3f543036e7c17..7d62f2502eaf7ef5e2591adadb1628a618233628 100644
--- a/tests/pytest/query/filterOtherTypes.py
+++ b/tests/pytest/query/filterOtherTypes.py
@@ -80,10 +80,12 @@ class TDTestCase:
tdSql.error("select * from st where tbcol1 like '____'")
# > for nchar type on column
- tdSql.error("select * from st where tbcol2 > 'taosdata'")
+ tdSql.query("select * from st where tbcol2 > 'taosdata'")
+ tdSql.checkRows(10)
# >= for nchar type on column
- tdSql.error("select * from st where tbcol2 >= 'taosdata'")
+ tdSql.query("select * from st where tbcol2 >= 'taosdata'")
+ tdSql.checkRows(10)
# = for nchar type on column
tdSql.query("select * from st where tbcol2 = 'taosdata1'")
@@ -98,10 +100,12 @@ class TDTestCase:
tdSql.checkRows(9)
# > for nchar type on column
- tdSql.error("select * from st where tbcol2 < 'taodata'")
+ tdSql.query("select * from st where tbcol2 < 'taodata'")
+ tdSql.checkRows(0)
# >= for nchar type on column
- tdSql.error("select * from st where tbcol2 <= 'taodata'")
+ tdSql.query("select * from st where tbcol2 <= 'taodata'")
+ tdSql.checkRows(0)
# % for nchar type on column case 1
tdSql.query("select * from st where tbcol2 like '%'")
@@ -140,10 +144,12 @@ class TDTestCase:
tdSql.checkRows(10)
# > for binary type on column
- tdSql.error("select * from st where tbcol3 > '涛思数据'")
+ tdSql.query("select * from st where tbcol3 > '涛思数据'")
+ tdSql.checkRows(10)
# >= for binary type on column
- tdSql.error("select * from st where tbcol3 >= '涛思数据'")
+ tdSql.query("select * from st where tbcol3 >= '涛思数据'")
+ tdSql.checkRows(10)
# = for binary type on column
tdSql.query("select * from st where tbcol3 = '涛思数据1'")
@@ -158,10 +164,12 @@ class TDTestCase:
tdSql.checkRows(9)
# > for binary type on column
- tdSql.error("select * from st where tbcol3 < '涛思数据'")
+ tdSql.query("select * from st where tbcol3 < '涛思数据'")
+ tdSql.checkRows(0)
# >= for binary type on column
- tdSql.error("select * from st where tbcol3 <= '涛思数据'")
+ tdSql.query("select * from st where tbcol3 <= '涛思数据'")
+ tdSql.checkRows(0)
# % for binary type on column case 1
tdSql.query("select * from st where tbcol3 like '%'")
diff --git a/tests/pytest/query/isNullTest.py b/tests/pytest/query/isNullTest.py
index 7b79679c7d9d9ac4629a69b32acb1a11b61a83c1..f9fbb47715043fb63a51fbb127cb7a889883fafb 100644
--- a/tests/pytest/query/isNullTest.py
+++ b/tests/pytest/query/isNullTest.py
@@ -66,7 +66,7 @@ class TDTestCase:
tdSql.checkData(0, 0, 12)
tdSql.query("select count(*) from st where t2 <> '' ")
- tdSql.checkData(0, 0, 24)
+ tdSql.checkData(0, 0, 12)
tdSql.query("select count(*) from st where t3 is null")
tdSql.checkData(0, 0, 12)
@@ -81,7 +81,7 @@ class TDTestCase:
tdSql.checkData(0, 0, 12)
tdSql.query("select count(*) from st where t3 <> '' ")
- tdSql.checkData(0, 0, 24)
+ tdSql.checkData(0, 0, 12)
tdSql.query("select count(*) from st where c1 is not null")
tdSql.checkData(0, 0, 30)
diff --git a/tests/pytest/query/nestquery_last_row.py b/tests/pytest/query/nestquery_last_row.py
index 3c4ada51744f620ca589266113acf1e3d8cfef43..8e9ee540c74569caffa18c209b745cbd70ecc71a 100644
--- a/tests/pytest/query/nestquery_last_row.py
+++ b/tests/pytest/query/nestquery_last_row.py
@@ -17,6 +17,7 @@ from util.log import tdLog
from util.cases import tdCases
from util.sql import tdSql
import random
+import time
class TDTestCase:
@@ -24,7 +25,8 @@ class TDTestCase:
tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor(), logSql)
- self.ts = 1600000000000
+ now = time.time()
+ self.ts = int(round(now * 1000))
self.num = 10
def run(self):
diff --git a/tests/pytest/query/operator_cost.py b/tests/pytest/query/operator_cost.py
index 774a1e5f42403a6b5f67678e53be5e07beaccde2..f22cfcd4ec709b1d4440065fab398979afeb3adc 100644
--- a/tests/pytest/query/operator_cost.py
+++ b/tests/pytest/query/operator_cost.py
@@ -25,7 +25,8 @@ class TDTestCase:
tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor(), logSql)
- self.ts = 1600000000000
+ now = time.time()
+ self.ts = int(round(now * 1000))
self.num = 10
def run(self):
diff --git a/tests/pytest/query/queryCnameDisplay.py b/tests/pytest/query/queryCnameDisplay.py
index 8864c0e37621c72ad39fb4249749244b1fbe8367..66a7f85120fe13293996d1bd3153b6fe9b1d6a72 100644
--- a/tests/pytest/query/queryCnameDisplay.py
+++ b/tests/pytest/query/queryCnameDisplay.py
@@ -49,10 +49,11 @@ class TDTestCase:
# select as cname with cname_list
sql_seq = f'select count(ts) as {cname_list[0]}, sum(pi1) as {cname_list[1]}, avg(pi2) as {cname_list[2]}, count(pf1) as {cname_list[3]}, count(pf2) as {cname_list[4]}, count(ps1) as {cname_list[5]}, min(pi3) as {cname_list[6]}, max(pi4) as {cname_list[7]}, count(pb1) as {cname_list[8]}, count(ps2) as {cname_list[9]} from regular_table_cname_check'
- sql_seq_no_as = sql_seq.replace('as ', '')
+ sql_seq_no_as = sql_seq.replace(' as ', ' ')
+ print(sql_seq)
+ print(sql_seq_no_as)
res = tdSql.getColNameList(sql_seq)
res_no_as = tdSql.getColNameList(sql_seq_no_as)
-
# cname[1] > 64, it is expected to be equal to 64
cname_list_1_expected = cname_list[1][:-1]
cname_list[1] = cname_list_1_expected
@@ -79,7 +80,7 @@ class TDTestCase:
# select as cname with cname_list
sql_seq = f'select count(ts) as {cname_list[0]}, sum(pi1) as {cname_list[1]}, avg(pi2) as {cname_list[2]}, count(pf1) as {cname_list[3]}, count(pf2) as {cname_list[4]}, count(ps1) as {cname_list[5]}, min(pi3) as {cname_list[6]}, max(pi4) as {cname_list[7]}, count(pb1) as {cname_list[8]}, count(ps2) as {cname_list[9]}, count(si1) as {cname_list[10]}, count(si2) as {cname_list[11]}, count(sf1) as {cname_list[12]}, count(sf2) as {cname_list[13]}, count(ss1) as {cname_list[14]}, count(si3) as {cname_list[15]}, count(si4) as {cname_list[16]}, count(sb1) as {cname_list[17]}, count(ss2) as {cname_list[18]} from super_table_cname_check'
- sql_seq_no_as = sql_seq.replace('as ', '')
+ sql_seq_no_as = sql_seq.replace(' as ', ' ')
res = tdSql.getColNameList(sql_seq)
res_no_as = tdSql.getColNameList(sql_seq_no_as)
diff --git a/tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.json b/tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.json
index 265f42036bc5a4e13dc0766b66fccf32924d7185..ad85f9607b72c5d4562266508bfdcf68837c33bd 100644
--- a/tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.json
+++ b/tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.json
@@ -22,7 +22,7 @@
"cache": 50,
"blocks": 8,
"precision": "ms",
- "keep": 365,
+ "keep": 36500,
"minRows": 100,
"maxRows": 4096,
"comp":2,
diff --git a/tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.py b/tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.py
index 7f551bcefd152007ebab7a1bc7d110468b69115a..5477223aad0262cf2874496481bc5d138fb3d2cf 100644
--- a/tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.py
+++ b/tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.py
@@ -13,6 +13,7 @@
import sys
import os
+import time
from util.log import *
from util.cases import *
from util.sql import *
@@ -24,6 +25,9 @@ class TDTestCase:
tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor(), logSql)
+ now = time.time()
+ self.ts = int(round(now * 1000))
+
def getBuildPath(self):
selfPath = os.path.dirname(os.path.realpath(__file__))
@@ -50,6 +54,7 @@ class TDTestCase:
# insert: create one or mutiple tables per sql and insert multiple rows per sql
# test case for https://jira.taosdata.com:18080/browse/TD-4985
+ os.system("rm -rf tools/taosdemoAllTest/TD-4985/query-limit-offset.py.sql")
os.system("%staosdemo -f tools/taosdemoAllTest/TD-4985/query-limit-offset.json -y " % binPath)
tdSql.execute("use db")
tdSql.query("select count (tbname) from stb0")
@@ -57,25 +62,25 @@ class TDTestCase:
for i in range(1000):
tdSql.execute('''insert into stb00_9999 values(%d, %d, %d,'test99.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_8888 values(%d, %d, %d,'test98.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_7777 values(%d, %d, %d,'test97.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_6666 values(%d, %d, %d,'test96.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_5555 values(%d, %d, %d,'test95.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_4444 values(%d, %d, %d,'test94.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_3333 values(%d, %d, %d,'test93.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_2222 values(%d, %d, %d,'test92.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_1111 values(%d, %d, %d,'test91.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.execute('''insert into stb00_100 values(%d, %d, %d,'test90.%s')'''
- % (1600000000000 + i, i, -10000+i, i))
+ % (self.ts + i, i, -10000+i, i))
tdSql.query("select * from stb0 where c2 like 'test99%' ")
tdSql.checkRows(1000)
tdSql.query("select * from stb0 where tbname like 'stb00_9999' limit 10" )
@@ -176,7 +181,7 @@ class TDTestCase:
tdSql.checkData(0, 1, 5)
tdSql.checkData(1, 1, 6)
tdSql.checkData(2, 1, 7)
- os.system("rm -rf tools/taosdemoAllTest/TD-4985/query-limit-offset.py.sql")
+
def stop(self):
tdSql.close()
diff --git a/tests/pytest/tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py b/tests/pytest/tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py
index dfa829866d945b06d232aeeaba266b11ae229234..ec55acb848352def34e3090e66c4ef392b737ce0 100644
--- a/tests/pytest/tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py
+++ b/tests/pytest/tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py
@@ -26,7 +26,10 @@ class TDTestCase:
tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor(), logSql)
- self.ts = 1538548685000
+ os.system("rm -rf tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py.sql")
+
+ now = time.time()
+ self.ts = int(round(now * 1000))
self.num = 100
def get_random_string(self, length):
@@ -691,7 +694,7 @@ class TDTestCase:
tdSql.query("describe table_40")
tdSql.checkRows(4096)
- os.system("rm -rf tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py.sql")
+
def stop(self):
diff --git a/tests/pytest/tools/taosdemoAllTest/TD-5213/insertSigcolumnsNum4096.json b/tests/pytest/tools/taosdemoAllTest/TD-5213/insertSigcolumnsNum4096.json
index 25af3a1041dbcd06319dd6abfeb82fd33240c013..c9c4ae2c1b650da99853d6c82106b3f6ee80d0c0 100755
--- a/tests/pytest/tools/taosdemoAllTest/TD-5213/insertSigcolumnsNum4096.json
+++ b/tests/pytest/tools/taosdemoAllTest/TD-5213/insertSigcolumnsNum4096.json
@@ -22,7 +22,7 @@
"cache": 50,
"blocks": 8,
"precision": "ms",
- "keep": 365,
+ "keep": 36500,
"minRows": 100,
"maxRows": 4096,
"comp":2,
diff --git a/tests/pytest/tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json b/tests/pytest/tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json
index 1b56830189623d344168918f239887c3359b2645..197f8a208e85ca4ce57c06518a433ec3a3acbac3 100644
--- a/tests/pytest/tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json
@@ -41,7 +41,7 @@
"batch_create_tbl_num": 10,
"data_source": "rand",
"insert_mode": "taosc",
- "insert_rows": 1000,
+ "insert_rows": 1001,
"childtable_limit": 0,
"childtable_offset":0,
"multi_thread_write_one_tbl": "no",
diff --git a/tests/pytest/tools/taosdemoPerformance.py b/tests/pytest/tools/taosdemoPerformance.py
index 51b064a08e5cd55401f9cf803a8683653f722679..82c57a656dfea12f80fe4eb2b530742c5bfb0916 100644
--- a/tests/pytest/tools/taosdemoPerformance.py
+++ b/tests/pytest/tools/taosdemoPerformance.py
@@ -120,7 +120,7 @@ class taosdemoPerformace:
projPath = selfPath[:selfPath.find("tests")]
for root, dirs, files in os.walk(projPath):
- if ("taosdemo" in files):
+ if ("taosd" in files):
rootRealPath = os.path.dirname(os.path.realpath(root))
if ("packaging" not in rootRealPath):
buildPath = root[:len(root) - len("/build/bin")]
diff --git a/tests/pytest/tools/taosdemoTest.py b/tests/pytest/tools/taosdemoTest.py
index 5662881031a01d19398cce223892eebbd8133c97..3cdcdcef5afcb14c04204d2489571bdfed937080 100644
--- a/tests/pytest/tools/taosdemoTest.py
+++ b/tests/pytest/tools/taosdemoTest.py
@@ -36,7 +36,7 @@ class TDTestCase:
projPath = selfPath[:selfPath.find("tests")]
for root, dirs, files in os.walk(projPath):
- if ("taosdemo" in files):
+ if ("taosd" in files):
rootRealPath = os.path.dirname(os.path.realpath(root))
if ("packaging" not in rootRealPath):
buildPath = root[:len(root) - len("/build/bin")]
diff --git a/tests/pytest/tools/taosdumpTest.py b/tests/pytest/tools/taosdumpTest.py
index 0dfc42f331b1a1c59d71268985d6a72d4d652856..628617e27b4af8695b96961441c6b135bdb15416 100644
--- a/tests/pytest/tools/taosdumpTest.py
+++ b/tests/pytest/tools/taosdumpTest.py
@@ -55,7 +55,7 @@ class TDTestCase:
if not os.path.exists("./taosdumptest/tmp1"):
os.makedirs("./taosdumptest/tmp1")
else:
- print("目录存在")
+ print("directory exists")
if not os.path.exists("./taosdumptest/tmp2"):
os.makedirs("./taosdumptest/tmp2")
diff --git a/tests/pytest/tools/taosdumpTest2.py b/tests/pytest/tools/taosdumpTest2.py
index bed0564139e20fb6c562a7258af0cbd5b542069b..839988375b652b0cfad09d8a6de7697de19609ea 100644
--- a/tests/pytest/tools/taosdumpTest2.py
+++ b/tests/pytest/tools/taosdumpTest2.py
@@ -37,7 +37,7 @@ class TDTestCase:
projPath = selfPath[:selfPath.find("tests")]
for root, dirs, files in os.walk(projPath):
- if ("taosdump" in files):
+ if ("taosd" in files):
rootRealPath = os.path.dirname(os.path.realpath(root))
if ("packaging" not in rootRealPath):
buildPath = root[:len(root) - len("/build/bin")]
diff --git a/tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdumpTestNanoSupport.py b/tests/pytest/tools/taosdumpTestNanoSupport.py
similarity index 98%
rename from tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdumpTestNanoSupport.py
rename to tests/pytest/tools/taosdumpTestNanoSupport.py
index ca8832170b7706621f5ef9d3225fe2cf16141c34..55f1671daaa09b148bb87d661b8bd1248e6cbb3a 100644
--- a/tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdumpTestNanoSupport.py
+++ b/tests/pytest/tools/taosdumpTestNanoSupport.py
@@ -44,7 +44,7 @@ class TDTestCase:
projPath = selfPath[:selfPath.find("tests")]
for root, dirs, files in os.walk(projPath):
- if ("taosdump" in files):
+ if ("taosd" in files):
rootRealPath = os.path.dirname(os.path.realpath(root))
if ("packaging" not in rootRealPath):
buildPath = root[:len(root) - len("/build/bin")]
@@ -136,7 +136,7 @@ class TDTestCase:
# dump part data with -S -E
os.system(
- '%staosdump --databases timedb1 -S 1625068810000000000 -E 1625068860000000000 -C ns -o ./taosdumptest/dumptmp2 ' %
+ '%staosdump --databases timedb1 -S 1625068810000000000 -E 1625068860000000000 -o ./taosdumptest/dumptmp2 ' %
binPath)
os.system(
'%staosdump --databases timedb1 -S 1625068810000000000 -o ./taosdumptest/dumptmp3 ' %
@@ -218,7 +218,7 @@ class TDTestCase:
"%staosdump --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath)
os.system(
- '%staosdump --databases timedb1 -S 1625068810000000 -E 1625068860000000 -C us -o ./taosdumptest/dumptmp2 ' %
+ '%staosdump --databases timedb1 -S 1625068810000000 -E 1625068860000000 -o ./taosdumptest/dumptmp2 ' %
binPath)
os.system(
'%staosdump --databases timedb1 -S 1625068810000000 -o ./taosdumptest/dumptmp3 ' %
@@ -299,7 +299,7 @@ class TDTestCase:
"%staosdump --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath)
os.system(
- '%staosdump --databases timedb1 -S 1625068810000 -E 1625068860000 -C ms -o ./taosdumptest/dumptmp2 ' %
+ '%staosdump --databases timedb1 -S 1625068810000 -E 1625068860000 -o ./taosdumptest/dumptmp2 ' %
binPath)
os.system(
'%staosdump --databases timedb1 -S 1625068810000 -o ./taosdumptest/dumptmp3 ' %
diff --git a/tests/pytest/tsdb/tsdbCompClusterReplica2.py b/tests/pytest/tsdb/tsdbCompClusterReplica2.py
index 2e016deea0b78d6cf9f76a917ca49fc2c5744a6e..cfda271497cde59e8dbe60150ddf935ba63fd9be 100644
--- a/tests/pytest/tsdb/tsdbCompClusterReplica2.py
+++ b/tests/pytest/tsdb/tsdbCompClusterReplica2.py
@@ -24,7 +24,7 @@ from random import choice
class TwoClients:
def initConnection(self):
- self.host = "chenhaoran02"
+ self.host = "chenhaoran01"
self.user = "root"
self.password = "taosdata"
self.config = "/etc/taos/"
@@ -116,8 +116,10 @@ class TwoClients:
sleep(3)
tdSql.execute(" drop dnode 'chenhaoran02:6030'; ")
sleep(20)
- os.system("rm -rf /var/lib/taos/*")
+ # remove data file;
+ os.system("rm -rf /home/chr/data/data0/*")
print("clear dnode chenhaoran02'data files")
+ sleep(5)
os.system("nohup /usr/bin/taosd > /dev/null 2>&1 &")
print("start taosd")
sleep(10)
diff --git a/tests/pytest/util/common.py b/tests/pytest/util/common.py
index 35abc4802f9de2080a6b6a166daf833c9cf04578..adf9026e7808dd1fd6715db26f70db56ce339cd5 100644
--- a/tests/pytest/util/common.py
+++ b/tests/pytest/util/common.py
@@ -14,7 +14,7 @@
import random
import string
from util.sql import tdSql
-
+from util.dnodes import tdDnodes
class TDCom:
def init(self, conn, logSql):
tdSql.init(conn.cursor(), logSql)
@@ -47,6 +47,42 @@ class TDCom:
chars = ''.join(random.choice(string.ascii_letters.lower() + string.digits) for i in range(len))
return chars
+ def restartTaosd(self, index=1, db_name="db"):
+ tdDnodes.stop(index)
+ tdDnodes.startWithoutSleep(index)
+ tdSql.execute(f"use {db_name}")
+
+ def typeof(self, variate):
+ v_type=None
+ if type(variate) is int:
+ v_type = "int"
+ elif type(variate) is str:
+ v_type = "str"
+ elif type(variate) is float:
+ v_type = "float"
+ elif type(variate) is bool:
+ v_type = "bool"
+ elif type(variate) is list:
+ v_type = "list"
+ elif type(variate) is tuple:
+ v_type = "tuple"
+ elif type(variate) is dict:
+ v_type = "dict"
+ elif type(variate) is set:
+ v_type = "set"
+ return v_type
+
+ def splitNumLetter(self, input_mix_str):
+ nums, letters = "", ""
+ for i in input_mix_str:
+ if i.isdigit():
+ nums += i
+ elif i.isspace():
+ pass
+ else:
+ letters += i
+ return nums, letters
+
def close(self):
self.cursor.close()
diff --git a/tests/script/general/compute/ceil.sim b/tests/script/general/compute/ceil.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8e8bcd04f003b1b86c8293cdb9a698da24073b38
--- /dev/null
+++ b/tests/script/general/compute/ceil.sim
@@ -0,0 +1,288 @@
+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
+
+$dbPrefix = m_di_db
+$tbPrefix = m_di_tb
+$mtPrefix = m_di_mt
+$tbNum = 2
+$rowNum = 5000
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 nchar(5), c9 binary(10)) TAGS (tgcol int)
+
+$i = 0
+while $i < $tbNum
+ $tb = $tbPrefix . $i
+ sql create table $tb using $mt tags( $i )
+
+ $x = 0
+ $y = 0
+
+ $v0 = 5000.0
+ $v1 = -5000.1
+ $v2 = 5000.2
+ $v3 = -5000.3
+ $v4 = 5000.4
+ $v5 = -5000.5
+ $v6 = 5000.6
+ $v7 = -5000.7
+ $v8 = 5000.8
+ $v9 = -5000.9
+
+ while $x < $rowNum
+ $cc = $x * 60000
+ $ms = 1601481600000 + $cc
+
+ $val = $v0
+
+ if $y == 0 then
+ $val = $v0
+ endi
+
+ if $y == 1 then
+ $val = $v1
+ endi
+
+ if $y == 2 then
+ $val = $v2
+ endi
+
+ if $y == 3 then
+ $val = $v3
+ endi
+
+ if $y == 4 then
+ $val = $v4
+ endi
+
+ if $y == 5 then
+ $val = $v5
+ endi
+
+ if $y == 6 then
+ $val = $v6
+ endi
+
+ if $y == 7 then
+ $val = $v7
+ endi
+
+ if $y == 8 then
+ $val = $v8
+ endi
+
+ if $y == 9 then
+ $val = $v9
+ endi
+
+ $tinyint = $x / 128
+ sql insert into $tb values ($ms , $x , $val , $x , $x , $tinyint , $x , $x , $x , $x )
+ $x = $x + 1
+ $y = $y + 1
+ if $y == 10 then
+ $y = 0
+ endi
+ endw
+
+ $i = $i + 1
+endw
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select ceil(c2) from $tb
+print ===> $data00
+if $data00 != 5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb
+print ===> $data10
+if $data10 != -5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb
+print ===> $data20
+if $data20 != 5001.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb
+print ===> $data30
+if $data30 != -5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb
+print ===> $data40
+if $data40 != 5001.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb
+print ===> $data50
+if $data50 != -5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb
+print ===> $data60
+if $data60 != 5001.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb
+print ===> $data70
+if $data70 != -5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb
+print ===> $data80
+if $data80 != 5001.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb
+print ===> $data90
+if $data90 != -5000.00000 then
+ return -1
+endi
+
+sql select ceil(c5) from $tb
+print ===> $data10
+if $data10 != 0 then
+ return -1
+endi
+sql select ts, ceil(c2) from $tb
+sql select c2, ceil(c2) from $tb
+sql select c2, c3, ceil(c2) from $tb
+sql select ts, c2, c3, ceil(c2) from $tb
+
+sql select ceil(c2), ceil(c6) from $tb
+
+sql select ts, ceil(c2), ceil(c6) from $tb
+sql select c2, ceil(c2), ceil(c6) from $tb
+sql select c2, c3, ceil(c2), ceil(c6) from $tb
+sql select ts, c2, c3, ceil(c2), ceil(c6) from $tb
+
+sql select ceil(c2), floor(c2), round(c2) from $tb
+
+sql select ts, ceil(c2), floor(c2), round(c2) from $tb
+sql select c2, ceil(c2), floor(c2), round(c2) from $tb
+sql select c2, c3, ceil(c2), floor(c2), round(c2) from $tb
+sql select ts, c2, c3, ceil(c2), floor(c2), round(c2) from $tb
+
+sql select ts, ceil(c2) from $mt
+sql select c2, ceil(c2) from $mt
+sql select c2, c3, ceil(c2) from $mt
+sql select ts, c2, c3, ceil(c2) from $mt
+
+sql select ceil(c2), ceil(c6) from $mt
+
+sql select ts, ceil(c2), ceil(c6) from $mt
+sql select c2, ceil(c2), ceil(c6) from $mt
+sql select c2, c3, ceil(c2), ceil(c6) from $mt
+sql select ts, c2, c3, ceil(c2), ceil(c6) from $mt
+
+sql select ceil(c2), ceil(c2), round(c2) from $mt
+
+sql select ts, ceil(c2), floor(c2), round(c2) from $mt
+sql select c2, ceil(c2), floor(c2), round(c2) from $mt
+sql select c2, c3, ceil(c2), floor(c2), round(c2) from $mt
+sql select ts, c2, c3, ceil(c2), floor(c2), round(c2) from $mt
+
+sql_error select ceil(c7) from $tb
+sql_error select ceil(c8) from $tb
+sql_error select ceil(c9) from $tb
+sql_error select ceil(ts) from $tb
+sql_error select ceil(c2+2) from $tb
+sql_error select ceil(c2) from $tb where ts > 0 and ts < now + 100m interval(10m)
+sql_error select ceil(ceil(c2)) from $tb
+sql_error select ceil(c2) from m_di_tb1 where c2 like '2%'
+
+print =============== step3
+sql select ceil(c2) from $tb where c2 <= 5001.00000
+print ===> $data00
+if $data00 != 5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 <= 5001.00000
+print ===> $data10
+if $data10 != -5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 <= 5001.00000
+print ===> $data20
+if $data20 != 5001.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 <= 5001.00000
+print ===> $data70
+if $data70 != -5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 <= 5001.00000
+print ===> $data80
+if $data80 != 5001.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 <= 5001.00000
+print ===> $data90
+if $data90 != -5000.00000 then
+ return -1
+endi
+
+print =============== step4
+sql select ceil(c2) from $tb where c2 >= -5001.00000
+print ===> $data00
+if $data00 != 5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 >= -5001.00000
+print ===> $data10
+if $data10 != -5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 >= -5001.00000
+print ===> $data20
+if $data20 != 5001.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 >= -5001.00000
+print ===> $data70
+if $data70 != -5000.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 >= -5001.00000
+print ===> $data80
+if $data80 != 5001.00000 then
+ return -1
+endi
+sql select ceil(c2) from $tb where c2 >= -5001.00000
+print ===> $data90
+if $data90 != -5000.00000 then
+ return -1
+endi
+
+print =============== step5
+sql select ceil(c1) as b from $tb interval(1m) -x step5
+ return -1
+step5:
+
+print =============== step6
+sql select ceil(c1) as b from $tb where ts < now + 4m interval(1m) -x step6
+ return -1
+step6:
+
+print =============== clear
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/compute/floor.sim b/tests/script/general/compute/floor.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0fc14515acd576505dfb48328eda18fabb51e8c5
--- /dev/null
+++ b/tests/script/general/compute/floor.sim
@@ -0,0 +1,288 @@
+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
+
+$dbPrefix = m_di_db
+$tbPrefix = m_di_tb
+$mtPrefix = m_di_mt
+$tbNum = 2
+$rowNum = 10000
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 nchar(5), c9 binary(10)) TAGS (tgcol int)
+
+$i = 0
+while $i < $tbNum
+ $tb = $tbPrefix . $i
+ sql create table $tb using $mt tags( $i )
+
+ $x = 0
+ $y = 0
+
+ $v0 = 5000.0
+ $v1 = -5000.1
+ $v2 = 5000.2
+ $v3 = -5000.3
+ $v4 = 5000.4
+ $v5 = -5000.5
+ $v6 = 5000.6
+ $v7 = -5000.7
+ $v8 = 5000.8
+ $v9 = -5000.9
+
+ while $x < $rowNum
+ $cc = $x * 60000
+ $ms = 1601481600000 + $cc
+
+ $val = $v0
+
+ if $y == 0 then
+ $val = $v0
+ endi
+
+ if $y == 1 then
+ $val = $v1
+ endi
+
+ if $y == 2 then
+ $val = $v2
+ endi
+
+ if $y == 3 then
+ $val = $v3
+ endi
+
+ if $y == 4 then
+ $val = $v4
+ endi
+
+ if $y == 5 then
+ $val = $v5
+ endi
+
+ if $y == 6 then
+ $val = $v6
+ endi
+
+ if $y == 7 then
+ $val = $v7
+ endi
+
+ if $y == 8 then
+ $val = $v8
+ endi
+
+ if $y == 9 then
+ $val = $v9
+ endi
+
+ $tinyint = $x / 128
+ sql insert into $tb values ($ms , $x , $val , $x , $x , $tinyint , $x , $x , $x , $x )
+ $x = $x + 1
+ $y = $y + 1
+ if $y == 10 then
+ $y = 0
+ endi
+ endw
+
+ $i = $i + 1
+endw
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select floor(c2) from $tb
+print ===> $data00
+if $data00 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb
+print ===> $data10
+if $data10 != -5001.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb
+print ===> $data20
+if $data20 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb
+print ===> $data30
+if $data30 != -5001.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb
+print ===> $data40
+if $data40 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb
+print ===> $data50
+if $data50 != -5001.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb
+print ===> $data60
+if $data60 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb
+print ===> $data70
+if $data70 != -5001.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb
+print ===> $data80
+if $data80 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb
+print ===> $data90
+if $data90 != -5001.00000 then
+ return -1
+endi
+
+sql select floor(c5) from $tb
+print ===> $data10
+if $data10 != 0 then
+ return -1
+endi
+sql select ts, floor(c2) from $tb
+sql select c2, floor(c2) from $tb
+sql select c2, c3, floor(c2) from $tb
+sql select ts, c2, c3, floor(c2) from $tb
+
+sql select floor(c2), floor(c6) from $tb
+
+sql select ts, floor(c2), floor(c6) from $tb
+sql select c2, floor(c2), floor(c6) from $tb
+sql select c2, c3, floor(c2), floor(c6) from $tb
+sql select ts, c2, c3, floor(c2), floor(c6) from $tb
+
+sql select ceil(c2), floor(c2), round(c2) from $tb
+
+sql select ts, ceil(c2), floor(c2), round(c2) from $tb
+sql select c2, ceil(c2), floor(c2), round(c2) from $tb
+sql select c2, c3, ceil(c2), floor(c2), round(c2) from $tb
+sql select ts, c2, c3, ceil(c2), floor(c2), round(c2) from $tb
+
+sql select ts, floor(c2) from $mt
+sql select c2, floor(c2) from $mt
+sql select c2, c3, floor(c2) from $mt
+sql select ts, c2, c3, floor(c2) from $mt
+
+sql select floor(c2), floor(c6) from $mt
+
+sql select ts, floor(c2), floor(c6) from $mt
+sql select c2, floor(c2), floor(c6) from $mt
+sql select c2, c3, floor(c2), floor(c6) from $mt
+sql select ts, c2, c3, floor(c2), floor(c6) from $mt
+
+sql select ceil(c2), floor(c2), round(c2) from $mt
+
+sql select ts, ceil(c2), floor(c2), round(c2) from $mt
+sql select c2, ceil(c2), floor(c2), round(c2) from $mt
+sql select c2, c3, ceil(c2), floor(c2), round(c2) from $mt
+sql select ts, c2, c3, ceil(c2), floor(c2), round(c2) from $mt
+
+sql_error select floor(c7) from $tb
+sql_error select floor(c8) from $tb
+sql_error select floor(c9) from $tb
+sql_error select floor(ts) from $tb
+sql_error select floor(c2+2) from $tb
+sql_error select floor(c2) from $tb where ts > 0 and ts < now + 100m interval(10m)
+sql_error select floor(floor(c2)) from $tb
+sql_error select floor(c2) from m_di_tb1 where c2 like '2%'
+
+print =============== step3
+sql select floor(c2) from $tb where c2 <= 5001.00000
+print ===> $data00
+if $data00 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 <= 5001.00000
+print ===> $data10
+if $data10 != -5001.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 <= 5001.00000
+print ===> $data20
+if $data20 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 <= 5001.00000
+print ===> $data70
+if $data70 != -5001.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 <= 5001.00000
+print ===> $data80
+if $data80 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 <= 5001.00000
+print ===> $data90
+if $data90 != -5001.00000 then
+ return -1
+endi
+
+print =============== step4
+sql select floor(c2) from $tb where c2 >= -5001.00000
+print ===> $data00
+if $data00 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 >= -5001.00000
+print ===> $data10
+if $data10 != -5001.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 >= -5001.00000
+print ===> $data20
+if $data20 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 >= -5001.00000
+print ===> $data70
+if $data70 != -5001.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 >= -5001.00000
+print ===> $data80
+if $data80 != 5000.00000 then
+ return -1
+endi
+sql select floor(c2) from $tb where c2 >= -5001.00000
+print ===> $data90
+if $data90 != -5001.00000 then
+ return -1
+endi
+
+print =============== step5
+sql select floor(c1) as b from $tb interval(1m) -x step5
+ return -1
+step5:
+
+print =============== step6
+sql select floor(c1) as b from $tb where ts < now + 4m interval(1m) -x step6
+ return -1
+step6:
+
+print =============== clear
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/compute/round.sim b/tests/script/general/compute/round.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5e03b47785fc4358e0c4b3a92db7fbc9233d4dbe
--- /dev/null
+++ b/tests/script/general/compute/round.sim
@@ -0,0 +1,288 @@
+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
+
+$dbPrefix = m_di_db
+$tbPrefix = m_di_tb
+$mtPrefix = m_di_mt
+$tbNum = 2
+$rowNum = 10000
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 nchar(5), c9 binary(10)) TAGS (tgcol int)
+
+$i = 0
+while $i < $tbNum
+ $tb = $tbPrefix . $i
+ sql create table $tb using $mt tags( $i )
+
+ $x = 0
+ $y = 0
+
+ $v0 = 5000.0
+ $v1 = -5000.1
+ $v2 = 5000.2
+ $v3 = -5000.3
+ $v4 = 5000.4
+ $v5 = -5000.5
+ $v6 = 5000.6
+ $v7 = -5000.7
+ $v8 = 5000.8
+ $v9 = -5000.9
+
+ while $x < $rowNum
+ $cc = $x * 60000
+ $ms = 1601481600000 + $cc
+
+ $val = $v0
+
+ if $y == 0 then
+ $val = $v0
+ endi
+
+ if $y == 1 then
+ $val = $v1
+ endi
+
+ if $y == 2 then
+ $val = $v2
+ endi
+
+ if $y == 3 then
+ $val = $v3
+ endi
+
+ if $y == 4 then
+ $val = $v4
+ endi
+
+ if $y == 5 then
+ $val = $v5
+ endi
+
+ if $y == 6 then
+ $val = $v6
+ endi
+
+ if $y == 7 then
+ $val = $v7
+ endi
+
+ if $y == 8 then
+ $val = $v8
+ endi
+
+ if $y == 9 then
+ $val = $v9
+ endi
+
+ $tinyint = $x / 128
+ sql insert into $tb values ($ms , $x , $val , $x , $x , $tinyint , $x , $x , $x , $x )
+ $x = $x + 1
+ $y = $y + 1
+ if $y == 10 then
+ $y = 0
+ endi
+ endw
+
+ $i = $i + 1
+endw
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select round(c2) from $tb
+print ===> $data00
+if $data00 != 5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb
+print ===> $data10
+if $data10 != -5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb
+print ===> $data20
+if $data20 != 5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb
+print ===> $data30
+if $data30 != -5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb
+print ===> $data40
+if $data40 != 5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb
+print ===> $data50
+if $data50 != -5001.00000 then
+ return -1
+endi
+sql select round(c2) from $tb
+print ===> $data60
+if $data60 != 5001.00000 then
+ return -1
+endi
+sql select round(c2) from $tb
+print ===> $data70
+if $data70 != -5001.00000 then
+ return -1
+endi
+sql select round(c2) from $tb
+print ===> $data80
+if $data80 != 5001.00000 then
+ return -1
+endi
+sql select round(c2) from $tb
+print ===> $data90
+if $data90 != -5001.00000 then
+ return -1
+endi
+
+sql select round(c5) from $tb
+print ===> $data10
+if $data10 != 0 then
+ return -1
+endi
+sql select ts, round(c2) from $tb
+sql select c2, round(c2) from $tb
+sql select c2, c3, round(c2) from $tb
+sql select ts, c2, c3, round(c2) from $tb
+
+sql select round(c2), round(c6) from $tb
+
+sql select ts, round(c2), round(c6) from $tb
+sql select c2, round(c2), round(c6) from $tb
+sql select c2, c3, round(c2), round(c6) from $tb
+sql select ts, c2, c3, round(c2), round(c6) from $tb
+
+sql select ceil(c2), floor(c2), round(c2) from $tb
+
+sql select ts, ceil(c2), floor(c2), round(c2) from $tb
+sql select c2, ceil(c2), floor(c2), round(c2) from $tb
+sql select c2, c3, ceil(c2), floor(c2), round(c2) from $tb
+sql select ts, c2, c3, ceil(c2), floor(c2), round(c2) from $tb
+
+sql select ts, round(c2) from $mt
+sql select c2, round(c2) from $mt
+sql select c2, c3, round(c2) from $mt
+sql select ts, c2, c3, round(c2) from $mt
+
+sql select round(c2), round(c6) from $mt
+
+sql select ts, round(c2), round(c6) from $mt
+sql select c2, round(c2), round(c6) from $mt
+sql select c2, c3, round(c2), round(c6) from $mt
+sql select ts, c2, c3, round(c2), round(c6) from $mt
+
+sql select ceil(c2), floor(c2), round(c2) from $mt
+
+sql select ts, ceil(c2), floor(c2), round(c2) from $mt
+sql select c2, ceil(c2), floor(c2), round(c2) from $mt
+sql select c2, c3, ceil(c2), floor(c2), round(c2) from $mt
+sql select ts, c2, c3, ceil(c2), floor(c2), round(c2) from $mt
+
+sql_error select round(c7) from $tb
+sql_error select round(c8) from $tb
+sql_error select round(c9) from $tb
+sql_error select round(ts) from $tb
+sql_error select round(c2+2) from $tb
+sql_error select round(c2) from $tb where ts > 0 and ts < now + 100m interval(10m)
+sql_error select round(round(c2)) from $tb
+sql_error select round(c2) from m_di_tb1 where c2 like '2%'
+
+print =============== step3
+sql select round(c2) from $tb where c2 <= 5001.00000
+print ===> $data00
+if $data00 != 5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 <= 5001.00000
+print ===> $data10
+if $data10 != -5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 <= 5001.00000
+print ===> $data20
+if $data20 != 5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 <= 5001.00000
+print ===> $data70
+if $data70 != -5001.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 <= 5001.00000
+print ===> $data80
+if $data80 != 5001.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 <= 5001.00000
+print ===> $data90
+if $data90 != -5001.00000 then
+ return -1
+endi
+
+print =============== step4
+sql select round(c2) from $tb where c2 >= -5001.00000
+print ===> $data00
+if $data00 != 5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 >= -5001.00000
+print ===> $data10
+if $data10 != -5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 >= -5001.00000
+print ===> $data20
+if $data20 != 5000.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 >= -5001.00000
+print ===> $data70
+if $data70 != -5001.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 >= -5001.00000
+print ===> $data80
+if $data80 != 5001.00000 then
+ return -1
+endi
+sql select round(c2) from $tb where c2 >= -5001.00000
+print ===> $data90
+if $data90 != -5001.00000 then
+ return -1
+endi
+
+print =============== step5
+sql select round(c1) as b from $tb interval(1m) -x step5
+ return -1
+step5:
+
+print =============== step6
+sql select round(c1) as b from $tb where ts < now + 4m interval(1m) -x step6
+ return -1
+step6:
+
+print =============== clear
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/between_and.sim b/tests/script/general/parser/between_and.sim
index cdced47cb65aea79618540b57e159b741bf9288a..5db40471d85bcbafbcb6dcaa5912e6cfb9a66bc5 100644
--- a/tests/script/general/parser/between_and.sim
+++ b/tests/script/general/parser/between_and.sim
@@ -159,7 +159,7 @@ if $data11 != 3 then
endi
sql_error select * from st2 where f7 between 2.0 and 3.0;
-sql_error select * from st2 where f8 between 2.0 and 3.0;
-sql_error select * from st2 where f9 between 2.0 and 3.0;
+sql select * from st2 where f8 between 2.0 and 3.0;
+sql select * from st2 where f9 between 2.0 and 3.0;
system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/condition.sim b/tests/script/general/parser/condition.sim
index c3aed7e2a3b04c0ca2e27e2e62d92009e8b2fe8e..96cd1e80bd01ad6ffa197ccbe8c58ce6474f3339 100644
--- a/tests/script/general/parser/condition.sim
+++ b/tests/script/general/parser/condition.sim
@@ -2,7 +2,7 @@ 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/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 6
system sh/cfg.sh -n dnode1 -c cache -v 1
system sh/exec.sh -n dnode1 -s start
@@ -135,11 +135,63 @@ while $i < $blockNum
$ts0 = $ts0 + 259200000
endw
+sql create table stb5 (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 timestamp, t2 int, t3 float, t4 bigint, t5 smallint, t6 tinyint, t7 double, t8 bool, t9 binary(100), t10 nchar(10))
+
+sql create table tb5_1 using stb5 tags('2021-05-05 18:19:01',1,1.0,1,1,1,1.0,true ,'111111111','1')
+sql create table tb5_2 using stb5 tags('2021-05-05 18:19:02',2,2.0,2,2,2,2.0,true ,'222222222','2')
+sql create table tb5_3 using stb5 tags('2021-05-05 18:19:03',3,3.0,3,3,3,3.0,false,'333333333','3')
+sql create table tb5_4 using stb5 tags('2021-05-05 18:19:04',4,4.0,4,4,4,4.0,false,'444444444','4')
+sql create table tb5_5 using stb5 tags('2021-05-05 18:19:05',5,5.0,5,5,5,5.0,true,'555555555','5')
+sql create table tb5_6 using stb5 tags('2021-05-05 18:19:06',6,6.0,6,6,6,6.0,true,'666666666','6')
+sql create table tb5_7 using stb5 tags(NULL,7,NULL,7,NULL,7,NULL,false,NULL,'7')
+sql create table tb5_8 using stb5 tags('2021-05-05 18:19:08',NULL,8.0,NULL,8,NULL,8.0,NULL,'888888888',NULL)
+
+sql insert into tb5_1 values ('2021-05-05 18:19:00',1,1.0,1,1,1,1.0,true ,'1','1')
+sql insert into tb5_1 values ('2021-05-05 18:19:01',2,2.0,2,2,2,2.0,true ,'2','2')
+sql insert into tb5_1 values ('2021-05-05 18:19:02',3,3.0,3,3,3,3.0,false,'3','3')
+sql insert into tb5_1 values ('2021-05-05 18:19:03',4,4.0,4,4,4,4.0,false,'4','4')
+sql insert into tb5_1 values ('2021-05-05 18:19:04',11,11.0,11,11,11,11.0,true ,'11','11')
+sql insert into tb5_1 values ('2021-05-05 18:19:05',12,12.0,12,12,12,12.0,true ,'12','12')
+sql insert into tb5_1 values ('2021-05-05 18:19:06',13,13.0,13,13,13,13.0,false,'13','13')
+sql insert into tb5_1 values ('2021-05-05 18:19:07',14,14.0,14,14,14,14.0,false,'14','14')
+sql insert into tb5_2 values ('2021-05-05 18:19:08',21,21.0,21,21,21,21.0,true ,'21','21')
+sql insert into tb5_2 values ('2021-05-05 18:19:09',22,22.0,22,22,22,22.0,true ,'22','22')
+sql insert into tb5_2 values ('2021-05-05 18:19:10',23,23.0,23,23,23,23.0,false,'23','23')
+sql insert into tb5_2 values ('2021-05-05 18:19:11',24,24.0,24,24,24,24.0,false,'24','24')
+sql insert into tb5_3 values ('2021-05-05 18:19:12',31,31.0,31,31,31,31.0,true ,'31','31')
+sql insert into tb5_3 values ('2021-05-05 18:19:13',32,32.0,32,32,32,32.0,true ,'32','32')
+sql insert into tb5_3 values ('2021-05-05 18:19:14',33,33.0,33,33,33,33.0,false,'33','33')
+sql insert into tb5_3 values ('2021-05-05 18:19:15',34,34.0,34,34,34,34.0,false,'34','34')
+sql insert into tb5_4 values ('2021-05-05 18:19:16',41,41.0,41,41,41,41.0,true ,'41','41')
+sql insert into tb5_4 values ('2021-05-05 18:19:17',42,42.0,42,42,42,42.0,true ,'42','42')
+sql insert into tb5_4 values ('2021-05-05 18:19:18',43,43.0,43,43,43,43.0,false,'43','43')
+sql insert into tb5_4 values ('2021-05-05 18:19:19',44,44.0,44,44,44,44.0,false,'44','44')
+sql insert into tb5_5 values ('2021-05-05 18:19:20',51,51.0,51,51,51,51.0,true ,'51','51')
+sql insert into tb5_5 values ('2021-05-05 18:19:21',52,52.0,52,52,52,52.0,true ,'52','52')
+sql insert into tb5_5 values ('2021-05-05 18:19:22',53,53.0,53,53,53,53.0,false,'53','53')
+sql insert into tb5_5 values ('2021-05-05 18:19:23',54,54.0,54,54,54,54.0,false,'54','54')
+sql insert into tb5_6 values ('2021-05-05 18:19:24',61,61.0,61,61,61,61.0,true ,'61','61')
+sql insert into tb5_6 values ('2021-05-05 18:19:25',62,62.0,62,62,62,62.0,true ,'62','62')
+sql insert into tb5_6 values ('2021-05-05 18:19:26',63,63.0,63,63,63,63.0,false,'63','63')
+sql insert into tb5_6 values ('2021-05-05 18:19:27',64,64.0,64,64,64,64.0,false,'64','64')
+sql insert into tb5_6 values ('2021-05-05 18:19:28',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
+sql insert into tb5_7 values ('2021-05-05 18:19:29',71,71.0,71,71,71,71.0,true ,'71','71')
+sql insert into tb5_7 values ('2021-05-05 18:19:30',72,72.0,72,72,72,72.0,true ,'72','72')
+sql insert into tb5_7 values ('2021-05-05 18:19:31',73,73.0,73,73,73,73.0,false,'73','73')
+sql insert into tb5_7 values ('2021-05-05 18:19:32',74,74.0,74,74,74,74.0,false,'74','74')
+sql insert into tb5_7 values ('2021-05-05 18:19:33',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
+sql insert into tb5_8 values ('2021-05-05 18:19:34',81,81.0,81,81,81,81.0,true ,'81','81')
+sql insert into tb5_8 values ('2021-05-05 18:19:35',82,82.0,82,82,82,82.0,true ,'82','82')
+sql insert into tb5_8 values ('2021-05-05 18:19:36',83,83.0,83,83,83,83.0,false,'83','83')
+sql insert into tb5_8 values ('2021-05-05 18:19:37',84,84.0,84,84,84,84.0,false,'84','84')
+sql insert into tb5_8 values ('2021-05-05 18:19:38',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
+
sleep 100
sql connect
run general/parser/condition_query.sim
+run general/parser/condition_query2.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -150,4 +202,90 @@ sql connect
sleep 100
run general/parser/condition_query.sim
+run general/parser/condition_query2.sim
+
+sql drop database if exists cdb
+
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 100
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 1000
+system sh/cfg.sh -n dnode1 -c minTablesPerVnode -v 1000
+system sh/exec.sh -n dnode1 -s start
+
+sql create database if not exists cdb
+sql use cdb
+sql create table stba (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
+sql create table stbb (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 bool)
+sql create table stbc (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 float)
+sql create table stbd (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 binary(10))
+sql create table stbe (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 nchar(10))
+
+
+sql create table tba_0 using stba tags(0)
+sql create table tba_1 using stba tags(1)
+sql create table tba_2 using stba tags(2)
+sql create table tba_3 using stba tags(3)
+sql create table tba_4 using stba tags(4)
+sql create table tba_5 using stba tags(5)
+sql create table tba_6 using stba tags(6)
+sql create table tba_7 using stba tags(7)
+sql create table tba_8 using stba tags(8)
+sql create table tba_9 using stba tags(9)
+
+sql create table tbb_0 using stbb tags(true)
+sql create table tbb_1 using stbb tags(false)
+sql create table tbb_2 using stbb tags(true)
+sql create table tbb_3 using stbb tags(false)
+sql create table tbb_4 using stbb tags(true)
+sql create table tbb_5 using stbb tags(false)
+sql create table tbb_6 using stbb tags(true)
+sql create table tbb_7 using stbb tags(false)
+sql create table tbb_8 using stbb tags(true)
+sql create table tbb_9 using stbb tags(false)
+
+sql create table tbc_0 using stbc tags(0)
+sql create table tbc_1 using stbc tags(1)
+sql create table tbc_2 using stbc tags(2)
+sql create table tbc_3 using stbc tags(3)
+sql create table tbc_4 using stbc tags(4)
+sql create table tbc_5 using stbc tags(5)
+sql create table tbc_6 using stbc tags(6)
+sql create table tbc_7 using stbc tags(7)
+sql create table tbc_8 using stbc tags(8)
+sql create table tbc_9 using stbc tags(9)
+
+
+sql create table tbd_0 using stbd tags('0000')
+sql create table tbd_1 using stbd tags('1111')
+sql create table tbd_2 using stbd tags('2222')
+sql create table tbd_3 using stbd tags('3333')
+sql create table tbd_4 using stbd tags('4444')
+sql create table tbd_5 using stbd tags('5555')
+sql create table tbd_6 using stbd tags('6666')
+sql create table tbd_7 using stbd tags('7777')
+sql create table tbd_8 using stbd tags('8888')
+sql create table tbd_9 using stbd tags('9999')
+
+sql create table tbe_0 using stbe tags('0000')
+sql create table tbe_1 using stbe tags('1111')
+sql create table tbe_2 using stbe tags('2222')
+sql create table tbe_3 using stbe tags('3333')
+sql create table tbe_4 using stbe tags('4444')
+sql create table tbe_5 using stbe tags('5555')
+sql create table tbe_6 using stbe tags('6666')
+sql create table tbe_7 using stbe tags('7777')
+sql create table tbe_8 using stbe tags('8888')
+sql create table tbe_9 using stbe tags('9999')
+
+
+run general/parser/condition_query3.sim
+
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 100
+system sh/exec.sh -n dnode1 -s start
+
+run general/parser/condition_query3.sim
diff --git a/tests/script/general/parser/condition_query.sim b/tests/script/general/parser/condition_query.sim
index 8dfa8dae0c9e0c56116cb4132d1e940e99f45d48..bebcbe709f005337795fe1286b34fc264b287cb0 100644
--- a/tests/script/general/parser/condition_query.sim
+++ b/tests/script/general/parser/condition_query.sim
@@ -1,4 +1,3 @@
-
sql use cdb;
print "column test"
@@ -11,7 +10,7 @@ if $rows != 28 then
return -1
endi
-sql_error select * from stb1 where c8 > 0
+
sql_error select * from stb1 where c7 in (0,2,3,1);
sql_error select * from stb1 where c8 in (true);
sql_error select * from stb1 where c8 in (1,2);
@@ -33,14 +32,119 @@ sql_error select * from stb1 where c4 != 'null';
sql_error select * from stb1 where c5 >= 'null';
sql_error select * from stb1 where c6 <= 'null';
sql_error select * from stb1 where c7 < 'nuLl';
-sql_error select * from stb1 where c8 < 'nuLl';
-sql_error select * from stb1 where c9 > 'nuLl';
+sql_error select * from stb1 where c1 match '.*';
+sql_error select * from stb1 where c2 match '.*';
+sql_error select * from stb1 where c3 match '.*';
+sql_error select * from stb1 where c4 match '.*';
+sql_error select * from stb1 where c5 match '.*';
+sql_error select * from stb1 where c6 match '.*';
+sql_error select * from stb1 where c7 match '.*';
+sql_error select * from stb1 where c9 match '.*';
+sql_error select * from stb1 where ts match '.*';
+sql_error select * from stb1 where c1 nmatch '.*';
+sql_error select * from stb1 where c2 nmatch '.*';
+sql_error select * from stb1 where c3 nmatch '.*';
+sql_error select * from stb1 where c4 nmatch '.*';
+sql_error select * from stb1 where c5 nmatch '.*';
+sql_error select * from stb1 where c6 nmatch '.*';
+sql_error select * from stb1 where c7 nmatch '.*';
+sql_error select * from stb1 where c9 nmatch '.*';
+sql_error select * from stb1 where ts nmatch '.*';
+
sql_error select * from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b;
sql_error select a.ts,a.c1,a.c8 from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and a.c1 > 50 or b.c1 < 60;
sql_error select a.ts,a.c1,a.c8 from (select * from stb1 where c7=true) a, (select * from stb1 where c1 > 30) b where a.ts=b.ts and ((a.c1 > 50 and a.c1 < 60) or (b.c2 > 60));
sql_error select * from stb1 where 'c2' is null;
sql_error select * from stb1 where 'c2' is not null;
+sql select * from stb1 where c9 > 'nuLl';
+if $rows != 0 then
+ return -1
+endi
+
+sql select * from stb1 where c8 = '22' or c8 >= '62';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+
+sql select * from stb1 where c8 < '11';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+
+sql select * from stb1 where c8 <> '11';
+if $rows != 27 then
+ return -1
+endi
+
+
+sql select * from stb1 where c9 > 'nuLl';
+if $rows != 0 then
+ return -1
+endi
+
+sql select * from stb1 where c9 > '11' and c9 <= '21';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+
+sql select * from stb1 where c9 <= '11' and c9 > '2' and c9 <> 3;
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+
+sql select * from stb1 where c8 > 0
+if $rows != 28 then
+ return -1
+endi
+
+sql select * from stb1 where c8 < 'nuLl';
+if $rows != 28 then
+ return -1
+endi
+
sql select * from stb1 where c2 > 3.0 or c2 < 60;
if $rows != 28 then
return -1
@@ -2071,179 +2175,61 @@ if $data20 != @21-07-16 01:00:00.899@ then
return -1
endi
-
-print "ts test"
-sql_error select ts,c1,c7 from stb1 where ts != '2021-05-05 18:19:27'
-sql_error select ts,c1,c7 from stb1 where ts > '2021-05-05 18:19:03.000' or ts < '2021-05-05 18:19:02.000';
-sql_error select ts,c1,c7 from stb1 where ts > '2021-05-05 18:19:03.000' and ts > '2021-05-05 18:19:20.000' and ts != '2021-05-05 18:19:22.000';
-sql_error select * from stb1 where ts2 like '2021-05-05%';
-sql_error select ts,c1,c2 from stb1 where (ts > '2021-05-05 18:19:25.000' or ts < '2021-05-05 18:19:05.000') and ts > '2021-05-05 18:19:01.000' and ts < '2021-05-05 18:19:27.000';
-sql_error select ts,c1,c2 from stb1 where (ts > '2021-05-05 18:19:20.000' or ts < '2021-05-05 18:19:05.000') and ts != '2021-05-05 18:19:25.000';
-sql_error select ts,c1,c2 from stb1 where ((ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:10.000') or (ts >= '2021-05-05 18:19:15.000' and ts <= '2021-05-05 18:19:20.000') or (ts >= '2021-05-05 18:19:11.000' and ts <= '2021-05-05 18:19:14.000'));
-sql_error select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts < '2021-05-05 18:19:24.000';
-sql select * from stb1 where ts is null;
-if $rows != 0 then
- return -1
-endi
-sql select * from stb1 where ts is not null and ts is null;
-if $rows != 0 then
- return -1
-endi
-
-sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' and ts < '2021-05-05 18:19:10.000';
-if $rows != 0 then
- return -1
-endi
-
-sql select * from stb1 where ts > '2021-05-05 18:19:03.000' and ts < '2021-05-05 18:19:02';
-if $rows != 0 then
+sql select * from stb1 where c8 > 0;
+if $rows != 28 then
return -1
endi
-sql select * from stb1 where ts is not null;
-if $rows != 29 then
+sql select * from stb1 where c8 > 1 and c8 <= 21 and c8 < 11 and c8 >= 3;
+if $rows != 2 then
return -1
endi
-
-sql select * from stb1 where ts is not null or ts is null;
-if $rows != 29 then
+if $data00 != @21-05-05 18:19:02.000@ then
return -1
endi
-
-sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts < '2021-05-05 18:19:25.000';
-if $rows != 29 then
+if $data10 != @21-05-05 18:19:03.000@ then
return -1
endi
-sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' and ts < '2021-05-05 18:19:26.000';
-if $rows != 1 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:25.000@ then
- return -1
-endi
-sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts < '2021-05-05 18:19:28.000';
-if $rows != 29 then
- return -1
-endi
-sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts > '2021-05-05 18:19:27.000';
-if $rows != 4 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:25.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:26.000@ then
+sql select * from stb1 where c8 = 11 or c8 = 12 or c8 is null or c8 in ('13','23') or (c8 like '%4' and c8 like '3_');
+if $rows != 6 then
return -1
endi
-if $data20 != @21-05-05 18:19:27.000@ then
+if $data00 != @21-05-05 18:19:04.000@ then
return -1
endi
-if $data30 != @21-05-05 18:19:28.000@ then
+if $data10 != @21-05-05 18:19:05.000@ then
return -1
endi
-
-sql select ts,c1,c2 from stb1 where ts > '2021-05-05 18:19:20.000' or ts < '2021-05-05 18:19:05.000' or ts != '2021-05-05 18:19:25.000';
-if $rows != 29 then
+if $data20 != @21-05-05 18:19:06.000@ then
return -1
endi
-
-sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts <> '2021-05-05 18:19:25.000';
-if $rows != 29 then
+if $data30 != @21-05-05 18:19:10.000@ then
return -1
endi
-
-sql select ts,c1,c2 from stb1 where ((ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:10.999') or (ts >= '2021-05-05 18:19:15.000' and ts <= '2021-05-05 18:19:20.000') or (ts >= '2021-05-05 18:19:11.000' and ts <= '2021-05-05 18:19:14.999'));
-if $rows != 16 then
+if $data40 != @21-05-05 18:19:15.000@ then
return -1
endi
-if $data00 != @21-05-05 18:19:05.000@ then
+if $data50 != @21-05-05 18:19:28.000@ then
return -1
endi
-sql select ts,c1,c2 from stb1 where (ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:10.000') or (ts >= '2021-05-05 18:19:12.000' and ts <= '2021-05-05 18:19:14.000') or (ts >= '2021-05-05 18:19:08.000' and ts <= '2021-05-05 18:19:17.000');
+sql select * from stb1 where c9 >= 3 and c9 <= 33;
if $rows != 13 then
return -1
endi
-if $data00 != @21-05-05 18:19:05.000@ then
- return -1
-endi
-
-sql select ts,c1,c2 from stb1 where (ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:10.000') or (ts >= '2021-05-05 18:19:02.000' and ts <= '2021-05-05 18:19:03.000') or (ts >= '2021-05-05 18:19:01.000' and ts <= '2021-05-05 18:19:08.000');
-if $rows != 10 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:01.000@ then
- return -1
-endi
-
-sql select ts,c1,c2 from stb1 where ((ts >= '2021-05-05 18:19:08.000' and ts <= '2021-05-05 18:19:10.000') or (ts >= '2021-05-05 18:19:02.000' and ts <= '2021-05-05 18:19:03.000') or (ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:06.000') or (ts >= '2021-05-05 18:19:03.000' and ts <= '2021-05-05 18:19:12.000')) and (ts >= '2021-05-05 18:19:10.000');
-if $rows != 3 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:10.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:11.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:12.000@ then
- return -1
-endi
-sql select ts,c1,c7 from stb1 where ts > '2021-05-05 18:19:25.000' and ts != '2021-05-05 18:19:18';
-if $rows != 3 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:26.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:27.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:28.000@ then
- return -1
-endi
-
-
-sql select * from stb1 where ts > '2021-05-05 18:19:03.000' and ts > '2021-05-05 18:19:25';
-if $rows != 3 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:26.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:27.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:28.000@ then
- return -1
-endi
-
-sql select * from stb1 where ts < '2021-05-05 18:19:03.000' and ts < '2021-05-05 18:19:25';
-if $rows != 3 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:00.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:01.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:02.000@ then
- return -1
-endi
-
-sql select * from stb1 where ts > '2021-05-05 18:19:23.000' and ts < '2021-05-05 18:19:25';
+sql select * from stb1 where c9 > 22 and c9 <= 38 and c8 < 30 and c8 >= 24;
if $rows != 1 then
return -1
endi
-if $data00 != @21-05-05 18:19:24.000@ then
+if $data00 != @21-05-05 18:19:11.000@ then
return -1
endi
-sql select * from stb1 where ts > '2021-05-05 18:19:03.000' or ts > '2021-05-05 18:19:25';
-if $rows != 25 then
+
+sql select * from stb1 where c9 = 11 or c9 = 12 or c9 is null or c9 in ('13','23') or ((c9 like '%4' or c9 like '3_') and c9 <> 34 and c9 != 44) and c9 < 45 and c9 like '1_';
+if $rows != 6 then
return -1
endi
if $data00 != @21-05-05 18:19:04.000@ then
@@ -2255,485 +2241,104 @@ endi
if $data20 != @21-05-05 18:19:06.000@ then
return -1
endi
-
-sql select * from stb1 where ts < '2021-05-05 18:19:03.000' or ts < '2021-05-05 18:19:25';
-if $rows != 25 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:00.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:01.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:02.000@ then
- return -1
-endi
-
-sql select * from stb1 where ts > '2021-05-05 18:19:23.000' or ts < '2021-05-05 18:19:25';
-if $rows != 29 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:00.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:01.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:02.000@ then
- return -1
-endi
-
-sql select * from stb1 where (ts > '2021-05-05 18:19:23.000' or ts < '2021-05-05 18:19:25') and (ts > '2021-05-05 18:19:23.000' and ts < '2021-05-05 18:19:26');
-if $rows != 2 then
+if $data30 != @21-05-05 18:19:07.000@ then
return -1
endi
-if $data00 != @21-05-05 18:19:24.000@ then
+if $data40 != @21-05-05 18:19:10.000@ then
return -1
endi
-if $data10 != @21-05-05 18:19:25.000@ then
+if $data50 != @21-05-05 18:19:28.000@ then
return -1
endi
-sql select * from stb1 where (ts > '2021-05-05 18:19:23.000' or ts < '2021-05-05 18:19:25') and (ts > '2021-05-05 18:19:23.000' or ts > '2021-05-05 18:19:26');
+sql select * from stb1 where c8 match '^1.*';
if $rows != 5 then
return -1
endi
-if $data00 != @21-05-05 18:19:24.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:25.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:26.000@ then
- return -1
-endi
-if $data30 != @21-05-05 18:19:27.000@ then
- return -1
-endi
-if $data40 != @21-05-05 18:19:28.000@ then
- return -1
-endi
-
-
-sql select * from stb2 where ts2 in ('2021-05-05 18:28:03','2021-05-05 18:28:05','2021-05-05 18:28:08');
-if $rows != 3 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:02.000@ then
+if $data00 != @21-05-05 18:19:00.000@ then
return -1
endi
if $data10 != @21-05-05 18:19:04.000@ then
return -1
endi
-if $data20 != @21-05-05 18:19:07.000@ then
- return -1
-endi
-
-sql select * from stb2 where t3 in ('2021-05-05 18:38:38','2021-05-05 18:38:28','2021-05-05 18:38:08') and ts2 in ('2021-05-05 18:28:04','2021-05-05 18:28:04','2021-05-05 18:28:03');
-if $rows != 2 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:02.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:03.000@ then
- return -1
-endi
-
-sql select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and (a.ts < '2021-05-05 18:19:03.000' or a.ts >= '2021-05-05 18:19:13.000') and (b.ts >= '2021-05-05 18:19:01.000' and b.ts <= '2021-05-05 18:19:14.000');
-if $rows != 4 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:01.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:02.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:13.000@ then
- return -1
-endi
-if $data30 != @21-05-05 18:19:14.000@ then
- return -1
-endi
-
-sql select a.ts,c.ts,b.c1,c.u1,c.u2 from (select * from stb1) a, (select * from stb1) b, (select * from stb2) c where a.ts=b.ts and b.ts=c.ts and a.ts <= '2021-05-05 18:19:12.000' and b.ts >= '2021-05-05 18:19:06.000' and c.ts >= '2021-05-05 18:19:08.000' and c.ts <= '2021-05-05 18:19:11.000' and a.ts != '2021-05-05 18:19:10.000';
-if $rows != 3 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:08.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:09.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:11.000@ then
- return -1
-endi
-
-sql select ts,c1,c2,c8 from (select * from stb1) where (ts <= '2021-05-05 18:19:06.000' or ts >= '2021-05-05 18:19:13.000') and (ts >= '2021-05-05 18:19:02.000' and ts <= '2021-05-05 18:19:14.000') and ts != '2021-05-05 18:19:04.000';
-if $rows != 6 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:02.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:03.000@ then
- return -1
-endi
if $data20 != @21-05-05 18:19:05.000@ then
return -1
endi
if $data30 != @21-05-05 18:19:06.000@ then
return -1
endi
-if $data40 != @21-05-05 18:19:13.000@ then
- return -1
-endi
-if $data50 != @21-05-05 18:19:14.000@ then
+if $data40 != @21-05-05 18:19:07.000@ then
return -1
endi
-sql select ts,c1,c2,c8 from (select * from stb1) where (ts <= '2021-05-05 18:19:03.000' or ts > '2021-05-05 18:19:26.000' or ts = '2021-05-05 18:19:26.000') and ts != '2021-05-05 18:19:03.000' and ts != '2021-05-05 18:19:26.000';
-if $rows != 5 then
+sql select * from stb1 where c8 match '1.*';
+if $rows != 10 then
return -1
endi
if $data00 != @21-05-05 18:19:00.000@ then
return -1
endi
-if $data10 != @21-05-05 18:19:01.000@ then
+if $data10 != @21-05-05 18:19:04.000@ then
return -1
endi
-if $data20 != @21-05-05 18:19:02.000@ then
+if $data20 != @21-05-05 18:19:05.000@ then
return -1
endi
-if $data30 != @21-05-05 18:19:27.000@ then
+if $data30 != @21-05-05 18:19:06.000@ then
return -1
endi
-if $data40 != @21-05-05 18:19:28.000@ then
+if $data40 != @21-05-05 18:19:07.000@ then
return -1
endi
-
-print "tbname test"
-sql_error select * from stb1 where tbname like '%3' and tbname like '%4';
-
-sql select * from stb1 where tbname like 'tb%';
-if $rows != 29 then
+if $data50 != @21-05-05 18:19:08.000@ then
return -1
endi
-
-sql select * from stb1 where tbname like '%2';
-if $rows != 4 then
+if $data60 != @21-05-05 18:19:12.000@ then
return -1
endi
-if $data00 != @21-05-05 18:19:08.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:09.000@ then
+if $data70 != @21-05-05 18:19:16.000@ then
return -1
endi
-if $data20 != @21-05-05 18:19:10.000@ then
+if $data80 != @21-05-05 18:19:20.000@ then
return -1
endi
-if $data30 != @21-05-05 18:19:11.000@ then
+if $data90 != @21-05-05 18:19:24.000@ then
return -1
endi
-print "tag test"
-sql select * from stb1 where t1 in (1,2) and t1 in (2,3);
+sql select * from stb1 where c8 match '1.+';
if $rows != 4 then
return -1
endi
-if $data00 != @21-05-05 18:19:08.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:09.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:10.000@ then
- return -1
-endi
-if $data30 != @21-05-05 18:19:11.000@ then
- return -1
-endi
-
-sql select * from stb2 where t1 in (1,2) and t2 in (2) and t3 in ('2021-05-05 18:58:57.000');
-if $rows != 0 then
- return -1
-endi
-
-print "join test"
-sql_error select * from tb1, tb2_1 where tb1.ts=tb2_1.ts or tb1.ts =tb2_1.ts;
-sql select tb1.ts from tb1, tb2_1 where tb1.ts=tb2_1.ts and tb1.ts > '2021-05-05 18:19:03.000' and tb2_1.ts < '2021-05-05 18:19:06.000';
-if $rows != 2 then
- return -1
-endi
if $data00 != @21-05-05 18:19:04.000@ then
return -1
endi
if $data10 != @21-05-05 18:19:05.000@ then
return -1
endi
-sql select tb1.ts,tb1.*,tb2_1.* from tb1, tb2_1 where tb1.ts=tb2_1.ts and tb1.ts > '2021-05-05 18:19:03.000' and tb2_1.u1 < 5;
-if $rows != 2 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:04.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:06.000@ then
- return -1
-endi
-
-sql select tb1.ts,tb1.*,tb2_1.* from tb1, tb2_1 where tb1.ts=tb2_1.ts and tb1.ts >= '2021-05-05 18:19:03.000' and tb1.c7=false and tb2_1.u3>4;
-if $rows != 2 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:03.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:07.000@ then
- return -1
-endi
-
-sql select stb1.ts,stb1.c1,stb1.t1,stb2.ts,stb2.u1,stb2.t4 from stb1, stb2 where stb1.ts=stb2.ts and stb1.t1 = stb2.t4;
-if $rows != 9 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:00.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:01.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:02.000@ then
- return -1
-endi
-if $data30 != @21-05-05 18:19:03.000@ then
- return -1
-endi
-if $data40 != @21-05-05 18:19:04.000@ then
- return -1
-endi
-if $data50 != @21-05-05 18:19:05.000@ then
- return -1
-endi
-if $data60 != @21-05-05 18:19:06.000@ then
- return -1
-endi
-if $data70 != @21-05-05 18:19:07.000@ then
- return -1
-endi
-if $data80 != @21-05-05 18:19:11.000@ then
- return -1
-endi
-
-sql select stb1.ts,stb1.c1,stb1.t1,stb2.ts,stb2.u1,stb2.t4 from stb1, stb2 where stb1.ts=stb2.ts and stb1.t1 = stb2.t4 and stb1.c1 > 2 and stb2.u1 <=4;
-if $rows != 3 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:02.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:04.000@ then
- return -1
-endi
if $data20 != @21-05-05 18:19:06.000@ then
return -1
endi
-
-print "column&ts test"
-sql_error select count(*) from stb1 where ts > 0 or c1 > 0;
-sql select * from stb1 where ts > '2021-05-05 18:19:03.000' and ts < '2021-05-05 18:19:20.000' and (c1 > 23 or c1 < 14) and c7 in (true) and c8 like '%2';
-if $rows != 3 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:05.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:13.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:17.000@ then
- return -1
-endi
-
-print "column&tbname test"
-sql_error select count(*) from stb1 where tbname like 'tb%' or c1 > 0;
-sql select * from stb1 where tbname like '%3' and c6 < 34 and c5 != 33 and c4 > 31;
-if $rows != 1 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:13.000@ then
+if $data30 != @21-05-05 18:19:07.000@ then
return -1
endi
-print "column&tag test"
-sql_error select * from stb1 where t1 > 0 or c1 > 0
-sql_error select * from stb1 where c1 > 0 or t1 > 0
-sql_error select * from stb1 where t1 > 0 or c1 > 0 or t1 > 1
-sql_error select * from stb1 where c1 > 0 or t1 > 0 or c1 > 1
-sql_error select * from stb1 where t1 > 0 and c1 > 0 or t1 > 1
-sql_error select * from stb1 where c1 > 0 or t1 > 0 and c1 > 1
-sql_error select * from stb1 where c1 > 0 or t1 > 0 and c1 > 1
-sql_error select * from stb1 where t1 > 0 or t1 > 0 and c1 > 1
-sql_error select * from stb1 where (c1 > 0 and t1 > 0 ) or (t1 > 1 and c1 > 3)
-sql_error select * from stb1 where (c1 > 0 and t1 > 0 ) or t1 > 1
-sql_error select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and a.t1=b.t1;
-
-sql select * from stb1 where c1 < 63 and t1 > 5
-if $rows != 2 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:24.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:25.000@ then
- return -1
-endi
-sql select * from stb1 where t1 > 3 and t1 < 5 and c1 != 42 and c1 != 44;
-if $rows != 2 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:16.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:18.000@ then
- return -1
-endi
-sql select * from stb1 where t1 > 1 and c1 > 21 and t1 < 3 and c1 < 24 and t1 != 3 and c1 != 23;
-if $rows != 1 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:09.000@ then
- return -1
-endi
-sql select * from stb1 where c1 > 1 and (t1 > 3 or t1 < 2) and (c2 > 2 and c2 < 62 and t1 != 4) and (t1 > 2 and t1 < 6) and c7 = true and c8 like '%2';
-if $rows != 1 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:21.000@ then
+sql select * from stb1 where c8 nmatch '^1.*';
+if $rows != 23 then
return -1
endi
-sql select * from stb1 where c1!=31 and c1 !=32 and c1 <> 63 and c1 <>1 and c1 <> 21 and c1 <> 2 and c7 <> true and c8 <> '3' and c9 <> '4' and c2<>13 and c3 <> 23 and c4 <> 33 and c5 <> 34 and c6 <> 43 and c2 <> 53 and t1 <> 5 and t2 <>4;
+sql select ts,c8 from stb1 where c8 nmatch '[2345]+';
if $rows != 3 then
return -1
endi
-if $data00 != @21-05-05 18:19:07.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:11.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:27.000@ then
- return -1
-endi
-
-
-print "column&join test"
-sql_error select tb1.ts,tb1.c1,tb2_1.u1 from tb1, tb2_1 where tb1.ts=tb2_1.ts or tb1.c1 > 0;
-
-
-print "ts&tbname test"
-sql_error select count(*) from stb1 where ts > 0 or tbname like 'tb%';
-
-print "ts&tag test"
-sql_error select count(*) from stb1 where ts > 0 or t1 > 0;
-
-sql select * from stb2 where t1!=1 and t2=2 and t3 in ('2021-05-05 18:58:58.000') and ts < '2021-05-05 18:19:13.000';
-if $rows != 2 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:11.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:12.000@ then
- return -1
-endi
-
-print "ts&join test"
-sql_error select tb1.ts,tb1.c1,tb2_1.u1 from tb1, tb2_1 where tb1.ts=tb2_1.ts or tb1.ts > 0;
-sql select tb1.ts,tb1.c1,tb2_1.u1 from tb1, tb2_1 where tb1.ts=tb2_1.ts and (tb1.ts > '2021-05-05 18:19:05.000' or tb1.ts < '2021-05-05 18:19:03.000' or tb1.ts > 0);
-
-
-print "tbname&tag test"
-sql select * from stb1 where tbname like 'tb%' and (t1=1 or t2=2 or t3=3) and t1 > 2;
-if $rows != 4 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:12.000@ then
- return -1
-endi
-if $data10 != @21-05-05 18:19:13.000@ then
- return -1
-endi
-if $data20 != @21-05-05 18:19:14.000@ then
- return -1
-endi
-if $data30 != @21-05-05 18:19:15.000@ then
- return -1
-endi
-
-print "tbname&join test"
-
-print "tag&join test"
-
-
-
-
-
-print "column&ts&tbname test"
-sql_error select count(*) from stb1 where tbname like 'tb%' or c1 > 0 or ts > 0;
-
-print "column&ts&tag test"
-sql_error select count(*) from stb1 where t1 > 0 or c1 > 0 or ts > 0;
-sql_error select count(*) from stb1 where c1 > 0 or t1 > 0 or ts > 0;
-
-sql select * from stb1 where (t1 > 0 or t1 > 2 ) and ts > '2021-05-05 18:19:10.000' and (c1 > 1 or c1 > 3) and (c6 > 40 or c6 < 30) and (c8 like '%3' or c8 like '_4') and (c9 like '1%' or c9 like '6%' or (c9 like '%3' and c9 != '23')) and ts > '2021-05-05 18:19:22.000' and ts <= '2021-05-05 18:19:26.000';
-if $rows != 1 then
- return -1
-endi
-if $data00 != @21-05-05 18:19:26.000@ then
+if $data00 != @21-05-05 18:19:00.000@ then
return -1
endi
-sql select * from stb1 where ts > '2021-05-05 18:19:00.000' and c1 > 2 and t1 != 1 and c2 >= 23 and t2 >= 3 and c3 < 63 and c7 = false and t3 > 3 and t3 < 6 and c8 like '4%' and ts < '2021-05-05 18:19:19.000' and c2 > 40 and c3 != 42;
-if $rows != 1 then
+if $data10 != @21-05-05 18:19:04.000@ then
return -1
endi
-if $data00 != @21-05-05 18:19:18.000@ then
+if $data20 != @21-05-05 18:19:24.000@ then
return -1
endi
-print "column&ts&join test"
-
-print "column&tbname&tag test"
-sql_error select count(*) from stb1 where c1 > 0 or tbname in ('tb1') or t1 > 0;
-
-print "column&tbname&join test"
-print "column&tag&join test"
-print "ts&tbname&tag test"
-sql_error select count(*) from stb1 where ts > 0 or tbname in ('tb1') or t1 > 0;
-
-print "ts&tbname&join test"
-print "ts&tag&join test"
-print "tbname&tag&join test"
-
-
-
-
-print "column&ts&tbname&tag test"
-sql_error select * from stb1 where (tbname like 'tb%' or ts > '2021-05-05 18:19:01.000') and (t1 > 5 or t1 < 4) and c1 > 0;
-sql_error select * from stb1 where (ts > '2021-05-05 18:19:01.000') and (ts > '2021-05-05 18:19:02.000' or t1 > 3) and (t1 > 5 or t1 < 4) and c1 > 0;
-sql_error select ts,c1,c7 from stb1 where ts > '2021-05-05 18:19:03.000' or ts > '2021-05-05 18:19:20.000' and col > 0 and t1 > 0;
-
-
-print "column&ts&tbname&join test"
-print "column&ts&tag&join test"
-print "column&tbname&tag&join test"
-print "ts&tbname&tag&join test"
-
-
-print "column&ts&tbname&tag&join test"
-#system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/condition_query2.sim b/tests/script/general/parser/condition_query2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..513bb9900ba2e40a165cc6d76cdaf88a46fb00e5
--- /dev/null
+++ b/tests/script/general/parser/condition_query2.sim
@@ -0,0 +1,2345 @@
+sql use cdb;
+
+print "ts test"
+sql_error select ts,c1,c7 from stb1 where ts != '2021-05-05 18:19:27'
+sql_error select ts,c1,c7 from stb1 where ts > '2021-05-05 18:19:03.000' or ts < '2021-05-05 18:19:02.000';
+sql_error select ts,c1,c7 from stb1 where ts > '2021-05-05 18:19:03.000' and ts > '2021-05-05 18:19:20.000' and ts != '2021-05-05 18:19:22.000';
+sql_error select * from stb1 where ts2 like '2021-05-05%';
+sql_error select ts,c1,c2 from stb1 where (ts > '2021-05-05 18:19:25.000' or ts < '2021-05-05 18:19:05.000') and ts > '2021-05-05 18:19:01.000' and ts < '2021-05-05 18:19:27.000';
+sql_error select ts,c1,c2 from stb1 where (ts > '2021-05-05 18:19:20.000' or ts < '2021-05-05 18:19:05.000') and ts != '2021-05-05 18:19:25.000';
+sql_error select ts,c1,c2 from stb1 where ((ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:10.000') or (ts >= '2021-05-05 18:19:15.000' and ts <= '2021-05-05 18:19:20.000') or (ts >= '2021-05-05 18:19:11.000' and ts <= '2021-05-05 18:19:14.000'));
+sql_error select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts < '2021-05-05 18:19:24.000';
+sql_error select tbname,ts,t1,t2 from stb5 where t1 > '';
+
+sql select * from stb1 where ts is null;
+if $rows != 0 then
+ return -1
+endi
+sql select * from stb1 where ts is not null and ts is null;
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' and ts < '2021-05-05 18:19:10.000';
+if $rows != 0 then
+ return -1
+endi
+
+sql select * from stb1 where ts > '2021-05-05 18:19:03.000' and ts < '2021-05-05 18:19:02';
+if $rows != 0 then
+ return -1
+endi
+
+sql select * from stb1 where ts is not null;
+if $rows != 29 then
+ return -1
+endi
+
+sql select * from stb1 where ts is not null or ts is null;
+if $rows != 29 then
+ return -1
+endi
+
+sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts < '2021-05-05 18:19:25.000';
+if $rows != 29 then
+ return -1
+endi
+
+sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' and ts < '2021-05-05 18:19:26.000';
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts < '2021-05-05 18:19:28.000';
+if $rows != 29 then
+ return -1
+endi
+sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts > '2021-05-05 18:19:27.000';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+
+sql select ts,c1,c2 from stb1 where ts > '2021-05-05 18:19:20.000' or ts < '2021-05-05 18:19:05.000' or ts != '2021-05-05 18:19:25.000';
+if $rows != 29 then
+ return -1
+endi
+
+sql select ts,c1,c2 from stb1 where ts >= '2021-05-05 18:19:25.000' or ts <> '2021-05-05 18:19:25.000';
+if $rows != 29 then
+ return -1
+endi
+
+sql select ts,c1,c2 from stb1 where ((ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:10.999') or (ts >= '2021-05-05 18:19:15.000' and ts <= '2021-05-05 18:19:20.000') or (ts >= '2021-05-05 18:19:11.000' and ts <= '2021-05-05 18:19:14.999'));
+if $rows != 16 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+
+sql select ts,c1,c2 from stb1 where (ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:10.000') or (ts >= '2021-05-05 18:19:12.000' and ts <= '2021-05-05 18:19:14.000') or (ts >= '2021-05-05 18:19:08.000' and ts <= '2021-05-05 18:19:17.000');
+if $rows != 13 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+
+sql select ts,c1,c2 from stb1 where (ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:10.000') or (ts >= '2021-05-05 18:19:02.000' and ts <= '2021-05-05 18:19:03.000') or (ts >= '2021-05-05 18:19:01.000' and ts <= '2021-05-05 18:19:08.000');
+if $rows != 10 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+
+sql select ts,c1,c2 from stb1 where ((ts >= '2021-05-05 18:19:08.000' and ts <= '2021-05-05 18:19:10.000') or (ts >= '2021-05-05 18:19:02.000' and ts <= '2021-05-05 18:19:03.000') or (ts >= '2021-05-05 18:19:05.000' and ts <= '2021-05-05 18:19:06.000') or (ts >= '2021-05-05 18:19:03.000' and ts <= '2021-05-05 18:19:12.000')) and (ts >= '2021-05-05 18:19:10.000');
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+
+sql select ts,c1,c7 from stb1 where ts > '2021-05-05 18:19:25.000' and ts != '2021-05-05 18:19:18';
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+
+
+sql select * from stb1 where ts > '2021-05-05 18:19:03.000' and ts > '2021-05-05 18:19:25';
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+
+sql select * from stb1 where ts < '2021-05-05 18:19:03.000' and ts < '2021-05-05 18:19:25';
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+
+sql select * from stb1 where ts > '2021-05-05 18:19:23.000' and ts < '2021-05-05 18:19:25';
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+
+sql select * from stb1 where ts > '2021-05-05 18:19:03.000' or ts > '2021-05-05 18:19:25';
+if $rows != 25 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+
+sql select * from stb1 where ts < '2021-05-05 18:19:03.000' or ts < '2021-05-05 18:19:25';
+if $rows != 25 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+
+sql select * from stb1 where ts > '2021-05-05 18:19:23.000' or ts < '2021-05-05 18:19:25';
+if $rows != 29 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+
+sql select * from stb1 where (ts > '2021-05-05 18:19:23.000' or ts < '2021-05-05 18:19:25') and (ts > '2021-05-05 18:19:23.000' and ts < '2021-05-05 18:19:26');
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+
+sql select * from stb1 where (ts > '2021-05-05 18:19:23.000' or ts < '2021-05-05 18:19:25') and (ts > '2021-05-05 18:19:23.000' or ts > '2021-05-05 18:19:26');
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+
+
+sql select * from stb2 where ts2 in ('2021-05-05 18:28:03','2021-05-05 18:28:05','2021-05-05 18:28:08');
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+
+sql select * from stb2 where t3 in ('2021-05-05 18:38:38','2021-05-05 18:38:28','2021-05-05 18:38:08') and ts2 in ('2021-05-05 18:28:04','2021-05-05 18:28:04','2021-05-05 18:28:03');
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+
+sql select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and (a.ts < '2021-05-05 18:19:03.000' or a.ts >= '2021-05-05 18:19:13.000') and (b.ts >= '2021-05-05 18:19:01.000' and b.ts <= '2021-05-05 18:19:14.000');
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+
+sql select a.ts,c.ts,b.c1,c.u1,c.u2 from (select * from stb1) a, (select * from stb1) b, (select * from stb2) c where a.ts=b.ts and b.ts=c.ts and a.ts <= '2021-05-05 18:19:12.000' and b.ts >= '2021-05-05 18:19:06.000' and c.ts >= '2021-05-05 18:19:08.000' and c.ts <= '2021-05-05 18:19:11.000' and a.ts != '2021-05-05 18:19:10.000';
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+
+sql select ts,c1,c2,c8 from (select * from stb1) where (ts <= '2021-05-05 18:19:06.000' or ts >= '2021-05-05 18:19:13.000') and (ts >= '2021-05-05 18:19:02.000' and ts <= '2021-05-05 18:19:14.000') and ts != '2021-05-05 18:19:04.000';
+if $rows != 6 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+
+sql select ts,c1,c2,c8 from (select * from stb1) where (ts <= '2021-05-05 18:19:03.000' or ts > '2021-05-05 18:19:26.000' or ts = '2021-05-05 18:19:26.000') and ts != '2021-05-05 18:19:03.000' and ts != '2021-05-05 18:19:26.000';
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+
+print "tbname test"
+sql select tbname from stb1;
+if $rows != 6 then
+ return -1
+endi
+
+sql select * from stb1 where tbname like '%3' and tbname like '%4';
+if $rows != 0 then
+ return -1
+endi
+
+sql select * from stb1 where tbname like 'tb%';
+if $rows != 29 then
+ return -1
+endi
+
+sql select * from stb1 where tbname like '%2';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname = 'tb1';
+if $rows != 1 then
+ return -1
+endi
+if $data00 != tb1 then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname = 'tb1' or tbname = 'tb3';
+if $rows != 2 then
+ return -1
+endi
+if $data00 != tb1 then
+ return -1
+endi
+if $data10 != tb3 then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname <> 'tb1';
+if $rows != 5 then
+ return -1
+endi
+if $data00 != tb2 then
+ return -1
+endi
+if $data10 != tb3 then
+ return -1
+endi
+if $data20 != tb4 then
+ return -1
+endi
+if $data30 != tb5 then
+ return -1
+endi
+if $data40 != tb6 then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname <> 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
+if $rows != 6 then
+ return -1
+endi
+if $data00 != tb1 then
+ return -1
+endi
+if $data10 != tb2 then
+ return -1
+endi
+if $data20 != tb3 then
+ return -1
+endi
+if $data30 != tb4 then
+ return -1
+endi
+if $data40 != tb5 then
+ return -1
+endi
+if $data50 != tb6 then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname > 'tba';
+if $rows != 0 then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname > 'tb2' and tbname <= 'tb5';
+if $rows != 3 then
+ return -1
+endi
+if $data00 != tb3 then
+ return -1
+endi
+if $data10 != tb4 then
+ return -1
+endi
+if $data20 != tb5 then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname >= 'tb5' or tbname <= 'tb2';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != tb1 then
+ return -1
+endi
+if $data10 != tb2 then
+ return -1
+endi
+if $data20 != tb5 then
+ return -1
+endi
+if $data30 != tb6 then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname is null;
+if $rows != 0 then
+ return -1
+endi
+
+
+sql select tbname from stb1 where tbname is not null;
+if $rows != 6 then
+ return -1
+endi
+if $data00 != tb1 then
+ return -1
+endi
+if $data10 != tb2 then
+ return -1
+endi
+if $data20 != tb3 then
+ return -1
+endi
+if $data30 != tb4 then
+ return -1
+endi
+if $data40 != tb5 then
+ return -1
+endi
+if $data50 != tb6 then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname in ('tb2','tb6');
+if $rows != 2 then
+ return -1
+endi
+if $data00 != tb2 then
+ return -1
+endi
+if $data10 != tb6 then
+ return -1
+endi
+
+sql select tbname from stb1 where tbname is not null and (tbname in ('tb2','tb6') or tbname like '%3');
+if $rows != 3 then
+ return -1
+endi
+if $data00 != tb2 then
+ return -1
+endi
+if $data10 != tb3 then
+ return -1
+endi
+if $data20 != tb6 then
+ return -1
+endi
+
+sql select tbname from stb1 where (tbname like '%5' and tbname like 'tb%');
+if $rows != 1 then
+ return -1
+endi
+if $data00 != tb5 then
+ return -1
+endi
+
+sql select * from stb1 where tbname = 'tb5' and tbname <> 'tb5';
+if $rows != 0 then
+ return -1
+endi
+
+sql select * from stb1 where tbname = 'tb5' and tbname <> 'tb4';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:20.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+
+sql select *,tbname from stb1 where tbname between 'tb2' and 'tb3';
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10,tbname from stb5 where tbname match '^3';
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10,tbname from stb5 where tbname match 'tb.?_[34]';
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:16.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:17.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:18.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:19.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10,tbname from stb5 where tbname nmatch '[123467]+';
+if $rows != 9 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:20.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:35.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:36.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:37.000@ then
+ return -1
+endi
+if $data80 != @21-05-05 18:19:38.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10,tbname from stb5 where tbname in ('tb5_1', 'TB5_2');
+if $rows != 12 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10,tbname from stb5 where tbname in ('tb5_1', 'TB5_2') or tbname in ('tb5_3');
+if $rows != 16 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10,tbname from stb5 where tbname in ('tb5_1', 'TB5_2') and tbname in ('tb5_2');
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+print "tag test"
+sql_error select * from stb5 where t1 match '.*';
+sql_error select * from stb5 where t2 match '.*';
+sql_error select * from stb5 where t3 match '.*';
+sql_error select * from stb5 where t4 match '.*';
+sql_error select * from stb5 where t5 match '.*';
+sql_error select * from stb5 where t6 match '.*';
+sql_error select * from stb5 where t7 match '.*';
+sql_error select * from stb5 where t8 match '.*';
+sql_error select * from stb5 where t10 match '.*';
+sql_error select * from tb1 where t1 in (1,2) and t1 in (2,3);
+
+sql select * from stb1 where t1 in (1,2) and t1 in (2,3);
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+
+sql select * from stb1 where t1 in (1,2) or t1 in (2,3);
+if $rows != 16 then
+ return -1
+endi
+
+sql select * from stb2 where t1 in (1,2) and t2 in (2) and t3 in ('2021-05-05 18:58:57.000');
+if $rows != 0 then
+ return -1
+endi
+
+sql select *,t1 from stb5 where t1 > 0;
+if $rows != 34 then
+ return -1
+endi
+
+sql select ts,c1,t1 from stb5 where ((t1 > 0 and t1 <= '2021-05-05 18:19:02.000') or (t1 >'2021-05-05 18:19:03.000' and t1 < '2021-05-05 18:19:06.000')) and t1 != '2021-05-05 18:19:04.000' and t1 is not null;
+if $rows != 16 then
+ return -1
+endi
+
+sql select ts,c1,t1 from stb5 where ((t1 > 0 and t1 <= '2021-05-05 18:19:02.000') or (t1 >'2021-05-05 18:19:03.000' and t1 < '2021-05-05 18:19:06.000')) and t1 != '2021-05-05 18:19:04.000' and t1 is null;
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,t1 from stb5 where (((t1 > 0 and t1 <= '2021-05-05 18:19:02.000') or (t1 >'2021-05-05 18:19:03.000' and t1 < '2021-05-05 18:19:06.000')) and t1 != '2021-05-05 18:19:04.000') or t1 is null;
+if $rows != 21 then
+ return -1
+endi
+
+sql select ts,c1,t2 from stb5 where t2 > 0 or t2 is null;
+if $rows != 39 then
+ return -1
+endi
+
+sql select ts,c1,t2 from stb5 where (((t2 > 5 or t2 is null or t2 < 3) and t2 != 6) or t2 in (4, 3)) and t2 <= 3 and t2 >= 2;
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+
+sql select ts,c1,t2 from stb5 where t2 > 5.5;
+if $rows != 10 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:29.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:30.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:31.000@ then
+ return -1
+endi
+if $data80 != @21-05-05 18:19:32.000@ then
+ return -1
+endi
+if $data90 != @21-05-05 18:19:33.000@ then
+ return -1
+endi
+
+sql select ts,c1,t2 from stb5 where t2 >= 5.5;
+if $rows != 14 then
+ return -1
+endi
+
+sql select ts,c1,t3,t4,t5,t6,t7 from stb5 where t3 is null or t4 is null;
+if $rows != 10 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:29.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:30.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:31.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:32.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:33.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:35.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:36.000@ then
+ return -1
+endi
+if $data80 != @21-05-05 18:19:37.000@ then
+ return -1
+endi
+if $data90 != @21-05-05 18:19:38.000@ then
+ return -1
+endi
+
+sql select ts,c1,t3,t4,t5,t6,t7 from stb5 where t3 is null or t4 is null or t5 <= 1 or t6 in (2,3) or t7 < 5;
+if $rows != 30 then
+ return -1
+endi
+
+sql select ts,c1,t8,t9 from stb5 where t8 = true;
+if $rows != 21 then
+ return -1
+endi
+sql select ts,c1,t8,t9 from stb5 where t8 <> true;
+if $rows != 13 then
+ return -1
+endi
+
+sql select ts,c1,t8,t9 from stb5 where t8 = false;
+if $rows != 13 then
+ return -1
+endi
+
+sql select ts,c1,t8,t9 from stb5 where t8 in (true, false);
+if $rows != 34 then
+ return -1
+endi
+
+sql select ts,c1,t8,t9 from stb5 where t8 in (true, false) or t8 is null;
+if $rows != 39 then
+ return -1
+endi
+
+sql select ts,c1,t8,t9 from stb5 where t8 in (true) and t8 is not null;
+if $rows != 21 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 > '12';
+if $rows != 34 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 = '11';
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 <> '111111111';
+if $rows != 26 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 = '111111111';
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 >= '888888888';
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:35.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:36.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:37.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:38.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 > '222222222' and t9 < '444444444';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 > '0000000000' and t9 < '999999999';
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 like '_1';
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 like '%1';
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where (t9 like '%1' or t9 in ('222222222','444444444')) and t9 is null;
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 is null;
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:29.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:30.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:31.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:32.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:33.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 is not null;
+if $rows != 34 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 is not null and t9 is null;
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 like '_%' and t10 between 5 and 6;
+if $rows != 9 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:20.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data80 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t10 is not null;
+if $rows != 34 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t10 is null;
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:35.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:36.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:37.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:38.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t10 is not null and t10 like '%__';
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t10 is not null and t10 like '%_%';
+if $rows != 34 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t10 is not null and t10 like '%%_%%';
+if $rows != 34 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t10 is not null and t10 like '%_%%%_';
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t10 like '_' and t10 between 2 and 3;
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t10 in ('a','3','bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb') or t10 in ('');
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t10 is null or (t10 > 1 and t10 < 7 and t10 in ('3','4','5') and t10 != 4 and t10 like '3');
+if $rows != 9 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:35.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:36.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:37.000@ then
+ return -1
+endi
+if $data80 != @21-05-05 18:19:38.000@ then
+ return -1
+endi
+
+sql select ts,c1,t8,t9,t10 from stb5 where (t10 is null or t9 is null) and t8 is null;
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:35.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:36.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:37.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:38.000@ then
+ return -1
+endi
+
+sql select ts,c1,t8,t9,t10 from stb5 where t10 between 3 and 7 and t9 between '' and '00000000000' and t9 like '_________' and (t10 like '3%'or t10 like '%4');
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:16.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:17.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:18.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:19.000@ then
+ return -1
+endi
+
+sql select ts,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10 from stb5 where t1 is not null and t2 between 2 and 7 and t3 in (2, 4,6) and t8 != false and t9 > '111111111' and t10 <= 5;
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+
+sql select * from stb5 where t1 <> 1;
+if $rows != 34 then
+ return -1
+endi
+
+sql select t1,ts,c1 from stb5 where t1 <> '2021-05-05 18:19:01.000'
+if $rows != 26 then
+ return -1
+endi
+
+sql select t1,ts,c1 from stb5 where t1 <> '2021-05-05 18:19:01.000' and t1 <> '2021-05-05 18:19:08.000';
+if $rows != 21 then
+ return -1
+endi
+
+sql select t1,ts,c1 from stb5 where t1 > '2021-05-05 18:19:02.000';
+if $rows != 22 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 match '1.+';
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 match '[3-9]';
+if $rows != 22 then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 match '8.*';
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:35.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:36.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:37.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:38.000@ then
+ return -1
+endi
+
+sql select ts,c1,t9,t10 from stb5 where t9 nmatch '^[12345]*\$';
+if $rows != 10 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:35.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:36.000@ then
+ return -1
+endi
+if $data80 != @21-05-05 18:19:37.000@ then
+ return -1
+endi
+if $data90 != @21-05-05 18:19:38.000@ then
+ return -1
+endi
+
+print "join test"
+sql_error select * from tb1, tb2_1 where tb1.ts=tb2_1.ts or tb1.ts =tb2_1.ts;
+sql select tb1.ts from tb1, tb2_1 where tb1.ts=tb2_1.ts and tb1.ts > '2021-05-05 18:19:03.000' and tb2_1.ts < '2021-05-05 18:19:06.000';
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+sql select tb1.ts,tb1.*,tb2_1.* from tb1, tb2_1 where tb1.ts=tb2_1.ts and tb1.ts > '2021-05-05 18:19:03.000' and tb2_1.u1 < 5;
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+
+sql select tb1.ts,tb1.*,tb2_1.* from tb1, tb2_1 where tb1.ts=tb2_1.ts and tb1.ts >= '2021-05-05 18:19:03.000' and tb1.c7=false and tb2_1.u3>4;
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+
+sql select stb1.ts,stb1.c1,stb1.t1,stb2.ts,stb2.u1,stb2.t4 from stb1, stb2 where stb1.ts=stb2.ts and stb1.t1 = stb2.t4;
+if $rows != 9 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+if $data80 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+
+sql select stb1.ts,stb1.c1,stb1.t1,stb2.ts,stb2.u1,stb2.t4 from stb1, stb2 where stb1.ts=stb2.ts and stb1.t1 = stb2.t4 and stb1.c1 > 2 and stb2.u1 <=4;
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+
+sql select stb1.ts,stb1.t1,stb1.c1,stb5.c2 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and (stb1.c1 between 20 and 50 and (stb5.c2 > 22 and stb5.c2 < 33));
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+
+sql select stb1.ts,stb1.t1,stb1.c1,stb5.c2 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts;
+if $rows != 29 then
+ return -1
+endi
+
+sql select stb1.c1,stb5.c1 from stb1, stb5 where stb1.t1=stb5.t2 and (stb1.c1 > 10 and stb5.c1 < 20) and stb1.ts=stb5.ts ;
+if $rows != 4 then
+ return -1
+endi
+if $data00 != 11 then
+ return -1
+endi
+if $data10 != 12 then
+ return -1
+endi
+if $data20 != 13 then
+ return -1
+endi
+if $data30 != 14 then
+ return -1
+endi
+
+print "column&ts test"
+sql_error select count(*) from stb1 where ts > 0 or c1 > 0;
+sql select * from stb1 where ts > '2021-05-05 18:19:03.000' and ts < '2021-05-05 18:19:20.000' and (c1 > 23 or c1 < 14) and c7 in (true) and c8 like '%2';
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:05.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:17.000@ then
+ return -1
+endi
+
+print "column&tbname test"
+sql_error select count(*) from stb1 where tbname like 'tb%' or c1 > 0;
+sql select * from stb1 where tbname like '%3' and c6 < 34 and c5 != 33 and c4 > 31;
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+
+sql select ts,c1,tbname from stb5 where c1 > 30 and tbname > 'tb5_3' and tbname < 'tb5_8' and c1 < 72 and c1 between 44 and 54;
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:19.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:20.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+
+sql select ts,c8,tbname from stb5 where (tbname like '%3' or tbname like '%4' or tbname = 'tb5_6') and tbname between 'tb5_2' and 'tb5_7' and (c8 like '3_' or c8 like '_4');
+if $rows != 6 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:19.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+
+
+print "column&tag test"
+sql_error select * from stb1 where t1 > 0 or c1 > 0
+sql_error select * from stb1 where c1 > 0 or t1 > 0
+sql_error select * from stb1 where t1 > 0 or c1 > 0 or t1 > 1
+sql_error select * from stb1 where c1 > 0 or t1 > 0 or c1 > 1
+sql_error select * from stb1 where t1 > 0 and c1 > 0 or t1 > 1
+sql_error select * from stb1 where c1 > 0 or t1 > 0 and c1 > 1
+sql_error select * from stb1 where c1 > 0 or t1 > 0 and c1 > 1
+sql_error select * from stb1 where t1 > 0 or t1 > 0 and c1 > 1
+sql_error select * from stb1 where (c1 > 0 and t1 > 0 ) or (t1 > 1 and c1 > 3)
+sql_error select * from stb1 where (c1 > 0 and t1 > 0 ) or t1 > 1
+sql_error select a.ts,b.ts,a.c1,b.u1,b.u2 from (select * from stb1) a, (select * from stb2) b where a.ts=b.ts and a.t1=b.t1;
+
+sql select * from stb1 where c1 < 63 and t1 > 5
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+sql select * from stb1 where t1 > 3 and t1 < 5 and c1 != 42 and c1 != 44;
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:16.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:18.000@ then
+ return -1
+endi
+sql select * from stb1 where t1 > 1 and c1 > 21 and t1 < 3 and c1 < 24 and t1 != 3 and c1 != 23;
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+sql select * from stb1 where c1 > 1 and (t1 > 3 or t1 < 2) and (c2 > 2 and c2 < 62 and t1 != 4) and (t1 > 2 and t1 < 6) and c7 = true and c8 like '%2';
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+
+sql select * from stb1 where c1!=31 and c1 !=32 and c1 <> 63 and c1 <>1 and c1 <> 21 and c1 <> 2 and c7 <> true and c8 <> '3' and c9 <> '4' and c2<>13 and c3 <> 23 and c4 <> 33 and c5 <> 34 and c6 <> 43 and c2 <> 53 and t1 <> 5 and t2 <>4;
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+
+sql select ts,t1,c1,t2 from stb5 where t1 in ('2021-05-05 18:19:02.000','2021-05-05 18:19:04.000','2021-05-05 18:19:06.000','2021-05-05 18:19:08.000') and c1 is null and t2 is null;
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:38.000@ then
+ return -1
+endi
+
+sql select ts,t1,c1,t2 from stb5 where t1 in ('2021-05-05 18:19:02.000','2021-05-05 18:19:04.000','2021-05-05 18:19:06.000','2021-05-05 18:19:08.000') and t2 is not null and ts between '2021-05-05 18:19:10.000' and '2021-05-05 18:19:20.000' and t2 < 3;
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+
+sql select ts,t1,c1,t2,tbname,t8,t9 from stb5 where (((t8 != false or t8 is null) and (t9 like '%8' or t9 like '%6') and t2 is not null) or (t8 in (false) and t1 is null)) and (c1 is null or (c1 > 62 and c1 <= 72));
+if $rows != 6 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:29.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:30.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:33.000@ then
+ return -1
+endi
+
+print "column&join test"
+sql_error select tb1.ts,tb1.c1,tb2_1.u1 from tb1, tb2_1 where tb1.ts=tb2_1.ts or tb1.c1 > 0;
+
+sql select stb5.ts,stb5.c1,stb5.t1,stb5.t8,stb5.t9,stb5.t10 from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and (stb5.c1 > 60 or stb5.c1 <= 11 or stb5.c1 is null);
+if $rows != 10 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:03.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:04.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data80 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data90 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+
+sql select stb5.ts,stb5.c1,stb5.t1,stb5.t8,stb5.t9,stb5.t10 from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and (stb5.c1 > 60 or stb5.c1 <= 11 or stb5.c1 is null or stb5.c2 between 30 and 40) and (stb1.c9 like '%3' or stb1.c8 like '%4') and stb5.c9 like '%3%';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+
+
+print "ts&tbname test"
+sql_error select count(*) from stb1 where ts > 0 or tbname like 'tb%';
+sql_error select tbname,ts,c1,tbname from stb5 where tbname like '%' and tbname between '' and 'tb5_3' and ts between '2021-05-05 18:19:05.000' and '2021-05-05 18:19:10.000' and ts <> '2021-05-05 18:19:07.000';
+
+sql select tbname,ts,c1,tbname from stb5 where (tbname like '%5' or tbname like '%8') and ts between '2021-05-05 18:19:21.000' and '2021-05-05 18:19:35.000';
+if $rows != 5 then
+ return -1
+endi
+if $data01 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data11 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data21 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+if $data31 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data41 != @21-05-05 18:19:35.000@ then
+ return -1
+endi
+
+sql select tbname,ts,c1,tbname from stb5 where tbname like '%' and tbname between '' and 'tb5_3' and ts between '2021-05-05 18:19:10.000' and '2021-05-05 18:19:05.000';
+if $rows != 0 then
+ return -1
+endi
+
+sql select tbname,ts,c1,tbname from stb5 where tbname like '%' and tbname between '' and 'tb5_3' and ts between '2021-05-05 18:19:05.000' and '2021-05-05 18:19:10.000' and ts <> '2021-05-05 18:19:05.000' and ts != '2021-05-05 18:19:10.000' order by ts desc;
+if $rows != 4 then
+ return -1
+endi
+if $data01 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data11 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data21 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+if $data31 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+
+
+print "ts&tag test"
+sql_error select count(*) from stb1 where ts > 0 or t1 > 0;
+
+sql select * from stb2 where t1!=1 and t2=2 and t3 in ('2021-05-05 18:58:58.000') and ts < '2021-05-05 18:19:13.000';
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+
+sql select t1,ts,c1,t1,t2 from stb5 where (t1 > 1 or t1 is null or t2 is null) and (t1 in ('2021-05-05 18:19:02.000','2021-05-05 18:19:04.000') or t1 is null) and t2 >= 4 order by ts;
+if $rows != 9 then
+ return -1
+endi
+if $data01 != @21-05-05 18:19:16.000@ then
+ return -1
+endi
+if $data11 != @21-05-05 18:19:17.000@ then
+ return -1
+endi
+if $data21 != @21-05-05 18:19:18.000@ then
+ return -1
+endi
+if $data31 != @21-05-05 18:19:19.000@ then
+ return -1
+endi
+if $data41 != @21-05-05 18:19:29.000@ then
+ return -1
+endi
+if $data51 != @21-05-05 18:19:30.000@ then
+ return -1
+endi
+if $data61 != @21-05-05 18:19:31.000@ then
+ return -1
+endi
+if $data71 != @21-05-05 18:19:32.000@ then
+ return -1
+endi
+if $data81 != @21-05-05 18:19:33.000@ then
+ return -1
+endi
+
+print "ts&join test"
+sql_error select tb1.ts,tb1.c1,tb2_1.u1 from tb1, tb2_1 where tb1.ts=tb2_1.ts or tb1.ts > 0;
+sql_error select stb1.tbname,stb5.tbname,stb1.ts,stb1.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and (stb1.ts = '2021-05-05 18:19:10.000' or stb1.ts = '2021-05-05 18:19:11.000');
+
+sql select tb1.ts,tb1.c1,tb2_1.u1 from tb1, tb2_1 where tb1.ts=tb2_1.ts and (tb1.ts > '2021-05-05 18:19:05.000' or tb1.ts < '2021-05-05 18:19:03.000' or tb1.ts > 0) and tb1.ts between '0' and '2021-05-05 18:19:04.000' and tb2_1.ts < '2021-05-05 18:19:03.000';
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:00.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:01.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:02.000@ then
+ return -1
+endi
+
+sql select stb1.tbname,stb5.tbname,stb1.ts,stb1.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and (stb1.ts = '2021-05-05 18:19:10.000' or stb1.ts <= '2021-05-05 18:19:11.000') and stb5.ts > '2021-05-05 18:19:05.000' and stb5.ts != '2021-05-05 18:19:11.000';
+if $rows != 5 then
+ return -1
+endi
+if $data02 != @21-05-05 18:19:06.000@ then
+ return -1
+endi
+if $data12 != @21-05-05 18:19:07.000@ then
+ return -1
+endi
+if $data22 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data32 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data42 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+
+
+print "tbname&tag test"
+sql select * from stb1 where tbname like 'tb%' and (t1=1 or t2=2 or t3=3) and t1 > 2;
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+
+sql select ts,t1,c1,t2,tbname,t8,t9 from stb5 where tbname = 'tb5_1' or t1 = '2021-05-05 18:19:02.000';
+if $rows != 12 then
+ return -1
+endi
+
+sql select ts,t1,c1,t2,tbname,t8,t9 from stb5 where t1 = '2021-05-05 18:19:02.000' or tbname = 'tb5_1';
+if $rows != 12 then
+ return -1
+endi
+
+sql select t2,t1,t2,t3,t4,t8 from stb5 where t2 > 1 and t2 < 3 or t3 >= 1 and t3 <=1 or t8 in (false);
+if $rows != 5 then
+ return -1
+endi
+
+sql select tbname,ts,c1,t1,t2,t3,t8 from stb5 where (t2 > 1 and t2 < 3 or t3 >= 1 and t3 <=1 or t8 in (false) or tbname like 'tb5_8' or tbname in ('tb5_5')) and tbname < 'tb5_3' and t3 > 1.0 and ts < '2021-05-05 18:19:10.000';
+if $rows != 2 then
+ return -1
+endi
+
+
+print "tbname&join test"
+sql select stb1.tbname,stb5.tbname,stb1.ts,stb1.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb1.tbname < 'tb4' and (stb5.tbname like 'tb5_3' or stb5.tbname = 'tb5_1') and stb5.tbname like '%____%_%';
+if $rows != 12 then
+ return -1
+endi
+
+sql select stb1.tbname,stb5.tbname,stb1.ts,stb1.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb1.tbname < 'tb4' and (stb5.tbname like 'tb5_3' or stb5.tbname = 'tb5_1') and stb5.tbname like '%____%_%_';
+if $rows != 0 then
+ return -1
+endi
+
+
+print "tag&join test"
+sql select stb1.ts,stb1.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb1.t1 >= -1 and stb1.t1 < 100 and stb1.t1 in (1,2,3,5,6) and stb1.t1 <> 3 and stb1.t1 <= 5 and stb1.t1 >=2;
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:20.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+
+sql select stb1.ts,stb1.c1,stb5.t1,stb5.t6,stb5.t7,stb5.t8 from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and stb5.t1 >'2021-05-05 18:19:01.000';
+if $rows != 21 then
+ return -1
+endi
+
+sql select stb1.ts,stb1.c1,stb1.t1,stb5.t3,stb5.t6,stb5.t7,stb5.t8,stb5.t9 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb5.t9 like '_%_______5555%55_';
+if $rows != 0 then
+ return -1
+endi
+
+sql select stb1.ts,stb1.c1,stb1.t1,stb5.t3,stb5.t6,stb5.t7,stb5.t8,stb5.t9 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb5.t9 like '%_%__55%%%%55%55';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:20.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+
+
+print "column&ts&tbname test"
+sql_error select count(*) from stb1 where tbname like 'tb%' or c1 > 0 or ts > 0;
+
+sql select * from stb5 where tbname > '' and (tbname like '%8') and tbname is null;
+if $rows != 0 then
+ return -1
+endi
+
+sql select ts,c1,ts,c1,ts,c1,c8 from stb5 where tbname > '' and (tbname like '%8' or tbname like '%3') and tbname is not null and tbname in ('tb5_2','tb5_8') and tbname < 'aaaaaaaaaaa' and ts <= 1620209977000 and (c9 like '_3' or c9 <> '82');
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:34.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:36.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:37.000@ then
+ return -1
+endi
+
+
+print "column&ts&tag test"
+sql_error select count(*) from stb1 where t1 > 0 or c1 > 0 or ts > 0;
+sql_error select count(*) from stb1 where c1 > 0 or t1 > 0 or ts > 0;
+
+sql select * from stb1 where (t1 > 0 or t1 > 2 ) and ts > '2021-05-05 18:19:10.000' and (c1 > 1 or c1 > 3) and (c6 > 40 or c6 < 30) and (c8 like '%3' or c8 like '_4') and (c9 like '1%' or c9 like '6%' or (c9 like '%3' and c9 != '23')) and ts > '2021-05-05 18:19:22.000' and ts <= '2021-05-05 18:19:26.000';
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+sql select * from stb1 where ts > '2021-05-05 18:19:00.000' and c1 > 2 and t1 != 1 and c2 >= 23 and t2 >= 3 and c3 < 63 and c7 = false and t3 > 3 and t3 < 6 and c8 like '4%' and ts < '2021-05-05 18:19:19.000' and c2 > 40 and c3 != 42;
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:18.000@ then
+ return -1
+endi
+
+
+print "column&ts&join test"
+sql select stb1.ts,stb1.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb1.ts > '2021-05-05 18:19:09.000' and stb5.ts < '2021-05-05 18:19:25.000' and stb1.c9 like '%4';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:19.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+
+print "column&tbname&tag test"
+sql_error select count(*) from stb1 where c1 > 0 or tbname in ('tb1') or t1 > 0;
+
+sql select * from stb5 where c1 > 10 and tbname in ('tb5_2','tb5_3','tb5_4') and t9 like '%4';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:16.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:17.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:18.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:19.000@ then
+ return -1
+endi
+
+
+print "column&tbname&join test"
+sql select stb1.ts,stb1.c1,stb5.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and (stb5.c1 > 10 or stb5.c1 is null) and stb5.tbname in ('tb5_2','tb5_3','tb5_6') and (stb5.c1 < 24 or stb5.c1 is null);
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+
+sql select stb1.ts,stb1.c1,stb5.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and (stb5.c1 > 10 or stb5.c1 is null) and stb5.tbname in ('tb5_2', 'tb5_3','tb5_6') and (stb5.c1 < 24 or stb5.c1 is null) and stb5.c1 is not null;
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+
+
+print "column&tag&join test"
+sql select stb1.ts,stb1.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb1.t1 >= -1 and stb1.t1 < 100 and stb1.t1 in (1,2,3,5,6) and stb1.t1 <> 3 and stb1.t1 <= 5 and stb1.t1 >=2 and stb1.c1 >= 22 and stb1.c1 <= 53 and stb1.c1 in (23,24,50,54,21);
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+
+sql select stb1.ts,stb1.t3,stb1.tbname,stb1.c1,stb5.tbname from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and stb1.t2 > 1;
+if $rows != 21 then
+ return -1
+endi
+
+sql select stb1.ts,stb1.t3,stb1.tbname,stb1.c1,stb5.t9,stb1.t2 from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and stb1.t2 between 2 and 5 and (stb5.t9 like '%2' or stb5.t9 like '%3') and stb1.ts < '2021-05-05 18:19:14.000' and stb5.ts > '2021-05-05 18:19:09.000';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+
+
+print "ts&tbname&tag test"
+sql_error select count(*) from stb1 where ts > 0 or tbname in ('tb1') or t1 > 0;
+
+sql select tbname,ts,t1,t2 from stb5 where ts > 0 and ts between '2021-05-05 18:19:06.001' and '2021-05-05 18:19:30.000' and (tbname='tb5_6' or tbname in ('tb5_1')) and t1 > '2021-05-05 18:19:01.000';
+if $rows != 5 then
+ return -1
+endi
+if $data01 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data11 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data21 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data31 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data41 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+
+print "ts&tbname&join test"
+
+sql_error select stb1.ts,stb1.c1,stb5.c1,stb1.t1 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb5.tbname in ('tb5_2', 'tb5_3','tb5_6') and stb5.ts < 1111111111111111111111;
+
+sql select stb1.ts,stb1.c1,stb5.c1,stb1.t1,stb1.tbname from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb5.tbname in ('tb5_2', 'tb5_3','tb5_6') and stb5.ts < 11111111111111111 and (stb1.tbname like '%6' or stb1.tbname in ('tb2')) and stb1.ts between '2021-05-05 18:19:10.000' and '2021-05-05 18:19:26.000';
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+
+print "ts&tag&join test"
+sql select stb1.ts,stb1.c1,stb5.t1,stb5.t3,stb5.t6,stb5.t7,stb5.t8,stb5.t9 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb5.t1 > '2021-05-05 18:19:02.000' and stb5.t1 between '2021-05-05 18:19:05.000' and '2021-05-05 18:19:06.000' and stb5.ts between '2021-05-05 18:19:23.000' and '2021-05-05 18:19:25.000';
+if $rows != 3 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+
+
+print "tbname&tag&join test"
+sql select stb1.ts,stb1.c1,stb5.t1,stb5.t3,stb5.t6,stb5.t7,stb5.t8,stb5.t9 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb5.t1 > '2021-05-05 18:19:01.000' and stb5.t1 between '2021-05-05 18:19:00.000' and '2021-05-05 18:19:06.000' and (stb5.tbname like '%3' or stb5.tbname like '%2');
+if $rows != 8 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:10.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+if $data70 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+
+print "column&ts&tbname&tag test"
+sql_error select * from stb1 where (tbname like 'tb%' or ts > '2021-05-05 18:19:01.000') and (t1 > 5 or t1 < 4) and c1 > 0;
+sql_error select * from stb1 where (ts > '2021-05-05 18:19:01.000') and (ts > '2021-05-05 18:19:02.000' or t1 > 3) and (t1 > 5 or t1 < 4) and c1 > 0;
+sql_error select ts,c1,c7 from stb1 where ts > '2021-05-05 18:19:03.000' or ts > '2021-05-05 18:19:20.000' and col > 0 and t1 > 0;
+
+sql select t4,tbname,ts,c1 from stb5 where ((tbname like '%4') or t4 >= 6) and ts between '2021-05-05 18:19:20.000' and '2021-05-05 18:19:30.000' and (c1 is null or c1 >= 62 and c1 <= 71);
+if $rows != 5 then
+ return -1
+endi
+if $data02 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data12 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data22 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+if $data32 != @21-05-05 18:19:28.000@ then
+ return -1
+endi
+if $data42 != @21-05-05 18:19:29.000@ then
+ return -1
+endi
+
+print "column&ts&tbname&join test"
+
+sql select stb1.ts,stb1.c1,stb5.t1,stb5.t3,stb5.t6,stb5.t7,stb5.t8,stb5.t9 from stb1, stb5 where stb1.t1=stb5.t2 and stb1.ts=stb5.ts and stb5.t1 > '2021-05-05 18:19:01.000' and stb5.t1 between '2021-05-05 18:19:00.000' and '2021-05-05 18:19:06.000' and (stb5.tbname like '%3' or stb5.tbname like '%2') and stb1.ts between '2021-05-05 18:19:09.000' and '2021-05-05 18:19:14.000' and stb1.c1 > 23;
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:11.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:12.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:13.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:14.000@ then
+ return -1
+endi
+
+print "column&ts&tag&join test"
+sql select stb1.ts,stb1.c1,stb5.t1,stb5.t6,stb5.t7,stb5.t8 from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and stb5.t8 = true and stb5.t7< 3.0000 and stb5.ts > '2021-05-05 18:19:02.000' and stb5.c1 between 10 and 22 and stb5.t1 >'2021-05-05 18:19:01.000';
+if $rows != 2 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:08.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:09.000@ then
+ return -1
+endi
+
+print "column&tbname&tag&join test"
+sql select stb1.ts,stb1.c1,stb5.t1,stb5.t6,stb5.t7,stb5.t8 from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and stb1.c1 > 11 and (stb5.tbname like '%3' or stb5.tbname like '%6' or stb5.tbname = 'tb5_4') and stb5.t7 > 4 and stb5.t8 <> 'false';
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:26.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:27.000@ then
+ return -1
+endi
+
+
+print "ts&tbname&tag&join test"
+sql select stb1.ts,stb1.c1,stb5.t1,stb5.t6,stb5.t7,stb5.t8 from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and stb1.ts between '2021-05-05 18:19:15.000' and '2099-05-05 18:19:15.000' and stb5.tbname in ('tb5_3','tb5_5','tb5_6') and stb5.t1 >= '2021-05-05 18:19:03.000' and stb5.t1 <= '2021-05-05 18:19:08.000' and stb5.ts <='2021-05-05 18:19:25.000';
+if $rows != 7 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:20.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+if $data50 != @21-05-05 18:19:24.000@ then
+ return -1
+endi
+if $data60 != @21-05-05 18:19:25.000@ then
+ return -1
+endi
+
+print "column&ts&tbname&tag&join test"
+sql select stb1.ts,stb1.c1,stb5.t1,stb5.t6,stb5.t7,stb5.t8 from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and stb1.ts between '2021-05-05 18:19:15.000' and '2099-05-05 18:19:15.000' and stb5.tbname in ('tb5_3','tb5_5','tb5_6') and stb5.t1 >= '2021-05-05 18:19:03.000' and stb5.t1 <= '2021-05-05 18:19:08.000' and stb5.ts <='2021-05-05 18:19:25.000' and stb1.c1 between 34 and 60;
+if $rows != 5 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:15.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:20.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data40 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+
+sql select stb1.ts,stb1.c1,stb5.t1,stb5.t6,stb5.t7,stb5.t8 from stb1,stb5 where stb1.ts=stb5.ts and stb1.t3=stb5.t7 and stb5.tbname<>'tb5_1' and stb5.t1 <> '2021-05-05 18:19:02.000' and stb1.ts > '2021-05-05 18:19:12.000' and stb5.c1 != 32 and stb5.t6 > 3 and stb5.t7 < 6 and stb5.t8 <> false;
+if $rows != 4 then
+ return -1
+endi
+if $data00 != @21-05-05 18:19:20.000@ then
+ return -1
+endi
+if $data10 != @21-05-05 18:19:21.000@ then
+ return -1
+endi
+if $data20 != @21-05-05 18:19:22.000@ then
+ return -1
+endi
+if $data30 != @21-05-05 18:19:23.000@ then
+ return -1
+endi
+
+
+#system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/condition_query3.sim b/tests/script/general/parser/condition_query3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a88d75f40d2d638e19d356b2f0ef76789c42b2db
--- /dev/null
+++ b/tests/script/general/parser/condition_query3.sim
@@ -0,0 +1,210 @@
+sql use cdb;
+
+print "index tag test"
+
+sql select tbname,t1 from stba;
+if $rows != 10 then
+ return -1
+endi
+
+sql select tbname,t1 from stba where t1 > 2;
+if $rows != 7 then
+ return -1
+endi
+
+sql select tbname,t1 from stba where t1 >= 4;
+if $rows != 6 then
+ return -1
+endi
+
+sql select tbname,t1 from stba where t1 >= 3 and t1 <= 6;
+if $rows != 4 then
+ return -1
+endi
+
+sql select tbname,t1 from stba where t1 = 3;
+if $rows != 1 then
+ return -1
+endi
+
+sql select tbname,t1 from stba where t1 <> 6;
+if $rows != 9 then
+ return -1
+endi
+
+sql select tbname,t1 from stba where t1 < 6;
+if $rows != 6 then
+ return -1
+endi
+
+sql select tbname,t1 from stba where t1 < 6 and t1 >= 2;
+if $rows != 4 then
+ return -1
+endi
+
+sql select tbname,t1 from stba where t1 is null;
+if $rows != 0 then
+ return -1
+endi
+sql select tbname,t1 from stba where t1 is not null;
+if $rows != 10 then
+ return -1
+endi
+
+sql_error select tbname,t1 from stbb where t1 > true;
+sql select tbname,t1 from stbb where t1 = true;
+if $rows != 5 then
+ return -1
+endi
+
+sql select tbname,t1 from stbb where t1 <> true;
+if $rows != 5 then
+ return -1
+endi
+
+sql select tbname,t1 from stbb where t1 is null;
+if $rows != 0 then
+ return -1
+endi
+sql select tbname,t1 from stbb where t1 is not null;
+if $rows != 10 then
+ return -1
+endi
+
+sql select tbname,t1 from stbc;
+if $rows != 10 then
+ return -1
+endi
+
+sql select tbname,t1 from stbc where t1 > 2;
+if $rows != 7 then
+ return -1
+endi
+
+sql select tbname,t1 from stbc where t1 >= 4;
+if $rows != 6 then
+ return -1
+endi
+
+sql select tbname,t1 from stbc where t1 >= 3 and t1 <= 6;
+if $rows != 4 then
+ return -1
+endi
+
+sql select tbname,t1 from stbc where t1 = 3;
+if $rows != 1 then
+ return -1
+endi
+
+sql select tbname,t1 from stbc where t1 <> 6;
+if $rows != 9 then
+ return -1
+endi
+
+sql select tbname,t1 from stbc where t1 < 6;
+if $rows != 6 then
+ return -1
+endi
+
+sql select tbname,t1 from stbc where t1 < 6 and t1 >= 2;
+if $rows != 4 then
+ return -1
+endi
+
+sql select tbname,t1 from stbc where t1 is null;
+if $rows != 0 then
+ return -1
+endi
+sql select tbname,t1 from stbc where t1 is not null;
+if $rows != 10 then
+ return -1
+endi
+
+sql select tbname,t1 from stbd where t1 > '2222';
+if $rows != 7 then
+ return -1
+endi
+
+sql select tbname,t1 from stbd where t1 >= '4444';
+if $rows != 6 then
+ return -1
+endi
+
+sql select tbname,t1 from stbd where t1 >= '3333' and t1 <= '6666';
+if $rows != 4 then
+ return -1
+endi
+
+sql select tbname,t1 from stbd where t1 = '3333';
+if $rows != 1 then
+ return -1
+endi
+
+sql select tbname,t1 from stbd where t1 <> '6666';
+if $rows != 9 then
+ return -1
+endi
+
+sql select tbname,t1 from stbd where t1 < '6666';
+if $rows != 6 then
+ return -1
+endi
+
+sql select tbname,t1 from stbd where t1 < '6666' and t1 >= '2222';
+if $rows != 4 then
+ return -1
+endi
+
+sql select tbname,t1 from stbd where t1 is null;
+if $rows != 0 then
+ return -1
+endi
+sql select tbname,t1 from stbd where t1 is not null;
+if $rows != 10 then
+ return -1
+endi
+sql select tbname,t1 from stbe where t1 > '2222';
+if $rows != 7 then
+ return -1
+endi
+
+sql select tbname,t1 from stbe where t1 >= '4444';
+if $rows != 6 then
+ return -1
+endi
+
+sql select tbname,t1 from stbe where t1 >= '3333' and t1 <= '6666';
+if $rows != 4 then
+ return -1
+endi
+
+sql select tbname,t1 from stbe where t1 = '3333';
+if $rows != 1 then
+ return -1
+endi
+
+sql select tbname,t1 from stbe where t1 <> '6666';
+if $rows != 9 then
+ return -1
+endi
+
+sql select tbname,t1 from stbe where t1 < '6666';
+if $rows != 6 then
+ return -1
+endi
+
+sql select tbname,t1 from stbe where t1 < '6666' and t1 >= '2222';
+if $rows != 4 then
+ return -1
+endi
+
+sql select tbname,t1 from stbe where t1 is null;
+if $rows != 0 then
+ return -1
+endi
+sql select tbname,t1 from stbe where t1 is not null;
+if $rows != 10 then
+ return -1
+endi
+
+#system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/regex.sim b/tests/script/general/parser/regex.sim
index 5351d914f34004b5bf198fb9e10792306f8ac32b..6d87e1cd7c6c6620eabb44e66195aab3cb177494 100644
--- a/tests/script/general/parser/regex.sim
+++ b/tests/script/general/parser/regex.sim
@@ -29,13 +29,22 @@ endi
sql select tbname from $st_name where tbname match '^ct[[:digit:]]'
-
if $rows != 2 then
return -1
endi
+sql select tbname from $st_name where tbname nmatch '^ct[[:digit:]]'
+if $rows != 1 then
+ return -1
+endi
+
sql select tbname from $st_name where tbname match '.*'
-if $rows !=3 then
+if $rows != 3 then
+ return -1
+endi
+
+sql select tbname from $st_name where tbname nmatch '.*'
+if $rows != 0 then
return -1
endi
@@ -44,6 +53,11 @@ if $rows != 2 then
return -1
endi
+sql select tbname from $st_name where t1b nmatch '[[:lower:]]+'
+if $rows != 1 then
+ return -1
+endi
+
sql insert into $ct1_name values(now, 'this is engine')
sql insert into $ct2_name values(now, 'this is app egnine')
@@ -56,6 +70,69 @@ if $rows != 1 then
return -1
endi
+sql select c1b from $st_name where c1b nmatch 'engine'
+if $data00 != @this is app egnine@ then
+ return -1
+endi
+
+if $rows != 1 then
+ return -1
+endi
+
+sql select c1b from $st_name where c1b match '\\.\\*'
+if $rows != 0 then
+ return -1
+endi
+
+sql select c1b from $st_name where c1b match '\\\\'
+if $rows != 0 then
+ return -1
+endi
+
+sql insert into $ct1_name values(now+3s, '\\this is engine')
+
+sql select c1b from $st_name where c1b match '\\'
+if $rows != 1 then
+ return -1
+endi
+
+sql_error select c1b from $st_name where c1b match e;
+sql_error select c1b from $st_name where c1b nmatch e;
+
+sql create table wrong_type(ts timestamp, c0 tinyint, c1 smallint, c2 int, c3 bigint, c4 float, c5 double, c6 bool, c7 nchar(20)) tags(t0 tinyint, t1 smallint, t2 int, t3 bigint, t4 float, t5 double, t6 bool, t7 nchar(10))
+sql insert into wrong_type_1 using wrong_type tags(1, 2, 3, 4, 5, 6, true, 'notsupport') values(now, 1, 2, 3, 4, 5, 6, false, 'notsupport')
+sql_error select * from wrong_type where ts match '.*'
+sql_error select * from wrong_type where ts nmatch '.*'
+sql_error select * from wrong_type where c0 match '.*'
+sql_error select * from wrong_type where c0 nmatch '.*'
+sql_error select * from wrong_type where c1 match '.*'
+sql_error select * from wrong_type where c1 nmatch '.*'
+sql_error select * from wrong_type where c2 match '.*'
+sql_error select * from wrong_type where c2 nmatch '.*'
+sql_error select * from wrong_type where c3 match '.*'
+sql_error select * from wrong_type where c3 nmatch '.*'
+sql_error select * from wrong_type where c4 match '.*'
+sql_error select * from wrong_type where c4 nmatch '.*'
+sql_error select * from wrong_type where c5 match '.*'
+sql_error select * from wrong_type where c5 nmatch '.*'
+sql_error select * from wrong_type where c6 match '.*'
+sql_error select * from wrong_type where c6 nmatch '.*'
+sql_error select * from wrong_type where c7 match '.*'
+sql_error select * from wrong_type where c7 nmatch '.*'
+sql_error select * from wrong_type where t1 match '.*'
+sql_error select * from wrong_type where t1 nmatch '.*'
+sql_error select * from wrong_type where t2 match '.*'
+sql_error select * from wrong_type where t2 nmatch '.*'
+sql_error select * from wrong_type where t3 match '.*'
+sql_error select * from wrong_type where t3 nmatch '.*'
+sql_error select * from wrong_type where t4 match '.*'
+sql_error select * from wrong_type where t4 nmatch '.*'
+sql_error select * from wrong_type where t5 match '.*'
+sql_error select * from wrong_type where t5 nmatch '.*'
+sql_error select * from wrong_type where t6 match '.*'
+sql_error select * from wrong_type where t6 nmatch '.*'
+sql_error select * from wrong_type where t7 match '.*'
+sql_error select * from wrong_type where t7 nmatch '.*'
system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/tbnameIn_query.sim b/tests/script/general/parser/tbnameIn_query.sim
index db27886bbfde744910068b702199e2079d24c7d2..7fa579b9c2c9d1187c8630fd7f1dd17808b396f0 100644
--- a/tests/script/general/parser/tbnameIn_query.sim
+++ b/tests/script/general/parser/tbnameIn_query.sim
@@ -125,11 +125,10 @@ if $data21 != 2 then
return -1
endi
-# multiple tbname in is not allowed NOW
-sql_error select count(*) from $stb where tbname in ('ti_tb1', 'ti_tb300') and tbname in ('ti_tb5', 'ti_tb1000') group by t1 order by t1 asc
-#if $rows != 4 then
-# return -1
-#endi
+sql select count(*) from $stb where tbname in ('ti_tb1', 'ti_tb300') and tbname in ('ti_tb5', 'ti_tb1000') group by t1 order by t1 asc
+if $rows != 0 then
+ return -1
+endi
#if $data00 != $rowNum then
# return -1
#endi