Skip to content

TDengine
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
TDengine
TDengine
提交 789fc754 编写于 作者: P Ping Xiao
浏览文件
操作

Merge branch 'develop' into xiaoping/add_test_case

上级 c1ddf46e 99073f1d
显示空白变更内容
内联 并排
Showing with 2928 addition and 2423 deletion
Jenkinsfile
浏览文件 @ 789fc754
...@@ -41,13 +41,10 @@ def pre_test(){ ...@@ -41,13 +41,10 @@ def pre_test(){
cd ${WKC} cd ${WKC}
git checkout develop git checkout develop
git reset --hard HEAD~10 git reset --hard HEAD~10 >/dev/null
git pull
git fetch
git checkout ${CHANGE_BRANCH}
git reset --hard HEAD~10
git pull git pull
git merge develop git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
cd ${WK} cd ${WK}
git reset --hard HEAD~10 git reset --hard HEAD~10
git checkout develop git checkout develop
...@@ -87,12 +84,15 @@ pipeline { ...@@ -87,12 +84,15 @@ pipeline {
steps { steps {
pre_test() pre_test()
timeout(time: 90, unit: 'MINUTES'){
sh ''' sh '''
cd ${WKC}/tests cd ${WKC}/tests
find pytest -name '*'sql|xargs rm -rf find pytest -name '*'sql|xargs rm -rf
./test-all.sh p1 ./test-all.sh p1
date''' date'''
} }
}
} }
stage('python_2') { stage('python_2') {
agent{label 'p2'} agent{label 'p2'}
...@@ -113,6 +113,7 @@ pipeline { ...@@ -113,6 +113,7 @@ pipeline {
stage('test_b1') { stage('test_b1') {
agent{label 'b1'} agent{label 'b1'}
steps { steps {
timeout(time: 90, unit: 'MINUTES'){
pre_test() pre_test()
sh ''' sh '''
cd ${WKC}/tests cd ${WKC}/tests
...@@ -120,6 +121,7 @@ pipeline { ...@@ -120,6 +121,7 @@ pipeline {
date''' date'''
} }
} }
}
stage('test_crash_gen') { stage('test_crash_gen') {
agent{label "b2"} agent{label "b2"}
...@@ -137,6 +139,7 @@ pipeline { ...@@ -137,6 +139,7 @@ pipeline {
./handle_crash_gen_val_log.sh ./handle_crash_gen_val_log.sh
''' '''
} }
timeout(time: 90, unit: 'MINUTES'){
sh ''' sh '''
date date
cd ${WKC}/tests cd ${WKC}/tests
...@@ -145,6 +148,7 @@ pipeline { ...@@ -145,6 +148,7 @@ pipeline {
''' '''
} }
} }
}
stage('test_valgrind') { stage('test_valgrind') {
agent{label "b3"} agent{label "b3"}
...@@ -158,6 +162,7 @@ pipeline { ...@@ -158,6 +162,7 @@ pipeline {
./handle_val_log.sh ./handle_val_log.sh
''' '''
} }
timeout(time: 90, unit: 'MINUTES'){
sh ''' sh '''
date date
cd ${WKC}/tests cd ${WKC}/tests
...@@ -165,6 +170,7 @@ pipeline { ...@@ -165,6 +170,7 @@ pipeline {
date''' date'''
} }
} }
}
} }
......
documentation20/webdocs/markdowndocs/TAOS SQL-ch.md
浏览文件 @ 789fc754
...@@ -743,7 +743,7 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数 ...@@ -743,7 +743,7 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
应用字段：不能应用在timestamp、binary、nchar、bool类型字段。 应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
适用于：表。 适用于：表。（从 2.0.15 版本开始，本函数也支持超级表）
示例： 示例：
```mysql ```mysql
......
documentation20/webdocs/markdowndocs/administrator-ch.md
浏览文件 @ 789fc754
...@@ -124,10 +124,10 @@ taosd -C ...@@ -124,10 +124,10 @@ taosd -C
对于一个应用场景，可能有多种数据特征的数据并存，最佳的设计是将具有相同数据特征的表放在一个库里，这样一个应用有多个库，而每个库可以配置不同的存储参数，从而保证系统有最优的性能。TDengine允许应用在创建库时指定上述存储参数，如果指定，该参数就将覆盖对应的系统配置参数。举例，有下述SQL： 对于一个应用场景，可能有多种数据特征的数据并存，最佳的设计是将具有相同数据特征的表放在一个库里，这样一个应用有多个库，而每个库可以配置不同的存储参数，从而保证系统有最优的性能。TDengine允许应用在创建库时指定上述存储参数，如果指定，该参数就将覆盖对应的系统配置参数。举例，有下述SQL：
``` ```
create database demo days 10 cache 32 blocks 8 replica 3; create database demo days 10 cache 32 blocks 8 replica 3 update 1;
``` ```
该SQL创建了一个库demo, 每个数据文件存储10天数据，内存块为32兆字节，每个VNODE占用8个内存块，副本数为3，而其他参数与系统配置完全一致。 该SQL创建了一个库demo, 每个数据文件存储10天数据，内存块为32兆字节，每个VNODE占用8个内存块，副本数为3，允许更新，而其他参数与系统配置完全一致。
TDengine集群中加入一个新的dnode时，涉及集群相关的一些参数必须与已有集群的配置相同，否则不能成功加入到集群中。会进行校验的参数如下： TDengine集群中加入一个新的dnode时，涉及集群相关的一些参数必须与已有集群的配置相同，否则不能成功加入到集群中。会进行校验的参数如下：
......
documentation20/webdocs/markdowndocs/connector-ch.md
浏览文件 @ 789fc754
...@@ -288,13 +288,6 @@ C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine ...@@ -288,13 +288,6 @@ C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine
* res：`taos_query_a`回调时返回的结果集 * res：`taos_query_a`回调时返回的结果集
* fp：回调函数。其参数`param`是用户可定义的传递给回调函数的参数结构体；`numOfRows`是获取到的数据的行数（不是整个查询结果集的函数）。 在回调函数中，应用可以通过调用`taos_fetch_row`前向迭代获取批量记录中每一行记录。读完一块内的所有记录后，应用需要在回调函数中继续调用`taos_fetch_rows_a`获取下一批记录进行处理，直到返回的记录数（numOfRows）为零（结果返回完成）或记录数为负值（查询出错）。 * fp：回调函数。其参数`param`是用户可定义的传递给回调函数的参数结构体；`numOfRows`是获取到的数据的行数（不是整个查询结果集的函数）。 在回调函数中，应用可以通过调用`taos_fetch_row`前向迭代获取批量记录中每一行记录。读完一块内的所有记录后，应用需要在回调函数中继续调用`taos_fetch_rows_a`获取下一批记录进行处理，直到返回的记录数（numOfRows）为零（结果返回完成）或记录数为负值（查询出错）。
- `void taos_fetch_row_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row), void *param);`
异步获取一条记录。其中：
* res：`taos_query_a`回调时返回的结果集
* fp：回调函数。其参数`param`是应用提供的一个用于回调的参数。回调时，第三个参数`row`指向一行记录。不同于`taos_fetch_rows_a`，应用无需调用`taos_fetch_row`来获取一行数据，更加简单，但数据提取性能不及批量获取的API。
TDengine的异步API均采用非阻塞调用模式。应用程序可以用多线程同时打开多张表，并可以同时对每张打开的表进行查询或者插入操作。需要指出的是，**客户端应用必须确保对同一张表的操作完全串行化**，即对同一个表的插入或查询操作未完成时（未返回时），不能够执行第二个插入或查询操作。 TDengine的异步API均采用非阻塞调用模式。应用程序可以用多线程同时打开多张表，并可以同时对每张打开的表进行查询或者插入操作。需要指出的是，**客户端应用必须确保对同一张表的操作完全串行化**，即对同一个表的插入或查询操作未完成时（未返回时），不能够执行第二个插入或查询操作。
### 参数绑定API ### 参数绑定API
......
documentation20/webdocs/markdowndocs/connector-java-ch.md
浏览文件 @ 789fc754
# Java Connector # Java Connector
Java连接器支持的系统有： TDengine 提供了遵循 JDBC 标准（3.0）API 规范的 `taos-jdbcdriver` 实现，可在 maven 的中央仓库 [Sonatype Repository][1] 搜索下载。
| **CPU类型** | x64（64bit） | | | ARM64 | ARM32 |
| ------------ | ------------ | -------- | -------- | -------- | -------- |
| **OS类型** | Linux | Win64 | Win32 | Linux | Linux |
| **支持与否** | **支持** | **支持** | **支持** | **支持** | **支持** |
Java连接器的使用请参见<a href=https://www.taosdata.com/blog/2020/11/11/1955.html>视频教程</a>。 `taos-jdbcdriver的` 实现包括 2 种形式： JDBC-JNI 和 JDBC-RESTful（taos-jdbcdriver-2.0.16 开始支持 JDBC-RESTful）。 JDBC-JNI 通过调用客户端 libtaos.so（或 taos.dll ）的本地方法实现， JDBC-RESTful 则在内部封装了 RESTful 接口实现。
TDengine 为了方便 Java 应用使用，提供了遵循 JDBC 标准(3.0)API 规范的 `taos-jdbcdriver` 实现。目前可以通过 [Sonatype Repository][1] 搜索并下载。 ![tdengine-connector](../assets/tdengine-jdbc-connector.png)
由于 TDengine 是使用 c 语言开发的，使用 taos-jdbcdriver 驱动包时需要依赖系统对应的本地函数库。 上图显示了 3 种 Java 应用使用连接器访问 TDengine 的方式：
* libtaos.so * JDBC-JNI：Java 应用在物理节点1（pnode1）上使用 JDBC-JNI 的 API ，直接调用客户端 API（libtaos.so 或 taos.dll）将写入和查询请求发送到位于物理节点2（pnode2）上的 taosd 实例。
在 linux 系统中成功安装 TDengine 后，依赖的本地函数库 libtaos.so 文件会被自动拷贝至 /usr/lib/libtaos.so，该目录包含在 Linux 自动扫描路径上，无需单独指定。 * RESTful：应用将 SQL 发送给位于物理节点2（pnode2）上的 RESTful 连接器，再调用客户端 API（libtaos.so）。
* JDBC-RESTful：Java 应用通过 JDBC-RESTful 的 API ，将 SQL 封装成一个 RESTful 请求，发送给物理节点2的 RESTful 连接器。
* taos.dll TDengine 的 JDBC 驱动实现尽可能与关系型数据库驱动保持一致，但时序空间数据库与关系对象型数据库服务的对象和技术特征存在差异，导致 `taos-jdbcdriver` 与传统的 JDBC driver 也存在一定差异。在使用时需要注意以下几点：
在 windows 系统中安装完客户端之后，驱动包依赖的 taos.dll 文件会自动拷贝到系统默认搜索路径 C:/Windows/System32 下，同样无需要单独指定。
> 注意：在 windows 环境开发时需要安装 TDengine 对应的 [windows 客户端][14]，Linux 服务器安装完 TDengine 之后默认已安装 client，也可以单独安装 [Linux 客户端][15] 连接远程 TDengine Server。 * TDengine 目前不支持针对单条数据记录的删除操作。
* 目前不支持事务操作。
TDengine 的 JDBC 驱动实现尽可能的与关系型数据库驱动保持一致，但时序空间数据库与关系对象型数据库服务的对象和技术特征的差异导致 taos-jdbcdriver 并未完全实现 JDBC 标准规范。在使用时需要注意以下几点：
* TDengine 不提供针对单条数据记录的删除和修改的操作，驱动中也没有支持相关方法。
* 由于不支持删除和修改，所以也不支持事务操作。
* 目前不支持表间的 union 操作。 * 目前不支持表间的 union 操作。
* 目前不支持嵌套查询(nested query)，对每个 Connection 的实例，至多只能有一个打开的 ResultSet 实例；如果在 ResultSet还没关闭的情况下执行了新的查询，TSDBJDBCDriver 则会自动关闭上一个 ResultSet。 * 目前不支持嵌套查询（nested query）。
* 对每个 Connection 的实例，至多只能有一个打开的 ResultSet 实例；如果在 ResultSet 还没关闭的情况下执行了新的查询，taos-jdbcdriver 会自动关闭上一个 ResultSet。
## TAOS-JDBCDriver 版本以及支持的 TDengine 版本和 JDK 版本
| taos-jdbcdriver 版本 | TDengine 版本 | JDK 版本 | ## JDBC-JNI和JDBC-RESTful的对比
| --- | --- | --- |
| 2.0.12 及以上 | 2.0.8.0 及以上 | 1.8.x | <table >
| 2.0.4 - 2.0.11 | 2.0.0.0 - 2.0.7.x | 1.8.x | <tr align="center"><th>对比项</th><th>JDBC-JNI</th><th>JDBC-RESTful</th></tr>
| 1.0.3 | 1.6.1.x 及以上 | 1.8.x | <tr align="center">
| 1.0.2 | 1.6.1.x 及以上 | 1.8.x | <td>支持的操作系统</td>
| 1.0.1 | 1.6.1.x 及以上 | 1.8.x | <td>linux、windows</td>
<td>全平台</td>
## TDengine DataType 和 Java DataType </tr>
<tr align="center">
TDengine 目前支持时间戳、数字、字符、布尔类型，与 Java 对应类型转换如下： <td>是否需要安装 client</td>
<td>需要</td>
| TDengine DataType | Java DataType | <td>不需要</td>
| --- | --- | </tr>
| TIMESTAMP | java.sql.Timestamp | <tr align="center">
| INT | java.lang.Integer | <td>server 升级后是否需要升级 client</td>
| BIGINT | java.lang.Long | <td>需要</td>
| FLOAT | java.lang.Float | <td>不需要</td>
| DOUBLE | java.lang.Double | </tr>
| SMALLINT, TINYINT |java.lang.Short | <tr align="center">
| BOOL | java.lang.Boolean | <td>写入性能</td>
| BINARY, NCHAR | java.lang.String | <td colspan="2">JDBC-RESTful 是 JDBC-JNI 的 50%～90% </td>
</tr>
## 如何获取 TAOS-JDBCDriver <tr align="center">
<td>查询性能</td>
<td colspan="2">JDBC-RESTful 与 JDBC-JNI 没有差别</td>
</tr>
</table>
## 如何获取 taos-jdbcdriver
### maven 仓库 ### maven 仓库
目前 taos-jdbcdriver 已经发布到 [Sonatype Repository][1] 仓库，且各大仓库都已同步。 目前 taos-jdbcdriver 已经发布到 [Sonatype Repository][1] 仓库，且各大仓库都已同步。
* [sonatype][8] * [sonatype][8]
* [mvnrepository][9] * [mvnrepository][9]
* [maven.aliyun][10] * [maven.aliyun][10]
...@@ -67,30 +67,63 @@ maven 项目中使用如下 pom.xml 配置即可： ...@@ -67,30 +67,63 @@ maven 项目中使用如下 pom.xml 配置即可：
<dependency> <dependency>
<groupId>com.taosdata.jdbc</groupId> <groupId>com.taosdata.jdbc</groupId>
<artifactId>taos-jdbcdriver</artifactId> <artifactId>taos-jdbcdriver</artifactId>
<version>2.0.4</version> <version>2.0.16</version>
</dependency> </dependency>
``` ```
### 源码编译打包 ### 源码编译打包
下载 [TDengine][3] 源码之后，进入 taos-jdbcdriver 源码目录 `src/connector/jdbc` 执行 `mvn clean package` 即可生成相应 jar 包。 下载 [TDengine][3] 源码之后，进入 taos-jdbcdriver 源码目录 `src/connector/jdbc` 执行 `mvn clean package -Dmaven.test.skip=true` 即可生成相应 jar 包。
## 使用说明 ## JDBC的使用说明
### 获取连接 ### 获取连接
#### 通过JdbcUrl获取连接 #### 指定URL获取连接
通过指定URL获取连接，如下所示：
```java
Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
String jdbcUrl = "jdbc:TAOS-RS://taosdemo.com:6041/test?user=root&password=taosdata";
Connection conn = DriverManager.getConnection(jdbcUrl);
```
以上示例，使用 **JDBC-RESTful** 的 driver，建立了到 hostname 为 taosdemo.com，端口为 6041，数据库名为 test 的连接。这个 URL 中指定用户名（user）为 root，密码（password）为 taosdata。
使用 JDBC-RESTful 接口，不需要依赖本地函数库。与 JDBC-JNI 相比，仅需要：
1. driverClass 指定为“com.taosdata.jdbc.rs.RestfulDriver”；
2. jdbcUrl 以“jdbc:TAOS-RS://”开头；
3. 使用 6041 作为连接端口。
如果希望获得更好的写入和查询性能，Java 应用可以使用 **JDBC-JNI** 的driver，如下所示：
通过指定的jdbcUrl获取连接，如下所示：
```java ```java
Class.forName("com.taosdata.jdbc.TSDBDriver"); Class.forName("com.taosdata.jdbc.TSDBDriver");
String jdbcUrl = "jdbc:TAOS://taosdemo.com:6030/test?user=root&password=taosdata"; String jdbcUrl = "jdbc:TAOS://taosdemo.com:6030/test?user=root&password=taosdata";
Connection conn = DriverManager.getConnection(jdbcUrl); Connection conn = DriverManager.getConnection(jdbcUrl);
``` ```
以上示例，建立了到hostname为taosdemo.com，端口为6030（TDengine的默认端口），数据库名为test的连接。这个url中指定用户名（user）为root，密码（password）为taosdata。
以上示例，使用了 JDBC-JNI 的 driver，建立了到 hostname 为 taosdemo.com，端口为 6030（TDengine 的默认端口），数据库名为 test 的连接。这个 URL 中指定用户名（user）为 root，密码（password）为 taosdata。
**注意**：使用 JDBC-JNI 的 driver，taos-jdbcdriver 驱动包时需要依赖系统对应的本地函数库。
* libtaos.so
在 linux 系统中成功安装 TDengine 后，依赖的本地函数库 libtaos.so 文件会被自动拷贝至 /usr/lib/libtaos.so，该目录包含在 Linux 自动扫描路径上，无需单独指定。
* taos.dll
在 windows 系统中安装完客户端之后，驱动包依赖的 taos.dll 文件会自动拷贝到系统默认搜索路径 C:/Windows/System32 下，同样无需要单独指定。
> 在 windows 环境开发时需要安装 TDengine 对应的 [windows 客户端][14]，Linux 服务器安装完 TDengine 之后默认已安装 client，也可以单独安装 [Linux 客户端][15] 连接远程 TDengine Server。
JDBC-JNI 的使用请参见<a href=https://www.taosdata.com/blog/2020/11/11/1955.html>视频教程</a>。
TDengine 的 JDBC URL 规范格式为： TDengine 的 JDBC URL 规范格式为：
`jdbc:TAOS://[host_name]:[port]/[database_name]?[user={user}|&password={password}|&charset={charset}|&cfgdir={config_dir}|&locale={locale}|&timezone={timezone}]` `jdbc:[TAOS|TAOS-RS]://[host_name]:[port]/[database_name]?[user={user}|&password={password}|&charset={charset}|&cfgdir={config_dir}|&locale={locale}|&timezone={timezone}]`
url中的配置参数如下： url中的配置参数如下：
* user：登录 TDengine 用户名，默认值 root。 * user：登录 TDengine 用户名，默认值 root。
* password：用户登录密码，默认值 taosdata。 * password：用户登录密码，默认值 taosdata。
...@@ -99,13 +132,17 @@ url中的配置参数如下： ...@@ -99,13 +132,17 @@ url中的配置参数如下：
* locale：客户端语言环境，默认值系统当前 locale。 * locale：客户端语言环境，默认值系统当前 locale。
* timezone：客户端使用的时区，默认值为系统当前时区。 * timezone：客户端使用的时区，默认值为系统当前时区。
#### 使用JdbcUrl和Properties获取连接
除了通过指定的jdbcUrl获取连接，还可以使用Properties指定建立连接时的参数，如下所示：
#### 指定URL和Properties获取连接
除了通过指定的 URL 获取连接，还可以使用 Properties 指定建立连接时的参数，如下所示：
```java ```java
public Connection getConn() throws Exception{ public Connection getConn() throws Exception{
Class.forName("com.taosdata.jdbc.TSDBDriver"); Class.forName("com.taosdata.jdbc.TSDBDriver");
// Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
String jdbcUrl = "jdbc:TAOS://taosdemo.com:6030/test?user=root&password=taosdata"; String jdbcUrl = "jdbc:TAOS://taosdemo.com:6030/test?user=root&password=taosdata";
// String jdbcUrl = "jdbc:TAOS-RS://taosdemo.com:6041/test?user=root&password=taosdata";
Properties connProps = new Properties(); Properties connProps = new Properties();
connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8"); connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8"); connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
...@@ -114,9 +151,10 @@ public Connection getConn() throws Exception{ ...@@ -114,9 +151,10 @@ public Connection getConn() throws Exception{
return conn; return conn;
} }
``` ```
以上示例，建立一个到hostname为taosdemo.com，端口为6030，数据库名为test的连接。这个连接在url中指定了用户名(user)为root，密码（password）为taosdata，并在connProps中指定了使用的字符集、语言环境、时区等信息。
properties中的配置参数如下： 以上示例，建立一个到 hostname 为 taosdemo.com，端口为 6030，数据库名为 test 的连接。注释为使用 JDBC-RESTful 时的方法。这个连接在 url 中指定了用户名(user)为 root，密码（password）为 taosdata，并在 connProps 中指定了使用的字符集、语言环境、时区等信息。
properties 中的配置参数如下：
* TSDBDriver.PROPERTY_KEY_USER：登录 TDengine 用户名，默认值 root。 * TSDBDriver.PROPERTY_KEY_USER：登录 TDengine 用户名，默认值 root。
* TSDBDriver.PROPERTY_KEY_PASSWORD：用户登录密码，默认值 taosdata。 * TSDBDriver.PROPERTY_KEY_PASSWORD：用户登录密码，默认值 taosdata。
* TSDBDriver.PROPERTY_KEY_CONFIG_DIR：客户端配置文件目录路径，Linux OS 上默认值 /etc/taos ，Windows OS 上默认值 C:/TDengine/cfg。 * TSDBDriver.PROPERTY_KEY_CONFIG_DIR：客户端配置文件目录路径，Linux OS 上默认值 /etc/taos ，Windows OS 上默认值 C:/TDengine/cfg。
...@@ -124,10 +162,14 @@ properties中的配置参数如下： ...@@ -124,10 +162,14 @@ properties中的配置参数如下：
* TSDBDriver.PROPERTY_KEY_LOCALE：客户端语言环境，默认值系统当前 locale。 * TSDBDriver.PROPERTY_KEY_LOCALE：客户端语言环境，默认值系统当前 locale。
* TSDBDriver.PROPERTY_KEY_TIME_ZONE：客户端使用的时区，默认值为系统当前时区。 * TSDBDriver.PROPERTY_KEY_TIME_ZONE：客户端使用的时区，默认值为系统当前时区。
#### 使用客户端配置文件建立连接 #### 使用客户端配置文件建立连接
当使用JDBC连接TDengine集群时，可以使用客户端配置文件，在客户端配置文件中指定集群的firstEp、secondEp参数。
当使用 JDBC-JNI 连接 TDengine 集群时，可以使用客户端配置文件，在客户端配置文件中指定集群的 firstEp、secondEp参数。
如下所示： 如下所示：
1. 在java中不指定hostname和port
1. 在 Java 应用中不指定 hostname 和 port
```java ```java
public Connection getConn() throws Exception{ public Connection getConn() throws Exception{
Class.forName("com.taosdata.jdbc.TSDBDriver"); Class.forName("com.taosdata.jdbc.TSDBDriver");
...@@ -140,7 +182,7 @@ public Connection getConn() throws Exception{ ...@@ -140,7 +182,7 @@ public Connection getConn() throws Exception{
return conn; return conn;
} }
``` ```
2. 在配置文件中指定firstEp和secondEp 2. 在配置文件中指定 firstEp 和 secondEp
``` ```
# first fully qualified domain name (FQDN) for TDengine system # first fully qualified domain name (FQDN) for TDengine system
firstEp cluster_node1:6030 firstEp cluster_node1:6030
...@@ -155,17 +197,19 @@ secondEp cluster_node2:6030 ...@@ -155,17 +197,19 @@ secondEp cluster_node2:6030
# locale en_US.UTF-8 # locale en_US.UTF-8
``` ```
以上示例，jdbc会使用客户端的配置文件，建立到hostname为cluster_node1，端口为6030，数据库名为test的连接。当集群中firstEp节点失效时，JDBC会尝试使用secondEp连接集群。 以上示例，jdbc 会使用客户端的配置文件，建立到 hostname 为 cluster_node1、端口为 6030、数据库名为 test 的连接。当集群中 firstEp 节点失效时，JDBC 会尝试使用 secondEp 连接集群。
TDengine中，只要保证firstEp和secondEp中一个节点有效，就可以正常建立到集群的连接。 TDengine 中，只要保证 firstEp 和 secondEp 中一个节点有效，就可以正常建立到集群的连接。
> 注意：这里的配置文件指的是调用JDBC Connector的应用程序所在机器上的配置文件，Linux OS 上默认值 /etc/taos/taos.cfg ，Windows OS 上默认值 C://TDengine/cfg/taos.cfg。 > 注意：这里的配置文件指的是调用 JDBC Connector 的应用程序所在机器上的配置文件，Linux OS 上默认值 /etc/taos/taos.cfg ，Windows OS 上默认值 C://TDengine/cfg/taos.cfg。
#### 配置参数的优先级 #### 配置参数的优先级
通过以上3种方式获取连接，如果配置参数在url、Properties、客户端配置文件中有重复，则参数的`优先级由高到低`分别如下：
通过以上 3 种方式获取连接，如果配置参数在 url、Properties、客户端配置文件中有重复，则参数的`优先级由高到低`分别如下：
1. JDBC URL 参数，如上所述，可以在 JDBC URL 的参数中指定。 1. JDBC URL 参数，如上所述，可以在 JDBC URL 的参数中指定。
2. Properties connProps 2. Properties connProps
3. 客户端配置文件 taos.cfg 3. 客户端配置文件 taos.cfg
例如：在url中指定了password为taosdata，在Properties中指定了password为taosdemo，那么，JDBC会使用url中的password建立连接。
例如：在 url 中指定了 password 为 taosdata，在 Properties 中指定了 password 为 taosdemo，那么，JDBC 会使用 url 中的 password 建立连接。
> 更多详细配置请参考[客户端配置][13] > 更多详细配置请参考[客户端配置][13]
...@@ -183,6 +227,7 @@ stmt.executeUpdate("use db"); ...@@ -183,6 +227,7 @@ stmt.executeUpdate("use db");
// create table // create table
stmt.executeUpdate("create table if not exists tb (ts timestamp, temperature int, humidity float)"); stmt.executeUpdate("create table if not exists tb (ts timestamp, temperature int, humidity float)");
``` ```
> 注意：如果不使用 `use db` 指定数据库，则后续对表的操作都需要增加数据库名称作为前缀，如 db.tb。 > 注意：如果不使用 `use db` 指定数据库，则后续对表的操作都需要增加数据库名称作为前缀，如 db.tb。
### 插入数据 ### 插入数据
...@@ -193,6 +238,7 @@ int affectedRows = stmt.executeUpdate("insert into tb values(now, 23, 10.3) (now ...@@ -193,6 +238,7 @@ int affectedRows = stmt.executeUpdate("insert into tb values(now, 23, 10.3) (now
System.out.println("insert " + affectedRows + " rows."); System.out.println("insert " + affectedRows + " rows.");
``` ```
> now 为系统内部函数，默认为服务器当前时间。 > now 为系统内部函数，默认为服务器当前时间。
> `now + 1s` 代表服务器当前时间往后加 1 秒，数字后面代表时间单位：a(毫秒), s(秒), m(分), h(小时), d(天)，w(周), n(月), y(年)。 > `now + 1s` 代表服务器当前时间往后加 1 秒，数字后面代表时间单位：a(毫秒), s(秒), m(分), h(小时), d(天)，w(周), n(月), y(年)。
...@@ -214,6 +260,7 @@ while(resultSet.next()){ ...@@ -214,6 +260,7 @@ while(resultSet.next()){
System.out.printf("%s, %d, %s\n", ts, temperature, humidity); System.out.printf("%s, %d, %s\n", ts, temperature, humidity);
} }
``` ```
> 查询和操作关系型数据库一致，使用下标获取返回字段内容时从 1 开始，建议使用字段名称获取。 > 查询和操作关系型数据库一致，使用下标获取返回字段内容时从 1 开始，建议使用字段名称获取。
### 订阅 ### 订阅
...@@ -248,7 +295,7 @@ while(true) { ...@@ -248,7 +295,7 @@ while(true) {
} }
``` ```
`consume` 方法返回一个结果集，其中包含从上次 `consume` 到目前为止的所有新数据。请务必按需选择合理的调用 `consume` 的频率（如例子中的`Thread.sleep(1000)`），否则会给服务端造成不必要的压力。 `consume` 方法返回一个结果集，其中包含从上次 `consume` 到目前为止的所有新数据。请务必按需选择合理的调用 `consume` 的频率（如例子中的 `Thread.sleep(1000)`），否则会给服务端造成不必要的压力。
#### 关闭订阅 #### 关闭订阅
...@@ -265,8 +312,11 @@ resultSet.close(); ...@@ -265,8 +312,11 @@ resultSet.close();
stmt.close(); stmt.close();
conn.close(); conn.close();
``` ```
> `注意务必要将 connection 进行关闭`，否则会出现连接泄露。 > `注意务必要将 connection 进行关闭`，否则会出现连接泄露。
## 与连接池使用 ## 与连接池使用
**HikariCP** **HikariCP**
...@@ -306,6 +356,7 @@ conn.close(); ...@@ -306,6 +356,7 @@ conn.close();
connection.close(); // put back to conneciton pool connection.close(); // put back to conneciton pool
} }
``` ```
> 通过 HikariDataSource.getConnection() 获取连接后，使用完成后需要调用 close() 方法，实际上它并不会关闭连接，只是放回连接池中。 > 通过 HikariDataSource.getConnection() 获取连接后，使用完成后需要调用 close() 方法，实际上它并不会关闭连接，只是放回连接池中。
> 更多 HikariCP 使用问题请查看[官方说明][5] > 更多 HikariCP 使用问题请查看[官方说明][5]
...@@ -356,6 +407,7 @@ public static void main(String[] args) throws Exception { ...@@ -356,6 +407,7 @@ public static void main(String[] args) throws Exception {
connection.close(); // put back to conneciton pool connection.close(); // put back to conneciton pool
} }
``` ```
> 更多 druid 使用问题请查看[官方说明][6] > 更多 druid 使用问题请查看[官方说明][6]
**注意事项** **注意事项**
...@@ -370,10 +422,43 @@ server_status()| ...@@ -370,10 +422,43 @@ server_status()|
Query OK, 1 row(s) in set (0.000141s) Query OK, 1 row(s) in set (0.000141s)
``` ```
## 与框架使用 ## 与框架使用
* Spring JdbcTemplate 中使用 taos-jdbcdriver，可参考 [SpringJdbcTemplate][11] * Spring JdbcTemplate 中使用 taos-jdbcdriver，可参考 [SpringJdbcTemplate][11]
* Springboot + Mybatis 中使用，可参考 [springbootdemo][12] * Springboot + Mybatis 中使用，可参考 [springbootdemo
## TAOS-JDBCDriver 版本以及支持的 TDengine 版本和 JDK 版本
| taos-jdbcdriver 版本 | TDengine 版本 | JDK 版本 |
| -------------------- | ----------------- | -------- |
| 2.0.12 及以上 | 2.0.8.0 及以上 | 1.8.x |
| 2.0.4 - 2.0.11 | 2.0.0.0 - 2.0.7.x | 1.8.x |
| 1.0.3 | 1.6.1.x 及以上 | 1.8.x |
| 1.0.2 | 1.6.1.x 及以上 | 1.8.x |
| 1.0.1 | 1.6.1.x 及以上 | 1.8.x |
## TDengine DataType 和 Java DataType
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, TINYINT | java.lang.Short |
| BOOL | java.lang.Boolean |
| BINARY, NCHAR | java.lang.String |
## 常见问题 ## 常见问题
...@@ -381,7 +466,7 @@ Query OK, 1 row(s) in set (0.000141s) ...@@ -381,7 +466,7 @@ Query OK, 1 row(s) in set (0.000141s)
**原因**：程序没有找到依赖的本地函数库 taos。 **原因**：程序没有找到依赖的本地函数库 taos。
**解决方法**：windows 下可以将 C:\TDengine\driver\taos.dll 拷贝到 C:\Windows\System32\ 目录下，linux 下将建立如下软链 ` ln -s /usr/local/taos/driver/libtaos.so.x.x.x.x /usr/lib/libtaos.so` 即可。 **解决方法**：windows 下可以将 C:\TDengine\driver\taos.dll 拷贝到 C:\Windows\System32\ 目录下，linux 下将建立如下软链 `ln -s /usr/local/taos/driver/libtaos.so.x.x.x.x /usr/lib/libtaos.so` 即可。
* java.lang.UnsatisfiedLinkError: taos.dll Can't load AMD 64 bit on a IA 32-bit platform * java.lang.UnsatisfiedLinkError: taos.dll Can't load AMD 64 bit on a IA 32-bit platform
...@@ -406,3 +491,4 @@ Query OK, 1 row(s) in set (0.000141s) ...@@ -406,3 +491,4 @@ Query OK, 1 row(s) in set (0.000141s)
[13]: https://www.taosdata.com/cn/documentation20/administrator/#%E5%AE%A2%E6%88%B7%E7%AB%AF%E9%85%8D%E7%BD%AE [13]: https://www.taosdata.com/cn/documentation20/administrator/#%E5%AE%A2%E6%88%B7%E7%AB%AF%E9%85%8D%E7%BD%AE
[14]: https://www.taosdata.com/cn/all-downloads/#TDengine-Windows-Client [14]: https://www.taosdata.com/cn/all-downloads/#TDengine-Windows-Client
[15]: https://www.taosdata.com/cn/getting-started/#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B [15]: https://www.taosdata.com/cn/getting-started/#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B
documentation20/webdocs/markdowndocs/faq-ch.md
浏览文件 @ 789fc754
...@@ -85,7 +85,9 @@ TDengine还没有一组专用的validation queries。然而建议你使用系统 ...@@ -85,7 +85,9 @@ TDengine还没有一组专用的validation queries。然而建议你使用系统
## 9. 我可以删除或更新一条记录吗？ ## 9. 我可以删除或更新一条记录吗？
不能。因为TDengine是为联网设备采集的数据设计的，不容许修改。但TDengine提供数据保留策略，只要数据记录超过保留时长，就会被自动删除。 TDengine 目前尚不支持删除功能，未来根据用户需求可能会支持。
从 2.0.8.0 开始，TDengine 支持更新已经写入数据的功能。使用更新功能需要在创建数据库时使用 UPDATE 1 参数，之后可以使用 INSERT INTO 命令更新已经写入的相同时间戳数据。UPDATE 参数不支持 ALTER DATABASE 命令修改。没有使用 UPDATE 1 参数创建的数据库，写入相同时间戳的数据不会修改之前的数据，也不会报错。
## 10. 我怎么创建超过1024列的表？ ## 10. 我怎么创建超过1024列的表？
...@@ -132,8 +134,3 @@ TDengine是根据hostname唯一标志一台机器的，在数据文件从机器A ...@@ -132,8 +134,3 @@ TDengine是根据hostname唯一标志一台机器的，在数据文件从机器A
- 2.0.7.0 及以后的版本，到/var/lib/taos/dnode下，修复dnodeEps.json的dnodeId对应的FQDN，重启。确保机器内所有机器的此文件是完全相同的。 - 2.0.7.0 及以后的版本，到/var/lib/taos/dnode下，修复dnodeEps.json的dnodeId对应的FQDN，重启。确保机器内所有机器的此文件是完全相同的。
- 1.x 和 2.x 版本的存储结构不兼容，需要使用迁移工具或者自己开发应用导出导入数据。 - 1.x 和 2.x 版本的存储结构不兼容，需要使用迁移工具或者自己开发应用导出导入数据。
## 17. TDengine 是否支持删除或更新已经写入的数据？
TDengine 目前尚不支持删除功能，未来根据用户需求可能会支持。
从 2.0.8.0 开始，TDengine 支持更新已经写入数据的功能。使用更新功能需要在创建数据库时使用 UPDATE 1 参数，之后可以使用 INSERT INTO 命令更新已经写入的相同时间戳数据。UPDATE 参数不支持 ALTER DATABASE 命令修改。没有使用 UPDATE 1 参数创建的数据库，写入相同时间戳的数据不会修改之前的数据，也不会报错。
\ No newline at end of file
packaging/cfg/taos.cfg
浏览文件 @ 789fc754
...@@ -265,9 +265,6 @@ ...@@ -265,9 +265,6 @@
# maximum display width of binary and nchar fields in the shell. The parts exceeding this limit will be hidden # maximum display width of binary and nchar fields in the shell. The parts exceeding this limit will be hidden
# maxBinaryDisplayWidth 30 # maxBinaryDisplayWidth 30
# enable/disable telemetry reporting
# telemetryReporting 1
# enable/disable stream (continuous query) # enable/disable stream (continuous query)
# stream 1 # stream 1
......
src/client/inc/tscSubquery.h
浏览文件 @ 789fc754
...@@ -47,7 +47,6 @@ void tscLockByThread(int64_t *lockedBy); ...@@ -47,7 +47,6 @@ void tscLockByThread(int64_t *lockedBy);
void tscUnlockByThread(int64_t *lockedBy); void tscUnlockByThread(int64_t *lockedBy);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
src/client/inc/tsclient.h
浏览文件 @ 789fc754
...@@ -317,7 +317,8 @@ typedef struct STscObj { ...@@ -317,7 +317,8 @@ typedef struct STscObj {
} STscObj; } STscObj;
typedef struct SSubqueryState { typedef struct SSubqueryState {
int32_t numOfRemain; // the number of remain unfinished subquery pthread_mutex_t mutex;
int8_t *states;
int32_t numOfSub; // the number of total sub-queries int32_t numOfSub; // the number of total sub-queries
uint64_t numOfRetrievedRows; // total number of points in this query uint64_t numOfRetrievedRows; // total number of points in this query
} SSubqueryState; } SSubqueryState;
......
src/client/src/tscLocalMerge.c
浏览文件 @ 789fc754
...@@ -1427,6 +1427,10 @@ int32_t tscDoLocalMerge(SSqlObj *pSql) { ...@@ -1427,6 +1427,10 @@ int32_t tscDoLocalMerge(SSqlObj *pSql) {
tscResetForNextRetrieve(pRes); tscResetForNextRetrieve(pRes);
if (pSql->signature != pSql || pRes == NULL || pRes->pLocalReducer == NULL) { // all data has been processed if (pSql->signature != pSql || pRes == NULL || pRes->pLocalReducer == NULL) { // all data has been processed
if (pRes->code == TSDB_CODE_SUCCESS) {
return pRes->code;
}
tscError("%p local merge abort due to error occurs, code:%s", pSql, tstrerror(pRes->code)); tscError("%p local merge abort due to error occurs, code:%s", pSql, tstrerror(pRes->code));
return pRes->code; return pRes->code;
} }
......
src/client/src/tscSQLParser.c
浏览文件 @ 789fc754
...@@ -264,6 +264,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) { ...@@ -264,6 +264,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
case TSDB_SQL_DROP_DB: { case TSDB_SQL_DROP_DB: {
const char* msg2 = "invalid name"; const char* msg2 = "invalid name";
const char* msg3 = "param name too long"; const char* msg3 = "param name too long";
const char* msg4 = "table is not super table";
SStrToken* pzName = &pInfo->pDCLInfo->a[0]; SStrToken* pzName = &pInfo->pDCLInfo->a[0];
if ((pInfo->type != TSDB_SQL_DROP_DNODE) && (tscValidateName(pzName) != TSDB_CODE_SUCCESS)) { if ((pInfo->type != TSDB_SQL_DROP_DNODE) && (tscValidateName(pzName) != TSDB_CODE_SUCCESS)) {
...@@ -285,6 +286,18 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) { ...@@ -285,6 +286,18 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
if(code != TSDB_CODE_SUCCESS) { if(code != TSDB_CODE_SUCCESS) {
return code; return code;
} }
if (pInfo->pDCLInfo->tableType == TSDB_SUPER_TABLE) {
code = tscGetTableMeta(pSql, pTableMetaInfo);
if (code != TSDB_CODE_SUCCESS) {
return code;
}
if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
}
}
} else if (pInfo->type == TSDB_SQL_DROP_DNODE) { } else if (pInfo->type == TSDB_SQL_DROP_DNODE) {
pzName->n = strdequote(pzName->z); pzName->n = strdequote(pzName->z);
strncpy(pTableMetaInfo->name, pzName->z, pzName->n); strncpy(pTableMetaInfo->name, pzName->z, pzName->n);
...@@ -4794,6 +4807,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) { ...@@ -4794,6 +4807,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
const char* msg17 = "invalid column name"; const char* msg17 = "invalid column name";
const char* msg18 = "primary timestamp column cannot be dropped"; const char* msg18 = "primary timestamp column cannot be dropped";
const char* msg19 = "invalid new tag name"; const char* msg19 = "invalid new tag name";
const char* msg20 = "table is not super table";
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
...@@ -4819,6 +4833,10 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) { ...@@ -4819,6 +4833,10 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
STableMeta* pTableMeta = pTableMetaInfo->pTableMeta; STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
if (pAlterSQL->tableType == TSDB_SUPER_TABLE && !(UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo))) {
return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg20);
}
if (pAlterSQL->type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_DROP_TAG_COLUMN || if (pAlterSQL->type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_DROP_TAG_COLUMN ||
pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN) { pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN) {
if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) { if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
......
src/client/src/tscServer.c
浏览文件 @ 789fc754
...@@ -2193,7 +2193,7 @@ int tscProcessDropTableRsp(SSqlObj *pSql) { ...@@ -2193,7 +2193,7 @@ int tscProcessDropTableRsp(SSqlObj *pSql) {
tscDebug("%p remove table meta after drop table:%s, numOfRemain:%d", pSql, pTableMetaInfo->name, tscDebug("%p remove table meta after drop table:%s, numOfRemain:%d", pSql, pTableMetaInfo->name,
(int32_t) taosHashGetSize(tscTableMetaInfo)); (int32_t) taosHashGetSize(tscTableMetaInfo));
assert(pTableMetaInfo->pTableMeta == NULL); pTableMetaInfo->pTableMeta = NULL;
return 0; return 0;
} }
......
src/client/src/tscSubquery.c
浏览文件 @ 789fc754
...@@ -55,6 +55,58 @@ static void skipRemainValue(STSBuf* pTSBuf, tVariant* tag1) { ...@@ -55,6 +55,58 @@ static void skipRemainValue(STSBuf* pTSBuf, tVariant* tag1) {
} }
} }
static void subquerySetState(SSqlObj *pSql, SSubqueryState *subState, int idx, int8_t state) {
assert(idx < subState->numOfSub);
assert(subState->states);
pthread_mutex_lock(&subState->mutex);
tscDebug("subquery:%p,%d state set to %d", pSql, idx, state);
subState->states[idx] = state;
pthread_mutex_unlock(&subState->mutex);
}
static bool allSubqueryDone(SSqlObj *pParentSql) {
bool done = true;
SSubqueryState *subState = &pParentSql->subState;
//lock in caller
for (int i = 0; i < subState->numOfSub; i++) {
if (0 == subState->states[i]) {
tscDebug("%p subquery:%p,%d is NOT finished, total:%d", pParentSql, pParentSql->pSubs[i], i, subState->numOfSub);
done = false;
break;
} else {
tscDebug("%p subquery:%p,%d is finished, total:%d", pParentSql, pParentSql->pSubs[i], i, subState->numOfSub);
}
}
return done;
}
static bool subAndCheckDone(SSqlObj *pSql, SSqlObj *pParentSql, int idx) {
SSubqueryState *subState = &pParentSql->subState;
assert(idx < subState->numOfSub);
pthread_mutex_lock(&subState->mutex);
tscDebug("%p subquery:%p,%d state set to 1", pParentSql, pSql, idx);
subState->states[idx] = 1;
bool done = allSubqueryDone(pParentSql);
pthread_mutex_unlock(&subState->mutex);
return done;
}
static int64_t doTSBlockIntersect(SSqlObj* pSql, SJoinSupporter* pSupporter1, SJoinSupporter* pSupporter2, STimeWindow * win) { static int64_t doTSBlockIntersect(SSqlObj* pSql, SJoinSupporter* pSupporter1, SJoinSupporter* pSupporter2, STimeWindow * win) {
SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex); SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
...@@ -367,10 +419,6 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) { ...@@ -367,10 +419,6 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
// scan all subquery, if one sub query has only ts, ignore it // scan all subquery, if one sub query has only ts, ignore it
tscDebug("%p start to launch secondary subqueries, %d out of %d needs to query", pSql, numOfSub, pSql->subState.numOfSub); tscDebug("%p start to launch secondary subqueries, %d out of %d needs to query", pSql, numOfSub, pSql->subState.numOfSub);
//the subqueries that do not actually launch the secondary query to virtual node is set as completed.
SSubqueryState* pState = &pSql->subState;
pState->numOfRemain = numOfSub;
bool success = true; bool success = true;
for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) { for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
...@@ -404,6 +452,7 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) { ...@@ -404,6 +452,7 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
break; break;
} }
tscClearSubqueryInfo(&pNew->cmd); tscClearSubqueryInfo(&pNew->cmd);
pSql->pSubs[i] = pNew; pSql->pSubs[i] = pNew;
...@@ -480,6 +529,8 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) { ...@@ -480,6 +529,8 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
} }
} }
subquerySetState(pPrevSub, &pSql->subState, i, 0);
size_t numOfCols = taosArrayGetSize(pQueryInfo->colList); size_t numOfCols = taosArrayGetSize(pQueryInfo->colList);
tscDebug("%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, name:%s", tscDebug("%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, name:%s",
pSql, pNew, 0, pTableMetaInfo->vgroupIndex, pQueryInfo->type, taosArrayGetSize(pQueryInfo->exprList), pSql, pNew, 0, pTableMetaInfo->vgroupIndex, pQueryInfo->type, taosArrayGetSize(pQueryInfo->exprList),
...@@ -517,20 +568,25 @@ void freeJoinSubqueryObj(SSqlObj* pSql) { ...@@ -517,20 +568,25 @@ void freeJoinSubqueryObj(SSqlObj* pSql) {
SJoinSupporter* p = pSub->param; SJoinSupporter* p = pSub->param;
tscDestroyJoinSupporter(p); tscDestroyJoinSupporter(p);
if (pSub->res.code == TSDB_CODE_SUCCESS) {
taos_free_result(pSub); taos_free_result(pSub);
pSql->pSubs[i] = NULL;
} }
if (pSql->subState.states) {
pthread_mutex_destroy(&pSql->subState.mutex);
} }
tfree(pSql->subState.states);
pSql->subState.numOfSub = 0; pSql->subState.numOfSub = 0;
} }
static void quitAllSubquery(SSqlObj* pSqlObj, SJoinSupporter* pSupporter) { static void quitAllSubquery(SSqlObj* pSqlSub, SSqlObj* pSqlObj, SJoinSupporter* pSupporter) {
assert(pSqlObj->subState.numOfRemain > 0); if (subAndCheckDone(pSqlSub, pSqlObj, pSupporter->subqueryIndex)) {
if (atomic_sub_fetch_32(&pSqlObj->subState.numOfRemain, 1) <= 0) {
tscError("%p all subquery return and query failed, global code:%s", pSqlObj, tstrerror(pSqlObj->res.code)); tscError("%p all subquery return and query failed, global code:%s", pSqlObj, tstrerror(pSqlObj->res.code));
freeJoinSubqueryObj(pSqlObj); freeJoinSubqueryObj(pSqlObj);
return;
} }
//tscDestroyJoinSupporter(pSupporter); //tscDestroyJoinSupporter(pSupporter);
...@@ -777,6 +833,15 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -777,6 +833,15 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex); SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
assert(TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY)); assert(TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY));
if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, numOfRows, pParentSql->res.code);
quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql);
return;
}
// check for the error code firstly // check for the error code firstly
if (taos_errno(pSql) != TSDB_CODE_SUCCESS) { if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {
// todo retry if other subqueries are not failed // todo retry if other subqueries are not failed
...@@ -785,7 +850,7 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -785,7 +850,7 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
tscError("%p sub query failed, code:%s, index:%d", pSql, tstrerror(numOfRows), pSupporter->subqueryIndex); tscError("%p sub query failed, code:%s, index:%d", pSql, tstrerror(numOfRows), pSupporter->subqueryIndex);
pParentSql->res.code = numOfRows; pParentSql->res.code = numOfRows;
quitAllSubquery(pParentSql, pSupporter); quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql); tscAsyncResultOnError(pParentSql);
return; return;
...@@ -802,7 +867,7 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -802,7 +867,7 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
tscError("%p failed to malloc memory", pSql); tscError("%p failed to malloc memory", pSql);
pParentSql->res.code = TAOS_SYSTEM_ERROR(errno); pParentSql->res.code = TAOS_SYSTEM_ERROR(errno);
quitAllSubquery(pParentSql, pSupporter); quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql); tscAsyncResultOnError(pParentSql);
return; return;
...@@ -844,7 +909,8 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -844,7 +909,8 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
// no data exists in next vnode, mark the <tid, tags> query completed // no data exists in next vnode, mark the <tid, tags> query completed
// only when there is no subquery exits any more, proceeds to get the intersect of the <tid, tags> tuple sets. // only when there is no subquery exits any more, proceeds to get the intersect of the <tid, tags> tuple sets.
if (atomic_sub_fetch_32(&pParentSql->subState.numOfRemain, 1) > 0) { if (!subAndCheckDone(pSql, pParentSql, pSupporter->subqueryIndex)) {
tscDebug("%p tagRetrieve:%p,%d completed, total:%d", pParentSql, tres, pSupporter->subqueryIndex, pParentSql->subState.numOfSub);
return; return;
} }
...@@ -891,7 +957,9 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -891,7 +957,9 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
((SJoinSupporter*)psub2->param)->pVgroupTables = tscVgroupTableInfoClone(pTableMetaInfo2->pVgroupTables); ((SJoinSupporter*)psub2->param)->pVgroupTables = tscVgroupTableInfoClone(pTableMetaInfo2->pVgroupTables);
pParentSql->subState.numOfSub = 2; pParentSql->subState.numOfSub = 2;
pParentSql->subState.numOfRemain = pParentSql->subState.numOfSub;
memset(pParentSql->subState.states, 0, sizeof(pParentSql->subState.states[0]) * pParentSql->subState.numOfSub);
tscDebug("%p reset all sub states to 0", pParentSql);
for (int32_t m = 0; m < pParentSql->subState.numOfSub; ++m) { for (int32_t m = 0; m < pParentSql->subState.numOfSub; ++m) {
SSqlObj* sub = pParentSql->pSubs[m]; SSqlObj* sub = pParentSql->pSubs[m];
...@@ -915,6 +983,15 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -915,6 +983,15 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex); SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
assert(!TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE)); assert(!TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE));
if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, numOfRows, pParentSql->res.code);
quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql);
return;
}
// check for the error code firstly // check for the error code firstly
if (taos_errno(pSql) != TSDB_CODE_SUCCESS) { if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {
// todo retry if other subqueries are not failed yet // todo retry if other subqueries are not failed yet
...@@ -922,7 +999,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -922,7 +999,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
tscError("%p sub query failed, code:%s, index:%d", pSql, tstrerror(numOfRows), pSupporter->subqueryIndex); tscError("%p sub query failed, code:%s, index:%d", pSql, tstrerror(numOfRows), pSupporter->subqueryIndex);
pParentSql->res.code = numOfRows; pParentSql->res.code = numOfRows;
quitAllSubquery(pParentSql, pSupporter); quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql); tscAsyncResultOnError(pParentSql);
return; return;
...@@ -937,7 +1014,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -937,7 +1014,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
pParentSql->res.code = TAOS_SYSTEM_ERROR(errno); pParentSql->res.code = TAOS_SYSTEM_ERROR(errno);
quitAllSubquery(pParentSql, pSupporter); quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql); tscAsyncResultOnError(pParentSql);
...@@ -955,7 +1032,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -955,7 +1032,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
pParentSql->res.code = TAOS_SYSTEM_ERROR(errno); pParentSql->res.code = TAOS_SYSTEM_ERROR(errno);
quitAllSubquery(pParentSql, pSupporter); quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql); tscAsyncResultOnError(pParentSql);
...@@ -1009,7 +1086,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow ...@@ -1009,7 +1086,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
return; return;
} }
if (atomic_sub_fetch_32(&pParentSql->subState.numOfRemain, 1) > 0) { if (!subAndCheckDone(pSql, pParentSql, pSupporter->subqueryIndex)) {
return; return;
} }
...@@ -1049,6 +1126,17 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR ...@@ -1049,6 +1126,17 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR
SSqlRes* pRes = &pSql->res; SSqlRes* pRes = &pSql->res;
SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex); SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, numOfRows, pParentSql->res.code);
quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql);
return;
}
if (taos_errno(pSql) != TSDB_CODE_SUCCESS) { if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {
assert(numOfRows == taos_errno(pSql)); assert(numOfRows == taos_errno(pSql));
...@@ -1088,9 +1176,8 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR ...@@ -1088,9 +1176,8 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR
} }
} }
assert(pState->numOfRemain > 0); if (!subAndCheckDone(pSql, pParentSql, pSupporter->subqueryIndex)) {
if (atomic_sub_fetch_32(&pState->numOfRemain, 1) > 0) { tscDebug("%p sub:%p,%d completed, total:%d", pParentSql, tres, pSupporter->subqueryIndex, pState->numOfSub);
tscDebug("%p sub:%p completed, remain:%d, total:%d", pParentSql, tres, pState->numOfRemain, pState->numOfSub);
return; return;
} }
...@@ -1205,16 +1292,17 @@ void tscFetchDatablockForSubquery(SSqlObj* pSql) { ...@@ -1205,16 +1292,17 @@ void tscFetchDatablockForSubquery(SSqlObj* pSql) {
} }
} }
// get the number of subquery that need to retrieve the next vnode.
if (orderedPrjQuery) { if (orderedPrjQuery) {
for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) { for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
SSqlObj* pSub = pSql->pSubs[i]; SSqlObj* pSub = pSql->pSubs[i];
if (pSub != NULL && pSub->res.row >= pSub->res.numOfRows && pSub->res.completed) { if (pSub != NULL && pSub->res.row >= pSub->res.numOfRows && pSub->res.completed) {
pSql->subState.numOfRemain++; subquerySetState(pSub, &pSql->subState, i, 0);
} }
} }
} }
for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) { for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
SSqlObj* pSub = pSql->pSubs[i]; SSqlObj* pSub = pSql->pSubs[i];
if (pSub == NULL) { if (pSub == NULL) {
...@@ -1270,7 +1358,19 @@ void tscFetchDatablockForSubquery(SSqlObj* pSql) { ...@@ -1270,7 +1358,19 @@ void tscFetchDatablockForSubquery(SSqlObj* pSql) {
// retrieve data from current vnode. // retrieve data from current vnode.
tscDebug("%p retrieve data from %d subqueries", pSql, numOfFetch); tscDebug("%p retrieve data from %d subqueries", pSql, numOfFetch);
SJoinSupporter* pSupporter = NULL; SJoinSupporter* pSupporter = NULL;
pSql->subState.numOfRemain = numOfFetch;
for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
SSqlObj* pSql1 = pSql->pSubs[i];
if (pSql1 == NULL) {
continue;
}
SSqlRes* pRes1 = &pSql1->res;
if (pRes1->row >= pRes1->numOfRows) {
subquerySetState(pSql1, &pSql->subState, i, 0);
}
}
for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) { for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
SSqlObj* pSql1 = pSql->pSubs[i]; SSqlObj* pSql1 = pSql->pSubs[i];
...@@ -1372,7 +1472,8 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) { ...@@ -1372,7 +1472,8 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) {
// retrieve actual query results from vnode during the second stage join subquery // retrieve actual query results from vnode during the second stage join subquery
if (pParentSql->res.code != TSDB_CODE_SUCCESS) { if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, code, pParentSql->res.code); tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, code, pParentSql->res.code);
quitAllSubquery(pParentSql, pSupporter); quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql); tscAsyncResultOnError(pParentSql);
return; return;
...@@ -1384,7 +1485,8 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) { ...@@ -1384,7 +1485,8 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) {
tscError("%p abort query, code:%s, global code:%s", pSql, tstrerror(code), tstrerror(pParentSql->res.code)); tscError("%p abort query, code:%s, global code:%s", pSql, tstrerror(code), tstrerror(pParentSql->res.code));
pParentSql->res.code = code; pParentSql->res.code = code;
quitAllSubquery(pParentSql, pSupporter);
quitAllSubquery(pSql, pParentSql, pSupporter);
tscAsyncResultOnError(pParentSql); tscAsyncResultOnError(pParentSql);
return; return;
...@@ -1408,7 +1510,7 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) { ...@@ -1408,7 +1510,7 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) {
// In case of consequence query from other vnode, do not wait for other query response here. // In case of consequence query from other vnode, do not wait for other query response here.
if (!(pTableMetaInfo->vgroupIndex > 0 && tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0))) { if (!(pTableMetaInfo->vgroupIndex > 0 && tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0))) {
if (atomic_sub_fetch_32(&pParentSql->subState.numOfRemain, 1) > 0) { if (!subAndCheckDone(pSql, pParentSql, pSupporter->subqueryIndex)) {
return; return;
} }
} }
...@@ -1422,6 +1524,7 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) { ...@@ -1422,6 +1524,7 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) {
if (pTableMetaInfo->vgroupIndex > 0 && tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0)) { if (pTableMetaInfo->vgroupIndex > 0 && tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
pSql->fp = joinRetrieveFinalResCallback; // continue retrieve data pSql->fp = joinRetrieveFinalResCallback; // continue retrieve data
pSql->cmd.command = TSDB_SQL_FETCH; pSql->cmd.command = TSDB_SQL_FETCH;
tscProcessSql(pSql); tscProcessSql(pSql);
} else { // first retrieve from vnode during the secondary stage sub-query } else { // first retrieve from vnode during the secondary stage sub-query
// set the command flag must be after the semaphore been correctly set. // set the command flag must be after the semaphore been correctly set.
...@@ -1457,8 +1560,7 @@ int32_t tscCreateJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter ...@@ -1457,8 +1560,7 @@ int32_t tscCreateJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter
return TSDB_CODE_TSC_OUT_OF_MEMORY; return TSDB_CODE_TSC_OUT_OF_MEMORY;
} }
pSql->pSubs[pSql->subState.numOfRemain++] = pNew; pSql->pSubs[tableIndex] = pNew;
assert(pSql->subState.numOfRemain <= pSql->subState.numOfSub);
if (QUERY_IS_JOIN_QUERY(pQueryInfo->type)) { if (QUERY_IS_JOIN_QUERY(pQueryInfo->type)) {
addGroupInfoForSubquery(pSql, pNew, 0, tableIndex); addGroupInfoForSubquery(pSql, pNew, 0, tableIndex);
...@@ -1590,6 +1692,19 @@ void tscHandleMasterJoinQuery(SSqlObj* pSql) { ...@@ -1590,6 +1692,19 @@ void tscHandleMasterJoinQuery(SSqlObj* pSql) {
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
pSql->subState.numOfSub = pQueryInfo->numOfTables; pSql->subState.numOfSub = pQueryInfo->numOfTables;
if (pSql->subState.states == NULL) {
pSql->subState.states = calloc(pSql->subState.numOfSub, sizeof(*pSql->subState.states));
if (pSql->subState.states == NULL) {
code = TSDB_CODE_TSC_OUT_OF_MEMORY;
goto _error;
}
pthread_mutex_init(&pSql->subState.mutex, NULL);
}
memset(pSql->subState.states, 0, sizeof(*pSql->subState.states) * pSql->subState.numOfSub);
tscDebug("%p reset all sub states to 0", pSql);
bool hasEmptySub = false; bool hasEmptySub = false;
tscDebug("%p start subquery, total:%d", pSql, pQueryInfo->numOfTables); tscDebug("%p start subquery, total:%d", pSql, pQueryInfo->numOfTables);
...@@ -1622,14 +1737,25 @@ void tscHandleMasterJoinQuery(SSqlObj* pSql) { ...@@ -1622,14 +1737,25 @@ void tscHandleMasterJoinQuery(SSqlObj* pSql) {
pSql->cmd.command = TSDB_SQL_RETRIEVE_EMPTY_RESULT; pSql->cmd.command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
(*pSql->fp)(pSql->param, pSql, 0); (*pSql->fp)(pSql->param, pSql, 0);
} else { } else {
int fail = 0;
for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) { for (int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
SSqlObj* pSub = pSql->pSubs[i]; SSqlObj* pSub = pSql->pSubs[i];
if (fail) {
(*pSub->fp)(pSub->param, pSub, 0);
continue;
}
if ((code = tscProcessSql(pSub)) != TSDB_CODE_SUCCESS) { if ((code = tscProcessSql(pSub)) != TSDB_CODE_SUCCESS) {
pSql->subState.numOfRemain = i - 1; // the already sent request will continue and do not go to the error process routine pRes->code = code;
break; (*pSub->fp)(pSub->param, pSub, 0);
fail = 1;
} }
} }
if(fail) {
return;
}
pSql->cmd.command = TSDB_SQL_TABLE_JOIN_RETRIEVE; pSql->cmd.command = TSDB_SQL_TABLE_JOIN_RETRIEVE;
} }
...@@ -1728,7 +1854,21 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) { ...@@ -1728,7 +1854,21 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
return ret; return ret;
} }
pState->numOfRemain = pState->numOfSub; if (pState->states == NULL) {
pState->states = calloc(pState->numOfSub, sizeof(*pState->states));
if (pState->states == NULL) {
pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
tscAsyncResultOnError(pSql);
tfree(pMemoryBuf);
return ret;
}
pthread_mutex_init(&pState->mutex, NULL);
}
memset(pState->states, 0, sizeof(*pState->states) * pState->numOfSub);
tscDebug("%p reset all sub states to 0", pSql);
pRes->code = TSDB_CODE_SUCCESS; pRes->code = TSDB_CODE_SUCCESS;
int32_t i = 0; int32_t i = 0;
...@@ -1877,7 +2017,6 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO ...@@ -1877,7 +2017,6 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
assert(pSql != NULL); assert(pSql != NULL);
SSubqueryState* pState = &pParentSql->subState; SSubqueryState* pState = &pParentSql->subState;
assert(pState->numOfRemain <= pState->numOfSub && pState->numOfRemain >= 0);
// retrieved in subquery failed. OR query cancelled in retrieve phase. // retrieved in subquery failed. OR query cancelled in retrieve phase.
if (taos_errno(pSql) == TSDB_CODE_SUCCESS && pParentSql->res.code != TSDB_CODE_SUCCESS) { if (taos_errno(pSql) == TSDB_CODE_SUCCESS && pParentSql->res.code != TSDB_CODE_SUCCESS) {
...@@ -1908,10 +2047,8 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO ...@@ -1908,10 +2047,8 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
} }
} }
int32_t remain = -1; if (!subAndCheckDone(pSql, pParentSql, subqueryIndex)) {
if ((remain = atomic_sub_fetch_32(&pState->numOfRemain, 1)) > 0) { tscDebug("%p sub:%p,%d freed, not finished, total:%d", pParentSql, pSql, trsupport->subqueryIndex, pState->numOfSub);
tscDebug("%p sub:%p orderOfSub:%d freed, finished subqueries:%d", pParentSql, pSql, trsupport->subqueryIndex,
pState->numOfSub - remain);
tscFreeRetrieveSup(pSql); tscFreeRetrieveSup(pSql);
return; return;
...@@ -1980,10 +2117,8 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p ...@@ -1980,10 +2117,8 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p
return; return;
} }
int32_t remain = -1; if (!subAndCheckDone(pSql, pParentSql, idx)) {
if ((remain = atomic_sub_fetch_32(&pParentSql->subState.numOfRemain, 1)) > 0) { tscDebug("%p sub:%p orderOfSub:%d freed, not finished", pParentSql, pSql, trsupport->subqueryIndex);
tscDebug("%p sub:%p orderOfSub:%d freed, finished subqueries:%d", pParentSql, pSql, trsupport->subqueryIndex,
pState->numOfSub - remain);
tscFreeRetrieveSup(pSql); tscFreeRetrieveSup(pSql);
return; return;
...@@ -2033,7 +2168,6 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR ...@@ -2033,7 +2168,6 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
SSqlObj * pParentSql = trsupport->pParentSql; SSqlObj * pParentSql = trsupport->pParentSql;
SSubqueryState* pState = &pParentSql->subState; SSubqueryState* pState = &pParentSql->subState;
assert(pState->numOfRemain <= pState->numOfSub && pState->numOfRemain >= 0);
STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0); STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
SVgroupInfo *pVgroup = &pTableMetaInfo->vgroupList->vgroups[0]; SVgroupInfo *pVgroup = &pTableMetaInfo->vgroupList->vgroups[0];
...@@ -2254,7 +2388,8 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows) ...@@ -2254,7 +2388,8 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
} }
} }
if (atomic_sub_fetch_32(&pParentObj->subState.numOfRemain, 1) > 0) { if (!subAndCheckDone(tres, pParentObj, pSupporter->index)) {
tscDebug("%p insert:%p,%d completed, total:%d", pParentObj, tres, pSupporter->index, pParentObj->subState.numOfSub);
return; return;
} }
...@@ -2288,6 +2423,8 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows) ...@@ -2288,6 +2423,8 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
STableMetaInfo* pMasterTableMetaInfo = tscGetTableMetaInfoFromCmd(&pParentObj->cmd, pSql->cmd.clauseIndex, 0); STableMetaInfo* pMasterTableMetaInfo = tscGetTableMetaInfoFromCmd(&pParentObj->cmd, pSql->cmd.clauseIndex, 0);
tscAddTableMetaInfo(pQueryInfo, pMasterTableMetaInfo->name, NULL, NULL, NULL, NULL); tscAddTableMetaInfo(pQueryInfo, pMasterTableMetaInfo->name, NULL, NULL, NULL, NULL);
subquerySetState(pSql, &pParentObj->subState, i, 0);
tscDebug("%p, failed sub:%d, %p", pParentObj, i, pSql); tscDebug("%p, failed sub:%d, %p", pParentObj, i, pSql);
} }
} }
...@@ -2302,7 +2439,6 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows) ...@@ -2302,7 +2439,6 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
} }
pParentObj->cmd.parseFinished = false; pParentObj->cmd.parseFinished = false;
pParentObj->subState.numOfRemain = numOfFailed;
tscResetSqlCmdObj(&pParentObj->cmd); tscResetSqlCmdObj(&pParentObj->cmd);
...@@ -2378,7 +2514,19 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) { ...@@ -2378,7 +2514,19 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
// the number of already initialized subqueries // the number of already initialized subqueries
int32_t numOfSub = 0; int32_t numOfSub = 0;
pSql->subState.numOfRemain = pSql->subState.numOfSub; if (pSql->subState.states == NULL) {
pSql->subState.states = calloc(pSql->subState.numOfSub, sizeof(*pSql->subState.states));
if (pSql->subState.states == NULL) {
pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
goto _error;
}
pthread_mutex_init(&pSql->subState.mutex, NULL);
}
memset(pSql->subState.states, 0, sizeof(*pSql->subState.states) * pSql->subState.numOfSub);
tscDebug("%p reset all sub states to 0", pSql);
pSql->pSubs = calloc(pSql->subState.numOfSub, POINTER_BYTES); pSql->pSubs = calloc(pSql->subState.numOfSub, POINTER_BYTES);
if (pSql->pSubs == NULL) { if (pSql->pSubs == NULL) {
goto _error; goto _error;
......
src/client/src/tscUtil.c
浏览文件 @ 789fc754
...@@ -441,6 +441,12 @@ static void tscFreeSubobj(SSqlObj* pSql) { ...@@ -441,6 +441,12 @@ static void tscFreeSubobj(SSqlObj* pSql) {
pSql->pSubs[i] = NULL; pSql->pSubs[i] = NULL;
} }
if (pSql->subState.states) {
pthread_mutex_destroy(&pSql->subState.mutex);
}
tfree(pSql->subState.states);
pSql->subState.numOfSub = 0; pSql->subState.numOfSub = 0;
} }
......
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java
浏览文件 @ 789fc754
...@@ -535,6 +535,12 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData { ...@@ -535,6 +535,12 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData {
return null; return null;
} }
/**
* @Param catalog : database名称，"" 表示不属于任何database的table，null表示不使用database来缩小范围
* @Param schemaPattern : schema名称，""表示
* @Param tableNamePattern : 表名满足tableNamePattern的表, null表示返回所有表
* @Param types : 表类型，null表示返回所有类型
*/
public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException { public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException {
if (conn == null || conn.isClosed()) { if (conn == null || conn.isClosed()) {
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL)); throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
...@@ -544,10 +550,92 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData { ...@@ -544,10 +550,92 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData {
if (catalog == null || catalog.isEmpty()) if (catalog == null || catalog.isEmpty())
return null; return null;
stmt.executeUpdate("use " + catalog); ResultSet databases = stmt.executeQuery("show databases");
ResultSet resultSet0 = stmt.executeQuery("show tables"); String dbname = null;
GetTablesResultSet getTablesResultSet = new GetTablesResultSet(resultSet0, catalog, schemaPattern, tableNamePattern, types); while (databases.next()) {
return getTablesResultSet; dbname = databases.getString("name");
if (dbname.equalsIgnoreCase(catalog))
break;
}
databases.close();
if (dbname == null)
return null;
stmt.execute("use " + dbname);
DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
List<ColumnMetaData> columnMetaDataList = new ArrayList<>();
ColumnMetaData col1 = new ColumnMetaData();
col1.setColIndex(1);
col1.setColName("TABLE_CAT");
col1.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col1);
ColumnMetaData col2 = new ColumnMetaData();
col2.setColIndex(2);
col2.setColName("TABLE_SCHEM");
col2.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col2);
ColumnMetaData col3 = new ColumnMetaData();
col3.setColIndex(3);
col3.setColName("TABLE_NAME");
col3.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col3);
ColumnMetaData col4 = new ColumnMetaData();
col4.setColIndex(4);
col4.setColName("TABLE_TYPE");
col4.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col4);
ColumnMetaData col5 = new ColumnMetaData();
col5.setColIndex(5);
col5.setColName("REMARKS");
col5.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col5);
ColumnMetaData col6 = new ColumnMetaData();
col6.setColIndex(6);
col6.setColName("TYPE_CAT");
col6.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col6);
ColumnMetaData col7 = new ColumnMetaData();
col7.setColIndex(7);
col7.setColName("TYPE_SCHEM");
col7.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col7);
ColumnMetaData col8 = new ColumnMetaData();
col8.setColIndex(8);
col8.setColName("TYPE_NAME");
col8.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col8);
ColumnMetaData col9 = new ColumnMetaData();
col9.setColIndex(9);
col9.setColName("SELF_REFERENCING_COL_NAME");
col9.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col9);
ColumnMetaData col10 = new ColumnMetaData();
col10.setColIndex(10);
col10.setColName("REF_GENERATION");
col10.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col10);
resultSet.setColumnMetaDataList(columnMetaDataList);
List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
ResultSet tables = stmt.executeQuery("show tables");
while (tables.next()) {
TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
rowData.setString(2, tables.getString("table_name"));
rowData.setString(3, "TABLE");
rowData.setString(4, "");
rowDataList.add(rowData);
}
ResultSet stables = stmt.executeQuery("show stables");
while (stables.next()) {
TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
rowData.setString(2, stables.getString("name"));
rowData.setString(3, "TABLE");
rowData.setString(4, "STABLE");
rowDataList.add(rowData);
}
resultSet.setRowDataList(rowDataList);
return resultSet;
} }
} }
...@@ -560,125 +648,172 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData { ...@@ -560,125 +648,172 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData {
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL)); throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
try (Statement stmt = conn.createStatement()) { try (Statement stmt = conn.createStatement()) {
DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
// set up ColumnMetaDataList
List<ColumnMetaData> columnMetaDataList = new ArrayList<>(24);
// TABLE_CAT
ColumnMetaData col1 = new ColumnMetaData();
col1.setColIndex(1);
col1.setColName("TABLE_CAT");
col1.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col1);
resultSet.setColumnMetaDataList(columnMetaDataList);
List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
ResultSet rs = stmt.executeQuery("show databases"); ResultSet rs = stmt.executeQuery("show databases");
return new CatalogResultSet(rs); while (rs.next()) {
TSDBResultSetRowData rowData = new TSDBResultSetRowData(1);
rowData.setString(0, rs.getString("name"));
rowDataList.add(rowData);
}
resultSet.setRowDataList(rowDataList);
return resultSet;
} }
} }
public ResultSet getTableTypes() throws SQLException { public ResultSet getTableTypes() throws SQLException {
DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet(); if (conn == null || conn.isClosed())
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
// set up ColumnMetaDataList // set up ColumnMetaDataList
List<ColumnMetaData> columnMetaDataList = new ArrayList<>(1); List<ColumnMetaData> columnMetaDataList = new ArrayList<>();
ColumnMetaData colMetaData = new ColumnMetaData(); ColumnMetaData colMetaData = new ColumnMetaData();
colMetaData.setColIndex(0); colMetaData.setColIndex(0);
colMetaData.setColName("TABLE_TYPE"); colMetaData.setColName("TABLE_TYPE");
colMetaData.setColSize(10); colMetaData.setColSize(10);
colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_BINARY); colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(colMetaData); columnMetaDataList.add(colMetaData);
resultSet.setColumnMetaDataList(columnMetaDataList);
// set up rowDataList // set up rowDataList
List<TSDBResultSetRowData> rowDataList = new ArrayList<>(2); List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
TSDBResultSetRowData rowData = new TSDBResultSetRowData(); TSDBResultSetRowData rowData = new TSDBResultSetRowData(1);
rowData.setString(0, "TABLE"); rowData.setString(0, "TABLE");
rowDataList.add(rowData); rowDataList.add(rowData);
rowData = new TSDBResultSetRowData(); rowData = new TSDBResultSetRowData(1);
rowData.setString(0, "STABLE"); rowData.setString(0, "STABLE");
rowDataList.add(rowData); rowDataList.add(rowData);
resultSet.setColumnMetaDataList(columnMetaDataList);
resultSet.setRowDataList(rowDataList); resultSet.setRowDataList(rowDataList);
return resultSet; return resultSet;
} }
public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
throws SQLException { if (conn == null || conn.isClosed())
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
/** add by zyyang **********/ try (Statement stmt = conn.createStatement()) {
Statement stmt = null;
if (null != conn && !conn.isClosed()) {
stmt = conn.createStatement();
if (catalog == null || catalog.isEmpty()) if (catalog == null || catalog.isEmpty())
return null; return null;
stmt.executeUpdate("use " + catalog); ResultSet databases = stmt.executeQuery("show databases");
String dbname = null;
while (databases.next()) {
dbname = databases.getString("name");
if (dbname.equalsIgnoreCase(catalog))
break;
}
databases.close();
if (dbname == null)
return null;
stmt.execute("use " + dbname);
DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet(); DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
// set up ColumnMetaDataList // set up ColumnMetaDataList
List<ColumnMetaData> columnMetaDataList = new ArrayList<>(24); List<ColumnMetaData> columnMetaDataList = new ArrayList<>(24);
// TABLE_CAT
ColumnMetaData col1 = new ColumnMetaData();
col1.setColIndex(1);
col1.setColName("TABLE_CAT");
col1.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col1);
// TABLE_SCHEM
ColumnMetaData col2 = new ColumnMetaData();
col2.setColIndex(2);
col2.setColName("TABLE_SCHEM");
col2.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col2);
// TABLE_NAME
ColumnMetaData col3 = new ColumnMetaData();
col3.setColIndex(3);
col3.setColName("TABLE_NAME");
col3.setColSize(193);
col3.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col3);
// COLUMN_NAME
ColumnMetaData col4 = new ColumnMetaData();
col4.setColIndex(4);
col4.setColName("COLUMN_NAME");
col4.setColSize(65);
col4.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col4);
// DATA_TYPE
ColumnMetaData col5 = new ColumnMetaData();
col5.setColIndex(5);
col5.setColName("DATA_TYPE");
col5.setColType(TSDBConstants.TSDB_DATA_TYPE_INT);
columnMetaDataList.add(col5);
// TYPE_NAME
ColumnMetaData col6 = new ColumnMetaData();
col6.setColIndex(6);
col6.setColName("TYPE_NAME");
col6.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col6);
// COLUMN_SIZE
ColumnMetaData col7 = new ColumnMetaData();
col7.setColIndex(7);
col7.setColName("COLUMN_SIZE");
col7.setColType(TSDBConstants.TSDB_DATA_TYPE_INT);
columnMetaDataList.add(col7);
// BUFFER_LENGTH ,not used
columnMetaDataList.add(null); columnMetaDataList.add(null);
columnMetaDataList.add(null); // DECIMAL_DIGITS
// add TABLE_NAME ColumnMetaData col9 = new ColumnMetaData();
ColumnMetaData colMetaData = new ColumnMetaData(); col9.setColIndex(9);
colMetaData.setColIndex(3); col9.setColName("DECIMAL_DIGITS");
colMetaData.setColName("TABLE_NAME"); col9.setColType(TSDBConstants.TSDB_DATA_TYPE_INT);
colMetaData.setColSize(193); columnMetaDataList.add(col9);
colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_BINARY);
columnMetaDataList.add(colMetaData);
// add COLUMN_NAME
colMetaData = new ColumnMetaData();
colMetaData.setColIndex(4);
colMetaData.setColName("COLUMN_NAME");
colMetaData.setColSize(65);
colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_BINARY);
columnMetaDataList.add(colMetaData);
// add DATA_TYPE
colMetaData = new ColumnMetaData();
colMetaData.setColIndex(5);
colMetaData.setColName("DATA_TYPE");
colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_INT);
columnMetaDataList.add(colMetaData);
// add TYPE_NAME
colMetaData = new ColumnMetaData();
colMetaData.setColIndex(6);
colMetaData.setColName("TYPE_NAME");
colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_BINARY);
columnMetaDataList.add(colMetaData);
// add COLUMN_SIZE
colMetaData = new ColumnMetaData();
colMetaData.setColIndex(7);
colMetaData.setColName("COLUMN_SIZE");
colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_INT);
columnMetaDataList.add(colMetaData);
// add BUFFER_LENGTH ,not used
columnMetaDataList.add(null);
// add DECIMAL_DIGITS
colMetaData = new ColumnMetaData();
colMetaData.setColIndex(9);
colMetaData.setColName("DECIMAL_DIGITS");
colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_INT);
columnMetaDataList.add(colMetaData);
// add NUM_PREC_RADIX // add NUM_PREC_RADIX
colMetaData = new ColumnMetaData(); ColumnMetaData col10 = new ColumnMetaData();
colMetaData.setColIndex(10); col10.setColIndex(10);
colMetaData.setColName("NUM_PREC_RADIX"); col10.setColName("NUM_PREC_RADIX");
colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_INT); col10.setColType(TSDBConstants.TSDB_DATA_TYPE_INT);
columnMetaDataList.add(colMetaData); columnMetaDataList.add(col10);
// add NULLABLE // NULLABLE
colMetaData = new ColumnMetaData(); ColumnMetaData col11 = new ColumnMetaData();
colMetaData.setColIndex(11); col11.setColIndex(11);
colMetaData.setColName("NULLABLE"); col11.setColName("NULLABLE");
colMetaData.setColType(TSDBConstants.TSDB_DATA_TYPE_INT); col11.setColType(TSDBConstants.TSDB_DATA_TYPE_INT);
columnMetaDataList.add(colMetaData); columnMetaDataList.add(col11);
// REMARKS
ColumnMetaData col12 = new ColumnMetaData();
col12.setColIndex(12);
col12.setColName("REMARKS");
col12.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col12);
resultSet.setColumnMetaDataList(columnMetaDataList); resultSet.setColumnMetaDataList(columnMetaDataList);
// set up rowDataList // set up rowDataList
ResultSet resultSet0 = stmt.executeQuery("describe " + tableNamePattern); ResultSet rs = stmt.executeQuery("describe " + dbname + "." + tableNamePattern);
List<TSDBResultSetRowData> rowDataList = new ArrayList<>(); List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
int index = 0; int index = 0;
while (resultSet0.next()) { while (rs.next()) {
TSDBResultSetRowData rowData = new TSDBResultSetRowData(24); TSDBResultSetRowData rowData = new TSDBResultSetRowData(24);
// set TABLE_CAT
rowData.setString(0, dbname);
// set TABLE_NAME // set TABLE_NAME
rowData.setString(2, tableNamePattern); rowData.setString(2, tableNamePattern);
// set COLUMN_NAME // set COLUMN_NAME
rowData.setString(3, resultSet0.getString(1)); rowData.setString(3, rs.getString("Field"));
// set DATA_TYPE // set DATA_TYPE
String typeName = resultSet0.getString(2); String typeName = rs.getString("Type");
rowData.setInt(4, getDataType(typeName)); rowData.setInt(4, getDataType(typeName));
// set TYPE_NAME // set TYPE_NAME
rowData.setString(5, typeName); rowData.setString(5, typeName);
// set COLUMN_SIZE // set COLUMN_SIZE
int length = resultSet0.getInt(3); int length = rs.getInt("Length");
rowData.setInt(6, getColumnSize(typeName, length)); rowData.setInt(6, getColumnSize(typeName, length));
// set DECIMAL_DIGITS // set DECIMAL_DIGITS
rowData.setInt(8, getDecimalDigits(typeName)); rowData.setInt(8, getDecimalDigits(typeName));
...@@ -686,22 +821,18 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData { ...@@ -686,22 +821,18 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData {
rowData.setInt(9, 10); rowData.setInt(9, 10);
// set NULLABLE // set NULLABLE
rowData.setInt(10, getNullable(index, typeName)); rowData.setInt(10, getNullable(index, typeName));
// set REMARKS
rowData.setString(11, rs.getString("Note"));
rowDataList.add(rowData); rowDataList.add(rowData);
index++; index++;
} }
resultSet.setRowDataList(rowDataList); resultSet.setRowDataList(rowDataList);
// GetColumnsResultSet getColumnsResultSet = new GetColumnsResultSet(resultSet0, catalog, schemaPattern, tableNamePattern, columnNamePattern);
// return getColumnsResultSet;
// DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
return resultSet; return resultSet;
} else {
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
}
/*************************/
// return getEmptyResultSet(); } catch (SQLException e) {
e.printStackTrace();
}
return null;
} }
private int getNullable(int index, String typeName) { private int getNullable(int index, String typeName) {
...@@ -778,7 +909,82 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData { ...@@ -778,7 +909,82 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData {
} }
public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException { public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
return getEmptyResultSet(); if (conn == null || conn.isClosed())
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
try (Statement stmt = conn.createStatement()) {
if (catalog == null || catalog.isEmpty())
return null;
ResultSet databases = stmt.executeQuery("show databases");
String dbname = null;
while (databases.next()) {
dbname = databases.getString("name");
if (dbname.equalsIgnoreCase(catalog))
break;
}
databases.close();
if (dbname == null)
return null;
stmt.execute("use " + dbname);
DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
// set up ColumnMetaDataList
List<ColumnMetaData> columnMetaDataList = new ArrayList<>();
// TABLE_CAT
ColumnMetaData col1 = new ColumnMetaData();
col1.setColIndex(0);
col1.setColName("TABLE_CAT");
col1.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col1);
// TABLE_SCHEM
ColumnMetaData col2 = new ColumnMetaData();
col2.setColIndex(1);
col2.setColName("TABLE_SCHEM");
col2.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col2);
// TABLE_NAME
ColumnMetaData col3 = new ColumnMetaData();
col3.setColIndex(2);
col3.setColName("TABLE_NAME");
col3.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col3);
// COLUMN_NAME
ColumnMetaData col4 = new ColumnMetaData();
col4.setColIndex(3);
col4.setColName("COLUMN_NAME");
col4.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col4);
// KEY_SEQ
ColumnMetaData col5 = new ColumnMetaData();
col5.setColIndex(4);
col5.setColName("KEY_SEQ");
col5.setColType(TSDBConstants.TSDB_DATA_TYPE_INT);
columnMetaDataList.add(col5);
// PK_NAME
ColumnMetaData col6 = new ColumnMetaData();
col6.setColIndex(5);
col6.setColName("PK_NAME");
col6.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col6);
resultSet.setColumnMetaDataList(columnMetaDataList);
// set rowData
List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
ResultSet rs = stmt.executeQuery("describe " + dbname + "." + table);
rs.next();
TSDBResultSetRowData rowData = new TSDBResultSetRowData(6);
rowData.setString(0, null);
rowData.setString(1, null);
rowData.setString(2, table);
String pkName = rs.getString(1);
rowData.setString(3, pkName);
rowData.setInt(4, 1);
rowData.setString(5, pkName);
rowDataList.add(rowData);
resultSet.setRowDataList(rowDataList);
return resultSet;
}
} }
public ResultSet getImportedKeys(String catalog, String schema, String table) throws SQLException { public ResultSet getImportedKeys(String catalog, String schema, String table) throws SQLException {
...@@ -876,12 +1082,72 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData { ...@@ -876,12 +1082,72 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData {
return false; return false;
} }
public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) throws SQLException { public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) throws
SQLException {
return getEmptyResultSet(); return getEmptyResultSet();
} }
public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern) throws SQLException { public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern) throws
return getEmptyResultSet(); SQLException {
if (conn == null || conn.isClosed())
throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
try (Statement stmt = conn.createStatement()) {
if (catalog == null || catalog.isEmpty())
return null;
ResultSet databases = stmt.executeQuery("show databases");
String dbname = null;
while (databases.next()) {
dbname = databases.getString("name");
if (dbname.equalsIgnoreCase(catalog))
break;
}
databases.close();
if (dbname == null)
return null;
stmt.execute("use " + dbname);
DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
// set up ColumnMetaDataList
List<ColumnMetaData> columnMetaDataList = new ArrayList<>();
// TABLE_CAT
ColumnMetaData col1 = new ColumnMetaData();
col1.setColIndex(0);
col1.setColName("TABLE_CAT");
col1.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col1);
// TABLE_SCHEM
ColumnMetaData col2 = new ColumnMetaData();
col2.setColIndex(1);
col2.setColName("TABLE_SCHEM");
col2.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col2);
// TABLE_NAME
ColumnMetaData col3 = new ColumnMetaData();
col3.setColIndex(2);
col3.setColName("TABLE_NAME");
col3.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col3);
// SUPERTABLE_NAME
ColumnMetaData col4 = new ColumnMetaData();
col4.setColIndex(3);
col4.setColName("SUPERTABLE_NAME");
col4.setColType(TSDBConstants.TSDB_DATA_TYPE_NCHAR);
columnMetaDataList.add(col4);
resultSet.setColumnMetaDataList(columnMetaDataList);
ResultSet rs = stmt.executeQuery("show tables like '" + tableNamePattern + "'");
List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
while (rs.next()) {
TSDBResultSetRowData rowData = new TSDBResultSetRowData(4);
rowData.setString(2, rs.getString(1));
rowData.setString(3, rs.getString(4));
rowDataList.add(rowData);
}
resultSet.setRowDataList(rowDataList);
return resultSet;
}
} }
public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern,
......
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
浏览文件 @ 789fc754
...@@ -28,7 +28,7 @@ public class TSDBResultSetRowData { ...@@ -28,7 +28,7 @@ public class TSDBResultSetRowData {
} }
public TSDBResultSetRowData() { public TSDBResultSetRowData() {
this.data = new ArrayList<Object>(); this.data = new ArrayList<>();
this.setColSize(0); this.setColSize(0);
} }
...@@ -39,7 +39,7 @@ public class TSDBResultSetRowData { ...@@ -39,7 +39,7 @@ public class TSDBResultSetRowData {
if (this.colSize == 0) { if (this.colSize == 0) {
return; return;
} }
this.data = new ArrayList<Object>(colSize); this.data = new ArrayList<>(colSize);
this.data.addAll(Collections.nCopies(this.colSize, null)); this.data.addAll(Collections.nCopies(this.colSize, null));
} }
......
src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java 已删除 100644 → 0
浏览文件 @ c1ddf46e
import com.taosdata.jdbc.TSDBDriver;
import java.sql.*;
import java.util.Properties;
public class TestTSDBDatabaseMetaData {
public static void main(String[] args) throws SQLException {
Connection connection = null;
DatabaseMetaData dbMetaData = null;
ResultSet resSet = null;
try {
Class.forName("com.taosdata.jdbc.TSDBDriver");
Properties properties = new Properties();
properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, "localhost");
connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/", properties);
dbMetaData = connection.getMetaData();
resSet = dbMetaData.getCatalogs();
while(resSet.next()) {
for (int i = 1; i <= resSet.getMetaData().getColumnCount(); i++) {
System.out.printf("dbMetaData.getCatalogs(%d) = %s\n", i, resSet.getString(i));
}
}
resSet.close();
} catch (Exception e) {
e.printStackTrace();
if (null != connection) {
connection.close();
}
}
}
}
src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
浏览文件 @ 789fc754
...@@ -10,7 +10,7 @@ import java.util.Properties; ...@@ -10,7 +10,7 @@ import java.util.Properties;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
public class StatementTest extends BaseTest { public class StatementTest {
static Connection connection = null; static Connection connection = null;
static Statement statement = null; static Statement statement = null;
static String dbName = "test"; static String dbName = "test";
...@@ -26,14 +26,29 @@ public class StatementTest extends BaseTest { ...@@ -26,14 +26,29 @@ public class StatementTest extends BaseTest {
return; return;
} }
Properties properties = new Properties(); Properties properties = new Properties();
properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8"); properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8"); properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8"); properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties); connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", properties);
statement = connection.createStatement(); statement = connection.createStatement();
statement.executeUpdate("drop database if exists " + dbName); statement.executeUpdate("drop database if exists " + dbName);
}
@Test
public void testCase() {
try {
ResultSet rs = statement.executeQuery("show databases");
ResultSetMetaData metaData = rs.getMetaData();
while (rs.next()) {
for (int i = 1; i <= metaData.getColumnCount(); i++) {
System.out.print(metaData.getColumnLabel(i) + ":" + rs.getString(i) + "\t");
}
System.out.println();
}
} catch (SQLException e) {
e.printStackTrace();
}
} }
...@@ -54,9 +69,6 @@ public class StatementTest extends BaseTest { ...@@ -54,9 +69,6 @@ public class StatementTest extends BaseTest {
@Test @Test
public void testUnsupport() { public void testUnsupport() {
// if(null == resSet) {
// return;
// }
TSDBStatement tsdbStatement = (TSDBStatement) statement; TSDBStatement tsdbStatement = (TSDBStatement) statement;
try { try {
tsdbStatement.unwrap(null); tsdbStatement.unwrap(null);
...@@ -163,11 +175,10 @@ public class StatementTest extends BaseTest { ...@@ -163,11 +175,10 @@ public class StatementTest extends BaseTest {
@AfterClass @AfterClass
public static void close() throws Exception { public static void close() throws Exception {
if (!statement.isClosed()) { if (!statement.isClosed()) {
statement.executeUpdate("drop database " + dbName); statement.executeUpdate("drop database if exists " + dbName);
statement.close(); statement.close();
connection.close(); connection.close();
Thread.sleep(10); Thread.sleep(10);
} }
} }
} }
src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDatabaseMetaDataTest.java
浏览文件 @ 789fc754
...@@ -4,10 +4,7 @@ import org.junit.Assert; ...@@ -4,10 +4,7 @@ import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.sql.Connection; import java.sql.*;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties; import java.util.Properties;
public class TSDBDatabaseMetaDataTest { public class TSDBDatabaseMetaDataTest {
...@@ -642,7 +639,15 @@ public class TSDBDatabaseMetaDataTest { ...@@ -642,7 +639,15 @@ public class TSDBDatabaseMetaDataTest {
@Test @Test
public void getTables() throws SQLException { public void getTables() throws SQLException {
Assert.assertNull(metaData.getTables("", "", "*", null)); ResultSet tables = metaData.getTables("log", "", null, null);
ResultSetMetaData metaData = tables.getMetaData();
while (tables.next()) {
System.out.print(metaData.getColumnLabel(3) + ":" + tables.getString(3) + "\t");
System.out.print(metaData.getColumnLabel(4) + ":" + tables.getString(4) + "\t");
System.out.print(metaData.getColumnLabel(5) + ":" + tables.getString(5) + "\n");
}
System.out.println();
Assert.assertNotNull(tables);
} }
@Test @Test
...@@ -652,17 +657,41 @@ public class TSDBDatabaseMetaDataTest { ...@@ -652,17 +657,41 @@ public class TSDBDatabaseMetaDataTest {
@Test @Test
public void getCatalogs() throws SQLException { public void getCatalogs() throws SQLException {
Assert.assertNotNull(metaData.getCatalogs()); ResultSet catalogs = metaData.getCatalogs();
ResultSetMetaData meta = catalogs.getMetaData();
while (catalogs.next()) {
for (int i = 1; i <= meta.getColumnCount(); i++) {
System.out.print(meta.getColumnLabel(i) + ": " + catalogs.getString(i));
}
System.out.println();
}
} }
@Test @Test
public void getTableTypes() throws SQLException { public void getTableTypes() throws SQLException {
ResultSet tableTypes = metaData.getTableTypes();
while (tableTypes.next()) {
System.out.println(tableTypes.getString("TABLE_TYPE"));
}
Assert.assertNotNull(metaData.getTableTypes()); Assert.assertNotNull(metaData.getTableTypes());
} }
@Test @Test
public void getColumns() throws SQLException { public void getColumns() throws SQLException {
Assert.assertNotNull(metaData.getColumns("", "", "", "")); ResultSet columns = metaData.getColumns("log", "", "dn", "");
ResultSetMetaData meta = columns.getMetaData();
while (columns.next()) {
System.out.print(meta.getColumnLabel(1) + ": " + columns.getString(1) + "\t");
System.out.print(meta.getColumnLabel(3) + ": " + columns.getString(3) + "\t");
System.out.print(meta.getColumnLabel(4) + ": " + columns.getString(4) + "\t");
System.out.print(meta.getColumnLabel(5) + ": " + columns.getString(5) + "\t");
System.out.print(meta.getColumnLabel(6) + ": " + columns.getString(6) + "\t");
System.out.print(meta.getColumnLabel(7) + ": " + columns.getString(7) + "\t");
System.out.print(meta.getColumnLabel(9) + ": " + columns.getString(9) + "\t");
System.out.print(meta.getColumnLabel(10) + ": " + columns.getString(10) + "\t");
System.out.print(meta.getColumnLabel(11) + ": " + columns.getString(11) + "\n");
System.out.print(meta.getColumnLabel(12) + ": " + columns.getString(12) + "\n");
}
} }
@Test @Test
...@@ -687,7 +716,15 @@ public class TSDBDatabaseMetaDataTest { ...@@ -687,7 +716,15 @@ public class TSDBDatabaseMetaDataTest {
@Test @Test
public void getPrimaryKeys() throws SQLException { public void getPrimaryKeys() throws SQLException {
Assert.assertNotNull(metaData.getPrimaryKeys("", "", "")); ResultSet rs = metaData.getPrimaryKeys("log", "", "dn1");
while (rs.next()) {
System.out.println("TABLE_NAME: " + rs.getString("TABLE_NAME"));
System.out.println("COLUMN_NAME: " + rs.getString("COLUMN_NAME"));
System.out.println("KEY_SEQ: " + rs.getString("KEY_SEQ"));
System.out.println("PK_NAME: " + rs.getString("PK_NAME"));
}
Assert.assertNotNull(rs);
} }
@Test @Test
...@@ -812,7 +849,12 @@ public class TSDBDatabaseMetaDataTest { ...@@ -812,7 +849,12 @@ public class TSDBDatabaseMetaDataTest {
@Test @Test
public void getSuperTables() throws SQLException { public void getSuperTables() throws SQLException {
Assert.assertNotNull(metaData.getSuperTables("", "", "")); ResultSet rs = metaData.getSuperTables("log", "", "dn1");
while (rs.next()) {
System.out.println("TABLE_NAME: " + rs.getString("TABLE_NAME"));
System.out.println("SUPERTABLE_NAME: " + rs.getString("SUPERTABLE_NAME"));
}
Assert.assertNotNull(rs);
} }
@Test @Test
......
src/connector/nodejs/nodetaos/cinterface.js
浏览文件 @ 789fc754
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
* @module CTaosInterface * @module CTaosInterface
*/ */
const ref = require('ref'); const ref = require('ref-napi');
const os = require('os'); const os = require('os');
const ffi = require('ffi'); const ffi = require('ffi-napi');
const ArrayType = require('ref-array'); const ArrayType = require('ref-array-napi');
const Struct = require('ref-struct'); const Struct = require('ref-struct-napi');
const FieldTypes = require('./constants'); const FieldTypes = require('./constants');
const errors = require ('./error'); const errors = require ('./error');
const TaosObjects = require('./taosobjects'); const TaosObjects = require('./taosobjects');
const { NULL_POINTER } = require('ref'); const { NULL_POINTER } = require('ref-napi');
module.exports = CTaosInterface; module.exports = CTaosInterface;
......
src/connector/nodejs/nodetaos/cursor.js
浏览文件 @ 789fc754
const ref = require('ref'); const ref = require('ref-napi');
require('./globalfunc.js') require('./globalfunc.js')
const CTaosInterface = require('./cinterface') const CTaosInterface = require('./cinterface')
const errors = require ('./error') const errors = require ('./error')
......
src/connector/nodejs/package-lock.json
浏览文件 @ 789fc754
{ {
"name": "td2.0-connector", "name": "td2.0-connector",
"version": "2.0.1", "version": "2.0.6",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
},
"ajv": {
"version": "6.10.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
"integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
"requires": {
"fast-deep-equal": "^2.0.1",
"fast-json-stable-stringify": "^2.0.0",
"json-schema-traverse": "^0.4.1",
"uri-js": "^4.2.2"
}
},
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
},
"aproba": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
},
"are-we-there-yet": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
}
},
"array-index": { "array-index": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz", "resolved": "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz",
...@@ -46,104 +11,23 @@ ...@@ -46,104 +11,23 @@
"requires": { "requires": {
"debug": "^2.2.0", "debug": "^2.2.0",
"es6-symbol": "^3.0.2" "es6-symbol": "^3.0.2"
}
}, },
"asn1": { "dependencies": {
"version": "0.2.4", "debug": {
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "version": "2.6.9",
"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"requires": { "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"safer-buffer": "~2.1.0"
}
},
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
},
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
},
"aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
},
"aws4": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
},
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
},
"bcrypt-pbkdf": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"requires": {
"tweetnacl": "^0.14.3"
}
},
"bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"requires": { "requires": {
"file-uri-to-path": "1.0.0" "ms": "2.0.0"
} }
}, },
"brace-expansion": { "ms": {
"version": "1.1.11", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
} }
},
"caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
},
"chownr": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
"integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
},
"code-point-at": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
},
"combined-stream": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
"requires": {
"delayed-stream": "~1.0.0"
} }
}, },
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"console-control-strings": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
},
"core-util-is": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
"d": { "d": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
...@@ -153,54 +37,22 @@ ...@@ -153,54 +37,22 @@
"type": "^1.0.1" "type": "^1.0.1"
} }
}, },
"dashdash": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"requires": {
"assert-plus": "^1.0.0"
}
},
"debug": { "debug": {
"version": "2.6.9", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"requires": { "requires": {
"ms": "2.0.0" "ms": "2.1.2"
} }
}, },
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
},
"delegates": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
},
"ecc-jsbn": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"requires": {
"jsbn": "~0.1.0",
"safer-buffer": "^2.1.0"
}
},
"env-paths": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
"integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA="
},
"es5-ext": { "es5-ext": {
"version": "0.10.50", "version": "0.10.53",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
"integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==", "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
"requires": { "requires": {
"es6-iterator": "~2.0.3", "es6-iterator": "~2.0.3",
"es6-symbol": "~3.1.1", "es6-symbol": "~3.1.3",
"next-tick": "^1.0.0" "next-tick": "~1.0.0"
} }
}, },
"es6-iterator": { "es6-iterator": {
...@@ -214,278 +66,104 @@ ...@@ -214,278 +66,104 @@
} }
}, },
"es6-symbol": { "es6-symbol": {
"version": "3.1.1", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
"requires": { "requires": {
"d": "1", "d": "^1.0.1",
"es5-ext": "~0.10.14" "ext": "^1.1.2"
} }
}, },
"extend": { "ext": {
"version": "3.0.2", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
},
"extsprintf": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
},
"fast-deep-equal": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
},
"fast-json-stable-stringify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
},
"ffi": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/ffi/-/ffi-2.3.0.tgz",
"integrity": "sha512-vkPA9Hf9CVuQ5HeMZykYvrZF2QNJ/iKGLkyDkisBnoOOFeFXZQhUPxBARPBIZMJVulvBI2R+jgofW03gyPpJcQ==",
"requires": { "requires": {
"bindings": "~1.2.0", "type": "^2.0.0"
"debug": "2",
"nan": "2",
"ref": "1",
"ref-struct": "1"
}, },
"dependencies": { "dependencies": {
"bindings": { "type": {
"version": "1.2.1", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
"integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE=" "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="
} }
} }
}, },
"file-uri-to-path": { "ffi-napi": {
"version": "1.0.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", "resolved": "https://registry.npmjs.org/ffi-napi/-/ffi-napi-3.1.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" "integrity": "sha512-EsHO+sP2p/nUC/3l/l8m9niee1BLm4asUFDzkkBGR4kYVgp2KqdAYUomZhkKtzim4Fq7mcYHjpUaIHsMqs+E1g==",
},
"forever-agent": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
},
"form-data": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
"requires": { "requires": {
"asynckit": "^0.4.0", "debug": "^4.1.1",
"combined-stream": "^1.0.6", "get-uv-event-loop-napi-h": "^1.0.5",
"mime-types": "^2.1.12" "node-addon-api": "^2.0.0",
} "node-gyp-build": "^4.2.1",
"ref-napi": "^2.0.1",
"ref-struct-di": "^1.1.0"
}, },
"fs-minipass": { "dependencies": {
"version": "1.2.6", "ref-napi": {
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz", "version": "2.1.2",
"integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==", "resolved": "https://registry.npmjs.org/ref-napi/-/ref-napi-2.1.2.tgz",
"requires": { "integrity": "sha512-aFl+vrIuLWUXMUTQGAwGAuSNLX3Ub5W3iVP8b7KyFFZUdn4+i4U1TXXTop0kCTUfGNu8glBGVz4lowkwMcPVVA==",
"minipass": "^2.2.1"
}
},
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"gauge": {
"version": "2.7.4",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"requires": {
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
"has-unicode": "^2.0.0",
"object-assign": "^4.1.0",
"signal-exit": "^3.0.0",
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1",
"wide-align": "^1.1.0"
}
},
"getpass": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"requires": { "requires": {
"assert-plus": "^1.0.0" "debug": "^4.1.1",
"get-symbol-from-current-process-h": "^1.0.2",
"node-addon-api": "^2.0.0",
"node-gyp-build": "^4.2.1"
} }
},
"glob": {
"version": "7.1.4",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "^3.0.4",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
} }
},
"graceful-fs": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
"integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="
},
"har-schema": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
},
"har-validator": {
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
"requires": {
"ajv": "^6.5.5",
"har-schema": "^2.0.0"
} }
}, },
"has-unicode": { "get-symbol-from-current-process-h": {
"version": "2.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "resolved": "https://registry.npmjs.org/get-symbol-from-current-process-h/-/get-symbol-from-current-process-h-1.0.2.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" "integrity": "sha512-syloC6fsCt62ELLrr1VKBM1ggOpMdetX9hTrdW77UQdcApPHLmf7CI7OKcN1c9kYuNxKcDe4iJ4FY9sX3aw2xw=="
},
"http-signature": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"requires": {
"assert-plus": "^1.0.0",
"jsprim": "^1.2.2",
"sshpk": "^1.7.0"
}
}, },
"inflight": { "get-uv-event-loop-napi-h": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "resolved": "https://registry.npmjs.org/get-uv-event-loop-napi-h/-/get-uv-event-loop-napi-h-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "integrity": "sha512-t5c9VNR84nRoF+eLiz6wFrEp1SE2Acg0wS+Ysa2zF0eROes+LzOfuTaVHxGy8AbS8rq7FHEJzjnCZo1BupwdJg==",
"requires": { "requires": {
"once": "^1.3.0", "get-symbol-from-current-process-h": "^1.0.1"
"wrappy": "1"
} }
}, },
"inherits": { "ms": {
"version": "2.0.4", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
"number-is-nan": "^1.0.0"
}
},
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
}, },
"isarray": { "next-tick": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
},
"isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
"isstream": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
},
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
},
"json-schema": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
},
"json-schema-traverse": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
},
"json-stringify-safe": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
},
"jsprim": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
"requires": {
"assert-plus": "1.0.0",
"extsprintf": "1.3.0",
"json-schema": "0.2.3",
"verror": "1.10.0"
}
},
"mime-db": {
"version": "1.40.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
},
"mime-types": {
"version": "2.1.24",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
"integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
"requires": {
"mime-db": "1.40.0"
}
},
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": {
"brace-expansion": "^1.1.7"
}
}, },
"minimist": { "node-addon-api": {
"version": "0.0.8", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="
}, },
"minipass": { "node-gyp-build": {
"version": "2.3.5", "version": "4.2.3",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz",
"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
}
}, },
"minizlib": { "ref-array-napi": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", "resolved": "https://registry.npmjs.org/ref-array-napi/-/ref-array-napi-1.2.1.tgz",
"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "integrity": "sha512-jQp2WWSucmxkqVfoNfm7yDlDeGu3liAbzqfwjNybL80ooLOCnCZpAK2woDInY+lxNOK/VlIVSqeDEYb4gVPuNQ==",
"requires": { "requires": {
"minipass": "^2.2.1" "array-index": "1",
} "debug": "2",
"ref-napi": "^1.4.2"
}, },
"mkdirp": { "dependencies": {
"version": "0.5.1", "debug": {
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "version": "2.6.9",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": { "requires": {
"minimist": "0.0.8" "ms": "2.0.0"
} }
}, },
"ms": { "ms": {
...@@ -493,352 +171,115 @@ ...@@ -493,352 +171,115 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
}, },
"nan": { "ref-napi": {
"version": "2.14.0", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", "resolved": "https://registry.npmjs.org/ref-napi/-/ref-napi-1.5.2.tgz",
"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" "integrity": "sha512-hwyNmWpUkt1bDWDW4aiwCoC+SJfJO69UIdjqssNqdaS0sYJpgqzosGg/rLtk69UoQ8drZdI9yyQefM7eEMM3Gw==",
},
"next-tick": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
},
"node-gyp": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.2.tgz",
"integrity": "sha512-sNcb5O7eJ9XiNAhWZ/UE2bWsBJn3Jb7rayMqMP4wjenlr1DwzZxUmbtmIrl04EU0p5fN2rU9WIDV+u0EbsI8oQ==",
"requires": { "requires": {
"env-paths": "^1.0.0", "debug": "^3.1.0",
"glob": "^7.0.3", "node-addon-api": "^2.0.0",
"graceful-fs": "^4.1.2", "node-gyp-build": "^4.2.1"
"mkdirp": "^0.5.0",
"nopt": "2 || 3",
"npmlog": "0 || 1 || 2 || 3 || 4",
"request": "^2.87.0",
"rimraf": "2",
"semver": "~5.3.0",
"tar": "^4.4.8",
"which": "1"
}
},
"nopt": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"requires": {
"abbrev": "1"
}
},
"npmlog": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"requires": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
"gauge": "~2.7.3",
"set-blocking": "~2.0.0"
}
},
"number-is-nan": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
}, },
"oauth-sign": { "dependencies": {
"version": "0.9.0", "debug": {
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "version": "3.2.7",
"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
}, "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"requires": { "requires": {
"wrappy": "1" "ms": "^2.1.1"
} }
}, },
"path-is-absolute": { "ms": {
"version": "1.0.1", "version": "2.1.3",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
},
"performance-now": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
},
"process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
},
"psl": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
"integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="
},
"punycode": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
},
"qs": {
"version": "6.5.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
},
"readable-stream": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"ref": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/ref/-/ref-1.3.5.tgz",
"integrity": "sha512-2cBCniTtxcGUjDpvFfVpw323a83/0RLSGJJY5l5lcomZWhYpU2cuLdsvYqMixvsdLJ9+sTdzEkju8J8ZHDM2nA==",
"requires": {
"bindings": "1",
"debug": "2",
"nan": "2"
} }
},
"ref-array": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/ref-array/-/ref-array-1.2.0.tgz",
"integrity": "sha1-u6hwFS1O4KvtFCGwYjkvCwGEKQw=",
"requires": {
"array-index": "1",
"debug": "2",
"ref": "1"
} }
},
"ref-struct": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/ref-struct/-/ref-struct-1.1.0.tgz",
"integrity": "sha1-XV7mWtQc78Olxf60BYcmHkee3BM=",
"requires": {
"debug": "2",
"ref": "1"
} }
},
"request": {
"version": "2.88.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
"requires": {
"aws-sign2": "~0.7.0",
"aws4": "^1.8.0",
"caseless": "~0.12.0",
"combined-stream": "~1.0.6",
"extend": "~3.0.2",
"forever-agent": "~0.6.1",
"form-data": "~2.3.2",
"har-validator": "~5.1.0",
"http-signature": "~1.2.0",
"is-typedarray": "~1.0.0",
"isstream": "~0.1.2",
"json-stringify-safe": "~5.0.1",
"mime-types": "~2.1.19",
"oauth-sign": "~0.9.0",
"performance-now": "^2.1.0",
"qs": "~6.5.2",
"safe-buffer": "^5.1.2",
"tough-cookie": "~2.4.3",
"tunnel-agent": "^0.6.0",
"uuid": "^3.3.2"
}
},
"rimraf": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"requires": {
"glob": "^7.1.3"
} }
}, },
"safe-buffer": { "ref-napi": {
"version": "5.1.2", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "resolved": "https://registry.npmjs.org/ref-napi/-/ref-napi-3.0.1.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-W3rcb0E+tlO9u9ySFnX5vifInwwPGToOfFgTZUHJBNiOBsW0NNvgHz2zJN7ctABo/2yIlgdPQUvuqqfORIF4LA==",
},
"safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"semver": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
},
"set-blocking": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
},
"signal-exit": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
},
"sshpk": {
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
"requires": {
"asn1": "~0.2.3",
"assert-plus": "^1.0.0",
"bcrypt-pbkdf": "^1.0.0",
"dashdash": "^1.12.0",
"ecc-jsbn": "~0.1.1",
"getpass": "^0.1.1",
"jsbn": "~0.1.0",
"safer-buffer": "^2.0.2",
"tweetnacl": "~0.14.0"
}
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": { "requires": {
"code-point-at": "^1.0.0", "debug": "^4.1.1",
"is-fullwidth-code-point": "^1.0.0", "get-symbol-from-current-process-h": "^1.0.2",
"strip-ansi": "^3.0.0" "node-addon-api": "^2.0.0",
"node-gyp-build": "^4.2.1"
} }
}, },
"string_decoder": { "ref-struct-di": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "resolved": "https://registry.npmjs.org/ref-struct-di/-/ref-struct-di-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "integrity": "sha512-2Xyn/0Qgz89VT+++WP0sTosdm9oeowLP23wRJYhG4BFdMUrLj3jhwHZNEytYNYgtPKLNTP3KJX4HEgBvM1/Y2g==",
"requires": { "requires": {
"safe-buffer": "~5.1.0" "debug": "^3.1.0"
}
}, },
"strip-ansi": { "dependencies": {
"version": "3.0.1", "debug": {
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "version": "3.2.7",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ms": "^2.1.1"
}
}
} }
}, },
"tar": { "ref-struct-napi": {
"version": "4.4.10", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", "resolved": "https://registry.npmjs.org/ref-struct-napi/-/ref-struct-napi-1.1.1.tgz",
"integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", "integrity": "sha512-YgS5/d7+kT5zgtySYI5ieH0hREdv+DabgDvoczxsui0f9VLm0rrDcWEj4DHKehsH+tJnVMsLwuyctWgvdEcVRw==",
"requires": {
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
"minipass": "^2.3.5",
"minizlib": "^1.2.1",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.2",
"yallist": "^3.0.3"
}
},
"tough-cookie": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
"requires": { "requires": {
"psl": "^1.1.24", "debug": "2",
"punycode": "^1.4.1" "ref-napi": "^1.4.2"
}, },
"dependencies": { "dependencies": {
"punycode": { "debug": {
"version": "1.4.1", "version": "2.6.9",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
}
}
},
"tunnel-agent": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"requires": { "requires": {
"safe-buffer": "^5.0.1" "ms": "2.0.0"
} }
}, },
"tweetnacl": { "ms": {
"version": "0.14.5", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"type": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/type/-/type-1.0.1.tgz",
"integrity": "sha512-MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw=="
}, },
"uri-js": { "ref-napi": {
"version": "4.2.2", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "resolved": "https://registry.npmjs.org/ref-napi/-/ref-napi-1.5.2.tgz",
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "integrity": "sha512-hwyNmWpUkt1bDWDW4aiwCoC+SJfJO69UIdjqssNqdaS0sYJpgqzosGg/rLtk69UoQ8drZdI9yyQefM7eEMM3Gw==",
"requires": { "requires": {
"punycode": "^2.1.0" "debug": "^3.1.0",
} "node-addon-api": "^2.0.0",
"node-gyp-build": "^4.2.1"
}, },
"util-deprecate": { "dependencies": {
"version": "1.0.2", "debug": {
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "version": "3.2.7",
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
}, "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"uuid": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
},
"verror": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"requires": { "requires": {
"assert-plus": "^1.0.0", "ms": "^2.1.1"
"core-util-is": "1.0.2",
"extsprintf": "^1.2.0"
} }
}, },
"which": { "ms": {
"version": "1.3.1", "version": "2.1.3",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
"requires": { }
"isexe": "^2.0.0" }
} }
},
"wide-align": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"requires": {
"string-width": "^1.0.2 || 2"
} }
}, },
"wrappy": { "type": {
"version": "1.0.2", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
},
"yallist": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
} }
} }
} }
src/connector/nodejs/package.json
浏览文件 @ 789fc754
{ {
"name": "td2.0-connector", "name": "td2.0-connector",
"version": "2.0.5", "version": "2.0.6",
"description": "A Node.js connector for TDengine.", "description": "A Node.js connector for TDengine.",
"main": "tdengine.js", "main": "tdengine.js",
"directories": {
"test": "test"
},
"scripts": { "scripts": {
"test": "node test/test.js" "test": "node test/test.js"
}, },
"repository": {
"type": "git",
"url": "git+https://github.com/taosdata/tdengine.git"
},
"keywords": [ "keywords": [
"TDengine", "TDengine",
"TAOS Data", "TAOS Data",
"Time Series Database", "Time Series Database",
"Connector" "Connector"
], ],
"author": "StoneT2000", "author": "TaosData Inc.",
"license": "AGPL-3.0", "license": "AGPL-3.0-or-later",
"dependencies": {
"ffi": "^2.3.0",
"node-gyp": "^5.0.2",
"ref": "^1.3.5",
"ref-array": "^1.2.0"
},
"homepage": "https://github.com/taosdata/tdengine",
"bugs": { "bugs": {
"url": "https://github.com/taosdata/tdengine/issues" "url": "https://github.com/taosdata/tdengine/issues"
}, },
"repository": { "homepage": "https://github.com/taosdata/tdengine#readme",
"type": "git", "dependencies": {
"url": "https://github.com/taosdata/tdengine.git" "ffi-napi": "^3.1.0",
"ref-array-napi": "^1.2.1",
"ref-napi": "^1.5.2",
"ref-struct-napi": "^1.1.1"
} }
} }
src/inc/ttokendef.h
浏览文件 @ 789fc754
...@@ -82,151 +82,154 @@ ...@@ -82,151 +82,154 @@
#define TK_STABLES 64 #define TK_STABLES 64
#define TK_VGROUPS 65 #define TK_VGROUPS 65
#define TK_DROP 66 #define TK_DROP 66
#define TK_DNODE 67 #define TK_STABLE 67
#define TK_USER 68 #define TK_DNODE 68
#define TK_ACCOUNT 69 #define TK_USER 69
#define TK_USE 70 #define TK_ACCOUNT 70
#define TK_DESCRIBE 71 #define TK_USE 71
#define TK_ALTER 72 #define TK_DESCRIBE 72
#define TK_PASS 73 #define TK_ALTER 73
#define TK_PRIVILEGE 74 #define TK_PASS 74
#define TK_LOCAL 75 #define TK_PRIVILEGE 75
#define TK_IF 76 #define TK_LOCAL 76
#define TK_EXISTS 77 #define TK_IF 77
#define TK_PPS 78 #define TK_EXISTS 78
#define TK_TSERIES 79 #define TK_PPS 79
#define TK_DBS 80 #define TK_TSERIES 80
#define TK_STORAGE 81 #define TK_DBS 81
#define TK_QTIME 82 #define TK_STORAGE 82
#define TK_CONNS 83 #define TK_QTIME 83
#define TK_STATE 84 #define TK_CONNS 84
#define TK_KEEP 85 #define TK_STATE 85
#define TK_CACHE 86 #define TK_KEEP 86
#define TK_REPLICA 87 #define TK_CACHE 87
#define TK_QUORUM 88 #define TK_REPLICA 88
#define TK_DAYS 89 #define TK_QUORUM 89
#define TK_MINROWS 90 #define TK_DAYS 90
#define TK_MAXROWS 91 #define TK_MINROWS 91
#define TK_BLOCKS 92 #define TK_MAXROWS 92
#define TK_CTIME 93 #define TK_BLOCKS 93
#define TK_WAL 94 #define TK_CTIME 94
#define TK_FSYNC 95 #define TK_WAL 95
#define TK_COMP 96 #define TK_FSYNC 96
#define TK_PRECISION 97 #define TK_COMP 97
#define TK_UPDATE 98 #define TK_PRECISION 98
#define TK_CACHELAST 99 #define TK_UPDATE 99
#define TK_LP 100 #define TK_CACHELAST 100
#define TK_RP 101 #define TK_LP 101
#define TK_UNSIGNED 102 #define TK_RP 102
#define TK_TAGS 103 #define TK_UNSIGNED 103
#define TK_USING 104 #define TK_TAGS 104
#define TK_AS 105 #define TK_USING 105
#define TK_COMMA 106 #define TK_AS 106
#define TK_NULL 107 #define TK_COMMA 107
#define TK_SELECT 108 #define TK_NULL 108
#define TK_UNION 109 #define TK_SELECT 109
#define TK_ALL 110 #define TK_UNION 110
#define TK_FROM 111 #define TK_ALL 111
#define TK_VARIABLE 112 #define TK_FROM 112
#define TK_INTERVAL 113 #define TK_VARIABLE 113
#define TK_FILL 114 #define TK_INTERVAL 114
#define TK_SLIDING 115 #define TK_FILL 115
#define TK_ORDER 116 #define TK_SLIDING 116
#define TK_BY 117 #define TK_ORDER 117
#define TK_ASC 118 #define TK_BY 118
#define TK_DESC 119 #define TK_ASC 119
#define TK_GROUP 120 #define TK_DESC 120
#define TK_HAVING 121 #define TK_GROUP 121
#define TK_LIMIT 122 #define TK_HAVING 122
#define TK_OFFSET 123 #define TK_LIMIT 123
#define TK_SLIMIT 124 #define TK_OFFSET 124
#define TK_SOFFSET 125 #define TK_SLIMIT 125
#define TK_WHERE 126 #define TK_SOFFSET 126
#define TK_NOW 127 #define TK_WHERE 127
#define TK_RESET 128 #define TK_NOW 128
#define TK_QUERY 129 #define TK_RESET 129
#define TK_ADD 130 #define TK_QUERY 130
#define TK_COLUMN 131 #define TK_ADD 131
#define TK_TAG 132 #define TK_COLUMN 132
#define TK_CHANGE 133 #define TK_TAG 133
#define TK_SET 134 #define TK_CHANGE 134
#define TK_KILL 135 #define TK_SET 135
#define TK_CONNECTION 136 #define TK_KILL 136
#define TK_STREAM 137 #define TK_CONNECTION 137
#define TK_COLON 138 #define TK_STREAM 138
#define TK_ABORT 139 #define TK_COLON 139
#define TK_AFTER 140 #define TK_ABORT 140
#define TK_ATTACH 141 #define TK_AFTER 141
#define TK_BEFORE 142 #define TK_ATTACH 142
#define TK_BEGIN 143 #define TK_BEFORE 143
#define TK_CASCADE 144 #define TK_BEGIN 144
#define TK_CLUSTER 145 #define TK_CASCADE 145
#define TK_CONFLICT 146 #define TK_CLUSTER 146
#define TK_COPY 147 #define TK_CONFLICT 147
#define TK_DEFERRED 148 #define TK_COPY 148
#define TK_DELIMITERS 149 #define TK_DEFERRED 149
#define TK_DETACH 150 #define TK_DELIMITERS 150
#define TK_EACH 151 #define TK_DETACH 151
#define TK_END 152 #define TK_EACH 152
#define TK_EXPLAIN 153 #define TK_END 153
#define TK_FAIL 154 #define TK_EXPLAIN 154
#define TK_FOR 155 #define TK_FAIL 155
#define TK_IGNORE 156 #define TK_FOR 156
#define TK_IMMEDIATE 157 #define TK_IGNORE 157
#define TK_INITIALLY 158 #define TK_IMMEDIATE 158
#define TK_INSTEAD 159 #define TK_INITIALLY 159
#define TK_MATCH 160 #define TK_INSTEAD 160
#define TK_KEY 161 #define TK_MATCH 161
#define TK_OF 162 #define TK_KEY 162
#define TK_RAISE 163 #define TK_OF 163
#define TK_REPLACE 164 #define TK_RAISE 164
#define TK_RESTRICT 165 #define TK_REPLACE 165
#define TK_ROW 166 #define TK_RESTRICT 166
#define TK_STATEMENT 167 #define TK_ROW 167
#define TK_TRIGGER 168 #define TK_STATEMENT 168
#define TK_VIEW 169 #define TK_TRIGGER 169
#define TK_COUNT 170 #define TK_VIEW 170
#define TK_SUM 171 #define TK_COUNT 171
#define TK_AVG 172 #define TK_SUM 172
#define TK_MIN 173 #define TK_AVG 173
#define TK_MAX 174 #define TK_MIN 174
#define TK_FIRST 175 #define TK_MAX 175
#define TK_LAST 176 #define TK_FIRST 176
#define TK_TOP 177 #define TK_LAST 177
#define TK_BOTTOM 178 #define TK_TOP 178
#define TK_STDDEV 179 #define TK_BOTTOM 179
#define TK_PERCENTILE 180 #define TK_STDDEV 180
#define TK_APERCENTILE 181 #define TK_PERCENTILE 181
#define TK_LEASTSQUARES 182 #define TK_APERCENTILE 182
#define TK_HISTOGRAM 183 #define TK_LEASTSQUARES 183
#define TK_DIFF 184 #define TK_HISTOGRAM 184
#define TK_SPREAD 185 #define TK_DIFF 185
#define TK_TWA 186 #define TK_SPREAD 186
#define TK_INTERP 187 #define TK_TWA 187
#define TK_LAST_ROW 188 #define TK_INTERP 188
#define TK_RATE 189 #define TK_LAST_ROW 189
#define TK_IRATE 190 #define TK_RATE 190
#define TK_SUM_RATE 191 #define TK_IRATE 191
#define TK_SUM_IRATE 192 #define TK_SUM_RATE 192
#define TK_AVG_RATE 193 #define TK_SUM_IRATE 193
#define TK_AVG_IRATE 194 #define TK_AVG_RATE 194
#define TK_TBID 195 #define TK_AVG_IRATE 195
#define TK_SEMI 196 #define TK_TBID 196
#define TK_NONE 197 #define TK_SEMI 197
#define TK_PREV 198 #define TK_NONE 198
#define TK_LINEAR 199 #define TK_PREV 199
#define TK_IMPORT 200 #define TK_LINEAR 200
#define TK_METRIC 201 #define TK_IMPORT 201
#define TK_TBNAME 202 #define TK_METRIC 202
#define TK_JOIN 203 #define TK_TBNAME 203
#define TK_METRICS 204 #define TK_JOIN 204
#define TK_STABLE 205 #define TK_METRICS 205
#define TK_INSERT 206 #define TK_INSERT 206
#define TK_INTO 207 #define TK_INTO 207
#define TK_VALUES 208 #define TK_VALUES 208
#define TK_SPACE 300 #define TK_SPACE 300
#define TK_COMMENT 301 #define TK_COMMENT 301
#define TK_ILLEGAL 302 #define TK_ILLEGAL 302
......
src/mnode/src/mnodeProfile.c
浏览文件 @ 789fc754
...@@ -385,12 +385,22 @@ static int32_t mnodeRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, v ...@@ -385,12 +385,22 @@ static int32_t mnodeRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, v
SConnObj *pConnObj = NULL; SConnObj *pConnObj = NULL;
int32_t cols = 0; int32_t cols = 0;
char * pWrite; char * pWrite;
void * pIter;
char str[TSDB_IPv4ADDR_LEN + 6] = {0}; char str[TSDB_IPv4ADDR_LEN + 6] = {0};
while (numOfRows < rows) { while (numOfRows < rows) {
pShow->pIter = mnodeGetNextConn(pShow->pIter, &pConnObj); pIter = mnodeGetNextConn(pShow->pIter, &pConnObj);
if (pConnObj == NULL) break; if (pConnObj == NULL) {
pShow->pIter = pIter;
break;
}
if (numOfRows + pConnObj->numOfQueries >= rows) {
mnodeCancelGetNextConn(pIter);
break;
}
pShow->pIter = pIter;
for (int32_t i = 0; i < pConnObj->numOfQueries; ++i) { for (int32_t i = 0; i < pConnObj->numOfQueries; ++i) {
SQueryDesc *pDesc = pConnObj->pQueries + i; SQueryDesc *pDesc = pConnObj->pQueries + i;
cols = 0; cols = 0;
...@@ -518,12 +528,22 @@ static int32_t mnodeRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, v ...@@ -518,12 +528,22 @@ static int32_t mnodeRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, v
SConnObj *pConnObj = NULL; SConnObj *pConnObj = NULL;
int32_t cols = 0; int32_t cols = 0;
char * pWrite; char * pWrite;
void * pIter;
char ipStr[TSDB_IPv4ADDR_LEN + 6]; char ipStr[TSDB_IPv4ADDR_LEN + 6];
while (numOfRows < rows) { while (numOfRows < rows) {
pShow->pIter = mnodeGetNextConn(pShow->pIter, &pConnObj); pIter = mnodeGetNextConn(pShow->pIter, &pConnObj);
if (pConnObj == NULL) break; if (pConnObj == NULL) {
pShow->pIter = pIter;
break;
}
if (numOfRows + pConnObj->numOfStreams >= rows) {
mnodeCancelGetNextConn(pIter);
break;
}
pShow->pIter = pIter;
for (int32_t i = 0; i < pConnObj->numOfStreams; ++i) { for (int32_t i = 0; i < pConnObj->numOfStreams; ++i) {
SStreamDesc *pDesc = pConnObj->pStreams + i; SStreamDesc *pDesc = pConnObj->pStreams + i;
cols = 0; cols = 0;
......
src/os/src/detail/osTime.c
浏览文件 @ 789fc754
...@@ -504,13 +504,13 @@ int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precisio ...@@ -504,13 +504,13 @@ int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precisio
int64_t end = 0; int64_t end = 0;
// not enough time range // not enough time range
if (INT64_MAX - start > pInterval->interval - 1) { if (start < 0 || INT64_MAX - start > pInterval->interval - 1) {
end = start + pInterval->interval - 1; end = start + pInterval->interval - 1;
while(end < t && ((start + pInterval->sliding) <= INT64_MAX)) { // move forward to the correct time window while(end < t && ((start + pInterval->sliding) <= INT64_MAX)) { // move forward to the correct time window
start += pInterval->sliding; start += pInterval->sliding;
if (INT64_MAX - start > pInterval->interval - 1) { if (start < 0 || INT64_MAX - start > pInterval->interval - 1) {
end = start + pInterval->interval - 1; end = start + pInterval->interval - 1;
} else { } else {
end = INT64_MAX; end = INT64_MAX;
......
src/query/inc/qSqlparser.h
浏览文件 @ 789fc754
...@@ -98,6 +98,7 @@ typedef struct SCreateTableSQL { ...@@ -98,6 +98,7 @@ typedef struct SCreateTableSQL {
typedef struct SAlterTableSQL { typedef struct SAlterTableSQL {
SStrToken name; SStrToken name;
int16_t tableType;
int16_t type; int16_t type;
STagData tagData; STagData tagData;
SArray *pAddColumns; // SArray<TAOS_FIELD> SArray *pAddColumns; // SArray<TAOS_FIELD>
...@@ -156,6 +157,7 @@ typedef struct tDCLSQL { ...@@ -156,6 +157,7 @@ typedef struct tDCLSQL {
int32_t nAlloc; /* Number of entries allocated below */ int32_t nAlloc; /* Number of entries allocated below */
SStrToken *a; /* one entry for element */ SStrToken *a; /* one entry for element */
bool existsCheck; bool existsCheck;
int16_t tableType;
union { union {
SCreateDBInfo dbOpt; SCreateDBInfo dbOpt;
...@@ -250,7 +252,7 @@ SCreateTableSQL *tSetCreateSqlElems(SArray *pCols, SArray *pTags, SQuerySQL *pSe ...@@ -250,7 +252,7 @@ SCreateTableSQL *tSetCreateSqlElems(SArray *pCols, SArray *pTags, SQuerySQL *pSe
void tSqlExprNodeDestroy(tSQLExpr *pExpr); void tSqlExprNodeDestroy(tSQLExpr *pExpr);
SAlterTableSQL * tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type); SAlterTableSQL * tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type, int16_t tableTable);
SCreatedTableInfo createNewChildTableInfo(SStrToken *pTableName, SArray *pTagVals, SStrToken *pToken, SStrToken* igExists); SCreatedTableInfo createNewChildTableInfo(SStrToken *pTableName, SArray *pTagVals, SStrToken *pToken, SStrToken* igExists);
void destroyAllSelectClause(SSubclauseInfo *pSql); void destroyAllSelectClause(SSubclauseInfo *pSql);
...@@ -267,7 +269,7 @@ void setCreatedTableName(SSqlInfo *pInfo, SStrToken *pTableNameToken, SStrToken ...@@ -267,7 +269,7 @@ void setCreatedTableName(SSqlInfo *pInfo, SStrToken *pTableNameToken, SStrToken
void SqlInfoDestroy(SSqlInfo *pInfo); void SqlInfoDestroy(SSqlInfo *pInfo);
void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParams, ...); void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParams, ...);
void setDropDbTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck); void setDropDbTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck,int16_t tableType);
void setShowOptions(SSqlInfo *pInfo, int32_t type, SStrToken* prefix, SStrToken* pPatterns); void setShowOptions(SSqlInfo *pInfo, int32_t type, SStrToken* prefix, SStrToken* pPatterns);
tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SStrToken *pToken); tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SStrToken *pToken);
......
src/query/inc/sql.y
浏览文件 @ 789fc754
...@@ -131,10 +131,16 @@ cmd ::= SHOW dbPrefix(X) VGROUPS ids(Y). { ...@@ -131,10 +131,16 @@ cmd ::= SHOW dbPrefix(X) VGROUPS ids(Y). {
//drop configure for tables //drop configure for tables
cmd ::= DROP TABLE ifexists(Y) ids(X) cpxName(Z). { cmd ::= DROP TABLE ifexists(Y) ids(X) cpxName(Z). {
X.n += Z.n; X.n += Z.n;
setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &X, &Y); setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &X, &Y, -1);
} }
cmd ::= DROP DATABASE ifexists(Y) ids(X). { setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &X, &Y); } //drop stable
cmd ::= DROP STABLE ifexists(Y) ids(X) cpxName(Z). {
X.n += Z.n;
setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &X, &Y, TSDB_SUPER_TABLE);
}
cmd ::= DROP DATABASE ifexists(Y) ids(X). { setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &X, &Y, -1); }
cmd ::= DROP DNODE ids(X). { setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &X); } cmd ::= DROP DNODE ids(X). { setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &X); }
cmd ::= DROP USER ids(X). { setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &X); } cmd ::= DROP USER ids(X). { setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &X); }
cmd ::= DROP ACCOUNT ids(X). { setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &X); } cmd ::= DROP ACCOUNT ids(X). { setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &X); }
...@@ -305,6 +311,8 @@ signed(A) ::= MINUS INTEGER(X). { A = -strtol(X.z, NULL, 10);} ...@@ -305,6 +311,8 @@ signed(A) ::= MINUS INTEGER(X). { A = -strtol(X.z, NULL, 10);}
////////////////////////////////// The CREATE TABLE statement /////////////////////////////// ////////////////////////////////// The CREATE TABLE statement ///////////////////////////////
cmd ::= CREATE TABLE create_table_args. {} cmd ::= CREATE TABLE create_table_args. {}
cmd ::= CREATE TABLE create_stable_args. {}
cmd ::= CREATE STABLE create_stable_args. {}
cmd ::= CREATE TABLE create_table_list(Z). { pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = Z;} cmd ::= CREATE TABLE create_table_list(Z). { pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = Z;}
%type create_table_list{SCreateTableSQL*} %type create_table_list{SCreateTableSQL*}
...@@ -333,7 +341,8 @@ create_table_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) LP columnlist(X) RP. { ...@@ -333,7 +341,8 @@ create_table_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) LP columnlist(X) RP. {
} }
// create super table // create super table
create_table_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) LP columnlist(X) RP TAGS LP columnlist(Y) RP. { %type create_stable_args{SCreateTableSQL*}
create_stable_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) LP columnlist(X) RP TAGS LP columnlist(Y) RP. {
A = tSetCreateSqlElems(X, Y, NULL, TSQL_CREATE_STABLE); A = tSetCreateSqlElems(X, Y, NULL, TSQL_CREATE_STABLE);
setSqlInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE); setSqlInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
...@@ -683,7 +692,7 @@ cmd ::= RESET QUERY CACHE. { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} ...@@ -683,7 +692,7 @@ cmd ::= RESET QUERY CACHE. { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
///////////////////////////////////ALTER TABLE statement////////////////////////////////// ///////////////////////////////////ALTER TABLE statement//////////////////////////////////
cmd ::= ALTER TABLE ids(X) cpxName(F) ADD COLUMN columnlist(A). { cmd ::= ALTER TABLE ids(X) cpxName(F) ADD COLUMN columnlist(A). {
X.n += F.n; X.n += F.n;
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
...@@ -693,14 +702,14 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) DROP COLUMN ids(A). { ...@@ -693,14 +702,14 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) DROP COLUMN ids(A). {
toTSDBType(A.type); toTSDBType(A.type);
SArray* K = tVariantListAppendToken(NULL, &A, -1); SArray* K = tVariantListAppendToken(NULL, &A, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
//////////////////////////////////ALTER TAGS statement///////////////////////////////////// //////////////////////////////////ALTER TAGS statement/////////////////////////////////////
cmd ::= ALTER TABLE ids(X) cpxName(Y) ADD TAG columnlist(A). { cmd ::= ALTER TABLE ids(X) cpxName(Y) ADD TAG columnlist(A). {
X.n += Y.n; X.n += Y.n;
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y). { cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y). {
...@@ -709,7 +718,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y). { ...@@ -709,7 +718,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y). {
toTSDBType(Y.type); toTSDBType(Y.type);
SArray* A = tVariantListAppendToken(NULL, &Y, -1); SArray* A = tVariantListAppendToken(NULL, &Y, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
...@@ -722,7 +731,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). { ...@@ -722,7 +731,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
toTSDBType(Z.type); toTSDBType(Z.type);
A = tVariantListAppendToken(A, &Z, -1); A = tVariantListAppendToken(A, &Z, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
...@@ -733,7 +742,54 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z). { ...@@ -733,7 +742,54 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z). {
SArray* A = tVariantListAppendToken(NULL, &Y, -1); SArray* A = tVariantListAppendToken(NULL, &Y, -1);
A = tVariantListAppend(A, &Z, -1); A = tVariantListAppend(A, &Z, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
///////////////////////////////////ALTER STABLE statement//////////////////////////////////
cmd ::= ALTER STABLE ids(X) cpxName(F) ADD COLUMN columnlist(A). {
X.n += F.n;
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
cmd ::= ALTER STABLE ids(X) cpxName(F) DROP COLUMN ids(A). {
X.n += F.n;
toTSDBType(A.type);
SArray* K = tVariantListAppendToken(NULL, &A, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
//////////////////////////////////ALTER TAGS statement/////////////////////////////////////
cmd ::= ALTER STABLE ids(X) cpxName(Y) ADD TAG columnlist(A). {
X.n += Y.n;
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
cmd ::= ALTER STABLE ids(X) cpxName(Z) DROP TAG ids(Y). {
X.n += Z.n;
toTSDBType(Y.type);
SArray* A = tVariantListAppendToken(NULL, &Y, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
cmd ::= ALTER STABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
X.n += F.n;
toTSDBType(Y.type);
SArray* A = tVariantListAppendToken(NULL, &Y, -1);
toTSDBType(Z.type);
A = tVariantListAppendToken(A, &Z, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
......
src/query/src/qParserImpl.c
浏览文件 @ 789fc754
...@@ -585,11 +585,12 @@ SCreatedTableInfo createNewChildTableInfo(SStrToken *pTableName, SArray *pTagVal ...@@ -585,11 +585,12 @@ SCreatedTableInfo createNewChildTableInfo(SStrToken *pTableName, SArray *pTagVal
return info; return info;
} }
SAlterTableSQL *tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type) { SAlterTableSQL *tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type, int16_t tableType) {
SAlterTableSQL *pAlterTable = calloc(1, sizeof(SAlterTableSQL)); SAlterTableSQL *pAlterTable = calloc(1, sizeof(SAlterTableSQL));
pAlterTable->name = *pTableName; pAlterTable->name = *pTableName;
pAlterTable->type = type; pAlterTable->type = type;
pAlterTable->tableType = tableType;
if (type == TSDB_ALTER_TABLE_ADD_COLUMN || type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN) { if (type == TSDB_ALTER_TABLE_ADD_COLUMN || type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN) {
pAlterTable->pAddColumns = pCols; pAlterTable->pAddColumns = pCols;
...@@ -733,9 +734,10 @@ void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParam, ...) { ...@@ -733,9 +734,10 @@ void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParam, ...) {
va_end(va); va_end(va);
} }
void setDropDbTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck) { void setDropDbTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck, int16_t tableType) {
pInfo->type = type; pInfo->type = type;
pInfo->pDCLInfo = tTokenListAppend(pInfo->pDCLInfo, pToken); pInfo->pDCLInfo = tTokenListAppend(pInfo->pDCLInfo, pToken);
pInfo->pDCLInfo->tableType = tableType;
pInfo->pDCLInfo->existsCheck = (existsCheck->n == 1); pInfo->pDCLInfo->existsCheck = (existsCheck->n == 1);
} }
......
src/query/src/sql.c
浏览文件 @ 789fc754
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
** input grammar file: ** input grammar file:
*/ */
#include <stdio.h> #include <stdio.h>
#include <assert.h>
/************ Begin %include sections from the grammar ************************/ /************ Begin %include sections from the grammar ************************/
#include <stdio.h> #include <stdio.h>
...@@ -76,8 +77,10 @@ ...@@ -76,8 +77,10 @@
** zero the stack is dynamically sized using realloc() ** zero the stack is dynamically sized using realloc()
** ParseARG_SDECL A static variable declaration for the %extra_argument ** ParseARG_SDECL A static variable declaration for the %extra_argument
** ParseARG_PDECL A parameter declaration for the %extra_argument ** ParseARG_PDECL A parameter declaration for the %extra_argument
** ParseARG_PARAM Code to pass %extra_argument as a subroutine parameter
** ParseARG_STORE Code to store %extra_argument into yypParser ** ParseARG_STORE Code to store %extra_argument into yypParser
** ParseARG_FETCH Code to extract %extra_argument from yypParser ** ParseARG_FETCH Code to extract %extra_argument from yypParser
** ParseCTX_* As ParseARG_ except for %extra_context
** YYERRORSYMBOL is the code number of the error symbol. If not ** YYERRORSYMBOL is the code number of the error symbol. If not
** defined, then do no error processing. ** defined, then do no error processing.
** YYNSTATE the combined number of states. ** YYNSTATE the combined number of states.
...@@ -97,7 +100,7 @@ ...@@ -97,7 +100,7 @@
#endif #endif
/************* Begin control #defines *****************************************/ /************* Begin control #defines *****************************************/
#define YYCODETYPE unsigned short int #define YYCODETYPE unsigned short int
#define YYNOCODE 279 #define YYNOCODE 278
#define YYACTIONTYPE unsigned short int #define YYACTIONTYPE unsigned short int
#define ParseTOKENTYPE SStrToken #define ParseTOKENTYPE SStrToken
typedef union { typedef union {
...@@ -124,21 +127,29 @@ typedef union { ...@@ -124,21 +127,29 @@ typedef union {
#endif #endif
#define ParseARG_SDECL SSqlInfo* pInfo; #define ParseARG_SDECL SSqlInfo* pInfo;
#define ParseARG_PDECL ,SSqlInfo* pInfo #define ParseARG_PDECL ,SSqlInfo* pInfo
#define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_PARAM ,pInfo
#define ParseARG_STORE yypParser->pInfo = pInfo #define ParseARG_FETCH SSqlInfo* pInfo=yypParser->pInfo;
#define ParseARG_STORE yypParser->pInfo=pInfo;
#define ParseCTX_SDECL
#define ParseCTX_PDECL
#define ParseCTX_PARAM
#define ParseCTX_FETCH
#define ParseCTX_STORE
#define YYFALLBACK 1 #define YYFALLBACK 1
#define YYNSTATE 258 #define YYNSTATE 282
#define YYNRULE 240 #define YYNRULE 248
#define YYNRULE_WITH_ACTION 248
#define YYNTOKEN 209 #define YYNTOKEN 209
#define YY_MAX_SHIFT 257 #define YY_MAX_SHIFT 281
#define YY_MIN_SHIFTREDUCE 431 #define YY_MIN_SHIFTREDUCE 461
#define YY_MAX_SHIFTREDUCE 670 #define YY_MAX_SHIFTREDUCE 708
#define YY_ERROR_ACTION 671 #define YY_ERROR_ACTION 709
#define YY_ACCEPT_ACTION 672 #define YY_ACCEPT_ACTION 710
#define YY_NO_ACTION 673 #define YY_NO_ACTION 711
#define YY_MIN_REDUCE 674 #define YY_MIN_REDUCE 712
#define YY_MAX_REDUCE 913 #define YY_MAX_REDUCE 959
/************* End control #defines *******************************************/ /************* End control #defines *******************************************/
#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
/* Define the yytestcase() macro to be a no-op if is not already defined /* Define the yytestcase() macro to be a no-op if is not already defined
** otherwise. ** otherwise.
...@@ -203,132 +214,136 @@ typedef union { ...@@ -203,132 +214,136 @@ typedef union {
** yy_default[] Default action for each state. ** yy_default[] Default action for each state.
** **
*********** Begin parsing tables **********************************************/ *********** Begin parsing tables **********************************************/
#define YY_ACTTAB_COUNT (586) #define YY_ACTTAB_COUNT (623)
static const YYACTIONTYPE yy_action[] = { static const YYACTIONTYPE yy_action[] = {
/* 0 */ 143, 474, 143, 23, 672, 257, 165, 547, 827, 475, /* 0 */ 158, 505, 158, 710, 281, 857, 659, 578, 182, 506,
/* 10 */ 900, 168, 901, 37, 38, 12, 39, 40, 816, 23, /* 10 */ 941, 185, 942, 41, 42, 15, 43, 44, 26, 179,
/* 20 */ 173, 31, 474, 474, 210, 43, 41, 45, 42, 805, /* 20 */ 190, 35, 505, 505, 231, 47, 45, 49, 46, 868,
/* 30 */ 475, 475, 163, 36, 35, 232, 231, 34, 33, 32, /* 30 */ 506, 506, 846, 40, 39, 256, 255, 38, 37, 36,
/* 40 */ 37, 38, 801, 39, 40, 816, 110, 173, 31, 162, /* 40 */ 41, 42, 660, 43, 44, 857, 951, 190, 35, 178,
/* 50 */ 255, 210, 43, 41, 45, 42, 176, 66, 802, 195, /* 50 */ 279, 231, 47, 45, 49, 46, 180, 195, 843, 214,
/* 60 */ 36, 35, 178, 824, 34, 33, 32, 432, 433, 434, /* 60 */ 40, 39, 157, 61, 38, 37, 36, 462, 463, 464,
/* 70 */ 435, 436, 437, 438, 439, 440, 441, 442, 443, 256, /* 70 */ 465, 466, 467, 468, 469, 470, 471, 472, 473, 280,
/* 80 */ 179, 225, 185, 37, 38, 805, 39, 40, 796, 242, /* 80 */ 198, 846, 204, 41, 42, 865, 43, 44, 246, 266,
/* 90 */ 173, 31, 143, 180, 210, 43, 41, 45, 42, 110, /* 90 */ 190, 35, 158, 834, 231, 47, 45, 49, 46, 122,
/* 100 */ 110, 167, 901, 36, 35, 57, 853, 34, 33, 32, /* 100 */ 122, 184, 942, 40, 39, 122, 62, 38, 37, 36,
/* 110 */ 17, 223, 250, 249, 222, 221, 220, 248, 219, 247, /* 110 */ 20, 244, 274, 273, 243, 242, 241, 272, 240, 271,
/* 120 */ 246, 245, 218, 244, 243, 803, 142, 774, 624, 762, /* 120 */ 270, 269, 239, 268, 267, 38, 37, 36, 813, 657,
/* 130 */ 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, /* 130 */ 801, 802, 803, 804, 805, 806, 807, 808, 809, 810,
/* 140 */ 773, 775, 776, 38, 181, 39, 40, 229, 228, 173, /* 140 */ 811, 812, 814, 815, 42, 200, 43, 44, 253, 252,
/* 150 */ 31, 605, 606, 210, 43, 41, 45, 42, 207, 854, /* 150 */ 190, 35, 835, 275, 231, 47, 45, 49, 46, 228,
/* 160 */ 61, 205, 36, 35, 23, 110, 34, 33, 32, 188, /* 160 */ 895, 66, 226, 40, 39, 115, 894, 38, 37, 36,
/* 170 */ 39, 40, 23, 251, 173, 31, 192, 191, 210, 43, /* 170 */ 26, 43, 44, 32, 26, 190, 35, 846, 207, 231,
/* 180 */ 41, 45, 42, 34, 33, 32, 105, 36, 35, 104, /* 180 */ 47, 45, 49, 46, 26, 211, 210, 162, 40, 39,
/* 190 */ 147, 34, 33, 32, 172, 637, 805, 28, 628, 897, /* 190 */ 196, 845, 38, 37, 36, 189, 670, 117, 938, 661,
/* 200 */ 631, 177, 634, 802, 172, 637, 896, 13, 628, 230, /* 200 */ 71, 664, 26, 667, 122, 189, 670, 188, 193, 661,
/* 210 */ 631, 802, 634, 18, 172, 637, 794, 895, 628, 63, /* 210 */ 843, 664, 194, 667, 843, 189, 670, 16, 21, 661,
/* 220 */ 631, 28, 634, 155, 574, 62, 169, 170, 23, 156, /* 220 */ 90, 664, 249, 667, 843, 266, 32, 186, 187, 246,
/* 230 */ 209, 29, 197, 92, 91, 150, 169, 170, 77, 76, /* 230 */ 26, 230, 837, 166, 278, 277, 109, 186, 187, 167,
/* 240 */ 582, 17, 198, 250, 249, 159, 169, 170, 248, 626, /* 240 */ 250, 615, 843, 199, 102, 101, 165, 186, 187, 4,
/* 250 */ 247, 246, 245, 715, 244, 243, 133, 211, 780, 80, /* 250 */ 20, 26, 274, 273, 219, 197, 26, 272, 248, 271,
/* 260 */ 160, 778, 779, 18, 242, 234, 781, 802, 783, 784, /* 260 */ 270, 269, 10, 268, 267, 67, 70, 132, 254, 819,
/* 270 */ 782, 28, 785, 786, 43, 41, 45, 42, 724, 579, /* 270 */ 843, 217, 817, 818, 21, 844, 27, 820, 905, 822,
/* 280 */ 64, 133, 36, 35, 19, 627, 34, 33, 32, 3, /* 280 */ 823, 821, 32, 824, 825, 47, 45, 49, 46, 258,
/* 290 */ 124, 194, 225, 44, 910, 72, 68, 71, 158, 11, /* 290 */ 663, 843, 666, 40, 39, 48, 842, 38, 37, 36,
/* 300 */ 10, 566, 592, 44, 563, 636, 564, 107, 565, 793, /* 300 */ 754, 232, 213, 146, 69, 48, 904, 669, 763, 173,
/* 310 */ 22, 795, 630, 44, 633, 636, 716, 36, 35, 133, /* 310 */ 755, 146, 68, 146, 662, 48, 665, 669, 599, 638,
/* 320 */ 635, 34, 33, 32, 171, 636, 596, 49, 78, 82, /* 320 */ 639, 596, 668, 597, 33, 598, 612, 669, 603, 607,
/* 330 */ 635, 48, 182, 183, 87, 90, 81, 137, 135, 629, /* 330 */ 604, 22, 668, 832, 833, 25, 836, 216, 625, 88,
/* 340 */ 635, 632, 84, 95, 94, 93, 50, 9, 145, 640, /* 340 */ 92, 937, 668, 119, 936, 82, 97, 100, 91, 201,
/* 350 */ 52, 65, 120, 254, 253, 98, 597, 656, 638, 555, /* 350 */ 202, 191, 588, 629, 94, 3, 136, 27, 52, 152,
/* 360 */ 146, 15, 14, 14, 24, 4, 55, 53, 546, 213, /* 360 */ 148, 29, 77, 73, 76, 150, 105, 104, 103, 40,
/* 370 */ 556, 570, 148, 571, 24, 48, 568, 149, 569, 89, /* 370 */ 39, 630, 689, 38, 37, 36, 18, 17, 671, 53,
/* 380 */ 88, 103, 101, 153, 154, 152, 141, 151, 144, 804, /* 380 */ 56, 174, 234, 17, 589, 81, 80, 27, 175, 52,
/* 390 */ 864, 863, 818, 174, 860, 859, 175, 233, 826, 846, /* 390 */ 12, 11, 99, 98, 673, 87, 86, 57, 54, 160,
/* 400 */ 831, 833, 106, 121, 845, 122, 567, 119, 123, 726, /* 400 */ 59, 161, 577, 14, 13, 163, 601, 164, 602, 114,
/* 410 */ 217, 139, 26, 226, 102, 723, 28, 227, 909, 74, /* 410 */ 112, 170, 171, 901, 169, 900, 156, 168, 159, 192,
/* 420 */ 908, 906, 125, 744, 27, 25, 196, 140, 713, 591, /* 420 */ 257, 116, 867, 859, 600, 872, 32, 874, 118, 133,
/* 430 */ 83, 711, 85, 86, 199, 709, 708, 184, 54, 134, /* 430 */ 887, 886, 131, 134, 135, 765, 238, 154, 30, 215,
/* 440 */ 706, 164, 705, 704, 703, 702, 136, 700, 698, 696, /* 440 */ 247, 762, 956, 78, 955, 953, 137, 251, 113, 950,
/* 450 */ 694, 692, 138, 203, 58, 59, 51, 847, 815, 46, /* 450 */ 84, 949, 947, 138, 783, 31, 28, 155, 752, 93,
/* 460 */ 208, 206, 204, 202, 200, 30, 79, 235, 236, 237, /* 460 */ 750, 95, 624, 220, 96, 181, 748, 747, 203, 147,
/* 470 */ 238, 239, 240, 241, 161, 215, 216, 252, 670, 187, /* 470 */ 58, 745, 224, 744, 743, 856, 742, 741, 149, 151,
/* 480 */ 186, 669, 69, 189, 157, 190, 668, 193, 661, 707, /* 480 */ 738, 55, 50, 123, 229, 227, 736, 734, 225, 732,
/* 490 */ 197, 576, 60, 56, 593, 96, 128, 97, 127, 745, /* 490 */ 223, 730, 221, 153, 89, 34, 218, 63, 259, 260,
/* 500 */ 126, 130, 129, 131, 132, 701, 693, 113, 111, 118, /* 500 */ 64, 888, 261, 262, 263, 264, 265, 276, 708, 176,
/* 510 */ 116, 114, 112, 115, 800, 1, 117, 2, 166, 20, /* 510 */ 205, 206, 707, 208, 236, 237, 209, 177, 172, 706,
/* 520 */ 108, 201, 6, 598, 109, 7, 639, 5, 8, 21, /* 520 */ 74, 694, 212, 216, 609, 746, 60, 106, 233, 6,
/* 530 */ 16, 67, 212, 641, 214, 515, 65, 511, 509, 508, /* 530 */ 120, 141, 140, 784, 139, 142, 143, 740, 144, 145,
/* 540 */ 507, 504, 478, 224, 70, 47, 73, 75, 24, 549, /* 540 */ 107, 739, 2, 108, 841, 731, 65, 626, 1, 129,
/* 550 */ 548, 545, 499, 497, 489, 495, 491, 493, 487, 485, /* 550 */ 126, 124, 125, 183, 127, 128, 130, 222, 7, 631,
/* 560 */ 517, 516, 514, 513, 512, 510, 506, 505, 48, 476, /* 560 */ 121, 23, 24, 672, 8, 5, 674, 9, 19, 235,
/* 570 */ 447, 445, 674, 673, 673, 673, 673, 673, 673, 673, /* 570 */ 72, 546, 542, 70, 540, 539, 538, 535, 509, 245,
/* 580 */ 673, 673, 673, 673, 99, 100, /* 580 */ 79, 27, 75, 580, 51, 83, 85, 579, 576, 530,
/* 590 */ 528, 520, 526, 522, 524, 518, 516, 548, 547, 545,
/* 600 */ 544, 543, 541, 537, 536, 52, 507, 477, 475, 712,
/* 610 */ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
/* 620 */ 711, 110, 111,
}; };
static const YYCODETYPE yy_lookahead[] = { static const YYCODETYPE yy_lookahead[] = {
/* 0 */ 267, 1, 267, 213, 210, 211, 230, 5, 213, 9, /* 0 */ 267, 1, 267, 209, 210, 251, 1, 5, 229, 9,
/* 10 */ 277, 276, 277, 13, 14, 267, 16, 17, 251, 213, /* 10 */ 277, 276, 277, 13, 14, 267, 16, 17, 212, 265,
/* 20 */ 20, 21, 1, 1, 24, 25, 26, 27, 28, 253, /* 20 */ 20, 21, 1, 1, 24, 25, 26, 27, 28, 212,
/* 30 */ 9, 9, 265, 33, 34, 33, 34, 37, 38, 39, /* 30 */ 9, 9, 253, 33, 34, 33, 34, 37, 38, 39,
/* 40 */ 13, 14, 252, 16, 17, 251, 213, 20, 21, 212, /* 40 */ 13, 14, 37, 16, 17, 251, 253, 20, 21, 211,
/* 50 */ 213, 24, 25, 26, 27, 28, 250, 218, 252, 265, /* 50 */ 212, 24, 25, 26, 27, 28, 250, 229, 252, 265,
/* 60 */ 33, 34, 230, 268, 37, 38, 39, 45, 46, 47, /* 60 */ 33, 34, 267, 217, 37, 38, 39, 45, 46, 47,
/* 70 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, /* 70 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
/* 80 */ 66, 76, 60, 13, 14, 253, 16, 17, 249, 78, /* 80 */ 66, 253, 60, 13, 14, 268, 16, 17, 77, 79,
/* 90 */ 20, 21, 267, 213, 24, 25, 26, 27, 28, 213, /* 90 */ 20, 21, 267, 247, 24, 25, 26, 27, 28, 212,
/* 100 */ 213, 276, 277, 33, 34, 105, 273, 37, 38, 39, /* 100 */ 212, 276, 277, 33, 34, 212, 106, 37, 38, 39,
/* 110 */ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, /* 110 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
/* 120 */ 95, 96, 97, 98, 99, 245, 267, 229, 101, 231, /* 120 */ 96, 97, 98, 99, 100, 37, 38, 39, 228, 102,
/* 130 */ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, /* 130 */ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
/* 140 */ 242, 243, 244, 14, 130, 16, 17, 133, 134, 20, /* 140 */ 240, 241, 242, 243, 14, 131, 16, 17, 134, 135,
/* 150 */ 21, 118, 119, 24, 25, 26, 27, 28, 271, 273, /* 150 */ 20, 21, 0, 229, 24, 25, 26, 27, 28, 271,
/* 160 */ 273, 275, 33, 34, 213, 213, 37, 38, 39, 129, /* 160 */ 273, 273, 275, 33, 34, 101, 273, 37, 38, 39,
/* 170 */ 16, 17, 213, 230, 20, 21, 136, 137, 24, 25, /* 170 */ 212, 16, 17, 109, 212, 20, 21, 253, 130, 24,
/* 180 */ 26, 27, 28, 37, 38, 39, 213, 33, 34, 100, /* 180 */ 25, 26, 27, 28, 212, 137, 138, 267, 33, 34,
/* 190 */ 267, 37, 38, 39, 1, 2, 253, 108, 5, 267, /* 190 */ 66, 253, 37, 38, 39, 1, 2, 212, 267, 5,
/* 200 */ 7, 250, 9, 252, 1, 2, 267, 44, 5, 250, /* 200 */ 217, 7, 212, 9, 212, 1, 2, 59, 250, 5,
/* 210 */ 7, 252, 9, 100, 1, 2, 0, 267, 5, 254, /* 210 */ 252, 7, 250, 9, 252, 1, 2, 44, 101, 5,
/* 220 */ 7, 108, 9, 60, 101, 273, 33, 34, 213, 66, /* 220 */ 74, 7, 250, 9, 252, 79, 109, 33, 34, 77,
/* 230 */ 37, 266, 109, 70, 71, 72, 33, 34, 131, 132, /* 230 */ 212, 37, 249, 60, 63, 64, 65, 33, 34, 66,
/* 240 */ 37, 85, 269, 87, 88, 267, 33, 34, 92, 1, /* 240 */ 250, 37, 252, 212, 71, 72, 73, 33, 34, 101,
/* 250 */ 94, 95, 96, 217, 98, 99, 220, 15, 229, 73, /* 250 */ 86, 212, 88, 89, 269, 131, 212, 93, 134, 95,
/* 260 */ 267, 232, 233, 100, 78, 250, 237, 252, 239, 240, /* 260 */ 96, 97, 101, 99, 100, 273, 105, 106, 250, 228,
/* 270 */ 241, 108, 243, 244, 25, 26, 27, 28, 217, 106, /* 270 */ 252, 102, 231, 232, 101, 244, 107, 236, 245, 238,
/* 280 */ 218, 220, 33, 34, 111, 37, 37, 38, 39, 61, /* 280 */ 239, 240, 109, 242, 243, 25, 26, 27, 28, 250,
/* 290 */ 62, 128, 76, 100, 253, 67, 68, 69, 135, 131, /* 290 */ 5, 252, 7, 33, 34, 101, 252, 37, 38, 39,
/* 300 */ 132, 2, 101, 100, 5, 112, 7, 106, 9, 247, /* 300 */ 216, 15, 129, 219, 217, 101, 245, 113, 216, 136,
/* 310 */ 248, 249, 5, 100, 7, 112, 217, 33, 34, 220, /* 310 */ 216, 219, 254, 219, 5, 101, 7, 113, 2, 119,
/* 320 */ 127, 37, 38, 39, 59, 112, 101, 106, 61, 62, /* 320 */ 120, 5, 128, 7, 266, 9, 107, 113, 5, 102,
/* 330 */ 127, 106, 33, 34, 67, 68, 69, 61, 62, 5, /* 330 */ 7, 112, 128, 246, 247, 248, 249, 110, 102, 61,
/* 340 */ 127, 7, 75, 67, 68, 69, 125, 100, 267, 107, /* 340 */ 62, 267, 128, 107, 267, 67, 68, 69, 70, 33,
/* 350 */ 106, 104, 105, 63, 64, 65, 101, 101, 101, 101, /* 350 */ 34, 245, 102, 102, 76, 61, 62, 107, 107, 61,
/* 360 */ 267, 106, 106, 106, 106, 100, 100, 123, 102, 101, /* 360 */ 62, 67, 68, 69, 70, 67, 68, 69, 70, 33,
/* 370 */ 101, 5, 267, 7, 106, 106, 5, 267, 7, 73, /* 370 */ 34, 102, 102, 37, 38, 39, 107, 107, 102, 107,
/* 380 */ 74, 61, 62, 267, 267, 267, 267, 267, 267, 253, /* 380 */ 107, 267, 102, 107, 102, 132, 133, 107, 267, 107,
/* 390 */ 246, 246, 251, 246, 246, 246, 246, 246, 213, 274, /* 390 */ 132, 133, 74, 75, 108, 132, 133, 124, 126, 267,
/* 400 */ 213, 213, 213, 213, 274, 213, 107, 255, 213, 213, /* 400 */ 101, 267, 103, 132, 133, 267, 5, 267, 7, 61,
/* 410 */ 213, 213, 213, 213, 59, 213, 108, 213, 213, 213, /* 410 */ 62, 267, 267, 245, 267, 245, 267, 267, 267, 245,
/* 420 */ 213, 213, 213, 213, 213, 213, 251, 213, 213, 112, /* 420 */ 245, 212, 212, 251, 108, 212, 109, 212, 212, 212,
/* 430 */ 213, 213, 213, 213, 270, 213, 213, 213, 122, 213, /* 430 */ 274, 274, 255, 212, 212, 212, 212, 212, 212, 251,
/* 440 */ 213, 270, 213, 213, 213, 213, 213, 213, 213, 213, /* 440 */ 212, 212, 212, 212, 212, 212, 212, 212, 59, 212,
/* 450 */ 213, 213, 213, 270, 214, 214, 124, 214, 264, 121, /* 450 */ 212, 212, 212, 212, 212, 212, 212, 212, 212, 212,
/* 460 */ 116, 120, 115, 114, 113, 126, 84, 83, 49, 80, /* 460 */ 212, 212, 113, 270, 212, 270, 212, 212, 212, 212,
/* 470 */ 82, 53, 81, 79, 214, 214, 214, 76, 5, 5, /* 470 */ 123, 212, 270, 212, 212, 264, 212, 212, 212, 212,
/* 480 */ 138, 5, 218, 138, 214, 5, 5, 129, 86, 214, /* 480 */ 212, 125, 122, 263, 117, 121, 212, 212, 116, 212,
/* 490 */ 109, 101, 106, 110, 101, 215, 222, 215, 226, 228, /* 490 */ 115, 212, 114, 212, 85, 127, 213, 213, 84, 49,
/* 500 */ 227, 223, 225, 224, 221, 214, 214, 261, 263, 256, /* 500 */ 213, 213, 81, 83, 53, 82, 80, 77, 5, 213,
/* 510 */ 258, 260, 262, 259, 251, 219, 257, 216, 1, 106, /* 510 */ 139, 5, 5, 139, 213, 213, 5, 213, 213, 5,
/* 520 */ 100, 100, 117, 101, 100, 117, 101, 100, 100, 106, /* 520 */ 217, 87, 130, 110, 102, 213, 111, 214, 104, 101,
/* 530 */ 100, 73, 103, 107, 103, 9, 104, 5, 5, 5, /* 530 */ 101, 221, 225, 227, 226, 224, 222, 213, 223, 220,
/* 540 */ 5, 5, 77, 15, 73, 16, 132, 132, 106, 5, /* 540 */ 214, 213, 215, 214, 251, 213, 107, 102, 218, 257,
/* 550 */ 5, 101, 5, 5, 5, 5, 5, 5, 5, 5, /* 550 */ 260, 262, 261, 1, 259, 258, 256, 101, 118, 102,
/* 560 */ 5, 5, 5, 5, 5, 5, 5, 5, 106, 77, /* 560 */ 101, 107, 107, 102, 118, 101, 108, 101, 101, 104,
/* 570 */ 59, 58, 0, 278, 278, 278, 278, 278, 278, 278, /* 570 */ 74, 9, 5, 105, 5, 5, 5, 5, 78, 15,
/* 580 */ 278, 278, 278, 278, 21, 21, 278, 278, 278, 278, /* 580 */ 133, 107, 74, 5, 16, 133, 133, 5, 102, 5,
/* 590 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 590 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
/* 600 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 600 */ 5, 5, 5, 5, 5, 107, 78, 59, 58, 0,
/* 610 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 610 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
/* 620 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 620 */ 278, 21, 21, 278, 278, 278, 278, 278, 278, 278,
/* 630 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 630 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
/* 640 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 640 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
/* 650 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 650 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
...@@ -345,86 +360,97 @@ static const YYCODETYPE yy_lookahead[] = { ...@@ -345,86 +360,97 @@ static const YYCODETYPE yy_lookahead[] = {
/* 760 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 760 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
/* 770 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 770 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
/* 780 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 780 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
/* 790 */ 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,
}; };
#define YY_SHIFT_COUNT (257) #define YY_SHIFT_COUNT (281)
#define YY_SHIFT_MIN (0) #define YY_SHIFT_MIN (0)
#define YY_SHIFT_MAX (572) #define YY_SHIFT_MAX (609)
static const unsigned short int yy_shift_ofst[] = { static const unsigned short int yy_shift_ofst[] = {
/* 0 */ 163, 25, 156, 5, 193, 213, 21, 21, 21, 21, /* 0 */ 173, 24, 164, 11, 194, 214, 21, 21, 21, 21,
/* 10 */ 21, 21, 0, 22, 213, 299, 299, 299, 113, 21, /* 10 */ 21, 21, 21, 21, 21, 0, 22, 214, 316, 316,
/* 20 */ 21, 21, 216, 21, 21, 186, 11, 11, 586, 203, /* 20 */ 316, 117, 21, 21, 21, 152, 21, 21, 146, 11,
/* 30 */ 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, /* 30 */ 10, 10, 623, 204, 214, 214, 214, 214, 214, 214,
/* 40 */ 213, 213, 213, 213, 213, 213, 213, 299, 299, 2, /* 40 */ 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
/* 50 */ 2, 2, 2, 2, 2, 2, 89, 21, 21, 21, /* 50 */ 214, 316, 316, 2, 2, 2, 2, 2, 2, 2,
/* 60 */ 21, 33, 33, 173, 21, 21, 21, 21, 21, 21, /* 60 */ 64, 21, 21, 21, 21, 21, 200, 200, 219, 21,
/* 70 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 70 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
/* 80 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 80 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
/* 90 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 90 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
/* 100 */ 21, 21, 21, 21, 308, 355, 355, 317, 317, 317, /* 100 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
/* 110 */ 355, 316, 332, 338, 344, 341, 347, 349, 351, 339, /* 110 */ 21, 21, 21, 21, 21, 317, 389, 389, 389, 349,
/* 120 */ 308, 355, 355, 355, 5, 355, 382, 384, 419, 389, /* 120 */ 349, 349, 389, 347, 356, 360, 367, 364, 372, 375,
/* 130 */ 388, 418, 391, 394, 355, 401, 355, 401, 355, 586, /* 130 */ 378, 368, 317, 389, 389, 389, 11, 389, 389, 409,
/* 140 */ 586, 27, 70, 70, 70, 129, 154, 249, 249, 249, /* 140 */ 414, 450, 421, 420, 451, 423, 426, 389, 430, 389,
/* 150 */ 267, 284, 284, 284, 284, 228, 276, 14, 40, 146, /* 150 */ 430, 389, 430, 389, 623, 623, 27, 70, 70, 70,
/* 160 */ 146, 247, 290, 123, 201, 225, 255, 256, 257, 307, /* 160 */ 130, 155, 260, 260, 260, 278, 294, 298, 336, 336,
/* 170 */ 334, 248, 265, 242, 221, 244, 258, 268, 269, 107, /* 170 */ 336, 336, 14, 48, 88, 88, 161, 124, 171, 227,
/* 180 */ 266, 168, 366, 371, 306, 320, 473, 342, 474, 476, /* 180 */ 169, 236, 251, 269, 270, 276, 285, 309, 5, 148,
/* 190 */ 345, 480, 481, 402, 358, 381, 390, 383, 386, 393, /* 190 */ 286, 272, 273, 250, 280, 282, 253, 258, 263, 299,
/* 200 */ 420, 517, 421, 422, 424, 413, 405, 423, 408, 425, /* 200 */ 271, 323, 401, 318, 348, 503, 371, 506, 507, 374,
/* 210 */ 427, 426, 428, 429, 430, 431, 432, 458, 526, 532, /* 210 */ 511, 514, 434, 392, 413, 422, 415, 424, 428, 439,
/* 220 */ 533, 534, 535, 536, 465, 528, 471, 529, 414, 415, /* 220 */ 445, 429, 552, 456, 457, 459, 454, 440, 455, 446,
/* 230 */ 442, 544, 545, 450, 442, 547, 548, 549, 550, 551, /* 230 */ 461, 464, 458, 466, 424, 467, 465, 468, 496, 562,
/* 240 */ 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, /* 240 */ 567, 569, 570, 571, 572, 500, 564, 508, 447, 474,
/* 250 */ 562, 462, 492, 563, 564, 511, 513, 572, /* 250 */ 474, 568, 452, 453, 474, 578, 582, 486, 474, 584,
/* 260 */ 585, 586, 587, 588, 589, 590, 591, 592, 593, 594,
/* 270 */ 595, 596, 597, 598, 599, 498, 528, 600, 601, 548,
/* 280 */ 550, 609,
}; };
#define YY_REDUCE_COUNT (140) #define YY_REDUCE_COUNT (155)
#define YY_REDUCE_MIN (-267) #define YY_REDUCE_MIN (-267)
#define YY_REDUCE_MAX (301) #define YY_REDUCE_MAX (332)
static const short yy_reduce_ofst[] = { static const short yy_reduce_ofst[] = {
/* 0 */ -206, -102, 29, 62, -265, -175, -114, -113, -194, -49, /* 0 */ -206, -100, 41, 87, -265, -175, -194, -113, -112, -42,
/* 10 */ -41, 15, -205, -163, -267, -224, -168, -57, -233, -27, /* 10 */ -38, -28, -10, 18, 39, -183, -162, -267, -221, -172,
/* 20 */ -167, -48, -161, -120, -210, 36, 61, 99, -35, -252, /* 20 */ -76, -246, -15, -107, -8, -17, 31, 44, 84, -154,
/* 30 */ -141, -77, -68, -61, -50, -22, -7, 81, 93, 105, /* 30 */ 92, 94, 58, -252, -205, -80, -69, 74, 77, 114,
/* 40 */ 110, 116, 117, 118, 119, 120, 121, 41, 136, 144, /* 40 */ 121, 132, 134, 138, 140, 144, 145, 147, 149, 150,
/* 50 */ 145, 147, 148, 149, 150, 151, 141, 185, 187, 188, /* 50 */ 151, -207, -62, 33, 61, 106, 168, 170, 174, 175,
/* 60 */ 189, 125, 130, 152, 190, 192, 195, 196, 197, 198, /* 60 */ 172, 209, 210, 213, 215, 216, 156, 157, 177, 217,
/* 70 */ 199, 200, 202, 204, 205, 206, 207, 208, 209, 210, /* 70 */ 221, 222, 223, 224, 225, 226, 228, 229, 230, 231,
/* 80 */ 211, 212, 214, 215, 217, 218, 219, 220, 222, 223, /* 80 */ 232, 233, 234, 235, 237, 238, 239, 240, 241, 242,
/* 90 */ 224, 226, 227, 229, 230, 231, 232, 233, 234, 235, /* 90 */ 243, 244, 245, 246, 247, 248, 249, 252, 254, 255,
/* 100 */ 236, 237, 238, 239, 175, 240, 241, 164, 171, 183, /* 100 */ 256, 257, 259, 261, 262, 264, 265, 266, 267, 268,
/* 110 */ 243, 194, 245, 250, 246, 251, 254, 252, 259, 253, /* 110 */ 274, 275, 277, 279, 281, 188, 283, 284, 287, 193,
/* 120 */ 263, 260, 261, 262, 264, 270, 271, 273, 272, 274, /* 120 */ 195, 202, 288, 211, 220, 289, 291, 290, 295, 297,
/* 130 */ 277, 278, 279, 283, 275, 280, 291, 282, 292, 296, /* 130 */ 292, 300, 293, 296, 301, 302, 303, 304, 305, 306,
/* 140 */ 301, /* 140 */ 308, 307, 310, 311, 314, 315, 319, 312, 313, 324,
/* 150 */ 326, 328, 329, 332, 330, 327,
}; };
static const YYACTIONTYPE yy_default[] = { static const YYACTIONTYPE yy_default[] = {
/* 0 */ 671, 725, 714, 722, 903, 903, 671, 671, 671, 671, /* 0 */ 709, 764, 753, 761, 944, 944, 709, 709, 709, 709,
/* 10 */ 671, 671, 828, 689, 903, 671, 671, 671, 671, 671, /* 10 */ 709, 709, 709, 709, 709, 869, 727, 944, 709, 709,
/* 20 */ 671, 671, 722, 671, 671, 727, 727, 727, 823, 671, /* 20 */ 709, 709, 709, 709, 709, 761, 709, 709, 766, 761,
/* 30 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, /* 30 */ 766, 766, 864, 709, 709, 709, 709, 709, 709, 709,
/* 40 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, /* 40 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709,
/* 50 */ 671, 671, 671, 671, 671, 671, 671, 671, 830, 832, /* 50 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709,
/* 60 */ 671, 850, 850, 821, 671, 671, 671, 671, 671, 671, /* 60 */ 709, 709, 709, 871, 873, 709, 891, 891, 862, 709,
/* 70 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, /* 70 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709,
/* 80 */ 671, 671, 671, 712, 671, 710, 671, 671, 671, 671, /* 80 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709,
/* 90 */ 671, 671, 671, 671, 671, 671, 671, 671, 699, 671, /* 90 */ 709, 709, 709, 751, 709, 749, 709, 709, 709, 709,
/* 100 */ 671, 671, 671, 671, 671, 691, 691, 671, 671, 671, /* 100 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 737,
/* 110 */ 691, 857, 861, 855, 843, 851, 842, 838, 837, 865, /* 110 */ 709, 709, 709, 709, 709, 709, 729, 729, 729, 709,
/* 120 */ 671, 691, 691, 691, 722, 691, 743, 741, 739, 731, /* 120 */ 709, 709, 729, 898, 902, 896, 884, 892, 883, 879,
/* 130 */ 737, 733, 735, 729, 691, 720, 691, 720, 691, 761, /* 130 */ 878, 906, 709, 729, 729, 729, 761, 729, 729, 782,
/* 140 */ 777, 671, 866, 902, 856, 892, 891, 898, 890, 889, /* 140 */ 780, 778, 770, 776, 772, 774, 768, 729, 759, 729,
/* 150 */ 671, 885, 886, 888, 887, 671, 671, 671, 671, 894, /* 150 */ 759, 729, 759, 729, 800, 816, 709, 907, 943, 897,
/* 160 */ 893, 671, 671, 671, 671, 671, 671, 671, 671, 671, /* 160 */ 933, 932, 939, 931, 930, 709, 709, 709, 926, 927,
/* 170 */ 671, 671, 868, 671, 862, 858, 671, 671, 671, 671, /* 170 */ 929, 928, 709, 709, 935, 934, 709, 709, 709, 709,
/* 180 */ 787, 671, 671, 671, 671, 671, 671, 671, 671, 671, /* 180 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 909,
/* 190 */ 671, 671, 671, 671, 671, 820, 671, 671, 829, 671, /* 190 */ 709, 903, 899, 709, 709, 709, 709, 709, 709, 826,
/* 200 */ 671, 671, 671, 671, 671, 852, 671, 844, 671, 671, /* 200 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709,
/* 210 */ 671, 671, 671, 797, 671, 671, 671, 671, 671, 671, /* 210 */ 709, 709, 709, 709, 861, 709, 709, 709, 709, 870,
/* 220 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, /* 220 */ 709, 709, 709, 709, 709, 709, 893, 709, 885, 709,
/* 230 */ 907, 671, 671, 671, 905, 671, 671, 671, 671, 671, /* 230 */ 709, 709, 709, 709, 838, 709, 709, 709, 709, 709,
/* 240 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, /* 240 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 954,
/* 250 */ 671, 746, 671, 697, 695, 671, 687, 671, /* 250 */ 952, 709, 709, 709, 948, 709, 709, 709, 946, 709,
/* 260 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709,
/* 270 */ 709, 709, 709, 709, 709, 785, 709, 735, 733, 709,
/* 280 */ 725, 709,
}; };
/********** End of lemon-generated parsing tables *****************************/ /********** End of lemon-generated parsing tables *****************************/
...@@ -511,6 +537,7 @@ static const YYCODETYPE yyFallback[] = { ...@@ -511,6 +537,7 @@ static const YYCODETYPE yyFallback[] = {
0, /* STABLES => nothing */ 0, /* STABLES => nothing */
0, /* VGROUPS => nothing */ 0, /* VGROUPS => nothing */
0, /* DROP => nothing */ 0, /* DROP => nothing */
1, /* STABLE => ID */
0, /* DNODE => nothing */ 0, /* DNODE => nothing */
0, /* USER => nothing */ 0, /* USER => nothing */
0, /* ACCOUNT => nothing */ 0, /* ACCOUNT => nothing */
...@@ -649,7 +676,6 @@ static const YYCODETYPE yyFallback[] = { ...@@ -649,7 +676,6 @@ static const YYCODETYPE yyFallback[] = {
1, /* TBNAME => ID */ 1, /* TBNAME => ID */
1, /* JOIN => ID */ 1, /* JOIN => ID */
1, /* METRICS => ID */ 1, /* METRICS => ID */
1, /* STABLE => ID */
1, /* INSERT => ID */ 1, /* INSERT => ID */
1, /* INTO => ID */ 1, /* INTO => ID */
1, /* VALUES => ID */ 1, /* VALUES => ID */
...@@ -692,6 +718,7 @@ struct yyParser { ...@@ -692,6 +718,7 @@ struct yyParser {
int yyerrcnt; /* Shifts left before out of the error */ int yyerrcnt; /* Shifts left before out of the error */
#endif #endif
ParseARG_SDECL /* A place to hold %extra_argument */ ParseARG_SDECL /* A place to hold %extra_argument */
ParseCTX_SDECL /* A place to hold %extra_context */
#if YYSTACKDEPTH<=0 #if YYSTACKDEPTH<=0
int yystksz; /* Current side of the stack */ int yystksz; /* Current side of the stack */
yyStackEntry *yystack; /* The parser's stack */ yyStackEntry *yystack; /* The parser's stack */
...@@ -806,187 +833,187 @@ static const char *const yyTokenName[] = { ...@@ -806,187 +833,187 @@ static const char *const yyTokenName[] = {
/* 64 */ "STABLES", /* 64 */ "STABLES",
/* 65 */ "VGROUPS", /* 65 */ "VGROUPS",
/* 66 */ "DROP", /* 66 */ "DROP",
/* 67 */ "DNODE", /* 67 */ "STABLE",
/* 68 */ "USER", /* 68 */ "DNODE",
/* 69 */ "ACCOUNT", /* 69 */ "USER",
/* 70 */ "USE", /* 70 */ "ACCOUNT",
/* 71 */ "DESCRIBE", /* 71 */ "USE",
/* 72 */ "ALTER", /* 72 */ "DESCRIBE",
/* 73 */ "PASS", /* 73 */ "ALTER",
/* 74 */ "PRIVILEGE", /* 74 */ "PASS",
/* 75 */ "LOCAL", /* 75 */ "PRIVILEGE",
/* 76 */ "IF", /* 76 */ "LOCAL",
/* 77 */ "EXISTS", /* 77 */ "IF",
/* 78 */ "PPS", /* 78 */ "EXISTS",
/* 79 */ "TSERIES", /* 79 */ "PPS",
/* 80 */ "DBS", /* 80 */ "TSERIES",
/* 81 */ "STORAGE", /* 81 */ "DBS",
/* 82 */ "QTIME", /* 82 */ "STORAGE",
/* 83 */ "CONNS", /* 83 */ "QTIME",
/* 84 */ "STATE", /* 84 */ "CONNS",
/* 85 */ "KEEP", /* 85 */ "STATE",
/* 86 */ "CACHE", /* 86 */ "KEEP",
/* 87 */ "REPLICA", /* 87 */ "CACHE",
/* 88 */ "QUORUM", /* 88 */ "REPLICA",
/* 89 */ "DAYS", /* 89 */ "QUORUM",
/* 90 */ "MINROWS", /* 90 */ "DAYS",
/* 91 */ "MAXROWS", /* 91 */ "MINROWS",
/* 92 */ "BLOCKS", /* 92 */ "MAXROWS",
/* 93 */ "CTIME", /* 93 */ "BLOCKS",
/* 94 */ "WAL", /* 94 */ "CTIME",
/* 95 */ "FSYNC", /* 95 */ "WAL",
/* 96 */ "COMP", /* 96 */ "FSYNC",
/* 97 */ "PRECISION", /* 97 */ "COMP",
/* 98 */ "UPDATE", /* 98 */ "PRECISION",
/* 99 */ "CACHELAST", /* 99 */ "UPDATE",
/* 100 */ "LP", /* 100 */ "CACHELAST",
/* 101 */ "RP", /* 101 */ "LP",
/* 102 */ "UNSIGNED", /* 102 */ "RP",
/* 103 */ "TAGS", /* 103 */ "UNSIGNED",
/* 104 */ "USING", /* 104 */ "TAGS",
/* 105 */ "AS", /* 105 */ "USING",
/* 106 */ "COMMA", /* 106 */ "AS",
/* 107 */ "NULL", /* 107 */ "COMMA",
/* 108 */ "SELECT", /* 108 */ "NULL",
/* 109 */ "UNION", /* 109 */ "SELECT",
/* 110 */ "ALL", /* 110 */ "UNION",
/* 111 */ "FROM", /* 111 */ "ALL",
/* 112 */ "VARIABLE", /* 112 */ "FROM",
/* 113 */ "INTERVAL", /* 113 */ "VARIABLE",
/* 114 */ "FILL", /* 114 */ "INTERVAL",
/* 115 */ "SLIDING", /* 115 */ "FILL",
/* 116 */ "ORDER", /* 116 */ "SLIDING",
/* 117 */ "BY", /* 117 */ "ORDER",
/* 118 */ "ASC", /* 118 */ "BY",
/* 119 */ "DESC", /* 119 */ "ASC",
/* 120 */ "GROUP", /* 120 */ "DESC",
/* 121 */ "HAVING", /* 121 */ "GROUP",
/* 122 */ "LIMIT", /* 122 */ "HAVING",
/* 123 */ "OFFSET", /* 123 */ "LIMIT",
/* 124 */ "SLIMIT", /* 124 */ "OFFSET",
/* 125 */ "SOFFSET", /* 125 */ "SLIMIT",
/* 126 */ "WHERE", /* 126 */ "SOFFSET",
/* 127 */ "NOW", /* 127 */ "WHERE",
/* 128 */ "RESET", /* 128 */ "NOW",
/* 129 */ "QUERY", /* 129 */ "RESET",
/* 130 */ "ADD", /* 130 */ "QUERY",
/* 131 */ "COLUMN", /* 131 */ "ADD",
/* 132 */ "TAG", /* 132 */ "COLUMN",
/* 133 */ "CHANGE", /* 133 */ "TAG",
/* 134 */ "SET", /* 134 */ "CHANGE",
/* 135 */ "KILL", /* 135 */ "SET",
/* 136 */ "CONNECTION", /* 136 */ "KILL",
/* 137 */ "STREAM", /* 137 */ "CONNECTION",
/* 138 */ "COLON", /* 138 */ "STREAM",
/* 139 */ "ABORT", /* 139 */ "COLON",
/* 140 */ "AFTER", /* 140 */ "ABORT",
/* 141 */ "ATTACH", /* 141 */ "AFTER",
/* 142 */ "BEFORE", /* 142 */ "ATTACH",
/* 143 */ "BEGIN", /* 143 */ "BEFORE",
/* 144 */ "CASCADE", /* 144 */ "BEGIN",
/* 145 */ "CLUSTER", /* 145 */ "CASCADE",
/* 146 */ "CONFLICT", /* 146 */ "CLUSTER",
/* 147 */ "COPY", /* 147 */ "CONFLICT",
/* 148 */ "DEFERRED", /* 148 */ "COPY",
/* 149 */ "DELIMITERS", /* 149 */ "DEFERRED",
/* 150 */ "DETACH", /* 150 */ "DELIMITERS",
/* 151 */ "EACH", /* 151 */ "DETACH",
/* 152 */ "END", /* 152 */ "EACH",
/* 153 */ "EXPLAIN", /* 153 */ "END",
/* 154 */ "FAIL", /* 154 */ "EXPLAIN",
/* 155 */ "FOR", /* 155 */ "FAIL",
/* 156 */ "IGNORE", /* 156 */ "FOR",
/* 157 */ "IMMEDIATE", /* 157 */ "IGNORE",
/* 158 */ "INITIALLY", /* 158 */ "IMMEDIATE",
/* 159 */ "INSTEAD", /* 159 */ "INITIALLY",
/* 160 */ "MATCH", /* 160 */ "INSTEAD",
/* 161 */ "KEY", /* 161 */ "MATCH",
/* 162 */ "OF", /* 162 */ "KEY",
/* 163 */ "RAISE", /* 163 */ "OF",
/* 164 */ "REPLACE", /* 164 */ "RAISE",
/* 165 */ "RESTRICT", /* 165 */ "REPLACE",
/* 166 */ "ROW", /* 166 */ "RESTRICT",
/* 167 */ "STATEMENT", /* 167 */ "ROW",
/* 168 */ "TRIGGER", /* 168 */ "STATEMENT",
/* 169 */ "VIEW", /* 169 */ "TRIGGER",
/* 170 */ "COUNT", /* 170 */ "VIEW",
/* 171 */ "SUM", /* 171 */ "COUNT",
/* 172 */ "AVG", /* 172 */ "SUM",
/* 173 */ "MIN", /* 173 */ "AVG",
/* 174 */ "MAX", /* 174 */ "MIN",
/* 175 */ "FIRST", /* 175 */ "MAX",
/* 176 */ "LAST", /* 176 */ "FIRST",
/* 177 */ "TOP", /* 177 */ "LAST",
/* 178 */ "BOTTOM", /* 178 */ "TOP",
/* 179 */ "STDDEV", /* 179 */ "BOTTOM",
/* 180 */ "PERCENTILE", /* 180 */ "STDDEV",
/* 181 */ "APERCENTILE", /* 181 */ "PERCENTILE",
/* 182 */ "LEASTSQUARES", /* 182 */ "APERCENTILE",
/* 183 */ "HISTOGRAM", /* 183 */ "LEASTSQUARES",
/* 184 */ "DIFF", /* 184 */ "HISTOGRAM",
/* 185 */ "SPREAD", /* 185 */ "DIFF",
/* 186 */ "TWA", /* 186 */ "SPREAD",
/* 187 */ "INTERP", /* 187 */ "TWA",
/* 188 */ "LAST_ROW", /* 188 */ "INTERP",
/* 189 */ "RATE", /* 189 */ "LAST_ROW",
/* 190 */ "IRATE", /* 190 */ "RATE",
/* 191 */ "SUM_RATE", /* 191 */ "IRATE",
/* 192 */ "SUM_IRATE", /* 192 */ "SUM_RATE",
/* 193 */ "AVG_RATE", /* 193 */ "SUM_IRATE",
/* 194 */ "AVG_IRATE", /* 194 */ "AVG_RATE",
/* 195 */ "TBID", /* 195 */ "AVG_IRATE",
/* 196 */ "SEMI", /* 196 */ "TBID",
/* 197 */ "NONE", /* 197 */ "SEMI",
/* 198 */ "PREV", /* 198 */ "NONE",
/* 199 */ "LINEAR", /* 199 */ "PREV",
/* 200 */ "IMPORT", /* 200 */ "LINEAR",
/* 201 */ "METRIC", /* 201 */ "IMPORT",
/* 202 */ "TBNAME", /* 202 */ "METRIC",
/* 203 */ "JOIN", /* 203 */ "TBNAME",
/* 204 */ "METRICS", /* 204 */ "JOIN",
/* 205 */ "STABLE", /* 205 */ "METRICS",
/* 206 */ "INSERT", /* 206 */ "INSERT",
/* 207 */ "INTO", /* 207 */ "INTO",
/* 208 */ "VALUES", /* 208 */ "VALUES",
/* 209 */ "error", /* 209 */ "program",
/* 210 */ "program", /* 210 */ "cmd",
/* 211 */ "cmd", /* 211 */ "dbPrefix",
/* 212 */ "dbPrefix", /* 212 */ "ids",
/* 213 */ "ids", /* 213 */ "cpxName",
/* 214 */ "cpxName", /* 214 */ "ifexists",
/* 215 */ "ifexists", /* 215 */ "alter_db_optr",
/* 216 */ "alter_db_optr", /* 216 */ "acct_optr",
/* 217 */ "acct_optr", /* 217 */ "ifnotexists",
/* 218 */ "ifnotexists", /* 218 */ "db_optr",
/* 219 */ "db_optr", /* 219 */ "pps",
/* 220 */ "pps", /* 220 */ "tseries",
/* 221 */ "tseries", /* 221 */ "dbs",
/* 222 */ "dbs", /* 222 */ "streams",
/* 223 */ "streams", /* 223 */ "storage",
/* 224 */ "storage", /* 224 */ "qtime",
/* 225 */ "qtime", /* 225 */ "users",
/* 226 */ "users", /* 226 */ "conns",
/* 227 */ "conns", /* 227 */ "state",
/* 228 */ "state", /* 228 */ "keep",
/* 229 */ "keep", /* 229 */ "tagitemlist",
/* 230 */ "tagitemlist", /* 230 */ "cache",
/* 231 */ "cache", /* 231 */ "replica",
/* 232 */ "replica", /* 232 */ "quorum",
/* 233 */ "quorum", /* 233 */ "days",
/* 234 */ "days", /* 234 */ "minrows",
/* 235 */ "minrows", /* 235 */ "maxrows",
/* 236 */ "maxrows", /* 236 */ "blocks",
/* 237 */ "blocks", /* 237 */ "ctime",
/* 238 */ "ctime", /* 238 */ "wal",
/* 239 */ "wal", /* 239 */ "fsync",
/* 240 */ "fsync", /* 240 */ "comp",
/* 241 */ "comp", /* 241 */ "prec",
/* 242 */ "prec", /* 242 */ "update",
/* 243 */ "update", /* 243 */ "cachelast",
/* 244 */ "cachelast", /* 244 */ "typename",
/* 245 */ "typename", /* 245 */ "signed",
/* 246 */ "signed", /* 246 */ "create_table_args",
/* 247 */ "create_table_args", /* 247 */ "create_stable_args",
/* 248 */ "create_table_list", /* 248 */ "create_table_list",
/* 249 */ "create_from_stable", /* 249 */ "create_from_stable",
/* 250 */ "columnlist", /* 250 */ "columnlist",
...@@ -1052,218 +1079,226 @@ static const char *const yyRuleName[] = { ...@@ -1052,218 +1079,226 @@ static const char *const yyRuleName[] = {
/* 25 */ "cmd ::= SHOW dbPrefix VGROUPS", /* 25 */ "cmd ::= SHOW dbPrefix VGROUPS",
/* 26 */ "cmd ::= SHOW dbPrefix VGROUPS ids", /* 26 */ "cmd ::= SHOW dbPrefix VGROUPS ids",
/* 27 */ "cmd ::= DROP TABLE ifexists ids cpxName", /* 27 */ "cmd ::= DROP TABLE ifexists ids cpxName",
/* 28 */ "cmd ::= DROP DATABASE ifexists ids", /* 28 */ "cmd ::= DROP STABLE ifexists ids cpxName",
/* 29 */ "cmd ::= DROP DNODE ids", /* 29 */ "cmd ::= DROP DATABASE ifexists ids",
/* 30 */ "cmd ::= DROP USER ids", /* 30 */ "cmd ::= DROP DNODE ids",
/* 31 */ "cmd ::= DROP ACCOUNT ids", /* 31 */ "cmd ::= DROP USER ids",
/* 32 */ "cmd ::= USE ids", /* 32 */ "cmd ::= DROP ACCOUNT ids",
/* 33 */ "cmd ::= DESCRIBE ids cpxName", /* 33 */ "cmd ::= USE ids",
/* 34 */ "cmd ::= ALTER USER ids PASS ids", /* 34 */ "cmd ::= DESCRIBE ids cpxName",
/* 35 */ "cmd ::= ALTER USER ids PRIVILEGE ids", /* 35 */ "cmd ::= ALTER USER ids PASS ids",
/* 36 */ "cmd ::= ALTER DNODE ids ids", /* 36 */ "cmd ::= ALTER USER ids PRIVILEGE ids",
/* 37 */ "cmd ::= ALTER DNODE ids ids ids", /* 37 */ "cmd ::= ALTER DNODE ids ids",
/* 38 */ "cmd ::= ALTER LOCAL ids", /* 38 */ "cmd ::= ALTER DNODE ids ids ids",
/* 39 */ "cmd ::= ALTER LOCAL ids ids", /* 39 */ "cmd ::= ALTER LOCAL ids",
/* 40 */ "cmd ::= ALTER DATABASE ids alter_db_optr", /* 40 */ "cmd ::= ALTER LOCAL ids ids",
/* 41 */ "cmd ::= ALTER ACCOUNT ids acct_optr", /* 41 */ "cmd ::= ALTER DATABASE ids alter_db_optr",
/* 42 */ "cmd ::= ALTER ACCOUNT ids PASS ids acct_optr", /* 42 */ "cmd ::= ALTER ACCOUNT ids acct_optr",
/* 43 */ "ids ::= ID", /* 43 */ "cmd ::= ALTER ACCOUNT ids PASS ids acct_optr",
/* 44 */ "ids ::= STRING", /* 44 */ "ids ::= ID",
/* 45 */ "ifexists ::= IF EXISTS", /* 45 */ "ids ::= STRING",
/* 46 */ "ifexists ::=", /* 46 */ "ifexists ::= IF EXISTS",
/* 47 */ "ifnotexists ::= IF NOT EXISTS", /* 47 */ "ifexists ::=",
/* 48 */ "ifnotexists ::=", /* 48 */ "ifnotexists ::= IF NOT EXISTS",
/* 49 */ "cmd ::= CREATE DNODE ids", /* 49 */ "ifnotexists ::=",
/* 50 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr", /* 50 */ "cmd ::= CREATE DNODE ids",
/* 51 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr", /* 51 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr",
/* 52 */ "cmd ::= CREATE USER ids PASS ids", /* 52 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr",
/* 53 */ "pps ::=", /* 53 */ "cmd ::= CREATE USER ids PASS ids",
/* 54 */ "pps ::= PPS INTEGER", /* 54 */ "pps ::=",
/* 55 */ "tseries ::=", /* 55 */ "pps ::= PPS INTEGER",
/* 56 */ "tseries ::= TSERIES INTEGER", /* 56 */ "tseries ::=",
/* 57 */ "dbs ::=", /* 57 */ "tseries ::= TSERIES INTEGER",
/* 58 */ "dbs ::= DBS INTEGER", /* 58 */ "dbs ::=",
/* 59 */ "streams ::=", /* 59 */ "dbs ::= DBS INTEGER",
/* 60 */ "streams ::= STREAMS INTEGER", /* 60 */ "streams ::=",
/* 61 */ "storage ::=", /* 61 */ "streams ::= STREAMS INTEGER",
/* 62 */ "storage ::= STORAGE INTEGER", /* 62 */ "storage ::=",
/* 63 */ "qtime ::=", /* 63 */ "storage ::= STORAGE INTEGER",
/* 64 */ "qtime ::= QTIME INTEGER", /* 64 */ "qtime ::=",
/* 65 */ "users ::=", /* 65 */ "qtime ::= QTIME INTEGER",
/* 66 */ "users ::= USERS INTEGER", /* 66 */ "users ::=",
/* 67 */ "conns ::=", /* 67 */ "users ::= USERS INTEGER",
/* 68 */ "conns ::= CONNS INTEGER", /* 68 */ "conns ::=",
/* 69 */ "state ::=", /* 69 */ "conns ::= CONNS INTEGER",
/* 70 */ "state ::= STATE ids", /* 70 */ "state ::=",
/* 71 */ "acct_optr ::= pps tseries storage streams qtime dbs users conns state", /* 71 */ "state ::= STATE ids",
/* 72 */ "keep ::= KEEP tagitemlist", /* 72 */ "acct_optr ::= pps tseries storage streams qtime dbs users conns state",
/* 73 */ "cache ::= CACHE INTEGER", /* 73 */ "keep ::= KEEP tagitemlist",
/* 74 */ "replica ::= REPLICA INTEGER", /* 74 */ "cache ::= CACHE INTEGER",
/* 75 */ "quorum ::= QUORUM INTEGER", /* 75 */ "replica ::= REPLICA INTEGER",
/* 76 */ "days ::= DAYS INTEGER", /* 76 */ "quorum ::= QUORUM INTEGER",
/* 77 */ "minrows ::= MINROWS INTEGER", /* 77 */ "days ::= DAYS INTEGER",
/* 78 */ "maxrows ::= MAXROWS INTEGER", /* 78 */ "minrows ::= MINROWS INTEGER",
/* 79 */ "blocks ::= BLOCKS INTEGER", /* 79 */ "maxrows ::= MAXROWS INTEGER",
/* 80 */ "ctime ::= CTIME INTEGER", /* 80 */ "blocks ::= BLOCKS INTEGER",
/* 81 */ "wal ::= WAL INTEGER", /* 81 */ "ctime ::= CTIME INTEGER",
/* 82 */ "fsync ::= FSYNC INTEGER", /* 82 */ "wal ::= WAL INTEGER",
/* 83 */ "comp ::= COMP INTEGER", /* 83 */ "fsync ::= FSYNC INTEGER",
/* 84 */ "prec ::= PRECISION STRING", /* 84 */ "comp ::= COMP INTEGER",
/* 85 */ "update ::= UPDATE INTEGER", /* 85 */ "prec ::= PRECISION STRING",
/* 86 */ "cachelast ::= CACHELAST INTEGER", /* 86 */ "update ::= UPDATE INTEGER",
/* 87 */ "db_optr ::=", /* 87 */ "cachelast ::= CACHELAST INTEGER",
/* 88 */ "db_optr ::= db_optr cache", /* 88 */ "db_optr ::=",
/* 89 */ "db_optr ::= db_optr replica", /* 89 */ "db_optr ::= db_optr cache",
/* 90 */ "db_optr ::= db_optr quorum", /* 90 */ "db_optr ::= db_optr replica",
/* 91 */ "db_optr ::= db_optr days", /* 91 */ "db_optr ::= db_optr quorum",
/* 92 */ "db_optr ::= db_optr minrows", /* 92 */ "db_optr ::= db_optr days",
/* 93 */ "db_optr ::= db_optr maxrows", /* 93 */ "db_optr ::= db_optr minrows",
/* 94 */ "db_optr ::= db_optr blocks", /* 94 */ "db_optr ::= db_optr maxrows",
/* 95 */ "db_optr ::= db_optr ctime", /* 95 */ "db_optr ::= db_optr blocks",
/* 96 */ "db_optr ::= db_optr wal", /* 96 */ "db_optr ::= db_optr ctime",
/* 97 */ "db_optr ::= db_optr fsync", /* 97 */ "db_optr ::= db_optr wal",
/* 98 */ "db_optr ::= db_optr comp", /* 98 */ "db_optr ::= db_optr fsync",
/* 99 */ "db_optr ::= db_optr prec", /* 99 */ "db_optr ::= db_optr comp",
/* 100 */ "db_optr ::= db_optr keep", /* 100 */ "db_optr ::= db_optr prec",
/* 101 */ "db_optr ::= db_optr update", /* 101 */ "db_optr ::= db_optr keep",
/* 102 */ "db_optr ::= db_optr cachelast", /* 102 */ "db_optr ::= db_optr update",
/* 103 */ "alter_db_optr ::=", /* 103 */ "db_optr ::= db_optr cachelast",
/* 104 */ "alter_db_optr ::= alter_db_optr replica", /* 104 */ "alter_db_optr ::=",
/* 105 */ "alter_db_optr ::= alter_db_optr quorum", /* 105 */ "alter_db_optr ::= alter_db_optr replica",
/* 106 */ "alter_db_optr ::= alter_db_optr keep", /* 106 */ "alter_db_optr ::= alter_db_optr quorum",
/* 107 */ "alter_db_optr ::= alter_db_optr blocks", /* 107 */ "alter_db_optr ::= alter_db_optr keep",
/* 108 */ "alter_db_optr ::= alter_db_optr comp", /* 108 */ "alter_db_optr ::= alter_db_optr blocks",
/* 109 */ "alter_db_optr ::= alter_db_optr wal", /* 109 */ "alter_db_optr ::= alter_db_optr comp",
/* 110 */ "alter_db_optr ::= alter_db_optr fsync", /* 110 */ "alter_db_optr ::= alter_db_optr wal",
/* 111 */ "alter_db_optr ::= alter_db_optr update", /* 111 */ "alter_db_optr ::= alter_db_optr fsync",
/* 112 */ "alter_db_optr ::= alter_db_optr cachelast", /* 112 */ "alter_db_optr ::= alter_db_optr update",
/* 113 */ "typename ::= ids", /* 113 */ "alter_db_optr ::= alter_db_optr cachelast",
/* 114 */ "typename ::= ids LP signed RP", /* 114 */ "typename ::= ids",
/* 115 */ "typename ::= ids UNSIGNED", /* 115 */ "typename ::= ids LP signed RP",
/* 116 */ "signed ::= INTEGER", /* 116 */ "typename ::= ids UNSIGNED",
/* 117 */ "signed ::= PLUS INTEGER", /* 117 */ "signed ::= INTEGER",
/* 118 */ "signed ::= MINUS INTEGER", /* 118 */ "signed ::= PLUS INTEGER",
/* 119 */ "cmd ::= CREATE TABLE create_table_args", /* 119 */ "signed ::= MINUS INTEGER",
/* 120 */ "cmd ::= CREATE TABLE create_table_list", /* 120 */ "cmd ::= CREATE TABLE create_table_args",
/* 121 */ "create_table_list ::= create_from_stable", /* 121 */ "cmd ::= CREATE TABLE create_stable_args",
/* 122 */ "create_table_list ::= create_table_list create_from_stable", /* 122 */ "cmd ::= CREATE STABLE create_stable_args",
/* 123 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", /* 123 */ "cmd ::= CREATE TABLE create_table_list",
/* 124 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", /* 124 */ "create_table_list ::= create_from_stable",
/* 125 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP", /* 125 */ "create_table_list ::= create_table_list create_from_stable",
/* 126 */ "create_table_args ::= ifnotexists ids cpxName AS select", /* 126 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP",
/* 127 */ "columnlist ::= columnlist COMMA column", /* 127 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP",
/* 128 */ "columnlist ::= column", /* 128 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP",
/* 129 */ "column ::= ids typename", /* 129 */ "create_table_args ::= ifnotexists ids cpxName AS select",
/* 130 */ "tagitemlist ::= tagitemlist COMMA tagitem", /* 130 */ "columnlist ::= columnlist COMMA column",
/* 131 */ "tagitemlist ::= tagitem", /* 131 */ "columnlist ::= column",
/* 132 */ "tagitem ::= INTEGER", /* 132 */ "column ::= ids typename",
/* 133 */ "tagitem ::= FLOAT", /* 133 */ "tagitemlist ::= tagitemlist COMMA tagitem",
/* 134 */ "tagitem ::= STRING", /* 134 */ "tagitemlist ::= tagitem",
/* 135 */ "tagitem ::= BOOL", /* 135 */ "tagitem ::= INTEGER",
/* 136 */ "tagitem ::= NULL", /* 136 */ "tagitem ::= FLOAT",
/* 137 */ "tagitem ::= MINUS INTEGER", /* 137 */ "tagitem ::= STRING",
/* 138 */ "tagitem ::= MINUS FLOAT", /* 138 */ "tagitem ::= BOOL",
/* 139 */ "tagitem ::= PLUS INTEGER", /* 139 */ "tagitem ::= NULL",
/* 140 */ "tagitem ::= PLUS FLOAT", /* 140 */ "tagitem ::= MINUS INTEGER",
/* 141 */ "select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt", /* 141 */ "tagitem ::= MINUS FLOAT",
/* 142 */ "union ::= select", /* 142 */ "tagitem ::= PLUS INTEGER",
/* 143 */ "union ::= LP union RP", /* 143 */ "tagitem ::= PLUS FLOAT",
/* 144 */ "union ::= union UNION ALL select", /* 144 */ "select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt",
/* 145 */ "union ::= union UNION ALL LP select RP", /* 145 */ "union ::= select",
/* 146 */ "cmd ::= union", /* 146 */ "union ::= LP union RP",
/* 147 */ "select ::= SELECT selcollist", /* 147 */ "union ::= union UNION ALL select",
/* 148 */ "sclp ::= selcollist COMMA", /* 148 */ "union ::= union UNION ALL LP select RP",
/* 149 */ "sclp ::=", /* 149 */ "cmd ::= union",
/* 150 */ "selcollist ::= sclp expr as", /* 150 */ "select ::= SELECT selcollist",
/* 151 */ "selcollist ::= sclp STAR", /* 151 */ "sclp ::= selcollist COMMA",
/* 152 */ "as ::= AS ids", /* 152 */ "sclp ::=",
/* 153 */ "as ::= ids", /* 153 */ "selcollist ::= sclp expr as",
/* 154 */ "as ::=", /* 154 */ "selcollist ::= sclp STAR",
/* 155 */ "from ::= FROM tablelist", /* 155 */ "as ::= AS ids",
/* 156 */ "tablelist ::= ids cpxName", /* 156 */ "as ::= ids",
/* 157 */ "tablelist ::= ids cpxName ids", /* 157 */ "as ::=",
/* 158 */ "tablelist ::= tablelist COMMA ids cpxName", /* 158 */ "from ::= FROM tablelist",
/* 159 */ "tablelist ::= tablelist COMMA ids cpxName ids", /* 159 */ "tablelist ::= ids cpxName",
/* 160 */ "tmvar ::= VARIABLE", /* 160 */ "tablelist ::= ids cpxName ids",
/* 161 */ "interval_opt ::= INTERVAL LP tmvar RP", /* 161 */ "tablelist ::= tablelist COMMA ids cpxName",
/* 162 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", /* 162 */ "tablelist ::= tablelist COMMA ids cpxName ids",
/* 163 */ "interval_opt ::=", /* 163 */ "tmvar ::= VARIABLE",
/* 164 */ "fill_opt ::=", /* 164 */ "interval_opt ::= INTERVAL LP tmvar RP",
/* 165 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", /* 165 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP",
/* 166 */ "fill_opt ::= FILL LP ID RP", /* 166 */ "interval_opt ::=",
/* 167 */ "sliding_opt ::= SLIDING LP tmvar RP", /* 167 */ "fill_opt ::=",
/* 168 */ "sliding_opt ::=", /* 168 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP",
/* 169 */ "orderby_opt ::=", /* 169 */ "fill_opt ::= FILL LP ID RP",
/* 170 */ "orderby_opt ::= ORDER BY sortlist", /* 170 */ "sliding_opt ::= SLIDING LP tmvar RP",
/* 171 */ "sortlist ::= sortlist COMMA item sortorder", /* 171 */ "sliding_opt ::=",
/* 172 */ "sortlist ::= item sortorder", /* 172 */ "orderby_opt ::=",
/* 173 */ "item ::= ids cpxName", /* 173 */ "orderby_opt ::= ORDER BY sortlist",
/* 174 */ "sortorder ::= ASC", /* 174 */ "sortlist ::= sortlist COMMA item sortorder",
/* 175 */ "sortorder ::= DESC", /* 175 */ "sortlist ::= item sortorder",
/* 176 */ "sortorder ::=", /* 176 */ "item ::= ids cpxName",
/* 177 */ "groupby_opt ::=", /* 177 */ "sortorder ::= ASC",
/* 178 */ "groupby_opt ::= GROUP BY grouplist", /* 178 */ "sortorder ::= DESC",
/* 179 */ "grouplist ::= grouplist COMMA item", /* 179 */ "sortorder ::=",
/* 180 */ "grouplist ::= item", /* 180 */ "groupby_opt ::=",
/* 181 */ "having_opt ::=", /* 181 */ "groupby_opt ::= GROUP BY grouplist",
/* 182 */ "having_opt ::= HAVING expr", /* 182 */ "grouplist ::= grouplist COMMA item",
/* 183 */ "limit_opt ::=", /* 183 */ "grouplist ::= item",
/* 184 */ "limit_opt ::= LIMIT signed", /* 184 */ "having_opt ::=",
/* 185 */ "limit_opt ::= LIMIT signed OFFSET signed", /* 185 */ "having_opt ::= HAVING expr",
/* 186 */ "limit_opt ::= LIMIT signed COMMA signed", /* 186 */ "limit_opt ::=",
/* 187 */ "slimit_opt ::=", /* 187 */ "limit_opt ::= LIMIT signed",
/* 188 */ "slimit_opt ::= SLIMIT signed", /* 188 */ "limit_opt ::= LIMIT signed OFFSET signed",
/* 189 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", /* 189 */ "limit_opt ::= LIMIT signed COMMA signed",
/* 190 */ "slimit_opt ::= SLIMIT signed COMMA signed", /* 190 */ "slimit_opt ::=",
/* 191 */ "where_opt ::=", /* 191 */ "slimit_opt ::= SLIMIT signed",
/* 192 */ "where_opt ::= WHERE expr", /* 192 */ "slimit_opt ::= SLIMIT signed SOFFSET signed",
/* 193 */ "expr ::= LP expr RP", /* 193 */ "slimit_opt ::= SLIMIT signed COMMA signed",
/* 194 */ "expr ::= ID", /* 194 */ "where_opt ::=",
/* 195 */ "expr ::= ID DOT ID", /* 195 */ "where_opt ::= WHERE expr",
/* 196 */ "expr ::= ID DOT STAR", /* 196 */ "expr ::= LP expr RP",
/* 197 */ "expr ::= INTEGER", /* 197 */ "expr ::= ID",
/* 198 */ "expr ::= MINUS INTEGER", /* 198 */ "expr ::= ID DOT ID",
/* 199 */ "expr ::= PLUS INTEGER", /* 199 */ "expr ::= ID DOT STAR",
/* 200 */ "expr ::= FLOAT", /* 200 */ "expr ::= INTEGER",
/* 201 */ "expr ::= MINUS FLOAT", /* 201 */ "expr ::= MINUS INTEGER",
/* 202 */ "expr ::= PLUS FLOAT", /* 202 */ "expr ::= PLUS INTEGER",
/* 203 */ "expr ::= STRING", /* 203 */ "expr ::= FLOAT",
/* 204 */ "expr ::= NOW", /* 204 */ "expr ::= MINUS FLOAT",
/* 205 */ "expr ::= VARIABLE", /* 205 */ "expr ::= PLUS FLOAT",
/* 206 */ "expr ::= BOOL", /* 206 */ "expr ::= STRING",
/* 207 */ "expr ::= ID LP exprlist RP", /* 207 */ "expr ::= NOW",
/* 208 */ "expr ::= ID LP STAR RP", /* 208 */ "expr ::= VARIABLE",
/* 209 */ "expr ::= expr IS NULL", /* 209 */ "expr ::= BOOL",
/* 210 */ "expr ::= expr IS NOT NULL", /* 210 */ "expr ::= ID LP exprlist RP",
/* 211 */ "expr ::= expr LT expr", /* 211 */ "expr ::= ID LP STAR RP",
/* 212 */ "expr ::= expr GT expr", /* 212 */ "expr ::= expr IS NULL",
/* 213 */ "expr ::= expr LE expr", /* 213 */ "expr ::= expr IS NOT NULL",
/* 214 */ "expr ::= expr GE expr", /* 214 */ "expr ::= expr LT expr",
/* 215 */ "expr ::= expr NE expr", /* 215 */ "expr ::= expr GT expr",
/* 216 */ "expr ::= expr EQ expr", /* 216 */ "expr ::= expr LE expr",
/* 217 */ "expr ::= expr AND expr", /* 217 */ "expr ::= expr GE expr",
/* 218 */ "expr ::= expr OR expr", /* 218 */ "expr ::= expr NE expr",
/* 219 */ "expr ::= expr PLUS expr", /* 219 */ "expr ::= expr EQ expr",
/* 220 */ "expr ::= expr MINUS expr", /* 220 */ "expr ::= expr AND expr",
/* 221 */ "expr ::= expr STAR expr", /* 221 */ "expr ::= expr OR expr",
/* 222 */ "expr ::= expr SLASH expr", /* 222 */ "expr ::= expr PLUS expr",
/* 223 */ "expr ::= expr REM expr", /* 223 */ "expr ::= expr MINUS expr",
/* 224 */ "expr ::= expr LIKE expr", /* 224 */ "expr ::= expr STAR expr",
/* 225 */ "expr ::= expr IN LP exprlist RP", /* 225 */ "expr ::= expr SLASH expr",
/* 226 */ "exprlist ::= exprlist COMMA expritem", /* 226 */ "expr ::= expr REM expr",
/* 227 */ "exprlist ::= expritem", /* 227 */ "expr ::= expr LIKE expr",
/* 228 */ "expritem ::= expr", /* 228 */ "expr ::= expr IN LP exprlist RP",
/* 229 */ "expritem ::=", /* 229 */ "exprlist ::= exprlist COMMA expritem",
/* 230 */ "cmd ::= RESET QUERY CACHE", /* 230 */ "exprlist ::= expritem",
/* 231 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", /* 231 */ "expritem ::= expr",
/* 232 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", /* 232 */ "expritem ::=",
/* 233 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", /* 233 */ "cmd ::= RESET QUERY CACHE",
/* 234 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", /* 234 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
/* 235 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", /* 235 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
/* 236 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", /* 236 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
/* 237 */ "cmd ::= KILL CONNECTION INTEGER", /* 237 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
/* 238 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", /* 238 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
/* 239 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", /* 239 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
/* 240 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
/* 241 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
/* 242 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
/* 243 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
/* 244 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
/* 245 */ "cmd ::= KILL CONNECTION INTEGER",
/* 246 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
/* 247 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
}; };
#endif /* NDEBUG */ #endif /* NDEBUG */
...@@ -1312,28 +1347,29 @@ static int yyGrowStack(yyParser *p){ ...@@ -1312,28 +1347,29 @@ static int yyGrowStack(yyParser *p){
/* Initialize a new parser that has already been allocated. /* Initialize a new parser that has already been allocated.
*/ */
void ParseInit(void *yypParser){ void ParseInit(void *yypRawParser ParseCTX_PDECL){
yyParser *pParser = (yyParser*)yypParser; yyParser *yypParser = (yyParser*)yypRawParser;
ParseCTX_STORE
#ifdef YYTRACKMAXSTACKDEPTH #ifdef YYTRACKMAXSTACKDEPTH
pParser->yyhwm = 0; yypParser->yyhwm = 0;
#endif #endif
#if YYSTACKDEPTH<=0 #if YYSTACKDEPTH<=0
pParser->yytos = NULL; yypParser->yytos = NULL;
pParser->yystack = NULL; yypParser->yystack = NULL;
pParser->yystksz = 0; yypParser->yystksz = 0;
if( yyGrowStack(pParser) ){ if( yyGrowStack(yypParser) ){
pParser->yystack = &pParser->yystk0; yypParser->yystack = &yypParser->yystk0;
pParser->yystksz = 1; yypParser->yystksz = 1;
} }
#endif #endif
#ifndef YYNOERRORRECOVERY #ifndef YYNOERRORRECOVERY
pParser->yyerrcnt = -1; yypParser->yyerrcnt = -1;
#endif #endif
pParser->yytos = pParser->yystack; yypParser->yytos = yypParser->yystack;
pParser->yystack[0].stateno = 0; yypParser->yystack[0].stateno = 0;
pParser->yystack[0].major = 0; yypParser->yystack[0].major = 0;
#if YYSTACKDEPTH>0 #if YYSTACKDEPTH>0
pParser->yystackEnd = &pParser->yystack[YYSTACKDEPTH-1]; yypParser->yystackEnd = &yypParser->yystack[YYSTACKDEPTH-1];
#endif #endif
} }
...@@ -1350,11 +1386,14 @@ void ParseInit(void *yypParser){ ...@@ -1350,11 +1386,14 @@ void ParseInit(void *yypParser){
** A pointer to a parser. This pointer is used in subsequent calls ** A pointer to a parser. This pointer is used in subsequent calls
** to Parse and ParseFree. ** to Parse and ParseFree.
*/ */
void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE)){ void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE) ParseCTX_PDECL){
yyParser *pParser; yyParser *yypParser;
pParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) ); yypParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) );
if( pParser ) ParseInit(pParser); if( yypParser ){
return pParser; ParseCTX_STORE
ParseInit(yypParser ParseCTX_PARAM);
}
return (void*)yypParser;
} }
#endif /* Parse_ENGINEALWAYSONSTACK */ #endif /* Parse_ENGINEALWAYSONSTACK */
...@@ -1371,7 +1410,8 @@ static void yy_destructor( ...@@ -1371,7 +1410,8 @@ static void yy_destructor(
YYCODETYPE yymajor, /* Type code for object to destroy */ YYCODETYPE yymajor, /* Type code for object to destroy */
YYMINORTYPE *yypminor /* The object to be destroyed */ YYMINORTYPE *yypminor /* The object to be destroyed */
){ ){
ParseARG_FETCH; ParseARG_FETCH
ParseCTX_FETCH
switch( yymajor ){ switch( yymajor ){
/* Here is inserted the actions which take place when a /* Here is inserted the actions which take place when a
** terminal or non-terminal is destroyed. This can happen ** terminal or non-terminal is destroyed. This can happen
...@@ -1384,8 +1424,8 @@ static void yy_destructor( ...@@ -1384,8 +1424,8 @@ static void yy_destructor(
** inside the C code. ** inside the C code.
*/ */
/********* Begin destructor definitions ***************************************/ /********* Begin destructor definitions ***************************************/
case 229: /* keep */ case 228: /* keep */
case 230: /* tagitemlist */ case 229: /* tagitemlist */
case 250: /* columnlist */ case 250: /* columnlist */
case 258: /* fill_opt */ case 258: /* fill_opt */
case 260: /* groupby_opt */ case 260: /* groupby_opt */
...@@ -1540,12 +1580,11 @@ int ParseCoverage(FILE *out){ ...@@ -1540,12 +1580,11 @@ int ParseCoverage(FILE *out){
** Find the appropriate action for a parser given the terminal ** Find the appropriate action for a parser given the terminal
** look-ahead token iLookAhead. ** look-ahead token iLookAhead.
*/ */
static unsigned int yy_find_shift_action( static YYACTIONTYPE yy_find_shift_action(
yyParser *pParser, /* The parser */ YYCODETYPE iLookAhead, /* The look-ahead token */
YYCODETYPE iLookAhead /* The look-ahead token */ YYACTIONTYPE stateno /* Current state number */
){ ){
int i; int i;
int stateno = pParser->yytos->stateno;
if( stateno>YY_MAX_SHIFT ) return stateno; if( stateno>YY_MAX_SHIFT ) return stateno;
assert( stateno <= YY_SHIFT_COUNT ); assert( stateno <= YY_SHIFT_COUNT );
...@@ -1554,15 +1593,19 @@ static unsigned int yy_find_shift_action( ...@@ -1554,15 +1593,19 @@ static unsigned int yy_find_shift_action(
#endif #endif
do{ do{
i = yy_shift_ofst[stateno]; i = yy_shift_ofst[stateno];
assert( i>=0 && i+YYNTOKEN<=sizeof(yy_lookahead)/sizeof(yy_lookahead[0]) ); assert( i>=0 );
assert( i<=YY_ACTTAB_COUNT );
assert( i+YYNTOKEN<=(int)YY_NLOOKAHEAD );
assert( iLookAhead!=YYNOCODE ); assert( iLookAhead!=YYNOCODE );
assert( iLookAhead < YYNTOKEN ); assert( iLookAhead < YYNTOKEN );
i += iLookAhead; i += iLookAhead;
assert( i<(int)YY_NLOOKAHEAD );
if( yy_lookahead[i]!=iLookAhead ){ if( yy_lookahead[i]!=iLookAhead ){
#ifdef YYFALLBACK #ifdef YYFALLBACK
YYCODETYPE iFallback; /* Fallback token */ YYCODETYPE iFallback; /* Fallback token */
if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0]) assert( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0]) );
&& (iFallback = yyFallback[iLookAhead])!=0 ){ iFallback = yyFallback[iLookAhead];
if( iFallback!=0 ){
#ifndef NDEBUG #ifndef NDEBUG
if( yyTraceFILE ){ if( yyTraceFILE ){
fprintf(yyTraceFILE, "%sFALLBACK %s => %s\n", fprintf(yyTraceFILE, "%sFALLBACK %s => %s\n",
...@@ -1577,15 +1620,8 @@ static unsigned int yy_find_shift_action( ...@@ -1577,15 +1620,8 @@ static unsigned int yy_find_shift_action(
#ifdef YYWILDCARD #ifdef YYWILDCARD
{ {
int j = i - iLookAhead + YYWILDCARD; int j = i - iLookAhead + YYWILDCARD;
if( assert( j<(int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])) );
#if YY_SHIFT_MIN+YYWILDCARD<0 if( yy_lookahead[j]==YYWILDCARD && iLookAhead>0 ){
j>=0 &&
#endif
#if YY_SHIFT_MAX+YYWILDCARD>=YY_ACTTAB_COUNT
j<YY_ACTTAB_COUNT &&
#endif
yy_lookahead[j]==YYWILDCARD && iLookAhead>0
){
#ifndef NDEBUG #ifndef NDEBUG
if( yyTraceFILE ){ if( yyTraceFILE ){
fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n", fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n",
...@@ -1599,6 +1635,7 @@ static unsigned int yy_find_shift_action( ...@@ -1599,6 +1635,7 @@ static unsigned int yy_find_shift_action(
#endif /* YYWILDCARD */ #endif /* YYWILDCARD */
return yy_default[stateno]; return yy_default[stateno];
}else{ }else{
assert( i>=0 && i<sizeof(yy_action)/sizeof(yy_action[0]) );
return yy_action[i]; return yy_action[i];
} }
}while(1); }while(1);
...@@ -1608,8 +1645,8 @@ static unsigned int yy_find_shift_action( ...@@ -1608,8 +1645,8 @@ static unsigned int yy_find_shift_action(
** Find the appropriate action for a parser given the non-terminal ** Find the appropriate action for a parser given the non-terminal
** look-ahead token iLookAhead. ** look-ahead token iLookAhead.
*/ */
static int yy_find_reduce_action( static YYACTIONTYPE yy_find_reduce_action(
int stateno, /* Current state number */ YYACTIONTYPE stateno, /* Current state number */
YYCODETYPE iLookAhead /* The look-ahead token */ YYCODETYPE iLookAhead /* The look-ahead token */
){ ){
int i; int i;
...@@ -1638,7 +1675,8 @@ static int yy_find_reduce_action( ...@@ -1638,7 +1675,8 @@ static int yy_find_reduce_action(
** The following routine is called if the stack overflows. ** The following routine is called if the stack overflows.
*/ */
static void yyStackOverflow(yyParser *yypParser){ static void yyStackOverflow(yyParser *yypParser){
ParseARG_FETCH; ParseARG_FETCH
ParseCTX_FETCH
#ifndef NDEBUG #ifndef NDEBUG
if( yyTraceFILE ){ if( yyTraceFILE ){
fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt); fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt);
...@@ -1649,7 +1687,8 @@ static void yyStackOverflow(yyParser *yypParser){ ...@@ -1649,7 +1687,8 @@ static void yyStackOverflow(yyParser *yypParser){
** stack every overflows */ ** stack every overflows */
/******** Begin %stack_overflow code ******************************************/ /******** Begin %stack_overflow code ******************************************/
/******** End %stack_overflow code ********************************************/ /******** End %stack_overflow code ********************************************/
ParseARG_STORE; /* Suppress warning about unused %extra_argument var */ ParseARG_STORE /* Suppress warning about unused %extra_argument var */
ParseCTX_STORE
} }
/* /*
...@@ -1678,8 +1717,8 @@ static void yyTraceShift(yyParser *yypParser, int yyNewState, const char *zTag){ ...@@ -1678,8 +1717,8 @@ static void yyTraceShift(yyParser *yypParser, int yyNewState, const char *zTag){
*/ */
static void yy_shift( static void yy_shift(
yyParser *yypParser, /* The parser to be shifted */ yyParser *yypParser, /* The parser to be shifted */
int yyNewState, /* The new state to shift in */ YYACTIONTYPE yyNewState, /* The new state to shift in */
int yyMajor, /* The major token to shift in */ YYCODETYPE yyMajor, /* The major token to shift in */
ParseTOKENTYPE yyMinor /* The minor token to shift in */ ParseTOKENTYPE yyMinor /* The minor token to shift in */
){ ){
yyStackEntry *yytos; yyStackEntry *yytos;
...@@ -1709,259 +1748,516 @@ static void yy_shift( ...@@ -1709,259 +1748,516 @@ static void yy_shift(
yyNewState += YY_MIN_REDUCE - YY_MIN_SHIFTREDUCE; yyNewState += YY_MIN_REDUCE - YY_MIN_SHIFTREDUCE;
} }
yytos = yypParser->yytos; yytos = yypParser->yytos;
yytos->stateno = (YYACTIONTYPE)yyNewState; yytos->stateno = yyNewState;
yytos->major = (YYCODETYPE)yyMajor; yytos->major = yyMajor;
yytos->minor.yy0 = yyMinor; yytos->minor.yy0 = yyMinor;
yyTraceShift(yypParser, yyNewState, "Shift"); yyTraceShift(yypParser, yyNewState, "Shift");
} }
/* The following table contains information about every rule that /* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
** is used during the reduce. ** of that rule */
*/ static const YYCODETYPE yyRuleInfoLhs[] = {
static const struct { 209, /* (0) program ::= cmd */
YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ 210, /* (1) cmd ::= SHOW DATABASES */
signed char nrhs; /* Negative of the number of RHS symbols in the rule */ 210, /* (2) cmd ::= SHOW MNODES */
} yyRuleInfo[] = { 210, /* (3) cmd ::= SHOW DNODES */
{ 210, -1 }, /* (0) program ::= cmd */ 210, /* (4) cmd ::= SHOW ACCOUNTS */
{ 211, -2 }, /* (1) cmd ::= SHOW DATABASES */ 210, /* (5) cmd ::= SHOW USERS */
{ 211, -2 }, /* (2) cmd ::= SHOW MNODES */ 210, /* (6) cmd ::= SHOW MODULES */
{ 211, -2 }, /* (3) cmd ::= SHOW DNODES */ 210, /* (7) cmd ::= SHOW QUERIES */
{ 211, -2 }, /* (4) cmd ::= SHOW ACCOUNTS */ 210, /* (8) cmd ::= SHOW CONNECTIONS */
{ 211, -2 }, /* (5) cmd ::= SHOW USERS */ 210, /* (9) cmd ::= SHOW STREAMS */
{ 211, -2 }, /* (6) cmd ::= SHOW MODULES */ 210, /* (10) cmd ::= SHOW VARIABLES */
{ 211, -2 }, /* (7) cmd ::= SHOW QUERIES */ 210, /* (11) cmd ::= SHOW SCORES */
{ 211, -2 }, /* (8) cmd ::= SHOW CONNECTIONS */ 210, /* (12) cmd ::= SHOW GRANTS */
{ 211, -2 }, /* (9) cmd ::= SHOW STREAMS */ 210, /* (13) cmd ::= SHOW VNODES */
{ 211, -2 }, /* (10) cmd ::= SHOW VARIABLES */ 210, /* (14) cmd ::= SHOW VNODES IPTOKEN */
{ 211, -2 }, /* (11) cmd ::= SHOW SCORES */ 211, /* (15) dbPrefix ::= */
{ 211, -2 }, /* (12) cmd ::= SHOW GRANTS */ 211, /* (16) dbPrefix ::= ids DOT */
{ 211, -2 }, /* (13) cmd ::= SHOW VNODES */ 213, /* (17) cpxName ::= */
{ 211, -3 }, /* (14) cmd ::= SHOW VNODES IPTOKEN */ 213, /* (18) cpxName ::= DOT ids */
{ 212, 0 }, /* (15) dbPrefix ::= */ 210, /* (19) cmd ::= SHOW CREATE TABLE ids cpxName */
{ 212, -2 }, /* (16) dbPrefix ::= ids DOT */ 210, /* (20) cmd ::= SHOW CREATE DATABASE ids */
{ 214, 0 }, /* (17) cpxName ::= */ 210, /* (21) cmd ::= SHOW dbPrefix TABLES */
{ 214, -2 }, /* (18) cpxName ::= DOT ids */ 210, /* (22) cmd ::= SHOW dbPrefix TABLES LIKE ids */
{ 211, -5 }, /* (19) cmd ::= SHOW CREATE TABLE ids cpxName */ 210, /* (23) cmd ::= SHOW dbPrefix STABLES */
{ 211, -4 }, /* (20) cmd ::= SHOW CREATE DATABASE ids */ 210, /* (24) cmd ::= SHOW dbPrefix STABLES LIKE ids */
{ 211, -3 }, /* (21) cmd ::= SHOW dbPrefix TABLES */ 210, /* (25) cmd ::= SHOW dbPrefix VGROUPS */
{ 211, -5 }, /* (22) cmd ::= SHOW dbPrefix TABLES LIKE ids */ 210, /* (26) cmd ::= SHOW dbPrefix VGROUPS ids */
{ 211, -3 }, /* (23) cmd ::= SHOW dbPrefix STABLES */ 210, /* (27) cmd ::= DROP TABLE ifexists ids cpxName */
{ 211, -5 }, /* (24) cmd ::= SHOW dbPrefix STABLES LIKE ids */ 210, /* (28) cmd ::= DROP STABLE ifexists ids cpxName */
{ 211, -3 }, /* (25) cmd ::= SHOW dbPrefix VGROUPS */ 210, /* (29) cmd ::= DROP DATABASE ifexists ids */
{ 211, -4 }, /* (26) cmd ::= SHOW dbPrefix VGROUPS ids */ 210, /* (30) cmd ::= DROP DNODE ids */
{ 211, -5 }, /* (27) cmd ::= DROP TABLE ifexists ids cpxName */ 210, /* (31) cmd ::= DROP USER ids */
{ 211, -4 }, /* (28) cmd ::= DROP DATABASE ifexists ids */ 210, /* (32) cmd ::= DROP ACCOUNT ids */
{ 211, -3 }, /* (29) cmd ::= DROP DNODE ids */ 210, /* (33) cmd ::= USE ids */
{ 211, -3 }, /* (30) cmd ::= DROP USER ids */ 210, /* (34) cmd ::= DESCRIBE ids cpxName */
{ 211, -3 }, /* (31) cmd ::= DROP ACCOUNT ids */ 210, /* (35) cmd ::= ALTER USER ids PASS ids */
{ 211, -2 }, /* (32) cmd ::= USE ids */ 210, /* (36) cmd ::= ALTER USER ids PRIVILEGE ids */
{ 211, -3 }, /* (33) cmd ::= DESCRIBE ids cpxName */ 210, /* (37) cmd ::= ALTER DNODE ids ids */
{ 211, -5 }, /* (34) cmd ::= ALTER USER ids PASS ids */ 210, /* (38) cmd ::= ALTER DNODE ids ids ids */
{ 211, -5 }, /* (35) cmd ::= ALTER USER ids PRIVILEGE ids */ 210, /* (39) cmd ::= ALTER LOCAL ids */
{ 211, -4 }, /* (36) cmd ::= ALTER DNODE ids ids */ 210, /* (40) cmd ::= ALTER LOCAL ids ids */
{ 211, -5 }, /* (37) cmd ::= ALTER DNODE ids ids ids */ 210, /* (41) cmd ::= ALTER DATABASE ids alter_db_optr */
{ 211, -3 }, /* (38) cmd ::= ALTER LOCAL ids */ 210, /* (42) cmd ::= ALTER ACCOUNT ids acct_optr */
{ 211, -4 }, /* (39) cmd ::= ALTER LOCAL ids ids */ 210, /* (43) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
{ 211, -4 }, /* (40) cmd ::= ALTER DATABASE ids alter_db_optr */ 212, /* (44) ids ::= ID */
{ 211, -4 }, /* (41) cmd ::= ALTER ACCOUNT ids acct_optr */ 212, /* (45) ids ::= STRING */
{ 211, -6 }, /* (42) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ 214, /* (46) ifexists ::= IF EXISTS */
{ 213, -1 }, /* (43) ids ::= ID */ 214, /* (47) ifexists ::= */
{ 213, -1 }, /* (44) ids ::= STRING */ 217, /* (48) ifnotexists ::= IF NOT EXISTS */
{ 215, -2 }, /* (45) ifexists ::= IF EXISTS */ 217, /* (49) ifnotexists ::= */
{ 215, 0 }, /* (46) ifexists ::= */ 210, /* (50) cmd ::= CREATE DNODE ids */
{ 218, -3 }, /* (47) ifnotexists ::= IF NOT EXISTS */ 210, /* (51) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
{ 218, 0 }, /* (48) ifnotexists ::= */ 210, /* (52) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
{ 211, -3 }, /* (49) cmd ::= CREATE DNODE ids */ 210, /* (53) cmd ::= CREATE USER ids PASS ids */
{ 211, -6 }, /* (50) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ 219, /* (54) pps ::= */
{ 211, -5 }, /* (51) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ 219, /* (55) pps ::= PPS INTEGER */
{ 211, -5 }, /* (52) cmd ::= CREATE USER ids PASS ids */ 220, /* (56) tseries ::= */
{ 220, 0 }, /* (53) pps ::= */ 220, /* (57) tseries ::= TSERIES INTEGER */
{ 220, -2 }, /* (54) pps ::= PPS INTEGER */ 221, /* (58) dbs ::= */
{ 221, 0 }, /* (55) tseries ::= */ 221, /* (59) dbs ::= DBS INTEGER */
{ 221, -2 }, /* (56) tseries ::= TSERIES INTEGER */ 222, /* (60) streams ::= */
{ 222, 0 }, /* (57) dbs ::= */ 222, /* (61) streams ::= STREAMS INTEGER */
{ 222, -2 }, /* (58) dbs ::= DBS INTEGER */ 223, /* (62) storage ::= */
{ 223, 0 }, /* (59) streams ::= */ 223, /* (63) storage ::= STORAGE INTEGER */
{ 223, -2 }, /* (60) streams ::= STREAMS INTEGER */ 224, /* (64) qtime ::= */
{ 224, 0 }, /* (61) storage ::= */ 224, /* (65) qtime ::= QTIME INTEGER */
{ 224, -2 }, /* (62) storage ::= STORAGE INTEGER */ 225, /* (66) users ::= */
{ 225, 0 }, /* (63) qtime ::= */ 225, /* (67) users ::= USERS INTEGER */
{ 225, -2 }, /* (64) qtime ::= QTIME INTEGER */ 226, /* (68) conns ::= */
{ 226, 0 }, /* (65) users ::= */ 226, /* (69) conns ::= CONNS INTEGER */
{ 226, -2 }, /* (66) users ::= USERS INTEGER */ 227, /* (70) state ::= */
{ 227, 0 }, /* (67) conns ::= */ 227, /* (71) state ::= STATE ids */
{ 227, -2 }, /* (68) conns ::= CONNS INTEGER */ 216, /* (72) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
{ 228, 0 }, /* (69) state ::= */ 228, /* (73) keep ::= KEEP tagitemlist */
{ 228, -2 }, /* (70) state ::= STATE ids */ 230, /* (74) cache ::= CACHE INTEGER */
{ 217, -9 }, /* (71) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ 231, /* (75) replica ::= REPLICA INTEGER */
{ 229, -2 }, /* (72) keep ::= KEEP tagitemlist */ 232, /* (76) quorum ::= QUORUM INTEGER */
{ 231, -2 }, /* (73) cache ::= CACHE INTEGER */ 233, /* (77) days ::= DAYS INTEGER */
{ 232, -2 }, /* (74) replica ::= REPLICA INTEGER */ 234, /* (78) minrows ::= MINROWS INTEGER */
{ 233, -2 }, /* (75) quorum ::= QUORUM INTEGER */ 235, /* (79) maxrows ::= MAXROWS INTEGER */
{ 234, -2 }, /* (76) days ::= DAYS INTEGER */ 236, /* (80) blocks ::= BLOCKS INTEGER */
{ 235, -2 }, /* (77) minrows ::= MINROWS INTEGER */ 237, /* (81) ctime ::= CTIME INTEGER */
{ 236, -2 }, /* (78) maxrows ::= MAXROWS INTEGER */ 238, /* (82) wal ::= WAL INTEGER */
{ 237, -2 }, /* (79) blocks ::= BLOCKS INTEGER */ 239, /* (83) fsync ::= FSYNC INTEGER */
{ 238, -2 }, /* (80) ctime ::= CTIME INTEGER */ 240, /* (84) comp ::= COMP INTEGER */
{ 239, -2 }, /* (81) wal ::= WAL INTEGER */ 241, /* (85) prec ::= PRECISION STRING */
{ 240, -2 }, /* (82) fsync ::= FSYNC INTEGER */ 242, /* (86) update ::= UPDATE INTEGER */
{ 241, -2 }, /* (83) comp ::= COMP INTEGER */ 243, /* (87) cachelast ::= CACHELAST INTEGER */
{ 242, -2 }, /* (84) prec ::= PRECISION STRING */ 218, /* (88) db_optr ::= */
{ 243, -2 }, /* (85) update ::= UPDATE INTEGER */ 218, /* (89) db_optr ::= db_optr cache */
{ 244, -2 }, /* (86) cachelast ::= CACHELAST INTEGER */ 218, /* (90) db_optr ::= db_optr replica */
{ 219, 0 }, /* (87) db_optr ::= */ 218, /* (91) db_optr ::= db_optr quorum */
{ 219, -2 }, /* (88) db_optr ::= db_optr cache */ 218, /* (92) db_optr ::= db_optr days */
{ 219, -2 }, /* (89) db_optr ::= db_optr replica */ 218, /* (93) db_optr ::= db_optr minrows */
{ 219, -2 }, /* (90) db_optr ::= db_optr quorum */ 218, /* (94) db_optr ::= db_optr maxrows */
{ 219, -2 }, /* (91) db_optr ::= db_optr days */ 218, /* (95) db_optr ::= db_optr blocks */
{ 219, -2 }, /* (92) db_optr ::= db_optr minrows */ 218, /* (96) db_optr ::= db_optr ctime */
{ 219, -2 }, /* (93) db_optr ::= db_optr maxrows */ 218, /* (97) db_optr ::= db_optr wal */
{ 219, -2 }, /* (94) db_optr ::= db_optr blocks */ 218, /* (98) db_optr ::= db_optr fsync */
{ 219, -2 }, /* (95) db_optr ::= db_optr ctime */ 218, /* (99) db_optr ::= db_optr comp */
{ 219, -2 }, /* (96) db_optr ::= db_optr wal */ 218, /* (100) db_optr ::= db_optr prec */
{ 219, -2 }, /* (97) db_optr ::= db_optr fsync */ 218, /* (101) db_optr ::= db_optr keep */
{ 219, -2 }, /* (98) db_optr ::= db_optr comp */ 218, /* (102) db_optr ::= db_optr update */
{ 219, -2 }, /* (99) db_optr ::= db_optr prec */ 218, /* (103) db_optr ::= db_optr cachelast */
{ 219, -2 }, /* (100) db_optr ::= db_optr keep */ 215, /* (104) alter_db_optr ::= */
{ 219, -2 }, /* (101) db_optr ::= db_optr update */ 215, /* (105) alter_db_optr ::= alter_db_optr replica */
{ 219, -2 }, /* (102) db_optr ::= db_optr cachelast */ 215, /* (106) alter_db_optr ::= alter_db_optr quorum */
{ 216, 0 }, /* (103) alter_db_optr ::= */ 215, /* (107) alter_db_optr ::= alter_db_optr keep */
{ 216, -2 }, /* (104) alter_db_optr ::= alter_db_optr replica */ 215, /* (108) alter_db_optr ::= alter_db_optr blocks */
{ 216, -2 }, /* (105) alter_db_optr ::= alter_db_optr quorum */ 215, /* (109) alter_db_optr ::= alter_db_optr comp */
{ 216, -2 }, /* (106) alter_db_optr ::= alter_db_optr keep */ 215, /* (110) alter_db_optr ::= alter_db_optr wal */
{ 216, -2 }, /* (107) alter_db_optr ::= alter_db_optr blocks */ 215, /* (111) alter_db_optr ::= alter_db_optr fsync */
{ 216, -2 }, /* (108) alter_db_optr ::= alter_db_optr comp */ 215, /* (112) alter_db_optr ::= alter_db_optr update */
{ 216, -2 }, /* (109) alter_db_optr ::= alter_db_optr wal */ 215, /* (113) alter_db_optr ::= alter_db_optr cachelast */
{ 216, -2 }, /* (110) alter_db_optr ::= alter_db_optr fsync */ 244, /* (114) typename ::= ids */
{ 216, -2 }, /* (111) alter_db_optr ::= alter_db_optr update */ 244, /* (115) typename ::= ids LP signed RP */
{ 216, -2 }, /* (112) alter_db_optr ::= alter_db_optr cachelast */ 244, /* (116) typename ::= ids UNSIGNED */
{ 245, -1 }, /* (113) typename ::= ids */ 245, /* (117) signed ::= INTEGER */
{ 245, -4 }, /* (114) typename ::= ids LP signed RP */ 245, /* (118) signed ::= PLUS INTEGER */
{ 245, -2 }, /* (115) typename ::= ids UNSIGNED */ 245, /* (119) signed ::= MINUS INTEGER */
{ 246, -1 }, /* (116) signed ::= INTEGER */ 210, /* (120) cmd ::= CREATE TABLE create_table_args */
{ 246, -2 }, /* (117) signed ::= PLUS INTEGER */ 210, /* (121) cmd ::= CREATE TABLE create_stable_args */
{ 246, -2 }, /* (118) signed ::= MINUS INTEGER */ 210, /* (122) cmd ::= CREATE STABLE create_stable_args */
{ 211, -3 }, /* (119) cmd ::= CREATE TABLE create_table_args */ 210, /* (123) cmd ::= CREATE TABLE create_table_list */
{ 211, -3 }, /* (120) cmd ::= CREATE TABLE create_table_list */ 248, /* (124) create_table_list ::= create_from_stable */
{ 248, -1 }, /* (121) create_table_list ::= create_from_stable */ 248, /* (125) create_table_list ::= create_table_list create_from_stable */
{ 248, -2 }, /* (122) create_table_list ::= create_table_list create_from_stable */ 246, /* (126) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
{ 247, -6 }, /* (123) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ 247, /* (127) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
{ 247, -10 }, /* (124) create_table_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ 249, /* (128) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
{ 249, -10 }, /* (125) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ 246, /* (129) create_table_args ::= ifnotexists ids cpxName AS select */
{ 247, -5 }, /* (126) create_table_args ::= ifnotexists ids cpxName AS select */ 250, /* (130) columnlist ::= columnlist COMMA column */
{ 250, -3 }, /* (127) columnlist ::= columnlist COMMA column */ 250, /* (131) columnlist ::= column */
{ 250, -1 }, /* (128) columnlist ::= column */ 252, /* (132) column ::= ids typename */
{ 252, -2 }, /* (129) column ::= ids typename */ 229, /* (133) tagitemlist ::= tagitemlist COMMA tagitem */
{ 230, -3 }, /* (130) tagitemlist ::= tagitemlist COMMA tagitem */ 229, /* (134) tagitemlist ::= tagitem */
{ 230, -1 }, /* (131) tagitemlist ::= tagitem */ 253, /* (135) tagitem ::= INTEGER */
{ 253, -1 }, /* (132) tagitem ::= INTEGER */ 253, /* (136) tagitem ::= FLOAT */
{ 253, -1 }, /* (133) tagitem ::= FLOAT */ 253, /* (137) tagitem ::= STRING */
{ 253, -1 }, /* (134) tagitem ::= STRING */ 253, /* (138) tagitem ::= BOOL */
{ 253, -1 }, /* (135) tagitem ::= BOOL */ 253, /* (139) tagitem ::= NULL */
{ 253, -1 }, /* (136) tagitem ::= NULL */ 253, /* (140) tagitem ::= MINUS INTEGER */
{ 253, -2 }, /* (137) tagitem ::= MINUS INTEGER */ 253, /* (141) tagitem ::= MINUS FLOAT */
{ 253, -2 }, /* (138) tagitem ::= MINUS FLOAT */ 253, /* (142) tagitem ::= PLUS INTEGER */
{ 253, -2 }, /* (139) tagitem ::= PLUS INTEGER */ 253, /* (143) tagitem ::= PLUS FLOAT */
{ 253, -2 }, /* (140) tagitem ::= PLUS FLOAT */ 251, /* (144) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
{ 251, -12 }, /* (141) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ 265, /* (145) union ::= select */
{ 265, -1 }, /* (142) union ::= select */ 265, /* (146) union ::= LP union RP */
{ 265, -3 }, /* (143) union ::= LP union RP */ 265, /* (147) union ::= union UNION ALL select */
{ 265, -4 }, /* (144) union ::= union UNION ALL select */ 265, /* (148) union ::= union UNION ALL LP select RP */
{ 265, -6 }, /* (145) union ::= union UNION ALL LP select RP */ 210, /* (149) cmd ::= union */
{ 211, -1 }, /* (146) cmd ::= union */ 251, /* (150) select ::= SELECT selcollist */
{ 251, -2 }, /* (147) select ::= SELECT selcollist */ 266, /* (151) sclp ::= selcollist COMMA */
{ 266, -2 }, /* (148) sclp ::= selcollist COMMA */ 266, /* (152) sclp ::= */
{ 266, 0 }, /* (149) sclp ::= */ 254, /* (153) selcollist ::= sclp expr as */
{ 254, -3 }, /* (150) selcollist ::= sclp expr as */ 254, /* (154) selcollist ::= sclp STAR */
{ 254, -2 }, /* (151) selcollist ::= sclp STAR */ 268, /* (155) as ::= AS ids */
{ 268, -2 }, /* (152) as ::= AS ids */ 268, /* (156) as ::= ids */
{ 268, -1 }, /* (153) as ::= ids */ 268, /* (157) as ::= */
{ 268, 0 }, /* (154) as ::= */ 255, /* (158) from ::= FROM tablelist */
{ 255, -2 }, /* (155) from ::= FROM tablelist */ 269, /* (159) tablelist ::= ids cpxName */
{ 269, -2 }, /* (156) tablelist ::= ids cpxName */ 269, /* (160) tablelist ::= ids cpxName ids */
{ 269, -3 }, /* (157) tablelist ::= ids cpxName ids */ 269, /* (161) tablelist ::= tablelist COMMA ids cpxName */
{ 269, -4 }, /* (158) tablelist ::= tablelist COMMA ids cpxName */ 269, /* (162) tablelist ::= tablelist COMMA ids cpxName ids */
{ 269, -5 }, /* (159) tablelist ::= tablelist COMMA ids cpxName ids */ 270, /* (163) tmvar ::= VARIABLE */
{ 270, -1 }, /* (160) tmvar ::= VARIABLE */ 257, /* (164) interval_opt ::= INTERVAL LP tmvar RP */
{ 257, -4 }, /* (161) interval_opt ::= INTERVAL LP tmvar RP */ 257, /* (165) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
{ 257, -6 }, /* (162) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ 257, /* (166) interval_opt ::= */
{ 257, 0 }, /* (163) interval_opt ::= */ 258, /* (167) fill_opt ::= */
{ 258, 0 }, /* (164) fill_opt ::= */ 258, /* (168) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
{ 258, -6 }, /* (165) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ 258, /* (169) fill_opt ::= FILL LP ID RP */
{ 258, -4 }, /* (166) fill_opt ::= FILL LP ID RP */ 259, /* (170) sliding_opt ::= SLIDING LP tmvar RP */
{ 259, -4 }, /* (167) sliding_opt ::= SLIDING LP tmvar RP */ 259, /* (171) sliding_opt ::= */
{ 259, 0 }, /* (168) sliding_opt ::= */ 261, /* (172) orderby_opt ::= */
{ 261, 0 }, /* (169) orderby_opt ::= */ 261, /* (173) orderby_opt ::= ORDER BY sortlist */
{ 261, -3 }, /* (170) orderby_opt ::= ORDER BY sortlist */ 271, /* (174) sortlist ::= sortlist COMMA item sortorder */
{ 271, -4 }, /* (171) sortlist ::= sortlist COMMA item sortorder */ 271, /* (175) sortlist ::= item sortorder */
{ 271, -2 }, /* (172) sortlist ::= item sortorder */ 273, /* (176) item ::= ids cpxName */
{ 273, -2 }, /* (173) item ::= ids cpxName */ 274, /* (177) sortorder ::= ASC */
{ 274, -1 }, /* (174) sortorder ::= ASC */ 274, /* (178) sortorder ::= DESC */
{ 274, -1 }, /* (175) sortorder ::= DESC */ 274, /* (179) sortorder ::= */
{ 274, 0 }, /* (176) sortorder ::= */ 260, /* (180) groupby_opt ::= */
{ 260, 0 }, /* (177) groupby_opt ::= */ 260, /* (181) groupby_opt ::= GROUP BY grouplist */
{ 260, -3 }, /* (178) groupby_opt ::= GROUP BY grouplist */ 275, /* (182) grouplist ::= grouplist COMMA item */
{ 275, -3 }, /* (179) grouplist ::= grouplist COMMA item */ 275, /* (183) grouplist ::= item */
{ 275, -1 }, /* (180) grouplist ::= item */ 262, /* (184) having_opt ::= */
{ 262, 0 }, /* (181) having_opt ::= */ 262, /* (185) having_opt ::= HAVING expr */
{ 262, -2 }, /* (182) having_opt ::= HAVING expr */ 264, /* (186) limit_opt ::= */
{ 264, 0 }, /* (183) limit_opt ::= */ 264, /* (187) limit_opt ::= LIMIT signed */
{ 264, -2 }, /* (184) limit_opt ::= LIMIT signed */ 264, /* (188) limit_opt ::= LIMIT signed OFFSET signed */
{ 264, -4 }, /* (185) limit_opt ::= LIMIT signed OFFSET signed */ 264, /* (189) limit_opt ::= LIMIT signed COMMA signed */
{ 264, -4 }, /* (186) limit_opt ::= LIMIT signed COMMA signed */ 263, /* (190) slimit_opt ::= */
{ 263, 0 }, /* (187) slimit_opt ::= */ 263, /* (191) slimit_opt ::= SLIMIT signed */
{ 263, -2 }, /* (188) slimit_opt ::= SLIMIT signed */ 263, /* (192) slimit_opt ::= SLIMIT signed SOFFSET signed */
{ 263, -4 }, /* (189) slimit_opt ::= SLIMIT signed SOFFSET signed */ 263, /* (193) slimit_opt ::= SLIMIT signed COMMA signed */
{ 263, -4 }, /* (190) slimit_opt ::= SLIMIT signed COMMA signed */ 256, /* (194) where_opt ::= */
{ 256, 0 }, /* (191) where_opt ::= */ 256, /* (195) where_opt ::= WHERE expr */
{ 256, -2 }, /* (192) where_opt ::= WHERE expr */ 267, /* (196) expr ::= LP expr RP */
{ 267, -3 }, /* (193) expr ::= LP expr RP */ 267, /* (197) expr ::= ID */
{ 267, -1 }, /* (194) expr ::= ID */ 267, /* (198) expr ::= ID DOT ID */
{ 267, -3 }, /* (195) expr ::= ID DOT ID */ 267, /* (199) expr ::= ID DOT STAR */
{ 267, -3 }, /* (196) expr ::= ID DOT STAR */ 267, /* (200) expr ::= INTEGER */
{ 267, -1 }, /* (197) expr ::= INTEGER */ 267, /* (201) expr ::= MINUS INTEGER */
{ 267, -2 }, /* (198) expr ::= MINUS INTEGER */ 267, /* (202) expr ::= PLUS INTEGER */
{ 267, -2 }, /* (199) expr ::= PLUS INTEGER */ 267, /* (203) expr ::= FLOAT */
{ 267, -1 }, /* (200) expr ::= FLOAT */ 267, /* (204) expr ::= MINUS FLOAT */
{ 267, -2 }, /* (201) expr ::= MINUS FLOAT */ 267, /* (205) expr ::= PLUS FLOAT */
{ 267, -2 }, /* (202) expr ::= PLUS FLOAT */ 267, /* (206) expr ::= STRING */
{ 267, -1 }, /* (203) expr ::= STRING */ 267, /* (207) expr ::= NOW */
{ 267, -1 }, /* (204) expr ::= NOW */ 267, /* (208) expr ::= VARIABLE */
{ 267, -1 }, /* (205) expr ::= VARIABLE */ 267, /* (209) expr ::= BOOL */
{ 267, -1 }, /* (206) expr ::= BOOL */ 267, /* (210) expr ::= ID LP exprlist RP */
{ 267, -4 }, /* (207) expr ::= ID LP exprlist RP */ 267, /* (211) expr ::= ID LP STAR RP */
{ 267, -4 }, /* (208) expr ::= ID LP STAR RP */ 267, /* (212) expr ::= expr IS NULL */
{ 267, -3 }, /* (209) expr ::= expr IS NULL */ 267, /* (213) expr ::= expr IS NOT NULL */
{ 267, -4 }, /* (210) expr ::= expr IS NOT NULL */ 267, /* (214) expr ::= expr LT expr */
{ 267, -3 }, /* (211) expr ::= expr LT expr */ 267, /* (215) expr ::= expr GT expr */
{ 267, -3 }, /* (212) expr ::= expr GT expr */ 267, /* (216) expr ::= expr LE expr */
{ 267, -3 }, /* (213) expr ::= expr LE expr */ 267, /* (217) expr ::= expr GE expr */
{ 267, -3 }, /* (214) expr ::= expr GE expr */ 267, /* (218) expr ::= expr NE expr */
{ 267, -3 }, /* (215) expr ::= expr NE expr */ 267, /* (219) expr ::= expr EQ expr */
{ 267, -3 }, /* (216) expr ::= expr EQ expr */ 267, /* (220) expr ::= expr AND expr */
{ 267, -3 }, /* (217) expr ::= expr AND expr */ 267, /* (221) expr ::= expr OR expr */
{ 267, -3 }, /* (218) expr ::= expr OR expr */ 267, /* (222) expr ::= expr PLUS expr */
{ 267, -3 }, /* (219) expr ::= expr PLUS expr */ 267, /* (223) expr ::= expr MINUS expr */
{ 267, -3 }, /* (220) expr ::= expr MINUS expr */ 267, /* (224) expr ::= expr STAR expr */
{ 267, -3 }, /* (221) expr ::= expr STAR expr */ 267, /* (225) expr ::= expr SLASH expr */
{ 267, -3 }, /* (222) expr ::= expr SLASH expr */ 267, /* (226) expr ::= expr REM expr */
{ 267, -3 }, /* (223) expr ::= expr REM expr */ 267, /* (227) expr ::= expr LIKE expr */
{ 267, -3 }, /* (224) expr ::= expr LIKE expr */ 267, /* (228) expr ::= expr IN LP exprlist RP */
{ 267, -5 }, /* (225) expr ::= expr IN LP exprlist RP */ 276, /* (229) exprlist ::= exprlist COMMA expritem */
{ 276, -3 }, /* (226) exprlist ::= exprlist COMMA expritem */ 276, /* (230) exprlist ::= expritem */
{ 276, -1 }, /* (227) exprlist ::= expritem */ 277, /* (231) expritem ::= expr */
{ 277, -1 }, /* (228) expritem ::= expr */ 277, /* (232) expritem ::= */
{ 277, 0 }, /* (229) expritem ::= */ 210, /* (233) cmd ::= RESET QUERY CACHE */
{ 211, -3 }, /* (230) cmd ::= RESET QUERY CACHE */ 210, /* (234) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
{ 211, -7 }, /* (231) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ 210, /* (235) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
{ 211, -7 }, /* (232) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ 210, /* (236) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
{ 211, -7 }, /* (233) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ 210, /* (237) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
{ 211, -7 }, /* (234) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ 210, /* (238) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
{ 211, -8 }, /* (235) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ 210, /* (239) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
{ 211, -9 }, /* (236) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ 210, /* (240) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
{ 211, -3 }, /* (237) cmd ::= KILL CONNECTION INTEGER */ 210, /* (241) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
{ 211, -5 }, /* (238) cmd ::= KILL STREAM INTEGER COLON INTEGER */ 210, /* (242) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
{ 211, -5 }, /* (239) cmd ::= KILL QUERY INTEGER COLON INTEGER */ 210, /* (243) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
210, /* (244) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
210, /* (245) cmd ::= KILL CONNECTION INTEGER */
210, /* (246) cmd ::= KILL STREAM INTEGER COLON INTEGER */
210, /* (247) cmd ::= KILL QUERY INTEGER COLON INTEGER */
};
/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
** of symbols on the right-hand side of that rule. */
static const signed char yyRuleInfoNRhs[] = {
-1, /* (0) program ::= cmd */
-2, /* (1) cmd ::= SHOW DATABASES */
-2, /* (2) cmd ::= SHOW MNODES */
-2, /* (3) cmd ::= SHOW DNODES */
-2, /* (4) cmd ::= SHOW ACCOUNTS */
-2, /* (5) cmd ::= SHOW USERS */
-2, /* (6) cmd ::= SHOW MODULES */
-2, /* (7) cmd ::= SHOW QUERIES */
-2, /* (8) cmd ::= SHOW CONNECTIONS */
-2, /* (9) cmd ::= SHOW STREAMS */
-2, /* (10) cmd ::= SHOW VARIABLES */
-2, /* (11) cmd ::= SHOW SCORES */
-2, /* (12) cmd ::= SHOW GRANTS */
-2, /* (13) cmd ::= SHOW VNODES */
-3, /* (14) cmd ::= SHOW VNODES IPTOKEN */
0, /* (15) dbPrefix ::= */
-2, /* (16) dbPrefix ::= ids DOT */
0, /* (17) cpxName ::= */
-2, /* (18) cpxName ::= DOT ids */
-5, /* (19) cmd ::= SHOW CREATE TABLE ids cpxName */
-4, /* (20) cmd ::= SHOW CREATE DATABASE ids */
-3, /* (21) cmd ::= SHOW dbPrefix TABLES */
-5, /* (22) cmd ::= SHOW dbPrefix TABLES LIKE ids */
-3, /* (23) cmd ::= SHOW dbPrefix STABLES */
-5, /* (24) cmd ::= SHOW dbPrefix STABLES LIKE ids */
-3, /* (25) cmd ::= SHOW dbPrefix VGROUPS */
-4, /* (26) cmd ::= SHOW dbPrefix VGROUPS ids */
-5, /* (27) cmd ::= DROP TABLE ifexists ids cpxName */
-5, /* (28) cmd ::= DROP STABLE ifexists ids cpxName */
-4, /* (29) cmd ::= DROP DATABASE ifexists ids */
-3, /* (30) cmd ::= DROP DNODE ids */
-3, /* (31) cmd ::= DROP USER ids */
-3, /* (32) cmd ::= DROP ACCOUNT ids */
-2, /* (33) cmd ::= USE ids */
-3, /* (34) cmd ::= DESCRIBE ids cpxName */
-5, /* (35) cmd ::= ALTER USER ids PASS ids */
-5, /* (36) cmd ::= ALTER USER ids PRIVILEGE ids */
-4, /* (37) cmd ::= ALTER DNODE ids ids */
-5, /* (38) cmd ::= ALTER DNODE ids ids ids */
-3, /* (39) cmd ::= ALTER LOCAL ids */
-4, /* (40) cmd ::= ALTER LOCAL ids ids */
-4, /* (41) cmd ::= ALTER DATABASE ids alter_db_optr */
-4, /* (42) cmd ::= ALTER ACCOUNT ids acct_optr */
-6, /* (43) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
-1, /* (44) ids ::= ID */
-1, /* (45) ids ::= STRING */
-2, /* (46) ifexists ::= IF EXISTS */
0, /* (47) ifexists ::= */
-3, /* (48) ifnotexists ::= IF NOT EXISTS */
0, /* (49) ifnotexists ::= */
-3, /* (50) cmd ::= CREATE DNODE ids */
-6, /* (51) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
-5, /* (52) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
-5, /* (53) cmd ::= CREATE USER ids PASS ids */
0, /* (54) pps ::= */
-2, /* (55) pps ::= PPS INTEGER */
0, /* (56) tseries ::= */
-2, /* (57) tseries ::= TSERIES INTEGER */
0, /* (58) dbs ::= */
-2, /* (59) dbs ::= DBS INTEGER */
0, /* (60) streams ::= */
-2, /* (61) streams ::= STREAMS INTEGER */
0, /* (62) storage ::= */
-2, /* (63) storage ::= STORAGE INTEGER */
0, /* (64) qtime ::= */
-2, /* (65) qtime ::= QTIME INTEGER */
0, /* (66) users ::= */
-2, /* (67) users ::= USERS INTEGER */
0, /* (68) conns ::= */
-2, /* (69) conns ::= CONNS INTEGER */
0, /* (70) state ::= */
-2, /* (71) state ::= STATE ids */
-9, /* (72) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
-2, /* (73) keep ::= KEEP tagitemlist */
-2, /* (74) cache ::= CACHE INTEGER */
-2, /* (75) replica ::= REPLICA INTEGER */
-2, /* (76) quorum ::= QUORUM INTEGER */
-2, /* (77) days ::= DAYS INTEGER */
-2, /* (78) minrows ::= MINROWS INTEGER */
-2, /* (79) maxrows ::= MAXROWS INTEGER */
-2, /* (80) blocks ::= BLOCKS INTEGER */
-2, /* (81) ctime ::= CTIME INTEGER */
-2, /* (82) wal ::= WAL INTEGER */
-2, /* (83) fsync ::= FSYNC INTEGER */
-2, /* (84) comp ::= COMP INTEGER */
-2, /* (85) prec ::= PRECISION STRING */
-2, /* (86) update ::= UPDATE INTEGER */
-2, /* (87) cachelast ::= CACHELAST INTEGER */
0, /* (88) db_optr ::= */
-2, /* (89) db_optr ::= db_optr cache */
-2, /* (90) db_optr ::= db_optr replica */
-2, /* (91) db_optr ::= db_optr quorum */
-2, /* (92) db_optr ::= db_optr days */
-2, /* (93) db_optr ::= db_optr minrows */
-2, /* (94) db_optr ::= db_optr maxrows */
-2, /* (95) db_optr ::= db_optr blocks */
-2, /* (96) db_optr ::= db_optr ctime */
-2, /* (97) db_optr ::= db_optr wal */
-2, /* (98) db_optr ::= db_optr fsync */
-2, /* (99) db_optr ::= db_optr comp */
-2, /* (100) db_optr ::= db_optr prec */
-2, /* (101) db_optr ::= db_optr keep */
-2, /* (102) db_optr ::= db_optr update */
-2, /* (103) db_optr ::= db_optr cachelast */
0, /* (104) alter_db_optr ::= */
-2, /* (105) alter_db_optr ::= alter_db_optr replica */
-2, /* (106) alter_db_optr ::= alter_db_optr quorum */
-2, /* (107) alter_db_optr ::= alter_db_optr keep */
-2, /* (108) alter_db_optr ::= alter_db_optr blocks */
-2, /* (109) alter_db_optr ::= alter_db_optr comp */
-2, /* (110) alter_db_optr ::= alter_db_optr wal */
-2, /* (111) alter_db_optr ::= alter_db_optr fsync */
-2, /* (112) alter_db_optr ::= alter_db_optr update */
-2, /* (113) alter_db_optr ::= alter_db_optr cachelast */
-1, /* (114) typename ::= ids */
-4, /* (115) typename ::= ids LP signed RP */
-2, /* (116) typename ::= ids UNSIGNED */
-1, /* (117) signed ::= INTEGER */
-2, /* (118) signed ::= PLUS INTEGER */
-2, /* (119) signed ::= MINUS INTEGER */
-3, /* (120) cmd ::= CREATE TABLE create_table_args */
-3, /* (121) cmd ::= CREATE TABLE create_stable_args */
-3, /* (122) cmd ::= CREATE STABLE create_stable_args */
-3, /* (123) cmd ::= CREATE TABLE create_table_list */
-1, /* (124) create_table_list ::= create_from_stable */
-2, /* (125) create_table_list ::= create_table_list create_from_stable */
-6, /* (126) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
-10, /* (127) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
-10, /* (128) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
-5, /* (129) create_table_args ::= ifnotexists ids cpxName AS select */
-3, /* (130) columnlist ::= columnlist COMMA column */
-1, /* (131) columnlist ::= column */
-2, /* (132) column ::= ids typename */
-3, /* (133) tagitemlist ::= tagitemlist COMMA tagitem */
-1, /* (134) tagitemlist ::= tagitem */
-1, /* (135) tagitem ::= INTEGER */
-1, /* (136) tagitem ::= FLOAT */
-1, /* (137) tagitem ::= STRING */
-1, /* (138) tagitem ::= BOOL */
-1, /* (139) tagitem ::= NULL */
-2, /* (140) tagitem ::= MINUS INTEGER */
-2, /* (141) tagitem ::= MINUS FLOAT */
-2, /* (142) tagitem ::= PLUS INTEGER */
-2, /* (143) tagitem ::= PLUS FLOAT */
-12, /* (144) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
-1, /* (145) union ::= select */
-3, /* (146) union ::= LP union RP */
-4, /* (147) union ::= union UNION ALL select */
-6, /* (148) union ::= union UNION ALL LP select RP */
-1, /* (149) cmd ::= union */
-2, /* (150) select ::= SELECT selcollist */
-2, /* (151) sclp ::= selcollist COMMA */
0, /* (152) sclp ::= */
-3, /* (153) selcollist ::= sclp expr as */
-2, /* (154) selcollist ::= sclp STAR */
-2, /* (155) as ::= AS ids */
-1, /* (156) as ::= ids */
0, /* (157) as ::= */
-2, /* (158) from ::= FROM tablelist */
-2, /* (159) tablelist ::= ids cpxName */
-3, /* (160) tablelist ::= ids cpxName ids */
-4, /* (161) tablelist ::= tablelist COMMA ids cpxName */
-5, /* (162) tablelist ::= tablelist COMMA ids cpxName ids */
-1, /* (163) tmvar ::= VARIABLE */
-4, /* (164) interval_opt ::= INTERVAL LP tmvar RP */
-6, /* (165) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
0, /* (166) interval_opt ::= */
0, /* (167) fill_opt ::= */
-6, /* (168) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
-4, /* (169) fill_opt ::= FILL LP ID RP */
-4, /* (170) sliding_opt ::= SLIDING LP tmvar RP */
0, /* (171) sliding_opt ::= */
0, /* (172) orderby_opt ::= */
-3, /* (173) orderby_opt ::= ORDER BY sortlist */
-4, /* (174) sortlist ::= sortlist COMMA item sortorder */
-2, /* (175) sortlist ::= item sortorder */
-2, /* (176) item ::= ids cpxName */
-1, /* (177) sortorder ::= ASC */
-1, /* (178) sortorder ::= DESC */
0, /* (179) sortorder ::= */
0, /* (180) groupby_opt ::= */
-3, /* (181) groupby_opt ::= GROUP BY grouplist */
-3, /* (182) grouplist ::= grouplist COMMA item */
-1, /* (183) grouplist ::= item */
0, /* (184) having_opt ::= */
-2, /* (185) having_opt ::= HAVING expr */
0, /* (186) limit_opt ::= */
-2, /* (187) limit_opt ::= LIMIT signed */
-4, /* (188) limit_opt ::= LIMIT signed OFFSET signed */
-4, /* (189) limit_opt ::= LIMIT signed COMMA signed */
0, /* (190) slimit_opt ::= */
-2, /* (191) slimit_opt ::= SLIMIT signed */
-4, /* (192) slimit_opt ::= SLIMIT signed SOFFSET signed */
-4, /* (193) slimit_opt ::= SLIMIT signed COMMA signed */
0, /* (194) where_opt ::= */
-2, /* (195) where_opt ::= WHERE expr */
-3, /* (196) expr ::= LP expr RP */
-1, /* (197) expr ::= ID */
-3, /* (198) expr ::= ID DOT ID */
-3, /* (199) expr ::= ID DOT STAR */
-1, /* (200) expr ::= INTEGER */
-2, /* (201) expr ::= MINUS INTEGER */
-2, /* (202) expr ::= PLUS INTEGER */
-1, /* (203) expr ::= FLOAT */
-2, /* (204) expr ::= MINUS FLOAT */
-2, /* (205) expr ::= PLUS FLOAT */
-1, /* (206) expr ::= STRING */
-1, /* (207) expr ::= NOW */
-1, /* (208) expr ::= VARIABLE */
-1, /* (209) expr ::= BOOL */
-4, /* (210) expr ::= ID LP exprlist RP */
-4, /* (211) expr ::= ID LP STAR RP */
-3, /* (212) expr ::= expr IS NULL */
-4, /* (213) expr ::= expr IS NOT NULL */
-3, /* (214) expr ::= expr LT expr */
-3, /* (215) expr ::= expr GT expr */
-3, /* (216) expr ::= expr LE expr */
-3, /* (217) expr ::= expr GE expr */
-3, /* (218) expr ::= expr NE expr */
-3, /* (219) expr ::= expr EQ expr */
-3, /* (220) expr ::= expr AND expr */
-3, /* (221) expr ::= expr OR expr */
-3, /* (222) expr ::= expr PLUS expr */
-3, /* (223) expr ::= expr MINUS expr */
-3, /* (224) expr ::= expr STAR expr */
-3, /* (225) expr ::= expr SLASH expr */
-3, /* (226) expr ::= expr REM expr */
-3, /* (227) expr ::= expr LIKE expr */
-5, /* (228) expr ::= expr IN LP exprlist RP */
-3, /* (229) exprlist ::= exprlist COMMA expritem */
-1, /* (230) exprlist ::= expritem */
-1, /* (231) expritem ::= expr */
0, /* (232) expritem ::= */
-3, /* (233) cmd ::= RESET QUERY CACHE */
-7, /* (234) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
-7, /* (235) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
-7, /* (236) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
-7, /* (237) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
-8, /* (238) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
-9, /* (239) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
-7, /* (240) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
-7, /* (241) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
-7, /* (242) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
-7, /* (243) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
-8, /* (244) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
-3, /* (245) cmd ::= KILL CONNECTION INTEGER */
-5, /* (246) cmd ::= KILL STREAM INTEGER COLON INTEGER */
-5, /* (247) cmd ::= KILL QUERY INTEGER COLON INTEGER */
}; };
static void yy_accept(yyParser*); /* Forward Declaration */ static void yy_accept(yyParser*); /* Forward Declaration */
...@@ -1976,30 +2272,34 @@ static void yy_accept(yyParser*); /* Forward Declaration */ ...@@ -1976,30 +2272,34 @@ static void yy_accept(yyParser*); /* Forward Declaration */
** only called from one place, optimizing compilers will in-line it, which ** only called from one place, optimizing compilers will in-line it, which
** means that the extra parameters have no performance impact. ** means that the extra parameters have no performance impact.
*/ */
static void yy_reduce( static YYACTIONTYPE yy_reduce(
yyParser *yypParser, /* The parser */ yyParser *yypParser, /* The parser */
unsigned int yyruleno, /* Number of the rule by which to reduce */ unsigned int yyruleno, /* Number of the rule by which to reduce */
int yyLookahead, /* Lookahead token, or YYNOCODE if none */ int yyLookahead, /* Lookahead token, or YYNOCODE if none */
ParseTOKENTYPE yyLookaheadToken /* Value of the lookahead token */ ParseTOKENTYPE yyLookaheadToken /* Value of the lookahead token */
ParseCTX_PDECL /* %extra_context */
){ ){
int yygoto; /* The next state */ int yygoto; /* The next state */
int yyact; /* The next action */ YYACTIONTYPE yyact; /* The next action */
yyStackEntry *yymsp; /* The top of the parser's stack */ yyStackEntry *yymsp; /* The top of the parser's stack */
int yysize; /* Amount to pop the stack */ int yysize; /* Amount to pop the stack */
ParseARG_FETCH; ParseARG_FETCH
(void)yyLookahead; (void)yyLookahead;
(void)yyLookaheadToken; (void)yyLookaheadToken;
yymsp = yypParser->yytos; yymsp = yypParser->yytos;
#ifndef NDEBUG #ifndef NDEBUG
if( yyTraceFILE && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){ if( yyTraceFILE && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){
yysize = yyRuleInfo[yyruleno].nrhs; yysize = yyRuleInfoNRhs[yyruleno];
if( yysize ){ if( yysize ){
fprintf(yyTraceFILE, "%sReduce %d [%s], go to state %d.\n", fprintf(yyTraceFILE, "%sReduce %d [%s]%s, pop back to state %d.\n",
yyTracePrompt, yyTracePrompt,
yyruleno, yyRuleName[yyruleno], yymsp[yysize].stateno); yyruleno, yyRuleName[yyruleno],
yyruleno<YYNRULE_WITH_ACTION ? "" : " without external action",
yymsp[yysize].stateno);
}else{ }else{
fprintf(yyTraceFILE, "%sReduce %d [%s].\n", fprintf(yyTraceFILE, "%sReduce %d [%s]%s.\n",
yyTracePrompt, yyruleno, yyRuleName[yyruleno]); yyTracePrompt, yyruleno, yyRuleName[yyruleno],
yyruleno<YYNRULE_WITH_ACTION ? "" : " without external action");
} }
} }
#endif /* NDEBUG */ #endif /* NDEBUG */
...@@ -2007,7 +2307,7 @@ static void yy_reduce( ...@@ -2007,7 +2307,7 @@ static void yy_reduce(
/* Check that the stack is large enough to grow by a single entry /* Check that the stack is large enough to grow by a single entry
** if the RHS of the rule is empty. This ensures that there is room ** if the RHS of the rule is empty. This ensures that there is room
** enough on the stack to push the LHS value */ ** enough on the stack to push the LHS value */
if( yyRuleInfo[yyruleno].nrhs==0 ){ if( yyRuleInfoNRhs[yyruleno]==0 ){
#ifdef YYTRACKMAXSTACKDEPTH #ifdef YYTRACKMAXSTACKDEPTH
if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){ if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){
yypParser->yyhwm++; yypParser->yyhwm++;
...@@ -2017,13 +2317,19 @@ static void yy_reduce( ...@@ -2017,13 +2317,19 @@ static void yy_reduce(
#if YYSTACKDEPTH>0 #if YYSTACKDEPTH>0
if( yypParser->yytos>=yypParser->yystackEnd ){ if( yypParser->yytos>=yypParser->yystackEnd ){
yyStackOverflow(yypParser); yyStackOverflow(yypParser);
return; /* The call to yyStackOverflow() above pops the stack until it is
** empty, causing the main parser loop to exit. So the return value
** is never used and does not matter. */
return 0;
} }
#else #else
if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz-1] ){ if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz-1] ){
if( yyGrowStack(yypParser) ){ if( yyGrowStack(yypParser) ){
yyStackOverflow(yypParser); yyStackOverflow(yypParser);
return; /* The call to yyStackOverflow() above pops the stack until it is
** empty, causing the main parser loop to exit. So the return value
** is never used and does not matter. */
return 0;
} }
yymsp = yypParser->yytos; yymsp = yypParser->yytos;
} }
...@@ -2042,7 +2348,9 @@ static void yy_reduce( ...@@ -2042,7 +2348,9 @@ static void yy_reduce(
/********** Begin reduce actions **********************************************/ /********** Begin reduce actions **********************************************/
YYMINORTYPE yylhsminor; YYMINORTYPE yylhsminor;
case 0: /* program ::= cmd */ case 0: /* program ::= cmd */
case 119: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==119); case 120: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==120);
case 121: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==121);
case 122: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==122);
{} {}
break; break;
case 1: /* cmd ::= SHOW DATABASES */ case 1: /* cmd ::= SHOW DATABASES */
...@@ -2150,107 +2458,113 @@ static void yy_reduce( ...@@ -2150,107 +2458,113 @@ static void yy_reduce(
case 27: /* cmd ::= DROP TABLE ifexists ids cpxName */ case 27: /* cmd ::= DROP TABLE ifexists ids cpxName */
{ {
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &yymsp[-1].minor.yy0, &yymsp[-2].minor.yy0); setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &yymsp[-1].minor.yy0, &yymsp[-2].minor.yy0, -1);
}
break;
case 28: /* cmd ::= DROP STABLE ifexists ids cpxName */
{
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &yymsp[-1].minor.yy0, &yymsp[-2].minor.yy0, TSDB_SUPER_TABLE);
} }
break; break;
case 28: /* cmd ::= DROP DATABASE ifexists ids */ case 29: /* cmd ::= DROP DATABASE ifexists ids */
{ setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &yymsp[0].minor.yy0, &yymsp[-1].minor.yy0); } { setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &yymsp[0].minor.yy0, &yymsp[-1].minor.yy0, -1); }
break; break;
case 29: /* cmd ::= DROP DNODE ids */ case 30: /* cmd ::= DROP DNODE ids */
{ setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &yymsp[0].minor.yy0); } { setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &yymsp[0].minor.yy0); }
break; break;
case 30: /* cmd ::= DROP USER ids */ case 31: /* cmd ::= DROP USER ids */
{ setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &yymsp[0].minor.yy0); } { setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &yymsp[0].minor.yy0); }
break; break;
case 31: /* cmd ::= DROP ACCOUNT ids */ case 32: /* cmd ::= DROP ACCOUNT ids */
{ setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &yymsp[0].minor.yy0); } { setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &yymsp[0].minor.yy0); }
break; break;
case 32: /* cmd ::= USE ids */ case 33: /* cmd ::= USE ids */
{ setDCLSQLElems(pInfo, TSDB_SQL_USE_DB, 1, &yymsp[0].minor.yy0);} { setDCLSQLElems(pInfo, TSDB_SQL_USE_DB, 1, &yymsp[0].minor.yy0);}
break; break;
case 33: /* cmd ::= DESCRIBE ids cpxName */ case 34: /* cmd ::= DESCRIBE ids cpxName */
{ {
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
setDCLSQLElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &yymsp[-1].minor.yy0); setDCLSQLElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &yymsp[-1].minor.yy0);
} }
break; break;
case 34: /* cmd ::= ALTER USER ids PASS ids */ case 35: /* cmd ::= ALTER USER ids PASS ids */
{ setAlterUserSql(pInfo, TSDB_ALTER_USER_PASSWD, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, NULL); } { setAlterUserSql(pInfo, TSDB_ALTER_USER_PASSWD, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, NULL); }
break; break;
case 35: /* cmd ::= ALTER USER ids PRIVILEGE ids */ case 36: /* cmd ::= ALTER USER ids PRIVILEGE ids */
{ setAlterUserSql(pInfo, TSDB_ALTER_USER_PRIVILEGES, &yymsp[-2].minor.yy0, NULL, &yymsp[0].minor.yy0);} { setAlterUserSql(pInfo, TSDB_ALTER_USER_PRIVILEGES, &yymsp[-2].minor.yy0, NULL, &yymsp[0].minor.yy0);}
break; break;
case 36: /* cmd ::= ALTER DNODE ids ids */ case 37: /* cmd ::= ALTER DNODE ids ids */
{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
break; break;
case 37: /* cmd ::= ALTER DNODE ids ids ids */ case 38: /* cmd ::= ALTER DNODE ids ids ids */
{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &yymsp[-2].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &yymsp[-2].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
break; break;
case 38: /* cmd ::= ALTER LOCAL ids */ case 39: /* cmd ::= ALTER LOCAL ids */
{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &yymsp[0].minor.yy0); } { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &yymsp[0].minor.yy0); }
break; break;
case 39: /* cmd ::= ALTER LOCAL ids ids */ case 40: /* cmd ::= ALTER LOCAL ids ids */
{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
break; break;
case 40: /* cmd ::= ALTER DATABASE ids alter_db_optr */ case 41: /* cmd ::= ALTER DATABASE ids alter_db_optr */
{ SStrToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy234, &t);} { SStrToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy234, &t);}
break; break;
case 41: /* cmd ::= ALTER ACCOUNT ids acct_optr */ case 42: /* cmd ::= ALTER ACCOUNT ids acct_optr */
{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy71);} { setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy71);}
break; break;
case 42: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ case 43: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy71);} { setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy71);}
break; break;
case 43: /* ids ::= ID */ case 44: /* ids ::= ID */
case 44: /* ids ::= STRING */ yytestcase(yyruleno==44); case 45: /* ids ::= STRING */ yytestcase(yyruleno==45);
{yylhsminor.yy0 = yymsp[0].minor.yy0; } {yylhsminor.yy0 = yymsp[0].minor.yy0; }
yymsp[0].minor.yy0 = yylhsminor.yy0; yymsp[0].minor.yy0 = yylhsminor.yy0;
break; break;
case 45: /* ifexists ::= IF EXISTS */ case 46: /* ifexists ::= IF EXISTS */
{ yymsp[-1].minor.yy0.n = 1;} { yymsp[-1].minor.yy0.n = 1;}
break; break;
case 46: /* ifexists ::= */ case 47: /* ifexists ::= */
case 48: /* ifnotexists ::= */ yytestcase(yyruleno==48); case 49: /* ifnotexists ::= */ yytestcase(yyruleno==49);
{ yymsp[1].minor.yy0.n = 0;} { yymsp[1].minor.yy0.n = 0;}
break; break;
case 47: /* ifnotexists ::= IF NOT EXISTS */ case 48: /* ifnotexists ::= IF NOT EXISTS */
{ yymsp[-2].minor.yy0.n = 1;} { yymsp[-2].minor.yy0.n = 1;}
break; break;
case 49: /* cmd ::= CREATE DNODE ids */ case 50: /* cmd ::= CREATE DNODE ids */
{ setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);}
break; break;
case 50: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ case 51: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy71);} { setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy71);}
break; break;
case 51: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ case 52: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */
{ setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy234, &yymsp[-2].minor.yy0);} { setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy234, &yymsp[-2].minor.yy0);}
break; break;
case 52: /* cmd ::= CREATE USER ids PASS ids */ case 53: /* cmd ::= CREATE USER ids PASS ids */
{ setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}
break; break;
case 53: /* pps ::= */ case 54: /* pps ::= */
case 55: /* tseries ::= */ yytestcase(yyruleno==55); case 56: /* tseries ::= */ yytestcase(yyruleno==56);
case 57: /* dbs ::= */ yytestcase(yyruleno==57); case 58: /* dbs ::= */ yytestcase(yyruleno==58);
case 59: /* streams ::= */ yytestcase(yyruleno==59); case 60: /* streams ::= */ yytestcase(yyruleno==60);
case 61: /* storage ::= */ yytestcase(yyruleno==61); case 62: /* storage ::= */ yytestcase(yyruleno==62);
case 63: /* qtime ::= */ yytestcase(yyruleno==63); case 64: /* qtime ::= */ yytestcase(yyruleno==64);
case 65: /* users ::= */ yytestcase(yyruleno==65); case 66: /* users ::= */ yytestcase(yyruleno==66);
case 67: /* conns ::= */ yytestcase(yyruleno==67); case 68: /* conns ::= */ yytestcase(yyruleno==68);
case 69: /* state ::= */ yytestcase(yyruleno==69); case 70: /* state ::= */ yytestcase(yyruleno==70);
{ yymsp[1].minor.yy0.n = 0; } { yymsp[1].minor.yy0.n = 0; }
break; break;
case 54: /* pps ::= PPS INTEGER */ case 55: /* pps ::= PPS INTEGER */
case 56: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==56); case 57: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==57);
case 58: /* dbs ::= DBS INTEGER */ yytestcase(yyruleno==58); case 59: /* dbs ::= DBS INTEGER */ yytestcase(yyruleno==59);
case 60: /* streams ::= STREAMS INTEGER */ yytestcase(yyruleno==60); case 61: /* streams ::= STREAMS INTEGER */ yytestcase(yyruleno==61);
case 62: /* storage ::= STORAGE INTEGER */ yytestcase(yyruleno==62); case 63: /* storage ::= STORAGE INTEGER */ yytestcase(yyruleno==63);
case 64: /* qtime ::= QTIME INTEGER */ yytestcase(yyruleno==64); case 65: /* qtime ::= QTIME INTEGER */ yytestcase(yyruleno==65);
case 66: /* users ::= USERS INTEGER */ yytestcase(yyruleno==66); case 67: /* users ::= USERS INTEGER */ yytestcase(yyruleno==67);
case 68: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==68); case 69: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==69);
case 70: /* state ::= STATE ids */ yytestcase(yyruleno==70); case 71: /* state ::= STATE ids */ yytestcase(yyruleno==71);
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
break; break;
case 71: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ case 72: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */
{ {
yylhsminor.yy71.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; yylhsminor.yy71.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
yylhsminor.yy71.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; yylhsminor.yy71.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
...@@ -2264,108 +2578,108 @@ static void yy_reduce( ...@@ -2264,108 +2578,108 @@ static void yy_reduce(
} }
yymsp[-8].minor.yy71 = yylhsminor.yy71; yymsp[-8].minor.yy71 = yylhsminor.yy71;
break; break;
case 72: /* keep ::= KEEP tagitemlist */ case 73: /* keep ::= KEEP tagitemlist */
{ yymsp[-1].minor.yy421 = yymsp[0].minor.yy421; } { yymsp[-1].minor.yy421 = yymsp[0].minor.yy421; }
break; break;
case 73: /* cache ::= CACHE INTEGER */ case 74: /* cache ::= CACHE INTEGER */
case 74: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==74); case 75: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==75);
case 75: /* quorum ::= QUORUM INTEGER */ yytestcase(yyruleno==75); case 76: /* quorum ::= QUORUM INTEGER */ yytestcase(yyruleno==76);
case 76: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==76); case 77: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==77);
case 77: /* minrows ::= MINROWS INTEGER */ yytestcase(yyruleno==77); case 78: /* minrows ::= MINROWS INTEGER */ yytestcase(yyruleno==78);
case 78: /* maxrows ::= MAXROWS INTEGER */ yytestcase(yyruleno==78); case 79: /* maxrows ::= MAXROWS INTEGER */ yytestcase(yyruleno==79);
case 79: /* blocks ::= BLOCKS INTEGER */ yytestcase(yyruleno==79); case 80: /* blocks ::= BLOCKS INTEGER */ yytestcase(yyruleno==80);
case 80: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==80); case 81: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==81);
case 81: /* wal ::= WAL INTEGER */ yytestcase(yyruleno==81); case 82: /* wal ::= WAL INTEGER */ yytestcase(yyruleno==82);
case 82: /* fsync ::= FSYNC INTEGER */ yytestcase(yyruleno==82); case 83: /* fsync ::= FSYNC INTEGER */ yytestcase(yyruleno==83);
case 83: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==83); case 84: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==84);
case 84: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==84); case 85: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==85);
case 85: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==85); case 86: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==86);
case 86: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==86); case 87: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==87);
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
break; break;
case 87: /* db_optr ::= */ case 88: /* db_optr ::= */
{setDefaultCreateDbOption(&yymsp[1].minor.yy234);} {setDefaultCreateDbOption(&yymsp[1].minor.yy234);}
break; break;
case 88: /* db_optr ::= db_optr cache */ case 89: /* db_optr ::= db_optr cache */
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 89: /* db_optr ::= db_optr replica */ case 90: /* db_optr ::= db_optr replica */
case 104: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==104); case 105: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==105);
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 90: /* db_optr ::= db_optr quorum */ case 91: /* db_optr ::= db_optr quorum */
case 105: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==105); case 106: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==106);
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 91: /* db_optr ::= db_optr days */ case 92: /* db_optr ::= db_optr days */
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 92: /* db_optr ::= db_optr minrows */ case 93: /* db_optr ::= db_optr minrows */
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 93: /* db_optr ::= db_optr maxrows */ case 94: /* db_optr ::= db_optr maxrows */
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 94: /* db_optr ::= db_optr blocks */ case 95: /* db_optr ::= db_optr blocks */
case 107: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==107); case 108: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==108);
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 95: /* db_optr ::= db_optr ctime */ case 96: /* db_optr ::= db_optr ctime */
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 96: /* db_optr ::= db_optr wal */ case 97: /* db_optr ::= db_optr wal */
case 109: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==109); case 110: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==110);
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 97: /* db_optr ::= db_optr fsync */ case 98: /* db_optr ::= db_optr fsync */
case 110: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==110); case 111: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==111);
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 98: /* db_optr ::= db_optr comp */ case 99: /* db_optr ::= db_optr comp */
case 108: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==108); case 109: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==109);
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 99: /* db_optr ::= db_optr prec */ case 100: /* db_optr ::= db_optr prec */
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.precision = yymsp[0].minor.yy0; } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.precision = yymsp[0].minor.yy0; }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 100: /* db_optr ::= db_optr keep */ case 101: /* db_optr ::= db_optr keep */
case 106: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==106); case 107: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==107);
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.keep = yymsp[0].minor.yy421; } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.keep = yymsp[0].minor.yy421; }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 101: /* db_optr ::= db_optr update */ case 102: /* db_optr ::= db_optr update */
case 111: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==111); case 112: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==112);
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 102: /* db_optr ::= db_optr cachelast */ case 103: /* db_optr ::= db_optr cachelast */
case 112: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==112); case 113: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==113);
{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy234 = yylhsminor.yy234; yymsp[-1].minor.yy234 = yylhsminor.yy234;
break; break;
case 103: /* alter_db_optr ::= */ case 104: /* alter_db_optr ::= */
{ setDefaultCreateDbOption(&yymsp[1].minor.yy234);} { setDefaultCreateDbOption(&yymsp[1].minor.yy234);}
break; break;
case 113: /* typename ::= ids */ case 114: /* typename ::= ids */
{ {
yymsp[0].minor.yy0.type = 0; yymsp[0].minor.yy0.type = 0;
tSqlSetColumnType (&yylhsminor.yy183, &yymsp[0].minor.yy0); tSqlSetColumnType (&yylhsminor.yy183, &yymsp[0].minor.yy0);
} }
yymsp[0].minor.yy183 = yylhsminor.yy183; yymsp[0].minor.yy183 = yylhsminor.yy183;
break; break;
case 114: /* typename ::= ids LP signed RP */ case 115: /* typename ::= ids LP signed RP */
{ {
if (yymsp[-1].minor.yy325 <= 0) { if (yymsp[-1].minor.yy325 <= 0) {
yymsp[-3].minor.yy0.type = 0; yymsp[-3].minor.yy0.type = 0;
...@@ -2377,7 +2691,7 @@ static void yy_reduce( ...@@ -2377,7 +2691,7 @@ static void yy_reduce(
} }
yymsp[-3].minor.yy183 = yylhsminor.yy183; yymsp[-3].minor.yy183 = yylhsminor.yy183;
break; break;
case 115: /* typename ::= ids UNSIGNED */ case 116: /* typename ::= ids UNSIGNED */
{ {
yymsp[-1].minor.yy0.type = 0; 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); yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z);
...@@ -2385,20 +2699,20 @@ static void yy_reduce( ...@@ -2385,20 +2699,20 @@ static void yy_reduce(
} }
yymsp[-1].minor.yy183 = yylhsminor.yy183; yymsp[-1].minor.yy183 = yylhsminor.yy183;
break; break;
case 116: /* signed ::= INTEGER */ case 117: /* signed ::= INTEGER */
{ yylhsminor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yylhsminor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[0].minor.yy325 = yylhsminor.yy325; yymsp[0].minor.yy325 = yylhsminor.yy325;
break; break;
case 117: /* signed ::= PLUS INTEGER */ case 118: /* signed ::= PLUS INTEGER */
{ yymsp[-1].minor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } { yymsp[-1].minor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
break; break;
case 118: /* signed ::= MINUS INTEGER */ case 119: /* signed ::= MINUS INTEGER */
{ yymsp[-1].minor.yy325 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} { yymsp[-1].minor.yy325 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
break; break;
case 120: /* cmd ::= CREATE TABLE create_table_list */ case 123: /* cmd ::= CREATE TABLE create_table_list */
{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy38;} { pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy38;}
break; break;
case 121: /* create_table_list ::= create_from_stable */ case 124: /* create_table_list ::= create_from_stable */
{ {
SCreateTableSQL* pCreateTable = calloc(1, sizeof(SCreateTableSQL)); SCreateTableSQL* pCreateTable = calloc(1, sizeof(SCreateTableSQL));
pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo));
...@@ -2409,14 +2723,14 @@ static void yy_reduce( ...@@ -2409,14 +2723,14 @@ static void yy_reduce(
} }
yymsp[0].minor.yy38 = yylhsminor.yy38; yymsp[0].minor.yy38 = yylhsminor.yy38;
break; break;
case 122: /* create_table_list ::= create_table_list create_from_stable */ case 125: /* create_table_list ::= create_table_list create_from_stable */
{ {
taosArrayPush(yymsp[-1].minor.yy38->childTableInfo, &yymsp[0].minor.yy152); taosArrayPush(yymsp[-1].minor.yy38->childTableInfo, &yymsp[0].minor.yy152);
yylhsminor.yy38 = yymsp[-1].minor.yy38; yylhsminor.yy38 = yymsp[-1].minor.yy38;
} }
yymsp[-1].minor.yy38 = yylhsminor.yy38; yymsp[-1].minor.yy38 = yylhsminor.yy38;
break; break;
case 123: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ case 126: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
{ {
yylhsminor.yy38 = tSetCreateSqlElems(yymsp[-1].minor.yy421, NULL, NULL, TSQL_CREATE_TABLE); yylhsminor.yy38 = tSetCreateSqlElems(yymsp[-1].minor.yy421, NULL, NULL, TSQL_CREATE_TABLE);
setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE); setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE);
...@@ -2426,7 +2740,7 @@ static void yy_reduce( ...@@ -2426,7 +2740,7 @@ static void yy_reduce(
} }
yymsp[-5].minor.yy38 = yylhsminor.yy38; yymsp[-5].minor.yy38 = yylhsminor.yy38;
break; break;
case 124: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ case 127: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
{ {
yylhsminor.yy38 = tSetCreateSqlElems(yymsp[-5].minor.yy421, yymsp[-1].minor.yy421, NULL, TSQL_CREATE_STABLE); yylhsminor.yy38 = tSetCreateSqlElems(yymsp[-5].minor.yy421, yymsp[-1].minor.yy421, NULL, TSQL_CREATE_STABLE);
setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE); setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE);
...@@ -2436,7 +2750,7 @@ static void yy_reduce( ...@@ -2436,7 +2750,7 @@ static void yy_reduce(
} }
yymsp[-9].minor.yy38 = yylhsminor.yy38; yymsp[-9].minor.yy38 = yylhsminor.yy38;
break; break;
case 125: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ case 128: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
{ {
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
...@@ -2444,7 +2758,7 @@ static void yy_reduce( ...@@ -2444,7 +2758,7 @@ static void yy_reduce(
} }
yymsp[-9].minor.yy152 = yylhsminor.yy152; yymsp[-9].minor.yy152 = yylhsminor.yy152;
break; break;
case 126: /* create_table_args ::= ifnotexists ids cpxName AS select */ case 129: /* create_table_args ::= ifnotexists ids cpxName AS select */
{ {
yylhsminor.yy38 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy148, TSQL_CREATE_STREAM); yylhsminor.yy38 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy148, TSQL_CREATE_STREAM);
setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE); setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE);
...@@ -2454,43 +2768,43 @@ static void yy_reduce( ...@@ -2454,43 +2768,43 @@ static void yy_reduce(
} }
yymsp[-4].minor.yy38 = yylhsminor.yy38; yymsp[-4].minor.yy38 = yylhsminor.yy38;
break; break;
case 127: /* columnlist ::= columnlist COMMA column */ case 130: /* columnlist ::= columnlist COMMA column */
{taosArrayPush(yymsp[-2].minor.yy421, &yymsp[0].minor.yy183); yylhsminor.yy421 = yymsp[-2].minor.yy421; } {taosArrayPush(yymsp[-2].minor.yy421, &yymsp[0].minor.yy183); yylhsminor.yy421 = yymsp[-2].minor.yy421; }
yymsp[-2].minor.yy421 = yylhsminor.yy421; yymsp[-2].minor.yy421 = yylhsminor.yy421;
break; break;
case 128: /* columnlist ::= column */ case 131: /* columnlist ::= column */
{yylhsminor.yy421 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy421, &yymsp[0].minor.yy183);} {yylhsminor.yy421 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy421, &yymsp[0].minor.yy183);}
yymsp[0].minor.yy421 = yylhsminor.yy421; yymsp[0].minor.yy421 = yylhsminor.yy421;
break; break;
case 129: /* column ::= ids typename */ case 132: /* column ::= ids typename */
{ {
tSqlSetColumnInfo(&yylhsminor.yy183, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy183); tSqlSetColumnInfo(&yylhsminor.yy183, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy183);
} }
yymsp[-1].minor.yy183 = yylhsminor.yy183; yymsp[-1].minor.yy183 = yylhsminor.yy183;
break; break;
case 130: /* tagitemlist ::= tagitemlist COMMA tagitem */ case 133: /* tagitemlist ::= tagitemlist COMMA tagitem */
{ yylhsminor.yy421 = tVariantListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy430, -1); } { yylhsminor.yy421 = tVariantListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy430, -1); }
yymsp[-2].minor.yy421 = yylhsminor.yy421; yymsp[-2].minor.yy421 = yylhsminor.yy421;
break; break;
case 131: /* tagitemlist ::= tagitem */ case 134: /* tagitemlist ::= tagitem */
{ yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[0].minor.yy430, -1); } { yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[0].minor.yy430, -1); }
yymsp[0].minor.yy421 = yylhsminor.yy421; yymsp[0].minor.yy421 = yylhsminor.yy421;
break; break;
case 132: /* tagitem ::= INTEGER */ case 135: /* tagitem ::= INTEGER */
case 133: /* tagitem ::= FLOAT */ yytestcase(yyruleno==133); case 136: /* tagitem ::= FLOAT */ yytestcase(yyruleno==136);
case 134: /* tagitem ::= STRING */ yytestcase(yyruleno==134); case 137: /* tagitem ::= STRING */ yytestcase(yyruleno==137);
case 135: /* tagitem ::= BOOL */ yytestcase(yyruleno==135); case 138: /* tagitem ::= BOOL */ yytestcase(yyruleno==138);
{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0); } { toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0); }
yymsp[0].minor.yy430 = yylhsminor.yy430; yymsp[0].minor.yy430 = yylhsminor.yy430;
break; break;
case 136: /* tagitem ::= NULL */ case 139: /* tagitem ::= NULL */
{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0); } { yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0); }
yymsp[0].minor.yy430 = yylhsminor.yy430; yymsp[0].minor.yy430 = yylhsminor.yy430;
break; break;
case 137: /* tagitem ::= MINUS INTEGER */ case 140: /* tagitem ::= MINUS INTEGER */
case 138: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==138); case 141: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==141);
case 139: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==139); case 142: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==142);
case 140: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==140); case 143: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==143);
{ {
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type; yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type;
...@@ -2499,70 +2813,70 @@ static void yy_reduce( ...@@ -2499,70 +2813,70 @@ static void yy_reduce(
} }
yymsp[-1].minor.yy430 = yylhsminor.yy430; yymsp[-1].minor.yy430 = yylhsminor.yy430;
break; break;
case 141: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ case 144: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
{ {
yylhsminor.yy148 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy166, yymsp[-9].minor.yy421, yymsp[-8].minor.yy78, yymsp[-4].minor.yy421, yymsp[-3].minor.yy421, &yymsp[-7].minor.yy400, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy421, &yymsp[0].minor.yy167, &yymsp[-1].minor.yy167); yylhsminor.yy148 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy166, yymsp[-9].minor.yy421, yymsp[-8].minor.yy78, yymsp[-4].minor.yy421, yymsp[-3].minor.yy421, &yymsp[-7].minor.yy400, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy421, &yymsp[0].minor.yy167, &yymsp[-1].minor.yy167);
} }
yymsp[-11].minor.yy148 = yylhsminor.yy148; yymsp[-11].minor.yy148 = yylhsminor.yy148;
break; break;
case 142: /* union ::= select */ case 145: /* union ::= select */
{ yylhsminor.yy153 = setSubclause(NULL, yymsp[0].minor.yy148); } { yylhsminor.yy153 = setSubclause(NULL, yymsp[0].minor.yy148); }
yymsp[0].minor.yy153 = yylhsminor.yy153; yymsp[0].minor.yy153 = yylhsminor.yy153;
break; break;
case 143: /* union ::= LP union RP */ case 146: /* union ::= LP union RP */
{ yymsp[-2].minor.yy153 = yymsp[-1].minor.yy153; } { yymsp[-2].minor.yy153 = yymsp[-1].minor.yy153; }
break; break;
case 144: /* union ::= union UNION ALL select */ case 147: /* union ::= union UNION ALL select */
{ yylhsminor.yy153 = appendSelectClause(yymsp[-3].minor.yy153, yymsp[0].minor.yy148); } { yylhsminor.yy153 = appendSelectClause(yymsp[-3].minor.yy153, yymsp[0].minor.yy148); }
yymsp[-3].minor.yy153 = yylhsminor.yy153; yymsp[-3].minor.yy153 = yylhsminor.yy153;
break; break;
case 145: /* union ::= union UNION ALL LP select RP */ case 148: /* union ::= union UNION ALL LP select RP */
{ yylhsminor.yy153 = appendSelectClause(yymsp[-5].minor.yy153, yymsp[-1].minor.yy148); } { yylhsminor.yy153 = appendSelectClause(yymsp[-5].minor.yy153, yymsp[-1].minor.yy148); }
yymsp[-5].minor.yy153 = yylhsminor.yy153; yymsp[-5].minor.yy153 = yylhsminor.yy153;
break; break;
case 146: /* cmd ::= union */ case 149: /* cmd ::= union */
{ setSqlInfo(pInfo, yymsp[0].minor.yy153, NULL, TSDB_SQL_SELECT); } { setSqlInfo(pInfo, yymsp[0].minor.yy153, NULL, TSDB_SQL_SELECT); }
break; break;
case 147: /* select ::= SELECT selcollist */ case 150: /* select ::= SELECT selcollist */
{ {
yylhsminor.yy148 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy166, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); yylhsminor.yy148 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy166, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
} }
yymsp[-1].minor.yy148 = yylhsminor.yy148; yymsp[-1].minor.yy148 = yylhsminor.yy148;
break; break;
case 148: /* sclp ::= selcollist COMMA */ case 151: /* sclp ::= selcollist COMMA */
{yylhsminor.yy166 = yymsp[-1].minor.yy166;} {yylhsminor.yy166 = yymsp[-1].minor.yy166;}
yymsp[-1].minor.yy166 = yylhsminor.yy166; yymsp[-1].minor.yy166 = yylhsminor.yy166;
break; break;
case 149: /* sclp ::= */ case 152: /* sclp ::= */
{yymsp[1].minor.yy166 = 0;} {yymsp[1].minor.yy166 = 0;}
break; break;
case 150: /* selcollist ::= sclp expr as */ case 153: /* selcollist ::= sclp expr as */
{ {
yylhsminor.yy166 = tSqlExprListAppend(yymsp[-2].minor.yy166, yymsp[-1].minor.yy78, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); yylhsminor.yy166 = tSqlExprListAppend(yymsp[-2].minor.yy166, yymsp[-1].minor.yy78, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
} }
yymsp[-2].minor.yy166 = yylhsminor.yy166; yymsp[-2].minor.yy166 = yylhsminor.yy166;
break; break;
case 151: /* selcollist ::= sclp STAR */ case 154: /* selcollist ::= sclp STAR */
{ {
tSQLExpr *pNode = tSqlExprIdValueCreate(NULL, TK_ALL); tSQLExpr *pNode = tSqlExprIdValueCreate(NULL, TK_ALL);
yylhsminor.yy166 = tSqlExprListAppend(yymsp[-1].minor.yy166, pNode, 0); yylhsminor.yy166 = tSqlExprListAppend(yymsp[-1].minor.yy166, pNode, 0);
} }
yymsp[-1].minor.yy166 = yylhsminor.yy166; yymsp[-1].minor.yy166 = yylhsminor.yy166;
break; break;
case 152: /* as ::= AS ids */ case 155: /* as ::= AS ids */
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
break; break;
case 153: /* as ::= ids */ case 156: /* as ::= ids */
{ yylhsminor.yy0 = yymsp[0].minor.yy0; } { yylhsminor.yy0 = yymsp[0].minor.yy0; }
yymsp[0].minor.yy0 = yylhsminor.yy0; yymsp[0].minor.yy0 = yylhsminor.yy0;
break; break;
case 154: /* as ::= */ case 157: /* as ::= */
{ yymsp[1].minor.yy0.n = 0; } { yymsp[1].minor.yy0.n = 0; }
break; break;
case 155: /* from ::= FROM tablelist */ case 158: /* from ::= FROM tablelist */
{yymsp[-1].minor.yy421 = yymsp[0].minor.yy421;} {yymsp[-1].minor.yy421 = yymsp[0].minor.yy421;}
break; break;
case 156: /* tablelist ::= ids cpxName */ case 159: /* tablelist ::= ids cpxName */
{ {
toTSDBType(yymsp[-1].minor.yy0.type); toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
...@@ -2571,7 +2885,7 @@ static void yy_reduce( ...@@ -2571,7 +2885,7 @@ static void yy_reduce(
} }
yymsp[-1].minor.yy421 = yylhsminor.yy421; yymsp[-1].minor.yy421 = yylhsminor.yy421;
break; break;
case 157: /* tablelist ::= ids cpxName ids */ case 160: /* tablelist ::= ids cpxName ids */
{ {
toTSDBType(yymsp[-2].minor.yy0.type); toTSDBType(yymsp[-2].minor.yy0.type);
toTSDBType(yymsp[0].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type);
...@@ -2581,7 +2895,7 @@ static void yy_reduce( ...@@ -2581,7 +2895,7 @@ static void yy_reduce(
} }
yymsp[-2].minor.yy421 = yylhsminor.yy421; yymsp[-2].minor.yy421 = yylhsminor.yy421;
break; break;
case 158: /* tablelist ::= tablelist COMMA ids cpxName */ case 161: /* tablelist ::= tablelist COMMA ids cpxName */
{ {
toTSDBType(yymsp[-1].minor.yy0.type); toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
...@@ -2590,7 +2904,7 @@ static void yy_reduce( ...@@ -2590,7 +2904,7 @@ static void yy_reduce(
} }
yymsp[-3].minor.yy421 = yylhsminor.yy421; yymsp[-3].minor.yy421 = yylhsminor.yy421;
break; break;
case 159: /* tablelist ::= tablelist COMMA ids cpxName ids */ case 162: /* tablelist ::= tablelist COMMA ids cpxName ids */
{ {
toTSDBType(yymsp[-2].minor.yy0.type); toTSDBType(yymsp[-2].minor.yy0.type);
toTSDBType(yymsp[0].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type);
...@@ -2600,23 +2914,23 @@ static void yy_reduce( ...@@ -2600,23 +2914,23 @@ static void yy_reduce(
} }
yymsp[-4].minor.yy421 = yylhsminor.yy421; yymsp[-4].minor.yy421 = yylhsminor.yy421;
break; break;
case 160: /* tmvar ::= VARIABLE */ case 163: /* tmvar ::= VARIABLE */
{yylhsminor.yy0 = yymsp[0].minor.yy0;} {yylhsminor.yy0 = yymsp[0].minor.yy0;}
yymsp[0].minor.yy0 = yylhsminor.yy0; yymsp[0].minor.yy0 = yylhsminor.yy0;
break; break;
case 161: /* interval_opt ::= INTERVAL LP tmvar RP */ case 164: /* interval_opt ::= INTERVAL LP tmvar RP */
{yymsp[-3].minor.yy400.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy400.offset.n = 0; yymsp[-3].minor.yy400.offset.z = NULL; yymsp[-3].minor.yy400.offset.type = 0;} {yymsp[-3].minor.yy400.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy400.offset.n = 0; yymsp[-3].minor.yy400.offset.z = NULL; yymsp[-3].minor.yy400.offset.type = 0;}
break; break;
case 162: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ case 165: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
{yymsp[-5].minor.yy400.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy400.offset = yymsp[-1].minor.yy0;} {yymsp[-5].minor.yy400.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy400.offset = yymsp[-1].minor.yy0;}
break; break;
case 163: /* interval_opt ::= */ case 166: /* interval_opt ::= */
{memset(&yymsp[1].minor.yy400, 0, sizeof(yymsp[1].minor.yy400));} {memset(&yymsp[1].minor.yy400, 0, sizeof(yymsp[1].minor.yy400));}
break; break;
case 164: /* fill_opt ::= */ case 167: /* fill_opt ::= */
{yymsp[1].minor.yy421 = 0; } {yymsp[1].minor.yy421 = 0; }
break; break;
case 165: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ case 168: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
{ {
tVariant A = {0}; tVariant A = {0};
toTSDBType(yymsp[-3].minor.yy0.type); toTSDBType(yymsp[-3].minor.yy0.type);
...@@ -2626,37 +2940,37 @@ static void yy_reduce( ...@@ -2626,37 +2940,37 @@ static void yy_reduce(
yymsp[-5].minor.yy421 = yymsp[-1].minor.yy421; yymsp[-5].minor.yy421 = yymsp[-1].minor.yy421;
} }
break; break;
case 166: /* fill_opt ::= FILL LP ID RP */ case 169: /* fill_opt ::= FILL LP ID RP */
{ {
toTSDBType(yymsp[-1].minor.yy0.type); toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-3].minor.yy421 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); yymsp[-3].minor.yy421 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
} }
break; break;
case 167: /* sliding_opt ::= SLIDING LP tmvar RP */ case 170: /* sliding_opt ::= SLIDING LP tmvar RP */
{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } {yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; }
break; break;
case 168: /* sliding_opt ::= */ case 171: /* sliding_opt ::= */
{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; }
break; break;
case 169: /* orderby_opt ::= */ case 172: /* orderby_opt ::= */
{yymsp[1].minor.yy421 = 0;} {yymsp[1].minor.yy421 = 0;}
break; break;
case 170: /* orderby_opt ::= ORDER BY sortlist */ case 173: /* orderby_opt ::= ORDER BY sortlist */
{yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;} {yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;}
break; break;
case 171: /* sortlist ::= sortlist COMMA item sortorder */ case 174: /* sortlist ::= sortlist COMMA item sortorder */
{ {
yylhsminor.yy421 = tVariantListAppend(yymsp[-3].minor.yy421, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96); yylhsminor.yy421 = tVariantListAppend(yymsp[-3].minor.yy421, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96);
} }
yymsp[-3].minor.yy421 = yylhsminor.yy421; yymsp[-3].minor.yy421 = yylhsminor.yy421;
break; break;
case 172: /* sortlist ::= item sortorder */ case 175: /* sortlist ::= item sortorder */
{ {
yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96); yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96);
} }
yymsp[-1].minor.yy421 = yylhsminor.yy421; yymsp[-1].minor.yy421 = yylhsminor.yy421;
break; break;
case 173: /* item ::= ids cpxName */ case 176: /* item ::= ids cpxName */
{ {
toTSDBType(yymsp[-1].minor.yy0.type); toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
...@@ -2665,240 +2979,240 @@ static void yy_reduce( ...@@ -2665,240 +2979,240 @@ static void yy_reduce(
} }
yymsp[-1].minor.yy430 = yylhsminor.yy430; yymsp[-1].minor.yy430 = yylhsminor.yy430;
break; break;
case 174: /* sortorder ::= ASC */ case 177: /* sortorder ::= ASC */
{ yymsp[0].minor.yy96 = TSDB_ORDER_ASC; } { yymsp[0].minor.yy96 = TSDB_ORDER_ASC; }
break; break;
case 175: /* sortorder ::= DESC */ case 178: /* sortorder ::= DESC */
{ yymsp[0].minor.yy96 = TSDB_ORDER_DESC;} { yymsp[0].minor.yy96 = TSDB_ORDER_DESC;}
break; break;
case 176: /* sortorder ::= */ case 179: /* sortorder ::= */
{ yymsp[1].minor.yy96 = TSDB_ORDER_ASC; } { yymsp[1].minor.yy96 = TSDB_ORDER_ASC; }
break; break;
case 177: /* groupby_opt ::= */ case 180: /* groupby_opt ::= */
{ yymsp[1].minor.yy421 = 0;} { yymsp[1].minor.yy421 = 0;}
break; break;
case 178: /* groupby_opt ::= GROUP BY grouplist */ case 181: /* groupby_opt ::= GROUP BY grouplist */
{ yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;} { yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;}
break; break;
case 179: /* grouplist ::= grouplist COMMA item */ case 182: /* grouplist ::= grouplist COMMA item */
{ {
yylhsminor.yy421 = tVariantListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy430, -1); yylhsminor.yy421 = tVariantListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy430, -1);
} }
yymsp[-2].minor.yy421 = yylhsminor.yy421; yymsp[-2].minor.yy421 = yylhsminor.yy421;
break; break;
case 180: /* grouplist ::= item */ case 183: /* grouplist ::= item */
{ {
yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[0].minor.yy430, -1); yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[0].minor.yy430, -1);
} }
yymsp[0].minor.yy421 = yylhsminor.yy421; yymsp[0].minor.yy421 = yylhsminor.yy421;
break; break;
case 181: /* having_opt ::= */ case 184: /* having_opt ::= */
case 191: /* where_opt ::= */ yytestcase(yyruleno==191); case 194: /* where_opt ::= */ yytestcase(yyruleno==194);
case 229: /* expritem ::= */ yytestcase(yyruleno==229); case 232: /* expritem ::= */ yytestcase(yyruleno==232);
{yymsp[1].minor.yy78 = 0;} {yymsp[1].minor.yy78 = 0;}
break; break;
case 182: /* having_opt ::= HAVING expr */ case 185: /* having_opt ::= HAVING expr */
case 192: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==192); case 195: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==195);
{yymsp[-1].minor.yy78 = yymsp[0].minor.yy78;} {yymsp[-1].minor.yy78 = yymsp[0].minor.yy78;}
break; break;
case 183: /* limit_opt ::= */ case 186: /* limit_opt ::= */
case 187: /* slimit_opt ::= */ yytestcase(yyruleno==187); case 190: /* slimit_opt ::= */ yytestcase(yyruleno==190);
{yymsp[1].minor.yy167.limit = -1; yymsp[1].minor.yy167.offset = 0;} {yymsp[1].minor.yy167.limit = -1; yymsp[1].minor.yy167.offset = 0;}
break; break;
case 184: /* limit_opt ::= LIMIT signed */ case 187: /* limit_opt ::= LIMIT signed */
case 188: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==188); case 191: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==191);
{yymsp[-1].minor.yy167.limit = yymsp[0].minor.yy325; yymsp[-1].minor.yy167.offset = 0;} {yymsp[-1].minor.yy167.limit = yymsp[0].minor.yy325; yymsp[-1].minor.yy167.offset = 0;}
break; break;
case 185: /* limit_opt ::= LIMIT signed OFFSET signed */ case 188: /* limit_opt ::= LIMIT signed OFFSET signed */
{ yymsp[-3].minor.yy167.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[0].minor.yy325;} { yymsp[-3].minor.yy167.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[0].minor.yy325;}
break; break;
case 186: /* limit_opt ::= LIMIT signed COMMA signed */ case 189: /* limit_opt ::= LIMIT signed COMMA signed */
{ yymsp[-3].minor.yy167.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[-2].minor.yy325;} { yymsp[-3].minor.yy167.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[-2].minor.yy325;}
break; break;
case 189: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ case 192: /* slimit_opt ::= SLIMIT signed SOFFSET signed */
{yymsp[-3].minor.yy167.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[0].minor.yy325;} {yymsp[-3].minor.yy167.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[0].minor.yy325;}
break; break;
case 190: /* slimit_opt ::= SLIMIT signed COMMA signed */ case 193: /* slimit_opt ::= SLIMIT signed COMMA signed */
{yymsp[-3].minor.yy167.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[-2].minor.yy325;} {yymsp[-3].minor.yy167.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[-2].minor.yy325;}
break; break;
case 193: /* expr ::= LP expr RP */ case 196: /* expr ::= LP expr RP */
{yylhsminor.yy78 = yymsp[-1].minor.yy78; yylhsminor.yy78->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy78->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} {yylhsminor.yy78 = yymsp[-1].minor.yy78; yylhsminor.yy78->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy78->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 194: /* expr ::= ID */ case 197: /* expr ::= ID */
{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} { yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);}
yymsp[0].minor.yy78 = yylhsminor.yy78; yymsp[0].minor.yy78 = yylhsminor.yy78;
break; break;
case 195: /* expr ::= ID DOT ID */ case 198: /* expr ::= ID DOT ID */
{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} { yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 196: /* expr ::= ID DOT STAR */ case 199: /* expr ::= ID DOT STAR */
{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} { yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 197: /* expr ::= INTEGER */ case 200: /* expr ::= INTEGER */
{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} { yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);}
yymsp[0].minor.yy78 = yylhsminor.yy78; yymsp[0].minor.yy78 = yylhsminor.yy78;
break; break;
case 198: /* expr ::= MINUS INTEGER */ case 201: /* expr ::= MINUS INTEGER */
case 199: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==199); case 202: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==202);
{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);}
yymsp[-1].minor.yy78 = yylhsminor.yy78; yymsp[-1].minor.yy78 = yylhsminor.yy78;
break; break;
case 200: /* expr ::= FLOAT */ case 203: /* expr ::= FLOAT */
{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} { yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);}
yymsp[0].minor.yy78 = yylhsminor.yy78; yymsp[0].minor.yy78 = yylhsminor.yy78;
break; break;
case 201: /* expr ::= MINUS FLOAT */ case 204: /* expr ::= MINUS FLOAT */
case 202: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==202); case 205: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==205);
{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);}
yymsp[-1].minor.yy78 = yylhsminor.yy78; yymsp[-1].minor.yy78 = yylhsminor.yy78;
break; break;
case 203: /* expr ::= STRING */ case 206: /* expr ::= STRING */
{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} { yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);}
yymsp[0].minor.yy78 = yylhsminor.yy78; yymsp[0].minor.yy78 = yylhsminor.yy78;
break; break;
case 204: /* expr ::= NOW */ case 207: /* expr ::= NOW */
{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } { yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); }
yymsp[0].minor.yy78 = yylhsminor.yy78; yymsp[0].minor.yy78 = yylhsminor.yy78;
break; break;
case 205: /* expr ::= VARIABLE */ case 208: /* expr ::= VARIABLE */
{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} { yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);}
yymsp[0].minor.yy78 = yylhsminor.yy78; yymsp[0].minor.yy78 = yylhsminor.yy78;
break; break;
case 206: /* expr ::= BOOL */ case 209: /* expr ::= BOOL */
{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} { yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);}
yymsp[0].minor.yy78 = yylhsminor.yy78; yymsp[0].minor.yy78 = yylhsminor.yy78;
break; break;
case 207: /* expr ::= ID LP exprlist RP */ case 210: /* expr ::= ID LP exprlist RP */
{ yylhsminor.yy78 = tSqlExprCreateFunction(yymsp[-1].minor.yy166, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } { yylhsminor.yy78 = tSqlExprCreateFunction(yymsp[-1].minor.yy166, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
yymsp[-3].minor.yy78 = yylhsminor.yy78; yymsp[-3].minor.yy78 = yylhsminor.yy78;
break; break;
case 208: /* expr ::= ID LP STAR RP */ case 211: /* expr ::= ID LP STAR RP */
{ yylhsminor.yy78 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } { yylhsminor.yy78 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
yymsp[-3].minor.yy78 = yylhsminor.yy78; yymsp[-3].minor.yy78 = yylhsminor.yy78;
break; break;
case 209: /* expr ::= expr IS NULL */ case 212: /* expr ::= expr IS NULL */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, NULL, TK_ISNULL);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, NULL, TK_ISNULL);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 210: /* expr ::= expr IS NOT NULL */ case 213: /* expr ::= expr IS NOT NULL */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-3].minor.yy78, NULL, TK_NOTNULL);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-3].minor.yy78, NULL, TK_NOTNULL);}
yymsp[-3].minor.yy78 = yylhsminor.yy78; yymsp[-3].minor.yy78 = yylhsminor.yy78;
break; break;
case 211: /* expr ::= expr LT expr */ case 214: /* expr ::= expr LT expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_LT);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_LT);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 212: /* expr ::= expr GT expr */ case 215: /* expr ::= expr GT expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_GT);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_GT);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 213: /* expr ::= expr LE expr */ case 216: /* expr ::= expr LE expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_LE);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_LE);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 214: /* expr ::= expr GE expr */ case 217: /* expr ::= expr GE expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_GE);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_GE);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 215: /* expr ::= expr NE expr */ case 218: /* expr ::= expr NE expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_NE);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_NE);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 216: /* expr ::= expr EQ expr */ case 219: /* expr ::= expr EQ expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_EQ);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_EQ);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 217: /* expr ::= expr AND expr */ case 220: /* expr ::= expr AND expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_AND);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_AND);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 218: /* expr ::= expr OR expr */ case 221: /* expr ::= expr OR expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_OR); } {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_OR); }
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 219: /* expr ::= expr PLUS expr */ case 222: /* expr ::= expr PLUS expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_PLUS); } {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_PLUS); }
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 220: /* expr ::= expr MINUS expr */ case 223: /* expr ::= expr MINUS expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_MINUS); } {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_MINUS); }
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 221: /* expr ::= expr STAR expr */ case 224: /* expr ::= expr STAR expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_STAR); } {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_STAR); }
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 222: /* expr ::= expr SLASH expr */ case 225: /* expr ::= expr SLASH expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_DIVIDE);} {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_DIVIDE);}
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 223: /* expr ::= expr REM expr */ case 226: /* expr ::= expr REM expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_REM); } {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_REM); }
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 224: /* expr ::= expr LIKE expr */ case 227: /* expr ::= expr LIKE expr */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_LIKE); } {yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_LIKE); }
yymsp[-2].minor.yy78 = yylhsminor.yy78; yymsp[-2].minor.yy78 = yylhsminor.yy78;
break; break;
case 225: /* expr ::= expr IN LP exprlist RP */ case 228: /* expr ::= expr IN LP exprlist RP */
{yylhsminor.yy78 = tSqlExprCreate(yymsp[-4].minor.yy78, (tSQLExpr*)yymsp[-1].minor.yy166, TK_IN); } {yylhsminor.yy78 = tSqlExprCreate(yymsp[-4].minor.yy78, (tSQLExpr*)yymsp[-1].minor.yy166, TK_IN); }
yymsp[-4].minor.yy78 = yylhsminor.yy78; yymsp[-4].minor.yy78 = yylhsminor.yy78;
break; break;
case 226: /* exprlist ::= exprlist COMMA expritem */ case 229: /* exprlist ::= exprlist COMMA expritem */
{yylhsminor.yy166 = tSqlExprListAppend(yymsp[-2].minor.yy166,yymsp[0].minor.yy78,0);} {yylhsminor.yy166 = tSqlExprListAppend(yymsp[-2].minor.yy166,yymsp[0].minor.yy78,0);}
yymsp[-2].minor.yy166 = yylhsminor.yy166; yymsp[-2].minor.yy166 = yylhsminor.yy166;
break; break;
case 227: /* exprlist ::= expritem */ case 230: /* exprlist ::= expritem */
{yylhsminor.yy166 = tSqlExprListAppend(0,yymsp[0].minor.yy78,0);} {yylhsminor.yy166 = tSqlExprListAppend(0,yymsp[0].minor.yy78,0);}
yymsp[0].minor.yy166 = yylhsminor.yy166; yymsp[0].minor.yy166 = yylhsminor.yy166;
break; break;
case 228: /* expritem ::= expr */ case 231: /* expritem ::= expr */
{yylhsminor.yy78 = yymsp[0].minor.yy78;} {yylhsminor.yy78 = yymsp[0].minor.yy78;}
yymsp[0].minor.yy78 = yylhsminor.yy78; yymsp[0].minor.yy78 = yylhsminor.yy78;
break; break;
case 230: /* cmd ::= RESET QUERY CACHE */ case 233: /* cmd ::= RESET QUERY CACHE */
{ setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
break; break;
case 231: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ case 234: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
{ {
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
break; break;
case 232: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ case 235: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
{ {
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
toTSDBType(yymsp[0].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type);
SArray* K = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1); SArray* K = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
break; break;
case 233: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ case 236: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
{ {
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
break; break;
case 234: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ case 237: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
{ {
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
toTSDBType(yymsp[0].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type);
SArray* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1); SArray* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
break; break;
case 235: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ case 238: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
{ {
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
...@@ -2908,11 +3222,11 @@ static void yy_reduce( ...@@ -2908,11 +3222,11 @@ static void yy_reduce(
toTSDBType(yymsp[0].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type);
A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1); A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
break; break;
case 236: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ case 239: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
{ {
yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
...@@ -2920,26 +3234,76 @@ static void yy_reduce( ...@@ -2920,26 +3234,76 @@ static void yy_reduce(
SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
A = tVariantListAppend(A, &yymsp[0].minor.yy430, -1); A = tVariantListAppend(A, &yymsp[0].minor.yy430, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
} }
break; break;
case 237: /* cmd ::= KILL CONNECTION INTEGER */ case 240: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&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);
}
break;
case 241: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
toTSDBType(yymsp[0].minor.yy0.type);
SArray* K = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 242: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&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);
}
break;
case 243: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
toTSDBType(yymsp[0].minor.yy0.type);
SArray* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 244: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
toTSDBType(yymsp[-1].minor.yy0.type);
SArray* A = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
toTSDBType(yymsp[0].minor.yy0.type);
A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1);
SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 245: /* cmd ::= KILL CONNECTION INTEGER */
{setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);}
break; break;
case 238: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ case 246: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
{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);} {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);}
break; break;
case 239: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ case 247: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
{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);} {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);}
break; break;
default: default:
break; break;
/********** End reduce actions ************************************************/ /********** End reduce actions ************************************************/
}; };
assert( yyruleno<sizeof(yyRuleInfo)/sizeof(yyRuleInfo[0]) ); assert( yyruleno<sizeof(yyRuleInfoLhs)/sizeof(yyRuleInfoLhs[0]) );
yygoto = yyRuleInfo[yyruleno].lhs; yygoto = yyRuleInfoLhs[yyruleno];
yysize = yyRuleInfo[yyruleno].nrhs; yysize = yyRuleInfoNRhs[yyruleno];
yyact = yy_find_reduce_action(yymsp[yysize].stateno,(YYCODETYPE)yygoto); yyact = yy_find_reduce_action(yymsp[yysize].stateno,(YYCODETYPE)yygoto);
/* There are no SHIFTREDUCE actions on nonterminals because the table /* There are no SHIFTREDUCE actions on nonterminals because the table
...@@ -2954,6 +3318,7 @@ static void yy_reduce( ...@@ -2954,6 +3318,7 @@ static void yy_reduce(
yymsp->stateno = (YYACTIONTYPE)yyact; yymsp->stateno = (YYACTIONTYPE)yyact;
yymsp->major = (YYCODETYPE)yygoto; yymsp->major = (YYCODETYPE)yygoto;
yyTraceShift(yypParser, yyact, "... then shift"); yyTraceShift(yypParser, yyact, "... then shift");
return yyact;
} }
/* /*
...@@ -2963,7 +3328,8 @@ static void yy_reduce( ...@@ -2963,7 +3328,8 @@ static void yy_reduce(
static void yy_parse_failed( static void yy_parse_failed(
yyParser *yypParser /* The parser */ yyParser *yypParser /* The parser */
){ ){
ParseARG_FETCH; ParseARG_FETCH
ParseCTX_FETCH
#ifndef NDEBUG #ifndef NDEBUG
if( yyTraceFILE ){ if( yyTraceFILE ){
fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt); fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt);
...@@ -2974,7 +3340,8 @@ static void yy_parse_failed( ...@@ -2974,7 +3340,8 @@ static void yy_parse_failed(
** parser fails */ ** parser fails */
/************ Begin %parse_failure code ***************************************/ /************ Begin %parse_failure code ***************************************/
/************ End %parse_failure code *****************************************/ /************ End %parse_failure code *****************************************/
ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ ParseARG_STORE /* Suppress warning about unused %extra_argument variable */
ParseCTX_STORE
} }
#endif /* YYNOERRORRECOVERY */ #endif /* YYNOERRORRECOVERY */
...@@ -2986,7 +3353,8 @@ static void yy_syntax_error( ...@@ -2986,7 +3353,8 @@ static void yy_syntax_error(
int yymajor, /* The major type of the error token */ int yymajor, /* The major type of the error token */
ParseTOKENTYPE yyminor /* The minor type of the error token */ ParseTOKENTYPE yyminor /* The minor type of the error token */
){ ){
ParseARG_FETCH; ParseARG_FETCH
ParseCTX_FETCH
#define TOKEN yyminor #define TOKEN yyminor
/************ Begin %syntax_error code ****************************************/ /************ Begin %syntax_error code ****************************************/
...@@ -3012,7 +3380,8 @@ static void yy_syntax_error( ...@@ -3012,7 +3380,8 @@ static void yy_syntax_error(
assert(len <= outputBufLen); assert(len <= outputBufLen);
/************ End %syntax_error code ******************************************/ /************ End %syntax_error code ******************************************/
ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ ParseARG_STORE /* Suppress warning about unused %extra_argument variable */
ParseCTX_STORE
} }
/* /*
...@@ -3021,7 +3390,8 @@ static void yy_syntax_error( ...@@ -3021,7 +3390,8 @@ static void yy_syntax_error(
static void yy_accept( static void yy_accept(
yyParser *yypParser /* The parser */ yyParser *yypParser /* The parser */
){ ){
ParseARG_FETCH; ParseARG_FETCH
ParseCTX_FETCH
#ifndef NDEBUG #ifndef NDEBUG
if( yyTraceFILE ){ if( yyTraceFILE ){
fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt); fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt);
...@@ -3036,7 +3406,8 @@ static void yy_accept( ...@@ -3036,7 +3406,8 @@ static void yy_accept(
/*********** Begin %parse_accept code *****************************************/ /*********** Begin %parse_accept code *****************************************/
/*********** End %parse_accept code *******************************************/ /*********** End %parse_accept code *******************************************/
ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ ParseARG_STORE /* Suppress warning about unused %extra_argument variable */
ParseCTX_STORE
} }
/* The main parser program. /* The main parser program.
...@@ -3065,45 +3436,47 @@ void Parse( ...@@ -3065,45 +3436,47 @@ void Parse(
ParseARG_PDECL /* Optional %extra_argument parameter */ ParseARG_PDECL /* Optional %extra_argument parameter */
){ ){
YYMINORTYPE yyminorunion; YYMINORTYPE yyminorunion;
unsigned int yyact; /* The parser action. */ YYACTIONTYPE yyact; /* The parser action. */
#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) #if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY)
int yyendofinput; /* True if we are at the end of input */ int yyendofinput; /* True if we are at the end of input */
#endif #endif
#ifdef YYERRORSYMBOL #ifdef YYERRORSYMBOL
int yyerrorhit = 0; /* True if yymajor has invoked an error */ int yyerrorhit = 0; /* True if yymajor has invoked an error */
#endif #endif
yyParser *yypParser; /* The parser */ yyParser *yypParser = (yyParser*)yyp; /* The parser */
ParseCTX_FETCH
ParseARG_STORE
yypParser = (yyParser*)yyp;
assert( yypParser->yytos!=0 ); assert( yypParser->yytos!=0 );
#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) #if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY)
yyendofinput = (yymajor==0); yyendofinput = (yymajor==0);
#endif #endif
ParseARG_STORE;
yyact = yypParser->yytos->stateno;
#ifndef NDEBUG #ifndef NDEBUG
if( yyTraceFILE ){ if( yyTraceFILE ){
int stateno = yypParser->yytos->stateno; if( yyact < YY_MIN_REDUCE ){
if( stateno < YY_MIN_REDUCE ){
fprintf(yyTraceFILE,"%sInput '%s' in state %d\n", fprintf(yyTraceFILE,"%sInput '%s' in state %d\n",
yyTracePrompt,yyTokenName[yymajor],stateno); yyTracePrompt,yyTokenName[yymajor],yyact);
}else{ }else{
fprintf(yyTraceFILE,"%sInput '%s' with pending reduce %d\n", fprintf(yyTraceFILE,"%sInput '%s' with pending reduce %d\n",
yyTracePrompt,yyTokenName[yymajor],stateno-YY_MIN_REDUCE); yyTracePrompt,yyTokenName[yymajor],yyact-YY_MIN_REDUCE);
} }
} }
#endif #endif
do{ do{
yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor); assert( yyact==yypParser->yytos->stateno );
yyact = yy_find_shift_action((YYCODETYPE)yymajor,yyact);
if( yyact >= YY_MIN_REDUCE ){ if( yyact >= YY_MIN_REDUCE ){
yy_reduce(yypParser,yyact-YY_MIN_REDUCE,yymajor,yyminor); yyact = yy_reduce(yypParser,yyact-YY_MIN_REDUCE,yymajor,
yyminor ParseCTX_PARAM);
}else if( yyact <= YY_MAX_SHIFTREDUCE ){ }else if( yyact <= YY_MAX_SHIFTREDUCE ){
yy_shift(yypParser,yyact,yymajor,yyminor); yy_shift(yypParser,yyact,(YYCODETYPE)yymajor,yyminor);
#ifndef YYNOERRORRECOVERY #ifndef YYNOERRORRECOVERY
yypParser->yyerrcnt--; yypParser->yyerrcnt--;
#endif #endif
yymajor = YYNOCODE; break;
}else if( yyact==YY_ACCEPT_ACTION ){ }else if( yyact==YY_ACCEPT_ACTION ){
yypParser->yytos--; yypParser->yytos--;
yy_accept(yypParser); yy_accept(yypParser);
...@@ -3154,10 +3527,9 @@ void Parse( ...@@ -3154,10 +3527,9 @@ void Parse(
yymajor = YYNOCODE; yymajor = YYNOCODE;
}else{ }else{
while( yypParser->yytos >= yypParser->yystack while( yypParser->yytos >= yypParser->yystack
&& yymx != YYERRORSYMBOL
&& (yyact = yy_find_reduce_action( && (yyact = yy_find_reduce_action(
yypParser->yytos->stateno, yypParser->yytos->stateno,
YYERRORSYMBOL)) >= YY_MIN_REDUCE YYERRORSYMBOL)) > YY_MAX_SHIFTREDUCE
){ ){
yy_pop_parser_stack(yypParser); yy_pop_parser_stack(yypParser);
} }
...@@ -3174,6 +3546,8 @@ void Parse( ...@@ -3174,6 +3546,8 @@ void Parse(
} }
yypParser->yyerrcnt = 3; yypParser->yyerrcnt = 3;
yyerrorhit = 1; yyerrorhit = 1;
if( yymajor==YYNOCODE ) break;
yyact = yypParser->yytos->stateno;
#elif defined(YYNOERRORRECOVERY) #elif defined(YYNOERRORRECOVERY)
/* If the YYNOERRORRECOVERY macro is defined, then do not attempt to /* If the YYNOERRORRECOVERY macro is defined, then do not attempt to
** do any kind of error recovery. Instead, simply invoke the syntax ** do any kind of error recovery. Instead, simply invoke the syntax
...@@ -3184,8 +3558,7 @@ void Parse( ...@@ -3184,8 +3558,7 @@ void Parse(
*/ */
yy_syntax_error(yypParser,yymajor, yyminor); yy_syntax_error(yypParser,yymajor, yyminor);
yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
yymajor = YYNOCODE; break;
#else /* YYERRORSYMBOL is not defined */ #else /* YYERRORSYMBOL is not defined */
/* This is what we do if the grammar does not define ERROR: /* This is what we do if the grammar does not define ERROR:
** **
...@@ -3207,10 +3580,10 @@ void Parse( ...@@ -3207,10 +3580,10 @@ void Parse(
yypParser->yyerrcnt = -1; yypParser->yyerrcnt = -1;
#endif #endif
} }
yymajor = YYNOCODE; break;
#endif #endif
} }
}while( yymajor!=YYNOCODE && yypParser->yytos>yypParser->yystack ); }while( yypParser->yytos>yypParser->yystack );
#ifndef NDEBUG #ifndef NDEBUG
if( yyTraceFILE ){ if( yyTraceFILE ){
yyStackEntry *i; yyStackEntry *i;
...@@ -3225,3 +3598,17 @@ void Parse( ...@@ -3225,3 +3598,17 @@ void Parse(
#endif #endif
return; return;
} }
/*
** Return the fallback token corresponding to canonical token iToken, or
** 0 if iToken has no fallback.
*/
int ParseFallback(int iToken){
#ifdef YYFALLBACK
assert( iToken<(int)(sizeof(yyFallback)/sizeof(yyFallback[0])) );
return yyFallback[iToken];
#else
(void)iToken;
return 0;
#endif
}
src/sync/src/syncMain.c
浏览文件 @ 789fc754
...@@ -568,7 +568,7 @@ static void syncStartCheckPeerConn(SSyncPeer *pPeer) { ...@@ -568,7 +568,7 @@ static void syncStartCheckPeerConn(SSyncPeer *pPeer) {
int32_t ret = strcmp(pPeer->fqdn, tsNodeFqdn); int32_t ret = strcmp(pPeer->fqdn, tsNodeFqdn);
if (pPeer->nodeId == 0 || (ret > 0) || (ret == 0 && pPeer->port > tsSyncPort)) { if (pPeer->nodeId == 0 || (ret > 0) || (ret == 0 && pPeer->port > tsSyncPort)) {
int32_t checkMs = 100 + (pNode->vgId * 10) % 100; int32_t checkMs = 100 + (pNode->vgId * 10) % 100;
if (pNode->vgId > 1) checkMs = tsStatusInterval * 1000 + checkMs;
sDebug("%s, check peer connection after %d ms", pPeer->id, checkMs); sDebug("%s, check peer connection after %d ms", pPeer->id, checkMs);
taosTmrReset(syncCheckPeerConnection, checkMs, (void *)pPeer->rid, tsSyncTmrCtrl, &pPeer->timer); taosTmrReset(syncCheckPeerConnection, checkMs, (void *)pPeer->rid, tsSyncTmrCtrl, &pPeer->timer);
} }
......
tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java
浏览文件 @ 789fc754
...@@ -48,7 +48,6 @@ public class JDBCDemo { ...@@ -48,7 +48,6 @@ public class JDBCDemo {
Class.forName("com.taosdata.jdbc.TSDBDriver"); Class.forName("com.taosdata.jdbc.TSDBDriver");
} }
Properties properties = new Properties(); Properties properties = new Properties();
properties.setProperty("host", host);
properties.setProperty("charset", "UTF-8"); properties.setProperty("charset", "UTF-8");
properties.setProperty("locale", "en_US.UTF-8"); properties.setProperty("locale", "en_US.UTF-8");
properties.setProperty("timezone", "UTC-8"); properties.setProperty("timezone", "UTC-8");
......
tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java 0 → 100644
浏览文件 @ 789fc754
package com.taosdata.example;
import java.sql.*;
import java.util.Properties;
public class JdbcRestfulDemo {
private static final String host = "master";
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";
Properties properties = new Properties();
properties.setProperty("charset", "UTF-8");
properties.setProperty("locale", "en_US.UTF-8");
properties.setProperty("timezone", "UTC-8");
Connection conn = DriverManager.getConnection(url, properties);
Statement stmt = conn.createStatement();
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");
ResultSetMetaData meta = rs.getMetaData();
while (rs.next()) {
for (int i = 1; i <= meta.getColumnCount(); i++) {
System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
}
System.out.println();
}
stmt.close();
conn.close();
} catch (ClassNotFoundException e) {
e.printStackTrace();
} catch (SQLException e) {
e.printStackTrace();
}
}
}
tests/examples/JDBC/taosdemo/pom.xml
浏览文件 @ 789fc754
...@@ -67,9 +67,9 @@ ...@@ -67,9 +67,9 @@
<dependency> <dependency>
<groupId>com.taosdata.jdbc</groupId> <groupId>com.taosdata.jdbc</groupId>
<artifactId>taos-jdbcdriver</artifactId> <artifactId>taos-jdbcdriver</artifactId>
<version>2.0.15</version> <version>2.0.16</version>
<scope>system</scope> <!-- <scope>system</scope>-->
<systemPath>${project.basedir}/src/main/resources/lib/taos-jdbcdriver-2.0.15-dist.jar</systemPath> <!-- <systemPath>${project.basedir}/src/main/resources/lib/taos-jdbcdriver-2.0.15-dist.jar</systemPath>-->
</dependency> </dependency>
<!-- fastjson --> <!-- fastjson -->
<dependency> <dependency>
......
tests/examples/nodejs/nodejsChecker.js
浏览文件 @ 789fc754
const taos = require('td2.0-connector'); const taos = require('td2.0-connector');
//const taos = require('../../../src/connector/nodejs/');
var host = null; var host = null;
......
tests/pytest/fulltest.sh
浏览文件 @ 789fc754
...@@ -260,3 +260,6 @@ python3 ./test.py -f update/bug_td2279.py ...@@ -260,3 +260,6 @@ python3 ./test.py -f update/bug_td2279.py
# wal # wal
python3 ./test.py -f wal/addOldWalTest.py python3 ./test.py -f wal/addOldWalTest.py
# account
python3 ./test.py -f account/account_create.py
\ No newline at end of file
tests/script/general/http/restful_full.sim
浏览文件 @ 789fc754
...@@ -15,6 +15,7 @@ print =============== step1 - login ...@@ -15,6 +15,7 @@ print =============== step1 - login
system_content curl 127.0.0.1:7111/rest/ system_content curl 127.0.0.1:7111/rest/
print 1-> $system_content print 1-> $system_content
if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
print $system_content
return -1 return -1
endi endi
......
tests/script/general/parser/join.sim
浏览文件 @ 789fc754
...@@ -415,6 +415,7 @@ sql select count(join_mt0.c1), sum(join_mt1.c2), first(join_mt0.c5), last(join_m ...@@ -415,6 +415,7 @@ sql select count(join_mt0.c1), sum(join_mt1.c2), first(join_mt0.c5), last(join_m
$val = 100 $val = 100
if $rows != $val then if $rows != $val then
print $rows
return -1 return -1
endi endi
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或