make merge compile

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;

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:

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;