fix conflict when merge from develop

cmake/define.inc

@@ -136,24 +136,25 @@ IF (TD_ALPINE)
   MESSAGE(STATUS "aplhine is defined")
 ENDIF ()
 
+
 IF ("${BUILD_HTTP}" STREQUAL "")
   IF (TD_LINUX)
     IF (TD_ARM_32)
-      SET(BUILD_HTTP "true")
+      SET(TD_BUILD_HTTP TRUE)
     ELSE ()
-      SET(BUILD_HTTP "false")
+      SET(TD_BUILD_HTTP TRUE)
     ENDIF ()
   ELSEIF (TD_DARWIN)
-    SET(BUILD_HTTP "false")
+    SET(TD_BUILD_HTTP TRUE)
   ELSE ()
-    SET(BUILD_HTTP "true")
+    SET(TD_BUILD_HTTP TRUE)
   ENDIF ()
-ENDIF ()
-
-IF (${BUILD_HTTP} MATCHES "true")
-  SET(TD_BUILD_HTTP TRUE)
 ELSEIF (${BUILD_HTTP} MATCHES "false")
   SET(TD_BUILD_HTTP FALSE)
+ELSEIF (${BUILD_HTTP} MATCHES "true")
+  SET(TD_BUILD_HTTP TRUE)
+ELSE ()
+  SET(TD_BUILD_HTTP TRUE)
 ENDIF ()
 
 IF (TD_BUILD_HTTP)

cmake/input.inc

@@ -96,7 +96,7 @@ IF (${BUILD_JDBC} MATCHES "false")
   SET(TD_BUILD_JDBC FALSE)
 ENDIF ()
 
-SET(TD_BUILD_HTTP FALSE)
+SET(TD_BUILD_HTTP TRUE)
 
 SET(TD_TAOS_TOOLS TRUE)
 

documentation20/cn/12.taos-sql/docs.md

@@ -834,7 +834,7 @@ UNION ALL SELECT ...
 [UNION ALL SELECT ...]
 ```
 
-TDengine 支持 UNION ALL 操作符。也就是说，如果多个 SELECT 子句返回结果集的结构完全相同（列名、列类型、列数、顺序），那么可以通过 UNION ALL 把这些结果集合并到一起。目前只支持 UNION ALL 模式，也即在结果集的合并过程中是不去重的。
+TDengine 支持 UNION ALL 操作符。也就是说，如果多个 SELECT 子句返回结果集的结构完全相同（列名、列类型、列数、顺序），那么可以通过 UNION ALL 把这些结果集合并到一起。目前只支持 UNION ALL 模式，也即在结果集的合并过程中是不去重的。在同一个sql语句中，UNION ALL 最多支持100个。
 
 ### SQL 示例 
 

documentation20/en/05.insert/docs.md

@@ -107,11 +107,10 @@ Launch an API service for blm_prometheus with the following command:
 
 Assuming that the IP address of the server where blm_prometheus located is "10.1.2. 3", the URL shall be added to the configuration file of Prometheus as:
 
+```yaml
 remote_write:
-
-\- url: "http://10.1.2.3:8088/receive"
-
-
+  - url: "http://10.1.2.3:8088/receive"
+```
 
 ### Query written data of prometheus
 

packaging/docker/Dockerfile

@@ -18,5 +18,5 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib" \
     LC_ALL=en_US.UTF-8
 
 EXPOSE 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042
-CMD ["taosd"]
-VOLUME [ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]
\ No newline at end of file
+CMD ["run_taosd.sh"]
+VOLUME [ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]

packaging/tools/install.sh

@@ -185,23 +185,25 @@ function install_bin() {
     # Remove links
     ${csudo} rm -f ${bin_link_dir}/taos     || :
     ${csudo} rm -f ${bin_link_dir}/taosd    || :
-    ${csudo} rm -f ${bin_link_dir}/taosadapter     || :
+    ${csudo} rm -f ${bin_link_dir}/taosadapter  || :
     ${csudo} rm -f ${bin_link_dir}/taosdemo || :
     ${csudo} rm -f ${bin_link_dir}/taosdump || :
     ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
-    ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
-    ${csudo} rm -f ${bin_link_dir}/set_core   || :
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator  || :
+    ${csudo} rm -f ${bin_link_dir}/set_core     || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
     [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos                      || :
     [ -x ${install_main_dir}/bin/taosd ] && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd                   || :
-    [ -x ${install_main_dir}/bin/taosadapter ] && ${csudo} ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter                      || :
+    [ -x ${install_main_dir}/bin/taosadapter ] && ${csudo} ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter || :
     [ -x ${install_main_dir}/bin/taosdemo ] && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo          || :
     [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump          || :
     [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos          || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core    || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_jh.sh

@@ -172,6 +172,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmjh        || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo} rm -f ${bin_link_dir}/set_core    || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -181,6 +182,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/jhdemo ] && ${csudo} ln -s ${install_main_dir}/bin/jhdemo ${bin_link_dir}/jhdemo            || :
     [ -x ${install_main_dir}/bin/remove_jh.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_jh.sh ${bin_link_dir}/rmjh  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_kh.sh

@@ -172,6 +172,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmkh        || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo} rm -f ${bin_link_dir}/set_core    || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -181,6 +182,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/khdemo ] && ${csudo} ln -s ${install_main_dir}/bin/khdemo ${bin_link_dir}/khdemo            || :
     [ -x ${install_main_dir}/bin/remove_kh.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_kh.sh ${bin_link_dir}/rmkh  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_power.sh

@@ -177,6 +177,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmpower   || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core   || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -186,6 +187,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/powerdemo ] && ${csudo} ln -s ${install_main_dir}/bin/powerdemo ${bin_link_dir}/powerdemo            || :
     [ -x ${install_main_dir}/bin/remove_power.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_power.sh ${bin_link_dir}/rmpower  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_pro.sh

@@ -172,6 +172,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmprodb   || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core   || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -181,6 +182,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/prodemo ] && ${csudo} ln -s ${install_main_dir}/bin/prodemo ${bin_link_dir}/prodemo            || :
     [ -x ${install_main_dir}/bin/remove_pro.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_pro.sh ${bin_link_dir}/rmprodb  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_tq.sh

@@ -177,6 +177,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmtq   || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core   || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -186,6 +187,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/tqdemo ] && ${csudo} ln -s ${install_main_dir}/bin/tqdemo ${bin_link_dir}/tqdemo            || :
     [ -x ${install_main_dir}/bin/remove_tq.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_tq.sh ${bin_link_dir}/rmtq  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/make_install.sh

@@ -165,6 +165,7 @@ function install_bin() {
     if [ "$osType" != "Darwin" ]; then
         ${csudo} rm -f ${bin_link_dir}/perfMonitor || :
         ${csudo} rm -f ${bin_link_dir}/set_core || :
+        ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
         ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
 
         ${csudo} cp -r ${binary_dir}/build/bin/* ${install_main_dir}/bin
@@ -172,6 +173,7 @@ function install_bin() {
 
         ${csudo} cp -r ${script_dir}/remove.sh     ${install_main_dir}/bin
         ${csudo} cp -r ${script_dir}/set_core.sh   ${install_main_dir}/bin
+        ${csudo} cp -r ${script_dir}/run_taosd.sh   ${install_main_dir}/bin
         ${csudo} cp -r ${script_dir}/startPre.sh   ${install_main_dir}/bin
 
         ${csudo} chmod 0555 ${install_main_dir}/bin/*
@@ -183,6 +185,7 @@ function install_bin() {
         [ -x ${install_main_dir}/bin/taosdemo ]  && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
         [ -x ${install_main_dir}/bin/perfMonitor ]  && ${csudo} ln -s ${install_main_dir}/bin/perfMonitor ${bin_link_dir}/perfMonitor || :
         [ -x ${install_main_dir}/set_core.sh ]  && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+        [ -x ${install_main_dir}/run_taosd.sh ]  && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh || :
         [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos  || :
    else
 

packaging/tools/makepkg.sh

@@ -57,6 +57,7 @@ else
       ${build_dir}/bin/tarbitrator\
       ${script_dir}/remove.sh \
       ${script_dir}/set_core.sh \
+      ${script_dir}/run_taosd.sh \
       ${script_dir}/startPre.sh \
       ${script_dir}/taosd-dump-cfg.gdb"
 
@@ -129,7 +130,7 @@ if [ -n "${taostools_bin_files}" ]; then
     if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh ]; then
         cp ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh \
             ${taostools_install_dir}/ > /dev/null \
-            && chmod a+x {taostools_install_dir}/install-taostools.sh \
+            && chmod a+x ${taostools_install_dir}/install-taostools.sh \
             || echo -e "failed to copy install-taostools.sh"
     else
         echo -e "install-taostools.sh not found"
@@ -295,7 +296,7 @@ if [ "$pagMode" == "lite" ]; then
   pkg_name=${pkg_name}-Lite
 fi
 
-tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+tar -zcv -f "$(basename ${pkg_name}).tar.gz" "$(basename ${install_dir})" --remove-files || :
 exitcode=$?
 if [ "$exitcode" != "0" ]; then
     echo "tar ${pkg_name}.tar.gz error !!!"
@@ -303,7 +304,7 @@ if [ "$exitcode" != "0" ]; then
 fi
 
 if [ -n "${taostools_bin_files}" ]; then
-    tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" $(basename ${taostools_install_dir}) --remove-files || :
+    tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || :
     exitcode=$?
     if [ "$exitcode" != "0" ]; then
         echo "tar ${taostools_pkg_name}.tar.gz error !!!"

packaging/tools/makepkg_jh.sh

@@ -56,6 +56,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/jh_taosdump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh      ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_kh.sh

@@ -56,6 +56,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/khdump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh      ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_power.sh

@@ -64,12 +64,13 @@ else
 #  bin_files="${build_dir}/bin/powerd ${build_dir}/bin/power ${build_dir}/bin/powerdemo ${build_dir}/bin/tarbitrator ${script_dir}/remove_power.sh ${script_dir}/set_core.sh"
   cp ${build_dir}/bin/taos          ${install_dir}/bin/power
   cp ${build_dir}/bin/taosd         ${install_dir}/bin/powerd
-  cp ${build_dir}/bin/taosadapter          ${install_dir}/bin/taosadapter ||:
+  cp ${build_dir}/bin/taosadapter   ${install_dir}/bin/taosadapter ||:
   cp ${script_dir}/remove_power.sh  ${install_dir}/bin
   cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/powerdemo
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/powerdump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh     ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_pro.sh

@@ -56,6 +56,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/prodump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh     ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_tq.sh

@@ -61,6 +61,7 @@ else
   cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/tqdemo
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh      ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/remove.sh

@@ -79,12 +79,13 @@ function clean_bin() {
     # Remove link
     ${csudo} rm -f ${bin_link_dir}/taos        || :
     ${csudo} rm -f ${bin_link_dir}/taosd       || :
-    ${csudo} rm -f ${bin_link_dir}/taosadapter        || :
+    ${csudo} rm -f ${bin_link_dir}/taosadapter || :
     ${csudo} rm -f ${bin_link_dir}/taosdemo    || :
     ${csudo} rm -f ${bin_link_dir}/taosdump    || :
     ${csudo} rm -f ${bin_link_dir}/rmtaos      || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo} rm -f ${bin_link_dir}/set_core    || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 }
 
 function clean_lib() {

packaging/tools/remove_jh.sh

@@ -70,10 +70,11 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/jh_taos      || :
     ${csudo} rm -f ${bin_link_dir}/jh_taosd      || :
     ${csudo} rm -f ${bin_link_dir}/jhdemo        || :
-    ${csudo} rm -f ${bin_link_dir}/jh_taosdump        || :
+    ${csudo} rm -f ${bin_link_dir}/jh_taosdump   || :
     ${csudo} rm -f ${bin_link_dir}/rmjh          || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core      || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh  || :
 }
 
 function clean_lib() {

packaging/tools/remove_kh.sh

@@ -74,6 +74,7 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmkh          || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core      || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh     || :
 }
 
 function clean_lib() {

packaging/tools/remove_power.sh

@@ -76,6 +76,7 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmpower      || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo} rm -f ${bin_link_dir}/set_core     || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 }
 
 function clean_lib() {

packaging/tools/remove_pro.sh

@@ -74,6 +74,7 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmprodb      || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo} rm -f ${bin_link_dir}/set_core     || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 }
 
 function clean_lib() {

packaging/tools/remove_tq.sh

@@ -76,6 +76,7 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmtq      || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo} rm -f ${bin_link_dir}/set_core     || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 }
 
 function clean_lib() {

packaging/tools/run_taosd.sh

+#!/bin/bash
+[[ -x /usr/bin/taosadapter ]] && /usr/bin/taosadapter &
+taosd

src/client/src/tscSQLParser.c

@@ -8231,7 +8231,8 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
   const char* msg3 = "tag value too long";
   const char* msg4 = "illegal value or data overflow";
   const char* msg5 = "tags number not matched";
-  const char* msg6 = "json type error, should be string";
+  const char* msg6 = "create table only from super table is allowed";
+  const char* msg7 = "json type error, should be string";
 
   SSqlCmd* pCmd = &pSql->cmd;
 
@@ -8279,6 +8280,10 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
       return code;
     }
 
+    if (!UTIL_TABLE_IS_SUPER_TABLE(pStableMetaInfo)) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
+    }
+
     size_t valSize = taosArrayGetSize(pValList);
 
     // too long tag values will return invalid sql, not be truncated automatically
@@ -8436,7 +8441,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
       if(pItem->pVar.nType != TSDB_DATA_TYPE_BINARY){
         tscError("json type error, should be string");
         tdDestroyKVRowBuilder(&kvRowBuilder);
-        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
       }
       if(pItem->pVar.nLen > TSDB_MAX_JSON_TAGS_LEN/TSDB_NCHAR_SIZE){
         tscError("json tag too long");

taos-tools @ 369ae007

-Subproject commit 446c03da6df8fe6675c6aba14b1d0766b56e1f08
+Subproject commit 369ae00784a3259b5f2234c25d4458aca32e961a

src/plugins/http/src/httpServer.c

@@ -409,6 +409,7 @@ static bool httpReadData(HttpContext *pContext) {
         continue;
       } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
         httpDebug("context:%p, fd:%d, read from socket error:%d, wait another event", pContext, pContext->fd, errno);
+        httpReleaseContext(pContext/*, false */);
         return false;
       } else {
         httpError("context:%p, fd:%d, read from socket error:%d, close connect", pContext, pContext->fd, errno);

src/rpc/src/rpcTcp.c

@@ -488,6 +488,12 @@ static int taosReadTcpData(SFdObj *pFdObj, SRecvInfo *pInfo) {
 
   msgLen = (int32_t)htonl((uint32_t)rpcHead.msgLen);
   int32_t size = msgLen + tsRpcOverhead;
+  // TODO: reason not found yet, workaround to avoid first
+  if (msgLen <= 0 || size < 0) {
+    tError("%s %p invalid size for malloc, msgLen:%d, size:%d", pThreadObj->label, pFdObj->thandle, msgLen, size);
+    return -1;
+  }
+
   buffer = malloc(size);
   if (NULL == buffer) {
     tError("%s %p TCP malloc(size:%d) fail", pThreadObj->label, pFdObj->thandle, msgLen);

src/sync/src/syncMain.c

@@ -1502,7 +1502,10 @@ static int32_t syncForwardToPeerImpl(SSyncNode *pNode, void *data, void *mhandle
       }
     }
 
-    int32_t retLen = taosWriteMsg(pPeer->peerFd, pSyncHead, fwdLen);
+    SOCKET peerFd = pPeer->peerFd;
+    pthread_mutex_unlock(&pNode->mutex);
+    int32_t retLen = taosWriteMsg(peerFd, pSyncHead, fwdLen);
+    pthread_mutex_lock(&pNode->mutex);
     if (retLen == fwdLen) {
       sTrace("%s, forward is sent, role:%s sstatus:%s hver:%" PRIu64 " contLen:%d", pPeer->id, syncRole[pPeer->role],
              syncStatus[pPeer->sstatus], pWalHead->version, pWalHead->len);

src/tsdb/src/tsdbMain.c

@@ -512,6 +512,7 @@ static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) {
   }
 
   // Check keep
+#if 0  // already checked and set in mnodeSetDefaultDbCfg
   if (pCfg->keep == -1) {
     pCfg->keep = TSDB_DEFAULT_KEEP;
   } else {
@@ -532,7 +533,25 @@ static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) {
   if (pCfg->keep2 == 0) {
     pCfg->keep2 = pCfg->keep;
   }
+#endif
+
+  int32_t keepMin = pCfg->keep1;
+  int32_t keepMid = pCfg->keep2;
+  int32_t keepMax = pCfg->keep;
+
+  if (keepMin > keepMid) {
+    SWAP(keepMin, keepMid, int32_t);
+  }
+  if (keepMin > keepMax) {
+    SWAP(keepMin, keepMax, int32_t);
+  }
+  if (keepMid > keepMax) {
+    SWAP(keepMid, keepMax, int32_t);
+  }
 
+  pCfg->keep = keepMax;
+  pCfg->keep1 = keepMin;
+  pCfg->keep2 = keepMid;
   // update check
   if (pCfg->update < TD_ROW_DISCARD_UPDATE || pCfg->update > TD_ROW_PARTIAL_UPDATE)
     pCfg->update = TD_ROW_DISCARD_UPDATE;

tests/develop-test/1-insert/0-sql/basic.py

@@ -18,6 +18,14 @@ from util.sql import *
 
 
 class TDTestCase:
+    def caseDescription(self):
+        '''
+        insert 倒序插入
+        语法解析错误同时meta请求也发出去了导致callback中处理逻辑失效
+        insert语句在values之间加入多个逗号
+        ''' 
+        return
+    
     def init(self, conn, logSql):
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)

tests/get_catalog.py

+#!/usr/bin/python
+###################################################################
+#           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
+#
+###################################################################
+# install pip
+# pip install src/connector/python/
+
+# -*- coding: utf-8 -*-
+import sys
+import getopt
+import os
+from fabric2 import Connection
+sys.path.append("pytest")
+import importlib
+
+class CatalogGen:
+    def __init__(self, CaseDirList, CatalogName, DirDepth):
+        self.CaseDirList = CaseDirList
+        self.CatalogName = CatalogName
+        self.blacklist = []
+        self.DirDepth = DirDepth
+
+    def CatalogGen(self):
+        for i in self.CaseDirList:
+            self.GetCatalog(i)
+            self.CollectLog(i)
+        print('Catalog Generation done')
+
+    def CollectLog(self, CaseDir):
+        DirorFiles = os.listdir(CaseDir)
+        for loop in range(self.DirDepth):
+            for i in DirorFiles:
+                fileName = os.path.join(CaseDir, i)
+                if os.path.isdir(fileName):
+                    self.CollectLog(fileName)
+                else:
+                    if i == self.CatalogName and fileName not in self.blacklist:
+                        self.blacklist.append(fileName)
+                        with open(fileName, "r") as f :
+                            Catalog = f.read()
+                        title = CaseDir.split("/")[-1]
+                        TitleLevel = CaseDir.count("/")
+                        with open(os.path.dirname(CaseDir) + '/' + self.CatalogName, "a") as f :
+                            f.write("#" * TitleLevel + ' %s\n' % title)
+                            f.write(Catalog)
+
+    def GetCatalog(self, CaseDir):
+        for root, dirs, files in os.walk(CaseDir):
+            for file in files:
+                if file.endswith(".py"):
+                    fileName = os.path.join(root, file)
+                    moduleName = fileName.replace(".py", "").replace("/", ".")
+                    uModule = importlib.import_module(moduleName)
+                    title = file.split('.')[0]
+                    TitleLevel = root.count('/') + 1
+                    try:
+                        ucase = uModule.TDTestCase()
+                        with open(root + '/' + self.CatalogName, 'a') as f:
+                            f.write('#'*TitleLevel + ' %s\n' % title)
+                            for i in ucase.caseDescription.__doc__.split('\n'):
+                                if i.lstrip() == '':continue
+                                f.write('* ' + i.strip()+'\n')                       
+                    except :
+                        print(fileName)
+
+    def CleanCatalog(self):
+        for i in self.CaseDirList:
+            for root, dirs, files in os.walk(i):
+                for file in files:
+                    if file == self.CatalogName:
+                        os.remove(root + '/' + self.CatalogName)
+        print('clean is done')
+
+if __name__ == "__main__":
+    CaseDirList = []
+    CatalogName = ''
+    DirDepth = 0
+    generate = True
+    delete = True
+    opts, args = getopt.gnu_getopt(sys.argv[1:], 'd:c:v:n:th')
+    for key, value in opts:
+        if key in ['-h', '--help']:
+            print(
+                'A collection of test cases catalog written using Python')
+            print("-d root dir of test case files written by Python, default: system-test,develop-test")
+            print('-c catalog file name, default: catalog.md')
+            print('-v dir depth of test cases.default: 5')
+            print('-n <True:False> generate')
+            print('-r <True:False> delete')
+            sys.exit(0)
+
+        if key in ['-d']: 
+            CaseDirList = value.split(',')
+
+        if key in ['-c']:
+            CatalogName = value
+
+        if key in ['-v']:
+            DirDepth = int(value)
+
+        if key in ['-n']:
+            if (value.upper() == "TRUE"):
+                generate = True
+            elif (value.upper() == "FALSE"):
+                generate = False
+
+        if key in ['-r']:
+            if (value.upper() == "TRUE"):
+                delete = True
+            elif (value.upper() == "FALSE"):
+                delete = False
+
+    print(CaseDirList, CatalogName)
+    if CaseDirList == [] :
+        CaseDirList = ['system-test', 'develop-test']
+    if CatalogName == '' :
+        CatalogName = 'catalog.md'
+    if DirDepth == 0:
+        DirDepth = 5
+    print('opt:\n\tcatalogname: %s\n\tcasedirlist: %s\n\tdepth: %d\n\tgenerate: %s\n\tdelete: %s' 
+            % (CatalogName, ','.join(CaseDirList), DirDepth, generate, delete))
+    f = CatalogGen(CaseDirList, CatalogName, DirDepth)
+    if delete:
+        f.CleanCatalog()
+    if generate:
+        f.CatalogGen()

tests/pytest/fulltest.sh

@@ -47,6 +47,7 @@ python3 ./test.py -f table/alter_column.py
 python3 ./test.py -f table/boundary.py
 python3 ./test.py -f table/create.py
 python3 ./test.py -f table/del_stable.py
+python3 ./test.py -f table/create_db_from_normal_db.py
 
 #stable
 python3 ./test.py -f stable/insert.py

tests/pytest/query/unionAllTest.py

@@ -116,10 +116,41 @@ class TDTestCase:
                 sql += f"union all select last(*) from sub{i} "
 
             tdSql.execute("create table sub%d using st2 tags('nchar%d')" % (i, i))
-            tdSql.execute("insert into sub%d values(%d, %d, %d, %d)" % (i, self.ts + i, i, i, i))
+            tdSql.execute("insert into sub%d values(%d, %d, %d, %d)(%d, %d, %d, %d)" % (i, self.ts + i, i, i, i,self.ts + i + 101, i + 101, i + 101, i + 101))
 
         tdSql.error(sql)
 
+        # TS-795
+        tdLog.info("test case for TS-795")
+        
+        functions = ["*", "count", "avg", "twa", "irate", "sum", "stddev", "leastsquares", "min", "max", "first", "last", "top", "bottom", "percentile", "apercentile", "last_row"]
+        
+        for func in functions:
+            expr = func
+            if func == "top" or func == "bottom":
+                expr += "(c1, 1)"
+            elif func == "percentile" or func == "apercentile":
+                expr += "(c1, 0.5)"
+            elif func == "leastsquares":
+                expr = func + "(c1, 1, 1)"
+            elif func == "*":
+                expr = func
+            else:
+                expr += "(c1)"
+
+            for i in range(100):
+                if i == 0:
+                    sql = f"select {expr} from sub0 "
+                else:
+                    sql += f"union all select {expr} from sub{i} "
+
+            tdSql.query(sql)
+            if func == "*":
+                tdSql.checkRows(200)
+            else:
+                tdSql.checkRows(100)
+
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/table/create_db_from_normal_db.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("test case for TS-783")
+        tdSql.execute("drop table if exists db.state1;")
+        tdSql.execute("create table db.state1 (ts timestamp, c1 int);")
+        tdSql.error("create table db.test1 using db.state1 tags('tt');")
+
+        tdSql.execute("drop table if exists db.state2;")
+        tdSql.execute("create table db.state2 (ts timestamp, c1 int) tags (t binary(20));")
+        tdSql.query("create table db.test2 using db.state2 tags('tt');")
+        tdSql.error("create table db.test22 using db.test2 tags('tt');")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/system-test/1-insert/0-sql/basic.py

@@ -18,6 +18,13 @@ from util.sql import *
 
 
 class TDTestCase:
+    def caseDescription(self):
+        '''
+        insert 倒序插入
+        语法解析错误同时meta请求也发出去了导致callback中处理逻辑失效
+        insert语句在values之间加入多个逗号
+        ''' 
+        return
     def init(self, conn, logSql):
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)