From 733c8f8f9abe55fd612b65c519b832c0a3728e36 Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Wed, 8 May 2024 14:59:08 +0800
Subject: [PATCH] fix: (compatibility) SLastCol field change cause 'last' crash

---
 source/dnode/vnode/src/inc/tsdb.h       | 23 ++++++++++++++++++++---
 source/dnode/vnode/src/tsdb/tsdbCache.c |  9 ++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h
index 23fd223ff6..5f90618d6d 100644
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -901,10 +901,27 @@ typedef struct {
   SColVal colVal;
 } SLastCol;
 
+typedef struct  {
+  union {
+    int64_t val;
+    struct {
+      uint8_t *pData;
+      uint32_t nData;
+    };
+  };
+} SValueV1;
+
 typedef struct {
-  TSKEY   ts;
-  int8_t  dirty;
-  SColVal colVal;
+  int16_t  cid;
+  int8_t   type;
+  int8_t   flag;
+  SValueV1 value;
+} SColValV1;
+
+typedef struct {
+  TSKEY     ts;
+  int8_t    dirty;
+  SColValV1 colVal;
 } SLastColV1;
 
 int32_t tsdbOpenCache(STsdb *pTsdb);
diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index d72c1dec6a..4622a7d8bd 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -343,7 +343,10 @@ static SLastCol *tsdbCacheConvertLastColV1(SLastColV1 *pLastColV1) {
   pLastCol->rowKey.ts = pLastColV1->ts;
   pLastCol->rowKey.numOfPKs = 0;
   pLastCol->dirty = pLastColV1->dirty;
-  pLastCol->colVal = pLastColV1->colVal;
+  pLastCol->colVal.cid = pLastColV1->colVal.cid;
+  pLastCol->colVal.flag = pLastColV1->colVal.flag;
+  pLastCol->colVal.value.type = pLastColV1->colVal.type;
+  pLastCol->colVal.value.val = pLastColV1->colVal.value.val;
 
   return pLastCol;
 }
@@ -354,8 +357,8 @@ static SLastCol *tsdbCacheDeserializeV1(char const *value) {
   }
 
   SLastColV1 *pLastColV1 = (SLastColV1 *)value;
-  SColVal    *pColVal = &pLastColV1->colVal;
-  if (IS_VAR_DATA_TYPE(pColVal->value.type)) {
+  SColValV1  *pColVal = &pLastColV1->colVal;
+  if (IS_VAR_DATA_TYPE(pColVal->type)) {
     if (pColVal->value.nData > 0) {
       pColVal->value.pData = (char *)value + sizeof(*pLastColV1);
     } else {