Merge branch '3.0' into cpwu/3.0

source/common/src/tmsg.c

@@ -4919,8 +4919,8 @@ int tDecodeSVCreateStbReq(SDecoder *pCoder, SVCreateStbReq *pReq) {
   if (tDecodeCStr(pCoder, &pReq->name) < 0) return -1;
   if (tDecodeI64(pCoder, &pReq->suid) < 0) return -1;
   if (tDecodeI8(pCoder, &pReq->rollup) < 0) return -1;
-  if (tDecodeSSchemaWrapper(pCoder, &pReq->schemaRow) < 0) return -1;
-  if (tDecodeSSchemaWrapper(pCoder, &pReq->schemaTag) < 0) return -1;
+  if (tDecodeSSchemaWrapperEx(pCoder, &pReq->schemaRow) < 0) return -1;
+  if (tDecodeSSchemaWrapperEx(pCoder, &pReq->schemaTag) < 0) return -1;
   if (pReq->rollup) {
     if (tDecodeSRSmaParam(pCoder, &pReq->rsmaParam) < 0) return -1;
   }

source/dnode/vnode/src/vnd/vnodeSnapshot.c

@@ -175,6 +175,7 @@ _err:
 
 int32_t vnodeSnapWriterClose(SVSnapWriter *pWriter, int8_t rollback) {
   int32_t code = 0;
+  SVnode *pVnode = pWriter->pVnode;
 
   if (pWriter->pMetaSnapWriter) {
     code = metaSnapWriterClose(&pWriter->pMetaSnapWriter, rollback);
@@ -186,8 +187,31 @@ int32_t vnodeSnapWriterClose(SVSnapWriter *pWriter, int8_t rollback) {
     if (code) goto _err;
   }
 
+  if (!rollback) {
+    SVnodeInfo info = {0};
+    char       dir[TSDB_FILENAME_LEN];
+
+    pVnode->state.committed = pWriter->ever;
+    pVnode->state.applied = pWriter->ever;
+    // pVnode->state.applyTerm = ;
+    // pVnode->state.commitTerm = ;
+
+    info.config = pVnode->config;
+    info.state.committed = pVnode->state.applied;
+    info.state.commitTerm = pVnode->state.applyTerm;
+    info.state.commitID = pVnode->state.commitID;
+    snprintf(dir, TSDB_FILENAME_LEN, "%s%s%s", tfsGetPrimaryPath(pVnode->pTfs), TD_DIRSEP, pVnode->path);
+    code = vnodeSaveInfo(dir, &info);
+    if (code) goto _err;
+
+    code = vnodeCommitInfo(dir, &info);
+    if (code) goto _err;
+  } else {
+    ASSERT(0);
+  }
+
 _exit:
-  vInfo("vgId:%d vnode snapshot writer closed, rollback:%d", TD_VID(pWriter->pVnode), rollback);
+  vInfo("vgId:%d vnode snapshot writer closed, rollback:%d", TD_VID(pVnode), rollback);
   taosMemoryFree(pWriter);
   return code;
 

source/dnode/vnode/src/vnd/vnodeSvr.c

@@ -422,8 +422,8 @@ static int32_t vnodeProcessCreateStbReq(SVnode *pVnode, int64_t version, void *p
     goto _err;
   }
 
-  taosMemoryFree(req.schemaRow.pSchema);
-  taosMemoryFree(req.schemaTag.pSchema);
+  // taosMemoryFree(req.schemaRow.pSchema);
+  // taosMemoryFree(req.schemaTag.pSchema);
   tDecoderClear(&coder);
   return 0;
 

tests/script/tsim/valgrind/checkError2.sim

@@ -78,18 +78,18 @@ sql select max(c1), max(c2), max(c3) from ct1
 sql select sum(c1), sum(c2), sum(c3) from ct1
 
 print =============== step9: insert select
-#sql create table ct4 using stb tags(4000);
-#sql insert into ct4 select * from ct1;
-#sql select * from ct4;
-#sql insert into ct4 select ts,c1,c2,c3 from stb;
+sql create table ct4 using stb tags(4000);
+sql insert into ct4 select * from ct1;
+sql select * from ct4;
+sql insert into ct4 select ts,c1,c2,c3 from stb;
 
-#sql create table tb1 (ts timestamp, c1 int, c2 float, c3 double);
-#sql insert into tb1 (ts, c1, c2, c3) select * from ct1;
-#sql select * from tb1;
+sql create table tb1 (ts timestamp, c1 int, c2 float, c3 double);
+sql insert into tb1 (ts, c1, c2, c3) select * from ct1;
+sql select * from tb1;
 
-#sql create table tb2 (ts timestamp, f1 binary(10), c1 int, c2 double);
-#sql insert into tb2 (c2, c1, ts) select c2+1, c1, ts+3 from ct2;
-#sql select * from tb2;
+sql create table tb2 (ts timestamp, f1 binary(10), c1 int, c2 double);
+sql insert into tb2 (c2, c1, ts) select c2+1, c1, ts+3 from ct2;
+sql select * from tb2;
 
 _OVER:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT