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:
factosea 2024-03-14 19:56:19 +08:00
parent 6678a65dc4
commit c6adba9bfc
7 changed files with 5055 additions and 4099 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

475
include/common/ttokendef.h
View File

@ -16,7 +16,6 @@
#ifndef _TD_COMMON_TOKEN_H_ #ifndef _TD_COMMON_TOKEN_H_
#define _TD_COMMON_TOKEN_H_ #define _TD_COMMON_TOKEN_H_
#define TK_OR 1 #define TK_OR 1
#define TK_AND 2 #define TK_AND 2
#define TK_UNION 3 #define TK_UNION 3
@ -134,243 +133,243 @@
#define TK_NK_EQ 115 #define TK_NK_EQ 115
#define TK_USING 116 #define TK_USING 116
#define TK_TAGS 117 #define TK_TAGS 117
#define TK_PRIMARY 118 #define TK_BOOL 118
#define TK_KEY 119 #define TK_TINYINT 119
#define TK_BOOL 120 #define TK_SMALLINT 120
#define TK_TINYINT 121 #define TK_INT 121
#define TK_SMALLINT 122 #define TK_INTEGER 122
#define TK_INT 123 #define TK_BIGINT 123
#define TK_INTEGER 124 #define TK_FLOAT 124
#define TK_BIGINT 125 #define TK_DOUBLE 125
#define TK_FLOAT 126 #define TK_BINARY 126
#define TK_DOUBLE 127 #define TK_NCHAR 127
#define TK_BINARY 128 #define TK_UNSIGNED 128
#define TK_NCHAR 129 #define TK_JSON 129
#define TK_UNSIGNED 130 #define TK_VARCHAR 130
#define TK_JSON 131 #define TK_MEDIUMBLOB 131
#define TK_VARCHAR 132 #define TK_BLOB 132
#define TK_MEDIUMBLOB 133 #define TK_VARBINARY 133
#define TK_BLOB 134 #define TK_GEOMETRY 134
#define TK_VARBINARY 135 #define TK_DECIMAL 135
#define TK_GEOMETRY 136 #define TK_COMMENT 136
#define TK_DECIMAL 137 #define TK_MAX_DELAY 137
#define TK_COMMENT 138 #define TK_WATERMARK 138
#define TK_MAX_DELAY 139 #define TK_ROLLUP 139
#define TK_WATERMARK 140 #define TK_TTL 140
#define TK_ROLLUP 141 #define TK_SMA 141
#define TK_TTL 142 #define TK_DELETE_MARK 142
#define TK_SMA 143 #define TK_FIRST 143
#define TK_DELETE_MARK 144 #define TK_LAST 144
#define TK_FIRST 145 #define TK_SHOW 145
#define TK_LAST 146 #define TK_PRIVILEGES 146
#define TK_SHOW 147 #define TK_DATABASES 147
#define TK_PRIVILEGES 148 #define TK_TABLES 148
#define TK_DATABASES 149 #define TK_STABLES 149
#define TK_TABLES 150 #define TK_MNODES 150
#define TK_STABLES 151 #define TK_QNODES 151
#define TK_MNODES 152 #define TK_FUNCTIONS 152
#define TK_QNODES 153 #define TK_INDEXES 153
#define TK_FUNCTIONS 154 #define TK_ACCOUNTS 154
#define TK_INDEXES 155 #define TK_APPS 155
#define TK_ACCOUNTS 156 #define TK_CONNECTIONS 156
#define TK_APPS 157 #define TK_LICENCES 157
#define TK_CONNECTIONS 158 #define TK_GRANTS 158
#define TK_LICENCES 159 #define TK_FULL 159
#define TK_GRANTS 160 #define TK_LOGS 160
#define TK_FULL 161 #define TK_MACHINES 161
#define TK_LOGS 162 #define TK_QUERIES 162
#define TK_MACHINES 163 #define TK_SCORES 163
#define TK_QUERIES 164 #define TK_TOPICS 164
#define TK_SCORES 165 #define TK_VARIABLES 165
#define TK_TOPICS 166 #define TK_BNODES 166
#define TK_VARIABLES 167 #define TK_SNODES 167
#define TK_BNODES 168 #define TK_TRANSACTIONS 168
#define TK_SNODES 169 #define TK_DISTRIBUTED 169
#define TK_TRANSACTIONS 170 #define TK_CONSUMERS 170
#define TK_DISTRIBUTED 171 #define TK_SUBSCRIPTIONS 171
#define TK_CONSUMERS 172 #define TK_VNODES 172
#define TK_SUBSCRIPTIONS 173 #define TK_ALIVE 173
#define TK_VNODES 174 #define TK_VIEWS 174
#define TK_ALIVE 175 #define TK_VIEW 175
#define TK_VIEWS 176 #define TK_COMPACTS 176
#define TK_VIEW 177 #define TK_NORMAL 177
#define TK_COMPACTS 178 #define TK_CHILD 178
#define TK_NORMAL 179 #define TK_LIKE 179
#define TK_CHILD 180 #define TK_TBNAME 180
#define TK_LIKE 181 #define TK_QTAGS 181
#define TK_TBNAME 182 #define TK_AS 182
#define TK_QTAGS 183 #define TK_SYSTEM 183
#define TK_AS 184 #define TK_INDEX 184
#define TK_SYSTEM 185 #define TK_FUNCTION 185
#define TK_INDEX 186 #define TK_INTERVAL 186
#define TK_FUNCTION 187 #define TK_COUNT 187
#define TK_INTERVAL 188 #define TK_LAST_ROW 188
#define TK_COUNT 189 #define TK_META 189
#define TK_LAST_ROW 190 #define TK_ONLY 190
#define TK_META 191 #define TK_TOPIC 191
#define TK_ONLY 192 #define TK_CONSUMER 192
#define TK_TOPIC 193 #define TK_GROUP 193
#define TK_CONSUMER 194 #define TK_DESC 194
#define TK_GROUP 195 #define TK_DESCRIBE 195
#define TK_DESC 196 #define TK_RESET 196
#define TK_DESCRIBE 197 #define TK_QUERY 197
#define TK_RESET 198 #define TK_CACHE 198
#define TK_QUERY 199 #define TK_EXPLAIN 199
#define TK_CACHE 200 #define TK_ANALYZE 200
#define TK_EXPLAIN 201 #define TK_VERBOSE 201
#define TK_ANALYZE 202 #define TK_NK_BOOL 202
#define TK_VERBOSE 203 #define TK_RATIO 203
#define TK_NK_BOOL 204 #define TK_NK_FLOAT 204
#define TK_RATIO 205 #define TK_OUTPUTTYPE 205
#define TK_NK_FLOAT 206 #define TK_AGGREGATE 206
#define TK_OUTPUTTYPE 207 #define TK_BUFSIZE 207
#define TK_AGGREGATE 208 #define TK_LANGUAGE 208
#define TK_BUFSIZE 209 #define TK_REPLACE 209
#define TK_LANGUAGE 210 #define TK_STREAM 210
#define TK_REPLACE 211 #define TK_INTO 211
#define TK_STREAM 212 #define TK_PAUSE 212
#define TK_INTO 213 #define TK_RESUME 213
#define TK_PAUSE 214 #define TK_TRIGGER 214
#define TK_RESUME 215 #define TK_AT_ONCE 215
#define TK_TRIGGER 216 #define TK_WINDOW_CLOSE 216
#define TK_AT_ONCE 217 #define TK_IGNORE 217
#define TK_WINDOW_CLOSE 218 #define TK_EXPIRED 218
#define TK_IGNORE 219 #define TK_FILL_HISTORY 219
#define TK_EXPIRED 220 #define TK_UPDATE 220
#define TK_FILL_HISTORY 221 #define TK_SUBTABLE 221
#define TK_UPDATE 222 #define TK_UNTREATED 222
#define TK_SUBTABLE 223 #define TK_KILL 223
#define TK_UNTREATED 224 #define TK_CONNECTION 224
#define TK_KILL 225 #define TK_TRANSACTION 225
#define TK_CONNECTION 226 #define TK_BALANCE 226
#define TK_TRANSACTION 227 #define TK_VGROUP 227
#define TK_BALANCE 228 #define TK_LEADER 228
#define TK_VGROUP 229 #define TK_MERGE 229
#define TK_LEADER 230 #define TK_REDISTRIBUTE 230
#define TK_MERGE 231 #define TK_SPLIT 231
#define TK_REDISTRIBUTE 232 #define TK_DELETE 232
#define TK_SPLIT 233 #define TK_INSERT 233
#define TK_DELETE 234 #define TK_NULL 234
#define TK_INSERT 235 #define TK_NK_QUESTION 235
#define TK_NULL 236 #define TK_NK_ALIAS 236
#define TK_NK_QUESTION 237 #define TK_NK_ARROW 237
#define TK_NK_ALIAS 238 #define TK_ROWTS 238
#define TK_NK_ARROW 239 #define TK_QSTART 239
#define TK_ROWTS 240 #define TK_QEND 240
#define TK_QSTART 241 #define TK_QDURATION 241
#define TK_QEND 242 #define TK_WSTART 242
#define TK_QDURATION 243 #define TK_WEND 243
#define TK_WSTART 244 #define TK_WDURATION 244
#define TK_WEND 245 #define TK_IROWTS 245
#define TK_WDURATION 246 #define TK_ISFILLED 246
#define TK_IROWTS 247 #define TK_CAST 247
#define TK_ISFILLED 248 #define TK_NOW 248
#define TK_CAST 249 #define TK_TODAY 249
#define TK_NOW 250 #define TK_TIMEZONE 250
#define TK_TODAY 251 #define TK_CLIENT_VERSION 251
#define TK_TIMEZONE 252 #define TK_SERVER_VERSION 252
#define TK_CLIENT_VERSION 253 #define TK_SERVER_STATUS 253
#define TK_SERVER_VERSION 254 #define TK_CURRENT_USER 254
#define TK_SERVER_STATUS 255 #define TK_CASE 255
#define TK_CURRENT_USER 256 #define TK_WHEN 256
#define TK_CASE 257 #define TK_THEN 257
#define TK_WHEN 258 #define TK_ELSE 258
#define TK_THEN 259 #define TK_BETWEEN 259
#define TK_ELSE 260 #define TK_IS 260
#define TK_BETWEEN 261 #define TK_NK_LT 261
#define TK_IS 262 #define TK_NK_GT 262
#define TK_NK_LT 263 #define TK_NK_LE 263
#define TK_NK_GT 264 #define TK_NK_GE 264
#define TK_NK_LE 265 #define TK_NK_NE 265
#define TK_NK_GE 266 #define TK_MATCH 266
#define TK_NK_NE 267 #define TK_NMATCH 267
#define TK_MATCH 268 #define TK_CONTAINS 268
#define TK_NMATCH 269 #define TK_IN 269
#define TK_CONTAINS 270 #define TK_JOIN 270
#define TK_IN 271 #define TK_INNER 271
#define TK_JOIN 272 #define TK_SELECT 272
#define TK_INNER 273 #define TK_NK_HINT 273
#define TK_SELECT 274 #define TK_DISTINCT 274
#define TK_NK_HINT 275 #define TK_WHERE 275
#define TK_DISTINCT 276 #define TK_PARTITION 276
#define TK_WHERE 277 #define TK_BY 277
#define TK_PARTITION 278 #define TK_SESSION 278
#define TK_BY 279 #define TK_STATE_WINDOW 279
#define TK_SESSION 280 #define TK_EVENT_WINDOW 280
#define TK_STATE_WINDOW 281 #define TK_COUNT_WINDOW 281
#define TK_EVENT_WINDOW 282 #define TK_SLIDING 282
#define TK_COUNT_WINDOW 283 #define TK_FILL 283
#define TK_SLIDING 284 #define TK_VALUE 284
#define TK_FILL 285 #define TK_VALUE_F 285
#define TK_VALUE 286 #define TK_NONE 286
#define TK_VALUE_F 287 #define TK_PREV 287
#define TK_NONE 288 #define TK_NULL_F 288
#define TK_PREV 289 #define TK_LINEAR 289
#define TK_NULL_F 290 #define TK_NEXT 290
#define TK_LINEAR 291 #define TK_HAVING 291
#define TK_NEXT 292 #define TK_RANGE 292
#define TK_HAVING 293 #define TK_EVERY 293
#define TK_RANGE 294 #define TK_ORDER 294
#define TK_EVERY 295 #define TK_SLIMIT 295
#define TK_ORDER 296 #define TK_SOFFSET 296
#define TK_SLIMIT 297 #define TK_LIMIT 297
#define TK_SOFFSET 298 #define TK_OFFSET 298
#define TK_LIMIT 299 #define TK_ASC 299
#define TK_OFFSET 300 #define TK_NULLS 300
#define TK_ASC 301 #define TK_ABORT 301
#define TK_NULLS 302 #define TK_AFTER 302
#define TK_ABORT 303 #define TK_ATTACH 303
#define TK_AFTER 304 #define TK_BEFORE 304
#define TK_ATTACH 305 #define TK_BEGIN 305
#define TK_BEFORE 306 #define TK_BITAND 306
#define TK_BEGIN 307 #define TK_BITNOT 307
#define TK_BITAND 308 #define TK_BITOR 308
#define TK_BITNOT 309 #define TK_BLOCKS 309
#define TK_BITOR 310 #define TK_CHANGE 310
#define TK_BLOCKS 311 #define TK_COMMA 311
#define TK_CHANGE 312 #define TK_CONCAT 312
#define TK_COMMA 313 #define TK_CONFLICT 313
#define TK_CONCAT 314 #define TK_COPY 314
#define TK_CONFLICT 315 #define TK_DEFERRED 315
#define TK_COPY 316 #define TK_DELIMITERS 316
#define TK_DEFERRED 317 #define TK_DETACH 317
#define TK_DELIMITERS 318 #define TK_DIVIDE 318
#define TK_DETACH 319 #define TK_DOT 319
#define TK_DIVIDE 320 #define TK_EACH 320
#define TK_DOT 321 #define TK_FAIL 321
#define TK_EACH 322 #define TK_FILE 322
#define TK_FAIL 323 #define TK_FOR 323
#define TK_FILE 324 #define TK_GLOB 324
#define TK_FOR 325 #define TK_ID 325
#define TK_GLOB 326 #define TK_IMMEDIATE 326
#define TK_ID 327 #define TK_IMPORT 327
#define TK_IMMEDIATE 328 #define TK_INITIALLY 328
#define TK_IMPORT 329 #define TK_INSTEAD 329
#define TK_INITIALLY 330 #define TK_ISNULL 330
#define TK_INSTEAD 331 #define TK_KEY 331
#define TK_ISNULL 332 #define TK_MODULES 332
#define TK_MODULES 333 #define TK_NK_BITNOT 333
#define TK_NK_BITNOT 334 #define TK_NK_SEMI 334
#define TK_NK_SEMI 335 #define TK_NOTNULL 335
#define TK_NOTNULL 336 #define TK_OF 336
#define TK_OF 337 #define TK_PLUS 337
#define TK_PLUS 338 #define TK_PRIVILEGE 338
#define TK_PRIVILEGE 339 #define TK_RAISE 339
#define TK_RAISE 340 #define TK_RESTRICT 340
#define TK_RESTRICT 341 #define TK_ROW 341
#define TK_ROW 342 #define TK_SEMI 342
#define TK_SEMI 343 #define TK_STAR 343
#define TK_STAR 344 #define TK_STATEMENT 344
#define TK_STATEMENT 345 #define TK_STRICT 345
#define TK_STRICT 346 #define TK_STRING 346
#define TK_STRING 347 #define TK_TIMES 347
#define TK_TIMES 348 #define TK_VALUES 348
#define TK_VALUES 349 #define TK_VARIABLE 349
#define TK_VARIABLE 350 #define TK_WAL 350
#define TK_WAL 351 #define TK_PRIMARY 351
#define TK_ENCODE 351 #define TK_ENCODE 352
#define TK_COMPRESS 352 #define TK_COMPRESS 353
#define TK_LEVEL 353 #define TK_LEVEL 354
#define TK_NK_SPACE 600 #define TK_NK_SPACE 600
#define TK_NK_COMMENT 601 #define TK_NK_COMMENT 601

2
source/common/src/tmsg.c
View File

@ -573,8 +573,6 @@ int32_t tSerializeSMCreateStbReq(void *buf, int32_t bufLen, SMCreateStbReq *pReq
if (tEncodeI32(&encoder, pField->bytes) < 0) return -1; if (tEncodeI32(&encoder, pField->bytes) < 0) return -1;
if (tEncodeCStr(&encoder, pField->name) < 0) return -1; if (tEncodeCStr(&encoder, pField->name) < 0) return -1;
if (tEncodeU32(&encoder, pField->compress) < 0) return -1; if (tEncodeU32(&encoder, pField->compress) < 0) return -1;
// XSDEBUG
printf("column: %s, compress: %0x.\n", pField->name, pField->compress);
} }
for (int32_t i = 0; i < pReq->numOfTags; ++i) { for (int32_t i = 0; i < pReq->numOfTags; ++i) {

4
source/dnode/mnode/impl/src/mndStb.c
View File

@ -1137,10 +1137,6 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
goto _OVER; goto _OVER;
} }
// todo xsdebug
// terrno = TSDB_CODE_OPS_NOT_SUPPORT;
// goto _OVER;
mInfo("stb:%s, start to create", createReq.name); mInfo("stb:%s, start to create", createReq.name);
if (mndCheckCreateStbReq(&createReq) != 0) { if (mndCheckCreateStbReq(&createReq) != 0) {
terrno = TSDB_CODE_INVALID_MSG; terrno = TSDB_CODE_INVALID_MSG;

2
source/libs/parser/inc/parAst.h
View File

@ -180,7 +180,7 @@ SNode* createCompactStmt(SAstCreateContext* pCxt, SToken* pDbName, SNode* pStart
SNode* createDefaultTableOptions(SAstCreateContext* pCxt); SNode* createDefaultTableOptions(SAstCreateContext* pCxt);
SNode* createAlterTableOptions(SAstCreateContext* pCxt); SNode* createAlterTableOptions(SAstCreateContext* pCxt);
SNode* setTableOption(SAstCreateContext* pCxt, SNode* pOptions, ETableOptionType type, void* pVal); SNode* setTableOption(SAstCreateContext* pCxt, SNode* pOptions, ETableOptionType type, void* pVal);
SNode* createColumnDefNode(SAstCreateContext* pCxt, SToken* pColName, SDataType dataType, SNode* pOptions, bool bPrimaryKey); SNode* createColumnDefNode(SAstCreateContext* pCxt, SToken* pColName, SDataType dataType, SNode* pOptions);
SNode* setColumnOptions(SAstCreateContext* pCxt, SNode* pOptions, EColumnOptionType type, void* pVal); SNode* setColumnOptions(SAstCreateContext* pCxt, SNode* pOptions, EColumnOptionType type, void* pVal);
SNode* createDefaultColumnOptions(SAstCreateContext* pCxt); SNode* createDefaultColumnOptions(SAstCreateContext* pCxt);
SNode* createCreateTableStmt(SAstCreateContext* pCxt, bool ignoreExists, SNode* pRealTable, SNodeList* pCols, SNode* createCreateTableStmt(SAstCreateContext* pCxt, bool ignoreExists, SNode* pRealTable, SNodeList* pCols,

2
source/libs/parser/inc/sql.y
View File

@ -1286,7 +1286,7 @@ null_ordering_opt(A) ::= NULLS LAST.
STRICT STRING TIMES VALUES VARIABLE VIEW WAL. STRICT STRING TIMES VALUES VARIABLE VIEW WAL.
column_options(A) ::= . { A = createDefaultColumnOptions(pCxt); } column_options(A) ::= . { A = createDefaultColumnOptions(pCxt); }
column_options(A) ::= column_options(B) PRIMARY KEY. { A = setColumnOptions(pCxt, B, COLUMN_OPTION_PRIMARYKEY, &C); } column_options(A) ::= column_options(B) PRIMARY KEY. { A = setColumnOptions(pCxt, B, COLUMN_OPTION_PRIMARYKEY, NULL); }
column_options(A) ::= column_options(B) ENCODE NK_STRING(C). { A = setColumnOptions(pCxt, B, COLUMN_OPTION_ENCODE, &C); } column_options(A) ::= column_options(B) ENCODE NK_STRING(C). { A = setColumnOptions(pCxt, B, COLUMN_OPTION_ENCODE, &C); }
column_options(A) ::= column_options(B) COMPRESS NK_STRING(C). { A = setColumnOptions(pCxt, B, COLUMN_OPTION_COMPRESS, &C); } column_options(A) ::= column_options(B) COMPRESS NK_STRING(C). { A = setColumnOptions(pCxt, B, COLUMN_OPTION_COMPRESS, &C); }
column_options(A) ::= column_options(B) LEVEL NK_STRING(C). { A = setColumnOptions(pCxt, B, COLUMN_OPTION_LEVEL, &C); } column_options(A) ::= column_options(B) LEVEL NK_STRING(C). { A = setColumnOptions(pCxt, B, COLUMN_OPTION_LEVEL, &C); }

3
source/libs/parser/src/parAstCreater.c
View File

@ -1555,7 +1555,8 @@ SNode* createColumnDefNode(SAstCreateContext* pCxt, SToken* pColName, SDataType
pCol->dataType = dataType; pCol->dataType = dataType;
pCol->pOptions = (SColumnOptions*)pNode; pCol->pOptions = (SColumnOptions*)pNode;
pCol->sma = true; pCol->sma = true;
pCol->is_pk = ((SColumnOptions*)pNode)->bPrimaryKey; // pNode equals to NULL means that the column is a tag.
pCol->is_pk = (SColumnOptions*)pNode ? ((SColumnOptions*)pNode)->bPrimaryKey : false;
return (SNode*)pCol; return (SNode*)pCol;
} }

8666
source/libs/parser/src/sql.c
View File

File diff suppressed because it is too large Load Diff