diff --git a/.gitmodules b/.gitmodules
index 0e65b02221be24495edbb3f8da136a0ac61ff812..346f5c00699e51eac39dbfaffdbf96656052b024 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
[submodule "tests/examples/rust"]
path = tests/examples/rust
url = https://github.com/songtianyi/tdengine-rust-bindings.git
+[submodule "deps/jemalloc"]
+ path = deps/jemalloc
+ url = https://github.com/jemalloc/jemalloc
diff --git a/cmake/define.inc b/cmake/define.inc
index ca169f2e0ca0dacbd0dad964f9378da7a70b53eb..673dd73f8db41df62370899ae4fd30f59ae96dec 100755
--- a/cmake/define.inc
+++ b/cmake/define.inc
@@ -59,6 +59,11 @@ IF (TD_LINUX_64)
MESSAGE(STATUS "linux64 is defined")
SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
ADD_DEFINITIONS(-DUSE_LIBICONV)
+
+ IF (JEMALLOC_ENABLED)
+ ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
+ ENDIF ()
+
ENDIF ()
IF (TD_LINUX_32)
diff --git a/cmake/input.inc b/cmake/input.inc
index 00e0e1bc0f00fd8ba8e679f93d5f75e1b75e6bcd..543114ad0956d24900ece70731da504acdf6a72d 100755
--- a/cmake/input.inc
+++ b/cmake/input.inc
@@ -72,3 +72,8 @@ IF (${RANDOM_NETWORK_FAIL} MATCHES "true")
SET(TD_RANDOM_NETWORK_FAIL TRUE)
MESSAGE(STATUS "build with random-network-fail enabled")
ENDIF ()
+
+IF (${JEMALLOC_ENABLED} MATCHES "true")
+ SET(TD_JEMALLOC_ENABLED TRUE)
+ MESSAGE(STATUS "build with jemalloc enabled")
+ENDIF ()
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 77b7da6c13793b5019e64eba832fbe9a04fd3717..6e0cc87ecbcad35345f5164dc69cc1e00f5c4e1f 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -19,3 +19,16 @@ ENDIF ()
IF (TD_DARWIN AND TD_MQTT)
ADD_SUBDIRECTORY(MQTT-C)
ENDIF ()
+
+IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+ MESSAGE("setup dpes/jemalloc, current source dir:" ${CMAKE_CURRENT_SOURCE_DIR})
+ MESSAGE("binary dir:" ${CMAKE_BINARY_DIR})
+ include(ExternalProject)
+ ExternalProject_Add(jemalloc
+ PREFIX "jemalloc"
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc
+ BUILD_IN_SOURCE 1
+ CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
+ BUILD_COMMAND ${MAKE}
+ )
+ENDIF ()
diff --git a/deps/jemalloc b/deps/jemalloc
new file mode 160000
index 0000000000000000000000000000000000000000..ea6b3e973b477b8061e0076bb257dbd7f3faa756
--- /dev/null
+++ b/deps/jemalloc
@@ -0,0 +1 @@
+Subproject commit ea6b3e973b477b8061e0076bb257dbd7f3faa756
diff --git a/documentation20/cn/03.architecture/02.replica/docs.md b/documentation20/cn/03.architecture/02.replica/docs.md
index 8e1b1e3ab1513fbeaa5b9b805263485a13483b9b..59192ee0cc1fdeb130e2f541b424af284fbc916a 100644
--- a/documentation20/cn/03.architecture/02.replica/docs.md
+++ b/documentation20/cn/03.architecture/02.replica/docs.md
@@ -107,9 +107,9 @@ TDengine采取的是Master-Slave模式进行同步，与流行的RAFT一致性
-1. 应用对写请求做基本的合法性检查，通过，则给改请求包打上一个版本号(version, 单调递增）
+1. 应用对写请求做基本的合法性检查，通过，则给该请求包打上一个版本号(version, 单调递增）
2. 应用将打上版本号的写请求封装一个WAL Head, 写入WAL(Write Ahead Log)
-3. 应用调用API syncForwardToPeer，如多vnode B是slave状态，sync模块将包含WAL Head的数据包通过Forward消息发送给vnode B，否则就不转发。
+3. 应用调用API syncForwardToPeer，如果vnode B是slave状态，sync模块将包含WAL Head的数据包通过Forward消息发送给vnode B，否则就不转发。
4. vnode B收到Forward消息后，调用回调函数writeToCache, 交给应用处理
5. vnode B应用在写入成功后，都需要调用syncAckForward通知sync模块已经写入成功。
6. 如果quorum大于1，vnode B需要等待应用的回复确认，收到确认后，vnode B发送Forward Response消息给node A。
@@ -219,7 +219,7 @@ Arbitrator的程序tarbitrator.c在复制模块的同一目录, 编译整个系
不同之处：
-- 选举流程不一样：Raft里任何一个节点是candidate时，主动向其他节点发出vote request, 如果超过半数回答Yes, 这个candidate就成为Leader,开始一个新的term. 而TDengine的实现里，节点上线、离线或角色改变都会触发状态消息在节点组类传播，等节点组里状态稳定一致之后才触发选举流程，因为状态稳定一致，基于同样的状态信息，每个节点做出的决定会是一致的，一旦某个节点符合成为master的条件，无需其他节点认可，它会自动将自己设为master。TDengine里，任何一个节点检测到其他节点或自己的角色发生改变，就会给节点组内其他节点进行广播的。Raft里不存在这样的机制，因此需要投票来解决。
+- 选举流程不一样：Raft里任何一个节点是candidate时，主动向其他节点发出vote request，如果超过半数回答Yes，这个candidate就成为Leader，开始一个新的term。而TDengine的实现里，节点上线、离线或角色改变都会触发状态消息在节点组内传播，等节点组里状态稳定一致之后才触发选举流程，因为状态稳定一致，基于同样的状态信息，每个节点做出的决定会是一致的，一旦某个节点符合成为master的条件，无需其他节点认可，它会自动将自己设为master。TDengine里，任何一个节点检测到其他节点或自己的角色发生改变，就会向节点组内其他节点进行广播。Raft里不存在这样的机制，因此需要投票来解决。
- 对WAL的一条记录，Raft用term + index来做唯一标识。但TDengine只用version（类似index)，在TDengine实现里，仅仅用version是完全可行的, 因为TDengine的选举机制，没有term的概念。
如果整个虚拟节点组全部宕机，重启，但不是所有虚拟节点都上线，这个时候TDengine是不会选出master的，因为未上线的节点有可能有最高version的数据。而RAFT协议，只要超过半数上线，就会选出Leader。
diff --git a/documentation20/cn/03.architecture/docs.md b/documentation20/cn/03.architecture/docs.md
index 3d6e5e4f2179d1199c6fcae889683fb5fff2de9e..2668967102986952793cd0f000f32ae4cc5e1125 100644
--- a/documentation20/cn/03.architecture/docs.md
+++ b/documentation20/cn/03.architecture/docs.md
@@ -343,7 +343,7 @@ TDengine采用数据驱动的方式让缓存中的数据写入硬盘进行持久
对于采集的数据，一般有保留时长，这个时长由系统配置参数keep决定。超过这个设置天数的数据文件，将被系统自动删除，释放存储空间。
-给定days与keep两个参数，一个vnode总的数据文件数为：keep/days。总的数据文件个数不宜过大，也不宜过小。10到100以内合适。基于这个原则，可以设置合理的days。 目前的版本，参数keep可以修改，但对于参数days，一但设置后，不可修改。
+给定days与keep两个参数，一个典型工作状态的vnode中总的数据文件数为：`向上取整(keep/days)+1`个。总的数据文件个数不宜过大，也不宜过小。10到100以内合适。基于这个原则，可以设置合理的days。 目前的版本，参数keep可以修改，但对于参数days，一但设置后，不可修改。
在每个数据文件里，一张表的数据是一块一块存储的。一张表可以有一到多个数据文件块。在一个文件块里，数据是列式存储的，占用的是一片连续的存储空间，这样大大提高读取速度。文件块的大小由系统参数maxRows（每块最大记录条数）决定，缺省值为4096。这个值不宜过大，也不宜过小。过大，定位具体时间段的数据的搜索时间会变长，影响读取速度；过小，数据块的索引太大，压缩效率偏低，也影响读取速度。
diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md
index 9edeb78c6884c79932c464cfaa2ac3d70123d787..94849179936f909de1f344b6a1e61cb1a36a7940 100644
--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -516,7 +516,7 @@ conn.close()
- _TDengineCursor_ 类
参考python中help(taos.TDengineCursor)。
- 这个类对应客户端进行的写入、查询操作。在客户端多线程的场景下，这个游标实例必须保持线程独享，不能夸线程共享使用，否则会导致返回结果出现错误。
+ 这个类对应客户端进行的写入、查询操作。在客户端多线程的场景下，这个游标实例必须保持线程独享，不能跨线程共享使用，否则会导致返回结果出现错误。
- _connect_ 方法
diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md
index af78074eb25391d605bfca9067d24e1626296891..6bd007ff215bb378767f92e7669ee595aa754342 100644
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -37,7 +37,7 @@ taos> DESCRIBE meters;
- Epoch Time：时间戳也可以是一个长整数，表示从 1970-01-01 08:00:00.000 开始的毫秒数
- 时间可以加减，比如 now-2h，表明查询时刻向前推 2 个小时（最近 2 小时）。数字后面的时间单位可以是 u(微秒)、a(毫秒)、s(秒)、m(分)、h(小时)、d(天)、w(周)。 比如 `select * from t1 where ts > now-2w and ts <= now-1w`，表示查询两周前整整一周的数据。在指定降频操作（down sampling）的时间窗口（interval）时，时间单位还可以使用 n(自然月) 和 y(自然年)。
-TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableMicrosecond 就可以支持微秒。
+TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传递的 PRECISION 参数就可以支持微秒。
在TDengine中，普通表的数据模型中可使用以下 10 种数据类型。
@@ -400,6 +400,7 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
tb2_name (tb2_field1_name, ...) [USING stb2_name TAGS (tag_value2, ...)] VALUES (field1_value1, ...) (field1_value2, ...) ...;
```
以自动建表的方式，同时向表tb1_name和tb2_name中按列分别插入多条记录。
+ 说明：`(tb1_field1_name, ...)`的部分可以省略掉，这样就是使用全列模式写入——也即在 VALUES 部分提供的数据，必须为数据表的每个列都显式地提供数据。全列写入速度会远快于指定列，因此建议尽可能采用全列写入方式，此时空列可以填入NULL。
从 2.0.20.5 版本开始，子表的列名可以不跟在子表名称后面，而是可以放在 TAGS 和 VALUES 之间，例如像下面这样写：
```mysql
INSERT INTO tb1_name [USING stb1_name TAGS (tag_value1, ...)] (tb1_field1_name, ...) VALUES (field1_value1, ...) (field1_value2, ...) ...;
@@ -423,9 +424,9 @@ Query OK, 1 row(s) in set (0.001029s)
taos> SHOW TABLES;
Query OK, 0 row(s) in set (0.000946s)
-taos> INSERT INTO d1001 USING meters TAGS('Beijing.Chaoyang', 2);
+taos> INSERT INTO d1001 USING meters TAGS('Beijing.Chaoyang', 2) VALUES('a');
-DB error: invalid SQL: keyword VALUES or FILE required
+DB error: invalid SQL: 'a' (invalid timestamp) (0.039494s)
taos> SHOW TABLES;
table_name | created_time | columns | stable_name |
diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
index 28be037e6c56e6ea156bfd963053f83b0d403a68..e6ddb6d7428446abb8d3c375a62f6ce4640f3398 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/release.sh b/packaging/release.sh
index 1e54bc28724dacf4a2835552eaca678f9ee3cd00..1d81f818a9b386e5520c5fa6b7499a7990cbe23a 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -6,7 +6,7 @@ set -e
#set -x
# release.sh -v [cluster | edge]
-# -c [aarch32 | aarch64 | x64 | x86 | mips64 ...]
+# -c [aarch32 | aarch64 | x64 | x86 | mips64 ...]
# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
# -V [stable | beta]
# -l [full | lite]
@@ -22,11 +22,12 @@ cpuType=x64 # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
osType=Linux # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
pagMode=full # [full | lite]
soMode=dynamic # [static | dynamic]
+allocator=glibc # [glibc | jemalloc]
dbName=taos # [taos | power]
verNumber=""
verNumberComp="2.0.0.0"
-while getopts "hv:V:c:o:l:s:d:n:m:" arg
+while getopts "hv:V:c:o:l:s:d:a:n:m:" arg
do
case $arg in
v)
@@ -53,6 +54,10 @@ do
#echo "dbName=$OPTARG"
dbName=$(echo $OPTARG)
;;
+ a)
+ #echo "allocator=$OPTARG"
+ allocator=$(echo $OPTARG)
+ ;;
n)
#echo "verNumber=$OPTARG"
verNumber=$(echo $OPTARG)
@@ -71,20 +76,21 @@ do
echo " -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...] "
echo " -V [stable | beta] "
echo " -l [full | lite] "
+ echo " -a [glibc | jemalloc] "
echo " -s [static | dynamic] "
echo " -d [taos | power] "
echo " -n [version number] "
echo " -m [compatible version number] "
exit 0
;;
- ?) #unknow option
+ ?) #unknow option
echo "unkonw argument"
exit 1
;;
esac
done
-echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} soMode=${soMode} dbName=${dbName} verNumber=${verNumber} verNumberComp=${verNumberComp}"
+echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} soMode=${soMode} dbName=${dbName} allocator=${allocator} verNumber=${verNumber} verNumberComp=${verNumberComp}"
curr_dir=$(pwd)
@@ -118,7 +124,7 @@ function vercomp () {
echo 0
exit 0
fi
-
+
local IFS=.
local i ver1=($1) ver2=($2)
@@ -164,7 +170,7 @@ if [[ "$verMode" == "cluster" ]]; then
else
gitinfoOfInternal=NULL
fi
-
+
cd ${curr_dir}
# 2. cmake executable file
@@ -180,12 +186,18 @@ else
fi
cd ${compile_dir}
+if [[ "$allocator" == "jemalloc" ]]; then
+ allocator_macro="-DJEMALLOC_ENABLED=true"
+else
+ allocator_macro=""
+fi
+
# check support cpu type
if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "mips64" ]] ; then
if [ "$verMode" != "cluster" ]; then
- cmake ../ -DCPUTYPE=${cpuType} -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp} -DPAGMODE=${pagMode}
+ cmake ../ -DCPUTYPE=${cpuType} -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp} -DPAGMODE=${pagMode} ${allocator_macro}
else
- cmake ../../ -DCPUTYPE=${cpuType} -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp}
+ cmake ../../ -DCPUTYPE=${cpuType} -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp} ${allocator_macro}
fi
else
echo "input cpuType=${cpuType} error!!!"
@@ -199,9 +211,9 @@ cd ${curr_dir}
# 3. Call the corresponding script for packaging
if [ "$osType" != "Darwin" ]; then
if [[ "$verMode" != "cluster" ]] && [[ "$cpuType" == "x64" ]] && [[ "$dbName" == "taos" ]]; then
- ret='0'
+ ret='0'
command -v dpkg >/dev/null 2>&1 || { ret='1'; }
- if [ "$ret" -eq 0 ]; then
+ if [ "$ret" -eq 0 ]; then
echo "====do deb package for the ubuntu system===="
output_dir="${top_dir}/debs"
if [ -d ${output_dir} ]; then
@@ -214,9 +226,9 @@ if [ "$osType" != "Darwin" ]; then
echo "==========dpkg command not exist, so not release deb package!!!"
fi
- ret='0'
+ ret='0'
command -v rpmbuild >/dev/null 2>&1 || { ret='1'; }
- if [ "$ret" -eq 0 ]; then
+ if [ "$ret" -eq 0 ]; then
echo "====do rpm package for the centos system===="
output_dir="${top_dir}/rpms"
if [ -d ${output_dir} ]; then
@@ -229,11 +241,11 @@ if [ "$osType" != "Darwin" ]; then
echo "==========rpmbuild command not exist, so not release rpm package!!!"
fi
fi
-
+
echo "====do tar.gz package for all systems===="
cd ${script_dir}/tools
-
- if [[ "$dbName" == "taos" ]]; then
+
+ if [[ "$dbName" == "taos" ]]; then
${csudo} ./makepkg.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
${csudo} ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
${csudo} ./makearbi.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
diff --git a/packaging/rpm/makerpm.sh b/packaging/rpm/makerpm.sh
index 678e75c500937330c5e7364b580d3146d7974d78..7c3272f8d05dc544c1b4b7ea9c605bfc3cc831d6 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 9910e20bfe8583a64067bbd3fded2c32e23f83d8..8a870286aba1793ec880af6dd0d8a21602ddc86e 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 178a248cfe26e7df248665c744ba462f4eb8fd8b..325ac810539385f8a43fb655b76a8e211d65c872 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 d6ace0a0638bf6c8e78a3c87ce150f731ffca396..0c755d9f728208cbfc2302ef45d7537e437dbb5b 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -1,12 +1,12 @@
#!/bin/bash
#
-# This file is used to install TAOS time-series database on linux systems. The operating system
+# This file is used to install TAOS time-series database on linux systems. The operating system
# is required to use systemd to manage services at boot
set -e
# set -x
-# -----------------------Variables definition---------------------
+# -----------------------Variables definition
source_dir=$1
binary_dir=$2
osType=$3
@@ -71,9 +71,9 @@ if [ "$osType" != "Darwin" ]; then
service_mod=0
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
@@ -123,9 +123,9 @@ function kill_taosd() {
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
@@ -176,6 +176,49 @@ function install_bin() {
[ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmtaos || :
fi
}
+function install_jemalloc() {
+ if [ "$osType" != "Darwin" ]; then
+ /usr/bin/install -c -d /usr/local/bin
+
+ if [ -f ${binary_dir}/build/bin/jemalloc-config ]; then
+ /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc-config /usr/local/bin
+ fi
+ if [ -f ${binary_dir}/build/bin/jemalloc.sh ]; then
+ /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc.sh /usr/local/bin
+ fi
+ if [ -f ${binary_dir}/build/bin/jeprof ]; then
+ /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jeprof /usr/local/bin
+ fi
+ if [ -f ${binary_dir}/build/include/jemalloc/jemalloc.h ]; then
+ /usr/bin/install -c -d /usr/local/include/jemalloc
+ /usr/bin/install -c -m 644 ${binary_dir}/build/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
+ fi
+ if [ -f ${binary_dir}/build/lib/libjemalloc.so.2 ]; then
+ /usr/bin/install -c -d /usr/local/lib
+ /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.so.2 /usr/local/lib
+ ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
+ /usr/bin/install -c -d /usr/local/lib
+ if [ -f ${binary_dir}/build/lib/libjemalloc.a ]; then
+ /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.a /usr/local/lib
+ fi
+ 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/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
+ fi
+ if [ -f ${binary_dir}/build/share/doc/jemalloc/jemalloc.html ]; then
+ /usr/bin/install -c -d /usr/local/share/doc/jemalloc
+ /usr/bin/install -c -m 644 ${binary_dir}/build/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
+ fi
+ if [ -f ${binary_dir}/build/share/man/man3/jemalloc.3 ]; then
+ /usr/bin/install -c -d /usr/local/share/man/man3
+ /usr/bin/install -c -m 644 ${binary_dir}/build/share/man/man3/jemalloc.3 /usr/local/share/man/man3
+ fi
+ fi
+}
function install_lib() {
# Remove links
@@ -183,12 +226,12 @@ function install_lib() {
if [ "$osType" != "Darwin" ]; then
${csudo} rm -f ${lib64_link_dir}/libtaos.* || :
fi
-
+
if [ "$osType" != "Darwin" ]; then
${csudo} cp ${binary_dir}/build/lib/libtaos.so.${verNumber} ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
${csudo} ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
-
+
if [ -d "${lib64_link_dir}" ]; then
${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1
${csudo} ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so
@@ -198,7 +241,9 @@ function install_lib() {
${csudo} ln -sf ${install_main_dir}/driver/libtaos.1.dylib ${lib_link_dir}/libtaos.1.dylib
${csudo} ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
fi
-
+
+ install_jemalloc
+
if [ "$osType" != "Darwin" ]; then
${csudo} ldconfig
fi
@@ -206,26 +251,26 @@ function install_lib() {
function install_header() {
- ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h || :
- ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
+ ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h || :
+ ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
}
function install_config() {
#${csudo} rm -f ${install_main_dir}/cfg/taos.cfg || :
-
- if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
+
+ 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
+ ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
}
-function install_log() {
+function install_log() {
${csudo} rm -rf ${log_dir} || :
if [ "$osType" != "Darwin" ]; then
@@ -239,7 +284,7 @@ function install_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() {
@@ -254,8 +299,8 @@ function install_connector() {
echo "WARNING: go connector not found, please check if want to use it!"
fi
${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector
-
- ${csudo} cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &> /dev/null && ${csudo} chmod 777 ${install_main_dir}/connector/*.jar || echo &> /dev/null
+
+ ${csudo} cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &> /dev/null && ${csudo} chmod 777 ${install_main_dir}/connector/*.jar || echo &> /dev/null
}
function install_examples() {
@@ -264,8 +309,8 @@ 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
@@ -277,9 +322,9 @@ function clean_service_on_sysvinit() {
elif ((${initd_mod}==3)); then
${csudo} update-rc.d -f taosd remove || :
fi
-
+
${csudo} rm -f ${service_config_dir}/taosd || :
-
+
if $(which init &> /dev/null); then
${csudo} init q || :
fi
@@ -298,10 +343,10 @@ function install_service_on_sysvinit() {
${csudo} cp -f ${script_dir}/../rpm/taosd ${install_main_dir}/init.d
${csudo} cp ${script_dir}/../rpm/taosd ${service_config_dir} && ${csudo} chmod a+x ${service_config_dir}/taosd
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 || :
@@ -323,7 +368,7 @@ function clean_service_on_systemd() {
${csudo} systemctl disable taosd &> /dev/null || echo &> /dev/null
${csudo} rm -f ${taosd_service_config}
-}
+}
# taos:2345:respawn:/etc/init.d/taosd start
@@ -383,7 +428,7 @@ function update_TDengine() {
sleep 1
fi
fi
-
+
install_main_path
install_log
@@ -431,16 +476,16 @@ function install_TDengine() {
# Start to install
if [ "$osType" != "Darwin" ]; then
echo -e "${GREEN}Start to install TDEngine...${NC}"
- else
- echo -e "${GREEN}Start to install TDEngine Client ...${NC}"
+ else
+ echo -e "${GREEN}Start to install TDEngine Client ...${NC}"
fi
- install_main_path
+ install_main_path
- if [ "$osType" != "Darwin" ]; then
+ if [ "$osType" != "Darwin" ]; then
install_data
fi
- install_log
+ install_log
install_header
install_lib
install_connector
@@ -452,7 +497,7 @@ function install_TDengine() {
install_service
fi
- install_config
+ install_config
if [ "$osType" != "Darwin" ]; then
# Ask if to start the service
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index e4d2d71b014293e1e328112e0d5e6e5677b772c0..624f72278a87be1d34d64d4e8b9381cbe663bede 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/tscLocalMerge.h b/src/client/inc/tscGlobalmerge.h
similarity index 79%
rename from src/client/inc/tscLocalMerge.h
rename to src/client/inc/tscGlobalmerge.h
index 3c0bde000030000330b33212c7e0c942d50d6a90..a462d78ff0d0b57cc05bbe3bde273700e426ba4e 100644
--- a/src/client/inc/tscLocalMerge.h
+++ b/src/client/inc/tscGlobalmerge.h
@@ -13,8 +13,8 @@
* along with this program. If not, see .
*/
-#ifndef TDENGINE_TSCLOCALMERGE_H
-#define TDENGINE_TSCLOCALMERGE_H
+#ifndef TDENGINE_TSCGLOBALMERGE_H
+#define TDENGINE_TSCGLOBALMERGE_H
#ifdef __cplusplus
extern "C" {
@@ -24,7 +24,7 @@ extern "C" {
#include "qFill.h"
#include "taosmsg.h"
#include "tlosertree.h"
-#include "tsclient.h"
+#include "qExecutor.h"
#define MAX_NUM_OF_SUBQUERY_RETRY 3
@@ -38,7 +38,7 @@ typedef struct SLocalDataSource {
tFilePage filePage;
} SLocalDataSource;
-typedef struct SLocalMerger {
+typedef struct SGlobalMerger {
SLocalDataSource **pLocalDataSrc;
int32_t numOfBuffer;
int32_t numOfCompleted;
@@ -48,20 +48,22 @@ typedef struct SLocalMerger {
tOrderDescriptor *pDesc;
tExtMemBuffer **pExtMemBuffer; // disk-based buffer
char *buf; // temp buffer
-} SLocalMerger;
+} SGlobalMerger;
+
+struct SSqlObj;
typedef struct SRetrieveSupport {
tExtMemBuffer ** pExtMemBuffer; // for build loser tree
tOrderDescriptor *pOrderDescriptor;
int32_t subqueryIndex; // index of current vnode in vnode list
- SSqlObj * pParentSql;
+ struct SSqlObj *pParentSql;
tFilePage * localBuffer; // temp buffer, there is a buffer for each vnode to
uint32_t numOfRetry; // record the number of retry times
} SRetrieveSupport;
-int32_t tscLocalReducerEnvCreate(SQueryInfo* pQueryInfo, tExtMemBuffer ***pMemBuffer, int32_t numOfSub, tOrderDescriptor **pDesc, uint32_t nBufferSize, int64_t id);
+int32_t tscCreateGlobalMergerEnv(SQueryInfo* pQueryInfo, tExtMemBuffer ***pMemBuffer, int32_t numOfSub, tOrderDescriptor **pDesc, uint32_t nBufferSize, int64_t id);
-void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, int32_t numOfVnodes);
+void tscDestroyGlobalMergerEnv(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, int32_t numOfVnodes);
int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, void *data,
int32_t numOfRows, int32_t orderType);
@@ -71,13 +73,13 @@ int32_t tscFlushTmpBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tF
/*
* create local reducer to launch the second-stage reduce process at client site
*/
-int32_t tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
- SQueryInfo *pQueryInfo, SLocalMerger **pMerger, int64_t id);
+int32_t tscCreateGlobalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
+ SQueryInfo *pQueryInfo, SGlobalMerger **pMerger, int64_t id);
-void tscDestroyLocalMerger(SLocalMerger* pLocalMerger);
+void tscDestroyGlobalMerger(SGlobalMerger* pMerger);
#ifdef __cplusplus
}
#endif
-#endif // TDENGINE_TSCLOCALMERGE_H
+#endif // TDENGINE_TSCGLOBALMERGE_H
diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h
index 5bc87a14e9207a73f6f10a5158443410b0d27dd0..864779244fb246353732f6e28c49cb708642f6ce 100644
--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -20,13 +20,13 @@
extern "C" {
#endif
-#include "tsched.h"
#include "exception.h"
#include "os.h"
#include "qExtbuffer.h"
#include "taosdef.h"
#include "tbuffer.h"
-#include "tscLocalMerge.h"
+#include "tscGlobalmerge.h"
+#include "tsched.h"
#include "tsclient.h"
#define UTIL_TABLE_IS_SUPER_TABLE(metaInfo) \
@@ -63,7 +63,7 @@ typedef struct SJoinSupporter {
SArray* exprList;
SFieldInfo fieldsInfo;
STagCond tagCond;
- SGroupbyExpr groupInfo; // group by info
+ SGroupbyExpr groupInfo; // group by info
struct STSBuf* pTSBuf; // the TSBuf struct that holds the compressed timestamp array
FILE* f; // temporary file in order to create TSBuf
char path[PATH_MAX]; // temporary file path, todo dynamic allocate memory
@@ -111,7 +111,7 @@ void* tscDestroyUdfArrayList(SArray* pUdfList);
void* tscDestroyBlockHashTable(SHashObj* pBlockHashTable, bool removeMeta);
int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock);
-int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap);
+int32_t tscMergeTableDataBlocks(SInsertStatementParam *pInsertParam, bool freeBlockMap);
int32_t tscGetDataBlockFromList(SHashObj* pHashList, int64_t id, int32_t size, int32_t startOffset, int32_t rowSize, SName* pName, STableMeta* pTableMeta,
STableDataBlocks** dataBlocks, SArray* pBlockList);
@@ -124,6 +124,8 @@ int32_t tscGetDataBlockFromList(SHashObj* pHashList, int64_t id, int32_t size, i
*/
bool tscIsPointInterpQuery(SQueryInfo* pQueryInfo);
bool tscIsTWAQuery(SQueryInfo* pQueryInfo);
+bool tscIsSessionWindowQuery(SQueryInfo* pQueryInfo);
+bool tscIsSecondStageQuery(SQueryInfo* pQueryInfo);
bool tsIsArithmeticQueryOnAggResult(SQueryInfo* pQueryInfo);
bool tscGroupbyColumn(SQueryInfo* pQueryInfo);
bool tscIsTopBotQuery(SQueryInfo* pQueryInfo);
@@ -286,6 +288,7 @@ void tscSVgroupInfoCopy(SVgroupInfo* dst, const SVgroupInfo* src);
SSqlObj* createSimpleSubObj(SSqlObj* pSql, __async_cb_func_t fp, void* param, int32_t cmd);
void registerSqlObj(SSqlObj* pSql);
+void tscInitResForMerge(SSqlRes* pRes);
SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t fp, void* param, int32_t cmd, SSqlObj* pPrevSql);
void addGroupInfoForSubquery(SSqlObj* pParentObj, SSqlObj* pSql, int32_t subClauseIndex, int32_t tableIndex);
@@ -330,12 +333,15 @@ SVgroupsInfo* tscVgroupsInfoDup(SVgroupsInfo* pVgroupsInfo);
int32_t tscCreateQueryFromQueryInfo(SQueryInfo* pQueryInfo, SQueryAttr* pQueryAttr, void* addr);
void tsCreateSQLFunctionCtx(SQueryInfo* pQueryInfo, SQLFunctionCtx* pCtx, SSchema* pSchema);
-void* createQInfoFromQueryNode(SQueryInfo* pQueryInfo, SExprInfo* pExprs, STableGroupInfo* pTableGroupInfo, SOperatorInfo* pOperator, char* sql, void* addr, int32_t stage);
+void* createQInfoFromQueryNode(SQueryInfo* pQueryInfo, STableGroupInfo* pTableGroupInfo, SOperatorInfo* pOperator, char* sql, void* addr, int32_t stage);
void* malloc_throw(size_t size);
void* calloc_throw(size_t nmemb, size_t size);
char* strdup_throw(const char* str);
+bool vgroupInfoIdentical(SNewVgroupInfo *pExisted, SVgroupMsg* src);
+SNewVgroupInfo createNewVgroupInfo(SVgroupMsg *pVgroupMsg);
+
#ifdef __cplusplus
}
#endif
diff --git a/src/client/inc/tschemautil.h b/src/client/inc/tschemautil.h
deleted file mode 100644
index 0026a27e199289fa06dbcd8f10a2313bc61430ea..0000000000000000000000000000000000000000
--- a/src/client/inc/tschemautil.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc.
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-#ifndef TDENGINE_TSCHEMAUTIL_H
-#define TDENGINE_TSCHEMAUTIL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "taosmsg.h"
-#include "tsclient.h"
-#include "ttoken.h"
-
-/**
- * get the number of tags of this table
- * @param pTableMeta
- * @return
- */
-int32_t tscGetNumOfTags(const STableMeta* pTableMeta);
-
-/**
- * get the number of columns of this table
- * @param pTableMeta
- * @return
- */
-int32_t tscGetNumOfColumns(const STableMeta* pTableMeta);
-
-/**
- * get the basic info of this table
- * @param pTableMeta
- * @return
- */
-STableComInfo tscGetTableInfo(const STableMeta* pTableMeta);
-
-/**
- * get the schema
- * @param pTableMeta
- * @return
- */
-SSchema* tscGetTableSchema(const STableMeta* pTableMeta);
-
-/**
- * get the tag schema
- * @param pMeta
- * @return
- */
-SSchema *tscGetTableTagSchema(const STableMeta *pMeta);
-
-/**
- * get the column schema according to the column index
- * @param pMeta
- * @param colIndex
- * @return
- */
-SSchema *tscGetTableColumnSchema(const STableMeta *pMeta, int32_t colIndex);
-
-/**
- * get the column schema according to the column id
- * @param pTableMeta
- * @param colId
- * @return
- */
-SSchema* tscGetColumnSchemaById(STableMeta* pTableMeta, int16_t colId);
-
-/**
- * create the table meta from the msg
- * @param pTableMetaMsg
- * @param size size of the table meta
- * @return
- */
-STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg);
-
-bool vgroupInfoIdentical(SNewVgroupInfo *pExisted, SVgroupMsg* src);
-SNewVgroupInfo createNewVgroupInfo(SVgroupMsg *pVgroupMsg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // TDENGINE_TSCHEMAUTIL_H
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 948ed11343c03a255fbefbd32ad4ba7d0be94678..50dda7ddfaa3107556695bd9016f25bf20974777 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -40,17 +40,9 @@ extern "C" {
// forward declaration
struct SSqlInfo;
-struct SLocalMerger;
typedef void (*__async_cb_func_t)(void *param, TAOS_RES *tres, int32_t numOfRows);
-typedef struct STableComInfo {
- uint8_t numOfTags;
- uint8_t precision;
- int16_t numOfColumns;
- int32_t rowSize;
-} STableComInfo;
-
typedef struct SNewVgroupInfo {
int32_t vgId;
int8_t inUse;
@@ -66,34 +58,6 @@ typedef struct CChildTableMeta {
uint64_t suid; // super table id
} CChildTableMeta;
-typedef struct STableMeta {
- int32_t vgId;
- STableId id;
- uint8_t tableType;
- char sTableName[TSDB_TABLE_FNAME_LEN]; // super table name
- uint64_t suid; // super table id
- int16_t sversion;
- int16_t tversion;
- STableComInfo tableInfo;
- SSchema schema[]; // if the table is TSDB_CHILD_TABLE, schema is acquired by super table meta info
-} STableMeta;
-
-typedef struct STableMetaInfo {
- STableMeta *pTableMeta; // table meta, cached in client side and acquired by name
- uint32_t tableMetaSize;
- SVgroupsInfo *vgroupList;
- SArray *pVgroupTables; // SArray
-
- /*
- * 1. keep the vgroup index during the multi-vnode super table projection query
- * 2. keep the vgroup index for multi-vnode insertion
- */
- int32_t vgroupIndex;
- SName name;
- char aliasName[TSDB_TABLE_NAME_LEN]; // alias name of table specified in query sql
- SArray *tagColList; // SArray, involved tag columns
-} STableMetaInfo;
-
typedef struct SColumnIndex {
int16_t tableIndex;
int16_t columnIndex;
@@ -111,44 +75,6 @@ typedef struct SInternalField {
SExprInfo *pExpr;
} SInternalField;
-typedef struct SFieldInfo {
- int16_t numOfOutput; // number of column in result
- TAOS_FIELD* final;
- SArray *internalField; // SArray
-} SFieldInfo;
-
-typedef struct SCond {
- uint64_t uid;
- int32_t len; // length of tag query condition data
- char * cond;
-} SCond;
-
-typedef struct SJoinNode {
- uint64_t uid;
- int16_t tagColId;
- SArray* tsJoin;
- SArray* tagJoin;
-} SJoinNode;
-
-typedef struct SJoinInfo {
- bool hasJoin;
- SJoinNode *joinTables[TSDB_MAX_JOIN_TABLE_NUM];
-} SJoinInfo;
-
-typedef struct STagCond {
- // relation between tbname list and query condition, including : TK_AND or TK_OR
- int16_t relType;
-
- // tbname query condition, only support tbname query condition on one table
- SCond tbnameCond;
-
- // join condition, only support two tables join currently
- SJoinInfo joinInfo;
-
- // for different table, the query condition must be seperated
- SArray *pCond;
-} STagCond;
-
typedef struct SParamInfo {
int32_t idx;
uint8_t type;
@@ -191,59 +117,6 @@ typedef struct STableDataBlocks {
SParamInfo *params;
} STableDataBlocks;
-typedef struct SQueryInfo {
- int16_t command; // the command may be different for each subclause, so keep it seperately.
- uint32_t type; // query/insert type
- STimeWindow window; // the whole query time window
-
- SInterval interval; // tumble time window
- SSessionWindow sessionWindow; // session time window
-
- SGroupbyExpr groupbyExpr; // groupby tags info
- SArray * colList; // SArray
- SFieldInfo fieldsInfo;
- SArray * exprList; // SArray
- SArray * exprList1; // final exprlist in case of arithmetic expression exists
- SLimitVal limit;
- SLimitVal slimit;
- STagCond tagCond;
-
- SOrderVal order;
- int16_t fillType; // final result fill type
- int16_t numOfTables;
- STableMetaInfo **pTableMetaInfo;
- struct STSBuf *tsBuf;
- int64_t * fillVal; // default value for fill
- char * msg; // pointer to the pCmd->payload to keep error message temporarily
- int64_t clauseLimit; // limit for current sub clause
-
- int64_t prjOffset; // offset value in the original sql expression, only applied at client side
- int64_t vgroupLimit; // table limit in case of super table projection query + global order + limit
-
- int32_t udColumnId; // current user-defined constant output field column id, monotonically decreases from TSDB_UD_COLUMN_INDEX
- int16_t resColumnId; // result column id
- bool distinctTag; // distinct tag or not
- int32_t round; // 0/1/....
- int32_t bufLen;
- char* buf;
- SQInfo* pQInfo; // global merge operator
- SQueryAttr* pQueryAttr; // query object
-
- struct SQueryInfo *sibling; // sibling
- SArray *pUpstream; // SArray
- struct SQueryInfo *pDownstream;
- int32_t havingFieldNum;
- bool stableQuery;
- bool groupbyColumn;
- bool simpleAgg;
- bool arithmeticOnAgg;
- bool projectionQuery;
- bool hasFilter;
- bool onlyTagQuery;
- bool globalMerge; // need global merge
- SArray *pUdfInfo; // user defined function information SArray
-} SQueryInfo;
-
typedef struct {
STableMeta *pTableMeta;
SVgroupsInfo *pVgroupInfo;
@@ -257,9 +130,13 @@ typedef struct SInsertStatementParam {
int8_t schemaAttached; // denote if submit block is built with table schema or not
STagData tagData; // NOTE: pTagData->data is used as a variant length array
+ int32_t batchSize; // for parameter ('?') binding and batch processing
+ int32_t numOfParams;
+
char msg[512]; // error message
- char *sql; // current sql statement position
uint32_t insertType; // insert data from [file|sql statement| bound statement]
+ uint64_t objectId; // sql object id
+ char *sql; // current sql statement position
} SInsertStatementParam;
// TODO extract sql parser supporter
@@ -268,15 +145,10 @@ typedef struct {
uint8_t msgType;
SInsertStatementParam insertParam;
char reserve1[3]; // fix bus error on arm32
+ int32_t count; // todo remove it
bool subCmd;
- union {
- int32_t count;
- };
-
- char * curSql; // current sql, resume position of sql after parsing paused
char reserve2[3]; // fix bus error on arm32
-
int16_t numOfCols;
char reserve3[2]; // fix bus error on arm32
uint32_t allocSize;
@@ -287,8 +159,6 @@ typedef struct {
SQueryInfo *pQueryInfo;
SQueryInfo *active; // current active query info
int32_t batchSize; // for parameter ('?') binding and batch processing
- int32_t numOfParams;
- STagData tagData; // NOTE: pTagData->data is used as a variant length array
int32_t resColumnId;
} SSqlCmd;
@@ -324,7 +194,7 @@ typedef struct {
TAOS_FIELD* final;
SArithmeticSupport *pArithSup; // support the arithmetic expression calculation on agg functions
- struct SLocalMerger *pLocalMerger;
+ struct SGlobalMerger *pMerger;
} SSqlRes;
typedef struct {
@@ -451,7 +321,7 @@ void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo);
void tscSetResRawPtrRv(SSqlRes* pRes, SQueryInfo* pQueryInfo, SSDataBlock* pBlock);
void handleDownstreamOperator(SSqlObj** pSqlList, int32_t numOfUpstream, SQueryInfo* px, SSqlRes* pOutput);
-void destroyTableNameList(SSqlCmd* pCmd);
+void destroyTableNameList(SInsertStatementParam* pInsertParam);
void tscResetSqlCmd(SSqlCmd *pCmd, bool removeMeta);
@@ -483,7 +353,7 @@ void waitForQueryRsp(void *param, TAOS_RES *tres, int code);
void doAsyncQuery(STscObj *pObj, SSqlObj *pSql, __async_cb_func_t fp, void *param, const char *sqlstr, size_t sqlLen);
void tscImportDataFromFile(SSqlObj *pSql);
-void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen);
+struct SGlobalMerger* tscInitResObjForLocalQuery(int32_t numOfRes, int32_t rowLen, uint64_t id);
bool tscIsUpdateQuery(SSqlObj* pSql);
char* tscGetSqlStr(SSqlObj* pSql);
bool tscIsQueryWithLimit(SSqlObj* pSql);
@@ -493,7 +363,7 @@ void tscSetBoundColumnInfo(SParsedDataColInfo *pColInfo, SSchema *pSchema, int32
char *tscGetErrorMsgPayload(SSqlCmd *pCmd);
-int32_t tscInvalidSQLErrMsg(char *msg, const char *additionalInfo, const char *sql);
+int32_t tscInvalidOperationMsg(char *msg, const char *additionalInfo, const char *sql);
int32_t tscSQLSyntaxErrMsg(char* msg, const char* additionalInfo, const char* sql);
int32_t tscValidateSqlInfo(SSqlObj *pSql, struct SSqlInfo *pInfo);
diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 47798f4e339b6f84231ba4f83ef7dfe702be1677..15276a38887523541cbe37ebf1add2152d2ffe80 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -22,7 +22,7 @@
#include "tscSubquery.h"
#include "tscUtil.h"
#include "tsched.h"
-#include "tschemautil.h"
+#include "qTableMeta.h"
#include "tsclient.h"
static void tscAsyncQueryRowsForNextVnode(void *param, TAOS_RES *tres, int numOfRows);
@@ -58,7 +58,6 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, __async_cb_func_t fp, void* para
strntolower(pSql->sqlstr, sqlstr, (int32_t)sqlLen);
tscDebugL("0x%"PRIx64" SQL: %s", pSql->self, pSql->sqlstr);
- pCmd->curSql = pSql->sqlstr;
pCmd->resColumnId = TSDB_RES_COL_ID;
int32_t code = tsParseSql(pSql, true);
@@ -221,7 +220,7 @@ void taos_fetch_rows_a(TAOS_RES *tres, __async_cb_func_t fp, void *param) {
tscResetForNextRetrieve(pRes);
- // handle the sub queries of join query
+ // handle outer query based on the already retrieved nest query results.
SQueryInfo* pQueryInfo = tscGetQueryInfo(pCmd);
if (pQueryInfo->pUpstream != NULL && taosArrayGetSize(pQueryInfo->pUpstream) > 0) {
SSchedMsg schedMsg = {0};
diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscGlobalmerge.c
similarity index 90%
rename from src/client/src/tscLocalMerge.c
rename to src/client/src/tscGlobalmerge.c
index 4fffe5f12867d99fcd0faf9f616e45e59f4ec684..cec3d92d8cfbaf0fc0e08dcbdac5e6f2debe206d 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscGlobalmerge.c
@@ -13,15 +13,19 @@
* along with this program. If not, see .
*/
-#include "tscLocalMerge.h"
-#include "tscSubquery.h"
#include "os.h"
#include "texpr.h"
#include "tlosertree.h"
+
+#include "tscGlobalmerge.h"
+#include "tscSubquery.h"
#include "tscLog.h"
-#include "tsclient.h"
#include "qUtil.h"
+#define COLMODEL_GET_VAL(data, schema, rowId, colId) \
+ (data + (schema)->pFields[colId].offset * ((schema)->capacity) + (rowId) * (schema)->pFields[colId].field.bytes)
+
+
typedef struct SCompareParam {
SLocalDataSource **pLocalData;
tOrderDescriptor * pDesc;
@@ -29,9 +33,18 @@ typedef struct SCompareParam {
int32_t groupOrderType;
} SCompareParam;
-bool needToMergeRv(SSDataBlock* pBlock, SArray* columnIndex, int32_t index, char **buf);
+static bool needToMerge(SSDataBlock* pBlock, SArray* columnIndexList, int32_t index, char **buf) {
+ int32_t ret = 0;
+ size_t size = taosArrayGetSize(columnIndexList);
+ if (size > 0) {
+ ret = compare_aRv(pBlock, columnIndexList, (int32_t) size, index, buf, TSDB_ORDER_ASC);
+ }
+
+ // if ret == 0, means the result belongs to the same group
+ return (ret == 0);
+}
-int32_t treeComparator(const void *pLeft, const void *pRight, void *param) {
+static int32_t treeComparator(const void *pLeft, const void *pRight, void *param) {
int32_t pLeftIdx = *(int32_t *)pLeft;
int32_t pRightIdx = *(int32_t *)pRight;
@@ -57,16 +70,16 @@ int32_t treeComparator(const void *pLeft, const void *pRight, void *param) {
}
}
-int32_t tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
- SQueryInfo* pQueryInfo, SLocalMerger **pMerger, int64_t id) {
+int32_t tscCreateGlobalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
+ SQueryInfo* pQueryInfo, SGlobalMerger **pMerger, int64_t id) {
if (pMemBuffer == NULL) {
- tscLocalReducerEnvDestroy(pMemBuffer, pDesc, numOfBuffer);
+ tscDestroyGlobalMergerEnv(pMemBuffer, pDesc, numOfBuffer);
tscError("0x%"PRIx64" %p pMemBuffer is NULL", id, pMemBuffer);
return TSDB_CODE_TSC_APP_ERROR;
}
if (pDesc->pColumnModel == NULL) {
- tscLocalReducerEnvDestroy(pMemBuffer, pDesc, numOfBuffer);
+ tscDestroyGlobalMergerEnv(pMemBuffer, pDesc, numOfBuffer);
tscError("0x%"PRIx64" no local buffer or intermediate result format model", id);
return TSDB_CODE_TSC_APP_ERROR;
}
@@ -83,7 +96,7 @@ int32_t tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tO
}
if (numOfFlush == 0 || numOfBuffer == 0) {
- tscLocalReducerEnvDestroy(pMemBuffer, pDesc, numOfBuffer);
+ tscDestroyGlobalMergerEnv(pMemBuffer, pDesc, numOfBuffer);
tscDebug("0x%"PRIx64" no data to retrieve", id);
return TSDB_CODE_SUCCESS;
}
@@ -92,15 +105,15 @@ int32_t tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tO
tscError("0x%"PRIx64" Invalid value of buffer capacity %d and page size %d ", id, pDesc->pColumnModel->capacity,
pMemBuffer[0]->pageSize);
- tscLocalReducerEnvDestroy(pMemBuffer, pDesc, numOfBuffer);
+ tscDestroyGlobalMergerEnv(pMemBuffer, pDesc, numOfBuffer);
return TSDB_CODE_TSC_APP_ERROR;
}
- *pMerger = (SLocalMerger *) calloc(1, sizeof(SLocalMerger));
+ *pMerger = (SGlobalMerger *) calloc(1, sizeof(SGlobalMerger));
if ((*pMerger) == NULL) {
tscError("0x%"PRIx64" failed to create local merge structure, out of memory", id);
- tscLocalReducerEnvDestroy(pMemBuffer, pDesc, numOfBuffer);
+ tscDestroyGlobalMergerEnv(pMemBuffer, pDesc, numOfBuffer);
return TSDB_CODE_TSC_OUT_OF_MEMORY;
}
@@ -160,7 +173,7 @@ int32_t tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tO
// no data actually, no need to merge result.
if (idx == 0) {
tscDebug("0x%"PRIx64" retrieved no data", id);
- tscLocalReducerEnvDestroy(pMemBuffer, pDesc, numOfBuffer);
+ tscDestroyGlobalMergerEnv(pMemBuffer, pDesc, numOfBuffer);
return TSDB_CODE_SUCCESS;
}
@@ -198,7 +211,7 @@ int32_t tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tO
}
// restore the limitation value at the last stage
- if (tscOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
+ if (pQueryInfo->orderProjectQuery) {
pQueryInfo->limit.limit = pQueryInfo->clauseLimit;
pQueryInfo->limit.offset = pQueryInfo->prjOffset;
}
@@ -297,28 +310,28 @@ int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePa
return 0;
}
-void tscDestroyLocalMerger(SLocalMerger* pLocalMerger) {
- if (pLocalMerger == NULL) {
+void tscDestroyGlobalMerger(SGlobalMerger* pMerger) {
+ if (pMerger == NULL) {
return;
}
- for (int32_t i = 0; i < pLocalMerger->numOfBuffer; ++i) {
- tfree(pLocalMerger->pLocalDataSrc[i]);
+ for (int32_t i = 0; i < pMerger->numOfBuffer; ++i) {
+ tfree(pMerger->pLocalDataSrc[i]);
}
- pLocalMerger->numOfBuffer = 0;
- tscLocalReducerEnvDestroy(pLocalMerger->pExtMemBuffer, pLocalMerger->pDesc, pLocalMerger->numOfVnode);
+ pMerger->numOfBuffer = 0;
+ tscDestroyGlobalMergerEnv(pMerger->pExtMemBuffer, pMerger->pDesc, pMerger->numOfVnode);
- pLocalMerger->numOfCompleted = 0;
+ pMerger->numOfCompleted = 0;
- if (pLocalMerger->pLoserTree) {
- tfree(pLocalMerger->pLoserTree->param);
- tfree(pLocalMerger->pLoserTree);
+ if (pMerger->pLoserTree) {
+ tfree(pMerger->pLoserTree->param);
+ tfree(pMerger->pLoserTree);
}
- tfree(pLocalMerger->buf);
- tfree(pLocalMerger->pLocalDataSrc);
- free(pLocalMerger);
+ tfree(pMerger->buf);
+ tfree(pMerger->pLocalDataSrc);
+ free(pMerger);
}
static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SQueryInfo* pQueryInfo, SColumnModel *pModel) {
@@ -329,7 +342,7 @@ static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SQueryInfo*
}
// primary timestamp column is involved in final result
- if (pQueryInfo->interval.interval != 0 || tscOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
+ if (pQueryInfo->interval.interval != 0 || pQueryInfo->orderProjectQuery) {
numOfGroupByCols++;
}
@@ -392,7 +405,7 @@ static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SQueryInfo*
}
}
-int32_t tscLocalReducerEnvCreate(SQueryInfo *pQueryInfo, tExtMemBuffer ***pMemBuffer, int32_t numOfSub,
+int32_t tscCreateGlobalMergerEnv(SQueryInfo *pQueryInfo, tExtMemBuffer ***pMemBuffer, int32_t numOfSub,
tOrderDescriptor **pOrderDesc, uint32_t nBufferSizes, int64_t id) {
SSchema *pSchema = NULL;
SColumnModel *pModel = NULL;
@@ -456,7 +469,7 @@ int32_t tscLocalReducerEnvCreate(SQueryInfo *pQueryInfo, tExtMemBuffer ***pMemBu
* @param pDesc
* @param numOfVnodes
*/
-void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, int32_t numOfVnodes) {
+void tscDestroyGlobalMergerEnv(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, int32_t numOfVnodes) {
tOrderDescDestroy(pDesc);
for (int32_t i = 0; i < numOfVnodes; ++i) {
pMemBuffer[i] = destoryExtMemBuffer(pMemBuffer[i]);
@@ -467,12 +480,12 @@ void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDe
/**
*
- * @param pLocalMerge
+ * @param pMerger
* @param pOneInterDataSrc
* @param treeList
* @return the number of remain input source. if ret == 0, all data has been handled
*/
-int32_t loadNewDataFromDiskFor(SLocalMerger *pLocalMerge, SLocalDataSource *pOneInterDataSrc,
+int32_t loadNewDataFromDiskFor(SGlobalMerger *pMerger, SLocalDataSource *pOneInterDataSrc,
bool *needAdjustLoserTree) {
pOneInterDataSrc->rowIdx = 0;
pOneInterDataSrc->pageId += 1;
@@ -489,17 +502,17 @@ int32_t loadNewDataFromDiskFor(SLocalMerger *pLocalMerge, SLocalDataSource *pOne
#endif
*needAdjustLoserTree = true;
} else {
- pLocalMerge->numOfCompleted += 1;
+ pMerger->numOfCompleted += 1;
pOneInterDataSrc->rowIdx = -1;
pOneInterDataSrc->pageId = -1;
*needAdjustLoserTree = true;
}
- return pLocalMerge->numOfBuffer;
+ return pMerger->numOfBuffer;
}
-void adjustLoserTreeFromNewData(SLocalMerger *pLocalMerge, SLocalDataSource *pOneInterDataSrc,
+void adjustLoserTreeFromNewData(SGlobalMerger *pMerger, SLocalDataSource *pOneInterDataSrc,
SLoserTreeInfo *pTree) {
/*
* load a new data page into memory for intermediate dataset source,
@@ -507,7 +520,7 @@ void adjustLoserTreeFromNewData(SLocalMerger *pLocalMerge, SLocalDataSource *pOn
*/
bool needToAdjust = true;
if (pOneInterDataSrc->filePage.num <= pOneInterDataSrc->rowIdx) {
- loadNewDataFromDiskFor(pLocalMerge, pOneInterDataSrc, &needToAdjust);
+ loadNewDataFromDiskFor(pMerger, pOneInterDataSrc, &needToAdjust);
}
/*
@@ -515,7 +528,7 @@ void adjustLoserTreeFromNewData(SLocalMerger *pLocalMerge, SLocalDataSource *pOn
* if the loser tree is rebuild completed, we do not need to adjust
*/
if (needToAdjust) {
- int32_t leafNodeIdx = pTree->pNode[0].index + pLocalMerge->numOfBuffer;
+ int32_t leafNodeIdx = pTree->pNode[0].index + pMerger->numOfBuffer;
#ifdef _DEBUG_VIEW
printf("before adjust:\t");
@@ -567,7 +580,7 @@ static void setTagValueForMultipleRows(SQLFunctionCtx* pCtx, int32_t numOfOutput
}
}
-static void doExecuteFinalMergeRv(SOperatorInfo* pOperator, int32_t numOfExpr, SSDataBlock* pBlock) {
+static void doExecuteFinalMerge(SOperatorInfo* pOperator, int32_t numOfExpr, SSDataBlock* pBlock) {
SMultiwayMergeInfo* pInfo = pOperator->info;
SQLFunctionCtx* pCtx = pInfo->binfo.pCtx;
@@ -579,7 +592,7 @@ static void doExecuteFinalMergeRv(SOperatorInfo* pOperator, int32_t numOfExpr, S
for(int32_t i = 0; i < pBlock->info.rows; ++i) {
if (pInfo->hasPrev) {
- if (needToMergeRv(pBlock, pInfo->orderColumnList, i, pInfo->prevRow)) {
+ if (needToMerge(pBlock, pInfo->orderColumnList, i, pInfo->prevRow)) {
for (int32_t j = 0; j < numOfExpr; ++j) {
pCtx[j].pInput = add[j] + pCtx[j].inputBytes * i;
}
@@ -694,45 +707,27 @@ static void doExecuteFinalMergeRv(SOperatorInfo* pOperator, int32_t numOfExpr, S
tfree(add);
}
-bool needToMergeRv(SSDataBlock* pBlock, SArray* columnIndexList, int32_t index, char **buf) {
- int32_t ret = 0;
- size_t size = taosArrayGetSize(columnIndexList);
- if (size > 0) {
- ret = compare_aRv(pBlock, columnIndexList, (int32_t) size, index, buf, TSDB_ORDER_ASC);
- }
-
- // if ret == 0, means the result belongs to the same group
- return (ret == 0);
+static bool isAllSourcesCompleted(SGlobalMerger *pMerger) {
+ return (pMerger->numOfBuffer == pMerger->numOfCompleted);
}
-static bool isAllSourcesCompleted(SLocalMerger *pLocalMerge) {
- return (pLocalMerge->numOfBuffer == pLocalMerge->numOfCompleted);
-}
-
-void tscInitResObjForLocalQuery(SSqlObj *pSql, int32_t numOfRes, int32_t rowLen) {
- SSqlRes *pRes = &pSql->res;
- if (pRes->pLocalMerger != NULL) {
- tscDestroyLocalMerger(pRes->pLocalMerger);
- pRes->pLocalMerger = NULL;
- tscDebug("0x%"PRIx64" free local reducer finished", pSql->self);
+SGlobalMerger* tscInitResObjForLocalQuery(int32_t numOfRes, int32_t rowLen, uint64_t id) {
+ SGlobalMerger *pMerger = calloc(1, sizeof(SGlobalMerger));
+ if (pMerger == NULL) {
+ tscDebug("0x%"PRIx64" free local reducer finished", id);
+ return NULL;
}
- pRes->qId = 1; // hack to pass the safety check in fetch_row function
- pRes->numOfRows = 0;
- pRes->row = 0;
-
- pRes->rspType = 0; // used as a flag to denote if taos_retrieved() has been called yet
- pRes->pLocalMerger = (SLocalMerger *)calloc(1, sizeof(SLocalMerger));
-
/*
* One more byte space is required, since the sprintf function needs one additional space to put '\0' at
* the end of string
*/
size_t size = numOfRes * rowLen + 1;
- pRes->pLocalMerger->buf = calloc(1, size);
- pRes->data = pRes->pLocalMerger->buf;
+ pMerger->buf = calloc(1, size);
+ return pMerger;
}
+// todo remove it
int32_t doArithmeticCalculate(SQueryInfo* pQueryInfo, tFilePage* pOutput, int32_t rowSize, int32_t finalRowSize) {
int32_t maxRowSize = MAX(rowSize, finalRowSize);
char* pbuf = calloc(1, (size_t)(pOutput->num * maxRowSize));
@@ -776,9 +771,6 @@ int32_t doArithmeticCalculate(SQueryInfo* pQueryInfo, tFilePage* pOutput, int32_
return offset;
}
-#define COLMODEL_GET_VAL(data, schema, rowId, colId) \
- (data + (schema)->pFields[colId].offset * ((schema)->capacity) + (rowId) * (schema)->pFields[colId].field.bytes)
-
static void appendOneRowToDataBlock(SSDataBlock *pBlock, char *buf, SColumnModel *pModel, int32_t rowIndex,
int32_t maxRows) {
for (int32_t i = 0; i < pBlock->info.numOfCols; ++i) {
@@ -800,7 +792,7 @@ SSDataBlock* doMultiwayMergeSort(void* param, bool* newgroup) {
SMultiwayMergeInfo *pInfo = pOperator->info;
- SLocalMerger *pMerger = pInfo->pMerge;
+ SGlobalMerger *pMerger = pInfo->pMerge;
SLoserTreeInfo *pTree = pMerger->pLoserTree;
pInfo->binfo.pRes->info.rows = 0;
@@ -884,7 +876,7 @@ SSDataBlock* doMultiwayMergeSort(void* param, bool* newgroup) {
return (pInfo->binfo.pRes->info.rows > 0)? pInfo->binfo.pRes:NULL;
}
-static bool isSameGroupRv(SArray* orderColumnList, SSDataBlock* pBlock, char** dataCols) {
+static bool isSameGroup(SArray* orderColumnList, SSDataBlock* pBlock, char** dataCols) {
int32_t numOfCols = (int32_t) taosArrayGetSize(orderColumnList);
for (int32_t i = 0; i < numOfCols; ++i) {
SColIndex *pIndex = taosArrayGet(orderColumnList, i);
@@ -937,7 +929,7 @@ SSDataBlock* doGlobalAggregate(void* param, bool* newgroup) {
}
}
- doExecuteFinalMergeRv(pOperator, pOperator->numOfOutput, pAggInfo->pExistBlock);
+ doExecuteFinalMerge(pOperator, pOperator->numOfOutput, pAggInfo->pExistBlock);
savePrevOrderColumns(pAggInfo->currentGroupColData, pAggInfo->groupColumnList, pAggInfo->pExistBlock, 0,
&pAggInfo->hasGroupColData);
@@ -958,7 +950,7 @@ SSDataBlock* doGlobalAggregate(void* param, bool* newgroup) {
}
if (pAggInfo->hasGroupColData) {
- bool sameGroup = isSameGroupRv(pAggInfo->groupColumnList, pBlock, pAggInfo->currentGroupColData);
+ bool sameGroup = isSameGroup(pAggInfo->groupColumnList, pBlock, pAggInfo->currentGroupColData);
if (!sameGroup) {
*newgroup = true;
pAggInfo->hasDataBlockForNewGroup = true;
@@ -972,7 +964,7 @@ SSDataBlock* doGlobalAggregate(void* param, bool* newgroup) {
setInputDataBlock(pOperator, pAggInfo->binfo.pCtx, pBlock, TSDB_ORDER_ASC);
updateOutputBuf(&pAggInfo->binfo, &pAggInfo->bufCapacity, pBlock->info.rows * pAggInfo->resultRowFactor);
- doExecuteFinalMergeRv(pOperator, pOperator->numOfOutput, pBlock);
+ doExecuteFinalMerge(pOperator, pOperator->numOfOutput, pBlock);
savePrevOrderColumns(pAggInfo->currentGroupColData, pAggInfo->groupColumnList, pBlock, 0, &pAggInfo->hasGroupColData);
handleData = true;
}
diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index abac2407fb7019dd298468a20838fbad680ea7ec..f97f54a6267d2754cb2edf2fd38ff6c075a2b285 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -20,7 +20,7 @@
#include "tname.h"
#include "tscLog.h"
#include "tscUtil.h"
-#include "tschemautil.h"
+#include "qTableMeta.h"
#include "tsclient.h"
#include "taos.h"
#include "tscSubquery.h"
@@ -71,7 +71,9 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
numOfRows = numOfRows + tscGetNumOfTags(pMeta);
}
- tscInitResObjForLocalQuery(pSql, totalNumOfRows, rowLen);
+ pSql->res.pMerger = tscInitResObjForLocalQuery(totalNumOfRows, rowLen, pSql->self);
+ tscInitResForMerge(&pSql->res);
+
SSchema *pSchema = tscGetTableSchema(pMeta);
for (int32_t i = 0; i < numOfRows; ++i) {
@@ -433,7 +435,8 @@ static int32_t tscSCreateSetValueToResObj(SSqlObj *pSql, int32_t rowLen, const c
if (strlen(ddl) == 0) {
}
- tscInitResObjForLocalQuery(pSql, numOfRows, rowLen);
+ pSql->res.pMerger = tscInitResObjForLocalQuery(numOfRows, rowLen, pSql->self);
+ tscInitResForMerge(&pSql->res);
TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 0);
char* dst = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 0) * numOfRows;
@@ -882,7 +885,8 @@ void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnNa
TAOS_FIELD f = tscCreateField((int8_t)type, columnName, (int16_t)valueLength);
tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
- tscInitResObjForLocalQuery(pSql, 1, (int32_t)valueLength);
+ pSql->res.pMerger = tscInitResObjForLocalQuery(1, (int32_t)valueLength, pSql->self);
+ tscInitResForMerge(&pSql->res);
SInternalField* pInfo = tscFieldInfoGetInternalField(&pQueryInfo->fieldsInfo, 0);
pInfo->pExpr = taosArrayGetP(pQueryInfo->exprList, 0);
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index cc89fd6220cfc24faf36157ba7541aa497f2e523..89b024eb17b60cc49caec70deb1600f05f834a7b 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -23,7 +23,7 @@
#include "ttype.h"
#include "hash.h"
#include "tscUtil.h"
-#include "tschemautil.h"
+#include "qTableMeta.h"
#include "tsclient.h"
#include "ttokendef.h"
#include "taosdef.h"
@@ -38,8 +38,9 @@ enum {
TSDB_USE_CLI_TS = 1,
};
-static int32_t tscAllocateMemIfNeed(STableDataBlocks *pDataBlock, int32_t rowSize, int32_t * numOfRows);
-static int32_t parseBoundColumns(SSqlCmd* pCmd, SParsedDataColInfo* pColInfo, SSchema* pSchema, char* str, char** end);
+static int32_t tscAllocateMemIfNeed(STableDataBlocks *pDataBlock, int32_t rowSize, int32_t *numOfRows);
+static int32_t parseBoundColumns(SInsertStatementParam *pInsertParam, SParsedDataColInfo *pColInfo, SSchema *pSchema,
+ char *str, char **end);
static int32_t tscToDouble(SStrToken *pToken, double *value, char **endPtr) {
errno = 0;
@@ -71,7 +72,7 @@ int tsParseTime(SStrToken *pToken, int64_t *time, char **next, char *error, int1
} else {
// strptime("2001-11-12 18:31:01", "%Y-%m-%d %H:%M:%S", &tm);
if (taosParseTime(pToken->z, time, pToken->n, timePrec, tsDaylight) != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(error, "invalid timestamp format", pToken->z);
+ return tscInvalidOperationMsg(error, "invalid timestamp format", pToken->z);
}
return TSDB_CODE_SUCCESS;
@@ -103,7 +104,7 @@ int tsParseTime(SStrToken *pToken, int64_t *time, char **next, char *error, int1
pTokenEnd += index;
if (valueToken.n < 2) {
- return tscInvalidSQLErrMsg(error, "value expected in timestamp", sToken.z);
+ return tscInvalidOperationMsg(error, "value expected in timestamp", sToken.z);
}
if (parseAbsoluteDuration(valueToken.z, valueToken.n, &interval) != TSDB_CODE_SUCCESS) {
@@ -138,7 +139,7 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
char *endptr = NULL;
if (IS_NUMERIC_TYPE(pSchema->type) && pToken->n == 0) {
- return tscInvalidSQLErrMsg(msg, "invalid numeric data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid numeric data", pToken->z);
}
switch (pSchema->type) {
@@ -161,7 +162,7 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
double dv = strtod(pToken->z, NULL);
*(uint8_t *)payload = (int8_t)((dv == 0) ? TSDB_FALSE : TSDB_TRUE);
} else {
- return tscInvalidSQLErrMsg(msg, "invalid bool data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid bool data", pToken->z);
}
}
break;
@@ -173,9 +174,9 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
ret = tStrToInteger(pToken->z, pToken->type, pToken->n, &iv, true);
if (ret != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(msg, "invalid tinyint data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid tinyint data", pToken->z);
} else if (!IS_VALID_TINYINT(iv)) {
- return tscInvalidSQLErrMsg(msg, "data overflow", pToken->z);
+ return tscInvalidOperationMsg(msg, "data overflow", pToken->z);
}
*((uint8_t *)payload) = (uint8_t)iv;
@@ -189,9 +190,9 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
ret = tStrToInteger(pToken->z, pToken->type, pToken->n, &iv, false);
if (ret != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(msg, "invalid unsigned tinyint data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid unsigned tinyint data", pToken->z);
} else if (!IS_VALID_UTINYINT(iv)) {
- return tscInvalidSQLErrMsg(msg, "unsigned tinyint data overflow", pToken->z);
+ return tscInvalidOperationMsg(msg, "unsigned tinyint data overflow", pToken->z);
}
*((uint8_t *)payload) = (uint8_t)iv;
@@ -205,9 +206,9 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
ret = tStrToInteger(pToken->z, pToken->type, pToken->n, &iv, true);
if (ret != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(msg, "invalid smallint data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid smallint data", pToken->z);
} else if (!IS_VALID_SMALLINT(iv)) {
- return tscInvalidSQLErrMsg(msg, "smallint data overflow", pToken->z);
+ return tscInvalidOperationMsg(msg, "smallint data overflow", pToken->z);
}
*((int16_t *)payload) = (int16_t)iv;
@@ -221,9 +222,9 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
ret = tStrToInteger(pToken->z, pToken->type, pToken->n, &iv, false);
if (ret != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(msg, "invalid unsigned smallint data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid unsigned smallint data", pToken->z);
} else if (!IS_VALID_USMALLINT(iv)) {
- return tscInvalidSQLErrMsg(msg, "unsigned smallint data overflow", pToken->z);
+ return tscInvalidOperationMsg(msg, "unsigned smallint data overflow", pToken->z);
}
*((uint16_t *)payload) = (uint16_t)iv;
@@ -237,9 +238,9 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
ret = tStrToInteger(pToken->z, pToken->type, pToken->n, &iv, true);
if (ret != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(msg, "invalid int data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid int data", pToken->z);
} else if (!IS_VALID_INT(iv)) {
- return tscInvalidSQLErrMsg(msg, "int data overflow", pToken->z);
+ return tscInvalidOperationMsg(msg, "int data overflow", pToken->z);
}
*((int32_t *)payload) = (int32_t)iv;
@@ -253,9 +254,9 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
ret = tStrToInteger(pToken->z, pToken->type, pToken->n, &iv, false);
if (ret != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(msg, "invalid unsigned int data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid unsigned int data", pToken->z);
} else if (!IS_VALID_UINT(iv)) {
- return tscInvalidSQLErrMsg(msg, "unsigned int data overflow", pToken->z);
+ return tscInvalidOperationMsg(msg, "unsigned int data overflow", pToken->z);
}
*((uint32_t *)payload) = (uint32_t)iv;
@@ -269,9 +270,9 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
ret = tStrToInteger(pToken->z, pToken->type, pToken->n, &iv, true);
if (ret != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(msg, "invalid bigint data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid bigint data", pToken->z);
} else if (!IS_VALID_BIGINT(iv)) {
- return tscInvalidSQLErrMsg(msg, "bigint data overflow", pToken->z);
+ return tscInvalidOperationMsg(msg, "bigint data overflow", pToken->z);
}
*((int64_t *)payload) = iv;
@@ -284,9 +285,9 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
ret = tStrToInteger(pToken->z, pToken->type, pToken->n, &iv, false);
if (ret != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(msg, "invalid unsigned bigint data", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid unsigned bigint data", pToken->z);
} else if (!IS_VALID_UBIGINT((uint64_t)iv)) {
- return tscInvalidSQLErrMsg(msg, "unsigned bigint data overflow", pToken->z);
+ return tscInvalidOperationMsg(msg, "unsigned bigint data overflow", pToken->z);
}
*((uint64_t *)payload) = iv;
@@ -299,11 +300,11 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
double dv;
if (TK_ILLEGAL == tscToDouble(pToken, &dv, &endptr)) {
- return tscInvalidSQLErrMsg(msg, "illegal float data", pToken->z);
+ return tscInvalidOperationMsg(msg, "illegal float data", pToken->z);
}
if (((dv == HUGE_VAL || dv == -HUGE_VAL) && errno == ERANGE) || dv > FLT_MAX || dv < -FLT_MAX || isinf(dv) || isnan(dv)) {
- return tscInvalidSQLErrMsg(msg, "illegal float data", pToken->z);
+ return tscInvalidOperationMsg(msg, "illegal float data", pToken->z);
}
// *((float *)payload) = (float)dv;
@@ -317,11 +318,11 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
double dv;
if (TK_ILLEGAL == tscToDouble(pToken, &dv, &endptr)) {
- return tscInvalidSQLErrMsg(msg, "illegal double data", pToken->z);
+ return tscInvalidOperationMsg(msg, "illegal double data", pToken->z);
}
if (((dv == HUGE_VAL || dv == -HUGE_VAL) && errno == ERANGE) || isinf(dv) || isnan(dv)) {
- return tscInvalidSQLErrMsg(msg, "illegal double data", pToken->z);
+ return tscInvalidOperationMsg(msg, "illegal double data", pToken->z);
}
*((double *)payload) = dv;
@@ -334,7 +335,7 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
setVardataNull(payload, TSDB_DATA_TYPE_BINARY);
} else { // too long values will return invalid sql, not be truncated automatically
if (pToken->n + VARSTR_HEADER_SIZE > pSchema->bytes) { //todo refactor
- return tscInvalidSQLErrMsg(msg, "string data overflow", pToken->z);
+ return tscInvalidOperationMsg(msg, "string data overflow", pToken->z);
}
STR_WITH_SIZE_TO_VARSTR(payload, pToken->z, pToken->n);
@@ -351,7 +352,7 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
if (!taosMbsToUcs4(pToken->z, pToken->n, varDataVal(payload), pSchema->bytes - VARSTR_HEADER_SIZE, &output)) {
char buf[512] = {0};
snprintf(buf, tListLen(buf), "%s", strerror(errno));
- return tscInvalidSQLErrMsg(msg, buf, pToken->z);
+ return tscInvalidOperationMsg(msg, buf, pToken->z);
}
varDataSetLen(payload, output);
@@ -368,7 +369,7 @@ int32_t tsParseOneColumn(SSchema *pSchema, SStrToken *pToken, char *payload, cha
} else {
int64_t temp;
if (tsParseTime(pToken, &temp, str, msg, timePrec) != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(msg, "invalid timestamp", pToken->z);
+ return tscInvalidOperationMsg(msg, "invalid timestamp", pToken->z);
}
*((int64_t *)payload) = temp;
@@ -417,8 +418,8 @@ int32_t tsCheckTimestamp(STableDataBlocks *pDataBlocks, const char *start) {
return TSDB_CODE_SUCCESS;
}
-int tsParseOneRow(char **str, STableDataBlocks *pDataBlocks, SSqlCmd *pCmd, int16_t timePrec, int32_t *len,
- char *tmpTokenBuf) {
+int tsParseOneRow(char **str, STableDataBlocks *pDataBlocks, int16_t timePrec, int32_t *len,
+ char *tmpTokenBuf, SInsertStatementParam* pInsertParam) {
int32_t index = 0;
SStrToken sToken = {0};
char *payload = pDataBlocks->pData + pDataBlocks->size;
@@ -441,8 +442,8 @@ int tsParseOneRow(char **str, STableDataBlocks *pDataBlocks, SSqlCmd *pCmd, int1
*str += index;
if (sToken.type == TK_QUESTION) {
- if (pCmd->insertParam.insertType != TSDB_QUERY_TYPE_STMT_INSERT) {
- return tscSQLSyntaxErrMsg(pCmd->payload, "? only allowed in binding insertion", *str);
+ if (pInsertParam->insertType != TSDB_QUERY_TYPE_STMT_INSERT) {
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "? only allowed in binding insertion", *str);
}
uint32_t offset = (uint32_t)(start - pDataBlocks->pData);
@@ -450,14 +451,14 @@ int tsParseOneRow(char **str, STableDataBlocks *pDataBlocks, SSqlCmd *pCmd, int1
continue;
}
- strcpy(pCmd->payload, "client out of memory");
+ strcpy(pInsertParam->msg, "client out of memory");
return TSDB_CODE_TSC_OUT_OF_MEMORY;
}
int16_t type = sToken.type;
if ((type != TK_NOW && type != TK_INTEGER && type != TK_STRING && type != TK_FLOAT && type != TK_BOOL &&
type != TK_NULL && type != TK_HEX && type != TK_OCT && type != TK_BIN) || (sToken.n == 0) || (type == TK_RP)) {
- return tscSQLSyntaxErrMsg(pCmd->payload, "invalid data or symbol", sToken.z);
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "invalid data or symbol", sToken.z);
}
// Remove quotation marks
@@ -487,13 +488,13 @@ int tsParseOneRow(char **str, STableDataBlocks *pDataBlocks, SSqlCmd *pCmd, int1
}
bool isPrimaryKey = (colIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX);
- int32_t ret = tsParseOneColumn(pSchema, &sToken, start, pCmd->payload, str, isPrimaryKey, timePrec);
+ int32_t ret = tsParseOneColumn(pSchema, &sToken, start, pInsertParam->msg, str, isPrimaryKey, timePrec);
if (ret != TSDB_CODE_SUCCESS) {
return ret;
}
if (isPrimaryKey && tsCheckTimestamp(pDataBlocks, start) != TSDB_CODE_SUCCESS) {
- tscInvalidSQLErrMsg(pCmd->payload, "client time/server time can not be mixed up", sToken.z);
+ tscInvalidOperationMsg(pInsertParam->msg, "client time/server time can not be mixed up", sToken.z);
return TSDB_CODE_TSC_INVALID_TIME_STAMP;
}
}
@@ -536,7 +537,8 @@ static int32_t rowDataCompar(const void *lhs, const void *rhs) {
}
}
-int32_t tsParseValues(char **str, STableDataBlocks *pDataBlock, int maxRows, SSqlCmd* pCmd, int32_t* numOfRows, char *tmpTokenBuf) {
+int32_t tsParseValues(char **str, STableDataBlocks *pDataBlock, int maxRows, SInsertStatementParam *pInsertParam,
+ int32_t* numOfRows, char *tmpTokenBuf) {
int32_t index = 0;
int32_t code = 0;
@@ -559,7 +561,7 @@ int32_t tsParseValues(char **str, STableDataBlocks *pDataBlock, int maxRows, SSq
int32_t tSize;
code = tscAllocateMemIfNeed(pDataBlock, tinfo.rowSize, &tSize);
if (code != TSDB_CODE_SUCCESS) { //TODO pass the correct error code to client
- strcpy(pCmd->payload, "client out of memory");
+ strcpy(pInsertParam->msg, "client out of memory");
return TSDB_CODE_TSC_OUT_OF_MEMORY;
}
@@ -568,7 +570,7 @@ int32_t tsParseValues(char **str, STableDataBlocks *pDataBlock, int maxRows, SSq
}
int32_t len = 0;
- code = tsParseOneRow(str, pDataBlock, pCmd, precision, &len, tmpTokenBuf);
+ code = tsParseOneRow(str, pDataBlock, precision, &len, tmpTokenBuf, pInsertParam);
if (code != TSDB_CODE_SUCCESS) { // error message has been set in tsParseOneRow, return directly
return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
}
@@ -578,7 +580,7 @@ int32_t tsParseValues(char **str, STableDataBlocks *pDataBlock, int maxRows, SSq
index = 0;
sToken = tStrGetToken(*str, &index, false);
if (sToken.n == 0 || sToken.type != TK_RP) {
- tscSQLSyntaxErrMsg(pCmd->payload, ") expected", *str);
+ tscSQLSyntaxErrMsg(pInsertParam->msg, ") expected", *str);
code = TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
return code;
}
@@ -589,7 +591,7 @@ int32_t tsParseValues(char **str, STableDataBlocks *pDataBlock, int maxRows, SSq
}
if ((*numOfRows) <= 0) {
- strcpy(pCmd->payload, "no any data points");
+ strcpy(pInsertParam->msg, "no any data points");
return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
} else {
return TSDB_CODE_SUCCESS;
@@ -699,7 +701,7 @@ void tscSortRemoveDataBlockDupRows(STableDataBlocks *dataBuf) {
dataBuf->prevTS = INT64_MIN;
}
-static int32_t doParseInsertStatement(SSqlCmd* pCmd, char **str, STableDataBlocks* dataBuf, int32_t *totalNum) {
+static int32_t doParseInsertStatement(SInsertStatementParam *pInsertParam, char **str, STableDataBlocks* dataBuf, int32_t *totalNum) {
STableComInfo tinfo = tscGetTableInfo(dataBuf->pTableMeta);
int32_t maxNumOfRows;
@@ -712,7 +714,7 @@ static int32_t doParseInsertStatement(SSqlCmd* pCmd, char **str, STableDataBlock
char tmpTokenBuf[16*1024] = {0}; // used for deleting Escape character: \\, \', \"
int32_t numOfRows = 0;
- code = tsParseValues(str, dataBuf, maxNumOfRows, pCmd, &numOfRows, tmpTokenBuf);
+ code = tsParseValues(str, dataBuf, maxNumOfRows, pInsertParam, &numOfRows, tmpTokenBuf);
if (code != TSDB_CODE_SUCCESS) {
return code;
}
@@ -720,7 +722,7 @@ static int32_t doParseInsertStatement(SSqlCmd* pCmd, char **str, STableDataBlock
for (uint32_t i = 0; i < dataBuf->numOfParams; ++i) {
SParamInfo *param = dataBuf->params + i;
if (param->idx == -1) {
- param->idx = pCmd->numOfParams++;
+ param->idx = pInsertParam->numOfParams++;
param->offset -= sizeof(SSubmitBlk);
}
}
@@ -728,7 +730,7 @@ static int32_t doParseInsertStatement(SSqlCmd* pCmd, char **str, STableDataBlock
SSubmitBlk *pBlocks = (SSubmitBlk *)(dataBuf->pData);
code = tsSetBlockInfo(pBlocks, dataBuf->pTableMeta, numOfRows);
if (code != TSDB_CODE_SUCCESS) {
- tscInvalidSQLErrMsg(pCmd->payload, "too many rows in sql, total number of rows should be less than 32767", *str);
+ tscInvalidOperationMsg(pInsertParam->msg, "too many rows in sql, total number of rows should be less than 32767", *str);
return code;
}
@@ -748,6 +750,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
SSqlCmd * pCmd = &pSql->cmd;
SQueryInfo *pQueryInfo = tscGetQueryInfo(pCmd);
+ SInsertStatementParam* pInsertParam = &pCmd->insertParam;
char *sql = *sqlstr;
@@ -784,7 +787,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
}
if (numOfColList == 0 && (*boundColumn) != NULL) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
+ return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
}
STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, TABLE_INDEX);
@@ -805,8 +808,8 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
return code;
}
- tNameExtractFullName(&pSTableMetaInfo->name, pCmd->tagData.name);
- pCmd->tagData.dataLen = 0;
+ tNameExtractFullName(&pSTableMetaInfo->name, pInsertParam->tagData.name);
+ pInsertParam->tagData.dataLen = 0;
code = tscGetTableMeta(pSql, pSTableMetaInfo);
if (code != TSDB_CODE_SUCCESS) {
@@ -814,7 +817,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
}
if (!UTIL_TABLE_IS_SUPER_TABLE(pSTableMetaInfo)) {
- return tscInvalidSQLErrMsg(pCmd->payload, "create table only from super table is allowed", sToken.z);
+ return tscInvalidOperationMsg(pInsertParam->msg, "create table only from super table is allowed", sToken.z);
}
SSchema *pTagSchema = tscGetTableTagSchema(pSTableMetaInfo->pTableMeta);
@@ -827,7 +830,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
sToken = tStrGetToken(sql, &index, false);
if (sToken.type != TK_TAGS && sToken.type != TK_LP) {
tscDestroyBoundColumnInfo(&spd);
- return tscInvalidSQLErrMsg(pCmd->payload, "keyword TAGS expected", sToken.z);
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "keyword TAGS expected", sToken.z);
}
// parse the bound tags column
@@ -837,7 +840,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
* tags(tagVal1, tagVal2, ..., tagValn) values(v1, v2,... vn);
*/
char* end = NULL;
- code = parseBoundColumns(pCmd, &spd, pTagSchema, sql, &end);
+ code = parseBoundColumns(pInsertParam, &spd, pTagSchema, sql, &end);
if (code != TSDB_CODE_SUCCESS) {
tscDestroyBoundColumnInfo(&spd);
return code;
@@ -858,7 +861,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
if (sToken.type != TK_LP) {
tscDestroyBoundColumnInfo(&spd);
- return tscInvalidSQLErrMsg(pCmd->payload, "( is expected", sToken.z);
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "( is expected", sToken.z);
}
SKVRowBuilder kvRowBuilder = {0};
@@ -877,7 +880,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
if (TK_ILLEGAL == sToken.type) {
tdDestroyKVRowBuilder(&kvRowBuilder);
tscDestroyBoundColumnInfo(&spd);
- return TSDB_CODE_TSC_INVALID_OPERATION;
+ return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
}
if (sToken.n == 0 || sToken.type == TK_RP) {
@@ -891,7 +894,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
}
char tagVal[TSDB_MAX_TAGS_LEN];
- code = tsParseOneColumn(pSchema, &sToken, tagVal, pCmd->payload, &sql, false, tinfo.precision);
+ code = tsParseOneColumn(pSchema, &sToken, tagVal, pInsertParam->msg, &sql, false, tinfo.precision);
if (code != TSDB_CODE_SUCCESS) {
tdDestroyKVRowBuilder(&kvRowBuilder);
tscDestroyBoundColumnInfo(&spd);
@@ -906,29 +909,29 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
SKVRow row = tdGetKVRowFromBuilder(&kvRowBuilder);
tdDestroyKVRowBuilder(&kvRowBuilder);
if (row == NULL) {
- return tscInvalidSQLErrMsg(pCmd->payload, "tag value expected", NULL);
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "tag value expected", NULL);
}
tdSortKVRowByColIdx(row);
- pCmd->tagData.dataLen = kvRowLen(row);
- if (pCmd->tagData.dataLen <= 0){
- return tscInvalidSQLErrMsg(pCmd->payload, "tag value expected", NULL);
+ pInsertParam->tagData.dataLen = kvRowLen(row);
+ if (pInsertParam->tagData.dataLen <= 0){
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "tag value expected", NULL);
}
- char* pTag = realloc(pCmd->tagData.data, pCmd->tagData.dataLen);
+ char* pTag = realloc(pInsertParam->tagData.data, pInsertParam->tagData.dataLen);
if (pTag == NULL) {
return TSDB_CODE_TSC_OUT_OF_MEMORY;
}
kvRowCpy(pTag, row);
free(row);
- pCmd->tagData.data = pTag;
+ pInsertParam->tagData.data = pTag;
index = 0;
sToken = tStrGetToken(sql, &index, false);
sql += index;
if (sToken.n == 0 || sToken.type != TK_RP) {
- return tscSQLSyntaxErrMsg(pCmd->payload, ") expected", sToken.z);
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, ") expected", sToken.z);
}
/* parse columns after super table tags values.
@@ -941,7 +944,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
int numOfColsAfterTags = 0;
if (sToken.type == TK_LP) {
if (*boundColumn != NULL) {
- return tscSQLSyntaxErrMsg(pCmd->payload, "bind columns again", sToken.z);
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "bind columns again", sToken.z);
} else {
*boundColumn = &sToken.z[0];
}
@@ -959,7 +962,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
}
if (numOfColsAfterTags == 0 && (*boundColumn) != NULL) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
+ return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
}
sToken = tStrGetToken(sql, &index, false);
@@ -968,7 +971,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
sql = sToken.z;
if (tscValidateName(&tableToken) != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(pCmd->payload, "invalid table name", *sqlstr);
+ return tscInvalidOperationMsg(pInsertParam->msg, "invalid table name", *sqlstr);
}
int32_t ret = tscSetTableFullName(&pTableMetaInfo->name, &tableToken, pSql);
@@ -977,7 +980,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
}
if (sql == NULL) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
+ return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
}
code = tscGetTableMetaEx(pSql, pTableMetaInfo, true);
@@ -986,20 +989,18 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
}
} else {
- sql = sToken.z;
-
- if (sql == NULL) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
+ if (sToken.z == NULL) {
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "", sql);
}
+ sql = sToken.z;
code = tscGetTableMetaEx(pSql, pTableMetaInfo, false);
- if (pCmd->curSql == NULL) {
+ if (pInsertParam->sql == NULL) {
assert(code == TSDB_CODE_TSC_ACTION_IN_PROGRESS);
}
}
*sqlstr = sql;
-
return code;
}
@@ -1013,21 +1014,21 @@ int validateTableName(char *tblName, int len, SStrToken* psTblToken) {
return tscValidateName(psTblToken);
}
-static int32_t validateDataSource(SSqlCmd *pCmd, int32_t type, const char *sql) {
- uint32_t *insertType = &pCmd->insertParam.insertType;
+static int32_t validateDataSource(SInsertStatementParam *pInsertParam, int32_t type, const char *sql) {
+ uint32_t *insertType = &pInsertParam->insertType;
if (*insertType == TSDB_QUERY_TYPE_STMT_INSERT && type == TSDB_QUERY_TYPE_INSERT) {
return TSDB_CODE_SUCCESS;
}
if ((*insertType) != 0 && (*insertType) != type) {
- return tscInvalidSQLErrMsg(pCmd->payload, "keyword VALUES and FILE are not allowed to mixed up", sql);
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "keyword VALUES and FILE are not allowed to mixed up", sql);
}
*insertType = type;
return TSDB_CODE_SUCCESS;
}
-static int32_t parseBoundColumns(SSqlCmd* pCmd, SParsedDataColInfo* pColInfo, SSchema* pSchema,
+static int32_t parseBoundColumns(SInsertStatementParam *pInsertParam, SParsedDataColInfo* pColInfo, SSchema* pSchema,
char* str, char **end) {
pColInfo->numOfBound = 0;
@@ -1043,7 +1044,7 @@ static int32_t parseBoundColumns(SSqlCmd* pCmd, SParsedDataColInfo* pColInfo, SS
str += index;
if (sToken.type != TK_LP) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "( is expected", sToken.z);
+ code = tscSQLSyntaxErrMsg(pInsertParam->msg, "( is expected", sToken.z);
goto _clean;
}
@@ -1070,7 +1071,7 @@ static int32_t parseBoundColumns(SSqlCmd* pCmd, SParsedDataColInfo* pColInfo, SS
for (int32_t t = 0; t < pColInfo->numOfCols; ++t) {
if (strncmp(sToken.z, pSchema[t].name, sToken.n) == 0 && strlen(pSchema[t].name) == sToken.n) {
if (pColInfo->cols[t].hasVal == true) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "duplicated column name", sToken.z);
+ code = tscInvalidOperationMsg(pInsertParam->msg, "duplicated column name", sToken.z);
goto _clean;
}
@@ -1083,7 +1084,7 @@ static int32_t parseBoundColumns(SSqlCmd* pCmd, SParsedDataColInfo* pColInfo, SS
}
if (!findColumnIndex) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "invalid column/tag name", sToken.z);
+ code = tscInvalidOperationMsg(pInsertParam->msg, "invalid column/tag name", sToken.z);
goto _clean;
}
}
@@ -1092,10 +1093,25 @@ static int32_t parseBoundColumns(SSqlCmd* pCmd, SParsedDataColInfo* pColInfo, SS
return TSDB_CODE_SUCCESS;
_clean:
- pCmd->curSql = NULL;
+ pInsertParam->sql = NULL;
return code;
}
+static int32_t getFileFullPath(SStrToken* pToken, char* output) {
+ char path[PATH_MAX] = {0};
+ strncpy(path, pToken->z, pToken->n);
+ strdequote(path);
+
+ wordexp_t full_path;
+ if (wordexp(path, &full_path, 0) != 0) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
+
+ tstrncpy(output, full_path.we_wordv[0], PATH_MAX);
+ wordfree(&full_path);
+ return TSDB_CODE_SUCCESS;
+}
+
/**
* parse insert sql
* @param pSql
@@ -1103,7 +1119,9 @@ static int32_t parseBoundColumns(SSqlCmd* pCmd, SParsedDataColInfo* pColInfo, SS
*/
int tsParseInsertSql(SSqlObj *pSql) {
SSqlCmd *pCmd = &pSql->cmd;
- char* str = pCmd->curSql;
+
+ SInsertStatementParam* pInsertParam = &pCmd->insertParam;
+ char* str = pInsertParam->sql;
int32_t totalNum = 0;
int32_t code = TSDB_CODE_SUCCESS;
@@ -1118,21 +1136,17 @@ int tsParseInsertSql(SSqlObj *pSql) {
return code;
}
- if ((code = tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE)) != TSDB_CODE_SUCCESS) {
- return code;
- }
-
- if (NULL == pCmd->insertParam.pTableBlockHashList) {
- pCmd->insertParam.pTableBlockHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
- if (NULL == pCmd->insertParam.pTableBlockHashList) {
+ if (NULL == pInsertParam->pTableBlockHashList) {
+ pInsertParam->pTableBlockHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
+ if (NULL == pInsertParam->pTableBlockHashList) {
code = TSDB_CODE_TSC_OUT_OF_MEMORY;
goto _clean;
}
} else {
- str = pCmd->curSql;
+ str = pInsertParam->sql;
}
- tscDebug("0x%"PRIx64" create data block list hashList:%p", pSql->self, pCmd->insertParam.pTableBlockHashList);
+ tscDebug("0x%"PRIx64" create data block list hashList:%p", pSql->self, pInsertParam->pTableBlockHashList);
while (1) {
int32_t index = 0;
@@ -1144,7 +1158,7 @@ int tsParseInsertSql(SSqlObj *pSql) {
* if the data is from the data file, no data has been generated yet. So, there no data to
* merge or submit, save the file path and parse the file in other routines.
*/
- if (TSDB_QUERY_HAS_TYPE(pCmd->insertParam.insertType, TSDB_QUERY_TYPE_FILE_INSERT)) {
+ if (TSDB_QUERY_HAS_TYPE(pInsertParam->insertType, TSDB_QUERY_TYPE_FILE_INSERT)) {
goto _clean;
}
@@ -1160,13 +1174,13 @@ int tsParseInsertSql(SSqlObj *pSql) {
}
}
- pCmd->curSql = sToken.z;
+ pInsertParam->sql = sToken.z;
char buf[TSDB_TABLE_FNAME_LEN];
SStrToken sTblToken;
sTblToken.z = buf;
// Check if the table name available or not
if (validateTableName(sToken.z, sToken.n, &sTblToken) != TSDB_CODE_SUCCESS) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "table name invalid", sToken.z);
+ code = tscInvalidOperationMsg(pInsertParam->msg, "table name invalid", sToken.z);
goto _clean;
}
@@ -1185,12 +1199,12 @@ int tsParseInsertSql(SSqlObj *pSql) {
}
tscError("0x%"PRIx64" async insert parse error, code:%s", pSql->self, tstrerror(code));
- pCmd->curSql = NULL;
+ pInsertParam->sql = NULL;
goto _clean;
}
if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "insert data into super table is not supported", NULL);
+ code = tscInvalidOperationMsg(pInsertParam->msg, "insert data into super table is not supported", NULL);
goto _clean;
}
@@ -1199,58 +1213,49 @@ int tsParseInsertSql(SSqlObj *pSql) {
str += index;
if (sToken.n == 0 || (sToken.type != TK_FILE && sToken.type != TK_VALUES)) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "keyword VALUES or FILE required", sToken.z);
+ code = tscSQLSyntaxErrMsg(pInsertParam->msg, "keyword VALUES or FILE required", sToken.z);
goto _clean;
}
STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
if (sToken.type == TK_FILE) {
- if (validateDataSource(pCmd, TSDB_QUERY_TYPE_FILE_INSERT, sToken.z) != TSDB_CODE_SUCCESS) {
+ if (validateDataSource(pInsertParam, TSDB_QUERY_TYPE_FILE_INSERT, sToken.z) != TSDB_CODE_SUCCESS) {
goto _clean;
}
index = 0;
sToken = tStrGetToken(str, &index, false);
if (sToken.type != TK_STRING && sToken.type != TK_ID) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "file path is required following keyword FILE", sToken.z);
+ code = tscSQLSyntaxErrMsg(pInsertParam->msg, "file path is required following keyword FILE", sToken.z);
goto _clean;
}
str += index;
if (sToken.n == 0) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "file path is required following keyword FILE", sToken.z);
+ code = tscSQLSyntaxErrMsg(pInsertParam->msg, "file path is required following keyword FILE", sToken.z);
goto _clean;
}
- strncpy(pCmd->payload, sToken.z, sToken.n);
- strdequote(pCmd->payload);
-
- // todo refactor extract method
- wordexp_t full_path;
- if (wordexp(pCmd->payload, &full_path, 0) != 0) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "invalid filename", sToken.z);
+ code = getFileFullPath(&sToken, pCmd->payload);
+ if (code != TSDB_CODE_SUCCESS) {
+ tscInvalidOperationMsg(pInsertParam->msg, "invalid filename", sToken.z);
goto _clean;
}
-
- tstrncpy(pCmd->payload, full_path.we_wordv[0], pCmd->allocSize);
- wordfree(&full_path);
-
} else {
if (bindedColumns == NULL) {
STableMeta *pTableMeta = pTableMetaInfo->pTableMeta;
-
- if (validateDataSource(pCmd, TSDB_QUERY_TYPE_INSERT, sToken.z) != TSDB_CODE_SUCCESS) {
+ if (validateDataSource(pInsertParam, TSDB_QUERY_TYPE_INSERT, sToken.z) != TSDB_CODE_SUCCESS) {
goto _clean;
}
STableDataBlocks *dataBuf = NULL;
- int32_t ret = tscGetDataBlockFromList(pCmd->insertParam.pTableBlockHashList, pTableMeta->id.uid, TSDB_DEFAULT_PAYLOAD_SIZE,
+ int32_t ret = tscGetDataBlockFromList(pInsertParam->pTableBlockHashList, pTableMeta->id.uid, TSDB_DEFAULT_PAYLOAD_SIZE,
sizeof(SSubmitBlk), tinfo.rowSize, &pTableMetaInfo->name, pTableMeta,
&dataBuf, NULL);
if (ret != TSDB_CODE_SUCCESS) {
goto _clean;
}
- code = doParseInsertStatement(pCmd, &str, dataBuf, &totalNum);
+ code = doParseInsertStatement(pInsertParam, &str, dataBuf, &totalNum);
if (code != TSDB_CODE_SUCCESS) {
goto _clean;
}
@@ -1258,12 +1263,12 @@ int tsParseInsertSql(SSqlObj *pSql) {
// insert into tablename(col1, col2,..., coln) values(v1, v2,... vn);
STableMeta *pTableMeta = tscGetTableMetaInfoFromCmd(pCmd, 0)->pTableMeta;
- if (validateDataSource(pCmd, TSDB_QUERY_TYPE_INSERT, sToken.z) != TSDB_CODE_SUCCESS) {
+ if (validateDataSource(pInsertParam, TSDB_QUERY_TYPE_INSERT, sToken.z) != TSDB_CODE_SUCCESS) {
goto _clean;
}
STableDataBlocks *dataBuf = NULL;
- int32_t ret = tscGetDataBlockFromList(pCmd->insertParam.pTableBlockHashList, pTableMeta->id.uid, TSDB_DEFAULT_PAYLOAD_SIZE,
+ int32_t ret = tscGetDataBlockFromList(pInsertParam->pTableBlockHashList, pTableMeta->id.uid, TSDB_DEFAULT_PAYLOAD_SIZE,
sizeof(SSubmitBlk), tinfo.rowSize, &pTableMetaInfo->name, pTableMeta,
&dataBuf, NULL);
if (ret != TSDB_CODE_SUCCESS) {
@@ -1271,22 +1276,22 @@ int tsParseInsertSql(SSqlObj *pSql) {
}
SSchema *pSchema = tscGetTableSchema(pTableMeta);
- code = parseBoundColumns(pCmd, &dataBuf->boundColumnInfo, pSchema, bindedColumns, NULL);
+ code = parseBoundColumns(pInsertParam, &dataBuf->boundColumnInfo, pSchema, bindedColumns, NULL);
if (code != TSDB_CODE_SUCCESS) {
goto _clean;
}
if (dataBuf->boundColumnInfo.cols[0].hasVal == false) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "primary timestamp column can not be null", NULL);
+ code = tscInvalidOperationMsg(pInsertParam->msg, "primary timestamp column can not be null", NULL);
goto _clean;
}
if (sToken.type != TK_VALUES) {
- code = tscInvalidSQLErrMsg(pCmd->payload, "keyword VALUES is expected", sToken.z);
+ code = tscSQLSyntaxErrMsg(pInsertParam->msg, "keyword VALUES is expected", sToken.z);
goto _clean;
}
- code = doParseInsertStatement(pCmd, &str, dataBuf, &totalNum);
+ code = doParseInsertStatement(pInsertParam, &str, dataBuf, &totalNum);
if (code != TSDB_CODE_SUCCESS) {
goto _clean;
}
@@ -1295,13 +1300,13 @@ int tsParseInsertSql(SSqlObj *pSql) {
}
// we need to keep the data blocks if there are parameters in the sql
- if (pCmd->numOfParams > 0) {
+ if (pInsertParam->numOfParams > 0) {
goto _clean;
}
// merge according to vgId
- if (!TSDB_QUERY_HAS_TYPE(pCmd->insertParam.insertType, TSDB_QUERY_TYPE_STMT_INSERT) && taosHashGetSize(pCmd->insertParam.pTableBlockHashList) > 0) {
- if ((code = tscMergeTableDataBlocks(pSql, true)) != TSDB_CODE_SUCCESS) {
+ if (!TSDB_QUERY_HAS_TYPE(pInsertParam->insertType, TSDB_QUERY_TYPE_STMT_INSERT) && taosHashGetSize(pInsertParam->pTableBlockHashList) > 0) {
+ if ((code = tscMergeTableDataBlocks(pInsertParam, true)) != TSDB_CODE_SUCCESS) {
goto _clean;
}
}
@@ -1310,7 +1315,7 @@ int tsParseInsertSql(SSqlObj *pSql) {
goto _clean;
_clean:
- pCmd->curSql = NULL;
+ pInsertParam->sql = NULL;
return code;
}
@@ -1325,18 +1330,19 @@ int tsInsertInitialCheck(SSqlObj *pSql) {
SStrToken sToken = tStrGetToken(pSql->sqlstr, &index, false);
assert(sToken.type == TK_INSERT || sToken.type == TK_IMPORT);
- pCmd->count = 0;
+ pCmd->count = 0;
pCmd->command = TSDB_SQL_INSERT;
+ SInsertStatementParam* pInsertParam = &pCmd->insertParam;
SQueryInfo *pQueryInfo = tscGetQueryInfoS(pCmd);
TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_INSERT);
sToken = tStrGetToken(pSql->sqlstr, &index, false);
if (sToken.type != TK_INTO) {
- return tscInvalidSQLErrMsg(pCmd->payload, "keyword INTO is expected", sToken.z);
+ return tscSQLSyntaxErrMsg(pInsertParam->msg, "keyword INTO is expected", sToken.z);
}
- pCmd->curSql = sToken.z + sToken.n;
+ pInsertParam->sql = sToken.z + sToken.n;
return TSDB_CODE_SUCCESS;
}
@@ -1345,7 +1351,7 @@ int tsParseSql(SSqlObj *pSql, bool initial) {
SSqlCmd* pCmd = &pSql->cmd;
if (!initial) {
- tscDebug("0x%"PRIx64" resume to parse sql: %s", pSql->self, pCmd->curSql);
+ tscDebug("0x%"PRIx64" resume to parse sql: %s", pSql->self, pCmd->insertParam.sql);
}
ret = tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE);
@@ -1355,12 +1361,11 @@ int tsParseSql(SSqlObj *pSql, bool initial) {
if (tscIsInsertData(pSql->sqlstr)) {
if (initial && ((ret = tsInsertInitialCheck(pSql)) != TSDB_CODE_SUCCESS)) {
+ strncpy(pCmd->payload, pCmd->insertParam.msg, TSDB_DEFAULT_PAYLOAD_SIZE);
return ret;
}
ret = tsParseInsertSql(pSql);
- assert(ret == TSDB_CODE_SUCCESS || ret == TSDB_CODE_TSC_ACTION_IN_PROGRESS || ret == TSDB_CODE_TSC_SQL_SYNTAX_ERROR || ret == TSDB_CODE_TSC_INVALID_OPERATION);
-
if (pSql->parseRetry < 1 && (ret == TSDB_CODE_TSC_SQL_SYNTAX_ERROR || ret == TSDB_CODE_TSC_INVALID_OPERATION)) {
tscDebug("0x%"PRIx64 " parse insert sql statement failed, code:%s, clear meta cache and retry ", pSql->self, tstrerror(ret));
@@ -1371,6 +1376,10 @@ int tsParseSql(SSqlObj *pSql, bool initial) {
ret = tsParseInsertSql(pSql);
}
}
+
+ if (ret != TSDB_CODE_SUCCESS) {
+ strncpy(pCmd->payload, pCmd->insertParam.msg, TSDB_DEFAULT_PAYLOAD_SIZE);
+ }
} else {
SSqlInfo sqlInfo = qSqlParse(pSql->sqlstr);
ret = tscValidateSqlInfo(pSql, &sqlInfo);
@@ -1395,29 +1404,25 @@ int tsParseSql(SSqlObj *pSql, bool initial) {
return ret;
}
-static int doPackSendDataBlock(SSqlObj *pSql, int32_t numOfRows, STableDataBlocks *pTableDataBlocks) {
+static int doPackSendDataBlock(SSqlObj* pSql, SInsertStatementParam *pInsertParam, STableMeta* pTableMeta, int32_t numOfRows, STableDataBlocks *pTableDataBlocks) {
int32_t code = TSDB_CODE_SUCCESS;
- SSqlCmd *pCmd = &pSql->cmd;
- pSql->res.numOfRows = 0;
-
- STableMeta *pTableMeta = tscGetTableMetaInfoFromCmd(pCmd, 0)->pTableMeta;
SSubmitBlk *pBlocks = (SSubmitBlk *)(pTableDataBlocks->pData);
code = tsSetBlockInfo(pBlocks, pTableMeta, numOfRows);
if (code != TSDB_CODE_SUCCESS) {
- return tscInvalidSQLErrMsg(pCmd->payload, "too many rows in sql, total number of rows should be less than 32767", NULL);
+ return tscInvalidOperationMsg(pInsertParam->msg, "too many rows in sql, total number of rows should be less than 32767", NULL);
}
- if ((code = tscMergeTableDataBlocks(pSql, true)) != TSDB_CODE_SUCCESS) {
+ if ((code = tscMergeTableDataBlocks(pInsertParam, true)) != TSDB_CODE_SUCCESS) {
return code;
}
- STableDataBlocks *pDataBlock = taosArrayGetP(pCmd->insertParam.pDataBlocks, 0);
+ STableDataBlocks *pDataBlock = taosArrayGetP(pInsertParam->pDataBlocks, 0);
if ((code = tscCopyDataBlockToPayload(pSql, pDataBlock)) != TSDB_CODE_SUCCESS) {
return code;
}
- return tscBuildAndSendRequest(pSql, NULL);
+ return TSDB_CODE_SUCCESS;
}
typedef struct SImportFileSupport {
@@ -1466,13 +1471,14 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int32_t numOfRow
STableMeta * pTableMeta = pTableMetaInfo->pTableMeta;
STableComInfo tinfo = tscGetTableInfo(pTableMeta);
- destroyTableNameList(pCmd);
+ SInsertStatementParam* pInsertParam = &pCmd->insertParam;
+ destroyTableNameList(pInsertParam);
- pCmd->insertParam.pDataBlocks = tscDestroyBlockArrayList(pCmd->insertParam.pDataBlocks);
+ pInsertParam->pDataBlocks = tscDestroyBlockArrayList(pInsertParam->pDataBlocks);
- if (pCmd->insertParam.pTableBlockHashList == NULL) {
- pCmd->insertParam.pTableBlockHashList = taosHashInit(16, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
- if (pCmd->insertParam.pTableBlockHashList == NULL) {
+ if (pInsertParam->pTableBlockHashList == NULL) {
+ pInsertParam->pTableBlockHashList = taosHashInit(16, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
+ if (pInsertParam->pTableBlockHashList == NULL) {
code = TSDB_CODE_TSC_OUT_OF_MEMORY;
goto _error;
}
@@ -1480,7 +1486,7 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int32_t numOfRow
STableDataBlocks *pTableDataBlock = NULL;
int32_t ret =
- tscGetDataBlockFromList(pCmd->insertParam.pTableBlockHashList, pTableMeta->id.uid, TSDB_PAYLOAD_SIZE, sizeof(SSubmitBlk),
+ tscGetDataBlockFromList(pInsertParam->pTableBlockHashList, pTableMeta->id.uid, TSDB_PAYLOAD_SIZE, sizeof(SSubmitBlk),
tinfo.rowSize, &pTableMetaInfo->name, pTableMeta, &pTableDataBlock, NULL);
if (ret != TSDB_CODE_SUCCESS) {
pParentSql->res.code = TSDB_CODE_TSC_OUT_OF_MEMORY;
@@ -1507,7 +1513,7 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int32_t numOfRow
strtolower(line, line);
int32_t len = 0;
- code = tsParseOneRow(&lineptr, pTableDataBlock, pCmd, tinfo.precision, &len, tokenBuf);
+ code = tsParseOneRow(&lineptr, pTableDataBlock, tinfo.precision, &len, tokenBuf, pInsertParam);
if (code != TSDB_CODE_SUCCESS || pTableDataBlock->numOfParams > 0) {
pSql->res.code = code;
break;
@@ -1526,12 +1532,14 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int32_t numOfRow
pParentSql->res.code = code;
if (code == TSDB_CODE_SUCCESS) {
if (count > 0) {
- code = doPackSendDataBlock(pSql, count, pTableDataBlock);
- if (code == TSDB_CODE_SUCCESS) {
- return;
- } else {
+ pSql->res.numOfRows = 0;
+ code = doPackSendDataBlock(pSql, pInsertParam, pTableMeta, count, pTableDataBlock);
+ if (code != TSDB_CODE_SUCCESS) {
goto _error;
}
+
+ tscBuildAndSendRequest(pSql, NULL);
+ return;
} else {
taos_free_result(pSql);
tfree(pSupporter);
@@ -1562,7 +1570,8 @@ void tscImportDataFromFile(SSqlObj *pSql) {
return;
}
- assert(TSDB_QUERY_HAS_TYPE(pCmd->insertParam.insertType, TSDB_QUERY_TYPE_FILE_INSERT) && strlen(pCmd->payload) != 0);
+ SInsertStatementParam* pInsertParam = &pCmd->insertParam;
+ assert(TSDB_QUERY_HAS_TYPE(pInsertParam->insertType, TSDB_QUERY_TYPE_FILE_INSERT) && strlen(pCmd->payload) != 0);
pCmd->active = pCmd->pQueryInfo;
SImportFileSupport *pSupporter = calloc(1, sizeof(SImportFileSupport));
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index b80bdabbfcd0a13d20b661760443f0f16c704379..f199a5798779523e90e95bfce468a68b8afb6c6d 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;
@@ -1085,7 +1086,7 @@ static int insertStmtExecute(STscStmt* stmt) {
fillTablesColumnsNull(stmt->pSql);
- int code = tscMergeTableDataBlocks(stmt->pSql, false);
+ int code = tscMergeTableDataBlocks(&stmt->pSql->cmd.insertParam, false);
if (code != TSDB_CODE_SUCCESS) {
return code;
}
@@ -1185,7 +1186,7 @@ static int insertBatchStmtExecute(STscStmt* pStmt) {
fillTablesColumnsNull(pStmt->pSql);
- if ((code = tscMergeTableDataBlocks(pStmt->pSql, false)) != TSDB_CODE_SUCCESS) {
+ if ((code = tscMergeTableDataBlocks(&pStmt->pSql->cmd.insertParam, false)) != TSDB_CODE_SUCCESS) {
return code;
}
@@ -1203,7 +1204,6 @@ static int insertBatchStmtExecute(STscStmt* pStmt) {
return pStmt->pSql->res.code;
}
-
int stmtParseInsertTbTags(SSqlObj* pSql, STscStmt* pStmt) {
SSqlCmd *pCmd = &pSql->cmd;
int32_t ret = TSDB_CODE_SUCCESS;
@@ -1213,7 +1213,7 @@ int stmtParseInsertTbTags(SSqlObj* pSql, STscStmt* pStmt) {
}
int32_t index = 0;
- SStrToken sToken = tStrGetToken(pCmd->curSql, &index, false);
+ SStrToken sToken = tStrGetToken(pCmd->insertParam.sql, &index, false);
if (sToken.n == 0) {
return TSDB_CODE_TSC_INVALID_OPERATION;
}
@@ -1232,29 +1232,29 @@ int stmtParseInsertTbTags(SSqlObj* pSql, STscStmt* pStmt) {
pStmt->mtb.tagSet = true;
- sToken = tStrGetToken(pCmd->curSql, &index, false);
- if (sToken.n > 0 && sToken.type == TK_VALUES) {
+ sToken = tStrGetToken(pCmd->insertParam.sql, &index, false);
+ if (sToken.n > 0 && (sToken.type == TK_VALUES || sToken.type == TK_LP)) {
return TSDB_CODE_SUCCESS;
}
if (sToken.n <= 0 || sToken.type != TK_USING) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
+ return tscSQLSyntaxErrMsg(pCmd->payload, "keywords USING is expected", sToken.z);
}
- sToken = tStrGetToken(pCmd->curSql, &index, false);
+ sToken = tStrGetToken(pCmd->insertParam.sql, &index, false);
if (sToken.n <= 0 || ((sToken.type != TK_ID) && (sToken.type != TK_STRING))) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
+ return tscSQLSyntaxErrMsg(pCmd->payload, "invalid token", sToken.z);
}
pStmt->mtb.stbname = sToken;
- sToken = tStrGetToken(pCmd->curSql, &index, false);
+ sToken = tStrGetToken(pCmd->insertParam.sql, &index, false);
if (sToken.n <= 0 || sToken.type != TK_TAGS) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
+ return tscSQLSyntaxErrMsg(pCmd->payload, "keyword TAGS expected", sToken.z);
}
- sToken = tStrGetToken(pCmd->curSql, &index, false);
+ sToken = tStrGetToken(pCmd->insertParam.sql, &index, false);
if (sToken.n <= 0 || sToken.type != TK_LP) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
+ return tscSQLSyntaxErrMsg(pCmd->payload, ") expected", sToken.z);
}
pStmt->mtb.tags = taosArrayInit(4, sizeof(SStrToken));
@@ -1262,7 +1262,7 @@ int stmtParseInsertTbTags(SSqlObj* pSql, STscStmt* pStmt) {
int32_t loopCont = 1;
while (loopCont) {
- sToken = tStrGetToken(pCmd->curSql, &index, false);
+ sToken = tStrGetToken(pCmd->insertParam.sql, &index, false);
if (sToken.n <= 0) {
return TSDB_CODE_TSC_INVALID_OPERATION;
}
@@ -1285,20 +1285,18 @@ int stmtParseInsertTbTags(SSqlObj* pSql, STscStmt* pStmt) {
return TSDB_CODE_TSC_INVALID_OPERATION;
}
- sToken = tStrGetToken(pCmd->curSql, &index, false);
- if (sToken.n <= 0 || sToken.type != TK_VALUES) {
+ sToken = tStrGetToken(pCmd->insertParam.sql, &index, false);
+ if (sToken.n <= 0 || (sToken.type != TK_VALUES && sToken.type != TK_LP)) {
return TSDB_CODE_TSC_INVALID_OPERATION;
}
pStmt->mtb.values = sToken;
+
}
return TSDB_CODE_SUCCESS;
}
-
-
-
int stmtGenInsertStatement(SSqlObj* pSql, STscStmt* pStmt, const char* name, TAOS_BIND* tags) {
size_t tagNum = taosArrayGetSize(pStmt->mtb.tags);
size_t size = 1048576;
@@ -1373,14 +1371,17 @@ 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;
}
-
-
////////////////////////////////////////////////////////////////////////////////
// interface functions
@@ -1468,7 +1469,7 @@ int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
if (tscIsInsertData(pSql->sqlstr)) {
pStmt->isInsert = true;
- pSql->cmd.numOfParams = 0;
+ pSql->cmd.insertParam.numOfParams = 0;
pSql->cmd.batchSize = 0;
registerSqlObj(pSql);
@@ -1561,11 +1562,10 @@ 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);
- pSql->cmd.numOfParams = 0;
+ pSql->cmd.insertParam.numOfParams = 0;
pSql->cmd.batchSize = 0;
if (taosHashGetSize(pCmd->insertParam.pTableBlockHashList) > 0) {
@@ -1634,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);
}
}
@@ -1851,8 +1852,8 @@ int taos_stmt_num_params(TAOS_STMT *stmt, int *nums) {
if (pStmt->isInsert) {
SSqlObj* pSql = pStmt->pSql;
- SSqlCmd *pCmd = &pSql->cmd;
- *nums = pCmd->numOfParams;
+ SSqlCmd *pCmd = &pSql->cmd;
+ *nums = pCmd->insertParam.numOfParams;
return TSDB_CODE_SUCCESS;
} else {
SNormalStmt* normal = &pStmt->normal;
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 546760f37f13ec2a7b5b2df058628b23c0b50293..c1a4006f2d44c6a7c455a9e292aa8b30552dc19b 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -28,7 +28,7 @@
#include "tname.h"
#include "tscLog.h"
#include "tscUtil.h"
-#include "tschemautil.h"
+#include "qTableMeta.h"
#include "tsclient.h"
#include "tstrbuild.h"
#include "ttoken.h"
@@ -91,6 +91,7 @@ static int32_t validateGroupbyNode(SQueryInfo* pQueryInfo, SArray* pList, SSqlCm
static int32_t validateIntervalNode(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNode* pSqlNode);
static int32_t parseIntervalOffset(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SStrToken* offsetToken);
static int32_t parseSlidingClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SStrToken* pSliding);
+static int32_t validateStateWindowNode(SSqlCmd* pSql, SQueryInfo* pQueryInfo, SSqlNode* pSqlNode, bool isStable);
static int32_t addProjectionExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSqlExprItem* pItem);
@@ -196,7 +197,7 @@ static bool validateDebugFlag(int32_t v) {
* is not needed in the final error message.
*/
static int32_t invalidOperationMsg(char* dstBuffer, const char* errMsg) {
- return tscInvalidSQLErrMsg(dstBuffer, errMsg, NULL);
+ return tscInvalidOperationMsg(dstBuffer, errMsg, NULL);
}
static int setColumnFilterInfoForTimestamp(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tVariant* pVar) {
@@ -993,6 +994,59 @@ int32_t validateIntervalNode(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNode* pS
// The following part is used to check for the invalid query expression.
return checkInvalidExprForTimeWindow(pCmd, pQueryInfo);
}
+static int32_t validateStateWindowNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSqlNode, bool isStable) {
+
+ const char* msg1 = "invalid column name";
+ const char* msg3 = "not support state_window with group by ";
+ const char* msg4 = "function not support for super table query";
+
+ SStrToken *col = &(pSqlNode->windowstateVal.col) ;
+ if (col->z == NULL || col->n <= 0) {
+ return TSDB_CODE_SUCCESS;
+ }
+
+ if (pQueryInfo->colList == NULL) {
+ pQueryInfo->colList = taosArrayInit(4, POINTER_BYTES);
+ }
+ if (pQueryInfo->groupbyExpr.numOfGroupCols > 0) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
+ }
+ pQueryInfo->groupbyExpr.numOfGroupCols = 1;
+
+ //TODO(dengyihao): check tag column
+ if (isStable) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
+ }
+
+ SColumnIndex index = COLUMN_INDEX_INITIALIZER;
+ if (getColumnIndexByName(pCmd, col, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
+ }
+
+ STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+ STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
+ int32_t numOfCols = tscGetNumOfColumns(pTableMeta);
+ if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX || index.columnIndex >= numOfCols) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
+ }
+
+ SGroupbyExpr* pGroupExpr = &pQueryInfo->groupbyExpr;
+ if (pGroupExpr->columnInfo == NULL) {
+ pGroupExpr->columnInfo = taosArrayInit(4, sizeof(SColIndex));
+ }
+
+ SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, index.columnIndex);
+ if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP || pSchema->type == TSDB_DATA_TYPE_FLOAT || pSchema->type == TSDB_DATA_TYPE_DOUBLE) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
+ }
+
+ tscColumnListInsert(pQueryInfo->colList, index.columnIndex, pTableMeta->id.uid, pSchema);
+ SColIndex colIndex = { .colIndex = index.columnIndex, .flag = TSDB_COL_NORMAL, .colId = pSchema->colId };
+ taosArrayPush(pGroupExpr->columnInfo, &colIndex);
+ pQueryInfo->groupbyExpr.orderType = TSDB_ORDER_ASC;
+ pQueryInfo->stateWindow = true;
+ return TSDB_CODE_SUCCESS;
+}
int32_t validateSessionNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode * pSqlNode) {
const char* msg1 = "gap should be fixed time window";
@@ -1027,11 +1081,17 @@ int32_t validateSessionNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode * pS
if (pQueryInfo->sessionWindow.gap != 0 && pQueryInfo->interval.interval != 0) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
}
+ if (pQueryInfo->sessionWindow.gap == 0) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
+ }
SColumnIndex index = COLUMN_INDEX_INITIALIZER;
if (getColumnIndexByName(pCmd, col, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
}
+ if (index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
+ }
pQueryInfo->sessionWindow.primaryColId = PRIMARYKEY_TIMESTAMP_COL_INDEX;
@@ -3167,6 +3227,9 @@ bool hasUnsupportFunctionsForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo)
return true;
}
}
+ } else if (tscIsSessionWindowQuery(pQueryInfo)) {
+ invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
+ return true;
}
return false;
@@ -6472,7 +6535,7 @@ static int32_t doTagFunctionCheck(SQueryInfo* pQueryInfo) {
int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
const char* msg1 = "functions/columns not allowed in group by query";
const char* msg2 = "projection query on columns not allowed";
- const char* msg3 = "group by not allowed on projection query";
+ const char* msg3 = "group by/session/state_window not allowed on projection query";
const char* msg4 = "retrieve tags not compatible with group by or interval query";
const char* msg5 = "functions can not be mixed up";
@@ -6488,6 +6551,9 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
return TSDB_CODE_SUCCESS;
}
}
+ if (tscIsProjectionQuery(pQueryInfo) && tscIsSessionWindowQuery(pQueryInfo)) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
+ }
if (pQueryInfo->groupbyExpr.numOfGroupCols > 0) {
// check if all the tags prj columns belongs to the group by columns
@@ -6931,7 +6997,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
if (!findColumnIndex) {
tdDestroyKVRowBuilder(&kvRowBuilder);
- return tscInvalidSQLErrMsg(pCmd->payload, "invalid tag name", sToken->z);
+ return tscInvalidOperationMsg(pCmd->payload, "invalid tag name", sToken->z);
}
}
} else {
@@ -7074,6 +7140,7 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
return TSDB_CODE_TSC_INVALID_OPERATION;
}
+
if (isTimeWindowQuery(pQueryInfo) && (validateFunctionsInIntervalOrGroupbyQuery(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS)) {
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
}
@@ -7747,6 +7814,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
const char* msg1 = "point interpolation query needs timestamp";
const char* msg2 = "too many tables in from clause";
const char* msg3 = "start(end) time of query range required or time range too large";
+ const char* msg4 = "interval query not supported, since the result of sub query not include valid timestamp column";
const char* msg9 = "only tag query not compatible with normal column filter";
int32_t code = TSDB_CODE_SUCCESS;
@@ -7788,6 +7856,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
return TSDB_CODE_TSC_INVALID_OPERATION;
}
+ // validate the query filter condition info
if (pSqlNode->pWhere != NULL) {
if (validateWhereNode(pQueryInfo, &pSqlNode->pWhere, pSql) != TSDB_CODE_SUCCESS) {
return TSDB_CODE_TSC_INVALID_OPERATION;
@@ -7799,6 +7868,30 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
pQueryInfo->window.ekey = pQueryInfo->window.ekey / 1000;
}
}
+
+ // validate the interval info
+ if (validateIntervalNode(pSql, pQueryInfo, pSqlNode) != TSDB_CODE_SUCCESS) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ } else {
+ if (isTimeWindowQuery(pQueryInfo)) {
+ // check if the first column of the nest query result is timestamp column
+ SColumn* pCol = taosArrayGetP(pQueryInfo->colList, 0);
+ if (pCol->info.type != TSDB_DATA_TYPE_TIMESTAMP) {
+ return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
+ }
+
+ if (validateFunctionsInIntervalOrGroupbyQuery(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
+ }
+ }
+
+ // set order by info
+ STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
+ if (validateOrderbyNode(pCmd, pQueryInfo, pSqlNode, tscGetTableSchema(pTableMeta)) !=
+ TSDB_CODE_SUCCESS) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
} else {
pQueryInfo->command = TSDB_SQL_SELECT;
@@ -7855,7 +7948,10 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
TSDB_CODE_SUCCESS) {
return TSDB_CODE_TSC_INVALID_OPERATION;
}
-
+ // parse the window_state
+ if (validateStateWindowNode(pCmd, pQueryInfo, pSqlNode, isSTable) != TSDB_CODE_SUCCESS) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
// set order by info
if (validateOrderbyNode(pCmd, pQueryInfo, pSqlNode, tscGetTableSchema(pTableMetaInfo->pTableMeta)) !=
TSDB_CODE_SUCCESS) {
@@ -7896,6 +7992,10 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
* transfer sql functions that need secondary merge into another format
* in dealing with super table queries such as: count/first/last
*/
+ if (validateSessionNode(pCmd, pQueryInfo, pSqlNode) != TSDB_CODE_SUCCESS) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
+
if (isSTable) {
tscTansformFuncForSTableQuery(pQueryInfo);
if (hasUnsupportFunctionsForSTableQuery(pCmd, pQueryInfo)) {
@@ -7903,10 +8003,6 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
}
}
- if (validateSessionNode(pCmd, pQueryInfo, pSqlNode) != TSDB_CODE_SUCCESS) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
-
// no result due to invalid query time range
if (pQueryInfo->window.skey > pQueryInfo->window.ekey) {
pQueryInfo->command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
@@ -7950,11 +8046,12 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
pQueryInfo->globalMerge = tscIsTwoStageSTableQuery(pCmd, pQueryInfo, 0);
pQueryInfo->arithmeticOnAgg = tsIsArithmeticQueryOnAggResult(pQueryInfo);
+ pQueryInfo->orderProjectQuery = tscOrderedProjectionQueryOnSTable(pQueryInfo, 0);
SExprInfo** p = NULL;
int32_t numOfExpr = 0;
+ pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
code = createProjectionExpr(pQueryInfo, pTableMetaInfo, &p, &numOfExpr);
-
if (pQueryInfo->exprList1 == NULL) {
pQueryInfo->exprList1 = taosArrayInit(4, POINTER_BYTES);
}
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index b9b0885630c6ed56b6fc2c8b41c22bfdf1657752..01843db5122e1768523b09771bf5b84e3f258e86 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -15,15 +15,15 @@
#include "os.h"
#include "tcmdtype.h"
+#include "tlockfree.h"
#include "trpc.h"
-#include "tscLocalMerge.h"
+#include "tscGlobalmerge.h"
#include "tscLog.h"
#include "tscProfile.h"
#include "tscUtil.h"
-#include "tschemautil.h"
+#include "qTableMeta.h"
#include "tsclient.h"
#include "ttimer.h"
-#include "tlockfree.h"
#include "qPlan.h"
int (*tscBuildMsg[TSDB_SQL_MAX])(SSqlObj *pSql, SSqlInfo *pInfo) = {0};
@@ -857,6 +857,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
pQueryMsg->simpleAgg = query.simpleAgg;
pQueryMsg->pointInterpQuery = query.pointInterpQuery;
pQueryMsg->needReverseScan = query.needReverseScan;
+ pQueryMsg->stateWindow = query.stateWindow;
pQueryMsg->numOfTags = htonl(numOfTags);
pQueryMsg->sqlstrLen = htonl(sqlLen);
@@ -1656,7 +1657,7 @@ int tscProcessRetrieveLocalMergeRsp(SSqlObj *pSql) {
return code;
}
- if (pRes->pLocalMerger == NULL) { // no result from subquery, so abort here directly.
+ if (pRes->pMerger == NULL) { // no result from subquery, so abort here directly.
(*pSql->fp)(pSql->param, pSql, pRes->numOfRows);
return code;
}
@@ -1673,15 +1674,7 @@ int tscProcessRetrieveLocalMergeRsp(SSqlObj *pSql) {
taosArrayPush(group, &tableKeyInfo);
taosArrayPush(tableGroupInfo.pGroupList, &group);
- // todo remove it
- SExprInfo* list = calloc(tscNumOfExprs(pQueryInfo), sizeof(SExprInfo));
- for(int32_t i = 0; i < tscNumOfExprs(pQueryInfo); ++i) {
- SExprInfo* pExprInfo = tscExprGet(pQueryInfo, i);
- list[i] = *pExprInfo;
- }
-
- pQueryInfo->pQInfo = createQInfoFromQueryNode(pQueryInfo, list, &tableGroupInfo, NULL, NULL, pRes->pLocalMerger, MERGE_STAGE);
- tfree(list);
+ pQueryInfo->pQInfo = createQInfoFromQueryNode(pQueryInfo, &tableGroupInfo, NULL, NULL, pRes->pMerger, MERGE_STAGE);
}
uint64_t localQueryId = 0;
@@ -2534,8 +2527,8 @@ static int32_t getTableMetaFromMnode(SSqlObj *pSql, STableMetaInfo *pTableMetaIn
char *pMsg = (char *)pInfoMsg + sizeof(STableInfoMsg);
// tag data exists
- if (autocreate && pSql->cmd.tagData.dataLen != 0) {
- pMsg = serializeTagData(&pSql->cmd.tagData, pMsg);
+ if (autocreate && pSql->cmd.insertParam.tagData.dataLen != 0) {
+ pMsg = serializeTagData(&pSql->cmd.insertParam.tagData, pMsg);
}
pNew->cmd.payloadLen = (int32_t)(pMsg - (char*)pInfoMsg);
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index d376ea1b6d4ca5b96fdddb4c35f7168c1d0766fb..9156337fef990b4ab23989c3b95381a720503377 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -627,7 +627,7 @@ static bool hasAdditionalErrorInfo(int32_t code, SSqlCmd *pCmd) {
char *z = NULL;
if (len > 0) {
- z = strstr(pCmd->payload, "invalid SQL");
+ z = strstr(pCmd->payload, "invalid operation");
if (z == NULL) {
z = strstr(pCmd->payload, "syntax error");
}
diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index 8e11fd0cfb435e0eadc24ecdcd175163f81e797b..73a3fbafc3c5bb897d26375a129526e083eaf0e8 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -13,7 +13,6 @@
* along with this program. If not, see .
*/
-#include
#include "os.h"
#include "taosmsg.h"
#include "tscLog.h"
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index f6560a02b8fabbb729f9583f92ec68ac0a6d0d2c..21076f4cd7561e0dc8bdeade05779ff862f85256 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -21,7 +21,7 @@
#include "tcompare.h"
#include "tscLog.h"
#include "tscSubquery.h"
-#include "tschemautil.h"
+#include "qTableMeta.h"
#include "tsclient.h"
#include "qUdf.h"
#include "qUtil.h"
@@ -2450,7 +2450,7 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
assert(pState->numOfSub > 0);
- int32_t ret = tscLocalReducerEnvCreate(pQueryInfo, &pMemoryBuf, pSql->subState.numOfSub, &pDesc, nBufferSize, pSql->self);
+ int32_t ret = tscCreateGlobalMergerEnv(pQueryInfo, &pMemoryBuf, pSql->subState.numOfSub, &pDesc, nBufferSize, pSql->self);
if (ret != 0) {
pRes->code = ret;
tscAsyncResultOnError(pSql);
@@ -2463,7 +2463,7 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
if (pSql->pSubs == NULL) {
tfree(pSql->pSubs);
pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
- tscLocalReducerEnvDestroy(pMemoryBuf, pDesc,pState->numOfSub);
+ tscDestroyGlobalMergerEnv(pMemoryBuf, pDesc,pState->numOfSub);
tscAsyncResultOnError(pSql);
return ret;
@@ -2530,13 +2530,13 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
tscError("0x%"PRIx64" failed to prepare subquery structure and launch subqueries", pSql->self);
pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
- tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pState->numOfSub);
+ tscDestroyGlobalMergerEnv(pMemoryBuf, pDesc, pState->numOfSub);
doCleanupSubqueries(pSql, i);
return pRes->code; // free all allocated resource
}
if (pRes->code == TSDB_CODE_TSC_QUERY_CANCELLED) {
- tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pState->numOfSub);
+ tscDestroyGlobalMergerEnv(pMemoryBuf, pDesc, pState->numOfSub);
doCleanupSubqueries(pSql, i);
return pRes->code;
}
@@ -2701,7 +2701,7 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
tstrerror(pParentSql->res.code));
// release allocated resource
- tscLocalReducerEnvDestroy(trsupport->pExtMemBuffer, trsupport->pOrderDescriptor,
+ tscDestroyGlobalMergerEnv(trsupport->pExtMemBuffer, trsupport->pOrderDescriptor,
pState->numOfSub);
tscFreeRetrieveSup(pSql);
@@ -2776,7 +2776,7 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p
SQueryInfo *pPQueryInfo = tscGetQueryInfo(&pParentSql->cmd);
tscClearInterpInfo(pPQueryInfo);
- code = tscCreateLocalMerger(trsupport->pExtMemBuffer, pState->numOfSub, pDesc, pPQueryInfo, &pParentSql->res.pLocalMerger, pParentSql->self);
+ code = tscCreateGlobalMerger(trsupport->pExtMemBuffer, pState->numOfSub, pDesc, pPQueryInfo, &pParentSql->res.pMerger, pParentSql->self);
pParentSql->res.code = code;
if (code == TSDB_CODE_SUCCESS && trsupport->pExtMemBuffer == NULL) {
@@ -3525,9 +3525,8 @@ static UNUSED_FUNC bool tscHasRemainDataInSubqueryResultSet(SSqlObj *pSql) {
return hasData;
}
-// todo remove pExprs
-void* createQInfoFromQueryNode(SQueryInfo* pQueryInfo, SExprInfo* pExprs, STableGroupInfo* pTableGroupInfo,
- SOperatorInfo* pSourceOperator, char* sql, void* merger, int32_t stage) {
+void* createQInfoFromQueryNode(SQueryInfo* pQueryInfo, STableGroupInfo* pTableGroupInfo, SOperatorInfo* pSourceOperator,
+ char* sql, void* merger, int32_t stage) {
assert(pQueryInfo != NULL);
SQInfo *pQInfo = (SQInfo *)calloc(1, sizeof(SQInfo));
if (pQInfo == NULL) {
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 3c518e01b5e01e3a228d1a8d1fa19b778cc0f36b..15a8a9f678096f8525c800e75ace519996493cfe 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -14,18 +14,18 @@
*/
#include "tscUtil.h"
-#include "tsched.h"
#include "hash.h"
#include "os.h"
#include "taosmsg.h"
#include "texpr.h"
#include "tkey.h"
#include "tmd5.h"
-#include "tscLocalMerge.h"
+#include "tscGlobalmerge.h"
#include "tscLog.h"
#include "tscProfile.h"
#include "tscSubquery.h"
-#include "tschemautil.h"
+#include "tsched.h"
+#include "qTableMeta.h"
#include "tsclient.h"
#include "ttimer.h"
#include "ttokendef.h"
@@ -456,6 +456,9 @@ bool tscIsTWAQuery(SQueryInfo* pQueryInfo) {
return false;
}
+bool tscIsSessionWindowQuery(SQueryInfo* pQueryInfo) {
+ return pQueryInfo->sessionWindow.gap > 0;
+}
bool tscNeedReverseScan(SQueryInfo* pQueryInfo) {
size_t numOfExprs = tscNumOfExprs(pQueryInfo);
@@ -738,9 +741,10 @@ static SColumnInfo* extractColumnInfoFromResult(SArray* pTableCols) {
}
typedef struct SDummyInputInfo {
- SSDataBlock *block;
- SSqlObj *pSql; // refactor: remove it
- int32_t numOfFilterCols;
+ SSDataBlock *block;
+ STableQueryInfo *pTableQueryInfo;
+ SSqlObj *pSql; // refactor: remove it
+ int32_t numOfFilterCols;
SSingleColumnFilterInfo *pFilterInfo;
} SDummyInputInfo;
@@ -757,9 +761,10 @@ typedef struct SJoinOperatorInfo {
SRspResultInfo resultInfo; // todo refactor, add this info for each operator
} SJoinOperatorInfo;
-static void doSetupSDataBlock(SSqlRes* pRes, SSDataBlock* pBlock) {
+static void doSetupSDataBlock(SSqlRes* pRes, SSDataBlock* pBlock, SSingleColumnFilterInfo* pFilterInfo, int32_t numOfFilterCols) {
int32_t offset = 0;
char* pData = pRes->data;
+
for(int32_t i = 0; i < pBlock->info.numOfCols; ++i) {
SColumnInfoData* pColData = taosArrayGet(pBlock->pDataBlock, i);
if (pData != NULL) {
@@ -771,6 +776,26 @@ static void doSetupSDataBlock(SSqlRes* pRes, SSDataBlock* pBlock) {
offset += pColData->info.bytes;
}
+ // filter data if needed
+ if (numOfFilterCols > 0) {
+ doSetFilterColumnInfo(pFilterInfo, numOfFilterCols, pBlock);
+ int8_t* p = calloc(pBlock->info.rows, sizeof(int8_t));
+ bool all = doFilterDataBlock(pFilterInfo, numOfFilterCols, pBlock->info.rows, p);
+ if (!all) {
+ doCompactSDataBlock(pBlock, pBlock->info.rows, p);
+ }
+
+ tfree(p);
+ }
+
+ // todo refactor: extract method
+ // set the timestamp range of current result data block
+ SColumnInfoData* pColData = taosArrayGet(pBlock->pDataBlock, 0);
+ if (pColData->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
+ pBlock->info.window.skey = ((int64_t*)pColData->pData)[0];
+ pBlock->info.window.ekey = ((int64_t*)pColData->pData)[pBlock->info.rows-1];
+ }
+
pRes->numOfRows = 0;
}
@@ -786,22 +811,13 @@ SSDataBlock* doGetDataBlock(void* param, bool* newgroup) {
SSqlRes* pRes = &pSql->res;
SSDataBlock* pBlock = pInput->block;
+ if (pOperator->pRuntimeEnv != NULL) {
+ pOperator->pRuntimeEnv->current = pInput->pTableQueryInfo;
+ }
pBlock->info.rows = pRes->numOfRows;
if (pRes->numOfRows != 0) {
- doSetupSDataBlock(pRes, pBlock);
-
- if (pInput->numOfFilterCols > 0) {
- doSetFilterColumnInfo(pInput->pFilterInfo, pInput->numOfFilterCols, pBlock);
- int8_t* p = calloc(pBlock->info.rows, sizeof(int8_t));
- bool all = doFilterDataBlock(pInput->pFilterInfo, pInput->numOfFilterCols, pBlock->info.rows, p);
- if (!all) {
- doCompactSDataBlock(pBlock, pBlock->info.rows, p);
- }
-
- tfree(p);
- }
-
+ doSetupSDataBlock(pRes, pBlock, pInput->pFilterInfo, pInput->numOfFilterCols);
*newgroup = false;
return pBlock;
}
@@ -816,11 +832,29 @@ SSDataBlock* doGetDataBlock(void* param, bool* newgroup) {
}
pBlock->info.rows = pRes->numOfRows;
- doSetupSDataBlock(pRes, pBlock);
+ doSetupSDataBlock(pRes, pBlock, pInput->pFilterInfo, pInput->numOfFilterCols);
*newgroup = false;
return pBlock;
}
+static void fetchNextBlockIfCompleted(SOperatorInfo* pOperator, bool* newgroup) {
+ SJoinOperatorInfo* pJoinInfo = pOperator->info;
+
+ for (int32_t i = 0; i < pOperator->numOfUpstream; ++i) {
+ SJoinStatus* pStatus = &pJoinInfo->status[i];
+ if (pStatus->pBlock == NULL || pStatus->index >= pStatus->pBlock->info.rows) {
+ pStatus->pBlock = pOperator->upstream[i]->exec(pOperator->upstream[i], newgroup);
+ pStatus->index = 0;
+
+ if (pStatus->pBlock == NULL) {
+ pOperator->status = OP_EXEC_DONE;
+ pJoinInfo->resultInfo.total += pJoinInfo->pRes->info.rows;
+ break;
+ }
+ }
+ }
+}
+
SSDataBlock* doDataBlockJoin(void* param, bool* newgroup) {
SOperatorInfo *pOperator = (SOperatorInfo*) param;
if (pOperator->status == OP_EXEC_DONE) {
@@ -833,19 +867,9 @@ SSDataBlock* doDataBlockJoin(void* param, bool* newgroup) {
pJoinInfo->pRes->info.rows = 0;
while(1) {
- for (int32_t i = 0; i < pOperator->numOfUpstream; ++i) {
- SJoinStatus* pStatus = &pJoinInfo->status[i];
- if (pStatus->pBlock == NULL || pStatus->index >= pStatus->pBlock->info.rows) {
- pStatus->pBlock = pOperator->upstream[i]->exec(pOperator->upstream[i], newgroup);
- pStatus->index = 0;
-
- if (pStatus->pBlock == NULL) {
- pOperator->status = OP_EXEC_DONE;
-
- pJoinInfo->resultInfo.total += pJoinInfo->pRes->info.rows;
- return pJoinInfo->pRes;
- }
- }
+ fetchNextBlockIfCompleted(pOperator, newgroup);
+ if (pOperator->status == OP_EXEC_DONE) {
+ return pJoinInfo->pRes;
}
SJoinStatus* st0 = &pJoinInfo->status[0];
@@ -864,8 +888,12 @@ SSDataBlock* doDataBlockJoin(void* param, bool* newgroup) {
if (ts[st->index] < ts0[st0->index]) { // less than the first
prefixEqual = false;
+
if ((++(st->index)) >= st->pBlock->info.rows) {
- break;
+ fetchNextBlockIfCompleted(pOperator, newgroup);
+ if (pOperator->status == OP_EXEC_DONE) {
+ return pJoinInfo->pRes;
+ }
}
} else if (ts[st->index] > ts0[st0->index]) { // greater than the first;
if (prefixEqual == true) {
@@ -873,12 +901,19 @@ SSDataBlock* doDataBlockJoin(void* param, bool* newgroup) {
for (int32_t j = 0; j < i; ++j) {
SJoinStatus* stx = &pJoinInfo->status[j];
if ((++(stx->index)) >= stx->pBlock->info.rows) {
- break;
+
+ fetchNextBlockIfCompleted(pOperator, newgroup);
+ if (pOperator->status == OP_EXEC_DONE) {
+ return pJoinInfo->pRes;
+ }
}
}
} else {
if ((++(st0->index)) >= st0->pBlock->info.rows) {
- break;
+ fetchNextBlockIfCompleted(pOperator, newgroup);
+ if (pOperator->status == OP_EXEC_DONE) {
+ return pJoinInfo->pRes;
+ }
}
}
}
@@ -973,11 +1008,14 @@ static void destroyDummyInputOperator(void* param, int32_t numOfOutput) {
// todo this operator servers as the adapter for Operator tree and SqlRes result, remove it later
SOperatorInfo* createDummyInputOperator(SSqlObj* pSql, SSchema* pSchema, int32_t numOfCols, SSingleColumnFilterInfo* pFilterInfo, int32_t numOfFilterCols) {
assert(numOfCols > 0);
+ STimeWindow win = {.skey = INT64_MIN, .ekey = INT64_MAX};
+
SDummyInputInfo* pInfo = calloc(1, sizeof(SDummyInputInfo));
pInfo->pSql = pSql;
pInfo->pFilterInfo = pFilterInfo;
pInfo->numOfFilterCols = numOfFilterCols;
+ pInfo->pTableQueryInfo = createTmpTableQueryInfo(win);
pInfo->block = calloc(numOfCols, sizeof(SSDataBlock));
pInfo->block->info.numOfCols = numOfCols;
@@ -1063,12 +1101,31 @@ void convertQueryResult(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
pRes->completed = (pRes->numOfRows == 0);
}
+static void createInputDataFilterInfo(SQueryInfo* px, int32_t numOfCol1, int32_t* numOfFilterCols, SSingleColumnFilterInfo** pFilterInfo) {
+ SColumnInfo* tableCols = calloc(numOfCol1, sizeof(SColumnInfo));
+ for(int32_t i = 0; i < numOfCol1; ++i) {
+ SColumn* pCol = taosArrayGetP(px->colList, i);
+ if (pCol->info.flist.numOfFilters > 0) {
+ (*numOfFilterCols) += 1;
+ }
+
+ tableCols[i] = pCol->info;
+ }
+
+ if ((*numOfFilterCols) > 0) {
+ doCreateFilterInfo(tableCols, numOfCol1, (*numOfFilterCols), pFilterInfo, 0);
+ }
+
+ tfree(tableCols);
+}
+
void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQueryInfo* px, SSqlRes* pOutput) {
// handle the following query process
if (px->pQInfo == NULL) {
SColumnInfo* pColumnInfo = extractColumnInfoFromResult(px->colList);
- SSchema* pSchema = tscGetTableSchema(px->pTableMetaInfo[0]->pTableMeta);
+ STableMeta* pTableMeta = tscGetMetaInfo(px, 0)->pTableMeta;
+ SSchema* pSchema = tscGetTableSchema(pTableMeta);
STableGroupInfo tableGroupInfo = {
.numOfTables = 1,
@@ -1085,23 +1142,11 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
taosArrayPush(tableGroupInfo.pGroupList, &group);
// if it is a join query, create join operator here
- int32_t numOfCol1 = px->pTableMetaInfo[0]->pTableMeta->tableInfo.numOfColumns;
+ int32_t numOfCol1 = pTableMeta->tableInfo.numOfColumns;
int32_t numOfFilterCols = 0;
- SColumnInfo* tableCols = calloc(numOfCol1, sizeof(SColumnInfo));
- for(int32_t i = 0; i < numOfCol1; ++i) {
- SColumn* pCol = taosArrayGetP(px->colList, i);
- if (pCol->info.flist.numOfFilters > 0) {
- numOfFilterCols += 1;
- }
-
- tableCols[i] = pCol->info;
- }
-
SSingleColumnFilterInfo* pFilterInfo = NULL;
- if (numOfFilterCols > 0) {
- doCreateFilterInfo(tableCols, numOfCol1, numOfFilterCols, &pFilterInfo, 0);
- }
+ createInputDataFilterInfo(px, numOfCol1, &numOfFilterCols, &pFilterInfo);
SOperatorInfo* pSourceOperator = createDummyInputOperator(pSqlObjList[0], pSchema, numOfCol1, pFilterInfo, numOfFilterCols);
@@ -1117,24 +1162,14 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
int32_t offset = pSourceOperator->numOfOutput;
for(int32_t i = 1; i < px->numOfTables; ++i) {
- SSchema* pSchema1 = tscGetTableSchema(px->pTableMetaInfo[i]->pTableMeta);
- int32_t n = px->pTableMetaInfo[i]->pTableMeta->tableInfo.numOfColumns;
-
- int32_t numOfFilterCols1 = 0;
- SColumnInfo* tableCols1 = calloc(numOfCol1, sizeof(SColumnInfo));
- for(int32_t j = 0; j < numOfCol1; ++j) {
- SColumn* pCol = taosArrayGetP(px->colList, j);
- if (pCol->info.flist.numOfFilters > 0) {
- numOfFilterCols += 1;
- }
+ STableMeta* pTableMeta1 = tscGetMetaInfo(px, i)->pTableMeta;
- tableCols1[j] = pCol->info;
- }
+ SSchema* pSchema1 = tscGetTableSchema(pTableMeta1);
+ int32_t n = pTableMeta1->tableInfo.numOfColumns;
+ int32_t numOfFilterCols1 = 0;
SSingleColumnFilterInfo* pFilterInfo1 = NULL;
- if (numOfFilterCols1 > 0) {
- doCreateFilterInfo(tableCols1, numOfCol1, numOfFilterCols1, &pFilterInfo1, 0);
- }
+ createInputDataFilterInfo(px, numOfCol1, &numOfFilterCols1, &pFilterInfo1);
p[i] = createDummyInputOperator(pSqlObjList[i], pSchema1, n, pFilterInfo1, numOfFilterCols1);
memcpy(&schema[offset], pSchema1, n * sizeof(SSchema));
@@ -1149,11 +1184,25 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
memcpy(schema, pSchema, numOfCol1*sizeof(SSchema));
}
- SExprInfo* exprInfo = NULL;
- px->pQInfo = createQInfoFromQueryNode(px, exprInfo, &tableGroupInfo, pSourceOperator, NULL, NULL, MASTER_SCAN);
+ // update the exprinfo
+ int32_t numOfOutput = (int32_t)tscNumOfExprs(px);
+ for(int32_t i = 0; i < numOfOutput; ++i) {
+ SExprInfo* pex = taosArrayGetP(px->exprList, i);
+ int32_t colId = pex->base.colInfo.colId;
+ for(int32_t j = 0; j < pSourceOperator->numOfOutput; ++j) {
+ if (colId == schema[j].colId) {
+ pex->base.colInfo.colIndex = j;
+ break;
+ }
+ }
+ }
+
+ px->pQInfo = createQInfoFromQueryNode(px, &tableGroupInfo, pSourceOperator, NULL, NULL, MASTER_SCAN);
tfree(pColumnInfo);
tfree(schema);
- tfree(exprInfo);
+
+ // set the pRuntimeEnv for pSourceOperator
+ pSourceOperator->pRuntimeEnv = &px->pQInfo->runtimeEnv;
}
uint64_t qId = 0;
@@ -1236,31 +1285,34 @@ void tscFreeQueryInfo(SSqlCmd* pCmd, bool removeMeta) {
pCmd->active = NULL;
}
-void destroyTableNameList(SSqlCmd* pCmd) {
- if (pCmd->insertParam.numOfTables == 0) {
- assert(pCmd->insertParam.pTableNameList == NULL);
+void destroyTableNameList(SInsertStatementParam* pInsertParam) {
+ if (pInsertParam->numOfTables == 0) {
+ assert(pInsertParam->pTableNameList == NULL);
return;
}
- for(int32_t i = 0; i < pCmd->insertParam.numOfTables; ++i) {
- tfree(pCmd->insertParam.pTableNameList[i]);
+ for(int32_t i = 0; i < pInsertParam->numOfTables; ++i) {
+ tfree(pInsertParam->pTableNameList[i]);
}
- pCmd->insertParam.numOfTables = 0;
- tfree(pCmd->insertParam.pTableNameList);
+ pInsertParam->numOfTables = 0;
+ tfree(pInsertParam->pTableNameList);
}
void tscResetSqlCmd(SSqlCmd* pCmd, bool clearCachedMeta) {
pCmd->command = 0;
pCmd->numOfCols = 0;
pCmd->count = 0;
- pCmd->curSql = NULL;
pCmd->msgType = 0;
- destroyTableNameList(pCmd);
+ pCmd->insertParam.sql = NULL;
+ destroyTableNameList(&pCmd->insertParam);
pCmd->insertParam.pTableBlockHashList = tscDestroyBlockHashTable(pCmd->insertParam.pTableBlockHashList, clearCachedMeta);
pCmd->insertParam.pDataBlocks = tscDestroyBlockArrayList(pCmd->insertParam.pDataBlocks);
+ tfree(pCmd->insertParam.tagData.data);
+ pCmd->insertParam.tagData.dataLen = 0;
+
tscFreeQueryInfo(pCmd, clearCachedMeta);
if (pCmd->pTableMetaMap != NULL) {
@@ -1279,8 +1331,8 @@ void tscResetSqlCmd(SSqlCmd* pCmd, bool clearCachedMeta) {
void tscFreeSqlResult(SSqlObj* pSql) {
SSqlRes* pRes = &pSql->res;
- tscDestroyLocalMerger(pRes->pLocalMerger);
- pRes->pLocalMerger = NULL;
+ tscDestroyGlobalMerger(pRes->pMerger);
+ pRes->pMerger = NULL;
tscDestroyResPointerInfo(pRes);
memset(&pSql->res, 0, sizeof(SSqlRes));
@@ -1373,9 +1425,6 @@ void tscFreeSqlObj(SSqlObj* pSql) {
tscFreeSqlResult(pSql);
tscResetSqlCmd(pCmd, false);
- tfree(pCmd->tagData.data);
- pCmd->tagData.dataLen = 0;
-
memset(pCmd->payload, 0, (size_t)pCmd->allocSize);
tfree(pCmd->payload);
pCmd->allocSize = 0;
@@ -1717,37 +1766,36 @@ static int32_t getRowExpandSize(STableMeta* pTableMeta) {
return result;
}
-static void extractTableNameList(SSqlCmd* pCmd, bool freeBlockMap) {
- pCmd->insertParam.numOfTables = (int32_t) taosHashGetSize(pCmd->insertParam.pTableBlockHashList);
- if (pCmd->insertParam.pTableNameList == NULL) {
- pCmd->insertParam.pTableNameList = calloc(pCmd->insertParam.numOfTables, POINTER_BYTES);
+static void extractTableNameList(SInsertStatementParam *pInsertParam, bool freeBlockMap) {
+ pInsertParam->numOfTables = (int32_t) taosHashGetSize(pInsertParam->pTableBlockHashList);
+ if (pInsertParam->pTableNameList == NULL) {
+ pInsertParam->pTableNameList = calloc(pInsertParam->numOfTables, POINTER_BYTES);
} else {
- memset(pCmd->insertParam.pTableNameList, 0, pCmd->insertParam.numOfTables * POINTER_BYTES);
+ memset(pInsertParam->pTableNameList, 0, pInsertParam->numOfTables * POINTER_BYTES);
}
- STableDataBlocks **p1 = taosHashIterate(pCmd->insertParam.pTableBlockHashList, NULL);
+ STableDataBlocks **p1 = taosHashIterate(pInsertParam->pTableBlockHashList, NULL);
int32_t i = 0;
while(p1) {
STableDataBlocks* pBlocks = *p1;
- tfree(pCmd->insertParam.pTableNameList[i]);
+ tfree(pInsertParam->pTableNameList[i]);
- pCmd->insertParam.pTableNameList[i++] = tNameDup(&pBlocks->tableName);
- p1 = taosHashIterate(pCmd->insertParam.pTableBlockHashList, p1);
+ pInsertParam->pTableNameList[i++] = tNameDup(&pBlocks->tableName);
+ p1 = taosHashIterate(pInsertParam->pTableBlockHashList, p1);
}
if (freeBlockMap) {
- pCmd->insertParam.pTableBlockHashList = tscDestroyBlockHashTable(pCmd->insertParam.pTableBlockHashList, false);
+ pInsertParam->pTableBlockHashList = tscDestroyBlockHashTable(pInsertParam->pTableBlockHashList, false);
}
}
-int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap) {
- const int INSERT_HEAD_SIZE = sizeof(SMsgDesc) + sizeof(SSubmitMsg);
- SSqlCmd* pCmd = &pSql->cmd;
+int32_t tscMergeTableDataBlocks(SInsertStatementParam *pInsertParam, bool freeBlockMap) {
+ const int INSERT_HEAD_SIZE = sizeof(SMsgDesc) + sizeof(SSubmitMsg);
void* pVnodeDataBlockHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
SArray* pVnodeDataBlockList = taosArrayInit(8, POINTER_BYTES);
- STableDataBlocks** p = taosHashIterate(pCmd->insertParam.pTableBlockHashList, NULL);
+ STableDataBlocks** p = taosHashIterate(pInsertParam->pTableBlockHashList, NULL);
STableDataBlocks* pOneTableBlock = *p;
while(pOneTableBlock) {
@@ -1760,7 +1808,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap) {
int32_t ret = tscGetDataBlockFromList(pVnodeDataBlockHashList, pOneTableBlock->vgId, TSDB_PAYLOAD_SIZE,
INSERT_HEAD_SIZE, 0, &pOneTableBlock->tableName, pOneTableBlock->pTableMeta, &dataBuf, pVnodeDataBlockList);
if (ret != TSDB_CODE_SUCCESS) {
- tscError("0x%"PRIx64" failed to prepare the data block buffer for merging table data, code:%d", pSql->self, ret);
+ tscError("0x%"PRIx64" failed to prepare the data block buffer for merging table data, code:%d", pInsertParam->objectId, ret);
taosHashCleanup(pVnodeDataBlockHashList);
tscDestroyBlockArrayList(pVnodeDataBlockList);
return ret;
@@ -1778,7 +1826,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap) {
dataBuf->pData = tmp;
memset(dataBuf->pData + dataBuf->size, 0, dataBuf->nAllocSize - dataBuf->size);
} else { // failed to allocate memory, free already allocated memory and return error code
- tscError("0x%"PRIx64" failed to allocate memory for merging submit block, size:%d", pSql->self, dataBuf->nAllocSize);
+ tscError("0x%"PRIx64" failed to allocate memory for merging submit block, size:%d", pInsertParam->objectId, dataBuf->nAllocSize);
taosHashCleanup(pVnodeDataBlockHashList);
tscDestroyBlockArrayList(pVnodeDataBlockList);
@@ -1791,7 +1839,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap) {
tscSortRemoveDataBlockDupRows(pOneTableBlock);
char* ekey = (char*)pBlocks->data + pOneTableBlock->rowSize*(pBlocks->numOfRows-1);
- tscDebug("0x%"PRIx64" name:%s, name:%d rows:%d sversion:%d skey:%" PRId64 ", ekey:%" PRId64, pSql->self, tNameGetTableName(&pOneTableBlock->tableName),
+ tscDebug("0x%"PRIx64" name:%s, name:%d rows:%d sversion:%d skey:%" PRId64 ", ekey:%" PRId64, pInsertParam->objectId, tNameGetTableName(&pOneTableBlock->tableName),
pBlocks->tid, pBlocks->numOfRows, pBlocks->sversion, GET_INT64_VAL(pBlocks->data), GET_INT64_VAL(ekey));
int32_t len = pBlocks->numOfRows * (pOneTableBlock->rowSize + expandSize) + sizeof(STColumn) * tscGetNumOfColumns(pOneTableBlock->pTableMeta);
@@ -1803,7 +1851,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap) {
pBlocks->schemaLen = 0;
// erase the empty space reserved for binary data
- int32_t finalLen = trimDataBlock(dataBuf->pData + dataBuf->size, pOneTableBlock, pCmd->insertParam.schemaAttached);
+ int32_t finalLen = trimDataBlock(dataBuf->pData + dataBuf->size, pOneTableBlock, pInsertParam->schemaAttached);
assert(finalLen <= len);
dataBuf->size += (finalLen + sizeof(SSubmitBlk));
@@ -1815,10 +1863,10 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap) {
pBlocks->numOfRows = 0;
}else {
- tscDebug("0x%"PRIx64" table %s data block is empty", pSql->self, pOneTableBlock->tableName.tname);
+ tscDebug("0x%"PRIx64" table %s data block is empty", pInsertParam->objectId, pOneTableBlock->tableName.tname);
}
- p = taosHashIterate(pCmd->insertParam.pTableBlockHashList, p);
+ p = taosHashIterate(pInsertParam->pTableBlockHashList, p);
if (p == NULL) {
break;
}
@@ -1826,10 +1874,10 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap) {
pOneTableBlock = *p;
}
- extractTableNameList(pCmd, freeBlockMap);
+ extractTableNameList(pInsertParam, freeBlockMap);
// free the table data blocks;
- pCmd->insertParam.pDataBlocks = pVnodeDataBlockList;
+ pInsertParam->pDataBlocks = pVnodeDataBlockList;
taosHashCleanup(pVnodeDataBlockHashList);
return TSDB_CODE_SUCCESS;
@@ -3158,6 +3206,15 @@ void tscResetForNextRetrieve(SSqlRes* pRes) {
pRes->numOfRows = 0;
}
+void tscInitResForMerge(SSqlRes* pRes) {
+ pRes->qId = 1; // hack to pass the safety check in fetch_row function
+ pRes->rspType = 0; // used as a flag to denote if taos_retrieved() has been called yet
+ tscResetForNextRetrieve(pRes);
+
+ assert(pRes->pMerger != NULL);
+ pRes->data = pRes->pMerger->buf;
+}
+
void registerSqlObj(SSqlObj* pSql) {
taosAcquireRef(tscRefId, pSql->pTscObj->rid);
pSql->self = taosAddRef(tscObjRef, pSql);
@@ -3179,14 +3236,6 @@ SSqlObj* createSimpleSubObj(SSqlObj* pSql, __async_cb_func_t fp, void* param, in
SSqlCmd* pCmd = &pNew->cmd;
pCmd->command = cmd;
-
- int32_t code = copyTagData(&pNew->cmd.tagData, &pSql->cmd.tagData);
- if (code != TSDB_CODE_SUCCESS) {
- tscError("0x%"PRIx64" new subquery failed, unable to malloc tag data, tableIndex:%d", pSql->self, 0);
- free(pNew);
- return NULL;
- }
-
if (tscAddQueryInfo(pCmd) != TSDB_CODE_SUCCESS) {
#ifdef __APPLE__
// to satisfy later tsem_destroy in taos_free_result
@@ -3284,8 +3333,6 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
pnCmd->insertParam.numOfTables = 0;
pnCmd->insertParam.pTableNameList = NULL;
pnCmd->insertParam.pTableBlockHashList = NULL;
- pnCmd->tagData.data = NULL;
- pnCmd->tagData.dataLen = 0;
if (tscAddQueryInfo(pnCmd) != TSDB_CODE_SUCCESS) {
terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
@@ -3456,7 +3503,11 @@ void doExecuteQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo) {
tscHandleMasterSTableQuery(pSql);
tscUnlockByThread(&pSql->squeryLock);
} else if (TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_INSERT)) {
- tscHandleMultivnodeInsert(pSql);
+ if (TSDB_QUERY_HAS_TYPE(pSql->cmd.insertParam.insertType, TSDB_QUERY_TYPE_FILE_INSERT)) {
+ tscImportDataFromFile(pSql);
+ } else {
+ tscHandleMultivnodeInsert(pSql);
+ }
} else if (pSql->cmd.command > TSDB_SQL_LOCAL) {
tscProcessLocalCmd(pSql);
} else { // send request to server directly
@@ -3674,10 +3725,10 @@ int32_t tscSQLSyntaxErrMsg(char* msg, const char* additionalInfo, const char* s
return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
}
-int32_t tscInvalidSQLErrMsg(char* msg, const char* additionalInfo, const char* sql) {
- const char* msgFormat1 = "invalid SQL: %s";
- const char* msgFormat2 = "invalid SQL: \'%s\' (%s)";
- const char* msgFormat3 = "invalid SQL: \'%s\'";
+int32_t tscInvalidOperationMsg(char* msg, const char* additionalInfo, const char* sql) {
+ const char* msgFormat1 = "invalid operation: %s";
+ const char* msgFormat2 = "invalid operation: \'%s\' (%s)";
+ const char* msgFormat3 = "invalid operation: \'%s\'";
const int32_t BACKWARD_CHAR_STEP = 0;
@@ -4281,11 +4332,13 @@ int32_t tscCreateQueryFromQueryInfo(SQueryInfo* pQueryInfo, SQueryAttr* pQueryAt
pQueryAttr->simpleAgg = isSimpleAggregate(pQueryInfo);
pQueryAttr->needReverseScan = tscNeedReverseScan(pQueryInfo);
pQueryAttr->stableQuery = QUERY_IS_STABLE_QUERY(pQueryInfo->type);
- pQueryAttr->groupbyColumn = tscGroupbyColumn(pQueryInfo);
+ pQueryAttr->groupbyColumn = (!pQueryInfo->stateWindow) && tscGroupbyColumn(pQueryInfo);
pQueryAttr->queryBlockDist = isBlockDistQuery(pQueryInfo);
pQueryAttr->pointInterpQuery = tscIsPointInterpQuery(pQueryInfo);
pQueryAttr->timeWindowInterpo = timeWindowInterpoRequired(pQueryInfo);
pQueryAttr->distinctTag = pQueryInfo->distinctTag;
+ pQueryAttr->sw = pQueryInfo->sessionWindow;
+ pQueryAttr->stateWindow = pQueryInfo->stateWindow;
pQueryAttr->numOfCols = numOfCols;
pQueryAttr->numOfOutput = numOfOutput;
@@ -4293,7 +4346,6 @@ int32_t tscCreateQueryFromQueryInfo(SQueryInfo* pQueryInfo, SQueryAttr* pQueryAt
pQueryAttr->slimit = pQueryInfo->slimit;
pQueryAttr->order = pQueryInfo->order;
pQueryAttr->fillType = pQueryInfo->fillType;
- pQueryAttr->groupbyColumn = tscGroupbyColumn(pQueryInfo);
pQueryAttr->havingNum = pQueryInfo->havingFieldNum;
pQueryAttr->pUdfInfo = pQueryInfo->pUdfInfo;
@@ -4484,3 +4536,38 @@ int tscTransferTableNameList(SSqlObj *pSql, const char *pNameList, int32_t lengt
return TSDB_CODE_SUCCESS;
}
+bool vgroupInfoIdentical(SNewVgroupInfo *pExisted, SVgroupMsg* src) {
+ assert(pExisted != NULL && src != NULL);
+ if (pExisted->numOfEps != src->numOfEps) {
+ return false;
+ }
+
+ for(int32_t i = 0; i < pExisted->numOfEps; ++i) {
+ if (pExisted->ep[i].port != src->epAddr[i].port) {
+ return false;
+ }
+
+ if (strncmp(pExisted->ep[i].fqdn, src->epAddr[i].fqdn, tListLen(pExisted->ep[i].fqdn)) != 0) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+SNewVgroupInfo createNewVgroupInfo(SVgroupMsg *pVgroupMsg) {
+ assert(pVgroupMsg != NULL);
+
+ SNewVgroupInfo info = {0};
+ info.numOfEps = pVgroupMsg->numOfEps;
+ info.vgId = pVgroupMsg->vgId;
+ info.inUse = 0; // 0 is the default value of inUse in case of multiple replica
+
+ assert(info.numOfEps >= 1 && info.vgId >= 1);
+ for(int32_t i = 0; i < pVgroupMsg->numOfEps; ++i) {
+ tstrncpy(info.ep[i].fqdn, pVgroupMsg->epAddr[i].fqdn, TSDB_FQDN_LEN);
+ info.ep[i].port = pVgroupMsg->epAddr[i].port;
+ }
+
+ return info;
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
index 179bad2cedea7759b05f507525b584029bfd3ef9..256e735285bd493f37c9e369a49b369e9e6b4b38 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@@ -16,13 +16,13 @@
*/
package com.taosdata.jdbc;
-import com.taosdata.jdbc.utils.TaosInfo;
-
import java.nio.ByteBuffer;
import java.sql.SQLException;
import java.sql.SQLWarning;
import java.util.List;
+import com.taosdata.jdbc.utils.TaosInfo;
+
/**
* JNI connector
*/
@@ -276,23 +276,14 @@ public class TSDBJNIConnector {
private native int validateCreateTableSqlImp(long connection, byte[] sqlBytes);
public long prepareStmt(String sql) throws SQLException {
- Long stmt = 0L;
- try {
- stmt = prepareStmtImp(sql.getBytes(), this.taos);
- } catch (Exception e) {
- e.printStackTrace();
- throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_ENCODING);
- }
-
- if (stmt == TSDBConstants.JNI_CONNECTION_NULL) {
+ Long stmt = prepareStmtImp(sql.getBytes(), this.taos);
+ if (stmt == TSDBConstants.JNI_TDENGINE_ERROR) {
+ throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_SQL);
+ } else if (stmt == TSDBConstants.JNI_CONNECTION_NULL) {
throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_CONNECTION_NULL);
- }
-
- if (stmt == TSDBConstants.JNI_SQL_NULL) {
+ } else if (stmt == TSDBConstants.JNI_SQL_NULL) {
throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_SQL_NULL);
- }
-
- if (stmt == TSDBConstants.JNI_OUT_OF_MEMORY) {
+ } else if (stmt == TSDBConstants.JNI_OUT_OF_MEMORY) {
throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_OUT_OF_MEMORY);
}
diff --git a/src/dnode/CMakeLists.txt b/src/dnode/CMakeLists.txt
index 4dfa7517ebdea6aa1cb4357b8f1aef88bb8f0318..b67988e344b6d954c9147acdbf84b8ce67b23c6d 100644
--- a/src/dnode/CMakeLists.txt
+++ b/src/dnode/CMakeLists.txt
@@ -10,8 +10,15 @@ INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
INCLUDE_DIRECTORIES(inc)
AUX_SOURCE_DIRECTORY(src SRC)
+IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+ ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
+ SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
+ELSE ()
+ SET(LINK_JEMALLOC "")
+ENDIF ()
+
ADD_EXECUTABLE(taosd ${SRC})
-TARGET_LINK_LIBRARIES(taosd mnode monitor http tsdb twal vnode cJson lua lz4 balance sync)
+TARGET_LINK_LIBRARIES(taosd mnode monitor http tsdb twal vnode cJson lua lz4 balance sync ${LINK_JEMALLOC})
IF (TD_SOMODE_STATIC)
TARGET_LINK_LIBRARIES(taosd taos_static)
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index e6071d7806baa22eea7c4d5d60a89e0a8e73c2b8..6a5cfe004809bdb572598a40b7e5552a7d9cab14 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -476,6 +476,7 @@ typedef struct {
bool simpleAgg;
bool pointInterpQuery; // point interpolation query
bool needReverseScan; // need reverse scan
+ bool stateWindow; // state window flag
STimeWindow window;
int32_t numOfTables;
diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h
index a8665cb48cf6041a46fb4180dca4c44a75a9a27c..d63e1367c476062017fd1ab6c4bcf3d6c742cd5b 100644
--- a/src/inc/ttokendef.h
+++ b/src/inc/ttokendef.h
@@ -141,73 +141,74 @@
#define TK_VARIABLE 122
#define TK_INTERVAL 123
#define TK_SESSION 124
-#define TK_FILL 125
-#define TK_SLIDING 126
-#define TK_ORDER 127
-#define TK_BY 128
-#define TK_ASC 129
-#define TK_DESC 130
-#define TK_GROUP 131
-#define TK_HAVING 132
-#define TK_LIMIT 133
-#define TK_OFFSET 134
-#define TK_SLIMIT 135
-#define TK_SOFFSET 136
-#define TK_WHERE 137
-#define TK_NOW 138
-#define TK_RESET 139
-#define TK_QUERY 140
-#define TK_SYNCDB 141
-#define TK_ADD 142
-#define TK_COLUMN 143
-#define TK_TAG 144
-#define TK_CHANGE 145
-#define TK_SET 146
-#define TK_KILL 147
-#define TK_CONNECTION 148
-#define TK_STREAM 149
-#define TK_COLON 150
-#define TK_ABORT 151
-#define TK_AFTER 152
-#define TK_ATTACH 153
-#define TK_BEFORE 154
-#define TK_BEGIN 155
-#define TK_CASCADE 156
-#define TK_CLUSTER 157
-#define TK_CONFLICT 158
-#define TK_COPY 159
-#define TK_DEFERRED 160
-#define TK_DELIMITERS 161
-#define TK_DETACH 162
-#define TK_EACH 163
-#define TK_END 164
-#define TK_EXPLAIN 165
-#define TK_FAIL 166
-#define TK_FOR 167
-#define TK_IGNORE 168
-#define TK_IMMEDIATE 169
-#define TK_INITIALLY 170
-#define TK_INSTEAD 171
-#define TK_MATCH 172
-#define TK_KEY 173
-#define TK_OF 174
-#define TK_RAISE 175
-#define TK_REPLACE 176
-#define TK_RESTRICT 177
-#define TK_ROW 178
-#define TK_STATEMENT 179
-#define TK_TRIGGER 180
-#define TK_VIEW 181
-#define TK_SEMI 182
-#define TK_NONE 183
-#define TK_PREV 184
-#define TK_LINEAR 185
-#define TK_IMPORT 186
-#define TK_TBNAME 187
-#define TK_JOIN 188
-#define TK_INSERT 189
-#define TK_INTO 190
-#define TK_VALUES 191
+#define TK_STATE_WINDOW 125
+#define TK_FILL 126
+#define TK_SLIDING 127
+#define TK_ORDER 128
+#define TK_BY 129
+#define TK_ASC 130
+#define TK_DESC 131
+#define TK_GROUP 132
+#define TK_HAVING 133
+#define TK_LIMIT 134
+#define TK_OFFSET 135
+#define TK_SLIMIT 136
+#define TK_SOFFSET 137
+#define TK_WHERE 138
+#define TK_NOW 139
+#define TK_RESET 140
+#define TK_QUERY 141
+#define TK_SYNCDB 142
+#define TK_ADD 143
+#define TK_COLUMN 144
+#define TK_TAG 145
+#define TK_CHANGE 146
+#define TK_SET 147
+#define TK_KILL 148
+#define TK_CONNECTION 149
+#define TK_STREAM 150
+#define TK_COLON 151
+#define TK_ABORT 152
+#define TK_AFTER 153
+#define TK_ATTACH 154
+#define TK_BEFORE 155
+#define TK_BEGIN 156
+#define TK_CASCADE 157
+#define TK_CLUSTER 158
+#define TK_CONFLICT 159
+#define TK_COPY 160
+#define TK_DEFERRED 161
+#define TK_DELIMITERS 162
+#define TK_DETACH 163
+#define TK_EACH 164
+#define TK_END 165
+#define TK_EXPLAIN 166
+#define TK_FAIL 167
+#define TK_FOR 168
+#define TK_IGNORE 169
+#define TK_IMMEDIATE 170
+#define TK_INITIALLY 171
+#define TK_INSTEAD 172
+#define TK_MATCH 173
+#define TK_KEY 174
+#define TK_OF 175
+#define TK_RAISE 176
+#define TK_REPLACE 177
+#define TK_RESTRICT 178
+#define TK_ROW 179
+#define TK_STATEMENT 180
+#define TK_TRIGGER 181
+#define TK_VIEW 182
+#define TK_SEMI 183
+#define TK_NONE 184
+#define TK_PREV 185
+#define TK_LINEAR 186
+#define TK_IMPORT 187
+#define TK_TBNAME 188
+#define TK_JOIN 189
+#define TK_INSERT 190
+#define TK_INTO 191
+#define TK_VALUES 192
#define TK_SPACE 300
#define TK_COMMENT 301
diff --git a/src/kit/shell/CMakeLists.txt b/src/kit/shell/CMakeLists.txt
index 10283dfebb1e2a3be7581f8e3ceee661b6f84cc4..2ec6f0a6755c85529351ebb3f48865925b838548 100644
--- a/src/kit/shell/CMakeLists.txt
+++ b/src/kit/shell/CMakeLists.txt
@@ -11,10 +11,17 @@ IF (TD_LINUX)
LIST(REMOVE_ITEM SRC ./src/shellDarwin.c)
ADD_EXECUTABLE(shell ${SRC})
+IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+ ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
+ SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
+ELSE ()
+ SET(LINK_JEMALLOC "")
+ENDIF ()
+
IF (TD_SOMODE_STATIC)
- TARGET_LINK_LIBRARIES(shell taos_static lua)
+ TARGET_LINK_LIBRARIES(shell taos_static lua ${LINK_JEMALLOC})
ELSE ()
- TARGET_LINK_LIBRARIES(shell taos lua)
+ TARGET_LINK_LIBRARIES(shell taos lua ${LINK_JEMALLOC})
ENDIF ()
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
diff --git a/src/kit/taosdemo/CMakeLists.txt b/src/kit/taosdemo/CMakeLists.txt
index 26e69ca45275e45c248f3161c9f635bc0e69e3e1..6be858d8660b3a18974f1dd2421738db27a5a5f8 100644
--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
@@ -55,14 +55,21 @@ ENDIF ()
MESSAGE("TD_VERSION_NUMBER is:" ${TD_VERSION_NUMBER})
ADD_DEFINITIONS(-DTD_VERNUMBER="${TD_VERSION_NUMBER}")
+IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+ ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
+ SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
+ELSE ()
+ SET(LINK_JEMALLOC "")
+ENDIF ()
+
IF (TD_LINUX)
AUX_SOURCE_DIRECTORY(. SRC)
ADD_EXECUTABLE(taosdemo ${SRC})
IF (TD_SOMODE_STATIC)
- TARGET_LINK_LIBRARIES(taosdemo taos_static cJson lua)
+ TARGET_LINK_LIBRARIES(taosdemo taos_static cJson lua ${LINK_JEMALLOC})
ELSE ()
- TARGET_LINK_LIBRARIES(taosdemo taos cJson)
+ TARGET_LINK_LIBRARIES(taosdemo taos cJson ${LINK_JEMALLOC})
ENDIF ()
ELSEIF (TD_WINDOWS)
AUX_SOURCE_DIRECTORY(. SRC)
@@ -71,7 +78,7 @@ ELSEIF (TD_WINDOWS)
IF (TD_SOMODE_STATIC)
TARGET_LINK_LIBRARIES(taosdemo taos_static cJson lua)
ELSE ()
- TARGET_LINK_LIBRARIES(taosdemo taos cJson lua})
+ TARGET_LINK_LIBRARIES(taosdemo taos cJson lua)
ENDIF ()
ELSEIF (TD_DARWIN)
# missing a few dependencies, such as
diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c
index 4d99de590f02fd01e03d1f39a2e226406d54d9c7..874e3f26ce28913218241192499770cb30e241d5 100644
--- a/src/mnode/src/mnodeDb.c
+++ b/src/mnode/src/mnodeDb.c
@@ -1063,6 +1063,13 @@ static SDbCfg mnodeGetAlterDbOption(SDbObj *pDb, SAlterDbMsg *pAlter) {
newCfg.partitions = partitions;
}
+// community version can only change daysToKeep
+// but enterprise version can change all daysToKeep options
+#ifndef _STORAGE
+ newCfg.daysToKeep1 = newCfg.daysToKeep;
+ newCfg.daysToKeep2 = newCfg.daysToKeep;
+#endif
+
return newCfg;
}
diff --git a/src/os/inc/osMemory.h b/src/os/inc/osMemory.h
index 27efd9f5051d9f87838980503ed60174de153ad4..793992c197a475b68046296b6683b5b2843b9d68 100644
--- a/src/os/inc/osMemory.h
+++ b/src/os/inc/osMemory.h
@@ -22,6 +22,10 @@
extern "C" {
#endif
+#ifdef TD_JEMALLOC_ENABLED
+#include
+#endif
+
typedef enum {
TAOS_ALLOC_MODE_DEFAULT = 0,
TAOS_ALLOC_MODE_RANDOM_FAIL = 1,
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
index 8f4e0dd2613d77c62dccc4b5e13a4cd2f96af631..e3baf06db8c4d7d4aa28b6f936e902e527046907 100644
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
@@ -22,6 +22,7 @@
#include "qFill.h"
#include "qResultbuf.h"
#include "qSqlparser.h"
+#include "qTableMeta.h"
#include "qTsbuf.h"
#include "query.h"
#include "taosdef.h"
@@ -71,14 +72,6 @@ typedef struct SResultRowPool {
SArray* pData; // SArray
} SResultRowPool;
-typedef struct SGroupbyExpr {
- int16_t tableIndex;
- SArray* columnInfo; // SArray, group by columns information
- int16_t numOfGroupCols; // todo remove it
- int16_t orderIndex; // order by column index
- int16_t orderType; // order by type: asc/desc
-} SGroupbyExpr;
-
typedef struct SResultRow {
int32_t pageId; // pageId & rowId is the position of current result in disk-based output buffer
int32_t offset:29; // row index in buffer page
@@ -197,6 +190,7 @@ typedef struct SQueryAttr {
bool pointInterpQuery; // point interpolation query
bool needReverseScan; // need reverse scan
bool distinctTag; // distinct tag query
+ bool stateWindow; // window State on sub/normal table
int32_t interBufSize; // intermediate buffer sizse
int32_t havingNum; // having expr number
@@ -217,7 +211,7 @@ typedef struct SQueryAttr {
int32_t intermediateResultRowSize; // intermediate result row size, in case of top-k query.
int32_t maxTableColumnWidth;
int32_t tagLen; // tag value length of current query
- SGroupbyExpr* pGroupbyExpr;
+ SGroupbyExpr *pGroupbyExpr;
SExprInfo* pExpr1;
SExprInfo* pExpr2;
@@ -306,6 +300,7 @@ enum OPERATOR_TYPE_E {
OP_Filter = 19,
OP_Distinct = 20,
OP_Join = 21,
+ OP_StateWindow = 22,
};
typedef struct SOperatorInfo {
@@ -471,6 +466,16 @@ typedef struct SSWindowOperatorInfo {
int32_t start; // start row index
} SSWindowOperatorInfo;
+typedef struct SStateWindowOperatorInfo {
+ SOptrBasicInfo binfo;
+ STimeWindow curWindow; // current time window
+ int32_t numOfRows; // number of rows
+ int32_t colIndex; // start row index
+ int32_t start;
+ char* prevData; // previous data
+
+} SStateWindowOperatorInfo ;
+
typedef struct SDistinctOperatorInfo {
SHashObj *pSet;
SSDataBlock *pRes;
@@ -479,10 +484,10 @@ typedef struct SDistinctOperatorInfo {
int64_t outputCapacity;
} SDistinctOperatorInfo;
-struct SLocalMerger;
+struct SGlobalMerger;
typedef struct SMultiwayMergeInfo {
- struct SLocalMerger *pMerge;
+ struct SGlobalMerger *pMerge;
SOptrBasicInfo binfo;
int32_t bufCapacity;
int64_t seed;
@@ -522,6 +527,7 @@ SOperatorInfo* createTableBlockInfoScanOperator(void* pTsdbQueryHandle, SQueryRu
SOperatorInfo* createMultiwaySortOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SExprInfo* pExpr, int32_t numOfOutput,
int32_t numOfRows, void* merger, bool groupMix);
SOperatorInfo* createGlobalAggregateOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput, void* param, SArray* pUdfInfo);
+SOperatorInfo* createStatewindowOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
SOperatorInfo* createSLimitOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput, void* merger);
SOperatorInfo* createFilterOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr,
int32_t numOfOutput, SColumnInfo* pCols, int32_t numOfFilter);
@@ -565,6 +571,8 @@ int32_t createFilterInfo(SQueryAttr* pQueryAttr, uint64_t qId);
void freeColumnFilterInfo(SColumnFilterInfo* pFilter, int32_t numOfFilters);
STableQueryInfo *createTableQueryInfo(SQueryAttr* pQueryAttr, void* pTable, bool groupbyColumn, STimeWindow win, void* buf);
+STableQueryInfo* createTmpTableQueryInfo(STimeWindow win);
+
int32_t buildArithmeticExprFromMsg(SExprInfo *pArithExprInfo, void *pQueryMsg);
bool isQueryKilled(SQInfo *pQInfo);
diff --git a/src/query/inc/qPlan.h b/src/query/inc/qPlan.h
index 30c0f8db4e43f33e8ac69e2bcde50ca77abac4d2..60a50ca70c32b1aa3f10af4ed19231b77b50f677 100644
--- a/src/query/inc/qPlan.h
+++ b/src/query/inc/qPlan.h
@@ -16,6 +16,8 @@
#ifndef TDENGINE_QPLAN_H
#define TDENGINE_QPLAN_H
+#include "qExecutor.h"
+
struct SQueryInfo;
typedef struct SQueryNodeBasicInfo {
diff --git a/src/query/inc/qSqlparser.h b/src/query/inc/qSqlparser.h
index 63b928604cd4ab25d913026d30e98e131b50470d..adb385911e87a62e79bdc5b66bb68e486fa0a3a0 100644
--- a/src/query/inc/qSqlparser.h
+++ b/src/query/inc/qSqlparser.h
@@ -89,6 +89,10 @@ typedef struct SSessionWindowVal {
SStrToken gap;
} SSessionWindowVal;
+typedef struct SWindowStateVal {
+ SStrToken col;
+} SWindowStateVal;
+
struct SRelationInfo;
typedef struct SSqlNode {
@@ -100,6 +104,7 @@ typedef struct SSqlNode {
SArray *fillType; // fill type[optional], SArray
SIntervalVal interval; // (interval, interval_offset) [optional]
SSessionWindowVal sessionVal; // session window [optional]
+ SWindowStateVal windowstateVal; // window_state(col) [optional]
SStrToken sliding; // sliding window [optional]
SLimitVal limit; // limit offset [optional]
SLimitVal slimit; // group limit offset [optional]
@@ -142,7 +147,7 @@ typedef struct SCreateTableSql {
} colInfo;
SArray *childTableInfo; // SArray
- SSqlNode *pSelect;
+ SSqlNode *pSelect;
} SCreateTableSql;
typedef struct SAlterTableInfo {
@@ -268,7 +273,6 @@ SArray *tVariantListInsert(SArray *pList, tVariant *pVar, uint8_t sortOrder, int
SArray *tVariantListAppendToken(SArray *pList, SStrToken *pAliasToken, uint8_t sortOrder);
SRelationInfo *setTableNameList(SRelationInfo* pFromInfo, SStrToken *pName, SStrToken* pAlias);
-//SRelationInfo *setSubquery(SRelationInfo* pFromInfo, SRelElementPair* p);
void *destroyRelationInfo(SRelationInfo* pFromInfo);
SRelationInfo *addSubqueryElem(SRelationInfo* pRelationInfo, SArray* pSub, SStrToken* pAlias);
@@ -286,7 +290,7 @@ SArray *tSqlExprListAppend(SArray *pList, tSqlExpr *pNode, SStrToken *pDistinc
void tSqlExprListDestroy(SArray *pList);
SSqlNode *tSetQuerySqlNode(SStrToken *pSelectToken, SArray *pSelNodeList, SRelationInfo *pFrom, tSqlExpr *pWhere,
- SArray *pGroupby, SArray *pSortOrder, SIntervalVal *pInterval, SSessionWindowVal *ps,
+ SArray *pGroupby, SArray *pSortOrder, SIntervalVal *pInterval, SSessionWindowVal *ps, SWindowStateVal *pw,
SStrToken *pSliding, SArray *pFill, SLimitVal *pLimit, SLimitVal *pgLimit, tSqlExpr *pHaving);
int32_t tSqlExprCompare(tSqlExpr *left, tSqlExpr *right);
diff --git a/src/query/inc/qTableMeta.h b/src/query/inc/qTableMeta.h
new file mode 100644
index 0000000000000000000000000000000000000000..a29020fc47c8358379bc4fb171088c4d5c8c6636
--- /dev/null
+++ b/src/query/inc/qTableMeta.h
@@ -0,0 +1,206 @@
+#ifndef TDENGINE_QTABLEUTIL_H
+#define TDENGINE_QTABLEUTIL_H
+
+#include "tsdb.h" //todo tsdb should not be here
+#include "qSqlparser.h"
+
+typedef struct SFieldInfo {
+ int16_t numOfOutput; // number of column in result
+ TAOS_FIELD* final;
+ SArray *internalField; // SArray
+} SFieldInfo;
+
+typedef struct SCond {
+ uint64_t uid;
+ int32_t len; // length of tag query condition data
+ char * cond;
+} SCond;
+
+typedef struct SJoinNode {
+ uint64_t uid;
+ int16_t tagColId;
+ SArray* tsJoin;
+ SArray* tagJoin;
+} SJoinNode;
+
+typedef struct SJoinInfo {
+ bool hasJoin;
+ SJoinNode *joinTables[TSDB_MAX_JOIN_TABLE_NUM];
+} SJoinInfo;
+
+typedef struct STagCond {
+ // relation between tbname list and query condition, including : TK_AND or TK_OR
+ int16_t relType;
+
+ // tbname query condition, only support tbname query condition on one table
+ SCond tbnameCond;
+
+ // join condition, only support two tables join currently
+ SJoinInfo joinInfo;
+
+ // for different table, the query condition must be seperated
+ SArray *pCond;
+} STagCond;
+
+typedef struct SGroupbyExpr {
+ int16_t tableIndex;
+ SArray* columnInfo; // SArray, group by columns information
+ int16_t numOfGroupCols; // todo remove it
+ int16_t orderIndex; // order by column index
+ int16_t orderType; // order by type: asc/desc
+} SGroupbyExpr;
+
+typedef struct STableComInfo {
+ uint8_t numOfTags;
+ uint8_t precision;
+ int16_t numOfColumns;
+ int32_t rowSize;
+} STableComInfo;
+
+typedef struct STableMeta {
+ int32_t vgId;
+ STableId id;
+ uint8_t tableType;
+ char sTableName[TSDB_TABLE_FNAME_LEN]; // super table name
+ uint64_t suid; // super table id
+ int16_t sversion;
+ int16_t tversion;
+ STableComInfo tableInfo;
+ SSchema schema[]; // if the table is TSDB_CHILD_TABLE, schema is acquired by super table meta info
+} STableMeta;
+
+typedef struct STableMetaInfo {
+ STableMeta *pTableMeta; // table meta, cached in client side and acquired by name
+ uint32_t tableMetaSize;
+ SVgroupsInfo *vgroupList;
+ SArray *pVgroupTables; // SArray
+
+ /*
+ * 1. keep the vgroup index during the multi-vnode super table projection query
+ * 2. keep the vgroup index for multi-vnode insertion
+ */
+ int32_t vgroupIndex;
+ SName name;
+ char aliasName[TSDB_TABLE_NAME_LEN]; // alias name of table specified in query sql
+ SArray *tagColList; // SArray, involved tag columns
+} STableMetaInfo;
+
+struct SQInfo; // global merge operator
+struct SQueryAttr; // query object
+
+typedef struct SQueryInfo {
+ int16_t command; // the command may be different for each subclause, so keep it seperately.
+ uint32_t type; // query/insert type
+ STimeWindow window; // the whole query time window
+
+ SInterval interval; // tumble time window
+ SSessionWindow sessionWindow; // session time window
+
+ SGroupbyExpr groupbyExpr; // groupby tags info
+ SArray * colList; // SArray
+ SFieldInfo fieldsInfo;
+ SArray * exprList; // SArray
+ SArray * exprList1; // final exprlist in case of arithmetic expression exists
+ SLimitVal limit;
+ SLimitVal slimit;
+ STagCond tagCond;
+
+ SOrderVal order;
+ int16_t fillType; // final result fill type
+ int16_t numOfTables;
+ STableMetaInfo **pTableMetaInfo;
+ struct STSBuf *tsBuf;
+ int64_t * fillVal; // default value for fill
+ char * msg; // pointer to the pCmd->payload to keep error message temporarily
+ int64_t clauseLimit; // limit for current sub clause
+
+ int64_t prjOffset; // offset value in the original sql expression, only applied at client side
+ int64_t vgroupLimit; // table limit in case of super table projection query + global order + limit
+
+ int32_t udColumnId; // current user-defined constant output field column id, monotonically decreases from TSDB_UD_COLUMN_INDEX
+ int16_t resColumnId; // result column id
+ bool distinctTag; // distinct tag or not
+ int32_t round; // 0/1/....
+ int32_t bufLen;
+ char* buf;
+ SArray *pUdfInfo;
+
+ struct SQInfo *pQInfo; // global merge operator
+ struct SQueryAttr *pQueryAttr; // query object
+
+ struct SQueryInfo *sibling; // sibling
+ SArray *pUpstream; // SArray
+ struct SQueryInfo *pDownstream;
+ int32_t havingFieldNum;
+ bool stableQuery;
+ bool groupbyColumn;
+ bool simpleAgg;
+ bool arithmeticOnAgg;
+ bool projectionQuery;
+ bool hasFilter;
+ bool onlyTagQuery;
+ bool orderProjectQuery;
+ bool stateWindow;
+ bool globalMerge;
+} SQueryInfo;
+
+/**
+ * get the number of tags of this table
+ * @param pTableMeta
+ * @return
+ */
+int32_t tscGetNumOfTags(const STableMeta* pTableMeta);
+
+/**
+ * get the number of columns of this table
+ * @param pTableMeta
+ * @return
+ */
+int32_t tscGetNumOfColumns(const STableMeta* pTableMeta);
+
+/**
+ * get the basic info of this table
+ * @param pTableMeta
+ * @return
+ */
+STableComInfo tscGetTableInfo(const STableMeta* pTableMeta);
+
+/**
+ * get the schema
+ * @param pTableMeta
+ * @return
+ */
+SSchema* tscGetTableSchema(const STableMeta* pTableMeta);
+
+/**
+ * get the tag schema
+ * @param pMeta
+ * @return
+ */
+SSchema *tscGetTableTagSchema(const STableMeta *pMeta);
+
+/**
+ * get the column schema according to the column index
+ * @param pMeta
+ * @param colIndex
+ * @return
+ */
+SSchema *tscGetTableColumnSchema(const STableMeta *pMeta, int32_t colIndex);
+
+/**
+ * get the column schema according to the column id
+ * @param pTableMeta
+ * @param colId
+ * @return
+ */
+SSchema* tscGetColumnSchemaById(STableMeta* pTableMeta, int16_t colId);
+
+/**
+ * create the table meta from the msg
+ * @param pTableMetaMsg
+ * @param size size of the table meta
+ * @return
+ */
+STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg);
+
+#endif // TDENGINE_QTABLEUTIL_H
diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y
index 58f7d4da26dafa0fe181349b822f7cbcd3644511..b692a25fd8ae4dee9bb1df1a547e4385ff0345f1 100644
--- a/src/query/inc/sql.y
+++ b/src/query/inc/sql.y
@@ -463,8 +463,8 @@ tagitem(A) ::= PLUS(X) FLOAT(Y). {
//////////////////////// The SELECT statement /////////////////////////////////
%type select {SSqlNode*}
%destructor select {destroySqlNode($$);}
-select(A) ::= SELECT(T) selcollist(W) from(X) where_opt(Y) interval_opt(K) session_option(H) fill_opt(F) sliding_opt(S) groupby_opt(P) orderby_opt(Z) having_opt(N) slimit_opt(G) limit_opt(L). {
- A = tSetQuerySqlNode(&T, W, X, Y, P, Z, &K, &H, &S, F, &L, &G, N);
+select(A) ::= SELECT(T) selcollist(W) from(X) where_opt(Y) interval_opt(K) session_option(H) windowstate_option(D) fill_opt(F) sliding_opt(S) groupby_opt(P) orderby_opt(Z) having_opt(N) slimit_opt(G) limit_opt(L). {
+ A = tSetQuerySqlNode(&T, W, X, Y, P, Z, &K, &H, &D, &S, F, &L, &G, N);
}
select(A) ::= LP select(B) RP. {A = B;}
@@ -482,7 +482,7 @@ cmd ::= union(X). { setSqlInfo(pInfo, X, NULL, TSDB_SQL_SELECT); }
// select client_version()
// select server_state()
select(A) ::= SELECT(T) selcollist(W). {
- A = tSetQuerySqlNode(&T, W, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ A = tSetQuerySqlNode(&T, W, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
}
// selcollist is a list of expressions that are to become the return
@@ -565,6 +565,11 @@ session_option(X) ::= SESSION LP ids(V) cpxName(Z) COMMA tmvar(Y) RP. {
X.col = V;
X.gap = Y;
}
+%type windowstate_option {SWindowStateVal}
+windowstate_option(X) ::= . {X.col.n = 0;}
+windowstate_option(X) ::= STATE_WINDOW LP ids(V) RP. {
+ X.col = V;
+}
%type fill_opt {SArray*}
%destructor fill_opt {taosArrayDestroy($$);}
diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c
index 6379b7bbe78245731de81eb99256954dba94d234..1b8b5ec58d3d42f4cda5e612e0080d28bed89f9c 100644
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -2518,7 +2518,6 @@ static void buildTopBotStruct(STopBotInfo *pTopBotInfo, SQLFunctionCtx *pCtx) {
tmp += POINTER_BYTES * pCtx->param[0].i64;
size_t size = sizeof(tValuePair) + pCtx->tagInfo.tagsLen;
-// assert(pCtx->param[0].i64 > 0);
for (int32_t i = 0; i < pCtx->param[0].i64; ++i) {
pTopBotInfo->res[i] = (tValuePair*) tmp;
@@ -2527,7 +2526,6 @@ static void buildTopBotStruct(STopBotInfo *pTopBotInfo, SQLFunctionCtx *pCtx) {
}
}
-
bool topbot_datablock_filter(SQLFunctionCtx *pCtx, const char *minval, const char *maxval) {
SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx);
if (pResInfo == NULL) {
@@ -2606,13 +2604,14 @@ static void top_function(SQLFunctionCtx *pCtx) {
for (int32_t i = 0; i < pCtx->size; ++i) {
char *data = GET_INPUT_DATA(pCtx, i);
- TSKEY ts = GET_TS_DATA(pCtx, i);
-
if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
continue;
}
notNullElems++;
+
+ // NOTE: Set the default timestamp if it is missing [todo refactor]
+ TSKEY ts = (pCtx->ptsList != NULL)? GET_TS_DATA(pCtx, i):0;
do_top_function_add(pRes, (int32_t)pCtx->param[0].i64, data, ts, pCtx->inputType, &pCtx->tagInfo, NULL, 0);
}
@@ -2685,13 +2684,13 @@ static void bottom_function(SQLFunctionCtx *pCtx) {
for (int32_t i = 0; i < pCtx->size; ++i) {
char *data = GET_INPUT_DATA(pCtx, i);
- TSKEY ts = GET_TS_DATA(pCtx, i);
-
if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
continue;
}
-
+
notNullElems++;
+ // NOTE: Set the default timestamp if it is missing [todo refactor]
+ TSKEY ts = (pCtx->ptsList != NULL)? GET_TS_DATA(pCtx, i):0;
do_bottom_function_add(pRes, (int32_t)pCtx->param[0].i64, data, ts, pCtx->inputType, &pCtx->tagInfo, NULL, 0);
}
@@ -2769,7 +2768,7 @@ static void top_bottom_func_finalizer(SQLFunctionCtx *pCtx) {
if (pCtx->param[1].i64 == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
__compar_fn_t comparator = (pCtx->param[2].i64 == TSDB_ORDER_ASC) ? resAscComparFn : resDescComparFn;
qsort(tvp, (size_t)pResInfo->numOfRes, POINTER_BYTES, comparator);
- } else if (pCtx->param[1].i64 > PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+ } else /*if (pCtx->param[1].i64 > PRIMARYKEY_TIMESTAMP_COL_INDEX)*/ {
__compar_fn_t comparator = (pCtx->param[2].i64 == TSDB_ORDER_ASC) ? resDataAscComparFn : resDataDescComparFn;
qsort(tvp, (size_t)pResInfo->numOfRes, POINTER_BYTES, comparator);
}
@@ -3324,8 +3323,12 @@ static void col_project_function(SQLFunctionCtx *pCtx) {
if (pCtx->numOfParams == 2) {
return;
}
+ if (pCtx->param[0].i64 == 1) {
+ SET_VAL(pCtx, pCtx->size, 1);
+ } else {
+ INC_INIT_VAL(pCtx, pCtx->size);
+ }
- INC_INIT_VAL(pCtx, pCtx->size);
char *pData = GET_INPUT_DATA_LIST(pCtx);
if (pCtx->order == TSDB_ORDER_ASC) {
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index a9302322dea78a7a5cd4b05824faf55e5c2c4823..60575314289969aadf7cc072938dcaf81fa5dcbf 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -190,12 +190,16 @@ static void destroySFillOperatorInfo(void* param, int32_t numOfOutput);
static void destroyGroupbyOperatorInfo(void* param, int32_t numOfOutput);
static void destroyArithOperatorInfo(void* param, int32_t numOfOutput);
static void destroyTagScanOperatorInfo(void* param, int32_t numOfOutput);
+static void destroySWindowOperatorInfo(void* param, int32_t numOfOutput);
+static void destroyStateWindowOperatorInfo(void* param, int32_t numOfOutput);
+static void destroyAggOperatorInfo(void* param, int32_t numOfOutput);
static void destroyOperatorInfo(SOperatorInfo* pOperator);
+
static int32_t doCopyToSDataBlock(SQueryRuntimeEnv* pRuntimeEnv, SGroupResInfo* pGroupResInfo, int32_t orderType, SSDataBlock* pBlock);
static int32_t getGroupbyColumnIndex(SGroupbyExpr *pGroupbyExpr, SSDataBlock* pDataBlock);
-static int32_t setGroupResultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SGroupbyOperatorInfo *pInfo, int32_t numOfCols, char *pData, int16_t type, int16_t bytes, int32_t groupIndex);
+static int32_t setGroupResultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SOptrBasicInfo *binf, int32_t numOfCols, char *pData, int16_t type, int16_t bytes, int32_t groupIndex);
static void initCtxOutputBuffer(SQLFunctionCtx* pCtx, int32_t size);
static void getAlignQueryTimeWindow(SQueryAttr *pQueryAttr, int64_t key, int64_t keyFirst, int64_t keyLast, STimeWindow *win);
@@ -805,7 +809,6 @@ static void doApplyFunctions(SQueryRuntimeEnv* pRuntimeEnv, SQLFunctionCtx* pCtx
if (pCtx[k].preAggVals.isSet && forwardStep < numOfTotal) {
pCtx[k].preAggVals.isSet = false;
}
-
if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
// aAggs[functionId].xFunction(&pCtx[k]);
if (functionId < 0) { // load the script and exec, pRuntimeEnv->pUdfInfo
@@ -1034,7 +1037,13 @@ static void doSetInputDataBlock(SOperatorInfo* pOperator, SQLFunctionCtx* pCtx,
uint32_t status = aAggs[pCtx[i].functionId].status;
if ((status & (TSDB_FUNCSTATE_SELECTIVITY | TSDB_FUNCSTATE_NEED_TS)) != 0) {
SColumnInfoData* tsInfo = taosArrayGet(pBlock->pDataBlock, 0);
- pCtx[i].ptsList = (int64_t*) tsInfo->pData;
+ // In case of the top/bottom query again the nest query result, which has no timestamp column
+ // don't set the ptsList attribute.
+ if (tsInfo->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
+ pCtx[i].ptsList = (int64_t*) tsInfo->pData;
+ } else {
+ pCtx[i].ptsList = NULL;
+ }
}
} else if (TSDB_COL_IS_UD_COL(pCol->flag) && (pOperator->pRuntimeEnv->scanFlag == MERGE_STAGE)) {
SColIndex* pColIndex = &pOperator->pExpr[i].base.colInfo;
@@ -1400,7 +1409,7 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SGroupbyOperatorInfo *pIn
}
int32_t ret =
- setGroupResultOutputBuf(pRuntimeEnv, pInfo, pOperator->numOfOutput, val, type, bytes, item->groupIndex);
+ setGroupResultOutputBuf(pRuntimeEnv, &(pInfo->binfo), pOperator->numOfOutput, val, type, bytes, item->groupIndex);
if (ret != TSDB_CODE_SUCCESS) { // null data, too many state code
longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
}
@@ -1442,12 +1451,16 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSWindowOperatorInf
pInfo->start = j;
} else if (tsList[j] - pInfo->prevTs <= gap) {
pInfo->curWindow.ekey = tsList[j];
- pInfo->prevTs = tsList[j];
+ //pInfo->prevTs = tsList[j];
pInfo->numOfRows += 1;
- pInfo->start = j;
+ if (j == 0 && pInfo->start != 0) {
+ pInfo->numOfRows = 1;
+ pInfo->start = 0;
+ }
} else { // start a new session window
SResultRow* pResult = NULL;
+ pInfo->curWindow.ekey = pInfo->curWindow.skey;
int32_t ret = setWindowOutputBufByKey(pRuntimeEnv, &pBInfo->resultRowInfo, &pInfo->curWindow, masterScan,
&pResult, item->groupIndex, pBInfo->pCtx, pOperator->numOfOutput,
pBInfo->rowCellInfoOffset);
@@ -1468,6 +1481,7 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSWindowOperatorInf
SResultRow* pResult = NULL;
+ pInfo->curWindow.ekey = pInfo->curWindow.skey;
int32_t ret = setWindowOutputBufByKey(pRuntimeEnv, &pBInfo->resultRowInfo, &pInfo->curWindow, masterScan,
&pResult, item->groupIndex, pBInfo->pCtx, pOperator->numOfOutput,
pBInfo->rowCellInfoOffset);
@@ -1495,12 +1509,12 @@ static void setResultRowKey(SResultRow* pResultRow, char* pData, int16_t type) {
}
}
-static int32_t setGroupResultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SGroupbyOperatorInfo *pInfo, int32_t numOfCols, char *pData, int16_t type, int16_t bytes, int32_t groupIndex) {
+static int32_t setGroupResultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SOptrBasicInfo *binfo, int32_t numOfCols, char *pData, int16_t type, int16_t bytes, int32_t groupIndex) {
SDiskbasedResultBuf *pResultBuf = pRuntimeEnv->pResultBuf;
- int32_t *rowCellInfoOffset = pInfo->binfo.rowCellInfoOffset;
- SResultRowInfo *pResultRowInfo = &pInfo->binfo.resultRowInfo;
- SQLFunctionCtx *pCtx = pInfo->binfo.pCtx;
+ int32_t *rowCellInfoOffset = binfo->rowCellInfoOffset;
+ SResultRowInfo *pResultRowInfo = &binfo->resultRowInfo;
+ SQLFunctionCtx *pCtx = binfo->pCtx;
// not assign result buffer yet, add new result buffer, TODO remove it
char* d = pData;
@@ -1822,7 +1836,10 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
case OP_TimeWindow: {
pRuntimeEnv->proot =
createTimeIntervalOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1, pQueryAttr->numOfOutput);
- setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
+ int32_t opType = pRuntimeEnv->proot->upstream[0]->operatorType;
+ if (opType != OP_DummyInput && opType != OP_Join) {
+ setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
+ }
break;
}
case OP_Groupby: {
@@ -1868,6 +1885,11 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
}
break;
}
+ case OP_StateWindow: {
+ pRuntimeEnv->proot = createStatewindowOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1, pQueryAttr->numOfOutput);
+ setTableScanFilterOperatorInfo(pRuntimeEnv->proot->upstream[0]->info, pRuntimeEnv->proot);
+ break;
+ }
case OP_Limit: {
pRuntimeEnv->proot = createLimitOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot);
@@ -2212,6 +2234,8 @@ static bool onlyFirstQuery(SQueryAttr *pQueryAttr) { return onlyOneQueryType(pQu
static bool onlyLastQuery(SQueryAttr *pQueryAttr) { return onlyOneQueryType(pQueryAttr, TSDB_FUNC_LAST, TSDB_FUNC_LAST_DST); }
+static bool notContainSessionOrStateWindow(SQueryAttr *pQueryAttr) { return !(pQueryAttr->sw.gap > 0 || pQueryAttr->stateWindow); }
+
static int32_t updateBlockLoadStatus(SQueryAttr *pQuery, int32_t status) {
bool hasFirstLastFunc = false;
bool hasOtherFunc = false;
@@ -2315,7 +2339,7 @@ static void changeExecuteScanOrder(SQInfo *pQInfo, SQueryTableMsg* pQueryMsg, bo
}
pQueryAttr->order.order = TSDB_ORDER_ASC;
- } else if (onlyLastQuery(pQueryAttr)) {
+ } else if (onlyLastQuery(pQueryAttr) && notContainSessionOrStateWindow(pQueryAttr)) {
if (QUERY_IS_ASC_QUERY(pQueryAttr)) {
qDebug(msg, pQInfo, "only-last", pQueryAttr->order.order, TSDB_ORDER_DESC, pQueryAttr->window.skey,
pQueryAttr->window.ekey, pQueryAttr->window.ekey, pQueryAttr->window.skey);
@@ -3331,7 +3355,7 @@ void finalizeQueryResult(SOperatorInfo* pOperator, SQLFunctionCtx* pCtx, SResult
SQueryAttr *pQueryAttr = pRuntimeEnv->pQueryAttr;
int32_t numOfOutput = pOperator->numOfOutput;
- if (pQueryAttr->groupbyColumn || QUERY_IS_INTERVAL_QUERY(pQueryAttr) || pQueryAttr->sw.gap > 0) {
+ if (pQueryAttr->groupbyColumn || QUERY_IS_INTERVAL_QUERY(pQueryAttr) || pQueryAttr->sw.gap > 0 || pQueryAttr->stateWindow) {
// for each group result, call the finalize function for each column
if (pQueryAttr->groupbyColumn) {
closeAllResultRows(pResultRowInfo);
@@ -3407,6 +3431,25 @@ STableQueryInfo *createTableQueryInfo(SQueryAttr* pQueryAttr, void* pTable, bool
return pTableQueryInfo;
}
+STableQueryInfo* createTmpTableQueryInfo(STimeWindow win) {
+ STableQueryInfo* pTableQueryInfo = calloc(1, sizeof(STableQueryInfo));
+
+ pTableQueryInfo->win = win;
+ pTableQueryInfo->lastKey = win.skey;
+
+ pTableQueryInfo->pTable = NULL;
+ pTableQueryInfo->cur.vgroupIndex = -1;
+
+ // set more initial size of interval/groupby query
+ int32_t initialSize = 16;
+ int32_t code = initResultRowInfo(&pTableQueryInfo->resInfo, initialSize, TSDB_DATA_TYPE_INT);
+ if (code != TSDB_CODE_SUCCESS) {
+ return NULL;
+ }
+
+ return pTableQueryInfo;
+}
+
void destroyTableQueryInfoImpl(STableQueryInfo *pTableQueryInfo) {
if (pTableQueryInfo == NULL) {
return;
@@ -4335,6 +4378,10 @@ static void updateTableIdInfo(STableQueryInfo* pTableQueryInfo, SSDataBlock* pBl
int32_t step = GET_FORWARD_DIRECTION_FACTOR(order);
pTableQueryInfo->lastKey = ((order == TSDB_ORDER_ASC)? pBlock->info.window.ekey:pBlock->info.window.skey) + step;
+ if (pTableQueryInfo->pTable == NULL) {
+ return;
+ }
+
STableIdInfo tidInfo = createTableIdInfo(pTableQueryInfo);
STableIdInfo *idinfo = taosHashGet(pTableIdInfo, &tidInfo.tid, sizeof(tidInfo.tid));
if (idinfo != NULL) {
@@ -4636,6 +4683,12 @@ void setTableScanFilterOperatorInfo(STableScanInfo* pTableScanInfo, SOperatorInf
} else if (pDownstream->operatorType == OP_SessionWindow) {
SSWindowOperatorInfo* pInfo = pDownstream->info;
+ pTableScanInfo->pCtx = pInfo->binfo.pCtx;
+ pTableScanInfo->pResultRowInfo = &pInfo->binfo.resultRowInfo;
+ pTableScanInfo->rowCellInfoOffset = pInfo->binfo.rowCellInfoOffset;
+ } else if (pDownstream->operatorType == OP_StateWindow) {
+ SStateWindowOperatorInfo* pInfo = pDownstream->info;
+
pTableScanInfo->pCtx = pInfo->binfo.pCtx;
pTableScanInfo->pResultRowInfo = &pInfo->binfo.resultRowInfo;
pTableScanInfo->rowCellInfoOffset = pInfo->binfo.rowCellInfoOffset;
@@ -4747,7 +4800,6 @@ static void destroyGlobalAggOperatorInfo(void* param, int32_t numOfOutput) {
tfree(pInfo->prevRow);
tfree(pInfo->currentGroupColData);
}
-
static void destroySlimitOperatorInfo(void* param, int32_t numOfOutput) {
SSLimitOperatorInfo *pInfo = (SSLimitOperatorInfo*) param;
taosArrayDestroy(pInfo->orderColumnList);
@@ -5008,8 +5060,7 @@ static SSDataBlock* doArithmeticOperation(void* param, bool* newgroup) {
updateOutputBuf(&pArithInfo->binfo, &pArithInfo->bufCapacity, pBlock->info.rows);
arithmeticApplyFunctions(pRuntimeEnv, pInfo->pCtx, pOperator->numOfOutput);
-
- if (pTableQueryInfo != NULL) { // TODO refactor
+ if (pTableQueryInfo != NULL) {
updateTableIdInfo(pTableQueryInfo, pBlock, pRuntimeEnv->pTableRetrieveTsMap, order);
}
@@ -5052,8 +5103,7 @@ static SSDataBlock* doArithmeticOperation(void* param, bool* newgroup) {
updateOutputBuf(&pArithInfo->binfo, &pArithInfo->bufCapacity, pBlock->info.rows);
arithmeticApplyFunctions(pRuntimeEnv, pInfo->pCtx, pOperator->numOfOutput);
-
- if (pTableQueryInfo != NULL) { // TODO refactor
+ if (pTableQueryInfo != NULL) {
updateTableIdInfo(pTableQueryInfo, pBlock, pRuntimeEnv->pTableRetrieveTsMap, order);
}
@@ -5254,6 +5304,130 @@ static SSDataBlock* doSTableIntervalAgg(void* param, bool* newgroup) {
return pIntervalInfo->pRes;
}
+
+static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorInfo *pInfo, SSDataBlock *pSDataBlock) {
+ SQueryRuntimeEnv* pRuntimeEnv = pOperator->pRuntimeEnv;
+ STableQueryInfo* item = pRuntimeEnv->current;
+ SColumnInfoData* pColInfoData = taosArrayGet(pSDataBlock->pDataBlock, pInfo->colIndex);
+
+ SOptrBasicInfo* pBInfo = &pInfo->binfo;
+
+ bool masterScan = IS_MASTER_SCAN(pRuntimeEnv);
+ int16_t bytes = pColInfoData->info.bytes;
+ int16_t type = pColInfoData->info.type;
+
+ SColumnInfoData* pTsColInfoData = taosArrayGet(pSDataBlock->pDataBlock, 0);
+ TSKEY* tsList = (TSKEY*)pTsColInfoData->pData;
+
+ pInfo->numOfRows = 0;
+ for (int32_t j = 0; j < pSDataBlock->info.rows; ++j) {
+ char* val = ((char*)pColInfoData->pData) + bytes * j;
+ if (isNull(val, type)) {
+ continue;
+ }
+ if (pInfo->prevData == NULL) {
+ pInfo->prevData = malloc(bytes);
+ memcpy(pInfo->prevData, val, bytes);
+ pInfo->numOfRows = 1;
+ pInfo->curWindow.skey = tsList[j];
+ pInfo->curWindow.ekey = tsList[j];
+ pInfo->start = j;
+
+ } else if (memcmp(pInfo->prevData, val, bytes) == 0) {
+ pInfo->curWindow.ekey = tsList[j];
+ pInfo->numOfRows += 1;
+ //pInfo->start = j;
+ if (j == 0 && pInfo->start != 0) {
+ pInfo->numOfRows = 1;
+ pInfo->start = 0;
+ }
+ } else {
+ SResultRow* pResult = NULL;
+ pInfo->curWindow.ekey = pInfo->curWindow.skey;
+ int32_t ret = setWindowOutputBufByKey(pRuntimeEnv, &pBInfo->resultRowInfo, &pInfo->curWindow, masterScan,
+ &pResult, item->groupIndex, pBInfo->pCtx, pOperator->numOfOutput,
+ pBInfo->rowCellInfoOffset);
+ if (ret != TSDB_CODE_SUCCESS) { // null data, too many state code
+ longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
+ }
+ doApplyFunctions(pRuntimeEnv, pBInfo->pCtx, &pInfo->curWindow, pInfo->start, pInfo->numOfRows, tsList,
+ pSDataBlock->info.rows, pOperator->numOfOutput);
+
+ pInfo->curWindow.skey = tsList[j];
+ pInfo->curWindow.ekey = tsList[j];
+ memcpy(pInfo->prevData, val, bytes);
+ pInfo->numOfRows = 1;
+ pInfo->start = j;
+
+ }
+ }
+ SResultRow* pResult = NULL;
+
+ pInfo->curWindow.ekey = pInfo->curWindow.skey;
+ int32_t ret = setWindowOutputBufByKey(pRuntimeEnv, &pBInfo->resultRowInfo, &pInfo->curWindow, masterScan,
+ &pResult, item->groupIndex, pBInfo->pCtx, pOperator->numOfOutput,
+ pBInfo->rowCellInfoOffset);
+ if (ret != TSDB_CODE_SUCCESS) { // null data, too many state code
+ longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
+ }
+
+ doApplyFunctions(pRuntimeEnv, pBInfo->pCtx, &pInfo->curWindow, pInfo->start, pInfo->numOfRows, tsList,
+ pSDataBlock->info.rows, pOperator->numOfOutput);
+}
+static SSDataBlock* doStateWindowAgg(void *param, bool* newgroup) {
+ SOperatorInfo* pOperator = (SOperatorInfo*) param;
+ if (pOperator->status == OP_EXEC_DONE) {
+ return NULL;
+ }
+
+ SStateWindowOperatorInfo* pWindowInfo = pOperator->info;
+ SOptrBasicInfo* pBInfo = &pWindowInfo->binfo;
+
+ SQueryRuntimeEnv* pRuntimeEnv = pOperator->pRuntimeEnv;
+ if (pOperator->status == OP_RES_TO_RETURN) {
+ toSSDataBlock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pBInfo->pRes);
+
+ if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pRuntimeEnv->groupResInfo)) {
+ pOperator->status = OP_EXEC_DONE;
+ }
+
+ return pBInfo->pRes;
+ }
+
+ SQueryAttr* pQueryAttr = pRuntimeEnv->pQueryAttr;
+ int32_t order = pQueryAttr->order.order;
+ STimeWindow win = pQueryAttr->window;
+ SOperatorInfo* upstream = pOperator->upstream[0];
+ while (1) {
+ SSDataBlock* pBlock = upstream->exec(upstream, newgroup);
+ if (pBlock == NULL) {
+ break;
+ }
+ setInputDataBlock(pOperator, pBInfo->pCtx, pBlock, pQueryAttr->order.order);
+ if (pWindowInfo->colIndex == -1) {
+ pWindowInfo->colIndex = getGroupbyColumnIndex(pRuntimeEnv->pQueryAttr->pGroupbyExpr, pBlock);
+ }
+ doStateWindowAggImpl(pOperator, pWindowInfo, pBlock);
+ }
+
+ // restore the value
+ pQueryAttr->order.order = order;
+ pQueryAttr->window = win;
+
+ pOperator->status = OP_RES_TO_RETURN;
+ closeAllResultRows(&pBInfo->resultRowInfo);
+ setQueryStatus(pRuntimeEnv, QUERY_COMPLETED);
+ finalizeQueryResult(pOperator, pBInfo->pCtx, &pBInfo->resultRowInfo, pBInfo->rowCellInfoOffset);
+
+ initGroupResInfo(&pRuntimeEnv->groupResInfo, &pBInfo->resultRowInfo);
+ toSSDataBlock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pBInfo->pRes);
+
+ if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pRuntimeEnv->groupResInfo)) {
+ pOperator->status = OP_EXEC_DONE;
+ }
+
+ return pBInfo->pRes->info.rows == 0? NULL:pBInfo->pRes;
+}
static SSDataBlock* doSessionWindowAgg(void* param, bool* newgroup) {
SOperatorInfo* pOperator = (SOperatorInfo*) param;
if (pOperator->status == OP_EXEC_DONE) {
@@ -5263,6 +5437,7 @@ static SSDataBlock* doSessionWindowAgg(void* param, bool* newgroup) {
SSWindowOperatorInfo* pWindowInfo = pOperator->info;
SOptrBasicInfo* pBInfo = &pWindowInfo->binfo;
+
SQueryRuntimeEnv* pRuntimeEnv = pOperator->pRuntimeEnv;
if (pOperator->status == OP_RES_TO_RETURN) {
toSSDataBlock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pBInfo->pRes);
@@ -5275,6 +5450,7 @@ static SSDataBlock* doSessionWindowAgg(void* param, bool* newgroup) {
}
SQueryAttr* pQueryAttr = pRuntimeEnv->pQueryAttr;
+ //pQueryAttr->order.order = TSDB_ORDER_ASC;
int32_t order = pQueryAttr->order.order;
STimeWindow win = pQueryAttr->window;
@@ -5512,7 +5688,7 @@ SOperatorInfo* createAggregateOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOpera
pOperator->pRuntimeEnv = pRuntimeEnv;
pOperator->exec = doAggregate;
- pOperator->cleanup = destroyBasicOperatorInfo;
+ pOperator->cleanup = destroyAggOperatorInfo;
appendUpstream(pOperator, upstream);
return pOperator;
@@ -5532,6 +5708,19 @@ static void destroyBasicOperatorInfo(void* param, int32_t numOfOutput) {
SOptrBasicInfo* pInfo = (SOptrBasicInfo*) param;
doDestroyBasicInfo(pInfo, numOfOutput);
}
+static void destroyStateWindowOperatorInfo(void* param, int32_t numOfOutput) {
+ SStateWindowOperatorInfo* pInfo = (SStateWindowOperatorInfo*) param;
+ doDestroyBasicInfo(&pInfo->binfo, numOfOutput);
+ tfree(pInfo->prevData);
+}
+static void destroyAggOperatorInfo(void* param, int32_t numOfOutput) {
+ SAggOperatorInfo* pInfo = (SAggOperatorInfo*) param;
+ doDestroyBasicInfo(&pInfo->binfo, numOfOutput);
+}
+static void destroySWindowOperatorInfo(void* param, int32_t numOfOutput) {
+ SSWindowOperatorInfo* pInfo = (SSWindowOperatorInfo*) param;
+ doDestroyBasicInfo(&pInfo->binfo, numOfOutput);
+}
static void destroySFillOperatorInfo(void* param, int32_t numOfOutput) {
SFillOperatorInfo* pInfo = (SFillOperatorInfo*) param;
@@ -5586,7 +5775,7 @@ SOperatorInfo* createMultiTableAggOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SO
pOperator->pRuntimeEnv = pRuntimeEnv;
pOperator->exec = doSTableAggregate;
- pOperator->cleanup = destroyBasicOperatorInfo;
+ pOperator->cleanup = destroyAggOperatorInfo;
appendUpstream(pOperator, upstream);
return pOperator;
@@ -5712,7 +5901,29 @@ SOperatorInfo* createTimeIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOp
appendUpstream(pOperator, upstream);
return pOperator;
}
+SOperatorInfo* createStatewindowOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput) {
+ SStateWindowOperatorInfo* pInfo = calloc(1, sizeof(SStateWindowOperatorInfo));
+ pInfo->colIndex = -1;
+ pInfo->binfo.pCtx = createSQLFunctionCtx(pRuntimeEnv, pExpr, numOfOutput, &pInfo->binfo.rowCellInfoOffset);
+ pInfo->binfo.pRes = createOutputBuf(pExpr, numOfOutput, pRuntimeEnv->resultInfo.capacity);
+ initResultRowInfo(&pInfo->binfo.resultRowInfo, 8, TSDB_DATA_TYPE_INT);
+
+ SOperatorInfo* pOperator = calloc(1, sizeof(SOperatorInfo));
+ pOperator->name = "StateWindowOperator";
+ pOperator->operatorType = OP_StateWindow;
+ pOperator->blockingOptr = true;
+ pOperator->status = OP_IN_EXECUTING;
+ pOperator->pExpr = pExpr;
+ pOperator->numOfOutput = numOfOutput;
+ pOperator->info = pInfo;
+ pOperator->pRuntimeEnv = pRuntimeEnv;
+ pOperator->exec = doStateWindowAgg;
+ pOperator->cleanup = destroyStateWindowOperatorInfo;
+ appendUpstream(pOperator, upstream);
+ return pOperator;
+
+}
SOperatorInfo* createSWindowOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput) {
SSWindowOperatorInfo* pInfo = calloc(1, sizeof(SSWindowOperatorInfo));
@@ -5732,7 +5943,7 @@ SOperatorInfo* createSWindowOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperato
pOperator->info = pInfo;
pOperator->pRuntimeEnv = pRuntimeEnv;
pOperator->exec = doSessionWindowAgg;
- pOperator->cleanup = destroyBasicOperatorInfo;
+ pOperator->cleanup = destroySWindowOperatorInfo;
appendUpstream(pOperator, upstream);
return pOperator;
@@ -7183,6 +7394,8 @@ SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SGroupbyExpr* pGroupbyExpr, S
pQueryAttr->simpleAgg = pQueryMsg->simpleAgg;
pQueryAttr->pointInterpQuery = pQueryMsg->pointInterpQuery;
pQueryAttr->needReverseScan = pQueryMsg->needReverseScan;
+ pQueryAttr->stateWindow = pQueryMsg->stateWindow;
+ pQueryAttr->vgId = vgId;
pQueryAttr->tableCols = calloc(numOfCols, sizeof(SSingleColumnFilterInfo));
if (pQueryAttr->tableCols == NULL) {
diff --git a/src/query/src/qPlan.c b/src/query/src/qPlan.c
index 9079d830c9a928f1f27a02fa94b763d1473aa221..24531c7f4e6e9486cb2ad388ec50fa422606de52 100644
--- a/src/query/src/qPlan.c
+++ b/src/query/src/qPlan.c
@@ -1,5 +1,5 @@
#include "os.h"
-#include "tschemautil.h"
+#include "qTableMeta.h"
#include "qPlan.h"
#include "qExecutor.h"
#include "qUtil.h"
@@ -592,6 +592,14 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
op = OP_SessionWindow;
taosArrayPush(plan, &op);
+ if (pQueryAttr->pExpr2 != NULL) {
+ op = OP_Arithmetic;
+ taosArrayPush(plan, &op);
+ }
+ } else if (pQueryAttr->stateWindow) {
+ op = OP_StateWindow;
+ taosArrayPush(plan, &op);
+
if (pQueryAttr->pExpr2 != NULL) {
op = OP_Arithmetic;
taosArrayPush(plan, &op);
diff --git a/src/query/src/qSqlParser.c b/src/query/src/qSqlParser.c
index 847a089cc104f1de95f4e417485dfb830ca54849..afa954dc093d45e0ef1b104222ad9884bfc5de45 100644
--- a/src/query/src/qSqlParser.c
+++ b/src/query/src/qSqlParser.c
@@ -726,9 +726,9 @@ void tSetColumnType(TAOS_FIELD *pField, SStrToken *type) {
* extract the select info out of sql string
*/
SSqlNode *tSetQuerySqlNode(SStrToken *pSelectToken, SArray *pSelNodeList, SRelationInfo *pFrom, tSqlExpr *pWhere,
- SArray *pGroupby, SArray *pSortOrder, SIntervalVal *pInterval, SSessionWindowVal *pSession,
- SStrToken *pSliding, SArray *pFill, SLimitVal *pLimit, SLimitVal *psLimit,
- tSqlExpr *pHaving) {
+ SArray *pGroupby, SArray *pSortOrder, SIntervalVal *pInterval,
+ SSessionWindowVal *pSession, SWindowStateVal *pWindowStateVal, SStrToken *pSliding, SArray *pFill, SLimitVal *pLimit,
+ SLimitVal *psLimit, tSqlExpr *pHaving) {
assert(pSelNodeList != NULL);
SSqlNode *pSqlNode = calloc(1, sizeof(SSqlNode));
@@ -779,6 +779,12 @@ SSqlNode *tSetQuerySqlNode(SStrToken *pSelectToken, SArray *pSelNodeList, SRelat
TPARSER_SET_NONE_TOKEN(pSqlNode->sessionVal.col);
}
+ if (pWindowStateVal != NULL) {
+ pSqlNode->windowstateVal = *pWindowStateVal;
+ } else {
+ TPARSER_SET_NONE_TOKEN(pSqlNode->windowstateVal.col);
+ }
+
return pSqlNode;
}
diff --git a/src/client/src/tscSchemaUtil.c b/src/query/src/qTableMeta.c
similarity index 57%
rename from src/client/src/tscSchemaUtil.c
rename to src/query/src/qTableMeta.c
index 114fc8ee7383787a0448b237e4ef1f8dc8be31e0..d25d6b7004b1dcf52fca97e3d27465e92f8de4f2 100644
--- a/src/client/src/tscSchemaUtil.c
+++ b/src/query/src/qTableMeta.c
@@ -1,47 +1,32 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc.
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
#include "os.h"
#include "taosmsg.h"
-#include "tschemautil.h"
+#include "qTableMeta.h"
#include "ttokendef.h"
#include "taosdef.h"
#include "tutil.h"
-#include "tsclient.h"
int32_t tscGetNumOfTags(const STableMeta* pTableMeta) {
assert(pTableMeta != NULL);
-
+
STableComInfo tinfo = tscGetTableInfo(pTableMeta);
-
+
if (pTableMeta->tableType == TSDB_NORMAL_TABLE) {
assert(tinfo.numOfTags == 0);
return 0;
}
-
+
if (pTableMeta->tableType == TSDB_SUPER_TABLE || pTableMeta->tableType == TSDB_CHILD_TABLE) {
return tinfo.numOfTags;
}
-
+
assert(tinfo.numOfTags == 0);
return 0;
}
int32_t tscGetNumOfColumns(const STableMeta* pTableMeta) {
assert(pTableMeta != NULL);
-
+
// table created according to super table, use data from super table
STableComInfo tinfo = tscGetTableInfo(pTableMeta);
return tinfo.numOfColumns;
@@ -54,10 +39,10 @@ SSchema *tscGetTableSchema(const STableMeta *pTableMeta) {
SSchema* tscGetTableTagSchema(const STableMeta* pTableMeta) {
assert(pTableMeta != NULL && (pTableMeta->tableType == TSDB_SUPER_TABLE || pTableMeta->tableType == TSDB_CHILD_TABLE));
-
+
STableComInfo tinfo = tscGetTableInfo(pTableMeta);
assert(tinfo.numOfTags > 0);
-
+
return tscGetTableColumnSchema(pTableMeta, tinfo.numOfColumns);
}
@@ -68,7 +53,7 @@ STableComInfo tscGetTableInfo(const STableMeta* pTableMeta) {
SSchema* tscGetTableColumnSchema(const STableMeta* pTableMeta, int32_t colIndex) {
assert(pTableMeta != NULL);
-
+
SSchema* pSchema = (SSchema*) pTableMeta->schema;
return &pSchema[colIndex];
}
@@ -88,7 +73,7 @@ SSchema* tscGetColumnSchemaById(STableMeta* pTableMeta, int16_t colId) {
STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg) {
assert(pTableMetaMsg != NULL && pTableMetaMsg->numOfColumns >= 2 && pTableMetaMsg->numOfTags >= 0);
-
+
int32_t schemaSize = (pTableMetaMsg->numOfColumns + pTableMetaMsg->numOfTags) * sizeof(SSchema);
STableMeta* pTableMeta = calloc(1, sizeof(STableMeta) + schemaSize);
@@ -97,11 +82,11 @@ STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg) {
pTableMeta->suid = pTableMetaMsg->suid;
pTableMeta->tableInfo = (STableComInfo) {
- .numOfTags = pTableMetaMsg->numOfTags,
- .precision = pTableMetaMsg->precision,
- .numOfColumns = pTableMetaMsg->numOfColumns,
+ .numOfTags = pTableMetaMsg->numOfTags,
+ .precision = pTableMetaMsg->precision,
+ .numOfColumns = pTableMetaMsg->numOfColumns,
};
-
+
pTableMeta->id.tid = pTableMetaMsg->tid;
pTableMeta->id.uid = pTableMetaMsg->uid;
@@ -109,69 +94,14 @@ STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg) {
pTableMeta->tversion = pTableMetaMsg->tversion;
tstrncpy(pTableMeta->sTableName, pTableMetaMsg->sTableName, TSDB_TABLE_FNAME_LEN);
-
+
memcpy(pTableMeta->schema, pTableMetaMsg->schema, schemaSize);
-
+
int32_t numOfTotalCols = pTableMeta->tableInfo.numOfColumns;
for(int32_t i = 0; i < numOfTotalCols; ++i) {
pTableMeta->tableInfo.rowSize += pTableMeta->schema[i].bytes;
}
-
- return pTableMeta;
-}
-
-bool vgroupInfoIdentical(SNewVgroupInfo *pExisted, SVgroupMsg* src) {
- assert(pExisted != NULL && src != NULL);
- if (pExisted->numOfEps != src->numOfEps) {
- return false;
- }
-
- for(int32_t i = 0; i < pExisted->numOfEps; ++i) {
- if (pExisted->ep[i].port != src->epAddr[i].port) {
- return false;
- }
-
- if (strncmp(pExisted->ep[i].fqdn, src->epAddr[i].fqdn, tListLen(pExisted->ep[i].fqdn)) != 0) {
- return false;
- }
- }
- return true;
-}
-
-SNewVgroupInfo createNewVgroupInfo(SVgroupMsg *pVgroupMsg) {
- assert(pVgroupMsg != NULL);
-
- SNewVgroupInfo info = {0};
- info.numOfEps = pVgroupMsg->numOfEps;
- info.vgId = pVgroupMsg->vgId;
- info.inUse = 0; // 0 is the default value of inUse in case of multiple replica
-
- assert(info.numOfEps >= 1 && info.vgId >= 1);
- for(int32_t i = 0; i < pVgroupMsg->numOfEps; ++i) {
- tstrncpy(info.ep[i].fqdn, pVgroupMsg->epAddr[i].fqdn, TSDB_FQDN_LEN);
- info.ep[i].port = pVgroupMsg->epAddr[i].port;
- }
-
- return info;
-}
-
-// todo refactor
-UNUSED_FUNC static FORCE_INLINE char* skipSegments(char* input, char delim, int32_t num) {
- for (int32_t i = 0; i < num; ++i) {
- while (*input != 0 && *input++ != delim) {
- };
- }
- return input;
-}
-
-UNUSED_FUNC static FORCE_INLINE size_t copy(char* dst, const char* src, char delimiter) {
- size_t len = 0;
- while (*src != delimiter && *src != 0) {
- *dst++ = *src++;
- len++;
- }
-
- return len;
+ return pTableMeta;
}
diff --git a/src/query/src/sql.c b/src/query/src/sql.c
index 12a01585138e07804a93b0fce68922e80d84d232..47a75fc0e2b3f92608cd1d9329269acba6104502 100644
--- a/src/query/src/sql.c
+++ b/src/query/src/sql.c
@@ -97,27 +97,28 @@
#endif
/************* Begin control #defines *****************************************/
#define YYCODETYPE unsigned short int
-#define YYNOCODE 271
+#define YYNOCODE 273
#define YYACTIONTYPE unsigned short int
#define ParseTOKENTYPE SStrToken
typedef union {
int yyinit;
ParseTOKENTYPE yy0;
- int yy112;
- SCreateAcctInfo yy151;
- tSqlExpr* yy166;
- SCreateTableSql* yy182;
- SSqlNode* yy236;
- SRelationInfo* yy244;
- SSessionWindowVal yy259;
- SIntervalVal yy340;
- TAOS_FIELD yy343;
- int64_t yy369;
- SCreateDbInfo yy382;
- SLimitVal yy414;
- SArray* yy441;
- SCreatedTableInfo yy456;
- tVariant yy506;
+ SSqlNode* yy24;
+ int yy60;
+ SIntervalVal yy136;
+ int64_t yy157;
+ SCreateAcctInfo yy171;
+ SSessionWindowVal yy251;
+ SCreateDbInfo yy254;
+ SWindowStateVal yy256;
+ SLimitVal yy262;
+ SRelationInfo* yy292;
+ tSqlExpr* yy370;
+ tVariant yy394;
+ SArray* yy413;
+ SCreateTableSql* yy438;
+ TAOS_FIELD yy471;
+ SCreatedTableInfo yy544;
} YYMINORTYPE;
#ifndef YYSTACKDEPTH
#define YYSTACKDEPTH 100
@@ -127,17 +128,17 @@ typedef union {
#define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo
#define ParseARG_STORE yypParser->pInfo = pInfo
#define YYFALLBACK 1
-#define YYNSTATE 338
-#define YYNRULE 279
-#define YYNTOKEN 192
-#define YY_MAX_SHIFT 337
-#define YY_MIN_SHIFTREDUCE 538
-#define YY_MAX_SHIFTREDUCE 816
-#define YY_ERROR_ACTION 817
-#define YY_ACCEPT_ACTION 818
-#define YY_NO_ACTION 819
-#define YY_MIN_REDUCE 820
-#define YY_MAX_REDUCE 1098
+#define YYNSTATE 342
+#define YYNRULE 281
+#define YYNTOKEN 193
+#define YY_MAX_SHIFT 341
+#define YY_MIN_SHIFTREDUCE 543
+#define YY_MAX_SHIFTREDUCE 823
+#define YY_ERROR_ACTION 824
+#define YY_ACCEPT_ACTION 825
+#define YY_NO_ACTION 826
+#define YY_MIN_REDUCE 827
+#define YY_MAX_REDUCE 1107
/************* End control #defines *******************************************/
/* Define the yytestcase() macro to be a no-op if is not already defined
@@ -203,273 +204,275 @@ typedef union {
** yy_default[] Default action for each state.
**
*********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (716)
+#define YY_ACTTAB_COUNT (711)
static const YYACTIONTYPE yy_action[] = {
- /* 0 */ 994, 588, 18, 588, 218, 335, 144, 224, 87, 589,
- /* 10 */ 588, 589, 151, 50, 51, 151, 54, 55, 589, 195,
- /* 20 */ 230, 44, 193, 53, 279, 58, 56, 60, 57, 227,
- /* 30 */ 1080, 967, 973, 49, 48, 818, 337, 47, 46, 45,
- /* 40 */ 956, 957, 30, 960, 47, 46, 45, 539, 540, 541,
- /* 50 */ 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
- /* 60 */ 552, 336, 235, 991, 219, 50, 51, 151, 54, 55,
- /* 70 */ 264, 263, 230, 44, 236, 53, 279, 58, 56, 60,
- /* 80 */ 57, 1028, 985, 73, 84, 49, 48, 973, 868, 47,
- /* 90 */ 46, 45, 50, 51, 179, 54, 55, 257, 195, 230,
- /* 100 */ 44, 85, 53, 279, 58, 56, 60, 57, 226, 1080,
- /* 110 */ 195, 301, 49, 48, 74, 242, 47, 46, 45, 50,
- /* 120 */ 52, 1079, 54, 55, 165, 199, 230, 44, 72, 53,
- /* 130 */ 279, 58, 56, 60, 57, 766, 1029, 769, 274, 49,
- /* 140 */ 48, 321, 588, 47, 46, 45, 51, 79, 54, 55,
- /* 150 */ 589, 1076, 230, 44, 39, 53, 279, 58, 56, 60,
- /* 160 */ 57, 958, 877, 760, 33, 49, 48, 1075, 179, 47,
- /* 170 */ 46, 45, 24, 299, 330, 329, 298, 297, 296, 328,
- /* 180 */ 295, 327, 326, 325, 294, 324, 323, 933, 671, 921,
- /* 190 */ 922, 923, 924, 925, 926, 927, 928, 929, 930, 931,
- /* 200 */ 932, 934, 935, 54, 55, 19, 220, 230, 44, 970,
- /* 210 */ 53, 279, 58, 56, 60, 57, 311, 310, 86, 1090,
- /* 220 */ 49, 48, 151, 203, 47, 46, 45, 229, 775, 959,
- /* 230 */ 205, 764, 985, 767, 249, 770, 127, 126, 204, 1074,
- /* 240 */ 229, 775, 253, 252, 764, 13, 767, 221, 770, 89,
- /* 250 */ 237, 25, 773, 212, 941, 985, 33, 939, 940, 214,
- /* 260 */ 215, 241, 942, 278, 944, 945, 943, 331, 946, 947,
- /* 270 */ 222, 79, 214, 215, 24, 973, 330, 329, 39, 213,
- /* 280 */ 765, 328, 768, 327, 326, 325, 33, 324, 323, 276,
- /* 290 */ 695, 83, 973, 692, 228, 693, 1039, 694, 233, 33,
- /* 300 */ 256, 970, 71, 58, 56, 60, 57, 70, 211, 670,
- /* 310 */ 301, 49, 48, 710, 33, 47, 46, 45, 5, 36,
- /* 320 */ 169, 244, 245, 33, 242, 168, 96, 101, 92, 100,
- /* 330 */ 33, 969, 239, 166, 243, 280, 59, 308, 307, 90,
- /* 340 */ 290, 234, 776, 6, 970, 242, 49, 48, 772, 59,
- /* 350 */ 47, 46, 45, 33, 971, 776, 304, 114, 699, 970,
- /* 360 */ 700, 772, 1, 167, 771, 305, 321, 869, 970, 112,
- /* 370 */ 106, 117, 309, 179, 961, 970, 116, 771, 122, 125,
- /* 380 */ 115, 187, 185, 183, 3, 180, 119, 197, 182, 131,
- /* 390 */ 130, 129, 128, 741, 742, 313, 714, 774, 970, 334,
- /* 400 */ 333, 136, 258, 762, 696, 240, 34, 707, 303, 76,
- /* 410 */ 142, 140, 139, 8, 77, 726, 260, 64, 732, 146,
- /* 420 */ 733, 260, 63, 796, 21, 777, 67, 20, 681, 20,
- /* 430 */ 282, 198, 34, 683, 34, 200, 779, 63, 65, 763,
- /* 440 */ 284, 972, 682, 254, 88, 68, 63, 29, 105, 104,
- /* 450 */ 285, 17, 16, 697, 194, 698, 124, 123, 15, 14,
- /* 460 */ 201, 202, 208, 209, 111, 110, 207, 192, 206, 196,
- /* 470 */ 1038, 231, 42, 1035, 1034, 232, 312, 143, 993, 1004,
- /* 480 */ 1001, 1002, 1006, 145, 986, 261, 149, 1021, 1020, 968,
- /* 490 */ 161, 162, 966, 163, 141, 164, 882, 287, 265, 291,
- /* 500 */ 881, 937, 159, 725, 983, 153, 288, 152, 154, 155,
- /* 510 */ 223, 156, 289, 267, 272, 277, 275, 69, 61, 292,
- /* 520 */ 293, 40, 190, 37, 302, 66, 876, 273, 1095, 271,
- /* 530 */ 102, 1094, 1092, 269, 170, 306, 1089, 108, 1088, 1086,
- /* 540 */ 171, 902, 38, 266, 35, 41, 191, 865, 118, 43,
- /* 550 */ 863, 120, 121, 861, 860, 246, 181, 858, 857, 856,
- /* 560 */ 855, 854, 853, 852, 184, 186, 849, 847, 845, 843,
- /* 570 */ 188, 840, 189, 322, 259, 113, 75, 80, 314, 268,
- /* 580 */ 1022, 315, 316, 317, 318, 319, 320, 332, 216, 816,
- /* 590 */ 238, 286, 247, 248, 815, 217, 210, 250, 97, 98,
- /* 600 */ 251, 880, 814, 802, 801, 255, 260, 281, 78, 9,
- /* 610 */ 225, 702, 859, 851, 178, 903, 174, 172, 173, 132,
- /* 620 */ 175, 176, 133, 134, 850, 177, 135, 842, 841, 2,
- /* 630 */ 26, 4, 262, 81, 727, 157, 158, 160, 147, 148,
- /* 640 */ 27, 82, 949, 730, 270, 91, 734, 150, 28, 10,
- /* 650 */ 11, 778, 7, 12, 780, 22, 23, 283, 31, 93,
- /* 660 */ 602, 89, 94, 32, 95, 634, 630, 628, 627, 626,
- /* 670 */ 623, 99, 592, 300, 34, 62, 673, 672, 618, 669,
- /* 680 */ 103, 616, 608, 107, 614, 109, 610, 612, 606, 604,
- /* 690 */ 637, 636, 635, 633, 632, 631, 629, 625, 624, 590,
- /* 700 */ 63, 137, 556, 554, 820, 819, 819, 819, 819, 819,
- /* 710 */ 819, 819, 819, 819, 819, 138,
+ /* 0 */ 18, 593, 992, 593, 195, 145, 992, 593, 88, 594,
+ /* 10 */ 1001, 594, 201, 50, 51, 594, 54, 55, 223, 197,
+ /* 20 */ 232, 44, 224, 53, 283, 58, 56, 60, 57, 229,
+ /* 30 */ 1089, 220, 339, 49, 48, 825, 341, 47, 46, 45,
+ /* 40 */ 963, 964, 30, 967, 773, 152, 776, 544, 545, 546,
+ /* 50 */ 547, 548, 549, 550, 551, 552, 553, 554, 555, 556,
+ /* 60 */ 557, 340, 226, 237, 221, 50, 51, 152, 54, 55,
+ /* 70 */ 266, 265, 232, 44, 998, 53, 283, 58, 56, 60,
+ /* 80 */ 57, 1085, 992, 73, 305, 49, 48, 980, 980, 47,
+ /* 90 */ 46, 45, 50, 51, 325, 54, 55, 197, 259, 232,
+ /* 100 */ 44, 91, 53, 283, 58, 56, 60, 57, 1088, 33,
+ /* 110 */ 1084, 87, 49, 48, 197, 1037, 47, 46, 45, 50,
+ /* 120 */ 52, 79, 54, 55, 228, 1089, 232, 44, 39, 53,
+ /* 130 */ 283, 58, 56, 60, 57, 280, 968, 84, 13, 49,
+ /* 140 */ 48, 244, 90, 47, 46, 45, 51, 152, 54, 55,
+ /* 150 */ 167, 222, 232, 44, 977, 53, 283, 58, 56, 60,
+ /* 160 */ 57, 780, 152, 767, 33, 49, 48, 1, 169, 47,
+ /* 170 */ 46, 45, 24, 303, 334, 333, 302, 301, 300, 332,
+ /* 180 */ 299, 331, 330, 329, 298, 328, 327, 940, 1083, 928,
+ /* 190 */ 929, 930, 931, 932, 933, 934, 935, 936, 937, 938,
+ /* 200 */ 939, 941, 942, 54, 55, 19, 235, 232, 44, 977,
+ /* 210 */ 53, 283, 58, 56, 60, 57, 704, 1038, 705, 278,
+ /* 220 */ 49, 48, 243, 205, 47, 46, 45, 231, 782, 676,
+ /* 230 */ 207, 771, 85, 774, 214, 777, 128, 127, 206, 948,
+ /* 240 */ 231, 782, 946, 947, 771, 284, 774, 949, 777, 951,
+ /* 250 */ 952, 950, 241, 953, 954, 239, 72, 315, 314, 216,
+ /* 260 */ 217, 49, 48, 282, 215, 47, 46, 45, 772, 33,
+ /* 270 */ 775, 79, 216, 217, 24, 966, 334, 333, 39, 199,
+ /* 280 */ 980, 332, 115, 331, 330, 329, 593, 328, 327, 965,
+ /* 290 */ 700, 325, 200, 697, 594, 698, 245, 699, 33, 312,
+ /* 300 */ 311, 258, 33, 71, 58, 56, 60, 57, 202, 213,
+ /* 310 */ 335, 236, 49, 48, 977, 33, 47, 46, 45, 251,
+ /* 320 */ 715, 246, 247, 5, 36, 171, 242, 255, 254, 307,
+ /* 330 */ 170, 97, 102, 93, 101, 980, 59, 47, 46, 45,
+ /* 340 */ 308, 244, 783, 977, 309, 294, 786, 977, 779, 59,
+ /* 350 */ 168, 76, 33, 974, 33, 783, 305, 313, 262, 86,
+ /* 360 */ 977, 779, 338, 337, 137, 778, 143, 141, 140, 875,
+ /* 370 */ 113, 107, 118, 74, 70, 181, 675, 117, 778, 123,
+ /* 380 */ 126, 116, 189, 187, 185, 781, 230, 120, 196, 184,
+ /* 390 */ 132, 131, 130, 129, 317, 25, 238, 977, 244, 976,
+ /* 400 */ 884, 260, 876, 719, 701, 34, 181, 978, 181, 3,
+ /* 410 */ 182, 748, 749, 712, 769, 77, 731, 739, 203, 8,
+ /* 420 */ 147, 63, 262, 740, 803, 784, 64, 21, 20, 20,
+ /* 430 */ 204, 67, 686, 286, 688, 6, 34, 34, 63, 288,
+ /* 440 */ 687, 210, 29, 89, 63, 289, 106, 105, 65, 211,
+ /* 450 */ 770, 68, 15, 14, 112, 111, 702, 209, 703, 17,
+ /* 460 */ 16, 125, 124, 194, 1099, 208, 198, 1048, 979, 1047,
+ /* 470 */ 233, 1044, 1043, 256, 144, 234, 316, 1000, 42, 1011,
+ /* 480 */ 1030, 1008, 1029, 1009, 993, 263, 1013, 142, 146, 150,
+ /* 490 */ 272, 163, 975, 261, 164, 267, 973, 295, 165, 944,
+ /* 500 */ 114, 730, 160, 158, 154, 990, 166, 153, 155, 225,
+ /* 510 */ 156, 269, 276, 277, 889, 291, 69, 292, 61, 281,
+ /* 520 */ 66, 293, 279, 296, 297, 157, 275, 40, 192, 273,
+ /* 530 */ 37, 306, 883, 1104, 103, 1103, 1101, 172, 310, 1098,
+ /* 540 */ 109, 1097, 1095, 173, 909, 38, 35, 41, 193, 872,
+ /* 550 */ 119, 870, 121, 122, 868, 867, 248, 183, 865, 864,
+ /* 560 */ 863, 862, 861, 860, 859, 186, 188, 856, 854, 852,
+ /* 570 */ 850, 190, 847, 191, 271, 75, 80, 268, 270, 1031,
+ /* 580 */ 43, 326, 318, 319, 320, 321, 322, 218, 323, 324,
+ /* 590 */ 336, 240, 290, 823, 249, 250, 822, 219, 252, 212,
+ /* 600 */ 98, 99, 888, 887, 253, 821, 809, 808, 257, 262,
+ /* 610 */ 285, 78, 866, 9, 26, 133, 176, 175, 910, 134,
+ /* 620 */ 174, 177, 179, 178, 180, 858, 2, 135, 857, 4,
+ /* 630 */ 136, 849, 848, 707, 264, 161, 159, 732, 162, 81,
+ /* 640 */ 148, 227, 956, 149, 735, 82, 10, 737, 83, 274,
+ /* 650 */ 11, 741, 151, 787, 92, 785, 27, 7, 28, 12,
+ /* 660 */ 22, 287, 23, 31, 94, 90, 95, 607, 32, 96,
+ /* 670 */ 639, 635, 633, 632, 631, 628, 597, 34, 304, 100,
+ /* 680 */ 62, 678, 677, 674, 623, 621, 613, 619, 615, 617,
+ /* 690 */ 104, 108, 611, 609, 642, 641, 640, 638, 110, 637,
+ /* 700 */ 636, 634, 630, 629, 63, 595, 138, 139, 561, 559,
+ /* 710 */ 827,
};
static const YYCODETYPE yy_lookahead[] = {
- /* 0 */ 196, 1, 258, 1, 195, 196, 196, 217, 202, 9,
- /* 10 */ 1, 9, 196, 13, 14, 196, 16, 17, 9, 258,
- /* 20 */ 20, 21, 258, 23, 24, 25, 26, 27, 28, 268,
- /* 30 */ 269, 196, 242, 33, 34, 193, 194, 37, 38, 39,
- /* 40 */ 234, 235, 236, 237, 37, 38, 39, 45, 46, 47,
+ /* 0 */ 260, 1, 241, 1, 260, 197, 241, 1, 203, 9,
+ /* 10 */ 197, 9, 260, 13, 14, 9, 16, 17, 257, 260,
+ /* 20 */ 20, 21, 257, 23, 24, 25, 26, 27, 28, 270,
+ /* 30 */ 271, 196, 197, 33, 34, 194, 195, 37, 38, 39,
+ /* 40 */ 235, 236, 237, 238, 5, 197, 7, 45, 46, 47,
/* 50 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- /* 60 */ 58, 59, 217, 259, 62, 13, 14, 196, 16, 17,
- /* 70 */ 260, 261, 20, 21, 239, 23, 24, 25, 26, 27,
- /* 80 */ 28, 265, 240, 83, 265, 33, 34, 242, 201, 37,
- /* 90 */ 38, 39, 13, 14, 207, 16, 17, 255, 258, 20,
- /* 100 */ 21, 243, 23, 24, 25, 26, 27, 28, 268, 269,
- /* 110 */ 258, 81, 33, 34, 256, 196, 37, 38, 39, 13,
- /* 120 */ 14, 269, 16, 17, 205, 258, 20, 21, 202, 23,
- /* 130 */ 24, 25, 26, 27, 28, 5, 265, 7, 267, 33,
- /* 140 */ 34, 87, 1, 37, 38, 39, 14, 110, 16, 17,
- /* 150 */ 9, 258, 20, 21, 117, 23, 24, 25, 26, 27,
- /* 160 */ 28, 235, 201, 111, 196, 33, 34, 258, 207, 37,
+ /* 60 */ 58, 59, 218, 218, 62, 13, 14, 197, 16, 17,
+ /* 70 */ 262, 263, 20, 21, 261, 23, 24, 25, 26, 27,
+ /* 80 */ 28, 260, 241, 83, 81, 33, 34, 243, 243, 37,
+ /* 90 */ 38, 39, 13, 14, 87, 16, 17, 260, 257, 20,
+ /* 100 */ 21, 203, 23, 24, 25, 26, 27, 28, 271, 197,
+ /* 110 */ 260, 83, 33, 34, 260, 267, 37, 38, 39, 13,
+ /* 120 */ 14, 110, 16, 17, 270, 271, 20, 21, 117, 23,
+ /* 130 */ 24, 25, 26, 27, 28, 265, 238, 267, 110, 33,
+ /* 140 */ 34, 197, 114, 37, 38, 39, 14, 197, 16, 17,
+ /* 150 */ 206, 239, 20, 21, 242, 23, 24, 25, 26, 27,
+ /* 160 */ 28, 122, 197, 111, 197, 33, 34, 204, 205, 37,
/* 170 */ 38, 39, 94, 95, 96, 97, 98, 99, 100, 101,
- /* 180 */ 102, 103, 104, 105, 106, 107, 108, 216, 5, 218,
- /* 190 */ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
- /* 200 */ 229, 230, 231, 16, 17, 44, 238, 20, 21, 241,
- /* 210 */ 23, 24, 25, 26, 27, 28, 33, 34, 83, 242,
- /* 220 */ 33, 34, 196, 62, 37, 38, 39, 1, 2, 0,
- /* 230 */ 69, 5, 240, 7, 140, 9, 75, 76, 77, 258,
- /* 240 */ 1, 2, 148, 149, 5, 110, 7, 255, 9, 114,
- /* 250 */ 217, 110, 122, 258, 216, 240, 196, 219, 220, 33,
- /* 260 */ 34, 69, 224, 37, 226, 227, 228, 217, 230, 231,
- /* 270 */ 255, 110, 33, 34, 94, 242, 96, 97, 117, 258,
- /* 280 */ 5, 101, 7, 103, 104, 105, 196, 107, 108, 263,
- /* 290 */ 2, 265, 242, 5, 61, 7, 233, 9, 238, 196,
- /* 300 */ 139, 241, 141, 25, 26, 27, 28, 110, 147, 112,
- /* 310 */ 81, 33, 34, 37, 196, 37, 38, 39, 63, 64,
- /* 320 */ 65, 33, 34, 196, 196, 70, 71, 72, 73, 74,
- /* 330 */ 196, 241, 69, 205, 142, 15, 110, 145, 146, 202,
- /* 340 */ 85, 238, 116, 110, 241, 196, 33, 34, 122, 110,
- /* 350 */ 37, 38, 39, 196, 205, 116, 238, 78, 5, 241,
- /* 360 */ 7, 122, 203, 204, 138, 238, 87, 201, 241, 63,
- /* 370 */ 64, 65, 238, 207, 237, 241, 70, 138, 72, 73,
- /* 380 */ 74, 63, 64, 65, 199, 200, 80, 258, 70, 71,
- /* 390 */ 72, 73, 74, 129, 130, 238, 120, 122, 241, 66,
- /* 400 */ 67, 68, 111, 1, 116, 142, 115, 115, 145, 111,
- /* 410 */ 63, 64, 65, 121, 111, 111, 118, 115, 111, 115,
- /* 420 */ 111, 118, 115, 111, 115, 111, 115, 115, 111, 115,
- /* 430 */ 111, 258, 115, 111, 115, 258, 116, 115, 136, 37,
- /* 440 */ 111, 242, 111, 196, 115, 134, 115, 110, 143, 144,
- /* 450 */ 113, 143, 144, 5, 258, 7, 78, 79, 143, 144,
- /* 460 */ 258, 258, 258, 258, 143, 144, 258, 258, 258, 258,
- /* 470 */ 233, 233, 257, 233, 233, 233, 233, 196, 196, 196,
- /* 480 */ 196, 196, 196, 196, 240, 240, 196, 266, 266, 240,
- /* 490 */ 244, 196, 196, 196, 61, 196, 196, 196, 262, 86,
- /* 500 */ 206, 232, 246, 122, 254, 252, 196, 253, 251, 250,
- /* 510 */ 262, 249, 196, 262, 262, 127, 131, 133, 132, 196,
- /* 520 */ 196, 196, 196, 196, 196, 135, 196, 126, 196, 125,
- /* 530 */ 196, 196, 196, 124, 196, 196, 196, 196, 196, 196,
- /* 540 */ 196, 196, 196, 123, 196, 196, 196, 196, 196, 137,
- /* 550 */ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
- /* 560 */ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
- /* 570 */ 196, 196, 196, 109, 197, 93, 197, 197, 92, 197,
- /* 580 */ 197, 51, 89, 91, 55, 90, 88, 81, 197, 5,
- /* 590 */ 197, 197, 150, 5, 5, 197, 197, 150, 202, 202,
- /* 600 */ 5, 206, 5, 96, 95, 140, 118, 113, 119, 110,
- /* 610 */ 1, 111, 197, 197, 208, 215, 209, 214, 213, 198,
- /* 620 */ 212, 210, 198, 198, 197, 211, 198, 197, 197, 203,
- /* 630 */ 110, 199, 115, 115, 111, 248, 247, 245, 110, 115,
- /* 640 */ 115, 110, 232, 111, 110, 78, 111, 110, 115, 128,
- /* 650 */ 128, 111, 110, 110, 116, 110, 110, 113, 84, 83,
- /* 660 */ 5, 114, 71, 84, 83, 9, 5, 5, 5, 5,
- /* 670 */ 5, 78, 82, 15, 115, 16, 5, 5, 5, 111,
- /* 680 */ 144, 5, 5, 144, 5, 144, 5, 5, 5, 5,
- /* 690 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 82,
- /* 700 */ 115, 21, 61, 60, 0, 270, 270, 270, 270, 270,
- /* 710 */ 270, 270, 270, 270, 270, 21, 270, 270, 270, 270,
- /* 720 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 730 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 740 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 750 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 760 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 770 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 780 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 790 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 800 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 810 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 820 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 830 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 840 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 850 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 860 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 870 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 880 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 890 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
- /* 900 */ 270, 270, 270, 270, 270, 270, 270, 270,
+ /* 180 */ 102, 103, 104, 105, 106, 107, 108, 217, 260, 219,
+ /* 190 */ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ /* 200 */ 230, 231, 232, 16, 17, 44, 239, 20, 21, 242,
+ /* 210 */ 23, 24, 25, 26, 27, 28, 5, 267, 7, 269,
+ /* 220 */ 33, 34, 69, 62, 37, 38, 39, 1, 2, 5,
+ /* 230 */ 69, 5, 267, 7, 260, 9, 75, 76, 77, 217,
+ /* 240 */ 1, 2, 220, 221, 5, 15, 7, 225, 9, 227,
+ /* 250 */ 228, 229, 69, 231, 232, 218, 203, 33, 34, 33,
+ /* 260 */ 34, 33, 34, 37, 260, 37, 38, 39, 5, 197,
+ /* 270 */ 7, 110, 33, 34, 94, 0, 96, 97, 117, 260,
+ /* 280 */ 243, 101, 78, 103, 104, 105, 1, 107, 108, 236,
+ /* 290 */ 2, 87, 260, 5, 9, 7, 143, 9, 197, 146,
+ /* 300 */ 147, 140, 197, 142, 25, 26, 27, 28, 260, 148,
+ /* 310 */ 218, 239, 33, 34, 242, 197, 37, 38, 39, 141,
+ /* 320 */ 37, 33, 34, 63, 64, 65, 143, 149, 150, 146,
+ /* 330 */ 70, 71, 72, 73, 74, 243, 110, 37, 38, 39,
+ /* 340 */ 239, 197, 116, 242, 239, 85, 116, 242, 122, 110,
+ /* 350 */ 206, 111, 197, 197, 197, 116, 81, 239, 118, 244,
+ /* 360 */ 242, 122, 66, 67, 68, 139, 63, 64, 65, 202,
+ /* 370 */ 63, 64, 65, 258, 110, 208, 112, 70, 139, 72,
+ /* 380 */ 73, 74, 63, 64, 65, 122, 61, 80, 260, 70,
+ /* 390 */ 71, 72, 73, 74, 239, 110, 240, 242, 197, 242,
+ /* 400 */ 202, 111, 202, 120, 116, 115, 208, 206, 208, 200,
+ /* 410 */ 201, 130, 131, 115, 1, 111, 111, 111, 260, 121,
+ /* 420 */ 115, 115, 118, 111, 111, 111, 115, 115, 115, 115,
+ /* 430 */ 260, 115, 111, 111, 111, 110, 115, 115, 115, 111,
+ /* 440 */ 111, 260, 110, 115, 115, 113, 144, 145, 137, 260,
+ /* 450 */ 37, 135, 144, 145, 144, 145, 5, 260, 7, 144,
+ /* 460 */ 145, 78, 79, 260, 243, 260, 260, 234, 243, 234,
+ /* 470 */ 234, 234, 234, 197, 197, 234, 234, 197, 259, 197,
+ /* 480 */ 268, 197, 268, 197, 241, 241, 197, 61, 197, 197,
+ /* 490 */ 197, 245, 241, 198, 197, 264, 197, 86, 197, 233,
+ /* 500 */ 93, 122, 248, 250, 254, 256, 197, 255, 253, 264,
+ /* 510 */ 252, 264, 264, 127, 197, 197, 134, 197, 133, 128,
+ /* 520 */ 136, 197, 132, 197, 197, 251, 126, 197, 197, 125,
+ /* 530 */ 197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
+ /* 540 */ 197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
+ /* 550 */ 197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
+ /* 560 */ 197, 197, 197, 197, 197, 197, 197, 197, 197, 197,
+ /* 570 */ 197, 197, 197, 197, 124, 198, 198, 123, 198, 198,
+ /* 580 */ 138, 109, 92, 51, 89, 91, 55, 198, 90, 88,
+ /* 590 */ 81, 198, 198, 5, 151, 5, 5, 198, 151, 198,
+ /* 600 */ 203, 203, 207, 207, 5, 5, 96, 95, 141, 118,
+ /* 610 */ 113, 119, 198, 110, 110, 199, 210, 214, 216, 199,
+ /* 620 */ 215, 213, 212, 211, 209, 198, 204, 199, 198, 200,
+ /* 630 */ 199, 198, 198, 111, 115, 247, 249, 111, 246, 115,
+ /* 640 */ 110, 1, 233, 115, 111, 110, 129, 111, 110, 110,
+ /* 650 */ 129, 111, 110, 116, 78, 111, 115, 110, 115, 110,
+ /* 660 */ 110, 113, 110, 84, 83, 114, 71, 5, 84, 83,
+ /* 670 */ 9, 5, 5, 5, 5, 5, 82, 115, 15, 78,
+ /* 680 */ 16, 5, 5, 111, 5, 5, 5, 5, 5, 5,
+ /* 690 */ 145, 145, 5, 5, 5, 5, 5, 5, 145, 5,
+ /* 700 */ 5, 5, 5, 5, 115, 82, 21, 21, 61, 60,
+ /* 710 */ 0, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 720 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 730 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 740 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 750 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 760 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 770 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 780 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 790 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 800 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 810 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 820 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 830 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 840 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 850 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 860 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 870 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 880 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 890 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
+ /* 900 */ 272, 272, 272, 272,
};
-#define YY_SHIFT_COUNT (337)
+#define YY_SHIFT_COUNT (341)
#define YY_SHIFT_MIN (0)
-#define YY_SHIFT_MAX (704)
+#define YY_SHIFT_MAX (710)
static const unsigned short int yy_shift_ofst[] = {
- /* 0 */ 161, 78, 78, 180, 180, 30, 226, 239, 141, 9,
- /* 10 */ 9, 9, 9, 9, 9, 9, 9, 9, 0, 2,
- /* 20 */ 239, 288, 288, 288, 288, 37, 37, 9, 9, 9,
- /* 30 */ 229, 9, 9, 9, 9, 279, 30, 54, 54, 716,
- /* 40 */ 716, 716, 239, 239, 239, 239, 239, 239, 239, 239,
+ /* 0 */ 161, 78, 78, 180, 180, 3, 226, 239, 285, 6,
+ /* 10 */ 6, 6, 6, 6, 6, 6, 6, 6, 0, 2,
+ /* 20 */ 239, 288, 288, 288, 288, 11, 11, 6, 6, 6,
+ /* 30 */ 275, 6, 6, 6, 6, 204, 3, 7, 7, 711,
+ /* 40 */ 711, 711, 239, 239, 239, 239, 239, 239, 239, 239,
/* 50 */ 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- /* 60 */ 239, 239, 288, 288, 183, 183, 183, 183, 183, 183,
- /* 70 */ 183, 9, 9, 9, 276, 9, 9, 9, 37, 37,
- /* 80 */ 9, 9, 9, 264, 264, 292, 37, 9, 9, 9,
- /* 90 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- /* 100 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- /* 110 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- /* 120 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- /* 130 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- /* 140 */ 9, 9, 9, 433, 433, 433, 381, 381, 381, 433,
- /* 150 */ 381, 433, 384, 390, 386, 388, 385, 401, 404, 409,
- /* 160 */ 420, 412, 433, 433, 433, 413, 413, 464, 30, 30,
- /* 170 */ 433, 433, 482, 486, 530, 493, 492, 529, 495, 498,
- /* 180 */ 464, 433, 506, 506, 433, 506, 433, 506, 433, 433,
- /* 190 */ 716, 716, 52, 79, 106, 79, 79, 132, 187, 278,
- /* 200 */ 278, 278, 278, 255, 306, 318, 313, 313, 313, 313,
- /* 210 */ 192, 94, 7, 7, 130, 275, 135, 263, 333, 347,
- /* 220 */ 291, 298, 303, 304, 307, 309, 312, 314, 402, 233,
- /* 230 */ 320, 302, 311, 317, 319, 322, 329, 331, 337, 305,
- /* 240 */ 315, 321, 197, 308, 353, 448, 378, 584, 442, 588,
- /* 250 */ 589, 447, 595, 597, 507, 509, 465, 488, 494, 499,
- /* 260 */ 489, 500, 520, 517, 518, 523, 528, 532, 524, 531,
- /* 270 */ 609, 534, 535, 537, 525, 521, 533, 522, 540, 542,
- /* 280 */ 538, 543, 494, 545, 544, 546, 547, 567, 574, 576,
- /* 290 */ 591, 655, 579, 581, 656, 661, 662, 663, 664, 665,
- /* 300 */ 590, 658, 593, 536, 559, 559, 659, 539, 541, 559,
- /* 310 */ 671, 672, 568, 559, 673, 676, 677, 679, 681, 682,
- /* 320 */ 683, 684, 685, 686, 687, 688, 689, 690, 691, 692,
- /* 330 */ 693, 585, 617, 680, 694, 641, 643, 704,
+ /* 60 */ 239, 239, 288, 288, 224, 224, 224, 224, 224, 224,
+ /* 70 */ 224, 6, 6, 6, 283, 6, 6, 6, 11, 11,
+ /* 80 */ 6, 6, 6, 6, 281, 281, 298, 11, 6, 6,
+ /* 90 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ /* 100 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ /* 110 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ /* 120 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ /* 130 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ /* 140 */ 6, 6, 6, 6, 426, 426, 426, 379, 379, 379,
+ /* 150 */ 426, 379, 426, 382, 384, 385, 391, 390, 386, 400,
+ /* 160 */ 404, 450, 454, 442, 426, 426, 426, 411, 411, 472,
+ /* 170 */ 3, 3, 426, 426, 407, 490, 532, 495, 494, 531,
+ /* 180 */ 498, 501, 472, 426, 509, 509, 426, 509, 426, 509,
+ /* 190 */ 426, 426, 711, 711, 52, 79, 106, 79, 79, 132,
+ /* 200 */ 187, 279, 279, 279, 279, 260, 307, 319, 228, 228,
+ /* 210 */ 228, 228, 153, 178, 300, 300, 39, 263, 28, 183,
+ /* 220 */ 296, 303, 290, 240, 304, 305, 306, 312, 313, 314,
+ /* 230 */ 413, 325, 230, 311, 316, 321, 322, 323, 328, 329,
+ /* 240 */ 332, 302, 308, 310, 264, 315, 211, 451, 383, 588,
+ /* 250 */ 443, 590, 591, 447, 599, 600, 510, 512, 467, 491,
+ /* 260 */ 497, 503, 492, 522, 504, 519, 524, 526, 530, 533,
+ /* 270 */ 528, 535, 536, 538, 640, 539, 540, 542, 541, 517,
+ /* 280 */ 543, 521, 544, 547, 537, 549, 497, 550, 548, 552,
+ /* 290 */ 551, 576, 579, 581, 595, 662, 584, 586, 661, 666,
+ /* 300 */ 667, 668, 669, 670, 594, 663, 601, 545, 562, 562,
+ /* 310 */ 664, 546, 553, 562, 676, 677, 572, 562, 679, 680,
+ /* 320 */ 681, 682, 683, 684, 687, 688, 689, 690, 691, 692,
+ /* 330 */ 694, 695, 696, 697, 698, 589, 623, 685, 686, 647,
+ /* 340 */ 649, 710,
};
-#define YY_REDUCE_COUNT (191)
-#define YY_REDUCE_MIN (-256)
-#define YY_REDUCE_MAX (432)
+#define YY_REDUCE_COUNT (193)
+#define YY_REDUCE_MIN (-260)
+#define YY_REDUCE_MAX (434)
static const short yy_reduce_ofst[] = {
- /* 0 */ -158, -29, -29, 38, 38, -194, -239, -160, -190, -32,
- /* 10 */ -129, 26, 60, 103, 118, 127, 134, 157, -196, -191,
- /* 20 */ -148, -210, -155, 33, 50, -8, 15, -184, -181, -165,
- /* 30 */ 137, -81, 128, 149, 90, -113, -74, -39, 166, -142,
- /* 40 */ 159, 185, -256, -236, -133, -107, -91, -19, -5, 21,
- /* 50 */ 129, 173, 177, 196, 202, 203, 204, 205, 208, 209,
- /* 60 */ 210, 211, -23, 199, 63, 237, 238, 240, 241, 242,
- /* 70 */ 243, 247, 281, 282, 215, 283, 284, 285, 244, 245,
- /* 80 */ 286, 287, 290, 221, 222, 246, 249, 295, 296, 297,
- /* 90 */ 299, 300, 301, 310, 316, 323, 324, 325, 326, 327,
- /* 100 */ 328, 330, 332, 334, 335, 336, 338, 339, 340, 341,
- /* 110 */ 342, 343, 344, 345, 346, 348, 349, 350, 351, 352,
- /* 120 */ 354, 355, 356, 357, 358, 359, 360, 361, 362, 363,
- /* 130 */ 364, 365, 366, 367, 368, 369, 370, 371, 372, 373,
- /* 140 */ 374, 375, 376, 377, 379, 380, 236, 248, 251, 382,
- /* 150 */ 252, 383, 250, 254, 253, 257, 259, 262, 387, 389,
- /* 160 */ 256, 392, 391, 393, 394, 294, 395, 269, 396, 397,
- /* 170 */ 398, 399, 400, 403, 405, 407, 408, 411, 414, 406,
- /* 180 */ 410, 415, 421, 424, 416, 425, 427, 428, 430, 431,
- /* 190 */ 426, 432,
+ /* 0 */ -159, -30, -30, 22, 22, -195, -241, -146, -192, -88,
+ /* 10 */ -50, -130, -33, 72, 101, 105, 118, 155, -187, -165,
+ /* 20 */ -163, -156, -155, 37, 92, -239, -235, -152, -35, 156,
+ /* 30 */ -102, -56, 144, 201, 157, 167, 53, 198, 200, 115,
+ /* 40 */ -37, 209, -260, -256, -248, -179, -150, -72, -26, 4,
+ /* 50 */ 19, 32, 48, 128, 158, 170, 181, 189, 197, 203,
+ /* 60 */ 205, 206, 221, 225, 233, 235, 236, 237, 238, 241,
+ /* 70 */ 242, 276, 277, 280, 219, 282, 284, 286, 243, 244,
+ /* 80 */ 289, 291, 292, 293, 212, 214, 246, 251, 297, 299,
+ /* 90 */ 301, 309, 317, 318, 320, 324, 326, 327, 330, 331,
+ /* 100 */ 333, 334, 335, 336, 337, 338, 339, 340, 341, 342,
+ /* 110 */ 343, 344, 345, 346, 347, 348, 349, 350, 351, 352,
+ /* 120 */ 353, 354, 355, 356, 357, 358, 359, 360, 361, 362,
+ /* 130 */ 363, 364, 365, 366, 367, 368, 369, 370, 371, 372,
+ /* 140 */ 373, 374, 375, 376, 295, 377, 378, 231, 245, 247,
+ /* 150 */ 380, 248, 381, 249, 252, 250, 255, 258, 274, 253,
+ /* 160 */ 387, 254, 388, 392, 389, 393, 394, 395, 396, 266,
+ /* 170 */ 397, 398, 399, 401, 402, 405, 403, 406, 408, 412,
+ /* 180 */ 410, 415, 409, 414, 416, 420, 427, 428, 430, 431,
+ /* 190 */ 433, 434, 422, 429,
};
static const YYACTIONTYPE yy_default[] = {
- /* 0 */ 817, 936, 878, 948, 866, 875, 1082, 1082, 817, 817,
- /* 10 */ 817, 817, 817, 817, 817, 817, 817, 817, 995, 837,
- /* 20 */ 1082, 817, 817, 817, 817, 817, 817, 817, 817, 817,
- /* 30 */ 875, 817, 817, 817, 817, 885, 875, 885, 885, 990,
- /* 40 */ 920, 938, 817, 817, 817, 817, 817, 817, 817, 817,
- /* 50 */ 817, 817, 817, 817, 817, 817, 817, 817, 817, 817,
- /* 60 */ 817, 817, 817, 817, 817, 817, 817, 817, 817, 817,
- /* 70 */ 817, 817, 817, 817, 997, 1003, 1000, 817, 817, 817,
- /* 80 */ 1005, 817, 817, 1025, 1025, 988, 817, 817, 817, 817,
- /* 90 */ 817, 817, 817, 817, 817, 817, 817, 817, 817, 817,
- /* 100 */ 817, 817, 817, 817, 817, 817, 817, 817, 817, 817,
- /* 110 */ 817, 817, 817, 817, 817, 817, 817, 817, 864, 817,
- /* 120 */ 862, 817, 817, 817, 817, 817, 817, 817, 817, 817,
- /* 130 */ 817, 817, 817, 817, 817, 817, 848, 817, 817, 817,
- /* 140 */ 817, 817, 817, 839, 839, 839, 817, 817, 817, 839,
- /* 150 */ 817, 839, 1032, 1036, 1030, 1018, 1026, 1017, 1013, 1011,
- /* 160 */ 1010, 1040, 839, 839, 839, 883, 883, 879, 875, 875,
- /* 170 */ 839, 839, 901, 899, 897, 889, 895, 891, 893, 887,
- /* 180 */ 867, 839, 873, 873, 839, 873, 839, 873, 839, 839,
- /* 190 */ 920, 938, 817, 1041, 817, 1081, 1031, 1071, 1070, 1077,
- /* 200 */ 1069, 1068, 1067, 817, 817, 817, 1063, 1064, 1066, 1065,
- /* 210 */ 817, 817, 1073, 1072, 817, 817, 817, 817, 817, 817,
- /* 220 */ 817, 817, 817, 817, 817, 817, 817, 817, 817, 1043,
- /* 230 */ 817, 1037, 1033, 817, 817, 817, 817, 817, 817, 817,
- /* 240 */ 817, 817, 950, 817, 817, 817, 817, 817, 817, 817,
- /* 250 */ 817, 817, 817, 817, 817, 817, 817, 987, 817, 817,
- /* 260 */ 817, 817, 817, 999, 998, 817, 817, 817, 817, 817,
- /* 270 */ 817, 817, 817, 817, 1027, 817, 1019, 817, 817, 817,
- /* 280 */ 817, 817, 962, 817, 817, 817, 817, 817, 817, 817,
- /* 290 */ 817, 817, 817, 817, 817, 817, 817, 817, 817, 817,
- /* 300 */ 817, 817, 817, 817, 1093, 1091, 817, 817, 817, 1087,
- /* 310 */ 817, 817, 817, 1085, 817, 817, 817, 817, 817, 817,
- /* 320 */ 817, 817, 817, 817, 817, 817, 817, 817, 817, 817,
- /* 330 */ 817, 904, 817, 846, 844, 817, 835, 817,
+ /* 0 */ 824, 943, 885, 955, 873, 882, 1091, 1091, 824, 824,
+ /* 10 */ 824, 824, 824, 824, 824, 824, 824, 824, 1002, 844,
+ /* 20 */ 1091, 824, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 30 */ 882, 824, 824, 824, 824, 892, 882, 892, 892, 997,
+ /* 40 */ 927, 945, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 50 */ 824, 824, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 60 */ 824, 824, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 70 */ 824, 824, 824, 824, 1004, 1010, 1007, 824, 824, 824,
+ /* 80 */ 1012, 824, 824, 824, 1034, 1034, 995, 824, 824, 824,
+ /* 90 */ 824, 824, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 100 */ 824, 824, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 110 */ 824, 824, 824, 824, 824, 824, 824, 824, 824, 871,
+ /* 120 */ 824, 869, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 130 */ 824, 824, 824, 824, 824, 824, 824, 855, 824, 824,
+ /* 140 */ 824, 824, 824, 824, 846, 846, 846, 824, 824, 824,
+ /* 150 */ 846, 824, 846, 1041, 1045, 1039, 1027, 1035, 1026, 1022,
+ /* 160 */ 1020, 1018, 1017, 1049, 846, 846, 846, 890, 890, 886,
+ /* 170 */ 882, 882, 846, 846, 908, 906, 904, 896, 902, 898,
+ /* 180 */ 900, 894, 874, 846, 880, 880, 846, 880, 846, 880,
+ /* 190 */ 846, 846, 927, 945, 824, 1050, 824, 1090, 1040, 1080,
+ /* 200 */ 1079, 1086, 1078, 1077, 1076, 824, 824, 824, 1072, 1073,
+ /* 210 */ 1075, 1074, 824, 824, 1082, 1081, 824, 824, 824, 824,
+ /* 220 */ 824, 824, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 230 */ 824, 1052, 824, 1046, 1042, 824, 824, 824, 824, 824,
+ /* 240 */ 824, 824, 824, 824, 957, 824, 824, 824, 824, 824,
+ /* 250 */ 824, 824, 824, 824, 824, 824, 824, 824, 824, 994,
+ /* 260 */ 824, 824, 824, 824, 824, 1006, 1005, 824, 824, 824,
+ /* 270 */ 824, 824, 824, 824, 824, 824, 824, 824, 1036, 824,
+ /* 280 */ 1028, 824, 824, 824, 824, 824, 969, 824, 824, 824,
+ /* 290 */ 824, 824, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 300 */ 824, 824, 824, 824, 824, 824, 824, 824, 1102, 1100,
+ /* 310 */ 824, 824, 824, 1096, 824, 824, 824, 1094, 824, 824,
+ /* 320 */ 824, 824, 824, 824, 824, 824, 824, 824, 824, 824,
+ /* 330 */ 824, 824, 824, 824, 824, 911, 824, 853, 851, 824,
+ /* 340 */ 842, 824,
};
/********** End of lemon-generated parsing tables *****************************/
@@ -614,6 +617,7 @@ static const YYCODETYPE yyFallback[] = {
0, /* VARIABLE => nothing */
0, /* INTERVAL => nothing */
0, /* SESSION => nothing */
+ 0, /* STATE_WINDOW => nothing */
0, /* FILL => nothing */
0, /* SLIDING => nothing */
0, /* ORDER => nothing */
@@ -892,151 +896,153 @@ static const char *const yyTokenName[] = {
/* 122 */ "VARIABLE",
/* 123 */ "INTERVAL",
/* 124 */ "SESSION",
- /* 125 */ "FILL",
- /* 126 */ "SLIDING",
- /* 127 */ "ORDER",
- /* 128 */ "BY",
- /* 129 */ "ASC",
- /* 130 */ "DESC",
- /* 131 */ "GROUP",
- /* 132 */ "HAVING",
- /* 133 */ "LIMIT",
- /* 134 */ "OFFSET",
- /* 135 */ "SLIMIT",
- /* 136 */ "SOFFSET",
- /* 137 */ "WHERE",
- /* 138 */ "NOW",
- /* 139 */ "RESET",
- /* 140 */ "QUERY",
- /* 141 */ "SYNCDB",
- /* 142 */ "ADD",
- /* 143 */ "COLUMN",
- /* 144 */ "TAG",
- /* 145 */ "CHANGE",
- /* 146 */ "SET",
- /* 147 */ "KILL",
- /* 148 */ "CONNECTION",
- /* 149 */ "STREAM",
- /* 150 */ "COLON",
- /* 151 */ "ABORT",
- /* 152 */ "AFTER",
- /* 153 */ "ATTACH",
- /* 154 */ "BEFORE",
- /* 155 */ "BEGIN",
- /* 156 */ "CASCADE",
- /* 157 */ "CLUSTER",
- /* 158 */ "CONFLICT",
- /* 159 */ "COPY",
- /* 160 */ "DEFERRED",
- /* 161 */ "DELIMITERS",
- /* 162 */ "DETACH",
- /* 163 */ "EACH",
- /* 164 */ "END",
- /* 165 */ "EXPLAIN",
- /* 166 */ "FAIL",
- /* 167 */ "FOR",
- /* 168 */ "IGNORE",
- /* 169 */ "IMMEDIATE",
- /* 170 */ "INITIALLY",
- /* 171 */ "INSTEAD",
- /* 172 */ "MATCH",
- /* 173 */ "KEY",
- /* 174 */ "OF",
- /* 175 */ "RAISE",
- /* 176 */ "REPLACE",
- /* 177 */ "RESTRICT",
- /* 178 */ "ROW",
- /* 179 */ "STATEMENT",
- /* 180 */ "TRIGGER",
- /* 181 */ "VIEW",
- /* 182 */ "SEMI",
- /* 183 */ "NONE",
- /* 184 */ "PREV",
- /* 185 */ "LINEAR",
- /* 186 */ "IMPORT",
- /* 187 */ "TBNAME",
- /* 188 */ "JOIN",
- /* 189 */ "INSERT",
- /* 190 */ "INTO",
- /* 191 */ "VALUES",
- /* 192 */ "error",
- /* 193 */ "program",
- /* 194 */ "cmd",
- /* 195 */ "dbPrefix",
- /* 196 */ "ids",
- /* 197 */ "cpxName",
- /* 198 */ "ifexists",
- /* 199 */ "alter_db_optr",
- /* 200 */ "alter_topic_optr",
- /* 201 */ "acct_optr",
- /* 202 */ "ifnotexists",
- /* 203 */ "db_optr",
- /* 204 */ "topic_optr",
- /* 205 */ "typename",
- /* 206 */ "bufsize",
- /* 207 */ "pps",
- /* 208 */ "tseries",
- /* 209 */ "dbs",
- /* 210 */ "streams",
- /* 211 */ "storage",
- /* 212 */ "qtime",
- /* 213 */ "users",
- /* 214 */ "conns",
- /* 215 */ "state",
- /* 216 */ "keep",
- /* 217 */ "tagitemlist",
- /* 218 */ "cache",
- /* 219 */ "replica",
- /* 220 */ "quorum",
- /* 221 */ "days",
- /* 222 */ "minrows",
- /* 223 */ "maxrows",
- /* 224 */ "blocks",
- /* 225 */ "ctime",
- /* 226 */ "wal",
- /* 227 */ "fsync",
- /* 228 */ "comp",
- /* 229 */ "prec",
- /* 230 */ "update",
- /* 231 */ "cachelast",
- /* 232 */ "partitions",
- /* 233 */ "signed",
- /* 234 */ "create_table_args",
- /* 235 */ "create_stable_args",
- /* 236 */ "create_table_list",
- /* 237 */ "create_from_stable",
- /* 238 */ "columnlist",
- /* 239 */ "tagNamelist",
- /* 240 */ "select",
- /* 241 */ "column",
- /* 242 */ "tagitem",
- /* 243 */ "selcollist",
- /* 244 */ "from",
- /* 245 */ "where_opt",
- /* 246 */ "interval_opt",
- /* 247 */ "session_option",
- /* 248 */ "fill_opt",
- /* 249 */ "sliding_opt",
- /* 250 */ "groupby_opt",
- /* 251 */ "orderby_opt",
- /* 252 */ "having_opt",
- /* 253 */ "slimit_opt",
- /* 254 */ "limit_opt",
- /* 255 */ "union",
- /* 256 */ "sclp",
- /* 257 */ "distinct",
- /* 258 */ "expr",
- /* 259 */ "as",
- /* 260 */ "tablelist",
- /* 261 */ "sub",
- /* 262 */ "tmvar",
- /* 263 */ "sortlist",
- /* 264 */ "sortitem",
- /* 265 */ "item",
- /* 266 */ "sortorder",
- /* 267 */ "grouplist",
- /* 268 */ "exprlist",
- /* 269 */ "expritem",
+ /* 125 */ "STATE_WINDOW",
+ /* 126 */ "FILL",
+ /* 127 */ "SLIDING",
+ /* 128 */ "ORDER",
+ /* 129 */ "BY",
+ /* 130 */ "ASC",
+ /* 131 */ "DESC",
+ /* 132 */ "GROUP",
+ /* 133 */ "HAVING",
+ /* 134 */ "LIMIT",
+ /* 135 */ "OFFSET",
+ /* 136 */ "SLIMIT",
+ /* 137 */ "SOFFSET",
+ /* 138 */ "WHERE",
+ /* 139 */ "NOW",
+ /* 140 */ "RESET",
+ /* 141 */ "QUERY",
+ /* 142 */ "SYNCDB",
+ /* 143 */ "ADD",
+ /* 144 */ "COLUMN",
+ /* 145 */ "TAG",
+ /* 146 */ "CHANGE",
+ /* 147 */ "SET",
+ /* 148 */ "KILL",
+ /* 149 */ "CONNECTION",
+ /* 150 */ "STREAM",
+ /* 151 */ "COLON",
+ /* 152 */ "ABORT",
+ /* 153 */ "AFTER",
+ /* 154 */ "ATTACH",
+ /* 155 */ "BEFORE",
+ /* 156 */ "BEGIN",
+ /* 157 */ "CASCADE",
+ /* 158 */ "CLUSTER",
+ /* 159 */ "CONFLICT",
+ /* 160 */ "COPY",
+ /* 161 */ "DEFERRED",
+ /* 162 */ "DELIMITERS",
+ /* 163 */ "DETACH",
+ /* 164 */ "EACH",
+ /* 165 */ "END",
+ /* 166 */ "EXPLAIN",
+ /* 167 */ "FAIL",
+ /* 168 */ "FOR",
+ /* 169 */ "IGNORE",
+ /* 170 */ "IMMEDIATE",
+ /* 171 */ "INITIALLY",
+ /* 172 */ "INSTEAD",
+ /* 173 */ "MATCH",
+ /* 174 */ "KEY",
+ /* 175 */ "OF",
+ /* 176 */ "RAISE",
+ /* 177 */ "REPLACE",
+ /* 178 */ "RESTRICT",
+ /* 179 */ "ROW",
+ /* 180 */ "STATEMENT",
+ /* 181 */ "TRIGGER",
+ /* 182 */ "VIEW",
+ /* 183 */ "SEMI",
+ /* 184 */ "NONE",
+ /* 185 */ "PREV",
+ /* 186 */ "LINEAR",
+ /* 187 */ "IMPORT",
+ /* 188 */ "TBNAME",
+ /* 189 */ "JOIN",
+ /* 190 */ "INSERT",
+ /* 191 */ "INTO",
+ /* 192 */ "VALUES",
+ /* 193 */ "error",
+ /* 194 */ "program",
+ /* 195 */ "cmd",
+ /* 196 */ "dbPrefix",
+ /* 197 */ "ids",
+ /* 198 */ "cpxName",
+ /* 199 */ "ifexists",
+ /* 200 */ "alter_db_optr",
+ /* 201 */ "alter_topic_optr",
+ /* 202 */ "acct_optr",
+ /* 203 */ "ifnotexists",
+ /* 204 */ "db_optr",
+ /* 205 */ "topic_optr",
+ /* 206 */ "typename",
+ /* 207 */ "bufsize",
+ /* 208 */ "pps",
+ /* 209 */ "tseries",
+ /* 210 */ "dbs",
+ /* 211 */ "streams",
+ /* 212 */ "storage",
+ /* 213 */ "qtime",
+ /* 214 */ "users",
+ /* 215 */ "conns",
+ /* 216 */ "state",
+ /* 217 */ "keep",
+ /* 218 */ "tagitemlist",
+ /* 219 */ "cache",
+ /* 220 */ "replica",
+ /* 221 */ "quorum",
+ /* 222 */ "days",
+ /* 223 */ "minrows",
+ /* 224 */ "maxrows",
+ /* 225 */ "blocks",
+ /* 226 */ "ctime",
+ /* 227 */ "wal",
+ /* 228 */ "fsync",
+ /* 229 */ "comp",
+ /* 230 */ "prec",
+ /* 231 */ "update",
+ /* 232 */ "cachelast",
+ /* 233 */ "partitions",
+ /* 234 */ "signed",
+ /* 235 */ "create_table_args",
+ /* 236 */ "create_stable_args",
+ /* 237 */ "create_table_list",
+ /* 238 */ "create_from_stable",
+ /* 239 */ "columnlist",
+ /* 240 */ "tagNamelist",
+ /* 241 */ "select",
+ /* 242 */ "column",
+ /* 243 */ "tagitem",
+ /* 244 */ "selcollist",
+ /* 245 */ "from",
+ /* 246 */ "where_opt",
+ /* 247 */ "interval_opt",
+ /* 248 */ "session_option",
+ /* 249 */ "windowstate_option",
+ /* 250 */ "fill_opt",
+ /* 251 */ "sliding_opt",
+ /* 252 */ "groupby_opt",
+ /* 253 */ "orderby_opt",
+ /* 254 */ "having_opt",
+ /* 255 */ "slimit_opt",
+ /* 256 */ "limit_opt",
+ /* 257 */ "union",
+ /* 258 */ "sclp",
+ /* 259 */ "distinct",
+ /* 260 */ "expr",
+ /* 261 */ "as",
+ /* 262 */ "tablelist",
+ /* 263 */ "sub",
+ /* 264 */ "tmvar",
+ /* 265 */ "sortlist",
+ /* 266 */ "sortitem",
+ /* 267 */ "item",
+ /* 268 */ "sortorder",
+ /* 269 */ "grouplist",
+ /* 270 */ "exprlist",
+ /* 271 */ "expritem",
};
#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
@@ -1207,7 +1213,7 @@ static const char *const yyRuleName[] = {
/* 160 */ "tagitem ::= MINUS FLOAT",
/* 161 */ "tagitem ::= PLUS INTEGER",
/* 162 */ "tagitem ::= PLUS FLOAT",
- /* 163 */ "select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt",
+ /* 163 */ "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",
/* 164 */ "select ::= LP select RP",
/* 165 */ "union ::= select",
/* 166 */ "union ::= union UNION ALL select",
@@ -1237,92 +1243,94 @@ static const char *const yyRuleName[] = {
/* 190 */ "interval_opt ::=",
/* 191 */ "session_option ::=",
/* 192 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP",
- /* 193 */ "fill_opt ::=",
- /* 194 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP",
- /* 195 */ "fill_opt ::= FILL LP ID RP",
- /* 196 */ "sliding_opt ::= SLIDING LP tmvar RP",
- /* 197 */ "sliding_opt ::=",
- /* 198 */ "orderby_opt ::=",
- /* 199 */ "orderby_opt ::= ORDER BY sortlist",
- /* 200 */ "sortlist ::= sortlist COMMA item sortorder",
- /* 201 */ "sortlist ::= item sortorder",
- /* 202 */ "item ::= ids cpxName",
- /* 203 */ "sortorder ::= ASC",
- /* 204 */ "sortorder ::= DESC",
- /* 205 */ "sortorder ::=",
- /* 206 */ "groupby_opt ::=",
- /* 207 */ "groupby_opt ::= GROUP BY grouplist",
- /* 208 */ "grouplist ::= grouplist COMMA item",
- /* 209 */ "grouplist ::= item",
- /* 210 */ "having_opt ::=",
- /* 211 */ "having_opt ::= HAVING expr",
- /* 212 */ "limit_opt ::=",
- /* 213 */ "limit_opt ::= LIMIT signed",
- /* 214 */ "limit_opt ::= LIMIT signed OFFSET signed",
- /* 215 */ "limit_opt ::= LIMIT signed COMMA signed",
- /* 216 */ "slimit_opt ::=",
- /* 217 */ "slimit_opt ::= SLIMIT signed",
- /* 218 */ "slimit_opt ::= SLIMIT signed SOFFSET signed",
- /* 219 */ "slimit_opt ::= SLIMIT signed COMMA signed",
- /* 220 */ "where_opt ::=",
- /* 221 */ "where_opt ::= WHERE expr",
- /* 222 */ "expr ::= LP expr RP",
- /* 223 */ "expr ::= ID",
- /* 224 */ "expr ::= ID DOT ID",
- /* 225 */ "expr ::= ID DOT STAR",
- /* 226 */ "expr ::= INTEGER",
- /* 227 */ "expr ::= MINUS INTEGER",
- /* 228 */ "expr ::= PLUS INTEGER",
- /* 229 */ "expr ::= FLOAT",
- /* 230 */ "expr ::= MINUS FLOAT",
- /* 231 */ "expr ::= PLUS FLOAT",
- /* 232 */ "expr ::= STRING",
- /* 233 */ "expr ::= NOW",
- /* 234 */ "expr ::= VARIABLE",
- /* 235 */ "expr ::= PLUS VARIABLE",
- /* 236 */ "expr ::= MINUS VARIABLE",
- /* 237 */ "expr ::= BOOL",
- /* 238 */ "expr ::= NULL",
- /* 239 */ "expr ::= ID LP exprlist RP",
- /* 240 */ "expr ::= ID LP STAR RP",
- /* 241 */ "expr ::= expr IS NULL",
- /* 242 */ "expr ::= expr IS NOT NULL",
- /* 243 */ "expr ::= expr LT expr",
- /* 244 */ "expr ::= expr GT expr",
- /* 245 */ "expr ::= expr LE expr",
- /* 246 */ "expr ::= expr GE expr",
- /* 247 */ "expr ::= expr NE expr",
- /* 248 */ "expr ::= expr EQ expr",
- /* 249 */ "expr ::= expr BETWEEN expr AND expr",
- /* 250 */ "expr ::= expr AND expr",
- /* 251 */ "expr ::= expr OR expr",
- /* 252 */ "expr ::= expr PLUS expr",
- /* 253 */ "expr ::= expr MINUS expr",
- /* 254 */ "expr ::= expr STAR expr",
- /* 255 */ "expr ::= expr SLASH expr",
- /* 256 */ "expr ::= expr REM expr",
- /* 257 */ "expr ::= expr LIKE expr",
- /* 258 */ "expr ::= expr IN LP exprlist RP",
- /* 259 */ "exprlist ::= exprlist COMMA expritem",
- /* 260 */ "exprlist ::= expritem",
- /* 261 */ "expritem ::= expr",
- /* 262 */ "expritem ::=",
- /* 263 */ "cmd ::= RESET QUERY CACHE",
- /* 264 */ "cmd ::= SYNCDB ids REPLICA",
- /* 265 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
- /* 266 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
- /* 267 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
- /* 268 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
- /* 269 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
- /* 270 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
- /* 271 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
- /* 272 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
- /* 273 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
- /* 274 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
- /* 275 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
- /* 276 */ "cmd ::= KILL CONNECTION INTEGER",
- /* 277 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
- /* 278 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
+ /* 193 */ "windowstate_option ::=",
+ /* 194 */ "windowstate_option ::= STATE_WINDOW LP ids RP",
+ /* 195 */ "fill_opt ::=",
+ /* 196 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP",
+ /* 197 */ "fill_opt ::= FILL LP ID RP",
+ /* 198 */ "sliding_opt ::= SLIDING LP tmvar RP",
+ /* 199 */ "sliding_opt ::=",
+ /* 200 */ "orderby_opt ::=",
+ /* 201 */ "orderby_opt ::= ORDER BY sortlist",
+ /* 202 */ "sortlist ::= sortlist COMMA item sortorder",
+ /* 203 */ "sortlist ::= item sortorder",
+ /* 204 */ "item ::= ids cpxName",
+ /* 205 */ "sortorder ::= ASC",
+ /* 206 */ "sortorder ::= DESC",
+ /* 207 */ "sortorder ::=",
+ /* 208 */ "groupby_opt ::=",
+ /* 209 */ "groupby_opt ::= GROUP BY grouplist",
+ /* 210 */ "grouplist ::= grouplist COMMA item",
+ /* 211 */ "grouplist ::= item",
+ /* 212 */ "having_opt ::=",
+ /* 213 */ "having_opt ::= HAVING expr",
+ /* 214 */ "limit_opt ::=",
+ /* 215 */ "limit_opt ::= LIMIT signed",
+ /* 216 */ "limit_opt ::= LIMIT signed OFFSET signed",
+ /* 217 */ "limit_opt ::= LIMIT signed COMMA signed",
+ /* 218 */ "slimit_opt ::=",
+ /* 219 */ "slimit_opt ::= SLIMIT signed",
+ /* 220 */ "slimit_opt ::= SLIMIT signed SOFFSET signed",
+ /* 221 */ "slimit_opt ::= SLIMIT signed COMMA signed",
+ /* 222 */ "where_opt ::=",
+ /* 223 */ "where_opt ::= WHERE expr",
+ /* 224 */ "expr ::= LP expr RP",
+ /* 225 */ "expr ::= ID",
+ /* 226 */ "expr ::= ID DOT ID",
+ /* 227 */ "expr ::= ID DOT STAR",
+ /* 228 */ "expr ::= INTEGER",
+ /* 229 */ "expr ::= MINUS INTEGER",
+ /* 230 */ "expr ::= PLUS INTEGER",
+ /* 231 */ "expr ::= FLOAT",
+ /* 232 */ "expr ::= MINUS FLOAT",
+ /* 233 */ "expr ::= PLUS FLOAT",
+ /* 234 */ "expr ::= STRING",
+ /* 235 */ "expr ::= NOW",
+ /* 236 */ "expr ::= VARIABLE",
+ /* 237 */ "expr ::= PLUS VARIABLE",
+ /* 238 */ "expr ::= MINUS VARIABLE",
+ /* 239 */ "expr ::= BOOL",
+ /* 240 */ "expr ::= NULL",
+ /* 241 */ "expr ::= ID LP exprlist RP",
+ /* 242 */ "expr ::= ID LP STAR RP",
+ /* 243 */ "expr ::= expr IS NULL",
+ /* 244 */ "expr ::= expr IS NOT NULL",
+ /* 245 */ "expr ::= expr LT expr",
+ /* 246 */ "expr ::= expr GT expr",
+ /* 247 */ "expr ::= expr LE expr",
+ /* 248 */ "expr ::= expr GE expr",
+ /* 249 */ "expr ::= expr NE expr",
+ /* 250 */ "expr ::= expr EQ expr",
+ /* 251 */ "expr ::= expr BETWEEN expr AND expr",
+ /* 252 */ "expr ::= expr AND expr",
+ /* 253 */ "expr ::= expr OR expr",
+ /* 254 */ "expr ::= expr PLUS expr",
+ /* 255 */ "expr ::= expr MINUS expr",
+ /* 256 */ "expr ::= expr STAR expr",
+ /* 257 */ "expr ::= expr SLASH expr",
+ /* 258 */ "expr ::= expr REM expr",
+ /* 259 */ "expr ::= expr LIKE expr",
+ /* 260 */ "expr ::= expr IN LP exprlist RP",
+ /* 261 */ "exprlist ::= exprlist COMMA expritem",
+ /* 262 */ "exprlist ::= expritem",
+ /* 263 */ "expritem ::= expr",
+ /* 264 */ "expritem ::=",
+ /* 265 */ "cmd ::= RESET QUERY CACHE",
+ /* 266 */ "cmd ::= SYNCDB ids REPLICA",
+ /* 267 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
+ /* 268 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
+ /* 269 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
+ /* 270 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
+ /* 271 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
+ /* 272 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
+ /* 273 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
+ /* 274 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
+ /* 275 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
+ /* 276 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
+ /* 277 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
+ /* 278 */ "cmd ::= KILL CONNECTION INTEGER",
+ /* 279 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
+ /* 280 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
};
#endif /* NDEBUG */
@@ -1443,59 +1451,59 @@ static void yy_destructor(
** inside the C code.
*/
/********* Begin destructor definitions ***************************************/
- case 216: /* keep */
- case 217: /* tagitemlist */
- case 238: /* columnlist */
- case 239: /* tagNamelist */
- case 248: /* fill_opt */
- case 250: /* groupby_opt */
- case 251: /* orderby_opt */
- case 263: /* sortlist */
- case 267: /* grouplist */
+ case 217: /* keep */
+ case 218: /* tagitemlist */
+ case 239: /* columnlist */
+ case 240: /* tagNamelist */
+ case 250: /* fill_opt */
+ case 252: /* groupby_opt */
+ case 253: /* orderby_opt */
+ case 265: /* sortlist */
+ case 269: /* grouplist */
{
-taosArrayDestroy((yypminor->yy441));
+taosArrayDestroy((yypminor->yy413));
}
break;
- case 236: /* create_table_list */
+ case 237: /* create_table_list */
{
-destroyCreateTableSql((yypminor->yy182));
+destroyCreateTableSql((yypminor->yy438));
}
break;
- case 240: /* select */
+ case 241: /* select */
{
-destroySqlNode((yypminor->yy236));
+destroySqlNode((yypminor->yy24));
}
break;
- case 243: /* selcollist */
- case 256: /* sclp */
- case 268: /* exprlist */
+ case 244: /* selcollist */
+ case 258: /* sclp */
+ case 270: /* exprlist */
{
-tSqlExprListDestroy((yypminor->yy441));
+tSqlExprListDestroy((yypminor->yy413));
}
break;
- case 244: /* from */
- case 260: /* tablelist */
- case 261: /* sub */
+ case 245: /* from */
+ case 262: /* tablelist */
+ case 263: /* sub */
{
-destroyRelationInfo((yypminor->yy244));
+destroyRelationInfo((yypminor->yy292));
}
break;
- case 245: /* where_opt */
- case 252: /* having_opt */
- case 258: /* expr */
- case 269: /* expritem */
+ case 246: /* where_opt */
+ case 254: /* having_opt */
+ case 260: /* expr */
+ case 271: /* expritem */
{
-tSqlExprDestroy((yypminor->yy166));
+tSqlExprDestroy((yypminor->yy370));
}
break;
- case 255: /* union */
+ case 257: /* union */
{
-destroyAllSqlNode((yypminor->yy441));
+destroyAllSqlNode((yypminor->yy413));
}
break;
- case 264: /* sortitem */
+ case 266: /* sortitem */
{
-tVariantDestroy(&(yypminor->yy506));
+tVariantDestroy(&(yypminor->yy394));
}
break;
/********* End destructor definitions *****************************************/
@@ -1789,285 +1797,287 @@ 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[] = {
- { 193, -1 }, /* (0) program ::= cmd */
- { 194, -2 }, /* (1) cmd ::= SHOW DATABASES */
- { 194, -2 }, /* (2) cmd ::= SHOW TOPICS */
- { 194, -2 }, /* (3) cmd ::= SHOW FUNCTIONS */
- { 194, -2 }, /* (4) cmd ::= SHOW MNODES */
- { 194, -2 }, /* (5) cmd ::= SHOW DNODES */
- { 194, -2 }, /* (6) cmd ::= SHOW ACCOUNTS */
- { 194, -2 }, /* (7) cmd ::= SHOW USERS */
- { 194, -2 }, /* (8) cmd ::= SHOW MODULES */
- { 194, -2 }, /* (9) cmd ::= SHOW QUERIES */
- { 194, -2 }, /* (10) cmd ::= SHOW CONNECTIONS */
- { 194, -2 }, /* (11) cmd ::= SHOW STREAMS */
- { 194, -2 }, /* (12) cmd ::= SHOW VARIABLES */
- { 194, -2 }, /* (13) cmd ::= SHOW SCORES */
- { 194, -2 }, /* (14) cmd ::= SHOW GRANTS */
- { 194, -2 }, /* (15) cmd ::= SHOW VNODES */
- { 194, -3 }, /* (16) cmd ::= SHOW VNODES IPTOKEN */
- { 195, 0 }, /* (17) dbPrefix ::= */
- { 195, -2 }, /* (18) dbPrefix ::= ids DOT */
- { 197, 0 }, /* (19) cpxName ::= */
- { 197, -2 }, /* (20) cpxName ::= DOT ids */
- { 194, -5 }, /* (21) cmd ::= SHOW CREATE TABLE ids cpxName */
- { 194, -5 }, /* (22) cmd ::= SHOW CREATE STABLE ids cpxName */
- { 194, -4 }, /* (23) cmd ::= SHOW CREATE DATABASE ids */
- { 194, -3 }, /* (24) cmd ::= SHOW dbPrefix TABLES */
- { 194, -5 }, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE ids */
- { 194, -3 }, /* (26) cmd ::= SHOW dbPrefix STABLES */
- { 194, -5 }, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE ids */
- { 194, -3 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS */
- { 194, -4 }, /* (29) cmd ::= SHOW dbPrefix VGROUPS ids */
- { 194, -5 }, /* (30) cmd ::= DROP TABLE ifexists ids cpxName */
- { 194, -5 }, /* (31) cmd ::= DROP STABLE ifexists ids cpxName */
- { 194, -4 }, /* (32) cmd ::= DROP DATABASE ifexists ids */
- { 194, -4 }, /* (33) cmd ::= DROP TOPIC ifexists ids */
- { 194, -3 }, /* (34) cmd ::= DROP FUNCTION ids */
- { 194, -3 }, /* (35) cmd ::= DROP DNODE ids */
- { 194, -3 }, /* (36) cmd ::= DROP USER ids */
- { 194, -3 }, /* (37) cmd ::= DROP ACCOUNT ids */
- { 194, -2 }, /* (38) cmd ::= USE ids */
- { 194, -3 }, /* (39) cmd ::= DESCRIBE ids cpxName */
- { 194, -5 }, /* (40) cmd ::= ALTER USER ids PASS ids */
- { 194, -5 }, /* (41) cmd ::= ALTER USER ids PRIVILEGE ids */
- { 194, -4 }, /* (42) cmd ::= ALTER DNODE ids ids */
- { 194, -5 }, /* (43) cmd ::= ALTER DNODE ids ids ids */
- { 194, -3 }, /* (44) cmd ::= ALTER LOCAL ids */
- { 194, -4 }, /* (45) cmd ::= ALTER LOCAL ids ids */
- { 194, -4 }, /* (46) cmd ::= ALTER DATABASE ids alter_db_optr */
- { 194, -4 }, /* (47) cmd ::= ALTER TOPIC ids alter_topic_optr */
- { 194, -4 }, /* (48) cmd ::= ALTER ACCOUNT ids acct_optr */
- { 194, -6 }, /* (49) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
- { 196, -1 }, /* (50) ids ::= ID */
- { 196, -1 }, /* (51) ids ::= STRING */
- { 198, -2 }, /* (52) ifexists ::= IF EXISTS */
- { 198, 0 }, /* (53) ifexists ::= */
- { 202, -3 }, /* (54) ifnotexists ::= IF NOT EXISTS */
- { 202, 0 }, /* (55) ifnotexists ::= */
- { 194, -3 }, /* (56) cmd ::= CREATE DNODE ids */
- { 194, -6 }, /* (57) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
- { 194, -5 }, /* (58) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
- { 194, -5 }, /* (59) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */
- { 194, -8 }, /* (60) cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
- { 194, -9 }, /* (61) cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
- { 194, -5 }, /* (62) cmd ::= CREATE USER ids PASS ids */
- { 206, 0 }, /* (63) bufsize ::= */
- { 206, -2 }, /* (64) bufsize ::= BUFSIZE INTEGER */
- { 207, 0 }, /* (65) pps ::= */
- { 207, -2 }, /* (66) pps ::= PPS INTEGER */
- { 208, 0 }, /* (67) tseries ::= */
- { 208, -2 }, /* (68) tseries ::= TSERIES INTEGER */
- { 209, 0 }, /* (69) dbs ::= */
- { 209, -2 }, /* (70) dbs ::= DBS INTEGER */
- { 210, 0 }, /* (71) streams ::= */
- { 210, -2 }, /* (72) streams ::= STREAMS INTEGER */
- { 211, 0 }, /* (73) storage ::= */
- { 211, -2 }, /* (74) storage ::= STORAGE INTEGER */
- { 212, 0 }, /* (75) qtime ::= */
- { 212, -2 }, /* (76) qtime ::= QTIME INTEGER */
- { 213, 0 }, /* (77) users ::= */
- { 213, -2 }, /* (78) users ::= USERS INTEGER */
- { 214, 0 }, /* (79) conns ::= */
- { 214, -2 }, /* (80) conns ::= CONNS INTEGER */
- { 215, 0 }, /* (81) state ::= */
- { 215, -2 }, /* (82) state ::= STATE ids */
- { 201, -9 }, /* (83) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
- { 216, -2 }, /* (84) keep ::= KEEP tagitemlist */
- { 218, -2 }, /* (85) cache ::= CACHE INTEGER */
- { 219, -2 }, /* (86) replica ::= REPLICA INTEGER */
- { 220, -2 }, /* (87) quorum ::= QUORUM INTEGER */
- { 221, -2 }, /* (88) days ::= DAYS INTEGER */
- { 222, -2 }, /* (89) minrows ::= MINROWS INTEGER */
- { 223, -2 }, /* (90) maxrows ::= MAXROWS INTEGER */
- { 224, -2 }, /* (91) blocks ::= BLOCKS INTEGER */
- { 225, -2 }, /* (92) ctime ::= CTIME INTEGER */
- { 226, -2 }, /* (93) wal ::= WAL INTEGER */
- { 227, -2 }, /* (94) fsync ::= FSYNC INTEGER */
- { 228, -2 }, /* (95) comp ::= COMP INTEGER */
- { 229, -2 }, /* (96) prec ::= PRECISION STRING */
- { 230, -2 }, /* (97) update ::= UPDATE INTEGER */
- { 231, -2 }, /* (98) cachelast ::= CACHELAST INTEGER */
- { 232, -2 }, /* (99) partitions ::= PARTITIONS INTEGER */
- { 203, 0 }, /* (100) db_optr ::= */
- { 203, -2 }, /* (101) db_optr ::= db_optr cache */
- { 203, -2 }, /* (102) db_optr ::= db_optr replica */
- { 203, -2 }, /* (103) db_optr ::= db_optr quorum */
- { 203, -2 }, /* (104) db_optr ::= db_optr days */
- { 203, -2 }, /* (105) db_optr ::= db_optr minrows */
- { 203, -2 }, /* (106) db_optr ::= db_optr maxrows */
- { 203, -2 }, /* (107) db_optr ::= db_optr blocks */
- { 203, -2 }, /* (108) db_optr ::= db_optr ctime */
- { 203, -2 }, /* (109) db_optr ::= db_optr wal */
- { 203, -2 }, /* (110) db_optr ::= db_optr fsync */
- { 203, -2 }, /* (111) db_optr ::= db_optr comp */
- { 203, -2 }, /* (112) db_optr ::= db_optr prec */
- { 203, -2 }, /* (113) db_optr ::= db_optr keep */
- { 203, -2 }, /* (114) db_optr ::= db_optr update */
- { 203, -2 }, /* (115) db_optr ::= db_optr cachelast */
- { 204, -1 }, /* (116) topic_optr ::= db_optr */
- { 204, -2 }, /* (117) topic_optr ::= topic_optr partitions */
- { 199, 0 }, /* (118) alter_db_optr ::= */
- { 199, -2 }, /* (119) alter_db_optr ::= alter_db_optr replica */
- { 199, -2 }, /* (120) alter_db_optr ::= alter_db_optr quorum */
- { 199, -2 }, /* (121) alter_db_optr ::= alter_db_optr keep */
- { 199, -2 }, /* (122) alter_db_optr ::= alter_db_optr blocks */
- { 199, -2 }, /* (123) alter_db_optr ::= alter_db_optr comp */
- { 199, -2 }, /* (124) alter_db_optr ::= alter_db_optr wal */
- { 199, -2 }, /* (125) alter_db_optr ::= alter_db_optr fsync */
- { 199, -2 }, /* (126) alter_db_optr ::= alter_db_optr update */
- { 199, -2 }, /* (127) alter_db_optr ::= alter_db_optr cachelast */
- { 200, -1 }, /* (128) alter_topic_optr ::= alter_db_optr */
- { 200, -2 }, /* (129) alter_topic_optr ::= alter_topic_optr partitions */
- { 205, -1 }, /* (130) typename ::= ids */
- { 205, -4 }, /* (131) typename ::= ids LP signed RP */
- { 205, -2 }, /* (132) typename ::= ids UNSIGNED */
- { 233, -1 }, /* (133) signed ::= INTEGER */
- { 233, -2 }, /* (134) signed ::= PLUS INTEGER */
- { 233, -2 }, /* (135) signed ::= MINUS INTEGER */
- { 194, -3 }, /* (136) cmd ::= CREATE TABLE create_table_args */
- { 194, -3 }, /* (137) cmd ::= CREATE TABLE create_stable_args */
- { 194, -3 }, /* (138) cmd ::= CREATE STABLE create_stable_args */
- { 194, -3 }, /* (139) cmd ::= CREATE TABLE create_table_list */
- { 236, -1 }, /* (140) create_table_list ::= create_from_stable */
- { 236, -2 }, /* (141) create_table_list ::= create_table_list create_from_stable */
- { 234, -6 }, /* (142) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
- { 235, -10 }, /* (143) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
- { 237, -10 }, /* (144) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
- { 237, -13 }, /* (145) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
- { 239, -3 }, /* (146) tagNamelist ::= tagNamelist COMMA ids */
- { 239, -1 }, /* (147) tagNamelist ::= ids */
- { 234, -5 }, /* (148) create_table_args ::= ifnotexists ids cpxName AS select */
- { 238, -3 }, /* (149) columnlist ::= columnlist COMMA column */
- { 238, -1 }, /* (150) columnlist ::= column */
- { 241, -2 }, /* (151) column ::= ids typename */
- { 217, -3 }, /* (152) tagitemlist ::= tagitemlist COMMA tagitem */
- { 217, -1 }, /* (153) tagitemlist ::= tagitem */
- { 242, -1 }, /* (154) tagitem ::= INTEGER */
- { 242, -1 }, /* (155) tagitem ::= FLOAT */
- { 242, -1 }, /* (156) tagitem ::= STRING */
- { 242, -1 }, /* (157) tagitem ::= BOOL */
- { 242, -1 }, /* (158) tagitem ::= NULL */
- { 242, -2 }, /* (159) tagitem ::= MINUS INTEGER */
- { 242, -2 }, /* (160) tagitem ::= MINUS FLOAT */
- { 242, -2 }, /* (161) tagitem ::= PLUS INTEGER */
- { 242, -2 }, /* (162) tagitem ::= PLUS FLOAT */
- { 240, -13 }, /* (163) select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
- { 240, -3 }, /* (164) select ::= LP select RP */
- { 255, -1 }, /* (165) union ::= select */
- { 255, -4 }, /* (166) union ::= union UNION ALL select */
- { 194, -1 }, /* (167) cmd ::= union */
- { 240, -2 }, /* (168) select ::= SELECT selcollist */
- { 256, -2 }, /* (169) sclp ::= selcollist COMMA */
- { 256, 0 }, /* (170) sclp ::= */
- { 243, -4 }, /* (171) selcollist ::= sclp distinct expr as */
- { 243, -2 }, /* (172) selcollist ::= sclp STAR */
- { 259, -2 }, /* (173) as ::= AS ids */
- { 259, -1 }, /* (174) as ::= ids */
- { 259, 0 }, /* (175) as ::= */
- { 257, -1 }, /* (176) distinct ::= DISTINCT */
- { 257, 0 }, /* (177) distinct ::= */
- { 244, -2 }, /* (178) from ::= FROM tablelist */
- { 244, -2 }, /* (179) from ::= FROM sub */
- { 261, -3 }, /* (180) sub ::= LP union RP */
- { 261, -4 }, /* (181) sub ::= LP union RP ids */
- { 261, -6 }, /* (182) sub ::= sub COMMA LP union RP ids */
- { 260, -2 }, /* (183) tablelist ::= ids cpxName */
- { 260, -3 }, /* (184) tablelist ::= ids cpxName ids */
- { 260, -4 }, /* (185) tablelist ::= tablelist COMMA ids cpxName */
- { 260, -5 }, /* (186) tablelist ::= tablelist COMMA ids cpxName ids */
- { 262, -1 }, /* (187) tmvar ::= VARIABLE */
- { 246, -4 }, /* (188) interval_opt ::= INTERVAL LP tmvar RP */
- { 246, -6 }, /* (189) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
- { 246, 0 }, /* (190) interval_opt ::= */
- { 247, 0 }, /* (191) session_option ::= */
- { 247, -7 }, /* (192) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
- { 248, 0 }, /* (193) fill_opt ::= */
- { 248, -6 }, /* (194) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
- { 248, -4 }, /* (195) fill_opt ::= FILL LP ID RP */
- { 249, -4 }, /* (196) sliding_opt ::= SLIDING LP tmvar RP */
- { 249, 0 }, /* (197) sliding_opt ::= */
- { 251, 0 }, /* (198) orderby_opt ::= */
- { 251, -3 }, /* (199) orderby_opt ::= ORDER BY sortlist */
- { 263, -4 }, /* (200) sortlist ::= sortlist COMMA item sortorder */
- { 263, -2 }, /* (201) sortlist ::= item sortorder */
- { 265, -2 }, /* (202) item ::= ids cpxName */
- { 266, -1 }, /* (203) sortorder ::= ASC */
- { 266, -1 }, /* (204) sortorder ::= DESC */
- { 266, 0 }, /* (205) sortorder ::= */
- { 250, 0 }, /* (206) groupby_opt ::= */
- { 250, -3 }, /* (207) groupby_opt ::= GROUP BY grouplist */
- { 267, -3 }, /* (208) grouplist ::= grouplist COMMA item */
- { 267, -1 }, /* (209) grouplist ::= item */
- { 252, 0 }, /* (210) having_opt ::= */
- { 252, -2 }, /* (211) having_opt ::= HAVING expr */
- { 254, 0 }, /* (212) limit_opt ::= */
- { 254, -2 }, /* (213) limit_opt ::= LIMIT signed */
- { 254, -4 }, /* (214) limit_opt ::= LIMIT signed OFFSET signed */
- { 254, -4 }, /* (215) limit_opt ::= LIMIT signed COMMA signed */
- { 253, 0 }, /* (216) slimit_opt ::= */
- { 253, -2 }, /* (217) slimit_opt ::= SLIMIT signed */
- { 253, -4 }, /* (218) slimit_opt ::= SLIMIT signed SOFFSET signed */
- { 253, -4 }, /* (219) slimit_opt ::= SLIMIT signed COMMA signed */
- { 245, 0 }, /* (220) where_opt ::= */
- { 245, -2 }, /* (221) where_opt ::= WHERE expr */
- { 258, -3 }, /* (222) expr ::= LP expr RP */
- { 258, -1 }, /* (223) expr ::= ID */
- { 258, -3 }, /* (224) expr ::= ID DOT ID */
- { 258, -3 }, /* (225) expr ::= ID DOT STAR */
- { 258, -1 }, /* (226) expr ::= INTEGER */
- { 258, -2 }, /* (227) expr ::= MINUS INTEGER */
- { 258, -2 }, /* (228) expr ::= PLUS INTEGER */
- { 258, -1 }, /* (229) expr ::= FLOAT */
- { 258, -2 }, /* (230) expr ::= MINUS FLOAT */
- { 258, -2 }, /* (231) expr ::= PLUS FLOAT */
- { 258, -1 }, /* (232) expr ::= STRING */
- { 258, -1 }, /* (233) expr ::= NOW */
- { 258, -1 }, /* (234) expr ::= VARIABLE */
- { 258, -2 }, /* (235) expr ::= PLUS VARIABLE */
- { 258, -2 }, /* (236) expr ::= MINUS VARIABLE */
- { 258, -1 }, /* (237) expr ::= BOOL */
- { 258, -1 }, /* (238) expr ::= NULL */
- { 258, -4 }, /* (239) expr ::= ID LP exprlist RP */
- { 258, -4 }, /* (240) expr ::= ID LP STAR RP */
- { 258, -3 }, /* (241) expr ::= expr IS NULL */
- { 258, -4 }, /* (242) expr ::= expr IS NOT NULL */
- { 258, -3 }, /* (243) expr ::= expr LT expr */
- { 258, -3 }, /* (244) expr ::= expr GT expr */
- { 258, -3 }, /* (245) expr ::= expr LE expr */
- { 258, -3 }, /* (246) expr ::= expr GE expr */
- { 258, -3 }, /* (247) expr ::= expr NE expr */
- { 258, -3 }, /* (248) expr ::= expr EQ expr */
- { 258, -5 }, /* (249) expr ::= expr BETWEEN expr AND expr */
- { 258, -3 }, /* (250) expr ::= expr AND expr */
- { 258, -3 }, /* (251) expr ::= expr OR expr */
- { 258, -3 }, /* (252) expr ::= expr PLUS expr */
- { 258, -3 }, /* (253) expr ::= expr MINUS expr */
- { 258, -3 }, /* (254) expr ::= expr STAR expr */
- { 258, -3 }, /* (255) expr ::= expr SLASH expr */
- { 258, -3 }, /* (256) expr ::= expr REM expr */
- { 258, -3 }, /* (257) expr ::= expr LIKE expr */
- { 258, -5 }, /* (258) expr ::= expr IN LP exprlist RP */
- { 268, -3 }, /* (259) exprlist ::= exprlist COMMA expritem */
- { 268, -1 }, /* (260) exprlist ::= expritem */
- { 269, -1 }, /* (261) expritem ::= expr */
- { 269, 0 }, /* (262) expritem ::= */
- { 194, -3 }, /* (263) cmd ::= RESET QUERY CACHE */
- { 194, -3 }, /* (264) cmd ::= SYNCDB ids REPLICA */
- { 194, -7 }, /* (265) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
- { 194, -7 }, /* (266) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
- { 194, -7 }, /* (267) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
- { 194, -7 }, /* (268) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
- { 194, -8 }, /* (269) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
- { 194, -9 }, /* (270) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
- { 194, -7 }, /* (271) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
- { 194, -7 }, /* (272) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
- { 194, -7 }, /* (273) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
- { 194, -7 }, /* (274) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
- { 194, -8 }, /* (275) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
- { 194, -3 }, /* (276) cmd ::= KILL CONNECTION INTEGER */
- { 194, -5 }, /* (277) cmd ::= KILL STREAM INTEGER COLON INTEGER */
- { 194, -5 }, /* (278) cmd ::= KILL QUERY INTEGER COLON INTEGER */
+ { 194, -1 }, /* (0) program ::= cmd */
+ { 195, -2 }, /* (1) cmd ::= SHOW DATABASES */
+ { 195, -2 }, /* (2) cmd ::= SHOW TOPICS */
+ { 195, -2 }, /* (3) cmd ::= SHOW FUNCTIONS */
+ { 195, -2 }, /* (4) cmd ::= SHOW MNODES */
+ { 195, -2 }, /* (5) cmd ::= SHOW DNODES */
+ { 195, -2 }, /* (6) cmd ::= SHOW ACCOUNTS */
+ { 195, -2 }, /* (7) cmd ::= SHOW USERS */
+ { 195, -2 }, /* (8) cmd ::= SHOW MODULES */
+ { 195, -2 }, /* (9) cmd ::= SHOW QUERIES */
+ { 195, -2 }, /* (10) cmd ::= SHOW CONNECTIONS */
+ { 195, -2 }, /* (11) cmd ::= SHOW STREAMS */
+ { 195, -2 }, /* (12) cmd ::= SHOW VARIABLES */
+ { 195, -2 }, /* (13) cmd ::= SHOW SCORES */
+ { 195, -2 }, /* (14) cmd ::= SHOW GRANTS */
+ { 195, -2 }, /* (15) cmd ::= SHOW VNODES */
+ { 195, -3 }, /* (16) cmd ::= SHOW VNODES IPTOKEN */
+ { 196, 0 }, /* (17) dbPrefix ::= */
+ { 196, -2 }, /* (18) dbPrefix ::= ids DOT */
+ { 198, 0 }, /* (19) cpxName ::= */
+ { 198, -2 }, /* (20) cpxName ::= DOT ids */
+ { 195, -5 }, /* (21) cmd ::= SHOW CREATE TABLE ids cpxName */
+ { 195, -5 }, /* (22) cmd ::= SHOW CREATE STABLE ids cpxName */
+ { 195, -4 }, /* (23) cmd ::= SHOW CREATE DATABASE ids */
+ { 195, -3 }, /* (24) cmd ::= SHOW dbPrefix TABLES */
+ { 195, -5 }, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE ids */
+ { 195, -3 }, /* (26) cmd ::= SHOW dbPrefix STABLES */
+ { 195, -5 }, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE ids */
+ { 195, -3 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS */
+ { 195, -4 }, /* (29) cmd ::= SHOW dbPrefix VGROUPS ids */
+ { 195, -5 }, /* (30) cmd ::= DROP TABLE ifexists ids cpxName */
+ { 195, -5 }, /* (31) cmd ::= DROP STABLE ifexists ids cpxName */
+ { 195, -4 }, /* (32) cmd ::= DROP DATABASE ifexists ids */
+ { 195, -4 }, /* (33) cmd ::= DROP TOPIC ifexists ids */
+ { 195, -3 }, /* (34) cmd ::= DROP FUNCTION ids */
+ { 195, -3 }, /* (35) cmd ::= DROP DNODE ids */
+ { 195, -3 }, /* (36) cmd ::= DROP USER ids */
+ { 195, -3 }, /* (37) cmd ::= DROP ACCOUNT ids */
+ { 195, -2 }, /* (38) cmd ::= USE ids */
+ { 195, -3 }, /* (39) cmd ::= DESCRIBE ids cpxName */
+ { 195, -5 }, /* (40) cmd ::= ALTER USER ids PASS ids */
+ { 195, -5 }, /* (41) cmd ::= ALTER USER ids PRIVILEGE ids */
+ { 195, -4 }, /* (42) cmd ::= ALTER DNODE ids ids */
+ { 195, -5 }, /* (43) cmd ::= ALTER DNODE ids ids ids */
+ { 195, -3 }, /* (44) cmd ::= ALTER LOCAL ids */
+ { 195, -4 }, /* (45) cmd ::= ALTER LOCAL ids ids */
+ { 195, -4 }, /* (46) cmd ::= ALTER DATABASE ids alter_db_optr */
+ { 195, -4 }, /* (47) cmd ::= ALTER TOPIC ids alter_topic_optr */
+ { 195, -4 }, /* (48) cmd ::= ALTER ACCOUNT ids acct_optr */
+ { 195, -6 }, /* (49) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
+ { 197, -1 }, /* (50) ids ::= ID */
+ { 197, -1 }, /* (51) ids ::= STRING */
+ { 199, -2 }, /* (52) ifexists ::= IF EXISTS */
+ { 199, 0 }, /* (53) ifexists ::= */
+ { 203, -3 }, /* (54) ifnotexists ::= IF NOT EXISTS */
+ { 203, 0 }, /* (55) ifnotexists ::= */
+ { 195, -3 }, /* (56) cmd ::= CREATE DNODE ids */
+ { 195, -6 }, /* (57) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
+ { 195, -5 }, /* (58) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
+ { 195, -5 }, /* (59) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */
+ { 195, -8 }, /* (60) cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
+ { 195, -9 }, /* (61) cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
+ { 195, -5 }, /* (62) cmd ::= CREATE USER ids PASS ids */
+ { 207, 0 }, /* (63) bufsize ::= */
+ { 207, -2 }, /* (64) bufsize ::= BUFSIZE INTEGER */
+ { 208, 0 }, /* (65) pps ::= */
+ { 208, -2 }, /* (66) pps ::= PPS INTEGER */
+ { 209, 0 }, /* (67) tseries ::= */
+ { 209, -2 }, /* (68) tseries ::= TSERIES INTEGER */
+ { 210, 0 }, /* (69) dbs ::= */
+ { 210, -2 }, /* (70) dbs ::= DBS INTEGER */
+ { 211, 0 }, /* (71) streams ::= */
+ { 211, -2 }, /* (72) streams ::= STREAMS INTEGER */
+ { 212, 0 }, /* (73) storage ::= */
+ { 212, -2 }, /* (74) storage ::= STORAGE INTEGER */
+ { 213, 0 }, /* (75) qtime ::= */
+ { 213, -2 }, /* (76) qtime ::= QTIME INTEGER */
+ { 214, 0 }, /* (77) users ::= */
+ { 214, -2 }, /* (78) users ::= USERS INTEGER */
+ { 215, 0 }, /* (79) conns ::= */
+ { 215, -2 }, /* (80) conns ::= CONNS INTEGER */
+ { 216, 0 }, /* (81) state ::= */
+ { 216, -2 }, /* (82) state ::= STATE ids */
+ { 202, -9 }, /* (83) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
+ { 217, -2 }, /* (84) keep ::= KEEP tagitemlist */
+ { 219, -2 }, /* (85) cache ::= CACHE INTEGER */
+ { 220, -2 }, /* (86) replica ::= REPLICA INTEGER */
+ { 221, -2 }, /* (87) quorum ::= QUORUM INTEGER */
+ { 222, -2 }, /* (88) days ::= DAYS INTEGER */
+ { 223, -2 }, /* (89) minrows ::= MINROWS INTEGER */
+ { 224, -2 }, /* (90) maxrows ::= MAXROWS INTEGER */
+ { 225, -2 }, /* (91) blocks ::= BLOCKS INTEGER */
+ { 226, -2 }, /* (92) ctime ::= CTIME INTEGER */
+ { 227, -2 }, /* (93) wal ::= WAL INTEGER */
+ { 228, -2 }, /* (94) fsync ::= FSYNC INTEGER */
+ { 229, -2 }, /* (95) comp ::= COMP INTEGER */
+ { 230, -2 }, /* (96) prec ::= PRECISION STRING */
+ { 231, -2 }, /* (97) update ::= UPDATE INTEGER */
+ { 232, -2 }, /* (98) cachelast ::= CACHELAST INTEGER */
+ { 233, -2 }, /* (99) partitions ::= PARTITIONS INTEGER */
+ { 204, 0 }, /* (100) db_optr ::= */
+ { 204, -2 }, /* (101) db_optr ::= db_optr cache */
+ { 204, -2 }, /* (102) db_optr ::= db_optr replica */
+ { 204, -2 }, /* (103) db_optr ::= db_optr quorum */
+ { 204, -2 }, /* (104) db_optr ::= db_optr days */
+ { 204, -2 }, /* (105) db_optr ::= db_optr minrows */
+ { 204, -2 }, /* (106) db_optr ::= db_optr maxrows */
+ { 204, -2 }, /* (107) db_optr ::= db_optr blocks */
+ { 204, -2 }, /* (108) db_optr ::= db_optr ctime */
+ { 204, -2 }, /* (109) db_optr ::= db_optr wal */
+ { 204, -2 }, /* (110) db_optr ::= db_optr fsync */
+ { 204, -2 }, /* (111) db_optr ::= db_optr comp */
+ { 204, -2 }, /* (112) db_optr ::= db_optr prec */
+ { 204, -2 }, /* (113) db_optr ::= db_optr keep */
+ { 204, -2 }, /* (114) db_optr ::= db_optr update */
+ { 204, -2 }, /* (115) db_optr ::= db_optr cachelast */
+ { 205, -1 }, /* (116) topic_optr ::= db_optr */
+ { 205, -2 }, /* (117) topic_optr ::= topic_optr partitions */
+ { 200, 0 }, /* (118) alter_db_optr ::= */
+ { 200, -2 }, /* (119) alter_db_optr ::= alter_db_optr replica */
+ { 200, -2 }, /* (120) alter_db_optr ::= alter_db_optr quorum */
+ { 200, -2 }, /* (121) alter_db_optr ::= alter_db_optr keep */
+ { 200, -2 }, /* (122) alter_db_optr ::= alter_db_optr blocks */
+ { 200, -2 }, /* (123) alter_db_optr ::= alter_db_optr comp */
+ { 200, -2 }, /* (124) alter_db_optr ::= alter_db_optr wal */
+ { 200, -2 }, /* (125) alter_db_optr ::= alter_db_optr fsync */
+ { 200, -2 }, /* (126) alter_db_optr ::= alter_db_optr update */
+ { 200, -2 }, /* (127) alter_db_optr ::= alter_db_optr cachelast */
+ { 201, -1 }, /* (128) alter_topic_optr ::= alter_db_optr */
+ { 201, -2 }, /* (129) alter_topic_optr ::= alter_topic_optr partitions */
+ { 206, -1 }, /* (130) typename ::= ids */
+ { 206, -4 }, /* (131) typename ::= ids LP signed RP */
+ { 206, -2 }, /* (132) typename ::= ids UNSIGNED */
+ { 234, -1 }, /* (133) signed ::= INTEGER */
+ { 234, -2 }, /* (134) signed ::= PLUS INTEGER */
+ { 234, -2 }, /* (135) signed ::= MINUS INTEGER */
+ { 195, -3 }, /* (136) cmd ::= CREATE TABLE create_table_args */
+ { 195, -3 }, /* (137) cmd ::= CREATE TABLE create_stable_args */
+ { 195, -3 }, /* (138) cmd ::= CREATE STABLE create_stable_args */
+ { 195, -3 }, /* (139) cmd ::= CREATE TABLE create_table_list */
+ { 237, -1 }, /* (140) create_table_list ::= create_from_stable */
+ { 237, -2 }, /* (141) create_table_list ::= create_table_list create_from_stable */
+ { 235, -6 }, /* (142) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
+ { 236, -10 }, /* (143) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
+ { 238, -10 }, /* (144) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
+ { 238, -13 }, /* (145) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
+ { 240, -3 }, /* (146) tagNamelist ::= tagNamelist COMMA ids */
+ { 240, -1 }, /* (147) tagNamelist ::= ids */
+ { 235, -5 }, /* (148) create_table_args ::= ifnotexists ids cpxName AS select */
+ { 239, -3 }, /* (149) columnlist ::= columnlist COMMA column */
+ { 239, -1 }, /* (150) columnlist ::= column */
+ { 242, -2 }, /* (151) column ::= ids typename */
+ { 218, -3 }, /* (152) tagitemlist ::= tagitemlist COMMA tagitem */
+ { 218, -1 }, /* (153) tagitemlist ::= tagitem */
+ { 243, -1 }, /* (154) tagitem ::= INTEGER */
+ { 243, -1 }, /* (155) tagitem ::= FLOAT */
+ { 243, -1 }, /* (156) tagitem ::= STRING */
+ { 243, -1 }, /* (157) tagitem ::= BOOL */
+ { 243, -1 }, /* (158) tagitem ::= NULL */
+ { 243, -2 }, /* (159) tagitem ::= MINUS INTEGER */
+ { 243, -2 }, /* (160) tagitem ::= MINUS FLOAT */
+ { 243, -2 }, /* (161) tagitem ::= PLUS INTEGER */
+ { 243, -2 }, /* (162) tagitem ::= PLUS FLOAT */
+ { 241, -14 }, /* (163) 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 */
+ { 241, -3 }, /* (164) select ::= LP select RP */
+ { 257, -1 }, /* (165) union ::= select */
+ { 257, -4 }, /* (166) union ::= union UNION ALL select */
+ { 195, -1 }, /* (167) cmd ::= union */
+ { 241, -2 }, /* (168) select ::= SELECT selcollist */
+ { 258, -2 }, /* (169) sclp ::= selcollist COMMA */
+ { 258, 0 }, /* (170) sclp ::= */
+ { 244, -4 }, /* (171) selcollist ::= sclp distinct expr as */
+ { 244, -2 }, /* (172) selcollist ::= sclp STAR */
+ { 261, -2 }, /* (173) as ::= AS ids */
+ { 261, -1 }, /* (174) as ::= ids */
+ { 261, 0 }, /* (175) as ::= */
+ { 259, -1 }, /* (176) distinct ::= DISTINCT */
+ { 259, 0 }, /* (177) distinct ::= */
+ { 245, -2 }, /* (178) from ::= FROM tablelist */
+ { 245, -2 }, /* (179) from ::= FROM sub */
+ { 263, -3 }, /* (180) sub ::= LP union RP */
+ { 263, -4 }, /* (181) sub ::= LP union RP ids */
+ { 263, -6 }, /* (182) sub ::= sub COMMA LP union RP ids */
+ { 262, -2 }, /* (183) tablelist ::= ids cpxName */
+ { 262, -3 }, /* (184) tablelist ::= ids cpxName ids */
+ { 262, -4 }, /* (185) tablelist ::= tablelist COMMA ids cpxName */
+ { 262, -5 }, /* (186) tablelist ::= tablelist COMMA ids cpxName ids */
+ { 264, -1 }, /* (187) tmvar ::= VARIABLE */
+ { 247, -4 }, /* (188) interval_opt ::= INTERVAL LP tmvar RP */
+ { 247, -6 }, /* (189) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
+ { 247, 0 }, /* (190) interval_opt ::= */
+ { 248, 0 }, /* (191) session_option ::= */
+ { 248, -7 }, /* (192) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
+ { 249, 0 }, /* (193) windowstate_option ::= */
+ { 249, -4 }, /* (194) windowstate_option ::= STATE_WINDOW LP ids RP */
+ { 250, 0 }, /* (195) fill_opt ::= */
+ { 250, -6 }, /* (196) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
+ { 250, -4 }, /* (197) fill_opt ::= FILL LP ID RP */
+ { 251, -4 }, /* (198) sliding_opt ::= SLIDING LP tmvar RP */
+ { 251, 0 }, /* (199) sliding_opt ::= */
+ { 253, 0 }, /* (200) orderby_opt ::= */
+ { 253, -3 }, /* (201) orderby_opt ::= ORDER BY sortlist */
+ { 265, -4 }, /* (202) sortlist ::= sortlist COMMA item sortorder */
+ { 265, -2 }, /* (203) sortlist ::= item sortorder */
+ { 267, -2 }, /* (204) item ::= ids cpxName */
+ { 268, -1 }, /* (205) sortorder ::= ASC */
+ { 268, -1 }, /* (206) sortorder ::= DESC */
+ { 268, 0 }, /* (207) sortorder ::= */
+ { 252, 0 }, /* (208) groupby_opt ::= */
+ { 252, -3 }, /* (209) groupby_opt ::= GROUP BY grouplist */
+ { 269, -3 }, /* (210) grouplist ::= grouplist COMMA item */
+ { 269, -1 }, /* (211) grouplist ::= item */
+ { 254, 0 }, /* (212) having_opt ::= */
+ { 254, -2 }, /* (213) having_opt ::= HAVING expr */
+ { 256, 0 }, /* (214) limit_opt ::= */
+ { 256, -2 }, /* (215) limit_opt ::= LIMIT signed */
+ { 256, -4 }, /* (216) limit_opt ::= LIMIT signed OFFSET signed */
+ { 256, -4 }, /* (217) limit_opt ::= LIMIT signed COMMA signed */
+ { 255, 0 }, /* (218) slimit_opt ::= */
+ { 255, -2 }, /* (219) slimit_opt ::= SLIMIT signed */
+ { 255, -4 }, /* (220) slimit_opt ::= SLIMIT signed SOFFSET signed */
+ { 255, -4 }, /* (221) slimit_opt ::= SLIMIT signed COMMA signed */
+ { 246, 0 }, /* (222) where_opt ::= */
+ { 246, -2 }, /* (223) where_opt ::= WHERE expr */
+ { 260, -3 }, /* (224) expr ::= LP expr RP */
+ { 260, -1 }, /* (225) expr ::= ID */
+ { 260, -3 }, /* (226) expr ::= ID DOT ID */
+ { 260, -3 }, /* (227) expr ::= ID DOT STAR */
+ { 260, -1 }, /* (228) expr ::= INTEGER */
+ { 260, -2 }, /* (229) expr ::= MINUS INTEGER */
+ { 260, -2 }, /* (230) expr ::= PLUS INTEGER */
+ { 260, -1 }, /* (231) expr ::= FLOAT */
+ { 260, -2 }, /* (232) expr ::= MINUS FLOAT */
+ { 260, -2 }, /* (233) expr ::= PLUS FLOAT */
+ { 260, -1 }, /* (234) expr ::= STRING */
+ { 260, -1 }, /* (235) expr ::= NOW */
+ { 260, -1 }, /* (236) expr ::= VARIABLE */
+ { 260, -2 }, /* (237) expr ::= PLUS VARIABLE */
+ { 260, -2 }, /* (238) expr ::= MINUS VARIABLE */
+ { 260, -1 }, /* (239) expr ::= BOOL */
+ { 260, -1 }, /* (240) expr ::= NULL */
+ { 260, -4 }, /* (241) expr ::= ID LP exprlist RP */
+ { 260, -4 }, /* (242) expr ::= ID LP STAR RP */
+ { 260, -3 }, /* (243) expr ::= expr IS NULL */
+ { 260, -4 }, /* (244) expr ::= expr IS NOT NULL */
+ { 260, -3 }, /* (245) expr ::= expr LT expr */
+ { 260, -3 }, /* (246) expr ::= expr GT expr */
+ { 260, -3 }, /* (247) expr ::= expr LE expr */
+ { 260, -3 }, /* (248) expr ::= expr GE expr */
+ { 260, -3 }, /* (249) expr ::= expr NE expr */
+ { 260, -3 }, /* (250) expr ::= expr EQ expr */
+ { 260, -5 }, /* (251) expr ::= expr BETWEEN expr AND expr */
+ { 260, -3 }, /* (252) expr ::= expr AND expr */
+ { 260, -3 }, /* (253) expr ::= expr OR expr */
+ { 260, -3 }, /* (254) expr ::= expr PLUS expr */
+ { 260, -3 }, /* (255) expr ::= expr MINUS expr */
+ { 260, -3 }, /* (256) expr ::= expr STAR expr */
+ { 260, -3 }, /* (257) expr ::= expr SLASH expr */
+ { 260, -3 }, /* (258) expr ::= expr REM expr */
+ { 260, -3 }, /* (259) expr ::= expr LIKE expr */
+ { 260, -5 }, /* (260) expr ::= expr IN LP exprlist RP */
+ { 270, -3 }, /* (261) exprlist ::= exprlist COMMA expritem */
+ { 270, -1 }, /* (262) exprlist ::= expritem */
+ { 271, -1 }, /* (263) expritem ::= expr */
+ { 271, 0 }, /* (264) expritem ::= */
+ { 195, -3 }, /* (265) cmd ::= RESET QUERY CACHE */
+ { 195, -3 }, /* (266) cmd ::= SYNCDB ids REPLICA */
+ { 195, -7 }, /* (267) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+ { 195, -7 }, /* (268) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+ { 195, -7 }, /* (269) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+ { 195, -7 }, /* (270) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+ { 195, -8 }, /* (271) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+ { 195, -9 }, /* (272) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+ { 195, -7 }, /* (273) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+ { 195, -7 }, /* (274) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+ { 195, -7 }, /* (275) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+ { 195, -7 }, /* (276) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+ { 195, -8 }, /* (277) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+ { 195, -3 }, /* (278) cmd ::= KILL CONNECTION INTEGER */
+ { 195, -5 }, /* (279) cmd ::= KILL STREAM INTEGER COLON INTEGER */
+ { 195, -5 }, /* (280) cmd ::= KILL QUERY INTEGER COLON INTEGER */
};
static void yy_accept(yyParser*); /* Forward Declaration */
@@ -2326,13 +2336,13 @@ static void yy_reduce(
break;
case 46: /* cmd ::= ALTER DATABASE ids alter_db_optr */
case 47: /* cmd ::= ALTER TOPIC ids alter_topic_optr */ yytestcase(yyruleno==47);
-{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy382, &t);}
+{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy254, &t);}
break;
case 48: /* cmd ::= ALTER ACCOUNT ids acct_optr */
-{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy151);}
+{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy171);}
break;
case 49: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
-{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy151);}
+{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy171);}
break;
case 50: /* ids ::= ID */
case 51: /* ids ::= STRING */ yytestcase(yyruleno==51);
@@ -2354,17 +2364,17 @@ static void yy_reduce(
{ setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);}
break;
case 57: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
-{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy151);}
+{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy171);}
break;
case 58: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */
case 59: /* cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ yytestcase(yyruleno==59);
-{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy382, &yymsp[-2].minor.yy0);}
+{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy254, &yymsp[-2].minor.yy0);}
break;
case 60: /* cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
-{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy343, &yymsp[0].minor.yy0, 1);}
+{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy471, &yymsp[0].minor.yy0, 1);}
break;
case 61: /* cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
-{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy343, &yymsp[0].minor.yy0, 2);}
+{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy471, &yymsp[0].minor.yy0, 2);}
break;
case 62: /* cmd ::= CREATE USER ids PASS ids */
{ setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}
@@ -2395,20 +2405,20 @@ static void yy_reduce(
break;
case 83: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */
{
- yylhsminor.yy151.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
- yylhsminor.yy151.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
- yylhsminor.yy151.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
- yylhsminor.yy151.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
- yylhsminor.yy151.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
- yylhsminor.yy151.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
- yylhsminor.yy151.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
- yylhsminor.yy151.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
- yylhsminor.yy151.stat = yymsp[0].minor.yy0;
-}
- yymsp[-8].minor.yy151 = yylhsminor.yy151;
+ yylhsminor.yy171.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
+ yylhsminor.yy171.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
+ yylhsminor.yy171.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
+ yylhsminor.yy171.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
+ yylhsminor.yy171.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
+ yylhsminor.yy171.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
+ yylhsminor.yy171.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
+ yylhsminor.yy171.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
+ yylhsminor.yy171.stat = yymsp[0].minor.yy0;
+}
+ yymsp[-8].minor.yy171 = yylhsminor.yy171;
break;
case 84: /* keep ::= KEEP tagitemlist */
-{ yymsp[-1].minor.yy441 = yymsp[0].minor.yy441; }
+{ yymsp[-1].minor.yy413 = yymsp[0].minor.yy413; }
break;
case 85: /* cache ::= CACHE INTEGER */
case 86: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==86);
@@ -2428,234 +2438,234 @@ static void yy_reduce(
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
break;
case 100: /* db_optr ::= */
-{setDefaultCreateDbOption(&yymsp[1].minor.yy382); yymsp[1].minor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;}
+{setDefaultCreateDbOption(&yymsp[1].minor.yy254); yymsp[1].minor.yy254.dbType = TSDB_DB_TYPE_DEFAULT;}
break;
case 101: /* db_optr ::= db_optr cache */
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 102: /* db_optr ::= db_optr replica */
case 119: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==119);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 103: /* db_optr ::= db_optr quorum */
case 120: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==120);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 104: /* db_optr ::= db_optr days */
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 105: /* db_optr ::= db_optr minrows */
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 106: /* db_optr ::= db_optr maxrows */
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 107: /* db_optr ::= db_optr blocks */
case 122: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==122);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 108: /* db_optr ::= db_optr ctime */
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 109: /* db_optr ::= db_optr wal */
case 124: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==124);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 110: /* db_optr ::= db_optr fsync */
case 125: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==125);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 111: /* db_optr ::= db_optr comp */
case 123: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==123);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 112: /* db_optr ::= db_optr prec */
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.precision = yymsp[0].minor.yy0; }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.precision = yymsp[0].minor.yy0; }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 113: /* db_optr ::= db_optr keep */
case 121: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==121);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.keep = yymsp[0].minor.yy441; }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.keep = yymsp[0].minor.yy413; }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 114: /* db_optr ::= db_optr update */
case 126: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==126);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 115: /* db_optr ::= db_optr cachelast */
case 127: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==127);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 116: /* topic_optr ::= db_optr */
case 128: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==128);
-{ yylhsminor.yy382 = yymsp[0].minor.yy382; yylhsminor.yy382.dbType = TSDB_DB_TYPE_TOPIC; }
- yymsp[0].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[0].minor.yy254; yylhsminor.yy254.dbType = TSDB_DB_TYPE_TOPIC; }
+ yymsp[0].minor.yy254 = yylhsminor.yy254;
break;
case 117: /* topic_optr ::= topic_optr partitions */
case 129: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==129);
-{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[-1].minor.yy382 = yylhsminor.yy382;
+{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[-1].minor.yy254 = yylhsminor.yy254;
break;
case 118: /* alter_db_optr ::= */
-{ setDefaultCreateDbOption(&yymsp[1].minor.yy382); yymsp[1].minor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;}
+{ setDefaultCreateDbOption(&yymsp[1].minor.yy254); yymsp[1].minor.yy254.dbType = TSDB_DB_TYPE_DEFAULT;}
break;
case 130: /* typename ::= ids */
{
yymsp[0].minor.yy0.type = 0;
- tSetColumnType (&yylhsminor.yy343, &yymsp[0].minor.yy0);
+ tSetColumnType (&yylhsminor.yy471, &yymsp[0].minor.yy0);
}
- yymsp[0].minor.yy343 = yylhsminor.yy343;
+ yymsp[0].minor.yy471 = yylhsminor.yy471;
break;
case 131: /* typename ::= ids LP signed RP */
{
- if (yymsp[-1].minor.yy369 <= 0) {
+ if (yymsp[-1].minor.yy157 <= 0) {
yymsp[-3].minor.yy0.type = 0;
- tSetColumnType(&yylhsminor.yy343, &yymsp[-3].minor.yy0);
+ tSetColumnType(&yylhsminor.yy471, &yymsp[-3].minor.yy0);
} else {
- yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy369; // negative value of name length
- tSetColumnType(&yylhsminor.yy343, &yymsp[-3].minor.yy0);
+ yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy157; // negative value of name length
+ tSetColumnType(&yylhsminor.yy471, &yymsp[-3].minor.yy0);
}
}
- yymsp[-3].minor.yy343 = yylhsminor.yy343;
+ yymsp[-3].minor.yy471 = yylhsminor.yy471;
break;
case 132: /* typename ::= ids UNSIGNED */
{
yymsp[-1].minor.yy0.type = 0;
yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z);
- tSetColumnType (&yylhsminor.yy343, &yymsp[-1].minor.yy0);
+ tSetColumnType (&yylhsminor.yy471, &yymsp[-1].minor.yy0);
}
- yymsp[-1].minor.yy343 = yylhsminor.yy343;
+ yymsp[-1].minor.yy471 = yylhsminor.yy471;
break;
case 133: /* signed ::= INTEGER */
-{ yylhsminor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
- yymsp[0].minor.yy369 = yylhsminor.yy369;
+{ yylhsminor.yy157 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+ yymsp[0].minor.yy157 = yylhsminor.yy157;
break;
case 134: /* signed ::= PLUS INTEGER */
-{ yymsp[-1].minor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+{ yymsp[-1].minor.yy157 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
break;
case 135: /* signed ::= MINUS INTEGER */
-{ yymsp[-1].minor.yy369 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
+{ yymsp[-1].minor.yy157 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
break;
case 139: /* cmd ::= CREATE TABLE create_table_list */
-{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy182;}
+{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy438;}
break;
case 140: /* create_table_list ::= create_from_stable */
{
SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql));
pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo));
- taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy456);
+ taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy544);
pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE;
- yylhsminor.yy182 = pCreateTable;
+ yylhsminor.yy438 = pCreateTable;
}
- yymsp[0].minor.yy182 = yylhsminor.yy182;
+ yymsp[0].minor.yy438 = yylhsminor.yy438;
break;
case 141: /* create_table_list ::= create_table_list create_from_stable */
{
- taosArrayPush(yymsp[-1].minor.yy182->childTableInfo, &yymsp[0].minor.yy456);
- yylhsminor.yy182 = yymsp[-1].minor.yy182;
+ taosArrayPush(yymsp[-1].minor.yy438->childTableInfo, &yymsp[0].minor.yy544);
+ yylhsminor.yy438 = yymsp[-1].minor.yy438;
}
- yymsp[-1].minor.yy182 = yylhsminor.yy182;
+ yymsp[-1].minor.yy438 = yylhsminor.yy438;
break;
case 142: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
{
- yylhsminor.yy182 = tSetCreateTableInfo(yymsp[-1].minor.yy441, NULL, NULL, TSQL_CREATE_TABLE);
- setSqlInfo(pInfo, yylhsminor.yy182, NULL, TSDB_SQL_CREATE_TABLE);
+ yylhsminor.yy438 = tSetCreateTableInfo(yymsp[-1].minor.yy413, NULL, NULL, TSQL_CREATE_TABLE);
+ setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE);
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
setCreatedTableName(pInfo, &yymsp[-4].minor.yy0, &yymsp[-5].minor.yy0);
}
- yymsp[-5].minor.yy182 = yylhsminor.yy182;
+ yymsp[-5].minor.yy438 = yylhsminor.yy438;
break;
case 143: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
{
- yylhsminor.yy182 = tSetCreateTableInfo(yymsp[-5].minor.yy441, yymsp[-1].minor.yy441, NULL, TSQL_CREATE_STABLE);
- setSqlInfo(pInfo, yylhsminor.yy182, NULL, TSDB_SQL_CREATE_TABLE);
+ yylhsminor.yy438 = tSetCreateTableInfo(yymsp[-5].minor.yy413, yymsp[-1].minor.yy413, NULL, TSQL_CREATE_STABLE);
+ setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE);
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
setCreatedTableName(pInfo, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
}
- yymsp[-9].minor.yy182 = yylhsminor.yy182;
+ yymsp[-9].minor.yy438 = yylhsminor.yy438;
break;
case 144: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
- yylhsminor.yy456 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy441, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
+ yylhsminor.yy544 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy413, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
}
- yymsp[-9].minor.yy456 = yylhsminor.yy456;
+ yymsp[-9].minor.yy544 = yylhsminor.yy544;
break;
case 145: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */
{
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n;
- yylhsminor.yy456 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy441, yymsp[-1].minor.yy441, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0);
+ yylhsminor.yy544 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy413, yymsp[-1].minor.yy413, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0);
}
- yymsp[-12].minor.yy456 = yylhsminor.yy456;
+ yymsp[-12].minor.yy544 = yylhsminor.yy544;
break;
case 146: /* tagNamelist ::= tagNamelist COMMA ids */
-{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy0); yylhsminor.yy441 = yymsp[-2].minor.yy441; }
- yymsp[-2].minor.yy441 = yylhsminor.yy441;
+{taosArrayPush(yymsp[-2].minor.yy413, &yymsp[0].minor.yy0); yylhsminor.yy413 = yymsp[-2].minor.yy413; }
+ yymsp[-2].minor.yy413 = yylhsminor.yy413;
break;
case 147: /* tagNamelist ::= ids */
-{yylhsminor.yy441 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy441, &yymsp[0].minor.yy0);}
- yymsp[0].minor.yy441 = yylhsminor.yy441;
+{yylhsminor.yy413 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy413, &yymsp[0].minor.yy0);}
+ yymsp[0].minor.yy413 = yylhsminor.yy413;
break;
case 148: /* create_table_args ::= ifnotexists ids cpxName AS select */
{
- yylhsminor.yy182 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy236, TSQL_CREATE_STREAM);
- setSqlInfo(pInfo, yylhsminor.yy182, NULL, TSDB_SQL_CREATE_TABLE);
+ yylhsminor.yy438 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy24, TSQL_CREATE_STREAM);
+ setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE);
yymsp[-3].minor.yy0.n += yymsp[-2].minor.yy0.n;
setCreatedTableName(pInfo, &yymsp[-3].minor.yy0, &yymsp[-4].minor.yy0);
}
- yymsp[-4].minor.yy182 = yylhsminor.yy182;
+ yymsp[-4].minor.yy438 = yylhsminor.yy438;
break;
case 149: /* columnlist ::= columnlist COMMA column */
-{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy343); yylhsminor.yy441 = yymsp[-2].minor.yy441; }
- yymsp[-2].minor.yy441 = yylhsminor.yy441;
+{taosArrayPush(yymsp[-2].minor.yy413, &yymsp[0].minor.yy471); yylhsminor.yy413 = yymsp[-2].minor.yy413; }
+ yymsp[-2].minor.yy413 = yylhsminor.yy413;
break;
case 150: /* columnlist ::= column */
-{yylhsminor.yy441 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy441, &yymsp[0].minor.yy343);}
- yymsp[0].minor.yy441 = yylhsminor.yy441;
+{yylhsminor.yy413 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy413, &yymsp[0].minor.yy471);}
+ yymsp[0].minor.yy413 = yylhsminor.yy413;
break;
case 151: /* column ::= ids typename */
{
- tSetColumnInfo(&yylhsminor.yy343, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy343);
+ tSetColumnInfo(&yylhsminor.yy471, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy471);
}
- yymsp[-1].minor.yy343 = yylhsminor.yy343;
+ yymsp[-1].minor.yy471 = yylhsminor.yy471;
break;
case 152: /* tagitemlist ::= tagitemlist COMMA tagitem */
-{ yylhsminor.yy441 = tVariantListAppend(yymsp[-2].minor.yy441, &yymsp[0].minor.yy506, -1); }
- yymsp[-2].minor.yy441 = yylhsminor.yy441;
+{ yylhsminor.yy413 = tVariantListAppend(yymsp[-2].minor.yy413, &yymsp[0].minor.yy394, -1); }
+ yymsp[-2].minor.yy413 = yylhsminor.yy413;
break;
case 153: /* tagitemlist ::= tagitem */
-{ yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); }
- yymsp[0].minor.yy441 = yylhsminor.yy441;
+{ yylhsminor.yy413 = tVariantListAppend(NULL, &yymsp[0].minor.yy394, -1); }
+ yymsp[0].minor.yy413 = yylhsminor.yy413;
break;
case 154: /* tagitem ::= INTEGER */
case 155: /* tagitem ::= FLOAT */ yytestcase(yyruleno==155);
case 156: /* tagitem ::= STRING */ yytestcase(yyruleno==156);
case 157: /* tagitem ::= BOOL */ yytestcase(yyruleno==157);
-{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0); }
- yymsp[0].minor.yy506 = yylhsminor.yy506;
+{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy394, &yymsp[0].minor.yy0); }
+ yymsp[0].minor.yy394 = yylhsminor.yy394;
break;
case 158: /* tagitem ::= NULL */
-{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0); }
- yymsp[0].minor.yy506 = yylhsminor.yy506;
+{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy394, &yymsp[0].minor.yy0); }
+ yymsp[0].minor.yy394 = yylhsminor.yy394;
break;
case 159: /* tagitem ::= MINUS INTEGER */
case 160: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==160);
@@ -2665,56 +2675,56 @@ static void yy_reduce(
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type;
toTSDBType(yymsp[-1].minor.yy0.type);
- tVariantCreate(&yylhsminor.yy506, &yymsp[-1].minor.yy0);
+ tVariantCreate(&yylhsminor.yy394, &yymsp[-1].minor.yy0);
}
- yymsp[-1].minor.yy506 = yylhsminor.yy506;
+ yymsp[-1].minor.yy394 = yylhsminor.yy394;
break;
- case 163: /* select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
+ case 163: /* 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 */
{
- yylhsminor.yy236 = tSetQuerySqlNode(&yymsp[-12].minor.yy0, yymsp[-11].minor.yy441, yymsp[-10].minor.yy244, yymsp[-9].minor.yy166, yymsp[-4].minor.yy441, yymsp[-3].minor.yy441, &yymsp[-8].minor.yy340, &yymsp[-7].minor.yy259, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy441, &yymsp[0].minor.yy414, &yymsp[-1].minor.yy414, yymsp[-2].minor.yy166);
+ yylhsminor.yy24 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy413, yymsp[-11].minor.yy292, yymsp[-10].minor.yy370, yymsp[-4].minor.yy413, yymsp[-3].minor.yy413, &yymsp[-9].minor.yy136, &yymsp[-8].minor.yy251, &yymsp[-7].minor.yy256, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy413, &yymsp[0].minor.yy262, &yymsp[-1].minor.yy262, yymsp[-2].minor.yy370);
}
- yymsp[-12].minor.yy236 = yylhsminor.yy236;
+ yymsp[-13].minor.yy24 = yylhsminor.yy24;
break;
case 164: /* select ::= LP select RP */
-{yymsp[-2].minor.yy236 = yymsp[-1].minor.yy236;}
+{yymsp[-2].minor.yy24 = yymsp[-1].minor.yy24;}
break;
case 165: /* union ::= select */
-{ yylhsminor.yy441 = setSubclause(NULL, yymsp[0].minor.yy236); }
- yymsp[0].minor.yy441 = yylhsminor.yy441;
+{ yylhsminor.yy413 = setSubclause(NULL, yymsp[0].minor.yy24); }
+ yymsp[0].minor.yy413 = yylhsminor.yy413;
break;
case 166: /* union ::= union UNION ALL select */
-{ yylhsminor.yy441 = appendSelectClause(yymsp[-3].minor.yy441, yymsp[0].minor.yy236); }
- yymsp[-3].minor.yy441 = yylhsminor.yy441;
+{ yylhsminor.yy413 = appendSelectClause(yymsp[-3].minor.yy413, yymsp[0].minor.yy24); }
+ yymsp[-3].minor.yy413 = yylhsminor.yy413;
break;
case 167: /* cmd ::= union */
-{ setSqlInfo(pInfo, yymsp[0].minor.yy441, NULL, TSDB_SQL_SELECT); }
+{ setSqlInfo(pInfo, yymsp[0].minor.yy413, NULL, TSDB_SQL_SELECT); }
break;
case 168: /* select ::= SELECT selcollist */
{
- yylhsminor.yy236 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy441, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ yylhsminor.yy24 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy413, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
}
- yymsp[-1].minor.yy236 = yylhsminor.yy236;
+ yymsp[-1].minor.yy24 = yylhsminor.yy24;
break;
case 169: /* sclp ::= selcollist COMMA */
-{yylhsminor.yy441 = yymsp[-1].minor.yy441;}
- yymsp[-1].minor.yy441 = yylhsminor.yy441;
+{yylhsminor.yy413 = yymsp[-1].minor.yy413;}
+ yymsp[-1].minor.yy413 = yylhsminor.yy413;
break;
case 170: /* sclp ::= */
- case 198: /* orderby_opt ::= */ yytestcase(yyruleno==198);
-{yymsp[1].minor.yy441 = 0;}
+ case 200: /* orderby_opt ::= */ yytestcase(yyruleno==200);
+{yymsp[1].minor.yy413 = 0;}
break;
case 171: /* selcollist ::= sclp distinct expr as */
{
- yylhsminor.yy441 = tSqlExprListAppend(yymsp[-3].minor.yy441, yymsp[-1].minor.yy166, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
+ yylhsminor.yy413 = tSqlExprListAppend(yymsp[-3].minor.yy413, yymsp[-1].minor.yy370, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
}
- yymsp[-3].minor.yy441 = yylhsminor.yy441;
+ yymsp[-3].minor.yy413 = yylhsminor.yy413;
break;
case 172: /* selcollist ::= sclp STAR */
{
tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL);
- yylhsminor.yy441 = tSqlExprListAppend(yymsp[-1].minor.yy441, pNode, 0, 0);
+ yylhsminor.yy413 = tSqlExprListAppend(yymsp[-1].minor.yy413, pNode, 0, 0);
}
- yymsp[-1].minor.yy441 = yylhsminor.yy441;
+ yymsp[-1].minor.yy413 = yylhsminor.yy413;
break;
case 173: /* as ::= AS ids */
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
@@ -2732,339 +2742,347 @@ static void yy_reduce(
break;
case 178: /* from ::= FROM tablelist */
case 179: /* from ::= FROM sub */ yytestcase(yyruleno==179);
-{yymsp[-1].minor.yy244 = yymsp[0].minor.yy244;}
+{yymsp[-1].minor.yy292 = yymsp[0].minor.yy292;}
break;
case 180: /* sub ::= LP union RP */
-{yymsp[-2].minor.yy244 = addSubqueryElem(NULL, yymsp[-1].minor.yy441, NULL);}
+{yymsp[-2].minor.yy292 = addSubqueryElem(NULL, yymsp[-1].minor.yy413, NULL);}
break;
case 181: /* sub ::= LP union RP ids */
-{yymsp[-3].minor.yy244 = addSubqueryElem(NULL, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);}
+{yymsp[-3].minor.yy292 = addSubqueryElem(NULL, yymsp[-2].minor.yy413, &yymsp[0].minor.yy0);}
break;
case 182: /* sub ::= sub COMMA LP union RP ids */
-{yylhsminor.yy244 = addSubqueryElem(yymsp[-5].minor.yy244, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);}
- yymsp[-5].minor.yy244 = yylhsminor.yy244;
+{yylhsminor.yy292 = addSubqueryElem(yymsp[-5].minor.yy292, yymsp[-2].minor.yy413, &yymsp[0].minor.yy0);}
+ yymsp[-5].minor.yy292 = yylhsminor.yy292;
break;
case 183: /* tablelist ::= ids cpxName */
{
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
- yylhsminor.yy244 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL);
+ yylhsminor.yy292 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL);
}
- yymsp[-1].minor.yy244 = yylhsminor.yy244;
+ yymsp[-1].minor.yy292 = yylhsminor.yy292;
break;
case 184: /* tablelist ::= ids cpxName ids */
{
yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
- yylhsminor.yy244 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
+ yylhsminor.yy292 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
}
- yymsp[-2].minor.yy244 = yylhsminor.yy244;
+ yymsp[-2].minor.yy292 = yylhsminor.yy292;
break;
case 185: /* tablelist ::= tablelist COMMA ids cpxName */
{
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
- yylhsminor.yy244 = setTableNameList(yymsp[-3].minor.yy244, &yymsp[-1].minor.yy0, NULL);
+ yylhsminor.yy292 = setTableNameList(yymsp[-3].minor.yy292, &yymsp[-1].minor.yy0, NULL);
}
- yymsp[-3].minor.yy244 = yylhsminor.yy244;
+ yymsp[-3].minor.yy292 = yylhsminor.yy292;
break;
case 186: /* tablelist ::= tablelist COMMA ids cpxName ids */
{
yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
- yylhsminor.yy244 = setTableNameList(yymsp[-4].minor.yy244, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
+ yylhsminor.yy292 = setTableNameList(yymsp[-4].minor.yy292, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
}
- yymsp[-4].minor.yy244 = yylhsminor.yy244;
+ yymsp[-4].minor.yy292 = yylhsminor.yy292;
break;
case 187: /* tmvar ::= VARIABLE */
{yylhsminor.yy0 = yymsp[0].minor.yy0;}
yymsp[0].minor.yy0 = yylhsminor.yy0;
break;
case 188: /* interval_opt ::= INTERVAL LP tmvar RP */
-{yymsp[-3].minor.yy340.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy340.offset.n = 0;}
+{yymsp[-3].minor.yy136.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy136.offset.n = 0;}
break;
case 189: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
-{yymsp[-5].minor.yy340.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy340.offset = yymsp[-1].minor.yy0;}
+{yymsp[-5].minor.yy136.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy136.offset = yymsp[-1].minor.yy0;}
break;
case 190: /* interval_opt ::= */
-{memset(&yymsp[1].minor.yy340, 0, sizeof(yymsp[1].minor.yy340));}
+{memset(&yymsp[1].minor.yy136, 0, sizeof(yymsp[1].minor.yy136));}
break;
case 191: /* session_option ::= */
-{yymsp[1].minor.yy259.col.n = 0; yymsp[1].minor.yy259.gap.n = 0;}
+{yymsp[1].minor.yy251.col.n = 0; yymsp[1].minor.yy251.gap.n = 0;}
break;
case 192: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
- yymsp[-6].minor.yy259.col = yymsp[-4].minor.yy0;
- yymsp[-6].minor.yy259.gap = yymsp[-1].minor.yy0;
+ yymsp[-6].minor.yy251.col = yymsp[-4].minor.yy0;
+ yymsp[-6].minor.yy251.gap = yymsp[-1].minor.yy0;
}
break;
- case 193: /* fill_opt ::= */
-{ yymsp[1].minor.yy441 = 0; }
+ case 193: /* windowstate_option ::= */
+{yymsp[1].minor.yy256.col.n = 0;}
break;
- case 194: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
+ case 194: /* windowstate_option ::= STATE_WINDOW LP ids RP */
+{
+ yymsp[-3].minor.yy256.col = yymsp[-1].minor.yy0;
+}
+ break;
+ case 195: /* fill_opt ::= */
+{ yymsp[1].minor.yy413 = 0; }
+ break;
+ case 196: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
{
tVariant A = {0};
toTSDBType(yymsp[-3].minor.yy0.type);
tVariantCreate(&A, &yymsp[-3].minor.yy0);
- tVariantListInsert(yymsp[-1].minor.yy441, &A, -1, 0);
- yymsp[-5].minor.yy441 = yymsp[-1].minor.yy441;
+ tVariantListInsert(yymsp[-1].minor.yy413, &A, -1, 0);
+ yymsp[-5].minor.yy413 = yymsp[-1].minor.yy413;
}
break;
- case 195: /* fill_opt ::= FILL LP ID RP */
+ case 197: /* fill_opt ::= FILL LP ID RP */
{
toTSDBType(yymsp[-1].minor.yy0.type);
- yymsp[-3].minor.yy441 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
+ yymsp[-3].minor.yy413 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
}
break;
- case 196: /* sliding_opt ::= SLIDING LP tmvar RP */
+ case 198: /* sliding_opt ::= SLIDING LP tmvar RP */
{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; }
break;
- case 197: /* sliding_opt ::= */
+ case 199: /* sliding_opt ::= */
{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; }
break;
- case 199: /* orderby_opt ::= ORDER BY sortlist */
-{yymsp[-2].minor.yy441 = yymsp[0].minor.yy441;}
+ case 201: /* orderby_opt ::= ORDER BY sortlist */
+{yymsp[-2].minor.yy413 = yymsp[0].minor.yy413;}
break;
- case 200: /* sortlist ::= sortlist COMMA item sortorder */
+ case 202: /* sortlist ::= sortlist COMMA item sortorder */
{
- yylhsminor.yy441 = tVariantListAppend(yymsp[-3].minor.yy441, &yymsp[-1].minor.yy506, yymsp[0].minor.yy112);
+ yylhsminor.yy413 = tVariantListAppend(yymsp[-3].minor.yy413, &yymsp[-1].minor.yy394, yymsp[0].minor.yy60);
}
- yymsp[-3].minor.yy441 = yylhsminor.yy441;
+ yymsp[-3].minor.yy413 = yylhsminor.yy413;
break;
- case 201: /* sortlist ::= item sortorder */
+ case 203: /* sortlist ::= item sortorder */
{
- yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[-1].minor.yy506, yymsp[0].minor.yy112);
+ yylhsminor.yy413 = tVariantListAppend(NULL, &yymsp[-1].minor.yy394, yymsp[0].minor.yy60);
}
- yymsp[-1].minor.yy441 = yylhsminor.yy441;
+ yymsp[-1].minor.yy413 = yylhsminor.yy413;
break;
- case 202: /* item ::= ids cpxName */
+ case 204: /* item ::= ids cpxName */
{
toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
- tVariantCreate(&yylhsminor.yy506, &yymsp[-1].minor.yy0);
+ tVariantCreate(&yylhsminor.yy394, &yymsp[-1].minor.yy0);
}
- yymsp[-1].minor.yy506 = yylhsminor.yy506;
+ yymsp[-1].minor.yy394 = yylhsminor.yy394;
break;
- case 203: /* sortorder ::= ASC */
-{ yymsp[0].minor.yy112 = TSDB_ORDER_ASC; }
+ case 205: /* sortorder ::= ASC */
+{ yymsp[0].minor.yy60 = TSDB_ORDER_ASC; }
break;
- case 204: /* sortorder ::= DESC */
-{ yymsp[0].minor.yy112 = TSDB_ORDER_DESC;}
+ case 206: /* sortorder ::= DESC */
+{ yymsp[0].minor.yy60 = TSDB_ORDER_DESC;}
break;
- case 205: /* sortorder ::= */
-{ yymsp[1].minor.yy112 = TSDB_ORDER_ASC; }
+ case 207: /* sortorder ::= */
+{ yymsp[1].minor.yy60 = TSDB_ORDER_ASC; }
break;
- case 206: /* groupby_opt ::= */
-{ yymsp[1].minor.yy441 = 0;}
+ case 208: /* groupby_opt ::= */
+{ yymsp[1].minor.yy413 = 0;}
break;
- case 207: /* groupby_opt ::= GROUP BY grouplist */
-{ yymsp[-2].minor.yy441 = yymsp[0].minor.yy441;}
+ case 209: /* groupby_opt ::= GROUP BY grouplist */
+{ yymsp[-2].minor.yy413 = yymsp[0].minor.yy413;}
break;
- case 208: /* grouplist ::= grouplist COMMA item */
+ case 210: /* grouplist ::= grouplist COMMA item */
{
- yylhsminor.yy441 = tVariantListAppend(yymsp[-2].minor.yy441, &yymsp[0].minor.yy506, -1);
+ yylhsminor.yy413 = tVariantListAppend(yymsp[-2].minor.yy413, &yymsp[0].minor.yy394, -1);
}
- yymsp[-2].minor.yy441 = yylhsminor.yy441;
+ yymsp[-2].minor.yy413 = yylhsminor.yy413;
break;
- case 209: /* grouplist ::= item */
+ case 211: /* grouplist ::= item */
{
- yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1);
+ yylhsminor.yy413 = tVariantListAppend(NULL, &yymsp[0].minor.yy394, -1);
}
- yymsp[0].minor.yy441 = yylhsminor.yy441;
+ yymsp[0].minor.yy413 = yylhsminor.yy413;
break;
- case 210: /* having_opt ::= */
- case 220: /* where_opt ::= */ yytestcase(yyruleno==220);
- case 262: /* expritem ::= */ yytestcase(yyruleno==262);
-{yymsp[1].minor.yy166 = 0;}
+ case 212: /* having_opt ::= */
+ case 222: /* where_opt ::= */ yytestcase(yyruleno==222);
+ case 264: /* expritem ::= */ yytestcase(yyruleno==264);
+{yymsp[1].minor.yy370 = 0;}
break;
- case 211: /* having_opt ::= HAVING expr */
- case 221: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==221);
-{yymsp[-1].minor.yy166 = yymsp[0].minor.yy166;}
+ case 213: /* having_opt ::= HAVING expr */
+ case 223: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==223);
+{yymsp[-1].minor.yy370 = yymsp[0].minor.yy370;}
break;
- case 212: /* limit_opt ::= */
- case 216: /* slimit_opt ::= */ yytestcase(yyruleno==216);
-{yymsp[1].minor.yy414.limit = -1; yymsp[1].minor.yy414.offset = 0;}
+ case 214: /* limit_opt ::= */
+ case 218: /* slimit_opt ::= */ yytestcase(yyruleno==218);
+{yymsp[1].minor.yy262.limit = -1; yymsp[1].minor.yy262.offset = 0;}
break;
- case 213: /* limit_opt ::= LIMIT signed */
- case 217: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==217);
-{yymsp[-1].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-1].minor.yy414.offset = 0;}
+ case 215: /* limit_opt ::= LIMIT signed */
+ case 219: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==219);
+{yymsp[-1].minor.yy262.limit = yymsp[0].minor.yy157; yymsp[-1].minor.yy262.offset = 0;}
break;
- case 214: /* limit_opt ::= LIMIT signed OFFSET signed */
-{ yymsp[-3].minor.yy414.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[0].minor.yy369;}
+ case 216: /* limit_opt ::= LIMIT signed OFFSET signed */
+{ yymsp[-3].minor.yy262.limit = yymsp[-2].minor.yy157; yymsp[-3].minor.yy262.offset = yymsp[0].minor.yy157;}
break;
- case 215: /* limit_opt ::= LIMIT signed COMMA signed */
-{ yymsp[-3].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[-2].minor.yy369;}
+ case 217: /* limit_opt ::= LIMIT signed COMMA signed */
+{ yymsp[-3].minor.yy262.limit = yymsp[0].minor.yy157; yymsp[-3].minor.yy262.offset = yymsp[-2].minor.yy157;}
break;
- case 218: /* slimit_opt ::= SLIMIT signed SOFFSET signed */
-{yymsp[-3].minor.yy414.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[0].minor.yy369;}
+ case 220: /* slimit_opt ::= SLIMIT signed SOFFSET signed */
+{yymsp[-3].minor.yy262.limit = yymsp[-2].minor.yy157; yymsp[-3].minor.yy262.offset = yymsp[0].minor.yy157;}
break;
- case 219: /* slimit_opt ::= SLIMIT signed COMMA signed */
-{yymsp[-3].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[-2].minor.yy369;}
+ case 221: /* slimit_opt ::= SLIMIT signed COMMA signed */
+{yymsp[-3].minor.yy262.limit = yymsp[0].minor.yy157; yymsp[-3].minor.yy262.offset = yymsp[-2].minor.yy157;}
break;
- case 222: /* expr ::= LP expr RP */
-{yylhsminor.yy166 = yymsp[-1].minor.yy166; yylhsminor.yy166->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy166->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 224: /* expr ::= LP expr RP */
+{yylhsminor.yy370 = yymsp[-1].minor.yy370; yylhsminor.yy370->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy370->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 223: /* expr ::= ID */
-{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);}
- yymsp[0].minor.yy166 = yylhsminor.yy166;
+ case 225: /* expr ::= ID */
+{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);}
+ yymsp[0].minor.yy370 = yylhsminor.yy370;
break;
- case 224: /* expr ::= ID DOT ID */
-{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 226: /* expr ::= ID DOT ID */
+{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 225: /* expr ::= ID DOT STAR */
-{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 227: /* expr ::= ID DOT STAR */
+{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 226: /* expr ::= INTEGER */
-{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);}
- yymsp[0].minor.yy166 = yylhsminor.yy166;
+ case 228: /* expr ::= INTEGER */
+{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);}
+ yymsp[0].minor.yy370 = yylhsminor.yy370;
break;
- case 227: /* expr ::= MINUS INTEGER */
- case 228: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==228);
-{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);}
- yymsp[-1].minor.yy166 = yylhsminor.yy166;
+ case 229: /* expr ::= MINUS INTEGER */
+ case 230: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==230);
+{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);}
+ yymsp[-1].minor.yy370 = yylhsminor.yy370;
break;
- case 229: /* expr ::= FLOAT */
-{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);}
- yymsp[0].minor.yy166 = yylhsminor.yy166;
+ case 231: /* expr ::= FLOAT */
+{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);}
+ yymsp[0].minor.yy370 = yylhsminor.yy370;
break;
- case 230: /* expr ::= MINUS FLOAT */
- case 231: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==231);
-{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);}
- yymsp[-1].minor.yy166 = yylhsminor.yy166;
+ case 232: /* expr ::= MINUS FLOAT */
+ case 233: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==233);
+{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);}
+ yymsp[-1].minor.yy370 = yylhsminor.yy370;
break;
- case 232: /* expr ::= STRING */
-{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);}
- yymsp[0].minor.yy166 = yylhsminor.yy166;
+ case 234: /* expr ::= STRING */
+{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);}
+ yymsp[0].minor.yy370 = yylhsminor.yy370;
break;
- case 233: /* expr ::= NOW */
-{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); }
- yymsp[0].minor.yy166 = yylhsminor.yy166;
+ case 235: /* expr ::= NOW */
+{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); }
+ yymsp[0].minor.yy370 = yylhsminor.yy370;
break;
- case 234: /* expr ::= VARIABLE */
-{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);}
- yymsp[0].minor.yy166 = yylhsminor.yy166;
+ case 236: /* expr ::= VARIABLE */
+{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);}
+ yymsp[0].minor.yy370 = yylhsminor.yy370;
break;
- case 235: /* expr ::= PLUS VARIABLE */
- case 236: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==236);
-{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);}
- yymsp[-1].minor.yy166 = yylhsminor.yy166;
+ case 237: /* expr ::= PLUS VARIABLE */
+ case 238: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==238);
+{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);}
+ yymsp[-1].minor.yy370 = yylhsminor.yy370;
break;
- case 237: /* expr ::= BOOL */
-{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);}
- yymsp[0].minor.yy166 = yylhsminor.yy166;
+ case 239: /* expr ::= BOOL */
+{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);}
+ yymsp[0].minor.yy370 = yylhsminor.yy370;
break;
- case 238: /* expr ::= NULL */
-{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);}
- yymsp[0].minor.yy166 = yylhsminor.yy166;
+ case 240: /* expr ::= NULL */
+{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);}
+ yymsp[0].minor.yy370 = yylhsminor.yy370;
break;
- case 239: /* expr ::= ID LP exprlist RP */
-{ yylhsminor.yy166 = tSqlExprCreateFunction(yymsp[-1].minor.yy441, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
- yymsp[-3].minor.yy166 = yylhsminor.yy166;
+ case 241: /* expr ::= ID LP exprlist RP */
+{ yylhsminor.yy370 = tSqlExprCreateFunction(yymsp[-1].minor.yy413, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
+ yymsp[-3].minor.yy370 = yylhsminor.yy370;
break;
- case 240: /* expr ::= ID LP STAR RP */
-{ yylhsminor.yy166 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
- yymsp[-3].minor.yy166 = yylhsminor.yy166;
+ case 242: /* expr ::= ID LP STAR RP */
+{ yylhsminor.yy370 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
+ yymsp[-3].minor.yy370 = yylhsminor.yy370;
break;
- case 241: /* expr ::= expr IS NULL */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, NULL, TK_ISNULL);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 243: /* expr ::= expr IS NULL */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, NULL, TK_ISNULL);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 242: /* expr ::= expr IS NOT NULL */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-3].minor.yy166, NULL, TK_NOTNULL);}
- yymsp[-3].minor.yy166 = yylhsminor.yy166;
+ case 244: /* expr ::= expr IS NOT NULL */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-3].minor.yy370, NULL, TK_NOTNULL);}
+ yymsp[-3].minor.yy370 = yylhsminor.yy370;
break;
- case 243: /* expr ::= expr LT expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LT);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 245: /* expr ::= expr LT expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_LT);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 244: /* expr ::= expr GT expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GT);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 246: /* expr ::= expr GT expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_GT);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 245: /* expr ::= expr LE expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LE);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 247: /* expr ::= expr LE expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_LE);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 246: /* expr ::= expr GE expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GE);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 248: /* expr ::= expr GE expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_GE);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 247: /* expr ::= expr NE expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_NE);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 249: /* expr ::= expr NE expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_NE);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 248: /* expr ::= expr EQ expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_EQ);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 250: /* expr ::= expr EQ expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_EQ);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 249: /* expr ::= expr BETWEEN expr AND expr */
-{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy166); yylhsminor.yy166 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy166, yymsp[-2].minor.yy166, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy166, TK_LE), TK_AND);}
- yymsp[-4].minor.yy166 = yylhsminor.yy166;
+ case 251: /* expr ::= expr BETWEEN expr AND expr */
+{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy370); yylhsminor.yy370 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy370, yymsp[-2].minor.yy370, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy370, TK_LE), TK_AND);}
+ yymsp[-4].minor.yy370 = yylhsminor.yy370;
break;
- case 250: /* expr ::= expr AND expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_AND);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 252: /* expr ::= expr AND expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_AND);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 251: /* expr ::= expr OR expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_OR); }
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 253: /* expr ::= expr OR expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_OR); }
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 252: /* expr ::= expr PLUS expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_PLUS); }
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 254: /* expr ::= expr PLUS expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_PLUS); }
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 253: /* expr ::= expr MINUS expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_MINUS); }
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 255: /* expr ::= expr MINUS expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_MINUS); }
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 254: /* expr ::= expr STAR expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_STAR); }
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 256: /* expr ::= expr STAR expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_STAR); }
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 255: /* expr ::= expr SLASH expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_DIVIDE);}
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 257: /* expr ::= expr SLASH expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_DIVIDE);}
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 256: /* expr ::= expr REM expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_REM); }
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 258: /* expr ::= expr REM expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_REM); }
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 257: /* expr ::= expr LIKE expr */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LIKE); }
- yymsp[-2].minor.yy166 = yylhsminor.yy166;
+ case 259: /* expr ::= expr LIKE expr */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_LIKE); }
+ yymsp[-2].minor.yy370 = yylhsminor.yy370;
break;
- case 258: /* expr ::= expr IN LP exprlist RP */
-{yylhsminor.yy166 = tSqlExprCreate(yymsp[-4].minor.yy166, (tSqlExpr*)yymsp[-1].minor.yy441, TK_IN); }
- yymsp[-4].minor.yy166 = yylhsminor.yy166;
+ case 260: /* expr ::= expr IN LP exprlist RP */
+{yylhsminor.yy370 = tSqlExprCreate(yymsp[-4].minor.yy370, (tSqlExpr*)yymsp[-1].minor.yy413, TK_IN); }
+ yymsp[-4].minor.yy370 = yylhsminor.yy370;
break;
- case 259: /* exprlist ::= exprlist COMMA expritem */
-{yylhsminor.yy441 = tSqlExprListAppend(yymsp[-2].minor.yy441,yymsp[0].minor.yy166,0, 0);}
- yymsp[-2].minor.yy441 = yylhsminor.yy441;
+ case 261: /* exprlist ::= exprlist COMMA expritem */
+{yylhsminor.yy413 = tSqlExprListAppend(yymsp[-2].minor.yy413,yymsp[0].minor.yy370,0, 0);}
+ yymsp[-2].minor.yy413 = yylhsminor.yy413;
break;
- case 260: /* exprlist ::= expritem */
-{yylhsminor.yy441 = tSqlExprListAppend(0,yymsp[0].minor.yy166,0, 0);}
- yymsp[0].minor.yy441 = yylhsminor.yy441;
+ case 262: /* exprlist ::= expritem */
+{yylhsminor.yy413 = tSqlExprListAppend(0,yymsp[0].minor.yy370,0, 0);}
+ yymsp[0].minor.yy413 = yylhsminor.yy413;
break;
- case 261: /* expritem ::= expr */
-{yylhsminor.yy166 = yymsp[0].minor.yy166;}
- yymsp[0].minor.yy166 = yylhsminor.yy166;
+ case 263: /* expritem ::= expr */
+{yylhsminor.yy370 = yymsp[0].minor.yy370;}
+ yymsp[0].minor.yy370 = yylhsminor.yy370;
break;
- case 263: /* cmd ::= RESET QUERY CACHE */
+ case 265: /* cmd ::= RESET QUERY CACHE */
{ setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
break;
- case 264: /* cmd ::= SYNCDB ids REPLICA */
+ case 266: /* cmd ::= SYNCDB ids REPLICA */
{ setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);}
break;
- case 265: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+ case 267: /* cmd ::= ALTER TABLE 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.yy441, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 266: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+ case 268: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -3075,14 +3093,14 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 267: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+ case 269: /* 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.yy441, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 268: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+ case 270: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -3093,7 +3111,7 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 269: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+ case 271: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
@@ -3107,26 +3125,26 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 270: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+ case 272: /* cmd ::= ALTER TABLE 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.yy506, -1);
+ A = tVariantListAppend(A, &yymsp[0].minor.yy394, -1);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 271: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
+ case 273: /* 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.yy441, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 272: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
+ case 274: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -3137,14 +3155,14 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 273: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
+ case 275: /* 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.yy441, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
+ SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 274: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
+ case 276: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
@@ -3155,7 +3173,7 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 275: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
+ case 277: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
@@ -3169,13 +3187,13 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
- case 276: /* cmd ::= KILL CONNECTION INTEGER */
+ case 278: /* cmd ::= KILL CONNECTION INTEGER */
{setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);}
break;
- case 277: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
+ case 279: /* 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 278: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
+ case 280: /* 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:
diff --git a/src/util/src/ttokenizer.c b/src/util/src/ttokenizer.c
index 81b65ef308deff4d0a1747e1f486d01c25ae11a7..cea94cf0f7b97ef817c13f86c55d61b14597fa56 100644
--- a/src/util/src/ttokenizer.c
+++ b/src/util/src/ttokenizer.c
@@ -141,6 +141,7 @@ static SKeyword keywordTable[] = {
{"VARIABLE", TK_VARIABLE},
{"INTERVAL", TK_INTERVAL},
{"SESSION", TK_SESSION},
+ {"STATE_WINDOW", TK_STATE_WINDOW},
{"FILL", TK_FILL},
{"SLIDING", TK_SLIDING},
{"ORDER", TK_ORDER},
diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index 2f2b9f693312b296451fea436ceb1d25a1bb81c7..0c1f651059714e6e32c3ec7e0a74ed22e05a6f3e 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -29,8 +29,8 @@ pipeline {
agent none
environment{
- WK = '/var/lib/jenkins/workspace/TDinternal'
- WKC= '/var/lib/jenkins/workspace/TDinternal/community'
+ WK = '/data/lib/jenkins/workspace/TDinternal'
+ WKC= '/data/lib/jenkins/workspace/TDinternal/community'
}
stages {
diff --git a/tests/examples/lua/OpenResty/conf/nginx.conf b/tests/examples/lua/OpenResty/conf/nginx.conf
index 2f838c21fccd99ead5641fd7eea1e55b49851fa2..960cac606a49e5964a900f815eb76e7f228078eb 100644
--- a/tests/examples/lua/OpenResty/conf/nginx.conf
+++ b/tests/examples/lua/OpenResty/conf/nginx.conf
@@ -6,9 +6,9 @@ events {
}
http {
- lua_package_path '$prefix/lua/?.lua;$prefix/rest/?.lua;/blah/?.lua;;';
+ lua_package_path '$prefix/lua/?.lua;$prefix/rest/?.lua;$prefix/rest/?/init.lua;;';
lua_package_cpath "$prefix/so/?.so;;";
- lua_code_cache off;
+ lua_code_cache on;
server {
listen 7000;
server_name restapi;
diff --git a/tests/examples/lua/OpenResty/rest/config.lua b/tests/examples/lua/OpenResty/rest/config.lua
new file mode 100644
index 0000000000000000000000000000000000000000..72a4fd8ec687430e5f3d0a798dc4fb3b2d95a942
--- /dev/null
+++ b/tests/examples/lua/OpenResty/rest/config.lua
@@ -0,0 +1,10 @@
+local config = {
+ host = "127.0.0.1",
+ port = 6030,
+ database = "",
+ user = "root",
+ password = "taosdata",
+ max_packet_size = 1024 * 1024 ,
+ connection_pool_size = 64
+}
+return config
diff --git a/tests/examples/lua/OpenResty/rest/tdpool/init.lua b/tests/examples/lua/OpenResty/rest/tdpool/init.lua
new file mode 100644
index 0000000000000000000000000000000000000000..ebf8e91756539cc8af5db38232a40bf42aeaa245
--- /dev/null
+++ b/tests/examples/lua/OpenResty/rest/tdpool/init.lua
@@ -0,0 +1,72 @@
+local _M = {}
+local driver = require "luaconnector51"
+local water_mark = 0
+local occupied = 0
+local connection_pool = {}
+
+function _M.new(o,config)
+ o = o or {}
+ o.connection_pool = connection_pool
+ o.water_mark = water_mark
+ o.occupied = occupied
+ if #connection_pool == 0 then
+
+ for i = 1, config.connection_pool_size do
+ local res = driver.connect(config)
+ if res.code ~= 0 then
+ ngx.log(ngx.ERR, "connect--- failed:"..res.error)
+ return nil
+ else
+ local object = {obj = res.conn, state = 0}
+ table.insert(o.connection_pool,i, object)
+ ngx.log(ngx.INFO, "add connection, now pool size:"..#(o.connection_pool))
+ end
+ end
+
+ end
+
+ return setmetatable(o, { __index = _M })
+end
+
+function _M:get_connection()
+
+ local connection_obj
+
+ for i = 1, #connection_pool do
+ connection_obj = connection_pool[i]
+ if connection_obj.state == 0 then
+ connection_obj.state = 1
+ occupied = occupied +1
+ if occupied > water_mark then
+ water_mark = occupied
+ end
+ return connection_obj["obj"]
+ end
+ end
+
+ ngx.log(ngx.ERR,"ALERT! NO FREE CONNECTION.")
+
+ return nil
+end
+
+function _M:get_water_mark()
+
+ return water_mark
+end
+
+function _M:release_connection(conn)
+
+ local connection_obj
+
+ for i = 1, #connection_pool do
+ connection_obj = connection_pool[i]
+
+ if connection_obj["obj"] == conn then
+ connection_obj["state"] = 0
+ occupied = occupied -1
+ return
+ end
+ end
+end
+
+return _M
diff --git a/tests/examples/lua/OpenResty/rest/test.lua b/tests/examples/lua/OpenResty/rest/test.lua
index 179950cbe7cc294cd53a538baecefda28fe30bcc..48aeef3fb4dd8c9a0dc18e8039b4b8c781760666 100644
--- a/tests/examples/lua/OpenResty/rest/test.lua
+++ b/tests/examples/lua/OpenResty/rest/test.lua
@@ -1,26 +1,11 @@
local driver = require "luaconnector51"
local cjson = require "cjson"
+local Pool = require "tdpool"
+local config = require "config"
ngx.say("start time:"..os.time())
-
-local config = {
- host = "127.0.0.1",
- port = 6030,
- database = "",
- user = "root",
- password = "taosdata",
- max_packet_size = 1024 * 1024
-}
-
-local conn
-local res = driver.connect(config)
-if res.code ~=0 then
- ngx.say("connect--- failed: "..res.error)
- return
-else
- conn = res.conn
- ngx.say("connect--- pass.")
-end
+local pool = Pool.new(Pool,config)
+local conn = pool:get_connection()
local res = driver.query(conn,"drop database if exists nginx")
if res.code ~=0 then
@@ -51,7 +36,7 @@ else
ngx.say("create table--- pass.")
end
-res = driver.query(conn,"insert into m1 values ('2019-09-01 00:00:00.001',0,'robotspace'), ('2019-09-01 00:00:00.002',1,'Hilink'),('2019-09-01 00:00:00.003',2,'Harmony')")
+res = driver.query(conn,"insert into m1 values ('2019-09-01 00:00:00.001', 0, 'robotspace'), ('2019-09-01 00:00:00.002',1,'Hilink'),('2019-09-01 00:00:00.003',2,'Harmony')")
if res.code ~=0 then
ngx.say("insert records failed: "..res.error)
return
@@ -77,7 +62,29 @@ else
end
end
-driver.close(conn)
-ngx.say("end time:"..os.time())
---ngx.log(ngx.ERR,"in test file.")
+local flag = false
+function query_callback(res)
+ if res.code ~=0 then
+ ngx.say("async_query_callback--- failed:"..res.error)
+ else
+ if(res.affected == 3) then
+ ngx.say("async_query_callback, insert records--- pass")
+ else
+ ngx.say("async_query_callback, insert records---failed: expect 3 affected records, actually affected "..res.affected)
+ end
+ end
+ flag = true
+end
+
+driver.query_a(conn,"insert into m1 values ('2019-09-01 00:00:00.001', 3, 'robotspace'),('2019-09-01 00:00:00.006', 4, 'Hilink'),('2019-09-01 00:00:00.007', 6, 'Harmony')", query_callback)
+
+while not flag do
+-- ngx.say("i am here once...")
+ ngx.sleep(0.001) -- time unit is second
+end
+
+ngx.say("pool water_mark:"..pool:get_water_mark())
+
+pool:release_connection(conn)
+ngx.say("end time:"..os.time())
diff --git a/tests/examples/lua/OpenResty/so/luaconnector51.so b/tests/examples/lua/OpenResty/so/luaconnector51.so
index 442de6e39f909e1aeb869988722b84795c048855..d8e4f00fec321ce5f48d4241176a59ee8df5d50c 100755
Binary files a/tests/examples/lua/OpenResty/so/luaconnector51.so and b/tests/examples/lua/OpenResty/so/luaconnector51.so differ
diff --git a/tests/examples/lua/build.sh b/tests/examples/lua/build.sh
index cbd47bdfd24ce210ab77a6a6259f030863dc7c5b..9d00c6842515415034ce0b5dc71d5d6af9ffc881 100755
--- a/tests/examples/lua/build.sh
+++ b/tests/examples/lua/build.sh
@@ -1,2 +1,8 @@
-gcc -std=c99 lua_connector.c -fPIC -shared -o luaconnector.so -Wall -ltaos
+lua_header_installed=`apt-cache policy liblua5.3-dev|grep Installed|grep none > /dev/null; echo $?`
+if [ "$lua_header_installed" = "0" ]; then
+ echo "If need, please input root password to install liblua5.3-dev for build the connector.."
+ sudo apt install -y liblua5.3-dev
+fi
+
+gcc -std=c99 lua_connector.c -fPIC -shared -o luaconnector.so -Wall -ltaos -I/usr/include/lua5.3
diff --git a/tests/examples/lua/lua51/lua_connector51.c b/tests/examples/lua/lua51/lua_connector51.c
index 9b932337febb204eada021ececa02bc59cf6d5db..fe2152945dc1915dca5de31458a8cbb2f007f4f2 100644
--- a/tests/examples/lua/lua51/lua_connector51.c
+++ b/tests/examples/lua/lua51/lua_connector51.c
@@ -13,6 +13,11 @@ struct cb_param{
void * stream;
};
+struct async_query_callback_param{
+ lua_State* state;
+ int callback;
+};
+
static int l_connect(lua_State *L){
TAOS * taos=NULL;
const char* host;
@@ -23,7 +28,7 @@ static int l_connect(lua_State *L){
luaL_checktype(L, 1, LUA_TTABLE);
- lua_getfield(L,-1,"host");
+ lua_getfield(L, 1,"host");
if (lua_isstring(L,-1)){
host = lua_tostring(L, -1);
// printf("host = %s\n", host);
@@ -178,6 +183,58 @@ static int l_query(lua_State *L){
return 1;
}
+void async_query_callback(void *param, TAOS_RES *result, int code){
+ struct async_query_callback_param* p = (struct async_query_callback_param*) param;
+
+ //printf("\nin c,numfields:%d\n", numFields);
+ //printf("\nin c, code:%d\n", code);
+
+ lua_State *L = p->state;
+ lua_rawgeti(L, LUA_REGISTRYINDEX, p->callback);
+ lua_newtable(L);
+ int table_index = lua_gettop(L);
+ if( code < 0){
+ printf("failed, reason:%s\n", taos_errstr(result));
+ lua_pushinteger(L, -1);
+ lua_setfield(L, table_index, "code");
+ lua_pushstring(L,"something is wrong");// taos_errstr(taos));
+ lua_setfield(L, table_index, "error");
+ }else{
+ //printf("success to async query.\n");
+ const int affectRows = taos_affected_rows(result);
+ //printf(" affect rows:%d\r\n", affectRows);
+ lua_pushinteger(L, 0);
+ lua_setfield(L, table_index, "code");
+ lua_pushinteger(L, affectRows);
+ lua_setfield(L, table_index, "affected");
+ }
+
+ lua_call(L, 1, 0);
+}
+
+static int l_async_query(lua_State *L){
+ int r = luaL_ref(L, LUA_REGISTRYINDEX);
+ TAOS * taos = (TAOS*)lua_topointer(L,1);
+ const char * sqlstr = lua_tostring(L,2);
+ // int stime = luaL_checknumber(L,3);
+
+ lua_newtable(L);
+ int table_index = lua_gettop(L);
+
+ struct async_query_callback_param *p = malloc(sizeof(struct async_query_callback_param));
+ p->state = L;
+ p->callback=r;
+ // printf("r:%d, L:%d\n",r,L);
+ taos_query_a(taos,sqlstr,async_query_callback,p);
+
+ lua_pushnumber(L, 0);
+ lua_setfield(L, table_index, "code");
+ lua_pushstring(L, "ok");
+ lua_setfield(L, table_index, "error");
+
+ return 1;
+}
+
void stream_cb(void *param, TAOS_RES *result, TAOS_ROW row){
struct cb_param* p = (struct cb_param*) param;
TAOS_FIELD *fields = taos_fetch_fields(result);
@@ -308,6 +365,7 @@ static int l_close(lua_State *L){
static const struct luaL_Reg lib[] = {
{"connect", l_connect},
{"query", l_query},
+ {"query_a",l_async_query},
{"close", l_close},
{"open_stream", l_open_stream},
{"close_stream", l_close_stream},
diff --git a/tests/examples/lua/lua_connector.c b/tests/examples/lua/lua_connector.c
index 8078ed2665bb30bb8b1d142a21182509dbc49f65..8c2ea3e9e83237fc8ed9ebce687f5131352e4d14 100644
--- a/tests/examples/lua/lua_connector.c
+++ b/tests/examples/lua/lua_connector.c
@@ -13,6 +13,11 @@ struct cb_param{
void * stream;
};
+struct async_query_callback_param{
+ lua_State* state;
+ int callback;
+};
+
static int l_connect(lua_State *L){
TAOS * taos=NULL;
const char* host;
@@ -56,6 +61,7 @@ static int l_connect(lua_State *L){
lua_settop(L,0);
taos_init();
+
lua_newtable(L);
int table_index = lua_gettop(L);
@@ -177,6 +183,58 @@ static int l_query(lua_State *L){
return 1;
}
+void async_query_callback(void *param, TAOS_RES *result, int code){
+ struct async_query_callback_param* p = (struct async_query_callback_param*) param;
+
+ //printf("\nin c,numfields:%d\n", numFields);
+ //printf("\nin c, code:%d\n", code);
+
+ lua_State *L = p->state;
+ lua_rawgeti(L, LUA_REGISTRYINDEX, p->callback);
+ lua_newtable(L);
+ int table_index = lua_gettop(L);
+ if( code < 0){
+ printf("failed, reason:%s\n", taos_errstr(result));
+ lua_pushinteger(L, -1);
+ lua_setfield(L, table_index, "code");
+ lua_pushstring(L,"something is wrong");// taos_errstr(taos));
+ lua_setfield(L, table_index, "error");
+ }else{
+ //printf("success to async query.\n");
+ const int affectRows = taos_affected_rows(result);
+ //printf(" affect rows:%d\r\n", affectRows);
+ lua_pushinteger(L, 0);
+ lua_setfield(L, table_index, "code");
+ lua_pushinteger(L, affectRows);
+ lua_setfield(L, table_index, "affected");
+ }
+
+ lua_call(L, 1, 0);
+}
+
+static int l_async_query(lua_State *L){
+ int r = luaL_ref(L, LUA_REGISTRYINDEX);
+ TAOS * taos = (TAOS*)lua_topointer(L,1);
+ const char * sqlstr = lua_tostring(L,2);
+ // int stime = luaL_checknumber(L,3);
+
+ lua_newtable(L);
+ int table_index = lua_gettop(L);
+
+ struct async_query_callback_param *p = malloc(sizeof(struct async_query_callback_param));
+ p->state = L;
+ p->callback=r;
+ // printf("r:%d, L:%d\n",r,L);
+ taos_query_a(taos,sqlstr,async_query_callback,p);
+
+ lua_pushnumber(L, 0);
+ lua_setfield(L, table_index, "code");
+ lua_pushstring(L, "ok");
+ lua_setfield(L, table_index, "error");
+
+ return 1;
+}
+
void stream_cb(void *param, TAOS_RES *result, TAOS_ROW row){
struct cb_param* p = (struct cb_param*) param;
TAOS_FIELD *fields = taos_fetch_fields(result);
@@ -307,6 +365,7 @@ static int l_close(lua_State *L){
static const struct luaL_Reg lib[] = {
{"connect", l_connect},
{"query", l_query},
+ {"query_a",l_async_query},
{"close", l_close},
{"open_stream", l_open_stream},
{"close_stream", l_close_stream},
diff --git a/tests/examples/lua/test.lua b/tests/examples/lua/test.lua
index 9f9c6934aa46d52e1578700b067193351120dbab..89c0904c6a04ecec79a95cb1f710136e93a4a00b 100644
--- a/tests/examples/lua/test.lua
+++ b/tests/examples/lua/test.lua
@@ -110,7 +110,25 @@ else
end
end
-function callback(t)
+function async_query_callback(res)
+ if res.code ~=0 then
+ print("async_query_callback--- failed:"..res.error)
+ return
+ else
+
+ if(res.affected == 3) then
+ print("async_query_callback, insert records--- pass")
+ else
+ print("async_query_callback, insert records---failed: expect 3 affected records, actually affected "..res.affected)
+ end
+
+ end
+end
+
+driver.query_a(conn,"INSERT INTO therm1 VALUES ('2019-09-01 00:00:00.005', 100),('2019-09-01 00:00:00.006', 101),('2019-09-01 00:00:00.007', 102)", async_query_callback)
+
+
+function stream_callback(t)
print("------------------------")
print("continuous query result:")
for key, value in pairs(t) do
@@ -119,7 +137,7 @@ function callback(t)
end
local stream
-res = driver.open_stream(conn,"SELECT COUNT(*) as count, AVG(degree) as avg, MAX(degree) as max, MIN(degree) as min FROM thermometer interval(2s) sliding(2s);)",0,callback)
+res = driver.open_stream(conn,"SELECT COUNT(*) as count, AVG(degree) as avg, MAX(degree) as max, MIN(degree) as min FROM thermometer interval(2s) sliding(2s);)",0, stream_callback)
if res.code ~=0 then
print("open stream--- failed:"..res.error)
return
@@ -146,4 +164,5 @@ while loop_index < 30 do
end
driver.close_stream(stream)
+
driver.close(conn)
diff --git a/tests/mas/Jenkinsfile b/tests/mas/Jenkinsfile
index b2a1a5e1167844e777909cc9688186d85b90a707..0e6e94a037d3ba1a187e6bdad2070e9dc4d4a32f 100644
--- a/tests/mas/Jenkinsfile
+++ b/tests/mas/Jenkinsfile
@@ -29,8 +29,8 @@ pipeline {
agent none
environment{
- WK = '/var/lib/jenkins/workspace/TDinternal'
- WKC= '/var/lib/jenkins/workspace/TDinternal/community'
+ WK = '/data/lib/jenkins/workspace/TDinternal'
+ WKC= '/data/lib/jenkins/workspace/TDinternal/community'
}
stages {
diff --git a/tests/pytest/connector/lua.py b/tests/pytest/connector/lua.py
new file mode 100644
index 0000000000000000000000000000000000000000..23f0602e12fe378b97ebf493dcbdb0e9a0a9a8fd
--- /dev/null
+++ b/tests/pytest/connector/lua.py
@@ -0,0 +1,73 @@
+###################################################################
+# 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 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 isLuaInstalled(self):
+ if not which('lua'):
+ tdLog.exit("Lua not found!")
+ return False
+ else:
+ return True
+
+ def run(self):
+ tdSql.prepare()
+# tdLog.info("Check if Lua installed")
+# if not self.isLuaInstalled():
+# sys.exit(1)
+
+ buildPath = self.getBuildPath()
+ if (buildPath == ""):
+ tdLog.exit("taosd not found!")
+ else:
+ tdLog.info("taosd found in %s" % buildPath)
+
+ targetPath = buildPath + "/../tests/examples/lua"
+ tdLog.info(targetPath)
+ currentPath = os.getcwd()
+ os.chdir(targetPath)
+ os.system('./build.sh')
+ os.system('lua test.lua')
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+#tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index be2cfee04b2e2405804fad8d24b77759b6f79b13..c93fbc5eb3803a22b7a8bc99fe420bab3fb3f0c2 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -334,5 +334,6 @@ 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 insert/insert_before_use_db.py
#======================p4-end===============
diff --git a/tests/pytest/import_merge/importCSV.py b/tests/pytest/import_merge/importCSV.py
index b4441949a1c8e83f15e07d76ceb49de0dc418afe..24ebffd48530e20a9a4f0cc13d4784e997ba4a75 100644
--- a/tests/pytest/import_merge/importCSV.py
+++ b/tests/pytest/import_merge/importCSV.py
@@ -82,6 +82,8 @@ class TDTestCase:
tdSql.execute("import into tbx file \'%s\'"%(self.csvfile))
tdSql.query('select * from tbx')
tdSql.checkRows(self.rows)
+ #TD-4447 import the same csv twice
+ tdSql.execute("import into tbx file \'%s\'"%(self.csvfile))
def stop(self):
self.destroyCSVFile()
diff --git a/tests/pytest/insert/insert_before_use_db.py b/tests/pytest/insert/insert_before_use_db.py
new file mode 100644
index 0000000000000000000000000000000000000000..8cc02b3d4bde3fc6465c6011ade24fd8d15818be
--- /dev/null
+++ b/tests/pytest/insert/insert_before_use_db.py
@@ -0,0 +1,39 @@
+###################################################################
+# 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.error('insert into tb values (now + 10m, 10)')
+ tdSql.prepare()
+ tdSql.error('insert into tb values (now + 10m, 10)')
+ tdSql.execute('drop database db')
+ tdSql.error('insert into tb values (now + 10m, 10)')
+
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh
index 0eb850749fbb62f3d4149f6051dfd2851ed55a88..7f7cb2a89e0b3f808a505b37360d227a9b38acc7 100755
--- a/tests/pytest/smoketest.sh
+++ b/tests/pytest/smoketest.sh
@@ -35,3 +35,5 @@ python3.8 ./test.py $1 -s && sleep 1
python3.8 ./test.py $1 -f client/client.py
python3.8 ./test.py $1 -s && sleep 1
+# connector
+python3.8 ./test.py $1 -f connector/lua.py
diff --git a/tests/script/api/stmtBatchTest.c b/tests/script/api/stmtBatchTest.c
index 8bd296db6123a4602a95c4777b7ef1322a37d7ba..24291adfa0a64349d62b59455ce0db52e36bcf4f 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,72 +3200,1278 @@ static void SpecifyColumnBatchCase(TAOS *taos) {
}
-int main(int argc, char *argv[])
-{
- TAOS *taos;
- char host[32] = "127.0.0.1";
- char* serverIp = NULL;
- int threadNum = 1;
+
+/*=======================*/
+/*
+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));
- // connect to server
- if (argc == 1) {
- serverIp = host;
- } else if (argc == 2) {
- serverIp = argv[1];
- } else if (argc == 3) {
- serverIp = argv[1];
- threadNum = atoi(argv[2]);
- } else if (argc == 4) {
- serverIp = argv[1];
- threadNum = atoi(argv[2]);
- g_runTimes = atoi(argv[3]);
+ 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;
}
- printf("server:%s, runTimes:%d\n\n", serverIp, g_runTimes);
+ 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;
-#if 0
- printf("server:%s, threadNum:%d, rows:%d\n\n", serverIp, threadNum, g_rows);
+ 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;
- pthread_t *pThreadList = (pthread_t *) calloc(sizeof(pthread_t), (size_t)threadNum);
- ThreadInfo* threadInfo = (ThreadInfo *) calloc(sizeof(ThreadInfo), (size_t)threadNum);
+ 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;
- ThreadInfo* tInfo = threadInfo;
- for (int i = 0; i < threadNum; i++) {
- taos = taos_connect(serverIp, "root", "taosdata", NULL, 0);
- if (taos == NULL) {
- printf("failed to connect to TDengine, reason:%s\n", taos_errstr(taos));
- return -1;
- }
+ 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;
- tInfo->taos = taos;
- tInfo->idx = i;
- if (0 == i) {
- //pthread_create(&(pThreadList[0]), NULL, runCase, (void *)tInfo);
- pthread_create(&(pThreadList[0]), NULL, SpecifyColumnBatchCase, (void *)tInfo);
- } else if (1 == i){
- pthread_create(&(pThreadList[0]), NULL, runCase_long, (void *)tInfo);
- }
- tInfo++;
+ i+=columnNum;
}
- for (int i = 0; i < threadNum; i++) {
- pthread_join(pThreadList[i], NULL);
+ //int64_t tts = 1591060628000;
+ for (int i = 0; i < totalRowsPerTbl * tableNum; ++i) {
+ v->ts[i] = tts + i;
}
- free(pThreadList);
- free(threadInfo);
-#endif
+ 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;
+ }
- taos = taos_connect(serverIp, "root", "taosdata", NULL, 0);
- if (taos == NULL) {
- printf("failed to connect to TDengine, reason:%s\n", taos_errstr(taos));
+
+ 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));
- runCase(taos);
- runCase_long(taos);
- SpecifyColumnBatchCase(taos);
+ 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;
+
+ // connect to server
+ if (argc == 1) {
+ serverIp = host;
+ } else if (argc == 2) {
+ serverIp = argv[1];
+ } else if (argc == 3) {
+ serverIp = argv[1];
+ //threadNum = atoi(argv[2]);
+ } else if (argc == 4) {
+ serverIp = argv[1];
+ //threadNum = atoi(argv[2]);
+ g_runTimes = atoi(argv[3]);
+ }
+
+ printf("server:%s, runTimes:%d\n\n", serverIp, g_runTimes);
+
+#if 0
+ printf("server:%s, threadNum:%d, rows:%d\n\n", serverIp, threadNum, g_rows);
+
+ pthread_t *pThreadList = (pthread_t *) calloc(sizeof(pthread_t), (size_t)threadNum);
+ ThreadInfo* threadInfo = (ThreadInfo *) calloc(sizeof(ThreadInfo), (size_t)threadNum);
+
+ ThreadInfo* tInfo = threadInfo;
+ for (int i = 0; i < threadNum; i++) {
+ taos = taos_connect(serverIp, "root", "taosdata", NULL, 0);
+ if (taos == NULL) {
+ printf("failed to connect to TDengine, reason:%s\n", taos_errstr(taos));
+ return -1;
+ }
+
+ tInfo->taos = taos;
+ tInfo->idx = i;
+ if (0 == i) {
+ //pthread_create(&(pThreadList[0]), NULL, runCase, (void *)tInfo);
+ pthread_create(&(pThreadList[0]), NULL, SpecifyColumnBatchCase, (void *)tInfo);
+ } else if (1 == i){
+ pthread_create(&(pThreadList[0]), NULL, runCase_long, (void *)tInfo);
+ }
+ tInfo++;
+ }
+
+ for (int i = 0; i < threadNum; i++) {
+ pthread_join(pThreadList[i], NULL);
+ }
+
+ free(pThreadList);
+ free(threadInfo);
+#endif
+
+ taos = taos_connect(serverIp, "root", "taosdata", NULL, 0);
+ if (taos == NULL) {
+ printf("failed to connect to TDengine, reason:%s\n", taos_errstr(taos));
+ return -1;
+ }
+
+ //runCase(taos);
+ //runCase_long(taos);
+ //SpecifyColumnBatchCase(taos);
+ SpecifyColumnBatchCase_autoCreateTbl(taos);
return 0;
}
diff --git a/tests/script/general/parser/function.sim b/tests/script/general/parser/function.sim
index 56ce15c36fbbe71753028f60a03d5cdf73a03571..ee5a750c88ede5e373c47796c1bc9d373f223e19 100644
--- a/tests/script/general/parser/function.sim
+++ b/tests/script/general/parser/function.sim
@@ -24,6 +24,9 @@ sql drop database if exists $db
sql create database $db keep 36500
sql use $db
+print =====================================> td-4481
+sql create database $db
+
print =====================================> test case for twa in single block
sql create table t1 (ts timestamp, k float);
diff --git a/tests/script/general/parser/import_file.sim b/tests/script/general/parser/import_file.sim
index a39d79af17ce55d452e5ba11cdf97535cf09897b..e9f0f1ed085cc75238681dc08b9601a8d591f6c4 100644
--- a/tests/script/general/parser/import_file.sim
+++ b/tests/script/general/parser/import_file.sim
@@ -18,6 +18,7 @@ system general/parser/gendata.sh
sql create table tbx (ts TIMESTAMP, collect_area NCHAR(12), device_id BINARY(16), imsi BINARY(16), imei BINARY(16), mdn BINARY(10), net_type BINARY(4), mno NCHAR(4), province NCHAR(10), city NCHAR(16), alarm BINARY(2))
print ====== create tables success, starting import data
+sql import into tbx file '~/data.sql'
sql import into tbx file '~/data.sql'
sql select count(*) from tbx
diff --git a/tests/script/general/parser/nestquery.sim b/tests/script/general/parser/nestquery.sim
index 9e2736833f56cb6224cc1a1b351b2171213f5f8f..3d13ff504db8e86ceaed368b237e0a834987e53e 100644
--- a/tests/script/general/parser/nestquery.sim
+++ b/tests/script/general/parser/nestquery.sim
@@ -9,7 +9,7 @@ sql connect
print ======================== dnode1 start
-$dbPrefix = nest_query
+$dbPrefix = nest_db
$tbPrefix = nest_tb
$mtPrefix = nest_mt
$tbNum = 10
@@ -17,7 +17,6 @@ $rowNum = 10000
$totalNum = $tbNum * $rowNum
print =============== nestquery.sim
-
$i = 0
$db = $dbPrefix . $i
$mt = $mtPrefix . $i
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index da91255e3f8342c3a9a4087a0addcbd1952198ed..43d414e5778964ebfd63af5c8205d9490c4f51a5 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -64,4 +64,5 @@ run general/parser/slimit_alter_tags.sim
run general/parser/udf.sim
run general/parser/udf_dll.sim
run general/parser/udf_dll_stable.sim
+run general/parser/nestquery.sim