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

src/client/src/tscParseInsert.c

@@ -702,7 +702,7 @@ static int32_t doParseInsertStatement(SSqlObj *pSql, void *pTableList, char **st
   }
 
   int32_t code = TSDB_CODE_TSC_INVALID_SQL;
-  char *  tmpTokenBuf = calloc(1, 4096);  // used for deleting Escape character: \\, \', \"
+  char *  tmpTokenBuf = calloc(1, 16*1024);  // used for deleting Escape character: \\, \', \"
   if (NULL == tmpTokenBuf) {
     return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }

src/client/src/tscSubquery.c

@@ -1449,6 +1449,7 @@ void tscHandleMasterJoinQuery(SSqlObj* pSql) {
 
   tscDebug("%p start subquery, total:%d", pSql, pQueryInfo->numOfTables);
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
+
     SJoinSupporter *pSupporter = tscCreateJoinSupporter(pSql, i);
     
     if (pSupporter == NULL) {  // failed to create support struct, abort current query

src/client/src/tscUtil.c

@@ -2158,7 +2158,7 @@ int16_t tscGetJoinTagColIdByUid(STagCond* pTagCond, uint64_t uid) {
 }
 
 int16_t tscGetTagColIndexById(STableMeta* pTableMeta, int16_t colId) {
-  int32_t numOfTags = tscGetNumOfColumns(pTableMeta);
+  int32_t numOfTags = tscGetNumOfTags(pTableMeta);
 
   SSchema* pSchema = tscGetTableTagSchema(pTableMeta);
   for(int32_t i = 0; i < numOfTags; ++i) {
@@ -2167,7 +2167,9 @@ int16_t tscGetTagColIndexById(STableMeta* pTableMeta, int16_t colId) {
     }
   }
 
-  return -1;
+  // can not reach here
+  assert(0);
+  return INT16_MIN;
 }
 
 bool tscIsUpdateQuery(SSqlObj* pSql) {

src/connector/go

@@ -1 +1 @@
-Subproject commit 8d7bf743852897110cbdcc7c4322cd7a74d4167b
+Subproject commit 8c58c512b6acda8bcdfa48fdc7140227b5221766

src/rpc/src/rpcMain.c

@@ -557,10 +557,7 @@ void rpcCancelRequest(void *handle) {
   int code = taosAcquireRef(tsRpcRefId, pContext);
   if (code < 0) return;
 
-  if (pContext->pConn) {
-    tDebug("%s, app tries to cancel request", pContext->pConn->info);
-    rpcCloseConn(pContext->pConn);
-  }
+  rpcCloseConn(pContext->pConn);
 
   taosReleaseRef(tsRpcRefId, pContext);
 }
@@ -655,6 +652,7 @@ static void rpcReleaseConn(SRpcConn *pConn) {
 
 static void rpcCloseConn(void *thandle) {
   SRpcConn *pConn = (SRpcConn *)thandle;
+  if (pConn == NULL) return;
 
   rpcLockConn(pConn);
 
@@ -1026,6 +1024,7 @@ static void rpcProcessBrokenLink(SRpcConn *pConn) {
   if (pConn->outType) {
     SRpcReqContext *pContext = pConn->pContext;
     pContext->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+    pContext->pConn = NULL;
     pConn->pReqMsg = NULL;
     taosTmrStart(rpcProcessConnError, 0, pContext, pRpc->tmrCtrl);
   }
@@ -1135,6 +1134,7 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead, SRpcReqConte
     // it's a response
     rpcMsg.handle = pContext;
     rpcMsg.ahandle = pContext->ahandle;
+    pContext->pConn = NULL;
 
     // for UDP, port may be changed by server, the port in epSet shall be used for cache
     if (pHead->code != TSDB_CODE_RPC_TOO_SLOW) {
@@ -1370,6 +1370,7 @@ static void rpcProcessRetryTimer(void *param, void *tmrId) {
       tDebug("%s, failed to send msg:%s to %s:%hu", pConn->info, taosMsg[pConn->outType], pConn->peerFqdn, pConn->peerPort);
       if (pConn->pContext) {
         pConn->pContext->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+        pConn->pContext->pConn = NULL;
         pConn->pReqMsg = NULL;
         taosTmrStart(rpcProcessConnError, 0, pConn->pContext, pRpc->tmrCtrl);
         rpcReleaseConn(pConn);

tests/examples/go/taosdemo.go

@@ -87,7 +87,7 @@ func init() {
 
 func printAllArgs() {
 	fmt.Printf("\n============= args parse result: =============\n")
-	fmt.Printf("dbName:               %v\n", configPara.hostName)
+	fmt.Printf("hostName:               %v\n", configPara.hostName)
 	fmt.Printf("serverPort:           %v\n", configPara.serverPort)
 	fmt.Printf("usr:                  %v\n", configPara.user)
 	fmt.Printf("password:             %v\n", configPara.password)