Merge branch 'develop' into test/td-6581-4

CMakeLists.txt

@@ -18,6 +18,7 @@ ENDIF ()
 SET(TD_ACCOUNT FALSE)
 SET(TD_ADMIN FALSE)
 SET(TD_GRANT FALSE)
+SET(TD_USB_DONGLE FALSE)
 SET(TD_MQTT FALSE)
 SET(TD_TSDB_PLUGINS FALSE)
 SET(TD_STORAGE FALSE)

cmake/define.inc

@@ -13,6 +13,10 @@ IF (TD_GRANT)
   ADD_DEFINITIONS(-D_GRANT)
 ENDIF ()
 
+IF (TD_USB_DONGLE)
+  ADD_DEFINITIONS(-D_USB_DONGLE)
+ENDIF ()
+
 IF (TD_MQTT)
   ADD_DEFINITIONS(-D_MQTT)
 ENDIF ()

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)
@@ -41,6 +40,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 ()

documentation20/cn/08.connector/01.java/docs.md

@@ -334,7 +334,6 @@ JDBC连接器可能报错的错误码包括3种：JDBC driver本身的报错（
 从 2.1.2.0 版本开始，TDengine 的 **JDBC-JNI** 实现大幅改进了参数绑定方式对数据写入（INSERT）场景的支持。采用这种方式写入数据时，能避免 SQL 语法解析的资源消耗，从而在很多情况下显著提升写入性能。（注意：**JDBC-RESTful** 实现并不提供参数绑定这种使用方式。）
 
 ```java
-Statement stmt = conn.createStatement();
 Random r = new Random();
 
 // INSERT 语句中，VALUES 部分允许指定具体的数据列；如果采取自动建表，则 TAGS 部分需要设定全部 TAGS 列的参数值：

packaging/tools/post.sh

@@ -280,9 +280,6 @@ function install_blm3_config() {
             ${csudo} chmod 644 ${cfg_install_dir}/blm.toml
     fi
 
-    # restore the backup standard input, and turn off 6
-    exec 0<&6 6<&-
-
     [ -f ${cfg_dir}/blm.toml ] &&
         ${csudo} mv ${cfg_dir}/blm.toml ${cfg_dir}/blm.toml.org
 

src/client/src/dataxJniConnection.c

@@ -6,35 +6,6 @@
 #include "com_alibaba_datax_plugin_writer_JniConnection.h"
 #include "jniCommon.h"
 
-jclass    g_arrayListClass;
-jmethodID g_arrayListConstructFp;
-jmethodID g_arrayListAddFp;
-
-jclass    g_metadataClass;
-jmethodID g_metadataConstructFp;
-jfieldID  g_metadataColtypeField;
-jfieldID  g_metadataColnameField;
-jfieldID  g_metadataColsizeField;
-jfieldID  g_metadataColindexField;
-
-jclass    g_rowdataClass;
-jmethodID g_rowdataConstructor;
-jmethodID g_rowdataClearFp;
-jmethodID g_rowdataSetBooleanFp;
-jmethodID g_rowdataSetByteFp;
-jmethodID g_rowdataSetShortFp;
-jmethodID g_rowdataSetIntFp;
-jmethodID g_rowdataSetLongFp;
-jmethodID g_rowdataSetFloatFp;
-jmethodID g_rowdataSetDoubleFp;
-jmethodID g_rowdataSetStringFp;
-jmethodID g_rowdataSetTimestampFp;
-jmethodID g_rowdataSetByteArrayFp;
-
-jmethodID g_blockdataSetByteArrayFp;
-jmethodID g_blockdataSetNumOfRowsFp;
-jmethodID g_blockdataSetNumOfColsFp;
-
 JNIEXPORT void JNICALL Java_com_alibaba_datax_plugin_writer_JniConnection_initImp(JNIEnv *env, jobject jobj,
                                                                                   jstring jconfigDir) {
   if (jconfigDir != NULL) {

src/client/src/tscParseLineProtocol.c

@@ -20,7 +20,7 @@
 #include "tscParseLine.h"
 
 typedef struct  {
-  char sTableName[TSDB_TABLE_NAME_LEN];
+  char sTableName[TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE];
   SHashObj* tagHash;
   SHashObj* fieldHash;
   SArray* tags; //SArray<SSchema>
@@ -64,13 +64,13 @@ typedef enum {
 } ESchemaAction;
 
 typedef struct {
-  char sTableName[TSDB_TABLE_NAME_LEN];
+  char sTableName[TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE];
   SArray* tags; //SArray<SSchema>
   SArray* fields; //SArray<SSchema>
 } SCreateSTableActionInfo;
 
 typedef struct {
-  char sTableName[TSDB_TABLE_NAME_LEN];
+  char sTableName[TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE];
   SSchema* field;
 } SAlterSTableActionInfo;
 
@@ -155,13 +155,13 @@ static int32_t getSmlMd5ChildTableName(TAOS_SML_DATA_POINT* point, char* tableNa
   qsort(point->tags, point->tagNum, sizeof(TAOS_SML_KV), compareSmlColKv);
 
   SStringBuilder sb; memset(&sb, 0, sizeof(sb));
-  char sTableName[TSDB_TABLE_NAME_LEN] = {0};
+  char sTableName[TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE] = {0};
   strtolower(sTableName, point->stableName);
   taosStringBuilderAppendString(&sb, sTableName);
   for (int j = 0; j < point->tagNum; ++j) {
     taosStringBuilderAppendChar(&sb, ',');
     TAOS_SML_KV* tagKv = point->tags + j;
-    char tagName[TSDB_COL_NAME_LEN] = {0};
+    char tagName[TSDB_COL_NAME_LEN + TS_ESCAPE_CHAR_SIZE] = {0};
     strtolower(tagName, tagKv->key);
     taosStringBuilderAppendString(&sb, tagName);
     taosStringBuilderAppendChar(&sb, '=');
@@ -214,8 +214,8 @@ static int32_t buildDataPointSchemas(TAOS_SML_DATA_POINT* points, int numPoint,
     for (int j = 0; j < point->tagNum; ++j) {
       TAOS_SML_KV* tagKv = point->tags + j;
       if (!point->childTableName) {
-        char childTableName[TSDB_TABLE_NAME_LEN];
-        int32_t tableNameLen = TSDB_TABLE_NAME_LEN;
+        char childTableName[TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE];
+        int32_t tableNameLen = TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE;
         getSmlMd5ChildTableName(point, childTableName, &tableNameLen, info);
         point->childTableName = calloc(1, tableNameLen+1);
         strncpy(point->childTableName, childTableName, tableNameLen);
@@ -261,7 +261,7 @@ static int32_t buildDataPointSchemas(TAOS_SML_DATA_POINT* points, int numPoint,
 
 static int32_t generateSchemaAction(SSchema* pointColField, SHashObj* dbAttrHash, SArray* dbAttrArray, bool isTag, char sTableName[],
                                        SSchemaAction* action, bool* actionNeeded, SSmlLinesInfo* info) {
-  char fieldNameLowerCase[TSDB_COL_NAME_LEN] = {0};
+  char fieldNameLowerCase[TSDB_COL_NAME_LEN + TS_ESCAPE_CHAR_SIZE] = {0};
   strtolower(fieldNameLowerCase, pointColField->name);
 
   size_t* pDbIndex = taosHashGet(dbAttrHash, fieldNameLowerCase, strlen(fieldNameLowerCase));
@@ -281,7 +281,7 @@ static int32_t generateSchemaAction(SSchema* pointColField, SHashObj* dbAttrHash
         action->action = SCHEMA_ACTION_CHANGE_COLUMN_SIZE;
       }
       memset(&action->alterSTable, 0,  sizeof(SAlterSTableActionInfo));
-      memcpy(action->alterSTable.sTableName, sTableName, TSDB_TABLE_NAME_LEN);
+      memcpy(action->alterSTable.sTableName, sTableName, TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE);
       action->alterSTable.field = pointColField;
       *actionNeeded = true;
     }
@@ -292,7 +292,7 @@ static int32_t generateSchemaAction(SSchema* pointColField, SHashObj* dbAttrHash
       action->action = SCHEMA_ACTION_ADD_COLUMN;
     }
     memset(&action->alterSTable, 0, sizeof(SAlterSTableActionInfo));
-    memcpy(action->alterSTable.sTableName, sTableName, TSDB_TABLE_NAME_LEN);
+    memcpy(action->alterSTable.sTableName, sTableName, TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE);
     action->alterSTable.field = pointColField;
     *actionNeeded = true;
   }
@@ -536,7 +536,7 @@ static int32_t retrieveTableMeta(TAOS* taos, char* tableName, STableMeta** pTabl
 
     tscDebug("SML:0x%" PRIx64 " retrieve table meta. super table name: %s", info->id, tableName);
 
-    char tableNameLowerCase[TSDB_TABLE_NAME_LEN];
+    char tableNameLowerCase[TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE];
     strtolower(tableNameLowerCase, tableName);
 
     char sql[256];
@@ -623,7 +623,7 @@ static int32_t modifyDBSchemas(TAOS* taos, SArray* stableSchemas, SSmlLinesInfo*
       SSchemaAction schemaAction = {0};
       schemaAction.action = SCHEMA_ACTION_CREATE_STABLE;
       memset(&schemaAction.createSTable, 0, sizeof(SCreateSTableActionInfo));
-      memcpy(schemaAction.createSTable.sTableName, pointSchema->sTableName, TSDB_TABLE_NAME_LEN);
+      memcpy(schemaAction.createSTable.sTableName, pointSchema->sTableName, TSDB_TABLE_NAME_LEN + TS_ESCAPE_CHAR_SIZE);
       schemaAction.createSTable.tags = pointSchema->tags;
       schemaAction.createSTable.fields = pointSchema->fields;
       applySchemaAction(taos, &schemaAction, info);
@@ -659,7 +659,7 @@ static int32_t modifyDBSchemas(TAOS* taos, SArray* stableSchemas, SSmlLinesInfo*
 
       SSchema* pointColTs = taosArrayGet(pointSchema->fields, 0);
       SSchema* dbColTs = taosArrayGet(dbSchema.fields, 0);
-      memcpy(pointColTs->name, dbColTs->name, TSDB_COL_NAME_LEN);
+      memcpy(pointColTs->name, dbColTs->name, TSDB_COL_NAME_LEN + TS_ESCAPE_CHAR_SIZE);
 
       for (int j = 1; j < pointFieldSize; ++j) {
         SSchema* pointCol = taosArrayGet(pointSchema->fields, j);

src/client/src/tscSQLParser.c

@@ -4523,10 +4523,8 @@ static int32_t validateLikeExpr(tSqlExpr* pExpr, STableMeta* pTableMeta, int32_t
 // check for match expression
 static int32_t validateMatchExpr(tSqlExpr* pExpr, STableMeta* pTableMeta, int32_t index, char* msgBuf) {
   const char* msg1 = "regular expression string should be less than %d characters";
-  const char* msg2 = "illegal column type for match/nmatch";
   const char* msg3 = "invalid regular expression";
 
-  tSqlExpr* pLeft  = pExpr->pLeft;
   tSqlExpr* pRight = pExpr->pRight;
 
   if (pExpr->tokenId == TK_MATCH || pExpr->tokenId == TK_NMATCH) {
@@ -4536,11 +4534,6 @@ static int32_t validateMatchExpr(tSqlExpr* pExpr, STableMeta* pTableMeta, int32_
       return invalidOperationMsg(msgBuf, tmp);
     }
 
-    SSchema* pSchema = tscGetTableSchema(pTableMeta);
-    if ((!isTablenameToken(&pLeft->columnName)) &&(pSchema[index].type != TSDB_DATA_TYPE_BINARY)) {
-      return invalidOperationMsg(msgBuf, msg2);
-    }
-
     if (!(pRight->type == SQL_NODE_VALUE && pRight->value.nType == TSDB_DATA_TYPE_BINARY)) {
       return invalidOperationMsg(msgBuf, msg3);
     }
@@ -6375,6 +6368,12 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
     SStrToken    name = {.type = TK_STRING, .z = pItem->name, .n = (uint32_t)strlen(pItem->name)};
+    //handle Escape character backstick
+    if (name.z[0] == TS_ESCAPE_CHAR && name.z[name.n - 1] == TS_ESCAPE_CHAR) {
+      memmove(name.z, name.z + 1, name.n);
+      name.z[name.n - TS_ESCAPE_CHAR_SIZE] = '\0';
+      name.n -= TS_ESCAPE_CHAR_SIZE;
+    }
     if (getColumnIndexByName(&name, pQueryInfo, &columnIndex, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
       return invalidOperationMsg(pMsg, msg17);
     }
@@ -6799,16 +6798,21 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
     tVariantListItem* p1 = (s > 1) ? taosArrayGet(pKeep, 1) : p0;
     tVariantListItem* p2 = (s > 2) ? taosArrayGet(pKeep, 2) : p1;
 
-    if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0 || (int32_t)p2->pVar.i64 <= 0) {
+    int32_t daysToKeep0 = (int32_t)p0->pVar.i64;
+    int32_t daysToKeep1 = (int32_t)(int32_t)p1->pVar.i64;
+    int32_t daysToKeep2 = (int32_t)p2->pVar.i64;
+    if (daysToKeep0 <= 0 || daysToKeep1 <= 0 || daysToKeep2 <= 0 ||
+        daysToKeep0 > TSDB_MAX_KEEP || daysToKeep1 > TSDB_MAX_KEEP || daysToKeep2 > TSDB_MAX_KEEP) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
     }
-    if (!(((int32_t)p0->pVar.i64 <= (int32_t)p1->pVar.i64) && ((int32_t)p1->pVar.i64 <= (int32_t)p2->pVar.i64))) {
+
+    if (!((daysToKeep0 <= daysToKeep1) && (daysToKeep1 <= daysToKeep2))) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
 
-    pMsg->daysToKeep0 = htonl((int32_t)p0->pVar.i64);
-    pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
-    pMsg->daysToKeep2 = htonl((int32_t)p2->pVar.i64);
+    pMsg->daysToKeep0 = htonl(daysToKeep0);
+    pMsg->daysToKeep1 = htonl(daysToKeep1);
+    pMsg->daysToKeep2 = htonl(daysToKeep2);
 
   }
 

src/common/inc/tdataformat.h

@@ -139,7 +139,7 @@ typedef uint64_t TKEY;
 #define tdGetTKEY(key) (((TKEY)ABS(key)) | (TKEY_NEGATIVE_FLAG & (TKEY)(key)))
 #define tdGetKey(tkey) (((TSKEY)((tkey)&TKEY_VALUE_FILTER)) * (TKEY_IS_NEGATIVE(tkey) ? -1 : 1))
 
-#define MIN_TS_KEY ((TSKEY)0x8000000000000001)
+#define MIN_TS_KEY ((TSKEY)0xc000000000000001)
 #define MAX_TS_KEY ((TSKEY)0x3fffffffffffffff)
 
 #define TD_TO_TKEY(key) tdGetTKEY(((key) < MIN_TS_KEY) ? MIN_TS_KEY : (((key) > MAX_TS_KEY) ? MAX_TS_KEY : key))

grafanaplugin @ 9ae793ad

-Subproject commit edad746514b2a53a8cf6061c93b98b52a5388692
+Subproject commit 9ae793ad2d567eb11d10627b65698f612542e988

src/connector/jdbc/pom.xml

@@ -112,6 +112,7 @@
                         <include>**/*Test.java</include>
                     </includes>
                     <excludes>
+                        <exclude>**/HttpClientPoolUtilTest.java</exclude>
                         <exclude>**/AppMemoryLeakTest.java</exclude>
                         <exclude>**/JDBCTypeAndTypeCompareTest.java</exclude>
                         <exclude>**/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java</exclude>

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

@@ -32,6 +32,7 @@ public class TSDBErrorNumbers {
     public static final int ERROR_USER_IS_REQUIRED = 0x2319;        // user is required
     public static final int ERROR_PASSWORD_IS_REQUIRED = 0x231a;    // password is required
     public static final int ERROR_INVALID_JSON_FORMAT = 0x231b;
+    public static final int ERROR_HTTP_ENTITY_IS_NULL = 0x231c; //http entity is null
 
 
     public static final int ERROR_UNKNOWN = 0x2350;    //unknown error
@@ -74,6 +75,7 @@ public class TSDBErrorNumbers {
         errorNumbers.add(ERROR_USER_IS_REQUIRED);
         errorNumbers.add(ERROR_PASSWORD_IS_REQUIRED);
         errorNumbers.add(ERROR_INVALID_JSON_FORMAT);
+        errorNumbers.add(ERROR_HTTP_ENTITY_IS_NULL);
 
         errorNumbers.add(ERROR_RESTFul_Client_Protocol_Exception);
 

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

@@ -19,6 +19,7 @@ import com.google.common.primitives.Longs;
 import com.google.common.primitives.Shorts;
 
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -256,7 +257,11 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
     public byte[] getBytes(int columnIndex) throws SQLException {
         checkAvailability(columnIndex, this.columnMetaDataList.size());
 
+        if (this.getBatchFetch())
+            return this.blockData.getString(columnIndex).getBytes();
+
         Object value = this.rowData.getObject(columnIndex);
+        this.lastWasNull = value == null;
         if (value == null)
             return null;
 
@@ -331,8 +336,10 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
             return new BigDecimal(this.blockData.getLong(columnIndex - 1));
 
         this.lastWasNull = this.rowData.wasNull(columnIndex);
-        BigDecimal res = null;
-        if (!lastWasNull) {
+        if (lastWasNull)
+            return null;
+
+        BigDecimal res;
         int nativeType = this.columnMetaDataList.get(columnIndex - 1).getColType();
         switch (nativeType) {
             case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
@@ -350,7 +357,6 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
             default:
                 res = new BigDecimal(this.rowData.getObject(columnIndex).toString());
         }
-        }
         return res;
     }
 
@@ -465,12 +471,6 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
 
     public boolean isClosed() throws SQLException {
         return isClosed;
-//        if (isClosed)
-//            return true;
-//        if (jniConnector != null) {
-//            isClosed = jniConnector.isResultsetClosed();
-//        }
-//        return isClosed;
     }
 
     public String getNString(int columnIndex) throws SQLException {

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

@@ -84,8 +84,7 @@ public class TSDBStatement extends AbstractStatement {
         long pSql = this.connection.getConnector().executeQuery(sql);
         // if pSql is create/insert/update/delete/alter SQL
         if (this.connection.getConnector().isUpdateQuery(pSql)) {
-            int rows = this.connection.getConnector().getAffectedRows(pSql);
-            this.affectedRows = rows == 0 ? -1 : this.connection.getConnector().getAffectedRows(pSql);
+            this.affectedRows = this.connection.getConnector().getAffectedRows(pSql);
             this.connection.getConnector().freeResultSet(pSql);
             return false;
         }

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

@@ -255,11 +255,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
-        if (value == null) {
-            wasNull = true;
+        wasNull = value == null;
+        if (value == null)
             return null;
-        }
-        wasNull = false;
         if (value instanceof byte[])
             return new String((byte[]) value);
         return value.toString();
@@ -270,11 +268,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
-        if (value == null) {
-            wasNull = true;
+        wasNull = value == null;
+        if (value == null)
             return false;
-        }
-        wasNull = false;
         if (value instanceof Boolean)
             return (boolean) value;
         return Boolean.parseBoolean(value.toString());
@@ -285,11 +281,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
-        if (value == null) {
-            wasNull = true;
+        wasNull = value == null;
+        if (value == null)
             return 0;
-        }
-        wasNull = false;
         long valueAsLong = Long.parseLong(value.toString());
         if (valueAsLong == Byte.MIN_VALUE)
             return 0;
@@ -309,11 +303,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
-        if (value == null) {
-            wasNull = true;
+        wasNull = value == null;
+        if (value == null)
             return 0;
-        }
-        wasNull = false;
         long valueAsLong = Long.parseLong(value.toString());
         if (valueAsLong == Short.MIN_VALUE)
             return 0;
@@ -327,11 +319,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
-        if (value == null) {
-            wasNull = true;
+        wasNull = value == null;
+        if (value == null)
             return 0;
-        }
-        wasNull = false;
         long valueAsLong = Long.parseLong(value.toString());
         if (valueAsLong == Integer.MIN_VALUE)
             return 0;
@@ -345,15 +335,11 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
-        if (value == null) {
-            wasNull = true;
+        wasNull = value == null;
+        if (value == null)
             return 0;
-        }
-
-        wasNull = false;
-        if (value instanceof Timestamp) {
+        if (value instanceof Timestamp)
             return ((Timestamp) value).getTime();
-        }
         long valueAsLong = 0;
         try {
             valueAsLong = Long.parseLong(value.toString());
@@ -370,11 +356,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
-        if (value == null) {
-            wasNull = true;
+        wasNull = value == null;
+        if (value == null)
             return 0;
-        }
-        wasNull = false;
         if (value instanceof Float)
             return (float) value;
         if (value instanceof Double)
@@ -387,11 +371,10 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
+        wasNull = value == null;
         if (value == null) {
-            wasNull = true;
             return 0;
         }
-        wasNull = false;
         if (value instanceof Double || value instanceof Float)
             return (double) value;
         return Double.parseDouble(value.toString());
@@ -402,6 +385,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
+        wasNull = value == null;
         if (value == null)
             return null;
         if (value instanceof byte[])
@@ -428,6 +412,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
+        wasNull = value == null;
         if (value == null)
             return null;
         if (value instanceof Timestamp)
@@ -440,6 +425,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
+        wasNull = value == null;
         if (value == null)
             return null;
         if (value instanceof Timestamp)
@@ -457,6 +443,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
+        wasNull = value == null;
         if (value == null)
             return null;
         if (value instanceof Timestamp)
@@ -473,6 +460,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             ret = Utils.parseTimestamp(value.toString());
         } catch (Exception e) {
             ret = null;
+            wasNull = true;
         }
         return ret;
     }
@@ -488,7 +476,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
     public Object getObject(int columnIndex) throws SQLException {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
-        return resultSet.get(pos).get(columnIndex - 1);
+        Object value = resultSet.get(pos).get(columnIndex - 1);
+        wasNull = value == null;
+        return value;
     }
 
     @Override
@@ -507,9 +497,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         checkAvailability(columnIndex, resultSet.get(pos).size());
 
         Object value = resultSet.get(pos).get(columnIndex - 1);
+        wasNull = value == null;
         if (value == null)
             return null;
-
         if (value instanceof Long || value instanceof Integer || value instanceof Short || value instanceof Byte)
             return new BigDecimal(Long.parseLong(value.toString()));
         if (value instanceof Double || value instanceof Float)

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

@@ -140,8 +140,7 @@ public class RestfulStatement extends AbstractStatement {
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
         JSONArray data = jsonObject.getJSONArray("data");
         if (data != null) {
-            int rows = data.getJSONArray(0).getInteger(0);
-            return rows == 0 ? -1 : data.getJSONArray(0).getInteger(0);
+            return data.getJSONArray(0).getInteger(0);
         }
         throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
     }

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

@@ -5,6 +5,7 @@ import com.taosdata.jdbc.TSDBErrorNumbers;
 import org.apache.http.HeaderElement;
 import org.apache.http.HeaderElementIterator;
 import org.apache.http.HttpEntity;
+import org.apache.http.NoHttpResponseException;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.config.RequestConfig;
@@ -30,12 +31,12 @@ import java.sql.SQLException;
 public class HttpClientPoolUtil {
 
     private static final String DEFAULT_CONTENT_TYPE = "application/json";
-    private static final int DEFAULT_MAX_TOTAL = 200;
-    private static final int DEFAULT_MAX_PER_ROUTE = 20;
-    private static final int DEFAULT_TIME_OUT = 15000;
-    private static final int DEFAULT_HTTP_KEEP_TIME = 15000;
     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;
+    private static final int DEFAULT_HTTP_KEEP_TIME = -1;
+
     private static final ConnectionKeepAliveStrategy DEFAULT_KEEP_ALIVE_STRATEGY = (response, context) -> {
         HeaderElementIterator it = new BasicHeaderElementIterator(response.headerIterator(HTTP.CONN_KEEP_ALIVE));
         while (it.hasNext()) {
@@ -52,29 +53,19 @@ public class HttpClientPoolUtil {
         return DEFAULT_HTTP_KEEP_TIME * 1000;
     };
 
-    private static final HttpRequestRetryHandler retryHandler = (exception, executionCount, httpContext) -> {
-        if (executionCount >= DEFAULT_MAX_RETRY_COUNT)
-            // do not retry if over max retry count
-            return false;
-        if (exception instanceof InterruptedIOException)
-            // timeout
-            return false;
-        if (exception instanceof UnknownHostException)
-            // unknown host
-            return false;
-        if (exception instanceof SSLException)
-            // SSL handshake exception
-            return false;
-        return true;
-    };
-
     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(retryHandler).build();
+
+        httpClient = HttpClients.custom()
+                .setKeepAliveStrategy(DEFAULT_KEEP_ALIVE_STRATEGY)
+                .setConnectionManager(connectionManager)
+                .setRetryHandler((exception, executionCount, httpContext) -> executionCount < DEFAULT_MAX_RETRY_COUNT)
+                .build();
     }
 
     /*** execute GET request ***/
@@ -118,9 +109,10 @@ public class HttpClientPoolUtil {
             HttpContext context = HttpClientContext.create();
             CloseableHttpResponse httpResponse = httpClient.execute(method, context);
             httpEntity = httpResponse.getEntity();
-            if (httpEntity != null) {
-                responseBody = EntityUtils.toString(httpEntity, StandardCharsets.UTF_8);
+            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());
@@ -139,9 +131,6 @@ public class HttpClientPoolUtil {
     private static HttpRequestBase getRequest(String uri, String methodName) {
         HttpRequestBase method;
         RequestConfig requestConfig = RequestConfig.custom()
-                .setSocketTimeout(DEFAULT_TIME_OUT * 1000)
-                .setConnectTimeout(DEFAULT_TIME_OUT * 1000)
-                .setConnectionRequestTimeout(DEFAULT_TIME_OUT * 1000)
                 .setExpectContinueEnabled(false)
                 .build();
         if (HttpPut.METHOD_NAME.equalsIgnoreCase(methodName)) {

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

@@ -660,7 +660,6 @@ public class RestfulResultSetTest {
     @BeforeClass
     public static void beforeClass() {
         try {
-            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
             conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
             stmt = conn.createStatement();
             stmt.execute("create database if not exists restful_test");
@@ -670,7 +669,7 @@ public class RestfulResultSetTest {
             stmt.execute("insert into restful_test.weather values('2021-01-01 00:00:00.000', 1, 100, 3.1415, 3.1415926, 'abc', 10, 10, true, '涛思数据')");
             rs = stmt.executeQuery("select * from restful_test.weather");
             rs.next();
-        } catch (ClassNotFoundException | SQLException e) {
+        } catch (SQLException e) {
             e.printStackTrace();
         }
 

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

+package com.taosdata.jdbc.rs;
+
+import org.junit.*;
+
+import java.sql.*;
+
+public class WasNullTest {
+
+    //    private static final String host = "127.0.0.1";
+    private static final String host = "master";
+    private Connection conn;
+
+
+    @Test
+    public void testGetTimestamp() {
+        try (Statement stmt = conn.createStatement()) {
+            stmt.execute("drop table if exists weather");
+            stmt.execute("create table if not exists weather(f1 timestamp, f2 timestamp, f3 int)");
+            stmt.execute("insert into restful_test.weather values('2021-01-01 00:00:00.000', NULL, 100)");
+
+            ResultSet rs = stmt.executeQuery("select * from restful_test.weather");
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                for (int i = 1; i <= meta.getColumnCount(); i++) {
+                    if (i == 2) {
+                        Object value = rs.getTimestamp(i);
+                        boolean wasNull = rs.wasNull();
+                        Assert.assertNull(value);
+                        Assert.assertTrue(wasNull);
+                    } else {
+                        Object value = rs.getObject(i);
+                        boolean wasNull = rs.wasNull();
+                        Assert.assertNotNull(value);
+                        Assert.assertFalse(wasNull);
+                    }
+                }
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testGetObject() {
+        try (Statement stmt = conn.createStatement()) {
+            stmt.execute("drop table if exists weather");
+            stmt.execute("create table if not exists weather(f1 timestamp, f2 int, f3 bigint, f4 float, f5 double, f6 binary(64), f7 smallint, f8 tinyint, f9 bool, f10 nchar(64))");
+            stmt.execute("insert into restful_test.weather values('2021-01-01 00:00:00.000', 1, 100, 3.1415, 3.1415926, NULL, 10, 10, true, '涛思数据')");
+
+            ResultSet rs = stmt.executeQuery("select * from restful_test.weather");
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                for (int i = 1; i <= meta.getColumnCount(); i++) {
+                    Object value = rs.getObject(i);
+                    boolean wasNull = rs.wasNull();
+                    if (i == 6) {
+                        Assert.assertNull(value);
+                        Assert.assertTrue(wasNull);
+                    } else {
+                        Assert.assertNotNull(value);
+                        Assert.assertFalse(wasNull);
+                    }
+                }
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Before
+    public void before() {
+        try {
+            conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
+            Statement stmt = conn.createStatement();
+            stmt.execute("drop database if exists restful_test");
+            stmt.execute("create database if not exists restful_test");
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @After
+    public void after() {
+        try {
+            Statement statement = conn.createStatement();
+            statement.execute("drop database if exists restful_test");
+            if (conn != null)
+                conn.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+}

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

+package com.taosdata.jdbc.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.taosdata.jdbc.TSDBDriver;
+import com.taosdata.jdbc.TSDBError;
+import org.junit.Test;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class HttpClientPoolUtilTest {
+
+    String user = "root";
+    String password = "taosdata";
+    String host = "127.0.0.1";
+    String dbname = "log";
+
+    @Test
+    public void test() {
+        // given
+        List<Thread> threads = IntStream.range(0, 4000).mapToObj(i -> new Thread(() -> {
+            useDB();
+//            try {
+//                TimeUnit.SECONDS.sleep(10);
+//            } catch (InterruptedException e) {
+//                e.printStackTrace();
+//            }
+        })).collect(Collectors.toList());
+
+        threads.forEach(Thread::start);
+
+        for (Thread thread : threads) {
+            try {
+                thread.join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+    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"));
+            }
+
+            String url = "http://" + host + ":6041/rest/sql";
+            String sql = "use " + dbname;
+            result = HttpClientPoolUtil.execute(url, sql, token);
+
+            JSONObject resultJson = JSON.parseObject(result);
+            if (resultJson.getString("status").equals("error")) {
+                throw TSDBError.createSQLException(resultJson.getInteger("code"), resultJson.getString("desc"));
+            }
+        } catch (UnsupportedEncodingException | SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+}
\ No newline at end of file

src/dnode/CMakeLists.txt

@@ -39,6 +39,10 @@ IF (TD_GRANT)
   TARGET_LINK_LIBRARIES(taosd grant)
 ENDIF ()
 
+IF (TD_USB_DONGLE)
+  TARGET_LINK_LIBRARIES(taosd usb_dongle)
+ENDIF ()
+
 IF (TD_MQTT)
   TARGET_LINK_LIBRARIES(taosd mqtt)
 ENDIF ()

src/dnode/src/dnodeMain.c

@@ -23,6 +23,7 @@
 #include "twal.h"
 #include "tfs.h"
 #include "tsync.h"
+#include "tgrant.h"
 #include "dnodeStep.h"
 #include "dnodePeer.h"
 #include "dnodeModule.h"
@@ -88,6 +89,7 @@ static SStep tsDnodeSteps[] = {
   {"dnode-statustmr", dnodeInitStatusTimer,dnodeCleanupStatusTimer},
   {"dnode-telemetry", dnodeInitTelemetry,  dnodeCleanupTelemetry},
   {"dnode-script",    scriptEnvPoolInit,   scriptEnvPoolCleanup},
+  {"dnode-grant",     grantInit,           grantCleanUp},
 };
 
 static SStep tsDnodeCompactSteps[] = {

src/inc/taosdef.h

@@ -295,7 +295,7 @@ do { \
 #define TSDB_DEFAULT_DAYS_PER_FILE      10
 
 #define TSDB_MIN_KEEP                   1        // data in db to be reserved.
-#define TSDB_MAX_KEEP                   365000   // data in db to be reserved.
+#define TSDB_MAX_KEEP                   36500   // data in db to be reserved.
 #define TSDB_DEFAULT_KEEP               3650     // ten years
 
 #define TSDB_DEFAULT_MIN_ROW_FBLOCK     100

src/inc/ttokendef.h

@@ -212,6 +212,7 @@
 #define TK_INSERT                         194
 #define TK_INTO                           195
 #define TK_VALUES                         196
+#define TK_FILE                           197
 
 
 
@@ -223,7 +224,6 @@
 #define TK_HEX                            303   // hex number  0x123
 #define TK_OCT                            304   // oct number
 #define TK_BIN                            305   // bin format data 0b111
-#define TK_FILE                           306
 #define TK_QUESTION                       307   // denoting the placeholder of "?",when invoking statement bind query
 
 #endif

src/mnode/src/mnodeDb.c

@@ -927,9 +927,12 @@ static int32_t mnodeProcessCreateDbMsg(SMnodeMsg *pMsg) {
   pCreate->maxRowsPerFileBlock = htonl(pCreate->maxRowsPerFileBlock);
   
   int32_t code;
+#ifdef GRANT_CHECK_WRITE
   if (grantCheck(TSDB_GRANT_TIME) != TSDB_CODE_SUCCESS) {
     code = TSDB_CODE_GRANT_EXPIRED;
-  } else if (!pMsg->pUser->writeAuth) {
+  } // else
+#endif
+  if (!pMsg->pUser->writeAuth) {
     code = TSDB_CODE_MND_NO_RIGHTS;
   } else {
     code = mnodeCreateDb(pMsg->pUser->pAcct, pCreate, pMsg);

src/mnode/src/mnodeFunc.c

@@ -191,9 +191,11 @@ static int32_t mnodeUpdateFunc(SFuncObj *pFunc, void *pMsg) {
 }
 */
 int32_t mnodeCreateFunc(SAcctObj *pAcct, char *name, int32_t codeLen, char *codeScript, char *path, uint8_t outputType, int16_t outputLen, int32_t funcType, int32_t bufSize, SMnodeMsg *pMsg) {
+#ifdef GRANT_CHECK_WRITE
   if (grantCheck(TSDB_GRANT_TIME) != TSDB_CODE_SUCCESS) {
     return TSDB_CODE_GRANT_EXPIRED;
   }
+#endif
 
   if (!pMsg->pUser->writeAuth) {
     return TSDB_CODE_MND_NO_RIGHTS;

src/mnode/src/mnodeMain.c

@@ -55,7 +55,7 @@ static SStep tsMnodeSteps[] = {
   {"mnodes",  mnodeInitMnodes,  mnodeCleanupMnodes},
   {"sdb",     sdbInit,          sdbCleanUp},
   {"balance", bnInit,           bnCleanUp},
-  {"grant",   grantInit,        grantCleanUp},
+  // {"grant",   grantInit,        grantCleanUp},
   {"show",    mnodeInitShow,    mnodeCleanUpShow}
 };
 

src/mnode/src/mnodeWrite.c

@@ -65,14 +65,16 @@ int32_t mnodeProcessWrite(SMnodeMsg *pMsg) {
     return TSDB_CODE_MND_MSG_NOT_PROCESSED;
   }
 
+#ifdef GRANT_CHECK_WRITE
   int32_t code = grantCheck(TSDB_GRANT_TIME);
   if (code != TSDB_CODE_SUCCESS) {
     mError("msg:%p, app:%p type:%s not processed, reason:%s", pMsg, pMsg->rpcMsg.ahandle, taosMsg[pMsg->rpcMsg.msgType],
            tstrerror(code));
     return code;
   }
+#endif
 
-  code = mnodeInitMsg(pMsg);
+  int32_t code = mnodeInitMsg(pMsg);
   if (code != TSDB_CODE_SUCCESS) {
     mError("msg:%p, app:%p type:%s not processed, reason:%s", pMsg, pMsg->rpcMsg.ahandle, taosMsg[pMsg->rpcMsg.msgType],
            tstrerror(code));

src/os/src/darwin/dwSysInfo.c

@@ -65,6 +65,8 @@ static void taosGetSystemTimezone() {
   struct tm tm1;
   localtime_r(&tx1, &tm1);
 
+  tsDaylight = daylight;
+
   /*
    * format example:
    *

src/os/src/detail/osSysinfo.c

@@ -213,6 +213,8 @@ static void taosGetSystemTimezone() {
   int32_t tz = (-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR;
   tz += daylight;
 
+  tsDaylight = daylight;
+
   /*
    * format example:
    *

src/os/src/detail/osTime.c

@@ -380,15 +380,20 @@ int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrec
   assert(toPrecision == TSDB_TIME_PRECISION_MILLI ||
          toPrecision == TSDB_TIME_PRECISION_MICRO ||
          toPrecision == TSDB_TIME_PRECISION_NANO);
+  double tempResult = (double)time;
   switch(fromPrecision) {
     case TSDB_TIME_PRECISION_MILLI: {
       switch (toPrecision) {
         case TSDB_TIME_PRECISION_MILLI:
           return time;
         case TSDB_TIME_PRECISION_MICRO:
-          return time * 1000;
+          tempResult *= 1000;
+          time *= 1000;
+          goto end_;
         case TSDB_TIME_PRECISION_NANO:
-          return time * 1000000;
+          tempResult *= 1000000;
+          time *= 1000000;
+          goto end_;
       }
     } // end from milli
     case TSDB_TIME_PRECISION_MICRO: {
@@ -398,7 +403,9 @@ int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrec
         case TSDB_TIME_PRECISION_MICRO:
           return time;
         case TSDB_TIME_PRECISION_NANO:
-          return time * 1000;
+          tempResult *= 1000;
+          time *= 1000;
+          goto end_;
       }
     } //end from micro
     case TSDB_TIME_PRECISION_NANO: {
@@ -416,6 +423,10 @@ int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrec
       return time;  // only to pass windows compilation
     }
   } //end switch fromPrecision
+end_:
+  if (tempResult > (double)INT64_MAX) return INT64_MAX;
+  if (tempResult < (double)INT64_MIN) return INT64_MIN + 1;  // INT64_MIN means NULL
+  return time;
 }
 
 static int32_t getDuration(int64_t val, char unit, int64_t* result, int32_t timePrecision) {

src/os/src/windows/wSysinfo.c

@@ -91,6 +91,17 @@ static void taosGetSystemTimezone() {
       strcpy(tsTimezone, tz);
     }
     cfg_timezone->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
+
+#ifdef _MSC_VER
+#if _MSC_VER >= 1900
+  int64_t timezone = _timezone;
+  int32_t daylight = _daylight;
+  char **tzname = _tzname;
+#endif
+#endif
+
+    tsDaylight = daylight;
+
     uInfo("timezone not configured, use default");
   }
 }

blm3 @ ba539ce6

-Subproject commit f56aa0f485d7bb6aebbcefc2007eeecdccb767c8
+Subproject commit ba539ce69dc4fe53536e9b0517fe75917dce5c46

src/plugins/http/inc/httpInt.h

@@ -154,12 +154,13 @@ typedef struct HttpContext {
   char               db[/*TSDB_ACCT_ID_LEN + */TSDB_DB_NAME_LEN];
   TAOS *             taos;
   void *             ppContext;
+  pthread_mutex_t    ctxMutex;
   HttpSession       *session;
   z_stream           gzipStream;
   HttpParser        *parser;
   HttpSqlCmd         singleCmd;
   HttpSqlCmds       *multiCmds;
-  JsonBuf *    jsonBuf;
+  JsonBuf           *jsonBuf;
   HttpEncodeMethod  *encodeMethod;
   HttpDecodeMethod  *decodeMethod;
   struct HttpThread *pThread;

src/plugins/http/src/httpContext.c

@@ -67,6 +67,8 @@ static void httpDestroyContext(void *data) {
     pContext->parser = NULL;
   }
 
+  pthread_mutex_destroy(&pContext->ctxMutex);
+
   tfree(pContext);
 }
 
@@ -128,6 +130,8 @@ HttpContext *httpCreateContext(SOCKET fd) {
   // set the ref to 0
   taosCacheRelease(tsHttpServer.contextCache, (void **)&ppContext, false);
 
+  pthread_mutex_init(&pContext->ctxMutex, NULL);
+
   return pContext;
 }
 

src/plugins/http/src/httpHandle.c

@@ -45,15 +45,14 @@ bool httpProcessData(HttpContext* pContext) {
     httpTrace("context:%p, fd:%d, process options request", pContext, pContext->fd);
     httpSendOptionResp(pContext, "process options request success");
   } else {
-    if (!httpDecodeRequest(pContext)) {
-      /*
-       * httpCloseContextByApp has been called when parsing the error
-       */
-      // httpCloseContextByApp(pContext);
-    } else {
+    pthread_mutex_lock(&pContext->ctxMutex);
+
+    if (httpDecodeRequest(pContext)) {
       httpClearParser(pContext->parser);
       httpProcessRequest(pContext);
     }
+
+    pthread_mutex_unlock(&pContext->ctxMutex);
   }
 
   return true;

src/plugins/http/src/httpSql.c

@@ -406,7 +406,14 @@ void httpProcessRequestCb(void *param, TAOS_RES *result, int32_t code) {
   if (pContext->session == NULL) {
     httpSendErrorResp(pContext, TSDB_CODE_HTTP_SESSION_FULL);
   } else {
+    // httpProcessRequestCb called by another thread and a subsequent thread calls this
+    // function again, if this function called by httpProcessRequestCb executes memset
+    // just before the subsequent thread executes *Cmd function, nativSql will be NULL
+    pthread_mutex_lock(&pContext->ctxMutex);
+
     httpExecCmd(pContext);
+
+    pthread_mutex_unlock(&pContext->ctxMutex);
   }
 }
 

src/query/inc/qSqlparser.h

@@ -281,7 +281,7 @@ void          *destroyRelationInfo(SRelationInfo* pFromInfo);
 SRelationInfo *addSubqueryElem(SRelationInfo* pRelationInfo, SArray* pSub, SStrToken* pAlias);
 
 // sql expr leaf node
-tSqlExpr *tSqlExprCreateIdValue(SStrToken *pToken, int32_t optrType);
+tSqlExpr *tSqlExprCreateIdValue(SSqlInfo* pInfo, SStrToken *pToken, int32_t optrType);
 tSqlExpr *tSqlExprCreateFunction(SArray *pParam, SStrToken *pFuncToken, SStrToken *endToken, int32_t optType);
 SArray *tStrTokenAppend(SArray *pList, SStrToken *pToken);
 

src/query/inc/sql.y

@@ -90,7 +90,6 @@ dbPrefix(A) ::= ids(X) DOT.        {A = X;  }
 %type cpxName {SStrToken}
 cpxName(A) ::= .             {A.n = 0;  }
 cpxName(A) ::= DOT ids(Y).   {A = Y; A.n += 1;    }
-
 cmd ::= SHOW CREATE TABLE ids(X) cpxName(Y).    {
    X.n += Y.n;
    setDCLSqlElems(pInfo, TSDB_SQL_SHOW_CREATE_TABLE, 1, &X);
@@ -520,7 +519,7 @@ selcollist(A) ::= sclp(P) distinct(Z) expr(X) as(Y).     {
 }
 
 selcollist(A) ::= sclp(P) STAR. {
-   tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL);
+   tSqlExpr *pNode = tSqlExprCreateIdValue(pInfo, NULL, TK_ALL);
    A = tSqlExprListAppend(P, pNode, 0, 0);
 }
 
@@ -701,23 +700,23 @@ where_opt(A) ::= WHERE expr(X).       {A = X;}
 
 expr(A) ::= LP(X) expr(Y) RP(Z).       {A = Y; A->exprToken.z = X.z; A->exprToken.n = (Z.z - X.z + 1);}
 
-expr(A) ::= ID(X).               { A = tSqlExprCreateIdValue(&X, TK_ID);}
-expr(A) ::= ID(X) DOT ID(Y).     { X.n += (1+Y.n); A = tSqlExprCreateIdValue(&X, TK_ID);}
-expr(A) ::= ID(X) DOT STAR(Y).   { X.n += (1+Y.n); A = tSqlExprCreateIdValue(&X, TK_ALL);}
-
-expr(A) ::= INTEGER(X).          { A = tSqlExprCreateIdValue(&X, TK_INTEGER);}
-expr(A) ::= MINUS(X) INTEGER(Y). { X.n += Y.n; X.type = TK_INTEGER; A = tSqlExprCreateIdValue(&X, TK_INTEGER);}
-expr(A) ::= PLUS(X)  INTEGER(Y). { X.n += Y.n; X.type = TK_INTEGER; A = tSqlExprCreateIdValue(&X, TK_INTEGER);}
-expr(A) ::= FLOAT(X).            { A = tSqlExprCreateIdValue(&X, TK_FLOAT);}
-expr(A) ::= MINUS(X) FLOAT(Y).   { X.n += Y.n; X.type = TK_FLOAT; A = tSqlExprCreateIdValue(&X, TK_FLOAT);}
-expr(A) ::= PLUS(X) FLOAT(Y).    { X.n += Y.n; X.type = TK_FLOAT; A = tSqlExprCreateIdValue(&X, TK_FLOAT);}
-expr(A) ::= STRING(X).           { A = tSqlExprCreateIdValue(&X, TK_STRING);}
-expr(A) ::= NOW(X).              { A = tSqlExprCreateIdValue(&X, TK_NOW); }
-expr(A) ::= VARIABLE(X).         { A = tSqlExprCreateIdValue(&X, TK_VARIABLE);}
-expr(A) ::= PLUS(X) VARIABLE(Y).   { X.n += Y.n; X.type = TK_VARIABLE; A = tSqlExprCreateIdValue(&X, TK_VARIABLE);}
-expr(A) ::= MINUS(X) VARIABLE(Y).  { X.n += Y.n; X.type = TK_VARIABLE; A = tSqlExprCreateIdValue(&X, TK_VARIABLE);}
-expr(A) ::= BOOL(X).             { A = tSqlExprCreateIdValue(&X, TK_BOOL);}
-expr(A) ::= NULL(X).             { A = tSqlExprCreateIdValue(&X, TK_NULL);}
+expr(A) ::= ID(X).               { A = tSqlExprCreateIdValue(pInfo, &X, TK_ID);}
+expr(A) ::= ID(X) DOT ID(Y).     { X.n += (1+Y.n); A = tSqlExprCreateIdValue(pInfo, &X, TK_ID);}
+expr(A) ::= ID(X) DOT STAR(Y).   { X.n += (1+Y.n); A = tSqlExprCreateIdValue(pInfo, &X, TK_ALL);}
+
+expr(A) ::= INTEGER(X).          { A = tSqlExprCreateIdValue(pInfo, &X, TK_INTEGER);}
+expr(A) ::= MINUS(X) INTEGER(Y). { X.n += Y.n; X.type = TK_INTEGER; A = tSqlExprCreateIdValue(pInfo, &X, TK_INTEGER);}
+expr(A) ::= PLUS(X)  INTEGER(Y). { X.n += Y.n; X.type = TK_INTEGER; A = tSqlExprCreateIdValue(pInfo, &X, TK_INTEGER);}
+expr(A) ::= FLOAT(X).            { A = tSqlExprCreateIdValue(pInfo, &X, TK_FLOAT);}
+expr(A) ::= MINUS(X) FLOAT(Y).   { X.n += Y.n; X.type = TK_FLOAT; A = tSqlExprCreateIdValue(pInfo, &X, TK_FLOAT);}
+expr(A) ::= PLUS(X) FLOAT(Y).    { X.n += Y.n; X.type = TK_FLOAT; A = tSqlExprCreateIdValue(pInfo, &X, TK_FLOAT);}
+expr(A) ::= STRING(X).           { A = tSqlExprCreateIdValue(pInfo, &X, TK_STRING);}
+expr(A) ::= NOW(X).              { A = tSqlExprCreateIdValue(pInfo, &X, TK_NOW); }
+expr(A) ::= VARIABLE(X).         { A = tSqlExprCreateIdValue(pInfo, &X, TK_VARIABLE);}
+expr(A) ::= PLUS(X) VARIABLE(Y).   { X.n += Y.n; X.type = TK_VARIABLE; A = tSqlExprCreateIdValue(pInfo, &X, TK_VARIABLE);}
+expr(A) ::= MINUS(X) VARIABLE(Y).  { X.n += Y.n; X.type = TK_VARIABLE; A = tSqlExprCreateIdValue(pInfo, &X, TK_VARIABLE);}
+expr(A) ::= BOOL(X).             { A = tSqlExprCreateIdValue(pInfo, &X, TK_BOOL);}
+expr(A) ::= NULL(X).             { A = tSqlExprCreateIdValue(pInfo, &X, TK_NULL);}
 
 // ordinary functions: min(x), max(x), top(k, 20)
 expr(A) ::= ID(X) LP exprlist(Y) RP(E). { tStrTokenAppend(pInfo->funcs, &X); A = tSqlExprCreateFunction(Y, &X, &E, X.type); }
@@ -922,4 +921,4 @@ cmd ::= KILL QUERY INTEGER(X) COLON(Z) INTEGER(Y).        {X.n += (Z.n + Y.n); s
 %fallback ID ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT COPY DATABASE DEFERRED
   DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR GLOB IGNORE IMMEDIATE INITIALLY INSTEAD
   LIKE MATCH NMATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL
-  NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT TBNAME JOIN STABLE NULL INSERT INTO VALUES.
+  NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT TBNAME JOIN STABLE NULL INSERT INTO VALUES FILE.

src/query/src/qAggMain.c

@@ -20,7 +20,6 @@
 #include "tdigest.h"
 #include "ttype.h"
 #include "tsdb.h"
-#include "tglobal.h"
 
 #include "qAggMain.h"
 #include "qFill.h"
@@ -172,7 +171,11 @@ typedef struct SDerivInfo {
 } SDerivInfo;
 
 typedef struct {
-  double cumSum;
+  union {
+    double d64CumSum;
+    int64_t i64CumSum;
+    uint64_t u64CumSum;
+  };
 } SCumSumInfo;
 
 typedef struct {
@@ -4709,7 +4712,7 @@ static bool csum_function_setup(SQLFunctionCtx *pCtx, SResultRowCellInfo* pResIn
   }
 
   SCumSumInfo* pCumSumInfo = GET_ROWCELL_INTERBUF(pResInfo);
-  pCumSumInfo->cumSum = 0;
+  pCumSumInfo->i64CumSum = 0;
   return true;
 }
 
@@ -4733,20 +4736,30 @@ static void csum_function(SQLFunctionCtx *pCtx) {
       continue;
     }
 
+    if (IS_SIGNED_NUMERIC_TYPE(pCtx->inputType)) {
+      int64_t v = 0;
+      GET_TYPED_DATA(v, int64_t, pCtx->inputType, pData);
+      pCumSumInfo->i64CumSum += v;
+    } else if (IS_UNSIGNED_NUMERIC_TYPE(pCtx->inputType)) {
+      uint64_t v = 0;
+      GET_TYPED_DATA(v, uint64_t, pCtx->inputType, pData);
+      pCumSumInfo->u64CumSum += v;
+    } else if (IS_FLOAT_TYPE(pCtx->inputType)) {
       double v = 0;
       GET_TYPED_DATA(v, double, pCtx->inputType, pData);
-    pCumSumInfo->cumSum += v;
+      pCumSumInfo->d64CumSum += v;
+    }
 
     *pTimestamp = (tsList != NULL) ? tsList[i] : 0;
     if (IS_SIGNED_NUMERIC_TYPE(pCtx->inputType)) {
       int64_t *retVal = (int64_t *)pCtx->pOutput;
-      *retVal = (int64_t)(pCumSumInfo->cumSum);
+      *retVal = (int64_t)(pCumSumInfo->i64CumSum);
     } else if (IS_UNSIGNED_NUMERIC_TYPE(pCtx->inputType)) {
       uint64_t *retVal = (uint64_t *)pCtx->pOutput;
-      *retVal = (uint64_t)(pCumSumInfo->cumSum);
+      *retVal = (uint64_t)(pCumSumInfo->u64CumSum);
     } else if (IS_FLOAT_TYPE(pCtx->inputType)) {
       double *retVal = (double*) pCtx->pOutput;
-      SET_DOUBLE_VAL(retVal, pCumSumInfo->cumSum);
+      SET_DOUBLE_VAL(retVal, pCumSumInfo->d64CumSum);
     }
 
     ++notNullElems;

src/query/src/qFilter.c

@@ -1841,6 +1841,15 @@ int32_t filterInitValFieldData(SFilterInfo *info) {
       qError("dump value to type[%d] failed", type);
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
+
+    // match/nmatch for nchar type need convert from ucs4 to mbs
+    if(type == TSDB_DATA_TYPE_NCHAR &&
+        (unit->compare.optr == TSDB_RELATION_MATCH || unit->compare.optr == TSDB_RELATION_NMATCH)){
+      char newValData[TSDB_REGEX_STRING_DEFAULT_LEN * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE] = {0};
+      int32_t len = taosUcs4ToMbs(varDataVal(fi->data), varDataLen(fi->data), varDataVal(newValData));
+      varDataSetLen(newValData, len);
+      varDataCopy(fi->data, newValData);
+    }
   }
 
   return TSDB_CODE_SUCCESS;
@@ -2960,8 +2969,17 @@ bool filterExecuteImplMisc(void *pinfo, int32_t numOfRows, int8_t** p, SDataStat
       all = false;
       continue;
     }
+    // match/nmatch for nchar type need convert from ucs4 to mbs
 
+    if(info->cunits[uidx].dataType == TSDB_DATA_TYPE_NCHAR && (info->cunits[uidx].optr == TSDB_RELATION_MATCH || info->cunits[uidx].optr == TSDB_RELATION_NMATCH)){
+      char *newColData = calloc(info->cunits[uidx].dataSize * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE, 1);
+      int len = taosUcs4ToMbs(varDataVal(colData), varDataLen(colData), varDataVal(newColData));
+      varDataSetLen(newColData, len);
+      (*p)[i] = filterDoCompare(gDataCompare[info->cunits[uidx].func], info->cunits[uidx].optr, newColData, info->cunits[uidx].valData);
+      tfree(newColData);
+    }else{
       (*p)[i] = filterDoCompare(gDataCompare[info->cunits[uidx].func], info->cunits[uidx].optr, colData, info->cunits[uidx].valData);
+    }
 
     if ((*p)[i] == 0) {
       all = false;
@@ -3009,8 +3027,16 @@ bool filterExecuteImpl(void *pinfo, int32_t numOfRows, int8_t** p, SDataStatis *
             } else if (cunit->rfunc >= 0) {
               (*p)[i] = (*gRangeCompare[cunit->rfunc])(colData, colData, cunit->valData, cunit->valData2, gDataCompare[cunit->func]);
             } else {
+              if(cunit->dataType == TSDB_DATA_TYPE_NCHAR && (cunit->optr == TSDB_RELATION_MATCH || cunit->optr == TSDB_RELATION_NMATCH)){
+                char *newColData = calloc(cunit->dataSize * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE, 1);
+                int len = taosUcs4ToMbs(varDataVal(colData), varDataLen(colData), varDataVal(newColData));
+                varDataSetLen(newColData, len);
+                (*p)[i] = filterDoCompare(gDataCompare[cunit->func], cunit->optr, newColData, cunit->valData);
+                tfree(newColData);
+              }else{
                 (*p)[i] = filterDoCompare(gDataCompare[cunit->func], cunit->optr, colData, cunit->valData);
               }
+            }
           
           //FILTER_UNIT_SET_R(info, uidx, p[i]);
           //FILTER_UNIT_SET_F(info, uidx);

src/query/src/qSqlParser.c

@@ -67,7 +67,6 @@ SSqlInfo qSqlParse(const char *pStr) {
         sqlInfo.valid = false;
         goto abort_parse;
       }
-        
       default:
         Parse(pParser, t0.type, t0, &sqlInfo);
         if (sqlInfo.valid == false) {
@@ -134,7 +133,7 @@ SArray *tStrTokenAppend(SArray *pList, SStrToken *pToken) {
   return pList;
 }
 
-tSqlExpr *tSqlExprCreateIdValue(SStrToken *pToken, int32_t optrType) {
+tSqlExpr *tSqlExprCreateIdValue(SSqlInfo* pInfo, SStrToken *pToken, int32_t optrType) {
   tSqlExpr *pSqlExpr = calloc(1, sizeof(tSqlExpr));
 
   if (pToken != NULL) {
@@ -169,6 +168,7 @@ tSqlExpr *tSqlExprCreateIdValue(SStrToken *pToken, int32_t optrType) {
       char unit = 0;
       int32_t ret = parseAbsoluteDuration(pToken->z, pToken->n, &pSqlExpr->value.i64, &unit, TSDB_TIME_PRECISION_NANO);
       if (ret != TSDB_CODE_SUCCESS) {
+        snprintf(pInfo->msg, tListLen(pInfo->msg), "%s", pToken->z);
         terrno = TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
       }
     }

src/tsdb/src/tsdbCompact.c

@@ -67,7 +67,9 @@ int tsdbCompact(STsdbRepo *pRepo) { return tsdbAsyncCompact(pRepo); }
 void *tsdbCompactImpl(STsdbRepo *pRepo) {
   // Check if there are files in TSDB FS to compact
   if (REPO_FS(pRepo)->cstatus->pmf == NULL) {
-    tsdbInfo("vgId:%d no file to compact in FS", REPO_ID(pRepo));
+    pRepo->compactState = TSDB_NO_COMPACT;
+    tsem_post(&(pRepo->readyToCommit));
+    tsdbInfo("vgId:%d compact over, no file to compact in FS", REPO_ID(pRepo));
     return NULL;
   }
 

src/util/src/tcompare.c

@@ -417,14 +417,20 @@ int32_t compareFindItemInSet(const void *pLeft, const void* pRight)  {
 
 int32_t compareWStrPatternComp(const void* pLeft, const void* pRight) {
   SPatternCompareInfo pInfo = {'%', '_'};
+  size_t size = varDataLen(pLeft)/TSDB_NCHAR_SIZE;
 
   assert(varDataLen(pRight) <= TSDB_MAX_FIELD_LEN * TSDB_NCHAR_SIZE);
 
   wchar_t *pattern = calloc(varDataLen(pRight) + 1, sizeof(wchar_t));
+  wchar_t *str = calloc(size + 1, sizeof(wchar_t));
+
   memcpy(pattern, varDataVal(pRight), varDataLen(pRight));
+  memcpy(str, varDataVal(pLeft), size * sizeof(wchar_t));
+
+  int32_t ret = WCSPatternMatch(pattern, str, size, &pInfo);
 
-  int32_t ret = WCSPatternMatch(pattern, varDataVal(pLeft), varDataLen(pLeft)/TSDB_NCHAR_SIZE, &pInfo);
   free(pattern);
+  free(str);
 
   return (ret == TSDB_PATTERN_MATCH) ? 0 : 1;
 }

src/vnode/src/vnodeRead.c

@@ -20,6 +20,7 @@
 #include "tglobal.h"
 #include "query.h"
 #include "vnodeStatus.h"
+#include "tgrant.h"
 
 int32_t vNumOfExistedQHandle;   // current initialized and existed query handle in current dnode
 
@@ -55,6 +56,11 @@ int32_t vnodeProcessRead(void *vparam, SVReadMsg *pRead) {
 }
 
 static int32_t vnodeCheckRead(SVnodeObj *pVnode) {
+  if (grantCheck(TSDB_GRANT_TIME) != TSDB_CODE_SUCCESS) {
+    vDebug("vgId:%d, grant expired, refCount:%d pVnode:%p", pVnode->vgId, pVnode->refCount, pVnode);
+    return TSDB_CODE_GRANT_EXPIRED;
+  }
+
   if (!vnodeInReadyStatus(pVnode)) {
     vDebug("vgId:%d, vnode status is %s, refCount:%d pVnode:%p", pVnode->vgId, vnodeStatus[pVnode->status],
            pVnode->refCount, pVnode);

tests/pytest/dbmgmt/nanoSecondCheck.py

@@ -31,6 +31,7 @@ class TDTestCase:
         tdSql.prepare()
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
+        tdSql.error('create database db keep 365000'); 
         tdSql.execute('create database db precision "ns";')
         tdSql.query('show databases;')
         tdSql.checkData(0,16,'ns')

tests/pytest/fulltest.sh

@@ -405,7 +405,7 @@ python3 ./test.py -f query/queryWildcardLength.py
 python3 ./test.py -f query/queryTbnameUpperLower.py
 
 python3 ./test.py -f query/query.py
-python3 ./test.py -f query/queryDiffColsOr.py
+python3 ./test.py -f query/queryDiffColsTagsAndOr.py
 
 
 python3 ./test.py -f client/nettest.py

tests/pytest/functions/function_derivative.py

@@ -147,6 +147,9 @@ class TDTestCase:
             tdSql.error("select derivative(col, 10s, 1) from stb group by id")
             tdSql.error("select derivative(col, 999ms, 1) from stb group by id")
             tdSql.error("select derivative(col, 10s, 2) from stb group by id")
+            tdSql.error("select derivative(col, -106752999999999922222d, 0) from stb group by tbname");  #overflow error
+            tdSql.error("select derivative(col, 10y, 0) from stb group by tbname")      #TD-10399, DB error: syntax error near '10y, 0) from stb group by tbname;'
+            tdSql.error("select derivative(col, -106752d, 0) from stb group by tbname") #TD-10398 overflow tips
 
     def run(self):
         tdSql.prepare()        

tests/pytest/functions/queryTestCases.py

@@ -1581,7 +1581,7 @@ class TDTestCase:
         # self.td5798()
 
         # develop branch
-        self.td4889()
+        # self.td4889() In the scenario that with vnode/wal/wal* but without meta/data in vnode, the status is reset to 0 right now.
         self.td5798()
 
     def stop(self):

tests/pytest/query/queryRegex.py

@@ -29,18 +29,18 @@ class TDTestCase:
         print("==============step1")
         ##2021-09-17 For jira: https://jira.taosdata.com:18080/browse/TD-6585
         tdSql.execute(
-            "create stable if not exists stb_test(ts timestamp,c0 binary(32),c1 int) tags(t0 binary(32))"
+            "create stable if not exists stb_test(ts timestamp,c0 binary(32),c1 int,c2 nchar(50)) tags(t0 binary(32),t1 nchar(50))"
         )
         tdSql.execute(
-            'create table if not exists stb_1 using stb_test tags("abcdefgasdfg12346")'
+            'create table if not exists stb_1 using stb_test tags("abcdefgasdfg12346","涛思数据")'
         )
-        tdLog.info('insert into stb_1 values("2021-09-13 10:00:00.001","abcefdasdqwerxasdazx12345",15')
+        tdLog.info('insert into stb_1 values("2021-09-13 10:00:00.001","abcefdasdqwerxasdazx12345",15,"引擎一组"')
 
 
-        tdSql.execute('insert into stb_1 values("2021-09-13 10:00:00.002","abcefdasdqwerxasdazx12345",15)')
-        tdSql.execute('insert into stb_1 values("2021-09-13 10:00:00.003","aaaaafffwwqqxzz",16)')
-        tdSql.execute('insert into stb_1 values("2021-09-13 10:00:00.004","fffwwqqxzz",17)')
-        tdSql.execute('insert into stb_1 values("2020-10-13 10:00:00.001","abcd\\\efgh",100)')
+        tdSql.execute('insert into stb_1 values("2021-09-13 10:00:00.002","abcefdasdqwerxasdazx12345",15,"引擎一组一号")')
+        tdSql.execute('insert into stb_1 values("2021-09-13 10:00:00.003","aaaaafffwwqqxzz",16,"引擎一组二号")')
+        tdSql.execute('insert into stb_1 values("2021-09-13 10:00:00.004","fffwwqqxzz",17,"涛涛思思")')
+        tdSql.execute('insert into stb_1 values("2020-10-13 10:00:00.001","abcd\\\efgh",100,"思涛思")')
 
         tdSql.query('select * from stb_test where tbname match "asd"')
         tdSql.checkRows(0)
@@ -98,6 +98,31 @@ class TDTestCase:
         tdSql.query("select * from stb_1 where c0 nmatch '\\\\'")
         tdSql.checkRows(3)
 
+        #2021-10-20 for https://jira.taosdata.com:18080/browse/TD-10708
+        tdSql.query('select * from stb_1 where c2 match "^涛"')
+        tdSql.checkRows(1)
+
+        tdSql.query('select * from stb_1 where c2 nmatch "^涛"')
+        tdSql.checkRows(3)
+
+        tdSql.query('select * from stb_1 where c2 match "号$"')
+        tdSql.checkRows(2)
+
+        tdSql.query('select * from stb_1 where c2 nmatch "号$"')
+        tdSql.checkRows(2)
+
+        tdSql.query('select * from stb_1 where c2 match "涛+思"')
+        tdSql.checkRows(2)
+
+        tdSql.query('select * from stb_1 where c2 nmatch "涛+思"')
+        tdSql.checkRows(2)
+
+        tdSql.query('select * from stb_1 where c2 match "涛*思"')
+        tdSql.checkRows(2)
+
+        tdSql.query('select * from stb_1 where c2 nmatch "涛*思"')
+        tdSql.checkRows(2)
+
 
 
 

tests/pytest/tools/taosdemoTestTblAlt.py

@@ -54,27 +54,36 @@ class TDTestCase:
         binPath = buildPath + "/build/bin/"
 
         if(threadID == 0):
-            os.system("%staosdemo -y -t %d -n %d -b INT,INT,INT,INT -m t" %
+            print("%staosdemo -y -t %d -n %d -b INT,INT,INT,INT" %
+                      (binPath, self.numberOfTables, self.numberOfRecords))
+            os.system("%staosdemo -y -t %d -n %d -b INT,INT,INT,INT" %
                       (binPath, self.numberOfTables, self.numberOfRecords))
         if(threadID == 1):
             time.sleep(2)
             print("use test")
-            while True:
+            max_try = 100
+            count = 0
+            while (count < max_try):
                 try:
                     tdSql.execute("use test")
                     break
                 except Exception as e:
                     tdLog.info("use database test failed")
-                    time.sleep(1)
+                    time.sleep(2)
+                    count += 1
+                    print("try %d times" % count)
                     continue
 
             # check if all the tables have heen created
-            while True:
+            count = 0
+            while (count < max_try):
                 try:
                     tdSql.query("show tables")
                 except Exception as e:
                     tdLog.info("show tables test failed")
-                    time.sleep(1)
+                    time.sleep(2)
+                    count += 1
+                    print("try %d times" % count)
                     continue
 
                 rows = tdSql.queryRows
@@ -83,13 +92,17 @@ class TDTestCase:
                     break
                 time.sleep(1)
             # check if there are any records in the last created table
-            while True:
+            count = 0
+            while (count < max_try):
                 print("query started")
+                print("try %d times" % count)
                 try:
-                    tdSql.query("select * from test.t7")
+                    tdSql.query("select * from test.d7")
                 except Exception as e:
                     tdLog.info("select * test failed")
                     time.sleep(2)
+                    count += 1
+                    print("try %d times" % count)
                     continue
 
                 rows = tdSql.queryRows
@@ -100,8 +113,8 @@ class TDTestCase:
 
             print("alter table test.meters add column c10 int")
             tdSql.execute("alter table test.meters add column c10 int")
-            print("insert into test.t7 values (now, 1, 2, 3, 4, 0)")
-            tdSql.execute("insert into test.t7 values (now, 1, 2, 3, 4, 0)")
+            print("insert into test.d7 values (now, 1, 2, 3, 4, 0)")
+            tdSql.execute("insert into test.d7 values (now, 1, 2, 3, 4, 0)")
 
     def run(self):
         tdSql.prepare()

tests/script/general/compute/csum.sim

@@ -88,6 +88,18 @@ sql select csum(tbcol) as b from $tb where ts <= $ms interval(1m) -x step6
   return -1
 step6:
 
+print =============== csum result overflow follow sum behavior
+sql create table overflow(ts timestamp, c1 bigint)
+sql insert into overflow values(now-1s, NULL)(now, 9223372036854775807)(now+1s, 9223372036854775807)
+sql select csum(c1) from overflow
+print $data00 , $data01, $data10, $data11
+if $data01 != 9223372036854775807 then
+  return -1
+endi
+if $data11 != -2 then
+  return -1
+endi
+
 print =============== clear
 sql drop database $db
 sql show databases

tests/script/general/parser/alter.sim

@@ -86,12 +86,13 @@ endi
 if $data07 != 11,12,13 then 
  return -1
 endi
-sql alter database $db keep 365000,365000,365000
+sql_error alter database $db keep 365000,365000,365000
+sql alter database $db keep 36500,36500,36500
 sql show databases
 if $rows != 1 then
   return -1
 endi
-if $data07 != 365000,365000,365000 then 
+if $data07 != 36500,36500,36500 then 
  return -1
 endi
 

tests/script/general/parser/alter__for_community_version.sim

@@ -79,15 +79,16 @@ endi
 if $data07 != 13 then 
  return -1
 endi
-sql alter database $db keep 365000
+sql alter database $db keep 36500
 sql show databases
 if $rows != 1 then
   return -1
 endi
-if $data07 != 365000 then 
+if $data07 != 36500 then 
  return -1
 endi
 
+sql_error alter database $db keep 365000
 
 ##### alter table test, simeplest case
 sql create table tb (ts timestamp, c1 int, c2 int, c3 int)

tests/script/general/parser/tagName_escape.sim

@@ -144,6 +144,25 @@ if $data30 != @456 123@ then
   return -1
 endi
 
+##MODIFY TAG
+
+sql alter stable stb0 add tag `key` binary(10)
+sql alter stable stb0 add tag `value` nchar(10)
+sql alter stable stb0 modify tag `key` binary(15)
+sql alter stable stb0 modify tag `value` nchar(15)
+
+sql describe stb0;
+if $rows != 7 then
+  return -1
+endi
+if $data52 != 15 then
+  return -1
+endi
+if $data62 != 15 then
+  return -1
+endi
+
+
 ##SET TAG
 
 sql insert into ctb0 values (now, 1)
@@ -155,6 +174,7 @@ sql alter table ctb0 set tag `456 123`=2
 #sql alter table ctb0 set tag `abc.123`=2
 #change tag has bug when using dot in tagname
 
+
 print ======================= test insert specific tags automatically create table
 
 sql alter table ctb0 set tag `321`=2
@@ -184,3 +204,4 @@ if $data24 != NULL then
 endi
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
+