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

fix(s3/s3_chunksize): rename to s3_chunkpages & default to 128k pages

This commit is contained in:
Minglei Jin 2024-10-28 16:46:26 +08:00
parent cbb3572fdd
commit 53826a320f
10 changed files with 2205 additions and 761 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

776
include/common/ttokendef.h
View File

@ -16,394 +16,394 @@
#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
#define TK_ALL 4 #define TK_ALL 4
#define TK_MINUS 5 #define TK_MINUS 5
#define TK_EXCEPT 6 #define TK_EXCEPT 6
#define TK_INTERSECT 7 #define TK_INTERSECT 7
#define TK_NK_BITAND 8 #define TK_NK_BITAND 8
#define TK_NK_BITOR 9 #define TK_NK_BITOR 9
#define TK_NK_LSHIFT 10 #define TK_NK_LSHIFT 10
#define TK_NK_RSHIFT 11 #define TK_NK_RSHIFT 11
#define TK_NK_PLUS 12 #define TK_NK_PLUS 12
#define TK_NK_MINUS 13 #define TK_NK_MINUS 13
#define TK_NK_STAR 14 #define TK_NK_STAR 14
#define TK_NK_SLASH 15 #define TK_NK_SLASH 15
#define TK_NK_REM 16 #define TK_NK_REM 16
#define TK_NK_CONCAT 17 #define TK_NK_CONCAT 17
#define TK_CREATE 18 #define TK_CREATE 18
#define TK_ACCOUNT 19 #define TK_ACCOUNT 19
#define TK_NK_ID 20 #define TK_NK_ID 20
#define TK_PASS 21 #define TK_PASS 21
#define TK_NK_STRING 22 #define TK_NK_STRING 22
#define TK_ALTER 23 #define TK_ALTER 23
#define TK_PPS 24 #define TK_PPS 24
#define TK_TSERIES 25 #define TK_TSERIES 25
#define TK_STORAGE 26 #define TK_STORAGE 26
#define TK_STREAMS 27 #define TK_STREAMS 27
#define TK_QTIME 28 #define TK_QTIME 28
#define TK_DBS 29 #define TK_DBS 29
#define TK_USERS 30 #define TK_USERS 30
#define TK_CONNS 31 #define TK_CONNS 31
#define TK_STATE 32 #define TK_STATE 32
#define TK_NK_COMMA 33 #define TK_NK_COMMA 33
#define TK_HOST 34 #define TK_HOST 34
#define TK_IS_IMPORT 35 #define TK_IS_IMPORT 35
#define TK_NK_INTEGER 36 #define TK_NK_INTEGER 36
#define TK_CREATEDB 37 #define TK_CREATEDB 37
#define TK_USER 38 #define TK_USER 38
#define TK_ENABLE 39 #define TK_ENABLE 39
#define TK_SYSINFO 40 #define TK_SYSINFO 40
#define TK_ADD 41 #define TK_ADD 41
#define TK_DROP 42 #define TK_DROP 42
#define TK_GRANT 43 #define TK_GRANT 43
#define TK_ON 44 #define TK_ON 44
#define TK_TO 45 #define TK_TO 45
#define TK_REVOKE 46 #define TK_REVOKE 46
#define TK_FROM 47 #define TK_FROM 47
#define TK_SUBSCRIBE 48 #define TK_SUBSCRIBE 48
#define TK_READ 49 #define TK_READ 49
#define TK_WRITE 50 #define TK_WRITE 50
#define TK_NK_DOT 51 #define TK_NK_DOT 51
#define TK_WITH 52 #define TK_WITH 52
#define TK_ENCRYPT_KEY 53 #define TK_ENCRYPT_KEY 53
#define TK_ANODE 54 #define TK_ANODE 54
#define TK_UPDATE 55 #define TK_UPDATE 55
#define TK_ANODES 56 #define TK_ANODES 56
#define TK_DNODE 57 #define TK_DNODE 57
#define TK_PORT 58 #define TK_PORT 58
#define TK_DNODES 59 #define TK_DNODES 59
#define TK_RESTORE 60 #define TK_RESTORE 60
#define TK_NK_IPTOKEN 61 #define TK_NK_IPTOKEN 61
#define TK_FORCE 62 #define TK_FORCE 62
#define TK_UNSAFE 63 #define TK_UNSAFE 63
#define TK_CLUSTER 64 #define TK_CLUSTER 64
#define TK_LOCAL 65 #define TK_LOCAL 65
#define TK_QNODE 66 #define TK_QNODE 66
#define TK_BNODE 67 #define TK_BNODE 67
#define TK_SNODE 68 #define TK_SNODE 68
#define TK_MNODE 69 #define TK_MNODE 69
#define TK_VNODE 70 #define TK_VNODE 70
#define TK_DATABASE 71 #define TK_DATABASE 71
#define TK_USE 72 #define TK_USE 72
#define TK_FLUSH 73 #define TK_FLUSH 73
#define TK_TRIM 74 #define TK_TRIM 74
#define TK_S3MIGRATE 75 #define TK_S3MIGRATE 75
#define TK_COMPACT 76 #define TK_COMPACT 76
#define TK_IF 77 #define TK_IF 77
#define TK_NOT 78 #define TK_NOT 78
#define TK_EXISTS 79 #define TK_EXISTS 79
#define TK_BUFFER 80 #define TK_BUFFER 80
#define TK_CACHEMODEL 81 #define TK_CACHEMODEL 81
#define TK_CACHESIZE 82 #define TK_CACHESIZE 82
#define TK_COMP 83 #define TK_COMP 83
#define TK_DURATION 84 #define TK_DURATION 84
#define TK_NK_VARIABLE 85 #define TK_NK_VARIABLE 85
#define TK_MAXROWS 86 #define TK_MAXROWS 86
#define TK_MINROWS 87 #define TK_MINROWS 87
#define TK_KEEP 88 #define TK_KEEP 88
#define TK_PAGES 89 #define TK_PAGES 89
#define TK_PAGESIZE 90 #define TK_PAGESIZE 90
#define TK_TSDB_PAGESIZE 91 #define TK_TSDB_PAGESIZE 91
#define TK_PRECISION 92 #define TK_PRECISION 92
#define TK_REPLICA 93 #define TK_REPLICA 93
#define TK_VGROUPS 94 #define TK_VGROUPS 94
#define TK_SINGLE_STABLE 95 #define TK_SINGLE_STABLE 95
#define TK_RETENTIONS 96 #define TK_RETENTIONS 96
#define TK_SCHEMALESS 97 #define TK_SCHEMALESS 97
#define TK_WAL_LEVEL 98 #define TK_WAL_LEVEL 98
#define TK_WAL_FSYNC_PERIOD 99 #define TK_WAL_FSYNC_PERIOD 99
#define TK_WAL_RETENTION_PERIOD 100 #define TK_WAL_RETENTION_PERIOD 100
#define TK_WAL_RETENTION_SIZE 101 #define TK_WAL_RETENTION_SIZE 101
#define TK_WAL_ROLL_PERIOD 102 #define TK_WAL_ROLL_PERIOD 102
#define TK_WAL_SEGMENT_SIZE 103 #define TK_WAL_SEGMENT_SIZE 103
#define TK_STT_TRIGGER 104 #define TK_STT_TRIGGER 104
#define TK_TABLE_PREFIX 105 #define TK_TABLE_PREFIX 105
#define TK_TABLE_SUFFIX 106 #define TK_TABLE_SUFFIX 106
#define TK_S3_CHUNKSIZE 107 #define TK_S3_CHUNKPAGES 107
#define TK_S3_KEEPLOCAL 108 #define TK_S3_KEEPLOCAL 108
#define TK_S3_COMPACT 109 #define TK_S3_COMPACT 109
#define TK_KEEP_TIME_OFFSET 110 #define TK_KEEP_TIME_OFFSET 110
#define TK_ENCRYPT_ALGORITHM 111 #define TK_ENCRYPT_ALGORITHM 111
#define TK_NK_COLON 112 #define TK_NK_COLON 112
#define TK_BWLIMIT 113 #define TK_BWLIMIT 113
#define TK_START 114 #define TK_START 114
#define TK_TIMESTAMP 115 #define TK_TIMESTAMP 115
#define TK_END 116 #define TK_END 116
#define TK_TABLE 117 #define TK_TABLE 117
#define TK_NK_LP 118 #define TK_NK_LP 118
#define TK_NK_RP 119 #define TK_NK_RP 119
#define TK_USING 120 #define TK_USING 120
#define TK_FILE 121 #define TK_FILE 121
#define TK_STABLE 122 #define TK_STABLE 122
#define TK_COLUMN 123 #define TK_COLUMN 123
#define TK_MODIFY 124 #define TK_MODIFY 124
#define TK_RENAME 125 #define TK_RENAME 125
#define TK_TAG 126 #define TK_TAG 126
#define TK_SET 127 #define TK_SET 127
#define TK_NK_EQ 128 #define TK_NK_EQ 128
#define TK_TAGS 129 #define TK_TAGS 129
#define TK_BOOL 130 #define TK_BOOL 130
#define TK_TINYINT 131 #define TK_TINYINT 131
#define TK_SMALLINT 132 #define TK_SMALLINT 132
#define TK_INT 133 #define TK_INT 133
#define TK_INTEGER 134 #define TK_INTEGER 134
#define TK_BIGINT 135 #define TK_BIGINT 135
#define TK_FLOAT 136 #define TK_FLOAT 136
#define TK_DOUBLE 137 #define TK_DOUBLE 137
#define TK_BINARY 138 #define TK_BINARY 138
#define TK_NCHAR 139 #define TK_NCHAR 139
#define TK_UNSIGNED 140 #define TK_UNSIGNED 140
#define TK_JSON 141 #define TK_JSON 141
#define TK_VARCHAR 142 #define TK_VARCHAR 142
#define TK_MEDIUMBLOB 143 #define TK_MEDIUMBLOB 143
#define TK_BLOB 144 #define TK_BLOB 144
#define TK_VARBINARY 145 #define TK_VARBINARY 145
#define TK_GEOMETRY 146 #define TK_GEOMETRY 146
#define TK_DECIMAL 147 #define TK_DECIMAL 147
#define TK_COMMENT 148 #define TK_COMMENT 148
#define TK_MAX_DELAY 149 #define TK_MAX_DELAY 149
#define TK_WATERMARK 150 #define TK_WATERMARK 150
#define TK_ROLLUP 151 #define TK_ROLLUP 151
#define TK_TTL 152 #define TK_TTL 152
#define TK_SMA 153 #define TK_SMA 153
#define TK_DELETE_MARK 154 #define TK_DELETE_MARK 154
#define TK_FIRST 155 #define TK_FIRST 155
#define TK_LAST 156 #define TK_LAST 156
#define TK_SHOW 157 #define TK_SHOW 157
#define TK_FULL 158 #define TK_FULL 158
#define TK_PRIVILEGES 159 #define TK_PRIVILEGES 159
#define TK_DATABASES 160 #define TK_DATABASES 160
#define TK_TABLES 161 #define TK_TABLES 161
#define TK_STABLES 162 #define TK_STABLES 162
#define TK_MNODES 163 #define TK_MNODES 163
#define TK_QNODES 164 #define TK_QNODES 164
#define TK_ARBGROUPS 165 #define TK_ARBGROUPS 165
#define TK_FUNCTIONS 166 #define TK_FUNCTIONS 166
#define TK_INDEXES 167 #define TK_INDEXES 167
#define TK_ACCOUNTS 168 #define TK_ACCOUNTS 168
#define TK_APPS 169 #define TK_APPS 169
#define TK_CONNECTIONS 170 #define TK_CONNECTIONS 170
#define TK_LICENCES 171 #define TK_LICENCES 171
#define TK_GRANTS 172 #define TK_GRANTS 172
#define TK_LOGS 173 #define TK_LOGS 173
#define TK_MACHINES 174 #define TK_MACHINES 174
#define TK_ENCRYPTIONS 175 #define TK_ENCRYPTIONS 175
#define TK_QUERIES 176 #define TK_QUERIES 176
#define TK_SCORES 177 #define TK_SCORES 177
#define TK_TOPICS 178 #define TK_TOPICS 178
#define TK_VARIABLES 179 #define TK_VARIABLES 179
#define TK_BNODES 180 #define TK_BNODES 180
#define TK_SNODES 181 #define TK_SNODES 181
#define TK_TRANSACTIONS 182 #define TK_TRANSACTIONS 182
#define TK_DISTRIBUTED 183 #define TK_DISTRIBUTED 183
#define TK_CONSUMERS 184 #define TK_CONSUMERS 184
#define TK_SUBSCRIPTIONS 185 #define TK_SUBSCRIPTIONS 185
#define TK_VNODES 186 #define TK_VNODES 186
#define TK_ALIVE 187 #define TK_ALIVE 187
#define TK_VIEWS 188 #define TK_VIEWS 188
#define TK_VIEW 189 #define TK_VIEW 189
#define TK_COMPACTS 190 #define TK_COMPACTS 190
#define TK_NORMAL 191 #define TK_NORMAL 191
#define TK_CHILD 192 #define TK_CHILD 192
#define TK_LIKE 193 #define TK_LIKE 193
#define TK_TBNAME 194 #define TK_TBNAME 194
#define TK_QTAGS 195 #define TK_QTAGS 195
#define TK_AS 196 #define TK_AS 196
#define TK_SYSTEM 197 #define TK_SYSTEM 197
#define TK_TSMA 198 #define TK_TSMA 198
#define TK_INTERVAL 199 #define TK_INTERVAL 199
#define TK_RECURSIVE 200 #define TK_RECURSIVE 200
#define TK_TSMAS 201 #define TK_TSMAS 201
#define TK_FUNCTION 202 #define TK_FUNCTION 202
#define TK_INDEX 203 #define TK_INDEX 203
#define TK_COUNT 204 #define TK_COUNT 204
#define TK_LAST_ROW 205 #define TK_LAST_ROW 205
#define TK_META 206 #define TK_META 206
#define TK_ONLY 207 #define TK_ONLY 207
#define TK_TOPIC 208 #define TK_TOPIC 208
#define TK_CONSUMER 209 #define TK_CONSUMER 209
#define TK_GROUP 210 #define TK_GROUP 210
#define TK_DESC 211 #define TK_DESC 211
#define TK_DESCRIBE 212 #define TK_DESCRIBE 212
#define TK_RESET 213 #define TK_RESET 213
#define TK_QUERY 214 #define TK_QUERY 214
#define TK_CACHE 215 #define TK_CACHE 215
#define TK_EXPLAIN 216 #define TK_EXPLAIN 216
#define TK_ANALYZE 217 #define TK_ANALYZE 217
#define TK_VERBOSE 218 #define TK_VERBOSE 218
#define TK_NK_BOOL 219 #define TK_NK_BOOL 219
#define TK_RATIO 220 #define TK_RATIO 220
#define TK_NK_FLOAT 221 #define TK_NK_FLOAT 221
#define TK_OUTPUTTYPE 222 #define TK_OUTPUTTYPE 222
#define TK_AGGREGATE 223 #define TK_AGGREGATE 223
#define TK_BUFSIZE 224 #define TK_BUFSIZE 224
#define TK_LANGUAGE 225 #define TK_LANGUAGE 225
#define TK_REPLACE 226 #define TK_REPLACE 226
#define TK_STREAM 227 #define TK_STREAM 227
#define TK_INTO 228 #define TK_INTO 228
#define TK_PAUSE 229 #define TK_PAUSE 229
#define TK_RESUME 230 #define TK_RESUME 230
#define TK_PRIMARY 231 #define TK_PRIMARY 231
#define TK_KEY 232 #define TK_KEY 232
#define TK_TRIGGER 233 #define TK_TRIGGER 233
#define TK_AT_ONCE 234 #define TK_AT_ONCE 234
#define TK_WINDOW_CLOSE 235 #define TK_WINDOW_CLOSE 235
#define TK_IGNORE 236 #define TK_IGNORE 236
#define TK_EXPIRED 237 #define TK_EXPIRED 237
#define TK_FILL_HISTORY 238 #define TK_FILL_HISTORY 238
#define TK_SUBTABLE 239 #define TK_SUBTABLE 239
#define TK_UNTREATED 240 #define TK_UNTREATED 240
#define TK_KILL 241 #define TK_KILL 241
#define TK_CONNECTION 242 #define TK_CONNECTION 242
#define TK_TRANSACTION 243 #define TK_TRANSACTION 243
#define TK_BALANCE 244 #define TK_BALANCE 244
#define TK_VGROUP 245 #define TK_VGROUP 245
#define TK_LEADER 246 #define TK_LEADER 246
#define TK_MERGE 247 #define TK_MERGE 247
#define TK_REDISTRIBUTE 248 #define TK_REDISTRIBUTE 248
#define TK_SPLIT 249 #define TK_SPLIT 249
#define TK_DELETE 250 #define TK_DELETE 250
#define TK_INSERT 251 #define TK_INSERT 251
#define TK_NK_BIN 252 #define TK_NK_BIN 252
#define TK_NK_HEX 253 #define TK_NK_HEX 253
#define TK_NULL 254 #define TK_NULL 254
#define TK_NK_QUESTION 255 #define TK_NK_QUESTION 255
#define TK_NK_ALIAS 256 #define TK_NK_ALIAS 256
#define TK_NK_ARROW 257 #define TK_NK_ARROW 257
#define TK_ROWTS 258 #define TK_ROWTS 258
#define TK_QSTART 259 #define TK_QSTART 259
#define TK_QEND 260 #define TK_QEND 260
#define TK_QDURATION 261 #define TK_QDURATION 261
#define TK_WSTART 262 #define TK_WSTART 262
#define TK_WEND 263 #define TK_WEND 263
#define TK_WDURATION 264 #define TK_WDURATION 264
#define TK_IROWTS 265 #define TK_IROWTS 265
#define TK_ISFILLED 266 #define TK_ISFILLED 266
#define TK_FLOW 267 #define TK_FLOW 267
#define TK_FHIGH 268 #define TK_FHIGH 268
#define TK_FROWTS 269 #define TK_FROWTS 269
#define TK_CAST 270 #define TK_CAST 270
#define TK_POSITION 271 #define TK_POSITION 271
#define TK_IN 272 #define TK_IN 272
#define TK_FOR 273 #define TK_FOR 273
#define TK_NOW 274 #define TK_NOW 274
#define TK_TODAY 275 #define TK_TODAY 275
#define TK_RAND 276 #define TK_RAND 276
#define TK_SUBSTR 277 #define TK_SUBSTR 277
#define TK_SUBSTRING 278 #define TK_SUBSTRING 278
#define TK_BOTH 279 #define TK_BOTH 279
#define TK_TRAILING 280 #define TK_TRAILING 280
#define TK_LEADING 281 #define TK_LEADING 281
#define TK_TIMEZONE 282 #define TK_TIMEZONE 282
#define TK_CLIENT_VERSION 283 #define TK_CLIENT_VERSION 283
#define TK_SERVER_VERSION 284 #define TK_SERVER_VERSION 284
#define TK_SERVER_STATUS 285 #define TK_SERVER_STATUS 285
#define TK_CURRENT_USER 286 #define TK_CURRENT_USER 286
#define TK_PI 287 #define TK_PI 287
#define TK_CASE 288 #define TK_CASE 288
#define TK_WHEN 289 #define TK_WHEN 289
#define TK_THEN 290 #define TK_THEN 290
#define TK_ELSE 291 #define TK_ELSE 291
#define TK_BETWEEN 292 #define TK_BETWEEN 292
#define TK_IS 293 #define TK_IS 293
#define TK_NK_LT 294 #define TK_NK_LT 294
#define TK_NK_GT 295 #define TK_NK_GT 295
#define TK_NK_LE 296 #define TK_NK_LE 296
#define TK_NK_GE 297 #define TK_NK_GE 297
#define TK_NK_NE 298 #define TK_NK_NE 298
#define TK_MATCH 299 #define TK_MATCH 299
#define TK_NMATCH 300 #define TK_NMATCH 300
#define TK_CONTAINS 301 #define TK_CONTAINS 301
#define TK_JOIN 302 #define TK_JOIN 302
#define TK_INNER 303 #define TK_INNER 303
#define TK_LEFT 304 #define TK_LEFT 304
#define TK_RIGHT 305 #define TK_RIGHT 305
#define TK_OUTER 306 #define TK_OUTER 306
#define TK_SEMI 307 #define TK_SEMI 307
#define TK_ANTI 308 #define TK_ANTI 308
#define TK_ASOF 309 #define TK_ASOF 309
#define TK_WINDOW 310 #define TK_WINDOW 310
#define TK_WINDOW_OFFSET 311 #define TK_WINDOW_OFFSET 311
#define TK_JLIMIT 312 #define TK_JLIMIT 312
#define TK_SELECT 313 #define TK_SELECT 313
#define TK_NK_HINT 314 #define TK_NK_HINT 314
#define TK_DISTINCT 315 #define TK_DISTINCT 315
#define TK_WHERE 316 #define TK_WHERE 316
#define TK_PARTITION 317 #define TK_PARTITION 317
#define TK_BY 318 #define TK_BY 318
#define TK_SESSION 319 #define TK_SESSION 319
#define TK_STATE_WINDOW 320 #define TK_STATE_WINDOW 320
#define TK_EVENT_WINDOW 321 #define TK_EVENT_WINDOW 321
#define TK_COUNT_WINDOW 322 #define TK_COUNT_WINDOW 322
#define TK_ANOMALY_WINDOW 323 #define TK_ANOMALY_WINDOW 323
#define TK_SLIDING 324 #define TK_SLIDING 324
#define TK_FILL 325 #define TK_FILL 325
#define TK_VALUE 326 #define TK_VALUE 326
#define TK_VALUE_F 327 #define TK_VALUE_F 327
#define TK_NONE 328 #define TK_NONE 328
#define TK_PREV 329 #define TK_PREV 329
#define TK_NULL_F 330 #define TK_NULL_F 330
#define TK_LINEAR 331 #define TK_LINEAR 331
#define TK_NEXT 332 #define TK_NEXT 332
#define TK_HAVING 333 #define TK_HAVING 333
#define TK_RANGE 334 #define TK_RANGE 334
#define TK_EVERY 335 #define TK_EVERY 335
#define TK_ORDER 336 #define TK_ORDER 336
#define TK_SLIMIT 337 #define TK_SLIMIT 337
#define TK_SOFFSET 338 #define TK_SOFFSET 338
#define TK_LIMIT 339 #define TK_LIMIT 339
#define TK_OFFSET 340 #define TK_OFFSET 340
#define TK_ASC 341 #define TK_ASC 341
#define TK_NULLS 342 #define TK_NULLS 342
#define TK_ABORT 343 #define TK_ABORT 343
#define TK_AFTER 344 #define TK_AFTER 344
#define TK_ATTACH 345 #define TK_ATTACH 345
#define TK_BEFORE 346 #define TK_BEFORE 346
#define TK_BEGIN 347 #define TK_BEGIN 347
#define TK_BITAND 348 #define TK_BITAND 348
#define TK_BITNOT 349 #define TK_BITNOT 349
#define TK_BITOR 350 #define TK_BITOR 350
#define TK_BLOCKS 351 #define TK_BLOCKS 351
#define TK_CHANGE 352 #define TK_CHANGE 352
#define TK_COMMA 353 #define TK_COMMA 353
#define TK_CONCAT 354 #define TK_CONCAT 354
#define TK_CONFLICT 355 #define TK_CONFLICT 355
#define TK_COPY 356 #define TK_COPY 356
#define TK_DEFERRED 357 #define TK_DEFERRED 357
#define TK_DELIMITERS 358 #define TK_DELIMITERS 358
#define TK_DETACH 359 #define TK_DETACH 359
#define TK_DIVIDE 360 #define TK_DIVIDE 360
#define TK_DOT 361 #define TK_DOT 361
#define TK_EACH 362 #define TK_EACH 362
#define TK_FAIL 363 #define TK_FAIL 363
#define TK_GLOB 364 #define TK_GLOB 364
#define TK_ID 365 #define TK_ID 365
#define TK_IMMEDIATE 366 #define TK_IMMEDIATE 366
#define TK_IMPORT 367 #define TK_IMPORT 367
#define TK_INITIALLY 368 #define TK_INITIALLY 368
#define TK_INSTEAD 369 #define TK_INSTEAD 369
#define TK_ISNULL 370 #define TK_ISNULL 370
#define TK_MODULES 371 #define TK_MODULES 371
#define TK_NK_BITNOT 372 #define TK_NK_BITNOT 372
#define TK_NK_SEMI 373 #define TK_NK_SEMI 373
#define TK_NOTNULL 374 #define TK_NOTNULL 374
#define TK_OF 375 #define TK_OF 375
#define TK_PLUS 376 #define TK_PLUS 376
#define TK_PRIVILEGE 377 #define TK_PRIVILEGE 377
#define TK_RAISE 378 #define TK_RAISE 378
#define TK_RESTRICT 379 #define TK_RESTRICT 379
#define TK_ROW 380 #define TK_ROW 380
#define TK_STAR 381 #define TK_STAR 381
#define TK_STATEMENT 382 #define TK_STATEMENT 382
#define TK_STRICT 383 #define TK_STRICT 383
#define TK_STRING 384 #define TK_STRING 384
#define TK_TIMES 385 #define TK_TIMES 385
#define TK_VALUES 386 #define TK_VALUES 386
#define TK_VARIABLE 387 #define TK_VARIABLE 387
#define TK_WAL 388 #define TK_WAL 388
#define TK_NK_SPACE 600 #define TK_NK_SPACE 600
#define TK_NK_COMMENT 601 #define TK_NK_COMMENT 601

2
include/util/tdef.h
View File

@ -450,7 +450,7 @@ typedef enum ELogicConditionType {
#define TSDB_MIN_S3_CHUNK_SIZE (128 * 1024) #define TSDB_MIN_S3_CHUNK_SIZE (128 * 1024)
#define TSDB_MAX_S3_CHUNK_SIZE (1024 * 1024) #define TSDB_MAX_S3_CHUNK_SIZE (1024 * 1024)
#define TSDB_DEFAULT_S3_CHUNK_SIZE (256 * 1024) #define TSDB_DEFAULT_S3_CHUNK_SIZE (128 * 1024)
#define TSDB_MIN_S3_KEEP_LOCAL (1 * 1440) // unit minute #define TSDB_MIN_S3_KEEP_LOCAL (1 * 1440) // unit minute
#define TSDB_MAX_S3_KEEP_LOCAL (365000 * 1440) #define TSDB_MAX_S3_KEEP_LOCAL (365000 * 1440)
#define TSDB_DEFAULT_S3_KEEP_LOCAL (365 * 1440) #define TSDB_DEFAULT_S3_KEEP_LOCAL (365 * 1440)

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

@ -118,7 +118,7 @@ static const SSysDbTableSchema userDBSchema[] = {
{.name = "table_suffix", .bytes = 2, .type = TSDB_DATA_TYPE_SMALLINT, .sysInfo = true}, {.name = "table_suffix", .bytes = 2, .type = TSDB_DATA_TYPE_SMALLINT, .sysInfo = true},
{.name = "tsdb_pagesize", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = true}, {.name = "tsdb_pagesize", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = true},
{.name = "keep_time_offset", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = false}, {.name = "keep_time_offset", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = false},
{.name = "s3_chunksize", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = true}, {.name = "s3_chunkpages", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = true},
{.name = "s3_keeplocal", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true}, {.name = "s3_keeplocal", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
{.name = "s3_compact", .bytes = 1, .type = TSDB_DATA_TYPE_TINYINT, .sysInfo = true}, {.name = "s3_compact", .bytes = 1, .type = TSDB_DATA_TYPE_TINYINT, .sysInfo = true},
{.name = "with_arbitrator", .bytes = 1, .type = TSDB_DATA_TYPE_TINYINT, .sysInfo = true}, {.name = "with_arbitrator", .bytes = 1, .type = TSDB_DATA_TYPE_TINYINT, .sysInfo = true},

146
source/libs/command/src/command.c
View File

@ -50,7 +50,7 @@ static int32_t buildRetrieveTableRsp(SSDataBlock* pBlock, int32_t numOfCols, SRe
(*pRsp)->numOfCols = htonl(numOfCols); (*pRsp)->numOfCols = htonl(numOfCols);
int32_t len = blockEncode(pBlock, (*pRsp)->data + PAYLOAD_PREFIX_LEN, numOfCols); int32_t len = blockEncode(pBlock, (*pRsp)->data + PAYLOAD_PREFIX_LEN, numOfCols);
if(len < 0) { if (len < 0) {
taosMemoryFree(*pRsp); taosMemoryFree(*pRsp);
return terrno; return terrno;
} }
@ -292,7 +292,7 @@ static int32_t buildRetension(SArray* pRetension, char** ppRetentions) {
} }
const int lMaxLen = 128; const int lMaxLen = 128;
char* p1 = taosMemoryCalloc(1, lMaxLen); char* p1 = taosMemoryCalloc(1, lMaxLen);
if (NULL == p1) { if (NULL == p1) {
return terrno; return terrno;
} }
@ -346,20 +346,20 @@ static const char* encryptAlgorithmStr(int8_t encryptAlgorithm) {
} }
int32_t formatDurationOrKeep(char* buffer, int64_t bufSize, int32_t timeInMinutes) { int32_t formatDurationOrKeep(char* buffer, int64_t bufSize, int32_t timeInMinutes) {
if (buffer == NULL || bufSize <= 0) { if (buffer == NULL || bufSize <= 0) {
return 0; return 0;
} }
int32_t len = 0; int32_t len = 0;
if (timeInMinutes % 1440 == 0) { if (timeInMinutes % 1440 == 0) {
int32_t days = timeInMinutes / 1440; int32_t days = timeInMinutes / 1440;
len = tsnprintf(buffer, bufSize, "%dd", days); len = tsnprintf(buffer, bufSize, "%dd", days);
} else if (timeInMinutes % 60 == 0) { } else if (timeInMinutes % 60 == 0) {
int32_t hours = timeInMinutes / 60; int32_t hours = timeInMinutes / 60;
len = tsnprintf(buffer, bufSize, "%dh", hours); len = tsnprintf(buffer, bufSize, "%dh", hours);
} else { } else {
len = tsnprintf(buffer, bufSize, "%dm", timeInMinutes); len = tsnprintf(buffer, bufSize, "%dm", timeInMinutes);
} }
return len; return len;
} }
static int32_t setCreateDBResultIntoDataBlock(SSDataBlock* pBlock, char* dbName, char* dbFName, SDbCfgInfo* pCfg) { static int32_t setCreateDBResultIntoDataBlock(SSDataBlock* pBlock, char* dbName, char* dbFName, SDbCfgInfo* pCfg) {
@ -410,27 +410,27 @@ static int32_t setCreateDBResultIntoDataBlock(SSDataBlock* pBlock, char* dbName,
int32_t lenKeep2 = formatDurationOrKeep(keep2Str, sizeof(keep2Str), pCfg->daysToKeep2); int32_t lenKeep2 = formatDurationOrKeep(keep2Str, sizeof(keep2Str), pCfg->daysToKeep2);
if (IS_SYS_DBNAME(dbName)) { if (IS_SYS_DBNAME(dbName)) {
len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_DB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE, "CREATE DATABASE `%s`", dbName);
} else {
len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_DB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE, len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_DB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE,
"CREATE DATABASE `%s` BUFFER %d CACHESIZE %d CACHEMODEL '%s' COMP %d DURATION %s " "CREATE DATABASE `%s`", dbName);
"WAL_FSYNC_PERIOD %d MAXROWS %d MINROWS %d STT_TRIGGER %d KEEP %s,%s,%s PAGES %d PAGESIZE %d " } else {
"PRECISION '%s' REPLICA %d " len +=
"WAL_LEVEL %d VGROUPS %d SINGLE_STABLE %d TABLE_PREFIX %d TABLE_SUFFIX %d TSDB_PAGESIZE %d " tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_DB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE,
"WAL_RETENTION_PERIOD %d WAL_RETENTION_SIZE %" PRId64 "CREATE DATABASE `%s` BUFFER %d CACHESIZE %d CACHEMODEL '%s' COMP %d DURATION %s "
" KEEP_TIME_OFFSET %d ENCRYPT_ALGORITHM '%s' S3_CHUNKSIZE %d S3_KEEPLOCAL %dm S3_COMPACT %d", "WAL_FSYNC_PERIOD %d MAXROWS %d MINROWS %d STT_TRIGGER %d KEEP %s,%s,%s PAGES %d PAGESIZE %d "
dbName, pCfg->buffer, pCfg->cacheSize, cacheModelStr(pCfg->cacheLast), pCfg->compression, "PRECISION '%s' REPLICA %d "
durationStr, "WAL_LEVEL %d VGROUPS %d SINGLE_STABLE %d TABLE_PREFIX %d TABLE_SUFFIX %d TSDB_PAGESIZE %d "
pCfg->walFsyncPeriod, pCfg->maxRows, pCfg->minRows, pCfg->sstTrigger, "WAL_RETENTION_PERIOD %d WAL_RETENTION_SIZE %" PRId64
keep0Str, keep1Str, keep2Str, " KEEP_TIME_OFFSET %d ENCRYPT_ALGORITHM '%s' S3_CHUNKPAGES %d S3_KEEPLOCAL %dm S3_COMPACT %d",
pCfg->pages, pCfg->pageSize, prec, dbName, pCfg->buffer, pCfg->cacheSize, cacheModelStr(pCfg->cacheLast), pCfg->compression, durationStr,
pCfg->replications, pCfg->walLevel, pCfg->numOfVgroups, 1 == pCfg->numOfStables, hashPrefix, pCfg->walFsyncPeriod, pCfg->maxRows, pCfg->minRows, pCfg->sstTrigger, keep0Str, keep1Str, keep2Str,
pCfg->hashSuffix, pCfg->tsdbPageSize, pCfg->walRetentionPeriod, pCfg->walRetentionSize, pCfg->pages, pCfg->pageSize, prec, pCfg->replications, pCfg->walLevel, pCfg->numOfVgroups,
pCfg->keepTimeOffset, encryptAlgorithmStr(pCfg->encryptAlgorithm), pCfg->s3ChunkSize, 1 == pCfg->numOfStables, hashPrefix, pCfg->hashSuffix, pCfg->tsdbPageSize, pCfg->walRetentionPeriod,
pCfg->s3KeepLocal, pCfg->s3Compact); pCfg->walRetentionSize, pCfg->keepTimeOffset, encryptAlgorithmStr(pCfg->encryptAlgorithm),
pCfg->s3ChunkSize, pCfg->s3KeepLocal, pCfg->s3Compact);
if (pRetentions) { if (pRetentions) {
len += tsnprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_DB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE, " RETENTIONS %s", pRetentions); len += tsnprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_DB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE,
" RETENTIONS %s", pRetentions);
} }
} }
@ -510,30 +510,30 @@ void appendColumnFields(char* buf, int32_t* len, STableCfg* pCfg) {
#define LTYPE_LEN (32 + 60) // 60 byte for compress info #define LTYPE_LEN (32 + 60) // 60 byte for compress info
char type[LTYPE_LEN]; char type[LTYPE_LEN];
snprintf(type, LTYPE_LEN, "%s", tDataTypes[pSchema->type].name); snprintf(type, LTYPE_LEN, "%s", tDataTypes[pSchema->type].name);
int typeLen = strlen(type); int typeLen = strlen(type);
if (TSDB_DATA_TYPE_VARCHAR == pSchema->type || TSDB_DATA_TYPE_VARBINARY == pSchema->type || if (TSDB_DATA_TYPE_VARCHAR == pSchema->type || TSDB_DATA_TYPE_VARBINARY == pSchema->type ||
TSDB_DATA_TYPE_GEOMETRY == pSchema->type) { TSDB_DATA_TYPE_GEOMETRY == pSchema->type) {
typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, "(%d)", (int32_t)(pSchema->bytes - VARSTR_HEADER_SIZE)); typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, "(%d)", (int32_t)(pSchema->bytes - VARSTR_HEADER_SIZE));
} else if (TSDB_DATA_TYPE_NCHAR == pSchema->type) { } else if (TSDB_DATA_TYPE_NCHAR == pSchema->type) {
typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, "(%d)", typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, "(%d)",
(int32_t)((pSchema->bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE)); (int32_t)((pSchema->bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE));
} }
if (useCompress(pCfg->tableType) && pCfg->pSchemaExt) { if (useCompress(pCfg->tableType) && pCfg->pSchemaExt) {
typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, " ENCODE \'%s\'", typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, " ENCODE \'%s\'",
columnEncodeStr(COMPRESS_L1_TYPE_U32(pCfg->pSchemaExt[i].compress))); columnEncodeStr(COMPRESS_L1_TYPE_U32(pCfg->pSchemaExt[i].compress)));
typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, " COMPRESS \'%s\'", typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, " COMPRESS \'%s\'",
columnCompressStr(COMPRESS_L2_TYPE_U32(pCfg->pSchemaExt[i].compress))); columnCompressStr(COMPRESS_L2_TYPE_U32(pCfg->pSchemaExt[i].compress)));
typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, " LEVEL \'%s\'", typeLen += tsnprintf(type + typeLen, LTYPE_LEN - typeLen, " LEVEL \'%s\'",
columnLevelStr(COMPRESS_L2_TYPE_LEVEL_U32(pCfg->pSchemaExt[i].compress))); columnLevelStr(COMPRESS_L2_TYPE_LEVEL_U32(pCfg->pSchemaExt[i].compress)));
} }
if (!(pSchema->flags & COL_IS_KEY)) { if (!(pSchema->flags & COL_IS_KEY)) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), "%s`%s` %s", *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
((i > 0) ? ", " : ""), pSchema->name, type); "%s`%s` %s", ((i > 0) ? ", " : ""), pSchema->name, type);
} else { } else {
char* pk = "PRIMARY KEY"; char* pk = "PRIMARY KEY";
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), "%s`%s` %s %s", *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
((i > 0) ? ", " : ""), pSchema->name, type, pk); "%s`%s` %s %s", ((i > 0) ? ", " : ""), pSchema->name, type, pk);
} }
} }
} }
@ -545,14 +545,15 @@ void appendTagFields(char* buf, int32_t* len, STableCfg* pCfg) {
snprintf(type, sizeof(type), "%s", tDataTypes[pSchema->type].name); snprintf(type, sizeof(type), "%s", tDataTypes[pSchema->type].name);
if (TSDB_DATA_TYPE_VARCHAR == pSchema->type || TSDB_DATA_TYPE_VARBINARY == pSchema->type || if (TSDB_DATA_TYPE_VARCHAR == pSchema->type || TSDB_DATA_TYPE_VARBINARY == pSchema->type ||
TSDB_DATA_TYPE_GEOMETRY == pSchema->type) { TSDB_DATA_TYPE_GEOMETRY == pSchema->type) {
snprintf(type + strlen(type), sizeof(type) - strlen(type), "(%d)", (int32_t)(pSchema->bytes - VARSTR_HEADER_SIZE)); snprintf(type + strlen(type), sizeof(type) - strlen(type), "(%d)",
(int32_t)(pSchema->bytes - VARSTR_HEADER_SIZE));
} else if (TSDB_DATA_TYPE_NCHAR == pSchema->type) { } else if (TSDB_DATA_TYPE_NCHAR == pSchema->type) {
snprintf(type + strlen(type), sizeof(type) - strlen(type), "(%d)", snprintf(type + strlen(type), sizeof(type) - strlen(type), "(%d)",
(int32_t)((pSchema->bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE)); (int32_t)((pSchema->bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE));
} }
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), "%s`%s` %s", *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
((i > 0) ? ", " : ""), pSchema->name, type); "%s`%s` %s", ((i > 0) ? ", " : ""), pSchema->name, type);
} }
} }
@ -560,7 +561,7 @@ void appendTagNameFields(char* buf, int32_t* len, STableCfg* pCfg) {
for (int32_t i = 0; i < pCfg->numOfTags; ++i) { for (int32_t i = 0; i < pCfg->numOfTags; ++i) {
SSchema* pSchema = pCfg->pSchemas + pCfg->numOfColumns + i; SSchema* pSchema = pCfg->pSchemas + pCfg->numOfColumns + i;
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
"%s`%s`", ((i > 0) ? ", " : ""), pSchema->name); "%s`%s`", ((i > 0) ? ", " : ""), pSchema->name);
} }
} }
@ -582,7 +583,7 @@ int32_t appendTagValues(char* buf, int32_t* len, STableCfg* pCfg) {
return terrno; return terrno;
} }
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
"%s", pJson); "%s", pJson);
taosMemoryFree(pJson); taosMemoryFree(pJson);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
@ -596,12 +597,12 @@ int32_t appendTagValues(char* buf, int32_t* len, STableCfg* pCfg) {
SSchema* pSchema = pCfg->pSchemas + pCfg->numOfColumns + i; SSchema* pSchema = pCfg->pSchemas + pCfg->numOfColumns + i;
if (i > 0) { if (i > 0) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
", "); ", ");
} }
if (j >= valueNum) { if (j >= valueNum) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
"NULL"); "NULL");
continue; continue;
} }
@ -624,14 +625,15 @@ int32_t appendTagValues(char* buf, int32_t* len, STableCfg* pCfg) {
code = dataConverToStr(buf + VARSTR_HEADER_SIZE + *len, leftSize, type, pTagVal->pData, pTagVal->nData, &tlen); code = dataConverToStr(buf + VARSTR_HEADER_SIZE + *len, leftSize, type, pTagVal->pData, pTagVal->nData, &tlen);
TAOS_CHECK_ERRNO(code); TAOS_CHECK_ERRNO(code);
} else { } else {
code = dataConverToStr(buf + VARSTR_HEADER_SIZE + *len, leftSize, type, &pTagVal->i64, tDataTypes[type].bytes, &tlen); code = dataConverToStr(buf + VARSTR_HEADER_SIZE + *len, leftSize, type, &pTagVal->i64, tDataTypes[type].bytes,
&tlen);
TAOS_CHECK_ERRNO(code); TAOS_CHECK_ERRNO(code);
} }
*len += tlen; *len += tlen;
j++; j++;
} else { } else {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
"NULL"); "NULL");
} }
} }
_exit: _exit:
@ -643,38 +645,38 @@ _exit:
void appendTableOptions(char* buf, int32_t* len, SDbCfgInfo* pDbCfg, STableCfg* pCfg) { void appendTableOptions(char* buf, int32_t* len, SDbCfgInfo* pDbCfg, STableCfg* pCfg) {
if (pCfg->commentLen > 0) { if (pCfg->commentLen > 0) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
" COMMENT '%s'", pCfg->pComment); " COMMENT '%s'", pCfg->pComment);
} else if (0 == pCfg->commentLen) { } else if (0 == pCfg->commentLen) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
" COMMENT ''"); " COMMENT ''");
} }
if (NULL != pDbCfg->pRetensions && pCfg->watermark1 > 0) { if (NULL != pDbCfg->pRetensions && pCfg->watermark1 > 0) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
" WATERMARK %" PRId64 "a", pCfg->watermark1); " WATERMARK %" PRId64 "a", pCfg->watermark1);
if (pCfg->watermark2 > 0) { if (pCfg->watermark2 > 0) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
", %" PRId64 "a", pCfg->watermark2); ", %" PRId64 "a", pCfg->watermark2);
} }
} }
if (NULL != pDbCfg->pRetensions && pCfg->delay1 > 0) { if (NULL != pDbCfg->pRetensions && pCfg->delay1 > 0) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
" MAX_DELAY %" PRId64 "a", pCfg->delay1); " MAX_DELAY %" PRId64 "a", pCfg->delay1);
if (pCfg->delay2 > 0) { if (pCfg->delay2 > 0) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
", %" PRId64 "a", pCfg->delay2); ", %" PRId64 "a", pCfg->delay2);
} }
} }
int32_t funcNum = taosArrayGetSize(pCfg->pFuncs); int32_t funcNum = taosArrayGetSize(pCfg->pFuncs);
if (NULL != pDbCfg->pRetensions && funcNum > 0) { if (NULL != pDbCfg->pRetensions && funcNum > 0) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
" ROLLUP("); " ROLLUP(");
for (int32_t i = 0; i < funcNum; ++i) { for (int32_t i = 0; i < funcNum; ++i) {
char* pFunc = taosArrayGet(pCfg->pFuncs, i); char* pFunc = taosArrayGet(pCfg->pFuncs, i);
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
"%s%s", ((i > 0) ? ", " : ""), pFunc); "%s%s", ((i > 0) ? ", " : ""), pFunc);
} }
*len += *len +=
snprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), ")"); snprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), ")");
@ -682,7 +684,7 @@ void appendTableOptions(char* buf, int32_t* len, SDbCfgInfo* pDbCfg, STableCfg*
if (pCfg->ttl > 0) { if (pCfg->ttl > 0) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
" TTL %d", pCfg->ttl); " TTL %d", pCfg->ttl);
} }
if (TSDB_SUPER_TABLE == pCfg->tableType || TSDB_NORMAL_TABLE == pCfg->tableType) { if (TSDB_SUPER_TABLE == pCfg->tableType || TSDB_NORMAL_TABLE == pCfg->tableType) {
@ -696,18 +698,18 @@ void appendTableOptions(char* buf, int32_t* len, SDbCfgInfo* pDbCfg, STableCfg*
if (nSma < pCfg->numOfColumns && nSma > 0) { if (nSma < pCfg->numOfColumns && nSma > 0) {
bool smaOn = false; bool smaOn = false;
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len),
" SMA("); " SMA(");
for (int32_t i = 0; i < pCfg->numOfColumns; ++i) { for (int32_t i = 0; i < pCfg->numOfColumns; ++i) {
if (IS_BSMA_ON(pCfg->pSchemas + i)) { if (IS_BSMA_ON(pCfg->pSchemas + i)) {
if (smaOn) { if (smaOn) {
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len,
SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), ",`%s`", SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), ",`%s`",
(pCfg->pSchemas + i)->name); (pCfg->pSchemas + i)->name);
} else { } else {
smaOn = true; smaOn = true;
*len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len, *len += tsnprintf(buf + VARSTR_HEADER_SIZE + *len,
SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), "`%s`", SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + *len), "`%s`",
(pCfg->pSchemas + i)->name); (pCfg->pSchemas + i)->name);
} }
} }
} }
@ -736,20 +738,20 @@ static int32_t setCreateTBResultIntoDataBlock(SSDataBlock* pBlock, SDbCfgInfo* p
if (TSDB_SUPER_TABLE == pCfg->tableType) { if (TSDB_SUPER_TABLE == pCfg->tableType) {
len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_TB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE, len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_TB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE,
"CREATE STABLE `%s` (", tbName); "CREATE STABLE `%s` (", tbName);
appendColumnFields(buf2, &len, pCfg); appendColumnFields(buf2, &len, pCfg);
len += tsnprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len), len += tsnprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len),
") TAGS ("); ") TAGS (");
appendTagFields(buf2, &len, pCfg); appendTagFields(buf2, &len, pCfg);
len += len +=
snprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len), ")"); snprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len), ")");
appendTableOptions(buf2, &len, pDbCfg, pCfg); appendTableOptions(buf2, &len, pDbCfg, pCfg);
} else if (TSDB_CHILD_TABLE == pCfg->tableType) { } else if (TSDB_CHILD_TABLE == pCfg->tableType) {
len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_TB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE, len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_TB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE,
"CREATE TABLE `%s` USING `%s` (", tbName, pCfg->stbName); "CREATE TABLE `%s` USING `%s` (", tbName, pCfg->stbName);
appendTagNameFields(buf2, &len, pCfg); appendTagNameFields(buf2, &len, pCfg);
len += tsnprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len), len += tsnprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len),
") TAGS ("); ") TAGS (");
code = appendTagValues(buf2, &len, pCfg); code = appendTagValues(buf2, &len, pCfg);
TAOS_CHECK_ERRNO(code); TAOS_CHECK_ERRNO(code);
len += len +=
@ -757,7 +759,7 @@ static int32_t setCreateTBResultIntoDataBlock(SSDataBlock* pBlock, SDbCfgInfo* p
appendTableOptions(buf2, &len, pDbCfg, pCfg); appendTableOptions(buf2, &len, pDbCfg, pCfg);
} else { } else {
len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_TB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE, len += tsnprintf(buf2 + VARSTR_HEADER_SIZE, SHOW_CREATE_TB_RESULT_FIELD2_LEN - VARSTR_HEADER_SIZE,
"CREATE TABLE `%s` (", tbName); "CREATE TABLE `%s` (", tbName);
appendColumnFields(buf2, &len, pCfg); appendColumnFields(buf2, &len, pCfg);
len += len +=
snprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len), ")"); snprintf(buf2 + VARSTR_HEADER_SIZE + len, SHOW_CREATE_TB_RESULT_FIELD2_LEN - (VARSTR_HEADER_SIZE + len), ")");
@ -793,7 +795,7 @@ static int32_t setCreateViewResultIntoDataBlock(SSDataBlock* pBlock, SShowCreate
} }
SViewMeta* pMeta = pStmt->pViewMeta; SViewMeta* pMeta = pStmt->pViewMeta;
if(NULL == pMeta) { if (NULL == pMeta) {
qError("exception: view meta is null"); qError("exception: view meta is null");
return TSDB_CODE_APP_ERROR; return TSDB_CODE_APP_ERROR;
} }

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

@ -64,7 +64,7 @@ typedef enum EDatabaseOptionType {
DB_OPTION_STT_TRIGGER, DB_OPTION_STT_TRIGGER,
DB_OPTION_TABLE_PREFIX, DB_OPTION_TABLE_PREFIX,
DB_OPTION_TABLE_SUFFIX, DB_OPTION_TABLE_SUFFIX,
DB_OPTION_S3_CHUNKSIZE, DB_OPTION_S3_CHUNKPAGES,
DB_OPTION_S3_KEEPLOCAL, DB_OPTION_S3_KEEPLOCAL,
DB_OPTION_S3_COMPACT, DB_OPTION_S3_COMPACT,
DB_OPTION_KEEP_TIME_OFFSET, DB_OPTION_KEEP_TIME_OFFSET,
@ -244,7 +244,7 @@ SNode* createShowTableDistributedStmt(SAstCreateContext* pCxt, SNode* pRealTable
SNode* createShowDnodeVariablesStmt(SAstCreateContext* pCxt, SNode* pDnodeId, SNode* pLikePattern); SNode* createShowDnodeVariablesStmt(SAstCreateContext* pCxt, SNode* pDnodeId, SNode* pLikePattern);
SNode* createShowVnodesStmt(SAstCreateContext* pCxt, SNode* pDnodeId, SNode* pDnodeEndpoint); SNode* createShowVnodesStmt(SAstCreateContext* pCxt, SNode* pDnodeId, SNode* pDnodeEndpoint);
SNode* createShowTableTagsStmt(SAstCreateContext* pCxt, SNode* pTbName, SNode* pDbName, SNodeList* pTags); SNode* createShowTableTagsStmt(SAstCreateContext* pCxt, SNode* pTbName, SNode* pDbName, SNodeList* pTags);
SNode* createCreateUserStmt(SAstCreateContext* pCxt, SToken* pUserName, const SToken* pPassword, int8_t sysinfo, SNode* createCreateUserStmt(SAstCreateContext* pCxt, SToken* pUserName, const SToken* pPassword, int8_t sysinfo,
int8_t createdb, int8_t is_import); int8_t createdb, int8_t is_import);
SNode* addCreateUserStmtWhiteList(SAstCreateContext* pCxt, SNode* pStmt, SNodeList* pIpRangesNodeList); SNode* addCreateUserStmtWhiteList(SAstCreateContext* pCxt, SNode* pStmt, SNodeList* pIpRangesNodeList);
SNode* createAlterUserStmt(SAstCreateContext* pCxt, SToken* pUserName, int8_t alterType, void* pAlterInfo); SNode* createAlterUserStmt(SAstCreateContext* pCxt, SToken* pUserName, int8_t alterType, void* pAlterInfo);

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

@ -280,7 +280,7 @@ db_options(A) ::= db_options(B) WAL_SEGMENT_SIZE NK_INTEGER(C).
db_options(A) ::= db_options(B) STT_TRIGGER NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_STT_TRIGGER, &C); } db_options(A) ::= db_options(B) STT_TRIGGER NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_STT_TRIGGER, &C); }
db_options(A) ::= db_options(B) TABLE_PREFIX signed(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_TABLE_PREFIX, C); } db_options(A) ::= db_options(B) TABLE_PREFIX signed(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_TABLE_PREFIX, C); }
db_options(A) ::= db_options(B) TABLE_SUFFIX signed(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_TABLE_SUFFIX, C); } db_options(A) ::= db_options(B) TABLE_SUFFIX signed(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_TABLE_SUFFIX, C); }
db_options(A) ::= db_options(B) S3_CHUNKSIZE NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_S3_CHUNKSIZE, &C); } db_options(A) ::= db_options(B) S3_CHUNKPAGES NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_S3_CHUNKPAGES, &C); }
db_options(A) ::= db_options(B) S3_KEEPLOCAL NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_S3_KEEPLOCAL, &C); } db_options(A) ::= db_options(B) S3_KEEPLOCAL NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_S3_KEEPLOCAL, &C); }
db_options(A) ::= db_options(B) S3_KEEPLOCAL NK_VARIABLE(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_S3_KEEPLOCAL, &C); } db_options(A) ::= db_options(B) S3_KEEPLOCAL NK_VARIABLE(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_S3_KEEPLOCAL, &C); }
db_options(A) ::= db_options(B) S3_COMPACT NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_S3_COMPACT, &C); } db_options(A) ::= db_options(B) S3_COMPACT NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_S3_COMPACT, &C); }

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

@ -43,11 +43,11 @@
} \ } \
} while (0) } while (0)
#define CHECK_NAME(p) \ #define CHECK_NAME(p) \
do { \ do { \
if (!p) { \ if (!p) { \
goto _err; \ goto _err; \
} \ } \
} while (0) } while (0)
#define COPY_STRING_FORM_ID_TOKEN(buf, pToken) strncpy(buf, (pToken)->z, TMIN((pToken)->n, sizeof(buf) - 1)) #define COPY_STRING_FORM_ID_TOKEN(buf, pToken) strncpy(buf, (pToken)->z, TMIN((pToken)->n, sizeof(buf) - 1))
@ -333,7 +333,7 @@ SNode* releaseRawExprNode(SAstCreateContext* pCxt, SNode* pNode) {
// Len of pRawExpr->p could be larger than len of aliasName[TSDB_COL_NAME_LEN]. // Len of pRawExpr->p could be larger than len of aliasName[TSDB_COL_NAME_LEN].
// If aliasName is truncated, hash value of aliasName could be the same. // If aliasName is truncated, hash value of aliasName could be the same.
uint64_t hashVal = MurmurHash3_64(pRawExpr->p, pRawExpr->n); uint64_t hashVal = MurmurHash3_64(pRawExpr->p, pRawExpr->n);
sprintf(pExpr->aliasName, "%"PRIu64, hashVal); sprintf(pExpr->aliasName, "%" PRIu64, hashVal);
strncpy(pExpr->userAlias, pRawExpr->p, len); strncpy(pExpr->userAlias, pRawExpr->p, len);
pExpr->userAlias[len] = '\0'; pExpr->userAlias[len] = '\0';
} }
@ -405,7 +405,7 @@ SNode* createValueNode(SAstCreateContext* pCxt, int32_t dataType, const SToken*
pCxt->errCode = nodesMakeNode(QUERY_NODE_VALUE, (SNode**)&val); pCxt->errCode = nodesMakeNode(QUERY_NODE_VALUE, (SNode**)&val);
CHECK_MAKE_NODE(val); CHECK_MAKE_NODE(val);
val->literal = taosStrndup(pLiteral->z, pLiteral->n); val->literal = taosStrndup(pLiteral->z, pLiteral->n);
if(!val->literal) { if (!val->literal) {
pCxt->errCode = terrno; pCxt->errCode = terrno;
nodesDestroyNode((SNode*)val); nodesDestroyNode((SNode*)val);
return NULL; return NULL;
@ -586,8 +586,8 @@ SNodeList* createHintNodeList(SAstCreateContext* pCxt, const SToken* pLiteral) {
if (NULL == pLiteral || pLiteral->n <= 5) { if (NULL == pLiteral || pLiteral->n <= 5) {
return NULL; return NULL;
} }
SNodeList* pHintList = NULL; SNodeList* pHintList = NULL;
char* hint = taosStrndup(pLiteral->z + 3, pLiteral->n - 5); char* hint = taosStrndup(pLiteral->z + 3, pLiteral->n - 5);
if (!hint) return NULL; if (!hint) return NULL;
int32_t i = 0; int32_t i = 0;
bool quit = false; bool quit = false;
@ -971,7 +971,7 @@ _err:
} }
SNode* createBetweenAnd(SAstCreateContext* pCxt, SNode* pExpr, SNode* pLeft, SNode* pRight) { SNode* createBetweenAnd(SAstCreateContext* pCxt, SNode* pExpr, SNode* pLeft, SNode* pRight) {
SNode* pNew = NULL, *pGE = NULL, *pLE = NULL; SNode *pNew = NULL, *pGE = NULL, *pLE = NULL;
CHECK_PARSER_STATUS(pCxt); CHECK_PARSER_STATUS(pCxt);
pCxt->errCode = nodesCloneNode(pExpr, &pNew); pCxt->errCode = nodesCloneNode(pExpr, &pNew);
CHECK_PARSER_STATUS(pCxt); CHECK_PARSER_STATUS(pCxt);
@ -993,7 +993,7 @@ _err:
} }
SNode* createNotBetweenAnd(SAstCreateContext* pCxt, SNode* pExpr, SNode* pLeft, SNode* pRight) { SNode* createNotBetweenAnd(SAstCreateContext* pCxt, SNode* pExpr, SNode* pLeft, SNode* pRight) {
SNode* pNew = NULL, *pLT = NULL, *pGT = NULL; SNode *pNew = NULL, *pLT = NULL, *pGT = NULL;
CHECK_PARSER_STATUS(pCxt); CHECK_PARSER_STATUS(pCxt);
pCxt->errCode = nodesCloneNode(pExpr, &pNew); pCxt->errCode = nodesCloneNode(pExpr, &pNew);
CHECK_PARSER_STATUS(pCxt); CHECK_PARSER_STATUS(pCxt);
@ -1959,7 +1959,7 @@ static SNode* setDatabaseOptionImpl(SAstCreateContext* pCxt, SNode* pOptions, ED
nodesDestroyNode((SNode*)pNode); nodesDestroyNode((SNode*)pNode);
break; break;
} }
case DB_OPTION_S3_CHUNKSIZE: case DB_OPTION_S3_CHUNKPAGES:
pDbOptions->s3ChunkSize = taosStr2Int32(((SToken*)pVal)->z, NULL, 10); pDbOptions->s3ChunkSize = taosStr2Int32(((SToken*)pVal)->z, NULL, 10);
break; break;
case DB_OPTION_S3_KEEPLOCAL: { case DB_OPTION_S3_KEEPLOCAL: {
@ -2210,7 +2210,7 @@ _err:
SNode* setColumnOptions(SAstCreateContext* pCxt, SNode* pOptions, const SToken* pVal1, void* pVal2) { SNode* setColumnOptions(SAstCreateContext* pCxt, SNode* pOptions, const SToken* pVal1, void* pVal2) {
CHECK_PARSER_STATUS(pCxt); CHECK_PARSER_STATUS(pCxt);
char optionType[TSDB_CL_OPTION_LEN]; char optionType[TSDB_CL_OPTION_LEN];
memset(optionType, 0, TSDB_CL_OPTION_LEN); memset(optionType, 0, TSDB_CL_OPTION_LEN);
strncpy(optionType, pVal1->z, TMIN(pVal1->n, TSDB_CL_OPTION_LEN)); strncpy(optionType, pVal1->z, TMIN(pVal1->n, TSDB_CL_OPTION_LEN));
@ -2807,7 +2807,7 @@ static int32_t getIpV4RangeFromWhitelistItem(char* ipRange, SIpV4Range* pIpRange
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
char* ipCopy = taosStrdup(ipRange); char* ipCopy = taosStrdup(ipRange);
if (!ipCopy) return terrno; if (!ipCopy) return terrno;
char* slash = strchr(ipCopy, '/'); char* slash = strchr(ipCopy, '/');
if (slash) { if (slash) {
*slash = '\0'; *slash = '\0';
struct in_addr addr; struct in_addr addr;

14
source/libs/parser/src/parTokenizer.c
View File

@ -340,7 +340,7 @@ static SKeyword keywordTable[] = {
{"_FROWTS", TK_FROWTS}, {"_FROWTS", TK_FROWTS},
{"ALIVE", TK_ALIVE}, {"ALIVE", TK_ALIVE},
{"VARBINARY", TK_VARBINARY}, {"VARBINARY", TK_VARBINARY},
{"S3_CHUNKSIZE", TK_S3_CHUNKSIZE}, {"S3_CHUNKPAGES", TK_S3_CHUNKPAGES},
{"S3_KEEPLOCAL", TK_S3_KEEPLOCAL}, {"S3_KEEPLOCAL", TK_S3_KEEPLOCAL},
{"S3_COMPACT", TK_S3_COMPACT}, {"S3_COMPACT", TK_S3_COMPACT},
{"S3MIGRATE", TK_S3MIGRATE}, {"S3MIGRATE", TK_S3MIGRATE},
@ -370,7 +370,7 @@ static int32_t doInitKeywordsTable(void) {
keywordHashTable = taosHashInit(numOfEntries, MurmurHash3_32, true, false); keywordHashTable = taosHashInit(numOfEntries, MurmurHash3_32, true, false);
for (int32_t i = 0; i < numOfEntries; i++) { for (int32_t i = 0; i < numOfEntries; i++) {
keywordTable[i].len = (uint8_t)strlen(keywordTable[i].name); keywordTable[i].len = (uint8_t)strlen(keywordTable[i].name);
void* ptr = &keywordTable[i]; void* ptr = &keywordTable[i];
int32_t code = taosHashPut(keywordHashTable, keywordTable[i].name, keywordTable[i].len, (void*)&ptr, POINTER_BYTES); int32_t code = taosHashPut(keywordHashTable, keywordTable[i].name, keywordTable[i].len, (void*)&ptr, POINTER_BYTES);
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS != code) {
taosHashCleanup(keywordHashTable); taosHashCleanup(keywordHashTable);
@ -698,7 +698,7 @@ uint32_t tGetToken(const char* z, uint32_t* tokenId) {
} }
} }
if (hasNonAsciiChars) { if (hasNonAsciiChars) {
*tokenId = TK_NK_ALIAS; // must be alias *tokenId = TK_NK_ALIAS; // must be alias
return i; return i;
} }
if (IS_TRUE_STR(z, i) || IS_FALSE_STR(z, i)) { if (IS_TRUE_STR(z, i) || IS_FALSE_STR(z, i)) {
@ -713,10 +713,10 @@ uint32_t tGetToken(const char* z, uint32_t* tokenId) {
break; break;
} }
bool hasNonAsciiChars = false; bool hasNonAsciiChars = false;
for (i = 1; ; i++) { for (i = 1;; i++) {
if ((z[i] & 0x80) != 0) { if ((z[i] & 0x80) != 0) {
hasNonAsciiChars = true; hasNonAsciiChars = true;
} else if (isIdChar[(uint8_t)z[i]]){ } else if (isIdChar[(uint8_t)z[i]]) {
} else { } else {
break; break;
} }
@ -834,9 +834,7 @@ SToken tStrGetToken(const char* str, int32_t* i, bool isPrevOptr, bool* pIgnoreC
bool taosIsKeyWordToken(const char* z, int32_t len) { return (tKeywordCode((char*)z, len) != TK_NK_ID); } bool taosIsKeyWordToken(const char* z, int32_t len) { return (tKeywordCode((char*)z, len) != TK_NK_ID); }
int32_t taosInitKeywordsTable() { int32_t taosInitKeywordsTable() { return doInitKeywordsTable(); }
return doInitKeywordsTable();
}
void taosCleanupKeywordsTable() { void taosCleanupKeywordsTable() {
void* m = keywordHashTable; void* m = keywordHashTable;

490
source/libs/parser/src/parTranslater.c
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff