xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add new schema

This commit is contained in:
yihaoDeng 2023-01-18 22:05:16 +08:00
parent 3d866abd6f
commit 673e3be9c8
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/common/tmsg.h
View File

@ -294,6 +294,16 @@ struct SSchema {
char name[TSDB_COL_NAME_LEN]; char name[TSDB_COL_NAME_LEN];
}; };
struct SSchema2 {
int8_t type;
int8_t flags;
col_id_t colId;
int32_t bytes;
char name[TSDB_COL_NAME_LEN];
char alias[TSDB_COL_NAME_LEN];
}
typedef struct { typedef struct {
char tbName[TSDB_TABLE_NAME_LEN]; char tbName[TSDB_TABLE_NAME_LEN];
char stbName[TSDB_TABLE_NAME_LEN]; char stbName[TSDB_TABLE_NAME_LEN];
@ -349,10 +359,11 @@ void tFreeSSubmitRsp(SSubmitRsp* pRsp);
<<<<<<< HEAD <<<<<<< HEAD
#define IS_BSMA_ON(s) (((s)->flags & 0x01) == COL_SMA_ON) #define IS_BSMA_ON(s) (((s)->flags & 0x01) == COL_SMA_ON)
#define IS_IDX_ON(s) (((s)->flags & 0x2) == COL_IDX_ON) #define IS_IDX_ON(s) (((s)->flags & 0x2) == COL_IDX_ON)
======= == == ==
=
#define IS_BSMA_ON(s) (((s)->flags & 0x01) == COL_SMA_ON) #define IS_BSMA_ON(s) (((s)->flags & 0x01) == COL_SMA_ON)
#define IS_SET_NULL(s) (((s)->flags & COL_SET_NULL) == COL_SET_NULL) #define IS_SET_NULL(s) (((s)->flags & COL_SET_NULL) == COL_SET_NULL)
>>>>>>> origin/3.0 >>>>>>> origin / 3.0
#define SSCHMEA_TYPE(s) ((s)->type) #define SSCHMEA_TYPE(s) ((s)->type)
#define SSCHMEA_FLAGS(s) ((s)->flags) #define SSCHMEA_FLAGS(s) ((s)->flags)
@ -360,7 +371,7 @@ void tFreeSSubmitRsp(SSubmitRsp* pRsp);
#define SSCHMEA_BYTES(s) ((s)->bytes) #define SSCHMEA_BYTES(s) ((s)->bytes)
#define SSCHMEA_NAME(s) ((s)->name) #define SSCHMEA_NAME(s) ((s)->name)
typedef struct { typedef struct {
int32_t nCols; int32_t nCols;
int32_t version; int32_t version;
SSchema* pSchema; SSchema* pSchema;
@ -1796,7 +1807,7 @@ typedef struct {
// 3.0.2.3 // 3.0.2.3
int8_t createStb; int8_t createStb;
uint64_t targetStbUid; uint64_t targetStbUid;
SArray* fillNullCols; // array of SColLocation SArray* fillNullCols; // array of SColLocation
} SCMCreateStreamReq; } SCMCreateStreamReq;
typedef struct { typedef struct {