Merge branch 'feat/TS-4243-3.0' into enh/TD-28945-pk

include/common/tdataformat.h

@@ -126,7 +126,7 @@ int32_t tRowMerge(SArray *aRowP, STSchema *pTSchema, int8_t flag);
 int32_t tRowUpsertColData(SRow *pRow, STSchema *pTSchema, SColData *aColData, int32_t nColData, int32_t flag);
 void    tRowGetKey(SRow *pRow, SRowKey *key);
 int32_t tRowKeyCompare(const void *p1, const void *p2);
-int32_t tRowKeyAssign(SRowKey* pDst, SRowKey* pSrc);
+int32_t tRowKeyAssign(SRowKey *pDst, SRowKey *pSrc);
 
 // SRowIter ================================
 int32_t  tRowIterOpen(SRow *pRow, STSchema *pTSchema, SRowIter **ppIter);
@@ -174,6 +174,7 @@ int32_t tColDataUpdateValue(SColData *pColData, SColVal *pColVal, bool forward);
 void    tColDataGetValue(SColData *pColData, int32_t iVal, SColVal *pColVal);
 uint8_t tColDataGetBitValue(const SColData *pColData, int32_t iVal);
 int32_t tColDataCopy(SColData *pColDataFrom, SColData *pColData, xMallocFn xMalloc, void *arg);
+void    tColDataArrGetRowKey(SColData *aColData, int32_t nColData, int32_t iRow, SRowKey *key);
 
 extern void (*tColDataCalcSMA[])(SColData *pColData, int64_t *sum, int64_t *max, int64_t *min, int16_t *numOfNull);
 
@@ -188,8 +189,8 @@ void    tColDataSortMerge(SArray *colDataArr);
 int32_t tColDataAddValueByDataBlock(SColData *pColData, int8_t type, int32_t bytes, int32_t nRows, char *lengthOrbitmap,
                                     char *data);
 // for encode/decode
-int32_t tPutColData(uint8_t *pBuf, SColData *pColData);
-int32_t tGetColData(uint8_t *pBuf, SColData *pColData);
+int32_t tPutColData(uint8_t version, uint8_t *pBuf, SColData *pColData);
+int32_t tGetColData(uint8_t version, uint8_t *pBuf, SColData *pColData);
 
 // STRUCT ================================
 struct STColumn {

include/common/tmsg.h

@@ -4065,6 +4065,7 @@ int32_t tDeserializeSMqSeekReq(void* buf, int32_t bufLen, SMqSeekReq* pReq);
 #define SUBMIT_REQ_COLUMN_DATA_FORMAT 0x2
 #define SUBMIT_REQ_FROM_FILE          0x4
 #define TD_REQ_FROM_TAOX              0x8
+#define SUBMIT_REQUEST_VERSION        (1)
 
 #define TD_REQ_FROM_TAOX_OLD 0x1  // for compatibility
 

include/common/ttokendef.h

@@ -16,368 +16,369 @@
 #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_S3MIGRATE            69
-#define TK_COMPACT              70
-#define TK_IF                   71
-#define TK_NOT                  72
-#define TK_EXISTS               73
-#define TK_BUFFER               74
-#define TK_CACHEMODEL           75
-#define TK_CACHESIZE            76
-#define TK_COMP                 77
-#define TK_DURATION             78
-#define TK_NK_VARIABLE          79
-#define TK_MAXROWS              80
-#define TK_MINROWS              81
-#define TK_KEEP                 82
-#define TK_PAGES                83
-#define TK_PAGESIZE             84
-#define TK_TSDB_PAGESIZE        85
-#define TK_PRECISION            86
-#define TK_REPLICA              87
-#define TK_VGROUPS              88
-#define TK_SINGLE_STABLE        89
-#define TK_RETENTIONS           90
-#define TK_SCHEMALESS           91
-#define TK_WAL_LEVEL            92
-#define TK_WAL_FSYNC_PERIOD     93
-#define TK_WAL_RETENTION_PERIOD 94
-#define TK_WAL_RETENTION_SIZE   95
-#define TK_WAL_ROLL_PERIOD      96
-#define TK_WAL_SEGMENT_SIZE     97
-#define TK_STT_TRIGGER          98
-#define TK_TABLE_PREFIX         99
-#define TK_TABLE_SUFFIX         100
-#define TK_S3_CHUNKSIZE         101
-#define TK_S3_KEEPLOCAL         102
-#define TK_S3_COMPACT           103
-#define TK_KEEP_TIME_OFFSET     104
-#define TK_NK_COLON             105
-#define TK_BWLIMIT              106
-#define TK_START                107
-#define TK_TIMESTAMP            108
-#define TK_END                  109
-#define TK_TABLE                110
-#define TK_NK_LP                111
-#define TK_NK_RP                112
-#define TK_STABLE               113
-#define TK_COLUMN               114
-#define TK_MODIFY               115
-#define TK_RENAME               116
-#define TK_TAG                  117
-#define TK_SET                  118
-#define TK_NK_EQ                119
-#define TK_USING                120
-#define TK_TAGS                 121
-#define TK_PRIMARY              122
-#define TK_KEY                  123
-#define TK_BOOL                 124
-#define TK_TINYINT              125
-#define TK_SMALLINT             126
-#define TK_INT                  127
-#define TK_INTEGER              128
-#define TK_BIGINT               129
-#define TK_FLOAT                130
-#define TK_DOUBLE               131
-#define TK_BINARY               132
-#define TK_NCHAR                133
-#define TK_UNSIGNED             134
-#define TK_JSON                 135
-#define TK_VARCHAR              136
-#define TK_MEDIUMBLOB           137
-#define TK_BLOB                 138
-#define TK_VARBINARY            139
-#define TK_GEOMETRY             140
-#define TK_DECIMAL              141
-#define TK_COMMENT              142
-#define TK_MAX_DELAY            143
-#define TK_WATERMARK            144
-#define TK_ROLLUP               145
-#define TK_TTL                  146
-#define TK_SMA                  147
-#define TK_DELETE_MARK          148
-#define TK_FIRST                149
-#define TK_LAST                 150
-#define TK_SHOW                 151
-#define TK_PRIVILEGES           152
-#define TK_DATABASES            153
-#define TK_TABLES               154
-#define TK_STABLES              155
-#define TK_MNODES               156
-#define TK_QNODES               157
-#define TK_ARBGROUPS            158
-#define TK_FUNCTIONS            159
-#define TK_INDEXES              160
-#define TK_ACCOUNTS             161
-#define TK_APPS                 162
-#define TK_CONNECTIONS          163
-#define TK_LICENCES             164
-#define TK_GRANTS               165
-#define TK_FULL                 166
-#define TK_LOGS                 167
-#define TK_MACHINES             168
-#define TK_QUERIES              169
-#define TK_SCORES               170
-#define TK_TOPICS               171
-#define TK_VARIABLES            172
-#define TK_BNODES               173
-#define TK_SNODES               174
-#define TK_TRANSACTIONS         175
-#define TK_DISTRIBUTED          176
-#define TK_CONSUMERS            177
-#define TK_SUBSCRIPTIONS        178
-#define TK_VNODES               179
-#define TK_ALIVE                180
-#define TK_VIEWS                181
-#define TK_VIEW                 182
-#define TK_COMPACTS             183
-#define TK_NORMAL               184
-#define TK_CHILD                185
-#define TK_LIKE                 186
-#define TK_TBNAME               187
-#define TK_QTAGS                188
-#define TK_AS                   189
-#define TK_SYSTEM               190
-#define TK_INDEX                191
-#define TK_FUNCTION             192
-#define TK_INTERVAL             193
-#define TK_COUNT                194
-#define TK_LAST_ROW             195
-#define TK_META                 196
-#define TK_ONLY                 197
-#define TK_TOPIC                198
-#define TK_CONSUMER             199
-#define TK_GROUP                200
-#define TK_DESC                 201
-#define TK_DESCRIBE             202
-#define TK_RESET                203
-#define TK_QUERY                204
-#define TK_CACHE                205
-#define TK_EXPLAIN              206
-#define TK_ANALYZE              207
-#define TK_VERBOSE              208
-#define TK_NK_BOOL              209
-#define TK_RATIO                210
-#define TK_NK_FLOAT             211
-#define TK_OUTPUTTYPE           212
-#define TK_AGGREGATE            213
-#define TK_BUFSIZE              214
-#define TK_LANGUAGE             215
-#define TK_REPLACE              216
-#define TK_STREAM               217
-#define TK_INTO                 218
-#define TK_PAUSE                219
-#define TK_RESUME               220
-#define TK_TRIGGER              221
-#define TK_AT_ONCE              222
-#define TK_WINDOW_CLOSE         223
-#define TK_IGNORE               224
-#define TK_EXPIRED              225
-#define TK_FILL_HISTORY         226
-#define TK_UPDATE               227
-#define TK_SUBTABLE             228
-#define TK_UNTREATED            229
-#define TK_KILL                 230
-#define TK_CONNECTION           231
-#define TK_TRANSACTION          232
-#define TK_BALANCE              233
-#define TK_VGROUP               234
-#define TK_LEADER               235
-#define TK_MERGE                236
-#define TK_REDISTRIBUTE         237
-#define TK_SPLIT                238
-#define TK_DELETE               239
-#define TK_INSERT               240
-#define TK_NK_BIN               241
-#define TK_NK_HEX               242
-#define TK_NULL                 243
-#define TK_NK_QUESTION          244
-#define TK_NK_ALIAS             245
-#define TK_NK_ARROW             246
-#define TK_ROWTS                247
-#define TK_QSTART               248
-#define TK_QEND                 249
-#define TK_QDURATION            250
-#define TK_WSTART               251
-#define TK_WEND                 252
-#define TK_WDURATION            253
-#define TK_IROWTS               254
-#define TK_ISFILLED             255
-#define TK_CAST                 256
-#define TK_NOW                  257
-#define TK_TODAY                258
-#define TK_TIMEZONE             259
-#define TK_CLIENT_VERSION       260
-#define TK_SERVER_VERSION       261
-#define TK_SERVER_STATUS        262
-#define TK_CURRENT_USER         263
-#define TK_CASE                 264
-#define TK_WHEN                 265
-#define TK_THEN                 266
-#define TK_ELSE                 267
-#define TK_BETWEEN              268
-#define TK_IS                   269
-#define TK_NK_LT                270
-#define TK_NK_GT                271
-#define TK_NK_LE                272
-#define TK_NK_GE                273
-#define TK_NK_NE                274
-#define TK_MATCH                275
-#define TK_NMATCH               276
-#define TK_CONTAINS             277
-#define TK_IN                   278
-#define TK_JOIN                 279
-#define TK_INNER                280
-#define TK_SELECT               281
-#define TK_NK_HINT              282
-#define TK_DISTINCT             283
-#define TK_WHERE                284
-#define TK_PARTITION            285
-#define TK_BY                   286
-#define TK_SESSION              287
-#define TK_STATE_WINDOW         288
-#define TK_EVENT_WINDOW         289
-#define TK_COUNT_WINDOW         290
-#define TK_SLIDING              291
-#define TK_FILL                 292
-#define TK_VALUE                293
-#define TK_VALUE_F              294
-#define TK_NONE                 295
-#define TK_PREV                 296
-#define TK_NULL_F               297
-#define TK_LINEAR               298
-#define TK_NEXT                 299
-#define TK_HAVING               300
-#define TK_RANGE                301
-#define TK_EVERY                302
-#define TK_ORDER                303
-#define TK_SLIMIT               304
-#define TK_SOFFSET              305
-#define TK_LIMIT                306
-#define TK_OFFSET               307
-#define TK_ASC                  308
-#define TK_NULLS                309
-#define TK_ABORT                310
-#define TK_AFTER                311
-#define TK_ATTACH               312
-#define TK_BEFORE               313
-#define TK_BEGIN                314
-#define TK_BITAND               315
-#define TK_BITNOT               316
-#define TK_BITOR                317
-#define TK_BLOCKS               318
-#define TK_CHANGE               319
-#define TK_COMMA                320
-#define TK_CONCAT               321
-#define TK_CONFLICT             322
-#define TK_COPY                 323
-#define TK_DEFERRED             324
-#define TK_DELIMITERS           325
-#define TK_DETACH               326
-#define TK_DIVIDE               327
-#define TK_DOT                  328
-#define TK_EACH                 329
-#define TK_FAIL                 330
-#define TK_FILE                 331
-#define TK_FOR                  332
-#define TK_GLOB                 333
-#define TK_ID                   334
-#define TK_IMMEDIATE            335
-#define TK_IMPORT               336
-#define TK_INITIALLY            337
-#define TK_INSTEAD              338
-#define TK_ISNULL               339
-#define TK_MODULES              340
-#define TK_NK_BITNOT            341
-#define TK_NK_SEMI              342
-#define TK_NOTNULL              343
-#define TK_OF                   344
-#define TK_PLUS                 345
-#define TK_PRIVILEGE            346
-#define TK_RAISE                347
-#define TK_RESTRICT             348
-#define TK_ROW                  349
-#define TK_SEMI                 350
-#define TK_STAR                 351
-#define TK_STATEMENT            352
-#define TK_STRICT               353
-#define TK_STRING               354
-#define TK_TIMES                355
-#define TK_VALUES               356
-#define TK_VARIABLE             357
-#define TK_WAL                  358
+#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_S3MIGRATE                       69
+#define TK_COMPACT                         70
+#define TK_IF                              71
+#define TK_NOT                             72
+#define TK_EXISTS                          73
+#define TK_BUFFER                          74
+#define TK_CACHEMODEL                      75
+#define TK_CACHESIZE                       76
+#define TK_COMP                            77
+#define TK_DURATION                        78
+#define TK_NK_VARIABLE                     79
+#define TK_MAXROWS                         80
+#define TK_MINROWS                         81
+#define TK_KEEP                            82
+#define TK_PAGES                           83
+#define TK_PAGESIZE                        84
+#define TK_TSDB_PAGESIZE                   85
+#define TK_PRECISION                       86
+#define TK_REPLICA                         87
+#define TK_VGROUPS                         88
+#define TK_SINGLE_STABLE                   89
+#define TK_RETENTIONS                      90
+#define TK_SCHEMALESS                      91
+#define TK_WAL_LEVEL                       92
+#define TK_WAL_FSYNC_PERIOD                93
+#define TK_WAL_RETENTION_PERIOD            94
+#define TK_WAL_RETENTION_SIZE              95
+#define TK_WAL_ROLL_PERIOD                 96
+#define TK_WAL_SEGMENT_SIZE                97
+#define TK_STT_TRIGGER                     98
+#define TK_TABLE_PREFIX                    99
+#define TK_TABLE_SUFFIX                   100
+#define TK_S3_CHUNKSIZE                   101
+#define TK_S3_KEEPLOCAL                   102
+#define TK_S3_COMPACT                     103
+#define TK_KEEP_TIME_OFFSET               104
+#define TK_NK_COLON                       105
+#define TK_BWLIMIT                        106
+#define TK_START                          107
+#define TK_TIMESTAMP                      108
+#define TK_END                            109
+#define TK_TABLE                          110
+#define TK_NK_LP                          111
+#define TK_NK_RP                          112
+#define TK_STABLE                         113
+#define TK_COLUMN                         114
+#define TK_MODIFY                         115
+#define TK_RENAME                         116
+#define TK_TAG                            117
+#define TK_SET                            118
+#define TK_NK_EQ                          119
+#define TK_USING                          120
+#define TK_TAGS                           121
+#define TK_PRIMARY                        122
+#define TK_KEY                            123
+#define TK_BOOL                           124
+#define TK_TINYINT                        125
+#define TK_SMALLINT                       126
+#define TK_INT                            127
+#define TK_INTEGER                        128
+#define TK_BIGINT                         129
+#define TK_FLOAT                          130
+#define TK_DOUBLE                         131
+#define TK_BINARY                         132
+#define TK_NCHAR                          133
+#define TK_UNSIGNED                       134
+#define TK_JSON                           135
+#define TK_VARCHAR                        136
+#define TK_MEDIUMBLOB                     137
+#define TK_BLOB                           138
+#define TK_VARBINARY                      139
+#define TK_GEOMETRY                       140
+#define TK_DECIMAL                        141
+#define TK_COMMENT                        142
+#define TK_MAX_DELAY                      143
+#define TK_WATERMARK                      144
+#define TK_ROLLUP                         145
+#define TK_TTL                            146
+#define TK_SMA                            147
+#define TK_DELETE_MARK                    148
+#define TK_FIRST                          149
+#define TK_LAST                           150
+#define TK_SHOW                           151
+#define TK_PRIVILEGES                     152
+#define TK_DATABASES                      153
+#define TK_TABLES                         154
+#define TK_STABLES                        155
+#define TK_MNODES                         156
+#define TK_QNODES                         157
+#define TK_ARBGROUPS                      158
+#define TK_FUNCTIONS                      159
+#define TK_INDEXES                        160
+#define TK_ACCOUNTS                       161
+#define TK_APPS                           162
+#define TK_CONNECTIONS                    163
+#define TK_LICENCES                       164
+#define TK_GRANTS                         165
+#define TK_FULL                           166
+#define TK_LOGS                           167
+#define TK_MACHINES                       168
+#define TK_QUERIES                        169
+#define TK_SCORES                         170
+#define TK_TOPICS                         171
+#define TK_VARIABLES                      172
+#define TK_BNODES                         173
+#define TK_SNODES                         174
+#define TK_TRANSACTIONS                   175
+#define TK_DISTRIBUTED                    176
+#define TK_CONSUMERS                      177
+#define TK_SUBSCRIPTIONS                  178
+#define TK_VNODES                         179
+#define TK_ALIVE                          180
+#define TK_VIEWS                          181
+#define TK_VIEW                           182
+#define TK_COMPACTS                       183
+#define TK_NORMAL                         184
+#define TK_CHILD                          185
+#define TK_LIKE                           186
+#define TK_TBNAME                         187
+#define TK_QTAGS                          188
+#define TK_AS                             189
+#define TK_SYSTEM                         190
+#define TK_INDEX                          191
+#define TK_FUNCTION                       192
+#define TK_INTERVAL                       193
+#define TK_COUNT                          194
+#define TK_LAST_ROW                       195
+#define TK_META                           196
+#define TK_ONLY                           197
+#define TK_TOPIC                          198
+#define TK_CONSUMER                       199
+#define TK_GROUP                          200
+#define TK_DESC                           201
+#define TK_DESCRIBE                       202
+#define TK_RESET                          203
+#define TK_QUERY                          204
+#define TK_CACHE                          205
+#define TK_EXPLAIN                        206
+#define TK_ANALYZE                        207
+#define TK_VERBOSE                        208
+#define TK_NK_BOOL                        209
+#define TK_RATIO                          210
+#define TK_NK_FLOAT                       211
+#define TK_OUTPUTTYPE                     212
+#define TK_AGGREGATE                      213
+#define TK_BUFSIZE                        214
+#define TK_LANGUAGE                       215
+#define TK_REPLACE                        216
+#define TK_STREAM                         217
+#define TK_INTO                           218
+#define TK_PAUSE                          219
+#define TK_RESUME                         220
+#define TK_TRIGGER                        221
+#define TK_AT_ONCE                        222
+#define TK_WINDOW_CLOSE                   223
+#define TK_IGNORE                         224
+#define TK_EXPIRED                        225
+#define TK_FILL_HISTORY                   226
+#define TK_UPDATE                         227
+#define TK_SUBTABLE                       228
+#define TK_UNTREATED                      229
+#define TK_KILL                           230
+#define TK_CONNECTION                     231
+#define TK_TRANSACTION                    232
+#define TK_BALANCE                        233
+#define TK_VGROUP                         234
+#define TK_LEADER                         235
+#define TK_MERGE                          236
+#define TK_REDISTRIBUTE                   237
+#define TK_SPLIT                          238
+#define TK_DELETE                         239
+#define TK_INSERT                         240
+#define TK_NK_BIN                         241
+#define TK_NK_HEX                         242
+#define TK_NULL                           243
+#define TK_NK_QUESTION                    244
+#define TK_NK_ALIAS                       245
+#define TK_NK_ARROW                       246
+#define TK_ROWTS                          247
+#define TK_QSTART                         248
+#define TK_QEND                           249
+#define TK_QDURATION                      250
+#define TK_WSTART                         251
+#define TK_WEND                           252
+#define TK_WDURATION                      253
+#define TK_IROWTS                         254
+#define TK_ISFILLED                       255
+#define TK_CAST                           256
+#define TK_NOW                            257
+#define TK_TODAY                          258
+#define TK_TIMEZONE                       259
+#define TK_CLIENT_VERSION                 260
+#define TK_SERVER_VERSION                 261
+#define TK_SERVER_STATUS                  262
+#define TK_CURRENT_USER                   263
+#define TK_CASE                           264
+#define TK_WHEN                           265
+#define TK_THEN                           266
+#define TK_ELSE                           267
+#define TK_BETWEEN                        268
+#define TK_IS                             269
+#define TK_NK_LT                          270
+#define TK_NK_GT                          271
+#define TK_NK_LE                          272
+#define TK_NK_GE                          273
+#define TK_NK_NE                          274
+#define TK_MATCH                          275
+#define TK_NMATCH                         276
+#define TK_CONTAINS                       277
+#define TK_IN                             278
+#define TK_JOIN                           279
+#define TK_INNER                          280
+#define TK_SELECT                         281
+#define TK_NK_HINT                        282
+#define TK_DISTINCT                       283
+#define TK_WHERE                          284
+#define TK_PARTITION                      285
+#define TK_BY                             286
+#define TK_SESSION                        287
+#define TK_STATE_WINDOW                   288
+#define TK_EVENT_WINDOW                   289
+#define TK_COUNT_WINDOW                   290
+#define TK_SLIDING                        291
+#define TK_FILL                           292
+#define TK_VALUE                          293
+#define TK_VALUE_F                        294
+#define TK_NONE                           295
+#define TK_PREV                           296
+#define TK_NULL_F                         297
+#define TK_LINEAR                         298
+#define TK_NEXT                           299
+#define TK_HAVING                         300
+#define TK_RANGE                          301
+#define TK_EVERY                          302
+#define TK_ORDER                          303
+#define TK_SLIMIT                         304
+#define TK_SOFFSET                        305
+#define TK_LIMIT                          306
+#define TK_OFFSET                         307
+#define TK_ASC                            308
+#define TK_NULLS                          309
+#define TK_ABORT                          310
+#define TK_AFTER                          311
+#define TK_ATTACH                         312
+#define TK_BEFORE                         313
+#define TK_BEGIN                          314
+#define TK_BITAND                         315
+#define TK_BITNOT                         316
+#define TK_BITOR                          317
+#define TK_BLOCKS                         318
+#define TK_CHANGE                         319
+#define TK_COMMA                          320
+#define TK_CONCAT                         321
+#define TK_CONFLICT                       322
+#define TK_COPY                           323
+#define TK_DEFERRED                       324
+#define TK_DELIMITERS                     325
+#define TK_DETACH                         326
+#define TK_DIVIDE                         327
+#define TK_DOT                            328
+#define TK_EACH                           329
+#define TK_FAIL                           330
+#define TK_FILE                           331
+#define TK_FOR                            332
+#define TK_GLOB                           333
+#define TK_ID                             334
+#define TK_IMMEDIATE                      335
+#define TK_IMPORT                         336
+#define TK_INITIALLY                      337
+#define TK_INSTEAD                        338
+#define TK_ISNULL                         339
+#define TK_MODULES                        340
+#define TK_NK_BITNOT                      341
+#define TK_NK_SEMI                        342
+#define TK_NOTNULL                        343
+#define TK_OF                             344
+#define TK_PLUS                           345
+#define TK_PRIVILEGE                      346
+#define TK_RAISE                          347
+#define TK_RESTRICT                       348
+#define TK_ROW                            349
+#define TK_SEMI                           350
+#define TK_STAR                           351
+#define TK_STATEMENT                      352
+#define TK_STRICT                         353
+#define TK_STRING                         354
+#define TK_TIMES                          355
+#define TK_VALUES                         356
+#define TK_VARIABLE                       357
+#define TK_WAL                            358
 
-#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_BIN           605  // bin format data 0b111

source/common/src/tdataformat.c

@@ -3111,7 +3111,7 @@ static int32_t tColDataCopyRowAppend(SColData *aFromColData, int32_t iFromRow, S
   return code;
 }
 
-static FORCE_INLINE void tColDataArrGetRowKey(SColData *aColData, int32_t nColData, int32_t iRow, SRowKey *key) {
+void tColDataArrGetRowKey(SColData *aColData, int32_t nColData, int32_t iRow, SRowKey *key) {
   SColVal cv;
 
   key->ts = ((TSKEY *)aColData[0].pData)[iRow];
@@ -3490,7 +3490,7 @@ _exit:
   return;
 }
 
-int32_t tPutColData(uint8_t *pBuf, SColData *pColData) {
+static int32_t tPutColDataVersion0(uint8_t *pBuf, SColData *pColData) {
   int32_t n = 0;
 
   n += tPutI16v(pBuf ? pBuf + n : NULL, pColData->cid);
@@ -3532,7 +3532,7 @@ int32_t tPutColData(uint8_t *pBuf, SColData *pColData) {
   return n;
 }
 
-int32_t tGetColData(uint8_t *pBuf, SColData *pColData) {
+static int32_t tGetColDataVersion0(uint8_t *pBuf, SColData *pColData) {
   int32_t n = 0;
 
   n += tGetI16v(pBuf + n, &pColData->cid);
@@ -3571,10 +3571,45 @@ int32_t tGetColData(uint8_t *pBuf, SColData *pColData) {
       n += pColData->nData;
     }
   }
+  pColData->cflag = 0;
 
   return n;
 }
 
+static int32_t tPutColDataVersion1(uint8_t *pBuf, SColData *pColData) {
+  int32_t n = tPutColDataVersion0(pBuf, pColData);
+  n += tPutI8(pBuf ? pBuf + n : NULL, pColData->cflag);
+  return n;
+}
+
+static int32_t tGetColDataVersion1(uint8_t *pBuf, SColData *pColData) {
+  int32_t n = tGetColDataVersion0(pBuf, pColData);
+  n += tGetI8(pBuf ? pBuf + n : NULL, &pColData->cflag);
+  return n;
+}
+
+int32_t tPutColData(uint8_t version, uint8_t *pBuf, SColData *pColData) {
+  if (version == 0) {
+    return tPutColDataVersion0(pBuf, pColData);
+  } else if (version == 1) {
+    return tPutColDataVersion1(pBuf, pColData);
+  } else {
+    ASSERT(0);
+    return -1;
+  }
+}
+
+int32_t tGetColData(uint8_t version, uint8_t *pBuf, SColData *pColData) {
+  if (version == 0) {
+    return tGetColDataVersion0(pBuf, pColData);
+  } else if (version == 1) {
+    return tGetColDataVersion1(pBuf, pColData);
+  } else {
+    ASSERT(0);
+    return -1;
+  }
+}
+
 #define CALC_SUM_MAX_MIN(SUM, MAX, MIN, VAL) \
   do {                                       \
     (SUM) += (VAL);                          \

source/common/src/tmsg.c

@@ -9181,7 +9181,8 @@ int32_t tDecodeSBatchDeleteReqSetCtime(SDecoder *pDecoder, SBatchDeleteReq *pReq
 static int32_t tEncodeSSubmitTbData(SEncoder *pCoder, const SSubmitTbData *pSubmitTbData) {
   if (tStartEncode(pCoder) < 0) return -1;
 
-  if (tEncodeI32v(pCoder, pSubmitTbData->flags) < 0) return -1;
+  int32_t flags = pSubmitTbData->flags | ((SUBMIT_REQUEST_VERSION) << 8);
+  if (tEncodeI32v(pCoder, flags) < 0) return -1;
 
   // auto create table
   if (pSubmitTbData->flags & SUBMIT_REQ_AUTO_CREATE_TABLE) {
@@ -9201,7 +9202,8 @@ static int32_t tEncodeSSubmitTbData(SEncoder *pCoder, const SSubmitTbData *pSubm
     if (tEncodeU64v(pCoder, nColData) < 0) return -1;
 
     for (uint64_t i = 0; i < nColData; i++) {
-      pCoder->pos += tPutColData(pCoder->data ? pCoder->data + pCoder->pos : NULL, &aColData[i]);
+      pCoder->pos +=
+          tPutColData(SUBMIT_REQUEST_VERSION, pCoder->data ? pCoder->data + pCoder->pos : NULL, &aColData[i]);
     }
   } else {
     if (tEncodeU64v(pCoder, TARRAY_SIZE(pSubmitTbData->aRowP)) < 0) return -1;
@@ -9220,13 +9222,18 @@ static int32_t tEncodeSSubmitTbData(SEncoder *pCoder, const SSubmitTbData *pSubm
 
 static int32_t tDecodeSSubmitTbData(SDecoder *pCoder, SSubmitTbData *pSubmitTbData) {
   int32_t code = 0;
+  int32_t flags;
+  uint8_t version;
 
   if (tStartDecode(pCoder) < 0) {
     code = TSDB_CODE_INVALID_MSG;
     goto _exit;
   }
 
-  if (tDecodeI32v(pCoder, &pSubmitTbData->flags) < 0) return -1;
+  if (tDecodeI32v(pCoder, &flags) < 0) return -1;
+
+  pSubmitTbData->flags = flags & 0xff;
+  version = (flags >> 8) & 0xff;
 
   if (pSubmitTbData->flags & SUBMIT_REQ_AUTO_CREATE_TABLE) {
     pSubmitTbData->pCreateTbReq = taosMemoryCalloc(1, sizeof(SVCreateTbReq));
@@ -9270,7 +9277,7 @@ static int32_t tDecodeSSubmitTbData(SDecoder *pCoder, SSubmitTbData *pSubmitTbDa
     }
 
     for (int32_t i = 0; i < nColData; ++i) {
-      pCoder->pos += tGetColData(pCoder->data + pCoder->pos, taosArrayReserve(pSubmitTbData->aCol, 1));
+      pCoder->pos += tGetColData(version, pCoder->data + pCoder->pos, taosArrayReserve(pSubmitTbData->aCol, 1));
     }
   } else {
     uint64_t nRow;

source/dnode/vnode/src/vnd/vnodeSvr.c

@@ -241,10 +241,13 @@ static int32_t vnodePreProcessSubmitTbData(SVnode *pVnode, SDecoder *pCoder, int
   }
 
   SSubmitTbData submitTbData;
+  uint8_t       version;
   if (tDecodeI32v(pCoder, &submitTbData.flags) < 0) {
     code = TSDB_CODE_INVALID_MSG;
     TSDB_CHECK_CODE(code, lino, _exit);
   }
+  version = (submitTbData.flags >> 8) & 0xff;
+  submitTbData.flags = submitTbData.flags & 0xff;
 
   if (submitTbData.flags & SUBMIT_REQ_FROM_FILE) {
     code = grantCheck(TSDB_GRANT_CSV);
@@ -308,7 +311,7 @@ static int32_t vnodePreProcessSubmitTbData(SVnode *pVnode, SDecoder *pCoder, int
     }
 
     SColData colData = {0};
-    pCoder->pos += tGetColData(pCoder->data + pCoder->pos, &colData);
+    pCoder->pos += tGetColData(version, pCoder->data + pCoder->pos, &colData);
     if (colData.flag != HAS_VALUE) {
       code = TSDB_CODE_INVALID_MSG;
       goto _exit;
@@ -322,7 +325,7 @@ static int32_t vnodePreProcessSubmitTbData(SVnode *pVnode, SDecoder *pCoder, int
     }
 
     for (uint64_t i = 1; i < nColData; i++) {
-      pCoder->pos += tGetColData(pCoder->data + pCoder->pos, &colData);
+      pCoder->pos += tGetColData(version, pCoder->data + pCoder->pos, &colData);
     }
   } else {
     uint64_t nRow;
@@ -1596,17 +1599,18 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t ver, void *pReq, in
         goto _exit;
       }
 
-      SColData *pColData = (SColData *)taosArrayGet(pSubmitTbData->aCol, 0);
-      TSKEY    *aKey = (TSKEY *)(pColData->pData);
-
-      for (int32_t iRow = 0; iRow < pColData->nVal; iRow++) {
-        if (aKey[iRow] < minKey || aKey[iRow] > maxKey || (iRow > 0 && aKey[iRow] <= aKey[iRow - 1])) {
+      SColData *colDataArr = TARRAY_DATA(pSubmitTbData->aCol);
+      SRowKey   lastKey;
+      tColDataArrGetRowKey(colDataArr, TARRAY_SIZE(pSubmitTbData->aCol), 0, &lastKey);
+      for (int32_t iRow = 1; iRow < colDataArr[0].nVal; iRow++) {
+        SRowKey key;
+        tColDataArrGetRowKey(TARRAY_DATA(pSubmitTbData->aCol), TARRAY_SIZE(pSubmitTbData->aCol), iRow, &key);
+        if (tRowKeyCompare(&lastKey, &key) >= 0) {
           code = TSDB_CODE_INVALID_MSG;
           vError("vgId:%d %s failed since %s, version:%" PRId64, TD_VID(pVnode), __func__, tstrerror(terrno), ver);
           goto _exit;
         }
       }
-
     } else {
       int32_t nRow = TARRAY_SIZE(pSubmitTbData->aRowP);
       SRow  **aRow = (SRow **)TARRAY_DATA(pSubmitTbData->aRowP);

source/libs/function/src/builtins.c

@@ -2018,9 +2018,17 @@ static int32_t translateCast(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
   if (IS_STR_DATA_TYPE(para2Type)) {
     para2Bytes -= VARSTR_HEADER_SIZE;
   }
-  if (para2Bytes <= 0 || para2Bytes > 4096) {  // cast dst var type length limits to 4096 bytes
-    return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
-                           "CAST function converted length should be in range (0, 4096] bytes");
+  if (para2Bytes <= 0 ||
+      para2Bytes > TSDB_MAX_BINARY_LEN - VARSTR_HEADER_SIZE) {  // cast dst var type length limits to 4096 bytes
+    if (TSDB_DATA_TYPE_NCHAR == para2Type) {
+      return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+                             "CAST function converted length should be in range (0, %d] NCHARS",
+                             (TSDB_MAX_BINARY_LEN - VARSTR_HEADER_SIZE)/TSDB_NCHAR_SIZE);
+    } else {
+      return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+                             "CAST function converted length should be in range (0, %d] bytes",
+                             TSDB_MAX_BINARY_LEN - VARSTR_HEADER_SIZE);
+    }
   }
 
   // add database precision as param

source/libs/parser/inc/sql.y

@@ -424,6 +424,13 @@ type_name(A) ::= DECIMAL.
 type_name(A) ::= DECIMAL NK_LP NK_INTEGER NK_RP.                                  { A = createDataType(TSDB_DATA_TYPE_DECIMAL); }
 type_name(A) ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP.              { A = createDataType(TSDB_DATA_TYPE_DECIMAL); }
 
+%type type_name_default_len                                                       { SDataType }
+%destructor type_name_default_len                                                 { }
+type_name_default_len(A) ::= BINARY.                                              { A = createVarLenDataType(TSDB_DATA_TYPE_BINARY, NULL); }
+type_name_default_len(A) ::= NCHAR.                                               { A = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, NULL); }
+type_name_default_len(A) ::= VARCHAR.                                             { A = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, NULL); }
+type_name_default_len(A) ::= VARBINARY.                                           { A = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, NULL); }
+
 %type tags_def_opt                                                                { SNodeList* }
 %destructor tags_def_opt                                                          { nodesDestroyList($$); }
 tags_def_opt(A) ::= .                                                             { A = NULL; }
@@ -1130,6 +1137,9 @@ function_expression(A) ::= function_name(B) NK_LP expression_list(C) NK_RP(D).
 function_expression(A) ::= star_func(B) NK_LP star_func_para_list(C) NK_RP(D).    { A = createRawExprNodeExt(pCxt, &B, &D, createFunctionNode(pCxt, &B, C)); }
 function_expression(A) ::=
   CAST(B) NK_LP expr_or_subquery(C) AS type_name(D) NK_RP(E).                     { A = createRawExprNodeExt(pCxt, &B, &E, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, C), D)); }
+function_expression(A) ::=
+  CAST(B) NK_LP expr_or_subquery(C) AS type_name_default_len(D) NK_RP(E).         { A = createRawExprNodeExt(pCxt, &B, &E, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, C), D)); }
+
 function_expression(A) ::= literal_func(B).                                       { A = B; }
 
 literal_func(A) ::= noarg_func(B) NK_LP NK_RP(C).                                 { A = createRawExprNodeExt(pCxt, &B, &C, createFunctionNode(pCxt, &B, NULL)); }

source/libs/parser/src/parAstCreater.c

@@ -1632,7 +1632,10 @@ SDataType createDataType(uint8_t type) {
 }
 
 SDataType createVarLenDataType(uint8_t type, const SToken* pLen) {
-  SDataType dt = {.type = type, .precision = 0, .scale = 0, .bytes = taosStr2Int32(pLen->z, NULL, 10)};
+  int32_t len = TSDB_MAX_BINARY_LEN - VARSTR_HEADER_SIZE;
+  if (type == TSDB_DATA_TYPE_NCHAR) len /= TSDB_NCHAR_SIZE;
+  if(pLen) len = taosStr2Int32(pLen->z, NULL, 10);
+  SDataType dt = {.type = type, .precision = 0, .scale = 0, .bytes = len};
   return dt;
 }
 

source/libs/parser/src/parTranslater.c

@@ -8240,6 +8240,7 @@ static int32_t adjustOrderOfProjections(STranslateContext* pCxt, SNodeList** ppC
   }
 
   int32_t code = TSDB_CODE_SUCCESS;
+  bool    hasTsKey = false;
   bool    hasPrimaryKey = false;
   SNode*  pCol = NULL;
   SNode*  pProj = NULL;
@@ -8255,13 +8256,22 @@ static int32_t adjustOrderOfProjections(STranslateContext* pCxt, SNodeList** ppC
       break;
     }
     if (PRIMARYKEY_TIMESTAMP_COL_ID == pSchema->colId) {
+      hasTsKey = true;
+    }
+
+    if (pSchema->flags & COL_IS_KEY) {
       hasPrimaryKey = true;
     }
   }
 
-  if (TSDB_CODE_SUCCESS == code && !hasPrimaryKey) {
+  if (TSDB_CODE_SUCCESS == code && !hasTsKey) {
     code = generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_COLUMNS_NUM,
-                                   "primary timestamp column can not be null");
+                                   "Primary timestamp column  of dest table can not be null");
+  }
+
+  if (TSDB_CODE_SUCCESS == code && !hasPrimaryKey && hasPkInTable(pMeta)) {
+    code = generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_COLUMNS_NUM,
+                                   "Primary key column of dest table can not be null");
   }
 
   SNodeList* pNewProjections = NULL;

source/libs/transport/src/transComm.c

@@ -70,7 +70,7 @@ int32_t transDecompressMsg(char** msg, int32_t len) {
   char*          buf = taosMemoryCalloc(1, oriLen + sizeof(STransMsgHead));
   STransMsgHead* pNewHead = (STransMsgHead*)buf;
   int32_t        decompLen = LZ4_decompress_safe(pCont + sizeof(STransCompMsg), (char*)pNewHead->content,
-                                          len - sizeof(STransMsgHead) - sizeof(STransCompMsg), oriLen);
+                                                 len - sizeof(STransMsgHead) - sizeof(STransCompMsg), oriLen);
   memcpy((char*)pNewHead, (char*)pHead, sizeof(STransMsgHead));
 
   pNewHead->msgLen = htonl(oriLen + sizeof(STransMsgHead));
@@ -158,6 +158,10 @@ int transResetBuffer(SConnBuffer* connBuf) {
     p->left = -1;
     p->total = 0;
     p->len = 0;
+    if (p->cap > BUFFER_CAP) {
+      p->cap = BUFFER_CAP;
+      p->buf = taosMemoryRealloc(p->buf, p->cap);
+    }
   } else {
     ASSERTS(0, "invalid read from sock buf");
     return -1;

source/util/src/tlog.c

@@ -242,6 +242,7 @@ void taosCloseLog() {
     taosMemoryFreeClear(tsLogObj.logHandle->buffer);
     taosThreadMutexDestroy(&tsLogObj.logMutex);
     taosMemoryFreeClear(tsLogObj.logHandle);
+    tsLogObj.logHandle = NULL;
   }
 }
 
@@ -285,8 +286,11 @@ static void taosKeepOldLog(char *oldName) {
     taosRemoveOldFiles(tsLogDir, tsLogKeepDays);
   }
 }
-
-static void *taosThreadToOpenNewFile(void *param) {
+typedef struct {
+  TdFilePtr pOldFile;
+  char      keepName[LOG_FILE_NAME_LEN + 20];
+} OldFileKeeper;
+static OldFileKeeper *taosOpenNewFile() {
   char keepName[LOG_FILE_NAME_LEN + 20];
   sprintf(keepName, "%s.%d", tsLogObj.logName, tsLogObj.flag);
 
@@ -312,13 +316,26 @@ static void *taosThreadToOpenNewFile(void *param) {
   tsLogObj.logHandle->pFile = pFile;
   tsLogObj.lines = 0;
   tsLogObj.openInProgress = 0;
-  taosSsleep(20);
-  taosCloseLogByFd(pOldFile);
+  OldFileKeeper* oldFileKeeper = taosMemoryMalloc(sizeof(OldFileKeeper));
+  if (oldFileKeeper == NULL) {
+    uError("create old log keep info faild! mem is not enough.");
+    return NULL;
+  }
+  oldFileKeeper->pOldFile = pOldFile;
+  memcpy(oldFileKeeper->keepName, keepName, LOG_FILE_NAME_LEN + 20);
 
   uInfo("   new log file:%d is opened", tsLogObj.flag);
   uInfo("==================================");
-  taosKeepOldLog(keepName);
+  return oldFileKeeper;
+}
 
+static void *taosThreadToCloseOldFile(void* param) {
+  if(!param)  return NULL;
+  OldFileKeeper* oldFileKeeper = (OldFileKeeper*)param;
+  taosSsleep(20);
+  taosCloseLogByFd(oldFileKeeper->pOldFile);
+  taosKeepOldLog(oldFileKeeper->keepName);
+  taosMemoryFree(oldFileKeeper);
   return NULL;
 }
 
@@ -334,7 +351,8 @@ static int32_t taosOpenNewLogFile() {
     taosThreadAttrInit(&attr);
     taosThreadAttrSetDetachState(&attr, PTHREAD_CREATE_DETACHED);
 
-    taosThreadCreate(&thread, &attr, taosThreadToOpenNewFile, NULL);
+    OldFileKeeper* oldFileKeeper = taosOpenNewFile();
+    taosThreadCreate(&thread, &attr, taosThreadToCloseOldFile, oldFileKeeper);
     taosThreadAttrDestroy(&attr);
   }
 
@@ -347,10 +365,11 @@ void taosResetLog() {
   // force create a new log file
   tsLogObj.lines = tsNumOfLogLines + 10;
 
-  taosOpenNewLogFile();
-
-  uInfo("==================================");
-  uInfo("   reset log file ");
+  if (tsLogObj.logHandle) {
+    taosOpenNewLogFile();
+    uInfo("==================================");
+    uInfo("   reset log file ");
+  }
 }
 
 static bool taosCheckFileIsOpen(char *logFileName) {

tests/system-test/2-query/cast.py

@@ -80,6 +80,10 @@ class TDTestCase:
         for i in range(len(data_t1_c1)):
             tdSql.checkData( i, 0, str(data_t1_c1[i]) )
             
+        tdSql.query(f"select cast(c1 as binary) as b from {self.dbname}.t1")
+        for i in range(len(data_t1_c1)):
+            tdSql.checkData( i, 0, str(data_t1_c1[i]) )
+
         tdLog.printNoPrefix("==========step6: cast int to nchar, expect changes to str(int) ")
 
         tdSql.query(f"select cast(c1 as nchar(32)) as b from {self.dbname}.ct4")
@@ -131,6 +135,13 @@ class TDTestCase:
         for i in range(len(data_t1_c2)):
             tdSql.checkData( i, 0, str(data_t1_c2[i]) )
             
+        tdSql.query(f"select cast(c2 as binary) as b from {self.dbname}.ct4")
+        for i in range(len(data_ct4_c2)):
+            tdSql.checkData( i, 0, str(data_ct4_c2[i]) )
+        tdSql.query(f"select cast(c2 as binary) as b from {self.dbname}.t1")
+        for i in range(len(data_t1_c2)):
+            tdSql.checkData( i, 0, str(data_t1_c2[i]) )
+
         tdLog.printNoPrefix("==========step10: cast bigint to nchar, expect changes to str(int) ")
 
         tdSql.query(f"select cast(c2 as nchar(32)) as b from {self.dbname}.ct4")
@@ -185,6 +196,13 @@ class TDTestCase:
         for i in range(len(data_t1_c3)):
             tdSql.checkData( i, 0, str(data_t1_c3[i]) )
             
+        tdSql.query(f"select cast(c3 as binary) as b from {self.dbname}.ct4")
+        for i in range(len(data_ct4_c3)):
+            tdSql.checkData( i, 0, str(data_ct4_c3[i]) )
+        tdSql.query(f"select cast(c3 as binary) as b from {self.dbname}.t1")
+        for i in range(len(data_t1_c3)):
+            tdSql.checkData( i, 0, str(data_t1_c3[i]) )
+
         tdLog.printNoPrefix("==========step14: cast smallint to nchar, expect changes to str(int) ")
 
         tdSql.query(f"select cast(c3 as nchar(32)) as b from {self.dbname}.ct4")
@@ -236,6 +254,13 @@ class TDTestCase:
         for i in range(len(data_t1_c4)):
             tdSql.checkData( i, 0, str(data_t1_c4[i]) )
             
+        tdSql.query(f"select cast(c4 as binary) as b from {self.dbname}.ct4")
+        for i in range(len(data_ct4_c4)):
+            tdSql.checkData( i, 0, str(data_ct4_c4[i]) )
+        tdSql.query(f"select cast(c4 as binary) as b from {self.dbname}.t1")
+        for i in range(len(data_t1_c4)):
+            tdSql.checkData( i, 0, str(data_t1_c4[i]) )
+
         tdLog.printNoPrefix("==========step18: cast tinyint to nchar, expect changes to str(int) ")
 
         tdSql.query(f"select cast(c4 as nchar(32)) as b from {self.dbname}.ct4")
@@ -282,6 +307,12 @@ class TDTestCase:
         for i in range(len(data_ct4_c5)):
             tdSql.checkData( i, 0, str(data_ct4_c5[i]) )  if data_ct4_c5[i] is None else  tdSql.checkData( i, 0, f'{data_ct4_c5[i]:.6f}' )
         tdSql.query(f"select cast(c5 as binary(32)) as b from {self.dbname}.t1")
+        for i in range(len(data_t1_c5)):
+            tdSql.checkData( i, 0, str(data_t1_c5[i]) )  if data_t1_c5[i] is None else tdSql.checkData( i, 0, f'{data_t1_c5[i]:.6f}' )
+        tdSql.query(f"select cast(c5 as binary) as b from {self.dbname}.ct4")
+        for i in range(len(data_ct4_c5)):
+            tdSql.checkData( i, 0, str(data_ct4_c5[i]) )  if data_ct4_c5[i] is None else  tdSql.checkData( i, 0, f'{data_ct4_c5[i]:.6f}' )
+        tdSql.query(f"select cast(c5 as binary) as b from {self.dbname}.t1")
         for i in range(len(data_t1_c5)):
             tdSql.checkData( i, 0, str(data_t1_c5[i]) )  if data_t1_c5[i] is None else tdSql.checkData( i, 0, f'{data_t1_c5[i]:.6f}' )
 
@@ -290,6 +321,12 @@ class TDTestCase:
         for i in range(len(data_ct4_c5)):
             tdSql.checkData( i, 0, None )  if data_ct4_c5[i] is None else  tdSql.checkData( i, 0, f'{data_ct4_c5[i]:.6f}' )
         tdSql.query(f"select cast(c5 as nchar(32)) as b from {self.dbname}.t1")
+        for i in range(len(data_t1_c5)):
+            tdSql.checkData( i, 0, None )  if data_t1_c5[i] is None else tdSql.checkData( i, 0, f'{data_t1_c5[i]:.6f}' )
+        tdSql.query(f"select cast(c5 as nchar) as b from {self.dbname}.t1")
+        for i in range(len(data_t1_c5)):
+            tdSql.checkData( i, 0, None )  if data_t1_c5[i] is None else tdSql.checkData( i, 0, f'{data_t1_c5[i]:.6f}' )
+        tdSql.query(f"select cast(c5 as varchar) as b from {self.dbname}.t1")
         for i in range(len(data_t1_c5)):
             tdSql.checkData( i, 0, None )  if data_t1_c5[i] is None else tdSql.checkData( i, 0, f'{data_t1_c5[i]:.6f}' )
 
@@ -580,6 +617,10 @@ class TDTestCase:
         ( tdSql.checkData(i, 0, '12121.233231') for i in range(tdSql.queryRows) )
         tdSql.query(f"select cast(12121.23323131 + 'test~!@`#$%^&*(){'}'}{'{'}][;><.,' as binary(2)) as b from {self.dbname}.ct4")
         ( tdSql.checkData(i, 0, '12') for i in range(tdSql.queryRows) )
+        tdSql.query(f"select cast(12121.23323131 + 'test~!@`#$%^&*(){'}'}{'{'}][;><.,' as binary) as b from {self.dbname}.ct4")
+        ( tdSql.checkData(i, 0, '12121.233231') for i in range(tdSql.queryRows) )
+        tdSql.query(f"select cast(12121.23323131 + 'test~!@`#$%^&*(){'}'}{'{'}][;><.,' as binary) as b from {self.dbname}.ct4")
+        ( tdSql.checkData(i, 0, '12') for i in range(tdSql.queryRows) )
         tdSql.query(f"select cast(12121.23323131 + 'test~!@`#$%^&*(){'}'}{'{'}][;><.,' as nchar(16)) as b from {self.dbname}.ct4")
         ( tdSql.checkData(i, 0, '12121.233231') for i in range(tdSql.queryRows) )
         tdSql.query(f"select cast(12121.23323131 + 'test~!@`#$%^&*(){'}'}{'{'}][;><.,' as nchar(2)) as b from {self.dbname}.ct4")