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

fix merge error

This commit is contained in:
yihaoDeng 2024-03-29 03:02:33 +00:00
parent 2f10dca544
commit f2d03dbbdf
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
include/libs/nodes/cmdnodes.h
View File

@ -42,13 +42,12 @@ extern "C" {
#define SHOW_CREATE_VIEW_RESULT_FIELD1_LEN (TSDB_VIEW_FNAME_LEN + 4 + VARSTR_HEADER_SIZE) #define SHOW_CREATE_VIEW_RESULT_FIELD1_LEN (TSDB_VIEW_FNAME_LEN + 4 + VARSTR_HEADER_SIZE)
#define SHOW_CREATE_VIEW_RESULT_FIELD2_LEN (TSDB_MAX_ALLOWED_SQL_LEN + VARSTR_HEADER_SIZE) #define SHOW_CREATE_VIEW_RESULT_FIELD2_LEN (TSDB_MAX_ALLOWED_SQL_LEN + VARSTR_HEADER_SIZE)
#define SHOW_LOCAL_VARIABLES_RESULT_COLS 3 #define SHOW_LOCAL_VARIABLES_RESULT_COLS 3
#define SHOW_LOCAL_VARIABLES_RESULT_FIELD1_LEN (TSDB_CONFIG_OPTION_LEN + VARSTR_HEADER_SIZE) #define SHOW_LOCAL_VARIABLES_RESULT_FIELD1_LEN (TSDB_CONFIG_OPTION_LEN + VARSTR_HEADER_SIZE)
#define SHOW_LOCAL_VARIABLES_RESULT_FIELD2_LEN (TSDB_CONFIG_VALUE_LEN + VARSTR_HEADER_SIZE) #define SHOW_LOCAL_VARIABLES_RESULT_FIELD2_LEN (TSDB_CONFIG_VALUE_LEN + VARSTR_HEADER_SIZE)
#define SHOW_LOCAL_VARIABLES_RESULT_FIELD3_LEN (TSDB_CONFIG_SCOPE_LEN + VARSTR_HEADER_SIZE) #define SHOW_LOCAL_VARIABLES_RESULT_FIELD3_LEN (TSDB_CONFIG_SCOPE_LEN + VARSTR_HEADER_SIZE)
#define COMPACT_DB_RESULT_COLS 3 #define COMPACT_DB_RESULT_COLS 3
#define COMPACT_DB_RESULT_FIELD1_LEN 32 #define COMPACT_DB_RESULT_FIELD1_LEN 32
#define COMPACT_DB_RESULT_FIELD3_LEN 128 #define COMPACT_DB_RESULT_FIELD3_LEN 128
@ -166,13 +165,13 @@ typedef struct STableOptions {
} STableOptions; } STableOptions;
typedef struct SColumnOptions { typedef struct SColumnOptions {
ENodeType type; ENodeType type;
bool commentNull; bool commentNull;
char comment[TSDB_CL_COMMENT_LEN]; char comment[TSDB_CL_COMMENT_LEN];
char encode[TSDB_CL_COMPRESS_OPTION_LEN]; char encode[TSDB_CL_COMPRESS_OPTION_LEN];
char compress[TSDB_CL_COMPRESS_OPTION_LEN]; char compress[TSDB_CL_COMPRESS_OPTION_LEN];
char compressLevel[TSDB_CL_COMPRESS_OPTION_LEN]; char compressLevel[TSDB_CL_COMPRESS_OPTION_LEN];
bool bPrimaryKey; bool bPrimaryKey;
} SColumnOptions; } SColumnOptions;
typedef struct SColumnDefNode { typedef struct SColumnDefNode {
ENodeType type; ENodeType type;
@ -180,6 +179,7 @@ typedef struct SColumnDefNode {
SDataType dataType; SDataType dataType;
SColumnOptions* pOptions; SColumnOptions* pOptions;
bool sma; bool sma;
bool is_pk;
} SColumnDefNode; } SColumnDefNode;
typedef struct SCreateTableStmt { typedef struct SCreateTableStmt {
@ -242,24 +242,24 @@ typedef struct SAlterTableStmt {
} SAlterTableStmt; } SAlterTableStmt;
typedef struct SCreateUserStmt { typedef struct SCreateUserStmt {
ENodeType type; ENodeType type;
char userName[TSDB_USER_LEN]; char userName[TSDB_USER_LEN];
char password[TSDB_USET_PASSWORD_LEN]; char password[TSDB_USET_PASSWORD_LEN];
int8_t sysinfo; int8_t sysinfo;
int32_t numIpRanges; int32_t numIpRanges;
SIpV4Range* pIpRanges; SIpV4Range* pIpRanges;
SNodeList* pNodeListIpRanges; SNodeList* pNodeListIpRanges;
} SCreateUserStmt; } SCreateUserStmt;
typedef struct SAlterUserStmt { typedef struct SAlterUserStmt {
ENodeType type; ENodeType type;
char userName[TSDB_USER_LEN]; char userName[TSDB_USER_LEN];
int8_t alterType; int8_t alterType;
char password[TSDB_USET_PASSWORD_LEN]; char password[TSDB_USET_PASSWORD_LEN];
int8_t enable; int8_t enable;
int8_t sysinfo; int8_t sysinfo;
int32_t numIpRanges; int32_t numIpRanges;
SIpV4Range* pIpRanges; SIpV4Range* pIpRanges;
SNodeList* pNodeListIpRanges; SNodeList* pNodeListIpRanges;
@ -297,7 +297,7 @@ typedef struct SShowStmt {
SNode* pDbName; // SValueNode SNode* pDbName; // SValueNode
SNode* pTbName; // SValueNode SNode* pTbName; // SValueNode
EOperatorType tableCondType; EOperatorType tableCondType;
EShowKind showKind; // show databases: user/system, show tables: normal/child, others NULL EShowKind showKind; // show databases: user/system, show tables: normal/child, others NULL
} SShowStmt; } SShowStmt;
typedef struct SShowCreateDatabaseStmt { typedef struct SShowCreateDatabaseStmt {
@ -358,7 +358,7 @@ typedef struct SShowCompactsStmt {
typedef struct SShowCompactDetailsStmt { typedef struct SShowCompactDetailsStmt {
ENodeType type; ENodeType type;
SNode* pCompactId; SNode* pCompactId;
} SShowCompactDetailsStmt; } SShowCompactDetailsStmt;
typedef enum EIndexType { INDEX_TYPE_SMA = 1, INDEX_TYPE_FULLTEXT, INDEX_TYPE_NORMAL } EIndexType; typedef enum EIndexType { INDEX_TYPE_SMA = 1, INDEX_TYPE_FULLTEXT, INDEX_TYPE_NORMAL } EIndexType;
@ -536,20 +536,20 @@ typedef struct SDropFunctionStmt {
} SDropFunctionStmt; } SDropFunctionStmt;
typedef struct SCreateViewStmt { typedef struct SCreateViewStmt {
ENodeType type; ENodeType type;
char dbName[TSDB_DB_NAME_LEN]; char dbName[TSDB_DB_NAME_LEN];
char viewName[TSDB_VIEW_NAME_LEN]; char viewName[TSDB_VIEW_NAME_LEN];
char* pQuerySql; char* pQuerySql;
bool orReplace; bool orReplace;
SNode* pQuery; SNode* pQuery;
SCMCreateViewReq createReq; SCMCreateViewReq createReq;
} SCreateViewStmt; } SCreateViewStmt;
typedef struct SDropViewStmt { typedef struct SDropViewStmt {
ENodeType type; ENodeType type;
char dbName[TSDB_DB_NAME_LEN]; char dbName[TSDB_DB_NAME_LEN];
char viewName[TSDB_VIEW_NAME_LEN]; char viewName[TSDB_VIEW_NAME_LEN];
bool ignoreNotExists; bool ignoreNotExists;
} SDropViewStmt; } SDropViewStmt;
typedef struct SGrantStmt { typedef struct SGrantStmt {