merge master and fix conflicts

.appveyor.yml

-version: 1.0.{build}
-image:
-  - Visual Studio 2015
-  - macos
-environment:
-  matrix:
-    - ARCH: amd64
-    - ARCH: x86
-matrix:
-  exclude:
-    - image: macos
-      ARCH: x86
-for:
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2015
-    clone_folder: c:\dev\TDengine
-    clone_depth: 1
-
-    init:
-      - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
-
-    before_build:
-      - cd c:\dev\TDengine
-      - md build
-
-    build_script:
-      - cd build
-      - cmake -G "NMake Makefiles" .. -DBUILD_JDBC=false
-      - nmake install
-  -
-    matrix:
-      only:
-        - image: macos
-    clone_depth: 1
-
-    build_script:
-      - mkdir debug
-      - cd debug
-      - cmake .. > /dev/null
-      - make > /dev/null
-notifications:
-- provider: Email
-  to:
-  - sangshuduo@gmail.com
-  on_build_success: true
-  on_build_failure: true
-  on_build_status_changed: true

.gitignore

@@ -81,6 +81,10 @@ tests/comparisonTest/opentsdb/opentsdbtest/.settings/
 tests/examples/JDBC/JDBCDemo/.classpath
 tests/examples/JDBC/JDBCDemo/.project
 tests/examples/JDBC/JDBCDemo/.settings/
+tests/script/api/batchprepare
+tests/script/api/stmt
+tests/script/api/stmtBatchTest
+tests/script/api/stmtTest
 
 # Emacs
 # -*- mode: gitignore; -*-

Jenkinsfile

 import hudson.model.Result
 import hudson.model.*;
 import jenkins.model.CauseOfInterruption
-properties([pipelineTriggers([githubPush()])])
 node {
-    git url: 'https://github.com/taosdata/TDengine.git'
 }
 
 def skipbuild=0
@@ -40,7 +38,8 @@ def pre_test(){
     sudo rmtaos || echo "taosd has not installed"
     '''
     sh '''
-    killall -9 taosd ||echo "no taosd running"
+    kill -9 $(pidof taosd) ||echo "no taosd running"
+    kill -9 $(pidof taosadapter) ||echo "no taosadapter running"
     killall -9 gdb || echo "no gdb running"
     killall -9 python3.8 || echo "no python program running"
     cd ${WKC}
@@ -72,6 +71,7 @@ def pre_test(){
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
     git clean -dfx
+    git submodule update --init --recursive
     cd ${WK}
     git reset --hard HEAD~10
     '''
@@ -112,8 +112,149 @@ def pre_test(){
     '''
     return 1
 }
+def pre_test_noinstall(){
+    sh'hostname'
+    sh'''
+    cd ${WKC}
+    git reset --hard HEAD~10 >/dev/null
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WKC}
+        git checkout master
+        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WKC}
+        git checkout 2.0
+        '''
+      } 
+      else{
+        sh '''
+        cd ${WKC}
+        git checkout develop
+        '''
+      }
+    }
+    sh'''
+    cd ${WKC}
+    git pull >/dev/null
+    git fetch origin +refs/pull/${CHANGE_ID}/merge
+    git checkout -qf FETCH_HEAD
+    git clean -dfx
+    git submodule update --init --recursive
+    cd ${WK}
+    git reset --hard HEAD~10
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WK}
+        git checkout master
+        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WK}
+        git checkout 2.0
+        '''
+      } 
+      else{
+        sh '''
+        cd ${WK}
+        git checkout develop
+        '''
+      } 
+    }
+    sh '''
+    cd ${WK}
+    git pull >/dev/null 
+    
+    export TZ=Asia/Harbin
+    date
+    git clean -dfx
+    mkdir debug
+    cd debug
+    cmake .. > /dev/null
+    make
+    '''
+    return 1
+}
+def pre_test_ningsi(){
+    sh'hostname'
+    sh'''
+    cd ${WKC}
+    git reset --hard HEAD~10 >/dev/null
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WKC}
+        git checkout master
+        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WKC}
+        git checkout 2.0
+        '''
+      } 
+      else{
+        sh '''
+        cd ${WKC}
+        git checkout develop
+        '''
+      }
+    }
+    sh'''
+    cd ${WKC}
+    git pull >/dev/null
+    git fetch origin +refs/pull/${CHANGE_ID}/merge
+    git checkout -qf FETCH_HEAD
+    git clean -dfx
+    git submodule update --init --recursive
+    cd ${WK}
+    git reset --hard HEAD~10
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WK}
+        git checkout master
+        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WK}
+        git checkout 2.0
+        '''
+      } 
+      else{
+        sh '''
+        cd ${WK}
+        git checkout develop
+        '''
+      } 
+    }
+    sh '''
+    cd ${WK}
+    git pull >/dev/null 
+    
+    export TZ=Asia/Harbin
+    date
+    git clean -dfx
+    mkdir debug
+    cd debug
+    cmake .. -DOSTYPE=Ningsi60 > /dev/null
+    make
+    '''
+    return 1
+}
 def pre_test_win(){
     bat '''
+    taskkill /f /t /im python.exe
     cd C:\\
     rd /s /Q C:\\TDengine
     cd C:\\workspace\\TDinternal
@@ -147,6 +288,7 @@ def pre_test_win(){
     git fetch origin +refs/pull/%CHANGE_ID%/merge
     git checkout -qf FETCH_HEAD
     git clean -dfx
+    git submodule update --init --recursive
     cd C:\\workspace\\TDinternal
     git reset --hard HEAD~10
     '''
@@ -171,7 +313,6 @@ def pre_test_win(){
       } 
     }
     bat '''
-    taskkill /f /t /im python.exe
     cd C:\\workspace\\TDinternal
     git pull 
 
@@ -179,9 +320,9 @@ def pre_test_win(){
     git clean -dfx
     mkdir debug
     cd debug
-    call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64
+    call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
     cmake ../ -G "NMake Makefiles" 
-    nmake || exit 8
+    set CL=/MP nmake nmake || exit 8
     nmake install || exit 8
     xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 || exit 8
     cd C:\\workspace\\TDinternal\\community\\src\\connector\\python
@@ -192,6 +333,7 @@ def pre_test_win(){
 }
 pipeline {
   agent none
+  options { skipDefaultCheckout() } 
   environment{
       WK = '/var/lib/jenkins/workspace/TDinternal'
       WKC= '/var/lib/jenkins/workspace/TDinternal/community'
@@ -199,6 +341,7 @@ pipeline {
   stages {
       stage('pre_build'){
           agent{label 'master'}
+          options { skipDefaultCheckout() } 
           when {
               changeRequest()
           }
@@ -207,52 +350,52 @@ pipeline {
               abort_previous()
               abortPreviousBuilds()
             }
-          sh'''
-          rm -rf ${WORKSPACE}.tes
-          cp -r ${WORKSPACE} ${WORKSPACE}.tes
-          cd ${WORKSPACE}.tes
-          git fetch
-          '''
-          script {
-            if (env.CHANGE_TARGET == 'master') {
-              sh '''
-              git checkout master
-              '''
-              }
-            else if(env.CHANGE_TARGET == '2.0'){
-              sh '''
-              git checkout 2.0
-              '''
-            } 
-            else{
-              sh '''
-              git checkout develop
-              '''
-            } 
-          }
-          sh'''
-          git fetch origin +refs/pull/${CHANGE_ID}/merge
-          git checkout -qf FETCH_HEAD
-          '''     
+          //   sh'''
+          // rm -rf ${WORKSPACE}.tes
+          // cp -r ${WORKSPACE} ${WORKSPACE}.tes
+          // cd ${WORKSPACE}.tes
+          // git fetch
+          // '''
+          // script {
+          //   if (env.CHANGE_TARGET == 'master') {
+          //     sh '''
+          //     git checkout master
+          //     '''
+          //     }
+          //   else if(env.CHANGE_TARGET == '2.0'){
+          //     sh '''
+          //     git checkout 2.0
+          //     '''
+          //   } 
+          //   else{
+          //     sh '''
+          //     git checkout develop
+          //     '''
+          //   } 
+          // }
+          // sh'''
+          // git fetch origin +refs/pull/${CHANGE_ID}/merge
+          // git checkout -qf FETCH_HEAD
+          // '''     
 
-          script{  
-            skipbuild='2'     
-            skipbuild=sh(script: "git log -2 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]' && echo 1 || echo 2", returnStdout:true)
-            println skipbuild
-          }
-          sh'''
-          rm -rf ${WORKSPACE}.tes
-          '''
+          // script{  
+          //   skipbuild='2'     
+          //   skipbuild=sh(script: "git log -2 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]' && echo 1 || echo 2", returnStdout:true)
+          //   println skipbuild
+          // }
+          // sh'''
+          // rm -rf ${WORKSPACE}.tes
+          // '''
+          // }       
           }
       }
       stage('Parallel test stage') {
         //only build pr
+        options { skipDefaultCheckout() } 
         when {
           allOf{
               changeRequest()
-               expression{
-                return skipbuild.trim() == '2'
-              }
+              not{ expression { env.CHANGE_BRANCH =~ /docs\// }}
             }
           }
       parallel {
@@ -288,7 +431,7 @@ pipeline {
         stage('python_3_s6') {
           agent{label " slave6 || slave16 "}
           steps {     
-            timeout(time: 55, unit: 'MINUTES'){       
+            timeout(time: 65, unit: 'MINUTES'){       
               pre_test()
               sh '''
               date
@@ -314,11 +457,13 @@ pipeline {
               npm install td2.0-connector > /dev/null 2>&1
               node nodejsChecker.js host=localhost
               '''
-              sh '''
-              cd ${WKC}/tests/examples/C#/taosdemo
-              mcs -out:taosdemo *.cs > /dev/null 2>&1
-              ./taosdemo -c /etc/taos -y
-              '''
+              catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                  cd ${WKC}/tests/examples/C#/taosdemo
+                  mcs -out:taosdemo *.cs > /dev/null 2>&1
+                  echo '' |./taosdemo -c /etc/taos
+                '''
+              } 
               sh '''
                 cd ${WKC}/tests/gotest
                 bash batchtest.sh
@@ -394,7 +539,7 @@ pipeline {
         stage('test_b4_s7') {
           agent{label " slave7 || slave17 "}
           steps {     
-            timeout(time: 55, unit: 'MINUTES'){       
+            timeout(time: 105, unit: 'MINUTES'){       
               pre_test()
               sh '''
               date
@@ -426,7 +571,7 @@ pipeline {
         stage('test_b6_s9') {
           agent{label " slave9 || slave19 "}
           steps {     
-            timeout(time: 55, unit: 'MINUTES'){       
+            timeout(time: 105, unit: 'MINUTES'){       
               pre_test()
               sh '''
               date
@@ -449,36 +594,97 @@ pipeline {
             }
           }
         } 
+        stage('arm64centos7') {
+          agent{label " arm64centos7 "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('arm64centos8') {
+          agent{label " arm64centos8 "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('arm32bionic') {
+          agent{label " arm32bionic "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('arm64bionic') {
+          agent{label " arm64bionic "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('arm64focal') {
+          agent{label " arm64focal "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('centos7') {
+          agent{label " centos7 "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('ubuntu:trusty') {
+          agent{label " trusty "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('ubuntu:xenial') {
+          agent{label " xenial "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+        stage('ubuntu:bionic') {
+          agent{label " bionic "}
+          steps {     
+              pre_test_noinstall()    
+            }
+        }
+
+        stage('ningsi') {
+          agent{label "ningsi"}
+          steps {     
+              pre_test_ningsi()    
+            }
+        }
         
-        // stage('build'){
-        //   agent{label " wintest "}
-        //   steps {
-        //     pre_test()
-        //     script{             
-        //         while(win_stop == 0){
-        //           sleep(1)
-        //           }
-        //       }
-        //     }
-        // }
-        // stage('test'){
-        //   agent{label "win"}
-        //   steps{
+        stage('build'){
+          agent{label " wintest "}
+          steps {
+            pre_test()
+            script{             
+                while(win_stop == 0){
+                  sleep(1)
+                  }
+              }
+            }
+        }
+        stage('test'){
+          agent{label "win"}
+          steps{
             
-        //     catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-        //         pre_test_win()
-        //         timeout(time: 20, unit: 'MINUTES'){
-        //         bat'''
-        //         cd C:\\workspace\\TDinternal\\community\\tests\\pytest
-        //         .\\test-all.bat Wintest
-        //         '''
-        //         }
-        //     }     
-        //     script{
-        //       win_stop=1
-        //     }
-        //   }
-        // }
+            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                pre_test_win()
+                timeout(time: 20, unit: 'MINUTES'){
+                bat'''
+                cd C:\\workspace\\TDinternal\\community\\tests\\pytest
+                .\\test-all.bat wintest
+                '''
+                }
+            }     
+            script{
+              win_stop=1
+            }
+          }
+        }
           
                
     }

cmake/define.inc

@@ -49,6 +49,14 @@ IF (TD_PRO)
   ADD_DEFINITIONS(-D_TD_PRO_)
 ENDIF ()
 
+IF (TD_KH)
+  ADD_DEFINITIONS(-D_TD_KH_)
+ENDIF ()
+
+IF (TD_JH)
+  ADD_DEFINITIONS(-D_TD_JH_)
+ENDIF ()
+
 IF (TD_MEM_CHECK)
   ADD_DEFINITIONS(-DTAOS_MEM_CHECK)
 ENDIF ()
@@ -117,7 +125,7 @@ IF (TD_MIPS_32)
   SET(COMMON_FLAGS "-Wall -Werror -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
-IF (TD_APLHINE)
+IF (TD_ALPINE)
   SET(COMMON_FLAGS "${COMMON_FLAGS} -largp")
   link_libraries(/usr/lib/libargp.a)
   ADD_DEFINITIONS(-D_ALPINE)
@@ -136,7 +144,12 @@ IF (TD_LINUX)
   ENDIF ()
 
   IF (TD_MEMORY_SANITIZER)
-    SET(DEBUG_FLAGS "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -O0 -g3 -DDEBUG")
+    IF (TD_ARCHLINUX)
+      SET(DEBUG_FLAGS "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -O0 -g3 -DDEBUG")
+    ELSE ()
+      SET(DEBUG_FLAGS "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -static-libasan -O0 -g3 -DDEBUG")
+    ENDIF ()
+    MESSAGE(STATUS "${BoldRed}Will compile with memory sanitizer! ${ColourReset}")
   ELSE ()
     SET(DEBUG_FLAGS "-O0 -g3 -DDEBUG")
   ENDIF ()

cmake/input.inc

@@ -52,6 +52,12 @@ ELSEIF (${DBNAME} MATCHES "tq")
 ELSEIF (${DBNAME} MATCHES "pro")
   SET(TD_PRO TRUE)
   MESSAGE(STATUS "pro is true")
+ELSEIF (${DBNAME} MATCHES "kh")
+  SET(TD_KH TRUE)
+  MESSAGE(STATUS "kh is true")
+ELSEIF (${DBNAME} MATCHES "jh")
+  SET(TD_JH TRUE)
+  MESSAGE(STATUS "jh is true")
 ENDIF ()
 
 IF (${DLLTYPE} MATCHES "go")

cmake/install.inc

 IF (TD_LINUX)
   SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
   INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
-  INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
-  INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR} Linux ${TD_VER_NUMBER})")
+  INSTALL(CODE "execute_process(COMMAND bash ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR} Linux ${TD_VER_NUMBER})")
 ELSEIF (TD_WINDOWS)
   IF (TD_POWER)
     SET(CMAKE_INSTALL_PREFIX C:/PowerDB)
+  ELSEIF (TD_TQ)
+    SET(CMAKE_INSTALL_PREFIX C:/TQueue)
   ELSEIF (TD_PRO)
     SET(CMAKE_INSTALL_PREFIX C:/ProDB)
+  ELSEIF (TD_KH)
+    SET(CMAKE_INSTALL_PREFIX C:/KingHistorian)
+  ELSEIF (TD_JH)
+    SET(CMAKE_INSTALL_PREFIX C:/jh_iot)
   ELSE ()
     SET(CMAKE_INSTALL_PREFIX C:/TDengine)
   ENDIF ()
 
-  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go     DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/nodejs DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/python DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/C\# DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/tests/examples DESTINATION .)
-  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/packaging/cfg DESTINATION .)
   INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taos.h DESTINATION include)
   INSTALL(FILES ${TD_COMMUNITY_DIR}/src/inc/taoserror.h DESTINATION include)
   INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
@@ -25,10 +24,28 @@ ELSEIF (TD_WINDOWS)
   INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)
 
   IF (TD_POWER)
+    INSTALL(FILES ${TD_COMMUNITY_DIR}/packaging/cfg/taos.cfg DESTINATION cfg)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/power.exe DESTINATION .)
+  ELSEIF (TD_TQ)
+    INSTALL(FILES ${TD_COMMUNITY_DIR}/packaging/cfg/taos.cfg DESTINATION cfg)
+    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/tq.exe DESTINATION .)
   ELSEIF (TD_PRO)
+    INSTALL(FILES ${TD_COMMUNITY_DIR}/packaging/cfg/taos.cfg DESTINATION cfg)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/prodbc.exe DESTINATION .)
+  ELSEIF (TD_KH)
+    INSTALL(FILES ${TD_COMMUNITY_DIR}/packaging/cfg/kinghistorian.cfg DESTINATION cfg)
+    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/khclient.exe DESTINATION .)
+  ELSEIF (TD_JH)
+    INSTALL(FILES ${TD_COMMUNITY_DIR}/packaging/cfg/taos.cfg DESTINATION cfg)
+    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/jh_taos.exe DESTINATION .)
   ELSE ()
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go     DESTINATION connector)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/nodejs DESTINATION connector)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/python DESTINATION connector)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/C\# DESTINATION connector)
+    INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/tests/examples DESTINATION .)
+
+    INSTALL(FILES ${TD_COMMUNITY_DIR}/packaging/cfg/taos.cfg DESTINATION cfg)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosdemo.exe DESTINATION .)
   ENDIF ()
@@ -41,6 +58,5 @@ ELSEIF (TD_WINDOWS)
 ELSEIF (TD_DARWIN)
   SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
   INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
-  INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
-  INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR} Darwin ${TD_VER_NUMBER})")
+  INSTALL(CODE "execute_process(COMMAND bash ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR} Darwin ${TD_VER_NUMBER})")
 ENDIF ()

cmake/platform.inc

@@ -21,7 +21,7 @@ SET(TD_LINUX FALSE)
   SET(TD_ARM_32 FALSE)
   SET(TD_MIPS_64 FALSE)
   SET(TD_MIPS_32 FALSE)
-  SET(TD_APLHINE FALSE)
+  SET(TD_ALPINE FALSE)
   SET(TD_NINGSI FALSE)
   SET(TD_NINGSI_60 FALSE)
   SET(TD_NINGSI_80 FALSE)
@@ -36,7 +36,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   # Get OS information and store in variable TD_OS_INFO.
   #
   execute_process(COMMAND chmod 777 ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh)
-  execute_process(COMMAND ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh "" OUTPUT_VARIABLE TD_OS_INFO)
+  execute_process(COMMAND sh ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh "" OUTPUT_VARIABLE TD_OS_INFO)
   MESSAGE(STATUS "The current os is " ${TD_OS_INFO})
 
   SET(TD_LINUX TRUE)
@@ -52,8 +52,13 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   ENDIF ()
 
   IF (${TD_OS_INFO} MATCHES "Alpine")
-    SET(TD_APLHINE TRUE)
-    MESSAGE(STATUS "The current OS is Alpine, append extra flags")
+    SET(TD_ALPINE TRUE)
+    MESSAGE(STATUS "The current OS is Alpine Linux, append extra flags")
+  ELSEIF (${TD_OS_INFO} MATCHES "Arch")
+    SET(TD_ARCHLINUX TRUE)
+    MESSAGE(STATUS "The current OS is Arch Linux")
+  ELSE ()
+    MESSAGE(STATUS "Ths distro is " ${TD_OS_INFO})
   ENDIF()
 ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   SET(TD_DARWIN TRUE)
@@ -155,7 +160,7 @@ ELSEIF (${OSTYPE} MATCHES "Linux")
   MESSAGE(STATUS "input osType: Linux")
 ELSEIF (${OSTYPE} MATCHES "Alpine")
   MESSAGE(STATUS "input osType: Alpine")
-  SET(TD_APLHINE TRUE)
+  SET(TD_ALPINE TRUE)
 ELSE ()
   MESSAGE(STATUS "The user specified osType is unknown: " ${OSTYPE})
 ENDIF ()

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.2.1.0")
+  SET(TD_VER_NUMBER "2.2.2.4")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

deps/MsvcLibX/src/filetime.c

@@ -29,7 +29,7 @@
    A Unix time_t is the number of 1-second intervals since January 1, 1970.
    time_ts are expressed in the GMT time zone. DOS times in the current local time.
 */
-time_t Filetime2Timet(uint16_t date, uint16_t time) {
+time_t Filetime2Timet(uint16_t date, uint16_t deps_time) {
   unsigned int year, month, day, hour, minute, second;
   struct tm stm;
 
@@ -37,9 +37,9 @@ time_t Filetime2Timet(uint16_t date, uint16_t time) {
   year = 1980 + ((date & 0xFE00) >> 9);
   month = (date & 0x1E0) >> 5;
   day = date & 0x1F;
-  hour = (time & 0xF800) >> 11;
-  minute = (time & 0x7E0) >> 5;
-  second = 2 * (time & 0x1F);
+  hour = (deps_time & 0xF800) >> 11;
+  minute = (deps_time & 0x7E0) >> 5;
+  second = 2 * (deps_time & 0x1F);
 
   stm.tm_year = (int)year - 1900;
   stm.tm_mon  = (int)month - 1;
@@ -55,7 +55,7 @@ time_t Filetime2Timet(uint16_t date, uint16_t time) {
 #if 0
 /* Older version of the same, trying to generate the time_t manually.
    Did not handle DST well */
-time_t Filetime2Timet(uint16_t date, uint16_t time) {
+time_t Filetime2Timet(uint16_t date, uint16_t deps_time) {
   unsigned int year, month, day, hour, minute, second;
   unsigned int olympiads; /* 4-year periods */
   unsigned long t = 0;
@@ -64,9 +64,9 @@ time_t Filetime2Timet(uint16_t date, uint16_t time) {
   year = 1980 + ((date & 0xFE00) >> 9);
   month = (date & 0x1E0) >> 5;
   day = date & 0x1F;
-  hour = (time & 0xF800) >> 11;
-  minute = (time & 0x7E0) >> 5;
-  second = 2 * (time & 0x1F);
+  hour = (deps_time & 0xF800) >> 11;
+  minute = (deps_time & 0x7E0) >> 5;
+  second = 2 * (deps_time & 0x1F);
 
   /* Count days */
   year -= 1970; /* Start of Unix time_t epoch */
@@ -111,16 +111,16 @@ time_t Filetime2Timet(uint16_t date, uint16_t time) {
 #endif
 
 /* Generate a string with the local file time, in the ISO 8601 date/time format */
-char *Filetime2String(uint16_t date, uint16_t time, char *pBuf, size_t nBufSize) {
+char *Filetime2String(uint16_t date, uint16_t deps_time, char *pBuf, size_t nBufSize) {
   unsigned int year, month, day, hour, minute, second;
 
   /* Decode fields */
   year = 1980 + ((date & 0xFE00) >> 9);
   month = (date & 0x1E0) >> 5;
   day = date & 0x1F;
-  hour = (time & 0xF800) >> 11;
-  minute = (time & 0x7E0) >> 5;
-  second = 2 * (time & 0x1F);
+  hour = (deps_time & 0xF800) >> 11;
+  minute = (deps_time & 0x7E0) >> 5;
+  second = 2 * (deps_time & 0x1F);
 
   if (nBufSize >= 20) {
     sprintf(pBuf, "%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, second);

deps/cJson/src/cJSON.c

@@ -49,8 +49,8 @@
 typedef struct {
     const unsigned char *json;
     size_t position;
-} error;
-static error global_error = { NULL, 0 };
+} deps_error;
+static deps_error global_error = { NULL, 0 };
 
 CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
 {
@@ -210,8 +210,8 @@ typedef struct
 #define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length))
 #define cannot_read(buffer, size) (!can_read(buffer, size))
 /* check if the buffer can be accessed at the given index (starting with 0) */
-#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
-#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
+#define can_access_at_index(buffer, deps_index) ((buffer != NULL) && (((buffer)->offset + deps_index) < (buffer)->length))
+#define cannot_access_at_index(buffer, deps_index) (!can_access_at_index(buffer, deps_index))
 /* get a pointer to the buffer at the position */
 #define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)
 
@@ -992,7 +992,7 @@ fail:
 
     if (value != NULL)
     {
-        error local_error;
+        deps_error local_error;
         local_error.json = (const unsigned char*)value;
         local_error.position = 0;
 
@@ -1683,7 +1683,7 @@ CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array)
     return (int)size;
 }
 
-static cJSON* get_array_item(const cJSON *array, size_t index)
+static cJSON* get_array_item(const cJSON *array, size_t deps_index)
 {
     cJSON *current_child = NULL;
 
@@ -1693,23 +1693,23 @@ static cJSON* get_array_item(const cJSON *array, size_t index)
     }
 
     current_child = array->child;
-    while ((current_child != NULL) && (index > 0))
+    while ((current_child != NULL) && (deps_index > 0))
     {
-        index--;
+        deps_index--;
         current_child = current_child->next;
     }
 
     return current_child;
 }
 
-CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index)
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int deps_index)
 {
-    if (index < 0)
+    if (deps_index < 0)
     {
         return NULL;
     }
 
-    return get_array_item(array, (size_t)index);
+    return get_array_item(array, (size_t)deps_index);
 }
 
 static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive)

deps/iconv/gentranslit.c

@@ -30,7 +30,7 @@ int main (int argc, char *argv[])
 {
   unsigned int data[0x100000];
   int uni2index[0x110000];
-  int index;
+  int deps_index;
 
   if (argc != 1)
     exit(1);
@@ -64,7 +64,7 @@ int main (int argc, char *argv[])
     int j;
     for (j = 0; j < 0x110000; j++)
       uni2index[j] = -1;
-    index = 0;
+    deps_index = 0;
     for (;;) {
       c = getc(stdin);
       if (c == EOF)
@@ -86,8 +86,8 @@ int main (int argc, char *argv[])
         if (c == '\t')
           break;
         if (uni2index[j] < 0) {
-          uni2index[j] = index;
-          data[index++] = 0;
+          uni2index[j] = deps_index;
+          data[deps_index++] = 0;
         }
         if (c >= 0x80) {
           /* Finish reading an UTF-8 character. */
@@ -104,17 +104,17 @@ int main (int argc, char *argv[])
             }
           }
         }
-        data[index++] = (unsigned int) c;
+        data[deps_index++] = (unsigned int) c;
       }
       if (uni2index[j] >= 0)
-        data[uni2index[j]] = index - uni2index[j] - 1;
+        data[uni2index[j]] = deps_index - uni2index[j] - 1;
       do { c = getc(stdin); } while (!(c == EOF || c == '\n'));
     }
   }
-  printf("static const unsigned int translit_data[%d] = {",index);
+  printf("static const unsigned int translit_data[%d] = {",deps_index);
   {
     int i;
-    for (i = 0; i < index; i++) {
+    for (i = 0; i < deps_index; i++) {
       if (data[i] < 32)
         printf("\n %3d,",data[i]);
       else if (data[i] == '\'')

deps/iconv/iconv.c

@@ -491,7 +491,7 @@ const char * iconv_canonicalize (const char * name)
   char* bp;
   const struct alias * ap;
   unsigned int count;
-  unsigned int index;
+  unsigned int deps_index;
   const char* pool;
 
   /* Before calling aliases_lookup, convert the input string to upper case,
@@ -555,23 +555,23 @@ const char * iconv_canonicalize (const char * name)
          This is also the case on native Woe32 systems.  */
 #if __STDC_ISO_10646__ || ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
       if (sizeof(wchar_t) == 4) {
-        index = ei_ucs4internal;
+        deps_index = ei_ucs4internal;
         break;
       }
       if (sizeof(wchar_t) == 2) {
-        index = ei_ucs2internal;
+        deps_index = ei_ucs2internal;
         break;
       }
       if (sizeof(wchar_t) == 1) {
-        index = ei_iso8859_1;
+        deps_index = ei_iso8859_1;
         break;
       }
 #endif
     }
-    index = ap->encoding_index;
+    deps_index = ap->encoding_index;
     break;
   }
-  return all_canonical[index] + pool;
+  return all_canonical[deps_index] + pool;
  invalid:
   return name;
 }

deps/jni/windows/win32/bridge/AccessBridgeCalls.c

@@ -569,9 +569,9 @@ extern "C" {
         return FALSE;
     }
 
-    AccessibleContext GetAccessibleChildFromContext(long vmID, AccessibleContext ac, jint index) {
+    AccessibleContext GetAccessibleChildFromContext(long vmID, AccessibleContext ac, jint deps_index) {
         if (theAccessBridgeInitializedFlag == TRUE) {
-            return theAccessBridge.GetAccessibleChildFromContext(vmID, ac, index);
+            return theAccessBridge.GetAccessibleChildFromContext(vmID, ac, deps_index);
         }
         return (AccessibleContext) 0;
     }
@@ -711,9 +711,9 @@ extern "C" {
      * return the row number for a cell at a given index
      */
     jint
-    getAccessibleTableRow(long vmID, AccessibleTable table, jint index) {
+    getAccessibleTableRow(long vmID, AccessibleTable table, jint deps_index) {
         if (theAccessBridgeInitializedFlag == TRUE) {
-            return theAccessBridge.getAccessibleTableRow(vmID, table, index);
+            return theAccessBridge.getAccessibleTableRow(vmID, table, deps_index);
         }
         return -1;
     }
@@ -722,9 +722,9 @@ extern "C" {
      * return the column number for a cell at a given index
      */
     jint
-    getAccessibleTableColumn(long vmID, AccessibleTable table, jint index) {
+    getAccessibleTableColumn(long vmID, AccessibleTable table, jint deps_index) {
         if (theAccessBridgeInitializedFlag == TRUE) {
-            return theAccessBridge.getAccessibleTableColumn(vmID, table, index);
+            return theAccessBridge.getAccessibleTableColumn(vmID, table, deps_index);
         }
         return -1;
     }
@@ -753,9 +753,9 @@ extern "C" {
         return FALSE;
     }
 
-    BOOL GetAccessibleTextItems(long vmID, AccessibleText at, AccessibleTextItemsInfo *textItems, jint index) {
+    BOOL GetAccessibleTextItems(long vmID, AccessibleText at, AccessibleTextItemsInfo *textItems, jint deps_index) {
         if (theAccessBridgeInitializedFlag == TRUE) {
-            return theAccessBridge.GetAccessibleTextItems(vmID, at, textItems, index);
+            return theAccessBridge.GetAccessibleTextItems(vmID, at, textItems, deps_index);
         }
         return FALSE;
     }
@@ -767,23 +767,23 @@ extern "C" {
         return FALSE;
     }
 
-    BOOL GetAccessibleTextAttributes(long vmID, AccessibleText at, jint index, AccessibleTextAttributesInfo *attributes) {
+    BOOL GetAccessibleTextAttributes(long vmID, AccessibleText at, jint deps_index, AccessibleTextAttributesInfo *attributes) {
         if (theAccessBridgeInitializedFlag == TRUE) {
-            return theAccessBridge.GetAccessibleTextAttributes(vmID, at, index, attributes);
+            return theAccessBridge.GetAccessibleTextAttributes(vmID, at, deps_index, attributes);
         }
         return FALSE;
     }
 
-    BOOL GetAccessibleTextRect(long vmID, AccessibleText at, AccessibleTextRectInfo *rectInfo, jint index) {
+    BOOL GetAccessibleTextRect(long vmID, AccessibleText at, AccessibleTextRectInfo *rectInfo, jint deps_index) {
         if (theAccessBridgeInitializedFlag == TRUE) {
-            return theAccessBridge.GetAccessibleTextRect(vmID, at, rectInfo, index);
+            return theAccessBridge.GetAccessibleTextRect(vmID, at, rectInfo, deps_index);
         }
         return FALSE;
     }
 
-    BOOL GetAccessibleTextLineBounds(long vmID, AccessibleText at, jint index, jint *startIndex, jint *endIndex) {
+    BOOL GetAccessibleTextLineBounds(long vmID, AccessibleText at, jint deps_index, jint *startIndex, jint *endIndex) {
         if (theAccessBridgeInitializedFlag == TRUE) {
-            return theAccessBridge.GetAccessibleTextLineBounds(vmID, at, index, startIndex, endIndex);
+            return theAccessBridge.GetAccessibleTextLineBounds(vmID, at, deps_index, startIndex, endIndex);
         }
         return FALSE;
     }
@@ -844,7 +844,7 @@ extern "C" {
 
     /*
      * This method is used to iterate through the hyperlinks in a component.  It
-     * returns hypertext information for a component starting at hyperlink index
+     * returns hypertext information for a component starting at hyperlink deps_index
      * nStartIndex.  No more than MAX_HYPERLINKS AccessibleHypertextInfo objects will
      * be returned for each call to this method.
      * returns FALSE on error.
@@ -1109,9 +1109,9 @@ extern "C" {
     /**
      * Gets the text caret location
      */
-    BOOL getCaretLocation(long vmID, AccessibleContext ac, AccessibleTextRectInfo *rectInfo, jint index) {
+    BOOL getCaretLocation(long vmID, AccessibleContext ac, AccessibleTextRectInfo *rectInfo, jint deps_index) {
         if (theAccessBridgeInitializedFlag == TRUE) {
-            return theAccessBridge.getCaretLocation(vmID, ac, rectInfo, index);
+            return theAccessBridge.getCaretLocation(vmID, ac, rectInfo, deps_index);
         }
         return FALSE;
     }

deps/lua/src/loadlib.c

@@ -114,13 +114,13 @@ static void setprogdir (lua_State *L) {
 
 
 static void pusherror (lua_State *L) {
-  int error = GetLastError();
+  int lua_error = GetLastError();
   char buffer[128];
   if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
-      NULL, error, 0, buffer, sizeof(buffer), NULL))
+      NULL, lua_error, 0, buffer, sizeof(buffer), NULL))
     lua_pushstring(L, buffer);
   else
-    lua_pushfstring(L, "system error %d\n", error);
+    lua_pushfstring(L, "system error %d\n", lua_error);
 }
 
 static void ll_unloadlib (void *lib) {

deps/regex/regcomp.c

@@ -120,7 +120,7 @@ static reg_errcode_t build_charclass (re_bitset_ptr_t sbcset,
 static bin_tree_t *build_word_op (re_dfa_t *dfa, int not, reg_errcode_t *err);
 static void free_bin_tree (bin_tree_t *tree);
 static bin_tree_t *create_tree (bin_tree_t *left, bin_tree_t *right,
-				re_token_type_t type, int index);
+				re_token_type_t type, int deps_index);
 static bin_tree_t *duplicate_tree (const bin_tree_t *src, re_dfa_t *dfa);
 
 /* This table gives an error message for each of the error codes listed
@@ -3447,11 +3447,11 @@ free_charset (re_charset_t *cset)
    Note: This function automatically free left and right if malloc fails.  */
 
 static bin_tree_t *
-create_tree (left, right, type, index)
+create_tree (left, right, type, deps_index)
      bin_tree_t *left;
      bin_tree_t *right;
      re_token_type_t type;
-     int index;
+     int deps_index;
 {
   bin_tree_t *tree;
   tree = re_malloc (bin_tree_t, 1);
@@ -3465,7 +3465,7 @@ create_tree (left, right, type, index)
   tree->left = left;
   tree->right = right;
   tree->type = type;
-  tree->node_idx = index;
+  tree->node_idx = deps_index;
   tree->first = -1;
   tree->next = -1;
   re_node_set_init_empty (&tree->eclosure);

documentation20/en/09.connections/docs.md

@@ -12,12 +12,17 @@ https://grafana.com/grafana/download.
 
 ### Configure Grafana
 
-TDengine Grafana plugin is in the /usr/local/taos/connector/grafanaplugin directory. 
+Download grafana plugin from <https://github.com/taosdata/grafanaplugin/releases/latest> .
+
+```bash
+GF_VERSION=3.1.1
+wget https://github.com/taosdata/grafanaplugin/releases/download/v$GF_VERSION/tdengine-datasource-$GF_VERSION.zip
+```
 
 Taking Centos 7.2 as an example, just copy grafanaplugin directory to /var/lib/grafana/plugins directory and restart Grafana.
 
 ```bash
-sudo cp -rf /usr/local/taos/connector/grafanaplugin /var/lib/grafana/plugins/tdengine
+sudo unzip tdengine-datasource-$GF_VERSION.zip /var/lib/grafana/plugins/
 ```
 
 ### Use Grafana
@@ -64,15 +69,15 @@ According to the default prompt, query the average system memory usage at the sp
 
 #### Import Dashboard
 
-A `tdengine-grafana.json` importable dashboard is provided under the Grafana plug-in directory/usr/local/taos/connector/grafana/tdengine/dashboard/.
+We provide an example dashboard [Grafana Dashboard 15146](https://grafana.com/grafana/dashboards/15146)。
 
-Click the `Import` button on the left panel and upload the  `tdengine-grafana.json` file:
+Click the `Import` button on the left panel and load the grafana id:
 
 ![img](page://images/connections/import_dashboard1.jpg)
 
 You can see as follows after Dashboard imported.
 
-![img](page://images/connections/import_dashboard2.jpg)
+![img](../images/connections/dashboard-15146.png)
 
 ## <a class="anchor" id="matlab"></a> MATLAB
 

packaging/tools/makearbi_power.sh

@@ -34,7 +34,6 @@ fi
 bin_files="${build_dir}/bin/tarbitrator ${script_dir}/remove_arbi_power.sh"
 install_files="${script_dir}/install_arbi_power.sh"
 
-#header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
 init_file_tarbitrator_deb=${script_dir}/../deb/tarbitratord
 init_file_tarbitrator_rpm=${script_dir}/../rpm/tarbitratord
 

go @ b8f76da4

-Subproject commit 050667e5b4d0eafa5387e4283e713559b421203f
+Subproject commit b8f76da4a708d158ec3cc4b844571dc4414e36b4