Merge remote-tracking branch 'origin/develop' into szhou/feature/support-math-functions

Jenkinsfile

@@ -177,7 +177,7 @@ def pre_test_noinstall(){
     mkdir debug
     cd debug
     cmake .. > /dev/null
-    make > /dev/null
+    make
     '''
     return 1
 }

cmake/define.inc

@@ -142,6 +142,8 @@ ENDIF ()
 
 IF (${BUILD_HTTP} MATCHES "true")
   SET(TD_BUILD_HTTP TRUE)
+ELSEIF (${BUILD_HTTP} MATCHES "false")
+  SET(TD_BUILD_HTTP FALSE)
 ENDIF ()
 
 IF (TD_BUILD_HTTP)

cmake/install.inc

@@ -35,7 +35,7 @@ ELSEIF (TD_WINDOWS)
   #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
   #INSTALL(TARGETS shell RUNTIME DESTINATION .)
   IF (TD_MVN_INSTALLED)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.35-dist.jar DESTINATION connector/jdbc)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.36-dist.jar DESTINATION connector/jdbc)
   ENDIF ()
 ELSEIF (TD_DARWIN)
   SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")

packaging/check_package.sh

@@ -179,7 +179,8 @@ function check_header_path() {
 
 function check_blm3_config_dir() {
 	# check all config
-	check_file ${cfg_install_dir} blm3.toml
+	check_file ${cfg_install_dir} blm.toml
+	check_file ${cfg_install_dir} blm3.service
 	check_file ${install_main_dir}/cfg blm.toml.org
 	echo -e "Check conf path:\033[32mOK\033[0m!"
 }

packaging/deb/DEBIAN/preinst

@@ -32,5 +32,9 @@ if [ -f "${install_main_dir}/blm.toml" ]; then
     ${csudo} rm -f ${install_main_dir}/cfg/blm.toml     || :
 fi
 
+if [ -f "${install_main_dir}/blm3.service" ]; then
+    ${csudo} rm -f ${install_main_dir}/cfg/blm3.service || :
+fi
+
 # there can not libtaos.so*, otherwise ln -s  error
 ${csudo} rm -f ${install_main_dir}/driver/libtaos*   || :

packaging/deb/makedeb.sh

@@ -47,6 +47,9 @@ cp ${compile_dir}/../packaging/cfg/taos.cfg         ${pkg_dir}${install_home_pat
 if [ -f "${compile_dir}/test/cfg/blm.toml" ]; then
     cp ${compile_dir}/test/cfg/blm.toml                 ${pkg_dir}${install_home_path}/cfg
 fi
+if [ -f "${compile_dir}/test/cfg/blm3.service" ]; then
+    cp ${compile_dir}/test/cfg/blm3.service          ${pkg_dir}${install_home_path}/cfg ||:
+fi
 
 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

packaging/release.sh

@@ -213,7 +213,7 @@ else
   exit 1
 fi
 
-make -j8
+make -j8 && ${csudo} make install
 
 cd ${curr_dir}
 

packaging/rpm/tdengine.spec

@@ -57,6 +57,9 @@ cp %{_compiledir}/../packaging/cfg/taos.cfg         %{buildroot}%{homepath}/cfg
 if [ -f %{_compiledir}/test/cfg/blm.toml ]; then
     cp %{_compiledir}/test/cfg/blm.toml         %{buildroot}%{homepath}/cfg
 fi
+if [ -f %{_compiledir}/test/cfg/blm3.service ]; then
+    cp %{_compiledir}/test/cfg/blm3.service %{buildroot}%{homepath}/cfg
+fi
 cp %{_compiledir}/../packaging/rpm/taosd            %{buildroot}%{homepath}/init.d
 cp %{_compiledir}/../packaging/tools/post.sh        %{buildroot}%{homepath}/script
 cp %{_compiledir}/../packaging/tools/preun.sh       %{buildroot}%{homepath}/script
@@ -153,16 +156,21 @@ if pidof taosd &> /dev/null; then
     echo "Stop taosd service success!"
     sleep 1
 fi
-# if taos.cfg already softlink, remove it
+# if taos.cfg already exist, remove it
 if [ -f %{cfg_install_dir}/taos.cfg ]; then
     ${csudo} rm -f %{homepath}/cfg/taos.cfg   || :
 fi
 
-# if blm.toml already softlink, remove it
+# if blm.toml already exist, remove it
 if [ -f %{cfg_install_dir}/blm.toml ]; then
     ${csudo} rm -f %{homepath}/cfg/blm.toml || :
 fi
 
+# if blm3.service already softlink, remove it
+if [ -f %{cfg_install_dir}/blm3.service ]; then
+    ${csudo} rm -f %{homepath}/cfg/blm3.service || :
+fi
+
 # there can not libtaos.so*, otherwise ln -s  error
 ${csudo} rm -f %{homepath}/driver/libtaos*   || :
 

packaging/tools/install.sh

@@ -679,8 +679,8 @@ function install_service_on_systemd() {
     taosd_service_config="${service_config_dir}/taosd.service"
     ${csudo} bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
+    ${csudo} bash -c "echo 'After=network-online.target blm3.service'        >> ${taosd_service_config}"
+    ${csudo} bash -c "echo 'Wants=network-online.target blm3.service'        >> ${taosd_service_config}"
     ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
     ${csudo} bash -c "echo '[Service]'                          >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
@@ -756,6 +756,11 @@ function install_service_on_systemd() {
     fi
 }
 
+function install_blm3_service() {
+    [ -f ${script_dir}/cfg/blm3.service ] &&\
+        ${csudo} cp ${script_dir}/cfg/blm3.service ${service_config_dir}/
+}
+
 function install_service() {
     if ((${service_mod}==0)); then
         install_service_on_systemd
@@ -878,6 +883,7 @@ function update_TDengine() {
     if [ -z $1 ]; then
         install_bin
         install_service
+        install_blm3_service
         install_config
         install_blm3_config
 
@@ -959,6 +965,7 @@ function install_TDengine() {
         # For installing new
         install_bin
         install_service
+        install_blm3_service
 
         openresty_work=false
         if [ "$verMode" == "cluster" ]; then

packaging/tools/make_install.sh

@@ -503,8 +503,8 @@ function install_service_on_systemd() {
 
     ${csudo} bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
+    ${csudo} bash -c "echo 'After=network-online.target blm3.service'        >> ${taosd_service_config}"
+    ${csudo} bash -c "echo 'Wants=network-online.target blm3.service'        >> ${taosd_service_config}"
     ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
     ${csudo} bash -c "echo '[Service]'                          >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
@@ -525,6 +525,11 @@ function install_service_on_systemd() {
     ${csudo} systemctl enable taosd
 }
 
+function install_blm3_service() {
+    [ -f ${script_dir}/cfg/blm3.service ] &&\
+        ${csudo} cp ${script_dir}/cfg/blm3.service ${service_config_dir}/
+}
+
 function install_service() {
     if ((${service_mod}==0)); then
         install_service_on_systemd
@@ -566,6 +571,7 @@ function update_TDengine() {
 
     if [ "$osType" != "Darwin" ]; then
         install_service
+        install_blm3_service
     fi
 
     install_config
@@ -620,6 +626,7 @@ function install_TDengine() {
 
     if [ "$osType" != "Darwin" ]; then
         install_service
+        install_blm3_service
     fi
 
     install_config

packaging/tools/post.sh

@@ -444,8 +444,8 @@ function install_service_on_systemd() {
 
     ${csudo} bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
+    ${csudo} bash -c "echo 'After=network-online.target blm3.service'        >> ${taosd_service_config}"
+    ${csudo} bash -c "echo 'Wants=network-online.target blm3.service'        >> ${taosd_service_config}"
     ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
     ${csudo} bash -c "echo '[Service]'                          >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
@@ -466,6 +466,11 @@ function install_service_on_systemd() {
     ${csudo} systemctl enable taosd
 }
 
+function install_blm3_service() {
+    [ -f ${script_dir}/cfg/blm3.service ] &&\
+        ${csudo} cp ${script_dir}/cfg/blm3.service ${service_config_dir}/
+}
+
 function install_service() {
     if ((${service_mod}==0)); then
         install_service_on_systemd
@@ -497,6 +502,7 @@ function install_TDengine() {
     install_avro_lib
     install_bin
     install_service
+    install_blm3_service
     install_config
     install_blm3_config
 

packaging/tools/preun.sh

@@ -58,6 +58,12 @@ function kill_taosd() {
 }
 
 function clean_service_on_systemd() {
+    blm3_service_config="${service_config_dir}/blm3.service"
+    if systemctl is-active --quiet blm3; then
+        echo "blm3 is running, stopping it..."
+        ${csudo} systemctl stop blm3 &> /dev/null || echo &> /dev/null
+    fi
+
     taosd_service_config="${service_config_dir}/${taos_service_name}.service"
 
     if systemctl is-active --quiet ${taos_service_name}; then
@@ -67,6 +73,9 @@ function clean_service_on_systemd() {
     ${csudo} systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null
 
     ${csudo} rm -f ${taosd_service_config}
+
+    [ -f ${blm3_service_config} ] && ${csudo} rm -f ${blm3_service_config}
+
 }
 
 function clean_service_on_sysvinit() {

packaging/tools/remove.sh

@@ -111,12 +111,14 @@ function clean_log() {
 
 function clean_service_on_systemd() {
     taosd_service_config="${service_config_dir}/${taos_service_name}.service"
+    blm3_service_config="${service_config_dir}/blm3.service"
     if systemctl is-active --quiet ${taos_service_name}; then
         echo "TDengine taosd is running, stopping it..."
         ${csudo} systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null
     fi
     ${csudo} systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null
     ${csudo} rm -f ${taosd_service_config}
+    [ -f ${blm3_service_config} ] && ${sudo} rm -f ${blm3_service_config}
 
     tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
     if systemctl is-active --quiet ${tarbitrator_service_name}; then

packaging/tools/startPre.sh

@@ -48,4 +48,3 @@ if [ ${coreFlag} = "unlimited" ];then
   fi
 fi
 
-/usr/bin/blm3 &

src/client/inc/tscParseLine.h

@@ -66,8 +66,7 @@ typedef struct {
 
   int32_t affectedRows;
 } SSmlLinesInfo;
-
-void addEscapeCharToString(char *str, int32_t len);
+char* addEscapeCharToString(char *str, int32_t len);
 int tscSmlInsert(TAOS* taos, TAOS_SML_DATA_POINT* points, int numPoint, SSmlLinesInfo* info);
 bool checkDuplicateKey(char *key, SHashObj *pHash, SSmlLinesInfo* info);
 bool isValidInteger(char *str);

src/client/src/tscParseLineProtocol.c

@@ -1178,13 +1178,14 @@ static void escapeSpecialCharacter(uint8_t field, const char **pos) {
   *pos = cur;
 }
 
-void addEscapeCharToString(char *str, int32_t len) {
+char* addEscapeCharToString(char *str, int32_t len) {
   if (str == NULL) {
-    return;
+    return NULL;
   }
   memmove(str + 1, str, len);
   str[0] = str[len + 1] = TS_ESCAPE_CHAR;
   str[len + 2] = '\0';
+  return str;
 }
 
 bool isValidInteger(char *str) {
@@ -1908,8 +1909,6 @@ static int32_t parseSmlKey(TAOS_SML_KV *pKV, const char **index, SHashObj *pHash
     }
     //Escape special character
     if (*cur == '\\') {
-      //TODO: escape will work after column & tag
-      //support spcial characters
       escapeSpecialCharacter(2, &cur);
     }
     key[len] = *cur;
@@ -1986,6 +1985,7 @@ static int32_t parseSmlValue(TAOS_SML_KV *pKV, const char **index,
     //Escape special character
     if (*cur == '\\') {
       escapeSpecialCharacter(isTag ? 2 : 3, &cur);
+      len++;
     }
     cur++;
     len++;
@@ -2108,6 +2108,13 @@ static int32_t parseSmlKvPairs(TAOS_SML_KV **pKVs, int *num_kvs,
     pkv = *pKVs;
   }
 
+  size_t childTableNameLen = strlen(tsSmlChildTableName);
+  char childTableName[TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE] = {0};
+  if (childTableNameLen != 0) {
+    memcpy(childTableName, tsSmlChildTableName, childTableNameLen);
+    addEscapeCharToString(childTableName, (int32_t)(childTableNameLen));
+  }
+
   while (*cur != '\0') {
     ret = parseSmlKey(pkv, &cur, pHash, info);
     if (ret) {
@@ -2119,7 +2126,8 @@ static int32_t parseSmlKvPairs(TAOS_SML_KV **pKVs, int *num_kvs,
       tscError("SML:0x%"PRIx64" Unable to parse value", info->id);
       goto error;
     }
-    if (!isField && (strcasecmp(pkv->key, "`ID`") == 0)) {
+
+    if (!isField && childTableNameLen != 0 && strcasecmp(pkv->key, childTableName) == 0)  {
       smlData->childTableName = malloc(pkv->length + TS_ESCAPE_CHAR_SIZE + 1);
       memcpy(smlData->childTableName, pkv->value, pkv->length);
       strntolower_s(smlData->childTableName, smlData->childTableName, (int32_t)pkv->length);

src/client/src/tscParseOpenTSDB.c

@@ -305,6 +305,12 @@ static int32_t parseTelnetTagKvs(TAOS_SML_KV **pKVs, int *num_kvs,
   *pKVs = tcalloc(capacity, sizeof(TAOS_SML_KV));
   pkv = *pKVs;
 
+  size_t childTableNameLen = strlen(tsSmlChildTableName);
+  char childTbName[TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE] = {0};
+  if (childTableNameLen != 0) {
+    memcpy(childTbName, tsSmlChildTableName, childTableNameLen);
+    addEscapeCharToString(childTbName, (int32_t)(childTableNameLen));
+  }
   while (*cur != '\0') {
     ret = parseTelnetTagKey(pkv, &cur, pHash, info);
     if (ret) {
@@ -316,7 +322,7 @@ static int32_t parseTelnetTagKvs(TAOS_SML_KV **pKVs, int *num_kvs,
       tscError("OTD:0x%"PRIx64" Unable to parse value", info->id);
       return ret;
     }
-    if ((strcasecmp(pkv->key, "`ID`") == 0)) {
+    if (childTableNameLen != 0 && strcasecmp(pkv->key, childTbName) == 0) {
       *childTableName = tcalloc(pkv->length + TS_ESCAPE_CHAR_SIZE + 1, 1);
       memcpy(*childTableName, pkv->value, pkv->length);
       (*childTableName)[pkv->length] = '\0';
@@ -892,26 +898,33 @@ static int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs,
   if (tags == NULL || tags->type != cJSON_Object) {
     return TSDB_CODE_TSC_INVALID_JSON;
   }
-  //only pick up the first ID value as child table name
-  cJSON *id = cJSON_GetObjectItem(tags, "ID");
-  if (id != NULL) {
-    if (!cJSON_IsString(id)) {
-      tscError("OTD:0x%"PRIx64" ID must be JSON string", info->id);
-      return TSDB_CODE_TSC_INVALID_JSON;
-    }
-    size_t idLen = strlen(id->valuestring);
-    *childTableName = tcalloc(idLen + TS_ESCAPE_CHAR_SIZE + 1, sizeof(char));
-    memcpy(*childTableName, id->valuestring, idLen);
-    strntolower_s(*childTableName, *childTableName, (int32_t)idLen);
-    addEscapeCharToString(*childTableName, (int32_t)idLen);
-
-    //check duplicate IDs
-    cJSON_DeleteItemFromObject(tags, "ID");
-    id = cJSON_GetObjectItem(tags, "ID");
+
+  //handle child table name
+  size_t childTableNameLen = strlen(tsSmlChildTableName);
+  char childTbName[TSDB_TABLE_NAME_LEN] = {0};
+  if (childTableNameLen != 0) {
+    memcpy(childTbName, tsSmlChildTableName, childTableNameLen);
+    cJSON *id = cJSON_GetObjectItem(tags, childTbName);
     if (id != NULL) {
-      return TSDB_CODE_TSC_DUP_TAG_NAMES;
+      if (!cJSON_IsString(id)) {
+        tscError("OTD:0x%"PRIx64" ID must be JSON string", info->id);
+        return TSDB_CODE_TSC_INVALID_JSON;
+      }
+      size_t idLen = strlen(id->valuestring);
+      *childTableName = tcalloc(idLen + TS_ESCAPE_CHAR_SIZE + 1, sizeof(char));
+      memcpy(*childTableName, id->valuestring, idLen);
+      strntolower_s(*childTableName, *childTableName, (int32_t)idLen);
+      addEscapeCharToString(*childTableName, (int32_t)idLen);
+
+      //check duplicate IDs
+      cJSON_DeleteItemFromObject(tags, childTbName);
+      id = cJSON_GetObjectItem(tags, childTbName);
+      if (id != NULL) {
+        return TSDB_CODE_TSC_DUP_TAG_NAMES;
+      }
     }
   }
+
   int32_t tagNum = cJSON_GetArraySize(tags);
   //at least one tag pair required
   if (tagNum <= 0) {

src/common/inc/tglobal.h

@@ -235,6 +235,7 @@ extern int8_t tsDeadLockKillQuery;
 
 // schemaless
 extern char tsDefaultJSONStrType[];
+extern char tsSmlChildTableName[];
 
 
 typedef struct {

src/common/src/tglobal.c

@@ -290,6 +290,7 @@ int8_t tsDeadLockKillQuery = 0;
 
 // default JSON string type
 char tsDefaultJSONStrType[7] = "binary";
+char tsSmlChildTableName[TSDB_TABLE_NAME_LEN] = ""; //user defined child table name can be specified in tag value. If set to empty system will generate table name using MD5 hash.
 
 int32_t (*monStartSystemFp)() = NULL;
 void (*monStopSystemFp)() = NULL;
@@ -1678,6 +1679,17 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
+  // child talbe name specified in schemaless tag value
+  cfg.option = "smlChildTableName";
+  cfg.ptr = tsSmlChildTableName;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = tListLen(tsSmlChildTableName);
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
   // flush vnode wal file if walSize > walFlushSize and walSize > cache*0.5*blocks
   cfg.option = "walFlushSize";
   cfg.ptr = &tsdbWalFlushSize;

src/connector/jdbc/CMakeLists.txt

@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
   ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
     POST_BUILD
     COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.35-dist.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.36-dist.jar ${LIBRARY_OUTPUT_PATH}
     COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
     COMMENT "build jdbc driver")
   ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})

src/connector/jdbc/deploy-pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>2.0.35</version>
+  <version>2.0.36</version>
   <packaging>jar</packaging>
 
   <name>JDBCDriver</name>

src/connector/jdbc/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.taosdata.jdbc</groupId>
     <artifactId>taos-jdbcdriver</artifactId>
-    <version>2.0.35</version>
+    <version>2.0.36</version>
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
     <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
@@ -58,6 +58,13 @@
             <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -70,6 +77,18 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java

@@ -135,7 +135,6 @@ public class TSDBDriver extends AbstractDriver {
             TSDBJNIConnector.init(props);
             return new TSDBConnection(props, this.dbMetaData);
         } catch (SQLWarning sqlWarning) {
-            sqlWarning.printStackTrace();
             return new TSDBConnection(props, this.dbMetaData);
         } catch (SQLException sqlEx) {
             throw sqlEx;

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java

@@ -50,9 +50,13 @@ public class RestfulDriver extends AbstractDriver {
             String password = URLEncoder.encode(props.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD), StandardCharsets.UTF_8.displayName());
             loginUrl = "http://" + props.getProperty(TSDBDriver.PROPERTY_KEY_HOST) + ":" + props.getProperty(TSDBDriver.PROPERTY_KEY_PORT) + "/rest/login/" + user + "/" + password + "";
         } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE, "unsupported UTF-8 concoding, user: " + props.getProperty(TSDBDriver.PROPERTY_KEY_USER) + ", password: " + props.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD));
         }
 
+        int poolSize = Integer.valueOf(props.getProperty("httpPoolSize", HttpClientPoolUtil.DEFAULT_MAX_PER_ROUTE));
+        boolean keepAlive = Boolean.valueOf(props.getProperty("httpKeepAlive", HttpClientPoolUtil.DEFAULT_HTTP_KEEP_ALIVE));
+
+        HttpClientPoolUtil.init(poolSize, keepAlive);
         String result = HttpClientPoolUtil.execute(loginUrl);
         JSONObject jsonResult = JSON.parseObject(result);
         String status = jsonResult.getString("status");

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/HttpClientPoolUtil.java

@@ -9,6 +9,7 @@ import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.*;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -22,15 +23,17 @@ import org.apache.http.util.EntityUtils;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
 
 public class HttpClientPoolUtil {
 
     private static final String DEFAULT_CONTENT_TYPE = "application/json";
     private static final int DEFAULT_MAX_RETRY_COUNT = 5;
 
-    private static final int DEFAULT_MAX_TOTAL = 50;
-    private static final int DEFAULT_MAX_PER_ROUTE = 5;
+    public static final String DEFAULT_HTTP_KEEP_ALIVE = "true";
+    public static final String DEFAULT_MAX_PER_ROUTE = "20";
     private static final int DEFAULT_HTTP_KEEP_TIME = -1;
+    private static String isKeepAlive;
 
     private static final ConnectionKeepAliveStrategy DEFAULT_KEEP_ALIVE_STRATEGY = (response, context) -> {
         HeaderElementIterator it = new BasicHeaderElementIterator(response.headerIterator(HTTP.CONN_KEEP_ALIVE));
@@ -48,37 +51,41 @@ public class HttpClientPoolUtil {
         return DEFAULT_HTTP_KEEP_TIME * 1000;
     };
 
-    private static final CloseableHttpClient httpClient;
+    private static CloseableHttpClient httpClient;
 
-    static {
-        PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
-        connectionManager.setMaxTotal(DEFAULT_MAX_TOTAL);
-        connectionManager.setDefaultMaxPerRoute(DEFAULT_MAX_PER_ROUTE);
-
-        httpClient = HttpClients.custom()
-                .setKeepAliveStrategy(DEFAULT_KEEP_ALIVE_STRATEGY)
-                .setConnectionManager(connectionManager)
-                .setRetryHandler((exception, executionCount, httpContext) -> executionCount < DEFAULT_MAX_RETRY_COUNT)
-                .build();
+    public static void init(Integer connPoolSize, boolean keepAlive) {
+        if (httpClient == null) {
+            synchronized (HttpClientPoolUtil.class) {
+                if (httpClient == null) {
+                    isKeepAlive = keepAlive ? HTTP.CONN_KEEP_ALIVE : HTTP.CONN_CLOSE;
+                    PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
+                    connectionManager.setMaxTotal(connPoolSize * 10);
+                    connectionManager.setDefaultMaxPerRoute(connPoolSize);
+                    httpClient = HttpClients.custom()
+                            .setKeepAliveStrategy(DEFAULT_KEEP_ALIVE_STRATEGY)
+                            .setConnectionManager(connectionManager)
+                            .setRetryHandler((exception, executionCount, httpContext) -> executionCount < DEFAULT_MAX_RETRY_COUNT)
+                            .build();
+                }
+            }
+        }
     }
 
     /*** execute GET request ***/
     public static String execute(String uri) throws SQLException {
         HttpEntity httpEntity = null;
         String responseBody = "";
-        try {
-            HttpRequestBase method = getRequest(uri, HttpGet.METHOD_NAME);
-            HttpContext context = HttpClientContext.create();
-            CloseableHttpResponse httpResponse = httpClient.execute(method, context);
+        HttpRequestBase method = getRequest(uri, HttpGet.METHOD_NAME);
+        HttpContext context = HttpClientContext.create();
+
+        try (CloseableHttpResponse httpResponse = httpClient.execute(method, context)) {
             httpEntity = httpResponse.getEntity();
             if (httpEntity != null) {
                 responseBody = EntityUtils.toString(httpEntity, StandardCharsets.UTF_8);
             }
         } catch (ClientProtocolException e) {
-            e.printStackTrace();
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESTFul_Client_Protocol_Exception, e.getMessage());
         } catch (IOException exception) {
-            exception.printStackTrace();
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESTFul_Client_IOException, exception.getMessage());
         } finally {
             if (httpEntity != null) {
@@ -88,30 +95,27 @@ public class HttpClientPoolUtil {
         return responseBody;
     }
 
-
     /*** execute POST request ***/
     public static String execute(String uri, String data, String token) throws SQLException {
+
+        HttpEntityEnclosingRequestBase method = (HttpEntityEnclosingRequestBase) getRequest(uri, HttpPost.METHOD_NAME);
+        method.setHeader(HTTP.CONTENT_TYPE, "text/plain");
+        method.setHeader(HTTP.CONN_DIRECTIVE, isKeepAlive);
+        method.setHeader("Authorization", "Taosd " + token);
+        method.setEntity(new StringEntity(data, StandardCharsets.UTF_8));
+        HttpContext context = HttpClientContext.create();
+
         HttpEntity httpEntity = null;
         String responseBody = "";
-        try {
-            HttpEntityEnclosingRequestBase method = (HttpEntityEnclosingRequestBase) getRequest(uri, HttpPost.METHOD_NAME);
-            method.setHeader(HTTP.CONTENT_TYPE, "text/plain");
-            method.setHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE);
-            method.setHeader("Authorization", "Taosd " + token);
-
-            method.setEntity(new StringEntity(data, StandardCharsets.UTF_8));
-            HttpContext context = HttpClientContext.create();
-            CloseableHttpResponse httpResponse = httpClient.execute(method, context);
+        try (CloseableHttpResponse httpResponse = httpClient.execute(method, context)) {
             httpEntity = httpResponse.getEntity();
             if (httpEntity == null) {
                 throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_HTTP_ENTITY_IS_NULL, "httpEntity is null, sql: " + data);
             }
             responseBody = EntityUtils.toString(httpEntity, StandardCharsets.UTF_8);
         } catch (ClientProtocolException e) {
-            e.printStackTrace();
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESTFul_Client_Protocol_Exception, e.getMessage());
         } catch (IOException exception) {
-            exception.printStackTrace();
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESTFul_Client_IOException, exception.getMessage());
         } finally {
             if (httpEntity != null) {
@@ -142,4 +146,12 @@ public class HttpClientPoolUtil {
         return method;
     }
 
+
+    public static void reset() {
+        synchronized (HttpClientPoolUtil.class) {
+            ClientConnectionManager cm = httpClient.getConnectionManager();
+            cm.closeExpiredConnections();
+            cm.closeIdleConnections(100, TimeUnit.MILLISECONDS);
+        }
+    }
 }
\ No newline at end of file

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TaosInfo.java

@@ -16,7 +16,6 @@ public class TaosInfo implements TaosInfoMBean {
             MBeanServer server = ManagementFactory.getPlatformMBeanServer();
             ObjectName name = new ObjectName("TaosInfoMBean:name=TaosInfo");
             server.registerMBean(TaosInfo.getInstance(), name);
-
         } catch (MalformedObjectNameException | InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException e) {
             e.printStackTrace();
         }

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java

@@ -49,14 +49,9 @@ public class Utils {
             try {
                 return parseMicroSecTimestamp(timeStampStr);
             } catch (DateTimeParseException ee) {
-                try {
-                    return parseNanoSecTimestamp(timeStampStr);
-                } catch (DateTimeParseException eee) {
-                    eee.printStackTrace();
-                }
+                return parseNanoSecTimestamp(timeStampStr);
             }
         }
-        return null;
     }
 
     private static LocalDateTime parseMilliSecTimestamp(String timeStampStr) throws DateTimeParseException {

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/HttpKeepAliveTest.java

+package com.taosdata.jdbc.rs;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class HttpKeepAliveTest {
+
+    private static final String host = "127.0.0.1";
+
+    @Test
+    public void test() throws SQLException {
+        //given
+        int multi = 4000;
+        AtomicInteger exceptionCount = new AtomicInteger();
+
+        //when
+        Properties props = new Properties();
+        props.setProperty("httpKeepAlive", "false");
+        props.setProperty("httpPoolSize", "20");
+        Connection connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata", props);
+
+        List<Thread> threads = IntStream.range(0, multi).mapToObj(i -> new Thread(
+                () -> {
+                    try (Statement stmt = connection.createStatement()) {
+                        stmt.execute("insert into log.tb_not_exists values(now, 1)");
+                        stmt.execute("select last(*) from log.dn");
+                    } catch (SQLException throwables) {
+                        exceptionCount.getAndIncrement();
+                    }
+                }
+        )).collect(Collectors.toList());
+
+        threads.forEach(Thread::start);
+
+        for (Thread thread : threads) {
+            try {
+                thread.join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        //then
+        Assert.assertEquals(multi, exceptionCount.get());
+    }
+
+}

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/WasNullTest.java

@@ -6,8 +6,7 @@ import java.sql.*;
 
 public class WasNullTest {
 
-    //    private static final String host = "127.0.0.1";
-    private static final String host = "master";
+    private static final String host = "127.0.0.1";
     private Connection conn;
 
 

src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/HttpClientPoolUtilTest.java

@@ -2,7 +2,6 @@ package com.taosdata.jdbc.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.taosdata.jdbc.TSDBError;
 import org.junit.Test;
 
 import java.io.UnsupportedEncodingException;
@@ -18,13 +17,21 @@ public class HttpClientPoolUtilTest {
     String user = "root";
     String password = "taosdata";
     String host = "127.0.0.1";
-    String dbname = "log";
+//    String host = "master";
 
     @Test
-    public void test() {
+    public void useLog() {
         // given
-        List<Thread> threads = IntStream.range(0, 4000).mapToObj(i -> new Thread(() -> {
-            useDB();
+        int multi = 10;
+
+        // when
+        List<Thread> threads = IntStream.range(0, multi).mapToObj(i -> new Thread(() -> {
+            try {
+                String token = login(multi);
+                executeOneSql("use log", token);
+            } catch (SQLException | UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
         })).collect(Collectors.toList());
 
         threads.forEach(Thread::start);
@@ -38,31 +45,60 @@ public class HttpClientPoolUtilTest {
         }
     }
 
-    private void useDB() {
-        try {
-            user = URLEncoder.encode(user, StandardCharsets.UTF_8.displayName());
-            password = URLEncoder.encode(password, StandardCharsets.UTF_8.displayName());
-            String loginUrl = "http://" + host + ":" + 6041 + "/rest/login/" + user + "/" + password + "";
-            String result = HttpClientPoolUtil.execute(loginUrl);
-            JSONObject jsonResult = JSON.parseObject(result);
-            String status = jsonResult.getString("status");
-            String token = jsonResult.getString("desc");
-            if (!status.equals("succ")) {
-                throw new SQLException(jsonResult.getString("desc"));
+    @Test
+    public void tableNotExist() {
+        // given
+        int multi = 20;
+
+        // when
+        List<Thread> threads = IntStream.range(0, multi * 25).mapToObj(i -> new Thread(() -> {
+            try {
+//                String token = "/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04";
+                String token = login(multi);
+                executeOneSql("insert into log.tb_not_exist values(now, 1)", token);
+                executeOneSql("select last(*) from log.dn", token);
+            } catch (SQLException | UnsupportedEncodingException e) {
+                e.printStackTrace();
             }
+        })).collect(Collectors.toList());
 
-            String url = "http://" + host + ":6041/rest/sql";
-            String sql = "use " + dbname;
-            result = HttpClientPoolUtil.execute(url, sql, token);
+        threads.forEach(Thread::start);
 
-            JSONObject resultJson = JSON.parseObject(result);
-            if (resultJson.getString("status").equals("error")) {
-                throw TSDBError.createSQLException(resultJson.getInteger("code"), resultJson.getString("desc"));
+        for (Thread thread : threads) {
+            try {
+                thread.join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
             }
-        } catch (UnsupportedEncodingException | SQLException e) {
-            e.printStackTrace();
         }
     }
 
+    private String login(int connPoolSize) throws SQLException, UnsupportedEncodingException {
+        user = URLEncoder.encode(user, StandardCharsets.UTF_8.displayName());
+        password = URLEncoder.encode(password, StandardCharsets.UTF_8.displayName());
+        String loginUrl = "http://" + host + ":" + 6041 + "/rest/login/" + user + "/" + password + "";
+        HttpClientPoolUtil.init(connPoolSize, false);
+        String result = HttpClientPoolUtil.execute(loginUrl);
+        JSONObject jsonResult = JSON.parseObject(result);
+        String status = jsonResult.getString("status");
+        String token = jsonResult.getString("desc");
+        if (!status.equals("succ")) {
+            throw new SQLException(jsonResult.getString("desc"));
+        }
+        return token;
+    }
+
+    private boolean executeOneSql(String sql, String token) throws SQLException {
+        String url = "http://" + host + ":6041/rest/sql";
+        String result = HttpClientPoolUtil.execute(url, sql, token);
+        JSONObject resultJson = JSON.parseObject(result);
+        if (resultJson.getString("status").equals("error")) {
+//            HttpClientPoolUtil.reset();
+//            throw TSDBError.createSQLException(resultJson.getInteger("code"), resultJson.getString("desc"));
+            return false;
+        }
+        return true;
+    }
+
 
 }
\ No newline at end of file

src/connector/jdbc/src/test/resources/commons-logging.properties

+#org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
+

src/connector/jdbc/src/test/resources/simplelog.properties

+org.apache.commons.logging.simplelog.defaultlog=TRACE
+org.apache.commons.logging.simplelog.showlogname=true
+org.apache.commons.logging.simplelog.showShortLogname=restful
+org.apache.commons.logging.simplelog.showdatetime=true
+org.apache.commons.logging.simplelog.dateTimeFormat=yyyy-mm-dd hh:MM:ss.SSS
\ No newline at end of file

src/connector/python/README.md

@@ -5,14 +5,27 @@
 
 ## Install
 
-```sh
-git clone --depth 1 https://github.com/taosdata/TDengine.git
-pip install ./TDengine/src/connector/python
+You can use `pip` to install the connector from PyPI:
+
+```bash
+pip install taospy
+```
+
+Or with git url:
+
+```bash
+pip install git+https://github.com/taosdata/taos-connector-python.git
+```
+
+If you have installed TDengine server or client with prebuilt packages, then you can install the connector from path:
+
+```bash
+pip install /usr/local/taos/connector/python
 ```
 
 ## Source Code
 
-[TDengine](https://github.com/taosdata/TDengine) connector for Python source code is hosted on [GitHub](https://github.com/taosdata/TDengine/tree/develop/src/connector/python).
+[TDengine](https://github.com/taosdata/TDengine) connector for Python source code is hosted on [GitHub](https://github.com/taosdata/taos-connector-python).
 
 ## Examples
 

src/connector/python/pyproject.toml

 [tool.poetry]
-name = "taos"
-version = "2.1.1"
+name = "taospy"
+version = "2.1.2"
 description = "TDengine connector for python"
 authors = ["Taosdata Inc. <support@taosdata.com>"]
 license = "AGPL-3.0"
 readme = "README.md"
+packages = [
+  {include = "taos"}
+]
 
 [tool.poetry.dependencies]
 python = "^2.7 || ^3.4"
@@ -12,12 +15,12 @@ typing = "*"
 
 [tool.poetry.dev-dependencies]
 pytest = [
-  { version = "^4.6", python = "^2.7" },
-  { version = "^6.2", python = "^3.7" }
+  { version = "^4.6", python = ">=2.7,<3.0" },
+  { version = "^6.2", python = ">=3.7,<4.0" }
 ]
 pdoc = { version = "^7.1.1", python = "^3.7" }
 mypy = { version = "^0.910", python = "^3.6" }
-black = { version = "^21.7b0", python = "^3.6" }
+black = [{ version = "^21.*", python = ">=3.6.2,<4.0" }]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

src/connector/python/taos/__init__.py

@@ -442,18 +442,14 @@ from .statement import *
 from .subscription import *
 from .schemaless import *
 
-try:
-    import importlib.metadata
-
-    __version__ = importlib.metadata.version("taos")
-except:
-    None
+from taos._version import __version__
 
 # Globals
 threadsafety = 0
 paramstyle = "pyformat"
 
 __all__ = [
+    "__version__",
     # functions
     "connect",
     "new_bind_param",

src/connector/python/taos/_version.py

+__version__ = '2.1.2'

src/connector/python/taos/cinterface.py

@@ -2,8 +2,9 @@
 
 import ctypes
 import platform
-import sys
+import inspect
 from ctypes import *
+
 try:
     from typing import Any
 except:
@@ -14,6 +15,7 @@ from .bind import *
 from .field import *
 from .schemaless import *
 
+_UNSUPPORTED = {}
 
 # stream callback
 stream_callback_type = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p)
@@ -47,10 +49,13 @@ def _load_taos():
         "Darwin": _load_taos_darwin,
         "Windows": _load_taos_windows,
     }
+    pf = platform.system()
+    if load_func[pf] is None:
+        raise InterfaceError("unsupported platform: %s" % pf)
     try:
-        return load_func[platform.system()]()
-    except:
-        raise InterfaceError('unsupported platform or failed to load taos client library')
+        return load_func[pf]()
+    except Exception as err:
+        raise InterfaceError("unable to load taos C library: %s" % err)
 
 
 _libtaos = _load_taos()
@@ -65,7 +70,6 @@ _libtaos.taos_consume.restype = ctypes.c_void_p
 _libtaos.taos_fetch_lengths.restype = ctypes.POINTER(ctypes.c_int)
 _libtaos.taos_free_result.restype = None
 _libtaos.taos_query.restype = ctypes.POINTER(ctypes.c_void_p)
-_libtaos.taos_schemaless_insert.restype = ctypes.c_void_p
 
 try:
     _libtaos.taos_stmt_errstr.restype = c_char_p
@@ -181,6 +185,7 @@ def taos_connect(host=None, user="root", password="taosdata", db=None, port=0):
         raise ConnectionError("connect to TDengine failed")
     return connection
 
+
 _libtaos.taos_connect_auth.restype = c_void_p
 _libtaos.taos_connect_auth.argtypes = c_char_p, c_char_p, c_char_p, c_char_p, c_uint16
 
@@ -236,6 +241,7 @@ def taos_connect_auth(host=None, user="root", auth="", db=None, port=0):
         raise ConnectionError("connect to TDengine failed")
     return connection
 
+
 _libtaos.taos_query.restype = c_void_p
 _libtaos.taos_query.argtypes = c_void_p, c_char_p
 
@@ -287,6 +293,7 @@ def taos_affected_rows(result):
     """The affected rows after runing query"""
     return _libtaos.taos_affected_rows(result)
 
+
 subscribe_callback_type = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p, c_int)
 _libtaos.taos_subscribe.restype = c_void_p
 # _libtaos.taos_subscribe.argtypes = c_void_p, c_int, c_char_p, c_char_p, subscribe_callback_type, c_void_p, c_int
@@ -317,7 +324,7 @@ def taos_subscribe(connection, restart, topic, sql, interval, callback=None, par
 
 
 _libtaos.taos_consume.restype = c_void_p
-_libtaos.taos_consume.argstype = c_void_p,
+_libtaos.taos_consume.argstype = (c_void_p,)
 
 
 def taos_consume(sub):
@@ -503,13 +510,17 @@ def taos_stop_query(result):
     return _libtaos.taos_stop_query(result)
 
 
-_libtaos.taos_load_table_info.restype = c_int
-_libtaos.taos_load_table_info.argstype = (c_void_p, c_char_p)
+try:
+    _libtaos.taos_load_table_info.restype = c_int
+    _libtaos.taos_load_table_info.argstype = (c_void_p, c_char_p)
+except Exception as err:
+    _UNSUPPORTED["taos_open_stream"] = err
 
 
 def taos_load_table_info(connection, tables):
     # type: (ctypes.c_void_p, str) -> None
     """Stop current query"""
+    _check_if_supported()
     errno = _libtaos.taos_load_table_info(connection, c_char_p(tables.encode("utf-8")))
     if errno != 0:
         msg = taos_errstr()
@@ -562,12 +573,13 @@ def taos_select_db(connection, db):
 try:
     _libtaos.taos_open_stream.restype = c_void_p
     _libtaos.taos_open_stream.argstype = c_void_p, c_char_p, stream_callback_type, c_int64, c_void_p, Any
-except:
-    pass
+except Exception as err:
+    _UNSUPPORTED["taos_open_stream"] = err
 
 
 def taos_open_stream(connection, sql, callback, stime=0, param=None, callback2=None):
     # type: (ctypes.c_void_p, str, stream_callback_type, c_int64, c_void_p, c_void_p) -> ctypes.pointer
+    _check_if_supported()
     if callback2 != None:
         callback2 = stream_callback2_type(callback2)
     """Open an stream"""
@@ -600,6 +612,7 @@ def taos_stmt_init(connection):
     """
     return c_void_p(_libtaos.taos_stmt_init(connection))
 
+
 _libtaos.taos_stmt_prepare.restype = c_int
 _libtaos.taos_stmt_prepare.argstype = (c_void_p, c_char_p, c_int)
 
@@ -618,6 +631,7 @@ def taos_stmt_prepare(stmt, sql):
 _libtaos.taos_stmt_close.restype = c_int
 _libtaos.taos_stmt_close.argstype = (c_void_p,)
 
+
 def taos_stmt_close(stmt):
     # type: (ctypes.c_void_p) -> None
     """Close a statement query
@@ -627,17 +641,12 @@ def taos_stmt_close(stmt):
     if res != 0:
         raise StatementError(msg=taos_stmt_errstr(stmt), errno=res)
 
-try:
-    _libtaos.taos_stmt_errstr.restype = c_char_p
-    _libtaos.taos_stmt_errstr.argstype = (c_void_p,)
-except AttributeError:
-    print("WARNING: libtaos(%s) does not support taos_stmt_errstr" % taos_get_client_info())
 
 try:
     _libtaos.taos_stmt_errstr.restype = c_char_p
     _libtaos.taos_stmt_errstr.argstype = (c_void_p,)
-except AttributeError:
-    print("WARNING: libtaos(%s) does not support taos_stmt_errstr" % taos_get_client_info())
+except Exception as err:
+    _UNSUPPORTED["taos_stmt_set_tbname"] = err
 
 
 def taos_stmt_errstr(stmt):
@@ -645,16 +654,17 @@ def taos_stmt_errstr(stmt):
     """Get error message from stetement query
     @stmt: c_void_p TAOS_STMT*
     """
+    _check_if_supported()
     err = c_char_p(_libtaos.taos_stmt_errstr(stmt))
     if err:
         return err.value.decode("utf-8")
 
+
 try:
     _libtaos.taos_stmt_set_tbname.restype = c_int
     _libtaos.taos_stmt_set_tbname.argstype = (c_void_p, c_char_p)
-except AttributeError:
-    print("WARNING: libtaos(%s) does not support taos_stmt_set_tbname" % taos_get_client_info())
-
+except Exception as err:
+    _UNSUPPORTED["taos_stmt_set_tbname"] = err
 
 
 def taos_stmt_set_tbname(stmt, name):
@@ -662,15 +672,17 @@ def taos_stmt_set_tbname(stmt, name):
     """Set table name of a statement query if exists.
     @stmt: c_void_p TAOS_STMT*
     """
+    _check_if_supported()
     res = _libtaos.taos_stmt_set_tbname(stmt, c_char_p(name.encode("utf-8")))
     if res != 0:
         raise StatementError(msg=taos_stmt_errstr(stmt), errno=res)
 
+
 try:
     _libtaos.taos_stmt_set_tbname_tags.restype = c_int
     _libtaos.taos_stmt_set_tbname_tags.argstype = (c_void_p, c_char_p, c_void_p)
-except AttributeError:
-    print("WARNING: libtaos(%s) does not support taos_stmt_set_tbname_tags" % taos_get_client_info())
+except Exception as err:
+    _UNSUPPORTED["taos_stmt_set_tbname_tags"] = err
 
 
 def taos_stmt_set_tbname_tags(stmt, name, tags):
@@ -678,11 +690,13 @@ def taos_stmt_set_tbname_tags(stmt, name, tags):
     """Set table name with tags bind params.
     @stmt: c_void_p TAOS_STMT*
     """
+    _check_if_supported()
     res = _libtaos.taos_stmt_set_tbname_tags(stmt, ctypes.c_char_p(name.encode("utf-8")), tags)
 
     if res != 0:
         raise StatementError(msg=taos_stmt_errstr(stmt), errno=res)
 
+
 _libtaos.taos_stmt_is_insert.restype = c_int
 _libtaos.taos_stmt_is_insert.argstype = (c_void_p, POINTER(c_int))
 
@@ -702,6 +716,7 @@ def taos_stmt_is_insert(stmt):
 _libtaos.taos_stmt_num_params.restype = c_int
 _libtaos.taos_stmt_num_params.argstype = (c_void_p, POINTER(c_int))
 
+
 def taos_stmt_num_params(stmt):
     # type: (ctypes.c_void_p) -> int
     """Params number of the current statement query.
@@ -713,6 +728,7 @@ def taos_stmt_num_params(stmt):
         raise StatementError(msg=taos_stmt_errstr(stmt), errno=res)
     return num_params.value
 
+
 _libtaos.taos_stmt_bind_param.restype = c_int
 _libtaos.taos_stmt_bind_param.argstype = (c_void_p, c_void_p)
 
@@ -729,12 +745,12 @@ def taos_stmt_bind_param(stmt, bind):
     if res != 0:
         raise StatementError(msg=taos_stmt_errstr(stmt), errno=res)
 
+
 try:
     _libtaos.taos_stmt_bind_param_batch.restype = c_int
     _libtaos.taos_stmt_bind_param_batch.argstype = (c_void_p, c_void_p)
-except AttributeError:
-    print("WARNING: libtaos(%s) does not support taos_stmt_bind_param_batch" % taos_get_client_info())
-
+except Exception as err:
+    _UNSUPPORTED["taos_stmt_bind_param_batch"] = err
 
 
 def taos_stmt_bind_param_batch(stmt, bind):
@@ -745,15 +761,17 @@ def taos_stmt_bind_param_batch(stmt, bind):
     """
     # ptr = ctypes.cast(bind, POINTER(TaosMultiBind))
     # ptr = pointer(bind)
+    _check_if_supported()
     res = _libtaos.taos_stmt_bind_param_batch(stmt, bind)
     if res != 0:
         raise StatementError(msg=taos_stmt_errstr(stmt), errno=res)
 
+
 try:
     _libtaos.taos_stmt_bind_single_param_batch.restype = c_int
     _libtaos.taos_stmt_bind_single_param_batch.argstype = (c_void_p, c_void_p, c_int)
-except AttributeError:
-    print("WARNING: libtaos(%s) does not support taos_stmt_bind_single_param_batch" % taos_get_client_info())
+except Exception as err:
+    _UNSUPPORTED["taos_stmt_bind_single_param_batch"] = err
 
 
 def taos_stmt_bind_single_param_batch(stmt, bind, col):
@@ -763,6 +781,7 @@ def taos_stmt_bind_single_param_batch(stmt, bind, col):
     @bind: TAOS_MULTI_BIND*
     @col: column index
     """
+    _check_if_supported()
     res = _libtaos.taos_stmt_bind_single_param_batch(stmt, bind, col)
     if res != 0:
         raise StatementError(msg=taos_stmt_errstr(stmt), errno=res)
@@ -810,14 +829,17 @@ def taos_stmt_use_result(stmt):
         raise StatementError(taos_stmt_errstr(stmt))
     return result
 
+
 try:
     _libtaos.taos_schemaless_insert.restype = c_void_p
     _libtaos.taos_schemaless_insert.argstype = c_void_p, c_void_p, c_int, c_int, c_int
-except AttributeError:
-    print("WARNING: libtaos(%s) does not support taos_schemaless_insert" % taos_get_client_info())
+except Exception as err:
+    _UNSUPPORTED["taos_schemaless_insert"] = err
+
 
 def taos_schemaless_insert(connection, lines, protocol, precision):
     # type: (c_void_p, list[str] | tuple(str), SmlProtocol, SmlPrecision) -> int
+    _check_if_supported()
     num_of_lines = len(lines)
     lines = (c_char_p(line.encode("utf-8")) for line in lines)
     lines_type = ctypes.c_char_p * num_of_lines
@@ -833,6 +855,18 @@ def taos_schemaless_insert(connection, lines, protocol, precision):
     taos_free_result(res)
     return affected_rows
 
+
+def _check_if_supported():
+    func = inspect.stack()[1][3]
+    if func in _UNSUPPORTED:
+        raise InterfaceError("C function %s is not supported in v%s: %s" % (func, taos_get_client_info(), _UNSUPPORTED[func]))
+
+
+def unsupported_methods():
+    for m, e in range(_UNSUPPORTED):
+        print("unsupported %s: %s", m, e)
+
+
 class CTaosInterface(object):
     def __init__(self, config=None):
         """

src/plugins/CMakeLists.txt

@@ -45,6 +45,7 @@ ELSE ()
         COMMAND cmake -E copy blm3 ${CMAKE_BINARY_DIR}/build/bin
         COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
         COMMAND cmake -E copy ./example/config/blm.toml ${CMAKE_BINARY_DIR}/test/cfg/
+        COMMAND cmake -E copy ./blm3.service ${CMAKE_BINARY_DIR}/test/cfg/
   )
 ENDIF ()
 

src/query/inc/qExecutor.h

@@ -43,6 +43,8 @@ typedef int32_t (*__block_search_fn_t)(char* data, int32_t num, int64_t key, int
 
 #define GET_NUM_OF_RESULTS(_r) (((_r)->outputBuf) == NULL? 0:((_r)->outputBuf)->info.rows)
 
+#define RESET_NUM_OF_RESULTS(_r) (((_r)->outputBuf) == NULL? 0:(((_r)->outputBuf)->info.rows = 0))
+
 #define NEEDTO_COMPRESS_QUERY(size) ((size) > tsCompressColData? 1 : 0)
 
 enum {
@@ -393,6 +395,7 @@ typedef struct SQInfo {
   int32_t          dataReady;   // denote if query result is ready or not
   void*            rspContext;  // response context
   int64_t          startExecTs; // start to exec timestamp
+  int64_t          lastRetrieveTs; // last retrieve timestamp  
   char*            sql;         // query sql string
   SQueryCostInfo   summary;
 } SQInfo;

src/query/src/qExecutor.c

@@ -2471,7 +2471,7 @@ bool isQueryKilled(SQInfo *pQInfo) {
 
   // query has been executed more than tsShellActivityTimer, and the retrieve has not arrived
   // abort current query execution.
-  if (pQInfo->owner != 0 && ((taosGetTimestampSec() - pQInfo->startExecTs/1000) > getMaximumIdleDurationSec()) &&
+  if (pQInfo->owner != 0 && ((taosGetTimestampSec() - pQInfo->lastRetrieveTs/1000) > getMaximumIdleDurationSec()) &&
       (!needBuildResAfterQueryComplete(pQInfo))) {
 
     assert(pQInfo->startExecTs != 0);
@@ -4379,31 +4379,16 @@ static void doCopyQueryResultToMsg(SQInfo *pQInfo, int32_t numOfRows, char *data
     compSizes = tcalloc(numOfCols, sizeof(int32_t));
   }
 
-  if (pQueryAttr->pExpr2 == NULL) {
-    for (int32_t col = 0; col < numOfCols; ++col) {
-      SColumnInfoData* pColRes = taosArrayGet(pRes->pDataBlock, col);
-      if (compressed) {
-        compSizes[col] = compressQueryColData(pColRes, pRes->info.rows, data, compressed);
-        data += compSizes[col];
-        *compLen += compSizes[col];
-        compSizes[col] = htonl(compSizes[col]);
-      } else {
-        memmove(data, pColRes->pData, pColRes->info.bytes * pRes->info.rows);
-        data += pColRes->info.bytes * pRes->info.rows;
-      }
-    }
-  } else {
-    for (int32_t col = 0; col < numOfCols; ++col) {
-      SColumnInfoData* pColRes = taosArrayGet(pRes->pDataBlock, col);
-      if (compressed) {
-        compSizes[col] = htonl(compressQueryColData(pColRes, numOfRows, data, compressed));
-        data += compSizes[col];
-        *compLen += compSizes[col];
-        compSizes[col] = htonl(compSizes[col]);
-      } else {
-        memmove(data, pColRes->pData, pColRes->info.bytes * numOfRows);
-        data += pColRes->info.bytes * numOfRows;
-      }
+  for (int32_t col = 0; col < numOfCols; ++col) {
+    SColumnInfoData* pColRes = taosArrayGet(pRes->pDataBlock, col);
+    if (compressed) {
+      compSizes[col] = compressQueryColData(pColRes, numOfRows, data, compressed);
+      data += compSizes[col];
+      *compLen += compSizes[col];
+      compSizes[col] = htonl(compSizes[col]);
+    } else {
+      memmove(data, pColRes->pData, pColRes->info.bytes * numOfRows);
+      data += pColRes->info.bytes * numOfRows;
     }
   }
 

src/query/src/queryMain.c

@@ -272,8 +272,10 @@ bool qTableQuery(qinfo_t qinfo, uint64_t *qId) {
   }
 
   *qId = pQInfo->qId;
-  if(pQInfo->startExecTs == 0)
+  if(pQInfo->startExecTs == 0) {
     pQInfo->startExecTs = taosGetTimestampMs();
+    pQInfo->lastRetrieveTs = pQInfo->startExecTs;
+  }
 
   if (isQueryKilled(pQInfo)) {
     qDebug("QInfo:0x%"PRIx64" it is already killed, abort", pQInfo->qId);
@@ -412,6 +414,9 @@ int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *co
     setQueryStatus(pRuntimeEnv, QUERY_OVER);
   }
 
+  RESET_NUM_OF_RESULTS(&(pQInfo->runtimeEnv));
+  pQInfo->lastRetrieveTs = taosGetTimestampMs();
+
   if ((*pRsp)->compressed && compLen != 0) {
     int32_t numOfCols = pQueryAttr->pExpr2 ? pQueryAttr->numOfExpr2 : pQueryAttr->numOfOutput;
     int32_t origSize  = pQueryAttr->resultRowSize * s;

src/util/inc/tconfig.h

@@ -20,8 +20,7 @@
 extern "C" {
 #endif
 
-
-#define TSDB_CFG_MAX_NUM    129
+#define TSDB_CFG_MAX_NUM    130
 #define TSDB_CFG_PRINT_LEN  23
 #define TSDB_CFG_OPTION_LEN 24
 #define TSDB_CFG_VALUE_LEN  41

tests/examples/JDBC/connectionPools/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>2.0.18</version>
+            <version>2.0.34</version>
         </dependency>
         <!-- druid -->
         <dependency>

tests/pytest/fulltest.sh

@@ -27,7 +27,7 @@ python3 ./test.py -f insert/bug3654.py
 python3 ./test.py -f insert/insertDynamicColBeforeVal.py
 python3 ./test.py -f insert/in_function.py
 python3 ./test.py -f insert/modify_column.py
-python3 ./test.py -f insert/line_insert.py
+#python3 ./test.py -f insert/line_insert.py
 python3 ./test.py -f insert/specialSql.py
 
 # timezone
@@ -416,9 +416,9 @@ python3 ./test.py -f insert/verifyMemToDiskCrash.py
 
 python3 ./test.py -f query/queryRegex.py
 python3 ./test.py -f tools/taosdemoTestdatatype.py
-python3 ./test.py -f insert/schemalessInsert.py
-python3 ./test.py -f insert/openTsdbTelnetLinesInsert.py
-python3 ./test.py -f insert/openTsdbJsonInsert.py
+#python3 ./test.py -f insert/schemalessInsert.py
+#python3 ./test.py -f insert/openTsdbTelnetLinesInsert.py
+#python3 ./test.py -f insert/openTsdbJsonInsert.py
 
 #======================p4-end===============