From d1530753b33c80c56f38e91e54c80f13c58a1e4f Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 21 Apr 2022 11:22:58 +0000
Subject: [PATCH] make merge compile

---
 include/common/tmsg.h             | 21 ++++++++++++++++++---
 source/common/src/tmsg.c          |  4 ++--
 source/dnode/vnode/src/inc/meta.h |  1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 9534abf55b..c10e5a1294 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -484,7 +484,7 @@ typedef struct {
   char    intervalUnit;
   char    slidingUnit;
   char
-          offsetUnit;  // TODO Remove it, the offset is the number of precision tickle, and it must be a immutable duration.
+      offsetUnit;  // TODO Remove it, the offset is the number of precision tickle, and it must be a immutable duration.
   int8_t  precision;
   int64_t interval;
   int64_t sliding;
@@ -711,7 +711,7 @@ typedef struct {
 
 int32_t tSerializeSRetrieveFuncRsp(void* buf, int32_t bufLen, SRetrieveFuncRsp* pRsp);
 int32_t tDeserializeSRetrieveFuncRsp(void* buf, int32_t bufLen, SRetrieveFuncRsp* pRsp);
-void tFreeSFuncInfo(SFuncInfo *pInfo);
+void    tFreeSFuncInfo(SFuncInfo* pInfo);
 void    tFreeSRetrieveFuncRsp(SRetrieveFuncRsp* pRsp);
 
 typedef struct {
@@ -1514,8 +1514,23 @@ typedef struct SVCreateTbReq {
   char*    name;
   uint32_t ttl;
   uint32_t keep;
-  uint8_t  type;
   union {
+    uint8_t info;
+    struct {
+      uint8_t rollup : 1;  // 1 means rollup sma
+      uint8_t type : 7;
+    };
+  };
+  union {
+    struct {
+      tb_uid_t    suid;
+      col_id_t    nCols;
+      col_id_t    nBSmaCols;
+      SSchema*    pSchema;
+      col_id_t    nTagCols;
+      SSchema*    pTagSchema;
+      SRSmaParam* pRSmaParam;
+    } stbCfg;
     struct {
       tb_uid_t suid;
       SKVRow   pTag;
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 8b7ab05c5d..a7c1620a87 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -545,8 +545,8 @@ void *tDeserializeSVCreateTbReq(void *buf, SVCreateTbReq *pReq) {
   buf = taosDecodeString(buf, &(pReq->name));
   buf = taosDecodeFixedU32(buf, &(pReq->ttl));
   buf = taosDecodeFixedU32(buf, &(pReq->keep));
-  buf = taosDecodeFixedU8(buf, &pReq->type);
-  // buf = taosDecodeFixedU8(buf, &(pReq->info));
+  // buf = taosDecodeFixedU8(buf, &pReq->type);
+  buf = taosDecodeFixedU8(buf, &(pReq->info));
 
   switch (pReq->type) {
     case TD_SUPER_TABLE:
diff --git a/source/dnode/vnode/src/inc/meta.h b/source/dnode/vnode/src/inc/meta.h
index 93cb6f62cf..ee5a9e51b1 100644
--- a/source/dnode/vnode/src/inc/meta.h
+++ b/source/dnode/vnode/src/inc/meta.h
@@ -65,6 +65,7 @@ struct SMeta {
   TENV*     pEnv;
   TDB*      pTbDb;
   TDB*      pSkmDb;
+  TDB*      pUidIdx;
   TDB*      pNameIdx;
   TDB*      pCtbIdx;
   TDB*      pTagIdx;