fix:core dump if consumer multi vgroup message with...

fix:core dump if consumer multi vgroup message with sequence:create/alter/delete/create or create/delete/create

examples/c/tmq.c

@@ -96,8 +96,7 @@ int32_t init_env() {
   }
   taos_free_result(pRes);
 
-  pRes =
-      taos_query(pConn, "create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 nchar(8), t4 bool)");
+  pRes = taos_query(pConn, "create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 nchar(8), t4 bool)");
   if (taos_errno(pRes) != 0) {
     printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
     return -1;
@@ -265,6 +264,20 @@ int32_t init_env() {
   }
   taos_free_result(pRes);
 
+  pRes = taos_query(pConn, "create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 nchar(8), t4 bool)");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "drop table st1");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to drop super table st1, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
   return 0;
 }
 

source/client/src/tmq.c

@@ -2397,7 +2397,7 @@ void tmq_free_json_meta(char* jsonMeta){
   taosMemoryFreeClear(jsonMeta);
 }
 
-static int32_t taosCreateStb(TAOS *taos, void *meta, int32_t metaLen, bool isCreate){
+static int32_t taosCreateStb(TAOS *taos, void *meta, int32_t metaLen){
   SVCreateStbReq req = {0};
   SDecoder       coder;
   SMCreateStbReq pReq = {0};
@@ -2436,13 +2436,9 @@ static int32_t taosCreateStb(TAOS *taos, void *meta, int32_t metaLen, bool isCre
     strcpy(field.name, pSchema->name);
     taosArrayPush(pReq.pTags, &field);
   }
-  if(isCreate){
-    pReq.colVer = 1;
-    pReq.tagVer = 1;
-  }else{
-    pReq.colVer = req.schemaRow.version;
-    pReq.tagVer = req.schemaTag.version;
-  }
+
+  pReq.colVer = req.schemaRow.version;
+  pReq.tagVer = req.schemaTag.version;
   pReq.numOfColumns = req.schemaRow.nCols;
   pReq.numOfTags = req.schemaTag.nCols;
   pReq.commentLen = -1;
@@ -2876,9 +2872,9 @@ int32_t taos_write_raw_meta(TAOS *taos, tmq_raw_data *raw_meta){
   }
 
   if(raw_meta->raw_meta_type == TDMT_VND_CREATE_STB) {
-    return taosCreateStb(taos, raw_meta->raw_meta, raw_meta->raw_meta_len, true);
+    return taosCreateStb(taos, raw_meta->raw_meta, raw_meta->raw_meta_len);
   }else if(raw_meta->raw_meta_type == TDMT_VND_ALTER_STB){
-    return taosCreateStb(taos, raw_meta->raw_meta, raw_meta->raw_meta_len, false);
+    return taosCreateStb(taos, raw_meta->raw_meta, raw_meta->raw_meta_len);
   }else if(raw_meta->raw_meta_type == TDMT_VND_DROP_STB){
     return taosDropStb(taos, raw_meta->raw_meta, raw_meta->raw_meta_len);
   }else if(raw_meta->raw_meta_type == TDMT_VND_CREATE_TABLE){

source/dnode/mnode/impl/src/mndStb.c

@@ -710,8 +710,8 @@ int32_t mndBuildStbFromReq(SMnode *pMnode, SStbObj *pDst, SMCreateStbReq *pCreat
   pDst->updateTime = pDst->createdTime;
   pDst->uid = (pCreate->source == TD_REQ_FROM_TAOX) ? pCreate->suid : mndGenerateUid(pCreate->name, TSDB_TABLE_FNAME_LEN);
   pDst->dbUid = pDb->uid;
-  pDst->tagVer = (pCreate->source == TD_REQ_FROM_TAOX) ? pCreate->tagVer : 1;
-  pDst->colVer = (pCreate->source == TD_REQ_FROM_TAOX) ? pCreate->colVer : 1;
+  pDst->tagVer = 1;
+  pDst->colVer = 1;
   pDst->smaVer = 1;
   pDst->nextColId = 1;
   pDst->maxdelay[0] = pCreate->delay1;
@@ -985,10 +985,6 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
     mInfo("stb:%s, alter table does not need to be done, because table is deleted", createReq.name);
     code = 0;
     goto _OVER;
-  } else if (createReq.source == TD_REQ_FROM_TAOX && (createReq.tagVer == 1 || createReq.colVer == 1)){ //metaSaveToSkmDb does not delete  pMeta->pSkmDb, if receivet tmq message is: create stable1 then delete stable1 then create stable1
-    mInfo("stb:%s, create table from taosx", createReq.name);
-    createReq.tagVer++;
-    createReq.colVer++;
   }
 
   pDb = mndAcquireDbByStb(pMnode, createReq.name);

source/dnode/vnode/src/meta/metaTable.c

@@ -1125,6 +1125,11 @@ static int metaSaveToSkmDb(SMeta *pMeta, const SMetaEntry *pME) {
   skmDbKey.uid = pME->uid;
   skmDbKey.sver = pSW->version;
 
+  // if receive tmq meta message is: create stable1 then delete stable1 then create stable1 with multi vgroups
+  if (tdbTbGet(pMeta->pSkmDb, &skmDbKey, sizeof(skmDbKey), NULL, NULL) == 0) {
+    return rcode;
+  }
+
   // encode schema
   int32_t ret = 0;
   tEncodeSize(tEncodeSSchemaWrapper, pSW, vLen, ret);