From e9faf4ab0855778581043d82cee2079a26a8a7c2 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 1 Apr 2024 07:58:00 +0000 Subject: [PATCH] fix ci error --- include/common/tcol.h | 6 +- include/common/ttokendef.h | 731 ++++++++++++++++---------------- source/common/src/tdataformat.c | 6 +- 3 files changed, 370 insertions(+), 373 deletions(-) diff --git a/include/common/tcol.h b/include/common/tcol.h index 88360ab4fb..26957f67c7 100644 --- a/include/common/tcol.h +++ b/include/common/tcol.h @@ -16,14 +16,14 @@ #ifndef _TD_TCOL_H_ #define _TD_TCOL_H_ -#define TSDB_COLUMN_ENCODE_UNKNOWN "Unknown" +#define TSDB_COLUMN_ENCODE_UNKNOWN "unknown" #define TSDB_COLUMN_ENCODE_SIMPLE8B "simple8b" #define TSDB_COLUMN_ENCODE_XOR "delta-i" #define TSDB_COLUMN_ENCODE_RLE "bit-packing" #define TSDB_COLUMN_ENCODE_DELTAD "delta-d" #define TSDB_COLUMN_ENCODE_DISABLED "disabled" -#define TSDB_COLUMN_COMPRESS_UNKNOWN "Unknown" +#define TSDB_COLUMN_COMPRESS_UNKNOWN "unknown" #define TSDB_COLUMN_COMPRESS_LZ4 "lz4" #define TSDB_COLUMN_COMPRESS_ZLIB "zlib" #define TSDB_COLUMN_COMPRESS_ZSTD "zstd" @@ -31,7 +31,7 @@ #define TSDB_COLUMN_COMPRESS_XZ "xz" #define TSDB_COLUMN_COMPRESS_DISABLED "disabled" -#define TSDB_COLUMN_LEVEL_UNKNOWN "Unknown" +#define TSDB_COLUMN_LEVEL_UNKNOWN "unknown" #define TSDB_COLUMN_LEVEL_HIGH "high" #define TSDB_COLUMN_LEVEL_MEDIUM "medium" #define TSDB_COLUMN_LEVEL_LOW "low" diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h index 134c82fb52..8039e4fa73 100644 --- a/include/common/ttokendef.h +++ b/include/common/ttokendef.h @@ -16,375 +16,374 @@ #ifndef _TD_COMMON_TOKEN_H_ #define _TD_COMMON_TOKEN_H_ -#define TK_OR 1 -#define TK_AND 2 -#define TK_UNION 3 -#define TK_ALL 4 -#define TK_MINUS 5 -#define TK_EXCEPT 6 -#define TK_INTERSECT 7 -#define TK_NK_BITAND 8 -#define TK_NK_BITOR 9 -#define TK_NK_LSHIFT 10 -#define TK_NK_RSHIFT 11 -#define TK_NK_PLUS 12 -#define TK_NK_MINUS 13 -#define TK_NK_STAR 14 -#define TK_NK_SLASH 15 -#define TK_NK_REM 16 -#define TK_NK_CONCAT 17 -#define TK_CREATE 18 -#define TK_ACCOUNT 19 -#define TK_NK_ID 20 -#define TK_PASS 21 -#define TK_NK_STRING 22 -#define TK_ALTER 23 -#define TK_PPS 24 -#define TK_TSERIES 25 -#define TK_STORAGE 26 -#define TK_STREAMS 27 -#define TK_QTIME 28 -#define TK_DBS 29 -#define TK_USERS 30 -#define TK_CONNS 31 -#define TK_STATE 32 -#define TK_NK_COMMA 33 -#define TK_HOST 34 -#define TK_USER 35 -#define TK_ENABLE 36 -#define TK_NK_INTEGER 37 -#define TK_SYSINFO 38 -#define TK_ADD 39 -#define TK_DROP 40 -#define TK_GRANT 41 -#define TK_ON 42 -#define TK_TO 43 -#define TK_REVOKE 44 -#define TK_FROM 45 -#define TK_SUBSCRIBE 46 -#define TK_READ 47 -#define TK_WRITE 48 -#define TK_NK_DOT 49 -#define TK_WITH 50 -#define TK_DNODE 51 -#define TK_PORT 52 -#define TK_DNODES 53 -#define TK_RESTORE 54 -#define TK_NK_IPTOKEN 55 -#define TK_FORCE 56 -#define TK_UNSAFE 57 -#define TK_CLUSTER 58 -#define TK_LOCAL 59 -#define TK_QNODE 60 -#define TK_BNODE 61 -#define TK_SNODE 62 -#define TK_MNODE 63 -#define TK_VNODE 64 -#define TK_DATABASE 65 -#define TK_USE 66 -#define TK_FLUSH 67 -#define TK_TRIM 68 -#define TK_COMPACT 69 -#define TK_IF 70 -#define TK_NOT 71 -#define TK_EXISTS 72 -#define TK_BUFFER 73 -#define TK_CACHEMODEL 74 -#define TK_CACHESIZE 75 -#define TK_COMP 76 -#define TK_DURATION 77 -#define TK_NK_VARIABLE 78 -#define TK_MAXROWS 79 -#define TK_MINROWS 80 -#define TK_KEEP 81 -#define TK_PAGES 82 -#define TK_PAGESIZE 83 -#define TK_TSDB_PAGESIZE 84 -#define TK_PRECISION 85 -#define TK_REPLICA 86 -#define TK_VGROUPS 87 -#define TK_SINGLE_STABLE 88 -#define TK_RETENTIONS 89 -#define TK_SCHEMALESS 90 -#define TK_WAL_LEVEL 91 -#define TK_WAL_FSYNC_PERIOD 92 -#define TK_WAL_RETENTION_PERIOD 93 -#define TK_WAL_RETENTION_SIZE 94 -#define TK_WAL_ROLL_PERIOD 95 -#define TK_WAL_SEGMENT_SIZE 96 -#define TK_STT_TRIGGER 97 -#define TK_TABLE_PREFIX 98 -#define TK_TABLE_SUFFIX 99 -#define TK_KEEP_TIME_OFFSET 100 -#define TK_NK_COLON 101 -#define TK_BWLIMIT 102 -#define TK_START 103 -#define TK_TIMESTAMP 104 -#define TK_END 105 -#define TK_TABLE 106 -#define TK_NK_LP 107 -#define TK_NK_RP 108 -#define TK_STABLE 109 -#define TK_COLUMN 110 -#define TK_MODIFY 111 -#define TK_RENAME 112 -#define TK_TAG 113 -#define TK_SET 114 -#define TK_NK_EQ 115 -#define TK_USING 116 -#define TK_TAGS 117 -#define TK_BOOL 118 -#define TK_TINYINT 119 -#define TK_SMALLINT 120 -#define TK_INT 121 -#define TK_INTEGER 122 -#define TK_BIGINT 123 -#define TK_FLOAT 124 -#define TK_DOUBLE 125 -#define TK_BINARY 126 -#define TK_NCHAR 127 -#define TK_UNSIGNED 128 -#define TK_JSON 129 -#define TK_VARCHAR 130 -#define TK_MEDIUMBLOB 131 -#define TK_BLOB 132 -#define TK_VARBINARY 133 -#define TK_GEOMETRY 134 -#define TK_DECIMAL 135 -#define TK_COMMENT 136 -#define TK_MAX_DELAY 137 -#define TK_WATERMARK 138 -#define TK_ROLLUP 139 -#define TK_TTL 140 -#define TK_SMA 141 -#define TK_DELETE_MARK 142 -#define TK_FIRST 143 -#define TK_LAST 144 -#define TK_SHOW 145 -#define TK_PRIVILEGES 146 -#define TK_DATABASES 147 -#define TK_TABLES 148 -#define TK_STABLES 149 -#define TK_MNODES 150 -#define TK_QNODES 151 -#define TK_ARBGROUPS 152 -#define TK_FUNCTIONS 153 -#define TK_INDEXES 154 -#define TK_ACCOUNTS 155 -#define TK_APPS 156 -#define TK_CONNECTIONS 157 -#define TK_LICENCES 158 -#define TK_GRANTS 159 -#define TK_FULL 160 -#define TK_LOGS 161 -#define TK_MACHINES 162 -#define TK_QUERIES 163 -#define TK_SCORES 164 -#define TK_TOPICS 165 -#define TK_VARIABLES 166 -#define TK_BNODES 167 -#define TK_SNODES 168 -#define TK_TRANSACTIONS 169 -#define TK_DISTRIBUTED 170 -#define TK_CONSUMERS 171 -#define TK_SUBSCRIPTIONS 172 -#define TK_VNODES 173 -#define TK_ALIVE 174 -#define TK_VIEWS 175 -#define TK_VIEW 176 -#define TK_COMPACTS 177 -#define TK_NORMAL 178 -#define TK_CHILD 179 -#define TK_LIKE 180 -#define TK_TBNAME 181 -#define TK_QTAGS 182 -#define TK_AS 183 -#define TK_SYSTEM 184 -#define TK_INDEX 185 -#define TK_FUNCTION 186 -#define TK_INTERVAL 187 -#define TK_COUNT 188 -#define TK_LAST_ROW 189 -#define TK_META 190 -#define TK_ONLY 191 -#define TK_TOPIC 192 -#define TK_CONSUMER 193 -#define TK_GROUP 194 -#define TK_DESC 195 -#define TK_DESCRIBE 196 -#define TK_RESET 197 -#define TK_QUERY 198 -#define TK_CACHE 199 -#define TK_EXPLAIN 200 -#define TK_ANALYZE 201 -#define TK_VERBOSE 202 -#define TK_NK_BOOL 203 -#define TK_RATIO 204 -#define TK_NK_FLOAT 205 -#define TK_OUTPUTTYPE 206 -#define TK_AGGREGATE 207 -#define TK_BUFSIZE 208 -#define TK_LANGUAGE 209 -#define TK_REPLACE 210 -#define TK_STREAM 211 -#define TK_INTO 212 -#define TK_PAUSE 213 -#define TK_RESUME 214 -#define TK_TRIGGER 215 -#define TK_AT_ONCE 216 -#define TK_WINDOW_CLOSE 217 -#define TK_IGNORE 218 -#define TK_EXPIRED 219 -#define TK_FILL_HISTORY 220 -#define TK_UPDATE 221 -#define TK_SUBTABLE 222 -#define TK_UNTREATED 223 -#define TK_KILL 224 -#define TK_CONNECTION 225 -#define TK_TRANSACTION 226 -#define TK_BALANCE 227 -#define TK_VGROUP 228 -#define TK_LEADER 229 -#define TK_MERGE 230 -#define TK_REDISTRIBUTE 231 -#define TK_SPLIT 232 -#define TK_DELETE 233 -#define TK_INSERT 234 -#define TK_NK_BIN 235 -#define TK_NK_HEX 236 -#define TK_NULL 237 -#define TK_NK_QUESTION 238 -#define TK_NK_ALIAS 239 -#define TK_NK_ARROW 240 -#define TK_ROWTS 241 -#define TK_QSTART 242 -#define TK_QEND 243 -#define TK_QDURATION 244 -#define TK_WSTART 245 -#define TK_WEND 246 -#define TK_WDURATION 247 -#define TK_IROWTS 248 -#define TK_ISFILLED 249 -#define TK_CAST 250 -#define TK_NOW 251 -#define TK_TODAY 252 -#define TK_TIMEZONE 253 -#define TK_CLIENT_VERSION 254 -#define TK_SERVER_VERSION 255 -#define TK_SERVER_STATUS 256 -#define TK_CURRENT_USER 257 -#define TK_CASE 258 -#define TK_WHEN 259 -#define TK_THEN 260 -#define TK_ELSE 261 -#define TK_BETWEEN 262 -#define TK_IS 263 -#define TK_NK_LT 264 -#define TK_NK_GT 265 -#define TK_NK_LE 266 -#define TK_NK_GE 267 -#define TK_NK_NE 268 -#define TK_MATCH 269 -#define TK_NMATCH 270 -#define TK_CONTAINS 271 -#define TK_IN 272 -#define TK_JOIN 273 -#define TK_INNER 274 -#define TK_SELECT 275 -#define TK_NK_HINT 276 -#define TK_DISTINCT 277 -#define TK_WHERE 278 -#define TK_PARTITION 279 -#define TK_BY 280 -#define TK_SESSION 281 -#define TK_STATE_WINDOW 282 -#define TK_EVENT_WINDOW 283 -#define TK_COUNT_WINDOW 284 -#define TK_SLIDING 285 -#define TK_FILL 286 -#define TK_VALUE 287 -#define TK_VALUE_F 288 -#define TK_NONE 289 -#define TK_PREV 290 -#define TK_NULL_F 291 -#define TK_LINEAR 292 -#define TK_NEXT 293 -#define TK_HAVING 294 -#define TK_RANGE 295 -#define TK_EVERY 296 -#define TK_ORDER 297 -#define TK_SLIMIT 298 -#define TK_SOFFSET 299 -#define TK_LIMIT 300 -#define TK_OFFSET 301 -#define TK_ASC 302 -#define TK_NULLS 303 -#define TK_ABORT 304 -#define TK_AFTER 305 -#define TK_ATTACH 306 -#define TK_BEFORE 307 -#define TK_BEGIN 308 -#define TK_BITAND 309 -#define TK_BITNOT 310 -#define TK_BITOR 311 -#define TK_BLOCKS 312 -#define TK_CHANGE 313 -#define TK_COMMA 314 -#define TK_CONCAT 315 -#define TK_CONFLICT 316 -#define TK_COPY 317 -#define TK_DEFERRED 318 -#define TK_DELIMITERS 319 -#define TK_DETACH 320 -#define TK_DIVIDE 321 -#define TK_DOT 322 -#define TK_EACH 323 -#define TK_FAIL 324 -#define TK_FILE 325 -#define TK_FOR 326 -#define TK_GLOB 327 -#define TK_ID 328 -#define TK_IMMEDIATE 329 -#define TK_IMPORT 330 -#define TK_INITIALLY 331 -#define TK_INSTEAD 332 -#define TK_ISNULL 333 -#define TK_KEY 334 -#define TK_MODULES 335 -#define TK_NK_BITNOT 336 -#define TK_NK_SEMI 337 -#define TK_NOTNULL 338 -#define TK_OF 339 -#define TK_PLUS 340 -#define TK_PRIVILEGE 341 -#define TK_RAISE 342 -#define TK_RESTRICT 343 -#define TK_ROW 344 -#define TK_SEMI 345 -#define TK_STAR 346 -#define TK_STATEMENT 347 -#define TK_STRICT 348 -#define TK_STRING 349 -#define TK_TIMES 350 -#define TK_VALUES 351 -#define TK_VARIABLE 352 -#define TK_WAL 353 -#define TK_PRIMARY 354 -#define TK_ENCODE 355 -#define TK_COMPRESS 356 -#define TK_LEVEL 357 +#define TK_OR 1 +#define TK_AND 2 +#define TK_UNION 3 +#define TK_ALL 4 +#define TK_MINUS 5 +#define TK_EXCEPT 6 +#define TK_INTERSECT 7 +#define TK_NK_BITAND 8 +#define TK_NK_BITOR 9 +#define TK_NK_LSHIFT 10 +#define TK_NK_RSHIFT 11 +#define TK_NK_PLUS 12 +#define TK_NK_MINUS 13 +#define TK_NK_STAR 14 +#define TK_NK_SLASH 15 +#define TK_NK_REM 16 +#define TK_NK_CONCAT 17 +#define TK_CREATE 18 +#define TK_ACCOUNT 19 +#define TK_NK_ID 20 +#define TK_PASS 21 +#define TK_NK_STRING 22 +#define TK_ALTER 23 +#define TK_PPS 24 +#define TK_TSERIES 25 +#define TK_STORAGE 26 +#define TK_STREAMS 27 +#define TK_QTIME 28 +#define TK_DBS 29 +#define TK_USERS 30 +#define TK_CONNS 31 +#define TK_STATE 32 +#define TK_NK_COMMA 33 +#define TK_HOST 34 +#define TK_USER 35 +#define TK_ENABLE 36 +#define TK_NK_INTEGER 37 +#define TK_SYSINFO 38 +#define TK_ADD 39 +#define TK_DROP 40 +#define TK_GRANT 41 +#define TK_ON 42 +#define TK_TO 43 +#define TK_REVOKE 44 +#define TK_FROM 45 +#define TK_SUBSCRIBE 46 +#define TK_READ 47 +#define TK_WRITE 48 +#define TK_NK_DOT 49 +#define TK_WITH 50 +#define TK_DNODE 51 +#define TK_PORT 52 +#define TK_DNODES 53 +#define TK_RESTORE 54 +#define TK_NK_IPTOKEN 55 +#define TK_FORCE 56 +#define TK_UNSAFE 57 +#define TK_CLUSTER 58 +#define TK_LOCAL 59 +#define TK_QNODE 60 +#define TK_BNODE 61 +#define TK_SNODE 62 +#define TK_MNODE 63 +#define TK_VNODE 64 +#define TK_DATABASE 65 +#define TK_USE 66 +#define TK_FLUSH 67 +#define TK_TRIM 68 +#define TK_COMPACT 69 +#define TK_IF 70 +#define TK_NOT 71 +#define TK_EXISTS 72 +#define TK_BUFFER 73 +#define TK_CACHEMODEL 74 +#define TK_CACHESIZE 75 +#define TK_COMP 76 +#define TK_DURATION 77 +#define TK_NK_VARIABLE 78 +#define TK_MAXROWS 79 +#define TK_MINROWS 80 +#define TK_KEEP 81 +#define TK_PAGES 82 +#define TK_PAGESIZE 83 +#define TK_TSDB_PAGESIZE 84 +#define TK_PRECISION 85 +#define TK_REPLICA 86 +#define TK_VGROUPS 87 +#define TK_SINGLE_STABLE 88 +#define TK_RETENTIONS 89 +#define TK_SCHEMALESS 90 +#define TK_WAL_LEVEL 91 +#define TK_WAL_FSYNC_PERIOD 92 +#define TK_WAL_RETENTION_PERIOD 93 +#define TK_WAL_RETENTION_SIZE 94 +#define TK_WAL_ROLL_PERIOD 95 +#define TK_WAL_SEGMENT_SIZE 96 +#define TK_STT_TRIGGER 97 +#define TK_TABLE_PREFIX 98 +#define TK_TABLE_SUFFIX 99 +#define TK_KEEP_TIME_OFFSET 100 +#define TK_NK_COLON 101 +#define TK_BWLIMIT 102 +#define TK_START 103 +#define TK_TIMESTAMP 104 +#define TK_END 105 +#define TK_TABLE 106 +#define TK_NK_LP 107 +#define TK_NK_RP 108 +#define TK_STABLE 109 +#define TK_COLUMN 110 +#define TK_MODIFY 111 +#define TK_RENAME 112 +#define TK_TAG 113 +#define TK_SET 114 +#define TK_NK_EQ 115 +#define TK_USING 116 +#define TK_TAGS 117 +#define TK_BOOL 118 +#define TK_TINYINT 119 +#define TK_SMALLINT 120 +#define TK_INT 121 +#define TK_INTEGER 122 +#define TK_BIGINT 123 +#define TK_FLOAT 124 +#define TK_DOUBLE 125 +#define TK_BINARY 126 +#define TK_NCHAR 127 +#define TK_UNSIGNED 128 +#define TK_JSON 129 +#define TK_VARCHAR 130 +#define TK_MEDIUMBLOB 131 +#define TK_BLOB 132 +#define TK_VARBINARY 133 +#define TK_GEOMETRY 134 +#define TK_DECIMAL 135 +#define TK_COMMENT 136 +#define TK_MAX_DELAY 137 +#define TK_WATERMARK 138 +#define TK_ROLLUP 139 +#define TK_TTL 140 +#define TK_SMA 141 +#define TK_DELETE_MARK 142 +#define TK_FIRST 143 +#define TK_LAST 144 +#define TK_SHOW 145 +#define TK_PRIVILEGES 146 +#define TK_DATABASES 147 +#define TK_TABLES 148 +#define TK_STABLES 149 +#define TK_MNODES 150 +#define TK_QNODES 151 +#define TK_ARBGROUPS 152 +#define TK_FUNCTIONS 153 +#define TK_INDEXES 154 +#define TK_ACCOUNTS 155 +#define TK_APPS 156 +#define TK_CONNECTIONS 157 +#define TK_LICENCES 158 +#define TK_GRANTS 159 +#define TK_FULL 160 +#define TK_LOGS 161 +#define TK_MACHINES 162 +#define TK_QUERIES 163 +#define TK_SCORES 164 +#define TK_TOPICS 165 +#define TK_VARIABLES 166 +#define TK_BNODES 167 +#define TK_SNODES 168 +#define TK_TRANSACTIONS 169 +#define TK_DISTRIBUTED 170 +#define TK_CONSUMERS 171 +#define TK_SUBSCRIPTIONS 172 +#define TK_VNODES 173 +#define TK_ALIVE 174 +#define TK_VIEWS 175 +#define TK_VIEW 176 +#define TK_COMPACTS 177 +#define TK_NORMAL 178 +#define TK_CHILD 179 +#define TK_LIKE 180 +#define TK_TBNAME 181 +#define TK_QTAGS 182 +#define TK_AS 183 +#define TK_SYSTEM 184 +#define TK_INDEX 185 +#define TK_FUNCTION 186 +#define TK_INTERVAL 187 +#define TK_COUNT 188 +#define TK_LAST_ROW 189 +#define TK_META 190 +#define TK_ONLY 191 +#define TK_TOPIC 192 +#define TK_CONSUMER 193 +#define TK_GROUP 194 +#define TK_DESC 195 +#define TK_DESCRIBE 196 +#define TK_RESET 197 +#define TK_QUERY 198 +#define TK_CACHE 199 +#define TK_EXPLAIN 200 +#define TK_ANALYZE 201 +#define TK_VERBOSE 202 +#define TK_NK_BOOL 203 +#define TK_RATIO 204 +#define TK_NK_FLOAT 205 +#define TK_OUTPUTTYPE 206 +#define TK_AGGREGATE 207 +#define TK_BUFSIZE 208 +#define TK_LANGUAGE 209 +#define TK_REPLACE 210 +#define TK_STREAM 211 +#define TK_INTO 212 +#define TK_PAUSE 213 +#define TK_RESUME 214 +#define TK_TRIGGER 215 +#define TK_AT_ONCE 216 +#define TK_WINDOW_CLOSE 217 +#define TK_IGNORE 218 +#define TK_EXPIRED 219 +#define TK_FILL_HISTORY 220 +#define TK_UPDATE 221 +#define TK_SUBTABLE 222 +#define TK_UNTREATED 223 +#define TK_KILL 224 +#define TK_CONNECTION 225 +#define TK_TRANSACTION 226 +#define TK_BALANCE 227 +#define TK_VGROUP 228 +#define TK_LEADER 229 +#define TK_MERGE 230 +#define TK_REDISTRIBUTE 231 +#define TK_SPLIT 232 +#define TK_DELETE 233 +#define TK_INSERT 234 +#define TK_NK_BIN 235 +#define TK_NK_HEX 236 +#define TK_NULL 237 +#define TK_NK_QUESTION 238 +#define TK_NK_ALIAS 239 +#define TK_NK_ARROW 240 +#define TK_ROWTS 241 +#define TK_QSTART 242 +#define TK_QEND 243 +#define TK_QDURATION 244 +#define TK_WSTART 245 +#define TK_WEND 246 +#define TK_WDURATION 247 +#define TK_IROWTS 248 +#define TK_ISFILLED 249 +#define TK_CAST 250 +#define TK_NOW 251 +#define TK_TODAY 252 +#define TK_TIMEZONE 253 +#define TK_CLIENT_VERSION 254 +#define TK_SERVER_VERSION 255 +#define TK_SERVER_STATUS 256 +#define TK_CURRENT_USER 257 +#define TK_CASE 258 +#define TK_WHEN 259 +#define TK_THEN 260 +#define TK_ELSE 261 +#define TK_BETWEEN 262 +#define TK_IS 263 +#define TK_NK_LT 264 +#define TK_NK_GT 265 +#define TK_NK_LE 266 +#define TK_NK_GE 267 +#define TK_NK_NE 268 +#define TK_MATCH 269 +#define TK_NMATCH 270 +#define TK_CONTAINS 271 +#define TK_IN 272 +#define TK_JOIN 273 +#define TK_INNER 274 +#define TK_SELECT 275 +#define TK_NK_HINT 276 +#define TK_DISTINCT 277 +#define TK_WHERE 278 +#define TK_PARTITION 279 +#define TK_BY 280 +#define TK_SESSION 281 +#define TK_STATE_WINDOW 282 +#define TK_EVENT_WINDOW 283 +#define TK_COUNT_WINDOW 284 +#define TK_SLIDING 285 +#define TK_FILL 286 +#define TK_VALUE 287 +#define TK_VALUE_F 288 +#define TK_NONE 289 +#define TK_PREV 290 +#define TK_NULL_F 291 +#define TK_LINEAR 292 +#define TK_NEXT 293 +#define TK_HAVING 294 +#define TK_RANGE 295 +#define TK_EVERY 296 +#define TK_ORDER 297 +#define TK_SLIMIT 298 +#define TK_SOFFSET 299 +#define TK_LIMIT 300 +#define TK_OFFSET 301 +#define TK_ASC 302 +#define TK_NULLS 303 +#define TK_ABORT 304 +#define TK_AFTER 305 +#define TK_ATTACH 306 +#define TK_BEFORE 307 +#define TK_BEGIN 308 +#define TK_BITAND 309 +#define TK_BITNOT 310 +#define TK_BITOR 311 +#define TK_BLOCKS 312 +#define TK_CHANGE 313 +#define TK_COMMA 314 +#define TK_CONCAT 315 +#define TK_CONFLICT 316 +#define TK_COPY 317 +#define TK_DEFERRED 318 +#define TK_DELIMITERS 319 +#define TK_DETACH 320 +#define TK_DIVIDE 321 +#define TK_DOT 322 +#define TK_EACH 323 +#define TK_FAIL 324 +#define TK_FILE 325 +#define TK_FOR 326 +#define TK_GLOB 327 +#define TK_ID 328 +#define TK_IMMEDIATE 329 +#define TK_IMPORT 330 +#define TK_INITIALLY 331 +#define TK_INSTEAD 332 +#define TK_ISNULL 333 +#define TK_KEY 334 +#define TK_MODULES 335 +#define TK_NK_BITNOT 336 +#define TK_NK_SEMI 337 +#define TK_NOTNULL 338 +#define TK_OF 339 +#define TK_PLUS 340 +#define TK_PRIVILEGE 341 +#define TK_RAISE 342 +#define TK_RESTRICT 343 +#define TK_ROW 344 +#define TK_SEMI 345 +#define TK_STAR 346 +#define TK_STATEMENT 347 +#define TK_STRICT 348 +#define TK_STRING 349 +#define TK_TIMES 350 +#define TK_VALUES 351 +#define TK_VARIABLE 352 +#define TK_WAL 353 +#define TK_PRIMARY 354 +#define TK_ENCODE 355 +#define TK_COMPRESS 356 +#define TK_LEVEL 357 - -#define TK_NK_SPACE 600 -#define TK_NK_COMMENT 601 -#define TK_NK_ILLEGAL 602 +#define TK_NK_SPACE 600 +#define TK_NK_COMMENT 601 +#define TK_NK_ILLEGAL 602 // #define TK_NK_HEX 603 // hex number 0x123 -#define TK_NK_OCT 604 // oct number +#define TK_NK_OCT 604 // oct number // #define TK_NK_BIN 605 // bin format data 0b111 -#define TK_BATCH_SCAN 606 -#define TK_NO_BATCH_SCAN 607 -#define TK_SORT_FOR_GROUP 608 -#define TK_PARTITION_FIRST 609 +#define TK_BATCH_SCAN 606 +#define TK_NO_BATCH_SCAN 607 +#define TK_SORT_FOR_GROUP 608 +#define TK_PARTITION_FIRST 609 #define TK_PARA_TABLES_SORT 610 #define TK_SMALLDATA_TS_SORT 611 diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 1f0e4e550c..ebb5201fe3 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -1286,7 +1286,7 @@ int32_t tRowKeyCompare(const void *p1, const void *p2) { return 0; } -int32_t tRowKeyAssign(SRowKey *pDst, SRowKey* pSrc) { +int32_t tRowKeyAssign(SRowKey *pDst, SRowKey *pSrc) { pDst->ts = pSrc->ts; pDst->numOfPKs = pSrc->numOfPKs; @@ -4254,9 +4254,7 @@ int32_t tCompressData(void *input, // input extraSizeNeeded = (info->cmprAlg == NO_COMPRESSION) ? info->originalSize : info->originalSize + COMP_OVERFLOW_BYTES; ASSERT(outputSize >= extraSizeNeeded); - // DEFINE_VAR(info->cmprAlg) - if (info->cmprAlg == NO_COMPRESSION/* || (l1 == L1_UNKNOWN && l2 == L2_UNKNOWN) || - (l1 == L1_DISABLED && l2 == L2_DISABLED)*/) { + if (info->cmprAlg == NO_COMPRESSION) { memcpy(output, input, info->originalSize); info->compressedSize = info->originalSize; } else if (info->cmprAlg == ONE_STAGE_COMP || info->cmprAlg == TWO_STAGE_COMP) {