Merge pull request #1270 from taosdata/release/v1.6.5.5

Release/v1.6.5.5

src/client/src/tscServer.c

@@ -1301,8 +1301,6 @@ void tscKillMetricQuery(SSqlObj *pSql) {
     taosStopRpcConn(pSql->pSubs[i]->thandle);
   }
 
-  pSql->numOfSubs = 0;
-
   /*
    * 1. if the subqueries are not launched or partially launched, we need to waiting the launched
    * query return to successfully free allocated resources.
@@ -2886,7 +2884,7 @@ int tscBuildMetricMetaMsg(SSqlObj *pSql) {
     int32_t condLen = 0;
     if (pTagCond->numOfTagCond > 0) {
       SCond *pCond = tsGetMetricQueryCondPos(pTagCond, uid);
-      if (pCond != NULL) {
+      if (pCond != NULL && pCond->cond != NULL) {
         condLen = strlen(pCond->cond) + 1;
         
         bool ret = taosMbsToUcs4(pCond->cond, condLen, pMsg, condLen * TSDB_NCHAR_SIZE);
@@ -2909,10 +2907,13 @@ int tscBuildMetricMetaMsg(SSqlObj *pSql) {
 
       pElem->tableCond = htonl(offset);
       
-      uint32_t len = strlen(pTagCond->tbnameCond.cond);
+      uint32_t len = 0;
+      if (pTagCond->tbnameCond.cond != NULL) {
+        len = strlen(pTagCond->tbnameCond.cond);
+        memcpy(pMsg, pTagCond->tbnameCond.cond, len);
+      }
+	    
       pElem->tableCondLen = htonl(len);
-
-      memcpy(pMsg, pTagCond->tbnameCond.cond, len);
       pMsg += len;
     }
 

src/client/src/tscUtil.c

@@ -64,7 +64,7 @@ void tscGetMetricMetaCacheKey(SSqlCmd* pCmd, char* str, uint64_t uid) {
   size_t redundantLen = 20;
 
   size_t bufSize = strlen(pMeterMetaInfo->name) + tbnameCondLen + strlen(join) + strlen(tagIdBuf);
-  if (cond != NULL) {
+  if (cond != NULL && cond->cond != NULL) {
     bufSize += strlen(cond->cond);
   }
 
@@ -72,7 +72,7 @@ void tscGetMetricMetaCacheKey(SSqlCmd* pCmd, char* str, uint64_t uid) {
   char* tmp = calloc(1, bufSize);
 
   int32_t keyLen = snprintf(tmp, bufSize, "%s,%s,%s,%d,%s,[%s],%d", pMeterMetaInfo->name,
-                            (cond != NULL ? cond->cond : NULL), (tbnameCondLen > 0 ? pTagCond->tbnameCond.cond : NULL),
+                            ((cond != NULL && cond->cond != NULL) ? cond->cond : NULL), (tbnameCondLen > 0 ? pTagCond->tbnameCond.cond : NULL),
                             pTagCond->relType, join, tagIdBuf, pCmd->groupbyExpr.orderType);
 
   assert(keyLen <= bufSize);

src/util/src/version.c

 char version[64] = "1.6.5.5";
-char compatible_version[64] = "1.6.1.0";
-char gitinfo[128] = "918cb2220f6a1f71966f7e94e697885d50fc241f";
+char compatible_version[64] = "1.6.0.0";
+char gitinfo[128] = "4ad876d4b466566c82661b4120a8c14354c57d96";
 char gitinfoOfInternal[128] = "da88f4a2474737d1f9c76adcf0ff7fd0975e7342";
-char buildinfo[512] = "Built by root at 2020-02-09 11:09";
+char buildinfo[512] = "Built by root at 2020-02-19 19:16";
 
 void libtaos_1_6_5_5_Linux_x64() {};