diff --git a/.appveyor.yml b/.appveyor.yml
index ee1dc91767..e7802b3d0d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,49 +1,49 @@
-version: 1.0.{build}
-image:
- - Visual Studio 2015
- - macos
-environment:
- matrix:
- - ARCH: amd64
- - ARCH: x86
-matrix:
- exclude:
- - image: macos
- ARCH: x86
-for:
- -
- matrix:
- only:
- - image: Visual Studio 2015
- clone_folder: c:\dev\TDengine
- clone_depth: 1
-
- init:
- - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
-
- before_build:
- - cd c:\dev\TDengine
- - md build
-
- build_script:
- - cd build
- - cmake -G "NMake Makefiles" ..
- - nmake install
- -
- matrix:
- only:
- - image: macos
- clone_depth: 1
-
- build_script:
- - mkdir debug
- - cd debug
- - cmake .. > /dev/null
- - make > /dev/null
-notifications:
-- provider: Email
- to:
- - sangshuduo@gmail.com
- on_build_success: true
- on_build_failure: true
- on_build_status_changed: true
+version: 1.0.{build}
+image:
+ - Visual Studio 2015
+ - macos
+environment:
+ matrix:
+ - ARCH: amd64
+ - ARCH: x86
+matrix:
+ exclude:
+ - image: macos
+ ARCH: x86
+for:
+ -
+ matrix:
+ only:
+ - image: Visual Studio 2015
+ clone_folder: c:\dev\TDengine
+ clone_depth: 1
+
+ init:
+ - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
+
+ before_build:
+ - cd c:\dev\TDengine
+ - md build
+
+ build_script:
+ - cd build
+ - cmake -G "NMake Makefiles" .. -DBUILD_JDBC=false
+ - nmake install
+ -
+ matrix:
+ only:
+ - image: macos
+ clone_depth: 1
+
+ build_script:
+ - mkdir debug
+ - cd debug
+ - cmake .. > /dev/null
+ - make > /dev/null
+notifications:
+- provider: Email
+ to:
+ - sangshuduo@gmail.com
+ on_build_success: true
+ on_build_failure: true
+ on_build_status_changed: true
diff --git a/cmake/env.inc b/cmake/env.inc
index 3989993953..6c1ce8fd89 100755
--- a/cmake/env.inc
+++ b/cmake/env.inc
@@ -14,11 +14,13 @@ MESSAGE(STATUS "Project binary files output path: " ${PROJECT_BINARY_DIR})
MESSAGE(STATUS "Project executable files output path: " ${EXECUTABLE_OUTPUT_PATH})
MESSAGE(STATUS "Project library files output path: " ${LIBRARY_OUTPUT_PATH})
-FIND_PROGRAM(TD_MVN_INSTALLED mvn)
-IF (TD_MVN_INSTALLED)
- MESSAGE(STATUS "MVN is installed and JDBC will be compiled")
-ELSE ()
- MESSAGE(STATUS "MVN is not installed and JDBC is not compiled")
+IF (TD_BUILD_JDBC)
+ FIND_PROGRAM(TD_MVN_INSTALLED mvn)
+ IF (TD_MVN_INSTALLED)
+ MESSAGE(STATUS "MVN is installed and JDBC will be compiled")
+ ELSE ()
+ MESSAGE(STATUS "MVN is not installed and JDBC is not compiled")
+ ENDIF ()
ENDIF ()
#
@@ -55,4 +57,4 @@ ELSE ()
SET(CMAKE_BUILD_TYPE "Debug")
MESSAGE(STATUS "Build Debug Version as default")
ENDIF()
-ENDIF ()
\ No newline at end of file
+ENDIF ()
diff --git a/cmake/input.inc b/cmake/input.inc
index 543114ad09..9b72a35d94 100755
--- a/cmake/input.inc
+++ b/cmake/input.inc
@@ -77,3 +77,9 @@ IF (${JEMALLOC_ENABLED} MATCHES "true")
SET(TD_JEMALLOC_ENABLED TRUE)
MESSAGE(STATUS "build with jemalloc enabled")
ENDIF ()
+
+SET(TD_BUILD_JDBC TRUE)
+
+IF (${BUILD_JDBC} MATCHES "false")
+ SET(TD_BUILD_JDBC FALSE)
+ENDIF ()
diff --git a/documentation20/cn/08.connector/01.java/docs.md b/documentation20/cn/08.connector/01.java/docs.md
index 5eec33e2f1..4fc10b542b 100644
--- a/documentation20/cn/08.connector/01.java/docs.md
+++ b/documentation20/cn/08.connector/01.java/docs.md
@@ -266,7 +266,9 @@ while(resultSet.next()){
> 查询和操作关系型数据库一致，使用下标获取返回字段内容时从 1 开始，建议使用字段名称获取。
### 处理异常
+
在报错后，通过SQLException可以获取到错误的信息和错误码：
+
```java
try (Statement statement = connection.createStatement()) {
// executeQuery
@@ -279,11 +281,87 @@ try (Statement statement = connection.createStatement()) {
e.printStackTrace();
}
```
+
JDBC连接器可能报错的错误码包括3种：JDBC driver本身的报错（错误码在0x2301到0x2350之间），JNI方法的报错（错误码在0x2351到0x2400之间），TDengine其他功能模块的报错。
具体的错误码请参考：
* https://github.com/taosdata/TDengine/blob/develop/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
* https://github.com/taosdata/TDengine/blob/develop/src/inc/taoserror.h
+### 通过参数绑定写入数据
+
+从 2.1.2.0 版本开始，TDengine 的 **JDBC-JNI** 实现大幅改进了参数绑定方式对数据写入（INSERT）场景的支持。采用这种方式写入数据时，能避免 SQL 语法解析的资源消耗，从而在很多情况下显著提升写入性能。（注意：**JDBC-RESTful** 实现并不提供参数绑定这种使用方式。）
+
+```java
+Statement stmt = conn.createStatement();
+Random r = new Random();
+
+// INSERT 语句中，VALUES 部分允许指定具体的数据列；如果采取自动建表，则 TAGS 部分需要设定全部 TAGS 列的参数值：
+TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? using weather_test tags (?, ?) (ts, c1, c2) values(?, ?, ?)");
+
+// 设定数据表名：
+s.setTableName("w1");
+// 设定 TAGS 取值：
+s.setTagInt(0, r.nextInt(10));
+s.setTagString(1, "Beijing");
+
+int numOfRows = 10;
+
+// VALUES 部分以逐列的方式进行设置：
+ArrayList ts = new ArrayList<>();
+for (int i = 0; i < numOfRows; i++){
+ ts.add(System.currentTimeMillis() + i);
+}
+s.setTimestamp(0, ts);
+
+ArrayList s1 = new ArrayList<>();
+for (int i = 0; i < numOfRows; i++){
+ s1.add(r.nextInt(100));
+}
+s.setInt(1, s1);
+
+ArrayList s2 = new ArrayList<>();
+for (int i = 0; i < numOfRows; i++){
+ s2.add("test" + r.nextInt(100));
+}
+s.setString(2, s2, 10);
+
+// AddBatch 之后，可以再设定新的表名、TAGS、VALUES 取值，这样就能实现一次执行向多个数据表写入：
+s.columnDataAddBatch();
+// 执行语句：
+s.columnDataExecuteBatch();
+// 执行完毕，释放资源：
+s.columnDataCloseBatch();
+```
+
+用于设定 TAGS 取值的方法总共有：
+```java
+public void setTagNull(int index, int type)
+public void setTagBoolean(int index, boolean value)
+public void setTagInt(int index, int value)
+public void setTagByte(int index, byte value)
+public void setTagShort(int index, short value)
+public void setTagLong(int index, long value)
+public void setTagTimestamp(int index, long value)
+public void setTagFloat(int index, float value)
+public void setTagDouble(int index, double value)
+public void setTagString(int index, String value)
+public void setTagNString(int index, String value)
+```
+
+用于设定 VALUES 数据列的取值的方法总共有：
+```java
+public void setInt(int columnIndex, ArrayList list) throws SQLException
+public void setFloat(int columnIndex, ArrayList list) throws SQLException
+public void setTimestamp(int columnIndex, ArrayList list) throws SQLException
+public void setLong(int columnIndex, ArrayList list) throws SQLException
+public void setDouble(int columnIndex, ArrayList list) throws SQLException
+public void setBoolean(int columnIndex, ArrayList list) throws SQLException
+public void setByte(int columnIndex, ArrayList list) throws SQLException
+public void setShort(int columnIndex, ArrayList list) throws SQLException
+public void setString(int columnIndex, ArrayList list, int size) throws SQLException
+public void setNString(int columnIndex, ArrayList list, int size) throws SQLException
+```
+
### 订阅
#### 创建
diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md
index 9484917993..60f8df95f8 100644
--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -291,9 +291,25 @@ typedef struct taosField {
TDengine的异步API均采用非阻塞调用模式。应用程序可以用多线程同时打开多张表，并可以同时对每张打开的表进行查询或者插入操作。需要指出的是，**客户端应用必须确保对同一张表的操作完全串行化**，即对同一个表的插入或查询操作未完成时（未返回时），不能够执行第二个插入或查询操作。
-### 参数绑定API
+
+### 参数绑定 API
-除了直接调用 `taos_query` 进行查询，TDengine也提供了支持参数绑定的Prepare API，与 MySQL 一样，这些API目前也仅支持用问号`?`来代表待绑定的参数，具体如下：
+除了直接调用 `taos_query` 进行查询，TDengine 也提供了支持参数绑定的 Prepare API，与 MySQL 一样，这些 API 目前也仅支持用问号 `?` 来代表待绑定的参数。
+
+从 2.1.1.0 和 2.1.2.0 版本开始，TDengine 大幅改进了参数绑定接口对数据写入（INSERT）场景的支持。这样在通过参数绑定接口写入数据时，就避免了 SQL 语法解析的资源消耗，从而在绝大多数情况下显著提升写入性能。此时的典型操作步骤如下：
+1. 调用 `taos_stmt_init` 创建参数绑定对象；
+2. 调用 `taos_stmt_prepare` 解析 INSERT 语句；
+3. 如果 INSERT 语句中预留了表名但没有预留 TAGS，那么调用 `taos_stmt_set_tbname` 来设置表名；
+4. 如果 INSERT 语句中既预留了表名又预留了 TAGS（例如 INSERT 语句采取的是自动建表的方式），那么调用 `taos_stmt_set_tbname_tags` 来设置表名和 TAGS 的值；
+5. 调用 `taos_stmt_bind_param_batch` 以多列的方式设置 VALUES 的值；
+6. 调用 `taos_stmt_add_batch` 把当前绑定的参数加入批处理；
+7. 可以重复第 3～6 步，为批处理加入更多的数据行；
+8. 调用 `taos_stmt_execute` 执行已经准备好的批处理指令；
+9. 执行完毕，调用 `taos_stmt_close` 释放所有资源。
+
+除 C/C++ 语言外，TDengine 的 Java 语言 JNI Connector 也提供参数绑定接口支持，具体请另外参见：[参数绑定接口的 Java 用法](https://www.taosdata.com/cn/documentation/connector/java#stmt-java)。
+
+接口相关的具体函数如下（也可以参考 [apitest.c](https://github.com/taosdata/TDengine/blob/develop/tests/examples/c/apitest.c) 文件中使用对应函数的方式）：
- `TAOS_STMT* taos_stmt_init(TAOS *taos)`
@@ -301,11 +317,12 @@ TDengine的异步API均采用非阻塞调用模式。应用程序可以用多线
- `int taos_stmt_prepare(TAOS_STMT *stmt, const char *sql, unsigned long length)`
- 解析一条sql语句，将解析结果和参数信息绑定到stmt上，如果参数length大于0，将使用此参数作为sql语句的长度，如等于0，将自动判断sql语句的长度。
+ 解析一条 SQL 语句，将解析结果和参数信息绑定到 stmt 上，如果参数 length 大于 0，将使用此参数作为 SQL 语句的长度，如等于 0，将自动判断 SQL 语句的长度。
- `int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind)`
- 进行参数绑定，bind指向一个数组，需保证此数组的元素数量和顺序与sql语句中的参数完全一致。TAOS_BIND 的使用方法与 MySQL中的 MYSQL_BIND 一致，具体定义如下：
+ 不如 `taos_stmt_bind_param_batch` 效率高，但可以支持非 INSERT 类型的 SQL 语句。
+ 进行参数绑定，bind 指向一个数组（代表所要绑定的一行数据），需保证此数组中的元素数量和顺序与 SQL 语句中的参数完全一致。TAOS_BIND 的使用方法与 MySQL 中的 MYSQL_BIND 一致，具体定义如下：
```c
typedef struct TAOS_BIND {
@@ -319,9 +336,35 @@ typedef struct TAOS_BIND {
} TAOS_BIND;
```
+- `int taos_stmt_set_tbname(TAOS_STMT* stmt, const char* name)`
+
+ （2.1.1.0 版本新增）
+ 当 SQL 语句中的表名使用了 `?` 占位时，可以使用此函数绑定一个具体的表名。
+
+- `int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_BIND* tags)`
+
+ （2.1.2.0 版本新增）
+ 当 SQL 语句中的表名和 TAGS 都使用了 `?` 占位时，可以使用此函数绑定具体的表名和具体的 TAGS 取值。最典型的使用场景是使用了自动建表功能的 INSERT 语句（目前版本不支持指定具体的 TAGS 列）。tags 参数中的列数量需要与 SQL 语句中要求的 TAGS 数量完全一致。
+
+- `int taos_stmt_bind_param_batch(TAOS_STMT* stmt, TAOS_MULTI_BIND* bind)`
+
+ （2.1.1.0 版本新增）
+ 以多列的方式传递待绑定的数据，需要保证这里传递的数据列的顺序、列的数量与 SQL 语句中的 VALUES 参数完全一致。TAOS_MULTI_BIND 的具体定义如下：
+
+```c
+typedef struct TAOS_MULTI_BIND {
+ int buffer_type;
+ void * buffer;
+ uintptr_t buffer_length;
+ int32_t * length;
+ char * is_null;
+ int num; // 列的个数，即 buffer 中的参数个数
+} TAOS_MULTI_BIND;
+```
+
- `int taos_stmt_add_batch(TAOS_STMT *stmt)`
- 将当前绑定的参数加入批处理中，调用此函数后，可以再次调用`taos_stmt_bind_param`绑定新的参数。需要注意，此函数仅支持 insert/import 语句，如果是select等其他SQL语句，将返回错误。
+ 将当前绑定的参数加入批处理中，调用此函数后，可以再次调用 `taos_stmt_bind_param` 或 `taos_stmt_bind_param_batch` 绑定新的参数。需要注意，此函数仅支持 INSERT/IMPORT 语句，如果是 SELECT 等其他 SQL 语句，将返回错误。
- `int taos_stmt_execute(TAOS_STMT *stmt)`
@@ -329,7 +372,7 @@ typedef struct TAOS_BIND {
- `TAOS_RES* taos_stmt_use_result(TAOS_STMT *stmt)`
- 获取语句的结果集。结果集的使用方式与非参数化调用时一致，使用完成后，应对此结果集调用 `taos_free_result`以释放资源。
+ 获取语句的结果集。结果集的使用方式与非参数化调用时一致，使用完成后，应对此结果集调用 `taos_free_result` 以释放资源。
- `int taos_stmt_close(TAOS_STMT *stmt)`
diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
index 28be037e6c..e6ddb6d742 100755
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@@ -24,14 +24,14 @@ echo "compile_dir: ${compile_dir}"
echo "pkg_dir: ${pkg_dir}"
if [ -d ${pkg_dir} ]; then
- rm -rf ${pkg_dir}
+ rm -rf ${pkg_dir}
fi
mkdir -p ${pkg_dir}
cd ${pkg_dir}
libfile="libtaos.so.${tdengine_ver}"
-# create install dir
+# create install dir
install_home_path="/usr/local/taos"
mkdir -p ${pkg_dir}${install_home_path}
mkdir -p ${pkg_dir}${install_home_path}/bin
@@ -42,7 +42,7 @@ mkdir -p ${pkg_dir}${install_home_path}/examples
mkdir -p ${pkg_dir}${install_home_path}/include
mkdir -p ${pkg_dir}${install_home_path}/init.d
mkdir -p ${pkg_dir}${install_home_path}/script
-
+
cp ${compile_dir}/../packaging/cfg/taos.cfg ${pkg_dir}${install_home_path}/cfg
cp ${compile_dir}/../packaging/deb/taosd ${pkg_dir}${install_home_path}/init.d
cp ${compile_dir}/../packaging/tools/post.sh ${pkg_dir}${install_home_path}/script
@@ -54,7 +54,7 @@ cp ${compile_dir}/build/bin/taosdemo ${pkg_dir}${install_home_pat
cp ${compile_dir}/build/bin/taosdump ${pkg_dir}${install_home_path}/bin
cp ${compile_dir}/build/bin/taosd ${pkg_dir}${install_home_path}/bin
cp ${compile_dir}/build/bin/taos ${pkg_dir}${install_home_path}/bin
-cp ${compile_dir}/build/lib/${libfile} ${pkg_dir}${install_home_path}/driver
+cp ${compile_dir}/build/lib/${libfile} ${pkg_dir}${install_home_path}/driver
cp ${compile_dir}/../src/inc/taos.h ${pkg_dir}${install_home_path}/include
cp ${compile_dir}/../src/inc/taoserror.h ${pkg_dir}${install_home_path}/include
cp -r ${top_dir}/tests/examples/* ${pkg_dir}${install_home_path}/examples
@@ -67,7 +67,41 @@ fi
cp -r ${top_dir}/src/connector/python ${pkg_dir}${install_home_path}/connector
cp -r ${top_dir}/src/connector/go ${pkg_dir}${install_home_path}/connector
cp -r ${top_dir}/src/connector/nodejs ${pkg_dir}${install_home_path}/connector
-cp ${compile_dir}/build/lib/taos-jdbcdriver*dist.* ${pkg_dir}${install_home_path}/connector ||:
+cp ${compile_dir}/build/lib/taos-jdbcdriver*.* ${pkg_dir}${install_home_path}/connector ||:
+
+if [ -f ${compile_dir}/build/bin/jemalloc-config ]; then
+ install_user_local_path="/usr/local"
+ mkdir -p ${pkg_dir}${install_user_local_path}/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}
+ cp ${compile_dir}/build/bin/jemalloc-config ${pkg_dir}${install_user_local_path}/bin/
+ if [ -f ${compile_dir}/build/bin/jemalloc.sh ]; then
+ cp ${compile_dir}/build/bin/jemalloc.sh ${pkg_dir}${install_user_local_path}/bin/
+ fi
+ if [ -f ${compile_dir}/build/bin/jeprof ]; then
+ cp ${compile_dir}/build/bin/jeprof ${pkg_dir}${install_user_local_path}/bin/
+ fi
+ if [ -f ${compile_dir}/build/include/jemalloc/jemalloc.h ]; then
+ cp ${compile_dir}/build/include/jemalloc/jemalloc.h ${pkg_dir}${install_user_local_path}/include/jemalloc/
+ fi
+ if [ -f ${compile_dir}/build/lib/libjemalloc.so.2 ]; then
+ cp ${compile_dir}/build/lib/libjemalloc.so.2 ${pkg_dir}${install_user_local_path}/lib/
+ ln -sf libjemalloc.so.2 ${pkg_dir}${install_user_local_path}/lib/libjemalloc.so
+ fi
+ if [ -f ${compile_dir}/build/lib/libjemalloc.a ]; then
+ cp ${compile_dir}/build/lib/libjemalloc.a ${pkg_dir}${install_user_local_path}/lib/
+ fi
+ if [ -f ${compile_dir}/build/lib/libjemalloc_pic.a ]; then
+ cp ${compile_dir}/build/lib/libjemalloc_pic.a ${pkg_dir}${install_user_local_path}/lib/
+ fi
+ if [ -f ${compile_dir}/build/lib/pkgconfig/jemalloc.pc ]; then
+ cp ${compile_dir}/build/lib/pkgconfig/jemalloc.pc ${pkg_dir}${install_user_local_path}/lib/pkgconfig/
+ fi
+ if [ -f ${compile_dir}/build/share/doc/jemalloc/jemalloc.html ]; then
+ cp ${compile_dir}/build/share/doc/jemalloc/jemalloc.html ${pkg_dir}${install_user_local_path}/share/doc/jemalloc/
+ fi
+ if [ -f ${compile_dir}/build/share/man/man3/jemalloc.3 ]; then
+ cp ${compile_dir}/build/share/man/man3/jemalloc.3 ${pkg_dir}${install_user_local_path}/share/man/man3/
+ fi
+fi
cp -r ${compile_dir}/../packaging/deb/DEBIAN ${pkg_dir}/
chmod 755 ${pkg_dir}/DEBIAN/*
@@ -75,7 +109,7 @@ chmod 755 ${pkg_dir}/DEBIAN/*
# modify version of control
debver="Version: "$tdengine_ver
sed -i "2c$debver" ${pkg_dir}/DEBIAN/control
-
+
#get taos version, then set deb name
@@ -90,7 +124,7 @@ fi
if [ "$verType" == "beta" ]; then
debname=${debname}-${verType}".deb"
-elif [ "$verType" == "stable" ]; then
+elif [ "$verType" == "stable" ]; then
debname=${debname}".deb"
else
echo "unknow verType, nor stabel or beta"
@@ -101,7 +135,7 @@ fi
dpkg -b ${pkg_dir} $debname
echo "make deb package success!"
-cp ${pkg_dir}/*.deb ${output_dir}
+cp ${pkg_dir}/*.deb ${output_dir}
# clean tmep dir
rm -rf ${pkg_dir}
diff --git a/packaging/rpm/makerpm.sh b/packaging/rpm/makerpm.sh
index 678e75c500..7c3272f8d0 100755
--- a/packaging/rpm/makerpm.sh
+++ b/packaging/rpm/makerpm.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Generate rpm package for centos
+# Generate rpm package for centos
set -e
# set -x
@@ -60,7 +60,7 @@ ${csudo} rpmbuild --define="_version ${tdengine_ver}" --define="_topdir ${pkg_di
# copy rpm package to output_dir, and modify package name, then clean temp dir
#${csudo} cp -rf RPMS/* ${output_dir}
-cp_rpm_package ${pkg_dir}/RPMS
+cp_rpm_package ${pkg_dir}/RPMS
if [ "$verMode" == "cluster" ]; then
@@ -74,7 +74,7 @@ fi
if [ "$verType" == "beta" ]; then
rpmname=${rpmname}-${verType}".rpm"
-elif [ "$verType" == "stable" ]; then
+elif [ "$verType" == "stable" ]; then
rpmname=${rpmname}".rpm"
else
echo "unknow verType, nor stabel or beta"
diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec
index 9910e20bfe..8a870286ab 100644
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@@ -1,4 +1,5 @@
%define homepath /usr/local/taos
+%define userlocalpath /usr/local
%define cfg_install_dir /etc/taos
%define __strip /bin/true
@@ -12,22 +13,22 @@ URL: www.taosdata.com
AutoReqProv: no
#BuildRoot: %_topdir/BUILDROOT
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
#Prefix: /usr/local/taos
-#BuildRequires:
-#Requires:
+#BuildRequires:
+#Requires:
%description
Big Data Platform Designed and Optimized for IoT
-#"prep" Nothing needs to be done
+#"prep" Nothing needs to be done
#%prep
#%setup -q
-#%setup -T
+#%setup -T
-#"build" Nothing needs to be done
+#"build" Nothing needs to be done
#%build
#%configure
#make %{?_smp_mflags}
@@ -75,9 +76,53 @@ fi
cp -r %{_compiledir}/../src/connector/python %{buildroot}%{homepath}/connector
cp -r %{_compiledir}/../src/connector/go %{buildroot}%{homepath}/connector
cp -r %{_compiledir}/../src/connector/nodejs %{buildroot}%{homepath}/connector
-cp %{_compiledir}/build/lib/taos-jdbcdriver*dist.* %{buildroot}%{homepath}/connector ||:
+cp %{_compiledir}/build/lib/taos-jdbcdriver*.* %{buildroot}%{homepath}/connector ||:
cp -r %{_compiledir}/../tests/examples/* %{buildroot}%{homepath}/examples
+
+if [ -f %{_compiledir}/build/bin/jemalloc-config ]; then
+ mkdir -p %{buildroot}%{userlocalpath}/bin
+ mkdir -p %{buildroot}%{userlocalpath}/lib
+ mkdir -p %{buildroot}%{userlocalpath}/lib/pkgconfig
+ mkdir -p %{buildroot}%{userlocalpath}/include
+ mkdir -p %{buildroot}%{userlocalpath}/include/jemalloc
+ mkdir -p %{buildroot}%{userlocalpath}/share
+ mkdir -p %{buildroot}%{userlocalpath}/share/doc
+ mkdir -p %{buildroot}%{userlocalpath}/share/doc/jemalloc
+ mkdir -p %{buildroot}%{userlocalpath}/share/man
+ mkdir -p %{buildroot}%{userlocalpath}/share/man/man3
+
+ cp %{_compiledir}/build/bin/jemalloc-config %{buildroot}%{userlocalpath}/bin/
+ if [ -f %{_compiledir}/build/bin/jemalloc.sh ]; then
+ cp %{_compiledir}/build/bin/jemalloc.sh %{buildroot}%{userlocalpath}/bin/
+ fi
+ if [ -f %{_compiledir}/build/bin/jeprof ]; then
+ cp %{_compiledir}/build/bin/jeprof %{buildroot}%{userlocalpath}/bin/
+ fi
+ if [ -f %{_compiledir}/build/include/jemalloc/jemalloc.h ]; then
+ cp %{_compiledir}/build/include/jemalloc/jemalloc.h %{buildroot}%{userlocalpath}/include/jemalloc/
+ fi
+ if [ -f %{_compiledir}/build/lib/libjemalloc.so.2 ]; then
+ cp %{_compiledir}/build/lib/libjemalloc.so.2 %{buildroot}%{userlocalpath}/lib/
+ ln -sf libjemalloc.so.2 %{buildroot}%{userlocalpath}/lib/libjemalloc.so
+ fi
+ if [ -f %{_compiledir}/build/lib/libjemalloc.a ]; then
+ cp %{_compiledir}/build/lib/libjemalloc.a %{buildroot}%{userlocalpath}/lib/
+ fi
+ if [ -f %{_compiledir}/build/lib/libjemalloc_pic.a ]; then
+ cp %{_compiledir}/build/lib/libjemalloc_pic.a %{buildroot}%{userlocalpath}/lib/
+ fi
+ if [ -f %{_compiledir}/build/lib/pkgconfig/jemalloc.pc ]; then
+ cp %{_compiledir}/build/lib/pkgconfig/jemalloc.pc %{buildroot}%{userlocalpath}/lib/pkgconfig/
+ fi
+ if [ -f %{_compiledir}/build/share/doc/jemalloc/jemalloc.html ]; then
+ cp %{_compiledir}/build/share/doc/jemalloc/jemalloc.html %{buildroot}%{userlocalpath}/share/doc/jemalloc/
+ fi
+ if [ -f %{_compiledir}/build/share/man/man3/jemalloc.3 ]; then
+ cp %{_compiledir}/build/share/man/man3/jemalloc.3 %{buildroot}%{userlocalpath}/share/man/man3/
+ fi
+fi
+
#Scripts executed before installation
%pre
csudo=""
@@ -103,7 +148,7 @@ fi
# if taos.cfg already softlink, remove it
if [ -f %{cfg_install_dir}/taos.cfg ]; then
${csudo} rm -f %{homepath}/cfg/taos.cfg || :
-fi
+fi
# there can not libtaos.so*, otherwise ln -s error
${csudo} rm -f %{homepath}/driver/libtaos* || :
@@ -116,18 +161,18 @@ if command -v sudo > /dev/null; then
fi
cd %{homepath}/script
${csudo} ./post.sh
-
+
# Scripts executed before uninstall
%preun
csudo=""
if command -v sudo > /dev/null; then
csudo="sudo"
fi
-# only remove package to call preun.sh, not but update(2)
+# only remove package to call preun.sh, not but update(2)
if [ $1 -eq 0 ];then
#cd %{homepath}/script
#${csudo} ./preun.sh
-
+
if [ -f %{homepath}/script/preun.sh ]; then
cd %{homepath}/script
${csudo} ./preun.sh
@@ -135,7 +180,7 @@ if [ $1 -eq 0 ];then
bin_link_dir="/usr/bin"
lib_link_dir="/usr/lib"
inc_link_dir="/usr/include"
-
+
data_link_dir="/usr/local/taos/data"
log_link_dir="/usr/local/taos/log"
cfg_link_dir="/usr/local/taos/cfg"
@@ -149,20 +194,20 @@ if [ $1 -eq 0 ];then
${csudo} rm -f ${inc_link_dir}/taos.h || :
${csudo} rm -f ${inc_link_dir}/taoserror.h || :
${csudo} rm -f ${lib_link_dir}/libtaos.* || :
-
+
${csudo} rm -f ${log_link_dir} || :
${csudo} rm -f ${data_link_dir} || :
-
+
pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
if [ -n "$pid" ]; then
${csudo} kill -9 $pid || :
- fi
- fi
+ fi
+ fi
fi
-
+
# Scripts executed after uninstall
%postun
-
+
# clean build dir
%clean
csudo=""
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 178a248cfe..325ac81053 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -59,11 +59,11 @@ initd_mod=0
service_mod=2
if pidof systemd &> /dev/null; then
service_mod=0
-elif $(which service &> /dev/null); then
+elif $(which service &> /dev/null); then
service_mod=1
- service_config_dir="/etc/init.d"
+ service_config_dir="/etc/init.d"
if $(which chkconfig &> /dev/null); then
- initd_mod=1
+ initd_mod=1
elif $(which insserv &> /dev/null); then
initd_mod=2
elif $(which update-rc.d &> /dev/null); then
@@ -71,7 +71,7 @@ elif $(which service &> /dev/null); then
else
service_mod=2
fi
-else
+else
service_mod=2
fi
@@ -103,7 +103,7 @@ elif echo $osinfo | grep -qwi "fedora" ; then
os_type=2
else
echo " osinfo: ${osinfo}"
- echo " This is an officially unverified linux system,"
+ echo " This is an officially unverified linux system,"
echo " if there are any problems with the installation and operation, "
echo " please feel free to contact taosdata.com for support."
os_type=1
@@ -138,7 +138,7 @@ do
echo "Usage: `basename $0` -v [server | client] -e [yes | no]"
exit 0
;;
- ?) #unknow option
+ ?) #unknow option
echo "unkonw argument"
exit 1
;;
@@ -157,9 +157,9 @@ function kill_process() {
function install_main_path() {
#create install main dir and all sub dir
${csudo} rm -rf ${install_main_dir} || :
- ${csudo} mkdir -p ${install_main_dir}
+ ${csudo} mkdir -p ${install_main_dir}
${csudo} mkdir -p ${install_main_dir}/cfg
- ${csudo} mkdir -p ${install_main_dir}/bin
+ ${csudo} mkdir -p ${install_main_dir}/bin
${csudo} mkdir -p ${install_main_dir}/connector
${csudo} mkdir -p ${install_main_dir}/driver
${csudo} mkdir -p ${install_main_dir}/examples
@@ -168,10 +168,10 @@ function install_main_path() {
if [ "$verMode" == "cluster" ]; then
${csudo} mkdir -p ${nginx_dir}
fi
-
+
if [[ -e ${script_dir}/email ]]; then
- ${csudo} cp ${script_dir}/email ${install_main_dir}/ ||:
- fi
+ ${csudo} cp ${script_dir}/email ${install_main_dir}/ ||:
+ fi
}
function install_bin() {
@@ -207,29 +207,75 @@ function install_lib() {
${csudo} rm -f ${lib_link_dir}/libtaos.* || :
${csudo} rm -f ${lib64_link_dir}/libtaos.* || :
#${csudo} rm -rf ${v15_java_app_dir} || :
- ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
-
+ ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+
${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
-
+
if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 || :
${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so || :
fi
-
- #if [ "$verMode" == "cluster" ]; then
+
+ #if [ "$verMode" == "cluster" ]; then
# # Compatible with version 1.5
# ${csudo} mkdir -p ${v15_java_app_dir}
# ${csudo} ln -s ${install_main_dir}/connector/taos-jdbcdriver-1.0.2-dist.jar ${v15_java_app_dir}/JDBCDriver-1.0.2-dist.jar
# ${csudo} chmod 777 ${v15_java_app_dir} || :
#fi
-
+
${csudo} ldconfig
}
+function install_jemalloc() {
+ jemalloc_dir=${script_dir}/jemalloc
+
+ if [ -d ${jemalloc_dir} ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/bin
+
+ if [ -f ${jemalloc_dir}/bin/jemalloc-config ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
+ fi
+ if [ -f ${jemalloc_dir}/bin/jemalloc.sh ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
+ fi
+ if [ -f ${jemalloc_dir}/bin/jeprof ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
+ fi
+ if [ -f ${jemalloc_dir}/include/jemalloc/jemalloc.h ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/include/jemalloc
+ ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
+ fi
+ if [ -f ${jemalloc_dir}/lib/libjemalloc.so.2 ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/lib
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
+ ${csudo} ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
+ ${csudo} /usr/bin/install -c -d /usr/local/lib
+ if [ -f ${jemalloc_dir}/lib/libjemalloc.a ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
+ fi
+ if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
+ ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
+ fi
+ if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/lib/pkgconfig
+ ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
+ fi
+ fi
+ if [ -f ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/share/doc/jemalloc
+ ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
+ fi
+ if [ -f ${jemalloc_dir}/share/man/man3/jemalloc.3 ]; then
+ ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
+ ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
+ fi
+ fi
+}
+
function install_header() {
${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h || :
- ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
+ ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
}
@@ -246,13 +292,13 @@ function add_newHostname_to_hosts() {
if [[ "$s" == "$localIp" ]]; then
return
fi
- done
+ done
${csudo} echo "127.0.0.1 $1" >> /etc/hosts ||:
}
function set_hostname() {
echo -e -n "${GREEN}Please enter one hostname(must not be 'localhost')${NC}:"
- read newHostname
+ read newHostname
while true; do
if [[ ! -z "$newHostname" && "$newHostname" != "localhost" ]]; then
break
@@ -266,25 +312,25 @@ function set_hostname() {
if [[ $retval != 0 ]]; then
echo
echo "set hostname fail!"
- return
+ return
fi
#echo -e -n "$(hostnamectl status --static)"
#echo -e -n "$(hostnamectl status --transient)"
#echo -e -n "$(hostnamectl status --pretty)"
-
+
#ubuntu/centos /etc/hostname
if [[ -e /etc/hostname ]]; then
${csudo} echo $newHostname > /etc/hostname ||:
fi
-
+
#debian: #HOSTNAME=yourname
if [[ -e /etc/sysconfig/network ]]; then
${csudo} sed -i -r "s/#*\s*(HOSTNAME=\s*).*/\1$newHostname/" /etc/sysconfig/network ||:
fi
${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$newHostname/" ${cfg_install_dir}/taos.cfg
- serverFqdn=$newHostname
-
+ serverFqdn=$newHostname
+
if [[ -e /etc/hosts ]]; then
add_newHostname_to_hosts $newHostname
fi
@@ -302,7 +348,7 @@ function is_correct_ipaddr() {
return 0
fi
done
-
+
return 1
}
@@ -316,13 +362,13 @@ function set_ipAsFqdn() {
echo
echo -e -n "${GREEN}Unable to get local ip, use 127.0.0.1${NC}"
localFqdn="127.0.0.1"
- # Write the local FQDN to configuration file
- ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
+ # Write the local FQDN to configuration file
+ ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
serverFqdn=$localFqdn
echo
return
- fi
-
+ fi
+
echo -e -n "${GREEN}Please choose an IP from local IP list${NC}:"
echo
echo -e -n "${GREEN}$iplist${NC}"
@@ -331,15 +377,15 @@ function set_ipAsFqdn() {
echo -e -n "${GREEN}Notes: if IP is used as the node name, data can NOT be migrated to other machine directly${NC}:"
read localFqdn
while true; do
- if [ ! -z "$localFqdn" ]; then
+ if [ ! -z "$localFqdn" ]; then
# Check if correct ip address
is_correct_ipaddr $localFqdn
retval=`echo $?`
if [[ $retval != 0 ]]; then
read -p "Please choose an IP from local IP list:" localFqdn
else
- # Write the local FQDN to configuration file
- ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
+ # Write the local FQDN to configuration file
+ ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
serverFqdn=$localFqdn
break
fi
@@ -354,59 +400,59 @@ function local_fqdn_check() {
echo
echo -e -n "System hostname is: ${GREEN}$serverFqdn${NC}"
echo
- if [[ "$serverFqdn" == "" ]] || [[ "$serverFqdn" == "localhost" ]]; then
+ if [[ "$serverFqdn" == "" ]] || [[ "$serverFqdn" == "localhost" ]]; then
echo -e -n "${GREEN}It is strongly recommended to configure a hostname for this machine ${NC}"
echo
-
+
while true
do
- read -r -p "Set hostname now? [Y/n] " input
- if [ ! -n "$input" ]; then
- set_hostname
- break
- else
- case $input in
- [yY][eE][sS]|[yY])
- set_hostname
- break
- ;;
-
- [nN][oO]|[nN])
- set_ipAsFqdn
- break
- ;;
-
- *)
- echo "Invalid input..."
- ;;
- esac
- fi
+ read -r -p "Set hostname now? [Y/n] " input
+ if [ ! -n "$input" ]; then
+ set_hostname
+ break
+ else
+ case $input in
+ [yY][eE][sS]|[yY])
+ set_hostname
+ break
+ ;;
+
+ [nN][oO]|[nN])
+ set_ipAsFqdn
+ break
+ ;;
+
+ *)
+ echo "Invalid input..."
+ ;;
+ esac
+ fi
done
fi
}
function install_config() {
#${csudo} rm -f ${install_main_dir}/cfg/taos.cfg || :
-
+
if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
${csudo} mkdir -p ${cfg_install_dir}
[ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
${csudo} chmod 644 ${cfg_install_dir}/*
- fi
-
+ fi
+
${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
[ ! -z $1 ] && return 0 || : # only install client
-
+
if ((${update_flag}==1)); then
return 0
fi
-
+
if [ "$interactiveFqdn" == "no" ]; then
return 0
- fi
-
+ fi
+
local_fqdn_check
#FQDN_FORMAT="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
@@ -424,8 +470,8 @@ function install_config() {
if [ ! -z "$firstEp" ]; then
# check the format of the firstEp
#if [[ $firstEp == $FQDN_PATTERN ]]; then
- # Write the first FQDN to configuration file
- ${csudo} sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/taos.cfg
+ # Write the first FQDN to configuration file
+ ${csudo} sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/taos.cfg
break
#else
# read -p "Please enter the correct FQDN:port: " firstEp
@@ -433,9 +479,9 @@ function install_config() {
else
break
fi
- done
+ done
- # user email
+ # user email
#EMAIL_PATTERN='^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$'
#EMAIL_PATTERN='^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$'
#EMAIL_PATTERN="^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$"
@@ -446,31 +492,31 @@ function install_config() {
if [ ! -z "$emailAddr" ]; then
# check the format of the emailAddr
#if [[ "$emailAddr" =~ $EMAIL_PATTERN ]]; then
- # Write the email address to temp file
- email_file="${install_main_dir}/email"
+ # Write the email address to temp file
+ email_file="${install_main_dir}/email"
${csudo} bash -c "echo $emailAddr > ${email_file}"
- break
+ break
#else
- # read -p "Please enter the correct email address: " emailAddr
+ # read -p "Please enter the correct email address: " emailAddr
#fi
else
break
fi
- done
+ done
}
function install_log() {
${csudo} rm -rf ${log_dir} || :
${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
-
+
${csudo} ln -s ${log_dir} ${install_main_dir}/log
}
function install_data() {
${csudo} mkdir -p ${data_dir}
-
- ${csudo} ln -s ${data_dir} ${install_main_dir}/data
+
+ ${csudo} ln -s ${data_dir} ${install_main_dir}/data
}
function install_connector() {
@@ -485,26 +531,26 @@ function install_examples() {
function clean_service_on_sysvinit() {
#restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
- #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
-
+ #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
+
if pidof taosd &> /dev/null; then
${csudo} service taosd stop || :
fi
-
+
if pidof tarbitrator &> /dev/null; then
${csudo} service tarbitratord stop || :
fi
if ((${initd_mod}==1)); then
- if [ -e ${service_config_dir}/taosd ]; then
+ if [ -e ${service_config_dir}/taosd ]; then
${csudo} chkconfig --del taosd || :
fi
- if [ -e ${service_config_dir}/tarbitratord ]; then
+ if [ -e ${service_config_dir}/tarbitratord ]; then
${csudo} chkconfig --del tarbitratord || :
fi
elif ((${initd_mod}==2)); then
- if [ -e ${service_config_dir}/taosd ]; then
+ if [ -e ${service_config_dir}/taosd ]; then
${csudo} insserv -r taosd || :
fi
if [ -e ${service_config_dir}/tarbitratord ]; then
@@ -518,10 +564,10 @@ function clean_service_on_sysvinit() {
${csudo} update-rc.d -f tarbitratord remove || :
fi
fi
-
+
${csudo} rm -f ${service_config_dir}/taosd || :
${csudo} rm -f ${service_config_dir}/tarbitratord || :
-
+
if $(which init &> /dev/null); then
${csudo} init q || :
fi
@@ -544,10 +590,10 @@ function install_service_on_sysvinit() {
${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
${csudo} cp ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
fi
-
+
#restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
#${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
-
+
if ((${initd_mod}==1)); then
${csudo} chkconfig --add taosd || :
${csudo} chkconfig --level 2345 taosd on || :
@@ -572,7 +618,7 @@ function clean_service_on_systemd() {
fi
${csudo} systemctl disable taosd &> /dev/null || echo &> /dev/null
${csudo} rm -f ${taosd_service_config}
-
+
tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
if systemctl is-active --quiet tarbitratord; then
echo "tarbitrator is running, stopping it..."
@@ -580,7 +626,7 @@ function clean_service_on_systemd() {
fi
${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
${csudo} rm -f ${tarbitratord_service_config}
-
+
if [ "$verMode" == "cluster" ]; then
nginx_service_config="${service_config_dir}/nginxd.service"
if systemctl is-active --quiet nginxd; then
@@ -588,8 +634,8 @@ function clean_service_on_systemd() {
${csudo} systemctl stop nginxd &> /dev/null || echo &> /dev/null
fi
${csudo} systemctl disable nginxd &> /dev/null || echo &> /dev/null
- ${csudo} rm -f ${nginx_service_config}
- fi
+ ${csudo} rm -f ${nginx_service_config}
+ fi
}
# taos:2345:respawn:/etc/init.d/taosd start
@@ -621,7 +667,7 @@ function install_service_on_systemd() {
${csudo} bash -c "echo '[Install]' >> ${taosd_service_config}"
${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${taosd_service_config}"
${csudo} systemctl enable taosd
-
+
tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
${csudo} bash -c "echo '[Unit]' >> ${tarbitratord_service_config}"
${csudo} bash -c "echo 'Description=TDengine arbitrator service' >> ${tarbitratord_service_config}"
@@ -643,9 +689,9 @@ function install_service_on_systemd() {
${csudo} bash -c "echo >> ${tarbitratord_service_config}"
${csudo} bash -c "echo '[Install]' >> ${tarbitratord_service_config}"
${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${tarbitratord_service_config}"
- #${csudo} systemctl enable tarbitratord
-
- if [ "$verMode" == "cluster" ]; then
+ #${csudo} systemctl enable tarbitratord
+
+ if [ "$verMode" == "cluster" ]; then
nginx_service_config="${service_config_dir}/nginxd.service"
${csudo} bash -c "echo '[Unit]' >> ${nginx_service_config}"
${csudo} bash -c "echo 'Description=Nginx For TDengine Service' >> ${nginx_service_config}"
@@ -674,7 +720,7 @@ function install_service_on_systemd() {
${csudo} systemctl enable nginxd
fi
${csudo} systemctl start nginxd
- fi
+ fi
}
function install_service() {
@@ -757,7 +803,7 @@ function update_TDengine() {
fi
sleep 1
fi
-
+
if [ "$verMode" == "cluster" ]; then
if pidof nginx &> /dev/null; then
if ((${service_mod}==0)); then
@@ -770,12 +816,13 @@ function update_TDengine() {
sleep 1
fi
fi
-
+
install_main_path
install_log
install_header
install_lib
+ install_jemalloc
if [ "$pagMode" != "lite" ]; then
install_connector
fi
@@ -783,10 +830,10 @@ function update_TDengine() {
if [ -z $1 ]; then
install_bin
install_service
- install_config
-
+ install_config
+
openresty_work=false
- if [ "$verMode" == "cluster" ]; then
+ if [ "$verMode" == "cluster" ]; then
# Check if openresty is installed
# Check if nginx is installed successfully
if type curl &> /dev/null; then
@@ -797,7 +844,7 @@ function update_TDengine() {
echo -e "\033[44;31;5mNginx for TDengine does not work! Please try again!\033[0m"
fi
fi
- fi
+ fi
#echo
#echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
@@ -816,7 +863,7 @@ function update_TDengine() {
else
echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos -h $serverFqdn${NC} in shell${NC}"
fi
-
+
echo
echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
else
@@ -839,14 +886,14 @@ function install_TDengine() {
tar -zxf taos.tar.gz
echo -e "${GREEN}Start to install TDengine...${NC}"
-
- install_main_path
-
+
+ install_main_path
+
if [ -z $1 ]; then
install_data
- fi
-
- install_log
+ fi
+
+ install_log
install_header
install_lib
if [ "$pagMode" != "lite" ]; then
@@ -871,8 +918,8 @@ function install_TDengine() {
fi
fi
fi
-
- install_config
+
+ install_config
# Ask if to start the service
#echo
@@ -885,36 +932,36 @@ function install_TDengine() {
echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} service taosd start${NC}"
else
echo -e "${GREEN_DARK}To start TDengine ${NC}: taosd${NC}"
- fi
+ fi
#if [ ${openresty_work} = 'true' ]; then
# echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
#else
# echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
#fi
-
+
if [ ! -z "$firstEp" ]; then
- tmpFqdn=${firstEp%%:*}
- substr=":"
- if [[ $firstEp =~ $substr ]];then
- tmpPort=${firstEp#*:}
- else
- tmpPort=""
- fi
- if [[ "$tmpPort" != "" ]];then
- echo -e "${GREEN_DARK}To access TDengine ${NC}: taos -h $tmpFqdn -P $tmpPort${GREEN_DARK} to login into cluster, then${NC}"
- else
- echo -e "${GREEN_DARK}To access TDengine ${NC}: taos -h $tmpFqdn${GREEN_DARK} to login into cluster, then${NC}"
- fi
- echo -e "${GREEN_DARK}execute ${NC}: create dnode 'newDnodeFQDN:port'; ${GREEN_DARK}to add this new node${NC}"
- echo
+ tmpFqdn=${firstEp%%:*}
+ substr=":"
+ if [[ $firstEp =~ $substr ]];then
+ tmpPort=${firstEp#*:}
+ else
+ tmpPort=""
+ fi
+ if [[ "$tmpPort" != "" ]];then
+ echo -e "${GREEN_DARK}To access TDengine ${NC}: taos -h $tmpFqdn -P $tmpPort${GREEN_DARK} to login into cluster, then${NC}"
+ else
+ echo -e "${GREEN_DARK}To access TDengine ${NC}: taos -h $tmpFqdn${GREEN_DARK} to login into cluster, then${NC}"
+ fi
+ echo -e "${GREEN_DARK}execute ${NC}: create dnode 'newDnodeFQDN:port'; ${GREEN_DARK}to add this new node${NC}"
+ echo
elif [ ! -z "$serverFqdn" ]; then
- echo -e "${GREEN_DARK}To access TDengine ${NC}: taos -h $serverFqdn${GREEN_DARK} to login into TDengine server${NC}"
- echo
+ echo -e "${GREEN_DARK}To access TDengine ${NC}: taos -h $serverFqdn${GREEN_DARK} to login into TDengine server${NC}"
+ echo
fi
-
+
echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
- echo
+ echo
else # Only install client
install_bin
install_config
@@ -945,6 +992,6 @@ elif [ "$verType" == "client" ]; then
else
install_TDengine client
fi
-else
- echo "please input correct verType"
+else
+ echo "please input correct verType"
fi
diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index 240804ed95..0c755d9f72 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -204,7 +204,7 @@ function install_jemalloc() {
if [ -f ${binary_dir}/build/lib/libjemalloc_pic.a ]; then
/usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc_pic.a /usr/local/lib
fi
- if [ -f ${binary_dir}/build/lib/libjemalloc_pic.a ]; then
+ if [ -f ${binary_dir}/build/lib/pkgconfig/jemalloc.pc ]; then
/usr/bin/install -c -d /usr/local/lib/pkgconfig
/usr/bin/install -c -m 644 ${binary_dir}/build/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
fi
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index e4d2d71b01..624f72278a 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -30,12 +30,12 @@ else
install_dir="${release_dir}/TDengine-server-${version}"
fi
-# Directories and files.
+# Directories and files
if [ "$pagMode" == "lite" ]; then
- strip ${build_dir}/bin/taosd
+ strip ${build_dir}/bin/taosd
strip ${build_dir}/bin/taos
bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${script_dir}/remove.sh"
-else
+else
bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdump ${build_dir}/bin/taosdemo ${build_dir}/bin/tarbitrator\
${script_dir}/remove.sh ${script_dir}/set_core.sh ${script_dir}/startPre.sh ${script_dir}/taosd-dump-cfg.gdb"
fi
@@ -73,10 +73,43 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taos
mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
+if [ -f ${build_dir}/bin/jemalloc-config ]; then
+ mkdir -p ${install_dir}/jemalloc/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}
+ cp ${build_dir}/bin/jemalloc-config ${install_dir}/jemalloc/bin
+ if [ -f ${build_dir}/bin/jemalloc.sh ]; then
+ cp ${build_dir}/bin/jemalloc.sh ${install_dir}/jemalloc/bin
+ fi
+ if [ -f ${build_dir}/bin/jeprof ]; then
+ cp ${build_dir}/bin/jeprof ${install_dir}/jemalloc/bin
+ fi
+ if [ -f ${build_dir}/include/jemalloc/jemalloc.h ]; then
+ cp ${build_dir}/include/jemalloc/jemalloc.h ${install_dir}/jemalloc/include/jemalloc
+ fi
+ if [ -f ${build_dir}/lib/libjemalloc.so.2 ]; then
+ cp ${build_dir}/lib/libjemalloc.so.2 ${install_dir}/jemalloc/lib
+ ln -sf libjemalloc.so.2 ${install_dir}/jemalloc/lib/libjemalloc.so
+ fi
+ if [ -f ${build_dir}/lib/libjemalloc.a ]; then
+ cp ${build_dir}/lib/libjemalloc.a ${install_dir}/jemalloc/lib
+ fi
+ if [ -f ${build_dir}/lib/libjemalloc_pic.a ]; then
+ cp ${build_dir}/lib/libjemalloc_pic.a ${install_dir}/jemalloc/lib
+ fi
+ if [ -f ${build_dir}/lib/pkgconfig/jemalloc.pc ]; then
+ cp ${build_dir}/lib/pkgconfig/jemalloc.pc ${install_dir}/jemalloc/lib/pkgconfig
+ fi
+ if [ -f ${build_dir}/share/doc/jemalloc/jemalloc.html ]; then
+ cp ${build_dir}/share/doc/jemalloc/jemalloc.html ${install_dir}/jemalloc/share/doc/jemalloc
+ fi
+ if [ -f ${build_dir}/share/man/man3/jemalloc.3 ]; then
+ cp ${build_dir}/share/man/man3/jemalloc.3 ${install_dir}/jemalloc/share/man/man3
+ fi
+fi
+
if [ "$verMode" == "cluster" ]; then
sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >> remove_temp.sh
mv remove_temp.sh ${install_dir}/bin/remove.sh
-
+
mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
rm -rf ${install_dir}/nginxd/png
@@ -132,7 +165,7 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
if [ -d ${examples_dir}/JDBC/taosdemo/target ]; then
rm -rf ${examples_dir}/JDBC/taosdemo/target
fi
-
+
cp -r ${examples_dir}/JDBC ${install_dir}/examples
cp -r ${examples_dir}/matlab ${install_dir}/examples
cp -r ${examples_dir}/python ${install_dir}/examples
@@ -142,7 +175,7 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
cp -r ${examples_dir}/C# ${install_dir}/examples
fi
# Copy driver
-mkdir -p ${install_dir}/driver
+mkdir -p ${install_dir}/driver
cp ${lib_files} ${install_dir}/driver
# Copy connector
@@ -168,7 +201,7 @@ fi
# exit 1
-cd ${release_dir}
+cd ${release_dir}
if [ "$verMode" == "cluster" ]; then
pkg_name=${install_dir}-${osType}-${cpuType}
@@ -185,8 +218,8 @@ fi
if [ "$verType" == "beta" ]; then
pkg_name=${pkg_name}-${verType}
-elif [ "$verType" == "stable" ]; then
- pkg_name=${pkg_name}
+elif [ "$verType" == "stable" ]; then
+ pkg_name=${pkg_name}
else
echo "unknow verType, nor stabel or beta"
exit 1
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 67fd34ffd7..c002f2cf32 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -283,6 +283,7 @@ typedef struct SSqlStream {
int64_t ctime; // stream created time
int64_t stime; // stream next executed time
int64_t etime; // stream end query time, when time is larger then etime, the stream will be closed
+ int64_t ltime; // stream last row time in stream table
SInterval interval;
void * pTimer;
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 89b024eb17..cd9853df03 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -774,6 +774,10 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
index = 0;
sToken = tStrGetToken(sql, &index, false);
+ if (sToken.type == TK_ILLEGAL) {
+ return tscSQLSyntaxErrMsg(pCmd->payload, "unrecognized token", sToken.z);
+ }
+
if (sToken.type == TK_RP) {
break;
}
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index 0e740b36bf..f199a57987 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -48,6 +48,7 @@ typedef struct SMultiTbStmt {
bool nameSet;
bool tagSet;
uint64_t currentUid;
+ char *sqlstr;
uint32_t tbNum;
SStrToken tbname;
SStrToken stbname;
@@ -1290,6 +1291,7 @@ int stmtParseInsertTbTags(SSqlObj* pSql, STscStmt* pStmt) {
}
pStmt->mtb.values = sToken;
+
}
return TSDB_CODE_SUCCESS;
@@ -1369,7 +1371,12 @@ int stmtGenInsertStatement(SSqlObj* pSql, STscStmt* pStmt, const char* name, TAO
break;
}
- free(pSql->sqlstr);
+ if (pStmt->mtb.sqlstr == NULL) {
+ pStmt->mtb.sqlstr = pSql->sqlstr;
+ } else {
+ tfree(pSql->sqlstr);
+ }
+
pSql->sqlstr = str;
return TSDB_CODE_SUCCESS;
@@ -1555,7 +1562,6 @@ int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_BIND* tags
}
pStmt->mtb.nameSet = true;
- pStmt->mtb.tagSet = true;
tscDebug("0x%"PRIx64" SQL: %s", pSql->self, pSql->sqlstr);
@@ -1628,6 +1634,7 @@ int taos_stmt_close(TAOS_STMT* stmt) {
taosHashCleanup(pStmt->pSql->cmd.insertParam.pTableBlockHashList);
pStmt->pSql->cmd.insertParam.pTableBlockHashList = NULL;
taosArrayDestroy(pStmt->mtb.tags);
+ tfree(pStmt->mtb.sqlstr);
}
}
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 15e40d5918..9ee83f3728 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -396,11 +396,18 @@ int32_t tscValidateSqlInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
const char* msg2 = "name too long";
SCreateDbInfo* pCreateDB = &(pInfo->pMiscInfo->dbOpt);
- if (tscValidateName(&pCreateDB->dbname) != TSDB_CODE_SUCCESS) {
+ if (pCreateDB->dbname.n >= TSDB_DB_NAME_LEN) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
+ }
+
+ char buf[TSDB_DB_NAME_LEN] = {0};
+ SStrToken token = taosTokenDup(&pCreateDB->dbname, buf, tListLen(buf));
+
+ if (tscValidateName(&token) != TSDB_CODE_SUCCESS) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
}
- int32_t ret = tNameSetDbName(&pTableMetaInfo->name, getAccountId(pSql), &(pCreateDB->dbname));
+ int32_t ret = tNameSetDbName(&pTableMetaInfo->name, getAccountId(pSql), &token);
if (ret != TSDB_CODE_SUCCESS) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
}
@@ -5138,6 +5145,10 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
const char* msg18 = "primary timestamp column cannot be dropped";
const char* msg19 = "invalid new tag name";
const char* msg20 = "table is not super table";
+ const char* msg21 = "only binary/nchar column length could be modified";
+ const char* msg22 = "new column length should be bigger than old one";
+ const char* msg23 = "only column length coulbe be modified";
+ const char* msg24 = "invalid binary/nchar column length";
int32_t code = TSDB_CODE_SUCCESS;
@@ -5168,13 +5179,13 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
}
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) {
- if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
+ pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN) {
+ if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
}
} else if ((pAlterSQL->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) && (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo))) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
- } else if ((pAlterSQL->type == TSDB_ALTER_TABLE_ADD_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_DROP_COLUMN) &&
+ } else if ((pAlterSQL->type == TSDB_ALTER_TABLE_ADD_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_DROP_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_COLUMN) &&
UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo)) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
}
@@ -5390,6 +5401,85 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
tstrncpy(name1, pItem->pVar.pz, sizeof(name1));
TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name1, tDataTypes[TSDB_DATA_TYPE_INT].bytes);
tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+ } else if (pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_COLUMN) {
+ if (taosArrayGetSize(pAlterSQL->pAddColumns) >= 2) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg16);
+ }
+
+
+ TAOS_FIELD* pItem = taosArrayGet(pAlterSQL->pAddColumns, 0);
+ if (pItem->type != TSDB_DATA_TYPE_BINARY && pItem->type != TSDB_DATA_TYPE_NCHAR) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg21);
+ }
+
+ SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
+ SStrToken name = {.type = TK_STRING, .z = pItem->name, .n = (uint32_t)strlen(pItem->name)};
+ if (getColumnIndexByName(pCmd, &name, pQueryInfo, &columnIndex) != TSDB_CODE_SUCCESS) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg17);
+ }
+
+ SSchema* pColSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, columnIndex.columnIndex);
+
+ if (pColSchema->type != TSDB_DATA_TYPE_BINARY && pColSchema->type != TSDB_DATA_TYPE_NCHAR) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg21);
+ }
+
+ if (pItem->type != pColSchema->type) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg23);
+ }
+
+ if ((pItem->type == TSDB_DATA_TYPE_BINARY && (pItem->bytes <= 0 || pItem->bytes > TSDB_MAX_BINARY_LEN)) ||
+ (pItem->type == TSDB_DATA_TYPE_NCHAR && (pItem->bytes <= 0 || pItem->bytes > TSDB_MAX_NCHAR_LEN))) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg24);
+ }
+
+ if (pItem->bytes <= pColSchema->bytes) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg22);
+ }
+
+ TAOS_FIELD f = tscCreateField(pColSchema->type, name.z, pItem->bytes);
+ tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+ }else if (pAlterSQL->type == TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN) {
+ if (taosArrayGetSize(pAlterSQL->pAddColumns) >= 2) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg16);
+ }
+
+ TAOS_FIELD* pItem = taosArrayGet(pAlterSQL->pAddColumns, 0);
+ if (pItem->type != TSDB_DATA_TYPE_BINARY && pItem->type != TSDB_DATA_TYPE_NCHAR) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg21);
+ }
+
+ SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
+ SStrToken name = {.type = TK_STRING, .z = pItem->name, .n = (uint32_t)strlen(pItem->name)};
+ if (getColumnIndexByName(pCmd, &name, pQueryInfo, &columnIndex) != TSDB_CODE_SUCCESS) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg17);
+ }
+
+ SSchema* pColSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, columnIndex.columnIndex);
+
+ if (columnIndex.columnIndex < tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg10);
+ }
+
+ if (pColSchema->type != TSDB_DATA_TYPE_BINARY && pColSchema->type != TSDB_DATA_TYPE_NCHAR) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg21);
+ }
+
+ if (pItem->type != pColSchema->type) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg23);
+ }
+
+ if ((pItem->type == TSDB_DATA_TYPE_BINARY && (pItem->bytes <= 0 || pItem->bytes > TSDB_MAX_BINARY_LEN)) ||
+ (pItem->type == TSDB_DATA_TYPE_NCHAR && (pItem->bytes <= 0 || pItem->bytes > TSDB_MAX_NCHAR_LEN))) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg24);
+ }
+
+ if (pItem->bytes <= pColSchema->bytes) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg22);
+ }
+
+ TAOS_FIELD f = tscCreateField(pColSchema->type, name.z, pItem->bytes);
+ tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
}
return TSDB_CODE_SUCCESS;
@@ -7189,8 +7279,9 @@ static int32_t getTableNameFromSqlNode(SSqlNode* pSqlNode, SArray* tableNameList
}
SName name = {0};
- if (tscSetTableFullName(&name, t, pSql) != TSDB_CODE_SUCCESS) {
- return invalidOperationMsg(msgBuf, msg1);
+ int32_t code = tscSetTableFullName(&name, t, pSql);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
}
taosArrayPush(tableNameList, &name);
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 2763005303..f997d487d1 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2469,8 +2469,8 @@ int32_t getMultiTableMetaFromMnode(SSqlObj *pSql, SArray* pNameList, SArray* pVg
pNew->fp = fp;
pNew->param = (void *)pSql->self;
- tscDebug("0x%"PRIx64" metaRid from %" PRId64 " to %" PRId64 , pSql->self, pSql->metaRid, pNew->self);
-
+ tscDebug("0x%"PRIx64" metaRid from 0x%" PRIx64 " to 0x%" PRIx64 , pSql->self, pSql->metaRid, pNew->self);
+
pSql->metaRid = pNew->self;
int32_t code = tscBuildAndSendRequest(pNew, NULL);
if (code == TSDB_CODE_SUCCESS) {
diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index 73a3fbafc3..2fc18943da 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -24,6 +24,7 @@
#include "tutil.h"
#include "tscProfile.h"
+#include "tscSubquery.h"
static void tscProcessStreamQueryCallback(void *param, TAOS_RES *tres, int numOfRows);
static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOfRows);
@@ -47,8 +48,8 @@ static bool isProjectStream(SQueryInfo* pQueryInfo) {
static int64_t tscGetRetryDelayTime(SSqlStream* pStream, int64_t slidingTime, int16_t prec) {
float retryRangeFactor = 0.3f;
- int64_t retryDelta = (int64_t)(tsStreamCompRetryDelay * retryRangeFactor);
- retryDelta = ((rand() % retryDelta) + tsStreamCompRetryDelay) * 1000L;
+ int64_t retryDelta = (int64_t)(tsRetryStreamCompDelay * retryRangeFactor);
+ retryDelta = ((rand() % retryDelta) + tsRetryStreamCompDelay) * 1000L;
if (pStream->interval.intervalUnit != 'n' && pStream->interval.intervalUnit != 'y') {
// change to ms
@@ -575,6 +576,14 @@ static void tscCreateStream(void *param, TAOS_RES *res, int code) {
pStream->stime = tscGetStreamStartTimestamp(pSql, pStream, pStream->stime);
+ // set stime with ltime if ltime > stime
+ const char* dstTable = pStream->dstTable? pStream->dstTable: "";
+ tscDebug(" CQ table=%s ltime is %"PRId64, dstTable, pStream->ltime);
+ if(pStream->ltime != INT64_MIN && pStream->ltime > pStream->stime) {
+ tscWarn(" CQ set stream %s stime=%"PRId64" replace with ltime=%"PRId64" if ltime>0 ", dstTable, pStream->stime, pStream->ltime);
+ pStream->stime = pStream->ltime;
+ }
+
int64_t starttime = tscGetLaunchTimestamp(pStream);
pCmd->command = TSDB_SQL_SELECT;
@@ -590,7 +599,66 @@ void tscSetStreamDestTable(SSqlStream* pStream, const char* dstTable) {
pStream->dstTable = dstTable;
}
-TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
+// fetchFp call back
+void fetchFpStreamLastRow(void* param ,TAOS_RES* res, int num) {
+ SSqlStream* pStream = (SSqlStream*)param;
+ SSqlObj* pSql = res;
+
+ // get row data set to ltime
+ tscSetSqlOwner(pSql);
+ TAOS_ROW row = doSetResultRowData(pSql);
+ if( row && row[0] ) {
+ pStream->ltime = *((int64_t*)row[0]);
+ const char* dstTable = pStream->dstTable? pStream->dstTable: "";
+ tscDebug(" CQ stream table=%s last row time=%"PRId64" .", dstTable, pStream->ltime);
+ }
+ tscClearSqlOwner(pSql);
+
+ // no condition call
+ tscCreateStream(param, pStream->pSql, TSDB_CODE_SUCCESS);
+ taos_free_result(res);
+}
+
+// fp callback
+void fpStreamLastRow(void* param ,TAOS_RES* res, int code) {
+ // check result successful
+ if (code != TSDB_CODE_SUCCESS) {
+ tscCreateStream(param, res, TSDB_CODE_SUCCESS);
+ taos_free_result(res);
+ return ;
+ }
+
+ // asynchronous fetch last row data
+ taos_fetch_rows_a(res, fetchFpStreamLastRow, param);
+}
+
+void cbParseSql(void* param, TAOS_RES* res, int code) {
+ // check result successful
+ SSqlStream* pStream = (SSqlStream*)param;
+ SSqlObj* pSql = pStream->pSql;
+ SSqlCmd* pCmd = &pSql->cmd;
+ if (code != TSDB_CODE_SUCCESS) {
+ pSql->res.code = code;
+ tscDebug("0x%"PRIx64" open stream parse sql failed, sql:%s, reason:%s, code:%s", pSql->self, pSql->sqlstr, pCmd->payload, tstrerror(code));
+ pStream->fp(pStream->param, NULL, NULL);
+ return;
+ }
+
+ // check dstTable valid
+ if(pStream->dstTable == NULL || strlen(pStream->dstTable) == 0) {
+ tscDebug(" cbParseSql dstTable is empty.");
+ tscCreateStream(param, res, code);
+ return ;
+ }
+
+ // query stream last row time async
+ char sql[128] = "";
+ sprintf(sql, "select last_row(*) from %s;", pStream->dstTable);
+ taos_query_a(pSql->pTscObj, sql, fpStreamLastRow, param);
+ return ;
+}
+
+TAOS_STREAM *taos_open_stream_withname(TAOS *taos, const char* dstTable, const char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
int64_t stime, void *param, void (*callback)(void *)) {
STscObj *pObj = (STscObj *)taos;
if (pObj == NULL || pObj->signature != pObj) return NULL;
@@ -613,11 +681,16 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
return NULL;
}
- pStream->stime = stime;
- pStream->fp = fp;
+ pStream->ltime = INT64_MIN;
+ pStream->stime = stime;
+ pStream->fp = fp;
pStream->callback = callback;
- pStream->param = param;
- pStream->pSql = pSql;
+ pStream->param = param;
+ pStream->pSql = pSql;
+ pSql->pStream = pStream;
+ pSql->param = pStream;
+ pSql->maxRetry = TSDB_MAX_REPLICA;
+ tscSetStreamDestTable(pStream, dstTable);
pSql->pStream = pStream;
pSql->param = pStream;
@@ -640,10 +713,17 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
tscDebugL("0x%"PRIx64" SQL: %s", pSql->self, pSql->sqlstr);
+ pSql->fp = cbParseSql;
+ pSql->fetchFp = cbParseSql;
+
+ registerSqlObj(pSql);
+
int32_t code = tsParseSql(pSql, true);
if (code == TSDB_CODE_SUCCESS) {
- tscCreateStream(pStream, pSql, code);
- } else if (code != TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+ cbParseSql(pStream, pSql, code);
+ } else if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+ tscDebug(" CQ taso_open_stream IN Process. sql=%s", sqlstr);
+ } else {
tscError("0x%"PRIx64" open stream failed, sql:%s, code:%s", pSql->self, sqlstr, tstrerror(code));
taosReleaseRef(tscObjRef, pSql->self);
free(pStream);
@@ -653,6 +733,11 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
return pStream;
}
+TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
+ int64_t stime, void *param, void (*callback)(void *)) {
+ return taos_open_stream_withname(taos, "", sqlstr, fp, stime, param, callback);
+}
+
void taos_close_stream(TAOS_STREAM *handle) {
SSqlStream *pStream = (SSqlStream *)handle;
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 4b1b3e9080..2f32e775d6 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -1469,6 +1469,8 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR
SSqlRes* pRes1 = &pParentSql->pSubs[i]->res;
+ pParentSql->res.precision = pRes1->precision;
+
if (pRes1->row > 0 && pRes1->numOfRows > 0) {
tscDebug("0x%"PRIx64" sub:0x%"PRIx64" index:%d numOfRows:%d total:%"PRId64 " (not retrieve)", pParentSql->self,
pParentSql->pSubs[i]->self, i, pRes1->numOfRows, pRes1->numOfTotal);
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 8042f032c8..b5dfc956dd 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1119,6 +1119,8 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
SOperatorInfo* pSourceOperator = createDummyInputOperator(pSqlObjList[0], pSchema, numOfCol1, pFilterInfo, numOfFilterCols);
+ pOutput->precision = pSqlObjList[0]->res.precision;
+
SSchema* schema = NULL;
if (px->numOfTables > 1) {
SOperatorInfo** p = calloc(px->numOfTables, POINTER_BYTES);
@@ -4477,4 +4479,4 @@ SNewVgroupInfo createNewVgroupInfo(SVgroupMsg *pVgroupMsg) {
}
return info;
-}
\ No newline at end of file
+}
diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index fcae7a415f..8ee7329156 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -319,7 +319,7 @@ int tdInitDataCols(SDataCols *pCols, STSchema *pSchema);
SDataCols *tdDupDataCols(SDataCols *pCols, bool keepData);
SDataCols *tdFreeDataCols(SDataCols *pCols);
void tdAppendDataRowToDataCol(SDataRow row, STSchema *pSchema, SDataCols *pCols);
-int tdMergeDataCols(SDataCols *target, SDataCols *src, int rowsToMerge);
+int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int *pOffset);
// ----------------- K-V data row structure
/*
diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index e07c3611d7..47460a5fab 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -39,6 +39,7 @@ extern int8_t tsEnableTelemetryReporting;
extern char tsEmail[];
extern char tsArbitrator[];
extern int8_t tsArbOnline;
+extern int64_t tsArbOnlineTimestamp;
extern int32_t tsDnodeId;
// common
@@ -75,7 +76,7 @@ extern int32_t tsMinSlidingTime;
extern int32_t tsMinIntervalTime;
extern int32_t tsMaxStreamComputDelay;
extern int32_t tsStreamCompStartDelay;
-extern int32_t tsStreamCompRetryDelay;
+extern int32_t tsRetryStreamCompDelay;
extern float tsStreamComputDelayRatio; // the delayed computing ration of the whole time window
extern int32_t tsProjectExecInterval;
extern int64_t tsMaxRetentWindow;
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index f5b84e4c9a..7ae34d532c 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -441,30 +441,35 @@ void tdAppendDataRowToDataCol(SDataRow row, STSchema *pSchema, SDataCols *pCols)
pCols->numOfRows++;
}
-int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge) {
+int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int *pOffset) {
ASSERT(rowsToMerge > 0 && rowsToMerge <= source->numOfRows);
ASSERT(target->numOfCols == source->numOfCols);
+ int offset = 0;
+
+ if (pOffset == NULL) {
+ pOffset = &offset;
+ }
SDataCols *pTarget = NULL;
- if (dataColsKeyLast(target) < dataColsKeyFirst(source)) { // No overlap
+ if ((target->numOfRows == 0) || (dataColsKeyLast(target) < dataColsKeyFirst(source))) { // No overlap
ASSERT(target->numOfRows + rowsToMerge <= target->maxPoints);
for (int i = 0; i < rowsToMerge; i++) {
for (int j = 0; j < source->numOfCols; j++) {
if (source->cols[j].len > 0) {
- dataColAppendVal(target->cols + j, tdGetColDataOfRow(source->cols + j, i), target->numOfRows,
+ dataColAppendVal(target->cols + j, tdGetColDataOfRow(source->cols + j, i + (*pOffset)), target->numOfRows,
target->maxPoints);
}
}
target->numOfRows++;
}
+ (*pOffset) += rowsToMerge;
} else {
pTarget = tdDupDataCols(target, true);
if (pTarget == NULL) goto _err;
int iter1 = 0;
- int iter2 = 0;
- tdMergeTwoDataCols(target, pTarget, &iter1, pTarget->numOfRows, source, &iter2, source->numOfRows,
+ tdMergeTwoDataCols(target, pTarget, &iter1, pTarget->numOfRows, source, pOffset, source->numOfRows,
pTarget->numOfRows + rowsToMerge);
}
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index d6bbc288ad..eae2fab32b 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -42,11 +42,12 @@ int32_t tsNumOfMnodes = 3;
int8_t tsEnableVnodeBak = 1;
int8_t tsEnableTelemetryReporting = 1;
int8_t tsArbOnline = 0;
+int64_t tsArbOnlineTimestamp = TSDB_ARB_DUMMY_TIME;
char tsEmail[TSDB_FQDN_LEN] = {0};
int32_t tsDnodeId = 0;
// common
-int32_t tsRpcTimer = 1000;
+int32_t tsRpcTimer = 300;
int32_t tsRpcMaxTime = 600; // seconds;
int32_t tsRpcForceTcp = 0; //disable this, means query, show command use udp protocol as default
int32_t tsMaxShellConns = 50000;
@@ -93,7 +94,7 @@ int32_t tsMaxStreamComputDelay = 20000;
int32_t tsStreamCompStartDelay = 10000;
// the stream computing delay time after executing failed, change accordingly
-int32_t tsStreamCompRetryDelay = 10;
+int32_t tsRetryStreamCompDelay = 10*1000;
// The delayed computing ration. 10% of the whole computing time window by default.
float tsStreamComputDelayRatio = 0.1f;
@@ -710,7 +711,7 @@ static void doInitGlobalConfig(void) {
taosInitConfigOption(cfg);
cfg.option = "retryStreamCompDelay";
- cfg.ptr = &tsStreamCompRetryDelay;
+ cfg.ptr = &tsRetryStreamCompDelay;
cfg.valType = TAOS_CFG_VTYPE_INT32;
cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
cfg.minValue = 10;
diff --git a/src/connector/go b/src/connector/go
index 8ce6d86558..7a26c432f8 160000
--- a/src/connector/go
+++ b/src/connector/go
@@ -1 +1 @@
-Subproject commit 8ce6d86558afc8c0b50c10f990fd2b4270cf06fc
+Subproject commit 7a26c432f8b4203e42344ff3290b9b9b01b983d5
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
index 52858e7f88..277ca447f5 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
@@ -243,15 +243,15 @@ public class TSDBPreparedStatementTest {
s.setNString(1, s2, 4);
random = 10 + r.nextInt(5);
- ArrayList s5 = new ArrayList();
+ ArrayList s3 = new ArrayList();
for(int i = 0; i < numOfRows; i++) {
if(i % random == 0) {
- s5.add(null);
+ s3.add(null);
}else{
- s5.add("test" + i % 10);
+ s3.add("test" + i % 10);
}
}
- s.setString(2, s5, 10);
+ s.setString(2, s3, 10);
s.columnDataAddBatch();
s.columnDataExecuteBatch();
@@ -268,7 +268,126 @@ public class TSDBPreparedStatementTest {
}
}
+ @Test
+ public void bindDataWithSingleTagTest() throws SQLException {
+ Statement stmt = conn.createStatement();
+ String types[] = new String[] {"tinyint", "smallint", "int", "bigint", "bool", "float", "double", "binary(10)", "nchar(10)"};
+
+ for (String type : types) {
+ stmt.execute("drop table if exists weather_test");
+ stmt.execute("create table weather_test(ts timestamp, f1 nchar(10), f2 binary(10)) tags (t " + type + ")");
+
+ int numOfRows = 1;
+
+ TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? using weather_test tags(?) values(?, ?, ?)");
+ Random r = new Random();
+ s.setTableName("w1");
+
+ switch(type) {
+ case "tinyint":
+ case "smallint":
+ case "int":
+ case "bigint":
+ s.setTagInt(0, 1);
+ break;
+ case "float":
+ s.setTagFloat(0, 1.23f);
+ break;
+ case "double":
+ s.setTagDouble(0, 3.14159265);
+ break;
+ case "bool":
+ s.setTagBoolean(0, true);
+ break;
+ case "binary(10)":
+ s.setTagString(0, "test");
+ break;
+ case "nchar(10)":
+ s.setTagNString(0, "test");
+ break;
+ default:
+ break;
+ }
+
+
+ ArrayList ts = new ArrayList();
+ for(int i = 0; i < numOfRows; i++) {
+ ts.add(System.currentTimeMillis() + i);
+ }
+ s.setTimestamp(0, ts);
+
+ int random = 10 + r.nextInt(5);
+ ArrayList s2 = new ArrayList();
+ for(int i = 0; i < numOfRows; i++) {
+ s2.add("分支" + i % 4);
+ }
+ s.setNString(1, s2, 10);
+
+ random = 10 + r.nextInt(5);
+ ArrayList s3 = new ArrayList();
+ for(int i = 0; i < numOfRows; i++) {
+ s3.add("test" + i % 4);
+ }
+ s.setString(2, s3, 10);
+
+ s.columnDataAddBatch();
+ s.columnDataExecuteBatch();
+ s.columnDataCloseBatch();
+
+ String sql = "select * from weather_test";
+ PreparedStatement statement = conn.prepareStatement(sql);
+ ResultSet rs = statement.executeQuery();
+ int rows = 0;
+ while(rs.next()) {
+ rows++;
+ }
+ Assert.assertEquals(numOfRows, rows);
+ }
+ }
+
+
+ @Test
+ public void bindDataWithMultipleTagsTest() throws SQLException {
+ Statement stmt = conn.createStatement();
+
+ stmt.execute("drop table if exists weather_test");
+ stmt.execute("create table weather_test(ts timestamp, f1 nchar(10), f2 binary(10)) tags (t1 int, t2 binary(10))");
+
+ int numOfRows = 1;
+
+ TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? using weather_test tags(?,?) (ts, f2) values(?, ?)");
+ s.setTableName("w2");
+ s.setTagInt(0, 1);
+ s.setTagString(1, "test");
+
+
+ ArrayList ts = new ArrayList();
+ for(int i = 0; i < numOfRows; i++) {
+ ts.add(System.currentTimeMillis() + i);
+ }
+ s.setTimestamp(0, ts);
+
+ ArrayList s2 = new ArrayList();
+ for(int i = 0; i < numOfRows; i++) {
+ s2.add("test" + i % 4);
+ }
+ s.setString(1, s2, 10);
+
+ s.columnDataAddBatch();
+ s.columnDataExecuteBatch();
+ s.columnDataCloseBatch();
+
+ String sql = "select * from weather_test";
+ PreparedStatement statement = conn.prepareStatement(sql);
+ ResultSet rs = statement.executeQuery();
+ int rows = 0;
+ while(rs.next()) {
+ rows++;
+ }
+ Assert.assertEquals(numOfRows, rows);
+
+ }
@Test
public void setBoolean() throws SQLException {
diff --git a/src/connector/python/taos/__init__.py b/src/connector/python/taos/__init__.py
index 9732635738..52c6db311e 100644
--- a/src/connector/python/taos/__init__.py
+++ b/src/connector/python/taos/__init__.py
@@ -2,6 +2,10 @@
from .connection import TDengineConnection
from .cursor import TDengineCursor
+# For some reason, the following is needed for VS Code (through PyLance) to
+# recognize that "error" is a valid module of the "taos" package.
+from .error import ProgrammingError
+
# Globals
threadsafety = 0
paramstyle = 'pyformat'
diff --git a/src/cq/src/cqMain.c b/src/cq/src/cqMain.c
index 5d5d5f339e..ee4be02b90 100644
--- a/src/cq/src/cqMain.c
+++ b/src/cq/src/cqMain.c
@@ -437,6 +437,10 @@ static void cqProcessCreateTimer(void *param, void *tmrId) {
taosReleaseRef(cqObjRef, (int64_t)param);
}
+// inner implement in tscStream.c
+TAOS_STREAM *taos_open_stream_withname(TAOS *taos, const char* desName, const char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
+ int64_t stime, void *param, void (*callback)(void *));
+
static void cqCreateStream(SCqContext *pContext, SCqObj *pObj) {
pObj->pContext = pContext;
@@ -449,11 +453,10 @@ static void cqCreateStream(SCqContext *pContext, SCqObj *pObj) {
pObj->tmrId = 0;
if (pObj->pStream == NULL) {
- pObj->pStream = taos_open_stream(pContext->dbConn, pObj->sqlStr, cqProcessStreamRes, INT64_MIN, (void *)pObj->rid, NULL);
+ pObj->pStream = taos_open_stream_withname(pContext->dbConn, pObj->dstTable, pObj->sqlStr, cqProcessStreamRes, INT64_MIN, (void *)pObj->rid, NULL);
// TODO the pObj->pStream may be released if error happens
if (pObj->pStream) {
- tscSetStreamDestTable(pObj->pStream, pObj->dstTable);
pContext->num++;
cDebug("vgId:%d, id:%d CQ:%s is opened", pContext->vgId, pObj->tid, pObj->sqlStr);
} else {
diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
index 64da11f312..cf633502c1 100644
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -88,13 +88,24 @@ static SStep tsDnodeSteps[] = {
static SStep tsDnodeCompactSteps[] = {
{"dnode-tfile", tfInit, tfCleanup},
+ {"dnode-globalcfg", taosCheckGlobalCfg, NULL},
{"dnode-storage", dnodeInitStorage, dnodeCleanupStorage},
+ {"dnode-cfg", dnodeInitCfg, dnodeCleanupCfg},
{"dnode-eps", dnodeInitEps, dnodeCleanupEps},
+ {"dnode-minfos", dnodeInitMInfos, dnodeCleanupMInfos},
{"dnode-wal", walInit, walCleanUp},
+ {"dnode-sync", syncInit, syncCleanUp},
+ {"dnode-vread", dnodeInitVRead, dnodeCleanupVRead},
+ {"dnode-vwrite", dnodeInitVWrite, dnodeCleanupVWrite},
+ {"dnode-vmgmt", dnodeInitVMgmt, dnodeCleanupVMgmt},
{"dnode-mread", dnodeInitMRead, NULL},
{"dnode-mwrite", dnodeInitMWrite, NULL},
{"dnode-mpeer", dnodeInitMPeer, NULL},
+ {"dnode-vnodes", dnodeInitVnodes, dnodeCleanupVnodes},
{"dnode-modules", dnodeInitModules, dnodeCleanupModules},
+ {"dnode-mread", NULL, dnodeCleanupMRead},
+ {"dnode-mwrite", NULL, dnodeCleanupMWrite},
+ {"dnode-mpeer", NULL, dnodeCleanupMPeer},
};
static int dnodeCreateDir(const char *dir) {
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index 5bdd197aa9..e6eec73681 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -375,6 +375,8 @@ do { \
#define TSDB_MAX_WAL_SIZE (1024*1024*3)
+#define TSDB_ARB_DUMMY_TIME 4765104000000 // 2121-01-01 00:00:00.000, :P
+
typedef enum {
TAOS_QTYPE_RPC = 0,
TAOS_QTYPE_FWD = 1,
diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 09f632ea32..ab15e851e7 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -215,11 +215,11 @@ int32_t* taosGetErrno();
#define TSDB_CODE_VND_IS_FLOWCTRL TAOS_DEF_ERROR_CODE(0, 0x050C) //"Database memory is full for waiting commit")
#define TSDB_CODE_VND_IS_DROPPING TAOS_DEF_ERROR_CODE(0, 0x050D) //"Database is dropping")
#define TSDB_CODE_VND_IS_BALANCING TAOS_DEF_ERROR_CODE(0, 0x050E) //"Database is balancing")
+#define TSDB_CODE_VND_IS_CLOSING TAOS_DEF_ERROR_CODE(0, 0x0510) //"Database is closing")
#define TSDB_CODE_VND_NOT_SYNCED TAOS_DEF_ERROR_CODE(0, 0x0511) //"Database suspended")
#define TSDB_CODE_VND_NO_WRITE_AUTH TAOS_DEF_ERROR_CODE(0, 0x0512) //"Database write operation denied")
#define TSDB_CODE_VND_IS_SYNCING TAOS_DEF_ERROR_CODE(0, 0x0513) //"Database is syncing")
#define TSDB_CODE_VND_INVALID_TSDB_STATE TAOS_DEF_ERROR_CODE(0, 0x0514) //"Invalid tsdb state")
-#define TSDB_CODE_VND_IS_CLOSING TAOS_DEF_ERROR_CODE(0, 0x0515) //"Database is closing")
// tsdb
#define TSDB_CODE_TDB_INVALID_TABLE_ID TAOS_DEF_ERROR_CODE(0, 0x0600) //"Invalid table ID")
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 0d8f555670..15b1da1dd3 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -161,6 +161,7 @@ enum _mgmt_table {
#define TSDB_ALTER_TABLE_ADD_COLUMN 5
#define TSDB_ALTER_TABLE_DROP_COLUMN 6
#define TSDB_ALTER_TABLE_CHANGE_COLUMN 7
+#define TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN 8
#define TSDB_FILL_NONE 0
#define TSDB_FILL_NULL 1
diff --git a/src/inc/tfs.h b/src/inc/tfs.h
index 4ed21bc6e1..e72620eca6 100644
--- a/src/inc/tfs.h
+++ b/src/inc/tfs.h
@@ -31,6 +31,8 @@ typedef struct {
#define TFS_UNDECIDED_ID -1
#define TFS_PRIMARY_LEVEL 0
#define TFS_PRIMARY_ID 0
+#define TFS_MIN_LEVEL 0
+#define TFS_MAX_LEVEL (TSDB_MAX_TIERS - 1)
// FS APIs ====================================
typedef struct {
diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index 376836369d..05d29daad5 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -409,6 +409,9 @@ void tsdbDecCommitRef(int vgId);
int tsdbSyncSend(void *pRepo, SOCKET socketFd);
int tsdbSyncRecv(void *pRepo, SOCKET socketFd);
+// For TSDB Compact
+int tsdbCompact(STsdbRepo *pRepo);
+
#ifdef __cplusplus
}
#endif
diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h
index e9585636fd..c7d630891b 100644
--- a/src/inc/ttokendef.h
+++ b/src/inc/ttokendef.h
@@ -156,54 +156,62 @@
#define TK_SYNCDB 137
#define TK_ADD 138
#define TK_COLUMN 139
-#define TK_TAG 140
-#define TK_CHANGE 141
-#define TK_SET 142
-#define TK_KILL 143
-#define TK_CONNECTION 144
-#define TK_STREAM 145
-#define TK_COLON 146
-#define TK_ABORT 147
-#define TK_AFTER 148
-#define TK_ATTACH 149
-#define TK_BEFORE 150
-#define TK_BEGIN 151
-#define TK_CASCADE 152
-#define TK_CLUSTER 153
-#define TK_CONFLICT 154
-#define TK_COPY 155
-#define TK_DEFERRED 156
-#define TK_DELIMITERS 157
-#define TK_DETACH 158
-#define TK_EACH 159
-#define TK_END 160
-#define TK_EXPLAIN 161
-#define TK_FAIL 162
-#define TK_FOR 163
-#define TK_IGNORE 164
-#define TK_IMMEDIATE 165
-#define TK_INITIALLY 166
-#define TK_INSTEAD 167
-#define TK_MATCH 168
-#define TK_KEY 169
-#define TK_OF 170
-#define TK_RAISE 171
-#define TK_REPLACE 172
-#define TK_RESTRICT 173
-#define TK_ROW 174
-#define TK_STATEMENT 175
-#define TK_TRIGGER 176
-#define TK_VIEW 177
-#define TK_SEMI 178
-#define TK_NONE 179
-#define TK_PREV 180
-#define TK_LINEAR 181
-#define TK_IMPORT 182
-#define TK_TBNAME 183
-#define TK_JOIN 184
-#define TK_INSERT 185
-#define TK_INTO 186
-#define TK_VALUES 187
+#define TK_MODIFY 140
+#define TK_TAG 141
+#define TK_CHANGE 142
+#define TK_SET 143
+#define TK_KILL 144
+#define TK_CONNECTION 145
+#define TK_STREAM 146
+#define TK_COLON 147
+#define TK_ABORT 148
+#define TK_AFTER 149
+#define TK_ATTACH 150
+#define TK_BEFORE 151
+#define TK_BEGIN 152
+#define TK_CASCADE 153
+#define TK_CLUSTER 154
+#define TK_CONFLICT 155
+#define TK_COPY 156
+#define TK_DEFERRED 157
+#define TK_DELIMITERS 158
+#define TK_DETACH 159
+#define TK_EACH 160
+#define TK_END 161
+#define TK_EXPLAIN 162
+#define TK_FAIL 163
+#define TK_FOR 164
+#define TK_IGNORE 165
+#define TK_IMMEDIATE 166
+#define TK_INITIALLY 167
+#define TK_INSTEAD 168
+#define TK_MATCH 169
+#define TK_KEY 170
+#define TK_OF 171
+#define TK_RAISE 172
+#define TK_REPLACE 173
+#define TK_RESTRICT 174
+#define TK_ROW 175
+#define TK_STATEMENT 176
+#define TK_TRIGGER 177
+#define TK_VIEW 178
+#define TK_SEMI 179
+#define TK_NONE 180
+#define TK_PREV 181
+#define TK_LINEAR 182
+#define TK_IMPORT 183
+#define TK_TBNAME 184
+#define TK_JOIN 185
+#define TK_INSERT 186
+#define TK_INTO 187
+#define TK_VALUES 188
+
+
+
+
+
+
+
#define TK_SPACE 300
#define TK_COMMENT 301
diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c
index 51f16e4bc6..7702978af1 100644
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
@@ -941,7 +941,7 @@ static int32_t mnodeRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, vo
cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
- *(int64_t *)pWrite = 0;
+ *(int64_t *)pWrite = tsArbOnlineTimestamp;
cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
diff --git a/src/mnode/src/mnodeSdb.c b/src/mnode/src/mnodeSdb.c
index ac3e5d86ec..a8bcdfa59e 100644
--- a/src/mnode/src/mnodeSdb.c
+++ b/src/mnode/src/mnodeSdb.c
@@ -656,8 +656,6 @@ static int32_t sdbProcessWrite(void *wparam, void *hparam, int32_t qtype, void *
dnodeReportStep("mnode-sdb", stepDesc, 0);
}
- if (qtype == TAOS_QTYPE_QUERY) return sdbPerformDeleteAction(pHead, pTable);
-
pthread_mutex_lock(&tsSdbMgmt.mutex);
if (pHead->version == 0) {
@@ -721,13 +719,11 @@ static int32_t sdbProcessWrite(void *wparam, void *hparam, int32_t qtype, void *
if (action == SDB_ACTION_INSERT) {
return sdbPerformInsertAction(pHead, pTable);
} else if (action == SDB_ACTION_DELETE) {
- //if (qtype == TAOS_QTYPE_FWD) {
- // Drop database/stable may take a long time and cause a timeout, so we confirm first then reput it into queue
- // sdbWriteFwdToQueue(1, hparam, TAOS_QTYPE_QUERY, unused);
- // return TSDB_CODE_SUCCESS;
- //} else {
- return sdbPerformDeleteAction(pHead, pTable);
- //}
+ if (qtype == TAOS_QTYPE_FWD) {
+ // Drop database/stable may take a long time and cause a timeout, so we confirm first
+ syncConfirmForward(tsSdbMgmt.sync, pHead->version, TSDB_CODE_SUCCESS, false);
+ }
+ return sdbPerformDeleteAction(pHead, pTable);
} else if (action == SDB_ACTION_UPDATE) {
return sdbPerformUpdateAction(pHead, pTable);
} else {
@@ -1140,7 +1136,10 @@ static void *sdbWorkerFp(void *pWorker) {
sdbConfirmForward(1, pRow, pRow->code);
} else {
if (qtype == TAOS_QTYPE_FWD) {
- syncConfirmForward(tsSdbMgmt.sync, pRow->pHead.version, pRow->code, false);
+ int32_t action = pRow->pHead.msgType % 10;
+ if (action != SDB_ACTION_DELETE) {
+ syncConfirmForward(tsSdbMgmt.sync, pRow->pHead.version, pRow->code, false);
+ }
}
sdbFreeFromQueue(pRow);
}
@@ -1177,9 +1176,10 @@ int32_t mnodeCompactWal() {
return -1;
}
- // close wal
- walFsync(tsSdbMgmt.wal, true);
- walClose(tsSdbMgmt.wal);
+ // close sdb and sync to disk
+ //walFsync(tsSdbMgmt.wal, true);
+ //walClose(tsSdbMgmt.wal);
+ sdbCleanUp();
// rename old wal to wal_bak
if (taosRename(tsMnodeDir, tsMnodeBakDir) != 0) {
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 5710601e5c..be53d353c9 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -93,6 +93,9 @@ static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *pMsg);
static void mnodeProcessAlterTableRsp(SRpcMsg *rpcMsg);
static int32_t mnodeFindSuperTableColumnIndex(SSTableObj *pStable, char *colName);
+static int32_t mnodeChangeSuperTableColumn(SMnodeMsg *pMsg);
+static int32_t mnodeChangeSuperTableTag(SMnodeMsg *pMsg);
+static int32_t mnodeChangeNormalTableColumn(SMnodeMsg *pMsg);
static void mnodeDestroyChildTable(SCTableObj *pTable) {
tfree(pTable->info.tableId);
@@ -1457,31 +1460,52 @@ static int32_t mnodeChangeSuperTableColumnCb(SMnodeMsg *pMsg, int32_t code) {
return code;
}
-static int32_t mnodeChangeSuperTableColumn(SMnodeMsg *pMsg, char *oldName, char *newName) {
+static int32_t mnodeChangeSuperTableColumn(SMnodeMsg *pMsg) {
+ SAlterTableMsg *pAlter = pMsg->rpcMsg.pCont;
+ char* name = pAlter->schema[0].name;
SSTableObj *pStable = (SSTableObj *)pMsg->pTable;
- int32_t col = mnodeFindSuperTableColumnIndex(pStable, oldName);
+ int32_t col = mnodeFindSuperTableColumnIndex(pStable, name);
if (col < 0) {
- mError("msg:%p, app:%p stable:%s, change column, oldName:%s, newName:%s", pMsg, pMsg->rpcMsg.ahandle,
- pStable->info.tableId, oldName, newName);
+ mError("msg:%p, app:%p stable:%s, change column, name:%s", pMsg, pMsg->rpcMsg.ahandle,
+ pStable->info.tableId, name);
return TSDB_CODE_MND_FIELD_NOT_EXIST;
}
- // int32_t rowSize = 0;
- uint32_t len = (uint32_t)strlen(newName);
- if (len >= TSDB_COL_NAME_LEN) {
- return TSDB_CODE_MND_COL_NAME_TOO_LONG;
- }
-
- if (mnodeFindSuperTableColumnIndex(pStable, newName) >= 0) {
- return TSDB_CODE_MND_FIELD_ALREAY_EXIST;
- }
-
// update
SSchema *schema = (SSchema *) (pStable->schema + col);
- tstrncpy(schema->name, newName, sizeof(schema->name));
+ ASSERT(schema->type == TSDB_DATA_TYPE_BINARY || schema->type == TSDB_DATA_TYPE_NCHAR);
+ schema->bytes = pAlter->schema[0].bytes;
+ mInfo("msg:%p, app:%p stable %s, start to modify column %s len to %d", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
+ name, schema->bytes);
- mInfo("msg:%p, app:%p stable %s, start to modify column %s to %s", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
- oldName, newName);
+ SSdbRow row = {
+ .type = SDB_OPER_GLOBAL,
+ .pTable = tsSuperTableSdb,
+ .pObj = pStable,
+ .pMsg = pMsg,
+ .fpRsp = mnodeChangeSuperTableColumnCb
+ };
+
+ return sdbUpdateRow(&row);
+}
+
+static int32_t mnodeChangeSuperTableTag(SMnodeMsg *pMsg) {
+ SAlterTableMsg *pAlter = pMsg->rpcMsg.pCont;
+ char* name = pAlter->schema[0].name;
+ SSTableObj *pStable = (SSTableObj *)pMsg->pTable;
+ int32_t col = mnodeFindSuperTableTagIndex(pStable, name);
+ if (col < 0) {
+ mError("msg:%p, app:%p stable:%s, change column, name:%s", pMsg, pMsg->rpcMsg.ahandle,
+ pStable->info.tableId, name);
+ return TSDB_CODE_MND_FIELD_NOT_EXIST;
+ }
+
+ // update
+ SSchema *schema = (SSchema *) (pStable->schema + col);
+ ASSERT(schema->type == TSDB_DATA_TYPE_BINARY || schema->type == TSDB_DATA_TYPE_NCHAR);
+ schema->bytes = pAlter->schema[0].bytes;
+ mInfo("msg:%p, app:%p stable %s, start to modify tag len %s to %d", pMsg, pMsg->rpcMsg.ahandle, pStable->info.tableId,
+ name, schema->bytes);
SSdbRow row = {
.type = SDB_OPER_GLOBAL,
@@ -2355,31 +2379,23 @@ static int32_t mnodeDropNormalTableColumn(SMnodeMsg *pMsg, char *colName) {
return sdbUpdateRow(&row);
}
-static int32_t mnodeChangeNormalTableColumn(SMnodeMsg *pMsg, char *oldName, char *newName) {
+static int32_t mnodeChangeNormalTableColumn(SMnodeMsg *pMsg) {
+ SAlterTableMsg *pAlter = pMsg->rpcMsg.pCont;
+ char* name = pAlter->schema[0].name;
SCTableObj *pTable = (SCTableObj *)pMsg->pTable;
- int32_t col = mnodeFindNormalTableColumnIndex(pTable, oldName);
+ int32_t col = mnodeFindNormalTableColumnIndex(pTable, name);
if (col < 0) {
- mError("msg:%p, app:%p ctable:%s, change column, oldName: %s, newName: %s", pMsg, pMsg->rpcMsg.ahandle,
- pTable->info.tableId, oldName, newName);
+ mError("msg:%p, app:%p ctable:%s, change column, name: %s", pMsg, pMsg->rpcMsg.ahandle,
+ pTable->info.tableId, name);
return TSDB_CODE_MND_FIELD_NOT_EXIST;
}
- // int32_t rowSize = 0;
- uint32_t len = (uint32_t)strlen(newName);
- if (len >= TSDB_COL_NAME_LEN) {
- return TSDB_CODE_MND_COL_NAME_TOO_LONG;
- }
-
- if (mnodeFindNormalTableColumnIndex(pTable, newName) >= 0) {
- return TSDB_CODE_MND_FIELD_ALREAY_EXIST;
- }
-
- // update
SSchema *schema = (SSchema *) (pTable->schema + col);
- tstrncpy(schema->name, newName, sizeof(schema->name));
+ ASSERT(schema->type == TSDB_DATA_TYPE_BINARY || schema->type == TSDB_DATA_TYPE_NCHAR);
+ schema->bytes = pAlter->schema[0].bytes;
- mInfo("msg:%p, app:%p ctable %s, start to modify column %s to %s", pMsg, pMsg->rpcMsg.ahandle, pTable->info.tableId,
- oldName, newName);
+ mInfo("msg:%p, app:%p ctable %s, start to modify column %s len to %d", pMsg, pMsg->rpcMsg.ahandle, pTable->info.tableId,
+ name, schema->bytes);
SSdbRow row = {
.type = SDB_OPER_GLOBAL,
@@ -3214,7 +3230,9 @@ static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *pMsg) {
} else if (pAlter->type == TSDB_ALTER_TABLE_DROP_COLUMN) {
code = mnodeDropSuperTableColumn(pMsg, pAlter->schema[0].name);
} else if (pAlter->type == TSDB_ALTER_TABLE_CHANGE_COLUMN) {
- code = mnodeChangeSuperTableColumn(pMsg, pAlter->schema[0].name, pAlter->schema[1].name);
+ code = mnodeChangeSuperTableColumn(pMsg);
+ } else if (pAlter->type == TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN) {
+ code = mnodeChangeSuperTableTag(pMsg);
} else {
}
} else {
@@ -3226,7 +3244,7 @@ static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *pMsg) {
} else if (pAlter->type == TSDB_ALTER_TABLE_DROP_COLUMN) {
code = mnodeDropNormalTableColumn(pMsg, pAlter->schema[0].name);
} else if (pAlter->type == TSDB_ALTER_TABLE_CHANGE_COLUMN) {
- code = mnodeChangeNormalTableColumn(pMsg, pAlter->schema[0].name, pAlter->schema[1].name);
+ code = mnodeChangeNormalTableColumn(pMsg);
} else {
}
}
@@ -3417,4 +3435,4 @@ int32_t mnodeCompactTables() {
mnodeCompactChildTables();
return 0;
-}
\ No newline at end of file
+}
diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y
index ba16eef763..01eaf3bbb6 100644
--- a/src/query/inc/sql.y
+++ b/src/query/inc/sql.y
@@ -759,6 +759,12 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) DROP COLUMN ids(A). {
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
+cmd ::= ALTER TABLE ids(X) cpxName(F) MODIFY COLUMN columnlist(A). {
+ X.n += F.n;
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
+ setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
//////////////////////////////////ALTER TAGS statement/////////////////////////////////////
cmd ::= ALTER TABLE ids(X) cpxName(Y) ADD TAG columnlist(A). {
X.n += Y.n;
@@ -799,6 +805,11 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z). {
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
+cmd ::= ALTER TABLE ids(X) cpxName(F) MODIFY TAG columnlist(A). {
+ X.n += F.n;
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1);
+ setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
///////////////////////////////////ALTER STABLE statement//////////////////////////////////
cmd ::= ALTER STABLE ids(X) cpxName(F) ADD COLUMN columnlist(A). {
@@ -817,6 +828,12 @@ cmd ::= ALTER STABLE ids(X) cpxName(F) DROP COLUMN ids(A). {
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
+cmd ::= ALTER STABLE ids(X) cpxName(F) MODIFY COLUMN columnlist(A). {
+ X.n += F.n;
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_CHANGE_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;
@@ -846,6 +863,23 @@ cmd ::= ALTER STABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
+cmd ::= ALTER STABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z). {
+ X.n += F.n;
+
+ toTSDBType(Y.type);
+ SArray* A = tVariantListAppendToken(NULL, &Y, -1);
+ A = tVariantListAppend(A, &Z, -1);
+
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE);
+ setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
+cmd ::= ALTER STABLE ids(X) cpxName(F) MODIFY TAG columnlist(A). {
+ X.n += F.n;
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE);
+ setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
////////////////////////////////////////kill statement///////////////////////////////////////
cmd ::= KILL CONNECTION INTEGER(Y). {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &Y);}
cmd ::= KILL STREAM INTEGER(X) COLON(Z) INTEGER(Y). {X.n += (Z.n + Y.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &X);}
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 9e1534eb24..5ac19bba82 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -1347,8 +1347,8 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSWindowOperatorInf
pInfo->start = j;
} else if (tsList[j] - pInfo->prevTs <= gap) {
pInfo->curWindow.ekey = tsList[j];
- pInfo->numOfRows += 1;
pInfo->prevTs = tsList[j];
+ pInfo->numOfRows += 1;
if (j == 0 && pInfo->start != 0) {
pInfo->numOfRows = 1;
pInfo->start = 0;
diff --git a/src/query/src/qSqlParser.c b/src/query/src/qSqlParser.c
index efe35ba72b..2cf3463d60 100644
--- a/src/query/src/qSqlParser.c
+++ b/src/query/src/qSqlParser.c
@@ -893,7 +893,7 @@ SAlterTableInfo *tSetAlterTableInfo(SStrToken *pTableName, SArray *pCols, SArray
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 || type == TSDB_ALTER_TABLE_CHANGE_COLUMN || type == TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN) {
pAlterTable->pAddColumns = pCols;
assert(pVals == NULL);
} else {
diff --git a/src/query/src/sql.c b/src/query/src/sql.c
index 55a6833cc1..0d11153e8e 100644
--- a/src/query/src/sql.c
+++ b/src/query/src/sql.c
@@ -23,6 +23,7 @@
** input grammar file:
*/
#include
+#include
/************ Begin %include sections from the grammar ************************/
#include
@@ -76,8 +77,10 @@
** zero the stack is dynamically sized using realloc()
** ParseARG_SDECL A static variable 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_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
** defined, then do no error processing.
** YYNSTATE the combined number of states.
@@ -97,7 +100,7 @@
#endif
/************* Begin control #defines *****************************************/
#define YYCODETYPE unsigned short int
-#define YYNOCODE 267
+#define YYNOCODE 266
#define YYACTIONTYPE unsigned short int
#define ParseTOKENTYPE SStrToken
typedef union {
@@ -125,21 +128,29 @@ typedef union {
#endif
#define ParseARG_SDECL SSqlInfo* pInfo;
#define ParseARG_PDECL ,SSqlInfo* pInfo
-#define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo
-#define ParseARG_STORE yypParser->pInfo = pInfo
+#define ParseARG_PARAM ,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 YYNSTATE 327
-#define YYNRULE 275
-#define YYNTOKEN 188
-#define YY_MAX_SHIFT 326
-#define YY_MIN_SHIFTREDUCE 523
-#define YY_MAX_SHIFTREDUCE 797
-#define YY_ERROR_ACTION 798
-#define YY_ACCEPT_ACTION 799
-#define YY_NO_ACTION 800
-#define YY_MIN_REDUCE 801
-#define YY_MAX_REDUCE 1075
+#define YYNSTATE 341
+#define YYNRULE 280
+#define YYNRULE_WITH_ACTION 280
+#define YYNTOKEN 189
+#define YY_MAX_SHIFT 340
+#define YY_MIN_SHIFTREDUCE 538
+#define YY_MAX_SHIFTREDUCE 817
+#define YY_ERROR_ACTION 818
+#define YY_ACCEPT_ACTION 819
+#define YY_NO_ACTION 820
+#define YY_MIN_REDUCE 821
+#define YY_MAX_REDUCE 1100
/************* 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
** otherwise.
@@ -204,78 +215,81 @@ typedef union {
** yy_default[] Default action for each state.
**
*********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (700)
+#define YY_ACTTAB_COUNT (722)
static const YYACTIONTYPE yy_action[] = {
- /* 0 */ 969, 571, 211, 324, 934, 18, 217, 186, 188, 572,
- /* 10 */ 799, 326, 192, 48, 49, 145, 52, 53, 220, 1057,
- /* 20 */ 223, 42, 275, 51, 274, 56, 54, 58, 55, 1053,
- /* 30 */ 650, 188, 948, 47, 46, 188, 228, 45, 44, 43,
- /* 40 */ 48, 49, 1056, 52, 53, 219, 1057, 223, 42, 571,
- /* 50 */ 51, 274, 56, 54, 58, 55, 960, 572, 300, 299,
- /* 60 */ 47, 46, 948, 966, 45, 44, 43, 49, 31, 52,
- /* 70 */ 53, 138, 250, 223, 42, 1067, 51, 274, 56, 54,
- /* 80 */ 58, 55, 271, 290, 82, 1052, 47, 46, 89, 234,
- /* 90 */ 45, 44, 43, 524, 525, 526, 527, 528, 529, 530,
- /* 100 */ 531, 532, 533, 534, 535, 536, 325, 571, 290, 212,
- /* 110 */ 71, 571, 944, 48, 49, 572, 52, 53, 760, 572,
- /* 120 */ 223, 42, 936, 51, 274, 56, 54, 58, 55, 45,
- /* 130 */ 44, 43, 741, 47, 46, 257, 256, 45, 44, 43,
- /* 140 */ 48, 50, 145, 52, 53, 1, 160, 223, 42, 145,
- /* 150 */ 51, 274, 56, 54, 58, 55, 323, 322, 130, 236,
- /* 160 */ 47, 46, 297, 296, 45, 44, 43, 24, 288, 319,
- /* 170 */ 318, 287, 286, 285, 317, 284, 316, 315, 314, 283,
- /* 180 */ 313, 312, 908, 31, 896, 897, 898, 899, 900, 901,
- /* 190 */ 902, 903, 904, 905, 906, 907, 909, 910, 52, 53,
- /* 200 */ 847, 960, 223, 42, 172, 51, 274, 56, 54, 58,
- /* 210 */ 55, 1005, 19, 86, 25, 47, 46, 214, 83, 45,
- /* 220 */ 44, 43, 222, 756, 213, 310, 745, 945, 748, 197,
- /* 230 */ 751, 222, 756, 230, 13, 745, 198, 748, 88, 751,
- /* 240 */ 85, 122, 121, 196, 931, 932, 30, 935, 56, 54,
- /* 250 */ 58, 55, 3, 173, 207, 208, 47, 46, 273, 948,
- /* 260 */ 45, 44, 43, 207, 208, 242, 232, 747, 24, 750,
- /* 270 */ 319, 318, 77, 246, 245, 317, 689, 316, 315, 314,
- /* 280 */ 37, 313, 312, 62, 916, 47, 46, 914, 915, 45,
- /* 290 */ 44, 43, 917, 942, 919, 920, 918, 145, 921, 922,
- /* 300 */ 107, 101, 112, 249, 31, 69, 63, 111, 117, 120,
- /* 310 */ 110, 204, 674, 109, 235, 671, 114, 672, 310, 673,
- /* 320 */ 5, 34, 162, 1051, 70, 57, 31, 161, 96, 91,
- /* 330 */ 95, 31, 757, 31, 57, 229, 233, 31, 753, 292,
- /* 340 */ 746, 757, 749, 237, 238, 226, 31, 753, 945, 946,
- /* 350 */ 180, 178, 176, 205, 693, 752, 933, 175, 125, 124,
- /* 360 */ 123, 136, 134, 133, 752, 77, 1006, 227, 269, 320,
- /* 370 */ 945, 84, 293, 37, 294, 945, 856, 945, 298, 754,
- /* 380 */ 172, 945, 848, 960, 686, 72, 172, 302, 722, 723,
- /* 390 */ 945, 8, 251, 743, 74, 948, 32, 75, 221, 215,
- /* 400 */ 705, 206, 253, 713, 140, 253, 714, 61, 777, 758,
- /* 410 */ 21, 65, 20, 20, 660, 678, 277, 679, 32, 662,
- /* 420 */ 32, 675, 279, 61, 661, 190, 87, 29, 61, 744,
- /* 430 */ 280, 191, 66, 100, 99, 15, 14, 119, 118, 106,
- /* 440 */ 105, 68, 6, 649, 17, 16, 676, 193, 677, 187,
- /* 450 */ 194, 195, 755, 201, 202, 200, 185, 199, 189, 947,
- /* 460 */ 1016, 1015, 224, 1012, 1011, 247, 137, 40, 225, 301,
- /* 470 */ 968, 979, 976, 977, 981, 139, 143, 961, 254, 998,
- /* 480 */ 997, 943, 263, 156, 135, 157, 704, 258, 311, 941,
- /* 490 */ 912, 306, 108, 303, 155, 150, 148, 958, 158, 159,
- /* 500 */ 859, 67, 146, 216, 282, 38, 260, 183, 35, 267,
- /* 510 */ 291, 64, 855, 1072, 97, 59, 1071, 1069, 163, 295,
- /* 520 */ 1066, 103, 1065, 1063, 164, 877, 36, 272, 33, 270,
- /* 530 */ 268, 39, 184, 844, 113, 842, 115, 116, 840, 839,
- /* 540 */ 239, 174, 837, 836, 835, 834, 833, 832, 177, 179,
- /* 550 */ 829, 827, 825, 266, 823, 181, 820, 182, 264, 252,
- /* 560 */ 73, 78, 262, 261, 999, 259, 41, 304, 305, 307,
- /* 570 */ 209, 231, 308, 309, 281, 321, 797, 240, 241, 210,
- /* 580 */ 796, 92, 93, 203, 244, 243, 795, 783, 782, 838,
- /* 590 */ 248, 253, 681, 276, 126, 171, 166, 878, 167, 165,
- /* 600 */ 168, 169, 831, 170, 9, 127, 128, 830, 76, 129,
- /* 610 */ 822, 821, 2, 26, 4, 255, 79, 706, 153, 151,
- /* 620 */ 149, 147, 152, 154, 141, 924, 709, 142, 80, 218,
- /* 630 */ 711, 81, 265, 761, 715, 144, 90, 10, 11, 27,
- /* 640 */ 759, 28, 7, 12, 22, 88, 23, 613, 278, 609,
- /* 650 */ 607, 606, 605, 602, 575, 289, 94, 32, 60, 98,
- /* 660 */ 652, 651, 648, 102, 597, 595, 104, 587, 593, 589,
- /* 670 */ 591, 585, 583, 616, 615, 614, 612, 611, 610, 608,
- /* 680 */ 604, 603, 573, 540, 538, 61, 801, 800, 800, 800,
- /* 690 */ 800, 800, 800, 800, 800, 800, 800, 800, 131, 132,
+ /* 0 */ 989, 586, 217, 338, 954, 22, 223, 192, 194, 587,
+ /* 10 */ 819, 340, 198, 52, 53, 151, 56, 57, 226, 1077,
+ /* 20 */ 229, 46, 283, 55, 282, 60, 58, 62, 59, 1073,
+ /* 30 */ 665, 194, 968, 51, 50, 194, 234, 49, 48, 47,
+ /* 40 */ 52, 53, 1076, 56, 57, 225, 1077, 229, 46, 586,
+ /* 50 */ 55, 282, 60, 58, 62, 59, 980, 587, 314, 313,
+ /* 60 */ 51, 50, 968, 986, 49, 48, 47, 53, 35, 56,
+ /* 70 */ 57, 144, 258, 229, 46, 75, 55, 282, 60, 58,
+ /* 80 */ 62, 59, 279, 298, 87, 867, 51, 50, 94, 178,
+ /* 90 */ 49, 48, 47, 539, 540, 541, 542, 543, 544, 545,
+ /* 100 */ 546, 547, 548, 549, 550, 551, 339, 953, 298, 218,
+ /* 110 */ 76, 586, 964, 52, 53, 35, 56, 57, 775, 587,
+ /* 120 */ 229, 46, 956, 55, 282, 60, 58, 62, 59, 49,
+ /* 130 */ 48, 47, 756, 51, 50, 265, 264, 49, 48, 47,
+ /* 140 */ 52, 54, 980, 56, 57, 324, 980, 229, 46, 586,
+ /* 150 */ 55, 282, 60, 58, 62, 59, 219, 587, 220, 965,
+ /* 160 */ 51, 50, 221, 1072, 49, 48, 47, 28, 296, 333,
+ /* 170 */ 332, 295, 294, 293, 331, 292, 330, 329, 328, 291,
+ /* 180 */ 327, 326, 928, 35, 916, 917, 918, 919, 920, 921,
+ /* 190 */ 922, 923, 924, 925, 926, 927, 929, 930, 56, 57,
+ /* 200 */ 876, 1071, 229, 46, 178, 55, 282, 60, 58, 62,
+ /* 210 */ 59, 962, 23, 91, 29, 51, 50, 1, 166, 49,
+ /* 220 */ 48, 47, 228, 771, 232, 79, 760, 965, 763, 203,
+ /* 230 */ 766, 228, 771, 261, 13, 760, 204, 763, 93, 766,
+ /* 240 */ 90, 128, 127, 202, 951, 952, 34, 955, 60, 58,
+ /* 250 */ 62, 59, 89, 235, 214, 215, 51, 50, 281, 151,
+ /* 260 */ 49, 48, 47, 214, 215, 762, 77, 765, 28, 1096,
+ /* 270 */ 333, 332, 82, 35, 35, 331, 701, 330, 329, 328,
+ /* 280 */ 41, 327, 326, 8, 936, 51, 50, 934, 935, 49,
+ /* 290 */ 48, 47, 937, 868, 939, 940, 938, 178, 941, 942,
+ /* 300 */ 113, 107, 118, 257, 239, 74, 704, 117, 123, 126,
+ /* 310 */ 116, 242, 211, 35, 233, 303, 120, 965, 965, 689,
+ /* 320 */ 212, 761, 686, 764, 687, 61, 688, 213, 1026, 35,
+ /* 330 */ 277, 35, 772, 1036, 61, 5, 38, 168, 768, 151,
+ /* 340 */ 196, 772, 167, 101, 96, 100, 35, 768, 35, 151,
+ /* 350 */ 245, 246, 35, 35, 304, 767, 236, 965, 186, 184,
+ /* 360 */ 182, 142, 140, 139, 767, 181, 131, 130, 129, 334,
+ /* 370 */ 305, 243, 306, 965, 240, 965, 238, 769, 302, 301,
+ /* 380 */ 82, 244, 968, 241, 708, 309, 308, 310, 41, 311,
+ /* 390 */ 965, 250, 965, 312, 316, 968, 965, 965, 3, 179,
+ /* 400 */ 254, 253, 337, 336, 136, 115, 966, 80, 1025, 259,
+ /* 410 */ 324, 737, 738, 36, 758, 261, 720, 728, 88, 729,
+ /* 420 */ 146, 66, 227, 25, 67, 792, 197, 773, 690, 24,
+ /* 430 */ 675, 24, 70, 770, 36, 285, 677, 287, 676, 36,
+ /* 440 */ 66, 92, 66, 33, 125, 124, 288, 68, 199, 15,
+ /* 450 */ 759, 14, 106, 71, 105, 193, 200, 17, 19, 16,
+ /* 460 */ 18, 201, 73, 112, 664, 111, 6, 207, 693, 691,
+ /* 470 */ 694, 692, 208, 206, 21, 1035, 20, 1088, 191, 205,
+ /* 480 */ 195, 967, 230, 255, 1032, 1031, 231, 315, 44, 143,
+ /* 490 */ 988, 1018, 999, 996, 1017, 997, 981, 262, 1001, 145,
+ /* 500 */ 149, 271, 162, 963, 141, 114, 266, 222, 719, 268,
+ /* 510 */ 158, 275, 154, 163, 978, 152, 155, 276, 961, 164,
+ /* 520 */ 165, 280, 153, 72, 156, 63, 879, 69, 290, 278,
+ /* 530 */ 42, 274, 189, 39, 299, 875, 300, 1095, 103, 1094,
+ /* 540 */ 1091, 169, 307, 1087, 109, 1086, 1083, 170, 897, 40,
+ /* 550 */ 272, 37, 43, 190, 270, 864, 119, 862, 121, 122,
+ /* 560 */ 267, 860, 859, 247, 180, 857, 856, 855, 854, 853,
+ /* 570 */ 852, 183, 185, 849, 847, 845, 843, 187, 840, 188,
+ /* 580 */ 45, 260, 78, 83, 325, 269, 1019, 317, 318, 319,
+ /* 590 */ 320, 321, 322, 323, 335, 817, 248, 216, 237, 289,
+ /* 600 */ 249, 816, 251, 252, 209, 210, 97, 98, 815, 798,
+ /* 610 */ 797, 256, 261, 263, 858, 696, 284, 9, 132, 851,
+ /* 620 */ 173, 133, 172, 898, 171, 174, 175, 177, 176, 4,
+ /* 630 */ 134, 850, 842, 932, 135, 30, 841, 81, 84, 721,
+ /* 640 */ 2, 161, 159, 157, 160, 147, 944, 724, 148, 85,
+ /* 650 */ 224, 726, 86, 273, 10, 730, 150, 11, 776, 774,
+ /* 660 */ 31, 7, 32, 12, 26, 286, 27, 95, 628, 93,
+ /* 670 */ 624, 622, 621, 620, 617, 297, 99, 590, 64, 36,
+ /* 680 */ 65, 102, 667, 666, 104, 108, 663, 612, 610, 602,
+ /* 690 */ 608, 604, 606, 600, 598, 631, 110, 630, 629, 627,
+ /* 700 */ 626, 625, 623, 619, 618, 588, 555, 553, 66, 821,
+ /* 710 */ 820, 820, 137, 820, 820, 820, 820, 820, 820, 820,
+ /* 720 */ 820, 138,
};
static const YYCODETYPE yy_lookahead[] = {
/* 0 */ 192, 1, 191, 192, 0, 254, 211, 254, 254, 9,
@@ -285,72 +299,72 @@ static const YYCODETYPE yy_lookahead[] = {
/* 40 */ 13, 14, 265, 16, 17, 264, 265, 20, 21, 1,
/* 50 */ 23, 24, 25, 26, 27, 28, 235, 9, 33, 34,
/* 60 */ 33, 34, 237, 255, 37, 38, 39, 14, 192, 16,
- /* 70 */ 17, 192, 251, 20, 21, 237, 23, 24, 25, 26,
- /* 80 */ 27, 28, 259, 79, 261, 254, 33, 34, 198, 68,
+ /* 70 */ 17, 192, 251, 20, 21, 198, 23, 24, 25, 26,
+ /* 80 */ 27, 28, 259, 79, 261, 197, 33, 34, 198, 201,
/* 90 */ 37, 38, 39, 45, 46, 47, 48, 49, 50, 51,
- /* 100 */ 52, 53, 54, 55, 56, 57, 58, 1, 79, 61,
- /* 110 */ 110, 1, 236, 13, 14, 9, 16, 17, 111, 9,
+ /* 100 */ 52, 53, 54, 55, 56, 57, 58, 230, 79, 61,
+ /* 110 */ 110, 1, 236, 13, 14, 192, 16, 17, 111, 9,
/* 120 */ 20, 21, 232, 23, 24, 25, 26, 27, 28, 37,
/* 130 */ 38, 39, 105, 33, 34, 256, 257, 37, 38, 39,
- /* 140 */ 13, 14, 192, 16, 17, 199, 200, 20, 21, 192,
- /* 150 */ 23, 24, 25, 26, 27, 28, 65, 66, 67, 138,
- /* 160 */ 33, 34, 141, 142, 37, 38, 39, 88, 89, 90,
+ /* 140 */ 13, 14, 235, 16, 17, 81, 235, 20, 21, 1,
+ /* 150 */ 23, 24, 25, 26, 27, 28, 233, 9, 251, 236,
+ /* 160 */ 33, 34, 251, 254, 37, 38, 39, 88, 89, 90,
/* 170 */ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
/* 180 */ 101, 102, 210, 192, 212, 213, 214, 215, 216, 217,
/* 190 */ 218, 219, 220, 221, 222, 223, 224, 225, 16, 17,
- /* 200 */ 197, 235, 20, 21, 201, 23, 24, 25, 26, 27,
- /* 210 */ 28, 261, 44, 198, 104, 33, 34, 251, 261, 37,
- /* 220 */ 38, 39, 1, 2, 233, 81, 5, 236, 7, 61,
- /* 230 */ 9, 1, 2, 211, 104, 5, 68, 7, 108, 9,
+ /* 200 */ 197, 254, 20, 21, 201, 23, 24, 25, 26, 27,
+ /* 210 */ 28, 192, 44, 198, 104, 33, 34, 199, 200, 37,
+ /* 220 */ 38, 39, 1, 2, 233, 105, 5, 236, 7, 61,
+ /* 230 */ 9, 1, 2, 113, 104, 5, 68, 7, 108, 9,
/* 240 */ 110, 73, 74, 75, 229, 230, 231, 232, 25, 26,
- /* 250 */ 27, 28, 195, 196, 33, 34, 33, 34, 37, 237,
- /* 260 */ 37, 38, 39, 33, 34, 136, 68, 5, 88, 7,
- /* 270 */ 90, 91, 104, 144, 145, 95, 37, 97, 98, 99,
- /* 280 */ 112, 101, 102, 109, 210, 33, 34, 213, 214, 37,
- /* 290 */ 38, 39, 218, 192, 220, 221, 222, 192, 224, 225,
- /* 300 */ 62, 63, 64, 135, 192, 137, 132, 69, 70, 71,
- /* 310 */ 72, 143, 2, 76, 192, 5, 78, 7, 81, 9,
- /* 320 */ 62, 63, 64, 254, 198, 104, 192, 69, 70, 71,
- /* 330 */ 72, 192, 111, 192, 104, 234, 138, 192, 117, 141,
- /* 340 */ 5, 111, 7, 33, 34, 233, 192, 117, 236, 227,
- /* 350 */ 62, 63, 64, 254, 115, 134, 230, 69, 70, 71,
- /* 360 */ 72, 62, 63, 64, 134, 104, 261, 233, 263, 211,
- /* 370 */ 236, 238, 233, 112, 233, 236, 197, 236, 233, 117,
- /* 380 */ 201, 236, 197, 235, 109, 252, 201, 233, 125, 126,
- /* 390 */ 236, 116, 105, 1, 105, 237, 109, 105, 60, 251,
- /* 400 */ 105, 254, 113, 105, 109, 113, 105, 109, 105, 105,
- /* 410 */ 109, 109, 109, 109, 105, 5, 105, 7, 109, 105,
- /* 420 */ 109, 111, 105, 109, 105, 254, 109, 104, 109, 37,
- /* 430 */ 107, 254, 130, 139, 140, 139, 140, 76, 77, 139,
- /* 440 */ 140, 104, 104, 106, 139, 140, 5, 254, 7, 254,
- /* 450 */ 254, 254, 117, 254, 254, 254, 254, 254, 254, 237,
- /* 460 */ 228, 228, 228, 228, 228, 192, 192, 253, 228, 228,
- /* 470 */ 192, 192, 192, 192, 192, 192, 192, 235, 235, 262,
- /* 480 */ 262, 235, 192, 239, 60, 192, 117, 258, 103, 192,
- /* 490 */ 226, 85, 87, 86, 240, 245, 247, 250, 192, 192,
- /* 500 */ 192, 129, 249, 258, 192, 192, 258, 192, 192, 258,
- /* 510 */ 192, 131, 192, 192, 192, 128, 192, 192, 192, 192,
- /* 520 */ 192, 192, 192, 192, 192, 192, 192, 123, 192, 127,
- /* 530 */ 122, 192, 192, 192, 192, 192, 192, 192, 192, 192,
+ /* 250 */ 27, 28, 238, 234, 33, 34, 33, 34, 37, 192,
+ /* 260 */ 37, 38, 39, 33, 34, 5, 252, 7, 88, 237,
+ /* 270 */ 90, 91, 104, 192, 192, 95, 109, 97, 98, 99,
+ /* 280 */ 112, 101, 102, 116, 210, 33, 34, 213, 214, 37,
+ /* 290 */ 38, 39, 218, 197, 220, 221, 222, 201, 224, 225,
+ /* 300 */ 62, 63, 64, 135, 68, 137, 37, 69, 70, 71,
+ /* 310 */ 72, 68, 144, 192, 233, 233, 78, 236, 236, 2,
+ /* 320 */ 254, 5, 5, 7, 7, 104, 9, 254, 261, 192,
+ /* 330 */ 263, 192, 111, 228, 104, 62, 63, 64, 117, 192,
+ /* 340 */ 254, 111, 69, 70, 71, 72, 192, 117, 192, 192,
+ /* 350 */ 33, 34, 192, 192, 233, 134, 211, 236, 62, 63,
+ /* 360 */ 64, 62, 63, 64, 134, 69, 70, 71, 72, 211,
+ /* 370 */ 233, 192, 233, 236, 138, 236, 140, 117, 142, 143,
+ /* 380 */ 104, 138, 237, 140, 115, 142, 143, 233, 112, 233,
+ /* 390 */ 236, 136, 236, 233, 233, 237, 236, 236, 195, 196,
+ /* 400 */ 145, 146, 65, 66, 67, 76, 227, 105, 261, 105,
+ /* 410 */ 81, 125, 126, 109, 1, 113, 105, 105, 261, 105,
+ /* 420 */ 109, 109, 60, 109, 109, 105, 254, 105, 111, 109,
+ /* 430 */ 105, 109, 109, 117, 109, 105, 105, 105, 105, 109,
+ /* 440 */ 109, 109, 109, 104, 76, 77, 107, 132, 254, 139,
+ /* 450 */ 37, 141, 139, 130, 141, 254, 254, 139, 139, 141,
+ /* 460 */ 141, 254, 104, 139, 106, 141, 104, 254, 5, 5,
+ /* 470 */ 7, 7, 254, 254, 139, 228, 141, 237, 254, 254,
+ /* 480 */ 254, 237, 228, 192, 228, 228, 228, 228, 253, 192,
+ /* 490 */ 192, 262, 192, 192, 262, 192, 235, 235, 192, 192,
+ /* 500 */ 192, 192, 239, 235, 60, 87, 258, 258, 117, 258,
+ /* 510 */ 243, 258, 247, 192, 250, 249, 246, 122, 192, 192,
+ /* 520 */ 192, 123, 248, 129, 245, 128, 192, 131, 192, 127,
+ /* 530 */ 192, 121, 192, 192, 192, 192, 192, 192, 192, 192,
/* 540 */ 192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
- /* 550 */ 192, 192, 192, 121, 192, 192, 192, 192, 120, 193,
- /* 560 */ 193, 193, 119, 193, 193, 118, 133, 50, 83, 54,
- /* 570 */ 193, 193, 84, 82, 193, 79, 5, 146, 5, 193,
- /* 580 */ 5, 198, 198, 193, 5, 146, 5, 90, 89, 193,
- /* 590 */ 136, 113, 105, 107, 194, 202, 207, 209, 203, 208,
- /* 600 */ 206, 204, 193, 205, 104, 194, 194, 193, 114, 194,
- /* 610 */ 193, 193, 199, 104, 195, 109, 109, 105, 242, 244,
- /* 620 */ 246, 248, 243, 241, 104, 226, 105, 109, 104, 1,
- /* 630 */ 105, 104, 104, 111, 105, 104, 76, 124, 124, 109,
- /* 640 */ 105, 109, 104, 104, 104, 108, 104, 9, 107, 5,
- /* 650 */ 5, 5, 5, 5, 80, 15, 76, 109, 16, 140,
- /* 660 */ 5, 5, 105, 140, 5, 5, 140, 5, 5, 5,
- /* 670 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- /* 680 */ 5, 5, 80, 60, 59, 109, 0, 266, 266, 266,
- /* 690 */ 266, 266, 266, 266, 266, 266, 266, 266, 21, 21,
- /* 700 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
- /* 710 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
- /* 720 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ /* 550 */ 120, 192, 192, 192, 119, 192, 192, 192, 192, 192,
+ /* 560 */ 118, 192, 192, 192, 192, 192, 192, 192, 192, 192,
+ /* 570 */ 192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
+ /* 580 */ 133, 193, 193, 193, 103, 193, 193, 86, 50, 83,
+ /* 590 */ 85, 54, 84, 82, 79, 5, 147, 193, 193, 193,
+ /* 600 */ 5, 5, 147, 5, 193, 193, 198, 198, 5, 90,
+ /* 610 */ 89, 136, 113, 109, 193, 105, 107, 104, 194, 193,
+ /* 620 */ 203, 194, 207, 209, 208, 206, 204, 202, 205, 195,
+ /* 630 */ 194, 193, 193, 226, 194, 104, 193, 114, 109, 105,
+ /* 640 */ 199, 240, 242, 244, 241, 104, 226, 105, 109, 104,
+ /* 650 */ 1, 105, 104, 104, 124, 105, 104, 124, 111, 105,
+ /* 660 */ 109, 104, 109, 104, 104, 107, 104, 76, 9, 108,
+ /* 670 */ 5, 5, 5, 5, 5, 15, 76, 80, 16, 109,
+ /* 680 */ 16, 141, 5, 5, 141, 141, 105, 5, 5, 5,
+ /* 690 */ 5, 5, 5, 5, 5, 5, 141, 5, 5, 5,
+ /* 700 */ 5, 5, 5, 5, 5, 80, 60, 59, 109, 0,
+ /* 710 */ 266, 266, 21, 266, 266, 266, 266, 266, 266, 266,
+ /* 720 */ 266, 21, 266, 266, 266, 266, 266, 266, 266, 266,
/* 730 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
/* 740 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
/* 750 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
@@ -366,104 +380,112 @@ static const YYCODETYPE yy_lookahead[] = {
/* 850 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
/* 860 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
/* 870 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
- /* 880 */ 266, 266, 266, 266, 266, 266, 266, 266,
+ /* 880 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ /* 890 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ /* 900 */ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ /* 910 */ 266,
};
-#define YY_SHIFT_COUNT (326)
+#define YY_SHIFT_COUNT (340)
#define YY_SHIFT_MIN (0)
-#define YY_SHIFT_MAX (686)
+#define YY_SHIFT_MAX (709)
static const unsigned short int yy_shift_ofst[] = {
- /* 0 */ 168, 79, 79, 180, 180, 29, 221, 230, 110, 106,
- /* 10 */ 106, 106, 106, 106, 106, 106, 106, 106, 0, 48,
- /* 20 */ 230, 310, 310, 310, 310, 261, 261, 106, 106, 106,
- /* 30 */ 4, 106, 106, 237, 29, 144, 144, 700, 700, 700,
- /* 40 */ 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
+ /* 0 */ 168, 79, 79, 180, 180, 29, 221, 230, 110, 148,
+ /* 10 */ 148, 148, 148, 148, 148, 148, 148, 148, 148, 148,
+ /* 20 */ 148, 148, 0, 48, 230, 317, 317, 317, 317, 276,
+ /* 30 */ 276, 148, 148, 148, 4, 148, 148, 329, 29, 64,
+ /* 40 */ 64, 722, 722, 722, 230, 230, 230, 230, 230, 230,
/* 50 */ 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
- /* 60 */ 310, 310, 25, 25, 25, 25, 25, 25, 25, 106,
- /* 70 */ 106, 106, 239, 106, 106, 106, 261, 261, 106, 106,
- /* 80 */ 106, 106, 263, 263, 275, 261, 106, 106, 106, 106,
- /* 90 */ 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
- /* 100 */ 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
- /* 110 */ 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
- /* 120 */ 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
- /* 130 */ 106, 106, 106, 106, 106, 106, 106, 424, 424, 424,
- /* 140 */ 369, 369, 369, 424, 369, 424, 372, 380, 387, 404,
- /* 150 */ 402, 408, 432, 438, 443, 447, 433, 424, 424, 424,
- /* 160 */ 385, 29, 29, 424, 424, 405, 407, 517, 485, 406,
- /* 170 */ 515, 488, 491, 385, 424, 496, 496, 424, 496, 424,
- /* 180 */ 496, 424, 424, 700, 700, 27, 100, 127, 100, 100,
- /* 190 */ 53, 182, 223, 223, 223, 223, 238, 258, 288, 252,
- /* 200 */ 252, 252, 252, 21, 129, 92, 92, 262, 335, 130,
- /* 210 */ 198, 91, 299, 287, 289, 292, 295, 298, 301, 303,
- /* 220 */ 304, 392, 338, 7, 174, 302, 309, 311, 314, 317,
- /* 230 */ 319, 323, 294, 296, 300, 337, 305, 410, 441, 361,
- /* 240 */ 571, 431, 573, 575, 439, 579, 581, 497, 499, 454,
- /* 250 */ 478, 486, 500, 494, 487, 509, 506, 507, 512, 520,
- /* 260 */ 521, 518, 524, 525, 527, 628, 528, 529, 531, 530,
- /* 270 */ 513, 532, 514, 535, 538, 522, 539, 486, 540, 541,
- /* 280 */ 542, 537, 560, 638, 644, 645, 646, 647, 648, 574,
- /* 290 */ 640, 580, 519, 548, 548, 642, 523, 526, 548, 655,
- /* 300 */ 656, 557, 548, 659, 660, 662, 663, 664, 665, 666,
- /* 310 */ 667, 668, 669, 670, 671, 672, 673, 674, 675, 676,
- /* 320 */ 576, 602, 677, 678, 623, 625, 686,
+ /* 60 */ 230, 230, 230, 230, 317, 317, 317, 25, 25, 25,
+ /* 70 */ 25, 25, 25, 25, 148, 148, 148, 269, 148, 148,
+ /* 80 */ 148, 276, 276, 148, 148, 148, 148, 286, 286, 167,
+ /* 90 */ 276, 148, 148, 148, 148, 148, 148, 148, 148, 148,
+ /* 100 */ 148, 148, 148, 148, 148, 148, 148, 148, 148, 148,
+ /* 110 */ 148, 148, 148, 148, 148, 148, 148, 148, 148, 148,
+ /* 120 */ 148, 148, 148, 148, 148, 148, 148, 148, 148, 148,
+ /* 130 */ 148, 148, 148, 148, 148, 148, 148, 148, 148, 148,
+ /* 140 */ 148, 148, 148, 444, 444, 444, 391, 391, 391, 444,
+ /* 150 */ 391, 444, 394, 396, 397, 398, 402, 395, 410, 430,
+ /* 160 */ 435, 442, 447, 444, 444, 444, 481, 29, 29, 444,
+ /* 170 */ 444, 418, 501, 538, 506, 505, 537, 508, 511, 481,
+ /* 180 */ 444, 515, 515, 444, 515, 444, 515, 444, 444, 722,
+ /* 190 */ 722, 27, 100, 127, 100, 100, 53, 182, 223, 223,
+ /* 200 */ 223, 223, 238, 273, 296, 252, 252, 252, 252, 236,
+ /* 210 */ 243, 255, 92, 92, 260, 316, 130, 337, 299, 304,
+ /* 220 */ 120, 302, 311, 312, 314, 320, 322, 413, 362, 7,
+ /* 230 */ 315, 323, 325, 330, 331, 332, 333, 339, 310, 313,
+ /* 240 */ 318, 319, 324, 358, 335, 463, 464, 368, 590, 449,
+ /* 250 */ 595, 596, 455, 598, 603, 519, 521, 475, 499, 509,
+ /* 260 */ 513, 523, 510, 531, 504, 529, 534, 541, 542, 539,
+ /* 270 */ 545, 546, 548, 649, 549, 550, 552, 551, 530, 553,
+ /* 280 */ 533, 554, 557, 547, 559, 509, 560, 558, 562, 561,
+ /* 290 */ 591, 659, 665, 666, 667, 668, 669, 597, 660, 600,
+ /* 300 */ 662, 540, 543, 570, 570, 570, 570, 664, 544, 555,
+ /* 310 */ 570, 570, 570, 677, 678, 581, 570, 682, 683, 684,
+ /* 320 */ 685, 686, 687, 688, 689, 690, 692, 693, 694, 695,
+ /* 330 */ 696, 697, 698, 699, 599, 625, 691, 700, 646, 648,
+ /* 340 */ 709,
};
-#define YY_REDUCE_COUNT (184)
+#define YY_REDUCE_COUNT (190)
#define YY_REDUCE_MIN (-249)
-#define YY_REDUCE_MAX (419)
+#define YY_REDUCE_MAX (443)
static const short yy_reduce_ofst[] = {
- /* 0 */ -179, -28, -28, 74, 74, 15, -246, -219, -121, -9,
- /* 10 */ 105, -177, 112, 134, 139, 141, 145, 154, -192, -189,
- /* 20 */ -223, -205, -175, 22, 158, -34, 148, -50, -43, 101,
- /* 30 */ -110, 122, -124, 3, 126, 179, 185, 133, -54, 57,
- /* 40 */ -249, -247, -242, -225, -169, 69, 99, 147, 171, 177,
- /* 50 */ 193, 195, 196, 197, 199, 200, 201, 202, 203, 204,
- /* 60 */ -162, 222, 232, 233, 234, 235, 236, 240, 241, 273,
- /* 70 */ 274, 278, 214, 279, 280, 281, 242, 243, 282, 283,
- /* 80 */ 284, 290, 217, 218, 244, 246, 293, 297, 306, 307,
- /* 90 */ 308, 312, 313, 315, 316, 318, 320, 321, 322, 324,
- /* 100 */ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
- /* 110 */ 336, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- /* 120 */ 348, 349, 350, 351, 352, 353, 354, 355, 356, 357,
- /* 130 */ 358, 359, 360, 362, 363, 364, 365, 366, 367, 368,
- /* 140 */ 229, 245, 248, 370, 251, 371, 247, 253, 373, 249,
- /* 150 */ 374, 250, 375, 379, 376, 382, 254, 377, 378, 381,
- /* 160 */ 264, 383, 384, 386, 390, 388, 391, 389, 395, 394,
- /* 170 */ 397, 398, 393, 399, 396, 400, 411, 409, 412, 414,
- /* 180 */ 415, 417, 418, 413, 419,
+ /* 0 */ -179, -28, -28, 74, 74, 15, -246, -219, -121, -77,
+ /* 10 */ 67, -177, -9, 81, 82, 121, 137, 139, 154, 156,
+ /* 20 */ 160, 161, -192, -189, -223, -205, -175, 145, 158, -93,
+ /* 30 */ -89, 147, 157, 19, -110, 179, -124, -112, -123, 3,
+ /* 40 */ 96, 14, 18, 203, -249, -247, -242, -225, -91, -53,
+ /* 50 */ 66, 73, 86, 172, 194, 201, 202, 207, 213, 218,
+ /* 60 */ 219, 224, 225, 226, 32, 240, 244, 105, 247, 254,
+ /* 70 */ 256, 257, 258, 259, 291, 297, 298, 235, 300, 301,
+ /* 80 */ 303, 261, 262, 306, 307, 308, 309, 229, 232, 263,
+ /* 90 */ 268, 321, 326, 327, 328, 334, 336, 338, 340, 341,
+ /* 100 */ 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+ /* 110 */ 352, 353, 354, 355, 356, 357, 359, 360, 361, 363,
+ /* 120 */ 364, 365, 366, 367, 369, 370, 371, 372, 373, 374,
+ /* 130 */ 375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
+ /* 140 */ 385, 386, 387, 388, 389, 390, 248, 249, 251, 392,
+ /* 150 */ 253, 393, 264, 266, 274, 265, 270, 279, 399, 267,
+ /* 160 */ 400, 403, 401, 404, 405, 406, 407, 408, 409, 411,
+ /* 170 */ 412, 414, 416, 415, 417, 419, 422, 423, 425, 420,
+ /* 180 */ 421, 424, 427, 426, 436, 438, 440, 439, 443, 441,
+ /* 190 */ 434,
};
static const YYACTIONTYPE yy_default[] = {
- /* 0 */ 798, 911, 857, 923, 845, 854, 1059, 1059, 798, 798,
- /* 10 */ 798, 798, 798, 798, 798, 798, 798, 798, 970, 817,
- /* 20 */ 1059, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 30 */ 854, 798, 798, 860, 854, 860, 860, 965, 895, 913,
- /* 40 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 50 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 60 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 70 */ 798, 798, 972, 978, 975, 798, 798, 798, 980, 798,
- /* 80 */ 798, 798, 1002, 1002, 963, 798, 798, 798, 798, 798,
- /* 90 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 100 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 110 */ 798, 798, 798, 843, 798, 841, 798, 798, 798, 798,
- /* 120 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 130 */ 828, 798, 798, 798, 798, 798, 798, 819, 819, 819,
- /* 140 */ 798, 798, 798, 819, 798, 819, 1009, 1013, 1007, 995,
- /* 150 */ 1003, 994, 990, 988, 986, 985, 1017, 819, 819, 819,
- /* 160 */ 858, 854, 854, 819, 819, 876, 874, 872, 864, 870,
- /* 170 */ 866, 868, 862, 846, 819, 852, 852, 819, 852, 819,
- /* 180 */ 852, 819, 819, 895, 913, 798, 1018, 798, 1058, 1008,
- /* 190 */ 1048, 1047, 1054, 1046, 1045, 1044, 798, 798, 798, 1040,
- /* 200 */ 1041, 1043, 1042, 798, 798, 1050, 1049, 798, 798, 798,
- /* 210 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 220 */ 798, 798, 1020, 798, 1014, 1010, 798, 798, 798, 798,
- /* 230 */ 798, 798, 798, 798, 798, 925, 798, 798, 798, 798,
- /* 240 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 250 */ 962, 798, 798, 798, 798, 798, 974, 973, 798, 798,
- /* 260 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 1004,
- /* 270 */ 798, 996, 798, 798, 798, 798, 798, 937, 798, 798,
- /* 280 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 290 */ 798, 798, 798, 1070, 1068, 798, 798, 798, 1064, 798,
- /* 300 */ 798, 798, 1062, 798, 798, 798, 798, 798, 798, 798,
- /* 310 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798,
- /* 320 */ 879, 798, 826, 824, 798, 815, 798,
+ /* 0 */ 818, 931, 877, 943, 865, 874, 1079, 1079, 818, 818,
+ /* 10 */ 818, 818, 818, 818, 818, 818, 818, 818, 818, 818,
+ /* 20 */ 818, 818, 990, 837, 1079, 818, 818, 818, 818, 818,
+ /* 30 */ 818, 818, 818, 818, 874, 818, 818, 880, 874, 880,
+ /* 40 */ 880, 985, 915, 933, 818, 818, 818, 818, 818, 818,
+ /* 50 */ 818, 818, 818, 818, 818, 818, 818, 818, 818, 818,
+ /* 60 */ 818, 818, 818, 818, 818, 818, 818, 818, 818, 818,
+ /* 70 */ 818, 818, 818, 818, 818, 818, 818, 992, 998, 995,
+ /* 80 */ 818, 818, 818, 1000, 818, 818, 818, 1022, 1022, 983,
+ /* 90 */ 818, 818, 818, 818, 818, 818, 818, 818, 818, 818,
+ /* 100 */ 818, 818, 818, 818, 818, 818, 818, 818, 818, 818,
+ /* 110 */ 818, 818, 818, 818, 818, 818, 818, 818, 818, 863,
+ /* 120 */ 818, 861, 818, 818, 818, 818, 818, 818, 818, 818,
+ /* 130 */ 818, 818, 818, 818, 818, 818, 848, 818, 818, 818,
+ /* 140 */ 818, 818, 818, 839, 839, 839, 818, 818, 818, 839,
+ /* 150 */ 818, 839, 1029, 1033, 1027, 1015, 1023, 1014, 1010, 1008,
+ /* 160 */ 1006, 1005, 1037, 839, 839, 839, 878, 874, 874, 839,
+ /* 170 */ 839, 896, 894, 892, 884, 890, 886, 888, 882, 866,
+ /* 180 */ 839, 872, 872, 839, 872, 839, 872, 839, 839, 915,
+ /* 190 */ 933, 818, 1038, 818, 1078, 1028, 1068, 1067, 1074, 1066,
+ /* 200 */ 1065, 1064, 818, 818, 818, 1060, 1061, 1063, 1062, 818,
+ /* 210 */ 818, 818, 1070, 1069, 818, 818, 818, 818, 818, 818,
+ /* 220 */ 818, 818, 818, 818, 818, 818, 818, 818, 1040, 818,
+ /* 230 */ 1034, 1030, 818, 818, 818, 818, 818, 818, 818, 818,
+ /* 240 */ 818, 818, 818, 945, 818, 818, 818, 818, 818, 818,
+ /* 250 */ 818, 818, 818, 818, 818, 818, 818, 818, 982, 818,
+ /* 260 */ 818, 818, 818, 818, 994, 993, 818, 818, 818, 818,
+ /* 270 */ 818, 818, 818, 818, 818, 818, 818, 1024, 818, 1016,
+ /* 280 */ 818, 818, 818, 818, 818, 957, 818, 818, 818, 818,
+ /* 290 */ 818, 818, 818, 818, 818, 818, 818, 818, 818, 818,
+ /* 300 */ 818, 818, 818, 1097, 1092, 1093, 1090, 818, 818, 818,
+ /* 310 */ 1089, 1084, 1085, 818, 818, 818, 1082, 818, 818, 818,
+ /* 320 */ 818, 818, 818, 818, 818, 818, 818, 818, 818, 818,
+ /* 330 */ 818, 818, 818, 818, 899, 818, 846, 844, 818, 835,
+ /* 340 */ 818,
};
/********** End of lemon-generated parsing tables *****************************/
@@ -623,6 +645,7 @@ static const YYCODETYPE yyFallback[] = {
0, /* SYNCDB => nothing */
0, /* ADD => nothing */
0, /* COLUMN => nothing */
+ 0, /* MODIFY => nothing */
0, /* TAG => nothing */
0, /* CHANGE => nothing */
0, /* SET => nothing */
@@ -710,6 +733,7 @@ struct yyParser {
int yyerrcnt; /* Shifts left before out of the error */
#endif
ParseARG_SDECL /* A place to hold %extra_argument */
+ ParseCTX_SDECL /* A place to hold %extra_context */
#if YYSTACKDEPTH<=0
int yystksz; /* Current side of the stack */
yyStackEntry *yystack; /* The parser's stack */
@@ -897,55 +921,55 @@ static const char *const yyTokenName[] = {
/* 137 */ "SYNCDB",
/* 138 */ "ADD",
/* 139 */ "COLUMN",
- /* 140 */ "TAG",
- /* 141 */ "CHANGE",
- /* 142 */ "SET",
- /* 143 */ "KILL",
- /* 144 */ "CONNECTION",
- /* 145 */ "STREAM",
- /* 146 */ "COLON",
- /* 147 */ "ABORT",
- /* 148 */ "AFTER",
- /* 149 */ "ATTACH",
- /* 150 */ "BEFORE",
- /* 151 */ "BEGIN",
- /* 152 */ "CASCADE",
- /* 153 */ "CLUSTER",
- /* 154 */ "CONFLICT",
- /* 155 */ "COPY",
- /* 156 */ "DEFERRED",
- /* 157 */ "DELIMITERS",
- /* 158 */ "DETACH",
- /* 159 */ "EACH",
- /* 160 */ "END",
- /* 161 */ "EXPLAIN",
- /* 162 */ "FAIL",
- /* 163 */ "FOR",
- /* 164 */ "IGNORE",
- /* 165 */ "IMMEDIATE",
- /* 166 */ "INITIALLY",
- /* 167 */ "INSTEAD",
- /* 168 */ "MATCH",
- /* 169 */ "KEY",
- /* 170 */ "OF",
- /* 171 */ "RAISE",
- /* 172 */ "REPLACE",
- /* 173 */ "RESTRICT",
- /* 174 */ "ROW",
- /* 175 */ "STATEMENT",
- /* 176 */ "TRIGGER",
- /* 177 */ "VIEW",
- /* 178 */ "SEMI",
- /* 179 */ "NONE",
- /* 180 */ "PREV",
- /* 181 */ "LINEAR",
- /* 182 */ "IMPORT",
- /* 183 */ "TBNAME",
- /* 184 */ "JOIN",
- /* 185 */ "INSERT",
- /* 186 */ "INTO",
- /* 187 */ "VALUES",
- /* 188 */ "error",
+ /* 140 */ "MODIFY",
+ /* 141 */ "TAG",
+ /* 142 */ "CHANGE",
+ /* 143 */ "SET",
+ /* 144 */ "KILL",
+ /* 145 */ "CONNECTION",
+ /* 146 */ "STREAM",
+ /* 147 */ "COLON",
+ /* 148 */ "ABORT",
+ /* 149 */ "AFTER",
+ /* 150 */ "ATTACH",
+ /* 151 */ "BEFORE",
+ /* 152 */ "BEGIN",
+ /* 153 */ "CASCADE",
+ /* 154 */ "CLUSTER",
+ /* 155 */ "CONFLICT",
+ /* 156 */ "COPY",
+ /* 157 */ "DEFERRED",
+ /* 158 */ "DELIMITERS",
+ /* 159 */ "DETACH",
+ /* 160 */ "EACH",
+ /* 161 */ "END",
+ /* 162 */ "EXPLAIN",
+ /* 163 */ "FAIL",
+ /* 164 */ "FOR",
+ /* 165 */ "IGNORE",
+ /* 166 */ "IMMEDIATE",
+ /* 167 */ "INITIALLY",
+ /* 168 */ "INSTEAD",
+ /* 169 */ "MATCH",
+ /* 170 */ "KEY",
+ /* 171 */ "OF",
+ /* 172 */ "RAISE",
+ /* 173 */ "REPLACE",
+ /* 174 */ "RESTRICT",
+ /* 175 */ "ROW",
+ /* 176 */ "STATEMENT",
+ /* 177 */ "TRIGGER",
+ /* 178 */ "VIEW",
+ /* 179 */ "SEMI",
+ /* 180 */ "NONE",
+ /* 181 */ "PREV",
+ /* 182 */ "LINEAR",
+ /* 183 */ "IMPORT",
+ /* 184 */ "TBNAME",
+ /* 185 */ "JOIN",
+ /* 186 */ "INSERT",
+ /* 187 */ "INTO",
+ /* 188 */ "VALUES",
/* 189 */ "program",
/* 190 */ "cmd",
/* 191 */ "dbPrefix",
@@ -1293,18 +1317,23 @@ static const char *const yyRuleName[] = {
/* 260 */ "cmd ::= SYNCDB ids REPLICA",
/* 261 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
/* 262 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
- /* 263 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
- /* 264 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
- /* 265 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
- /* 266 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
- /* 267 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
- /* 268 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
- /* 269 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
- /* 270 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
- /* 271 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
- /* 272 */ "cmd ::= KILL CONNECTION INTEGER",
- /* 273 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
- /* 274 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
+ /* 263 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist",
+ /* 264 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
+ /* 265 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
+ /* 266 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
+ /* 267 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
+ /* 268 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist",
+ /* 269 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
+ /* 270 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
+ /* 271 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist",
+ /* 272 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
+ /* 273 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
+ /* 274 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
+ /* 275 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem",
+ /* 276 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist",
+ /* 277 */ "cmd ::= KILL CONNECTION INTEGER",
+ /* 278 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
+ /* 279 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
};
#endif /* NDEBUG */
@@ -1353,28 +1382,29 @@ static int yyGrowStack(yyParser *p){
/* Initialize a new parser that has already been allocated.
*/
-void ParseInit(void *yypParser){
- yyParser *pParser = (yyParser*)yypParser;
+void ParseInit(void *yypRawParser ParseCTX_PDECL){
+ yyParser *yypParser = (yyParser*)yypRawParser;
+ ParseCTX_STORE
#ifdef YYTRACKMAXSTACKDEPTH
- pParser->yyhwm = 0;
+ yypParser->yyhwm = 0;
#endif
#if YYSTACKDEPTH<=0
- pParser->yytos = NULL;
- pParser->yystack = NULL;
- pParser->yystksz = 0;
- if( yyGrowStack(pParser) ){
- pParser->yystack = &pParser->yystk0;
- pParser->yystksz = 1;
+ yypParser->yytos = NULL;
+ yypParser->yystack = NULL;
+ yypParser->yystksz = 0;
+ if( yyGrowStack(yypParser) ){
+ yypParser->yystack = &yypParser->yystk0;
+ yypParser->yystksz = 1;
}
#endif
#ifndef YYNOERRORRECOVERY
- pParser->yyerrcnt = -1;
+ yypParser->yyerrcnt = -1;
#endif
- pParser->yytos = pParser->yystack;
- pParser->yystack[0].stateno = 0;
- pParser->yystack[0].major = 0;
+ yypParser->yytos = yypParser->yystack;
+ yypParser->yystack[0].stateno = 0;
+ yypParser->yystack[0].major = 0;
#if YYSTACKDEPTH>0
- pParser->yystackEnd = &pParser->yystack[YYSTACKDEPTH-1];
+ yypParser->yystackEnd = &yypParser->yystack[YYSTACKDEPTH-1];
#endif
}
@@ -1391,11 +1421,14 @@ void ParseInit(void *yypParser){
** A pointer to a parser. This pointer is used in subsequent calls
** to Parse and ParseFree.
*/
-void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE)){
- yyParser *pParser;
- pParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) );
- if( pParser ) ParseInit(pParser);
- return pParser;
+void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE) ParseCTX_PDECL){
+ yyParser *yypParser;
+ yypParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) );
+ if( yypParser ){
+ ParseCTX_STORE
+ ParseInit(yypParser ParseCTX_PARAM);
+ }
+ return (void*)yypParser;
}
#endif /* Parse_ENGINEALWAYSONSTACK */
@@ -1412,7 +1445,8 @@ static void yy_destructor(
YYCODETYPE yymajor, /* Type code for object to destroy */
YYMINORTYPE *yypminor /* The object to be destroyed */
){
- ParseARG_FETCH;
+ ParseARG_FETCH
+ ParseCTX_FETCH
switch( yymajor ){
/* Here is inserted the actions which take place when a
** terminal or non-terminal is destroyed. This can happen
@@ -1589,13 +1623,12 @@ int ParseCoverage(FILE *out){
** Find the appropriate action for a parser given the terminal
** look-ahead token iLookAhead.
*/
-static unsigned int yy_find_shift_action(
- yyParser *pParser, /* The parser */
- YYCODETYPE iLookAhead /* The look-ahead token */
+static YYACTIONTYPE yy_find_shift_action(
+ YYCODETYPE iLookAhead, /* The look-ahead token */
+ YYACTIONTYPE stateno /* Current state number */
){
int i;
- int stateno = pParser->yytos->stateno;
-
+
if( stateno>YY_MAX_SHIFT ) return stateno;
assert( stateno <= YY_SHIFT_COUNT );
#if defined(YYCOVERAGE)
@@ -1603,15 +1636,19 @@ static unsigned int yy_find_shift_action(
#endif
do{
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 < YYNTOKEN );
i += iLookAhead;
+ assert( i<(int)YY_NLOOKAHEAD );
if( yy_lookahead[i]!=iLookAhead ){
#ifdef YYFALLBACK
YYCODETYPE iFallback; /* Fallback token */
- if( iLookAhead %s\n",
@@ -1626,15 +1663,8 @@ static unsigned int yy_find_shift_action(
#ifdef YYWILDCARD
{
int j = i - iLookAhead + YYWILDCARD;
- if(
-#if YY_SHIFT_MIN+YYWILDCARD<0
- j>=0 &&
-#endif
-#if YY_SHIFT_MAX+YYWILDCARD>=YY_ACTTAB_COUNT
- j0
- ){
+ assert( j<(int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])) );
+ if( yy_lookahead[j]==YYWILDCARD && iLookAhead>0 ){
#ifndef NDEBUG
if( yyTraceFILE ){
fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n",
@@ -1648,6 +1678,7 @@ static unsigned int yy_find_shift_action(
#endif /* YYWILDCARD */
return yy_default[stateno];
}else{
+ assert( i>=0 && iyytos;
- yytos->stateno = (YYACTIONTYPE)yyNewState;
- yytos->major = (YYCODETYPE)yyMajor;
+ yytos->stateno = yyNewState;
+ yytos->major = yyMajor;
yytos->minor.yy0 = yyMinor;
yyTraceShift(yypParser, yyNewState, "Shift");
}
-/* The following table contains information about every rule that
-** is used during the reduce.
-*/
-static const struct {
- YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */
- signed char nrhs; /* Negative of the number of RHS symbols in the rule */
-} yyRuleInfo[] = {
- { 189, -1 }, /* (0) program ::= cmd */
- { 190, -2 }, /* (1) cmd ::= SHOW DATABASES */
- { 190, -2 }, /* (2) cmd ::= SHOW TOPICS */
- { 190, -2 }, /* (3) cmd ::= SHOW MNODES */
- { 190, -2 }, /* (4) cmd ::= SHOW DNODES */
- { 190, -2 }, /* (5) cmd ::= SHOW ACCOUNTS */
- { 190, -2 }, /* (6) cmd ::= SHOW USERS */
- { 190, -2 }, /* (7) cmd ::= SHOW MODULES */
- { 190, -2 }, /* (8) cmd ::= SHOW QUERIES */
- { 190, -2 }, /* (9) cmd ::= SHOW CONNECTIONS */
- { 190, -2 }, /* (10) cmd ::= SHOW STREAMS */
- { 190, -2 }, /* (11) cmd ::= SHOW VARIABLES */
- { 190, -2 }, /* (12) cmd ::= SHOW SCORES */
- { 190, -2 }, /* (13) cmd ::= SHOW GRANTS */
- { 190, -2 }, /* (14) cmd ::= SHOW VNODES */
- { 190, -3 }, /* (15) cmd ::= SHOW VNODES IPTOKEN */
- { 191, 0 }, /* (16) dbPrefix ::= */
- { 191, -2 }, /* (17) dbPrefix ::= ids DOT */
- { 193, 0 }, /* (18) cpxName ::= */
- { 193, -2 }, /* (19) cpxName ::= DOT ids */
- { 190, -5 }, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */
- { 190, -5 }, /* (21) cmd ::= SHOW CREATE STABLE ids cpxName */
- { 190, -4 }, /* (22) cmd ::= SHOW CREATE DATABASE ids */
- { 190, -3 }, /* (23) cmd ::= SHOW dbPrefix TABLES */
- { 190, -5 }, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */
- { 190, -3 }, /* (25) cmd ::= SHOW dbPrefix STABLES */
- { 190, -5 }, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */
- { 190, -3 }, /* (27) cmd ::= SHOW dbPrefix VGROUPS */
- { 190, -4 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */
- { 190, -5 }, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */
- { 190, -5 }, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */
- { 190, -4 }, /* (31) cmd ::= DROP DATABASE ifexists ids */
- { 190, -4 }, /* (32) cmd ::= DROP TOPIC ifexists ids */
- { 190, -3 }, /* (33) cmd ::= DROP DNODE ids */
- { 190, -3 }, /* (34) cmd ::= DROP USER ids */
- { 190, -3 }, /* (35) cmd ::= DROP ACCOUNT ids */
- { 190, -2 }, /* (36) cmd ::= USE ids */
- { 190, -3 }, /* (37) cmd ::= DESCRIBE ids cpxName */
- { 190, -5 }, /* (38) cmd ::= ALTER USER ids PASS ids */
- { 190, -5 }, /* (39) cmd ::= ALTER USER ids PRIVILEGE ids */
- { 190, -4 }, /* (40) cmd ::= ALTER DNODE ids ids */
- { 190, -5 }, /* (41) cmd ::= ALTER DNODE ids ids ids */
- { 190, -3 }, /* (42) cmd ::= ALTER LOCAL ids */
- { 190, -4 }, /* (43) cmd ::= ALTER LOCAL ids ids */
- { 190, -4 }, /* (44) cmd ::= ALTER DATABASE ids alter_db_optr */
- { 190, -4 }, /* (45) cmd ::= ALTER TOPIC ids alter_topic_optr */
- { 190, -4 }, /* (46) cmd ::= ALTER ACCOUNT ids acct_optr */
- { 190, -6 }, /* (47) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
- { 192, -1 }, /* (48) ids ::= ID */
- { 192, -1 }, /* (49) ids ::= STRING */
- { 194, -2 }, /* (50) ifexists ::= IF EXISTS */
- { 194, 0 }, /* (51) ifexists ::= */
- { 198, -3 }, /* (52) ifnotexists ::= IF NOT EXISTS */
- { 198, 0 }, /* (53) ifnotexists ::= */
- { 190, -3 }, /* (54) cmd ::= CREATE DNODE ids */
- { 190, -6 }, /* (55) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
- { 190, -5 }, /* (56) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
- { 190, -5 }, /* (57) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */
- { 190, -5 }, /* (58) cmd ::= CREATE USER ids PASS ids */
- { 201, 0 }, /* (59) pps ::= */
- { 201, -2 }, /* (60) pps ::= PPS INTEGER */
- { 202, 0 }, /* (61) tseries ::= */
- { 202, -2 }, /* (62) tseries ::= TSERIES INTEGER */
- { 203, 0 }, /* (63) dbs ::= */
- { 203, -2 }, /* (64) dbs ::= DBS INTEGER */
- { 204, 0 }, /* (65) streams ::= */
- { 204, -2 }, /* (66) streams ::= STREAMS INTEGER */
- { 205, 0 }, /* (67) storage ::= */
- { 205, -2 }, /* (68) storage ::= STORAGE INTEGER */
- { 206, 0 }, /* (69) qtime ::= */
- { 206, -2 }, /* (70) qtime ::= QTIME INTEGER */
- { 207, 0 }, /* (71) users ::= */
- { 207, -2 }, /* (72) users ::= USERS INTEGER */
- { 208, 0 }, /* (73) conns ::= */
- { 208, -2 }, /* (74) conns ::= CONNS INTEGER */
- { 209, 0 }, /* (75) state ::= */
- { 209, -2 }, /* (76) state ::= STATE ids */
- { 197, -9 }, /* (77) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
- { 210, -2 }, /* (78) keep ::= KEEP tagitemlist */
- { 212, -2 }, /* (79) cache ::= CACHE INTEGER */
- { 213, -2 }, /* (80) replica ::= REPLICA INTEGER */
- { 214, -2 }, /* (81) quorum ::= QUORUM INTEGER */
- { 215, -2 }, /* (82) days ::= DAYS INTEGER */
- { 216, -2 }, /* (83) minrows ::= MINROWS INTEGER */
- { 217, -2 }, /* (84) maxrows ::= MAXROWS INTEGER */
- { 218, -2 }, /* (85) blocks ::= BLOCKS INTEGER */
- { 219, -2 }, /* (86) ctime ::= CTIME INTEGER */
- { 220, -2 }, /* (87) wal ::= WAL INTEGER */
- { 221, -2 }, /* (88) fsync ::= FSYNC INTEGER */
- { 222, -2 }, /* (89) comp ::= COMP INTEGER */
- { 223, -2 }, /* (90) prec ::= PRECISION STRING */
- { 224, -2 }, /* (91) update ::= UPDATE INTEGER */
- { 225, -2 }, /* (92) cachelast ::= CACHELAST INTEGER */
- { 226, -2 }, /* (93) partitions ::= PARTITIONS INTEGER */
- { 199, 0 }, /* (94) db_optr ::= */
- { 199, -2 }, /* (95) db_optr ::= db_optr cache */
- { 199, -2 }, /* (96) db_optr ::= db_optr replica */
- { 199, -2 }, /* (97) db_optr ::= db_optr quorum */
- { 199, -2 }, /* (98) db_optr ::= db_optr days */
- { 199, -2 }, /* (99) db_optr ::= db_optr minrows */
- { 199, -2 }, /* (100) db_optr ::= db_optr maxrows */
- { 199, -2 }, /* (101) db_optr ::= db_optr blocks */
- { 199, -2 }, /* (102) db_optr ::= db_optr ctime */
- { 199, -2 }, /* (103) db_optr ::= db_optr wal */
- { 199, -2 }, /* (104) db_optr ::= db_optr fsync */
- { 199, -2 }, /* (105) db_optr ::= db_optr comp */
- { 199, -2 }, /* (106) db_optr ::= db_optr prec */
- { 199, -2 }, /* (107) db_optr ::= db_optr keep */
- { 199, -2 }, /* (108) db_optr ::= db_optr update */
- { 199, -2 }, /* (109) db_optr ::= db_optr cachelast */
- { 200, -1 }, /* (110) topic_optr ::= db_optr */
- { 200, -2 }, /* (111) topic_optr ::= topic_optr partitions */
- { 195, 0 }, /* (112) alter_db_optr ::= */
- { 195, -2 }, /* (113) alter_db_optr ::= alter_db_optr replica */
- { 195, -2 }, /* (114) alter_db_optr ::= alter_db_optr quorum */
- { 195, -2 }, /* (115) alter_db_optr ::= alter_db_optr keep */
- { 195, -2 }, /* (116) alter_db_optr ::= alter_db_optr blocks */
- { 195, -2 }, /* (117) alter_db_optr ::= alter_db_optr comp */
- { 195, -2 }, /* (118) alter_db_optr ::= alter_db_optr wal */
- { 195, -2 }, /* (119) alter_db_optr ::= alter_db_optr fsync */
- { 195, -2 }, /* (120) alter_db_optr ::= alter_db_optr update */
- { 195, -2 }, /* (121) alter_db_optr ::= alter_db_optr cachelast */
- { 196, -1 }, /* (122) alter_topic_optr ::= alter_db_optr */
- { 196, -2 }, /* (123) alter_topic_optr ::= alter_topic_optr partitions */
- { 227, -1 }, /* (124) typename ::= ids */
- { 227, -4 }, /* (125) typename ::= ids LP signed RP */
- { 227, -2 }, /* (126) typename ::= ids UNSIGNED */
- { 228, -1 }, /* (127) signed ::= INTEGER */
- { 228, -2 }, /* (128) signed ::= PLUS INTEGER */
- { 228, -2 }, /* (129) signed ::= MINUS INTEGER */
- { 190, -3 }, /* (130) cmd ::= CREATE TABLE create_table_args */
- { 190, -3 }, /* (131) cmd ::= CREATE TABLE create_stable_args */
- { 190, -3 }, /* (132) cmd ::= CREATE STABLE create_stable_args */
- { 190, -3 }, /* (133) cmd ::= CREATE TABLE create_table_list */
- { 231, -1 }, /* (134) create_table_list ::= create_from_stable */
- { 231, -2 }, /* (135) create_table_list ::= create_table_list create_from_stable */
- { 229, -6 }, /* (136) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
- { 230, -10 }, /* (137) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
- { 232, -10 }, /* (138) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
- { 232, -13 }, /* (139) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
- { 234, -3 }, /* (140) tagNamelist ::= tagNamelist COMMA ids */
- { 234, -1 }, /* (141) tagNamelist ::= ids */
- { 229, -5 }, /* (142) create_table_args ::= ifnotexists ids cpxName AS select */
- { 233, -3 }, /* (143) columnlist ::= columnlist COMMA column */
- { 233, -1 }, /* (144) columnlist ::= column */
- { 236, -2 }, /* (145) column ::= ids typename */
- { 211, -3 }, /* (146) tagitemlist ::= tagitemlist COMMA tagitem */
- { 211, -1 }, /* (147) tagitemlist ::= tagitem */
- { 237, -1 }, /* (148) tagitem ::= INTEGER */
- { 237, -1 }, /* (149) tagitem ::= FLOAT */
- { 237, -1 }, /* (150) tagitem ::= STRING */
- { 237, -1 }, /* (151) tagitem ::= BOOL */
- { 237, -1 }, /* (152) tagitem ::= NULL */
- { 237, -2 }, /* (153) tagitem ::= MINUS INTEGER */
- { 237, -2 }, /* (154) tagitem ::= MINUS FLOAT */
- { 237, -2 }, /* (155) tagitem ::= PLUS INTEGER */
- { 237, -2 }, /* (156) tagitem ::= PLUS FLOAT */
- { 235, -14 }, /* (157) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
- { 235, -3 }, /* (158) select ::= LP select RP */
- { 251, -1 }, /* (159) union ::= select */
- { 251, -4 }, /* (160) union ::= union UNION ALL select */
- { 190, -1 }, /* (161) cmd ::= union */
- { 235, -2 }, /* (162) select ::= SELECT selcollist */
- { 252, -2 }, /* (163) sclp ::= selcollist COMMA */
- { 252, 0 }, /* (164) sclp ::= */
- { 238, -4 }, /* (165) selcollist ::= sclp distinct expr as */
- { 238, -2 }, /* (166) selcollist ::= sclp STAR */
- { 255, -2 }, /* (167) as ::= AS ids */
- { 255, -1 }, /* (168) as ::= ids */
- { 255, 0 }, /* (169) as ::= */
- { 253, -1 }, /* (170) distinct ::= DISTINCT */
- { 253, 0 }, /* (171) distinct ::= */
- { 239, -2 }, /* (172) from ::= FROM tablelist */
- { 239, -2 }, /* (173) from ::= FROM sub */
- { 257, -3 }, /* (174) sub ::= LP union RP */
- { 257, -4 }, /* (175) sub ::= LP union RP ids */
- { 257, -6 }, /* (176) sub ::= sub COMMA LP union RP ids */
- { 256, -2 }, /* (177) tablelist ::= ids cpxName */
- { 256, -3 }, /* (178) tablelist ::= ids cpxName ids */
- { 256, -4 }, /* (179) tablelist ::= tablelist COMMA ids cpxName */
- { 256, -5 }, /* (180) tablelist ::= tablelist COMMA ids cpxName ids */
- { 258, -1 }, /* (181) tmvar ::= VARIABLE */
- { 241, -4 }, /* (182) interval_opt ::= INTERVAL LP tmvar RP */
- { 241, -6 }, /* (183) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
- { 241, 0 }, /* (184) interval_opt ::= */
- { 242, 0 }, /* (185) session_option ::= */
- { 242, -7 }, /* (186) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
- { 243, 0 }, /* (187) windowstate_option ::= */
- { 243, -4 }, /* (188) windowstate_option ::= STATE_WINDOW LP ids RP */
- { 244, 0 }, /* (189) fill_opt ::= */
- { 244, -6 }, /* (190) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
- { 244, -4 }, /* (191) fill_opt ::= FILL LP ID RP */
- { 245, -4 }, /* (192) sliding_opt ::= SLIDING LP tmvar RP */
- { 245, 0 }, /* (193) sliding_opt ::= */
- { 247, 0 }, /* (194) orderby_opt ::= */
- { 247, -3 }, /* (195) orderby_opt ::= ORDER BY sortlist */
- { 259, -4 }, /* (196) sortlist ::= sortlist COMMA item sortorder */
- { 259, -2 }, /* (197) sortlist ::= item sortorder */
- { 261, -2 }, /* (198) item ::= ids cpxName */
- { 262, -1 }, /* (199) sortorder ::= ASC */
- { 262, -1 }, /* (200) sortorder ::= DESC */
- { 262, 0 }, /* (201) sortorder ::= */
- { 246, 0 }, /* (202) groupby_opt ::= */
- { 246, -3 }, /* (203) groupby_opt ::= GROUP BY grouplist */
- { 263, -3 }, /* (204) grouplist ::= grouplist COMMA item */
- { 263, -1 }, /* (205) grouplist ::= item */
- { 248, 0 }, /* (206) having_opt ::= */
- { 248, -2 }, /* (207) having_opt ::= HAVING expr */
- { 250, 0 }, /* (208) limit_opt ::= */
- { 250, -2 }, /* (209) limit_opt ::= LIMIT signed */
- { 250, -4 }, /* (210) limit_opt ::= LIMIT signed OFFSET signed */
- { 250, -4 }, /* (211) limit_opt ::= LIMIT signed COMMA signed */
- { 249, 0 }, /* (212) slimit_opt ::= */
- { 249, -2 }, /* (213) slimit_opt ::= SLIMIT signed */
- { 249, -4 }, /* (214) slimit_opt ::= SLIMIT signed SOFFSET signed */
- { 249, -4 }, /* (215) slimit_opt ::= SLIMIT signed COMMA signed */
- { 240, 0 }, /* (216) where_opt ::= */
- { 240, -2 }, /* (217) where_opt ::= WHERE expr */
- { 254, -3 }, /* (218) expr ::= LP expr RP */
- { 254, -1 }, /* (219) expr ::= ID */
- { 254, -3 }, /* (220) expr ::= ID DOT ID */
- { 254, -3 }, /* (221) expr ::= ID DOT STAR */
- { 254, -1 }, /* (222) expr ::= INTEGER */
- { 254, -2 }, /* (223) expr ::= MINUS INTEGER */
- { 254, -2 }, /* (224) expr ::= PLUS INTEGER */
- { 254, -1 }, /* (225) expr ::= FLOAT */
- { 254, -2 }, /* (226) expr ::= MINUS FLOAT */
- { 254, -2 }, /* (227) expr ::= PLUS FLOAT */
- { 254, -1 }, /* (228) expr ::= STRING */
- { 254, -1 }, /* (229) expr ::= NOW */
- { 254, -1 }, /* (230) expr ::= VARIABLE */
- { 254, -2 }, /* (231) expr ::= PLUS VARIABLE */
- { 254, -2 }, /* (232) expr ::= MINUS VARIABLE */
- { 254, -1 }, /* (233) expr ::= BOOL */
- { 254, -1 }, /* (234) expr ::= NULL */
- { 254, -4 }, /* (235) expr ::= ID LP exprlist RP */
- { 254, -4 }, /* (236) expr ::= ID LP STAR RP */
- { 254, -3 }, /* (237) expr ::= expr IS NULL */
- { 254, -4 }, /* (238) expr ::= expr IS NOT NULL */
- { 254, -3 }, /* (239) expr ::= expr LT expr */
- { 254, -3 }, /* (240) expr ::= expr GT expr */
- { 254, -3 }, /* (241) expr ::= expr LE expr */
- { 254, -3 }, /* (242) expr ::= expr GE expr */
- { 254, -3 }, /* (243) expr ::= expr NE expr */
- { 254, -3 }, /* (244) expr ::= expr EQ expr */
- { 254, -5 }, /* (245) expr ::= expr BETWEEN expr AND expr */
- { 254, -3 }, /* (246) expr ::= expr AND expr */
- { 254, -3 }, /* (247) expr ::= expr OR expr */
- { 254, -3 }, /* (248) expr ::= expr PLUS expr */
- { 254, -3 }, /* (249) expr ::= expr MINUS expr */
- { 254, -3 }, /* (250) expr ::= expr STAR expr */
- { 254, -3 }, /* (251) expr ::= expr SLASH expr */
- { 254, -3 }, /* (252) expr ::= expr REM expr */
- { 254, -3 }, /* (253) expr ::= expr LIKE expr */
- { 254, -5 }, /* (254) expr ::= expr IN LP exprlist RP */
- { 264, -3 }, /* (255) exprlist ::= exprlist COMMA expritem */
- { 264, -1 }, /* (256) exprlist ::= expritem */
- { 265, -1 }, /* (257) expritem ::= expr */
- { 265, 0 }, /* (258) expritem ::= */
- { 190, -3 }, /* (259) cmd ::= RESET QUERY CACHE */
- { 190, -3 }, /* (260) cmd ::= SYNCDB ids REPLICA */
- { 190, -7 }, /* (261) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
- { 190, -7 }, /* (262) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
- { 190, -7 }, /* (263) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
- { 190, -7 }, /* (264) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
- { 190, -8 }, /* (265) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
- { 190, -9 }, /* (266) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
- { 190, -7 }, /* (267) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
- { 190, -7 }, /* (268) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
- { 190, -7 }, /* (269) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
- { 190, -7 }, /* (270) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
- { 190, -8 }, /* (271) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
- { 190, -3 }, /* (272) cmd ::= KILL CONNECTION INTEGER */
- { 190, -5 }, /* (273) cmd ::= KILL STREAM INTEGER COLON INTEGER */
- { 190, -5 }, /* (274) cmd ::= KILL QUERY INTEGER COLON INTEGER */
+/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
+** of that rule */
+static const YYCODETYPE yyRuleInfoLhs[] = {
+ 189, /* (0) program ::= cmd */
+ 190, /* (1) cmd ::= SHOW DATABASES */
+ 190, /* (2) cmd ::= SHOW TOPICS */
+ 190, /* (3) cmd ::= SHOW MNODES */
+ 190, /* (4) cmd ::= SHOW DNODES */
+ 190, /* (5) cmd ::= SHOW ACCOUNTS */
+ 190, /* (6) cmd ::= SHOW USERS */
+ 190, /* (7) cmd ::= SHOW MODULES */
+ 190, /* (8) cmd ::= SHOW QUERIES */
+ 190, /* (9) cmd ::= SHOW CONNECTIONS */
+ 190, /* (10) cmd ::= SHOW STREAMS */
+ 190, /* (11) cmd ::= SHOW VARIABLES */
+ 190, /* (12) cmd ::= SHOW SCORES */
+ 190, /* (13) cmd ::= SHOW GRANTS */
+ 190, /* (14) cmd ::= SHOW VNODES */
+ 190, /* (15) cmd ::= SHOW VNODES IPTOKEN */
+ 191, /* (16) dbPrefix ::= */
+ 191, /* (17) dbPrefix ::= ids DOT */
+ 193, /* (18) cpxName ::= */
+ 193, /* (19) cpxName ::= DOT ids */
+ 190, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */
+ 190, /* (21) cmd ::= SHOW CREATE STABLE ids cpxName */
+ 190, /* (22) cmd ::= SHOW CREATE DATABASE ids */
+ 190, /* (23) cmd ::= SHOW dbPrefix TABLES */
+ 190, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */
+ 190, /* (25) cmd ::= SHOW dbPrefix STABLES */
+ 190, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */
+ 190, /* (27) cmd ::= SHOW dbPrefix VGROUPS */
+ 190, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */
+ 190, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */
+ 190, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */
+ 190, /* (31) cmd ::= DROP DATABASE ifexists ids */
+ 190, /* (32) cmd ::= DROP TOPIC ifexists ids */
+ 190, /* (33) cmd ::= DROP DNODE ids */
+ 190, /* (34) cmd ::= DROP USER ids */
+ 190, /* (35) cmd ::= DROP ACCOUNT ids */
+ 190, /* (36) cmd ::= USE ids */
+ 190, /* (37) cmd ::= DESCRIBE ids cpxName */
+ 190, /* (38) cmd ::= ALTER USER ids PASS ids */
+ 190, /* (39) cmd ::= ALTER USER ids PRIVILEGE ids */
+ 190, /* (40) cmd ::= ALTER DNODE ids ids */
+ 190, /* (41) cmd ::= ALTER DNODE ids ids ids */
+ 190, /* (42) cmd ::= ALTER LOCAL ids */
+ 190, /* (43) cmd ::= ALTER LOCAL ids ids */
+ 190, /* (44) cmd ::= ALTER DATABASE ids alter_db_optr */
+ 190, /* (45) cmd ::= ALTER TOPIC ids alter_topic_optr */
+ 190, /* (46) cmd ::= ALTER ACCOUNT ids acct_optr */
+ 190, /* (47) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
+ 192, /* (48) ids ::= ID */
+ 192, /* (49) ids ::= STRING */
+ 194, /* (50) ifexists ::= IF EXISTS */
+ 194, /* (51) ifexists ::= */
+ 198, /* (52) ifnotexists ::= IF NOT EXISTS */
+ 198, /* (53) ifnotexists ::= */
+ 190, /* (54) cmd ::= CREATE DNODE ids */
+ 190, /* (55) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
+ 190, /* (56) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
+ 190, /* (57) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */
+ 190, /* (58) cmd ::= CREATE USER ids PASS ids */
+ 201, /* (59) pps ::= */
+ 201, /* (60) pps ::= PPS INTEGER */
+ 202, /* (61) tseries ::= */
+ 202, /* (62) tseries ::= TSERIES INTEGER */
+ 203, /* (63) dbs ::= */
+ 203, /* (64) dbs ::= DBS INTEGER */
+ 204, /* (65) streams ::= */
+ 204, /* (66) streams ::= STREAMS INTEGER */
+ 205, /* (67) storage ::= */
+ 205, /* (68) storage ::= STORAGE INTEGER */
+ 206, /* (69) qtime ::= */
+ 206, /* (70) qtime ::= QTIME INTEGER */
+ 207, /* (71) users ::= */
+ 207, /* (72) users ::= USERS INTEGER */
+ 208, /* (73) conns ::= */
+ 208, /* (74) conns ::= CONNS INTEGER */
+ 209, /* (75) state ::= */
+ 209, /* (76) state ::= STATE ids */
+ 197, /* (77) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
+ 210, /* (78) keep ::= KEEP tagitemlist */
+ 212, /* (79) cache ::= CACHE INTEGER */
+ 213, /* (80) replica ::= REPLICA INTEGER */
+ 214, /* (81) quorum ::= QUORUM INTEGER */
+ 215, /* (82) days ::= DAYS INTEGER */
+ 216, /* (83) minrows ::= MINROWS INTEGER */
+ 217, /* (84) maxrows ::= MAXROWS INTEGER */
+ 218, /* (85) blocks ::= BLOCKS INTEGER */
+ 219, /* (86) ctime ::= CTIME INTEGER */
+ 220, /* (87) wal ::= WAL INTEGER */
+ 221, /* (88) fsync ::= FSYNC INTEGER */
+ 222, /* (89) comp ::= COMP INTEGER */
+ 223, /* (90) prec ::= PRECISION STRING */
+ 224, /* (91) update ::= UPDATE INTEGER */
+ 225, /* (92) cachelast ::= CACHELAST INTEGER */
+ 226, /* (93) partitions ::= PARTITIONS INTEGER */
+ 199, /* (94) db_optr ::= */
+ 199, /* (95) db_optr ::= db_optr cache */
+ 199, /* (96) db_optr ::= db_optr replica */
+ 199, /* (97) db_optr ::= db_optr quorum */
+ 199, /* (98) db_optr ::= db_optr days */
+ 199, /* (99) db_optr ::= db_optr minrows */
+ 199, /* (100) db_optr ::= db_optr maxrows */
+ 199, /* (101) db_optr ::= db_optr blocks */
+ 199, /* (102) db_optr ::= db_optr ctime */
+ 199, /* (103) db_optr ::= db_optr wal */
+ 199, /* (104) db_optr ::= db_optr fsync */
+ 199, /* (105) db_optr ::= db_optr comp */
+ 199, /* (106) db_optr ::= db_optr prec */
+ 199, /* (107) db_optr ::= db_optr keep */
+ 199, /* (108) db_optr ::= db_optr update */
+ 199, /* (109) db_optr ::= db_optr cachelast */
+ 200, /* (110) topic_optr ::= db_optr */
+ 200, /* (111) topic_optr ::= topic_optr partitions */
+ 195, /* (112) alter_db_optr ::= */
+ 195, /* (113) alter_db_optr ::= alter_db_optr replica */
+ 195, /* (114) alter_db_optr ::= alter_db_optr quorum */
+ 195, /* (115) alter_db_optr ::= alter_db_optr keep */
+ 195, /* (116) alter_db_optr ::= alter_db_optr blocks */
+ 195, /* (117) alter_db_optr ::= alter_db_optr comp */
+ 195, /* (118) alter_db_optr ::= alter_db_optr wal */
+ 195, /* (119) alter_db_optr ::= alter_db_optr fsync */
+ 195, /* (120) alter_db_optr ::= alter_db_optr update */
+ 195, /* (121) alter_db_optr ::= alter_db_optr cachelast */
+ 196, /* (122) alter_topic_optr ::= alter_db_optr */
+ 196, /* (123) alter_topic_optr ::= alter_topic_optr partitions */
+ 227, /* (124) typename ::= ids */
+ 227, /* (125) typename ::= ids LP signed RP */
+ 227, /* (126) typename ::= ids UNSIGNED */
+ 228, /* (127) signed ::= INTEGER */
+ 228, /* (128) signed ::= PLUS INTEGER */
+ 228, /* (129) signed ::= MINUS INTEGER */
+ 190, /* (130) cmd ::= CREATE TABLE create_table_args */
+ 190, /* (131) cmd ::= CREATE TABLE create_stable_args */
+ 190, /* (132) cmd ::= CREATE STABLE create_stable_args */
+ 190, /* (133) cmd ::= CREATE TABLE create_table_list */
+ 231, /* (134) create_table_list ::= create_from_stable */
+ 231, /* (135) create_table_list ::= create_table_list create_from_stable */
+ 229, /* (136) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
+ 230, /* (137) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
+ 232, /* (138) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
+ 232, /* (139) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
+ 234, /* (140) tagNamelist ::= tagNamelist COMMA ids */
+ 234, /* (141) tagNamelist ::= ids */
+ 229, /* (142) create_table_args ::= ifnotexists ids cpxName AS select */
+ 233, /* (143) columnlist ::= columnlist COMMA column */
+ 233, /* (144) columnlist ::= column */
+ 236, /* (145) column ::= ids typename */
+ 211, /* (146) tagitemlist ::= tagitemlist COMMA tagitem */
+ 211, /* (147) tagitemlist ::= tagitem */
+ 237, /* (148) tagitem ::= INTEGER */
+ 237, /* (149) tagitem ::= FLOAT */
+ 237, /* (150) tagitem ::= STRING */
+ 237, /* (151) tagitem ::= BOOL */
+ 237, /* (152) tagitem ::= NULL */
+ 237, /* (153) tagitem ::= MINUS INTEGER */
+ 237, /* (154) tagitem ::= MINUS FLOAT */
+ 237, /* (155) tagitem ::= PLUS INTEGER */
+ 237, /* (156) tagitem ::= PLUS FLOAT */
+ 235, /* (157) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
+ 235, /* (158) select ::= LP select RP */
+ 251, /* (159) union ::= select */
+ 251, /* (160) union ::= union UNION ALL select */
+ 190, /* (161) cmd ::= union */
+ 235, /* (162) select ::= SELECT selcollist */
+ 252, /* (163) sclp ::= selcollist COMMA */
+ 252, /* (164) sclp ::= */
+ 238, /* (165) selcollist ::= sclp distinct expr as */
+ 238, /* (166) selcollist ::= sclp STAR */
+ 255, /* (167) as ::= AS ids */
+ 255, /* (168) as ::= ids */
+ 255, /* (169) as ::= */
+ 253, /* (170) distinct ::= DISTINCT */
+ 253, /* (171) distinct ::= */
+ 239, /* (172) from ::= FROM tablelist */
+ 239, /* (173) from ::= FROM sub */
+ 257, /* (174) sub ::= LP union RP */
+ 257, /* (175) sub ::= LP union RP ids */
+ 257, /* (176) sub ::= sub COMMA LP union RP ids */
+ 256, /* (177) tablelist ::= ids cpxName */
+ 256, /* (178) tablelist ::= ids cpxName ids */
+ 256, /* (179) tablelist ::= tablelist COMMA ids cpxName */
+ 256, /* (180) tablelist ::= tablelist COMMA ids cpxName ids */
+ 258, /* (181) tmvar ::= VARIABLE */
+ 241, /* (182) interval_opt ::= INTERVAL LP tmvar RP */
+ 241, /* (183) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
+ 241, /* (184) interval_opt ::= */
+ 242, /* (185) session_option ::= */
+ 242, /* (186) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
+ 243, /* (187) windowstate_option ::= */
+ 243, /* (188) windowstate_option ::= STATE_WINDOW LP ids RP */
+ 244, /* (189) fill_opt ::= */
+ 244, /* (190) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
+ 244, /* (191) fill_opt ::= FILL LP ID RP */
+ 245, /* (192) sliding_opt ::= SLIDING LP tmvar RP */
+ 245, /* (193) sliding_opt ::= */
+ 247, /* (194) orderby_opt ::= */
+ 247, /* (195) orderby_opt ::= ORDER BY sortlist */
+ 259, /* (196) sortlist ::= sortlist COMMA item sortorder */
+ 259, /* (197) sortlist ::= item sortorder */
+ 261, /* (198) item ::= ids cpxName */
+ 262, /* (199) sortorder ::= ASC */
+ 262, /* (200) sortorder ::= DESC */
+ 262, /* (201) sortorder ::= */
+ 246, /* (202) groupby_opt ::= */
+ 246, /* (203) groupby_opt ::= GROUP BY grouplist */
+ 263, /* (204) grouplist ::= grouplist COMMA item */
+ 263, /* (205) grouplist ::= item */
+ 248, /* (206) having_opt ::= */
+ 248, /* (207) having_opt ::= HAVING expr */
+ 250, /* (208) limit_opt ::= */
+ 250, /* (209) limit_opt ::= LIMIT signed */
+ 250, /* (210) limit_opt ::= LIMIT signed OFFSET signed */
+ 250, /* (211) limit_opt ::= LIMIT signed COMMA signed */
+ 249, /* (212) slimit_opt ::= */
+ 249, /* (213) slimit_opt ::= SLIMIT signed */
+ 249, /* (214) slimit_opt ::= SLIMIT signed SOFFSET signed */
+ 249, /* (215) slimit_opt ::= SLIMIT signed COMMA signed */
+ 240, /* (216) where_opt ::= */
+ 240, /* (217) where_opt ::= WHERE expr */
+ 254, /* (218) expr ::= LP expr RP */
+ 254, /* (219) expr ::= ID */
+ 254, /* (220) expr ::= ID DOT ID */
+ 254, /* (221) expr ::= ID DOT STAR */
+ 254, /* (222) expr ::= INTEGER */
+ 254, /* (223) expr ::= MINUS INTEGER */
+ 254, /* (224) expr ::= PLUS INTEGER */
+ 254, /* (225) expr ::= FLOAT */
+ 254, /* (226) expr ::= MINUS FLOAT */
+ 254, /* (227) expr ::= PLUS FLOAT */
+ 254, /* (228) expr ::= STRING */
+ 254, /* (229) expr ::= NOW */
+ 254, /* (230) expr ::= VARIABLE */
+ 254, /* (231) expr ::= PLUS VARIABLE */
+ 254, /* (232) expr ::= MINUS VARIABLE */
+ 254, /* (233) expr ::= BOOL */
+ 254, /* (234) expr ::= NULL */
+ 254, /* (235) expr ::= ID LP exprlist RP */
+ 254, /* (236) expr ::= ID LP STAR RP */
+ 254, /* (237) expr ::= expr IS NULL */
+ 254, /* (238) expr ::= expr IS NOT NULL */
+ 254, /* (239) expr ::= expr LT expr */
+ 254, /* (240) expr ::= expr GT expr */
+ 254, /* (241) expr ::= expr LE expr */
+ 254, /* (242) expr ::= expr GE expr */
+ 254, /* (243) expr ::= expr NE expr */
+ 254, /* (244) expr ::= expr EQ expr */
+ 254, /* (245) expr ::= expr BETWEEN expr AND expr */
+ 254, /* (246) expr ::= expr AND expr */
+ 254, /* (247) expr ::= expr OR expr */
+ 254, /* (248) expr ::= expr PLUS expr */
+ 254, /* (249) expr ::= expr MINUS expr */
+ 254, /* (250) expr ::= expr STAR expr */
+ 254, /* (251) expr ::= expr SLASH expr */
+ 254, /* (252) expr ::= expr REM expr */
+ 254, /* (253) expr ::= expr LIKE expr */
+ 254, /* (254) expr ::= expr IN LP exprlist RP */
+ 264, /* (255) exprlist ::= exprlist COMMA expritem */
+ 264, /* (256) exprlist ::= expritem */
+ 265, /* (257) expritem ::= expr */
+ 265, /* (258) expritem ::= */
+ 190, /* (259) cmd ::= RESET QUERY CACHE */
+ 190, /* (260) cmd ::= SYNCDB ids REPLICA */
+ 190, /* (261) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+ 190, /* (262) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+ 190, /* (263) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
+ 190, /* (264) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+ 190, /* (265) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+ 190, /* (266) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+ 190, /* (267) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+ 190, /* (268) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
+ 190, /* (269) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+ 190, /* (270) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+ 190, /* (271) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
+ 190, /* (272) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+ 190, /* (273) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+ 190, /* (274) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+ 190, /* (275) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
+ 190, /* (276) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
+ 190, /* (277) cmd ::= KILL CONNECTION INTEGER */
+ 190, /* (278) cmd ::= KILL STREAM INTEGER COLON INTEGER */
+ 190, /* (279) 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 TOPICS */
+ -2, /* (3) cmd ::= SHOW MNODES */
+ -2, /* (4) cmd ::= SHOW DNODES */
+ -2, /* (5) cmd ::= SHOW ACCOUNTS */
+ -2, /* (6) cmd ::= SHOW USERS */
+ -2, /* (7) cmd ::= SHOW MODULES */
+ -2, /* (8) cmd ::= SHOW QUERIES */
+ -2, /* (9) cmd ::= SHOW CONNECTIONS */
+ -2, /* (10) cmd ::= SHOW STREAMS */
+ -2, /* (11) cmd ::= SHOW VARIABLES */
+ -2, /* (12) cmd ::= SHOW SCORES */
+ -2, /* (13) cmd ::= SHOW GRANTS */
+ -2, /* (14) cmd ::= SHOW VNODES */
+ -3, /* (15) cmd ::= SHOW VNODES IPTOKEN */
+ 0, /* (16) dbPrefix ::= */
+ -2, /* (17) dbPrefix ::= ids DOT */
+ 0, /* (18) cpxName ::= */
+ -2, /* (19) cpxName ::= DOT ids */
+ -5, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */
+ -5, /* (21) cmd ::= SHOW CREATE STABLE ids cpxName */
+ -4, /* (22) cmd ::= SHOW CREATE DATABASE ids */
+ -3, /* (23) cmd ::= SHOW dbPrefix TABLES */
+ -5, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */
+ -3, /* (25) cmd ::= SHOW dbPrefix STABLES */
+ -5, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */
+ -3, /* (27) cmd ::= SHOW dbPrefix VGROUPS */
+ -4, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */
+ -5, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */
+ -5, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */
+ -4, /* (31) cmd ::= DROP DATABASE ifexists ids */
+ -4, /* (32) cmd ::= DROP TOPIC ifexists ids */
+ -3, /* (33) cmd ::= DROP DNODE ids */
+ -3, /* (34) cmd ::= DROP USER ids */
+ -3, /* (35) cmd ::= DROP ACCOUNT ids */
+ -2, /* (36) cmd ::= USE ids */
+ -3, /* (37) cmd ::= DESCRIBE ids cpxName */
+ -5, /* (38) cmd ::= ALTER USER ids PASS ids */
+ -5, /* (39) cmd ::= ALTER USER ids PRIVILEGE ids */
+ -4, /* (40) cmd ::= ALTER DNODE ids ids */
+ -5, /* (41) cmd ::= ALTER DNODE ids ids ids */
+ -3, /* (42) cmd ::= ALTER LOCAL ids */
+ -4, /* (43) cmd ::= ALTER LOCAL ids ids */
+ -4, /* (44) cmd ::= ALTER DATABASE ids alter_db_optr */
+ -4, /* (45) cmd ::= ALTER TOPIC ids alter_topic_optr */
+ -4, /* (46) cmd ::= ALTER ACCOUNT ids acct_optr */
+ -6, /* (47) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
+ -1, /* (48) ids ::= ID */
+ -1, /* (49) ids ::= STRING */
+ -2, /* (50) ifexists ::= IF EXISTS */
+ 0, /* (51) ifexists ::= */
+ -3, /* (52) ifnotexists ::= IF NOT EXISTS */
+ 0, /* (53) ifnotexists ::= */
+ -3, /* (54) cmd ::= CREATE DNODE ids */
+ -6, /* (55) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
+ -5, /* (56) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
+ -5, /* (57) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */
+ -5, /* (58) cmd ::= CREATE USER ids PASS ids */
+ 0, /* (59) pps ::= */
+ -2, /* (60) pps ::= PPS INTEGER */
+ 0, /* (61) tseries ::= */
+ -2, /* (62) tseries ::= TSERIES INTEGER */
+ 0, /* (63) dbs ::= */
+ -2, /* (64) dbs ::= DBS INTEGER */
+ 0, /* (65) streams ::= */
+ -2, /* (66) streams ::= STREAMS INTEGER */
+ 0, /* (67) storage ::= */
+ -2, /* (68) storage ::= STORAGE INTEGER */
+ 0, /* (69) qtime ::= */
+ -2, /* (70) qtime ::= QTIME INTEGER */
+ 0, /* (71) users ::= */
+ -2, /* (72) users ::= USERS INTEGER */
+ 0, /* (73) conns ::= */
+ -2, /* (74) conns ::= CONNS INTEGER */
+ 0, /* (75) state ::= */
+ -2, /* (76) state ::= STATE ids */
+ -9, /* (77) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
+ -2, /* (78) keep ::= KEEP tagitemlist */
+ -2, /* (79) cache ::= CACHE INTEGER */
+ -2, /* (80) replica ::= REPLICA INTEGER */
+ -2, /* (81) quorum ::= QUORUM INTEGER */
+ -2, /* (82) days ::= DAYS INTEGER */
+ -2, /* (83) minrows ::= MINROWS INTEGER */
+ -2, /* (84) maxrows ::= MAXROWS INTEGER */
+ -2, /* (85) blocks ::= BLOCKS INTEGER */
+ -2, /* (86) ctime ::= CTIME INTEGER */
+ -2, /* (87) wal ::= WAL INTEGER */
+ -2, /* (88) fsync ::= FSYNC INTEGER */
+ -2, /* (89) comp ::= COMP INTEGER */
+ -2, /* (90) prec ::= PRECISION STRING */
+ -2, /* (91) update ::= UPDATE INTEGER */
+ -2, /* (92) cachelast ::= CACHELAST INTEGER */
+ -2, /* (93) partitions ::= PARTITIONS INTEGER */
+ 0, /* (94) db_optr ::= */
+ -2, /* (95) db_optr ::= db_optr cache */
+ -2, /* (96) db_optr ::= db_optr replica */
+ -2, /* (97) db_optr ::= db_optr quorum */
+ -2, /* (98) db_optr ::= db_optr days */
+ -2, /* (99) db_optr ::= db_optr minrows */
+ -2, /* (100) db_optr ::= db_optr maxrows */
+ -2, /* (101) db_optr ::= db_optr blocks */
+ -2, /* (102) db_optr ::= db_optr ctime */
+ -2, /* (103) db_optr ::= db_optr wal */
+ -2, /* (104) db_optr ::= db_optr fsync */
+ -2, /* (105) db_optr ::= db_optr comp */
+ -2, /* (106) db_optr ::= db_optr prec */
+ -2, /* (107) db_optr ::= db_optr keep */
+ -2, /* (108) db_optr ::= db_optr update */
+ -2, /* (109) db_optr ::= db_optr cachelast */
+ -1, /* (110) topic_optr ::= db_optr */
+ -2, /* (111) topic_optr ::= topic_optr partitions */
+ 0, /* (112) alter_db_optr ::= */
+ -2, /* (113) alter_db_optr ::= alter_db_optr replica */
+ -2, /* (114) alter_db_optr ::= alter_db_optr quorum */
+ -2, /* (115) alter_db_optr ::= alter_db_optr keep */
+ -2, /* (116) alter_db_optr ::= alter_db_optr blocks */
+ -2, /* (117) alter_db_optr ::= alter_db_optr comp */
+ -2, /* (118) alter_db_optr ::= alter_db_optr wal */
+ -2, /* (119) alter_db_optr ::= alter_db_optr fsync */
+ -2, /* (120) alter_db_optr ::= alter_db_optr update */
+ -2, /* (121) alter_db_optr ::= alter_db_optr cachelast */
+ -1, /* (122) alter_topic_optr ::= alter_db_optr */
+ -2, /* (123) alter_topic_optr ::= alter_topic_optr partitions */
+ -1, /* (124) typename ::= ids */
+ -4, /* (125) typename ::= ids LP signed RP */
+ -2, /* (126) typename ::= ids UNSIGNED */
+ -1, /* (127) signed ::= INTEGER */
+ -2, /* (128) signed ::= PLUS INTEGER */
+ -2, /* (129) signed ::= MINUS INTEGER */
+ -3, /* (130) cmd ::= CREATE TABLE create_table_args */
+ -3, /* (131) cmd ::= CREATE TABLE create_stable_args */
+ -3, /* (132) cmd ::= CREATE STABLE create_stable_args */
+ -3, /* (133) cmd ::= CREATE TABLE create_table_list */
+ -1, /* (134) create_table_list ::= create_from_stable */
+ -2, /* (135) create_table_list ::= create_table_list create_from_stable */
+ -6, /* (136) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
+ -10, /* (137) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
+ -10, /* (138) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
+ -13, /* (139) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
+ -3, /* (140) tagNamelist ::= tagNamelist COMMA ids */
+ -1, /* (141) tagNamelist ::= ids */
+ -5, /* (142) create_table_args ::= ifnotexists ids cpxName AS select */
+ -3, /* (143) columnlist ::= columnlist COMMA column */
+ -1, /* (144) columnlist ::= column */
+ -2, /* (145) column ::= ids typename */
+ -3, /* (146) tagitemlist ::= tagitemlist COMMA tagitem */
+ -1, /* (147) tagitemlist ::= tagitem */
+ -1, /* (148) tagitem ::= INTEGER */
+ -1, /* (149) tagitem ::= FLOAT */
+ -1, /* (150) tagitem ::= STRING */
+ -1, /* (151) tagitem ::= BOOL */
+ -1, /* (152) tagitem ::= NULL */
+ -2, /* (153) tagitem ::= MINUS INTEGER */
+ -2, /* (154) tagitem ::= MINUS FLOAT */
+ -2, /* (155) tagitem ::= PLUS INTEGER */
+ -2, /* (156) tagitem ::= PLUS FLOAT */
+ -14, /* (157) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
+ -3, /* (158) select ::= LP select RP */
+ -1, /* (159) union ::= select */
+ -4, /* (160) union ::= union UNION ALL select */
+ -1, /* (161) cmd ::= union */
+ -2, /* (162) select ::= SELECT selcollist */
+ -2, /* (163) sclp ::= selcollist COMMA */
+ 0, /* (164) sclp ::= */
+ -4, /* (165) selcollist ::= sclp distinct expr as */
+ -2, /* (166) selcollist ::= sclp STAR */
+ -2, /* (167) as ::= AS ids */
+ -1, /* (168) as ::= ids */
+ 0, /* (169) as ::= */
+ -1, /* (170) distinct ::= DISTINCT */
+ 0, /* (171) distinct ::= */
+ -2, /* (172) from ::= FROM tablelist */
+ -2, /* (173) from ::= FROM sub */
+ -3, /* (174) sub ::= LP union RP */
+ -4, /* (175) sub ::= LP union RP ids */
+ -6, /* (176) sub ::= sub COMMA LP union RP ids */
+ -2, /* (177) tablelist ::= ids cpxName */
+ -3, /* (178) tablelist ::= ids cpxName ids */
+ -4, /* (179) tablelist ::= tablelist COMMA ids cpxName */
+ -5, /* (180) tablelist ::= tablelist COMMA ids cpxName ids */
+ -1, /* (181) tmvar ::= VARIABLE */
+ -4, /* (182) interval_opt ::= INTERVAL LP tmvar RP */
+ -6, /* (183) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
+ 0, /* (184) interval_opt ::= */
+ 0, /* (185) session_option ::= */
+ -7, /* (186) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
+ 0, /* (187) windowstate_option ::= */
+ -4, /* (188) windowstate_option ::= STATE_WINDOW LP ids RP */
+ 0, /* (189) fill_opt ::= */
+ -6, /* (190) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
+ -4, /* (191) fill_opt ::= FILL LP ID RP */
+ -4, /* (192) sliding_opt ::= SLIDING LP tmvar RP */
+ 0, /* (193) sliding_opt ::= */
+ 0, /* (194) orderby_opt ::= */
+ -3, /* (195) orderby_opt ::= ORDER BY sortlist */
+ -4, /* (196) sortlist ::= sortlist COMMA item sortorder */
+ -2, /* (197) sortlist ::= item sortorder */
+ -2, /* (198) item ::= ids cpxName */
+ -1, /* (199) sortorder ::= ASC */
+ -1, /* (200) sortorder ::= DESC */
+ 0, /* (201) sortorder ::= */
+ 0, /* (202) groupby_opt ::= */
+ -3, /* (203) groupby_opt ::= GROUP BY grouplist */
+ -3, /* (204) grouplist ::= grouplist COMMA item */
+ -1, /* (205) grouplist ::= item */
+ 0, /* (206) having_opt ::= */
+ -2, /* (207) having_opt ::= HAVING expr */
+ 0, /* (208) limit_opt ::= */
+ -2, /* (209) limit_opt ::= LIMIT signed */
+ -4, /* (210) limit_opt ::= LIMIT signed OFFSET signed */
+ -4, /* (211) limit_opt ::= LIMIT signed COMMA signed */
+ 0, /* (212) slimit_opt ::= */
+ -2, /* (213) slimit_opt ::= SLIMIT signed */
+ -4, /* (214) slimit_opt ::= SLIMIT signed SOFFSET signed */
+ -4, /* (215) slimit_opt ::= SLIMIT signed COMMA signed */
+ 0, /* (216) where_opt ::= */
+ -2, /* (217) where_opt ::= WHERE expr */
+ -3, /* (218) expr ::= LP expr RP */
+ -1, /* (219) expr ::= ID */
+ -3, /* (220) expr ::= ID DOT ID */
+ -3, /* (221) expr ::= ID DOT STAR */
+ -1, /* (222) expr ::= INTEGER */
+ -2, /* (223) expr ::= MINUS INTEGER */
+ -2, /* (224) expr ::= PLUS INTEGER */
+ -1, /* (225) expr ::= FLOAT */
+ -2, /* (226) expr ::= MINUS FLOAT */
+ -2, /* (227) expr ::= PLUS FLOAT */
+ -1, /* (228) expr ::= STRING */
+ -1, /* (229) expr ::= NOW */
+ -1, /* (230) expr ::= VARIABLE */
+ -2, /* (231) expr ::= PLUS VARIABLE */
+ -2, /* (232) expr ::= MINUS VARIABLE */
+ -1, /* (233) expr ::= BOOL */
+ -1, /* (234) expr ::= NULL */
+ -4, /* (235) expr ::= ID LP exprlist RP */
+ -4, /* (236) expr ::= ID LP STAR RP */
+ -3, /* (237) expr ::= expr IS NULL */
+ -4, /* (238) expr ::= expr IS NOT NULL */
+ -3, /* (239) expr ::= expr LT expr */
+ -3, /* (240) expr ::= expr GT expr */
+ -3, /* (241) expr ::= expr LE expr */
+ -3, /* (242) expr ::= expr GE expr */
+ -3, /* (243) expr ::= expr NE expr */
+ -3, /* (244) expr ::= expr EQ expr */
+ -5, /* (245) expr ::= expr BETWEEN expr AND expr */
+ -3, /* (246) expr ::= expr AND expr */
+ -3, /* (247) expr ::= expr OR expr */
+ -3, /* (248) expr ::= expr PLUS expr */
+ -3, /* (249) expr ::= expr MINUS expr */
+ -3, /* (250) expr ::= expr STAR expr */
+ -3, /* (251) expr ::= expr SLASH expr */
+ -3, /* (252) expr ::= expr REM expr */
+ -3, /* (253) expr ::= expr LIKE expr */
+ -5, /* (254) expr ::= expr IN LP exprlist RP */
+ -3, /* (255) exprlist ::= exprlist COMMA expritem */
+ -1, /* (256) exprlist ::= expritem */
+ -1, /* (257) expritem ::= expr */
+ 0, /* (258) expritem ::= */
+ -3, /* (259) cmd ::= RESET QUERY CACHE */
+ -3, /* (260) cmd ::= SYNCDB ids REPLICA */
+ -7, /* (261) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+ -7, /* (262) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+ -7, /* (263) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
+ -7, /* (264) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+ -7, /* (265) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+ -8, /* (266) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+ -9, /* (267) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+ -7, /* (268) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
+ -7, /* (269) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+ -7, /* (270) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+ -7, /* (271) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
+ -7, /* (272) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+ -7, /* (273) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+ -8, /* (274) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+ -9, /* (275) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
+ -7, /* (276) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
+ -3, /* (277) cmd ::= KILL CONNECTION INTEGER */
+ -5, /* (278) cmd ::= KILL STREAM INTEGER COLON INTEGER */
+ -5, /* (279) cmd ::= KILL QUERY INTEGER COLON INTEGER */
};
static void yy_accept(yyParser*); /* Forward Declaration */
@@ -2060,30 +2379,34 @@ static void yy_accept(yyParser*); /* Forward Declaration */
** only called from one place, optimizing compilers will in-line it, which
** means that the extra parameters have no performance impact.
*/
-static void yy_reduce(
+static YYACTIONTYPE yy_reduce(
yyParser *yypParser, /* The parser */
unsigned int yyruleno, /* Number of the rule by which to reduce */
int yyLookahead, /* Lookahead token, or YYNOCODE if none */
ParseTOKENTYPE yyLookaheadToken /* Value of the lookahead token */
+ ParseCTX_PDECL /* %extra_context */
){
int yygoto; /* The next state */
- int yyact; /* The next action */
+ YYACTIONTYPE yyact; /* The next action */
yyStackEntry *yymsp; /* The top of the parser's stack */
int yysize; /* Amount to pop the stack */
- ParseARG_FETCH;
+ ParseARG_FETCH
(void)yyLookahead;
(void)yyLookaheadToken;
yymsp = yypParser->yytos;
#ifndef NDEBUG
if( yyTraceFILE && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){
- yysize = yyRuleInfo[yyruleno].nrhs;
+ yysize = yyRuleInfoNRhs[yyruleno];
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,
- yyruleno, yyRuleName[yyruleno], yymsp[yysize].stateno);
+ yyruleno, yyRuleName[yyruleno],
+ yyrulenoyytos - yypParser->yystack)>yypParser->yyhwm ){
yypParser->yyhwm++;
@@ -2101,13 +2424,19 @@ static void yy_reduce(
#if YYSTACKDEPTH>0
if( yypParser->yytos>=yypParser->yystackEnd ){
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
if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz-1] ){
if( yyGrowStack(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;
}
@@ -3047,14 +3376,21 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 263: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+ case 263: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
+{
+ yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy193, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
+ setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+ break;
+ case 264: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy193, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 264: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+ case 265: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -3065,7 +3401,7 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 265: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+ case 266: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
@@ -3079,7 +3415,7 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 266: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+ case 267: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
{
yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
@@ -3091,14 +3427,21 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 267: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+ case 268: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
+{
+ yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy193, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1);
+ setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+ break;
+ case 269: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy193, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 268: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+ case 270: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -3109,14 +3452,21 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 269: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+ case 271: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
+{
+ yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy193, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE);
+ setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+ break;
+ case 272: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy193, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 270: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+ case 273: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -3127,7 +3477,7 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 271: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+ case 274: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
@@ -3141,22 +3491,41 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 272: /* cmd ::= KILL CONNECTION INTEGER */
+ case 275: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
+{
+ yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
+
+ toTSDBType(yymsp[-2].minor.yy0.type);
+ SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
+ A = tVariantListAppend(A, &yymsp[0].minor.yy442, -1);
+
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE);
+ setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+ break;
+ case 276: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
+{
+ yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy193, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE);
+ setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+ break;
+ case 277: /* cmd ::= KILL CONNECTION INTEGER */
{setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);}
break;
- case 273: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
+ case 278: /* 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);}
break;
- case 274: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
+ case 279: /* 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);}
break;
default:
break;
/********** End reduce actions ************************************************/
};
- assert( yyrulenostateno = (YYACTIONTYPE)yyact;
yymsp->major = (YYCODETYPE)yygoto;
yyTraceShift(yypParser, yyact, "... then shift");
+ return yyact;
}
/*
@@ -3180,7 +3550,8 @@ static void yy_reduce(
static void yy_parse_failed(
yyParser *yypParser /* The parser */
){
- ParseARG_FETCH;
+ ParseARG_FETCH
+ ParseCTX_FETCH
#ifndef NDEBUG
if( yyTraceFILE ){
fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt);
@@ -3191,7 +3562,8 @@ static void yy_parse_failed(
** parser fails */
/************ Begin %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 */
@@ -3203,7 +3575,8 @@ static void yy_syntax_error(
int yymajor, /* The major type of the error token */
ParseTOKENTYPE yyminor /* The minor type of the error token */
){
- ParseARG_FETCH;
+ ParseARG_FETCH
+ ParseCTX_FETCH
#define TOKEN yyminor
/************ Begin %syntax_error code ****************************************/
@@ -3229,7 +3602,8 @@ static void yy_syntax_error(
assert(len <= outputBufLen);
/************ End %syntax_error code ******************************************/
- ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
+ ParseARG_STORE /* Suppress warning about unused %extra_argument variable */
+ ParseCTX_STORE
}
/*
@@ -3238,7 +3612,8 @@ static void yy_syntax_error(
static void yy_accept(
yyParser *yypParser /* The parser */
){
- ParseARG_FETCH;
+ ParseARG_FETCH
+ ParseCTX_FETCH
#ifndef NDEBUG
if( yyTraceFILE ){
fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt);
@@ -3253,7 +3628,8 @@ static void yy_accept(
/*********** Begin %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.
@@ -3282,45 +3658,47 @@ void Parse(
ParseARG_PDECL /* Optional %extra_argument parameter */
){
YYMINORTYPE yyminorunion;
- unsigned int yyact; /* The parser action. */
+ YYACTIONTYPE yyact; /* The parser action. */
#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY)
int yyendofinput; /* True if we are at the end of input */
#endif
#ifdef YYERRORSYMBOL
int yyerrorhit = 0; /* True if yymajor has invoked an error */
#endif
- yyParser *yypParser; /* The parser */
+ yyParser *yypParser = (yyParser*)yyp; /* The parser */
+ ParseCTX_FETCH
+ ParseARG_STORE
- yypParser = (yyParser*)yyp;
assert( yypParser->yytos!=0 );
#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY)
yyendofinput = (yymajor==0);
#endif
- ParseARG_STORE;
+ yyact = yypParser->yytos->stateno;
#ifndef NDEBUG
if( yyTraceFILE ){
- int stateno = yypParser->yytos->stateno;
- if( stateno < YY_MIN_REDUCE ){
+ if( yyact < YY_MIN_REDUCE ){
fprintf(yyTraceFILE,"%sInput '%s' in state %d\n",
- yyTracePrompt,yyTokenName[yymajor],stateno);
+ yyTracePrompt,yyTokenName[yymajor],yyact);
}else{
fprintf(yyTraceFILE,"%sInput '%s' with pending reduce %d\n",
- yyTracePrompt,yyTokenName[yymajor],stateno-YY_MIN_REDUCE);
+ yyTracePrompt,yyTokenName[yymajor],yyact-YY_MIN_REDUCE);
}
}
#endif
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 ){
- 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 ){
- yy_shift(yypParser,yyact,yymajor,yyminor);
+ yy_shift(yypParser,yyact,(YYCODETYPE)yymajor,yyminor);
#ifndef YYNOERRORRECOVERY
yypParser->yyerrcnt--;
#endif
- yymajor = YYNOCODE;
+ break;
}else if( yyact==YY_ACCEPT_ACTION ){
yypParser->yytos--;
yy_accept(yypParser);
@@ -3371,10 +3749,9 @@ void Parse(
yymajor = YYNOCODE;
}else{
while( yypParser->yytos >= yypParser->yystack
- && yymx != YYERRORSYMBOL
&& (yyact = yy_find_reduce_action(
yypParser->yytos->stateno,
- YYERRORSYMBOL)) >= YY_MIN_REDUCE
+ YYERRORSYMBOL)) > YY_MAX_SHIFTREDUCE
){
yy_pop_parser_stack(yypParser);
}
@@ -3391,6 +3768,8 @@ void Parse(
}
yypParser->yyerrcnt = 3;
yyerrorhit = 1;
+ if( yymajor==YYNOCODE ) break;
+ yyact = yypParser->yytos->stateno;
#elif defined(YYNOERRORRECOVERY)
/* If the YYNOERRORRECOVERY macro is defined, then do not attempt to
** do any kind of error recovery. Instead, simply invoke the syntax
@@ -3401,8 +3780,7 @@ void Parse(
*/
yy_syntax_error(yypParser,yymajor, yyminor);
yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
- yymajor = YYNOCODE;
-
+ break;
#else /* YYERRORSYMBOL is not defined */
/* This is what we do if the grammar does not define ERROR:
**
@@ -3424,10 +3802,10 @@ void Parse(
yypParser->yyerrcnt = -1;
#endif
}
- yymajor = YYNOCODE;
+ break;
#endif
}
- }while( yymajor!=YYNOCODE && yypParser->yytos>yypParser->yystack );
+ }while( yypParser->yytos>yypParser->yystack );
#ifndef NDEBUG
if( yyTraceFILE ){
yyStackEntry *i;
@@ -3442,3 +3820,17 @@ void Parse(
#endif
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
+}
diff --git a/src/sync/src/syncMain.c b/src/sync/src/syncMain.c
index 493d5f117a..d34536543c 100644
--- a/src/sync/src/syncMain.c
+++ b/src/sync/src/syncMain.c
@@ -1150,7 +1150,12 @@ static void syncSetupPeerConnection(SSyncPeer *pPeer) {
pPeer->peerFd = connFd;
pPeer->role = TAOS_SYNC_ROLE_UNSYNCED;
pPeer->pConn = syncAllocateTcpConn(tsTcpPool, pPeer->rid, connFd);
- if (pPeer->isArb) tsArbOnline = 1;
+ if (pPeer->isArb) {
+ tsArbOnline = 1;
+ if (tsArbOnlineTimestamp == TSDB_ARB_DUMMY_TIME) {
+ tsArbOnlineTimestamp = taosGetTimestampMs();
+ }
+ }
} else {
sDebug("%s, failed to setup peer connection to server since %s, try later", pPeer->id, strerror(errno));
taosCloseSocket(connFd);
diff --git a/src/tsdb/CMakeLists.txt b/src/tsdb/CMakeLists.txt
index 31d52aae7d..8080a61a6c 100644
--- a/src/tsdb/CMakeLists.txt
+++ b/src/tsdb/CMakeLists.txt
@@ -6,6 +6,10 @@ AUX_SOURCE_DIRECTORY(src SRC)
ADD_LIBRARY(tsdb ${SRC})
TARGET_LINK_LIBRARIES(tsdb tfs common tutil)
+IF (TD_TSDB_PLUGINS)
+ TARGET_LINK_LIBRARIES(tsdb tsdbPlugins)
+ENDIF ()
+
IF (TD_LINUX)
# Someone has no gtest directory, so comment it
# ADD_SUBDIRECTORY(tests)
diff --git a/src/tsdb/inc/tsdbCommit.h b/src/tsdb/inc/tsdbCommit.h
index 6bd5dc4325..cde728b170 100644
--- a/src/tsdb/inc/tsdbCommit.h
+++ b/src/tsdb/inc/tsdbCommit.h
@@ -29,10 +29,17 @@ typedef struct {
int64_t size;
} SKVRecord;
+#define TSDB_DEFAULT_BLOCK_ROWS(maxRows) ((maxRows)*4 / 5)
+
void tsdbGetRtnSnap(STsdbRepo *pRepo, SRtn *pRtn);
int tsdbEncodeKVRecord(void **buf, SKVRecord *pRecord);
void *tsdbDecodeKVRecord(void *buf, SKVRecord *pRecord);
void *tsdbCommitData(STsdbRepo *pRepo);
+int tsdbApplyRtnOnFSet(STsdbRepo *pRepo, SDFileSet *pSet, SRtn *pRtn);
+int tsdbWriteBlockInfoImpl(SDFile *pHeadf, STable *pTable, SArray *pSupA, SArray *pSubA, void **ppBuf, SBlockIdx *pIdx);
+int tsdbWriteBlockIdx(SDFile *pHeadf, SArray *pIdxA, void **ppBuf);
+int tsdbWriteBlockImpl(STsdbRepo *pRepo, STable *pTable, SDFile *pDFile, SDataCols *pDataCols, SBlock *pBlock,
+ bool isLast, bool isSuper, void **ppBuf, void **ppCBuf);
int tsdbApplyRtn(STsdbRepo *pRepo);
static FORCE_INLINE int tsdbGetFidLevel(int fid, SRtn *pRtn) {
diff --git a/src/tsdb/inc/tsdbCommitQueue.h b/src/tsdb/inc/tsdbCommitQueue.h
index c2353391f9..6342c036b7 100644
--- a/src/tsdb/inc/tsdbCommitQueue.h
+++ b/src/tsdb/inc/tsdbCommitQueue.h
@@ -16,6 +16,8 @@
#ifndef _TD_TSDB_COMMIT_QUEUE_H_
#define _TD_TSDB_COMMIT_QUEUE_H_
-int tsdbScheduleCommit(STsdbRepo *pRepo);
+typedef enum { COMMIT_REQ, COMPACT_REQ } TSDB_REQ_T;
+
+int tsdbScheduleCommit(STsdbRepo *pRepo, TSDB_REQ_T req);
#endif /* _TD_TSDB_COMMIT_QUEUE_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbCompact.h b/src/tsdb/inc/tsdbCompact.h
new file mode 100644
index 0000000000..5a382de5e0
--- /dev/null
+++ b/src/tsdb/inc/tsdbCompact.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+#ifndef _TD_TSDB_COMPACT_H_
+#define _TD_TSDB_COMPACT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *tsdbCompactImpl(STsdbRepo *pRepo);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _TD_TSDB_COMPACT_H_ */
\ No newline at end of file
diff --git a/src/tsdb/inc/tsdbint.h b/src/tsdb/inc/tsdbint.h
index 945b74af35..049c1bdb6e 100644
--- a/src/tsdb/inc/tsdbint.h
+++ b/src/tsdb/inc/tsdbint.h
@@ -64,6 +64,8 @@ extern "C" {
#include "tsdbReadImpl.h"
// Commit
#include "tsdbCommit.h"
+// Compact
+#include "tsdbCompact.h"
// Commit Queue
#include "tsdbCommitQueue.h"
// Main definitions
diff --git a/src/tsdb/src/tsdbCommit.c b/src/tsdb/src/tsdbCommit.c
index f2bbe347bd..82cc6f07f7 100644
--- a/src/tsdb/src/tsdbCommit.c
+++ b/src/tsdb/src/tsdbCommit.c
@@ -51,7 +51,7 @@ typedef struct {
#define TSDB_COMMIT_LAST_FILE(ch) TSDB_DFILE_IN_SET(TSDB_COMMIT_WRITE_FSET(ch), TSDB_FILE_LAST)
#define TSDB_COMMIT_BUF(ch) TSDB_READ_BUF(&((ch)->readh))
#define TSDB_COMMIT_COMP_BUF(ch) TSDB_READ_COMP_BUF(&((ch)->readh))
-#define TSDB_COMMIT_DEFAULT_ROWS(ch) (TSDB_COMMIT_REPO(ch)->config.maxRowsPerFileBlock * 4 / 5)
+#define TSDB_COMMIT_DEFAULT_ROWS(ch) TSDB_DEFAULT_BLOCK_ROWS(TSDB_COMMIT_REPO(ch)->config.maxRowsPerFileBlock)
#define TSDB_COMMIT_TXN_VERSION(ch) FS_TXN_VERSION(REPO_FS(TSDB_COMMIT_REPO(ch)))
static int tsdbCommitMeta(STsdbRepo *pRepo);
@@ -72,7 +72,6 @@ static int tsdbCommitToTable(SCommitH *pCommith, int tid);
static int tsdbSetCommitTable(SCommitH *pCommith, STable *pTable);
static int tsdbComparKeyBlock(const void *arg1, const void *arg2);
static int tsdbWriteBlockInfo(SCommitH *pCommih);
-static int tsdbWriteBlockIdx(SCommitH *pCommih);
static int tsdbCommitMemData(SCommitH *pCommith, SCommitIter *pIter, TSKEY keyLimit, bool toData);
static int tsdbMergeMemData(SCommitH *pCommith, SCommitIter *pIter, int bidx);
static int tsdbMoveBlock(SCommitH *pCommith, int bidx);
@@ -86,7 +85,6 @@ static void tsdbCloseCommitFile(SCommitH *pCommith, bool hasError);
static bool tsdbCanAddSubBlock(SCommitH *pCommith, SBlock *pBlock, SMergeInfo *pInfo);
static void tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIter *pCommitIter, SDataCols *pTarget,
TSKEY maxKey, int maxRows, int8_t update);
-static int tsdbApplyRtnOnFSet(STsdbRepo *pRepo, SDFileSet *pSet, SRtn *pRtn);
void *tsdbCommitData(STsdbRepo *pRepo) {
if (pRepo->imem == NULL) {
@@ -117,6 +115,151 @@ _err:
return NULL;
}
+int tsdbApplyRtnOnFSet(STsdbRepo *pRepo, SDFileSet *pSet, SRtn *pRtn) {
+ SDiskID did;
+ SDFileSet nSet;
+ STsdbFS * pfs = REPO_FS(pRepo);
+ int level;
+
+ ASSERT(pSet->fid >= pRtn->minFid);
+
+ level = tsdbGetFidLevel(pSet->fid, pRtn);
+
+ tfsAllocDisk(level, &(did.level), &(did.id));
+ if (did.level == TFS_UNDECIDED_LEVEL) {
+ terrno = TSDB_CODE_TDB_NO_AVAIL_DISK;
+ return -1;
+ }
+
+ if (did.level > TSDB_FSET_LEVEL(pSet)) {
+ // Need to move the FSET to higher level
+ tsdbInitDFileSet(&nSet, did, REPO_ID(pRepo), pSet->fid, FS_TXN_VERSION(pfs));
+
+ if (tsdbCopyDFileSet(pSet, &nSet) < 0) {
+ tsdbError("vgId:%d failed to copy FSET %d from level %d to level %d since %s", REPO_ID(pRepo), pSet->fid,
+ TSDB_FSET_LEVEL(pSet), did.level, tstrerror(terrno));
+ return -1;
+ }
+
+ if (tsdbUpdateDFileSet(pfs, &nSet) < 0) {
+ return -1;
+ }
+
+ tsdbInfo("vgId:%d FSET %d is copied from level %d disk id %d to level %d disk id %d", REPO_ID(pRepo), pSet->fid,
+ TSDB_FSET_LEVEL(pSet), TSDB_FSET_ID(pSet), did.level, did.id);
+ } else {
+ // On a correct level
+ if (tsdbUpdateDFileSet(pfs, pSet) < 0) {
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+int tsdbWriteBlockInfoImpl(SDFile *pHeadf, STable *pTable, SArray *pSupA, SArray *pSubA, void **ppBuf,
+ SBlockIdx *pIdx) {
+ size_t nSupBlocks;
+ size_t nSubBlocks;
+ uint32_t tlen;
+ SBlockInfo *pBlkInfo;
+ int64_t offset;
+ SBlock * pBlock;
+
+ memset(pIdx, 0, sizeof(*pIdx));
+
+ nSupBlocks = taosArrayGetSize(pSupA);
+ nSubBlocks = (pSubA == NULL) ? 0 : taosArrayGetSize(pSubA);
+
+ if (nSupBlocks <= 0) {
+ // No data (data all deleted)
+ return 0;
+ }
+
+ tlen = (uint32_t)(sizeof(SBlockInfo) + sizeof(SBlock) * (nSupBlocks + nSubBlocks) + sizeof(TSCKSUM));
+ if (tsdbMakeRoom(ppBuf, tlen) < 0) return -1;
+ pBlkInfo = *ppBuf;
+
+ pBlkInfo->delimiter = TSDB_FILE_DELIMITER;
+ pBlkInfo->tid = TABLE_TID(pTable);
+ pBlkInfo->uid = TABLE_UID(pTable);
+
+ memcpy((void *)(pBlkInfo->blocks), taosArrayGet(pSupA, 0), nSupBlocks * sizeof(SBlock));
+ if (nSubBlocks > 0) {
+ memcpy((void *)(pBlkInfo->blocks + nSupBlocks), taosArrayGet(pSubA, 0), nSubBlocks * sizeof(SBlock));
+
+ for (int i = 0; i < nSupBlocks; i++) {
+ pBlock = pBlkInfo->blocks + i;
+
+ if (pBlock->numOfSubBlocks > 1) {
+ pBlock->offset += (sizeof(SBlockInfo) + sizeof(SBlock) * nSupBlocks);
+ }
+ }
+ }
+
+ taosCalcChecksumAppend(0, (uint8_t *)pBlkInfo, tlen);
+
+ if (tsdbAppendDFile(pHeadf, (void *)pBlkInfo, tlen, &offset) < 0) {
+ return -1;
+ }
+
+ tsdbUpdateDFileMagic(pHeadf, POINTER_SHIFT(pBlkInfo, tlen - sizeof(TSCKSUM)));
+
+ // Set pIdx
+ pBlock = taosArrayGetLast(pSupA);
+
+ pIdx->tid = TABLE_TID(pTable);
+ pIdx->uid = TABLE_UID(pTable);
+ pIdx->hasLast = pBlock->last ? 1 : 0;
+ pIdx->maxKey = pBlock->keyLast;
+ pIdx->numOfBlocks = (uint32_t)nSupBlocks;
+ pIdx->len = tlen;
+ pIdx->offset = (uint32_t)offset;
+
+ return 0;
+}
+
+int tsdbWriteBlockIdx(SDFile *pHeadf, SArray *pIdxA, void **ppBuf) {
+ SBlockIdx *pBlkIdx;
+ size_t nidx = taosArrayGetSize(pIdxA);
+ int tlen = 0, size;
+ int64_t offset;
+
+ if (nidx <= 0) {
+ // All data are deleted
+ pHeadf->info.offset = 0;
+ pHeadf->info.len = 0;
+ return 0;
+ }
+
+ for (size_t i = 0; i < nidx; i++) {
+ pBlkIdx = (SBlockIdx *)taosArrayGet(pIdxA, i);
+
+ size = tsdbEncodeSBlockIdx(NULL, pBlkIdx);
+ if (tsdbMakeRoom(ppBuf, tlen + size) < 0) return -1;
+
+ void *ptr = POINTER_SHIFT(*ppBuf, tlen);
+ tsdbEncodeSBlockIdx(&ptr, pBlkIdx);
+
+ tlen += size;
+ }
+
+ tlen += sizeof(TSCKSUM);
+ if (tsdbMakeRoom(ppBuf, tlen) < 0) return -1;
+ taosCalcChecksumAppend(0, (uint8_t *)(*ppBuf), tlen);
+
+ if (tsdbAppendDFile(pHeadf, *ppBuf, tlen, &offset) < tlen) {
+ return -1;
+ }
+
+ tsdbUpdateDFileMagic(pHeadf, POINTER_SHIFT(*ppBuf, tlen - sizeof(TSCKSUM)));
+ pHeadf->info.offset = (uint32_t)offset;
+ pHeadf->info.len = tlen;
+
+ return 0;
+}
+
+
// =================== Commit Meta Data
static int tsdbCommitMeta(STsdbRepo *pRepo) {
STsdbFS * pfs = REPO_FS(pRepo);
@@ -446,7 +589,8 @@ static int tsdbCommitToFile(SCommitH *pCommith, SDFileSet *pSet, int fid) {
}
}
- if (tsdbWriteBlockIdx(pCommith) < 0) {
+ if (tsdbWriteBlockIdx(TSDB_COMMIT_HEAD_FILE(pCommith), pCommith->aBlkIdx, (void **)(&(TSDB_COMMIT_BUF(pCommith)))) <
+ 0) {
tsdbError("vgId:%d failed to write SBlockIdx part to FSET %d since %s", REPO_ID(pRepo), fid, tstrerror(terrno));
tsdbCloseCommitFile(pCommith, true);
// revert the file change
@@ -754,23 +898,21 @@ static int tsdbComparKeyBlock(const void *arg1, const void *arg2) {
}
}
-static int tsdbWriteBlock(SCommitH *pCommith, SDFile *pDFile, SDataCols *pDataCols, SBlock *pBlock, bool isLast,
- bool isSuper) {
- STsdbRepo * pRepo = TSDB_COMMIT_REPO(pCommith);
+int tsdbWriteBlockImpl(STsdbRepo *pRepo, STable *pTable, SDFile *pDFile, SDataCols *pDataCols, SBlock *pBlock,
+ bool isLast, bool isSuper, void **ppBuf, void **ppCBuf) {
STsdbCfg * pCfg = REPO_CFG(pRepo);
SBlockData *pBlockData;
int64_t offset = 0;
- STable * pTable = TSDB_COMMIT_TABLE(pCommith);
int rowsToWrite = pDataCols->numOfRows;
ASSERT(rowsToWrite > 0 && rowsToWrite <= pCfg->maxRowsPerFileBlock);
ASSERT((!isLast) || rowsToWrite < pCfg->minRowsPerFileBlock);
// Make buffer space
- if (tsdbMakeRoom((void **)(&TSDB_COMMIT_BUF(pCommith)), TSDB_BLOCK_STATIS_SIZE(pDataCols->numOfCols)) < 0) {
+ if (tsdbMakeRoom(ppBuf, TSDB_BLOCK_STATIS_SIZE(pDataCols->numOfCols)) < 0) {
return -1;
}
- pBlockData = (SBlockData *)TSDB_COMMIT_BUF(pCommith);
+ pBlockData = (SBlockData *)(*ppBuf);
// Get # of cols not all NULL(not including key column)
int nColsNotAllNull = 0;
@@ -816,23 +958,23 @@ static int tsdbWriteBlock(SCommitH *pCommith, SDFile *pDFile, SDataCols *pDataCo
void * tptr;
// Make room
- if (tsdbMakeRoom((void **)(&TSDB_COMMIT_BUF(pCommith)), lsize + tlen + COMP_OVERFLOW_BYTES + sizeof(TSCKSUM)) < 0) {
+ if (tsdbMakeRoom(ppBuf, lsize + tlen + COMP_OVERFLOW_BYTES + sizeof(TSCKSUM)) < 0) {
return -1;
}
- pBlockData = (SBlockData *)TSDB_COMMIT_BUF(pCommith);
+ pBlockData = (SBlockData *)(*ppBuf);
pBlockCol = pBlockData->cols + tcol;
tptr = POINTER_SHIFT(pBlockData, lsize);
if (pCfg->compression == TWO_STAGE_COMP &&
- tsdbMakeRoom((void **)(&TSDB_COMMIT_COMP_BUF(pCommith)), tlen + COMP_OVERFLOW_BYTES) < 0) {
+ tsdbMakeRoom(ppCBuf, tlen + COMP_OVERFLOW_BYTES) < 0) {
return -1;
}
// Compress or just copy
if (pCfg->compression) {
flen = (*(tDataTypes[pDataCol->type].compFunc))((char *)pDataCol->pData, tlen, rowsToWrite, tptr,
- tlen + COMP_OVERFLOW_BYTES, pCfg->compression,
- TSDB_COMMIT_COMP_BUF(pCommith), tlen + COMP_OVERFLOW_BYTES);
+ tlen + COMP_OVERFLOW_BYTES, pCfg->compression, *ppCBuf,
+ tlen + COMP_OVERFLOW_BYTES);
} else {
flen = tlen;
memcpy(tptr, pDataCol->pData, flen);
@@ -888,68 +1030,27 @@ static int tsdbWriteBlock(SCommitH *pCommith, SDFile *pDFile, SDataCols *pDataCo
return 0;
}
+static int tsdbWriteBlock(SCommitH *pCommith, SDFile *pDFile, SDataCols *pDataCols, SBlock *pBlock, bool isLast,
+ bool isSuper) {
+ return tsdbWriteBlockImpl(TSDB_COMMIT_REPO(pCommith), TSDB_COMMIT_TABLE(pCommith), pDFile, pDataCols, pBlock, isLast,
+ isSuper, (void **)(&(TSDB_COMMIT_BUF(pCommith))),
+ (void **)(&(TSDB_COMMIT_COMP_BUF(pCommith))));
+}
+
+
static int tsdbWriteBlockInfo(SCommitH *pCommih) {
- SDFile * pHeadf = TSDB_COMMIT_HEAD_FILE(pCommih);
- SBlockIdx blkIdx;
- STable * pTable = TSDB_COMMIT_TABLE(pCommih);
- SBlock * pBlock;
- size_t nSupBlocks;
- size_t nSubBlocks;
- uint32_t tlen;
- SBlockInfo *pBlkInfo;
- int64_t offset;
+ SDFile * pHeadf = TSDB_COMMIT_HEAD_FILE(pCommih);
+ SBlockIdx blkIdx;
+ STable * pTable = TSDB_COMMIT_TABLE(pCommih);
- nSupBlocks = taosArrayGetSize(pCommih->aSupBlk);
- nSubBlocks = taosArrayGetSize(pCommih->aSubBlk);
-
- if (nSupBlocks <= 0) {
- // No data (data all deleted)
- return 0;
- }
-
- tlen = (uint32_t)(sizeof(SBlockInfo) + sizeof(SBlock) * (nSupBlocks + nSubBlocks) + sizeof(TSCKSUM));
-
- // Write SBlockInfo part
- if (tsdbMakeRoom((void **)(&(TSDB_COMMIT_BUF(pCommih))), tlen) < 0) return -1;
- pBlkInfo = TSDB_COMMIT_BUF(pCommih);
-
- pBlkInfo->delimiter = TSDB_FILE_DELIMITER;
- pBlkInfo->tid = TABLE_TID(pTable);
- pBlkInfo->uid = TABLE_UID(pTable);
-
- memcpy((void *)(pBlkInfo->blocks), taosArrayGet(pCommih->aSupBlk, 0), nSupBlocks * sizeof(SBlock));
- if (nSubBlocks > 0) {
- memcpy((void *)(pBlkInfo->blocks + nSupBlocks), taosArrayGet(pCommih->aSubBlk, 0), nSubBlocks * sizeof(SBlock));
-
- for (int i = 0; i < nSupBlocks; i++) {
- pBlock = pBlkInfo->blocks + i;
-
- if (pBlock->numOfSubBlocks > 1) {
- pBlock->offset += (sizeof(SBlockInfo) + sizeof(SBlock) * nSupBlocks);
- }
- }
- }
-
- taosCalcChecksumAppend(0, (uint8_t *)pBlkInfo, tlen);
-
- if (tsdbAppendDFile(pHeadf, TSDB_COMMIT_BUF(pCommih), tlen, &offset) < 0) {
+ if (tsdbWriteBlockInfoImpl(pHeadf, pTable, pCommih->aSupBlk, pCommih->aSubBlk, (void **)(&(TSDB_COMMIT_BUF(pCommih))),
+ &blkIdx) < 0) {
return -1;
}
- tsdbUpdateDFileMagic(pHeadf, POINTER_SHIFT(pBlkInfo, tlen - sizeof(TSCKSUM)));
-
- // Set blkIdx
- pBlock = taosArrayGet(pCommih->aSupBlk, nSupBlocks - 1);
-
- blkIdx.tid = TABLE_TID(pTable);
- blkIdx.uid = TABLE_UID(pTable);
- blkIdx.hasLast = pBlock->last ? 1 : 0;
- blkIdx.maxKey = pBlock->keyLast;
- blkIdx.numOfBlocks = (uint32_t)nSupBlocks;
- blkIdx.len = tlen;
- blkIdx.offset = (uint32_t)offset;
-
- ASSERT(blkIdx.numOfBlocks > 0);
+ if (blkIdx.numOfBlocks == 0) {
+ return 0;
+ }
if (taosArrayPush(pCommih->aBlkIdx, (void *)(&blkIdx)) == NULL) {
terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
@@ -959,49 +1060,6 @@ static int tsdbWriteBlockInfo(SCommitH *pCommih) {
return 0;
}
-static int tsdbWriteBlockIdx(SCommitH *pCommih) {
- SBlockIdx *pBlkIdx = NULL;
- SDFile * pHeadf = TSDB_COMMIT_HEAD_FILE(pCommih);
- size_t nidx = taosArrayGetSize(pCommih->aBlkIdx);
- int tlen = 0, size = 0;
- int64_t offset = 0;
-
- if (nidx <= 0) {
- // All data are deleted
- pHeadf->info.offset = 0;
- pHeadf->info.len = 0;
- return 0;
- }
-
- for (size_t i = 0; i < nidx; i++) {
- pBlkIdx = (SBlockIdx *)taosArrayGet(pCommih->aBlkIdx, i);
-
- size = tsdbEncodeSBlockIdx(NULL, pBlkIdx);
- if (tsdbMakeRoom((void **)(&TSDB_COMMIT_BUF(pCommih)), tlen + size) < 0) return -1;
-
- void *ptr = POINTER_SHIFT(TSDB_COMMIT_BUF(pCommih), tlen);
- tsdbEncodeSBlockIdx(&ptr, pBlkIdx);
-
- tlen += size;
- }
-
- tlen += sizeof(TSCKSUM);
- if (tsdbMakeRoom((void **)(&TSDB_COMMIT_BUF(pCommih)), tlen) < 0) return -1;
- taosCalcChecksumAppend(0, (uint8_t *)TSDB_COMMIT_BUF(pCommih), tlen);
-
- if (tsdbAppendDFile(pHeadf, TSDB_COMMIT_BUF(pCommih), tlen, &offset) < tlen) {
- tsdbError("vgId:%d failed to write block index part to file %s since %s", TSDB_COMMIT_REPO_ID(pCommih),
- TSDB_FILE_FULL_NAME(pHeadf), tstrerror(terrno));
- return -1;
- }
-
- tsdbUpdateDFileMagic(pHeadf, POINTER_SHIFT(TSDB_COMMIT_BUF(pCommih), tlen - sizeof(TSCKSUM)));
- pHeadf->info.offset = (uint32_t)offset;
- pHeadf->info.len = tlen;
-
- return 0;
-}
-
static int tsdbCommitMemData(SCommitH *pCommith, SCommitIter *pIter, TSKEY keyLimit, bool toData) {
STsdbRepo *pRepo = TSDB_COMMIT_REPO(pCommith);
STsdbCfg * pCfg = REPO_CFG(pRepo);
@@ -1454,45 +1512,3 @@ int tsdbApplyRtn(STsdbRepo *pRepo) {
return 0;
}
-
-static int tsdbApplyRtnOnFSet(STsdbRepo *pRepo, SDFileSet *pSet, SRtn *pRtn) {
- SDiskID did;
- SDFileSet nSet;
- STsdbFS * pfs = REPO_FS(pRepo);
- int level;
-
- ASSERT(pSet->fid >= pRtn->minFid);
-
- level = tsdbGetFidLevel(pSet->fid, pRtn);
-
- tfsAllocDisk(level, &(did.level), &(did.id));
- if (did.level == TFS_UNDECIDED_LEVEL) {
- terrno = TSDB_CODE_TDB_NO_AVAIL_DISK;
- return -1;
- }
-
- if (did.level > TSDB_FSET_LEVEL(pSet)) {
- // Need to move the FSET to higher level
- tsdbInitDFileSet(&nSet, did, REPO_ID(pRepo), pSet->fid, FS_TXN_VERSION(pfs));
-
- if (tsdbCopyDFileSet(pSet, &nSet) < 0) {
- tsdbError("vgId:%d failed to copy FSET %d from level %d to level %d since %s", REPO_ID(pRepo), pSet->fid,
- TSDB_FSET_LEVEL(pSet), did.level, tstrerror(terrno));
- return -1;
- }
-
- if (tsdbUpdateDFileSet(pfs, &nSet) < 0) {
- return -1;
- }
-
- tsdbInfo("vgId:%d FSET %d is copied from level %d disk id %d to level %d disk id %d", REPO_ID(pRepo), pSet->fid,
- TSDB_FSET_LEVEL(pSet), TSDB_FSET_ID(pSet), did.level, did.id);
- } else {
- // On a correct level
- if (tsdbUpdateDFileSet(pfs, pSet) < 0) {
- return -1;
- }
- }
-
- return 0;
-}
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbCommitQueue.c b/src/tsdb/src/tsdbCommitQueue.c
index abea79bc4f..bb844e8e83 100644
--- a/src/tsdb/src/tsdbCommitQueue.c
+++ b/src/tsdb/src/tsdbCommitQueue.c
@@ -26,8 +26,9 @@ typedef struct {
} SCommitQueue;
typedef struct {
+ TSDB_REQ_T req;
STsdbRepo *pRepo;
-} SCommitReq;
+} SReq;
static void *tsdbLoopCommit(void *arg);
@@ -90,16 +91,17 @@ void tsdbDestroyCommitQueue() {
pthread_mutex_destroy(&(pQueue->lock));
}
-int tsdbScheduleCommit(STsdbRepo *pRepo) {
+int tsdbScheduleCommit(STsdbRepo *pRepo, TSDB_REQ_T req) {
SCommitQueue *pQueue = &tsCommitQueue;
- SListNode *pNode = (SListNode *)calloc(1, sizeof(SListNode) + sizeof(SCommitReq));
+ SListNode *pNode = (SListNode *)calloc(1, sizeof(SListNode) + sizeof(SReq));
if (pNode == NULL) {
terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
return -1;
}
- ((SCommitReq *)pNode->data)->pRepo = pRepo;
+ ((SReq *)pNode->data)->req = req;
+ ((SReq *)pNode->data)->pRepo = pRepo;
pthread_mutex_lock(&(pQueue->lock));
@@ -154,6 +156,7 @@ static void *tsdbLoopCommit(void *arg) {
SCommitQueue *pQueue = &tsCommitQueue;
SListNode * pNode = NULL;
STsdbRepo * pRepo = NULL;
+ TSDB_REQ_T req;
while (true) {
pthread_mutex_lock(&(pQueue->lock));
@@ -174,14 +177,22 @@ static void *tsdbLoopCommit(void *arg) {
pthread_mutex_unlock(&(pQueue->lock));
- pRepo = ((SCommitReq *)pNode->data)->pRepo;
+ req = ((SReq *)pNode->data)->req;
+ pRepo = ((SReq *)pNode->data)->pRepo;
// check if need to apply new config
- if (pRepo->config_changed) {
+ if (pRepo->config_changed) {
tsdbApplyRepoConfig(pRepo);
}
- tsdbCommitData(pRepo);
+ if (req == COMMIT_REQ) {
+ tsdbCommitData(pRepo);
+ } else if (req == COMPACT_REQ) {
+ tsdbCompactImpl(pRepo);
+ } else {
+ ASSERT(0);
+ }
+
listNodeFree(pNode);
}
diff --git a/src/tsdb/src/tsdbCompact.c b/src/tsdb/src/tsdbCompact.c
index 6dea4a4e57..635bba388a 100644
--- a/src/tsdb/src/tsdbCompact.c
+++ b/src/tsdb/src/tsdbCompact.c
@@ -11,4 +11,12 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- */
\ No newline at end of file
+ */
+#include "tsdb.h"
+
+#ifndef _TSDB_PLUGINS
+
+int tsdbCompact(STsdbRepo *pRepo) { return 0; }
+void *tsdbCompactImpl(STsdbRepo *pRepo) { return NULL; }
+
+#endif
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
index 79dbb8be5d..bee5600af7 100644
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -288,7 +288,7 @@ int tsdbAsyncCommit(STsdbRepo *pRepo) {
if (tsdbLockRepo(pRepo) < 0) return -1;
pRepo->imem = pRepo->mem;
pRepo->mem = NULL;
- tsdbScheduleCommit(pRepo);
+ tsdbScheduleCommit(pRepo, COMMIT_REQ);
if (tsdbUnlockRepo(pRepo) < 0) return -1;
return 0;
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 324a7c79c5..8174698197 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -68,7 +68,7 @@ int tsdbCreateTable(STsdbRepo *repo, STableCfg *pCfg) {
TABLE_CHAR_NAME(pMeta->tables[tid]), TABLE_TID(pMeta->tables[tid]), TABLE_UID(pMeta->tables[tid]));
return 0;
} else {
- tsdbError("vgId:%d table %s at tid %d uid %" PRIu64
+ tsdbInfo("vgId:%d table %s at tid %d uid %" PRIu64
" exists, replace it with new table, this can be not reasonable",
REPO_ID(pRepo), TABLE_CHAR_NAME(pMeta->tables[tid]), TABLE_TID(pMeta->tables[tid]),
TABLE_UID(pMeta->tables[tid]));
@@ -1055,10 +1055,7 @@ static int tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable) {
STable *pSTable = pTable->pSuper;
ASSERT(pSTable != NULL);
- STSchema *pSchema = tsdbGetTableTagSchema(pTable);
- STColumn *pCol = schemaColAt(pSchema, DEFAULT_TAG_INDEX_COLUMN);
-
- char * key = tdGetKVRowValOfCol(pTable->tagVal, pCol->colId);
+ char* key = getTagIndexKey(pTable);
SArray *res = tSkipListGet(pSTable->pIndex, key);
size_t size = taosArrayGetSize(res);
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index fd2b403184..1545d44395 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -368,40 +368,39 @@ static STsdbQueryHandle* tsdbQueryTablesImpl(STsdbRepo* tsdb, STsdbQueryCond* pC
goto out_of_memory;
}
- assert(pCond != NULL && pCond->numOfCols > 0 && pMemRef != NULL);
+ assert(pCond != NULL && pMemRef != NULL);
if (ASCENDING_TRAVERSE(pCond->order)) {
assert(pQueryHandle->window.skey <= pQueryHandle->window.ekey);
} else {
assert(pQueryHandle->window.skey >= pQueryHandle->window.ekey);
}
-
- // allocate buffer in order to load data blocks from file
- pQueryHandle->statis = calloc(pCond->numOfCols, sizeof(SDataStatis));
- if (pQueryHandle->statis == NULL) {
- goto out_of_memory;
- }
-
- pQueryHandle->pColumns = taosArrayInit(pCond->numOfCols, sizeof(SColumnInfoData)); // todo: use list instead of array?
- if (pQueryHandle->pColumns == NULL) {
- goto out_of_memory;
- }
-
- for (int32_t i = 0; i < pCond->numOfCols; ++i) {
- SColumnInfoData colInfo = {{0}, 0};
-
- colInfo.info = pCond->colList[i];
- colInfo.pData = calloc(1, EXTRA_BYTES + pQueryHandle->outputCapacity * pCond->colList[i].bytes);
- if (colInfo.pData == NULL) {
+ if (pCond->numOfCols > 0) {
+ // allocate buffer in order to load data blocks from file
+ pQueryHandle->statis = calloc(pCond->numOfCols, sizeof(SDataStatis));
+ if (pQueryHandle->statis == NULL) {
goto out_of_memory;
}
- taosArrayPush(pQueryHandle->pColumns, &colInfo);
- pQueryHandle->statis[i].colId = colInfo.info.colId;
- }
- if (pCond->numOfCols > 0) {
+ pQueryHandle->pColumns =
+ taosArrayInit(pCond->numOfCols, sizeof(SColumnInfoData)); // todo: use list instead of array?
+ if (pQueryHandle->pColumns == NULL) {
+ goto out_of_memory;
+ }
+
+ for (int32_t i = 0; i < pCond->numOfCols; ++i) {
+ SColumnInfoData colInfo = {{0}, 0};
+
+ colInfo.info = pCond->colList[i];
+ colInfo.pData = calloc(1, EXTRA_BYTES + pQueryHandle->outputCapacity * pCond->colList[i].bytes);
+ if (colInfo.pData == NULL) {
+ goto out_of_memory;
+ }
+ taosArrayPush(pQueryHandle->pColumns, &colInfo);
+ pQueryHandle->statis[i].colId = colInfo.info.colId;
+ }
+
pQueryHandle->defaultLoadColumn = getDefaultLoadColumns(pQueryHandle, true);
}
-
STsdbMeta* pMeta = tsdbGetMeta(tsdb);
assert(pMeta != NULL);
diff --git a/src/tsdb/src/tsdbReadImpl.c b/src/tsdb/src/tsdbReadImpl.c
index 7212ae1636..dd14dc700f 100644
--- a/src/tsdb/src/tsdbReadImpl.c
+++ b/src/tsdb/src/tsdbReadImpl.c
@@ -258,7 +258,7 @@ int tsdbLoadBlockData(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo) {
for (int i = 1; i < pBlock->numOfSubBlocks; i++) {
iBlock++;
if (tsdbLoadBlockDataImpl(pReadh, iBlock, pReadh->pDCols[1]) < 0) return -1;
- if (tdMergeDataCols(pReadh->pDCols[0], pReadh->pDCols[1], pReadh->pDCols[1]->numOfRows) < 0) return -1;
+ if (tdMergeDataCols(pReadh->pDCols[0], pReadh->pDCols[1], pReadh->pDCols[1]->numOfRows, NULL) < 0) return -1;
}
ASSERT(pReadh->pDCols[0]->numOfRows == pBlock->numOfRows);
@@ -284,7 +284,7 @@ int tsdbLoadBlockDataCols(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo,
for (int i = 1; i < pBlock->numOfSubBlocks; i++) {
iBlock++;
if (tsdbLoadBlockDataColsImpl(pReadh, iBlock, pReadh->pDCols[1], colIds, numOfColsIds) < 0) return -1;
- if (tdMergeDataCols(pReadh->pDCols[0], pReadh->pDCols[1], pReadh->pDCols[1]->numOfRows) < 0) return -1;
+ if (tdMergeDataCols(pReadh->pDCols[0], pReadh->pDCols[1], pReadh->pDCols[1]->numOfRows, NULL) < 0) return -1;
}
ASSERT(pReadh->pDCols[0]->numOfRows == pBlock->numOfRows);
diff --git a/src/util/inc/ttoken.h b/src/util/inc/ttoken.h
index 3bf030a9eb..f62329183f 100644
--- a/src/util/inc/ttoken.h
+++ b/src/util/inc/ttoken.h
@@ -183,6 +183,7 @@ void taosCleanupKeywordsTable();
SStrToken tscReplaceStrToken(char **str, SStrToken *token, const char* newToken);
+SStrToken taosTokenDup(SStrToken* pToken, char* buf, int32_t len);
#ifdef __cplusplus
}
diff --git a/src/util/src/terror.c b/src/util/src/terror.c
index 887b231ec6..382f872486 100644
--- a/src/util/src/terror.c
+++ b/src/util/src/terror.c
@@ -224,6 +224,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_VND_IS_FULL, "Database memory is fu
TAOS_DEFINE_ERROR(TSDB_CODE_VND_IS_FLOWCTRL, "Database memory is full for waiting commit")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_IS_DROPPING, "Database is dropping")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_IS_BALANCING, "Database is balancing")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_IS_CLOSING, "Database is closing")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_NOT_SYNCED, "Database suspended")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_NO_WRITE_AUTH, "Database write operation denied")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_IS_SYNCING, "Database is syncing")
diff --git a/src/util/src/ttokenizer.c b/src/util/src/ttokenizer.c
index e9bbda1f9b..7026fcda0f 100644
--- a/src/util/src/ttokenizer.c
+++ b/src/util/src/ttokenizer.c
@@ -218,7 +218,8 @@ static SKeyword keywordTable[] = {
{"DISTINCT", TK_DISTINCT},
{"PARTITIONS", TK_PARTITIONS},
{"TOPIC", TK_TOPIC},
- {"TOPICS", TK_TOPICS}
+ {"TOPICS", TK_TOPICS},
+ {"MODIFY", TK_MODIFY}
};
static const char isIdChar[] = {
@@ -674,3 +675,15 @@ void taosCleanupKeywordsTable() {
taosHashCleanup(m);
}
}
+
+SStrToken taosTokenDup(SStrToken* pToken, char* buf, int32_t len) {
+ assert(pToken != NULL && buf != NULL);
+ SStrToken token = *pToken;
+ token.z = buf;
+
+ assert(len > token.n);
+ strncpy(token.z, pToken->z, pToken->n);
+ token.z[token.n] = 0;
+
+ return token;
+}
diff --git a/src/vnode/src/vnodeMgmt.c b/src/vnode/src/vnodeMgmt.c
index 32f9532138..7e6022fc87 100644
--- a/src/vnode/src/vnodeMgmt.c
+++ b/src/vnode/src/vnodeMgmt.c
@@ -91,18 +91,18 @@ static void vnodeIncRef(void *ptNode) {
}
void *vnodeAcquire(int32_t vgId) {
- SVnodeObj **ppVnode = NULL;
+ SVnodeObj *pVnode = NULL;
if (tsVnodesHash != NULL) {
- ppVnode = taosHashGetClone(tsVnodesHash, &vgId, sizeof(int32_t), vnodeIncRef, NULL, sizeof(void *));
+ taosHashGetClone(tsVnodesHash, &vgId, sizeof(int32_t), vnodeIncRef, &pVnode, sizeof(void *));
}
- if (ppVnode == NULL || *ppVnode == NULL) {
+ if (pVnode == NULL) {
terrno = TSDB_CODE_VND_INVALID_VGROUP_ID;
vDebug("vgId:%d, not exist", vgId);
return NULL;
}
- return *ppVnode;
+ return pVnode;
}
void vnodeRelease(void *vparam) {
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 16089c8e91..555eda6d13 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -303,6 +303,17 @@ static int32_t vnodeWriteToWQueueImp(SVWriteMsg *pWrite) {
}
int32_t vnodeWriteToWQueue(void *vparam, void *wparam, int32_t qtype, void *rparam) {
+ SVnodeObj *pVnode = vparam;
+ if (qtype == TAOS_QTYPE_RPC) {
+ if (!vnodeInReadyStatus(pVnode)) {
+ return TSDB_CODE_APP_NOT_READY; // it may be in deleting or closing state
+ }
+
+ if (pVnode->role != TAOS_SYNC_ROLE_MASTER) {
+ return TSDB_CODE_APP_NOT_READY;
+ }
+ }
+
SVWriteMsg *pWrite = vnodeBuildVWriteMsg(vparam, wparam, qtype, rparam);
if (pWrite == NULL) {
assert(terrno != 0);
diff --git a/tests/pytest/alter/alter_cacheLastRow.py b/tests/pytest/alter/alter_cacheLastRow.py
new file mode 100644
index 0000000000..36a2864d0f
--- /dev/null
+++ b/tests/pytest/alter/alter_cacheLastRow.py
@@ -0,0 +1,109 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import tdDnodes
+from datetime import datetime
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ def getBuildPath(self):
+ selfPath = os.path.dirname(os.path.realpath(__file__))
+
+ if ("community" in selfPath):
+ projPath = selfPath[:selfPath.find("community")]
+ else:
+ projPath = selfPath[:selfPath.find("tests")]
+
+ for root, dirs, files in os.walk(projPath):
+ if ("taosd" in files):
+ rootRealPath = os.path.dirname(os.path.realpath(root))
+ if ("packaging" not in rootRealPath):
+ buildPath = root[:len(root) - len("/build/bin")]
+ break
+ return buildPath
+
+ def run(self):
+ tdSql.prepare()
+ tdSql.query('show databases')
+ tdSql.checkData(0,15,0)
+ buildPath = self.getBuildPath()
+ if (buildPath == ""):
+ tdLog.exit("taosd not found!")
+ else:
+ tdLog.info("taosd found in %s" % buildPath)
+ binPath = buildPath + "/build/bin/"
+
+ #write 5M rows into db, then restart to force the data move into disk.
+ #create 500 tables
+ os.system("%staosdemo -f tools/taosdemoAllTest/insert_5M_rows.json -y " % binPath)
+ tdDnodes.stop(1)
+ tdDnodes.start(1)
+ tdSql.execute('use db')
+
+ #prepare to query 500 tables last_row()
+ tableName = []
+ for i in range(500):
+ tableName.append(f"stb_{i}")
+ tdSql.execute('use db')
+ lastRow_Off_start = datetime.now()
+
+ slow = 0 #count time where lastRow on is slower
+ for i in range(5):
+ #switch lastRow to off and check
+ tdSql.execute('alter database db cachelast 0')
+ tdSql.query('show databases')
+ tdSql.checkData(0,15,0)
+
+ #run last_row(*) query 500 times
+ for i in range(500):
+ tdSql.execute(f'SELECT LAST_ROW(*) FROM {tableName[i]}')
+ lastRow_Off_end = datetime.now()
+
+ tdLog.debug(f'time used:{lastRow_Off_end-lastRow_Off_start}')
+
+ #switch lastRow to on and check
+ tdSql.execute('alter database db cachelast 1')
+ tdSql.query('show databases')
+ tdSql.checkData(0,15,1)
+
+ #run last_row(*) query 500 times
+ tdSql.execute('use db')
+ lastRow_On_start = datetime.now()
+ for i in range(500):
+ tdSql.execute(f'SELECT LAST_ROW(*) FROM {tableName[i]}')
+ lastRow_On_end = datetime.now()
+
+ tdLog.debug(f'time used:{lastRow_On_end-lastRow_On_start}')
+
+ #check which one used more time
+ if (lastRow_Off_end-lastRow_Off_start > lastRow_On_end-lastRow_On_start):
+ pass
+ else:
+ slow += 1
+ tdLog.debug(slow)
+ if slow > 1: #tolerance for the first time
+ tdLog.exit('lastRow hot alter failed')
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/crash_gen/crash_gen_main.py b/tests/pytest/crash_gen/crash_gen_main.py
index 644aa79916..b743eee2ef 100755
--- a/tests/pytest/crash_gen/crash_gen_main.py
+++ b/tests/pytest/crash_gen/crash_gen_main.py
@@ -37,6 +37,7 @@ import requests
import gc
import taos
+
from .shared.types import TdColumns, TdTags
# from crash_gen import ServiceManager, TdeInstance, TdeSubProcess
@@ -160,6 +161,7 @@ class WorkerThread:
Logging.debug("[TRD] Thread Coordinator not running any more, worker thread now stopping...")
break
+
# Before we fetch the task and run it, let's ensure we properly "use" the database (not needed any more)
try:
if (Config.getConfig().per_thread_db_connection): # most likely TRUE
@@ -1362,9 +1364,12 @@ class Task():
Progress.emit(Progress.ACCEPTABLE_ERROR)
self._err = err
else: # not an acceptable error
- errMsg = "[=] Unexpected Taos library exception ({}): errno=0x{:X}, msg: {}, SQL: {}".format(
+ shortTid = threading.get_ident() % 10000
+ errMsg = "[=] Unexpected Taos library exception ({}): errno=0x{:X}, thread={}, msg: {}, SQL: {}".format(
self.__class__.__name__,
- errno2, err, wt.getDbConn().getLastSql())
+ errno2,
+ shortTid,
+ err, wt.getDbConn().getLastSql())
self.logDebug(errMsg)
if Config.getConfig().debug:
# raise # so that we see full stack
@@ -1411,21 +1416,31 @@ class Task():
def lockTable(self, ftName): # full table name
# print(" <<" + ftName + '_', end="", flush=True)
- with Task._lock:
- if not ftName in Task._tableLocks:
+ with Task._lock: # SHORT lock! so we only protect lock creation
+ if not ftName in Task._tableLocks: # Create new lock and add to list, if needed
Task._tableLocks[ftName] = threading.Lock()
- Task._tableLocks[ftName].acquire()
+ # No lock protection, anybody can do this any time
+ lock = Task._tableLocks[ftName]
+ # Logging.info("Acquiring lock: {}, {}".format(ftName, lock))
+ lock.acquire()
+ # Logging.info("Acquiring lock successful: {}".format(lock))
def unlockTable(self, ftName):
# print('_' + ftName + ">> ", end="", flush=True)
- with Task._lock:
+ with Task._lock:
if not ftName in self._tableLocks:
raise RuntimeError("Corrupt state, no such lock")
lock = Task._tableLocks[ftName]
if not lock.locked():
raise RuntimeError("Corrupte state, already unlocked")
- lock.release()
+
+ # Important note, we want to protect unlocking under the task level
+ # locking, because we don't want the lock to be deleted (maybe in the futur)
+ # while we unlock it
+ # Logging.info("Releasing lock: {}".format(lock))
+ lock.release()
+ # Logging.info("Releasing lock successful: {}".format(lock))
class ExecutionStats:
@@ -1696,6 +1711,11 @@ class TdSuperTable:
return dbc.query("SELECT * FROM {}.{}".format(self._dbName, self._stName)) > 0
def ensureRegTable(self, task: Optional[Task], dbc: DbConn, regTableName: str):
+ '''
+ Make sure a regular table exists for this super table, creating it if necessary.
+ If there is an associated "Task" that wants to do this, "lock" this table so that
+ others don't access it while we create it.
+ '''
dbName = self._dbName
sql = "select tbname from {}.{} where tbname in ('{}')".format(dbName, self._stName, regTableName)
if dbc.query(sql) >= 1 : # reg table exists already
@@ -1703,18 +1723,24 @@ class TdSuperTable:
# acquire a lock first, so as to be able to *verify*. More details in TD-1471
fullTableName = dbName + '.' + regTableName
- if task is not None: # TODO: what happens if we don't lock the table
- task.lockTable(fullTableName)
+ if task is not None: # Somethime thie operation is requested on behalf of a "task"
+ # Logging.info("Locking table for creation: {}".format(fullTableName))
+ task.lockTable(fullTableName) # in which case we'll lock this table to ensure serialized access
+ # Logging.info("Table locked for creation".format(fullTableName))
Progress.emit(Progress.CREATE_TABLE_ATTEMPT) # ATTEMPT to create a new table
# print("(" + fullTableName[-3:] + ")", end="", flush=True)
try:
sql = "CREATE TABLE {} USING {}.{} tags ({})".format(
fullTableName, dbName, self._stName, self._getTagStrForSql(dbc)
)
+ # Logging.info("Creating regular with SQL: {}".format(sql))
dbc.execute(sql)
+ # Logging.info("Regular table created: {}".format(sql))
finally:
if task is not None:
+ # Logging.info("Unlocking table after creation: {}".format(fullTableName))
task.unlockTable(fullTableName) # no matter what
+ # Logging.info("Table unlocked after creation: {}".format(fullTableName))
def _getTagStrForSql(self, dbc) :
tags = self._getTags(dbc)
@@ -2011,9 +2037,30 @@ class TaskAddData(StateTransitionTask):
def canBeginFrom(cls, state: AnyState):
return state.canAddData()
+ def _lockTableIfNeeded(self, fullTableName, extraMsg = ''):
+ if Config.getConfig().verify_data:
+ # Logging.info("Locking table: {}".format(fullTableName))
+ self.lockTable(fullTableName)
+ # Logging.info("Table locked {}: {}".format(extraMsg, fullTableName))
+ # print("_w" + str(nextInt % 100), end="", flush=True) # Trace what was written
+ else:
+ # Logging.info("Skipping locking table")
+ pass
+
+ def _unlockTableIfNeeded(self, fullTableName):
+ if Config.getConfig().verify_data:
+ # Logging.info("Unlocking table: {}".format(fullTableName))
+ self.unlockTable(fullTableName)
+ # Logging.info("Table unlocked: {}".format(fullTableName))
+ else:
+ pass
+ # Logging.info("Skipping unlocking table")
+
def _addDataInBatch(self, db, dbc, regTableName, te: TaskExecutor):
numRecords = self.LARGE_NUMBER_OF_RECORDS if Config.getConfig().larger_data else self.SMALL_NUMBER_OF_RECORDS
+
fullTableName = db.getName() + '.' + regTableName
+ self._lockTableIfNeeded(fullTableName, 'batch')
sql = "INSERT INTO {} VALUES ".format(fullTableName)
for j in range(numRecords): # number of records per table
@@ -2021,51 +2068,60 @@ class TaskAddData(StateTransitionTask):
nextTick = db.getNextTick()
nextColor = db.getNextColor()
sql += "('{}', {}, '{}');".format(nextTick, nextInt, nextColor)
- dbc.execute(sql)
+
+ # Logging.info("Adding data in batch: {}".format(sql))
+ try:
+ dbc.execute(sql)
+ finally:
+ # Logging.info("Data added in batch: {}".format(sql))
+ self._unlockTableIfNeeded(fullTableName)
+
+
def _addData(self, db: Database, dbc, regTableName, te: TaskExecutor): # implied: NOT in batches
numRecords = self.LARGE_NUMBER_OF_RECORDS if Config.getConfig().larger_data else self.SMALL_NUMBER_OF_RECORDS
for j in range(numRecords): # number of records per table
- nextInt = db.getNextInt()
+ intToWrite = db.getNextInt()
nextTick = db.getNextTick()
nextColor = db.getNextColor()
if Config.getConfig().record_ops:
self.prepToRecordOps()
if self.fAddLogReady is None:
raise CrashGenError("Unexpected empty fAddLogReady")
- self.fAddLogReady.write("Ready to write {} to {}\n".format(nextInt, regTableName))
+ self.fAddLogReady.write("Ready to write {} to {}\n".format(intToWrite, regTableName))
self.fAddLogReady.flush()
os.fsync(self.fAddLogReady.fileno())
# TODO: too ugly trying to lock the table reliably, refactor...
fullTableName = db.getName() + '.' + regTableName
- if Config.getConfig().verify_data:
- self.lockTable(fullTableName)
- # print("_w" + str(nextInt % 100), end="", flush=True) # Trace what was written
-
+ self._lockTableIfNeeded(fullTableName) # so that we are verify read-back. TODO: deal with exceptions before unlock
+
try:
sql = "INSERT INTO {} VALUES ('{}', {}, '{}');".format( # removed: tags ('{}', {})
fullTableName,
# ds.getFixedSuperTableName(),
# ds.getNextBinary(), ds.getNextFloat(),
- nextTick, nextInt, nextColor)
+ nextTick, intToWrite, nextColor)
+ # Logging.info("Adding data: {}".format(sql))
dbc.execute(sql)
+ # Logging.info("Data added: {}".format(sql))
+ intWrote = intToWrite
# Quick hack, attach an update statement here. TODO: create an "update" task
if (not Config.getConfig().use_shadow_db) and Dice.throw(5) == 0: # 1 in N chance, plus not using shaddow DB
- nextInt = db.getNextInt()
+ intToUpdate = db.getNextInt() # Updated， but should not succeed
nextColor = db.getNextColor()
sql = "INSERt INTO {} VALUES ('{}', {}, '{}');".format( # "INSERt" means "update" here
fullTableName,
- nextTick, nextInt, nextColor)
+ nextTick, intToUpdate, nextColor)
# sql = "UPDATE {} set speed={}, color='{}' WHERE ts='{}'".format(
# fullTableName, db.getNextInt(), db.getNextColor(), nextTick)
dbc.execute(sql)
+ intWrote = intToUpdate # We updated, seems TDengine non-cluster accepts this.
except: # Any exception at all
- if Config.getConfig().verify_data:
- self.unlockTable(fullTableName)
+ self._unlockTableIfNeeded(fullTableName)
raise
# Now read it back and verify, we might encounter an error if table is dropped
@@ -2073,33 +2129,41 @@ class TaskAddData(StateTransitionTask):
try:
readBack = dbc.queryScalar("SELECT speed from {}.{} WHERE ts='{}'".
format(db.getName(), regTableName, nextTick))
- if readBack != nextInt :
+ if readBack != intWrote :
raise taos.error.ProgrammingError(
"Failed to read back same data, wrote: {}, read: {}"
- .format(nextInt, readBack), 0x999)
+ .format(intWrote, readBack), 0x999)
except taos.error.ProgrammingError as err:
errno = Helper.convertErrno(err.errno)
- if errno in [CrashGenError.INVALID_EMPTY_RESULT, CrashGenError.INVALID_MULTIPLE_RESULT] : # not a single result
+ if errno == CrashGenError.INVALID_EMPTY_RESULT: # empty result
raise taos.error.ProgrammingError(
- "Failed to read back same data for tick: {}, wrote: {}, read: {}"
- .format(nextTick, nextInt, "Empty Result" if errno == CrashGenError.INVALID_EMPTY_RESULT else "Multiple Result"),
+ "Failed to read back same data for tick: {}, wrote: {}, read: EMPTY"
+ .format(nextTick, intWrote),
+ errno)
+ elif errno == CrashGenError.INVALID_MULTIPLE_RESULT : # multiple results
+ raise taos.error.ProgrammingError(
+ "Failed to read back same data for tick: {}, wrote: {}, read: MULTIPLE RESULTS"
+ .format(nextTick, intWrote),
errno)
elif errno in [0x218, 0x362]: # table doesn't exist
# do nothing
- dummy = 0
+ pass
else:
# Re-throw otherwise
raise
finally:
- self.unlockTable(fullTableName) # Unlock the table no matter what
+ self._unlockTableIfNeeded(fullTableName) # Quite ugly, refactor lock/unlock
+ # Done with read-back verification, unlock the table now
+ else:
+ self._unlockTableIfNeeded(fullTableName)
# Successfully wrote the data into the DB, let's record it somehow
- te.recordDataMark(nextInt)
+ te.recordDataMark(intWrote)
if Config.getConfig().record_ops:
if self.fAddLogDone is None:
raise CrashGenError("Unexpected empty fAddLogDone")
- self.fAddLogDone.write("Wrote {} to {}\n".format(nextInt, regTableName))
+ self.fAddLogDone.write("Wrote {} to {}\n".format(intWrote, regTableName))
self.fAddLogDone.flush()
os.fsync(self.fAddLogDone.fileno())
@@ -2137,15 +2201,16 @@ class TaskAddData(StateTransitionTask):
class ThreadStacks: # stack info for all threads
def __init__(self):
self._allStacks = {}
- allFrames = sys._current_frames()
- for th in threading.enumerate():
+ allFrames = sys._current_frames() # All current stack frames
+ for th in threading.enumerate(): # For each thread
if th.ident is None:
continue
- stack = traceback.extract_stack(allFrames[th.ident])
- self._allStacks[th.native_id] = stack
+ stack = traceback.extract_stack(allFrames[th.ident]) # Get stack for a thread
+ shortTid = th.ident % 10000
+ self._allStacks[shortTid] = stack # Was using th.native_id
def print(self, filteredEndName = None, filterInternal = False):
- for thNid, stack in self._allStacks.items(): # for each thread, stack frames top to bottom
+ for tIdent, stack in self._allStacks.items(): # for each thread, stack frames top to bottom
lastFrame = stack[-1]
if filteredEndName: # we need to filter out stacks that match this name
if lastFrame.name == filteredEndName : # end did not match
@@ -2157,7 +2222,7 @@ class ThreadStacks: # stack info for all threads
'__init__']: # the thread that extracted the stack
continue # ignore
# Now print
- print("\n<----- Thread Info for LWP/ID: {} (most recent call last) <-----".format(thNid))
+ print("\n<----- Thread Info for LWP/ID: {} (most recent call last) <-----".format(tIdent))
stackFrame = 0
for frame in stack: # was using: reversed(stack)
# print(frame)
@@ -2376,7 +2441,7 @@ class MainExec:
action='store',
default=0,
type=int,
- help='Maximum number of DBs to keep, set to disable dropping DB. (default: 0)')
+ help='Number of DBs to use, set to disable dropping DB. (default: 0)')
parser.add_argument(
'-c',
'--connector-type',
diff --git a/tests/pytest/crash_gen/service_manager.py b/tests/pytest/crash_gen/service_manager.py
index 1cd65c1dde..c6685ec469 100644
--- a/tests/pytest/crash_gen/service_manager.py
+++ b/tests/pytest/crash_gen/service_manager.py
@@ -179,7 +179,7 @@ quorum 2
def getServiceCmdLine(self): # to start the instance
if Config.getConfig().track_memory_leaks:
Logging.info("Invoking VALGRIND on service...")
- return ['exec /usr/bin/valgrind', '--leak-check=yes', self.getExecFile(), '-c', self.getCfgDir()]
+ return ['exec valgrind', '--leak-check=yes', self.getExecFile(), '-c', self.getCfgDir()]
else:
# TODO: move "exec -c" into Popen(), we can both "use shell" and NOT fork so ask to lose kill control
return ["exec " + self.getExecFile(), '-c', self.getCfgDir()] # used in subproce.Popen()
@@ -310,7 +310,7 @@ class TdeSubProcess:
# print("Starting TDengine with env: ", myEnv.items())
print("Starting TDengine: {}".format(cmdLine))
- return Popen(
+ ret = Popen(
' '.join(cmdLine), # ' '.join(cmdLine) if useShell else cmdLine,
shell=True, # Always use shell, since we need to pass ENV vars
stdout=PIPE,
@@ -318,6 +318,10 @@ class TdeSubProcess:
close_fds=ON_POSIX,
env=myEnv
) # had text=True, which interferred with reading EOF
+ time.sleep(0.01) # very brief wait, then let's check if sub process started successfully.
+ if ret.poll():
+ raise CrashGenError("Sub process failed to start with command line: {}".format(cmdLine))
+ return ret
STOP_SIGNAL = signal.SIGINT # signal.SIGKILL/SIGINT # What signal to use (in kill) to stop a taosd process?
SIG_KILL_RETCODE = 137 # ref: https://stackoverflow.com/questions/43268156/process-finished-with-exit-code-137-in-pycharm
@@ -614,7 +618,7 @@ class ServiceManager:
# Find if there's already a taosd service, and then kill it
for proc in psutil.process_iter():
- if proc.name() == 'taosd':
+ if proc.name() == 'taosd' or proc.name() == 'memcheck-amd64-': # Regular or under Valgrind
Logging.info("Killing an existing TAOSD process in 2 seconds... press CTRL-C to interrupt")
time.sleep(2.0)
proc.kill()
diff --git a/tests/pytest/crash_gen/shared/misc.py b/tests/pytest/crash_gen/shared/misc.py
index 90ad802ff1..78923bcc29 100644
--- a/tests/pytest/crash_gen/shared/misc.py
+++ b/tests/pytest/crash_gen/shared/misc.py
@@ -35,7 +35,8 @@ class LoggingFilter(logging.Filter):
class MyLoggingAdapter(logging.LoggerAdapter):
def process(self, msg, kwargs):
- return "[{:04d}] {}".format(threading.get_ident() % 10000, msg), kwargs
+ shortTid = threading.get_ident() % 10000
+ return "[{:04d}] {}".format(shortTid, msg), kwargs
# return '[%s] %s' % (self.extra['connid'], msg), kwargs
diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index c93fbc5eb3..11d7c49396 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -31,7 +31,7 @@ python3 ./test.py -f table/column_name.py
python3 ./test.py -f table/column_num.py
python3 ./test.py -f table/db_table.py
python3 ./test.py -f table/create_sensitive.py
-#python3 ./test.py -f table/tablename-boundary.py
+python3 ./test.py -f table/tablename-boundary.py
python3 ./test.py -f table/max_table_length.py
python3 ./test.py -f table/alter_column.py
python3 ./test.py -f table/boundary.py
@@ -314,6 +314,8 @@ python3 ./test.py -f query/last_row_cache.py
python3 ./test.py -f account/account_create.py
python3 ./test.py -f alter/alter_table.py
python3 ./test.py -f query/queryGroupbySort.py
+python3 ./test.py -f functions/function_session.py
+python3 ./test.py -f functions/function_stateWindow.py
python3 ./test.py -f insert/unsignedInt.py
python3 ./test.py -f insert/unsignedBigint.py
@@ -334,6 +336,7 @@ python3 ./test.py -f tag_lite/alter_tag.py
python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
+python3 ./test.py -f tag_lite/drop_auto_create.py
python3 test.py -f insert/insert_before_use_db.py
-
+python3 test.py -f alter/alter_cacheLastRow.py
#======================p4-end===============
diff --git a/tests/pytest/functions/function_session.py b/tests/pytest/functions/function_session.py
new file mode 100644
index 0000000000..21b6d088ff
--- /dev/null
+++ b/tests/pytest/functions/function_session.py
@@ -0,0 +1,86 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+#import numpy as np
+
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor())
+
+ self.rowNum = 10
+ self.ts = 1537146000000
+
+ def run(self):
+ tdSql.prepare()
+
+ tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double,
+ col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned) tags(loc nchar(20))''')
+ tdSql.execute("create table test1 using test tags('beijing')")
+ for i in range(self.rowNum):
+ tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
+ % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
+
+ # operation not allowed on super table
+ tdSql.error("select count(*) from test session(ts, 1s)")
+ # operation not allowde on col pro
+ tdSql.error("select * from test1 session(ts, 1s)")
+ # operation not allowed on col except primary ts
+ tdSql.error("select * from test1 session(col1, 1s)")
+
+ tdSql.query("select count(*) from test1 session(ts, 1s)")
+
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 1, 10)
+ # append more data
+
+ for i in range(self.rowNum):
+ tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
+ % (self.ts + 2000, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
+
+ tdSql.query("select count(*) from test1 session(ts, 1s)")
+ tdSql.checkRows(2)
+ tdSql.checkData(0, 1, 10)
+ tdSql.checkData(1, 1, 1)
+
+ tdSql.query("select count(*) from test1 session(ts, 1m)")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 1, 11)
+
+ tdSql.query("select first(col1) from test1 session(ts, 1s)")
+ tdSql.checkRows(2)
+ tdSql.checkData(0, 1, 1)
+ tdSql.checkData(1, 1, 1)
+
+
+ tdSql.query("select first(col1), last(col2) from test1 session(ts, 1s)")
+ tdSql.checkRows(2)
+ tdSql.checkData(0, 1, 1)
+ tdSql.checkData(0, 2, 10)
+ tdSql.checkData(1, 1, 1)
+ tdSql.checkData(1, 1, 1)
+
+ # add more function
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_stateWindow.py b/tests/pytest/functions/function_stateWindow.py
new file mode 100644
index 0000000000..8f05b32164
--- /dev/null
+++ b/tests/pytest/functions/function_stateWindow.py
@@ -0,0 +1,109 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+#import numpy as np
+
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor())
+
+ self.rowNum = 10
+ self.ts = 1537146000000
+
+ def run(self):
+ tdSql.prepare()
+
+ tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double,
+ col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned) tags(loc nchar(20))''')
+ tdSql.execute("create table test1 using test tags('beijing')")
+ col0 = 0
+ for i in range(self.rowNum):
+ tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
+ % (self.ts + i, col0, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
+
+ # operation not allowed on super table
+ tdSql.error("select count(*) from test session(ts, 1s)")
+ # operation not allowde on col pro
+ tdSql.error("select * from test1 session(ts, 1s)")
+ # operation not allowed on col except primary ts
+ tdSql.error("select * from test1 session(col1, 1s)")
+
+ tdSql.query("select count(*) from test1 state_window(col1)")
+
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, self.rowNum)
+ # append more data
+
+ col0 = col0 + 1
+ for i in range(self.rowNum):
+ tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
+ % (self.ts + i + 10000, col0, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
+
+ tdSql.query("select count(*) from test1 state_window(col1)")
+
+ tdSql.checkRows(2)
+ tdSql.checkData(0, 0, self.rowNum)
+ tdSql.checkData(1, 0, self.rowNum)
+
+
+ tdSql.query("select first(col1) from test1 state_window(col1)")
+ tdSql.checkRows(2)
+ col0 = col0 - 1
+ tdSql.checkData(0, 0, col0)
+ col0 = col0 + 1
+ tdSql.checkData(1, 0, col0)
+
+ tdSql.query("select first(col2) from test1 state_window(col1)")
+ tdSql.checkRows(2)
+ tdSql.checkData(0, 0, 1)
+ tdSql.checkData(1, 0, 1)
+
+ tdSql.query("select count(col1), first(col2) from test1 state_window(col1)")
+ tdSql.checkRows(2)
+ tdSql.checkData(0, 0, 10)
+ tdSql.checkData(0, 1, 1)
+
+ tdSql.checkData(1, 0, 10)
+ tdSql.checkData(1, 1, 1)
+
+
+ #tdSql.query("select count(*) from test1 session(ts, 1m)")
+ #tdSql.checkRows(1)
+ #tdSql.checkData(0, 1, 11)
+
+ #tdSql.query("select first(col1) from test1 session(ts, 1s)")
+ #tdSql.checkRows(2)
+ #tdSql.checkData(0, 1, 1)
+ #tdSql.checkData(1, 1, 1)
+
+ #tdSql.query("select first(col1), last(col2) from test1 session(ts, 1s)")
+ #tdSql.checkRows(2)
+ #tdSql.checkData(0, 1, 1)
+ #tdSql.checkData(0, 2, 10)
+ #tdSql.checkData(1, 1, 1)
+ #tdSql.checkData(1, 1, 1)
+
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/nchar.py b/tests/pytest/insert/nchar.py
index 3319aa3c56..5ad52b96a1 100644
--- a/tests/pytest/insert/nchar.py
+++ b/tests/pytest/insert/nchar.py
@@ -36,6 +36,10 @@ class TDTestCase:
tdSql.checkData(1, 1, '涛思数据')
tdSql.error("insert into tb values (now, 'taosdata001')")
+
+ tdSql.error("insert into tb(now, 😀)")
+ tdSql.query("select * from tb")
+ tdSql.checkRows(2)
def stop(self):
tdSql.close()
diff --git a/tests/pytest/manualTest/manual_alter_block.py b/tests/pytest/manualTest/manual_alter_block.py
new file mode 100644
index 0000000000..ccd98b1421
--- /dev/null
+++ b/tests/pytest/manualTest/manual_alter_block.py
@@ -0,0 +1,82 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import tdDnodes
+
+##TODO: auto test version is currently unsupported, need to come up with
+# an auto test version in the future
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ def getBuildPath(self):
+ selfPath = os.path.dirname(os.path.realpath(__file__))
+
+ if ("community" in selfPath):
+ projPath = selfPath[:selfPath.find("community")]
+ else:
+ projPath = selfPath[:selfPath.find("tests")]
+
+ for root, dirs, files in os.walk(projPath):
+ if ("taosd" in files):
+ rootRealPath = os.path.dirname(os.path.realpath(root))
+ if ("packaging" not in rootRealPath):
+ buildPath = root[:len(root)-len("/build/bin")]
+ break
+ return buildPath
+
+ def run(self):
+ tdSql.prepare()
+ buildPath = self.getBuildPath()
+ if (buildPath == ""):
+ tdLog.exit("taosd not found!")
+ else:
+ tdLog.info("taosd found in %s" % buildPath)
+ binPath = buildPath+ "/build/bin/"
+
+ #alter cache block to 3, then check alter
+ tdSql.execute('alter database db blocks 3')
+ tdSql.query('show databases')
+ tdSql.checkData(0,9,3)
+
+ #run taosdemo to occupy all cache, need to manually check memory consumption
+ os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath)
+ input("please check memory usage for taosd. After checking, press enter")
+
+ #alter cache block to 8, then check alter
+ tdSql.execute('alter database db blocks 8')
+ tdSql.query('show databases')
+ tdSql.checkData(0,9,8)
+
+ #run taosdemo to occupy all cache, need to manually check memory consumption
+ os.system("%staosdemo -f tools/taosdemoAllTest/manual_block2.json" % binPath)
+ input("please check memory usage for taosd. After checking, press enter")
+
+ ##expected result the peak memory consumption should increase by around 80MB = 5 blocks of cache
+
+ ##test results
+ #2021/06/02 before:2621700K after: 2703640K memory usage increased by 80MB = 5 block
+ # confirm with the change in block. Baosheng Chang
+
+ def stop(self):
+ tdSql.close()
+ tdLog.debug("%s alter block manual check finish" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/manualTest/manual_alter_comp.py b/tests/pytest/manualTest/manual_alter_comp.py
new file mode 100644
index 0000000000..6c3e0fc296
--- /dev/null
+++ b/tests/pytest/manualTest/manual_alter_comp.py
@@ -0,0 +1,126 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import tdDnodes
+
+##TODO: auto test version is currently unsupported, need to come up with
+# an auto test version in the future
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ def getRootPath(self):
+ selfPath = os.path.dirname(os.path.realpath(__file__))
+ print(selfPath)
+ if ("community" in selfPath):
+ projPath = selfPath[:selfPath.find("community")]
+ print(projPath)
+ else:
+ projPath = selfPath[:selfPath.find("tests")]
+ print("test" + projPath)
+
+ for root, dirs, files in os.walk(projPath):
+ if ('data' in dirs and 'sim' in root):
+ rootPath = root
+
+ return rootPath
+
+ def getBuildPath(self):
+ selfPath = os.path.dirname(os.path.realpath(__file__))
+
+ if ("community" in selfPath):
+ projPath = selfPath[:selfPath.find("community")]
+ else:
+ projPath = selfPath[:selfPath.find("tests")]
+
+ for root, dirs, files in os.walk(projPath):
+ if ("taosd" in files):
+ rootRealPath = os.path.dirname(os.path.realpath(root))
+ if ("packaging" not in rootRealPath):
+ buildPath = root[:len(root)-len("/build/bin")]
+ break
+ return buildPath
+
+
+
+ def run(self):
+ dnodePath = self.getRootPath()
+ os.system(f'rm -rf {dnodePath}/data/* {dnodePath}/log/*')
+ tdSql.prepare()
+ buildPath = self.getBuildPath()
+ if (buildPath == ""):
+ tdLog.exit("taosd not found!")
+ else:
+ tdLog.info("taosd found in %s" % buildPath)
+ binPath = buildPath+ "/build/bin/"
+
+ #comp is at 14
+ #check disk usage when comp=2
+ tdSql.query('show databases')
+ tdSql.execute('alter database db blocks 3') # minimize the data in cache
+ tdSql.checkData(0,14,2)
+ os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath)
+ print("default location is at /home/bryan/Documents/Github/TDengine/sim/dnode1/data/vnode")
+ print('comp = 2')
+ input("please check disk usage for taosd. After checking, press enter")
+
+ #removing all data file
+ os.system(f'sudo rm -rf {dnodePath}/data/* {dnodePath}/log/*')
+ #print(f'rm -rf {dnodePath}/data/* {dnodePath}/log/*') #for showing the command ran
+ input("please check if the pervious data is being deleted. Then, press enter")
+
+ #check disk usage when comp=0
+ tdSql.prepare()
+ tdSql.query('show databases')
+ tdSql.checkData(0,14,2)
+ tdSql.execute('alter database db comp 0')
+ tdSql.query('show databases')
+ tdSql.checkData(0,14,0)
+ os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath)
+ print("default location is at /home/bryan/Documents/Github/TDengine/sim/dnode1/data")
+ print('comp = 0')
+ input("please check disk usage for taosd. After checking, press enter")
+
+ #removing all data file
+ os.system(f'sudo rm -rf {dnodePath}/data/* {dnodePath}/log/*')
+ #print(f'rm -rf {dnodePath}/data/* {dnodePath}/log/*') #for showing the command ran
+ input("please check if the pervious data is being deleted. Then, press enter")
+
+ #check disk usage when comp=1
+ tdSql.prepare()
+ tdSql.query('show databases')
+ tdSql.checkData(0,14,2)
+ tdSql.execute('alter database db comp 1')
+ tdSql.query('show databases')
+ tdSql.checkData(0,14,1)
+ os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath)
+ print("default location is at /home/bryan/Documents/Github/TDengine/sim/dnode1/data")
+ print('comp = 1')
+ input("please check disk usage for taosd. After checking, press enter")
+
+ ##test result
+ # 2021/06/02 comp=2:13M comp=1:57M comp=0:399M. Test past
+ # each row entered is identical Tester - Baosheng Chang
+
+ def stop(self):
+ tdSql.close()
+ tdLog.debug("%s alter block manual check finish" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryInsertValue.py b/tests/pytest/query/queryInsertValue.py
index 856801b4ee..a6b2a88008 100644
--- a/tests/pytest/query/queryInsertValue.py
+++ b/tests/pytest/query/queryInsertValue.py
@@ -45,7 +45,7 @@ class TDTestCase:
tdSql.query("select * from st")
tdSql.checkRows(1)
- tdSql.execute("alter table st add column length int")
+ tdSql.execute("alter table st add column len int")
tdSql.execute("insert into t1 values(now, 1, 2)")
tdSql.query("select last(*) from st")
tdSql.checkData(0, 2, 2);
diff --git a/tests/pytest/table/tablename-boundary.py b/tests/pytest/table/tablename-boundary.py
index 0755e75355..dc22c3343b 100644
--- a/tests/pytest/table/tablename-boundary.py
+++ b/tests/pytest/table/tablename-boundary.py
@@ -14,6 +14,13 @@ class TDTestCase:
tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor(), logSql)
+ self.ts = 1622100000000
+
+ def get_random_string(self, length):
+ letters = string.ascii_lowercase
+ result_str = ''.join(random.choice(letters) for i in range(length))
+ return result_str
+
def run(self):
tdSql.prepare()
@@ -24,19 +31,62 @@ class TDTestCase:
shell=True)) - 1
tdLog.info("table name max length is %d" % tableNameMaxLen)
chars = string.ascii_uppercase + string.ascii_lowercase
- tb_name = ''.join(random.choices(chars, k=tableNameMaxLen))
+ tb_name = ''.join(random.choices(chars, k=tableNameMaxLen + 1))
tdLog.info('tb_name length %d' % len(tb_name))
tdLog.info('create table %s (ts timestamp, value int)' % tb_name)
- tdSql.error(
- 'create table %s (ts timestamp, speed binary(4089))' %
- tb_name)
+ tdSql.error('create table %s (ts timestamp, speed binary(4089))' % tb_name)
- tb_name = ''.join(random.choices(chars, k=191))
+ tb_name = ''.join(random.choices(chars, k=tableNameMaxLen))
tdLog.info('tb_name length %d' % len(tb_name))
tdLog.info('create table %s (ts timestamp, value int)' % tb_name)
tdSql.execute(
'create table %s (ts timestamp, speed binary(4089))' %
tb_name)
+
+ db_name = self.get_random_string(33)
+ tdSql.error("create database %s" % db_name)
+
+ db_name = self.get_random_string(32)
+ tdSql.execute("create database %s" % db_name)
+ tdSql.execute("use %s" % db_name)
+
+ tb_name = self.get_random_string(193)
+ tdSql.error("create table %s(ts timestamp, val int)" % tb_name)
+
+ tb_name = self.get_random_string(192)
+ tdSql.execute("create table %s.%s(ts timestamp, val int)" % (db_name, tb_name))
+ tdSql.query("show %s.tables" % db_name)
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, tb_name)
+
+ tdSql.execute("insert into %s.%s values(now, 1)" % (db_name, tb_name))
+ tdSql.query("select * from %s.%s" %(db_name, tb_name))
+ tdSql.checkRows(1)
+
+ db_name = self.get_random_string(32)
+ tdSql.execute("create database %s update 1" % db_name)
+
+ stb_name = self.get_random_string(192)
+ tdSql.execute("create table %s.%s(ts timestamp, val int) tags(id int)" % (db_name, stb_name))
+ tb_name1 = self.get_random_string(192)
+ tdSql.execute("insert into %s.%s using %s.%s tags(1) values(%d, 1)(%d, 2)(%d, 3)" % (db_name, tb_name1, db_name, stb_name, self.ts, self.ts + 1, self.ts + 2))
+ tb_name2 = self.get_random_string(192)
+ tdSql.execute("insert into %s.%s using %s.%s tags(2) values(%d, 1)(%d, 2)(%d, 3)" % (db_name, tb_name2, db_name, stb_name, self.ts, self.ts + 1, self.ts + 2))
+
+ tdSql.query("show %s.tables" % db_name)
+ tdSql.checkRows(2)
+
+ tdSql.query("select * from %s.%s" % (db_name, stb_name))
+ tdSql.checkRows(6)
+
+ tdSql.execute("insert into %s.%s using %s.%s tags(1) values(%d, null)" % (db_name, tb_name1, db_name, stb_name, self.ts))
+
+ tdSql.query("select * from %s.%s" % (db_name, stb_name))
+ tdSql.checkRows(6)
+
+
+
+
def stop(self):
tdSql.close()
diff --git a/tests/pytest/tag_lite/drop_auto_create.py b/tests/pytest/tag_lite/drop_auto_create.py
new file mode 100644
index 0000000000..f89b41008b
--- /dev/null
+++ b/tests/pytest/tag_lite/drop_auto_create.py
@@ -0,0 +1,47 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ def run(self):
+ tdSql.prepare()
+
+ tdSql.execute('create table m1(ts timestamp, k int) tags(a binary(12), b int, c double);')
+ tdSql.execute('insert into tm0 using m1(b,c) tags(1, 99) values(now, 1);')
+ tdSql.execute('insert into tm1 using m1(b,c) tags(2, 100) values(now, 2);')
+ tdLog.info("2 rows inserted")
+ tdSql.query('select * from m1;')
+ tdSql.checkRows(2)
+ tdSql.query('select *,tbname from m1;')
+ tdSql.execute("drop table tm0; ")
+ tdSql.query('select * from m1')
+ tdSql.checkRows(1)
+
+
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tools/taosdemoAllTest/insert_5M_rows.json b/tests/pytest/tools/taosdemoAllTest/insert_5M_rows.json
new file mode 100644
index 0000000000..4637009ca3
--- /dev/null
+++ b/tests/pytest/tools/taosdemoAllTest/insert_5M_rows.json
@@ -0,0 +1,60 @@
+{
+ "filetype": "insert",
+ "cfgdir": "/etc/taos",
+ "host": "127.0.0.1",
+ "port": 6030,
+ "user": "root",
+ "password": "taosdata",
+ "thread_count": 4,
+ "thread_count_create_tbl": 4,
+ "result_file": "./insert_res.txt",
+ "confirm_parameter_prompt": "no",
+ "insert_interval": 0,
+ "interlace_rows": 100,
+ "num_of_records_per_req": 100,
+ "databases": [{
+ "dbinfo": {
+ "name": "db",
+ "drop": "yes",
+ "replica": 1,
+ "days": 10,
+ "cache": 16,
+ "blocks": 8,
+ "precision": "ms",
+ "keep": 3650,
+ "minRows": 100,
+ "maxRows": 4096,
+ "comp":2,
+ "walLevel":1,
+ "cachelast":0,
+ "quorum":1,
+ "fsync":3000,
+ "update": 0
+ },
+ "super_tables": [{
+ "name": "stb",
+ "child_table_exists":"no",
+ "childtable_count": 500,
+ "childtable_prefix": "stb_",
+ "auto_create_table": "no",
+ "batch_create_tbl_num": 20,
+ "data_source": "rand",
+ "insert_mode": "taosc",
+ "insert_rows": 10000,
+ "childtable_limit": 10,
+ "childtable_offset":100,
+ "interlace_rows": 0,
+ "insert_interval":0,
+ "max_sql_len": 1024000,
+ "disorder_ratio": 0,
+ "disorder_range": 1000,
+ "timestamp_step": 10,
+ "start_timestamp": "2020-10-01 00:00:00.000",
+ "sample_format": "csv",
+ "sample_file": "./sample.csv",
+ "tags_file": "",
+ "columns": [{"type": "INT"}],
+ "tags": [{"type": "TINYINT", "count":2}]
+ }]
+ }]
+}
\ No newline at end of file
diff --git a/tests/pytest/tools/taosdemoAllTest/manual_block1_comp.json b/tests/pytest/tools/taosdemoAllTest/manual_block1_comp.json
new file mode 100644
index 0000000000..a6ac674dd7
--- /dev/null
+++ b/tests/pytest/tools/taosdemoAllTest/manual_block1_comp.json
@@ -0,0 +1,60 @@
+{
+ "filetype": "insert",
+ "cfgdir": "/etc/taos",
+ "host": "127.0.0.1",
+ "port": 6030,
+ "user": "root",
+ "password": "taosdata",
+ "thread_count": 4,
+ "thread_count_create_tbl": 4,
+ "result_file": "./insert_res.txt",
+ "confirm_parameter_prompt": "no",
+ "insert_interval": 0,
+ "interlace_rows": 100,
+ "num_of_records_per_req": 32766,
+ "databases": [{
+ "dbinfo": {
+ "name": "db",
+ "drop": "no",
+ "replica": 1,
+ "days": 10,
+ "cache": 16,
+ "blocks": 3,
+ "precision": "ms",
+ "keep": 3650,
+ "minRows": 1000,
+ "maxRows": 4096,
+ "comp":2,
+ "walLevel":1,
+ "cachelast":0,
+ "quorum":1,
+ "fsync":3000,
+ "update": 0
+ },
+ "super_tables": [{
+ "name": "stb",
+ "child_table_exists":"no",
+ "childtable_count": 500,
+ "childtable_prefix": "stb_",
+ "auto_create_table": "no",
+ "batch_create_tbl_num": 20,
+ "data_source": "sample",
+ "insert_mode": "taosc",
+ "insert_rows": 10000,
+ "childtable_limit": 10,
+ "childtable_offset":100,
+ "interlace_rows": 0,
+ "insert_interval":0,
+ "max_sql_len": 1024000,
+ "disorder_ratio": 0,
+ "disorder_range": 1000,
+ "timestamp_step": 1,
+ "start_timestamp": "2019-10-01 00:00:00.000",
+ "sample_format": "csv",
+ "sample_file": "./tools/taosdemoAllTest/sample.csv",
+ "tags_file": "",
+ "columns": [{"type": "INT", "count":3}, {"type": "DOUBLE", "count":3}, {"type": "BINARY", "len": 16, "count":1}, {"type": "BINARY", "len": 32, "count":1}, {"type": "BOOL"}],
+ "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+ }]
+ }]
+}
\ No newline at end of file
diff --git a/tests/pytest/tools/taosdemoAllTest/manual_block2.json b/tests/pytest/tools/taosdemoAllTest/manual_block2.json
new file mode 100644
index 0000000000..434159159b
--- /dev/null
+++ b/tests/pytest/tools/taosdemoAllTest/manual_block2.json
@@ -0,0 +1,60 @@
+{
+ "filetype": "insert",
+ "cfgdir": "/etc/taos",
+ "host": "127.0.0.1",
+ "port": 6030,
+ "user": "root",
+ "password": "taosdata",
+ "thread_count": 4,
+ "thread_count_create_tbl": 4,
+ "result_file": "./insert_res.txt",
+ "confirm_parameter_prompt": "no",
+ "insert_interval": 0,
+ "interlace_rows": 100,
+ "num_of_records_per_req": 32766,
+ "databases": [{
+ "dbinfo": {
+ "name": "db",
+ "drop": "no",
+ "replica": 1,
+ "days": 10,
+ "cache": 16,
+ "blocks": 8,
+ "precision": "ms",
+ "keep": 3650,
+ "minRows": 100,
+ "maxRows": 4096,
+ "comp":2,
+ "walLevel":1,
+ "cachelast":0,
+ "quorum":1,
+ "fsync":3000,
+ "update": 0
+ },
+ "super_tables": [{
+ "name": "stb",
+ "child_table_exists":"yes",
+ "childtable_count": 500,
+ "childtable_prefix": "stb_",
+ "auto_create_table": "no",
+ "batch_create_tbl_num": 20,
+ "data_source": "rand",
+ "insert_mode": "taosc",
+ "insert_rows": 100000,
+ "childtable_limit": 500,
+ "childtable_offset":0,
+ "interlace_rows": 0,
+ "insert_interval":0,
+ "max_sql_len": 1024000,
+ "disorder_ratio": 0,
+ "disorder_range": 1000,
+ "timestamp_step": 1,
+ "start_timestamp": "now",
+ "sample_format": "csv",
+ "sample_file": "./sample.csv",
+ "tags_file": "",
+ "columns": [{"type": "INT"}],
+ "tags": [{"type": "TINYINT", "count":2}]
+ }]
+ }]
+}
\ No newline at end of file
diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
index 6eaf4e18af..0f71ffd0a3 100644
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -432,7 +432,7 @@ class TDDnodes:
self.simDeployed = False
def init(self, path):
- psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+ psCmd = "ps -ef|grep -w taosd| grep -v grep| grep -v defunct | awk '{print $2}'"
processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
while(processID):
killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
@@ -545,14 +545,14 @@ class TDDnodes:
for i in range(len(self.dnodes)):
self.dnodes[i].stop()
- psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep | awk '{print $2}'"
+ psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep| grep -v defunct | awk '{print $2}'"
processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
if processID:
cmd = "sudo systemctl stop taosd"
os.system(cmd)
# if os.system(cmd) != 0 :
# tdLog.exit(cmd)
- psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+ psCmd = "ps -ef|grep -w taosd| grep -v grep| grep -v defunct | awk '{print $2}'"
processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
while(processID):
killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
diff --git a/tests/script/api/stmtBatchTest.c b/tests/script/api/stmtBatchTest.c
index 8bd296db61..24291adfa0 100644
--- a/tests/script/api/stmtBatchTest.c
+++ b/tests/script/api/stmtBatchTest.c
@@ -1450,6 +1450,47 @@ static void prepareV_long(TAOS *taos, int schemaCase, int tableNum, int lenO
}
+static void prepareVcolumn_autoCreateTbl(TAOS *taos, int schemaCase, int tableNum, int lenOfBinaryDef, char* dbName) {
+ TAOS_RES *result;
+ int code;
+ char sqlstr[1024] = {0};
+ sprintf(sqlstr, "drop database if exists %s;", dbName);
+ result = taos_query(taos, sqlstr);
+ taos_free_result(result);
+
+ sprintf(sqlstr, "create database %s;", dbName);
+ result = taos_query(taos, sqlstr);
+ code = taos_errno(result);
+ if (code != 0) {
+ printf("failed to create database, reason:%s\n", taos_errstr(result));
+ taos_free_result(result);
+ return;
+ }
+ taos_free_result(result);
+
+ sprintf(sqlstr, "use %s;", dbName);
+ result = taos_query(taos, sqlstr);
+ taos_free_result(result);
+
+ // create table
+ char buf[1024] = {0};
+ //if (bigsize) {
+ sprintf(buf, "create stable stb1 (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, br binary(%d), nr nchar(%d), ts2 timestamp)"
+ " tags(id1 int, id2 bool, id3 tinyint, id4 smallint, id5 bigint, id6 float, id7 double, id8 binary(%d), id9 nchar(%d))", lenOfBinaryDef, lenOfBinaryDef, lenOfBinaryDef, lenOfBinaryDef) ;
+ //} else {
+ // sprintf(buf, "create stable stb1 (ts timestamp, b int) tags(id1 int, id2 bool, id3 tinyint, id4 smallint, id5 bigint, id6 float, id7 double, id8 binary(40), id9 nchar(40))") ;
+ //}
+
+ result = taos_query(taos, buf);
+ code = taos_errno(result);
+ if (code != 0) {
+ printf("failed to create table, reason:%s\n", taos_errstr(result));
+ taos_free_result(result);
+ return;
+ }
+ taos_free_result(result);
+}
+
static void prepareVcolumn(TAOS *taos, int schemaCase, int tableNum, int lenOfBinaryDef, char* dbName) {
TAOS_RES *result;
@@ -3159,12 +3200,1218 @@ static void SpecifyColumnBatchCase(TAOS *taos) {
}
+
+/*=======================*/
+/*
+test scene: insert into tb1 (ts,f1) values (?,?)
+*/
+static int stmt_specifyCol_bind_case_001_autoCreateTbl(TAOS_STMT *stmt, int tableNum, int rowsOfPerColum, int bingNum, int lenOfBinaryDef, int lenOfBinaryAct, int columnNum) {
+ sampleValue* v = (sampleValue *)calloc(1, sizeof(sampleValue));
+
+ int totalRowsPerTbl = rowsOfPerColum * bingNum;
+
+ v->ts = (int64_t *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * tableNum));
+ v->br = (char *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * lenOfBinaryDef));
+ v->nr = (char *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * lenOfBinaryDef));
+
+ int *lb = (int *)malloc(MAX_ROWS_OF_PER_COLUMN * sizeof(int));
+
+ TAOS_BIND *tags = calloc(1, sizeof(TAOS_BIND) * 9 * 1);
+ TAOS_MULTI_BIND *params = calloc(1, sizeof(TAOS_MULTI_BIND) * (size_t)(bingNum * columnNum * (tableNum+1) * rowsOfPerColum));
+ char* is_null = malloc(sizeof(char) * MAX_ROWS_OF_PER_COLUMN);
+ char* no_null = malloc(sizeof(char) * MAX_ROWS_OF_PER_COLUMN);
+ int one_not_null = 0;
+
+ int64_t tts = 1591060628000;
+
+ for (int i = 0; i < rowsOfPerColum; ++i) {
+ lb[i] = lenOfBinaryAct;
+ no_null[i] = 0;
+ is_null[i] = (i % 10 == 2) ? 1 : 0;
+ v->b[i] = (int8_t)(i % 2);
+ v->v1[i] = (int8_t)((i+1) % 2);
+ v->v2[i] = (int16_t)i;
+ v->v4[i] = (int32_t)(i+1);
+ v->v8[i] = (int64_t)(i+2);
+ v->f4[i] = (float)(i+3);
+ v->f8[i] = (double)(i+4);
+ char tbuf[MAX_BINARY_DEF_LEN];
+ memset(tbuf, 0, MAX_BINARY_DEF_LEN);
+ sprintf(tbuf, "binary-%d-0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", i%10);
+ memcpy(v->br + i*lenOfBinaryDef, tbuf, (size_t)lenOfBinaryAct);
+ memset(tbuf, 0, MAX_BINARY_DEF_LEN);
+ sprintf(tbuf, "nchar-%d-0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", i%10);
+ memcpy(v->nr + i*lenOfBinaryDef, tbuf, (size_t)lenOfBinaryAct);
+ v->ts2[i] = tts + i;
+ }
+
+ int i = 0;
+ for (int j = 0; j < bingNum * tableNum; j++) {
+ params[i+0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+ params[i+0].buffer_length = sizeof(int64_t);
+ params[i+0].buffer = &v->ts[j*rowsOfPerColum];
+ params[i+0].length = NULL;
+ params[i+0].is_null = no_null;
+ params[i+0].num = rowsOfPerColum;
+
+ params[i+1].buffer_type = TSDB_DATA_TYPE_BOOL;
+ params[i+1].buffer_length = sizeof(int8_t);
+ params[i+1].buffer = v->b;
+ params[i+1].length = NULL;
+ params[i+1].is_null = is_null;
+ params[i+1].num = rowsOfPerColum;
+
+ params[i+2].buffer_type = TSDB_DATA_TYPE_INT;
+ params[i+2].buffer_length = sizeof(int32_t);
+ params[i+2].buffer = v->v4;
+ params[i+2].length = NULL;
+ params[i+2].is_null = is_null;
+ params[i+2].num = rowsOfPerColum;
+
+ params[i+3].buffer_type = TSDB_DATA_TYPE_FLOAT;
+ params[i+3].buffer_length = sizeof(float);
+ params[i+3].buffer = v->f4;
+ params[i+3].length = NULL;
+ params[i+3].is_null = is_null;
+ params[i+3].num = rowsOfPerColum;
+
+ params[i+4].buffer_type = TSDB_DATA_TYPE_BINARY;
+ params[i+4].buffer_length = (uintptr_t)lenOfBinaryDef;
+ params[i+4].buffer = v->br;
+ params[i+4].length = lb;
+ params[i+4].is_null = is_null;
+ params[i+4].num = rowsOfPerColum;
+
+ i+=columnNum;
+ }
+
+ //int64_t tts = 1591060628000;
+ for (int i = 0; i < totalRowsPerTbl * tableNum; ++i) {
+ v->ts[i] = tts + i;
+ }
+
+ for (int i = 0; i < 1; ++i) {
+ tags[i+0].buffer_type = TSDB_DATA_TYPE_INT;
+ tags[i+0].buffer = v->v4;
+ tags[i+0].is_null = &one_not_null;
+ tags[i+0].length = NULL;
+
+ tags[i+1].buffer_type = TSDB_DATA_TYPE_BOOL;
+ tags[i+1].buffer = v->b;
+ tags[i+1].is_null = &one_not_null;
+ tags[i+1].length = NULL;
+
+ tags[i+2].buffer_type = TSDB_DATA_TYPE_TINYINT;
+ tags[i+2].buffer = v->v1;
+ tags[i+2].is_null = &one_not_null;
+ tags[i+2].length = NULL;
+
+ tags[i+3].buffer_type = TSDB_DATA_TYPE_SMALLINT;
+ tags[i+3].buffer = v->v2;
+ tags[i+3].is_null = &one_not_null;
+ tags[i+3].length = NULL;
+
+ tags[i+4].buffer_type = TSDB_DATA_TYPE_BIGINT;
+ tags[i+4].buffer = v->v8;
+ tags[i+4].is_null = &one_not_null;
+ tags[i+4].length = NULL;
+
+ tags[i+5].buffer_type = TSDB_DATA_TYPE_FLOAT;
+ tags[i+5].buffer = v->f4;
+ tags[i+5].is_null = &one_not_null;
+ tags[i+5].length = NULL;
+
+ tags[i+6].buffer_type = TSDB_DATA_TYPE_DOUBLE;
+ tags[i+6].buffer = v->f8;
+ tags[i+6].is_null = &one_not_null;
+ tags[i+6].length = NULL;
+
+ tags[i+7].buffer_type = TSDB_DATA_TYPE_BINARY;
+ tags[i+7].buffer = v->br;
+ tags[i+7].is_null = &one_not_null;
+ tags[i+7].length = (uintptr_t *)lb;
+
+ tags[i+8].buffer_type = TSDB_DATA_TYPE_NCHAR;
+ tags[i+8].buffer = v->nr;
+ tags[i+8].is_null = &one_not_null;
+ tags[i+8].length = (uintptr_t *)lb;
+ }
+
+
+ unsigned long long starttime = getCurrentTime();
+
+// create table m%d (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, br binary(%d), nr nchar(%d), ts2 timestamp)
+ //char *sql = "insert into ? (ts,b,v4,f4,br) using stb1 tags (?,?,?,?,?,?,?,?,?) values(?,?,?,?,?)";
+ char *sql = "insert into ? using stb1 tags (?,?,?,?,?,?,?,?,?) (ts,b,v4,f4,br) values(?,?,?,?,?)";
+
+ int code = taos_stmt_prepare(stmt, sql, 0);
+ if (code != 0){
+ printf("failed to execute taos_stmt_prepare. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+
+ int id = 0;
+ for (int l = 0; l < bingNum; l++) {
+ for (int zz = 0; zz < tableNum; zz++) {
+ char buf[32];
+ sprintf(buf, "m%d", zz);
+ code = taos_stmt_set_tbname_tags(stmt, buf, tags);
+ if (code != 0){
+ printf("failed to execute taos_stmt_set_tbname. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+
+ for (int col=0; col < columnNum; ++col) {
+ code = taos_stmt_bind_single_param_batch(stmt, params + id, col);
+ if (code != 0){
+ printf("failed to execute taos_stmt_bind_single_param_batch. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ id++;
+ }
+
+ code = taos_stmt_add_batch(stmt);
+ if (code != 0) {
+ printf("failed to execute taos_stmt_add_batch. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ }
+
+ code = taos_stmt_execute(stmt);
+ if (code != 0) {
+ printf("failed to execute taos_stmt_execute. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ }
+
+ unsigned long long endtime = getCurrentTime();
+ unsigned long long totalRows = (uint32_t)(totalRowsPerTbl * tableNum);
+ printf("insert total %d records, used %u seconds, avg:%u useconds per record\n", totalRows, (endtime-starttime)/1000000UL, (endtime-starttime)/totalRows);
+
+ free(v->ts);
+ free(v->br);
+ free(v->nr);
+ free(v);
+ free(lb);
+ free(params);
+ free(tags);
+ free(is_null);
+ free(no_null);
+
+ return 0;
+}
+
+static int stmt_specifyCol_bind_case_002_autoCreateTbl(TAOS_STMT *stmt, int tableNum, int rowsOfPerColum, int bingNum, int lenOfBinaryDef, int lenOfBinaryAct, int columnNum) {
+ sampleValue* v = (sampleValue *)calloc(1, sizeof(sampleValue));
+
+ int totalRowsPerTbl = rowsOfPerColum * bingNum;
+
+ v->ts = (int64_t *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * tableNum));
+ v->br = (char *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * lenOfBinaryDef));
+ v->nr = (char *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * lenOfBinaryDef));
+
+ int *lb = (int *)malloc(MAX_ROWS_OF_PER_COLUMN * sizeof(int));
+
+ TAOS_BIND *tags = calloc(1, sizeof(TAOS_BIND) * 9 * 1);
+ TAOS_MULTI_BIND *params = calloc(1, sizeof(TAOS_MULTI_BIND) * (size_t)(bingNum * columnNum * (tableNum+1) * rowsOfPerColum));
+ char* is_null = malloc(sizeof(char) * MAX_ROWS_OF_PER_COLUMN);
+ char* no_null = malloc(sizeof(char) * MAX_ROWS_OF_PER_COLUMN);
+ int one_not_null = 0;
+
+ int64_t tts = 1591060628000;
+
+ for (int i = 0; i < rowsOfPerColum; ++i) {
+ lb[i] = lenOfBinaryAct;
+ no_null[i] = 0;
+ is_null[i] = (i % 10 == 2) ? 1 : 0;
+ v->b[i] = (int8_t)(i % 2);
+ v->v1[i] = (int8_t)((i+1) % 2);
+ v->v2[i] = (int16_t)i;
+ v->v4[i] = (int32_t)(i+1);
+ v->v8[i] = (int64_t)(i+2);
+ v->f4[i] = (float)(i+3);
+ v->f8[i] = (double)(i+4);
+ char tbuf[MAX_BINARY_DEF_LEN];
+ memset(tbuf, 0, MAX_BINARY_DEF_LEN);
+ sprintf(tbuf, "binary-%d-0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", i%10);
+ memcpy(v->br + i*lenOfBinaryDef, tbuf, (size_t)lenOfBinaryAct);
+ memset(tbuf, 0, MAX_BINARY_DEF_LEN);
+ sprintf(tbuf, "nchar-%d-0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", i%10);
+ memcpy(v->nr + i*lenOfBinaryDef, tbuf, (size_t)lenOfBinaryAct);
+ v->ts2[i] = tts + i;
+ }
+
+ int i = 0;
+ for (int j = 0; j < bingNum * tableNum; j++) {
+ params[i+0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+ params[i+0].buffer_length = sizeof(int64_t);
+ params[i+0].buffer = &v->ts[j*rowsOfPerColum];
+ params[i+0].length = NULL;
+ params[i+0].is_null = no_null;
+ params[i+0].num = rowsOfPerColum;
+
+ params[i+1].buffer_type = TSDB_DATA_TYPE_BOOL;
+ params[i+1].buffer_length = sizeof(int8_t);
+ params[i+1].buffer = v->b;
+ params[i+1].length = NULL;
+ params[i+1].is_null = is_null;
+ params[i+1].num = rowsOfPerColum;
+
+ params[i+2].buffer_type = TSDB_DATA_TYPE_INT;
+ params[i+2].buffer_length = sizeof(int32_t);
+ params[i+2].buffer = v->v4;
+ params[i+2].length = NULL;
+ params[i+2].is_null = is_null;
+ params[i+2].num = rowsOfPerColum;
+
+ params[i+3].buffer_type = TSDB_DATA_TYPE_FLOAT;
+ params[i+3].buffer_length = sizeof(float);
+ params[i+3].buffer = v->f4;
+ params[i+3].length = NULL;
+ params[i+3].is_null = is_null;
+ params[i+3].num = rowsOfPerColum;
+
+ params[i+4].buffer_type = TSDB_DATA_TYPE_BINARY;
+ params[i+4].buffer_length = (uintptr_t)lenOfBinaryDef;
+ params[i+4].buffer = v->br;
+ params[i+4].length = lb;
+ params[i+4].is_null = is_null;
+ params[i+4].num = rowsOfPerColum;
+
+ i+=columnNum;
+ }
+
+ //int64_t tts = 1591060628000;
+ for (int i = 0; i < totalRowsPerTbl * tableNum; ++i) {
+ v->ts[i] = tts + i;
+ }
+
+ for (int i = 0; i < 1; ++i) {
+ //tags[i+0].buffer_type = TSDB_DATA_TYPE_INT;
+ //tags[i+0].buffer = v->v4;
+ //tags[i+0].is_null = &one_not_null;
+ //tags[i+0].length = NULL;
+
+ tags[i+0].buffer_type = TSDB_DATA_TYPE_BOOL;
+ tags[i+0].buffer = v->b;
+ tags[i+0].is_null = &one_not_null;
+ tags[i+0].length = NULL;
+
+ //tags[i+2].buffer_type = TSDB_DATA_TYPE_TINYINT;
+ //tags[i+2].buffer = v->v1;
+ //tags[i+2].is_null = &one_not_null;
+ //tags[i+2].length = NULL;
+
+ tags[i+1].buffer_type = TSDB_DATA_TYPE_SMALLINT;
+ tags[i+1].buffer = v->v2;
+ tags[i+1].is_null = &one_not_null;
+ tags[i+1].length = NULL;
+
+ tags[i+2].buffer_type = TSDB_DATA_TYPE_BIGINT;
+ tags[i+2].buffer = v->v8;
+ tags[i+2].is_null = &one_not_null;
+ tags[i+2].length = NULL;
+
+ tags[i+3].buffer_type = TSDB_DATA_TYPE_FLOAT;
+ tags[i+3].buffer = v->f4;
+ tags[i+3].is_null = &one_not_null;
+ tags[i+3].length = NULL;
+
+ tags[i+4].buffer_type = TSDB_DATA_TYPE_DOUBLE;
+ tags[i+4].buffer = v->f8;
+ tags[i+4].is_null = &one_not_null;
+ tags[i+4].length = NULL;
+
+ tags[i+5].buffer_type = TSDB_DATA_TYPE_BINARY;
+ tags[i+5].buffer = v->br;
+ tags[i+5].is_null = &one_not_null;
+ tags[i+5].length = (uintptr_t *)lb;
+
+ tags[i+6].buffer_type = TSDB_DATA_TYPE_NCHAR;
+ tags[i+6].buffer = v->nr;
+ tags[i+6].is_null = &one_not_null;
+ tags[i+6].length = (uintptr_t *)lb;
+ }
+
+
+ unsigned long long starttime = getCurrentTime();
+
+// create table m%d (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, br binary(%d), nr nchar(%d), ts2 timestamp)
+ //char *sql = "insert into ? (ts,b,v4,f4,br) using stb1 tags (?,?,?,?,?,?,?,?,?) values(?,?,?,?,?)";
+ char *sql = "insert into ? using stb1 tags (33,?,99,?,?,?,?,?,?) (ts,b,v4,f4,br) values(?,?,?,?,?)";
+
+ int code = taos_stmt_prepare(stmt, sql, 0);
+ if (code != 0){
+ printf("failed to execute taos_stmt_prepare. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+
+ int id = 0;
+ for (int l = 0; l < bingNum; l++) {
+ for (int zz = 0; zz < tableNum; zz++) {
+ char buf[32];
+ sprintf(buf, "m%d", zz);
+ code = taos_stmt_set_tbname_tags(stmt, buf, tags);
+ if (code != 0){
+ printf("failed to execute taos_stmt_set_tbname. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+
+ for (int col=0; col < columnNum; ++col) {
+ code = taos_stmt_bind_single_param_batch(stmt, params + id, col);
+ if (code != 0){
+ printf("failed to execute taos_stmt_bind_single_param_batch. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ id++;
+ }
+
+ code = taos_stmt_add_batch(stmt);
+ if (code != 0) {
+ printf("failed to execute taos_stmt_add_batch. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ }
+
+ code = taos_stmt_execute(stmt);
+ if (code != 0) {
+ printf("failed to execute taos_stmt_execute. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ }
+
+ unsigned long long endtime = getCurrentTime();
+ unsigned long long totalRows = (uint32_t)(totalRowsPerTbl * tableNum);
+ printf("insert total %d records, used %u seconds, avg:%u useconds per record\n", totalRows, (endtime-starttime)/1000000UL, (endtime-starttime)/totalRows);
+
+ free(v->ts);
+ free(v->br);
+ free(v->nr);
+ free(v);
+ free(lb);
+ free(params);
+ free(tags);
+ free(is_null);
+ free(no_null);
+
+ return 0;
+}
+
+// some tags are null
+static int stmt_specifyCol_bind_case_003_autoCreateTbl(TAOS_STMT *stmt, int tableNum, int rowsOfPerColum, int bingNum, int lenOfBinaryDef, int lenOfBinaryAct, int columnNum) {
+ sampleValue* v = (sampleValue *)calloc(1, sizeof(sampleValue));
+
+ int totalRowsPerTbl = rowsOfPerColum * bingNum;
+
+ v->ts = (int64_t *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * tableNum));
+ v->br = (char *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * lenOfBinaryDef));
+ v->nr = (char *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * lenOfBinaryDef));
+
+ int *lb = (int *)malloc(MAX_ROWS_OF_PER_COLUMN * sizeof(int));
+
+ TAOS_BIND *tags = calloc(1, sizeof(TAOS_BIND) * 9 * 1);
+ TAOS_MULTI_BIND *params = calloc(1, sizeof(TAOS_MULTI_BIND) * (size_t)(bingNum * columnNum * (tableNum+1) * rowsOfPerColum));
+ char* is_null = malloc(sizeof(char) * MAX_ROWS_OF_PER_COLUMN);
+ char* no_null = malloc(sizeof(char) * MAX_ROWS_OF_PER_COLUMN);
+ int one_not_null = 0;
+ int one_is_null = 1;
+
+ int64_t tts = 1591060628000;
+
+ for (int i = 0; i < rowsOfPerColum; ++i) {
+ lb[i] = lenOfBinaryAct;
+ no_null[i] = 0;
+ is_null[i] = (i % 10 == 2) ? 1 : 0;
+ v->b[i] = (int8_t)(i % 2);
+ v->v1[i] = (int8_t)((i+1) % 2);
+ v->v2[i] = (int16_t)i;
+ v->v4[i] = (int32_t)(i+1);
+ v->v8[i] = (int64_t)(i+2);
+ v->f4[i] = (float)(i+3);
+ v->f8[i] = (double)(i+4);
+ char tbuf[MAX_BINARY_DEF_LEN];
+ memset(tbuf, 0, MAX_BINARY_DEF_LEN);
+ sprintf(tbuf, "binary-%d-0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", i%10);
+ memcpy(v->br + i*lenOfBinaryDef, tbuf, (size_t)lenOfBinaryAct);
+ memset(tbuf, 0, MAX_BINARY_DEF_LEN);
+ sprintf(tbuf, "nchar-%d-0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", i%10);
+ memcpy(v->nr + i*lenOfBinaryDef, tbuf, (size_t)lenOfBinaryAct);
+ v->ts2[i] = tts + i;
+ }
+
+ int i = 0;
+ for (int j = 0; j < bingNum * tableNum; j++) {
+ params[i+0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+ params[i+0].buffer_length = sizeof(int64_t);
+ params[i+0].buffer = &v->ts[j*rowsOfPerColum];
+ params[i+0].length = NULL;
+ params[i+0].is_null = no_null;
+ params[i+0].num = rowsOfPerColum;
+
+ params[i+1].buffer_type = TSDB_DATA_TYPE_BOOL;
+ params[i+1].buffer_length = sizeof(int8_t);
+ params[i+1].buffer = v->b;
+ params[i+1].length = NULL;
+ params[i+1].is_null = is_null;
+ params[i+1].num = rowsOfPerColum;
+
+ params[i+2].buffer_type = TSDB_DATA_TYPE_INT;
+ params[i+2].buffer_length = sizeof(int32_t);
+ params[i+2].buffer = v->v4;
+ params[i+2].length = NULL;
+ params[i+2].is_null = is_null;
+ params[i+2].num = rowsOfPerColum;
+
+ params[i+3].buffer_type = TSDB_DATA_TYPE_FLOAT;
+ params[i+3].buffer_length = sizeof(float);
+ params[i+3].buffer = v->f4;
+ params[i+3].length = NULL;
+ params[i+3].is_null = is_null;
+ params[i+3].num = rowsOfPerColum;
+
+ params[i+4].buffer_type = TSDB_DATA_TYPE_BINARY;
+ params[i+4].buffer_length = (uintptr_t)lenOfBinaryDef;
+ params[i+4].buffer = v->br;
+ params[i+4].length = lb;
+ params[i+4].is_null = is_null;
+ params[i+4].num = rowsOfPerColum;
+
+ i+=columnNum;
+ }
+
+ //int64_t tts = 1591060628000;
+ for (int i = 0; i < totalRowsPerTbl * tableNum; ++i) {
+ v->ts[i] = tts + i;
+ }
+
+ for (int i = 0; i < 1; ++i) {
+ tags[i+0].buffer_type = TSDB_DATA_TYPE_INT;
+ tags[i+0].buffer = v->v4;
+ tags[i+0].is_null = &one_not_null;
+ tags[i+0].length = NULL;
+
+ tags[i+1].buffer_type = TSDB_DATA_TYPE_BOOL;
+ tags[i+1].buffer = v->b;
+ tags[i+1].is_null = &one_is_null;
+ tags[i+1].length = NULL;
+
+ tags[i+2].buffer_type = TSDB_DATA_TYPE_TINYINT;
+ tags[i+2].buffer = v->v1;
+ tags[i+2].is_null = &one_is_null;
+ tags[i+2].length = NULL;
+
+ tags[i+3].buffer_type = TSDB_DATA_TYPE_SMALLINT;
+ tags[i+3].buffer = v->v2;
+ tags[i+3].is_null = &one_not_null;
+ tags[i+3].length = NULL;
+
+ tags[i+4].buffer_type = TSDB_DATA_TYPE_BIGINT;
+ tags[i+4].buffer = v->v8;
+ tags[i+4].is_null = &one_not_null;
+ tags[i+4].length = NULL;
+
+ tags[i+5].buffer_type = TSDB_DATA_TYPE_FLOAT;
+ tags[i+5].buffer = v->f4;
+ tags[i+5].is_null = &one_is_null;
+ tags[i+5].length = NULL;
+
+ tags[i+6].buffer_type = TSDB_DATA_TYPE_DOUBLE;
+ tags[i+6].buffer = v->f8;
+ tags[i+6].is_null = &one_not_null;
+ tags[i+6].length = NULL;
+
+ tags[i+7].buffer_type = TSDB_DATA_TYPE_BINARY;
+ tags[i+7].buffer = v->br;
+ tags[i+7].is_null = &one_not_null;
+ tags[i+7].length = (uintptr_t *)lb;
+
+ tags[i+8].buffer_type = TSDB_DATA_TYPE_NCHAR;
+ tags[i+8].buffer = v->nr;
+ tags[i+8].is_null = &one_not_null;
+ tags[i+8].length = (uintptr_t *)lb;
+ }
+
+
+ unsigned long long starttime = getCurrentTime();
+
+// create table m%d (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, br binary(%d), nr nchar(%d), ts2 timestamp)
+ //char *sql = "insert into ? (ts,b,v4,f4,br) using stb1 tags (?,?,?,?,?,?,?,?,?) values(?,?,?,?,?)";
+ char *sql = "insert into ? using stb1 tags (?,?,?,?,?,?,?,?,?) (ts,b,v4,f4,br) values(?,?,?,?,?)";
+
+ int code = taos_stmt_prepare(stmt, sql, 0);
+ if (code != 0){
+ printf("failed to execute taos_stmt_prepare. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+
+ int id = 0;
+ for (int l = 0; l < bingNum; l++) {
+ for (int zz = 0; zz < tableNum; zz++) {
+ char buf[32];
+ sprintf(buf, "m%d", zz);
+ code = taos_stmt_set_tbname_tags(stmt, buf, tags);
+ if (code != 0){
+ printf("failed to execute taos_stmt_set_tbname. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+
+ for (int col=0; col < columnNum; ++col) {
+ code = taos_stmt_bind_single_param_batch(stmt, params + id, col);
+ if (code != 0){
+ printf("failed to execute taos_stmt_bind_single_param_batch. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ id++;
+ }
+
+ code = taos_stmt_add_batch(stmt);
+ if (code != 0) {
+ printf("failed to execute taos_stmt_add_batch. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ }
+
+ code = taos_stmt_execute(stmt);
+ if (code != 0) {
+ printf("failed to execute taos_stmt_execute. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ }
+
+ unsigned long long endtime = getCurrentTime();
+ unsigned long long totalRows = (uint32_t)(totalRowsPerTbl * tableNum);
+ printf("insert total %d records, used %u seconds, avg:%u useconds per record\n", totalRows, (endtime-starttime)/1000000UL, (endtime-starttime)/totalRows);
+
+ free(v->ts);
+ free(v->br);
+ free(v->nr);
+ free(v);
+ free(lb);
+ free(params);
+ free(tags);
+ free(is_null);
+ free(no_null);
+
+ return 0;
+}
+
+// specify tags field, and not support , then is error case
+static int stmt_specifyCol_bind_case_004_autoCreateTbl(TAOS_STMT *stmt, int tableNum, int rowsOfPerColum, int bingNum, int lenOfBinaryDef, int lenOfBinaryAct, int columnNum) {
+ sampleValue* v = (sampleValue *)calloc(1, sizeof(sampleValue));
+
+ int totalRowsPerTbl = rowsOfPerColum * bingNum;
+
+ v->ts = (int64_t *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * tableNum));
+ v->br = (char *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * lenOfBinaryDef));
+ v->nr = (char *)malloc(sizeof(int64_t) * (size_t)(totalRowsPerTbl * lenOfBinaryDef));
+
+ int *lb = (int *)malloc(MAX_ROWS_OF_PER_COLUMN * sizeof(int));
+
+ TAOS_BIND *tags = calloc(1, sizeof(TAOS_BIND) * 9 * 1);
+ TAOS_MULTI_BIND *params = calloc(1, sizeof(TAOS_MULTI_BIND) * (size_t)(bingNum * columnNum * (tableNum+1) * rowsOfPerColum));
+ char* is_null = malloc(sizeof(char) * MAX_ROWS_OF_PER_COLUMN);
+ char* no_null = malloc(sizeof(char) * MAX_ROWS_OF_PER_COLUMN);
+ int one_not_null = 0;
+
+ int64_t tts = 1591060628000;
+
+ for (int i = 0; i < rowsOfPerColum; ++i) {
+ lb[i] = lenOfBinaryAct;
+ no_null[i] = 0;
+ is_null[i] = (i % 10 == 2) ? 1 : 0;
+ v->b[i] = (int8_t)(i % 2);
+ v->v1[i] = (int8_t)((i+1) % 2);
+ v->v2[i] = (int16_t)i;
+ v->v4[i] = (int32_t)(i+1);
+ v->v8[i] = (int64_t)(i+2);
+ v->f4[i] = (float)(i+3);
+ v->f8[i] = (double)(i+4);
+ char tbuf[MAX_BINARY_DEF_LEN];
+ memset(tbuf, 0, MAX_BINARY_DEF_LEN);
+ sprintf(tbuf, "binary-%d-0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", i%10);
+ memcpy(v->br + i*lenOfBinaryDef, tbuf, (size_t)lenOfBinaryAct);
+ memset(tbuf, 0, MAX_BINARY_DEF_LEN);
+ sprintf(tbuf, "nchar-%d-0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", i%10);
+ memcpy(v->nr + i*lenOfBinaryDef, tbuf, (size_t)lenOfBinaryAct);
+ v->ts2[i] = tts + i;
+ }
+
+ int i = 0;
+ for (int j = 0; j < bingNum * tableNum; j++) {
+ params[i+0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+ params[i+0].buffer_length = sizeof(int64_t);
+ params[i+0].buffer = &v->ts[j*rowsOfPerColum];
+ params[i+0].length = NULL;
+ params[i+0].is_null = no_null;
+ params[i+0].num = rowsOfPerColum;
+
+ params[i+1].buffer_type = TSDB_DATA_TYPE_BOOL;
+ params[i+1].buffer_length = sizeof(int8_t);
+ params[i+1].buffer = v->b;
+ params[i+1].length = NULL;
+ params[i+1].is_null = is_null;
+ params[i+1].num = rowsOfPerColum;
+
+ params[i+2].buffer_type = TSDB_DATA_TYPE_INT;
+ params[i+2].buffer_length = sizeof(int32_t);
+ params[i+2].buffer = v->v4;
+ params[i+2].length = NULL;
+ params[i+2].is_null = is_null;
+ params[i+2].num = rowsOfPerColum;
+
+ params[i+3].buffer_type = TSDB_DATA_TYPE_FLOAT;
+ params[i+3].buffer_length = sizeof(float);
+ params[i+3].buffer = v->f4;
+ params[i+3].length = NULL;
+ params[i+3].is_null = is_null;
+ params[i+3].num = rowsOfPerColum;
+
+ params[i+4].buffer_type = TSDB_DATA_TYPE_BINARY;
+ params[i+4].buffer_length = (uintptr_t)lenOfBinaryDef;
+ params[i+4].buffer = v->br;
+ params[i+4].length = lb;
+ params[i+4].is_null = is_null;
+ params[i+4].num = rowsOfPerColum;
+
+ i+=columnNum;
+ }
+
+ //int64_t tts = 1591060628000;
+ for (int i = 0; i < totalRowsPerTbl * tableNum; ++i) {
+ v->ts[i] = tts + i;
+ }
+
+ for (int i = 0; i < 1; ++i) {
+ //tags[i+0].buffer_type = TSDB_DATA_TYPE_INT;
+ //tags[i+0].buffer = v->v4;
+ //tags[i+0].is_null = &one_not_null;
+ //tags[i+0].length = NULL;
+
+ tags[i+0].buffer_type = TSDB_DATA_TYPE_BOOL;
+ tags[i+0].buffer = v->b;
+ tags[i+0].is_null = &one_not_null;
+ tags[i+0].length = NULL;
+
+ //tags[i+2].buffer_type = TSDB_DATA_TYPE_TINYINT;
+ //tags[i+2].buffer = v->v1;
+ //tags[i+2].is_null = &one_not_null;
+ //tags[i+2].length = NULL;
+
+ tags[i+1].buffer_type = TSDB_DATA_TYPE_SMALLINT;
+ tags[i+1].buffer = v->v2;
+ tags[i+1].is_null = &one_not_null;
+ tags[i+1].length = NULL;
+
+ tags[i+2].buffer_type = TSDB_DATA_TYPE_BIGINT;
+ tags[i+2].buffer = v->v8;
+ tags[i+2].is_null = &one_not_null;
+ tags[i+2].length = NULL;
+
+ tags[i+3].buffer_type = TSDB_DATA_TYPE_FLOAT;
+ tags[i+3].buffer = v->f4;
+ tags[i+3].is_null = &one_not_null;
+ tags[i+3].length = NULL;
+
+ tags[i+4].buffer_type = TSDB_DATA_TYPE_DOUBLE;
+ tags[i+4].buffer = v->f8;
+ tags[i+4].is_null = &one_not_null;
+ tags[i+4].length = NULL;
+
+ tags[i+5].buffer_type = TSDB_DATA_TYPE_BINARY;
+ tags[i+5].buffer = v->br;
+ tags[i+5].is_null = &one_not_null;
+ tags[i+5].length = (uintptr_t *)lb;
+
+ tags[i+6].buffer_type = TSDB_DATA_TYPE_NCHAR;
+ tags[i+6].buffer = v->nr;
+ tags[i+6].is_null = &one_not_null;
+ tags[i+6].length = (uintptr_t *)lb;
+ }
+
+
+ unsigned long long starttime = getCurrentTime();
+
+// create table m%d (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, br binary(%d), nr nchar(%d), ts2 timestamp)
+ //char *sql = "insert into ? (ts,b,v4,f4,br) using stb1 tags (?,?,?,?,?,?,?,?,?) values(?,?,?,?,?)";
+ char *sql = "insert into ? using stb1 (id1, id2, id3, id4, id5, id6, id7, id8, id9) tags (33,?,99,?,?,?,?,?,?) (ts,b,v4,f4,br) values(?,?,?,?,?)";
+
+ int code = taos_stmt_prepare(stmt, sql, 0);
+ if (code != 0){
+ printf("failed to execute taos_stmt_prepare. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+
+ int id = 0;
+ for (int l = 0; l < bingNum; l++) {
+ for (int zz = 0; zz < tableNum; zz++) {
+ char buf[32];
+ sprintf(buf, "m%d", zz);
+ code = taos_stmt_set_tbname_tags(stmt, buf, tags);
+ if (code != 0){
+ printf("failed to execute taos_stmt_set_tbname. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+
+ for (int col=0; col < columnNum; ++col) {
+ code = taos_stmt_bind_single_param_batch(stmt, params + id, col);
+ if (code != 0){
+ printf("failed to execute taos_stmt_bind_single_param_batch. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ id++;
+ }
+
+ code = taos_stmt_add_batch(stmt);
+ if (code != 0) {
+ printf("failed to execute taos_stmt_add_batch. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ }
+
+ code = taos_stmt_execute(stmt);
+ if (code != 0) {
+ printf("failed to execute taos_stmt_execute. code:0x%x[%s]\n", code, tstrerror(code));
+ return -1;
+ }
+ }
+
+ unsigned long long endtime = getCurrentTime();
+ unsigned long long totalRows = (uint32_t)(totalRowsPerTbl * tableNum);
+ printf("insert total %d records, used %u seconds, avg:%u useconds per record\n", totalRows, (endtime-starttime)/1000000UL, (endtime-starttime)/totalRows);
+
+ free(v->ts);
+ free(v->br);
+ free(v->nr);
+ free(v);
+ free(lb);
+ free(params);
+ free(tags);
+ free(is_null);
+ free(no_null);
+
+ return 0;
+}
+
+static void SpecifyColumnBatchCase_autoCreateTbl(TAOS *taos) {
+ TAOS_STMT *stmt = NULL;
+
+ int tableNum;
+ int lenOfBinaryDef;
+ int rowsOfPerColum;
+ int bingNum;
+ int lenOfBinaryAct;
+ int columnNum;
+
+ int totalRowsPerTbl;
+
+//=======================================================================//
+//=============================== single table ==========================//
+//========== case 1: ======================//
+#if 1
+{
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 1;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db1");
+ stmt_specifyCol_bind_case_001_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 1 check result end\n\n");
+}
+#endif
+
+ //========== case 2: ======================//
+#if 1
+{
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 5;
+ bingNum = 1;
+ lenOfBinaryDef = 1000;
+ lenOfBinaryAct = 15;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db2");
+ stmt_specifyCol_bind_case_001_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ //checkResult(taos, "m1", 0, totalRowsPerTbl);
+ //checkResult(taos, "m2", 0, totalRowsPerTbl);
+ //checkResult(taos, "m3", 0, totalRowsPerTbl);
+ //checkResult(taos, "m4", 0, totalRowsPerTbl);
+ //checkResult(taos, "m5", 0, totalRowsPerTbl);
+ //checkResult(taos, "m6", 0, totalRowsPerTbl);
+ //checkResult(taos, "m7", 0, totalRowsPerTbl);
+ //checkResult(taos, "m8", 0, totalRowsPerTbl);
+ //checkResult(taos, "m9", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 2 check result end\n\n");
+}
+#endif
+
+ //========== case 2-1: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 32767;
+ bingNum = 1;
+ lenOfBinaryDef = 1000;
+ lenOfBinaryAct = 15;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db2_1");
+ stmt_specifyCol_bind_case_001_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ //checkResult(taos, "m1", 0, totalRowsPerTbl);
+ //checkResult(taos, "m2", 0, totalRowsPerTbl);
+ //checkResult(taos, "m3", 0, totalRowsPerTbl);
+ //checkResult(taos, "m4", 0, totalRowsPerTbl);
+ //checkResult(taos, "m5", 0, totalRowsPerTbl);
+ //checkResult(taos, "m6", 0, totalRowsPerTbl);
+ //checkResult(taos, "m7", 0, totalRowsPerTbl);
+ //checkResult(taos, "m8", 0, totalRowsPerTbl);
+ //checkResult(taos, "m9", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 2-1 check result end\n\n");
+ }
+#endif
+ //========== case 2-2: ======================//
+#if 1
+ {
+ printf("====case 2-2 error test start\n");
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 32768;
+ bingNum = 1;
+ lenOfBinaryDef = 1000;
+ lenOfBinaryAct = 15;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db2_2");
+ stmt_specifyCol_bind_case_001_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ //checkResult(taos, "m1", 0, totalRowsPerTbl);
+ //checkResult(taos, "m2", 0, totalRowsPerTbl);
+ //checkResult(taos, "m3", 0, totalRowsPerTbl);
+ //checkResult(taos, "m4", 0, totalRowsPerTbl);
+ //checkResult(taos, "m5", 0, totalRowsPerTbl);
+ //checkResult(taos, "m6", 0, totalRowsPerTbl);
+ //checkResult(taos, "m7", 0, totalRowsPerTbl);
+ //checkResult(taos, "m8", 0, totalRowsPerTbl);
+ //checkResult(taos, "m9", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("====case 2-2 check result end\n\n");
+ }
+#endif
+
+
+ //========== case 3: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 1;
+ bingNum = 5;
+ lenOfBinaryDef = 1000;
+ lenOfBinaryAct = 20;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db3");
+ stmt_specifyCol_bind_case_001_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ //checkResult(taos, "m1", 0, totalRowsPerTbl);
+ //checkResult(taos, "m2", 0, totalRowsPerTbl);
+ //checkResult(taos, "m3", 0, totalRowsPerTbl);
+ //checkResult(taos, "m4", 0, totalRowsPerTbl);
+ //checkResult(taos, "m5", 0, totalRowsPerTbl);
+ //checkResult(taos, "m6", 0, totalRowsPerTbl);
+ //checkResult(taos, "m7", 0, totalRowsPerTbl);
+ //checkResult(taos, "m8", 0, totalRowsPerTbl);
+ //checkResult(taos, "m9", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 3 check result end\n\n");
+ }
+#endif
+
+ //========== case 4: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 5;
+ bingNum = 5;
+ lenOfBinaryDef = 1000;
+ lenOfBinaryAct = 33;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db4");
+ stmt_specifyCol_bind_case_001_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ //checkResult(taos, "m1", 0, totalRowsPerTbl);
+ //checkResult(taos, "m2", 0, totalRowsPerTbl);
+ //checkResult(taos, "m3", 0, totalRowsPerTbl);
+ //checkResult(taos, "m4", 0, totalRowsPerTbl);
+ //checkResult(taos, "m5", 0, totalRowsPerTbl);
+ //checkResult(taos, "m6", 0, totalRowsPerTbl);
+ //checkResult(taos, "m7", 0, totalRowsPerTbl);
+ //checkResult(taos, "m8", 0, totalRowsPerTbl);
+ //checkResult(taos, "m9", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 4 check result end\n\n");
+ }
+#endif
+
+ //=======================================================================//
+ //=============================== multi-rows to single table ==========================//
+ //========== case 5: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 23740;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db5");
+ stmt_specifyCol_bind_case_001_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 5 check result end\n\n");
+ }
+#endif
+
+// ============== error test: 1.multi table, 2.specify some tags
+ //========== case 6: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 2;
+ rowsOfPerColum = 5;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db6");
+ stmt_specifyCol_bind_case_001_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ checkResult(taos, "m1", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 6 check result end\n\n");
+ }
+#endif
+
+ //========== case 7: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 200;
+ rowsOfPerColum = 60;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db7");
+ stmt_specifyCol_bind_case_001_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ checkResult(taos, "m1", 0, totalRowsPerTbl);
+ checkResult(taos, "m99", 0, totalRowsPerTbl);
+ checkResult(taos, "m139", 0, totalRowsPerTbl);
+ checkResult(taos, "m199", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 7 check result end\n\n");
+ }
+#endif
+
+ //========== case 8: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 5;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db8");
+ stmt_specifyCol_bind_case_002_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 8 check result end\n\n");
+ }
+#endif
+
+ //========== case 9: ======================//
+
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 10;
+ rowsOfPerColum = 5;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db9");
+ stmt_specifyCol_bind_case_002_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ checkResult(taos, "m3", 0, totalRowsPerTbl);
+ checkResult(taos, "m6", 0, totalRowsPerTbl);
+ checkResult(taos, "m9", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 9 check result end\n\n");
+ }
+#endif
+
+ //========== case 10: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 23740;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db10");
+ stmt_specifyCol_bind_case_003_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 10 check result end\n\n");
+ }
+#endif
+
+ //========== case 11: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 2;
+ rowsOfPerColum = 5;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db11");
+ stmt_specifyCol_bind_case_003_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ checkResult(taos, "m1", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 11 check result end\n\n");
+ }
+#endif
+
+ //========== case 12: ======================//
+#if 1
+ {
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 200;
+ rowsOfPerColum = 60;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db12");
+ stmt_specifyCol_bind_case_003_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ checkResult(taos, "m1", 0, totalRowsPerTbl);
+ checkResult(taos, "m99", 0, totalRowsPerTbl);
+ checkResult(taos, "m139", 0, totalRowsPerTbl);
+ checkResult(taos, "m199", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("case 12 check result end\n\n");
+ }
+#endif
+
+
+ //========== case 13: ======================//
+#if 1
+ {
+ printf("====case 13 error test start\n");
+ stmt = taos_stmt_init(taos);
+
+ tableNum = 1;
+ rowsOfPerColum = 8;
+ bingNum = 1;
+ lenOfBinaryDef = 40;
+ lenOfBinaryAct = 8;
+ columnNum = 5;
+
+ prepareVcolumn_autoCreateTbl(taos, 1, tableNum, lenOfBinaryDef, "db13");
+ stmt_specifyCol_bind_case_004_autoCreateTbl(stmt, tableNum, rowsOfPerColum, bingNum, lenOfBinaryDef, lenOfBinaryAct, columnNum);
+
+ totalRowsPerTbl = rowsOfPerColum * bingNum;
+ checkResult(taos, "m0", 0, totalRowsPerTbl);
+ taos_stmt_close(stmt);
+ printf("====case 13 check result end\n\n");
+ }
+#endif
+
+ return ;
+
+}
+
+
int main(int argc, char *argv[])
{
TAOS *taos;
char host[32] = "127.0.0.1";
char* serverIp = NULL;
- int threadNum = 1;
+ //int threadNum = 1;
// connect to server
if (argc == 1) {
@@ -3173,10 +4420,10 @@ int main(int argc, char *argv[])
serverIp = argv[1];
} else if (argc == 3) {
serverIp = argv[1];
- threadNum = atoi(argv[2]);
+ //threadNum = atoi(argv[2]);
} else if (argc == 4) {
serverIp = argv[1];
- threadNum = atoi(argv[2]);
+ //threadNum = atoi(argv[2]);
g_runTimes = atoi(argv[3]);
}
@@ -3219,12 +4466,12 @@ int main(int argc, char *argv[])
if (taos == NULL) {
printf("failed to connect to TDengine, reason:%s\n", taos_errstr(taos));
return -1;
- }
+ }
- runCase(taos);
- runCase_long(taos);
- SpecifyColumnBatchCase(taos);
-
+ //runCase(taos);
+ //runCase_long(taos);
+ //SpecifyColumnBatchCase(taos);
+ SpecifyColumnBatchCase_autoCreateTbl(taos);
return 0;
}
diff --git a/tests/script/general/parser/alter_column.sim b/tests/script/general/parser/alter_column.sim
new file mode 100644
index 0000000000..fe109352d1
--- /dev/null
+++ b/tests/script/general/parser/alter_column.sim
@@ -0,0 +1,118 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/exec.sh -n dnode1 -s start
+sleep 100
+sql connect
+
+$dbPrefix = m_alt_db
+$tbPrefix = m_alt_tb
+$mtPrefix = m_alt_mt
+$tbNum = 10
+$rowNum = 5
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== alter.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database if exists $db
+sql create database $db
+sql use $db
+##### alter table test, simeplest case
+sql create table tb (ts timestamp, c1 int, c2 binary(10), c3 nchar(10))
+sql insert into tb values (now, 1, "1", "1")
+sql alter table tb modify column c2 binary(20);
+if $rows != 0 then
+ return -1
+endi
+sql alter table tb modify column c3 nchar(20);
+if $rows != 0 then
+ return -1
+endi
+
+
+sql create stable stb (ts timestamp, c1 int, c2 binary(10), c3 nchar(10)) tags(id1 int, id2 binary(10), id3 nchar(10))
+sql create table tb1 using stb tags(1, "a", "b")
+sql insert into tb1 values (now, 1, "1", "1")
+sql alter stable stb modify column c2 binary(20);
+if $rows != 0 then
+ return -1
+endi
+sql alter table stb modify column c2 binary(30);
+if $rows != 0 then
+ return -1
+endi
+sql alter stable stb modify column c3 nchar(20);
+if $rows != 0 then
+ return -1
+endi
+sql alter table stb modify column c3 nchar(30);
+if $rows != 0 then
+ return -1
+endi
+
+sql alter table stb modify tag id2 binary(11);
+if $rows != 0 then
+ return -1
+endi
+sql alter stable stb modify tag id2 binary(11);
+if $rows != 0 then
+ return -1
+endi
+sql alter table stb modify tag id3 nchar(11);
+if $rows != 0 then
+ return -1
+endi
+sql alter stable stb modify tag id3 nchar(11);
+if $rows != 0 then
+ return -1
+endi
+
+##### ILLEGAL OPERATIONS
+
+# try dropping columns that are defined in metric
+sql_error alter table tb modify column c1 binary(10);
+sql_error alter table tb modify column c1 double;
+sql_error alter table tb modify column c2 int;
+sql_error alter table tb modify column c2 binary(10);
+sql_error alter table tb modify column c2 binary(9);
+sql_error alter table tb modify column c2 binary(-9);
+sql_error alter table tb modify column c2 binary(0);
+sql_error alter table tb modify column c2 binary(17000);
+sql_error alter table tb modify column c2 nchar(30);
+sql_error alter table tb modify column c3 double;
+sql_error alter table tb modify column c3 nchar(10);
+sql_error alter table tb modify column c3 nchar(0);
+sql_error alter table tb modify column c3 nchar(-1);
+sql_error alter table tb modify column c3 binary(80);
+sql_error alter table tb modify column c3 nchar(17000);
+sql_error alter table tb modify column c3 nchar(100), c2 binary(30);
+sql_error alter table tb modify column c1 nchar(100), c2 binary(30);
+sql_error alter stable tb modify column c2 binary(30);
+sql_error alter table tb modify tag c2 binary(30);
+sql_error alter table stb modify tag id2 binary(10);
+sql_error alter table stb modify tag id2 nchar(30);
+sql_error alter stable stb modify tag id2 binary(10);
+sql_error alter stable stb modify tag id2 nchar(30);
+sql_error alter table stb modify tag id3 nchar(10);
+sql_error alter table stb modify tag id3 binary(30);
+sql_error alter stable stb modify tag id3 nchar(10);
+sql_error alter stable stb modify tag id3 binary(30);
+sql_error alter stable stb modify tag id1 binary(30);
+sql_error alter stable stb modify tag c1 binary(30);
+
+
+sql_error alter table tb1 modify column c2 binary(30);
+sql_error alter table tb1 modify column c3 nchar(30);
+sql_error alter table tb1 modify tag id2 binary(30);
+sql_error alter table tb1 modify tag id3 nchar(30);
+sql_error alter stable tb1 modify tag id2 binary(30);
+sql_error alter stable tb1 modify tag id3 nchar(30);
+sql_error alter stable tb1 modify column c2 binary(30);
+
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT