Merge remote-tracking branch 'origin/3.0' into feat/TD-24700

source/common/src/tmsg.c

@@ -6982,8 +6982,11 @@ int32_t tDecodeSVAlterTbReqSetCtime(SDecoder* pDecoder, SVAlterTbReq* pReq, int6
   if (tStartDecode(pDecoder) < 0) return -1;
   if (tDecodeSVAlterTbReqCommon(pDecoder, pReq) < 0) return -1;
 
-  *(int64_t *)(pDecoder->data + pDecoder->pos) = ctimeMs;
-  if (tDecodeI64(pDecoder, &pReq->ctimeMs) < 0) return -1;
+  pReq->ctimeMs = 0;
+  if (!tDecodeIsEnd(pDecoder)) {
+    *(int64_t *)(pDecoder->data + pDecoder->pos) = ctimeMs;
+    if (tDecodeI64(pDecoder, &pReq->ctimeMs) < 0) return -1;
+  }
 
   tEndDecode(pDecoder);
   return 0;
@@ -7541,8 +7544,11 @@ int32_t tDecodeSBatchDeleteReq(SDecoder *pDecoder, SBatchDeleteReq *pReq) {
 int32_t tDecodeSBatchDeleteReqSetCtime(SDecoder *pDecoder, SBatchDeleteReq *pReq, int64_t ctimeMs) {
   if (tDecodeSBatchDeleteReqCommon(pDecoder, pReq)) return -1;
 
-  *(int64_t *)(pDecoder->data + pDecoder->pos) = ctimeMs;
-  if (tDecodeI64(pDecoder, &pReq->ctimeMs) < 0) return -1;
+  pReq->ctimeMs = 0;
+  if (!tDecodeIsEnd(pDecoder)) {
+    *(int64_t *)(pDecoder->data + pDecoder->pos) = ctimeMs;
+    if (tDecodeI64(pDecoder, &pReq->ctimeMs) < 0) return -1;
+  }
   return 0;
 }
 

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

@@ -1980,6 +1980,11 @@ static int metaUpdateTtl(SMeta *pMeta, const SMetaEntry *pME) {
 int metaUpdateChangeTime(SMeta *pMeta, tb_uid_t uid, int64_t changeTimeMs) {
   if (!tsTtlChangeOnWrite) return 0;
 
+  if (changeTimeMs <= 0) {
+    metaWarn("Skip to change ttl deletetion time on write, uid: %" PRId64, uid);
+    return TSDB_CODE_VERSION_NOT_COMPATIBLE;
+  }
+
   STtlUpdCtimeCtx ctx = {.uid = uid, .changeTimeMs = changeTimeMs};
 
   return ttlMgrUpdateChangeTime(pMeta->pTtlMgr, &ctx);

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

@@ -358,7 +358,8 @@ int ttlMgrFlush(STtlManger *pTtlMgr, TXN *pTxn) {
 
     STtlCacheEntry *cacheEntry = taosHashGet(pTtlMgr->pTtlCache, pUid, sizeof(*pUid));
     if (cacheEntry == NULL) {
-      metaError("ttlMgr flush failed to get ttl cache since %s", tstrerror(terrno));
+      metaError("ttlMgr flush failed to get ttl cache since %s, uid: %" PRId64 ", type: %d", tstrerror(terrno), *pUid,
+                pEntry->type);
       goto _out;
     }
 

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

@@ -234,8 +234,10 @@ static int32_t vnodePreProcessSubmitTbData(SVnode *pVnode, SDecoder *pCoder, int
     }
   }
 
-  *(int64_t *)(pCoder->data + pCoder->pos) = ctimeMs;
-  pCoder->pos += sizeof(int64_t);
+  if (!tDecodeIsEnd(pCoder)) {
+    *(int64_t *)(pCoder->data + pCoder->pos) = ctimeMs;
+    pCoder->pos += sizeof(int64_t);
+  }
 
   tEndDecode(pCoder);