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

rebase fix

This commit is contained in:
wangjiaming0909 2024-02-04 09:27:46 +08:00
parent 6e7dc4b7b4
commit 09bb7c3814
4 changed files with 5244 additions and 5236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

353
include/common/ttokendef.h
View File

@ -208,182 +208,183 @@
#define TK_SYSTEM 190 #define TK_SYSTEM 190
#define TK_TSMA 191 #define TK_TSMA 191
#define TK_INTERVAL 192 #define TK_INTERVAL 192
#define TK_TSMAS 193 #define TK_RECURSIVE 193
#define TK_FUNCTION 194 #define TK_TSMAS 194
#define TK_INDEX 195 #define TK_FUNCTION 195
#define TK_COUNT 196 #define TK_INDEX 196
#define TK_LAST_ROW 197 #define TK_COUNT 197
#define TK_META 198 #define TK_LAST_ROW 198
#define TK_ONLY 199 #define TK_META 199
#define TK_TOPIC 200 #define TK_ONLY 200
#define TK_CONSUMER 201 #define TK_TOPIC 201
#define TK_GROUP 202 #define TK_CONSUMER 202
#define TK_DESC 203 #define TK_GROUP 203
#define TK_DESCRIBE 204 #define TK_DESC 204
#define TK_RESET 205 #define TK_DESCRIBE 205
#define TK_QUERY 206 #define TK_RESET 206
#define TK_CACHE 207 #define TK_QUERY 207
#define TK_EXPLAIN 208 #define TK_CACHE 208
#define TK_ANALYZE 209 #define TK_EXPLAIN 209
#define TK_VERBOSE 210 #define TK_ANALYZE 210
#define TK_NK_BOOL 211 #define TK_VERBOSE 211
#define TK_RATIO 212 #define TK_NK_BOOL 212
#define TK_NK_FLOAT 213 #define TK_RATIO 213
#define TK_OUTPUTTYPE 214 #define TK_NK_FLOAT 214
#define TK_AGGREGATE 215 #define TK_OUTPUTTYPE 215
#define TK_BUFSIZE 216 #define TK_AGGREGATE 216
#define TK_LANGUAGE 217 #define TK_BUFSIZE 217
#define TK_REPLACE 218 #define TK_LANGUAGE 218
#define TK_STREAM 219 #define TK_REPLACE 219
#define TK_INTO 220 #define TK_STREAM 220
#define TK_PAUSE 221 #define TK_INTO 221
#define TK_RESUME 222 #define TK_PAUSE 222
#define TK_TRIGGER 223 #define TK_RESUME 223
#define TK_AT_ONCE 224 #define TK_TRIGGER 224
#define TK_WINDOW_CLOSE 225 #define TK_AT_ONCE 225
#define TK_IGNORE 226 #define TK_WINDOW_CLOSE 226
#define TK_EXPIRED 227 #define TK_IGNORE 227
#define TK_FILL_HISTORY 228 #define TK_EXPIRED 228
#define TK_UPDATE 229 #define TK_FILL_HISTORY 229
#define TK_SUBTABLE 230 #define TK_UPDATE 230
#define TK_UNTREATED 231 #define TK_SUBTABLE 231
#define TK_KILL 232 #define TK_UNTREATED 232
#define TK_CONNECTION 233 #define TK_KILL 233
#define TK_TRANSACTION 234 #define TK_CONNECTION 234
#define TK_BALANCE 235 #define TK_TRANSACTION 235
#define TK_VGROUP 236 #define TK_BALANCE 236
#define TK_LEADER 237 #define TK_VGROUP 237
#define TK_MERGE 238 #define TK_LEADER 238
#define TK_REDISTRIBUTE 239 #define TK_MERGE 239
#define TK_SPLIT 240 #define TK_REDISTRIBUTE 240
#define TK_DELETE 241 #define TK_SPLIT 241
#define TK_INSERT 242 #define TK_DELETE 242
#define TK_NK_BIN 243 #define TK_INSERT 243
#define TK_NK_HEX 244 #define TK_NK_BIN 244
#define TK_NULL 245 #define TK_NK_HEX 245
#define TK_NK_QUESTION 246 #define TK_NULL 246
#define TK_NK_ALIAS 247 #define TK_NK_QUESTION 247
#define TK_NK_ARROW 248 #define TK_NK_ALIAS 248
#define TK_ROWTS 249 #define TK_NK_ARROW 249
#define TK_QSTART 250 #define TK_ROWTS 250
#define TK_QEND 251 #define TK_QSTART 251
#define TK_QDURATION 252 #define TK_QEND 252
#define TK_WSTART 253 #define TK_QDURATION 253
#define TK_WEND 254 #define TK_WSTART 254
#define TK_WDURATION 255 #define TK_WEND 255
#define TK_IROWTS 256 #define TK_WDURATION 256
#define TK_ISFILLED 257 #define TK_IROWTS 257
#define TK_CAST 258 #define TK_ISFILLED 258
#define TK_NOW 259 #define TK_CAST 259
#define TK_TODAY 260 #define TK_NOW 260
#define TK_TIMEZONE 261 #define TK_TODAY 261
#define TK_CLIENT_VERSION 262 #define TK_TIMEZONE 262
#define TK_SERVER_VERSION 263 #define TK_CLIENT_VERSION 263
#define TK_SERVER_STATUS 264 #define TK_SERVER_VERSION 264
#define TK_CURRENT_USER 265 #define TK_SERVER_STATUS 265
#define TK_CASE 266 #define TK_CURRENT_USER 266
#define TK_WHEN 267 #define TK_CASE 267
#define TK_THEN 268 #define TK_WHEN 268
#define TK_ELSE 269 #define TK_THEN 269
#define TK_BETWEEN 270 #define TK_ELSE 270
#define TK_IS 271 #define TK_BETWEEN 271
#define TK_NK_LT 272 #define TK_IS 272
#define TK_NK_GT 273 #define TK_NK_LT 273
#define TK_NK_LE 274 #define TK_NK_GT 274
#define TK_NK_GE 275 #define TK_NK_LE 275
#define TK_NK_NE 276 #define TK_NK_GE 276
#define TK_MATCH 277 #define TK_NK_NE 277
#define TK_NMATCH 278 #define TK_MATCH 278
#define TK_CONTAINS 279 #define TK_NMATCH 279
#define TK_IN 280 #define TK_CONTAINS 280
#define TK_JOIN 281 #define TK_IN 281
#define TK_INNER 282 #define TK_JOIN 282
#define TK_LEFT 283 #define TK_INNER 283
#define TK_RIGHT 284 #define TK_LEFT 284
#define TK_OUTER 285 #define TK_RIGHT 285
#define TK_SEMI 286 #define TK_OUTER 286
#define TK_ANTI 287 #define TK_SEMI 287
#define TK_ASOF 288 #define TK_ANTI 288
#define TK_WINDOW 289 #define TK_ASOF 289
#define TK_WINDOW_OFFSET 290 #define TK_WINDOW 290
#define TK_JLIMIT 291 #define TK_WINDOW_OFFSET 291
#define TK_SELECT 292 #define TK_JLIMIT 292
#define TK_NK_HINT 293 #define TK_SELECT 293
#define TK_DISTINCT 294 #define TK_NK_HINT 294
#define TK_WHERE 295 #define TK_DISTINCT 295
#define TK_PARTITION 296 #define TK_WHERE 296
#define TK_BY 297 #define TK_PARTITION 297
#define TK_SESSION 298 #define TK_BY 298
#define TK_STATE_WINDOW 299 #define TK_SESSION 299
#define TK_EVENT_WINDOW 300 #define TK_STATE_WINDOW 300
#define TK_COUNT_WINDOW 301 #define TK_EVENT_WINDOW 301
#define TK_SLIDING 302 #define TK_COUNT_WINDOW 302
#define TK_FILL 303 #define TK_SLIDING 303
#define TK_VALUE 304 #define TK_FILL 304
#define TK_VALUE_F 305 #define TK_VALUE 305
#define TK_NONE 306 #define TK_VALUE_F 306
#define TK_PREV 307 #define TK_NONE 307
#define TK_NULL_F 308 #define TK_PREV 308
#define TK_LINEAR 309 #define TK_NULL_F 309
#define TK_NEXT 310 #define TK_LINEAR 310
#define TK_HAVING 311 #define TK_NEXT 311
#define TK_RANGE 312 #define TK_HAVING 312
#define TK_EVERY 313 #define TK_RANGE 313
#define TK_ORDER 314 #define TK_EVERY 314
#define TK_SLIMIT 315 #define TK_ORDER 315
#define TK_SOFFSET 316 #define TK_SLIMIT 316
#define TK_LIMIT 317 #define TK_SOFFSET 317
#define TK_OFFSET 318 #define TK_LIMIT 318
#define TK_ASC 319 #define TK_OFFSET 319
#define TK_NULLS 320 #define TK_ASC 320
#define TK_ABORT 321 #define TK_NULLS 321
#define TK_AFTER 322 #define TK_ABORT 322
#define TK_ATTACH 323 #define TK_AFTER 323
#define TK_BEFORE 324 #define TK_ATTACH 324
#define TK_BEGIN 325 #define TK_BEFORE 325
#define TK_BITAND 326 #define TK_BEGIN 326
#define TK_BITNOT 327 #define TK_BITAND 327
#define TK_BITOR 328 #define TK_BITNOT 328
#define TK_BLOCKS 329 #define TK_BITOR 329
#define TK_CHANGE 330 #define TK_BLOCKS 330
#define TK_COMMA 331 #define TK_CHANGE 331
#define TK_CONCAT 332 #define TK_COMMA 332
#define TK_CONFLICT 333 #define TK_CONCAT 333
#define TK_COPY 334 #define TK_CONFLICT 334
#define TK_DEFERRED 335 #define TK_COPY 335
#define TK_DELIMITERS 336 #define TK_DEFERRED 336
#define TK_DETACH 337 #define TK_DELIMITERS 337
#define TK_DIVIDE 338 #define TK_DETACH 338
#define TK_DOT 339 #define TK_DIVIDE 339
#define TK_EACH 340 #define TK_DOT 340
#define TK_FAIL 341 #define TK_EACH 341
#define TK_FILE 342 #define TK_FAIL 342
#define TK_FOR 343 #define TK_FILE 343
#define TK_GLOB 344 #define TK_FOR 344
#define TK_ID 345 #define TK_GLOB 345
#define TK_IMMEDIATE 346 #define TK_ID 346
#define TK_IMPORT 347 #define TK_IMMEDIATE 347
#define TK_INITIALLY 348 #define TK_IMPORT 348
#define TK_INSTEAD 349 #define TK_INITIALLY 349
#define TK_ISNULL 350 #define TK_INSTEAD 350
#define TK_MODULES 351 #define TK_ISNULL 351
#define TK_NK_BITNOT 352 #define TK_MODULES 352
#define TK_NK_SEMI 353 #define TK_NK_BITNOT 353
#define TK_NOTNULL 354 #define TK_NK_SEMI 354
#define TK_OF 355 #define TK_NOTNULL 355
#define TK_PLUS 356 #define TK_OF 356
#define TK_PRIVILEGE 357 #define TK_PLUS 357
#define TK_RAISE 358 #define TK_PRIVILEGE 358
#define TK_RESTRICT 359 #define TK_RAISE 359
#define TK_ROW 360 #define TK_RESTRICT 360
#define TK_STAR 361 #define TK_ROW 361
#define TK_STATEMENT 362 #define TK_STAR 362
#define TK_STRICT 363 #define TK_STATEMENT 363
#define TK_STRING 364 #define TK_STRICT 364
#define TK_TIMES 365 #define TK_STRING 365
#define TK_VALUES 366 #define TK_TIMES 366
#define TK_VARIABLE 367 #define TK_VALUES 367
#define TK_WAL 368 #define TK_VARIABLE 368
#define TK_WAL 369
#define TK_NK_SPACE 600 #define TK_NK_SPACE 600
#define TK_NK_COMMENT 601 #define TK_NK_COMMENT 601

4
source/libs/function/src/functionMgt.c
View File

@ -498,7 +498,7 @@ int32_t fmGetDistMethod(const SFunctionNode* pFunc, SFunctionNode** pPartialFunc
} }
int32_t code = createPartialFunction(pFunc, pPartialFunc); int32_t code = createPartialFunction(pFunc, pPartialFunc);
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code && pMidFunc) {
code = createMidFunction(pFunc, *pPartialFunc, pMidFunc); code = createMidFunction(pFunc, *pPartialFunc, pMidFunc);
} }
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
@ -507,7 +507,7 @@ int32_t fmGetDistMethod(const SFunctionNode* pFunc, SFunctionNode** pPartialFunc
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS != code) {
nodesDestroyNode((SNode*)*pPartialFunc); nodesDestroyNode((SNode*)*pPartialFunc);
nodesDestroyNode((SNode*)*pMidFunc); if (pMidFunc) nodesDestroyNode((SNode*)*pMidFunc);
nodesDestroyNode((SNode*)*pMergeFunc); nodesDestroyNode((SNode*)*pMergeFunc);
} }

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

File diff suppressed because it is too large Load Diff

2
source/libs/planner/src/planOptimizer.c
View File

@ -6381,7 +6381,7 @@ static int32_t tsmaOptRevisePlan2(STSMAOptCtx* pTsmaOptCtx, SLogicNode* pParent,
} }
continue; continue;
} }
code = fmGetDistMethod(pAggFunc, &pPartial, &pMerge); code = fmGetDistMethod(pAggFunc, &pPartial, NULL, &pMerge);
if (code) break; if (code) break;
pColNode = (SColumnNode*)pScanListCell->pNode; pColNode = (SColumnNode*)pScanListCell->pNode;