Merge remote-tracking branch 'origin/develop' into feature/sim

alert/go.mod

@@ -5,7 +5,7 @@ go 1.14
 require (
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
-	github.com/taosdata/driver-go v0.0.0-20200727182616-1a3b1941c206
+	github.com/taosdata/driver-go v0.0.0-20201113094317-050667e5b4d0
 	go.uber.org/zap v1.14.1
 	google.golang.org/appengine v1.6.5 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c

src/client/inc/tsclient.h

@@ -307,7 +307,6 @@ typedef struct STscObj {
   SRpcCorEpSet       *tscCorMgmtEpSet;
   void*              pDnodeConn;
   pthread_mutex_t    mutex;
-  T_REF_DECLARE()
 } STscObj;
 
 typedef struct SSubqueryState {
@@ -483,7 +482,6 @@ extern int           tscObjRef;
 extern void *    tscTmr;
 extern void *    tscQhandle;
 extern int       tscKeepConn[];
-extern int       tsInsertHeadSize;
 extern int       tscNumOfThreads;
 extern int       tscRefId;
   

src/client/src/tscSQLParser.c

@@ -996,33 +996,6 @@ static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pC
     return false;
   }
 
-  int32_t nLen = 0;
-  for (int32_t i = 0; i < numOfTags; ++i) {
-    TAOS_FIELD* p = taosArrayGet(pTagsList, i);
-    if (p->bytes == 0) {
-      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg7);
-      return false;
-    }
-
-    nLen += p->bytes;
-  }
-
-  // max tag row length must be less than TSDB_MAX_TAGS_LEN
-  if (nLen > TSDB_MAX_TAGS_LEN) {
-    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
-    return false;
-  }
-
-  // field name must be unique
-  for (int32_t i = 0; i < numOfTags; ++i) {
-    TAOS_FIELD* p = taosArrayGet(pTagsList, i);
-
-    if (has(pFieldList, 0, p->name) == true) {
-      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
-      return false;
-    }
-  }
-
   /* timestamp in tag is not allowed */
   for (int32_t i = 0; i < numOfTags; ++i) {
     TAOS_FIELD* p = taosArrayGet(pTagsList, i);
@@ -1054,6 +1027,33 @@ static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pC
     }
   }
 
+  int32_t nLen = 0;
+  for (int32_t i = 0; i < numOfTags; ++i) {
+    TAOS_FIELD* p = taosArrayGet(pTagsList, i);
+    if (p->bytes == 0) {
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg7);
+      return false;
+    }
+
+    nLen += p->bytes;
+  }
+
+  // max tag row length must be less than TSDB_MAX_TAGS_LEN
+  if (nLen > TSDB_MAX_TAGS_LEN) {
+    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+    return false;
+  }
+
+  // field name must be unique
+  for (int32_t i = 0; i < numOfTags; ++i) {
+    TAOS_FIELD* p = taosArrayGet(pTagsList, i);
+
+    if (has(pFieldList, 0, p->name) == true) {
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      return false;
+    }
+  }
+
   return true;
 }
 

src/client/src/tscSql.c

@@ -115,9 +115,7 @@ static SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pa
 
   pObj->signature = pObj;
   pObj->pDnodeConn = pDnodeConn;
-  T_REF_INIT_VAL(pObj, 1);
   
-
   tstrncpy(pObj->user, user, sizeof(pObj->user));
   secretEncryptLen = MIN(secretEncryptLen, sizeof(pObj->pass));
   memcpy(pObj->pass, secretEncrypt, secretEncryptLen);
@@ -172,11 +170,9 @@ static SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pa
   if (taos != NULL) {
     *taos = pObj;
   }
-
-  registerSqlObj(pSql);
-  tsInsertHeadSize = sizeof(SMsgDesc) + sizeof(SSubmitMsg);
-
   pObj->rid = taosAddRef(tscRefId, pObj);
+  registerSqlObj(pSql);
+
   return pSql;
 }
 
@@ -288,34 +284,19 @@ void taos_close(TAOS *taos) {
     return;
   }
 
-  // make sure that the close connection can only be executed once.
+  SSqlObj* pHb = (SSqlObj*)taosAcquireRef(tscObjRef, pObj->hbrid);
-  pObj->signature = NULL;
+  if (pHb != NULL) {
-  taosTmrStopA(&(pObj->pTimer));
+    if (pHb->rpcRid > 0) {  // wait for rsp from dnode
-
+      rpcCancelRequest(pHb->rpcRid);
-  if (pObj->hbrid > 0) {
+      pHb->rpcRid = -1;
-    SSqlObj* pHb = (SSqlObj*)taosAcquireRef(tscObjRef, pObj->hbrid);
-    if (pHb != NULL) {
-      if (pHb->rpcRid > 0) {  // wait for rsp from dnode
-        rpcCancelRequest(pHb->rpcRid);
-        pHb->rpcRid = -1;
-      }
-
-      tscDebug("%p HB is freed", pHb);
-      taos_free_result(pHb);
-      taosReleaseRef(tscObjRef, pHb->self);
     }
-  }
 
-  int32_t ref = T_REF_DEC(pObj);
+    tscDebug("%p HB is freed", pHb);
-  assert(ref >= 0);
+    taosReleaseRef(tscObjRef, pHb->self);
-
+    taos_free_result(pHb);
-  if (ref > 0) {
-    tscDebug("%p %d remain sqlObjs, not free tscObj and dnodeConn:%p", pObj, ref, pObj->pDnodeConn);
-    return;
   }
 
   tscDebug("%p all sqlObj are freed, free tscObj and close dnodeConn:%p", pObj, pObj->pDnodeConn);
-
   taosRemoveRef(tscRefId, pObj->rid);
 }
 

src/client/src/tscSystem.c

@@ -36,7 +36,6 @@ int     tscObjRef = -1;
 void *  tscTmr;
 void *  tscQhandle;
 void *  tscCheckDiskUsageTmr;
-int     tsInsertHeadSize;
 int     tscRefId = -1;
 
 int tscNumOfThreads;

src/client/src/tscUtil.c

@@ -460,15 +460,7 @@ void tscFreeRegisteredSqlObj(void *pSql) {
 
   assert(p->self != 0);
   tscFreeSqlObj(p);
-
+  taosReleaseRef(tscRefId, pTscObj->rid);
-  int32_t ref = T_REF_DEC(pTscObj);
-  assert(ref >= 0);
-
-  tscDebug("%p free sqlObj completed, tscObj:%p ref:%d", p, pTscObj, ref);
-  if (ref == 0) {
-    tscDebug("%p all sqlObj freed, free tscObj:%p", p, pTscObj);
-    taosRemoveRef(tscRefId, pTscObj->rid);
-  }
 }
 
 void tscFreeTableMetaHelper(void *pTableMeta) {
@@ -810,6 +802,7 @@ static void extractTableMeta(SSqlCmd* pCmd) {
 }
 
 int32_t tscMergeTableDataBlocks(SSqlObj* pSql) {
+  const int INSERT_HEAD_SIZE = sizeof(SMsgDesc) + sizeof(SSubmitMsg); 
   SSqlCmd* pCmd = &pSql->cmd;
 
   void* pVnodeDataBlockHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
@@ -824,7 +817,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql) {
     STableDataBlocks* dataBuf = NULL;
     
     int32_t ret = tscGetDataBlockFromList(pVnodeDataBlockHashList, pOneTableBlock->vgId, TSDB_PAYLOAD_SIZE,
-                                tsInsertHeadSize, 0, pOneTableBlock->tableId, pOneTableBlock->pTableMeta, &dataBuf, pVnodeDataBlockList);
+                                INSERT_HEAD_SIZE, 0, pOneTableBlock->tableId, pOneTableBlock->pTableMeta, &dataBuf, pVnodeDataBlockList);
     if (ret != TSDB_CODE_SUCCESS) {
       tscError("%p failed to prepare the data block buffer for merging table data, code:%d", pSql, ret);
       taosHashCleanup(pVnodeDataBlockHashList);
@@ -1917,9 +1910,7 @@ void tscResetForNextRetrieve(SSqlRes* pRes) {
 }
 
 void registerSqlObj(SSqlObj* pSql) {
-  int32_t ref = T_REF_INC(pSql->pTscObj);
+  taosAcquireRef(tscRefId, pSql->pTscObj->rid);
-  tscDebug("%p add to tscObj:%p, ref:%d", pSql, pSql->pTscObj, ref);
-
   pSql->self = taosAddRef(tscObjRef, pSql);
 }
 
@@ -2629,4 +2620,4 @@ int32_t copyTagData(STagData* dst, const STagData* src) {
   }
 
   return 0;
-}
+}

src/query/src/qParserImpl.c

@@ -384,7 +384,12 @@ void tSqlSetColumnInfo(TAOS_FIELD *pField, SStrToken *pName, TAOS_FIELD *pType)
   pField->name[pName->n] = 0;
 
   pField->type = pType->type;
-  pField->bytes = pType->bytes;
+  if(pField->type < TSDB_DATA_TYPE_BOOL || pField->type > TSDB_DATA_TYPE_NCHAR){
+    pField->bytes = 0;
+  } else {
+    pField->bytes = pType->bytes;
+  }
+
 }
 
 void tSqlSetColumnType(TAOS_FIELD *pField, SStrToken *type) {