Merge branch '3.0' into feature/tq

cmake/cmake.version

@@ -2,7 +2,7 @@
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "3.0.1.2")
+  SET(TD_VER_NUMBER "3.0.1.3")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

cmake/taostools_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG cf1df1c
+        GIT_TAG 70f5a1c
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

docs/en/05-get-started/01-docker.md

@@ -5,8 +5,8 @@ title: Quick Install on Docker
 
 This document describes how to install TDengine in a Docker container and perform queries and inserts.
 
+- The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com). 
 - To get started with TDengine in a non-containerized environment, see [Quick Install from Package](../../get-started/package).
-- For a fully managed solution, see the [TDengine Cloud documentation](/cloud/).
 - If you want to view the source code, build TDengine yourself, or contribute to the project, see the [TDengine GitHub repository](https://github.com/taosdata/TDengine).
 
 ## Run TDengine

docs/en/05-get-started/03-package.md

@@ -9,8 +9,8 @@ import PkgListV3 from "/components/PkgListV3";
 
 This document describes how to install TDengine on Linux and Windows and perform queries and inserts.
 
+- The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com). 
 - To get started with TDengine on Docker, see [Quick Install on Docker](../../get-started/docker).
-- For a fully managed solution, see the [TDengine Cloud documentation](/cloud/).
 - If you want to view the source code, build TDengine yourself, or contribute to the project, see the [TDengine GitHub repository](https://github.com/taosdata/TDengine).
 
 The full package of TDengine includes the TDengine Server (`taosd`), TDengine Client (`taosc`), taosAdapter for connecting with third-party systems and providing a RESTful interface, a command-line interface (CLI, taos), and some tools. Note that taosAdapter supports Linux only. In addition to connectors for multiple languages, TDengine also provides a [REST API](../../reference/rest-api) through [taosAdapter](../../reference/taosadapter).

docs/en/14-reference/02-rest-api/02-rest-api.mdx

@@ -123,7 +123,7 @@ where `TOKEN` is the string after Base64 encoding of `{username}:{password}`, e.
 
 ### HTTP body structure
 
-#### Successful Operation
+#### Successful Insert Operation
 
 Example:
 
@@ -143,7 +143,7 @@ Description:
 - rows: (`int`) Only returns `1`.
 - data: (`[][]any`) Returns the number of rows affected.
 
-#### Successful Query
+#### Successful Query Operation
 
 Example:
 

docs/en/14-reference/12-config/index.md

@@ -177,12 +177,21 @@ The parameters described in this document by the effect that they have on the sy
 ### maxNumOfDistinctRes
 
 | Attribute     | Description                                                                                                                                                                         |
-| -------- | -------------------------------- | --- |
+| -------- | -------------------------------- |
 | Applicable    | Server Only                                                                                                                                                                         |
 | Meaning       | The maximum number of distinct rows returned |
 | Value Range   | [100,000 - 100,000,000]                      |
 | Default Value | 100,000                                      |
 
+### keepColumnName
+
+| Attribute     | Description                             |
+| -------- | -------------------------------- |
+| Applicable | Client only                     |
+| Meaning     | When the Last, First, LastRow function is queried, whether the returned column name contains the function name. |
+| Value Range | 0 means including the function name, 1 means not including the function name.     |
+| Default Value   | 0                            |
+
 ## Locale Parameters
 
 ### timezone

docs/en/28-releases/01-tdengine.md

@@ -6,6 +6,10 @@ description: TDengine release history, Release Notes and download links.
 
 import Release from "/components/ReleaseV3";
 
+## 3.0.1.3
+
+<Release type="tdengine" version="3.0.1.3" />
+
 ## 3.0.1.2
 
 <Release type="tdengine" version="3.0.1.2" />

docs/en/28-releases/02-tools.md

@@ -6,6 +6,10 @@ description: taosTools release history, Release Notes, download links.
 
 import Release from "/components/ReleaseV3";
 
+## 2.2.3
+
+<Release type="tools" version="2.2.3" />
+
 ## 2.2.2
 
 <Release type="tools" version="2.2.2" />

docs/zh/08-connector/02-rest-api.mdx

@@ -125,7 +125,7 @@ curl -L -u username:password -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]
 
 ### HTTP body 结构
 
-#### 正确执行
+#### 正确执行插入
 
 样例：
 
@@ -145,7 +145,7 @@ curl -L -u username:password -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]
 - rows：（`int`）只返回 `1`。
 - data：（`[][]any`）返回受影响行数。
 
-#### 正确查询
+#### 正确执行查询
 
 样例：
 

docs/zh/14-reference/12-config/index.md

@@ -177,12 +177,21 @@ taos --dump-config
 ### maxNumOfDistinctRes
 
 | 属性     | 说明                             |
-| -------- | -------------------------------- | --- |
+| -------- | -------------------------------- |
 | 适用范围 | 仅服务端适用                     |
 | 含义     | 允许返回的 distinct 结果最大行数 |
 | 取值范围 | 默认值为 10 万，最大值 1 亿      |
 | 缺省值   | 10 万                            |
 
+### keepColumnName
+
+| 属性     | 说明                             |
+| -------- | -------------------------------- |
+| 适用范围 | 仅客户端适用                     |
+| 含义     | Last、First、LastRow 函数查询时，返回的列名是否包含函数名。 |
+| 取值范围 | 0 表示包含函数名，1 表示不包含函数名。      |
+| 缺省值   | 0                            |
+
 ## 区域相关
 
 ### timezone

docs/zh/28-releases/01-tdengine.md

@@ -6,6 +6,10 @@ description: TDengine 发布历史、Release Notes 及下载链接
 
 import Release from "/components/ReleaseV3";
 
+## 3.0.1.3
+
+<Release type="tdengine" version="3.0.1.3" />
+
 ## 3.0.1.2
 
 <Release type="tdengine" version="3.0.1.2" />

docs/zh/28-releases/02-tools.md

@@ -6,6 +6,10 @@ description: taosTools 的发布历史、Release Notes 和下载链接
 
 import Release from "/components/ReleaseV3";
 
+## 2.2.3
+
+<Release type="tools" version="2.2.3" />
+
 ## 2.2.2
 
 <Release type="tools" version="2.2.2" />

include/common/tdataformat.h

@@ -66,10 +66,18 @@ int32_t tGetValue(uint8_t *p, SValue *pValue, int8_t type);
 int     tValueCmprFn(const SValue *pValue1, const SValue *pValue2, int8_t type);
 
 // SColVal ================================
-#define COL_VAL_NONE(CID, TYPE)     ((SColVal){.cid = (CID), .type = (TYPE), .isNone = 1})
-#define COL_VAL_NULL(CID, TYPE)     ((SColVal){.cid = (CID), .type = (TYPE), .isNull = 1})
+#define CV_FLAG_VALUE ((int8_t)0x0)
+#define CV_FLAG_NONE  ((int8_t)0x1)
+#define CV_FLAG_NULL  ((int8_t)0x2)
+
+#define COL_VAL_NONE(CID, TYPE)     ((SColVal){.cid = (CID), .type = (TYPE), .flag = CV_FLAG_NONE})
+#define COL_VAL_NULL(CID, TYPE)     ((SColVal){.cid = (CID), .type = (TYPE), .flag = CV_FLAG_NULL})
 #define COL_VAL_VALUE(CID, TYPE, V) ((SColVal){.cid = (CID), .type = (TYPE), .value = (V)})
 
+#define COL_VAL_IS_NONE(CV)  ((CV)->flag == CV_FLAG_NONE)
+#define COL_VAL_IS_NULL(CV)  ((CV)->flag == CV_FLAG_NULL)
+#define COL_VAL_IS_VALUE(CV) ((CV)->flag == CV_FLAG_VALUE)
+
 // STSRow2 ================================
 #define TSROW_LEN(PROW, V)  tGetI32v((uint8_t *)(PROW)->data, (V) ? &(V) : NULL)
 #define TSROW_SVER(PROW, V) tGetI32v((PROW)->data + TSROW_LEN(PROW, NULL), (V) ? &(V) : NULL)
@@ -175,8 +183,7 @@ struct SValue {
 struct SColVal {
   int16_t cid;
   int8_t  type;
-  int8_t  isNone;
-  int8_t  isNull;
+  int8_t  flag;
   SValue  value;
 };
 

include/common/tglobal.h

@@ -98,6 +98,7 @@ extern int32_t tsQueryRsmaTolerance;
 extern bool    tsQueryPlannerTrace;
 extern int32_t tsQueryNodeChunkSize;
 extern bool    tsQueryUseNodeAllocator;
+extern bool    tsKeepColumnName;
 
 // client
 extern int32_t tsMinSlidingTime;

include/common/tmsg.h

@@ -55,11 +55,10 @@ extern int32_t tMsgDict[];
 
 #define TMSG_SEG_CODE(TYPE) (((TYPE)&0xff00) >> 8)
 #define TMSG_SEG_SEQ(TYPE)  ((TYPE)&0xff)
-#define TMSG_INFO(TYPE)                                                                                      \
-  ((TYPE) >= 0 && ((TYPE) < TDMT_DND_MAX_MSG || (TYPE) < TDMT_MND_MAX_MSG || (TYPE) < TDMT_VND_MAX_MSG ||    \
-                   (TYPE) < TDMT_SCH_MAX_MSG || (TYPE) < TDMT_STREAM_MAX_MSG || (TYPE) < TDMT_MON_MAX_MSG || \
-                   (TYPE) < TDMT_SYNC_MAX_MSG))                                                              \
-      ? tMsgInfo[tMsgDict[TMSG_SEG_CODE(TYPE)] + TMSG_SEG_SEQ(TYPE)]                                         \
+#define TMSG_INFO(TYPE)                                                                                                \
+  ((TYPE) < TDMT_DND_MAX_MSG || (TYPE) < TDMT_MND_MAX_MSG || (TYPE) < TDMT_VND_MAX_MSG || (TYPE) < TDMT_SCH_MAX_MSG || \
+   (TYPE) < TDMT_STREAM_MAX_MSG || (TYPE) < TDMT_MON_MAX_MSG || (TYPE) < TDMT_SYNC_MAX_MSG)                            \
+      ? tMsgInfo[tMsgDict[TMSG_SEG_CODE(TYPE)] + TMSG_SEG_SEQ(TYPE)]                                                   \
       : 0
 #define TMSG_INDEX(TYPE) (tMsgDict[TMSG_SEG_CODE(TYPE)] + TMSG_SEG_SEQ(TYPE))
 
@@ -866,7 +865,8 @@ int32_t tSerializeSDbCfgReq(void* buf, int32_t bufLen, SDbCfgReq* pReq);
 int32_t tDeserializeSDbCfgReq(void* buf, int32_t bufLen, SDbCfgReq* pReq);
 
 typedef struct {
-  char db[TSDB_DB_FNAME_LEN];
+  char    db[TSDB_DB_FNAME_LEN];
+  int32_t maxSpeed;
 } STrimDbReq;
 
 int32_t tSerializeSTrimDbReq(void* buf, int32_t bufLen, STrimDbReq* pReq);
@@ -1426,10 +1426,10 @@ typedef struct {
 
 typedef struct {
   SExplainRsp rsp;
-  uint64_t qId; 
-  uint64_t tId; 
-  int64_t rId; 
-  int32_t eId;
+  uint64_t    qId;
+  uint64_t    tId;
+  int64_t     rId;
+  int32_t     eId;
 } SExplainLocalRsp;
 
 typedef struct STableScanAnalyzeInfo {
@@ -1446,7 +1446,7 @@ typedef struct STableScanAnalyzeInfo {
 
 int32_t tSerializeSExplainRsp(void* buf, int32_t bufLen, SExplainRsp* pRsp);
 int32_t tDeserializeSExplainRsp(void* buf, int32_t bufLen, SExplainRsp* pRsp);
-void tFreeSExplainRsp(SExplainRsp *pRsp);
+void    tFreeSExplainRsp(SExplainRsp* pRsp);
 
 typedef struct {
   char    fqdn[TSDB_FQDN_LEN];  // end point, hostname:port
@@ -1729,6 +1729,8 @@ typedef struct {
   int64_t maxDelay;
   int64_t watermark;
   int8_t  igExpired;
+  int32_t numOfTags;
+  SArray* pTags;  // array of SField
 } SCMCreateStreamReq;
 
 typedef struct {

include/common/ttokendef.h

@@ -107,227 +107,230 @@
 #define TK_TABLE_PREFIX         89
 #define TK_TABLE_SUFFIX         90
 #define TK_NK_COLON             91
-#define TK_TABLE                92
-#define TK_NK_LP                93
-#define TK_NK_RP                94
-#define TK_STABLE               95
-#define TK_ADD                  96
-#define TK_COLUMN               97
-#define TK_MODIFY               98
-#define TK_RENAME               99
-#define TK_TAG                  100
-#define TK_SET                  101
-#define TK_NK_EQ                102
-#define TK_USING                103
-#define TK_TAGS                 104
-#define TK_COMMENT              105
-#define TK_BOOL                 106
-#define TK_TINYINT              107
-#define TK_SMALLINT             108
-#define TK_INT                  109
-#define TK_INTEGER              110
-#define TK_BIGINT               111
-#define TK_FLOAT                112
-#define TK_DOUBLE               113
-#define TK_BINARY               114
-#define TK_TIMESTAMP            115
-#define TK_NCHAR                116
-#define TK_UNSIGNED             117
-#define TK_JSON                 118
-#define TK_VARCHAR              119
-#define TK_MEDIUMBLOB           120
-#define TK_BLOB                 121
-#define TK_VARBINARY            122
-#define TK_DECIMAL              123
-#define TK_MAX_DELAY            124
-#define TK_WATERMARK            125
-#define TK_ROLLUP               126
-#define TK_TTL                  127
-#define TK_SMA                  128
-#define TK_FIRST                129
-#define TK_LAST                 130
-#define TK_SHOW                 131
-#define TK_DATABASES            132
-#define TK_TABLES               133
-#define TK_STABLES              134
-#define TK_MNODES               135
-#define TK_MODULES              136
-#define TK_QNODES               137
-#define TK_FUNCTIONS            138
-#define TK_INDEXES              139
-#define TK_ACCOUNTS             140
-#define TK_APPS                 141
-#define TK_CONNECTIONS          142
-#define TK_LICENCES             143
-#define TK_GRANTS               144
-#define TK_QUERIES              145
-#define TK_SCORES               146
-#define TK_TOPICS               147
-#define TK_VARIABLES            148
-#define TK_BNODES               149
-#define TK_SNODES               150
-#define TK_CLUSTER              151
-#define TK_TRANSACTIONS         152
-#define TK_DISTRIBUTED          153
-#define TK_CONSUMERS            154
-#define TK_SUBSCRIPTIONS        155
-#define TK_VNODES               156
-#define TK_LIKE                 157
-#define TK_INDEX                158
-#define TK_FUNCTION             159
-#define TK_INTERVAL             160
-#define TK_TOPIC                161
-#define TK_AS                   162
-#define TK_WITH                 163
-#define TK_META                 164
-#define TK_CONSUMER             165
-#define TK_GROUP                166
-#define TK_DESC                 167
-#define TK_DESCRIBE             168
-#define TK_RESET                169
-#define TK_QUERY                170
-#define TK_CACHE                171
-#define TK_EXPLAIN              172
-#define TK_ANALYZE              173
-#define TK_VERBOSE              174
-#define TK_NK_BOOL              175
-#define TK_RATIO                176
-#define TK_NK_FLOAT             177
-#define TK_OUTPUTTYPE           178
-#define TK_AGGREGATE            179
-#define TK_BUFSIZE              180
-#define TK_STREAM               181
-#define TK_INTO                 182
-#define TK_TRIGGER              183
-#define TK_AT_ONCE              184
-#define TK_WINDOW_CLOSE         185
-#define TK_IGNORE               186
-#define TK_EXPIRED              187
-#define TK_KILL                 188
-#define TK_CONNECTION           189
-#define TK_TRANSACTION          190
-#define TK_BALANCE              191
-#define TK_VGROUP               192
-#define TK_MERGE                193
-#define TK_REDISTRIBUTE         194
-#define TK_SPLIT                195
-#define TK_DELETE               196
-#define TK_INSERT               197
-#define TK_NULL                 198
-#define TK_NK_QUESTION          199
-#define TK_NK_ARROW             200
-#define TK_ROWTS                201
-#define TK_TBNAME               202
-#define TK_QSTART               203
-#define TK_QEND                 204
-#define TK_QDURATION            205
-#define TK_WSTART               206
-#define TK_WEND                 207
-#define TK_WDURATION            208
-#define TK_CAST                 209
-#define TK_NOW                  210
-#define TK_TODAY                211
-#define TK_TIMEZONE             212
-#define TK_CLIENT_VERSION       213
-#define TK_SERVER_VERSION       214
-#define TK_SERVER_STATUS        215
-#define TK_CURRENT_USER         216
-#define TK_COUNT                217
-#define TK_LAST_ROW             218
-#define TK_CASE                 219
-#define TK_END                  220
-#define TK_WHEN                 221
-#define TK_THEN                 222
-#define TK_ELSE                 223
-#define TK_BETWEEN              224
-#define TK_IS                   225
-#define TK_NK_LT                226
-#define TK_NK_GT                227
-#define TK_NK_LE                228
-#define TK_NK_GE                229
-#define TK_NK_NE                230
-#define TK_MATCH                231
-#define TK_NMATCH               232
-#define TK_CONTAINS             233
-#define TK_IN                   234
-#define TK_JOIN                 235
-#define TK_INNER                236
-#define TK_SELECT               237
-#define TK_DISTINCT             238
-#define TK_WHERE                239
-#define TK_PARTITION            240
-#define TK_BY                   241
-#define TK_SESSION              242
-#define TK_STATE_WINDOW         243
-#define TK_SLIDING              244
-#define TK_FILL                 245
-#define TK_VALUE                246
-#define TK_NONE                 247
-#define TK_PREV                 248
-#define TK_LINEAR               249
-#define TK_NEXT                 250
-#define TK_HAVING               251
-#define TK_RANGE                252
-#define TK_EVERY                253
-#define TK_ORDER                254
-#define TK_SLIMIT               255
-#define TK_SOFFSET              256
-#define TK_LIMIT                257
-#define TK_OFFSET               258
-#define TK_ASC                  259
-#define TK_NULLS                260
-#define TK_ABORT                261
-#define TK_AFTER                262
-#define TK_ATTACH               263
-#define TK_BEFORE               264
-#define TK_BEGIN                265
-#define TK_BITAND               266
-#define TK_BITNOT               267
-#define TK_BITOR                268
-#define TK_BLOCKS               269
-#define TK_CHANGE               270
-#define TK_COMMA                271
-#define TK_COMPACT              272
-#define TK_CONCAT               273
-#define TK_CONFLICT             274
-#define TK_COPY                 275
-#define TK_DEFERRED             276
-#define TK_DELIMITERS           277
-#define TK_DETACH               278
-#define TK_DIVIDE               279
-#define TK_DOT                  280
-#define TK_EACH                 281
-#define TK_FAIL                 282
-#define TK_FILE                 283
-#define TK_FOR                  284
-#define TK_GLOB                 285
-#define TK_ID                   286
-#define TK_IMMEDIATE            287
-#define TK_IMPORT               288
-#define TK_INITIALLY            289
-#define TK_INSTEAD              290
-#define TK_ISNULL               291
-#define TK_KEY                  292
-#define TK_NK_BITNOT            293
-#define TK_NK_SEMI              294
-#define TK_NOTNULL              295
-#define TK_OF                   296
-#define TK_PLUS                 297
-#define TK_PRIVILEGE            298
-#define TK_RAISE                299
-#define TK_REPLACE              300
-#define TK_RESTRICT             301
-#define TK_ROW                  302
-#define TK_SEMI                 303
-#define TK_STAR                 304
-#define TK_STATEMENT            305
-#define TK_STRING               306
-#define TK_TIMES                307
-#define TK_UPDATE               308
-#define TK_VALUES               309
-#define TK_VARIABLE             310
-#define TK_VIEW                 311
-#define TK_WAL                  312
+#define TK_MAX_SPEED            92
+#define TK_TABLE                93
+#define TK_NK_LP                94
+#define TK_NK_RP                95
+#define TK_STABLE               96
+#define TK_ADD                  97
+#define TK_COLUMN               98
+#define TK_MODIFY               99
+#define TK_RENAME               100
+#define TK_TAG                  101
+#define TK_SET                  102
+#define TK_NK_EQ                103
+#define TK_USING                104
+#define TK_TAGS                 105
+#define TK_COMMENT              106
+#define TK_BOOL                 107
+#define TK_TINYINT              108
+#define TK_SMALLINT             109
+#define TK_INT                  110
+#define TK_INTEGER              111
+#define TK_BIGINT               112
+#define TK_FLOAT                113
+#define TK_DOUBLE               114
+#define TK_BINARY               115
+#define TK_TIMESTAMP            116
+#define TK_NCHAR                117
+#define TK_UNSIGNED             118
+#define TK_JSON                 119
+#define TK_VARCHAR              120
+#define TK_MEDIUMBLOB           121
+#define TK_BLOB                 122
+#define TK_VARBINARY            123
+#define TK_DECIMAL              124
+#define TK_MAX_DELAY            125
+#define TK_WATERMARK            126
+#define TK_ROLLUP               127
+#define TK_TTL                  128
+#define TK_SMA                  129
+#define TK_FIRST                130
+#define TK_LAST                 131
+#define TK_SHOW                 132
+#define TK_DATABASES            133
+#define TK_TABLES               134
+#define TK_STABLES              135
+#define TK_MNODES               136
+#define TK_MODULES              137
+#define TK_QNODES               138
+#define TK_FUNCTIONS            139
+#define TK_INDEXES              140
+#define TK_ACCOUNTS             141
+#define TK_APPS                 142
+#define TK_CONNECTIONS          143
+#define TK_LICENCES             144
+#define TK_GRANTS               145
+#define TK_QUERIES              146
+#define TK_SCORES               147
+#define TK_TOPICS               148
+#define TK_VARIABLES            149
+#define TK_BNODES               150
+#define TK_SNODES               151
+#define TK_CLUSTER              152
+#define TK_TRANSACTIONS         153
+#define TK_DISTRIBUTED          154
+#define TK_CONSUMERS            155
+#define TK_SUBSCRIPTIONS        156
+#define TK_VNODES               157
+#define TK_LIKE                 158
+#define TK_INDEX                159
+#define TK_FUNCTION             160
+#define TK_INTERVAL             161
+#define TK_TOPIC                162
+#define TK_AS                   163
+#define TK_WITH                 164
+#define TK_META                 165
+#define TK_CONSUMER             166
+#define TK_GROUP                167
+#define TK_DESC                 168
+#define TK_DESCRIBE             169
+#define TK_RESET                170
+#define TK_QUERY                171
+#define TK_CACHE                172
+#define TK_EXPLAIN              173
+#define TK_ANALYZE              174
+#define TK_VERBOSE              175
+#define TK_NK_BOOL              176
+#define TK_RATIO                177
+#define TK_NK_FLOAT             178
+#define TK_OUTPUTTYPE           179
+#define TK_AGGREGATE            180
+#define TK_BUFSIZE              181
+#define TK_STREAM               182
+#define TK_INTO                 183
+#define TK_TRIGGER              184
+#define TK_AT_ONCE              185
+#define TK_WINDOW_CLOSE         186
+#define TK_IGNORE               187
+#define TK_EXPIRED              188
+#define TK_SUBTABLE             189
+#define TK_KILL                 190
+#define TK_CONNECTION           191
+#define TK_TRANSACTION          192
+#define TK_BALANCE              193
+#define TK_VGROUP               194
+#define TK_MERGE                195
+#define TK_REDISTRIBUTE         196
+#define TK_SPLIT                197
+#define TK_DELETE               198
+#define TK_INSERT               199
+#define TK_NULL                 200
+#define TK_NK_QUESTION          201
+#define TK_NK_ARROW             202
+#define TK_ROWTS                203
+#define TK_TBNAME               204
+#define TK_QSTART               205
+#define TK_QEND                 206
+#define TK_QDURATION            207
+#define TK_WSTART               208
+#define TK_WEND                 209
+#define TK_WDURATION            210
+#define TK_IROWTS               211
+#define TK_CAST                 212
+#define TK_NOW                  213
+#define TK_TODAY                214
+#define TK_TIMEZONE             215
+#define TK_CLIENT_VERSION       216
+#define TK_SERVER_VERSION       217
+#define TK_SERVER_STATUS        218
+#define TK_CURRENT_USER         219
+#define TK_COUNT                220
+#define TK_LAST_ROW             221
+#define TK_CASE                 222
+#define TK_END                  223
+#define TK_WHEN                 224
+#define TK_THEN                 225
+#define TK_ELSE                 226
+#define TK_BETWEEN              227
+#define TK_IS                   228
+#define TK_NK_LT                229
+#define TK_NK_GT                230
+#define TK_NK_LE                231
+#define TK_NK_GE                232
+#define TK_NK_NE                233
+#define TK_MATCH                234
+#define TK_NMATCH               235
+#define TK_CONTAINS             236
+#define TK_IN                   237
+#define TK_JOIN                 238
+#define TK_INNER                239
+#define TK_SELECT               240
+#define TK_DISTINCT             241
+#define TK_WHERE                242
+#define TK_PARTITION            243
+#define TK_BY                   244
+#define TK_SESSION              245
+#define TK_STATE_WINDOW         246
+#define TK_SLIDING              247
+#define TK_FILL                 248
+#define TK_VALUE                249
+#define TK_NONE                 250
+#define TK_PREV                 251
+#define TK_LINEAR               252
+#define TK_NEXT                 253
+#define TK_HAVING               254
+#define TK_RANGE                255
+#define TK_EVERY                256
+#define TK_ORDER                257
+#define TK_SLIMIT               258
+#define TK_SOFFSET              259
+#define TK_LIMIT                260
+#define TK_OFFSET               261
+#define TK_ASC                  262
+#define TK_NULLS                263
+#define TK_ABORT                264
+#define TK_AFTER                265
+#define TK_ATTACH               266
+#define TK_BEFORE               267
+#define TK_BEGIN                268
+#define TK_BITAND               269
+#define TK_BITNOT               270
+#define TK_BITOR                271
+#define TK_BLOCKS               272
+#define TK_CHANGE               273
+#define TK_COMMA                274
+#define TK_COMPACT              275
+#define TK_CONCAT               276
+#define TK_CONFLICT             277
+#define TK_COPY                 278
+#define TK_DEFERRED             279
+#define TK_DELIMITERS           280
+#define TK_DETACH               281
+#define TK_DIVIDE               282
+#define TK_DOT                  283
+#define TK_EACH                 284
+#define TK_FAIL                 285
+#define TK_FILE                 286
+#define TK_FOR                  287
+#define TK_GLOB                 288
+#define TK_ID                   289
+#define TK_IMMEDIATE            290
+#define TK_IMPORT               291
+#define TK_INITIALLY            292
+#define TK_INSTEAD              293
+#define TK_ISNULL               294
+#define TK_KEY                  295
+#define TK_NK_BITNOT            296
+#define TK_NK_SEMI              297
+#define TK_NOTNULL              298
+#define TK_OF                   299
+#define TK_PLUS                 300
+#define TK_PRIVILEGE            301
+#define TK_RAISE                302
+#define TK_REPLACE              303
+#define TK_RESTRICT             304
+#define TK_ROW                  305
+#define TK_SEMI                 306
+#define TK_STAR                 307
+#define TK_STATEMENT            308
+#define TK_STRING               309
+#define TK_TIMES                310
+#define TK_UPDATE               311
+#define TK_VALUES               312
+#define TK_VARIABLE             313
+#define TK_VIEW                 314
+#define TK_WAL                  315
 
 #define TK_NK_SPACE   300
 #define TK_NK_COMMENT 301

include/dnode/mnode/mnode.h

@@ -106,6 +106,8 @@ void    mndPostProcessQueryMsg(SRpcMsg *pMsg);
  */
 void mndGenerateMachineCode();
 
+void mndDumpSdb();
+
 #ifdef __cplusplus
 }
 #endif

include/libs/function/functionMgt.h

@@ -119,9 +119,10 @@ typedef enum EFunctionType {
   FUNCTION_TYPE_WSTART,
   FUNCTION_TYPE_WEND,
   FUNCTION_TYPE_WDURATION,
+  FUNCTION_TYPE_IROWTS,
 
   // internal function
-  FUNCTION_TYPE_SELECT_VALUE,
+  FUNCTION_TYPE_SELECT_VALUE = 3750,
   FUNCTION_TYPE_BLOCK_DIST,       // block distribution aggregate function
   FUNCTION_TYPE_BLOCK_DIST_INFO,  // block distribution pseudo column function
   FUNCTION_TYPE_TO_COLUMN,
@@ -212,6 +213,7 @@ bool fmIsClientPseudoColumnFunc(int32_t funcId);
 bool fmIsMultiRowsFunc(int32_t funcId);
 bool fmIsKeepOrderFunc(int32_t funcId);
 bool fmIsCumulativeFunc(int32_t funcId);
+bool fmIsInterpPseudoColumnFunc(int32_t funcId);
 
 int32_t fmGetDistMethod(const SFunctionNode* pFunc, SFunctionNode** pPartialFunc, SFunctionNode** pMergeFunc);
 

include/libs/nodes/cmdnodes.h

@@ -119,6 +119,7 @@ typedef struct SFlushDatabaseStmt {
 typedef struct STrimDatabaseStmt {
   ENodeType type;
   char      dbName[TSDB_DB_NAME_LEN];
+  int32_t   maxSpeed;
 } STrimDatabaseStmt;
 
 typedef struct STableOptions {
@@ -383,6 +384,8 @@ typedef struct SCreateStreamStmt {
   bool            ignoreExists;
   SStreamOptions* pOptions;
   SNode*          pQuery;
+  SNodeList*      pTags;
+  SNode*          pSubtable;
 } SCreateStreamStmt;
 
 typedef struct SDropStreamStmt {

include/libs/nodes/nodes.h

@@ -27,9 +27,9 @@ extern "C" {
 
 #define LIST_LENGTH(l) (NULL != (l) ? (l)->length : 0)
 
-#define FOREACH(node, list)                                       \
-  for (SListCell* cell = (NULL != (list) ? (list)->pHead : NULL); \
-       (NULL != cell ? (node = cell->pNode, true) : (node = NULL, false)); cell = cell->pNext)
+#define FOREACH(node, list)                                               \
+  for (SListCell *cell = (NULL != (list) ? (list)->pHead : NULL), *pNext; \
+       (NULL != cell ? (node = cell->pNode, pNext = cell->pNext, true) : (node = NULL, pNext = NULL, false)); cell = pNext)
 
 #define REPLACE_NODE(newNode) cell->pNode = (SNode*)(newNode)
 
@@ -239,6 +239,7 @@ typedef enum ENodeType {
   QUERY_NODE_PHYSICAL_PLAN_STREAM_FINAL_INTERVAL,
   QUERY_NODE_PHYSICAL_PLAN_STREAM_SEMI_INTERVAL,
   QUERY_NODE_PHYSICAL_PLAN_FILL,
+  QUERY_NODE_PHYSICAL_PLAN_STREAM_FILL,
   QUERY_NODE_PHYSICAL_PLAN_MERGE_SESSION,
   QUERY_NODE_PHYSICAL_PLAN_STREAM_SESSION,
   QUERY_NODE_PHYSICAL_PLAN_STREAM_SEMI_SESSION,

include/libs/nodes/plannodes.h

@@ -94,6 +94,8 @@ typedef struct SScanLogicNode {
   SArray*       pSmaIndexes;
   SNodeList*    pGroupTags;
   bool          groupSort;
+  SNodeList*    pTags;      // for create stream
+  SNode*        pSubtable;  // for create stream
   int8_t        cacheLastMode;
   bool          hasNormalCols;  // neither tag column nor primary key tag column
   bool          sortPrimaryKey;
@@ -233,6 +235,8 @@ typedef struct SSortLogicNode {
 typedef struct SPartitionLogicNode {
   SLogicNode node;
   SNodeList* pPartitionKeys;
+  SNodeList* pTags;
+  SNode*     pSubtable;
 } SPartitionLogicNode;
 
 typedef enum ESubplanType {
@@ -332,6 +336,8 @@ typedef struct STableScanPhysiNode {
   SNodeList*     pDynamicScanFuncs;
   SNodeList*     pGroupTags;
   bool           groupSort;
+  SNodeList*     pTags;
+  SNode*         pSubtable;
   int64_t        interval;
   int64_t        offset;
   int64_t        sliding;
@@ -458,6 +464,8 @@ typedef struct SFillPhysiNode {
   EOrder      inputTsOrder;
 } SFillPhysiNode;
 
+typedef SFillPhysiNode SStreamFillPhysiNode;
+
 typedef struct SMultiTableIntervalPhysiNode {
   SIntervalPhysiNode interval;
   SNodeList*         pPartitionKeys;
@@ -495,7 +503,11 @@ typedef struct SPartitionPhysiNode {
   SNodeList* pTargets;
 } SPartitionPhysiNode;
 
-typedef SPartitionPhysiNode SStreamPartitionPhysiNode;
+typedef struct SStreamPartitionPhysiNode {
+  SPartitionPhysiNode part;
+  SNodeList*          pTags;
+  SNode*              pSubtable;
+} SStreamPartitionPhysiNode;
 
 typedef struct SDataSinkNode {
   ENodeType           type;

include/libs/nodes/querynodes.h

@@ -261,6 +261,8 @@ typedef struct SSelectStmt {
   SNode*      pFromTable;
   SNode*      pWhere;
   SNodeList*  pPartitionByList;
+  SNodeList*  pTags;      // for create stream
+  SNode*      pSubtable;  // for create stream
   SNode*      pWindow;
   SNodeList*  pGroupByList;  // SGroupingSetNode
   SNode*      pHaving;

include/libs/stream/streamState.h

@@ -31,6 +31,7 @@ typedef struct {
   TDB*         db;
   TTB*         pStateDb;
   TTB*         pFuncStateDb;
+  TTB*         pFillStateDb;  // todo refactor
   TXN          txn;
 } SStreamState;
 
@@ -51,15 +52,22 @@ int32_t streamStateFuncDel(SStreamState* pState, const STupleKey* key);
 int32_t streamStatePut(SStreamState* pState, const SWinKey* key, const void* value, int32_t vLen);
 int32_t streamStateGet(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen);
 int32_t streamStateDel(SStreamState* pState, const SWinKey* key);
+
+int32_t streamStateFillPut(SStreamState* pState, const SWinKey* key, const void* value, int32_t vLen);
+int32_t streamStateFillGet(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen);
+int32_t streamStateFillDel(SStreamState* pState, const SWinKey* key);
+
 int32_t streamStateAddIfNotExist(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen);
 int32_t streamStateReleaseBuf(SStreamState* pState, const SWinKey* key, void* pVal);
 void    streamFreeVal(void* val);
 
 SStreamStateCur* streamStateGetCur(SStreamState* pState, const SWinKey* key);
-SStreamStateCur* streamStateSeekKeyNext(SStreamState* pState, const SWinKey* key);
-SStreamStateCur* streamStateSeekKeyPrev(SStreamState* pState, const SWinKey* key);
+SStreamStateCur* streamStateGetAndCheckCur(SStreamState* pState, SWinKey* key);
+SStreamStateCur* streamStateFillSeekKeyNext(SStreamState* pState, const SWinKey* key);
+SStreamStateCur* streamStateFillSeekKeyPrev(SStreamState* pState, const SWinKey* key);
 void             streamStateFreeCur(SStreamStateCur* pCur);
 
+int32_t streamStateGetGroupKVByCur(SStreamStateCur* pCur, SWinKey* pKey, const void** pVal, int32_t* pVLen);
 int32_t streamStateGetKVByCur(SStreamStateCur* pCur, SWinKey* pKey, const void** pVal, int32_t* pVLen);
 
 int32_t streamStateSeekFirst(SStreamState* pState, SStreamStateCur* pCur);

include/os/osSocket.h

@@ -167,7 +167,7 @@ uint32_t    ip2uint(const char *const ip_addr);
 void        taosIgnSIGPIPE();
 void        taosSetMaskSIGPIPE();
 uint32_t    taosInetAddr(const char *ipAddr);
-const char *taosInetNtoa(struct in_addr ipInt);
+const char *taosInetNtoa(struct in_addr ipInt, char *dstStr, int32_t len);
 
 #ifdef __cplusplus
 }

include/os/osString.h

@@ -77,7 +77,6 @@ int32_t taosWcharsWidth(TdWchar *pWchar, int32_t size);
 int32_t taosMbToWchar(TdWchar *pWchar, const char *pStr, int32_t size);
 int32_t taosMbsToWchars(TdWchar *pWchars, const char *pStrs, int32_t size);
 int32_t taosWcharToMb(char *pStr, TdWchar wchar);
-int32_t taosWcharsToMbs(char *pStrs, TdWchar *pWchars, int32_t size);
 
 char *taosStrCaseStr(const char *str, const char *pattern);
 

packaging/cfg/nginxd.service

-[Unit]
-Description=Nginx For TDengine Service
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=forking
-PIDFile=/usr/local/nginxd/logs/nginx.pid
-ExecStart=/usr/local/nginxd/sbin/nginx
-ExecStop=/usr/local/nginxd/sbin/nginx -s stop
-TimeoutStopSec=1000000s
-LimitNOFILE=infinity
-LimitNPROC=infinity
-LimitCORE=infinity
-TimeoutStartSec=0
-StandardOutput=null
-Restart=always
-StartLimitBurst=3
-StartLimitInterval=60s
-
-[Install]
-WantedBy=multi-user.target

packaging/check_package.sh

@@ -38,8 +38,6 @@ temp_version=""
 fin_result=""
 
 service_config_dir="/etc/systemd/system"
-nginx_port=6060
-nginx_dir="/usr/local/nginxd"
 
 # Color setting
 RED='\033[0;31m'
@@ -132,10 +130,7 @@ function check_main_path() {
         check_file ${install_main_dir} $i
     done
     if [ "$verMode" == "cluster" ]; then
-        nginx_main_dir=("admin" "conf" "html" "sbin" "logs")
-        for i in "${nginx_main_dir[@]}";do
-            check_file ${nginx_dir}  $i
-        done
+        check_file ${install_main_dir} "share/admin"
     fi
     echo -e "Check main path:\033[32mOK\033[0m!"
 }
@@ -150,9 +145,6 @@ function check_bin_path() {
     for i in "${lbin_dir[@]}";do
         check_link ${bin_link_dir}/$i
     done
-    if [ "$verMode" == "cluster" ]; then
-        check_file ${nginx_dir}/sbin nginx
-    fi
     echo -e "Check bin  path:\033[32mOK\033[0m!"
 }
 

packaging/tools/install.sh

@@ -50,8 +50,7 @@ install_main_dir=${installDir}
 bin_dir="${installDir}/bin"
 
 service_config_dir="/etc/systemd/system"
-nginx_port=6060
-nginx_dir="/usr/local/nginxd"
+web_port=6041
 
 # Color setting
 RED='\033[0;31m'
@@ -182,7 +181,7 @@ function install_main_path() {
   ${csudo}mkdir -p ${install_main_dir}/include
   #  ${csudo}mkdir -p ${install_main_dir}/init.d
   if [ "$verMode" == "cluster" ]; then
-    ${csudo}mkdir -p ${nginx_dir}
+    ${csudo}mkdir -p ${install_main_dir}/share
   fi
 
   if [[ -e ${script_dir}/email ]]; then
@@ -218,12 +217,6 @@ function install_bin() {
   [ -x ${install_main_dir}/bin/TDinsight.sh ] && ${csudo}ln -s ${install_main_dir}/bin/TDinsight.sh ${bin_link_dir}/TDinsight.sh || :
   [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :
   [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
-
-  if [ "$verMode" == "cluster" ]; then
-    ${csudo}cp -r ${script_dir}/nginxd/* ${nginx_dir} && ${csudo}chmod 0555 ${nginx_dir}/*
-    ${csudo}mkdir -p ${nginx_dir}/logs
-    ${csudo}chmod 777 ${nginx_dir}/sbin/nginx
-  fi
 }
 
 function install_lib() {
@@ -574,6 +567,13 @@ function install_examples() {
   fi
 }
 
+function install_web() {
+  if [ -d "${script_dir}/share" ]; then
+    ${csudo}cp -rf ${binary_dir}/share/* ${install_main_dir}/share
+  fi
+}
+
+
 function clean_service_on_sysvinit() {
   if pidof ${serverName} &>/dev/null; then
     ${csudo}service ${serverName} stop || :
@@ -654,16 +654,6 @@ function clean_service_on_systemd() {
   fi
   ${csudo}systemctl disable tarbitratord &>/dev/null || echo &>/dev/null
   ${csudo}rm -f ${tarbitratord_service_config}
-
-  if [ "$verMode" == "cluster" ]; then
-    nginx_service_config="${service_config_dir}/nginxd.service"
-    if systemctl is-active --quiet nginxd; then
-      echo "Nginx for ${productName} is running, stopping it..."
-      ${csudo}systemctl stop nginxd &>/dev/null || echo &>/dev/null
-    fi
-    ${csudo}systemctl disable nginxd &>/dev/null || echo &>/dev/null
-    ${csudo}rm -f ${nginx_service_config}
-  fi
 }
 
 function install_service_on_systemd() {
@@ -677,19 +667,6 @@ function install_service_on_systemd() {
   ${csudo}systemctl enable ${serverName}
 
   ${csudo}systemctl daemon-reload
-
-  if [ "$verMode" == "cluster" ]; then
-    [ -f ${script_dir}/cfg/nginxd.service ] &&
-      ${csudo}cp ${script_dir}/cfg/nginxd.service \
-        ${service_config_dir}/ || :
-    ${csudo}systemctl daemon-reload
-
-    if ! ${csudo}systemctl enable nginxd &>/dev/null; then
-      ${csudo}systemctl daemon-reexec
-      ${csudo}systemctl enable nginxd
-    fi
-    ${csudo}systemctl start nginxd
-  fi
 }
 
 function install_adapter_service() {
@@ -793,19 +770,6 @@ function updateProduct() {
     sleep 1
   fi
 
-  if [ "$verMode" == "cluster" ]; then
-    if pidof nginx &>/dev/null; then
-      if ((${service_mod} == 0)); then
-        ${csudo}systemctl stop nginxd || :
-      elif ((${service_mod} == 1)); then
-        ${csudo}service nginxd stop || :
-      else
-        kill_process nginx
-      fi
-      sleep 1
-    fi
-  fi
-
   install_main_path
 
   install_log
@@ -817,6 +781,7 @@ function updateProduct() {
   fi
 
   install_examples
+  install_web
   if [ -z $1 ]; then
     install_bin
     install_service
@@ -825,18 +790,6 @@ function updateProduct() {
     install_adapter_config
 
     openresty_work=false
-    if [ "$verMode" == "cluster" ]; then
-      # Check if openresty is installed
-      # Check if nginx is installed successfully
-      if type curl &>/dev/null; then
-        if curl -sSf http://127.0.0.1:${nginx_port} &>/dev/null; then
-          echo -e "\033[44;32;1mNginx for ${productName} is updated successfully!${NC}"
-          openresty_work=true
-        else
-          echo -e "\033[44;31;5mNginx for ${productName} does not work! Please try again!\033[0m"
-        fi
-      fi
-    fi
 
     echo
     echo -e "${GREEN_DARK}To configure ${productName} ${NC}: edit ${cfg_install_dir}/${configFile}"
@@ -857,7 +810,7 @@ function updateProduct() {
     fi
 
     if [ ${openresty_work} = 'true' ]; then
-      echo -e "${GREEN_DARK}To access ${productName}    ${NC}: use ${GREEN_UNDERLINE}${clientName} -h $serverFqdn${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
+      echo -e "${GREEN_DARK}To access ${productName}    ${NC}: use ${GREEN_UNDERLINE}${clientName} -h $serverFqdn${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${web_port}${NC}"
     else
       echo -e "${GREEN_DARK}To access ${productName}    ${NC}: use ${GREEN_UNDERLINE}${clientName} -h $serverFqdn${NC} in shell${NC}"
     fi
@@ -906,6 +859,7 @@ function installProduct() {
       install_connector
   fi
   install_examples
+  install_web
 
   if [ -z $1 ]; then # install service and client
     # For installing new
@@ -915,17 +869,6 @@ function installProduct() {
     install_adapter_config
 
     openresty_work=false
-    if [ "$verMode" == "cluster" ]; then
-      # Check if nginx is installed successfully
-      if type curl &>/dev/null; then
-        if curl -sSf http://127.0.0.1:${nginx_port} &>/dev/null; then
-          echo -e "\033[44;32;1mNginx for ${productName} is installed successfully!${NC}"
-          openresty_work=true
-        else
-          echo -e "\033[44;31;5mNginx for ${productName} does not work! Please try again!\033[0m"
-        fi
-      fi
-    fi
 
     install_config
 

packaging/tools/make_install.sh

@@ -151,6 +151,7 @@ function install_main_path() {
     ${csudo}mkdir -p ${install_main_dir}/driver
     ${csudo}mkdir -p ${install_main_dir}/examples
     ${csudo}mkdir -p ${install_main_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/share
     #    ${csudo}mkdir -p ${install_main_dir}/init.d
   else
     ${csudo}rm -rf ${install_main_dir} || ${csudo}rm -rf ${install_main_2_dir} || :
@@ -161,6 +162,7 @@ function install_main_path() {
     ${csudo}mkdir -p ${install_main_dir}/driver || ${csudo}mkdir -p ${install_main_2_dir}/driver
     ${csudo}mkdir -p ${install_main_dir}/examples || ${csudo}mkdir -p ${install_main_2_dir}/examples
     ${csudo}mkdir -p ${install_main_dir}/include || ${csudo}mkdir -p ${install_main_2_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/share || ${csudo}mkdir -p ${install_main_2_dir}/share
   fi
 }
 
@@ -469,6 +471,16 @@ function install_examples() {
   fi
 }
 
+function install_web() {
+  if [ -d "${binary_dir}/build/share" ]; then
+    if [ "$osType" != "Darwin" ]; then
+      ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_dir}/share || :
+    else
+      ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_dir}/share || ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_2_dir}/share || :
+    fi
+  fi
+}
+
 function clean_service_on_sysvinit() {
   if pidof ${serverName} &>/dev/null; then
     ${csudo}service ${serverName} stop || :
@@ -596,6 +608,7 @@ function update_TDengine() {
   install_lib
   #  install_connector
   install_examples
+  install_web
   install_bin
 
   install_service

packaging/tools/makepkg.sh

@@ -107,7 +107,7 @@ else
 fi
 
 install_files="${script_dir}/install.sh"
-nginx_dir="${top_dir}/../enterprise/src/plugins/web"
+web_dir="${top_dir}/../enterprise/src/plugins/web"
 
 init_file_deb=${script_dir}/../deb/taosd
 init_file_rpm=${script_dir}/../rpm/taosd
@@ -132,10 +132,6 @@ if [ -f "${cfg_dir}/${serverName}.service" ]; then
   cp ${cfg_dir}/${serverName}.service ${install_dir}/cfg || :
 fi
 
-if [ -f "${top_dir}/packaging/cfg/nginxd.service" ]; then
-  cp ${top_dir}/packaging/cfg/nginxd.service ${install_dir}/cfg || :
-fi
-
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || :
 mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/${serverName}.deb
 mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/${serverName}.rpm
@@ -222,16 +218,6 @@ if [ "$verMode" == "cluster" ]; then
   sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >>remove_temp.sh
   mv remove_temp.sh ${install_dir}/bin/remove.sh
 
-  mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
-  cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
-  rm -rf ${install_dir}/nginxd/png
-
-  if [ "$cpuType" == "aarch64" ]; then
-    cp -f ${install_dir}/nginxd/sbin/arm/64bit/nginx ${install_dir}/nginxd/sbin/
-  elif [ "$cpuType" == "aarch32" ]; then
-    cp -f ${install_dir}/nginxd/sbin/arm/32bit/nginx ${install_dir}/nginxd/sbin/
-  fi
-  rm -rf ${install_dir}/nginxd/sbin/arm
 fi
 
 cd ${install_dir}
@@ -288,6 +274,13 @@ if [[ $dbName == "taos" ]]; then
     cp -r ${examples_dir}/C# ${install_dir}/examples
     mkdir -p ${install_dir}/examples/taosbenchmark-json && cp ${examples_dir}/../tools/taos-tools/example/* ${install_dir}/examples/taosbenchmark-json
   fi
+
+  # Add web files
+  if [ -d "${web_dir}/admin" ]; then
+    mkdir -p ${install_dir}/share/
+    cp ${web_dir}/admin ${install_dir}/share/ -r
+    cp ${web_dir}/png/taos.png ${install_dir}/share/admin/images/taos.png
+  fi
 fi
 
 # Copy driver

packaging/tools/remove.sh

@@ -27,13 +27,11 @@ local_bin_link_dir="/usr/local/bin"
 lib_link_dir="/usr/lib"
 lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
-install_nginxd_dir="/usr/local/nginxd"
 
 service_config_dir="/etc/systemd/system"
 taos_service_name=${serverName}
 taosadapter_service_name="taosadapter"
 tarbitrator_service_name="tarbitratord"
-nginx_service_name="nginxd"
 csudo=""
 if command -v sudo >/dev/null; then
   csudo="sudo "
@@ -153,18 +151,6 @@ function clean_service_on_systemd() {
   fi
   ${csudo}systemctl disable ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
   ${csudo}rm -f ${tarbitratord_service_config}
-
-  if [ "$verMode" == "cluster" ]; then
-    nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
-    if [ -d ${install_nginxd_dir} ]; then
-      if systemctl is-active --quiet ${nginx_service_name}; then
-        echo "Nginx for ${productName} is running, stopping it..."
-        ${csudo}systemctl stop ${nginx_service_name} &>/dev/null || echo &>/dev/null
-      fi
-      ${csudo}systemctl disable ${nginx_service_name} &>/dev/null || echo &>/dev/null
-      ${csudo}rm -f ${nginx_service_config}
-    fi
-  fi
 }
 
 function clean_service_on_sysvinit() {
@@ -239,7 +225,6 @@ clean_config
 ${csudo}rm -rf ${data_link_dir} || :
 
 ${csudo}rm -rf ${install_main_dir}
-${csudo}rm -rf ${install_nginxd_dir}
 if [[ -e /etc/os-release ]]; then
   osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
 else

source/client/src/clientSml.c

@@ -79,7 +79,7 @@
 #define NCHAR_ADD_LEN  3  // L"nchar"   3 means L" "
 
 #define MAX_RETRY_TIMES 5
-#define LINE_BATCH      20000
+#define LINE_BATCH      2000
 //=================================================================================================
 typedef TSDB_SML_PROTOCOL_TYPE SMLProtocolType;
 
@@ -151,13 +151,14 @@ typedef struct {
 typedef struct {
   SRequestObj     *request;
   tsem_t           sem;
+  int32_t          cnt;
+  int32_t          total;
   TdThreadSpinlock lock;
 } Params;
 
 typedef struct {
   int64_t id;
   Params *params;
-  bool    isLast;
 
   SMLProtocolType protocol;
   int8_t          precision;
@@ -1531,6 +1532,7 @@ static SSmlHandle* smlBuildSmlInfo(STscObj* pTscObj, SRequestObj* request, SMLPr
     info->pRequest = request;
     info->msgBuf.buf = info->pRequest->msgBuf;
     info->msgBuf.len = ERROR_MSG_BUF_DEFAULT_SIZE;
+    info->pRequest->stmtType = info->pQuery->pRoot->type;
   }
 
   info->exec = smlInitHandle(info->pQuery);
@@ -2331,6 +2333,9 @@ static int32_t smlInsertData(SSmlHandle *info) {
   //  info->affectedRows = taos_affected_rows(info->pRequest);
   //  return info->pRequest->code;
 
+  SAppClusterSummary *pActivity = &info->taos->pAppInfo->summary;
+  atomic_add_fetch_64((int64_t *)&pActivity->numOfInsertsReq, 1);
+
   launchAsyncQuery(info->pRequest, info->pQuery, NULL);
   return TSDB_CODE_SUCCESS;
 }
@@ -2449,28 +2454,26 @@ static void smlInsertCallback(void *param, void *res, int32_t code) {
   int32_t rows = taos_affected_rows(pRequest);
 
   uDebug("SML:0x%" PRIx64 " result. code:%d, msg:%s", info->id, pRequest->code, pRequest->msgBuf);
+  Params *pParam = info->params;
   // lock
-  taosThreadSpinLock(&info->params->lock);
+  taosThreadSpinLock(&pParam->lock);
+  pParam->cnt++;
   if (code != TSDB_CODE_SUCCESS) {
-    info->params->request->code = code;
-    info->params->request->body.resInfo.numOfRows += rows;
+    pParam->request->code = code;
+    pParam->request->body.resInfo.numOfRows += rows;
   }else{
-    info->params->request->body.resInfo.numOfRows += info->affectedRows;
+    pParam->request->body.resInfo.numOfRows += info->affectedRows;
   }
-  taosThreadSpinUnlock(&info->params->lock);
+  if (pParam->cnt == pParam->total) {
+    tsem_post(&pParam->sem);
+  }
+  taosThreadSpinUnlock(&pParam->lock);
   // unlock
-
   uDebug("SML:0x%" PRIx64 " insert finished, code: %d, rows: %d, total: %d", info->id, code, rows, info->affectedRows);
-  Params *pParam = info->params;
-  bool    isLast = info->isLast;
   info->cost.endTime = taosGetTimestampUs();
   info->cost.code = code;
   smlPrintStatisticInfo(info);
   smlDestroyInfo(info);
-
-  if (isLast) {
-    tsem_post(&pParam->sem);
-  }
 }
 
 /**
@@ -2512,7 +2515,7 @@ TAOS_RES* taos_schemaless_insert(TAOS* taos, char* lines[], int numLines, int pr
   pTscObj->schemalessType = 1;
   SSmlMsgBuf msg = {ERROR_MSG_BUF_DEFAULT_SIZE, request->msgBuf};
 
-  Params params;
+  Params params = {0};
   params.request = request;
   tsem_init(&params.sem, 0, 0);
   taosThreadSpinInit(&(params.lock), 0);
@@ -2557,6 +2560,7 @@ TAOS_RES* taos_schemaless_insert(TAOS* taos, char* lines[], int numLines, int pr
   }
 
   batchs = ceil(((double)numLines) / LINE_BATCH);
+  params.total = batchs;
   for (int i = 0; i < batchs; ++i) {
     SRequestObj* req = (SRequestObj*)createRequest(pTscObj->id, TSDB_SQL_INSERT);
     if(!req){
@@ -2575,11 +2579,9 @@ TAOS_RES* taos_schemaless_insert(TAOS* taos, char* lines[], int numLines, int pr
 
     if (numLines > perBatch) {
       numLines -= perBatch;
-      info->isLast = false;
     } else {
       perBatch = numLines;
       numLines = 0;
-      info->isLast = true;
     }
 
     info->params = &params;

source/common/src/tdataformat.c

@@ -212,9 +212,9 @@ int32_t tTSRowNew(STSRowBuilder *pBuilder, SArray *pArray, STSchema *pTSchema, S
         if (pColVal->cid == pTColumn->colId) {
           iColVal++;
 
-          if (pColVal->isNone) {
+          if (COL_VAL_IS_NONE(pColVal)) {
             flags |= TSROW_HAS_NONE;
-          } else if (pColVal->isNull) {
+          } else if (COL_VAL_IS_NULL(pColVal)) {
             flags |= TSROW_HAS_NULL;
             maxIdx = nkv;
             nTag++;
@@ -398,9 +398,9 @@ int32_t tTSRowNew(STSRowBuilder *pBuilder, SArray *pArray, STSchema *pTSchema, S
         if (pColVal->cid == pTColumn->colId) {
           iColVal++;
 
-          if (pColVal->isNone) {
+          if (COL_VAL_IS_NONE(pColVal)) {
             goto _set_none;
-          } else if (pColVal->isNull) {
+          } else if (COL_VAL_IS_NULL(pColVal)) {
             goto _set_null;
           } else {
             goto _set_value;
@@ -1222,9 +1222,9 @@ _exit:
 static FORCE_INLINE int32_t tColDataAppendValue0(SColData *pColData, SColVal *pColVal) {  // 0
   int32_t code = 0;
 
-  if (pColVal->isNone) {
+  if (COL_VAL_IS_NONE(pColVal)) {
     pColData->flag = HAS_NONE;
-  } else if (pColVal->isNull) {
+  } else if (COL_VAL_IS_NULL(pColVal)) {
     pColData->flag = HAS_NULL;
   } else {
     pColData->flag = HAS_VALUE;
@@ -1239,7 +1239,7 @@ _exit:
 static FORCE_INLINE int32_t tColDataAppendValue1(SColData *pColData, SColVal *pColVal) {  // HAS_NONE
   int32_t code = 0;
 
-  if (!pColVal->isNone) {
+  if (!COL_VAL_IS_NONE(pColVal)) {
     int32_t nBit = BIT1_SIZE(pColData->nVal + 1);
 
     code = tRealloc(&pColData->pBitMap, nBit);
@@ -1248,7 +1248,7 @@ static FORCE_INLINE int32_t tColDataAppendValue1(SColData *pColData, SColVal *pC
     memset(pColData->pBitMap, 0, nBit);
     SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
 
-    if (pColVal->isNull) {
+    if (COL_VAL_IS_NULL(pColVal)) {
       pColData->flag |= HAS_NULL;
     } else {
       pColData->flag |= HAS_VALUE;
@@ -1279,12 +1279,12 @@ _exit:
 static FORCE_INLINE int32_t tColDataAppendValue2(SColData *pColData, SColVal *pColVal) {  // HAS_NULL
   int32_t code = 0;
 
-  if (!pColVal->isNull) {
+  if (!COL_VAL_IS_NULL(pColVal)) {
     int32_t nBit = BIT1_SIZE(pColData->nVal + 1);
     code = tRealloc(&pColData->pBitMap, nBit);
     if (code) goto _exit;
 
-    if (pColVal->isNone) {
+    if (COL_VAL_IS_NONE(pColVal)) {
       pColData->flag |= HAS_NONE;
 
       memset(pColData->pBitMap, 255, nBit);
@@ -1321,12 +1321,12 @@ _exit:
 static FORCE_INLINE int32_t tColDataAppendValue3(SColData *pColData, SColVal *pColVal) {  // HAS_NULL|HAS_NONE
   int32_t code = 0;
 
-  if (pColVal->isNone) {
+  if (COL_VAL_IS_NONE(pColVal)) {
     code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
     if (code) goto _exit;
 
     SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
-  } else if (pColVal->isNull) {
+  } else if (COL_VAL_IS_NULL(pColVal)) {
     code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
     if (code) goto _exit;
 
@@ -1371,8 +1371,8 @@ _exit:
 static FORCE_INLINE int32_t tColDataAppendValue4(SColData *pColData, SColVal *pColVal) {  // HAS_VALUE
   int32_t code = 0;
 
-  if (pColVal->isNone || pColVal->isNull) {
-    if (pColVal->isNone) {
+  if (!COL_VAL_IS_VALUE(pColVal)) {
+    if (COL_VAL_IS_NONE(pColVal)) {
       pColData->flag |= HAS_NONE;
     } else {
       pColData->flag |= HAS_NULL;
@@ -1399,7 +1399,7 @@ _exit:
 static FORCE_INLINE int32_t tColDataAppendValue5(SColData *pColData, SColVal *pColVal) {  // HAS_VALUE|HAS_NONE
   int32_t code = 0;
 
-  if (pColVal->isNull) {
+  if (COL_VAL_IS_NULL(pColVal)) {
     pColData->flag |= HAS_NULL;
 
     uint8_t *pBitMap = NULL;
@@ -1417,7 +1417,7 @@ static FORCE_INLINE int32_t tColDataAppendValue5(SColData *pColData, SColVal *pC
     code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
     if (code) goto _exit;
 
-    if (pColVal->isNone) {
+    if (COL_VAL_IS_NONE(pColVal)) {
       SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
     } else {
       SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
@@ -1434,7 +1434,7 @@ _exit:
 static FORCE_INLINE int32_t tColDataAppendValue6(SColData *pColData, SColVal *pColVal) {  // HAS_VALUE|HAS_NULL
   int32_t code = 0;
 
-  if (pColVal->isNone) {
+  if (COL_VAL_IS_NONE(pColVal)) {
     pColData->flag |= HAS_NONE;
 
     uint8_t *pBitMap = NULL;
@@ -1452,7 +1452,7 @@ static FORCE_INLINE int32_t tColDataAppendValue6(SColData *pColData, SColVal *pC
     code = tRealloc(&pColData->pBitMap, BIT1_SIZE(pColData->nVal + 1));
     if (code) goto _exit;
 
-    if (pColVal->isNull) {
+    if (COL_VAL_IS_NULL(pColVal)) {
       SET_BIT1(pColData->pBitMap, pColData->nVal, 0);
     } else {
       SET_BIT1(pColData->pBitMap, pColData->nVal, 1);
@@ -1473,9 +1473,9 @@ static FORCE_INLINE int32_t tColDataAppendValue7(SColData *pColData,
   code = tRealloc(&pColData->pBitMap, BIT2_SIZE(pColData->nVal + 1));
   if (code) goto _exit;
 
-  if (pColVal->isNone) {
+  if (COL_VAL_IS_NONE(pColVal)) {
     SET_BIT2(pColData->pBitMap, pColData->nVal, 0);
-  } else if (pColVal->isNull) {
+  } else if (COL_VAL_IS_NULL(pColVal)) {
     SET_BIT2(pColData->pBitMap, pColData->nVal, 1);
   } else {
     SET_BIT2(pColData->pBitMap, pColData->nVal, 2);

source/common/src/tglobal.c

@@ -95,6 +95,7 @@ int32_t tsQueryRsmaTolerance = 1000;  // the tolerance time (ms) to judge from w
 bool    tsQueryPlannerTrace = false;
 int32_t tsQueryNodeChunkSize = 32 * 1024;
 bool    tsQueryUseNodeAllocator = true;
+bool    tsKeepColumnName = false;
 
 /*
  * denote if the server needs to compress response message at the application layer to client, including query rsp,
@@ -205,7 +206,9 @@ static int32_t taosLoadCfg(SConfig *pCfg, const char **envCmd, const char *input
     tstrncpy(cfgFile, cfgDir, sizeof(cfgDir));
   }
 
-  if (apolloUrl == NULL || apolloUrl[0] == '\0') cfgGetApollUrl(envCmd, envFile, apolloUrl);
+  if (apolloUrl != NULL && apolloUrl[0] == '\0') {
+    cfgGetApollUrl(envCmd, envFile, apolloUrl);
+  }
 
   if (cfgLoad(pCfg, CFG_STYPE_APOLLO_URL, apolloUrl) != 0) {
     uError("failed to load from apollo url:%s since %s", apolloUrl, terrstr());
@@ -290,6 +293,7 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
   if (cfgAddBool(pCfg, "queryPlannerTrace", tsQueryPlannerTrace, true) != 0) return -1;
   if (cfgAddInt32(pCfg, "queryNodeChunkSize", tsQueryNodeChunkSize, 1024, 128 * 1024, true) != 0) return -1;
   if (cfgAddBool(pCfg, "queryUseNodeAllocator", tsQueryUseNodeAllocator, true) != 0) return -1;
+  if (cfgAddBool(pCfg, "keepColumnName", tsKeepColumnName, true) != 0) return -1;
   if (cfgAddString(pCfg, "smlChildTableName", "", 1) != 0) return -1;
   if (cfgAddString(pCfg, "smlTagName", tsSmlTagName, 1) != 0) return -1;
   if (cfgAddBool(pCfg, "smlDataFormat", tsSmlDataFormat, 1) != 0) return -1;
@@ -652,6 +656,7 @@ static int32_t taosSetClientCfg(SConfig *pCfg) {
   tsQueryPlannerTrace = cfgGetItem(pCfg, "queryPlannerTrace")->bval;
   tsQueryNodeChunkSize = cfgGetItem(pCfg, "queryNodeChunkSize")->i32;
   tsQueryUseNodeAllocator = cfgGetItem(pCfg, "queryUseNodeAllocator")->bval;
+  tsKeepColumnName = cfgGetItem(pCfg, "keepColumnName")->bval;
   return 0;
 }
 
@@ -685,7 +690,9 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
   tsQueryBufferSize = cfgGetItem(pCfg, "queryBufferSize")->i32;
   tsPrintAuth = cfgGetItem(pCfg, "printAuth")->bval;
 
+#if !defined(WINDOWS) && !defined(DARWIN)
   tsMultiProcess = cfgGetItem(pCfg, "multiProcess")->bval;
+#endif
   tsMnodeShmSize = cfgGetItem(pCfg, "mnodeShmSize")->i32;
   tsVnodeShmSize = cfgGetItem(pCfg, "vnodeShmSize")->i32;
   tsQnodeShmSize = cfgGetItem(pCfg, "qnodeShmSize")->i32;
@@ -843,6 +850,9 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
       break;
     }
     case 'k': {
+      if (strcasecmp("keepColumnName", name) == 0) {
+        tsKeepColumnName = cfgGetItem(pCfg, "keepColumnName")->bval;
+      }
       break;
     }
     case 'l': {
@@ -919,7 +929,9 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
         }
         case 'u': {
           if (strcasecmp("multiProcess", name) == 0) {
+#if !defined(WINDOWS) && !defined(DARWIN)
             tsMultiProcess = cfgGetItem(pCfg, "multiProcess")->bval;
+#endif
           } else if (strcasecmp("udfDebugFlag", name) == 0) {
             udfDebugFlag = cfgGetItem(pCfg, "udfDebugFlag")->i32;
           }
@@ -1122,11 +1134,20 @@ int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDi
 
   if (tsc) {
     tsLogEmbedded = 0;
-    if (taosAddClientLogCfg(pCfg) != 0) return -1;
+    if (taosAddClientLogCfg(pCfg) != 0) {
+      cfgCleanup(pCfg);
+      return -1;
+    }
   } else {
     tsLogEmbedded = 1;
-    if (taosAddClientLogCfg(pCfg) != 0) return -1;
-    if (taosAddServerLogCfg(pCfg) != 0) return -1;
+    if (taosAddClientLogCfg(pCfg) != 0) {
+      cfgCleanup(pCfg);
+      return -1;
+    }
+    if (taosAddServerLogCfg(pCfg) != 0) {
+      cfgCleanup(pCfg);
+      return -1;
+    }
   }
 
   if (taosLoadCfg(pCfg, envCmd, cfgDir, envFile, apolloUrl) != 0) {

source/common/src/tmsg.c

@@ -2682,6 +2682,7 @@ int32_t tSerializeSTrimDbReq(void *buf, int32_t bufLen, STrimDbReq *pReq) {
 
   if (tStartEncode(&encoder) < 0) return -1;
   if (tEncodeCStr(&encoder, pReq->db) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->maxSpeed) < 0) return -1;
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
@@ -2695,6 +2696,7 @@ int32_t tDeserializeSTrimDbReq(void *buf, int32_t bufLen, STrimDbReq *pReq) {
 
   if (tStartDecode(&decoder) < 0) return -1;
   if (tDecodeCStrTo(&decoder, pReq->db) < 0) return -1;
+  if (tDecodeI32(&decoder, &pReq->maxSpeed) < 0) return -1;
   tEndDecode(&decoder);
 
   tDecoderClear(&decoder);
@@ -3347,12 +3349,12 @@ int32_t tDeserializeSSTbHbRsp(void *buf, int32_t bufLen, SSTbHbRsp *pRsp) {
   return 0;
 }
 
-void tFreeSTableMetaRsp(void *pRsp) { 
+void tFreeSTableMetaRsp(void *pRsp) {
   if (NULL == pRsp) {
     return;
   }
-  
-  taosMemoryFreeClear(((STableMetaRsp *)pRsp)->pSchemas); 
+
+  taosMemoryFreeClear(((STableMetaRsp *)pRsp)->pSchemas);
 }
 
 void tFreeSTableIndexRsp(void *info) {
@@ -4373,8 +4375,7 @@ int32_t tDeserializeSExplainRsp(void *buf, int32_t bufLen, SExplainRsp *pRsp) {
     if (tDecodeDouble(&decoder, &pRsp->subplanInfo[i].totalCost) < 0) return -1;
     if (tDecodeU64(&decoder, &pRsp->subplanInfo[i].numOfRows) < 0) return -1;
     if (tDecodeU32(&decoder, &pRsp->subplanInfo[i].verboseLen) < 0) return -1;
-    if (tDecodeBinaryAlloc(&decoder, &pRsp->subplanInfo[i].verboseInfo, NULL) < 0)
-      return -1;
+    if (tDecodeBinaryAlloc(&decoder, &pRsp->subplanInfo[i].verboseInfo, NULL) < 0) return -1;
   }
 
   tEndDecode(&decoder);
@@ -4826,6 +4827,14 @@ int32_t tSerializeSCMCreateStreamReq(void *buf, int32_t bufLen, const SCMCreateS
   if (tEncodeI8(&encoder, pReq->igExpired) < 0) return -1;
   if (sqlLen > 0 && tEncodeCStr(&encoder, pReq->sql) < 0) return -1;
   if (astLen > 0 && tEncodeCStr(&encoder, pReq->ast) < 0) return -1;
+  if (tEncodeI32(&encoder, pReq->numOfTags) < 0) return -1;
+  for (int32_t i = 0; i < pReq->numOfTags; ++i) {
+    SField *pField = taosArrayGet(pReq->pTags, i);
+    if (tEncodeI8(&encoder, pField->type) < 0) return -1;
+    if (tEncodeI8(&encoder, pField->flags) < 0) return -1;
+    if (tEncodeI32(&encoder, pField->bytes) < 0) return -1;
+    if (tEncodeCStr(&encoder, pField->name) < 0) return -1;
+  }
 
   tEndEncode(&encoder);
 
@@ -4864,6 +4873,28 @@ int32_t tDeserializeSCMCreateStreamReq(void *buf, int32_t bufLen, SCMCreateStrea
     if (pReq->ast == NULL) return -1;
     if (tDecodeCStrTo(&decoder, pReq->ast) < 0) return -1;
   }
+
+  if (tDecodeI32(&decoder, &pReq->numOfTags) < 0) return -1;
+  if (pReq->numOfTags > 0) {
+    pReq->pTags = taosArrayInit(pReq->numOfTags, sizeof(SField));
+    if (pReq->pTags == NULL) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      return -1;
+    }
+
+    for (int32_t i = 0; i < pReq->numOfTags; ++i) {
+      SField field = {0};
+      if (tDecodeI8(&decoder, &field.type) < 0) return -1;
+      if (tDecodeI8(&decoder, &field.flags) < 0) return -1;
+      if (tDecodeI32(&decoder, &field.bytes) < 0) return -1;
+      if (tDecodeCStrTo(&decoder, field.name) < 0) return -1;
+      if (taosArrayPush(pReq->pTags, &field) == NULL) {
+        terrno = TSDB_CODE_OUT_OF_MEMORY;
+        return -1;
+      }
+    }
+  }
+
   tEndDecode(&decoder);
 
   tDecoderClear(&decoder);

source/common/src/trow.c

@@ -620,7 +620,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow) {
       ASSERT(pTColumn->colId == PRIMARYKEY_TIMESTAMP_COL_ID);
     } else {
       if (IS_VAR_DATA_TYPE(pTColumn->type)) {
-        if (pColVal && !pColVal->isNone && !pColVal->isNull) {
+        if (pColVal && COL_VAL_IS_VALUE(pColVal)) {
           varDataLen += (pColVal->value.nData + sizeof(VarDataLenT));
           if (maxVarDataLen < (pColVal->value.nData + sizeof(VarDataLenT))) {
             maxVarDataLen = pColVal->value.nData + sizeof(VarDataLenT);
@@ -680,9 +680,9 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow) {
     const void *val = NULL;
     if (iColVal < nColVal) {
       pColVal = (SColVal *)taosArrayGet(pArray, iColVal);
-      if (pColVal->isNone) {
+      if (COL_VAL_IS_NONE(pColVal)) {
         valType = TD_VTYPE_NONE;
-      } else if (pColVal->isNull) {
+      } else if (COL_VAL_IS_NULL(pColVal)) {
         valType = TD_VTYPE_NULL;
       } else if (IS_VAR_DATA_TYPE(pTColumn->type)) {
         varDataSetLen(varBuf, pColVal->value.nData);

source/common/test/dataformatTest.cpp

@@ -133,11 +133,11 @@ static int32_t genTestData(const char **data, int16_t nCols, SArray **pArray) {
     SColVal colVal = {0};
     colVal.cid = PRIMARYKEY_TIMESTAMP_COL_ID + i;
     if (strncasecmp(data[i], NONE_CSTR, NONE_LEN) == 0) {
-      colVal.isNone = 1;
+      colVal.flag = CV_FLAG_NONE;
       taosArrayPush(*pArray, &colVal);
       continue;
     } else if (strncasecmp(data[i], NULL_CSTR, NULL_LEN) == 0) {
-      colVal.isNull = 1;
+      colVal.flag = CV_FLAG_NULL;
       taosArrayPush(*pArray, &colVal);
       continue;
     }
@@ -204,11 +204,11 @@ static int32_t genTestData(const char **data, int16_t nCols, SArray **pArray) {
 }
 
 int32_t debugPrintSColVal(SColVal *cv, int8_t type) {
-  if (cv->isNone) {
+  if (COL_VAL_IS_NONE(cv)) {
     printf("None ");
     return 0;
   }
-  if (cv->isNull) {
+  if (COL_VAL_IS_NULL(cv)) {
     printf("Null ");
     return 0;
   }
@@ -298,11 +298,11 @@ void debugPrintTSRow(STSRow2 *row, STSchema *pTSchema, const char *tags, int32_t
 static int32_t checkSColVal(const char *rawVal, SColVal *cv, int8_t type) {
   ASSERT(rawVal);
 
-  if (cv->isNone) {
+  if (COL_VAL_IS_NONE(cv)) {
     EXPECT_STRCASEEQ(rawVal, NONE_CSTR);
     return 0;
   }
-  if (cv->isNull) {
+  if (COL_VAL_IS_NULL(cv)) {
     EXPECT_STRCASEEQ(rawVal, NULL_CSTR);
     return 0;
   }

source/dnode/mgmt/exe/dmMain.c

@@ -16,10 +16,12 @@
 #define _DEFAULT_SOURCE
 #include "dmMgmt.h"
 #include "tconfig.h"
+#include "mnode.h"
 
 #define DM_APOLLO_URL    "The apollo string to use when configuring the server, such as: -a 'jsonFile:./tests/cfg.json', cfg.json text can be '{\"fqdn\":\"td1\"}'."
 #define DM_CFG_DIR       "Configuration directory."
 #define DM_DMP_CFG       "Dump configuration."
+#define DM_SDB_INFO      "Dump sdb info."
 #define DM_ENV_CMD       "The env cmd variable string to use when configuring the server, such as: -e 'TAOS_FQDN=td1'."
 #define DM_ENV_FILE      "The env variable file path to use when configuring the server, default is './.env', .env text can be 'TAOS_FQDN=td1'."
 #define DM_NODE_TYPE     "Startup type of the node, default is 0."
@@ -31,6 +33,7 @@ static struct {
   bool         winServiceMode;
 #endif
   bool         dumpConfig;
+  bool         dumpSdb;
   bool         generateGrant;
   bool         printAuth;
   bool         printVersion;
@@ -82,6 +85,8 @@ static int32_t dmParseArgs(int32_t argc, char const *argv[]) {
       }
     } else if (strcmp(argv[i], "-a") == 0) {
       tstrncpy(global.apolloUrl, argv[++i], PATH_MAX);
+    } else if (strcmp(argv[i], "-s") == 0) {
+      global.dumpSdb = true;
     } else if (strcmp(argv[i], "-E") == 0) {
       tstrncpy(global.envFile, argv[++i], PATH_MAX);
     } else if (strcmp(argv[i], "-n") == 0) {
@@ -131,6 +136,7 @@ static void dmPrintHelp() {
   printf("Usage: taosd [OPTION...] \n\n");
   printf("%s%s%s%s\n", indent, "-a,", indent, DM_APOLLO_URL);
   printf("%s%s%s%s\n", indent, "-c,", indent, DM_CFG_DIR);
+  printf("%s%s%s%s\n", indent, "-s,", indent, DM_SDB_INFO);
   printf("%s%s%s%s\n", indent, "-C,", indent, DM_DMP_CFG);
   printf("%s%s%s%s\n", indent, "-e,", indent, DM_ENV_CMD);
   printf("%s%s%s%s\n", indent, "-E,", indent, DM_ENV_FILE);
@@ -229,6 +235,14 @@ int mainWindows(int argc,char** argv) {
     return 0;
   }
 
+  if (global.dumpSdb) {
+    mndDumpSdb();
+    taosCleanupCfg();
+    taosCloseLog();
+    taosCleanupArgs();
+    return 0;
+  }
+
   dmSetProcInfo(argc, (char **)argv);
   taosCleanupArgs();
 

source/dnode/mgmt/mgmt_qnode/src/qmWorker.c

@@ -87,6 +87,7 @@ int32_t qmPutRpcMsgToQueue(SQnodeMgmt *pMgmt, EQueueType qtype, SRpcMsg *pRpc) {
       return 0;
     default:
       terrno = TSDB_CODE_INVALID_PARA;
+      taosFreeQitem(pMsg);
       return -1;
   }
 }

source/dnode/mgmt/mgmt_vnode/src/vmFile.c

@@ -135,12 +135,14 @@ _OVER:
   if (content != NULL) taosMemoryFree(content);
   if (root != NULL) cJSON_Delete(root);
   if (pFile != NULL) taosCloseFile(&pFile);
+  if (*ppCfgs == NULL && pCfgs != NULL) taosMemoryFree(pCfgs);
 
   terrno = code;
   return code;
 }
 
 int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) {
+  int32_t ret = 0;
   char file[PATH_MAX] = {0};
   char realfile[PATH_MAX] = {0};
   snprintf(file, sizeof(file), "%s%svnodes.json.bak", pMgmt->path, TD_DIRSEP);
@@ -161,13 +163,16 @@ int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) {
   char   *content = taosMemoryCalloc(1, maxLen + 1);
   if (content == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return -1;
+    ret = -1;
+    goto _OVER;
   }
 
   len += snprintf(content + len, maxLen - len, "{\n");
   len += snprintf(content + len, maxLen - len, "  \"vnodes\": [\n");
   for (int32_t i = 0; i < numOfVnodes; ++i) {
     SVnodeObj *pVnode = pVnodes[i];
+    if (pVnode == NULL) continue;
+
     len += snprintf(content + len, maxLen - len, "    {\n");
     len += snprintf(content + len, maxLen - len, "      \"vgId\": %d,\n", pVnode->vgId);
     len += snprintf(content + len, maxLen - len, "      \"dropped\": %d,\n", pVnode->dropped);
@@ -180,12 +185,13 @@ int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) {
   }
   len += snprintf(content + len, maxLen - len, "  ]\n");
   len += snprintf(content + len, maxLen - len, "}\n");
+  terrno = 0;
 
+_OVER:
   taosWriteFile(pFile, content, len);
   taosFsyncFile(pFile);
   taosCloseFile(&pFile);
   taosMemoryFree(content);
-  terrno = 0;
 
   for (int32_t i = 0; i < numOfVnodes; ++i) {
     SVnodeObj *pVnode = pVnodes[i];
@@ -196,6 +202,8 @@ int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) {
     taosMemoryFree(pVnodes);
   }
 
+  if (ret != 0) return -1;
+
   dDebug("successed to write %s, numOfVnodes:%d", realfile, numOfVnodes);
   return taosRenameFile(file, realfile);
 }
\ No newline at end of file

source/dnode/mgmt/mgmt_vnode/src/vmHandle.c

@@ -175,7 +175,7 @@ static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) {
   pCfg->hashSuffix = pCreate->hashSuffix;
   pCfg->tsdbPageSize = pCreate->tsdbPageSize * 1024;
 
-  pCfg->standby = pCfg->standby;
+  pCfg->standby = 0;
   pCfg->syncCfg.myIndex = pCreate->selfIndex;
   pCfg->syncCfg.replicaNum = pCreate->replica;
   memset(&pCfg->syncCfg.nodeInfo, 0, sizeof(pCfg->syncCfg.nodeInfo));

source/dnode/mgmt/mgmt_vnode/src/vmInt.c

@@ -58,11 +58,14 @@ int32_t vmOpenVnode(SVnodeMgmt *pMgmt, SWrapperCfg *pCfg, SVnode *pImpl) {
 
   if (pVnode->path == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
+    taosMemoryFree(pVnode);
     return -1;
   }
 
   if (vmAllocQueue(pMgmt, pVnode) != 0) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
+    taosMemoryFree(pVnode->path);
+    taosMemoryFree(pVnode);
     return -1;
   }
 
@@ -221,6 +224,7 @@ static void vmCloseVnodes(SVnodeMgmt *pMgmt) {
   SVnodeObj **ppVnodes = vmGetVnodeListFromHash(pMgmt, &numOfVnodes);
 
   for (int32_t i = 0; i < numOfVnodes; ++i) {
+    if (ppVnodes == NULL || ppVnodes[i] == NULL) continue;
     vmCloseVnode(pMgmt, ppVnodes[i]);
   }
 
@@ -380,7 +384,9 @@ static int32_t vmStartVnodes(SVnodeMgmt *pMgmt) {
   for (int32_t v = 0; v < numOfVnodes; ++v) {
     int32_t       t = v % threadNum;
     SVnodeThread *pThread = &threads[t];
-    pThread->ppVnodes[pThread->vnodeNum++] = ppVnodes[v];
+    if (pThread->ppVnodes != NULL) {
+      pThread->ppVnodes[pThread->vnodeNum++] = ppVnodes[v];
+    }
   }
 
   pMgmt->state.openVnodes = 0;
@@ -411,8 +417,8 @@ static int32_t vmStartVnodes(SVnodeMgmt *pMgmt) {
   taosMemoryFree(threads);
 
   for (int32_t i = 0; i < numOfVnodes; ++i) {
-    SVnodeObj *pVnode = ppVnodes[i];
-    vmReleaseVnode(pMgmt, pVnode);
+    if (ppVnodes == NULL || ppVnodes[i] == NULL) continue;
+    vmReleaseVnode(pMgmt, ppVnodes[i]);
   }
 
   if (ppVnodes != NULL) {

source/dnode/mgmt/mgmt_vnode/src/vmWorker.c

@@ -244,7 +244,7 @@ int32_t vmPutMsgToMonitorQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) {
 int32_t vmPutRpcMsgToQueue(SVnodeMgmt *pMgmt, EQueueType qtype, SRpcMsg *pRpc) {
   SRpcMsg *pMsg = taosAllocateQitem(sizeof(SRpcMsg), RPC_QITEM);
   if (pMsg == NULL) {
-    rpcFreeCont(pMsg->pCont);
+    rpcFreeCont(pRpc->pCont);
     pRpc->pCont = NULL;
     return -1;
   }

source/dnode/mnode/impl/inc/mndStb.h

@@ -40,6 +40,8 @@ int32_t mndBuildSMCreateStbRsp(SMnode *pMnode, char* dbFName, char* stbFName, vo
 void mndExtractDbNameFromStbFullName(const char *stbFullName, char *dst);
 void mndExtractTbNameFromStbFullName(const char *stbFullName, char *dst, int32_t dstSize);
 
+const char *mndGetStbStr(const char *src);
+
 #ifdef __cplusplus
 }
 #endif

source/dnode/mnode/impl/src/mndCluster.c

@@ -315,7 +315,7 @@ static int32_t mndProcessUptimeTimer(SRpcMsg *pReq) {
     return 0;
   }
 
-  mTrace("update cluster uptime to %" PRId64, clusterObj.upTime);
+  mInfo("update cluster uptime to %" PRId64, clusterObj.upTime);
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_CONFLICT_NOTHING, pReq, "update-uptime");
   if (pTrans == NULL) return -1;
 

source/dnode/mnode/impl/src/mndConsumer.c

@@ -54,13 +54,15 @@ static int32_t mndProcessConsumerLostMsg(SRpcMsg *pMsg);
 static int32_t mndProcessConsumerRecoverMsg(SRpcMsg *pMsg);
 
 int32_t mndInitConsumer(SMnode *pMnode) {
-  SSdbTable table = {.sdbType = SDB_CONSUMER,
-                     .keyType = SDB_KEY_INT64,
-                     .encodeFp = (SdbEncodeFp)mndConsumerActionEncode,
-                     .decodeFp = (SdbDecodeFp)mndConsumerActionDecode,
-                     .insertFp = (SdbInsertFp)mndConsumerActionInsert,
-                     .updateFp = (SdbUpdateFp)mndConsumerActionUpdate,
-                     .deleteFp = (SdbDeleteFp)mndConsumerActionDelete};
+  SSdbTable table = {
+      .sdbType = SDB_CONSUMER,
+      .keyType = SDB_KEY_INT64,
+      .encodeFp = (SdbEncodeFp)mndConsumerActionEncode,
+      .decodeFp = (SdbDecodeFp)mndConsumerActionDecode,
+      .insertFp = (SdbInsertFp)mndConsumerActionInsert,
+      .updateFp = (SdbUpdateFp)mndConsumerActionUpdate,
+      .deleteFp = (SdbDeleteFp)mndConsumerActionDelete,
+  };
 
   mndSetMsgHandle(pMnode, TDMT_MND_SUBSCRIBE, mndProcessSubscribeReq);
   mndSetMsgHandle(pMnode, TDMT_MND_MQ_HB, mndProcessMqHbReq);
@@ -176,6 +178,8 @@ static int32_t mndProcessMqTimerMsg(SRpcMsg *pMsg) {
   SMqConsumerObj *pConsumer;
   void           *pIter = NULL;
 
+  mTrace("start to process mq timer");
+
   // rebalance cannot be parallel
   if (!mndRebTryStart()) {
     mInfo("mq rebalance already in progress, do nothing");

source/dnode/mnode/impl/src/mndFunc.c

@@ -38,13 +38,15 @@ static int32_t  mndRetrieveFuncs(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
 static void     mndCancelGetNextFunc(SMnode *pMnode, void *pIter);
 
 int32_t mndInitFunc(SMnode *pMnode) {
-  SSdbTable table = {.sdbType = SDB_FUNC,
-                     .keyType = SDB_KEY_BINARY,
-                     .encodeFp = (SdbEncodeFp)mndFuncActionEncode,
-                     .decodeFp = (SdbDecodeFp)mndFuncActionDecode,
-                     .insertFp = (SdbInsertFp)mndFuncActionInsert,
-                     .updateFp = (SdbUpdateFp)mndFuncActionUpdate,
-                     .deleteFp = (SdbDeleteFp)mndFuncActionDelete};
+  SSdbTable table = {
+      .sdbType = SDB_FUNC,
+      .keyType = SDB_KEY_BINARY,
+      .encodeFp = (SdbEncodeFp)mndFuncActionEncode,
+      .decodeFp = (SdbDecodeFp)mndFuncActionDecode,
+      .insertFp = (SdbInsertFp)mndFuncActionInsert,
+      .updateFp = (SdbUpdateFp)mndFuncActionUpdate,
+      .deleteFp = (SdbDeleteFp)mndFuncActionDelete,
+  };
 
   mndSetMsgHandle(pMnode, TDMT_MND_CREATE_FUNC, mndProcessCreateFuncReq);
   mndSetMsgHandle(pMnode, TDMT_MND_DROP_FUNC, mndProcessDropFuncReq);

source/dnode/mnode/impl/src/mndMain.c

@@ -119,28 +119,30 @@ static void *mndThreadFp(void *param) {
     lastTime++;
     taosMsleep(100);
     if (mndGetStop(pMnode)) break;
+    if (lastTime % 10 != 0) continue;
 
-    if (lastTime % (tsTtlPushInterval * 10) == 1) {
+    int64_t sec = lastTime / 10;
+    if (sec % tsTtlPushInterval == 0) {
       mndPullupTtl(pMnode);
     }
 
-    if (lastTime % (tsTransPullupInterval * 10) == 0) {
+    if (sec % tsTransPullupInterval == 0) {
       mndPullupTrans(pMnode);
     }
 
-    if (lastTime % (tsMqRebalanceInterval * 10) == 0) {
+    if (sec % tsMqRebalanceInterval == 0) {
       mndCalMqRebalance(pMnode);
     }
 
-    if (lastTime % (tsTelemInterval * 10) == ((tsTelemInterval - 1) * 10)) {
+    if (sec % tsTelemInterval == (TMIN(60, (tsTelemInterval - 1)))) {
       mndPullupTelem(pMnode);
     }
 
-    if (lastTime % (tsGrantHBInterval * 10) == 0) {
+    if (sec % tsGrantHBInterval == 0) {
       mndPullupGrant(pMnode);
     }
 
-    if ((lastTime % (tsUptimeInterval * 10)) == ((tsUptimeInterval - 1) * 10)) {
+    if (sec % tsUptimeInterval == 0) {
       mndIncreaseUpTime(pMnode);
     }
   }
@@ -399,15 +401,15 @@ void mndPreClose(SMnode *pMnode) {
     atomic_store_8(&(pMnode->syncMgmt.leaderTransferFinish), 0);
     syncLeaderTransfer(pMnode->syncMgmt.sync);
 
-    /*
-        mInfo("vgId:1, mnode start leader transfer");
-        // wait for leader transfer finish
-        while (!atomic_load_8(&(pMnode->syncMgmt.leaderTransferFinish))) {
-          taosMsleep(10);
-          mInfo("vgId:1, mnode waiting for leader transfer");
-        }
-        mInfo("vgId:1, mnode finish leader transfer");
-    */
+#if 0
+    mInfo("vgId:1, mnode start leader transfer");
+    // wait for leader transfer finish
+    while (!atomic_load_8(&(pMnode->syncMgmt.leaderTransferFinish))) {
+      taosMsleep(10);
+      mInfo("vgId:1, mnode waiting for leader transfer");
+    }
+    mInfo("vgId:1, mnode finish leader transfer");
+#endif
   }
 }
 

source/dnode/mnode/impl/src/mndStb.c

@@ -834,6 +834,8 @@ static int32_t mndProcessTtlTimer(SRpcMsg *pReq) {
   int32_t           reqLen = tSerializeSVDropTtlTableReq(NULL, 0, &ttlReq);
   int32_t           contLen = reqLen + sizeof(SMsgHead);
 
+  mInfo("start to process ttl timer");
+
   while (1) {
     pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup);
     if (pIter == NULL) break;
@@ -2579,3 +2581,14 @@ static void mndCancelGetNextStb(SMnode *pMnode, void *pIter) {
   SSdb *pSdb = pMnode->pSdb;
   sdbCancelFetch(pSdb, pIter);
 }
+
+const char *mndGetStbStr(const char *src) {
+  char *posDb = strstr(src, TS_PATH_DELIMITER);
+  if (posDb != NULL) ++posDb;
+  if (posDb == NULL) return src;
+
+  char *posStb = strstr(posDb, TS_PATH_DELIMITER);
+  if (posStb != NULL) ++posStb;
+  if (posStb == NULL) return posDb;
+  return posStb;
+}
\ No newline at end of file

source/dnode/mnode/impl/src/mndTelem.c

@@ -133,7 +133,7 @@ static int32_t mndProcessTelemTimer(SRpcMsg* pReq) {
     if (taosSendHttpReport(tsTelemServer, tsTelemPort, pCont, strlen(pCont), HTTP_FLAT) != 0) {
       mError("failed to send telemetry report");
     } else {
-      mTrace("succeed to send telemetry report");
+      mInfo("succeed to send telemetry report");
     }
     taosMemoryFree(pCont);
   }

source/dnode/mnode/impl/src/mndTrans.c

@@ -1478,6 +1478,7 @@ void mndTransExecute(SMnode *pMnode, STrans *pTrans) {
 }
 
 static int32_t mndProcessTransTimer(SRpcMsg *pReq) {
+  mTrace("start to process trans timer");
   mndTransPullup(pReq->info.node);
   return 0;
 }
@@ -1604,7 +1605,7 @@ static int32_t mndRetrieveTrans(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)dbname, false);
 
-    char stbname[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
+    char stbname[TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
     STR_WITH_MAXSIZE_TO_VARSTR(stbname, mndGetDbStr(pTrans->stbname), pShow->pMeta->pSchemas[cols].bytes);
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)stbname, false);

source/dnode/mnode/sdb/src/sdbFile.c

@@ -514,7 +514,7 @@ static void sdbCloseIter(SSdbIter *pIter) {
   }
 
   if (pIter->name != NULL) {
-    taosRemoveFile(pIter->name);
+    (void)taosRemoveFile(pIter->name);
     taosMemoryFree(pIter->name);
     pIter->name = NULL;
   }
@@ -606,6 +606,7 @@ int32_t sdbStartWrite(SSdb *pSdb, SSdbIter **ppIter) {
   if (pIter->file == NULL) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     mError("failed to open %s since %s", pIter->name, terrstr());
+    sdbCloseIter(pIter);
     return -1;
   }
 
@@ -636,9 +637,9 @@ int32_t sdbStopWrite(SSdb *pSdb, SSdbIter *pIter, bool isApply, int64_t index, i
     return -1;
   }
 
-  sdbCloseIter(pIter);
   if (sdbReadFile(pSdb) != 0) {
     mError("sdbiter:%p, failed to read from %s since %s", pIter, datafile, terrstr());
+    sdbCloseIter(pIter);
     return -1;
   }
 
@@ -656,6 +657,7 @@ int32_t sdbStopWrite(SSdb *pSdb, SSdbIter *pIter, bool isApply, int64_t index, i
   }
 
   mInfo("sdbiter:%p, success applyed to sdb", pIter);
+  sdbCloseIter(pIter);
   return 0;
 }
 

source/dnode/mnode/sdb/src/sdbHash.c

@@ -40,6 +40,8 @@ const char *sdbTableName(ESdbType type) {
       return "auth";
     case SDB_ACCT:
       return "acct";
+    case SDB_STREAM_CK:
+      return "stream_ck";
     case SDB_STREAM:
       return "stream";
     case SDB_OFFSET:
@@ -219,14 +221,15 @@ static int32_t sdbDeleteRow(SSdb *pSdb, SHashObj *hash, SSdbRaw *pRaw, SSdbRow *
     return terrno;
   }
   SSdbRow *pOldRow = *ppOldRow;
-
   pOldRow->status = pRaw->status;
+
+  atomic_add_fetch_32(&pOldRow->refCount, 1);
   sdbPrintOper(pSdb, pOldRow, "delete");
 
   taosHashRemove(hash, pOldRow->pObj, keySize);
+  pSdb->tableVer[pOldRow->type]++;
   taosThreadRwlockUnlock(pLock);
 
-  pSdb->tableVer[pOldRow->type]++;
   sdbFreeRow(pSdb, pRow, false);
 
   sdbCheckRow(pSdb, pOldRow);
@@ -315,7 +318,7 @@ static void sdbCheckRow(SSdb *pSdb, SSdbRow *pRow) {
   TdThreadRwlock *pLock = &pSdb->locks[pRow->type];
   taosThreadRwlockWrlock(pLock);
 
-  int32_t ref = atomic_load_32(&pRow->refCount);
+  int32_t ref = atomic_sub_fetch_32(&pRow->refCount, 1);
   sdbPrintOper(pSdb, pRow, "check");
   if (ref <= 0 && pRow->status == SDB_STATUS_DROPPED) {
     sdbFreeRow(pSdb, pRow, true);

source/dnode/vnode/src/inc/tsdb.h

@@ -32,6 +32,12 @@ extern "C" {
 #define tsdbTrace(...) do { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TSD ", DEBUG_TRACE, tsdbDebugFlag, __VA_ARGS__); }} while(0)
 // clang-format on
 
+#define TSDB_CHECK_CODE(CODE, LINO, LABEL) \
+  if (CODE) {                              \
+    LINO = __LINE__;                       \
+    goto LABEL;                            \
+  }
+
 typedef struct TSDBROW       TSDBROW;
 typedef struct TABLEID       TABLEID;
 typedef struct TSDBKEY       TSDBKEY;
@@ -88,9 +94,8 @@ typedef struct SLDataIter    SLDataIter;
 static FORCE_INLINE int64_t tsdbLogicToFileSize(int64_t lSize, int32_t szPage) {
   int64_t fOffSet = LOGIC_TO_FILE_OFFSET(lSize, szPage);
   int64_t pgno = OFFSET_PGNO(fOffSet, szPage);
-  int32_t szPageCont = PAGE_CONTENT_SIZE(szPage);
 
-  if (fOffSet % szPageCont == 0) {
+  if (fOffSet % szPage == 0) {
     pgno--;
   }
 
@@ -151,7 +156,7 @@ int32_t tCmprBlockL(void const *lhs, void const *rhs);
 
 int32_t   tBlockDataCreate(SBlockData *pBlockData);
 void      tBlockDataDestroy(SBlockData *pBlockData, int8_t deepClear);
-int32_t   tBlockDataInit(SBlockData *pBlockData, int64_t suid, int64_t uid, STSchema *pTSchema);
+int32_t   tBlockDataInit(SBlockData *pBlockData, TABLEID *pId, STSchema *pTSchema, int16_t *aCid, int32_t nCid);
 int32_t   tBlockDataInitEx(SBlockData *pBlockData, SBlockData *pBlockDataFrom);
 void      tBlockDataReset(SBlockData *pBlockData);
 int32_t   tBlockDataAppendRow(SBlockData *pBlockData, TSDBROW *pRow, STSchema *pTSchema, int64_t uid);
@@ -273,6 +278,7 @@ int32_t tsdbReadSttBlk(SDataFReader *pReader, int32_t iStt, SArray *aSttBlk);
 int32_t tsdbReadBlockSma(SDataFReader *pReader, SDataBlk *pBlock, SArray *aColumnDataAgg);
 int32_t tsdbReadDataBlock(SDataFReader *pReader, SDataBlk *pBlock, SBlockData *pBlockData);
 int32_t tsdbReadSttBlock(SDataFReader *pReader, int32_t iStt, SSttBlk *pSttBlk, SBlockData *pBlockData);
+int32_t tsdbReadSttBlockEx(SDataFReader *pReader, int32_t iStt, SSttBlk *pSttBlk, SBlockData *pBlockData);
 // SDelFWriter
 int32_t tsdbDelFWriterOpen(SDelFWriter **ppWriter, SDelFile *pFile, STsdb *pTsdb);
 int32_t tsdbDelFWriterClose(SDelFWriter **ppWriter, int8_t sync);
@@ -285,8 +291,8 @@ int32_t tsdbDelFReaderClose(SDelFReader **ppReader);
 int32_t tsdbReadDelData(SDelFReader *pReader, SDelIdx *pDelIdx, SArray *aDelData);
 int32_t tsdbReadDelIdx(SDelFReader *pReader, SArray *aDelIdx);
 // tsdbRead.c ==============================================================================================
-int32_t tsdbTakeReadSnap(STsdb *pTsdb, STsdbReadSnap **ppSnap, const char* id);
-void    tsdbUntakeReadSnap(STsdb *pTsdb, STsdbReadSnap *pSnap, const char* id);
+int32_t tsdbTakeReadSnap(STsdb *pTsdb, STsdbReadSnap **ppSnap, const char *id);
+void    tsdbUntakeReadSnap(STsdb *pTsdb, STsdbReadSnap *pSnap, const char *id);
 // tsdbMerge.c ==============================================================================================
 int32_t tsdbMerge(STsdb *pTsdb);
 
@@ -634,6 +640,9 @@ typedef struct SSttBlockLoadInfo {
   int32_t    currentLoadBlockIndex;
   int32_t    loadBlocks;
   double     elapsedTime;
+  STSchema  *pSchema;
+  int16_t   *colIds;
+  int32_t    numOfCols;
 } SSttBlockLoadInfo;
 
 typedef struct SMergeTree {
@@ -653,13 +662,14 @@ typedef struct {
 } SSkmInfo;
 
 int32_t tMergeTreeOpen(SMergeTree *pMTree, int8_t backward, SDataFReader *pFReader, uint64_t suid, uint64_t uid,
-                       STimeWindow *pTimeWindow, SVersionRange *pVerRange, void *pLoadInfo, const char *idStr);
+                       STimeWindow *pTimeWindow, SVersionRange *pVerRange, void *pBlockLoadInfo, STSchema *pSchema,
+                       int16_t *pCols, int32_t numOfCols, const char *idStr);
 void    tMergeTreeAddIter(SMergeTree *pMTree, SLDataIter *pIter);
 bool    tMergeTreeNext(SMergeTree *pMTree);
 TSDBROW tMergeTreeGetRow(SMergeTree *pMTree);
 void    tMergeTreeClose(SMergeTree *pMTree);
 
-SSttBlockLoadInfo *tCreateLastBlockLoadInfo();
+SSttBlockLoadInfo *tCreateLastBlockLoadInfo(STSchema *pSchema, int16_t *colList, int32_t numOfCols);
 void               resetLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo);
 void               getLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo, int64_t *blocks, double *el);
 void              *destroyLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo);

source/dnode/vnode/src/tsdb/tsdbCache.c

@@ -272,8 +272,8 @@ int32_t tsdbCacheInsertLast(SLRUCache *pCache, tb_uid_t uid, STSRow *row, STsdb
 
         SColVal colVal = {0};
         tTSRowGetVal(row, pTSchema, iCol, &colVal);
-        if (colVal.isNone || colVal.isNull) {
-          if (keyTs == tTsVal1->ts && !tColVal->isNone && !tColVal->isNull) {
+        if (!COL_VAL_IS_VALUE(&colVal)) {
+          if (keyTs == tTsVal1->ts && COL_VAL_IS_VALUE(tColVal)) {
             invalidate = true;
 
             break;
@@ -457,7 +457,7 @@ static int32_t getNextRowFromFSLast(void *iter, TSDBROW **ppRow) {
 
       tMergeTreeOpen(&state->mergeTree, 1, state->pDataFReader, state->suid, state->uid,
                      &(STimeWindow){.skey = TSKEY_MIN, .ekey = TSKEY_MAX},
-                     &(SVersionRange){.minVer = 0, .maxVer = UINT64_MAX}, NULL, NULL);
+                     &(SVersionRange){.minVer = 0, .maxVer = UINT64_MAX}, NULL, NULL, NULL, 0, NULL);
       bool hasVal = tMergeTreeNext(&state->mergeTree);
       if (!hasVal) {
         state->state = SFSLASTNEXTROW_FILESET;
@@ -612,7 +612,8 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
         tMapDataGetItemByIdx(&state->blockMap, state->iBlock, &block, tGetDataBlk);
         /* code = tsdbReadBlockData(state->pDataFReader, &state->blockIdx, &block, &state->blockData, NULL, NULL); */
         tBlockDataReset(state->pBlockData);
-        code = tBlockDataInit(state->pBlockData, state->suid, state->uid, state->pTSchema);
+        TABLEID tid = {.suid = state->suid, .uid = state->uid};
+        code = tBlockDataInit(state->pBlockData, &tid, state->pTSchema, NULL, 0);
         if (code) goto _err;
 
         code = tsdbReadDataBlock(state->pDataFReader, &block, state->pBlockData);
@@ -1062,7 +1063,7 @@ static int32_t mergeLastRow(tb_uid_t uid, STsdb *pTsdb, bool *dup, STSRow **ppRo
           goto _err;
         }
 
-        if (pColVal->isNone && !setNoneCol) {
+        if (COL_VAL_IS_NONE(pColVal) && !setNoneCol) {
           noneCol = iCol;
           setNoneCol = true;
         }
@@ -1087,9 +1088,9 @@ static int32_t mergeLastRow(tb_uid_t uid, STsdb *pTsdb, bool *dup, STSRow **ppRo
       SColVal *tColVal = (SColVal *)taosArrayGet(pColArray, iCol);
 
       tsdbRowGetColVal(pRow, pTSchema, iCol, pColVal);
-      if (tColVal->isNone && !pColVal->isNone) {
+      if (COL_VAL_IS_NONE(tColVal) && !COL_VAL_IS_NONE(pColVal)) {
         taosArraySet(pColArray, iCol, pColVal);
-      } else if (tColVal->isNone && pColVal->isNone && !setNoneCol) {
+      } else if (COL_VAL_IS_NONE(tColVal) && COL_VAL_IS_NONE(pColVal) && !setNoneCol) {
         noneCol = iCol;
         setNoneCol = true;
       }
@@ -1161,7 +1162,7 @@ static int32_t mergeLast(tb_uid_t uid, STsdb *pTsdb, SArray **ppLastArray) {
           goto _err;
         }
 
-        if ((pColVal->isNone || pColVal->isNull) && !setNoneCol) {
+        if (!COL_VAL_IS_VALUE(pColVal) && !setNoneCol) {
           noneCol = iCol;
           setNoneCol = true;
         }
@@ -1181,9 +1182,9 @@ static int32_t mergeLast(tb_uid_t uid, STsdb *pTsdb, SArray **ppLastArray) {
       SColVal *tColVal = (SColVal *)taosArrayGet(pColArray, iCol);
 
       tsdbRowGetColVal(pRow, pTSchema, iCol, pColVal);
-      if ((tColVal->isNone || tColVal->isNull) && (!pColVal->isNone && !pColVal->isNull)) {
+      if (!COL_VAL_IS_VALUE(tColVal) && COL_VAL_IS_VALUE(pColVal)) {
         taosArraySet(pColArray, iCol, &(SLastCol){.ts = rowTs, .colVal = *pColVal});
-      } else if ((tColVal->isNone || tColVal->isNull) && (pColVal->isNone || pColVal->isNull) && !setNoneCol) {
+      } else if (!COL_VAL_IS_VALUE(tColVal) && !COL_VAL_IS_VALUE(pColVal) && !setNoneCol) {
         noneCol = iCol;
         setNoneCol = true;
       }

source/dnode/vnode/src/tsdb/tsdbCacheRead.c

@@ -45,7 +45,7 @@ static void saveOneRow(STSRow* pRow, SSDataBlock* pBlock, SCacheRowsReader* pRea
       tTSRowGetVal(pRow, pReader->pSchema, slotId, &colVal);
 
       if (IS_VAR_DATA_TYPE(colVal.type)) {
-        if (colVal.isNull || colVal.isNone) {
+        if (!COL_VAL_IS_VALUE(&colVal)) {
           colDataAppendNULL(pColInfoData, numOfRows);
         } else {
           varDataSetLen(pReader->transferBuf[slotId], colVal.value.nData);
@@ -53,7 +53,7 @@ static void saveOneRow(STSRow* pRow, SSDataBlock* pBlock, SCacheRowsReader* pRea
           colDataAppend(pColInfoData, numOfRows, pReader->transferBuf[slotId], false);
         }
       } else {
-        colDataAppend(pColInfoData, numOfRows, (const char*)&colVal.value, colVal.isNull || colVal.isNone);
+        colDataAppend(pColInfoData, numOfRows, (const char*)&colVal.value, !COL_VAL_IS_VALUE(&colVal));
       }
     }
   }
@@ -84,7 +84,7 @@ int32_t tsdbCacherowsReaderOpen(void* pVnode, int32_t type, SArray* pTableIdList
 
   p->transferBuf = taosMemoryCalloc(p->pSchema->numOfCols, POINTER_BYTES);
   if (p->transferBuf == NULL) {
-    return  TSDB_CODE_OUT_OF_MEMORY;
+    return TSDB_CODE_OUT_OF_MEMORY;
   }
 
   for (int32_t i = 0; i < p->pSchema->numOfCols; ++i) {
@@ -117,7 +117,8 @@ int32_t tsdbCacherowsReaderClose(void* pReader) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t doExtractCacheRow(SCacheRowsReader* pr, SLRUCache* lruCache, uint64_t uid, STSRow** pRow, LRUHandle** h) {
+static int32_t doExtractCacheRow(SCacheRowsReader* pr, SLRUCache* lruCache, uint64_t uid, STSRow** pRow,
+                                 LRUHandle** h) {
   int32_t code = TSDB_CODE_SUCCESS;
   if ((pr->type & CACHESCAN_RETRIEVE_LAST_ROW) == CACHESCAN_RETRIEVE_LAST_ROW) {
     code = tsdbCacheGetLastrowH(lruCache, uid, pr->pVnode->pTsdb, h);
@@ -166,7 +167,7 @@ int32_t tsdbRetrieveCacheRows(void* pReader, SSDataBlock* pResBlock, const int32
       STableKeyInfo* pKeyInfo = taosArrayGet(pr->pTableList, i);
 
       code = doExtractCacheRow(pr, lruCache, pKeyInfo->uid, &pRow, &h);
-      if (code != TSDB_CODE_SUCCESS)  {
+      if (code != TSDB_CODE_SUCCESS) {
         return code;
       }
 
@@ -194,7 +195,7 @@ int32_t tsdbRetrieveCacheRows(void* pReader, SSDataBlock* pResBlock, const int32
     for (int32_t i = pr->tableIndex; i < numOfTables; ++i) {
       STableKeyInfo* pKeyInfo = taosArrayGet(pr->pTableList, i);
       code = doExtractCacheRow(pr, lruCache, pKeyInfo->uid, &pRow, &h);
-      if (code != TSDB_CODE_SUCCESS)  {
+      if (code != TSDB_CODE_SUCCESS) {
         return code;
       }
 

source/dnode/vnode/src/tsdb/tsdbCommit.c

@@ -437,7 +437,7 @@ static int32_t tsdbOpenCommitIter(SCommitter *pCommitter) {
 
         pIter->iSttBlk = 0;
         SSttBlk *pSttBlk = (SSttBlk *)taosArrayGet(pIter->aSttBlk, 0);
-        code = tsdbReadSttBlock(pCommitter->dReader.pReader, iStt, pSttBlk, &pIter->bData);
+        code = tsdbReadSttBlockEx(pCommitter->dReader.pReader, iStt, pSttBlk, &pIter->bData);
         if (code) goto _err;
 
         pIter->iRow = 0;
@@ -1049,7 +1049,7 @@ static int32_t tsdbNextCommitRow(SCommitter *pCommitter) {
         if (pIter->iSttBlk < taosArrayGetSize(pIter->aSttBlk)) {
           SSttBlk *pSttBlk = (SSttBlk *)taosArrayGet(pIter->aSttBlk, pIter->iSttBlk);
 
-          code = tsdbReadSttBlock(pCommitter->dReader.pReader, pIter->iStt, pSttBlk, &pIter->bData);
+          code = tsdbReadSttBlockEx(pCommitter->dReader.pReader, pIter->iStt, pSttBlk, &pIter->bData);
           if (code) goto _exit;
 
           pIter->iRow = 0;
@@ -1305,7 +1305,8 @@ static int32_t tsdbInitLastBlockIfNeed(SCommitter *pCommitter, TABLEID id) {
   if (!pBDatal->suid && !pBDatal->uid) {
     ASSERT(pCommitter->skmTable.suid == id.suid);
     ASSERT(pCommitter->skmTable.uid == id.uid);
-    code = tBlockDataInit(pBDatal, id.suid, id.suid ? 0 : id.uid, pCommitter->skmTable.pTSchema);
+    TABLEID tid = {.suid = id.suid, .uid = id.suid ? 0 : id.uid};
+    code = tBlockDataInit(pBDatal, &tid, pCommitter->skmTable.pTSchema, NULL, 0);
     if (code) goto _exit;
   }
 
@@ -1428,9 +1429,9 @@ static int32_t tsdbCommitFileDataImpl(SCommitter *pCommitter) {
     // impl
     code = tsdbUpdateTableSchema(pCommitter->pTsdb->pVnode->pMeta, id.suid, id.uid, &pCommitter->skmTable);
     if (code) goto _err;
-    code = tBlockDataInit(&pCommitter->dReader.bData, id.suid, id.uid, pCommitter->skmTable.pTSchema);
+    code = tBlockDataInit(&pCommitter->dReader.bData, &id, pCommitter->skmTable.pTSchema, NULL, 0);
     if (code) goto _err;
-    code = tBlockDataInit(&pCommitter->dWriter.bData, id.suid, id.uid, pCommitter->skmTable.pTSchema);
+    code = tBlockDataInit(&pCommitter->dWriter.bData, &id, pCommitter->skmTable.pTSchema, NULL, 0);
     if (code) goto _err;
 
     /* merge with data in .data file */

source/dnode/vnode/src/tsdb/tsdbMergeTree.c

@@ -28,11 +28,10 @@ struct SLDataIter {
   uint64_t      uid;
   STimeWindow   timeWindow;
   SVersionRange verRange;
-
   SSttBlockLoadInfo* pBlockLoadInfo;
 };
 
-SSttBlockLoadInfo* tCreateLastBlockLoadInfo() {
+SSttBlockLoadInfo* tCreateLastBlockLoadInfo(STSchema* pSchema, int16_t* colList, int32_t numOfCols) {
   SSttBlockLoadInfo* pLoadInfo = taosMemoryCalloc(TSDB_DEFAULT_STT_FILE, sizeof(SSttBlockLoadInfo));
   if (pLoadInfo == NULL) {
     terrno =  TSDB_CODE_OUT_OF_MEMORY;
@@ -55,6 +54,9 @@ SSttBlockLoadInfo* tCreateLastBlockLoadInfo() {
     }
 
     pLoadInfo[i].aSttBlk = taosArrayInit(4, sizeof(SSttBlk));
+    pLoadInfo[i].pSchema = pSchema;
+    pLoadInfo[i].colIds = colList;
+    pLoadInfo[i].numOfCols = numOfCols;
   }
 
   return pLoadInfo;
@@ -111,7 +113,19 @@ static SBlockData* loadLastBlock(SLDataIter *pIter, const char* idStr) {
   pInfo->currentLoadBlockIndex ^= 1;
   if (pIter->pSttBlk != NULL) {  // current block not loaded yet
     int64_t st = taosGetTimestampUs();
-    code = tsdbReadSttBlock(pIter->pReader, pIter->iStt, pIter->pSttBlk, &pInfo->blockData[pInfo->currentLoadBlockIndex]);
+
+    SBlockData* pBlock = &pInfo->blockData[pInfo->currentLoadBlockIndex];
+
+    TABLEID id = {0};
+    if (pIter->pSttBlk->suid != 0) {
+      id.suid = pIter->pSttBlk->suid;
+    } else {
+      id.uid = pIter->uid;
+    }
+
+    tBlockDataInit(pBlock, &id, pInfo->pSchema, pInfo->colIds, pInfo->numOfCols);
+    code = tsdbReadSttBlock(pIter->pReader, pIter->iStt, pIter->pSttBlk, pBlock);
+
     double el = (taosGetTimestampUs() - st)/ 1000.0;
     pInfo->elapsedTime += el;
     pInfo->loadBlocks += 1;
@@ -460,7 +474,8 @@ static FORCE_INLINE int32_t tLDataIterCmprFn(const void *p1, const void *p2) {
 }
 
 int32_t tMergeTreeOpen(SMergeTree *pMTree, int8_t backward, SDataFReader *pFReader, uint64_t suid, uint64_t uid,
-                       STimeWindow *pTimeWindow, SVersionRange *pVerRange, void* pBlockLoadInfo, const char* idStr) {
+                       STimeWindow *pTimeWindow, SVersionRange *pVerRange, void* pBlockLoadInfo, STSchema* pSchema,
+                       int16_t* pCols, int32_t numOfCols, const char* idStr) {
   pMTree->backward = backward;
   pMTree->pIter = NULL;
   pMTree->pIterList = taosArrayInit(4, POINTER_BYTES);
@@ -475,9 +490,10 @@ int32_t tMergeTreeOpen(SMergeTree *pMTree, int8_t backward, SDataFReader *pFRead
 
   SSttBlockLoadInfo* pLoadInfo = NULL;
   if (pBlockLoadInfo == NULL) {
+    ASSERT(0);
     if (pMTree->pLoadInfo == NULL) {
       pMTree->destroyLoadInfo = true;
-      pMTree->pLoadInfo = tCreateLastBlockLoadInfo();
+      pMTree->pLoadInfo = tCreateLastBlockLoadInfo(pSchema, pCols, numOfCols);
     }
 
     pLoadInfo = pMTree->pLoadInfo;

source/dnode/vnode/src/tsdb/tsdbRead.c

@@ -79,6 +79,7 @@ typedef struct SBlockLoadSuppInfo {
   SColumnDataAgg   tsColAgg;
   SColumnDataAgg** plist;
   int16_t*         colIds;    // column ids for loading file block data
+  int32_t          numOfCols;
   char**           buildBuf;  // build string tmp buffer, todo remove it later after all string format being updated.
 } SBlockLoadSuppInfo;
 
@@ -203,6 +204,7 @@ static int32_t setColumnIdSlotList(STsdbReader* pReader, SSDataBlock* pBlock) {
 
   size_t numOfCols = blockDataGetNumOfCols(pBlock);
 
+  pSupInfo->numOfCols = numOfCols;
   pSupInfo->colIds = taosMemoryMalloc(numOfCols * sizeof(int16_t));
   pSupInfo->buildBuf = taosMemoryCalloc(numOfCols, POINTER_BYTES);
   if (pSupInfo->buildBuf == NULL || pSupInfo->colIds == NULL) {
@@ -352,7 +354,8 @@ static int32_t initFilesetIterator(SFilesetIter* pIter, SArray* aDFileSet, STsdb
   tMergeTreeClose(&pLReader->mergeTree);
 
   if (pLReader->pInfo == NULL) {
-    pLReader->pInfo = tCreateLastBlockLoadInfo();
+    // here we ignore the first column, which is always be the primary timestamp column
+    pLReader->pInfo = tCreateLastBlockLoadInfo(pReader->pSchema, &pReader->suppInfo.colIds[1], pReader->suppInfo.numOfCols - 1);
     if (pLReader->pInfo == NULL) {
       tsdbDebug("init fileset iterator failed, code:%s %s", tstrerror(terrno), pReader->idStr);
       return terrno;
@@ -662,7 +665,7 @@ static void setBlockAllDumped(SFileBlockDumpInfo* pDumpInfo, int64_t maxKey, int
 static void doCopyColVal(SColumnInfoData* pColInfoData, int32_t rowIndex, int32_t colIndex, SColVal* pColVal,
                          SBlockLoadSuppInfo* pSup) {
   if (IS_VAR_DATA_TYPE(pColVal->type)) {
-    if (pColVal->isNull || pColVal->isNone) {
+    if (!COL_VAL_IS_VALUE(pColVal)) {
       colDataAppendNULL(pColInfoData, rowIndex);
     } else {
       varDataSetLen(pSup->buildBuf[colIndex], pColVal->value.nData);
@@ -671,7 +674,7 @@ static void doCopyColVal(SColumnInfoData* pColInfoData, int32_t rowIndex, int32_
       colDataAppend(pColInfoData, rowIndex, pSup->buildBuf[colIndex], false);
     }
   } else {
-    colDataAppend(pColInfoData, rowIndex, (const char*)&pColVal->value, pColVal->isNull || pColVal->isNone);
+    colDataAppend(pColInfoData, rowIndex, (const char*)&pColVal->value, !COL_VAL_IS_VALUE(pColVal));
   }
 }
 
@@ -760,51 +763,43 @@ static int doBinarySearchKey(TSKEY* keyList, int num, int pos, TSKEY key, int or
   s = pos;
 
   // check
-  assert(pos >=0 && pos < num);
+  assert(pos >= 0 && pos < num);
   assert(num > 0);
 
   if (order == TSDB_ORDER_ASC) {
     // find the first position which is smaller than the key
-    e  = num - 1;
-    if (key < keyList[pos])
-      return -1;
+    e = num - 1;
+    if (key < keyList[pos]) return -1;
     while (1) {
       // check can return
-      if (key >= keyList[e])
-        return e;
-      if (key <= keyList[s])
-        return s;
-      if (e - s <= 1)
-        return s;
+      if (key >= keyList[e]) return e;
+      if (key <= keyList[s]) return s;
+      if (e - s <= 1) return s;
 
       // change start or end position
-      int mid = s + (e - s + 1)/2;
+      int mid = s + (e - s + 1) / 2;
       if (keyList[mid] > key)
         e = mid;
-      else if(keyList[mid] < key)
+      else if (keyList[mid] < key)
         s = mid;
       else
         return mid;
     }
-  } else { // DESC
+  } else {  // DESC
     // find the first position which is bigger than the key
-    e  = 0;
-    if (key > keyList[pos])
-      return -1;
+    e = 0;
+    if (key > keyList[pos]) return -1;
     while (1) {
       // check can return
-      if (key <= keyList[e])
-        return e;
-      if (key >= keyList[s])
-        return s;
-      if (s - e <= 1)
-        return s;
+      if (key <= keyList[e]) return e;
+      if (key >= keyList[s]) return s;
+      if (s - e <= 1) return s;
 
       // change start or end position
-      int mid = s - (s - e + 1)/2;
+      int mid = s - (s - e + 1) / 2;
       if (keyList[mid] < key)
         e = mid;
-      else if(keyList[mid] > key)
+      else if (keyList[mid] > key)
         s = mid;
       else
         return mid;
@@ -815,7 +810,7 @@ static int doBinarySearchKey(TSKEY* keyList, int num, int pos, TSKEY key, int or
 int32_t getEndPosInDataBlock(STsdbReader* pReader, SBlockData* pBlockData, SDataBlk* pBlock, int32_t pos) {
   // NOTE: reverse the order to find the end position in data block
   int32_t endPos = -1;
-  bool asc = ASCENDING_TRAVERSE(pReader->order);
+  bool    asc = ASCENDING_TRAVERSE(pReader->order);
 
   if (asc && pReader->window.ekey >= pBlock->maxKey.ts) {
     endPos = pBlock->nRow - 1;
@@ -851,8 +846,8 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
   } else if (!asc && pReader->window.ekey >= pBlock->maxKey.ts) {
     pDumpInfo->rowIndex = pBlock->nRow - 1;
   } else {
-    int32_t pos = asc? pBlock->nRow-1:0;
-    int32_t order = (pReader->order == TSDB_ORDER_ASC)? TSDB_ORDER_DESC:TSDB_ORDER_ASC;
+    int32_t pos = asc ? pBlock->nRow - 1 : 0;
+    int32_t order = (pReader->order == TSDB_ORDER_ASC) ? TSDB_ORDER_DESC : TSDB_ORDER_ASC;
     pDumpInfo->rowIndex = doBinarySearchKey(pBlockData->aTSKEY, pBlock->nRow, pos, pReader->window.skey, order);
   }
 
@@ -865,13 +860,13 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
 
   endIndex += step;
   int32_t remain = asc ? (endIndex - pDumpInfo->rowIndex) : (pDumpInfo->rowIndex - endIndex);
-  if (remain > pReader->capacity) { // output buffer check
+  if (remain > pReader->capacity) {  // output buffer check
     remain = pReader->capacity;
   }
 
   int32_t rowIndex = 0;
 
-  int32_t i = 0;
+  int32_t          i = 0;
   SColumnInfoData* pColData = taosArrayGet(pResBlock->pDataBlock, i);
   if (pColData->info.colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
     if (asc) {
@@ -895,7 +890,7 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
     if (pData->cid < pColData->info.colId) {
       colIndex += 1;
     } else if (pData->cid == pColData->info.colId) {
-      if (pData->flag == HAS_NONE || pData->flag == HAS_NULL || pData->flag == (HAS_NULL|HAS_NONE)) {
+      if (pData->flag == HAS_NONE || pData->flag == HAS_NULL || pData->flag == (HAS_NULL | HAS_NONE)) {
         colDataAppendNNULL(pColData, 0, remain);
       } else {
         if (IS_NUMERIC_TYPE(pColData->info.type) && asc) {
@@ -940,7 +935,7 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
     int64_t ts = pBlockData->aTSKEY[pDumpInfo->rowIndex];
     setBlockAllDumped(pDumpInfo, ts, pReader->order);
   } else {
-    int64_t k = asc? pBlock->maxKey.ts:pBlock->minKey.ts;
+    int64_t k = asc ? pBlock->maxKey.ts : pBlock->minKey.ts;
     setBlockAllDumped(pDumpInfo, k, pReader->order);
   }
 
@@ -950,8 +945,8 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, STableBlockScanIn
   int32_t unDumpedRows = asc ? pBlock->nRow - pDumpInfo->rowIndex : pDumpInfo->rowIndex + 1;
   tsdbDebug("%p copy file block to sdatablock, global index:%d, table index:%d, brange:%" PRId64 "-%" PRId64
             ", rows:%d, remain:%d, minVer:%" PRId64 ", maxVer:%" PRId64 ", elapsed time:%.2f ms, %s",
-            pReader, pBlockIter->index, pBlockInfo->tbBlockIdx, pBlock->minKey.ts, pBlock->maxKey.ts, remain, unDumpedRows,
-            pBlock->minVer, pBlock->maxVer, elapsedTime, pReader->idStr);
+            pReader, pBlockIter->index, pBlockInfo->tbBlockIdx, pBlock->minKey.ts, pBlock->maxKey.ts, remain,
+            unDumpedRows, pBlock->minVer, pBlock->maxVer, elapsedTime, pReader->idStr);
 
   return TSDB_CODE_SUCCESS;
 }
@@ -1287,14 +1282,8 @@ static bool doCheckforDatablockOverlap(STableBlockScanInfo* pBlockScanInfo, cons
       if (p->version >= pBlock->minVer) {
         if (i < num - 1) {
           TSDBKEY* pnext = taosArrayGet(pBlockScanInfo->delSkyline, i + 1);
-//          if (i + 1 == num - 1) {  // pnext is the last point
-            if (pnext->ts >= pBlock->minKey.ts) {
-              return true;
-//            }
-//          } else {
-//            if (pnext->ts >= pBlock->minKey.ts) {
-//              return true;
-//            }
+          if (pnext->ts >= pBlock->minKey.ts) {
+            return true;
           }
         } else {  // it must be the last point
           ASSERT(p->version == 0);
@@ -1755,7 +1744,7 @@ static int32_t doMergeMultiLevelRows(STsdbReader* pReader, STableBlockScanInfo*
     tsLast = getCurrentKeyInLastBlock(pLastBlockReader);
   }
 
-  int64_t key = hasDataInFileBlock(pBlockData, pDumpInfo)? pBlockData->aTSKEY[pDumpInfo->rowIndex]:INT64_MIN;
+  int64_t key = hasDataInFileBlock(pBlockData, pDumpInfo) ? pBlockData->aTSKEY[pDumpInfo->rowIndex] : INT64_MIN;
 
   TSDBKEY k = TSDBROW_KEY(pRow);
   TSDBKEY ik = TSDBROW_KEY(piRow);
@@ -2009,7 +1998,8 @@ static bool initLastBlockReader(SLastBlockReader* pLBlockReader, STableBlockScan
 
   int32_t code =
       tMergeTreeOpen(&pLBlockReader->mergeTree, (pLBlockReader->order == TSDB_ORDER_DESC), pReader->pFileReader,
-                     pReader->suid, pScanInfo->uid, &w, &pLBlockReader->verRange, pLBlockReader->pInfo, pReader->idStr);
+                     pReader->suid, pScanInfo->uid, &w, &pLBlockReader->verRange, pLBlockReader->pInfo,
+                     pReader->pSchema, pReader->suppInfo.colIds, pReader->suppInfo.numOfCols, pReader->idStr);
   if (code != TSDB_CODE_SUCCESS) {
     return false;
   }
@@ -2023,12 +2013,12 @@ static int64_t getCurrentKeyInLastBlock(SLastBlockReader* pLastBlockReader) {
 }
 
 static bool hasDataInLastBlock(SLastBlockReader* pLastBlockReader) { return pLastBlockReader->mergeTree.pIter != NULL; }
-bool hasDataInFileBlock(const SBlockData* pBlockData, const SFileBlockDumpInfo* pDumpInfo) {
-  if (pBlockData->nRow > 0) {
-    ASSERT(pBlockData->nRow == pDumpInfo->totalRows);
+bool        hasDataInFileBlock(const SBlockData* pBlockData, const SFileBlockDumpInfo* pDumpInfo) {
+         if (pBlockData->nRow > 0) {
+           ASSERT(pBlockData->nRow == pDumpInfo->totalRows);
   }
 
-  return pBlockData->nRow > 0 && (!pDumpInfo->allDumped);
+         return pBlockData->nRow > 0 && (!pDumpInfo->allDumped);
 }
 
 int32_t mergeRowsInFileBlocks(SBlockData* pBlockData, STableBlockScanInfo* pBlockScanInfo, int64_t key,
@@ -2101,11 +2091,12 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) {
   if (pBlockInfo != NULL) {
     pBlockScanInfo = taosHashGet(pReader->status.pTableMap, &pBlockInfo->uid, sizeof(pBlockInfo->uid));
     SDataBlk* pBlock = getCurrentBlock(&pReader->status.blockIter);
-    TSDBKEY keyInBuf = getCurrentKeyInBuf(pBlockScanInfo, pReader);
+    TSDBKEY   keyInBuf = getCurrentKeyInBuf(pBlockScanInfo, pReader);
 
     // it is a clean block, load it directly
     if (isCleanFileDataBlock(pReader, pBlockInfo, pBlock, pBlockScanInfo, keyInBuf, pLastBlockReader)) {
-      if (pReader->order == TSDB_ORDER_ASC || (pReader->order == TSDB_ORDER_DESC && (!hasDataInLastBlock(pLastBlockReader)))) {
+      if (pReader->order == TSDB_ORDER_ASC ||
+          (pReader->order == TSDB_ORDER_DESC && (!hasDataInLastBlock(pLastBlockReader)))) {
         copyBlockDataToSDataBlock(pReader, pBlockScanInfo);
         goto _end;
       }
@@ -2158,12 +2149,12 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) {
     }
   }
 
-  _end:
+_end:
   pResBlock->info.uid = pBlockScanInfo->uid;
   blockDataUpdateTsWindow(pResBlock, 0);
 
   setComposedBlockFlag(pReader, true);
-  double el = (taosGetTimestampUs() - st)/1000.0;
+  double el = (taosGetTimestampUs() - st) / 1000.0;
 
   pReader->cost.composedBlocks += 1;
   pReader->cost.buildComposedBlockTime += el;
@@ -2465,7 +2456,8 @@ static int32_t doBuildDataBlock(STsdbReader* pReader) {
     code = buildComposedDataBlock(pReader);
   } else if (fileBlockShouldLoad(pReader, pBlockInfo, pBlock, pScanInfo, keyInBuf, pLastBlockReader)) {
     tBlockDataReset(&pStatus->fileBlockData);
-    code = tBlockDataInit(&pStatus->fileBlockData, pReader->suid, pScanInfo->uid, pReader->pSchema);
+    TABLEID tid = {.suid = pReader->suid, .uid = pScanInfo->uid};
+    code = tBlockDataInit(&pStatus->fileBlockData, &tid, pReader->pSchema, NULL, 0);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
@@ -2945,7 +2937,8 @@ static int32_t checkForNeighborFileBlock(STsdbReader* pReader, STableBlockScanIn
 
     // 3. load the neighbor block, and set it to be the currently accessed file data block
     tBlockDataReset(&pStatus->fileBlockData);
-    int32_t code = tBlockDataInit(&pStatus->fileBlockData, pReader->suid, pFBlock->uid, pReader->pSchema);
+    TABLEID tid = {.suid = pReader->suid, .uid = pFBlock->uid};
+    int32_t code = tBlockDataInit(&pStatus->fileBlockData, &tid, pReader->pSchema, NULL, 0);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
@@ -3228,7 +3221,8 @@ int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, S
       tColDataGetValue(pData, rowIndex, &cv);
       doCopyColVal(pCol, outputRowIndex, i, &cv, pSupInfo);
       j += 1;
-    } else if (pData->cid > pCol->info.colId) {  // the specified column does not exist in file block, fill with null data
+    } else if (pData->cid > pCol->info.colId) {
+      // the specified column does not exist in file block, fill with null data
       colDataAppendNULL(pCol, outputRowIndex);
     }
 
@@ -3302,7 +3296,6 @@ void* tsdbGetIvtIdx(SMeta* pMeta) {
 
 uint64_t getReaderMaxVersion(STsdbReader* pReader) { return pReader->verRange.maxVer; }
 
-
 static int32_t doOpenReaderImpl(STsdbReader* pReader) {
   SDataBlockIter* pBlockIter = &pReader->status.blockIter;
 
@@ -3375,19 +3368,20 @@ int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, SArray* pTabl
 
   // NOTE: the endVersion in pCond is the data version not schema version, so pCond->endVersion is not correct here.
   if (pCond->suid != 0) {
-    pReader->pSchema = metaGetTbTSchema(pReader->pTsdb->pVnode->pMeta, pReader->suid,  -1);
+    pReader->pSchema = metaGetTbTSchema(pReader->pTsdb->pVnode->pMeta, pReader->suid, -1);
     if (pReader->pSchema == NULL) {
-      tsdbError("failed to get table schema, suid:%"PRIu64", ver:%"PRId64" , %s", pReader->suid, -1, pReader->idStr);
+      tsdbError("failed to get table schema, suid:%" PRIu64 ", ver:%" PRId64 " , %s", pReader->suid, -1,
+                pReader->idStr);
     }
   } else if (taosArrayGetSize(pTableList) > 0) {
     STableKeyInfo* pKey = taosArrayGet(pTableList, 0);
     pReader->pSchema = metaGetTbTSchema(pReader->pTsdb->pVnode->pMeta, pKey->uid, -1);
     if (pReader->pSchema == NULL) {
-      tsdbError("failed to get table schema, uid:%"PRIu64", ver:%"PRId64" , %s", pKey->uid, -1, pReader->idStr);
+      tsdbError("failed to get table schema, uid:%" PRIu64 ", ver:%" PRId64 " , %s", pKey->uid, -1, pReader->idStr);
     }
   }
 
-  STsdbReader* p = pReader->innerReader[0] != NULL? pReader->innerReader[0]:pReader;
+  STsdbReader* p = pReader->innerReader[0] != NULL ? pReader->innerReader[0] : pReader;
 
   int32_t numOfTables = taosArrayGetSize(pTableList);
   pReader->status.pTableMap = createDataBlockScanInfo(p, pTableList->pData, numOfTables);
@@ -3416,10 +3410,14 @@ int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, SArray* pTabl
     // we need only one row
     pPrevReader->capacity = 1;
     pPrevReader->status.pTableMap = pReader->status.pTableMap;
+    pPrevReader->pSchema = pReader->pSchema;
+    pPrevReader->pMemSchema = pReader->pMemSchema;
     pPrevReader->pReadSnap = pReader->pReadSnap;
 
     pNextReader->capacity = 1;
     pNextReader->status.pTableMap = pReader->status.pTableMap;
+    pNextReader->pSchema = pReader->pSchema;
+    pNextReader->pMemSchema = pReader->pMemSchema;
     pNextReader->pReadSnap = pReader->pReadSnap;
 
     code = doOpenReaderImpl(pPrevReader);
@@ -3453,11 +3451,19 @@ void tsdbReaderClose(STsdbReader* pReader) {
 
   {
     if (pReader->innerReader[0] != NULL) {
-      pReader->innerReader[0]->status.pTableMap = NULL;
-      pReader->innerReader[0]->pReadSnap = NULL;
+      STsdbReader* p = pReader->innerReader[0];
+
+      p->status.pTableMap = NULL;
+      p->pReadSnap = NULL;
+      p->pSchema = NULL;
+      p->pMemSchema = NULL;
 
-      pReader->innerReader[1]->status.pTableMap = NULL;
-      pReader->innerReader[1]->pReadSnap = NULL;
+      p = pReader->innerReader[1];
+
+      p->status.pTableMap = NULL;
+      p->pReadSnap = NULL;
+      p->pSchema = NULL;
+      p->pMemSchema = NULL;
 
       tsdbReaderClose(pReader->innerReader[0]);
       tsdbReaderClose(pReader->innerReader[1]);
@@ -3507,7 +3513,8 @@ void tsdbReaderClose(STsdbReader* pReader) {
 
   tsdbDebug(
       "%p :io-cost summary: head-file:%" PRIu64 ", head-file time:%.2f ms, SMA:%" PRId64
-      " SMA-time:%.2f ms, fileBlocks:%" PRId64 ", fileBlocks-load-time:%.2f ms, "
+      " SMA-time:%.2f ms, fileBlocks:%" PRId64
+      ", fileBlocks-load-time:%.2f ms, "
       "build in-memory-block-time:%.2f ms, lastBlocks:%" PRId64 ", lastBlocks-time:%.2f ms, composed-blocks:%" PRId64
       ", composed-blocks-time:%.2fms, STableBlockScanInfo size:%.2f Kb %s",
       pReader, pCost->headFileLoad, pCost->headFileLoadTime, pCost->smaDataLoad, pCost->smaLoadTime, pCost->numOfBlocks,
@@ -3695,7 +3702,8 @@ static SArray* doRetrieveDataBlock(STsdbReader* pReader) {
   STableBlockScanInfo* pBlockScanInfo = taosHashGet(pStatus->pTableMap, &pFBlock->uid, sizeof(pFBlock->uid));
 
   tBlockDataReset(&pStatus->fileBlockData);
-  int32_t code = tBlockDataInit(&pStatus->fileBlockData, pReader->suid, pBlockScanInfo->uid, pReader->pSchema);
+  TABLEID tid = {.suid = pReader->suid, .uid = pBlockScanInfo->uid};
+  int32_t code = tBlockDataInit(&pStatus->fileBlockData, &tid, pReader->pSchema, NULL, 0);
   if (code != TSDB_CODE_SUCCESS) {
     terrno = code;
     return NULL;
@@ -3765,8 +3773,10 @@ int32_t tsdbReaderReset(STsdbReader* pReader, SQueryTableDataCond* pCond) {
     }
   }
 
-  tsdbDebug("%p reset reader, suid:%" PRIu64 ", numOfTables:%d, skey:%"PRId64", query range:%" PRId64 " - %" PRId64 " in query %s",
-            pReader, pReader->suid, numOfTables, pCond->twindows.skey, pReader->window.skey, pReader->window.ekey, pReader->idStr);
+  tsdbDebug("%p reset reader, suid:%" PRIu64 ", numOfTables:%d, skey:%" PRId64 ", query range:%" PRId64 " - %" PRId64
+            " in query %s",
+            pReader, pReader->suid, numOfTables, pCond->twindows.skey, pReader->window.skey, pReader->window.ekey,
+            pReader->idStr);
 
   return code;
 }

source/dnode/vnode/src/tsdb/tsdbReaderWriter.c

@@ -926,12 +926,13 @@ _err:
   return code;
 }
 
-static int32_t tsdbReadBlockDataImpl(SDataFReader *pReader, SBlockInfo *pBlkInfo, SBlockData *pBlockData) {
+static int32_t tsdbReadBlockDataImpl(SDataFReader *pReader, SBlockInfo *pBlkInfo, SBlockData *pBlockData,
+                                     int32_t iStt) {
   int32_t code = 0;
 
   tBlockDataClear(pBlockData);
 
-  STsdbFD *pFD = pReader->pDataFD;
+  STsdbFD *pFD = (iStt < 0) ? pReader->pDataFD : pReader->aSttFD[iStt];
 
   // uid + version + tskey
   code = tRealloc(&pReader->aBuf[0], pBlkInfo->szKey);
@@ -1070,9 +1071,12 @@ _err:
 int32_t tsdbReadDataBlock(SDataFReader *pReader, SDataBlk *pDataBlk, SBlockData *pBlockData) {
   int32_t code = 0;
 
-  code = tsdbReadBlockDataImpl(pReader, &pDataBlk->aSubBlock[0], pBlockData);
+  code = tsdbReadBlockDataImpl(pReader, &pDataBlk->aSubBlock[0], pBlockData, -1);
   if (code) goto _err;
 
+  ASSERT(pDataBlk->nSubBlock == 1);
+
+#if 0
   if (pDataBlk->nSubBlock > 1) {
     SBlockData bData1;
     SBlockData bData2;
@@ -1113,6 +1117,7 @@ int32_t tsdbReadDataBlock(SDataFReader *pReader, SDataBlk *pDataBlk, SBlockData
     tBlockDataDestroy(&bData1, 1);
     tBlockDataDestroy(&bData2, 1);
   }
+#endif
 
   return code;
 
@@ -1123,23 +1128,38 @@ _err:
 
 int32_t tsdbReadSttBlock(SDataFReader *pReader, int32_t iStt, SSttBlk *pSttBlk, SBlockData *pBlockData) {
   int32_t code = 0;
+  int32_t lino = 0;
+
+  code = tsdbReadBlockDataImpl(pReader, &pSttBlk->bInfo, pBlockData, iStt);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+_exit:
+  if (code) {
+    tsdbError("vgId:%d %s failed at %d since %s", TD_VID(pReader->pTsdb->pVnode), __func__, lino, tstrerror(code));
+  }
+  return code;
+}
+
+int32_t tsdbReadSttBlockEx(SDataFReader *pReader, int32_t iStt, SSttBlk *pSttBlk, SBlockData *pBlockData) {
+  int32_t code = 0;
+  int32_t lino = 0;
 
   // alloc
   code = tRealloc(&pReader->aBuf[0], pSttBlk->bInfo.szBlock);
-  if (code) goto _err;
+  TSDB_CHECK_CODE(code, lino, _exit);
 
   // read
   code = tsdbReadFile(pReader->aSttFD[iStt], pSttBlk->bInfo.offset, pReader->aBuf[0], pSttBlk->bInfo.szBlock);
-  if (code) goto _err;
+  TSDB_CHECK_CODE(code, lino, _exit);
 
   // decmpr
   code = tDecmprBlockData(pReader->aBuf[0], pSttBlk->bInfo.szBlock, pBlockData, &pReader->aBuf[1]);
-  if (code) goto _err;
-
-  return code;
+  TSDB_CHECK_CODE(code, lino, _exit);
 
-_err:
-  tsdbError("vgId:%d tsdb read stt block failed since %s", TD_VID(pReader->pTsdb->pVnode), tstrerror(code));
+_exit:
+  if (code) {
+    tsdbError("vgId:%d %s failed at %d since %s", TD_VID(pReader->pTsdb->pVnode), __func__, lino, tstrerror(code));
+  }
   return code;
 }
 

source/dnode/vnode/src/tsdb/tsdbSnapshot.c

@@ -140,7 +140,7 @@ static int32_t tsdbSnapReadOpenFile(STsdbSnapReader* pReader) {
       if (pSttBlk->minVer > pReader->ever) continue;
       if (pSttBlk->maxVer < pReader->sver) continue;
 
-      code = tsdbReadSttBlock(pReader->pDataFReader, iStt, pSttBlk, &pIter->bData);
+      code = tsdbReadSttBlockEx(pReader->pDataFReader, iStt, pSttBlk, &pIter->bData);
       if (code) goto _err;
 
       for (pIter->iRow = 0; pIter->iRow < pIter->bData.nRow; pIter->iRow++) {
@@ -223,7 +223,7 @@ static int32_t tsdbSnapNextRow(STsdbSnapReader* pReader) {
 
           if (pSttBlk->minVer > pReader->ever || pSttBlk->maxVer < pReader->sver) continue;
 
-          code = tsdbReadSttBlock(pReader->pDataFReader, pIter->iStt, pSttBlk, &pIter->bData);
+          code = tsdbReadSttBlockEx(pReader->pDataFReader, pIter->iStt, pSttBlk, &pIter->bData);
           if (code) goto _err;
 
           pIter->iRow = -1;
@@ -319,7 +319,7 @@ static int32_t tsdbSnapReadData(STsdbSnapReader* pReader, uint8_t** ppData) {
     code = tsdbUpdateTableSchema(pTsdb->pVnode->pMeta, id.suid, id.uid, &pReader->skmTable);
     if (code) goto _err;
 
-    code = tBlockDataInit(pBlockData, id.suid, id.uid, pReader->skmTable.pTSchema);
+    code = tBlockDataInit(pBlockData, &id, pReader->skmTable.pTSchema, NULL, 0);
     if (code) goto _err;
 
     while (pRowInfo->suid == id.suid && pRowInfo->uid == id.uid) {
@@ -715,7 +715,7 @@ static int32_t tsdbSnapWriteTableDataStart(STsdbSnapWriter* pWriter, TABLEID* pI
   if (code) goto _err;
 
   tMapDataReset(&pWriter->dWriter.mDataBlk);
-  code = tBlockDataInit(&pWriter->dWriter.bData, pId->suid, pId->uid, pWriter->skmTable.pTSchema);
+  code = tBlockDataInit(&pWriter->dWriter.bData, pId, pWriter->skmTable.pTSchema, NULL, 0);
   if (code) goto _err;
 
   return code;
@@ -1000,7 +1000,8 @@ static int32_t tsdbSnapWriteToSttFile(STsdbSnapWriter* pWriter, int32_t iRow) {
     code = tsdbUpdateTableSchema(pWriter->pTsdb->pVnode->pMeta, pWriter->id.suid, pWriter->id.uid, &pWriter->skmTable);
     if (code) goto _err;
 
-    code = tBlockDataInit(pBData, pWriter->id.suid, pWriter->id.suid ? 0 : pWriter->id.uid, pWriter->skmTable.pTSchema);
+    TABLEID tid = {.suid = pWriter->id.suid, .uid = pWriter->id.suid ? 0 : pWriter->id.uid};
+    code = tBlockDataInit(pBData, &tid, pWriter->skmTable.pTSchema, NULL, 0);
     if (code) goto _err;
   }
 

source/dnode/vnode/src/tsdb/tsdbUtil.c

@@ -705,12 +705,12 @@ int32_t tRowMergerAdd(SRowMerger *pMerger, TSDBROW *pRow, STSchema *pTSchema) {
     tsdbRowGetColVal(pRow, pTSchema, jCol++, pColVal);
 
     if (key.version > pMerger->version) {
-      if (!pColVal->isNone) {
+      if (!COL_VAL_IS_NONE(pColVal)) {
         taosArraySet(pMerger->pArray, iCol, pColVal);
       }
     } else if (key.version < pMerger->version) {
       SColVal *tColVal = (SColVal *)taosArrayGet(pMerger->pArray, iCol);
-      if (tColVal->isNone && !pColVal->isNone) {
+      if (COL_VAL_IS_NONE(tColVal) && !COL_VAL_IS_NONE(pColVal)) {
         taosArraySet(pMerger->pArray, iCol, pColVal);
       }
     } else {
@@ -776,12 +776,12 @@ int32_t tRowMerge(SRowMerger *pMerger, TSDBROW *pRow) {
     tsdbRowGetColVal(pRow, pMerger->pTSchema, iCol, pColVal);
 
     if (key.version > pMerger->version) {
-      if (!pColVal->isNone) {
+      if (!COL_VAL_IS_NONE(pColVal)) {
         taosArraySet(pMerger->pArray, iCol, pColVal);
       }
     } else if (key.version < pMerger->version) {
       SColVal *tColVal = (SColVal *)taosArrayGet(pMerger->pArray, iCol);
-      if (tColVal->isNone && !pColVal->isNone) {
+      if (COL_VAL_IS_NONE(tColVal) && !COL_VAL_IS_NONE(pColVal)) {
         taosArraySet(pMerger->pArray, iCol, pColVal);
       }
     } else {
@@ -948,24 +948,47 @@ void tBlockDataDestroy(SBlockData *pBlockData, int8_t deepClear) {
   pBlockData->aColData = NULL;
 }
 
-int32_t tBlockDataInit(SBlockData *pBlockData, int64_t suid, int64_t uid, STSchema *pTSchema) {
+int32_t tBlockDataInit(SBlockData *pBlockData, TABLEID *pId, STSchema *pTSchema, int16_t *aCid, int32_t nCid) {
   int32_t code = 0;
 
-  ASSERT(suid || uid);
+  ASSERT(pId->suid || pId->uid);
 
-  pBlockData->suid = suid;
-  pBlockData->uid = uid;
+  pBlockData->suid = pId->suid;
+  pBlockData->uid = pId->uid;
   pBlockData->nRow = 0;
 
   taosArrayClear(pBlockData->aIdx);
-  for (int32_t iColumn = 1; iColumn < pTSchema->numOfCols; iColumn++) {
+  if (aCid) {
+    int32_t   iColumn = 1;
     STColumn *pTColumn = &pTSchema->columns[iColumn];
+    for (int32_t iCid = 0; iCid < nCid; iCid++) {
+      while (pTColumn && pTColumn->colId < aCid[iCid]) {
+        iColumn++;
+        pTColumn = (iColumn < pTSchema->numOfCols) ? &pTSchema->columns[iColumn] : NULL;
+      }
 
-    SColData *pColData;
-    code = tBlockDataAddColData(pBlockData, iColumn - 1, &pColData);
-    if (code) goto _exit;
+      if (pTColumn == NULL) {
+        break;
+      } else if (pTColumn->colId == aCid[iCid]) {
+        SColData *pColData;
+        code = tBlockDataAddColData(pBlockData, taosArrayGetSize(pBlockData->aIdx), &pColData);
+        if (code) goto _exit;
+        tColDataInit(pColData, pTColumn->colId, pTColumn->type, (pTColumn->flags & COL_SMA_ON) ? 1 : 0);
 
-    tColDataInit(pColData, pTColumn->colId, pTColumn->type, (pTColumn->flags & COL_SMA_ON) ? 1 : 0);
+        iColumn++;
+        pTColumn = (iColumn < pTSchema->numOfCols) ? &pTSchema->columns[iColumn] : NULL;
+      }
+    }
+  } else {
+    for (int32_t iColumn = 1; iColumn < pTSchema->numOfCols; iColumn++) {
+      STColumn *pTColumn = &pTSchema->columns[iColumn];
+
+      SColData *pColData;
+      code = tBlockDataAddColData(pBlockData, iColumn - 1, &pColData);
+      if (code) goto _exit;
+
+      tColDataInit(pColData, pTColumn->colId, pTColumn->type, (pTColumn->flags & COL_SMA_ON) ? 1 : 0);
+    }
   }
 
 _exit:
@@ -1505,7 +1528,7 @@ void tsdbCalcColDataSMA(SColData *pColData, SColumnDataAgg *pColAgg) {
   for (int32_t iVal = 0; iVal < pColData->nVal; iVal++) {
     tColDataGetValue(pColData, iVal, pColVal);
 
-    if (pColVal->isNone || pColVal->isNull) {
+    if (!COL_VAL_IS_VALUE(pColVal)) {
       pColAgg->numOfNull++;
     } else {
       switch (pColData->type) {

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

@@ -688,6 +688,8 @@ static void vnodeRestoreFinish(struct SSyncFSM *pFsm) {
     }
   } while (true);
 
+  walApplyVer(pVnode->pWal, pVnode->state.applied);
+
   pVnode->restored = true;
   vDebug("vgId:%d, sync restore finished", pVnode->config.vgId);
 }

source/libs/executor/inc/executorimpl.h

@@ -34,6 +34,7 @@ extern "C" {
 #include "scalar.h"
 #include "taosdef.h"
 #include "tarray.h"
+#include "tfill.h"
 #include "thash.h"
 #include "tlockfree.h"
 #include "tmsg.h"
@@ -799,6 +800,22 @@ typedef struct SStreamPartitionOperatorInfo {
   SSDataBlock*          pDelRes;
 } SStreamPartitionOperatorInfo;
 
+typedef struct SStreamFillOperatorInfo {
+  SStreamFillSupporter* pFillSup;
+  SSDataBlock*      pRes;
+  SSDataBlock*      pSrcBlock;
+  int32_t           srcRowIndex;
+  SSDataBlock*      pPrevSrcBlock;
+  SSDataBlock*      pSrcDelBlock;
+  int32_t           srcDelRowIndex;
+  SSDataBlock*      pDelRes;
+  SNode*            pCondition;
+  SArray*           pColMatchColInfo;
+  int32_t           primaryTsCol;
+  int32_t           primarySrcSlotId;
+  SStreamFillInfo*  pFillInfo;
+} SStreamFillOperatorInfo;
+
 typedef struct STimeSliceOperatorInfo {
   SSDataBlock*         pRes;
   STimeWindow          win;
@@ -991,7 +1008,7 @@ SOperatorInfo* createStatewindowOperatorInfo(SOperatorInfo* downstream, SStateWi
 SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SPartitionPhysiNode* pPartNode,
                                            SExecTaskInfo* pTaskInfo);
 
-SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SPartitionPhysiNode* pPartNode,
+SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStreamPartitionPhysiNode* pPartNode,
                                                  SExecTaskInfo* pTaskInfo);
 
 SOperatorInfo* createTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pNode, SExecTaskInfo* pTaskInfo);
@@ -1007,6 +1024,8 @@ SOperatorInfo* createStreamIntervalOperatorInfo(SOperatorInfo* downstream,
 
 SOperatorInfo* createStreamStateAggOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyNode,
                                                 SExecTaskInfo* pTaskInfo);
+SOperatorInfo* createStreamFillOperatorInfo(SOperatorInfo* downstream, SStreamFillPhysiNode* pPhyFillNode,
+                                            SExecTaskInfo* pTaskInfo);
 
 int32_t projectApplyFunctions(SExprInfo* pExpr, SSDataBlock* pResult, SSDataBlock* pSrcBlock, SqlFunctionCtx* pCtx,
                               int32_t numOfOutput, SArray* pPseudoList);
@@ -1095,6 +1114,7 @@ int32_t setOutputBuf(STimeWindow* win, SResultRow** pResult, int64_t tableGroupI
                            SExecTaskInfo* pTaskInfo);
 int32_t releaseOutputBuf(SExecTaskInfo* pTaskInfo, SWinKey* pKey, SResultRow* pResult);
 int32_t saveOutputBuf(SExecTaskInfo* pTaskInfo, SWinKey* pKey, SResultRow* pResult, int32_t resSize);
+void    getNextIntervalWindow(SInterval* pInterval, STimeWindow* tw, int32_t order);
 
 #ifdef __cplusplus
 }

source/libs/executor/inc/tfill.h

@@ -23,12 +23,13 @@ extern "C" {
 #include "os.h"
 #include "taosdef.h"
 #include "tcommon.h"
+#include "tsimplehash.h"
 
 struct SSDataBlock;
 
 typedef struct SFillColInfo {
-  SExprInfo *pExpr;
-  bool       notFillCol;      // denote if this column needs fill operation
+  SExprInfo* pExpr;
+  bool       notFillCol;  // denote if this column needs fill operation
   SVariant   fillVal;
 } SFillColInfo;
 
@@ -51,46 +52,96 @@ typedef struct {
 } SRowVal;
 
 typedef struct SFillInfo {
-  TSKEY     start;                // start timestamp
-  TSKEY     end;                  // endKey for fill
-  TSKEY     currentKey;           // current active timestamp, the value may be changed during the fill procedure.
-  int32_t   tsSlotId;             // primary time stamp slot id
-  int32_t   srcTsSlotId;          // timestamp column id in the source data block.
-  int32_t   order;                // order [TSDB_ORDER_ASC|TSDB_ORDER_DESC]
-  int32_t   type;                 // fill type
-  int32_t   numOfRows;            // number of rows in the input data block
-  int32_t   index;                // active row index
-  int32_t   numOfTotal;           // number of filled rows in one round
-  int32_t   numOfCurrent;         // number of filled rows in current results
-  int32_t   numOfCols;            // number of columns, including the tags columns
-  SInterval interval;
-  SRowVal   prev;
-  SRowVal   next;
-  SSDataBlock *pSrcBlock;
-  int32_t   alloc;                // data buffer size in rows
-
-  SFillColInfo* pFillCol;         // column info for fill operations
-  SFillTagColInfo* pTags;         // tags value for filling gap
-  const char* id;
+  TSKEY        start;         // start timestamp
+  TSKEY        end;           // endKey for fill
+  TSKEY        currentKey;    // current active timestamp, the value may be changed during the fill procedure.
+  int32_t      tsSlotId;      // primary time stamp slot id
+  int32_t      srcTsSlotId;   // timestamp column id in the source data block.
+  int32_t      order;         // order [TSDB_ORDER_ASC|TSDB_ORDER_DESC]
+  int32_t      type;          // fill type
+  int32_t      numOfRows;     // number of rows in the input data block
+  int32_t      index;         // active row index
+  int32_t      numOfTotal;    // number of filled rows in one round
+  int32_t      numOfCurrent;  // number of filled rows in current results
+  int32_t      numOfCols;     // number of columns, including the tags columns
+  SInterval    interval;
+  SRowVal      prev;
+  SRowVal      next;
+  SSDataBlock* pSrcBlock;
+  int32_t      alloc;  // data buffer size in rows
+
+  SFillColInfo*    pFillCol;  // column info for fill operations
+  SFillTagColInfo* pTags;     // tags value for filling gap
+  const char*      id;
 } SFillInfo;
 
-int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, int64_t ekey, int32_t maxNumOfRows);
+typedef struct SResultCellData {
+  bool    isNull;
+  int8_t  type;
+  int32_t bytes;
+  char    pData[];
+} SResultCellData;
+
+typedef struct SResultRowData {
+  TSKEY            key;
+  SResultCellData* pRowVal;
+} SResultRowData;
+
+typedef struct SStreamFillLinearInfo {
+  TSKEY   nextEnd;
+  SArray* pDeltaVal;      // double. value for Fill(linear).
+  SArray* pNextDeltaVal;  // double. value for Fill(linear).
+  int64_t winIndex;
+  bool    hasNext;
+} SStreamFillLinearInfo;
+
+typedef struct SStreamFillInfo {
+  TSKEY                  start;    // startKey for fill
+  TSKEY                  end;      // endKey for fill
+  TSKEY                  current;  // current Key for fill
+  TSKEY                  preRowKey;
+  TSKEY                  nextRowKey;
+  SResultRowData*        pResRow;
+  SStreamFillLinearInfo* pLinearInfo;
+  bool                   needFill;
+  int32_t                type;  // fill type
+  int32_t                pos;
+  SArray*                delRanges;
+  int32_t                delIndex;
+} SStreamFillInfo;
+
+typedef struct SStreamFillSupporter {
+  int32_t        type;  // fill type
+  SInterval      interval;
+  SResultRowData prev;
+  SResultRowData cur;
+  SResultRowData next;
+  SResultRowData nextNext;
+  SFillColInfo*  pAllColInfo;   // fill exprs and not fill exprs
+  int32_t        numOfAllCols;  // number of all exprs, including the tags columns
+  int32_t        numOfFillCols;
+  int32_t        numOfNotFillCols;
+  int32_t        rowSize;
+  SSHashObj*     pResMap;
+  bool           hasDelete;
+} SStreamFillSupporter;
 
+int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, int64_t ekey, int32_t maxNumOfRows);
 
-void taosFillSetStartInfo(struct SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey);
-void taosResetFillInfo(struct SFillInfo* pFillInfo, TSKEY startTimestamp);
-void taosFillSetInputDataBlock(struct SFillInfo* pFillInfo, const struct SSDataBlock* pInput);
-struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfFillExpr, SExprInfo* pNotFillExpr, int32_t numOfNotFillCols, const struct SNodeListNode* val);
-bool taosFillHasMoreResults(struct SFillInfo* pFillInfo);
+void                 taosFillSetStartInfo(struct SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey);
+void                 taosResetFillInfo(struct SFillInfo* pFillInfo, TSKEY startTimestamp);
+void                 taosFillSetInputDataBlock(struct SFillInfo* pFillInfo, const struct SSDataBlock* pInput);
+struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfFillExpr, SExprInfo* pNotFillExpr,
+                                       int32_t numOfNotFillCols, const struct SNodeListNode* val);
+bool                 taosFillHasMoreResults(struct SFillInfo* pFillInfo);
 
 SFillInfo* taosCreateFillInfo(TSKEY skey, int32_t numOfFillCols, int32_t numOfNotFillCols, int32_t capacity,
                               SInterval* pInterval, int32_t fillType, struct SFillColInfo* pCol, int32_t slotId,
                               int32_t order, const char* id);
 
-void* taosDestroyFillInfo(struct SFillInfo *pFillInfo);
+void*   taosDestroyFillInfo(struct SFillInfo* pFillInfo);
 int64_t taosFillResultDataBlock(struct SFillInfo* pFillInfo, SSDataBlock* p, int32_t capacity);
-int64_t getFillInfoStart(struct SFillInfo *pFillInfo);
-
+int64_t getFillInfoStart(struct SFillInfo* pFillInfo);
 
 #ifdef __cplusplus
 }

source/libs/executor/src/executorimpl.c

@@ -1110,7 +1110,8 @@ void setResultRowInitCtx(SResultRow* pResult, SqlFunctionCtx* pCtx, int32_t numO
   }
 }
 
-static void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoData* p, bool keep, int32_t status);
+static void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoData* p, bool keep,
+                                                int32_t status);
 
 void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock, const SArray* pColMatchInfo) {
   if (pFilterNode == NULL || pBlock->info.rows == 0) {
@@ -1120,12 +1121,12 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock, const SArray* pColM
   SFilterInfo* filter = NULL;
 
   // todo move to the initialization function
-  int32_t code = filterInitFromNode((SNode*)pFilterNode, &filter, 0);
+  int32_t            code = filterInitFromNode((SNode*)pFilterNode, &filter, 0);
   SFilterColumnParam param1 = {.numOfCols = taosArrayGetSize(pBlock->pDataBlock), .pDataBlock = pBlock->pDataBlock};
   code = filterSetDataFromSlotId(filter, &param1);
 
   SColumnInfoData* p = NULL;
-  int32_t status = 0;
+  int32_t          status = 0;
 
   // todo the keep seems never to be True??
   bool keep = filterExecute(filter, pBlock, &p, NULL, param1.numOfCols, &status);
@@ -1201,7 +1202,7 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoD
   }
 }
 
-  void doSetTableGroupOutputBuf(SOperatorInfo* pOperator, int32_t numOfOutput, uint64_t groupId) {
+void doSetTableGroupOutputBuf(SOperatorInfo* pOperator, int32_t numOfOutput, uint64_t groupId) {
   // for simple group by query without interval, all the tables belong to one group result.
   SExecTaskInfo*    pTaskInfo = pOperator->pTaskInfo;
   SAggOperatorInfo* pAggInfo = pOperator->info;
@@ -1787,7 +1788,9 @@ static int32_t doSendFetchDataRequest(SExchangeInfo* pExchangeInfo, SExecTaskInf
 
   if (pSource->localExec) {
     SDataBuf pBuf = {0};
-    int32_t code = (*pTaskInfo->localFetch.fp)(pTaskInfo->localFetch.handle, pSource->schedId, pTaskInfo->id.queryId, pSource->taskId, 0, pSource->execId, &pBuf.pData, pTaskInfo->localFetch.explainRes);
+    int32_t  code =
+        (*pTaskInfo->localFetch.fp)(pTaskInfo->localFetch.handle, pSource->schedId, pTaskInfo->id.queryId,
+                                    pSource->taskId, 0, pSource->execId, &pBuf.pData, pTaskInfo->localFetch.explainRes);
     loadRemoteDataCallback(pWrapper, &pBuf, code);
     taosMemoryFree(pWrapper);
   } else {
@@ -1798,8 +1801,8 @@ static int32_t doSendFetchDataRequest(SExchangeInfo* pExchangeInfo, SExecTaskInf
     }
 
     qDebug("%s build fetch msg and send to vgId:%d, ep:%s, taskId:0x%" PRIx64 ", execId:%d, %d/%" PRIzu,
-           GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->addr.epSet.eps[0].fqdn, pSource->taskId, pSource->execId,
-           sourceIndex, totalSources);
+           GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->addr.epSet.eps[0].fqdn, pSource->taskId,
+           pSource->execId, sourceIndex, totalSources);
 
     pMsg->header.vgId = htonl(pSource->addr.nodeId);
     pMsg->sId = htobe64(pSource->schedId);
@@ -1824,9 +1827,10 @@ static int32_t doSendFetchDataRequest(SExchangeInfo* pExchangeInfo, SExecTaskInf
     pMsgSendInfo->fp = loadRemoteDataCallback;
 
     int64_t transporterId = 0;
-    int32_t code = asyncSendMsgToServer(pExchangeInfo->pTransporter, &pSource->addr.epSet, &transporterId, pMsgSendInfo);
+    int32_t code =
+        asyncSendMsgToServer(pExchangeInfo->pTransporter, &pSource->addr.epSet, &transporterId, pMsgSendInfo);
   }
-  
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -3356,9 +3360,7 @@ static void cleanupTableSchemaInfo(SSchemaInfo* pSchemaInfo) {
   tDeleteSSchemaWrapper(pSchemaInfo->qsw);
 }
 
-static void cleanupStreamInfo(SStreamTaskInfo* pStreamInfo) {
-  tDeleteSSchemaWrapper(pStreamInfo->schema);
-}
+static void cleanupStreamInfo(SStreamTaskInfo* pStreamInfo) { tDeleteSSchemaWrapper(pStreamInfo->schema); }
 
 static int32_t sortTableGroup(STableListInfo* pTableListInfo) {
   taosArrayClear(pTableListInfo->pGroupList);
@@ -3539,7 +3541,8 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
       STableScanInfo* pScanInfo = pOperator->info;
       pTaskInfo->cost.pRecoder = &pScanInfo->readRecorder;
     } else if (QUERY_NODE_PHYSICAL_PLAN_EXCHANGE == type) {
-      pOperator = createExchangeOperatorInfo(pHandle ? pHandle->pMsgCb->clientRpc : NULL, (SExchangePhysiNode*)pPhyNode, pTaskInfo);
+      pOperator = createExchangeOperatorInfo(pHandle ? pHandle->pMsgCb->clientRpc : NULL, (SExchangePhysiNode*)pPhyNode,
+                                             pTaskInfo);
     } else if (QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN == type) {
       STableScanPhysiNode* pTableScanNode = (STableScanPhysiNode*)pPhyNode;
       if (pHandle->vnode) {
@@ -3729,7 +3732,7 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
   } else if (QUERY_NODE_PHYSICAL_PLAN_PARTITION == type) {
     pOptr = createPartitionOperatorInfo(ops[0], (SPartitionPhysiNode*)pPhyNode, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_STREAM_PARTITION == type) {
-    pOptr = createStreamPartitionOperatorInfo(ops[0], (SPartitionPhysiNode*)pPhyNode, pTaskInfo);
+    pOptr = createStreamPartitionOperatorInfo(ops[0], (SStreamPartitionPhysiNode*)pPhyNode, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_MERGE_STATE == type) {
     SStateWinodwPhysiNode* pStateNode = (SStateWinodwPhysiNode*)pPhyNode;
     pOptr = createStatewindowOperatorInfo(ops[0], pStateNode, pTaskInfo);
@@ -3739,6 +3742,8 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     pOptr = createMergeJoinOperatorInfo(ops, size, (SSortMergeJoinPhysiNode*)pPhyNode, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_FILL == type) {
     pOptr = createFillOperatorInfo(ops[0], (SFillPhysiNode*)pPhyNode, pTaskInfo);
+  } else if (QUERY_NODE_PHYSICAL_PLAN_STREAM_FILL == type) {
+    pOptr = createStreamFillOperatorInfo(ops[0], (SStreamFillPhysiNode*)pPhyNode, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_INDEF_ROWS_FUNC == type) {
     pOptr = createIndefinitOutputOperatorInfo(ops[0], pPhyNode, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_INTERP_FUNC == type) {
@@ -4058,7 +4063,7 @@ void doDestroyTask(SExecTaskInfo* pTaskInfo) {
   if (!pTaskInfo->localFetch.localExec) {
     nodesDestroyNode((SNode*)pTaskInfo->pSubplan);
   }
-  
+
   taosMemoryFreeClear(pTaskInfo->sql);
   taosMemoryFreeClear(pTaskInfo->id.str);
   taosMemoryFreeClear(pTaskInfo);

source/libs/executor/src/groupoperator.c

@@ -989,11 +989,11 @@ SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStr
     goto _error;
   }
   int32_t code = TSDB_CODE_SUCCESS;
-  pInfo->partitionSup.pGroupCols = extractPartitionColInfo(pPartNode->pPartitionKeys);
+  pInfo->partitionSup.pGroupCols = extractPartitionColInfo(pPartNode->part.pPartitionKeys);
 
-  if (pPartNode->pExprs != NULL) {
+  if (pPartNode->part.pExprs != NULL) {
     int32_t    num = 0;
-    SExprInfo* pCalExprInfo = createExprInfo(pPartNode->pExprs, NULL, &num);
+    SExprInfo* pCalExprInfo = createExprInfo(pPartNode->part.pExprs, NULL, &num);
     code = initExprSupp(&pInfo->scalarSup, pCalExprInfo, num);
     if (code != TSDB_CODE_SUCCESS) {
       goto _error;
@@ -1008,7 +1008,7 @@ SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStr
   }
   pInfo->partitionSup.needCalc = true;
 
-  SSDataBlock* pResBlock = createResDataBlock(pPartNode->node.pOutputDataBlockDesc);
+  SSDataBlock* pResBlock = createResDataBlock(pPartNode->part.node.pOutputDataBlockDesc);
   if (!pResBlock) {
     goto _error;
   }
@@ -1022,7 +1022,7 @@ SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStr
   pInfo->pDelRes = createSpecialDataBlock(STREAM_DELETE_RESULT);
 
   int32_t    numOfCols = 0;
-  SExprInfo* pExprInfo = createExprInfo(pPartNode->pTargets, NULL, &numOfCols);
+  SExprInfo* pExprInfo = createExprInfo(pPartNode->part.pTargets, NULL, &numOfCols);
 
   pOperator->name = "StreamPartitionOperator";
   pOperator->blocking = false;

source/libs/function/inc/functionMgtInt.h

@@ -50,6 +50,7 @@ extern "C" {
 #define FUNC_MGT_KEEP_ORDER_FUNC        FUNC_MGT_FUNC_CLASSIFICATION_MASK(21)
 #define FUNC_MGT_CUMULATIVE_FUNC        FUNC_MGT_FUNC_CLASSIFICATION_MASK(22)
 #define FUNC_MGT_FORBID_STABLE_FUNC     FUNC_MGT_FUNC_CLASSIFICATION_MASK(23)
+#define FUNC_MGT_INTERP_PC_FUNC         FUNC_MGT_FUNC_CLASSIFICATION_MASK(24)
 
 #define FUNC_MGT_TEST_MASK(val, mask) (((val) & (mask)) != 0)
 

source/libs/function/src/builtins.c

@@ -3146,6 +3146,16 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
     .classification = FUNC_MGT_SYSTEM_INFO_FUNC | FUNC_MGT_SCALAR_FUNC,
     .translateFunc = translateUserFunc,
   },
+  {
+    .name = "_irowts",
+    .type = FUNCTION_TYPE_IROWTS,
+    .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_INTERP_PC_FUNC,
+    .translateFunc = translateTimePseudoColumn,
+    .getEnvFunc   = getTimePseudoFuncEnv,
+    .initFunc     = NULL,
+    .sprocessFunc = NULL,
+    .finalizeFunc = NULL
+  },
 };
 // clang-format on
 

source/libs/index/src/indexCache.c

@@ -302,6 +302,7 @@ static int32_t cacheSearchCompareFunc_JSON(void* cache, SIndexTerm* term, SIdxTR
         char* p = taosMemoryCalloc(1, strlen(c->colVal) + 1);
         memcpy(p, c->colVal, strlen(c->colVal));
         cond = cmpFn(p + skip, term->colVal, dType);
+        taosMemoryFree(p);
       }
     }
     if (cond == MATCH) {