other: merge 3.0

2023-10-31 16:42:51 +08:00 · 2023-10-31 16:42:51 +08:00 · a1aa2380ae
parent 0b18192b23 c4e1faae36
commit a1aa2380ae
50 changed files with 2949 additions and 861 deletions
--- a/docs/en/12-taos-sql/10-function.md
+++ b/docs/en/12-taos-sql/10-function.md
@ -483,6 +483,91 @@ return_timestamp: {
 - The precision of the returned timestamp is same as the precision set for the current data base in use
 - return_timestamp indicates whether the returned value type is TIMESTAMP or not. If this parameter set to 1, function will return TIMESTAMP type. Otherwise function will return BIGINT type. If parameter is omitted, default return value type is BIGINT.

+#### TO_CHAR
+
+```sql
+TO_CHAR(ts, format_str_literal)
+```
+
+**Description**: Convert a ts column to string as the format specified
+
+**Return value type**: VARCHAR
+
+**Applicable column types**: TIMESTAMP
+
+**Nested query**: It can be used in both the outer query and inner query in a nested query.
+
+**Applicable table types**: standard tables and supertables
+
+**Supported Formats**
+
+| **Format** | **Comment**| **example** |
+| --- | --- | --- |
+|AM,am,PM,pm| Meridiem indicator(without periods) | 07:00:00am|
+|A.M.,a.m.,P.M.,p.m.| Meridiem indicator(with periods)| 07:00:00a.m.|
+|YYYY,yyyy|year, 4 or more digits| 2023-10-10|
+|YYY,yyy| year, last 3 digits| 023-10-10|
+|YY,yy| year, last 2 digits| 23-10-10|
+|Y,y| year, last digit| 3-10-10|
+|MONTH|full uppercase of month| 2023-JANUARY-01|
+|Month|full capitalized month| 2023-January-01|
+|month|full lowercase of month| 2023-january-01|
+|MON| abbreviated uppercase of month(3 char)| JAN, SEP|
+|Mon| abbreviated capitalized month| Jan, Sep|
+|mon|abbreviated lowercase of month| jan, sep|
+|MM,mm|month number 01-12|2023-01-01|
+|DD,dd|month day, 01-31||
+|DAY|full uppercase of week day|MONDAY|
+|Day|full capitalized week day|Monday|
+|day|full lowercase of week day|monday|
+|DY|abbreviated uppercase of week day|MON|
+|Dy|abbreviated capitalized week day|Mon|
+|dy|abbreviated lowercase of week day|mon|
+|DDD|year day, 001-366||
+|D,d|week day number, 1-7, Sunday(1) to Saturday(7)||
+|HH24,hh24|hour of day, 00-23|2023-01-30 23:59:59|
+|hh12,HH12, hh, HH| hour of day, 01-12|2023-01-30 12:59:59PM|
+|MI,mi|minute, 00-59||
+|SS,ss|second, 00-59||
+|MS,ms|milli second, 000-999||
+|US,us|micro second, 000000-999999||
+|NS,ns|nano second, 000000000-999999999||
+|TZH,tzh|time zone hour|2023-01-30 11:59:59PM +08|
+
+**More explanations**:
+- The output format of `Month`, `Day` are left aligined, like`2023-OCTOBER  -01`, `2023-SEPTEMBER-01`, `September` is the longest, no paddings. Week days are slimilar.
+- When `ms`,`us`,`ns` are used in `to_char`, like `to_char(ts, 'yyyy-mm-dd hh:mi:ss.ms.us.ns')`, The time of `ms`,`us`,`ns` corresponds to the same fraction seconds. When ts is `1697182085123`, the output of `ms` is `123`, `us` is `123000`, `ns` is `123000000`.
+- If we want to output some characters of format without converting, surround it with double quotes. `to_char(ts, 'yyyy-mm-dd "is formated by yyyy-mm-dd"')`. If want to output double quotes, add a back slash before double quote, like `to_char(ts, '\"yyyy-mm-dd\"')` will output `"2023-10-10"`.
+- For formats that output digits, the uppercase and lowercase formats are the same.
+- It's recommended to put time zone in the format, if not, the default time zone zone will be that in server or client.
+
+#### TO_TIMESTAMP
+
+```sql
+TO_TIMESTAMP(ts_str_literal, format_str_literal)
+```
+
+**Description**: Convert a formated timestamp string to a timestamp
+
+**Return value type**: TIMESTAMP
+
+**Applicable column types**: VARCHAR
+
+**Nested query**: It can be used in both the outer query and inner query in a nested query.
+
+**Applicable table types**: standard tables and supertables
+
+**Supported Formats**: The same as `TO_CHAR`.
+
+**More explanations**:
+- When `ms`, `us`, `ns` are used in `to_timestamp`, if multi of them are specified, the results are accumulated. For example, `to_timestamp('2023-10-10 10:10:10.123.000456.000000789', 'yyyy-mm-dd hh:mi:ss.ms.us.ns')` will output the timestamp of `2023-10-10 10:10:10.123456789`.
+- The uppercase or lowercase of `MONTH`, `MON`, `DAY`, `DY` and formtas that output digits have same effect when used in `to_timestamp`, like `to_timestamp('2023-JANUARY-01', 'YYYY-month-dd')`, `month` can be replaced by `MONTH`, or `month`. The cases are ignored.
+- If multi times are specified for one component, the previous will be overwritten. Like `to_timestamp('2023-22-10-10', 'yyyy-yy-MM-dd')`, the output year will be `2022`.
+- To avoid unexpected time zone used during the convertion, it's recommended to put time zone in the ts string, e.g. '2023-10-10 10:10:10+08'. If time zone not specified, default will be that in server or client.
+- The default timestamp if some components are not specified will be: `1970-01-01 00:00:00` with specified or default local timezone.
+- If `AM` or `PM` is specified in formats, the Hour must between `1-12`.
+- In some cases, `to_timestamp` can convert correctly even the format and the timestamp string are not totally matched. Like `to_timetamp('200101/2', 'yyyyMM1/dd')`, the digit `1` in format string are ignored, and the output timestsamp is `2001-01-02 00:00:00`. Spaces and tabs in formats and tiemstamp string are also ignored automatically.
+

 ### Time and Date Functions

--- a/docs/zh/12-taos-sql/10-function.md
+++ b/docs/zh/12-taos-sql/10-function.md
@ -483,6 +483,91 @@ return_timestamp: {
 - 返回的时间戳精度与当前 DATABASE 设置的时间精度一致。
 - return_timestamp 指定函数返回值是否为时间戳类型，设置为1时返回 TIMESTAMP 类型，设置为0时返回 BIGINT 类型。如不指定缺省返回 BIGINT 类型。

+#### TO_CHAR
+
+```sql
+TO_CHAR(ts, format_str_literal)
+```
+
+**功能说明**: 将timestamp类型按照指定格式转换为字符串
+
+**返回结果数据类型**: VARCHAR
+
+**应用字段**: TIMESTAMP
+
+**嵌套子查询支持**: 适用于内层查询和外层查询
+
+**适用于**: 表和超级表
+
+**支持的格式**
+
+| **格式** | **说明**| **例子** |
+| --- | --- | --- |
+|AM,am,PM,pm| 无点分隔的上午下午 | 07:00:00am|
+|A.M.,a.m.,P.M.,p.m.| 有点分隔的上午下午| 07:00:00a.m.|
+|YYYY,yyyy|年, 4个及以上数字| 2023-10-10|
+|YYY,yyy| 年, 最后3位数字| 023-10-10|
+|YY,yy| 年, 最后2位数字| 23-10-10|
+|Y,y|年, 最后一位数字| 3-10-10|
+|MONTH|月, 全大写| 2023-JANUARY-01|
+|Month|月, 首字母大写| 2023-January-01|
+|month|月, 全小写| 2023-january-01|
+|MON| 月, 缩写, 全大写(三个字符)| JAN, SEP|
+|Mon| 月, 缩写, 首字母大写| Jan, Sep|
+|mon|月, 缩写, 全小写| jan, sep|
+|MM,mm|月, 数字 01-12|2023-01-01|
+|DD,dd|月日, 01-31||
+|DAY|周日, 全大写|MONDAY|
+|Day|周日, 首字符大写|Monday|
+|day|周日, 全小写|monday|
+|DY|周日, 缩写, 全大写|MON|
+|Dy|周日, 缩写, 首字符大写|Mon|
+|dy|周日, 缩写, 全小写|mon|
+|DDD|年日, 001-366||
+|D,d|周日, 数字, 1-7, Sunday(1) to Saturday(7)||
+|HH24,hh24|小时, 00-23|2023-01-30 23:59:59|
+|hh12,HH12, hh, HH| 小时, 01-12|2023-01-30 12:59:59PM|
+|MI,mi|分钟, 00-59||
+|SS,ss|秒, 00-59||
+|MS,ms|毫秒, 000-999||
+|US,us|微秒, 000000-999999||
+|NS,ns|纳秒, 000000000-999999999||
+|TZH,tzh|时区小时|2023-01-30 11:59:59PM +08|
+
+**使用说明**:
+- `Month`, `Day`等的输出格式是左对齐的, 右侧添加空格, 如`2023-OCTOBER  -01`, `2023-SEPTEMBER-01`, 9月是月份中英文字母数最长的, 因此9月没有空格. 星期类似.
+- 使用`ms`, `us`, `ns`时, 以上三种格式的输出只在精度上不同, 比如ts为 `1697182085123`,  `ms` 的输出为 `123`, `us` 的输出为 `123000`, `ns` 的输出为 `123000000`.
+- 时间格式中无法匹配规则的内容会直接输出. 如果想要在格式串中指定某些能够匹配规则的部分不做转换, 可以使用双引号, 如`to_char(ts, 'yyyy-mm-dd "is formated by yyyy-mm-dd"')`. 如果想要输出双引号, 那么在双引号之前加一个反斜杠, 如 `to_char(ts, '\"yyyy-mm-dd\"')` 将会输出 `"2023-10-10"`.
+- 那些输出是数字的格式, 如`YYYY`, `DD`, 大写与小写意义相同, 即`yyyy` 和 `YYYY` 可以互换.
+- 推荐在时间格式中带时区信息，如果不带则默认输出的时区为服务端或客户端所配置的时区.
+
+#### TO_TIMESTAMP
+
+```sql
+TO_TIMESTAMP(ts_str_literal, format_str_literal)
+```
+
+**功能说明**: 将字符串按照指定格式转化为时间戳.
+
+**返回结果数据类型**: TIMESTAMP
+
+**应用字段**: VARCHAR
+
+**嵌套子查询支持**: 适用于内层查询和外层查询
+
+**适用于**: 表和超级表
+
+**支持的格式**: 与`to_char`相同
+
+**使用说明**:
+- 若`ms`, `us`, `ns`同时指定, 那么结果时间戳包含上述三个字段的和. 如 `to_timestamp('2023-10-10 10:10:10.123.000456.000000789', 'yyyy-mm-dd hh:mi:ss.ms.us.ns')` 输出是 `2023-10-10 10:10:10.123456789`.
+- `MONTH`, `MON`, `DAY`, `DY` 以及其他输出为数字的格式的大小写意义相同, 如 `to_timestamp('2023-JANUARY-01', 'YYYY-month-dd')`, `month`可以被替换为`MONTH` 或者`Month`.
+- 如果同一字段被指定了多次, 那么前面的指定将会被覆盖.  如 `to_timestamp('2023-22-10-10', 'yyyy-yy-MM-dd')`, 输出年份是`2022`.
+- 为避免转换时使用了非预期的时区，推荐在时间中携带时区信息，例如'2023-10-10 10:10:10+08'，如果未指定时区则默认时区为服务端或客户端指定的时区。
+- 如果没有指定完整的时间，那么默认时间值为指定或默认时区的 `1970-01-01 00:00:00`, 未指定部分使用该默认值中的对应部分.
+- 如果格式串中有`AM`, `PM`等, 那么小时必须是12小时制, 范围必须是01-12.
+- `to_timestamp`转换具有一定的容错机制, 在格式串和时间戳串不完全对应时, 有时也可转换, 如: `to_timestamp('200101/2', 'yyyyMM1/dd')`, 格式串中多出来的1会被丢弃. 格式串与时间戳串中多余的空格字符(空格, tab等)也会被 自动忽略. 如`to_timestamp('  23 年 - 1 月 - 01 日  ', 'yy 年-MM月-dd日')` 可以被成功转换. 虽然`MM`等字段需要两个数字对应(只有一位时前面补0), 在`to_timestamp`时, 一个数字也可以成功转换.
+

 ### 时间和日期函数

--- a/include/common/ttime.h
+++ b/include/common/ttime.h
@ -90,6 +90,34 @@ int32_t convertStringToTimestamp(int16_t type, char* inputData, int64_t timePrec

 void taosFormatUtcTime(char* buf, int32_t bufLen, int64_t ts, int32_t precision);

+struct STm {
+  struct tm tm;
+  int64_t   fsec;  // in NANOSECOND
+};
+
+int32_t taosTs2Tm(int64_t ts, int32_t precision, struct STm* tm);
+int32_t taosTm2Ts(struct STm* tm, int64_t* ts, int32_t precision);
+
+/// @brief convert a timestamp to a formatted string
+/// @param format the timestamp format, must null terminated
+/// @param [in,out] formats the formats array pointer generated. Shouldn't be NULL.
+/// If (*formats == NULL), [format] will be used and [formats] will be updated to the new generated
+/// formats array; If not NULL, [formats] will be used instead of [format] to skip parse formats again.
+/// @param out output buffer, should be initialized by memset
+/// @notes remember to free the generated formats
+void taosTs2Char(const char* format, SArray** formats, int64_t ts, int32_t precision, char* out, int32_t outLen);
+/// @brief convert a formatted timestamp string to a timestamp
+/// @param format must null terminated
+/// @param [in, out] formats, see taosTs2Char
+/// @param tsStr must null terminated
+/// @retval 0 for success, otherwise error occured
+/// @notes remember to free the generated formats even when error occured
+int32_t taosChar2Ts(const char* format, SArray** formats, const char* tsStr, int64_t* ts, int32_t precision, char* errMsg,
+                    int32_t errMsgLen);
+
+void    TEST_ts2char(const char* format, int64_t ts, int32_t precision, char* out, int32_t outLen);
+int32_t TEST_char2ts(const char* format, int64_t* ts, int32_t precision, const char* tsStr);
+
 #ifdef __cplusplus
 }
 #endif
--- a/include/libs/function/functionMgt.h
+++ b/include/libs/function/functionMgt.h
@ -94,6 +94,8 @@ typedef enum EFunctionType {
  FUNCTION_TYPE_TO_ISO8601,
  FUNCTION_TYPE_TO_UNIXTIMESTAMP,
  FUNCTION_TYPE_TO_JSON,
+  FUNCTION_TYPE_TO_TIMESTAMP,
+  FUNCTION_TYPE_TO_CHAR,

  // date and time function
  FUNCTION_TYPE_NOW = 2500,
--- a/include/libs/scalar/scalar.h
+++ b/include/libs/scalar/scalar.h
@ -80,6 +80,8 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
 int32_t toISO8601Function(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t toUnixtimestampFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t toJsonFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t toTimestampFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t toCharFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t timeDiffFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t nowFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@ -46,6 +46,7 @@ extern "C" {
 #define SYNC_HEARTBEAT_SLOW_MS       1500
 #define SYNC_HEARTBEAT_REPLY_SLOW_MS 1500
 #define SYNC_SNAP_RESEND_MS          1000 * 60
+#define SYNC_SNAP_TIMEOUT_MS         1000 * 600

 #define SYNC_VND_COMMIT_MIN_MS 3000

--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@ -657,6 +657,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_PAR_CORRESPONDING_STABLE_ERR  TAOS_DEF_ERROR_CODE(0, 0x2618)
 #define TSDB_CODE_PAR_INVALID_DB_OPTION         TAOS_DEF_ERROR_CODE(0, 0x2619)
 #define TSDB_CODE_PAR_INVALID_TABLE_OPTION      TAOS_DEF_ERROR_CODE(0, 0x261A)
+#define TSDB_CODE_PAR_INTER_VALUE_TOO_BIG       TAOS_DEF_ERROR_CODE(0, 0x261B)
 #define TSDB_CODE_PAR_GROUPBY_WINDOW_COEXIST    TAOS_DEF_ERROR_CODE(0, 0x2624)
 #define TSDB_CODE_PAR_AGG_FUNC_NESTING          TAOS_DEF_ERROR_CODE(0, 0x2627)
 #define TSDB_CODE_PAR_INVALID_STATE_WIN_TYPE    TAOS_DEF_ERROR_CODE(0, 0x2628)
@ -739,6 +740,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_FUNC_FUNTION_PARA_VALUE       TAOS_DEF_ERROR_CODE(0, 0x2803)
 #define TSDB_CODE_FUNC_NOT_BUILTIN_FUNTION      TAOS_DEF_ERROR_CODE(0, 0x2804)
 #define TSDB_CODE_FUNC_DUP_TIMESTAMP            TAOS_DEF_ERROR_CODE(0, 0x2805)
+#define TSDB_CODE_FUNC_TO_TIMESTAMP_FAILED      TAOS_DEF_ERROR_CODE(0, 0x2806)

 //udf
 #define TSDB_CODE_UDF_STOPPING                  TAOS_DEF_ERROR_CODE(0, 0x2901)
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@ -109,6 +109,15 @@ extern const int32_t TYPE_BYTES[21];

 #define TSDB_INS_USER_STABLES_DBNAME_COLID 2

+static const int64_t TICK_PER_SECOND[] = {
+  1000LL, // MILLISECOND
+  1000000LL, // MICROSECOND
+  1000000000LL, // NANOSECOND
+  0LL, // HOUR
+  0LL, // MINUTE
+  1LL // SECOND
+};
+
 #define TSDB_TICK_PER_SECOND(precision)               \
  ((int64_t)((precision) == TSDB_TIME_PRECISION_MILLI \
                 ? 1000LL                             \
@ -294,6 +303,8 @@ typedef enum ELogicConditionType {
 #define TSDB_SYNC_APPLYQ_SIZE_LIMIT    512
 #define TSDB_SYNC_NEGOTIATION_WIN      512

+#define TSDB_SYNC_SNAP_BUFFER_SIZE 2048
+
 #define TSDB_TBNAME_COLUMN_INDEX     (-1)
 #define TSDB_MULTI_TABLEMETA_MAX_NUM 100000  // maximum batch size allowed to load table meta

--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@ -104,13 +104,21 @@ uint16_t tsAuditPort = 6043;
 bool     tsEnableAuditCreateTable = true;

 // telem
+#ifdef TD_ENTERPRISE
+bool     tsEnableTelem = false;
+#else
 bool     tsEnableTelem = true;
+#endif
 int32_t  tsTelemInterval = 43200;
 char     tsTelemServer[TSDB_FQDN_LEN] = "telemetry.tdengine.com";
 uint16_t tsTelemPort = 80;
 char    *tsTelemUri = "/report";

+#ifdef TD_ENTERPRISE
+bool  tsEnableCrashReport = false;
+#else
 bool  tsEnableCrashReport = true;
+#endif
 char *tsClientCrashReportUri = "/ccrashreport";
 char *tsSvrCrashReportUri = "/dcrashreport";

--- a/source/common/src/ttime.c
+++ b/source/common/src/ttime.c
@ -25,7 +25,6 @@

 #include "tlog.h"

-
 // ==== mktime() kernel code =================//
 static int64_t m_deltaUtc = 0;

@ -682,7 +681,7 @@ int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision) {
  }

  // The following code handles the y/n time duration
-  int64_t numOfMonth = (unit == 'y')? duration*12:duration;
+  int64_t numOfMonth = (unit == 'y') ? duration * 12 : duration;
  int64_t fraction = t % TSDB_TICK_PER_SECOND(precision);

  struct tm tm;
@ -768,7 +767,6 @@ int64_t taosTimeTruncate(int64_t ts, const SInterval* pInterval) {
  int32_t precision = pInterval->precision;

  if (IS_CALENDAR_TIME_DURATION(pInterval->slidingUnit)) {
-
    start /= (int64_t)(TSDB_TICK_PER_SECOND(precision));
    struct tm tm;
    time_t    tt = (time_t)start;
@ -799,7 +797,7 @@ int64_t taosTimeTruncate(int64_t ts, const SInterval* pInterval) {
        int64_t newe = taosTimeAdd(news, pInterval->interval, pInterval->intervalUnit, precision) - 1;

        if (newe < ts) {  // move towards the greater endpoint
-          while(newe < ts && news < ts) {
+          while (newe < ts && news < ts) {
            news += pInterval->sliding;
            newe = taosTimeAdd(news, pInterval->interval, pInterval->intervalUnit, precision) - 1;
          }
@ -978,3 +976,947 @@ void taosFormatUtcTime(char* buf, int32_t bufLen, int64_t t, int32_t precision)

  tstrncpy(buf, ts, bufLen);
 }
+
+int32_t taosTs2Tm(int64_t ts, int32_t precision, struct STm* tm) {
+  tm->fsec = ts % TICK_PER_SECOND[precision] * (TICK_PER_SECOND[TSDB_TIME_PRECISION_NANO] / TICK_PER_SECOND[precision]);
+  time_t t = ts / TICK_PER_SECOND[precision];
+  taosLocalTime(&t, &tm->tm, NULL);
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t taosTm2Ts(struct STm* tm, int64_t* ts, int32_t precision) {
+  *ts = taosMktime(&tm->tm);
+  *ts *= TICK_PER_SECOND[precision];
+  *ts += tm->fsec / (TICK_PER_SECOND[TSDB_TIME_PRECISION_NANO] / TICK_PER_SECOND[precision]);
+  return TSDB_CODE_SUCCESS;
+}
+
+typedef struct {
+  const char* name;
+  int         len;
+  int         id;
+  bool        isDigit;
+} TSFormatKeyWord;
+
+typedef enum {
+  // TSFKW_AD,   // BC AD
+  // TSFKW_A_D,  // A.D. B.C.
+  TSFKW_AM,   // AM, PM
+  TSFKW_A_M,  // A.M., P.M.
+  // TSFKW_BC,   // BC AD
+  // TSFKW_B_C,  // B.C. A.D.
+  TSFKW_DAY,  // MONDAY, TUESDAY ...
+  TSFKW_DDD,  // Day of year 001-366
+  TSFKW_DD,   // Day of month 01-31
+  TSFKW_Day,  // Sunday, Monday
+  TSFKW_DY,   // MON, TUE
+  TSFKW_Dy,   // Mon, Tue
+  TSFKW_D,    // 1-7 -> Sunday(1) -> Saturday(7)
+  TSFKW_HH24,
+  TSFKW_HH12,
+  TSFKW_HH,
+  TSFKW_MI,  // minute
+  TSFKW_MM,
+  TSFKW_MONTH,  // JANUARY, FEBRUARY
+  TSFKW_MON,
+  TSFKW_Month,
+  TSFKW_Mon,
+  TSFKW_MS,
+  TSFKW_NS,
+  //TSFKW_OF,
+  TSFKW_PM,
+  TSFKW_P_M,
+  TSFKW_SS,
+  TSFKW_TZH,
+  // TSFKW_TZM,
+  // TSFKW_TZ,
+  TSFKW_US,
+  TSFKW_YYYY,
+  TSFKW_YYY,
+  TSFKW_YY,
+  TSFKW_Y,
+  // TSFKW_a_d,
+  // TSFKW_ad,
+  TSFKW_am,
+  TSFKW_a_m,
+  // TSFKW_b_c,
+  // TSFKW_bc,
+  TSFKW_day,
+  TSFKW_ddd,
+  TSFKW_dd,
+  TSFKW_dy,   // mon, tue
+  TSFKW_d,
+  TSFKW_hh24,
+  TSFKW_hh12,
+  TSFKW_hh,
+  TSFKW_mi,
+  TSFKW_mm,
+  TSFKW_month,
+  TSFKW_mon,
+  TSFKW_ms,
+  TSFKW_ns,
+  TSFKW_pm,
+  TSFKW_p_m,
+  TSFKW_ss,
+  TSFKW_tzh,
+  // TSFKW_tzm,
+  // TSFKW_tz,
+  TSFKW_us,
+  TSFKW_yyyy,
+  TSFKW_yyy,
+  TSFKW_yy,
+  TSFKW_y,
+  TSFKW_last_
+} TSFormatKeywordId;
+
+// clang-format off
+static const TSFormatKeyWord formatKeyWords[] = {
+  //{"AD", 2, TSFKW_AD, false},
+  //{"A.D.", 4, TSFKW_A_D},
+  {"AM", 2, TSFKW_AM, false},
+  {"A.M.", 4, TSFKW_A_M, false},
+  //{"BC", 2, TSFKW_BC, false},
+  //{"B.C.", 4, TSFKW_B_C, false},
+  {"DAY", 3, TSFKW_DAY, false},
+  {"DDD", 3, TSFKW_DDD, true},
+  {"DD", 2, TSFKW_DD, true},
+  {"Day", 3, TSFKW_Day, false},
+  {"DY", 2, TSFKW_DY, false},
+  {"Dy", 2, TSFKW_Dy, false},
+  {"D", 1, TSFKW_D, true},
+  {"HH24", 4, TSFKW_HH24, true},
+  {"HH12", 4, TSFKW_HH12, true},
+  {"HH", 2, TSFKW_HH, true},
+  {"MI", 2, TSFKW_MI, true},
+  {"MM", 2, TSFKW_MM, true},
+  {"MONTH", 5, TSFKW_MONTH, false},
+  {"MON", 3, TSFKW_MON, false},
+  {"Month", 5, TSFKW_Month, false},
+  {"Mon", 3, TSFKW_Mon, false},
+  {"MS", 2, TSFKW_MS, true},
+  {"NS", 2, TSFKW_NS, true},
+  //{"OF", 2, TSFKW_OF, false},
+  {"PM", 2, TSFKW_PM, false},
+  {"P.M.", 4, TSFKW_P_M, false},
+  {"SS", 2, TSFKW_SS, true},
+  {"TZH", 3, TSFKW_TZH, false},
+  //{"TZM", 3, TSFKW_TZM},
+  //{"TZ", 2, TSFKW_TZ},
+  {"US", 2, TSFKW_US, true},
+  {"YYYY", 4, TSFKW_YYYY, true},
+  {"YYY", 3, TSFKW_YYY, true},
+  {"YY", 2, TSFKW_YY, true},
+  {"Y", 1, TSFKW_Y, true},
+  //{"a.d.", 4, TSFKW_a_d, false},
+  //{"ad", 2, TSFKW_ad, false},
+  {"am", 2, TSFKW_am, false},
+  {"a.m.", 4, TSFKW_a_m, false},
+  //{"b.c.", 4, TSFKW_b_c, false},
+  //{"bc", 2, TSFKW_bc, false},
+  {"day", 3, TSFKW_day, false},
+  {"ddd", 3, TSFKW_DDD, true},
+  {"dd", 2, TSFKW_DD, true},
+  {"dy", 2, TSFKW_dy, false},
+  {"d", 1, TSFKW_D, true},
+  {"hh24", 4, TSFKW_HH24, true},
+  {"hh12", 4, TSFKW_HH12, true},
+  {"hh", 2, TSFKW_HH, true},
+  {"mi", 2, TSFKW_MI, true},
+  {"mm", 2, TSFKW_MM, true},
+  {"month", 5, TSFKW_month, false},
+  {"mon", 3, TSFKW_mon, false},
+  {"ms", 2, TSFKW_MS, true},
+  {"ns", 2, TSFKW_NS, true},
+  //{"of", 2, TSFKW_OF, false},
+  {"pm", 2, TSFKW_pm, false},
+  {"p.m.", 4, TSFKW_p_m, false},
+  {"ss", 2, TSFKW_SS, true},
+  {"tzh", 3, TSFKW_TZH, false},
+  //{"tzm", 3, TSFKW_TZM},
+  //{"tz", 2, TSFKW_tz},
+  {"us", 2, TSFKW_US, true},
+  {"yyyy", 4, TSFKW_YYYY, true},
+  {"yyy", 3, TSFKW_YYY, true},
+  {"yy", 2, TSFKW_YY, true},
+  {"y", 1, TSFKW_Y, true},
+  {NULL, 0, 0}
+};
+// clang-format on
+
+#define TS_FROMAT_KEYWORD_INDEX_SIZE ('z' - 'A' + 1)
+static const int TSFormatKeywordIndex[TS_FROMAT_KEYWORD_INDEX_SIZE] = {
+    /*A*/ TSFKW_AM,     -1, -1,
+    /*D*/ TSFKW_DAY,    -1, -1, -1,
+    /*H*/ TSFKW_HH24,   -1, -1, -1, -1,
+    /*M*/ TSFKW_MI,
+    /*N*/ TSFKW_NS,     -1,
+    /*P*/ TSFKW_PM,     -1, -1,
+    /*S*/ TSFKW_SS,
+    /*T*/ TSFKW_TZH,
+    /*U*/ TSFKW_US,     -1, -1, -1,
+    /*Y*/ TSFKW_YYYY,   -1,
+    /*[ \ ] ^ _ `*/ -1, -1, -1, -1, -1, -1,
+    /*a*/ TSFKW_am,     -1, -1,
+    /*d*/ TSFKW_day,    -1, -1, -1,
+    /*h*/ TSFKW_hh24,   -1, -1, -1, -1,
+    /*m*/ TSFKW_mi,
+    /*n*/ TSFKW_ns,     -1,
+    /*p*/ TSFKW_pm,     -1, -1,
+    /*s*/ TSFKW_ss,
+    /*t*/ TSFKW_tzh,
+    /*u*/ TSFKW_us,     -1, -1, -1,
+    /*y*/ TSFKW_yyyy,   -1};
+
+typedef struct {
+  uint8_t                type;
+  const char*            c;
+  int32_t                len;
+  const TSFormatKeyWord* key;
+} TSFormatNode;
+
+static const char* const weekDays[] = {"Sunday",   "Monday", "Tuesday",  "Wednesday",
+                                       "Thursday", "Friday", "Saturday", "NULL"};
+static const char* const shortWeekDays[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "NULL"};
+static const char* const fullMonths[] = {"January", "February",  "March",   "April",    "May",      "June", "July",
+                                         "August",  "September", "October", "November", "December", NULL};
+static const char* const months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
+                                     "Aug", "Sep", "Oct", "Nov", "Dec", NULL};
+#define A_M_STR "A.M."
+#define a_m_str "a.m."
+#define AM_STR  "AM"
+#define am_str  "am"
+#define P_M_STR "P.M."
+#define p_m_str "p.m."
+#define PM_STR  "PM"
+#define pm_str  "pm"
+static const char* const apms[] = {AM_STR, PM_STR, am_str, pm_str, NULL};
+static const char* const long_apms[] = {A_M_STR, P_M_STR, a_m_str, p_m_str, NULL};
+
+#define TS_FORMAT_NODE_TYPE_KEYWORD   1
+#define TS_FORMAT_NODE_TYPE_SEPARATOR 2
+#define TS_FORMAT_NODE_TYPE_CHAR      3
+
+static const TSFormatKeyWord* keywordSearch(const char* str) {
+  if (*str < 'A' || *str > 'z' || (*str > 'Z' && *str < 'a')) return NULL;
+  int32_t idx = TSFormatKeywordIndex[str[0] - 'A'];
+  if (idx < 0) return NULL;
+  const TSFormatKeyWord* key = &formatKeyWords[idx++];
+  while (key->name && str[0] == key->name[0]) {
+    if (0 == strncmp(key->name, str, key->len)) {
+      return key;
+    }
+    key = &formatKeyWords[idx++];
+  }
+  return NULL;
+}
+
+static bool isSeperatorChar(char c) {
+  return (c > 0x20 && c < 0x7F && !(c >= 'A' && c <= 'Z') && !(c >= 'a' && c <= 'z') && !(c >= '0' && c <= '9'));
+}
+
+static void parseTsFormat(const char* formatStr, SArray* formats) {
+  TSFormatNode* lastOtherFormat = NULL;
+  while (*formatStr) {
+    const TSFormatKeyWord* key = keywordSearch(formatStr);
+    if (key) {
+      TSFormatNode format = {.key = key, .type = TS_FORMAT_NODE_TYPE_KEYWORD};
+      taosArrayPush(formats, &format);
+      formatStr += key->len;
+      lastOtherFormat = NULL;
+    } else {
+      if (*formatStr == '"') {
+        lastOtherFormat = NULL;
+        // for double quoted string
+        formatStr++;
+        TSFormatNode* last = NULL;
+        while (*formatStr) {
+          if (*formatStr == '"') {
+            formatStr++;
+            break;
+          }
+          if (*formatStr == '\\' && *(formatStr + 1)) {
+            formatStr++;
+            last = NULL; // stop expanding last format, create new format
+          }
+          if (last) {
+            // expand
+            assert(last->type == TS_FORMAT_NODE_TYPE_CHAR);
+            last->len++;
+            formatStr++;
+          } else {
+            // create new
+            TSFormatNode format = {.type = TS_FORMAT_NODE_TYPE_CHAR, .key = NULL};
+            format.c = formatStr;
+            format.len = 1;
+            taosArrayPush(formats, &format);
+            formatStr++;
+            last = taosArrayGetLast(formats);
+          }
+        }
+      } else {
+        // for other strings
+        if (*formatStr == '\\' && *(formatStr + 1)) {
+          formatStr++;
+          lastOtherFormat = NULL; // stop expanding
+        } else {
+          if (lastOtherFormat && !isSeperatorChar(*formatStr)) {
+            // expanding
+          } else {
+            // create new
+            lastOtherFormat = NULL;
+          }
+        }
+        if (lastOtherFormat) {
+          assert(lastOtherFormat->type == TS_FORMAT_NODE_TYPE_CHAR);
+          lastOtherFormat->len++;
+          formatStr++;
+        } else {
+          TSFormatNode format = {
+            .type = isSeperatorChar(*formatStr) ? TS_FORMAT_NODE_TYPE_SEPARATOR : TS_FORMAT_NODE_TYPE_CHAR,
+            .key = NULL};
+          format.c = formatStr;
+          format.len = 1;
+          taosArrayPush(formats, &format);
+          formatStr++;
+          if (format.type == TS_FORMAT_NODE_TYPE_CHAR) lastOtherFormat = taosArrayGetLast(formats);
+        }
+      }
+    }
+  }
+}
+
+static void tm2char(const SArray* formats, const struct STm* tm, char* s, int32_t outLen) {
+  int32_t size = taosArrayGetSize(formats);
+  const char* start = s;
+  for (int32_t i = 0; i < size; ++i) {
+    TSFormatNode* format = taosArrayGet(formats, i);
+    if (format->type != TS_FORMAT_NODE_TYPE_KEYWORD) {
+      if (s - start + format->len + 1 > outLen) break;
+      strncpy(s, format->c, format->len);
+      s += format->len;
+      continue;
+    }
+    if (s - start + 16 > outLen) break;
+
+    switch (format->key->id) {
+      case TSFKW_AM:
+      case TSFKW_PM:
+        sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "PM" : "AM");
+        s += 2;
+        break;
+      case TSFKW_A_M:
+      case TSFKW_P_M:
+        sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "P.M." : "A.M.");
+        s += 4;
+        break;
+      case TSFKW_am:
+      case TSFKW_pm:
+        sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "pm" : "am");
+        s += 2;
+        break;
+      case TSFKW_a_m:
+      case TSFKW_p_m:
+        sprintf(s, tm->tm.tm_hour % 24 >= 12 ? "p.m." : "a.m.");
+        s += 4;
+        break;
+      case TSFKW_DDD:
+        sprintf(s, "%d", tm->tm.tm_yday);
+        s += strlen(s);
+        break;
+      case TSFKW_DD:
+        sprintf(s, "%02d", tm->tm.tm_mday);
+        s += 2;
+        break;
+      case TSFKW_D:
+        sprintf(s, "%d", tm->tm.tm_wday + 1);
+        s += 1;
+        break;
+      case TSFKW_DAY: {
+        // MONDAY, TUESDAY...
+        const char* wd = weekDays[tm->tm.tm_wday];
+        char        buf[10] = {0};
+        for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = toupper(wd[i]);
+        sprintf(s, "%-9s", buf);
+        s += strlen(s);
+        break;
+      }
+      case TSFKW_Day:
+        // Monday, TuesDay...
+        sprintf(s, "%-9s", weekDays[tm->tm.tm_wday]);
+        s += strlen(s);
+        break;
+      case TSFKW_day: {
+        const char* wd = weekDays[tm->tm.tm_wday];
+        char        buf[10] = {0};
+        for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = tolower(wd[i]);
+        sprintf(s, "%-9s", buf);
+        s += strlen(s);
+        break;
+      }
+      case TSFKW_DY: {
+        // MON, TUE
+        const char* wd = shortWeekDays[tm->tm.tm_wday];
+        char        buf[8] = {0};
+        for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = toupper(wd[i]);
+        sprintf(s, "%3s", buf);
+        s += 3;
+        break;
+      }
+      case TSFKW_Dy:
+        // Mon, Tue
+        sprintf(s, "%3s", shortWeekDays[tm->tm.tm_wday]);
+        s += 3;
+        break;
+      case TSFKW_dy: {
+        // mon, tue
+        const char* wd = shortWeekDays[tm->tm.tm_wday];
+        char        buf[8] = {0};
+        for (int32_t i = 0; i < strlen(wd); ++i) buf[i] = tolower(wd[i]);
+        sprintf(s, "%3s", buf);
+        s += 3;
+        break;
+      }
+      case TSFKW_HH24:
+        sprintf(s, "%02d", tm->tm.tm_hour);
+        s += 2;
+        break;
+      case TSFKW_HH:
+      case TSFKW_HH12:
+        // 0 or 12 o'clock in 24H coresponds to 12 o'clock (AM/PM) in 12H
+        sprintf(s, "%02d", tm->tm.tm_hour % 12 == 0 ? 12 : tm->tm.tm_hour % 12);
+        s += 2;
+        break;
+      case TSFKW_MI:
+        sprintf(s, "%02d", tm->tm.tm_min);
+        s += 2;
+        break;
+      case TSFKW_MM:
+        sprintf(s, "%02d", tm->tm.tm_mon + 1);
+        s += 2;
+        break;
+      case TSFKW_MONTH: {
+        const char* mon = fullMonths[tm->tm.tm_mon];
+        char        buf[10] = {0};
+        for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = toupper(mon[i]);
+        sprintf(s, "%-9s", buf);
+        s += strlen(s);
+        break;
+      }
+      case TSFKW_MON: {
+        const char* mon = months[tm->tm.tm_mon];
+        char        buf[10] = {0};
+        for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = toupper(mon[i]);
+        sprintf(s, "%s", buf);
+        s += strlen(s);
+        break;
+      }
+      case TSFKW_Month:
+        sprintf(s, "%-9s", fullMonths[tm->tm.tm_mon]);
+        s += strlen(s);
+        break;
+      case TSFKW_month: {
+        const char* mon = fullMonths[tm->tm.tm_mon];
+        char        buf[10] = {0};
+        for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = tolower(mon[i]);
+        sprintf(s, "%-9s", buf);
+        s += strlen(s);
+        break;
+      }
+      case TSFKW_Mon:
+        sprintf(s, "%s", months[tm->tm.tm_mon]);
+        s += strlen(s);
+        break;
+      case TSFKW_mon: {
+        const char* mon = months[tm->tm.tm_mon];
+        char        buf[10] = {0};
+        for (int32_t i = 0; i < strlen(mon); ++i) buf[i] = tolower(mon[i]);
+        sprintf(s, "%s", buf);
+        s += strlen(s);
+        break;
+      }
+      case TSFKW_SS:
+        sprintf(s, "%02d", tm->tm.tm_sec);
+        s += 2;
+        break;
+      case TSFKW_MS:
+        sprintf(s, "%03" PRId64, tm->fsec / 1000000L);
+        s += 3;
+        break;
+      case TSFKW_US:
+        sprintf(s, "%06" PRId64, tm->fsec / 1000L);
+        s += 6;
+        break;
+      case TSFKW_NS:
+        sprintf(s, "%09" PRId64, tm->fsec);
+        s += 9;
+        break;
+      case TSFKW_TZH:
+        sprintf(s, "%s%02d", tsTimezone < 0 ? "-" : "+", tsTimezone);
+        s += strlen(s);
+        break;
+      case TSFKW_YYYY:
+        sprintf(s, "%04d", tm->tm.tm_year + 1900);
+        s += strlen(s);
+        break;
+      case TSFKW_YYY:
+        sprintf(s, "%03d", (tm->tm.tm_year + 1900) % 1000);
+        s += strlen(s);
+        break;
+      case TSFKW_YY:
+        sprintf(s, "%02d", (tm->tm.tm_year + 1900) % 100);
+        s += strlen(s);
+        break;
+      case TSFKW_Y:
+        sprintf(s, "%01d", (tm->tm.tm_year + 1900) % 10);
+        s += strlen(s);
+        break;
+      default:
+        break;
+    }
+  }
+}
+
+/// @brief find s in arr case insensitively
+/// @retval the index in arr if found, -1 if not found
+static int32_t strArrayCaseSearch(const char* const* arr, const char* s) {
+  if (!*s) return -1;
+  const char* const* fmt = arr;
+  for (; *fmt; ++fmt) {
+    const char *l, *r;
+    for (l = fmt[0], r = s;; l++, r++) {
+      if (*l == '\0') return fmt - arr;
+      if (*r == '\0' || tolower(*l) != tolower(*r)) break;
+    }
+  }
+  return -1;
+}
+
+static const char* tsFormatStr2Int32(int32_t* dest, const char* str, int32_t len, bool needMoreDigit) {
+  char*       last;
+  int64_t     res;
+  const char* s = str;
+  if ('\0' == str[0]) return NULL;
+  if (len <= 0) {
+    res = taosStr2Int64(s, &last, 10);
+    s = last;
+  } else {
+    char buf[16] = {0};
+    strncpy(buf, s, len);
+    int32_t copiedLen = strlen(buf);
+    if (copiedLen < len) {
+      if (!needMoreDigit) {
+        // digits not enough, that's ok, cause we do not need more digits
+        // '2023-1' 'YYYY-MM'
+        // '202a' 'YYYY' -> 202
+        res = taosStr2Int64(s, &last, 10);
+        s += copiedLen;
+      } else {
+        // bytes not enough, and there are other digit formats to match
+        // '2023-1' 'YYYY-MMDD'
+        return NULL;
+      }
+    } else {
+      if (needMoreDigit) {
+        res = taosStr2Int64(buf, &last, 10);
+        // bytes enough, but digits not enough, like '202a12' 'YYYYMM', YYYY needs four digits
+        if (last - buf < len) return NULL;
+        s += last - buf;
+      } else {
+        res = taosStr2Int64(s, &last, 10);
+        s = last;
+      }
+    }
+  }
+  if (s == str) {
+    // no integers found
+    return NULL;
+  }
+  if (errno == ERANGE || res > INT32_MAX || res < INT32_MIN) {
+    // out of range
+    return NULL;
+  }
+  *dest = res;
+  return s;
+}
+
+static int32_t adjustYearTo2020(int32_t year) {
+  if (year < 70) return year + 2000;    // 2000 - 2069
+  if (year < 100) return year + 1900;   // 1970 - 1999
+  if (year < 520) return year + 2000;   // 2100 - 2519
+  if (year < 1000) return year + 1000;  // 1520 - 1999
+  return year;
+}
+
+static bool checkTm(const struct tm* tm) {
+  if (tm->tm_mon < 0 || tm->tm_mon > 11) return false;
+  if (tm->tm_wday < 0 || tm->tm_wday > 6) return false;
+  if (tm->tm_yday < 0 || tm->tm_yday > 365) return false;
+  if (tm->tm_mday < 0 || tm->tm_mday > 31) return false;
+  if (tm->tm_hour < 0 || tm->tm_hour > 23) return false;
+  if (tm->tm_min < 0 || tm->tm_min > 59) return false;
+  if (tm->tm_sec < 0 || tm->tm_sec > 60) return false;
+  return true;
+}
+
+static bool needMoreDigits(SArray* formats, int32_t curIdx) {
+  if (curIdx == taosArrayGetSize(formats) - 1) return false;
+  TSFormatNode* pNextNode = taosArrayGet(formats, curIdx + 1);
+  if (pNextNode->type == TS_FORMAT_NODE_TYPE_SEPARATOR) {
+    return false;
+  } else if (pNextNode->type == TS_FORMAT_NODE_TYPE_KEYWORD) {
+    return pNextNode->key->isDigit;
+  } else {
+    return isdigit(pNextNode->c[0]);
+  }
+}
+
+/// @brief convert a formatted time str to timestamp
+/// @param[in] s the formatted timestamp str
+/// @param[in] formats array of TSFormatNode, output of parseTsFormat
+/// @param[out] ts output timestamp
+/// @param precision the timestamp precision to convert to, sec/milli/micro/nano
+/// @param[out] sErrPos if not NULL, when err occured, points to the failed position of s, only set when ret is -1
+/// @param[out] fErrIdx if not NULL, when err occured, the idx of the failed format idx, only set when ret is -1
+/// @retval 0 for success
+/// @retval -1 for format and s mismatch error
+/// @retval -2 if datetime err, like 2023-13-32 25:61:69
+static int32_t char2ts(const char* s, SArray* formats, int64_t* ts, int32_t precision, const char** sErrPos,
+                       int32_t* fErrIdx) {
+  int32_t size = taosArrayGetSize(formats);
+  int32_t pm = 0;      // default am
+  int32_t hour12 = 0;  // default HH24
+  int32_t year = 0, mon = 0, yd = 0, md = 1, wd = 0;
+  int32_t hour = 0, min = 0, sec = 0, us = 0, ms = 0, ns = 0;
+  int32_t tzSign = 1, tz = tsTimezone;
+  int32_t err = 0;
+
+  for (int32_t i = 0; i < size && *s != '\0'; ++i) {
+    while (isspace(*s) && *s != '\0') {
+      s++;
+    }
+    if (!s) break;
+    TSFormatNode* node = taosArrayGet(formats, i);
+    if (node->type == TS_FORMAT_NODE_TYPE_SEPARATOR) {
+      // separator matches any character
+      if (isSeperatorChar(s[0])) s += node->len;
+      continue;
+    }
+    if (node->type == TS_FORMAT_NODE_TYPE_CHAR) {
+      int32_t pos = 0;
+      // skip leading spaces
+      while (isspace(node->c[pos]) && node->len > 0) pos++;
+      while (pos < node->len && *s != '\0') {
+        if (!isspace(node->c[pos++])) {
+          while (isspace(*s) && *s != '\0') s++;
+          if (*s != '\0') s++;  // forward together
+        }
+      }
+      continue;
+    }
+    assert(node->type == TS_FORMAT_NODE_TYPE_KEYWORD);
+    switch (node->key->id) {
+      case TSFKW_A_M:
+      case TSFKW_P_M:
+      case TSFKW_a_m:
+      case TSFKW_p_m: {
+        int32_t idx = strArrayCaseSearch(long_apms, s);
+        if (idx >= 0) {
+          s += 4;
+          pm = idx % 2;
+          hour12 = 1;
+        } else {
+          err = -1;
+        }
+      } break;
+      case TSFKW_AM:
+      case TSFKW_PM:
+      case TSFKW_am:
+      case TSFKW_pm: {
+        int32_t idx = strArrayCaseSearch(apms, s);
+        if (idx >= 0) {
+          s += 2;
+          pm = idx % 2;
+          hour12 = 1;
+        } else {
+          err = -1;
+        }
+      } break;
+      case TSFKW_HH:
+      case TSFKW_HH12: {
+        const char* newPos = tsFormatStr2Int32(&hour, s, 2, needMoreDigits(formats, i));
+        if (NULL == newPos || hour > 12 || hour <= 0) {
+          err = -1;
+        } else {
+          hour12 = 1;
+          s = newPos;
+        }
+      } break;
+      case TSFKW_HH24: {
+        const char* newPos = tsFormatStr2Int32(&hour, s, 2, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          hour12 = 0;
+          s = newPos;
+        }
+      } break;
+      case TSFKW_MI: {
+        const char* newPos = tsFormatStr2Int32(&min, s, 2, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          s = newPos;
+        }
+      } break;
+      case TSFKW_SS: {
+        const char* newPos = tsFormatStr2Int32(&sec, s, 2, needMoreDigits(formats, i));
+        if (NULL == newPos)
+          err = -1;
+        else
+          s = newPos;
+      } break;
+      case TSFKW_MS: {
+        const char* newPos = tsFormatStr2Int32(&ms, s, 3, needMoreDigits(formats, i));
+        if (NULL == newPos)
+          err = -1;
+        else {
+          int32_t len = newPos - s;
+          ms *= len == 1 ? 100 : len == 2 ? 10 : 1;
+          s = newPos;
+        }
+      } break;
+      case TSFKW_US: {
+        const char* newPos = tsFormatStr2Int32(&us, s, 6, needMoreDigits(formats, i));
+        if (NULL == newPos)
+          err = -1;
+        else {
+          int32_t len = newPos - s;
+          us *= len == 1 ? 100000 : len == 2 ? 10000 : len == 3 ? 1000 : len == 4 ? 100 : len == 5 ? 10 : 1;
+          s = newPos;
+        }
+      } break;
+      case TSFKW_NS: {
+        const char* newPos = tsFormatStr2Int32(&ns, s, 9, needMoreDigits(formats, i));
+        if (NULL == newPos)
+          err = -1;
+        else {
+          int32_t len = newPos - s;
+          ns *= len == 1   ? 100000000
+                : len == 2 ? 10000000
+                : len == 3 ? 1000000
+                : len == 4 ? 100000
+                : len == 5 ? 10000
+                : len == 6 ? 1000
+                : len == 7 ? 100
+                : len == 8 ? 10
+                           : 1;
+          s = newPos;
+        }
+      } break;
+      case TSFKW_TZH: {
+        tzSign = *s == '-' ? -1 : 1;
+        const char* newPos = tsFormatStr2Int32(&tz, s, -1, needMoreDigits(formats, i));
+        if (NULL == newPos)
+          err = -1;
+        else {
+          s = newPos;
+        }
+      } break;
+      case TSFKW_MONTH:
+      case TSFKW_Month:
+      case TSFKW_month: {
+        int32_t idx = strArrayCaseSearch(fullMonths, s);
+        if (idx >= 0) {
+          s += strlen(fullMonths[idx]);
+          mon = idx;
+        } else {
+          err = -1;
+        }
+      } break;
+      case TSFKW_MON:
+      case TSFKW_Mon:
+      case TSFKW_mon: {
+        int32_t idx = strArrayCaseSearch(months, s);
+        if (idx >= 0) {
+          s += strlen(months[idx]);
+          mon = idx;
+        } else {
+          err = -1;
+        }
+      } break;
+      case TSFKW_MM: {
+        const char* newPos = tsFormatStr2Int32(&mon, s, 2, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          s = newPos;
+          mon -= 1;
+        }
+      } break;
+      case TSFKW_DAY:
+      case TSFKW_Day:
+      case TSFKW_day: {
+        int32_t idx = strArrayCaseSearch(weekDays, s);
+        if (idx >= 0) {
+          s += strlen(weekDays[idx]);
+          wd = idx;
+        } else {
+          err = -1;
+        }
+      } break;
+      case TSFKW_DY:
+      case TSFKW_Dy:
+      case TSFKW_dy: {
+        int32_t idx = strArrayCaseSearch(shortWeekDays, s);
+        if (idx >= 0) {
+          s += strlen(shortWeekDays[idx]);
+          wd = idx;
+        } else {
+          err = -1;
+        }
+      } break;
+      case TSFKW_DDD: {
+        const char* newPos = tsFormatStr2Int32(&yd, s, 3, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          s = newPos;
+        }
+      } break;
+      case TSFKW_DD: {
+        const char* newPos = tsFormatStr2Int32(&md, s, 2, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          s = newPos;
+        }
+      } break;
+      case TSFKW_D: {
+        const char* newPos = tsFormatStr2Int32(&wd, s, 1, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          s = newPos;
+        }
+      } break;
+      case TSFKW_YYYY: {
+        const char* newPos = tsFormatStr2Int32(&year, s, 4, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          s = newPos;
+        }
+      } break;
+      case TSFKW_YYY: {
+        const char* newPos = tsFormatStr2Int32(&year, s, 3, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          year = adjustYearTo2020(year);
+          s = newPos;
+        }
+      } break;
+      case TSFKW_YY: {
+        const char* newPos = tsFormatStr2Int32(&year, s, 2, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          year = adjustYearTo2020(year);
+          s = newPos;
+        }
+      } break;
+      case TSFKW_Y: {
+        const char* newPos = tsFormatStr2Int32(&year, s, 1, needMoreDigits(formats, i));
+        if (NULL == newPos) {
+          err = -1;
+        } else {
+          year = adjustYearTo2020(year);
+          s = newPos;
+        }
+      } break;
+      default:
+        break;
+    }
+    if (err) {
+      if (sErrPos) *sErrPos = s;
+      if (fErrIdx) *fErrIdx = i;
+      return err;
+    }
+  }
+  struct STm tm = {0};
+  tm.tm.tm_year = year - 1900;
+  tm.tm.tm_mon = mon;
+  tm.tm.tm_yday = yd;
+  tm.tm.tm_mday = md;
+  tm.tm.tm_wday = wd;
+  if (hour12) {
+    if (pm && hour < 12)
+      tm.tm.tm_hour = hour + 12;
+    else if (!pm && hour == 12)
+      tm.tm.tm_hour = 0;
+    else
+      tm.tm.tm_hour = hour;
+  } else {
+    tm.tm.tm_hour = hour;
+  }
+  tm.tm.tm_min = min;
+  tm.tm.tm_sec = sec;
+  if (!checkTm(&tm.tm)) return -2;
+  if (tz < -12 || tz > 12) return -2;
+  tm.fsec = ms * 1000000 + us * 1000 + ns;
+  int32_t ret = taosTm2Ts(&tm, ts, precision);
+  *ts += 60 * 60 * (tsTimezone - tz) * TICK_PER_SECOND[precision];
+  return ret;
+}
+
+void taosTs2Char(const char* format, SArray** formats, int64_t ts, int32_t precision, char* out, int32_t outLen) {
+  if (!*formats) {
+    *formats = taosArrayInit(8, sizeof(TSFormatNode));
+    parseTsFormat(format, *formats);
+  }
+  struct STm tm;
+  taosTs2Tm(ts, precision, &tm);
+  tm2char(*formats, &tm, out, outLen);
+}
+
+int32_t taosChar2Ts(const char* format, SArray** formats, const char* tsStr, int64_t* ts, int32_t precision, char* errMsg,
+                    int32_t errMsgLen) {
+  const char* sErrPos;
+  int32_t     fErrIdx;
+  if (!*formats) {
+    *formats = taosArrayInit(4, sizeof(TSFormatNode));
+    parseTsFormat(format, *formats);
+  }
+  int32_t code = char2ts(tsStr, *formats, ts, precision, &sErrPos, &fErrIdx);
+  if (code == -1) {
+    TSFormatNode* fNode = (taosArrayGet(*formats, fErrIdx));
+    snprintf(errMsg, errMsgLen, "mismatch format for: %s and %s", sErrPos,
+             fErrIdx < taosArrayGetSize(*formats) ? ((TSFormatNode*)taosArrayGet(*formats, fErrIdx))->key->name : "");
+  } else if (code == -2) {
+    snprintf(errMsg, errMsgLen, "timestamp format error: %s -> %s", tsStr, format);
+  }
+  return code;
+}
+
+void TEST_ts2char(const char* format, int64_t ts, int32_t precision, char* out, int32_t outLen) {
+  SArray* formats = taosArrayInit(4, sizeof(TSFormatNode));
+  parseTsFormat(format, formats);
+  struct STm tm;
+  taosTs2Tm(ts, precision, &tm);
+  tm2char(formats, &tm, out, outLen);
+  taosArrayDestroy(formats);
+}
+
+int32_t TEST_char2ts(const char* format, int64_t* ts, int32_t precision, const char* tsStr) {
+  const char* sErrPos;
+  int32_t     fErrIdx;
+  SArray*     formats = taosArrayInit(4, sizeof(TSFormatNode));
+  parseTsFormat(format, formats);
+  int32_t code = char2ts(tsStr, formats, ts, precision, &sErrPos, &fErrIdx);
+  if (code == -1) {
+    printf("failed position: %s\n", sErrPos);
+    printf("failed format: %s\n", ((TSFormatNode*)taosArrayGet(formats, fErrIdx))->key->name);
+  }
+  taosArrayDestroy(formats);
+  return code;
+}
--- a/source/common/test/commonTests.cpp
+++ b/source/common/test/commonTests.cpp
@ -13,6 +13,7 @@
 #include "tdatablock.h"
 #include "tdef.h"
 #include "tvariant.h"
+#include "ttime.h"

 namespace {
 //
@ -260,4 +261,234 @@ TEST(testCase, var_dataBlock_split_test) {
  }
 }

+void check_tm(const STm* tm, int32_t y, int32_t mon, int32_t d, int32_t h, int32_t m, int32_t s, int64_t fsec) {
+  ASSERT_EQ(tm->tm.tm_year, y);
+  ASSERT_EQ(tm->tm.tm_mon, mon);
+  ASSERT_EQ(tm->tm.tm_mday, d);
+  ASSERT_EQ(tm->tm.tm_hour, h);
+  ASSERT_EQ(tm->tm.tm_min, m);
+  ASSERT_EQ(tm->tm.tm_sec, s);
+  ASSERT_EQ(tm->fsec, fsec);
+}
+
+void test_timestamp_tm_conversion(int64_t ts, int32_t precision, int32_t y, int32_t mon, int32_t d, int32_t h, int32_t m, int32_t s, int64_t fsec) {
+  int64_t ts_tmp;
+  char buf[128] = {0};
+  struct STm tm;
+  taosFormatUtcTime(buf, 128, ts, precision);
+  printf("formated ts of %ld, precision: %d is: %s\n", ts, precision, buf);
+  taosTs2Tm(ts, precision, &tm);
+  check_tm(&tm, y, mon, d, h, m, s, fsec);
+  taosTm2Ts(&tm, &ts_tmp, precision);
+  ASSERT_EQ(ts, ts_tmp);
+}
+
+TEST(timeTest, timestamp2tm) {
+  const char* ts_str_ns = "2023-10-12T11:29:00.775726171+0800";
+  const char* ts_str_us = "2023-10-12T11:29:00.775726+0800";
+  const char* ts_str_ms = "2023-10-12T11:29:00.775+0800";
+  int64_t     ts, tmp_ts = 0;
+  struct STm  tm;
+
+  ASSERT_EQ(TSDB_CODE_SUCCESS, taosParseTime(ts_str_ns, &ts, strlen(ts_str_ns), TSDB_TIME_PRECISION_NANO, 0));
+  test_timestamp_tm_conversion(ts, TSDB_TIME_PRECISION_NANO, 2023 - 1900, 9 /* mon start from 0*/, 12, 11, 29, 0,
+                               775726171L);
+
+  ASSERT_EQ(TSDB_CODE_SUCCESS, taosParseTime(ts_str_us, &ts, strlen(ts_str_us), TSDB_TIME_PRECISION_MICRO, 0));
+  test_timestamp_tm_conversion(ts, TSDB_TIME_PRECISION_MICRO, 2023 - 1900, 9 /* mon start from 0*/, 12, 11, 29, 0,
+                               775726000L);
+
+  ASSERT_EQ(TSDB_CODE_SUCCESS, taosParseTime(ts_str_ms, &ts, strlen(ts_str_ms), TSDB_TIME_PRECISION_MILLI, 0));
+  test_timestamp_tm_conversion(ts, TSDB_TIME_PRECISION_MILLI, 2023 - 1900, 9 /* mon start from 0*/, 12, 11, 29, 0,
+                               775000000L);
+
+  ts = -5364687943000;  // milliseconds since epoch, Wednesday, January 1, 1800 1:00:00 AM GMT+08:06
+  test_timestamp_tm_conversion(ts, TSDB_TIME_PRECISION_MILLI, 1800 - 1900, 0 /* mon start from 0*/, 1, 1, 0, 0,
+                               000000000L);
+
+  ts = 0;
+  test_timestamp_tm_conversion(ts, TSDB_TIME_PRECISION_MILLI, 1970 - 1900, 0 /* mon start from 0*/, 1, 8, 0, 0,
+                               000000000L);
+
+  ts = -62198784343000; // milliseconds before epoch, Friday, January 1, -0001 12:00:00 AM GMT+08:06
+  test_timestamp_tm_conversion(ts, TSDB_TIME_PRECISION_MILLI, -1 - 1900, 0 /* mon start from 0*/, 1,
+                               0 /* hour start from 0*/, 0, 0, 000000000L);
+}
+
+void test_ts2char(int64_t ts, const char* format, int32_t precison, const char* expected) {
+  char buf[256] = {0};
+  TEST_ts2char(format, ts, precison, buf, 256);
+  printf("ts: %ld format: %s res: [%s], expected: [%s]\n", ts, format, buf, expected);
+  ASSERT_STREQ(expected, buf);
+}
+
+TEST(timeTest, ts2char) {
+  osDefaultInit();
+  if (tsTimezone != TdEastZone8) GTEST_SKIP();
+  int64_t ts;
+  const char* format = "YYYY-MM-DD";
+  ts = 0;
+  test_ts2char(ts, format, TSDB_TIME_PRECISION_MILLI, "1970-01-01");
+  test_ts2char(ts, format, TSDB_TIME_PRECISION_MICRO, "1970-01-01");
+  test_ts2char(ts, format, TSDB_TIME_PRECISION_NANO, "1970-01-01");
+  test_ts2char(ts, format, TSDB_TIME_PRECISION_SECONDS, "1970-01-01");
+
+  ts = 1697163517;
+  test_ts2char(ts, "YYYY-MM-DD", TSDB_TIME_PRECISION_SECONDS, "2023-10-13");
+  ts = 1697163517000;
+  test_ts2char(ts, "YYYY-MM-DD-Day-DAY", TSDB_TIME_PRECISION_MILLI, "2023-10-13-Friday   -FRIDAY   ");
+#ifndef WINDOWS
+  // double quoted: year, month, day are not parsed
+  test_ts2char(ts,
+               "YYYY-YYY-YY-Y-yyyy-yyy-yy-y-\"年\"-MONTH-MON-Month-Mon-month-mon-\"月\"-DDD-DD-D-ddd-dd-d-DAY-Day-"
+               "day-\"日\"",
+               TSDB_TIME_PRECISION_MILLI,
+               "2023-023-23-3-2023-023-23-3-年-OCTOBER  -OCT-October  -Oct-october  "
+               "-oct-月-285-13-6-285-13-6-FRIDAY   -Friday   -friday   -日");
+#endif
+  ts = 1697182085123L; // Friday, October 13, 2023 3:28:05.123 PM GMT+08:00
+  test_ts2char(ts, "HH24:hh24:HH12:hh12:HH:hh:MI:mi:SS:ss:MS:ms:US:us:NS:ns:PM:AM:pm:am", TSDB_TIME_PRECISION_MILLI,
+               "15:15:03:03:03:03:28:28:05:05:123:123:123000:123000:123000000:123000000:PM:PM:pm:pm");
+
+  // double quotes normal output
+  test_ts2char(ts, "\\\"HH24:hh24:HH12:hh12:HH:hh:MI:mi:SS:ss:MS:ms:US:us:NS:ns:PM:AM:pm:am\\\"", TSDB_TIME_PRECISION_MILLI,
+               "\"15:15:03:03:03:03:28:28:05:05:123:123:123000:123000:123000000:123000000:PM:PM:pm:pm\"");
+  test_ts2char(ts, "\\\"HH24:hh24:HH12:hh12:HH:hh:MI:mi:SS:ss:MS:ms:US:us:NS:ns:PM:AM:pm:am", TSDB_TIME_PRECISION_MILLI,
+               "\"15:15:03:03:03:03:28:28:05:05:123:123:123000:123000:123000000:123000000:PM:PM:pm:pm");
+  // double quoted strings recognized as literal string, parsing skipped
+  test_ts2char(ts, "\"HH24:hh24:HH12:hh12:HH:hh:MI:mi:SS:ss:MS:ms:US:us:NS:ns:PM:AM:pm:am", TSDB_TIME_PRECISION_MILLI,
+               "HH24:hh24:HH12:hh12:HH:hh:MI:mi:SS:ss:MS:ms:US:us:NS:ns:PM:AM:pm:am");
+  test_ts2char(ts, "yyyy-mm-dd hh24:mi:ss.nsamaaa", TSDB_TIME_PRECISION_MILLI, "2023-10-13 15:28:05.123000000pmaaa");
+  test_ts2char(ts, "aaa--yyyy-mm-dd hh24:mi:ss.nsamaaa", TSDB_TIME_PRECISION_MILLI, "aaa--2023-10-13 15:28:05.123000000pmaaa");
+  test_ts2char(ts, "add--yyyy-mm-dd hh24:mi:ss.nsamaaa", TSDB_TIME_PRECISION_MILLI, "a13--2023-10-13 15:28:05.123000000pmaaa");
+
+  ts = 1693946405000;
+  test_ts2char(ts, "Day, Month dd, YYYY hh24:mi:ss AM TZH:tzh", TSDB_TIME_PRECISION_MILLI, "Wednesday, September 06, 2023 04:40:05 AM +08:+08");
+
+  ts = -62198784343000; // milliseconds before epoch, Friday, January 1, -0001 12:00:00 AM GMT+08:06
+  test_ts2char(ts, "Day, Month dd, YYYY hh12:mi:ss AM", TSDB_TIME_PRECISION_MILLI, "Friday   , January   01, -001 12:00:00 AM");
+}
+
+TEST(timeTest, char2ts) {
+  osDefaultInit();
+  if (tsTimezone != TdEastZone8) GTEST_SKIP();
+  int64_t ts;
+  int32_t code =
+      TEST_char2ts("YYYY-DD-MM HH12:MI:SS:MSPM", &ts, TSDB_TIME_PRECISION_MILLI, "2023-10-10 12:00:00.000AM");
+  ASSERT_EQ(code, 0);
+  ASSERT_EQ(ts, 1696867200000LL);
+
+  // 2009-1-1 00:00:00
+  ASSERT_EQ(0, TEST_char2ts("YYYY-YYY-YY-Y", &ts, TSDB_TIME_PRECISION_MILLI, "2023-123-23-9"));
+  ASSERT_EQ(1230739200000LL, ts);
+  // 2023-1-1
+  ASSERT_EQ(0, TEST_char2ts("YYYY-YYY-YY", &ts, TSDB_TIME_PRECISION_MILLI, "2023-123-23-9"));
+  ASSERT_EQ(ts, 1672502400000LL);
+
+  // 2123-1-1, the second year(123) is used, which converted to 2123
+  ASSERT_EQ(0, TEST_char2ts("YYYY-YYY", &ts, TSDB_TIME_PRECISION_MILLI, "2023-123-23-9"));
+  ASSERT_EQ(ts, 4828176000000LL);
+  // 2023-1-1 12:10:10am
+  ASSERT_EQ(0, TEST_char2ts("yyyy-mm-dd HH12:MI:SSAM", &ts, TSDB_TIME_PRECISION_MILLI, "2023-1-1 12:10:10am"));
+  ASSERT_EQ(ts, 1672503010000LL);
+
+  // 2023-1-1 21:10:10.123
+  ASSERT_EQ(0, TEST_char2ts("yy-MM-dd HH12:MI:ss.msa.m.", &ts, TSDB_TIME_PRECISION_MILLI, "23-1-01 9:10:10.123p.m."));
+  ASSERT_EQ(ts, 1672578610123LL);
+
+  // 2023-1-1 21:10:10.123456789
+  ASSERT_EQ(0, TEST_char2ts("yy-MM-dd HH:MI:ss.ms.us.nsa.m.", &ts, TSDB_TIME_PRECISION_NANO,
+                            "23-1-01 9:10:10.123.000456.000000789p.m."));
+  ASSERT_EQ(ts, 1672578610123456789LL);
+
+  // 2023-1-1 21:10:10.120450780
+  ASSERT_EQ(0, TEST_char2ts("yy-MM-dd HH24:MI:SS.ms.us.ns", &ts, TSDB_TIME_PRECISION_NANO,
+                            "   23   - 1 - 01   \t  21:10:10 .  12 .  \t 00045 . 00000078  \t"));
+  ASSERT_EQ(ts, 1672578610120450780LL);
+
+#ifndef WINDOWS
+  // 2023-1-1 21:10:10.120450780
+  ASSERT_EQ(0, TEST_char2ts("yy \"年\"-MM 月-dd  \"日 子\" HH24:MI:ss.ms.us.ns TZH", &ts, TSDB_TIME_PRECISION_NANO,
+                            "   23  年 - 1 月 - 01 日 子  \t  21:10:10 .  12 .  \t 00045 . 00000078  \t+08"));
+  ASSERT_EQ(ts, 1672578610120450780LL);
+#endif
+
+  // 2023-1-1 19:10:10.123456789+06 -> 2023-1-1 21:10:10.123456789+08
+  ASSERT_EQ(0, TEST_char2ts("yy-MM-dd HH:MI:ss.ms.us.nsa.m.TZH", &ts, TSDB_TIME_PRECISION_NANO,
+                            "23-1-01 7:10:10.123.000456.000000789p.m.6"));
+  ASSERT_EQ(ts, 1672578610123456789LL);
+
+  // 2023-1-1 12:10:10.123456789-01 -> 2023-1-1 21:10:10.123456789+08
+  ASSERT_EQ(0, TEST_char2ts("yy-MM-dd HH24:MI:ss.ms.us.nsTZH", &ts, TSDB_TIME_PRECISION_NANO,
+                            "23-1-01 12:10:10.123.000456.000000789-1"));
+  ASSERT_EQ(ts, 1672578610123456789LL);
+
+  // 2100-01-01 11:10:10.124456+08
+  ASSERT_EQ(
+      0, TEST_char2ts("yyyy-MM-dd HH24:MI:ss.usTZH", &ts, TSDB_TIME_PRECISION_MICRO, "2100-01-01 11:10:10.124456+08"));
+  ASSERT_EQ(ts, 4102456210124456LL);
+
+  // 2100-01-01 11:10:10.124456+08 Firday
+  ASSERT_EQ(0, TEST_char2ts("yyyy/MONTH/dd DAY HH24:MI:ss.usTZH", &ts, TSDB_TIME_PRECISION_MICRO,
+                            "2100/january/01 friday 11:10:10.124456+08"));
+  ASSERT_EQ(ts, 4102456210124456LL);
+
+  ASSERT_EQ(0, TEST_char2ts("yyyy/Month/dd Day HH24:MI:ss.usTZH", &ts, TSDB_TIME_PRECISION_MICRO,
+                            "2100/january/01 FRIDAY 11:10:10.124456+08"));
+  ASSERT_EQ(ts, 4102456210124456LL);
+  ASSERT_EQ(0, TEST_char2ts("yyyy/Month/dd Dy HH24:MI:ss.usTZH", &ts, TSDB_TIME_PRECISION_MICRO,
+                            "2100/january/01 Fri 11:10:10.124456+08:00"));
+  ASSERT_EQ(ts, 4102456210124456LL);
+
+  ASSERT_EQ(0, TEST_char2ts("yyyy/month/dd day HH24:MI:ss.usTZH", &ts, TSDB_TIME_PRECISION_MICRO,
+                            "2100/january/01 Friday 11:10:10.124456+08"));
+  ASSERT_EQ(ts, 4102456210124456LL);
+
+  // 2100-02-01 11:10:10.124456+08 Firday
+  ASSERT_EQ(0, TEST_char2ts("yyyy/mon/dd DY HH24:MI:ss.usTZH", &ts, TSDB_TIME_PRECISION_MICRO,
+                            "2100/Feb/01 Mon 11:10:10.124456+08"));
+  ASSERT_EQ(ts, 4105134610124456LL);
+
+  // 2100-02-01 11:10:10.124456+08 Firday
+  ASSERT_EQ(0, TEST_char2ts("yyyy/mon/dd DY DDD-DD-D HH24:MI:ss.usTZH", &ts, TSDB_TIME_PRECISION_MICRO,
+                            "2100/Feb/01 Mon 100-1-01 11:10:10.124456+08"));
+  ASSERT_EQ(ts, 4105134610124456LL);
+
+  ASSERT_EQ(0, TEST_char2ts("yyyyMMdd ", &ts, TSDB_TIME_PRECISION_MICRO, "21000101"));
+
+  // What is Fe?
+  ASSERT_EQ(-1, TEST_char2ts("yyyy/mon/dd ", &ts, TSDB_TIME_PRECISION_MICRO, "2100/Fe/01"));
+  // '/' cannot convert to MM
+  ASSERT_EQ(-1, TEST_char2ts("yyyyMMdd ", &ts, TSDB_TIME_PRECISION_MICRO, "2100/2/1"));
+  // nothing to be converted to dd
+  ASSERT_EQ(0, TEST_char2ts("yyyyMMdd ", &ts, TSDB_TIME_PRECISION_MICRO, "210012"));
+  ASSERT_EQ(ts, 4131273600000000LL); // 2100-12-1
+  ASSERT_EQ(-1, TEST_char2ts("yyyyMMdd ", &ts, TSDB_TIME_PRECISION_MICRO, "21001"));
+  ASSERT_EQ(-1, TEST_char2ts("yyyyMM-dd ", &ts, TSDB_TIME_PRECISION_MICRO, "23a1-1"));
+
+  // 2100-1-2
+  ASSERT_EQ(0, TEST_char2ts("yyyyMM/dd ", &ts, TSDB_TIME_PRECISION_MICRO, "21001/2"));
+  ASSERT_EQ(ts, 4102502400000000LL);
+
+  // default to 1970-1-1 00:00:00+08 -> 1969-12-31 16:00:00+00
+  ASSERT_EQ(0, TEST_char2ts("YYYY", &ts, TSDB_TIME_PRECISION_SECONDS, "1970"));
+  ASSERT_EQ(ts, -1 * tsTimezone * 60 * 60);
+
+  ASSERT_EQ(0, TEST_char2ts("yyyyMM1/dd ", &ts, TSDB_TIME_PRECISION_MICRO, "210001/2"));
+  ASSERT_EQ(ts, 4102502400000000LL);
+
+  ASSERT_EQ(-2, TEST_char2ts("yyyyMM/dd ", &ts, TSDB_TIME_PRECISION_MICRO, "210013/2"));
+  ASSERT_EQ(-2, TEST_char2ts("yyyyMM/dd ", &ts, TSDB_TIME_PRECISION_MICRO, "210011/32"));
+  ASSERT_EQ(-1, TEST_char2ts("HH12:MI:SS", &ts, TSDB_TIME_PRECISION_MICRO, "21:12:12"));
+  ASSERT_EQ(-1, TEST_char2ts("yyyy/MM1/dd ", &ts, TSDB_TIME_PRECISION_MICRO, "2100111111111/11/2"));
+  ASSERT_EQ(-2, TEST_char2ts("yyyy/MM1/ddTZH", &ts, TSDB_TIME_PRECISION_MICRO, "23/11/2-13"));
+  ASSERT_EQ(0, TEST_char2ts("yyyy年 MM/ddTZH", &ts, TSDB_TIME_PRECISION_MICRO, "1970年1/1+0"));
+  ASSERT_EQ(ts, 0);
+  ASSERT_EQ(-1, TEST_char2ts("yyyy年a MM/dd", &ts, TSDB_TIME_PRECISION_MICRO, "2023年1/2"));
+  ASSERT_EQ(0, TEST_char2ts("yyyy年 MM/ddTZH", &ts, TSDB_TIME_PRECISION_MICRO, "1970年   1/1+0"));
+  ASSERT_EQ(ts, 0);
+  ASSERT_EQ(0, TEST_char2ts("yyyy年 a a a MM/ddTZH", &ts, TSDB_TIME_PRECISION_MICRO, "1970年 a a a 1/1+0"));
+  ASSERT_EQ(0, TEST_char2ts("yyyy年 a a a a a a a a a a a a a a a MM/ddTZH", &ts, TSDB_TIME_PRECISION_MICRO, "1970年 a     "));
+}
+
 #pragma GCC diagnostic pop
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@ -309,7 +309,7 @@ int32_t tsdbTakeReadSnap2(STsdbReader *pReader, _query_reseek_func_t reseek, STs
 void    tsdbUntakeReadSnap2(STsdbReader *pReader, STsdbReadSnap *pSnap, bool proactive);

 // tsdbMerge.c ==============================================================================================
-int32_t tsdbMerge(void *arg);
+int32_t tsdbSchedMerge(STsdb *tsdb, int32_t fid);

 // tsdbDiskData ==============================================================================================
 int32_t tDiskDataBuilderCreate(SDiskDataBuilder **ppBuilder);
@ -371,7 +371,7 @@ struct STsdb {
  char                *path;
  SVnode              *pVnode;
  STsdbKeepCfg         keepCfg;
-  TdThreadRwlock       rwLock;
+  TdThreadMutex        mutex;
  SMemTable           *mem;
  SMemTable           *imem;
  STsdbFS              fs;  // old
@ -668,7 +668,7 @@ struct SDelFWriter {
 };

 #include "tarray2.h"
-//#include "tsdbFS2.h"
+// #include "tsdbFS2.h"
 //  struct STFileSet;
 typedef struct STFileSet STFileSet;
 typedef TARRAY2(STFileSet *) TFileSetArray;
@ -873,8 +873,8 @@ int32_t tMergeTreeOpen2(SMergeTree *pMTree, SMergeTreeConf *pConf);

 void tMergeTreeAddIter(SMergeTree *pMTree, SLDataIter *pIter);
 bool tMergeTreeNext(SMergeTree *pMTree);
-void tMergeTreePinSttBlock(SMergeTree* pMTree);
-void tMergeTreeUnpinSttBlock(SMergeTree* pMTree);
+void tMergeTreePinSttBlock(SMergeTree *pMTree);
+void tMergeTreeUnpinSttBlock(SMergeTree *pMTree);
 bool tMergeTreeIgnoreEarlierTs(SMergeTree *pMTree);
 void tMergeTreeClose(SMergeTree *pMTree);

--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@ -31,8 +31,6 @@ SSmaMgmt smaMgmt = {

 typedef struct SRSmaQTaskInfoItem SRSmaQTaskInfoItem;

-extern int32_t tsdbDoRetention(STsdb *pTsdb, int64_t now);
-
 static int32_t    tdUidStorePut(STbUidStore *pStore, tb_uid_t suid, tb_uid_t *uid);
 static void       tdUidStoreDestory(STbUidStore *pStore);
 static int32_t    tdUpdateTbUidListImpl(SSma *pSma, tb_uid_t *suid, SArray *tbUids, bool isAdd);
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
@ -131,7 +131,7 @@ int32_t tsdbBegin(STsdb *pTsdb) {
  TSDB_CHECK_CODE(code, lino, _exit);

  // lock
-  if ((code = taosThreadRwlockWrlock(&pTsdb->rwLock))) {
+  if ((code = taosThreadMutexLock(&pTsdb->mutex))) {
    code = TAOS_SYSTEM_ERROR(code);
    TSDB_CHECK_CODE(code, lino, _exit);
  }
@ -139,7 +139,7 @@ int32_t tsdbBegin(STsdb *pTsdb) {
  pTsdb->mem = pMemTable;

  // unlock
-  if ((code = taosThreadRwlockUnlock(&pTsdb->rwLock))) {
+  if ((code = taosThreadMutexUnlock(&pTsdb->mutex))) {
    code = TAOS_SYSTEM_ERROR(code);
    TSDB_CHECK_CODE(code, lino, _exit);
  }
@ -152,11 +152,11 @@ _exit:
 }

 int32_t tsdbPrepareCommit(STsdb *pTsdb) {
-  taosThreadRwlockWrlock(&pTsdb->rwLock);
+  taosThreadMutexLock(&pTsdb->mutex);
  ASSERT(pTsdb->imem == NULL);
  pTsdb->imem = pTsdb->mem;
  pTsdb->mem = NULL;
-  taosThreadRwlockUnlock(&pTsdb->rwLock);
+  taosThreadMutexUnlock(&pTsdb->mutex);

  return 0;
 }
@ -171,9 +171,9 @@ int32_t tsdbCommit(STsdb *pTsdb, SCommitInfo *pInfo) {

  // check
  if (pMemTable->nRow == 0 && pMemTable->nDel == 0) {
-    taosThreadRwlockWrlock(&pTsdb->rwLock);
+    taosThreadMutexLock(&pTsdb->mutex);
    pTsdb->imem = NULL;
-    taosThreadRwlockUnlock(&pTsdb->rwLock);
+    taosThreadMutexUnlock(&pTsdb->mutex);

    tsdbUnrefMemTable(pMemTable, NULL, true);
    goto _exit;
@ -501,6 +501,7 @@ static int32_t tsdbCommitFileDataStart(SCommitter *pCommitter) {
  int32_t    lino = 0;
  STsdb     *pTsdb = pCommitter->pTsdb;
  SDFileSet *pRSet = NULL;
+
  // memory
  pCommitter->commitFid = tsdbKeyFid(pCommitter->nextKey, pCommitter->minutes, pCommitter->precision);
  pCommitter->expLevel = tsdbFidLevel(pCommitter->commitFid, &pCommitter->pTsdb->keepCfg, taosGetTimestampSec());
@ -798,6 +799,7 @@ static int32_t tsdbCommitFileData(SCommitter *pCommitter) {
  int32_t    lino = 0;
  STsdb     *pTsdb = pCommitter->pTsdb;
  SMemTable *pMemTable = pTsdb->imem;
+
  // commit file data start
  code = tsdbCommitFileDataStart(pCommitter);
  TSDB_CHECK_CODE(code, lino, _exit);
@ -1650,18 +1652,18 @@ int32_t tsdbFinishCommit(STsdb *pTsdb) {
  SMemTable *pMemTable = pTsdb->imem;

  // lock
-  taosThreadRwlockWrlock(&pTsdb->rwLock);
+  taosThreadMutexLock(&pTsdb->mutex);

  code = tsdbFSCommit(pTsdb);
  if (code) {
-    taosThreadRwlockUnlock(&pTsdb->rwLock);
+    taosThreadMutexUnlock(&pTsdb->mutex);
    TSDB_CHECK_CODE(code, lino, _exit);
  }

  pTsdb->imem = NULL;

  // unlock
-  taosThreadRwlockUnlock(&pTsdb->rwLock);
+  taosThreadMutexUnlock(&pTsdb->mutex);
  if (pMemTable) {
    tsdbUnrefMemTable(pMemTable, NULL, true);
  }
--- a/source/dnode/vnode/src/tsdb/tsdbCommit2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
@ -367,7 +367,12 @@ static int32_t tsdbCommitFileSetBegin(SCommitter2 *committer) {
  int32_t lino = 0;
  STsdb  *tsdb = committer->tsdb;

-  committer->ctx->fid = tsdbKeyFid(committer->ctx->nextKey, committer->minutes, committer->precision);
+  int32_t fid = tsdbKeyFid(committer->ctx->nextKey, committer->minutes, committer->precision);
+
+  // check if can commit
+  tsdbFSCheckCommit(tsdb, fid);
+
+  committer->ctx->fid = fid;
  committer->ctx->expLevel = tsdbFidLevel(committer->ctx->fid, &tsdb->keepCfg, committer->ctx->now);
  tsdbFidKeyRange(committer->ctx->fid, committer->minutes, committer->precision, &committer->ctx->minKey,
                  &committer->ctx->maxKey);
@ -549,11 +554,11 @@ _exit:
 }

 int32_t tsdbPreCommit(STsdb *tsdb) {
-  taosThreadRwlockWrlock(&tsdb->rwLock);
+  taosThreadMutexLock(&tsdb->mutex);
  ASSERT(tsdb->imem == NULL);
  tsdb->imem = tsdb->mem;
  tsdb->mem = NULL;
-  taosThreadRwlockUnlock(&tsdb->rwLock);
+  taosThreadMutexUnlock(&tsdb->mutex);
  return 0;
 }

@ -568,15 +573,13 @@ int32_t tsdbCommitBegin(STsdb *tsdb, SCommitInfo *info) {
  int64_t    nDel = imem->nDel;

  if (nRow == 0 && nDel == 0) {
-    taosThreadRwlockWrlock(&tsdb->rwLock);
+    taosThreadMutexLock(&tsdb->mutex);
    tsdb->imem = NULL;
-    taosThreadRwlockUnlock(&tsdb->rwLock);
+    taosThreadMutexUnlock(&tsdb->mutex);
    tsdbUnrefMemTable(imem, NULL, true);
  } else {
    SCommitter2 committer[1];

-    tsdbFSCheckCommit(tsdb->pFS);
-
    code = tsdbOpenCommitter(tsdb, info, committer);
    TSDB_CHECK_CODE(code, lino, _exit);

@ -605,14 +608,14 @@ int32_t tsdbCommitCommit(STsdb *tsdb) {
  if (tsdb->imem == NULL) goto _exit;

  SMemTable *pMemTable = tsdb->imem;
-  taosThreadRwlockWrlock(&tsdb->rwLock);
+  taosThreadMutexLock(&tsdb->mutex);
  code = tsdbFSEditCommit(tsdb->pFS);
  if (code) {
-    taosThreadRwlockUnlock(&tsdb->rwLock);
+    taosThreadMutexUnlock(&tsdb->mutex);
    TSDB_CHECK_CODE(code, lino, _exit);
  }
  tsdb->imem = NULL;
-  taosThreadRwlockUnlock(&tsdb->rwLock);
+  taosThreadMutexUnlock(&tsdb->mutex);
  tsdbUnrefMemTable(pMemTable, NULL, true);

 _exit:
--- a/source/dnode/vnode/src/tsdb/tsdbFS2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS2.c
@ -55,25 +55,11 @@ static int32_t create_fs(STsdb *pTsdb, STFileSystem **fs) {
  TARRAY2_INIT(fs[0]->fSetArr);
  TARRAY2_INIT(fs[0]->fSetArrTmp);

-  // background task queue
-  taosThreadMutexInit(fs[0]->mutex, NULL);
-  fs[0]->bgTaskQueue->next = fs[0]->bgTaskQueue;
-  fs[0]->bgTaskQueue->prev = fs[0]->bgTaskQueue;
-
-  taosThreadMutexInit(&fs[0]->commitMutex, NULL);
-  taosThreadCondInit(&fs[0]->canCommit, NULL);
-  fs[0]->blockCommit = false;
-
  return 0;
 }

 static int32_t destroy_fs(STFileSystem **fs) {
  if (fs[0] == NULL) return 0;
-  taosThreadMutexDestroy(&fs[0]->commitMutex);
-  taosThreadCondDestroy(&fs[0]->canCommit);
-  taosThreadMutexDestroy(fs[0]->mutex);
-
-  ASSERT(fs[0]->bgTaskNum == 0);

  TARRAY2_DESTROY(fs[0]->fSetArr, NULL);
  TARRAY2_DESTROY(fs[0]->fSetArrTmp, NULL);
@ -264,10 +250,11 @@ static int32_t apply_commit(STFileSystem *fs) {
    if (fset1 && fset2) {
      if (fset1->fid < fset2->fid) {
        // delete fset1
-        TARRAY2_REMOVE(fsetArray1, i1, tsdbTFileSetRemove);
+        tsdbTFileSetRemove(fset1);
+        i1++;
      } else if (fset1->fid > fset2->fid) {
        // create new file set with fid of fset2->fid
-        code = tsdbTFileSetInitDup(fs->tsdb, fset2, &fset1);
+        code = tsdbTFileSetInitCopy(fs->tsdb, fset2, &fset1);
        if (code) return code;
        code = TARRAY2_SORT_INSERT(fsetArray1, fset1, tsdbTFileSetCmprFn);
        if (code) return code;
@ -282,10 +269,11 @@ static int32_t apply_commit(STFileSystem *fs) {
      }
    } else if (fset1) {
      // delete fset1
-      TARRAY2_REMOVE(fsetArray1, i1, tsdbTFileSetRemove);
+      tsdbTFileSetRemove(fset1);
+      i1++;
    } else {
      // create new file set with fid of fset2->fid
-      code = tsdbTFileSetInitDup(fs->tsdb, fset2, &fset1);
+      code = tsdbTFileSetInitCopy(fs->tsdb, fset2, &fset1);
      if (code) return code;
      code = TARRAY2_SORT_INSERT(fsetArray1, fset1, tsdbTFileSetCmprFn);
      if (code) return code;
@ -512,7 +500,8 @@ static int32_t tsdbFSDoSanAndFix(STFileSystem *fs) {
        TARRAY2_FOREACH(lvl->fobjArr, fobj) {
          code = tsdbFSDoScanAndFixFile(fs, fobj);
          if (code) {
-            fset->maxVerValid = (fobj->f->minVer <= fobj->f->maxVer) ? TMIN(fset->maxVerValid, fobj->f->minVer - 1) : -1;
+            fset->maxVerValid =
+                (fobj->f->minVer <= fobj->f->maxVer) ? TMIN(fset->maxVerValid, fobj->f->minVer - 1) : -1;
            corrupt = true;
          }
        }
@ -592,7 +581,7 @@ static int32_t tsdbFSDupState(STFileSystem *fs) {
  const STFileSet *fset1;
  TARRAY2_FOREACH(src, fset1) {
    STFileSet *fset2;
-    code = tsdbTFileSetInitDup(fs->tsdb, fset1, &fset2);
+    code = tsdbTFileSetInitCopy(fs->tsdb, fset1, &fset2);
    if (code) return code;
    code = TARRAY2_APPEND(dst, fset2);
    if (code) return code;
@ -665,12 +654,6 @@ static int32_t close_file_system(STFileSystem *fs) {
  return 0;
 }

-static int32_t apply_edit(STFileSystem *pFS) {
-  int32_t code = 0;
-  ASSERTS(0, "TODO: Not implemented yet");
-  return code;
-}
-
 static int32_t fset_cmpr_fn(const struct STFileSet *pSet1, const struct STFileSet *pSet2) {
  if (pSet1->fid < pSet2->fid) {
    return -1;
@ -710,10 +693,23 @@ static int32_t edit_fs(STFileSystem *fs, const TFileOpArray *opArray) {
    TSDB_CHECK_CODE(code, lino, _exit);
  }

-  // remove empty file set
+  // remove empty empty stt level and empty file set
  int32_t i = 0;
  while (i < TARRAY2_SIZE(fsetArray)) {
    fset = TARRAY2_GET(fsetArray, i);
+
+    SSttLvl *lvl;
+    int32_t  j = 0;
+    while (j < TARRAY2_SIZE(fset->lvlArr)) {
+      lvl = TARRAY2_GET(fset->lvlArr, j);
+
+      if (TARRAY2_SIZE(lvl->fobjArr) == 0) {
+        TARRAY2_REMOVE(fset->lvlArr, j, tsdbSttLvlClear);
+      } else {
+        j++;
+      }
+    }
+
    if (tsdbTFileSetIsEmpty(fset)) {
      TARRAY2_REMOVE(fsetArray, i, tsdbTFileSetClear);
    } else {
@ -753,13 +749,13 @@ _exit:

 static void tsdbDoWaitBgTask(STFileSystem *fs, STFSBgTask *task) {
  task->numWait++;
-  taosThreadCondWait(task->done, fs->mutex);
+  taosThreadCondWait(task->done, &fs->tsdb->mutex);
  task->numWait--;

  if (task->numWait == 0) {
    taosThreadCondDestroy(task->done);
-    if (task->free) {
-      task->free(task->arg);
+    if (task->destroy) {
+      task->destroy(task->arg);
    }
    taosMemoryFree(task);
  }
@ -770,8 +766,8 @@ static void tsdbDoDoneBgTask(STFileSystem *fs, STFSBgTask *task) {
    taosThreadCondBroadcast(task->done);
  } else {
    taosThreadCondDestroy(task->done);
-    if (task->free) {
-      task->free(task->arg);
+    if (task->destroy) {
+      task->destroy(task->arg);
    }
    taosMemoryFree(task);
  }
@ -780,23 +776,16 @@ static void tsdbDoDoneBgTask(STFileSystem *fs, STFSBgTask *task) {
 int32_t tsdbCloseFS(STFileSystem **fs) {
  if (fs[0] == NULL) return 0;

-  taosThreadMutexLock(fs[0]->mutex);
-  fs[0]->stop = true;
-
-  if (fs[0]->bgTaskRunning) {
-    tsdbDoWaitBgTask(fs[0], fs[0]->bgTaskRunning);
-  }
-  taosThreadMutexUnlock(fs[0]->mutex);
-
+  tsdbFSDisableBgTask(fs[0]);
  close_file_system(fs[0]);
  destroy_fs(fs);
  return 0;
 }

 int64_t tsdbFSAllocEid(STFileSystem *fs) {
-  taosThreadRwlockRdlock(&fs->tsdb->rwLock);
+  taosThreadMutexLock(&fs->tsdb->mutex);
  int64_t cid = ++fs->neid;
-  taosThreadRwlockUnlock(&fs->tsdb->rwLock);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);
  return cid;
 }

@ -837,27 +826,34 @@ _exit:
  return code;
 }

-static int32_t tsdbFSSetBlockCommit(STFileSystem *fs, bool block) {
-  taosThreadMutexLock(&fs->commitMutex);
+static int32_t tsdbFSSetBlockCommit(STFileSet *fset, bool block) {
  if (block) {
-    fs->blockCommit = true;
+    fset->blockCommit = true;
  } else {
-    fs->blockCommit = false;
-    taosThreadCondSignal(&fs->canCommit);
+    fset->blockCommit = false;
+    if (fset->numWaitCommit > 0) {
+      taosThreadCondSignal(&fset->canCommit);
+    }
  }
-  taosThreadMutexUnlock(&fs->commitMutex);
  return 0;
 }

-int32_t tsdbFSCheckCommit(STFileSystem *fs) {
-  taosThreadMutexLock(&fs->commitMutex);
-  while (fs->blockCommit) {
-    taosThreadCondWait(&fs->canCommit, &fs->commitMutex);
+int32_t tsdbFSCheckCommit(STsdb *tsdb, int32_t fid) {
+  taosThreadMutexLock(&tsdb->mutex);
+  STFileSet *fset;
+  tsdbFSGetFSet(tsdb->pFS, fid, &fset);
+  if (fset) {
+    while (fset->blockCommit) {
+      fset->numWaitCommit++;
+      taosThreadCondWait(&fset->canCommit, &tsdb->mutex);
+      fset->numWaitCommit--;
    }
-  taosThreadMutexUnlock(&fs->commitMutex);
+  }
+  taosThreadMutexUnlock(&tsdb->mutex);
  return 0;
 }

+// IMPORTANT: the caller must hold fs->tsdb->mutex
 int32_t tsdbFSEditCommit(STFileSystem *fs) {
  int32_t code = 0;
  int32_t lino = 0;
@ -867,36 +863,57 @@ int32_t tsdbFSEditCommit(STFileSystem *fs) {
  TSDB_CHECK_CODE(code, lino, _exit);

  // schedule merge
-  if (fs->tsdb->pVnode->config.sttTrigger > 1) {
-    STFileSet *fset;
  int32_t sttTrigger = fs->tsdb->pVnode->config.sttTrigger;
-    bool       schedMerge = false;
-    bool       blockCommit = false;
-
+  if (sttTrigger > 1) {
+    STFileSet *fset;
    TARRAY2_FOREACH_REVERSE(fs->fSetArr, fset) {
-      if (TARRAY2_SIZE(fset->lvlArr) == 0) continue;
+      if (TARRAY2_SIZE(fset->lvlArr) == 0) {
+        tsdbFSSetBlockCommit(fset, false);
+        continue;
+      }

      SSttLvl *lvl = TARRAY2_FIRST(fset->lvlArr);
-      if (lvl->level != 0) continue;
+      if (lvl->level != 0) {
+        tsdbFSSetBlockCommit(fset, false);
+        continue;
+      }

      int32_t numFile = TARRAY2_SIZE(lvl->fobjArr);
      if (numFile >= sttTrigger) {
-        schedMerge = true;
-      }
-
-      if (numFile >= sttTrigger * BLOCK_COMMIT_FACTOR) {
-        blockCommit = true;
-      }
-
-      if (schedMerge && blockCommit) break;
-    }
-
-    if (schedMerge) {
-      code = tsdbFSScheduleBgTask(fs, TSDB_BG_TASK_MERGER, tsdbMerge, NULL, fs->tsdb, NULL);
+        // launch merge
+        code = tsdbSchedMerge(fs->tsdb, fset->fid);
        TSDB_CHECK_CODE(code, lino, _exit);
      }

-    tsdbFSSetBlockCommit(fs, blockCommit);
+      if (numFile >= sttTrigger * BLOCK_COMMIT_FACTOR) {
+        tsdbFSSetBlockCommit(fset, true);
+      } else {
+        tsdbFSSetBlockCommit(fset, false);
+      }
+    }
+  }
+
+  // clear empty level and fset
+  int32_t i = 0;
+  while (i < TARRAY2_SIZE(fs->fSetArr)) {
+    STFileSet *fset = TARRAY2_GET(fs->fSetArr, i);
+
+    int32_t j = 0;
+    while (j < TARRAY2_SIZE(fset->lvlArr)) {
+      SSttLvl *lvl = TARRAY2_GET(fset->lvlArr, j);
+
+      if (TARRAY2_SIZE(lvl->fobjArr) == 0) {
+        TARRAY2_REMOVE(fset->lvlArr, j, tsdbSttLvlClear);
+      } else {
+        j++;
+      }
+    }
+
+    if (tsdbTFileSetIsEmpty(fset) && fset->bgTaskRunning == NULL) {
+      TARRAY2_REMOVE(fs->fSetArr, i, tsdbTFileSetClear);
+    } else {
+      i++;
+    }
  }

 _exit:
@ -933,15 +950,15 @@ int32_t tsdbFSCreateCopySnapshot(STFileSystem *fs, TFileSetArray **fsetArr) {

  TARRAY2_INIT(fsetArr[0]);

-  taosThreadRwlockRdlock(&fs->tsdb->rwLock);
+  taosThreadMutexLock(&fs->tsdb->mutex);
  TARRAY2_FOREACH(fs->fSetArr, fset) {
-    code = tsdbTFileSetInitDup(fs->tsdb, fset, &fset1);
+    code = tsdbTFileSetInitCopy(fs->tsdb, fset, &fset1);
    if (code) break;

    code = TARRAY2_APPEND(fsetArr[0], fset1);
    if (code) break;
  }
-  taosThreadRwlockUnlock(&fs->tsdb->rwLock);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);

  if (code) {
    TARRAY2_DESTROY(fsetArr[0], tsdbTFileSetClear);
@ -961,9 +978,9 @@ int32_t tsdbFSDestroyCopySnapshot(TFileSetArray **fsetArr) {
 }

 int32_t tsdbFSCreateRefSnapshot(STFileSystem *fs, TFileSetArray **fsetArr) {
-  taosThreadRwlockRdlock(&fs->tsdb->rwLock);
+  taosThreadMutexLock(&fs->tsdb->mutex);
  int32_t code = tsdbFSCreateRefSnapshotWithoutLock(fs, fsetArr);
-  taosThreadRwlockUnlock(&fs->tsdb->rwLock);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);
  return code;
 }

@ -1017,7 +1034,7 @@ int32_t tsdbFSCreateCopyRangedSnapshot(STFileSystem *fs, TSnapRangeArray *pRange
    }
  }

-  taosThreadRwlockRdlock(&fs->tsdb->rwLock);
+  taosThreadMutexLock(&fs->tsdb->mutex);
  TARRAY2_FOREACH(fs->fSetArr, fset) {
    int64_t ever = VERSION_MAX;
    if (pHash) {
@ -1034,7 +1051,7 @@ int32_t tsdbFSCreateCopyRangedSnapshot(STFileSystem *fs, TSnapRangeArray *pRange
    code = TARRAY2_APPEND(fsetArr[0], fset1);
    if (code) break;
  }
-  taosThreadRwlockUnlock(&fs->tsdb->rwLock);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);

 _out:
  if (code) {
@ -1089,7 +1106,7 @@ int32_t tsdbFSCreateRefRangedSnapshot(STFileSystem *fs, int64_t sver, int64_t ev
    }
  }

-  taosThreadRwlockRdlock(&fs->tsdb->rwLock);
+  taosThreadMutexLock(&fs->tsdb->mutex);
  TARRAY2_FOREACH(fs->fSetArr, fset) {
    int64_t sver1 = sver;
    int64_t ever1 = ever;
@ -1118,7 +1135,7 @@ int32_t tsdbFSCreateRefRangedSnapshot(STFileSystem *fs, int64_t sver, int64_t ev

    fsr1 = NULL;
  }
-  taosThreadRwlockUnlock(&fs->tsdb->rwLock);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);

  if (code) {
    tsdbTSnapRangeClear(&fsr1);
@ -1137,59 +1154,69 @@ _out:
 const char *gFSBgTaskName[] = {NULL, "MERGE", "RETENTION", "COMPACT"};

 static int32_t tsdbFSRunBgTask(void *arg) {
-  STFileSystem *fs = (STFileSystem *)arg;
+  STFSBgTask   *task = (STFSBgTask *)arg;
+  STFileSystem *fs = task->fs;
+  STFileSet    *fset;

-  ASSERT(fs->bgTaskRunning != NULL);
+  tsdbFSGetFSet(fs, task->fid, &fset);

-  fs->bgTaskRunning->launchTime = taosGetTimestampMs();
-  fs->bgTaskRunning->run(fs->bgTaskRunning->arg);
-  fs->bgTaskRunning->finishTime = taosGetTimestampMs();
+  ASSERT(fset != NULL && fset->bgTaskRunning == task);
+
+  task->launchTime = taosGetTimestampMs();
+  task->run(task->arg);
+  task->finishTime = taosGetTimestampMs();

  tsdbDebug("vgId:%d bg task:%s task id:%" PRId64 " finished, schedule time:%" PRId64 " launch time:%" PRId64
            " finish time:%" PRId64,
-            TD_VID(fs->tsdb->pVnode), gFSBgTaskName[fs->bgTaskRunning->type], fs->bgTaskRunning->taskid,
-            fs->bgTaskRunning->scheduleTime, fs->bgTaskRunning->launchTime, fs->bgTaskRunning->finishTime);
+            TD_VID(fs->tsdb->pVnode), gFSBgTaskName[task->type], task->taskid, task->scheduleTime, task->launchTime,
+            task->finishTime);

-  taosThreadMutexLock(fs->mutex);
+  taosThreadMutexLock(&fs->tsdb->mutex);

  // free last
-  tsdbDoDoneBgTask(fs, fs->bgTaskRunning);
-  fs->bgTaskRunning = NULL;
+  tsdbDoDoneBgTask(fs, task);
+  fset->bgTaskRunning = NULL;

  // schedule next
-  if (fs->bgTaskNum > 0) {
+  if (fset->bgTaskNum > 0) {
    if (fs->stop) {
-      while (fs->bgTaskNum > 0) {
-        STFSBgTask *task = fs->bgTaskQueue->next;
-        task->prev->next = task->next;
-        task->next->prev = task->prev;
-        fs->bgTaskNum--;
-        tsdbDoDoneBgTask(fs, task);
+      while (fset->bgTaskNum > 0) {
+        STFSBgTask *nextTask = fset->bgTaskQueue->next;
+        nextTask->prev->next = nextTask->next;
+        nextTask->next->prev = nextTask->prev;
+        fset->bgTaskNum--;
+        tsdbDoDoneBgTask(fs, nextTask);
      }
    } else {
      // pop task from head
-      fs->bgTaskRunning = fs->bgTaskQueue->next;
-      fs->bgTaskRunning->prev->next = fs->bgTaskRunning->next;
-      fs->bgTaskRunning->next->prev = fs->bgTaskRunning->prev;
-      fs->bgTaskNum--;
-      vnodeScheduleTaskEx(1, tsdbFSRunBgTask, arg);
+      fset->bgTaskRunning = fset->bgTaskQueue->next;
+      fset->bgTaskRunning->prev->next = fset->bgTaskRunning->next;
+      fset->bgTaskRunning->next->prev = fset->bgTaskRunning->prev;
+      fset->bgTaskNum--;
+      vnodeScheduleTaskEx(1, tsdbFSRunBgTask, fset->bgTaskRunning);
    }
  }

-  taosThreadMutexUnlock(fs->mutex);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);
  return 0;
 }

-static int32_t tsdbFSScheduleBgTaskImpl(STFileSystem *fs, EFSBgTaskT   type, int32_t (*run)(void *),
+// IMPORTANT: the caller must hold the fs->tsdb->mutex
+int32_t tsdbFSScheduleBgTask(STFileSystem *fs, int32_t fid, EFSBgTaskT type, int32_t (*run)(void *),
                             void (*destroy)(void *), void *arg, int64_t *taskid) {
  if (fs->stop) {
    if (destroy) {
      destroy(arg);
    }
-    return 0;  // TODO: use a better error code
+    return 0;
  }

-  for (STFSBgTask *task = fs->bgTaskQueue->next; task != fs->bgTaskQueue; task = task->next) {
+  STFileSet *fset;
+  tsdbFSGetFSet(fs, fid, &fset);
+
+  ASSERT(fset != NULL);
+
+  for (STFSBgTask *task = fset->bgTaskQueue->next; task != fset->bgTaskQueue; task = task->next) {
    if (task->type == type) {
      if (destroy) {
        destroy(arg);
@ -1203,22 +1230,24 @@ static int32_t tsdbFSScheduleBgTaskImpl(STFileSystem *fs, EFSBgTaskT   type, int
  if (task == NULL) return TSDB_CODE_OUT_OF_MEMORY;
  taosThreadCondInit(task->done, NULL);

+  task->fs = fs;
+  task->fid = fid;
  task->type = type;
  task->run = run;
-  task->free = destroy;
+  task->destroy = destroy;
  task->arg = arg;
  task->scheduleTime = taosGetTimestampMs();
  task->taskid = ++fs->taskid;

-  if (fs->bgTaskRunning == NULL && fs->bgTaskNum == 0) {
+  if (fset->bgTaskRunning == NULL && fset->bgTaskNum == 0) {
    // launch task directly
-    fs->bgTaskRunning = task;
-    vnodeScheduleTaskEx(1, tsdbFSRunBgTask, fs);
+    fset->bgTaskRunning = task;
+    vnodeScheduleTaskEx(1, tsdbFSRunBgTask, task);
  } else {
    // add to the queue tail
-    fs->bgTaskNum++;
-    task->next = fs->bgTaskQueue;
-    task->prev = fs->bgTaskQueue->prev;
+    fset->bgTaskNum++;
+    task->next = fset->bgTaskQueue;
+    task->prev = fset->bgTaskQueue->prev;
    task->prev->next = task;
    task->next->prev = task;
  }
@ -1227,68 +1256,30 @@ static int32_t tsdbFSScheduleBgTaskImpl(STFileSystem *fs, EFSBgTaskT   type, int
  return 0;
 }

-int32_t tsdbFSScheduleBgTask(STFileSystem *fs, EFSBgTaskT type, int32_t (*run)(void *), void (*free)(void *), void *arg,
-                             int64_t *taskid) {
-  taosThreadMutexLock(fs->mutex);
-  int32_t code = tsdbFSScheduleBgTaskImpl(fs, type, run, free, arg, taskid);
-  taosThreadMutexUnlock(fs->mutex);
-  return code;
-}
+int32_t tsdbFSDisableBgTask(STFileSystem *fs) {
+  taosThreadMutexLock(&fs->tsdb->mutex);
+  for (;;) {
+    fs->stop = true;
+    bool done = true;

-int32_t tsdbFSWaitBgTask(STFileSystem *fs, int64_t taskid) {
-  STFSBgTask *task = NULL;
-
-  taosThreadMutexLock(fs->mutex);
-
-  if (fs->bgTaskRunning && fs->bgTaskRunning->taskid == taskid) {
-    task = fs->bgTaskRunning;
-  } else {
-    for (STFSBgTask *taskt = fs->bgTaskQueue->next; taskt != fs->bgTaskQueue; taskt = taskt->next) {
-      if (taskt->taskid == taskid) {
-        task = taskt;
+    STFileSet *fset;
+    TARRAY2_FOREACH(fs->fSetArr, fset) {
+      if (fset->bgTaskRunning) {
+        tsdbDoWaitBgTask(fs, fset->bgTaskRunning);
+        done = false;
        break;
      }
    }
-  }

-  if (task) {
-    tsdbDoWaitBgTask(fs, task);
+    if (done) break;
  }
-
-  taosThreadMutexUnlock(fs->mutex);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);
  return 0;
 }

-int32_t tsdbFSWaitAllBgTask(STFileSystem *fs) {
-  taosThreadMutexLock(fs->mutex);
-
-  while (fs->bgTaskRunning) {
-    taosThreadCondWait(fs->bgTaskRunning->done, fs->mutex);
-  }
-
-  taosThreadMutexUnlock(fs->mutex);
-  return 0;
-}
-
-static int32_t tsdbFSDoDisableBgTask(STFileSystem *fs) {
-  fs->stop = true;
-
-  if (fs->bgTaskRunning) {
-    tsdbDoWaitBgTask(fs, fs->bgTaskRunning);
-  }
-  return 0;
-}
-
-int32_t tsdbFSDisableBgTask(STFileSystem *fs) {
-  taosThreadMutexLock(fs->mutex);
-  int32_t code = tsdbFSDoDisableBgTask(fs);
-  taosThreadMutexUnlock(fs->mutex);
-  return code;
-}
-
 int32_t tsdbFSEnableBgTask(STFileSystem *fs) {
-  taosThreadMutexLock(fs->mutex);
+  taosThreadMutexLock(&fs->tsdb->mutex);
  fs->stop = false;
-  taosThreadMutexUnlock(fs->mutex);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);
  return 0;
 }
--- a/source/dnode/vnode/src/tsdb/tsdbFS2.h
+++ b/source/dnode/vnode/src/tsdb/tsdbFS2.h
@ -22,22 +22,11 @@
 extern "C" {
 #endif

-/* Exposed Handle */
-typedef struct STFileSystem STFileSystem;
-typedef struct STFSBgTask   STFSBgTask;
-// typedef TARRAY2(STFileSet *) TFileSetArray;
-
 typedef enum {
  TSDB_FEDIT_COMMIT = 1,  //
  TSDB_FEDIT_MERGE
 } EFEditT;

-typedef enum {
-  TSDB_BG_TASK_MERGER = 1,
-  TSDB_BG_TASK_RETENTION,
-  TSDB_BG_TASK_COMPACT,
-} EFSBgTaskT;
-
 typedef enum {
  TSDB_FCURRENT = 1,
  TSDB_FCURRENT_C,  // for commit
@ -67,37 +56,17 @@ int32_t tsdbFSEditBegin(STFileSystem *fs, const TFileOpArray *opArray, EFEditT e
 int32_t tsdbFSEditCommit(STFileSystem *fs);
 int32_t tsdbFSEditAbort(STFileSystem *fs);
 // background task
-int32_t tsdbFSScheduleBgTask(STFileSystem *fs, EFSBgTaskT type, int32_t (*run)(void *), void (*free)(void *), void *arg,
-                             int64_t *taskid);
-int32_t tsdbFSWaitBgTask(STFileSystem *fs, int64_t taskid);
-int32_t tsdbFSWaitAllBgTask(STFileSystem *fs);
+int32_t tsdbFSScheduleBgTask(STFileSystem *fs, int32_t fid, EFSBgTaskT type, int32_t (*run)(void *),
+                             void (*destroy)(void *), void *arg, int64_t *taskid);
 int32_t tsdbFSDisableBgTask(STFileSystem *fs);
 int32_t tsdbFSEnableBgTask(STFileSystem *fs);
 // other
 int32_t tsdbFSGetFSet(STFileSystem *fs, int32_t fid, STFileSet **fset);
-int32_t tsdbFSCheckCommit(STFileSystem *fs);
+int32_t tsdbFSCheckCommit(STsdb *tsdb, int32_t fid);
 // utils
 int32_t save_fs(const TFileSetArray *arr, const char *fname);
 int32_t current_fname(STsdb *pTsdb, char *fname, EFCurrentT ftype);

-struct STFSBgTask {
-  EFSBgTaskT type;
-  int32_t (*run)(void *arg);
-  void (*free)(void *arg);
-  void *arg;
-
-  TdThreadCond done[1];
-  int32_t      numWait;
-
-  int64_t taskid;
-  int64_t scheduleTime;
-  int64_t launchTime;
-  int64_t finishTime;
-
-  struct STFSBgTask *prev;
-  struct STFSBgTask *next;
-};
-
 /* Exposed Structs */
 struct STFileSystem {
  STsdb        *tsdb;
@ -109,17 +78,8 @@ struct STFileSystem {
  TFileSetArray fSetArrTmp[1];

  // background task queue
-  TdThreadMutex mutex[1];
  bool    stop;
  int64_t taskid;
-  int32_t       bgTaskNum;
-  STFSBgTask    bgTaskQueue[1];
-  STFSBgTask   *bgTaskRunning;
-
-  // block commit variables
-  TdThreadMutex commitMutex;
-  TdThreadCond  canCommit;
-  bool          blockCommit;
 };

 #ifdef __cplusplus
--- a/source/dnode/vnode/src/tsdb/tsdbFSet2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFSet2.c
@ -342,11 +342,6 @@ int32_t tsdbTFileSetEdit(STsdb *pTsdb, STFileSet *fset, const STFileOp *op) {
      int32_t    idx = TARRAY2_SEARCH_IDX(lvl->fobjArr, &tfobjp, tsdbTFileObjCmpr, TD_EQ);
      ASSERT(idx >= 0);
      TARRAY2_REMOVE(lvl->fobjArr, idx, tsdbSttLvlClearFObj);
-
-      if (TARRAY2_SIZE(lvl->fobjArr) == 0) {
-        // TODO: remove the stt level if no file exists anymore
-        // TARRAY2_REMOVE(&fset->lvlArr, lvl - fset->lvlArr.data, tsdbSttLvlClear);
-      }
    } else {
      ASSERT(tsdbIsSameTFile(&op->of, fset->farr[op->of.type]->f));
      tsdbTFileObjUnref(fset->farr[op->of.type]);
@ -454,10 +449,22 @@ int32_t tsdbTFileSetInit(int32_t fid, STFileSet **fset) {
  fset[0]->fid = fid;
  fset[0]->maxVerValid = VERSION_MAX;
  TARRAY2_INIT(fset[0]->lvlArr);
+
+  // background task queue
+  fset[0]->bgTaskNum = 0;
+  fset[0]->bgTaskQueue->next = fset[0]->bgTaskQueue;
+  fset[0]->bgTaskQueue->prev = fset[0]->bgTaskQueue;
+  fset[0]->bgTaskRunning = NULL;
+
+  // block commit variables
+  taosThreadCondInit(&fset[0]->canCommit, NULL);
+  fset[0]->numWaitCommit = 0;
+  fset[0]->blockCommit = false;
+
  return 0;
 }

-int32_t tsdbTFileSetInitDup(STsdb *pTsdb, const STFileSet *fset1, STFileSet **fset) {
+int32_t tsdbTFileSetInitCopy(STsdb *pTsdb, const STFileSet *fset1, STFileSet **fset) {
  int32_t code = tsdbTFileSetInit(fset1->fid, fset);
  if (code) return code;

@ -588,21 +595,23 @@ int32_t tsdbTFileSetClear(STFileSet **fset) {

  TARRAY2_DESTROY(fset[0]->lvlArr, tsdbSttLvlClear);

+  taosThreadCondDestroy(&fset[0]->canCommit);
  taosMemoryFree(fset[0]);
  fset[0] = NULL;

  return 0;
 }

-int32_t tsdbTFileSetRemove(STFileSet **fset) {
+int32_t tsdbTFileSetRemove(STFileSet *fset) {
+  if (fset == NULL) return 0;
+
  for (tsdb_ftype_t ftype = TSDB_FTYPE_MIN; ftype < TSDB_FTYPE_MAX; ++ftype) {
-    if (fset[0]->farr[ftype] == NULL) continue;
-    tsdbTFileObjRemove(fset[0]->farr[ftype]);
+    if (fset->farr[ftype] == NULL) continue;
+    tsdbTFileObjRemove(fset->farr[ftype]);
  }

-  TARRAY2_DESTROY(fset[0]->lvlArr, tsdbSttLvlRemove);
-  taosMemoryFree(fset[0]);
-  fset[0] = NULL;
+  TARRAY2_DESTROY(fset->lvlArr, tsdbSttLvlRemove);
+
  return 0;
 }

--- a/source/dnode/vnode/src/tsdb/tsdbFSet2.h
+++ b/source/dnode/vnode/src/tsdb/tsdbFSet2.h
@ -28,6 +28,8 @@ typedef struct SSttLvl   SSttLvl;
 typedef TARRAY2(STFileObj *) TFileObjArray;
 typedef TARRAY2(SSttLvl *) TSttLvlArray;
 typedef TARRAY2(STFileOp) TFileOpArray;
+typedef struct STFileSystem STFileSystem;
+typedef struct STFSBgTask   STFSBgTask;

 typedef enum {
  TSDB_FOP_NONE = 0,
@ -41,10 +43,10 @@ typedef enum {

 // init/clear
 int32_t tsdbTFileSetInit(int32_t fid, STFileSet **fset);
-int32_t tsdbTFileSetInitDup(STsdb *pTsdb, const STFileSet *fset1, STFileSet **fset);
+int32_t tsdbTFileSetInitCopy(STsdb *pTsdb, const STFileSet *fset1, STFileSet **fset);
 int32_t tsdbTFileSetInitRef(STsdb *pTsdb, const STFileSet *fset1, STFileSet **fset);
 int32_t tsdbTFileSetClear(STFileSet **fset);
-int32_t tsdbTFileSetRemove(STFileSet **fset);
+int32_t tsdbTFileSetRemove(STFileSet *fset);

 int32_t tsdbTFileSetFilteredInitDup(STsdb *pTsdb, const STFileSet *fset1, int64_t ever, STFileSet **fset,
                                    TFileOpArray *fopArr);
@ -58,6 +60,7 @@ int32_t tsdbJsonToTFileSet(STsdb *pTsdb, const cJSON *json, STFileSet **fset);
 // cmpr
 int32_t tsdbTFileSetCmprFn(const STFileSet **fset1, const STFileSet **fset2);
 // edit
+int32_t tsdbSttLvlClear(SSttLvl **lvl);
 int32_t tsdbTFileSetEdit(STsdb *pTsdb, STFileSet *fset, const STFileOp *op);
 int32_t tsdbTFileSetApplyEdit(STsdb *pTsdb, const STFileSet *fset1, STFileSet *fset);
 // max commit id
@ -70,6 +73,33 @@ bool tsdbTFileSetIsEmpty(const STFileSet *fset);
 int32_t tsdbSttLvlInit(int32_t level, SSttLvl **lvl);
 int32_t tsdbSttLvlClear(SSttLvl **lvl);

+typedef enum {
+  TSDB_BG_TASK_MERGER = 1,
+  TSDB_BG_TASK_RETENTION,
+  TSDB_BG_TASK_COMPACT,
+} EFSBgTaskT;
+
+struct STFSBgTask {
+  STFileSystem *fs;
+  int32_t       fid;
+
+  EFSBgTaskT type;
+  int32_t (*run)(void *arg);
+  void (*destroy)(void *arg);
+  void *arg;
+
+  TdThreadCond done[1];
+  int32_t      numWait;
+
+  int64_t taskid;
+  int64_t scheduleTime;
+  int64_t launchTime;
+  int64_t finishTime;
+
+  struct STFSBgTask *prev;
+  struct STFSBgTask *next;
+};
+
 struct STFileOp {
  tsdb_fop_t optype;
  int32_t    fid;
@ -87,6 +117,16 @@ struct STFileSet {
  int64_t      maxVerValid;
  STFileObj   *farr[TSDB_FTYPE_MAX];  // file array
  TSttLvlArray lvlArr[1];             // level array
+
+  // background task queue
+  int32_t     bgTaskNum;
+  STFSBgTask  bgTaskQueue[1];
+  STFSBgTask *bgTaskRunning;
+
+  // block commit variables
+  TdThreadCond canCommit;
+  int32_t      numWaitCommit;
+  bool         blockCommit;
 };

 struct STSnapRange {
--- a/source/dnode/vnode/src/tsdb/tsdbMemTable.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
@ -191,7 +191,7 @@ int32_t tsdbDeleteTableData(STsdb *pTsdb, int64_t version, tb_uid_t suid, tb_uid

  pMemTable->nDel++;
  pMemTable->minVer = TMIN(pMemTable->minVer, version);
-  pMemTable->maxVer = TMIN(pMemTable->maxVer, version);
+  pMemTable->maxVer = TMAX(pMemTable->maxVer, version);
  /*
  if (TSDB_CACHE_LAST_ROW(pMemTable->pTsdb->pVnode->config) && tsdbKeyCmprFn(&lastKey, &pTbData->maxKey) >= 0) {
    tsdbCacheDeleteLastrow(pTsdb->lruCache, pTbData->uid, eKey);
--- a/source/dnode/vnode/src/tsdb/tsdbMerge.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMerge.c
@ -15,11 +15,17 @@

 #include "tsdbMerge.h"

-#define TSDB_MAX_LEVEL 6  // means max level is 7
+#define TSDB_MAX_LEVEL 2  // means max level is 3

 typedef struct {
  STsdb  *tsdb;
-  TFileSetArray *fsetArr;
+  int32_t fid;
+} SMergeArg;
+
+typedef struct {
+  STsdb     *tsdb;
+  int32_t    fid;
+  STFileSet *fset;

  int32_t sttTrigger;
  int32_t maxRow;
@ -313,7 +319,6 @@ static int32_t tsdbMergeFileSetBeginOpenWriter(SMerger *merger) {
      if (merger->ctx->fset->farr[ftype]) {
        config.files[ftype].exist = true;
        config.files[ftype].file = merger->ctx->fset->farr[ftype]->f[0];
-
      } else {
        config.files[ftype].exist = false;
      }
@ -397,13 +402,13 @@ static int32_t tsdbMergeFileSetEnd(SMerger *merger) {
  code = tsdbFSEditBegin(merger->tsdb->pFS, merger->fopArr, TSDB_FEDIT_MERGE);
  TSDB_CHECK_CODE(code, lino, _exit);

-  taosThreadRwlockWrlock(&merger->tsdb->rwLock);
+  taosThreadMutexLock(&merger->tsdb->mutex);
  code = tsdbFSEditCommit(merger->tsdb->pFS);
  if (code) {
-    taosThreadRwlockUnlock(&merger->tsdb->rwLock);
+    taosThreadMutexUnlock(&merger->tsdb->mutex);
    TSDB_CHECK_CODE(code, lino, _exit);
  }
-  taosThreadRwlockUnlock(&merger->tsdb->rwLock);
+  taosThreadMutexUnlock(&merger->tsdb->mutex);

 _exit:
  if (code) {
@ -480,28 +485,19 @@ _exit:
 static int32_t tsdbDoMerge(SMerger *merger) {
  int32_t  code = 0;
  int32_t  lino = 0;
+  SSttLvl *lvl = TARRAY2_FIRST(merger->fset->lvlArr);

-  STFileSet *fset;
-  TARRAY2_FOREACH(merger->fsetArr, fset) {
-    if (TARRAY2_SIZE(fset->lvlArr) == 0) continue;
+  if (TARRAY2_SIZE(merger->fset->lvlArr) == 0) return 0;
+  if (lvl->level != 0 || TARRAY2_SIZE(lvl->fobjArr) < merger->sttTrigger) return 0;

-    SSttLvl *lvl = TARRAY2_FIRST(fset->lvlArr);
-
-    if (lvl->level != 0 || TARRAY2_SIZE(lvl->fobjArr) < merger->sttTrigger) continue;
-
-    if (!merger->ctx->opened) {
  code = tsdbMergerOpen(merger);
  TSDB_CHECK_CODE(code, lino, _exit);
-    }

-    code = tsdbMergeFileSet(merger, fset);
+  code = tsdbMergeFileSet(merger, merger->fset);
  TSDB_CHECK_CODE(code, lino, _exit);
-  }

-  if (merger->ctx->opened) {
  code = tsdbMergerClose(merger);
  TSDB_CHECK_CODE(code, lino, _exit);
-  }

 _exit:
  if (code) {
@ -512,36 +508,73 @@ _exit:
  return code;
 }

-int32_t tsdbMerge(void *arg) {
-  int32_t code = 0;
-  int32_t lino = 0;
-  STsdb  *tsdb = (STsdb *)arg;
+static int32_t tsdbMergeGetFSet(SMerger *merger) {
+  STFileSet *fset;

-  SMerger merger[1] = {{
-      .tsdb = tsdb,
-      .sttTrigger = tsdb->pVnode->config.sttTrigger,
-  }};
-
-  if (merger->sttTrigger <= 1) {
+  taosThreadMutexLock(&merger->tsdb->mutex);
+  tsdbFSGetFSet(merger->tsdb->pFS, merger->fid, &fset);
+  if (fset == NULL) {
+    taosThreadMutexUnlock(&merger->tsdb->mutex);
    return 0;
  }

-  code = tsdbFSCreateCopySnapshot(tsdb->pFS, &merger->fsetArr);
+  int32_t code = tsdbTFileSetInitCopy(merger->tsdb, fset, &merger->fset);
+  if (code) {
+    taosThreadMutexUnlock(&merger->tsdb->mutex);
+    return code;
+  }
+  taosThreadMutexUnlock(&merger->tsdb->mutex);
+  return 0;
+}
+
+static int32_t tsdbMerge(void *arg) {
+  int32_t    code = 0;
+  int32_t    lino = 0;
+  SMergeArg *mergeArg = (SMergeArg *)arg;
+  STsdb     *tsdb = mergeArg->tsdb;
+
+  SMerger merger[1] = {{
+      .tsdb = tsdb,
+      .fid = mergeArg->fid,
+      .sttTrigger = tsdb->pVnode->config.sttTrigger,
+  }};
+
+  if (merger->sttTrigger <= 1) return 0;
+
+  // copy snapshot
+  code = tsdbMergeGetFSet(merger);
  TSDB_CHECK_CODE(code, lino, _exit);

+  if (merger->fset == NULL) return 0;
+
+  // do merge
+  tsdbDebug("vgId:%d merge begin, fid:%d", TD_VID(tsdb->pVnode), merger->fid);
  code = tsdbDoMerge(merger);
+  tsdbDebug("vgId:%d merge done, fid:%d", TD_VID(tsdb->pVnode), mergeArg->fid);
  TSDB_CHECK_CODE(code, lino, _exit);

-  tsdbFSDestroyCopySnapshot(&merger->fsetArr);
-
 _exit:
  if (code) {
    TSDB_ERROR_LOG(TD_VID(tsdb->pVnode), lino, code);
    tsdbFatal("vgId:%d, failed to merge stt files since %s. code:%d", TD_VID(tsdb->pVnode), terrstr(), code);
    taosMsleep(100);
    exit(EXIT_FAILURE);
-  } else if (merger->ctx->opened) {
-    tsdbDebug("vgId:%d %s done", TD_VID(tsdb->pVnode), __func__);
  }
+  tsdbTFileSetClear(&merger->fset);
+  return code;
+}
+
+int32_t tsdbSchedMerge(STsdb *tsdb, int32_t fid) {
+  SMergeArg *arg = taosMemoryMalloc(sizeof(*arg));
+  if (arg == NULL) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+
+  arg->tsdb = tsdb;
+  arg->fid = fid;
+
+  int32_t code = tsdbFSScheduleBgTask(tsdb->pFS, fid, TSDB_BG_TASK_MERGER, tsdbMerge, taosMemoryFree, arg, NULL);
+  if (code) taosMemoryFree(arg);
+
  return code;
 }
--- a/source/dnode/vnode/src/tsdb/tsdbOpen.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c
@ -53,7 +53,7 @@ int tsdbOpen(SVnode *pVnode, STsdb **ppTsdb, const char *dir, STsdbKeepCfg *pKee
  snprintf(pTsdb->path, TD_PATH_MAX, "%s%s%s", pVnode->path, TD_DIRSEP, dir);
  // taosRealPath(pTsdb->path, NULL, slen);
  pTsdb->pVnode = pVnode;
-  taosThreadRwlockInit(&pTsdb->rwLock, NULL);
+  taosThreadMutexInit(&pTsdb->mutex, NULL);
  if (!pKeepCfg) {
    tsdbSetKeepCfg(pTsdb, &pVnode->config.tsdbCfg);
  } else {
@ -99,15 +99,14 @@ int tsdbClose(STsdb **pTsdb) {
    tsdbDebug("vgId:%d, tsdb is close at %s, days:%d, keep:%d,%d,%d, keepTimeOffset:%d", TD_VID(pdb->pVnode), pdb->path,
              pdb->keepCfg.days, pdb->keepCfg.keep0, pdb->keepCfg.keep1, pdb->keepCfg.keep2,
              pdb->keepCfg.keepTimeOffset);
-    taosThreadRwlockWrlock(&(*pTsdb)->rwLock);
+    taosThreadMutexLock(&(*pTsdb)->mutex);
    tsdbMemTableDestroy((*pTsdb)->mem, true);
    (*pTsdb)->mem = NULL;
-    taosThreadRwlockUnlock(&(*pTsdb)->rwLock);
-
-    taosThreadRwlockDestroy(&(*pTsdb)->rwLock);
+    taosThreadMutexUnlock(&(*pTsdb)->mutex);

    tsdbCloseFS(&(*pTsdb)->pFS);
    tsdbCloseCache(*pTsdb);
+    taosThreadMutexDestroy(&(*pTsdb)->mutex);
    taosMemoryFreeClear(*pTsdb);
  }
  return 0;
--- a/source/dnode/vnode/src/tsdb/tsdbRead2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c
@ -1105,8 +1105,9 @@ static int32_t dataBlockPartiallyRequired(STimeWindow* pWindow, SVersionRange* p
         (pVerRange->maxVer < pBlock->record.maxVer && pVerRange->maxVer >= pBlock->record.minVer);
 }

-static bool getNeighborBlockOfSameTable(SDataBlockIter* pBlockIter, SFileDataBlockInfo* pBlockInfo, STableBlockScanInfo* pTableBlockScanInfo,
-                                        int32_t* nextIndex, int32_t order, SBrinRecord* pRecord) {
+static bool getNeighborBlockOfSameTable(SDataBlockIter* pBlockIter, SFileDataBlockInfo* pBlockInfo,
+                                        STableBlockScanInfo* pTableBlockScanInfo, int32_t* nextIndex, int32_t order,
+                                        SBrinRecord* pRecord) {
  bool asc = ASCENDING_TRAVERSE(order);
  if (asc && pBlockInfo->tbBlockIdx >= taosArrayGetSize(pTableBlockScanInfo->pBlockIdxList) - 1) {
    return false;
@ -1119,7 +1120,8 @@ static bool getNeighborBlockOfSameTable(SDataBlockIter* pBlockIter, SFileDataBlo
  int32_t step = asc ? 1 : -1;
  //  *nextIndex = pBlockInfo->tbBlockIdx + step;
  //  *pBlockIndex = *(SBlockIndex*)taosArrayGet(pTableBlockScanInfo->pBlockList, *nextIndex);
-  STableDataBlockIdx* pTableDataBlockIdx = taosArrayGet(pTableBlockScanInfo->pBlockIdxList, pBlockInfo->tbBlockIdx + step);
+  STableDataBlockIdx* pTableDataBlockIdx =
+      taosArrayGet(pTableBlockScanInfo->pBlockIdxList, pBlockInfo->tbBlockIdx + step);
  SFileDataBlockInfo* p = taosArrayGet(pBlockIter->blockList, pTableDataBlockIdx->globalIndex);
  memcpy(pRecord, &p->record, sizeof(SBrinRecord));

@ -1145,7 +1147,8 @@ static int32_t findFileBlockInfoIndex(SDataBlockIter* pBlockIter, SFileDataBlock
  return -1;
 }

-static int32_t setFileBlockActiveInBlockIter(STsdbReader* pReader, SDataBlockIter* pBlockIter, int32_t index, int32_t step) {
+static int32_t setFileBlockActiveInBlockIter(STsdbReader* pReader, SDataBlockIter* pBlockIter, int32_t index,
+                                             int32_t step) {
  if (index < 0 || index >= pBlockIter->numOfBlocks) {
    return -1;
  }
@ -1158,7 +1161,8 @@ static int32_t setFileBlockActiveInBlockIter(STsdbReader* pReader, SDataBlockIte
      for (int32_t i = index - 1; i >= pBlockIter->index; --i) {
        SFileDataBlockInfo* pBlockInfo = taosArrayGet(pBlockIter->blockList, i);

-        STableBlockScanInfo* pBlockScanInfo = getTableBlockScanInfo(pReader->status.pTableMap, pBlockInfo->uid, pReader->idStr);
+        STableBlockScanInfo* pBlockScanInfo =
+            getTableBlockScanInfo(pReader->status.pTableMap, pBlockInfo->uid, pReader->idStr);
        STableDataBlockIdx* pTableDataBlockIdx = taosArrayGet(pBlockScanInfo->pBlockIdxList, pBlockInfo->tbBlockIdx);
        pTableDataBlockIdx->globalIndex = i + 1;

@ -1168,13 +1172,13 @@ static int32_t setFileBlockActiveInBlockIter(STsdbReader* pReader, SDataBlockIte
      for (int32_t i = index + 1; i <= pBlockIter->index; ++i) {
        SFileDataBlockInfo* pBlockInfo = taosArrayGet(pBlockIter->blockList, i);

-        STableBlockScanInfo* pBlockScanInfo = getTableBlockScanInfo(pReader->status.pTableMap, pBlockInfo->uid, pReader->idStr);
+        STableBlockScanInfo* pBlockScanInfo =
+            getTableBlockScanInfo(pReader->status.pTableMap, pBlockInfo->uid, pReader->idStr);
        STableDataBlockIdx* pTableDataBlockIdx = taosArrayGet(pBlockScanInfo->pBlockIdxList, pBlockInfo->tbBlockIdx);
        pTableDataBlockIdx->globalIndex = i - 1;

        taosArraySet(pBlockIter->blockList, i - 1, pBlockInfo);
      }
-
    }

    taosArraySet(pBlockIter->blockList, pBlockIter->index, &fblock);
@ -1303,7 +1307,8 @@ static void getBlockToLoadInfo(SDataBlockToLoadInfo* pInfo, SFileDataBlockInfo*
  int32_t     neighborIndex = 0;
  SBrinRecord rec = {0};

-  bool hasNeighbor = getNeighborBlockOfSameTable(&pReader->status.blockIter, pBlockInfo, pScanInfo, &neighborIndex, pReader->info.order, &rec);
+  bool hasNeighbor = getNeighborBlockOfSameTable(&pReader->status.blockIter, pBlockInfo, pScanInfo, &neighborIndex,
+                                                 pReader->info.order, &rec);

  // overlap with neighbor
  if (hasNeighbor) {
@ -1437,9 +1442,7 @@ static bool nextRowFromLastBlocks(SLastBlockReader* pLastBlockReader, STableBloc
  }
 }

-static void doPinSttBlock(SLastBlockReader* pLastBlockReader) {
-  tMergeTreePinSttBlock(&pLastBlockReader->mergeTree);
-}
+static void doPinSttBlock(SLastBlockReader* pLastBlockReader) { tMergeTreePinSttBlock(&pLastBlockReader->mergeTree); }

 static void doUnpinSttBlock(SLastBlockReader* pLastBlockReader) {
  tMergeTreeUnpinSttBlock(&pLastBlockReader->mergeTree);
@ -2236,8 +2239,9 @@ static int32_t buildComposedDataBlockImpl(STsdbReader* pReader, STableBlockScanI
  SFileBlockDumpInfo* pDumpInfo = &pReader->status.fBlockDumpInfo;

  TSDBROW *pRow = NULL, *piRow = NULL;
-  int64_t key = (pBlockData->nRow > 0 && (!pDumpInfo->allDumped)) ? pBlockData->aTSKEY[pDumpInfo->rowIndex] :
-                                                                   (ASCENDING_TRAVERSE(pReader->info.order) ? INT64_MAX : INT64_MIN);
+  int64_t  key = (pBlockData->nRow > 0 && (!pDumpInfo->allDumped))
+                     ? pBlockData->aTSKEY[pDumpInfo->rowIndex]
+                     : (ASCENDING_TRAVERSE(pReader->info.order) ? INT64_MAX : INT64_MIN);
  if (pBlockScanInfo->iter.hasVal) {
    pRow = getValidMemRow(&pBlockScanInfo->iter, pBlockScanInfo->delSkyline, pReader);
  }
@ -2274,7 +2278,8 @@ static int32_t loadNeighborIfOverlap(SFileDataBlockInfo* pBlockInfo, STableBlock
  *loadNeighbor = false;

  SBrinRecord rec = {0};
-  bool hasNeighbor = getNeighborBlockOfSameTable(&pReader->status.blockIter, pBlockInfo, pBlockScanInfo, &nextIndex, pReader->info.order, &rec);
+  bool hasNeighbor = getNeighborBlockOfSameTable(&pReader->status.blockIter, pBlockInfo, pBlockScanInfo, &nextIndex,
+                                                 pReader->info.order, &rec);
  if (!hasNeighbor) {  // do nothing
    return code;
  }
@ -4930,12 +4935,12 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
  SVersionRange* pRange = &pReader->info.verRange;

  // lock
-  taosThreadRwlockRdlock(&pTsdb->rwLock);
+  taosThreadMutexLock(&pTsdb->mutex);

  // alloc
  STsdbReadSnap* pSnap = (STsdbReadSnap*)taosMemoryCalloc(1, sizeof(STsdbReadSnap));
  if (pSnap == NULL) {
-    taosThreadRwlockUnlock(&pTsdb->rwLock);
+    taosThreadMutexUnlock(&pTsdb->mutex);
    code = TSDB_CODE_OUT_OF_MEMORY;
    goto _exit;
  }
@ -4945,7 +4950,7 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
    pSnap->pMem = pTsdb->mem;
    pSnap->pNode = taosMemoryMalloc(sizeof(*pSnap->pNode));
    if (pSnap->pNode == NULL) {
-      taosThreadRwlockUnlock(&pTsdb->rwLock);
+      taosThreadMutexUnlock(&pTsdb->mutex);
      code = TSDB_CODE_OUT_OF_MEMORY;
      goto _exit;
    }
@ -4960,7 +4965,7 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
    pSnap->pIMem = pTsdb->imem;
    pSnap->pINode = taosMemoryMalloc(sizeof(*pSnap->pINode));
    if (pSnap->pINode == NULL) {
-      taosThreadRwlockUnlock(&pTsdb->rwLock);
+      taosThreadMutexUnlock(&pTsdb->mutex);
      code = TSDB_CODE_OUT_OF_MEMORY;
      goto _exit;
    }
@ -4975,7 +4980,7 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
  code = tsdbFSCreateRefSnapshotWithoutLock(pTsdb->pFS, &pSnap->pfSetArray);

  // unlock
-  taosThreadRwlockUnlock(&pTsdb->rwLock);
+  taosThreadMutexUnlock(&pTsdb->mutex);

  if (code == TSDB_CODE_SUCCESS) {
    tsdbTrace("vgId:%d, take read snapshot", TD_VID(pTsdb->pVnode));
@ -5028,4 +5033,5 @@ void tsdbReaderSetId2(STsdbReader* pReader, const char* idstr) {
  pReader->status.fileIter.pLastBlockReader->mergeTree.idStr = pReader->idStr;
 }

-void tsdbReaderSetCloseFlag(STsdbReader* pReader) { /*pReader->code = TSDB_CODE_TSC_QUERY_CANCELLED;*/ }
+void tsdbReaderSetCloseFlag(STsdbReader* pReader) { /*pReader->code = TSDB_CODE_TSC_QUERY_CANCELLED;*/
+}
--- a/source/dnode/vnode/src/tsdb/tsdbRetention.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRetention.c
@ -25,11 +25,6 @@ typedef struct {

  TFileSetArray *fsetArr;
  TFileOpArray   fopArr[1];
-
-  struct {
-    int32_t    fsetArrIdx;
-    STFileSet *fset;
-  } ctx[1];
 } SRTNer;

 static int32_t tsdbDoRemoveFileObject(SRTNer *rtner, const STFileObj *fobj) {
@ -227,8 +222,8 @@ _exit:

 typedef struct {
  STsdb  *tsdb;
-  int32_t sync;
  int64_t now;
+  int32_t fid;
 } SRtnArg;

 static int32_t tsdbDoRetentionBegin(SRtnArg *arg, SRTNer *rtner) {
@ -263,15 +258,15 @@ static int32_t tsdbDoRetentionEnd(SRTNer *rtner) {
  code = tsdbFSEditBegin(rtner->tsdb->pFS, rtner->fopArr, TSDB_FEDIT_MERGE);
  TSDB_CHECK_CODE(code, lino, _exit);

-  taosThreadRwlockWrlock(&rtner->tsdb->rwLock);
+  taosThreadMutexLock(&rtner->tsdb->mutex);

  code = tsdbFSEditCommit(rtner->tsdb->pFS);
  if (code) {
-    taosThreadRwlockUnlock(&rtner->tsdb->rwLock);
+    taosThreadMutexUnlock(&rtner->tsdb->mutex);
    TSDB_CHECK_CODE(code, lino, _exit);
  }

-  taosThreadRwlockUnlock(&rtner->tsdb->rwLock);
+  taosThreadMutexUnlock(&rtner->tsdb->mutex);

  TARRAY2_DESTROY(rtner->fopArr, NULL);

@ -285,22 +280,14 @@ _exit:
  return code;
 }

-static int32_t tsdbDoRetention2(void *arg) {
+static int32_t tsdbDoRetentionOnFileSet(SRTNer *rtner, STFileSet *fset) {
  int32_t    code = 0;
  int32_t    lino = 0;
-  SRTNer  rtner[1] = {0};
+  STFileObj *fobj = NULL;
+  int32_t    expLevel = tsdbFidLevel(fset->fid, &rtner->tsdb->keepCfg, rtner->now);

-  code = tsdbDoRetentionBegin(arg, rtner);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
-  for (rtner->ctx->fsetArrIdx = 0; rtner->ctx->fsetArrIdx < TARRAY2_SIZE(rtner->fsetArr); rtner->ctx->fsetArrIdx++) {
-    rtner->ctx->fset = TARRAY2_GET(rtner->fsetArr, rtner->ctx->fsetArrIdx);
-
-    STFileObj *fobj;
-    int32_t    expLevel = tsdbFidLevel(rtner->ctx->fset->fid, &rtner->tsdb->keepCfg, rtner->now);
-
-    if (expLevel < 0) {  // remove the file set
-      for (int32_t ftype = 0; (ftype < TSDB_FTYPE_MAX) && (fobj = rtner->ctx->fset->farr[ftype], 1); ++ftype) {
+  if (expLevel < 0) {  // remove the fileset
+    for (int32_t ftype = 0; (ftype < TSDB_FTYPE_MAX) && (fobj = fset->farr[ftype], 1); ++ftype) {
      if (fobj == NULL) continue;

      int32_t nlevel = tfsGetLevel(rtner->tsdb->pVnode->pTfs);
@ -314,15 +301,15 @@ static int32_t tsdbDoRetention2(void *arg) {
    }

    SSttLvl *lvl;
-      TARRAY2_FOREACH(rtner->ctx->fset->lvlArr, lvl) {
+    TARRAY2_FOREACH(fset->lvlArr, lvl) {
      TARRAY2_FOREACH(lvl->fobjArr, fobj) {
        code = tsdbDoRemoveFileObject(rtner, fobj);
        TSDB_CHECK_CODE(code, lino, _exit);
      }
    }
-    } else if (expLevel == 0) {
-      continue;
-    } else {
+  } else if (expLevel == 0) {  // only migrate to upper level
+    return 0;
+  } else {  // migrate
    SDiskID did;

    if (tfsAllocDisk(rtner->tsdb->pVnode->pTfs, expLevel, &did) < 0) {
@ -332,7 +319,7 @@ static int32_t tsdbDoRetention2(void *arg) {
    tfsMkdirRecurAt(rtner->tsdb->pVnode->pTfs, rtner->tsdb->path, did);

    // data
-      for (int32_t ftype = 0; ftype < TSDB_FTYPE_MAX && (fobj = rtner->ctx->fset->farr[ftype], 1); ++ftype) {
+    for (int32_t ftype = 0; ftype < TSDB_FTYPE_MAX && (fobj = fset->farr[ftype], 1); ++ftype) {
      if (fobj == NULL) continue;

      if (fobj->f->did.level == did.level) continue;
@ -360,7 +347,7 @@ static int32_t tsdbDoRetention2(void *arg) {

    // stt
    SSttLvl *lvl;
-      TARRAY2_FOREACH(rtner->ctx->fset->lvlArr, lvl) {
+    TARRAY2_FOREACH(fset->lvlArr, lvl) {
      TARRAY2_FOREACH(lvl->fobjArr, fobj) {
        if (fobj->f->did.level == did.level) continue;

@ -369,10 +356,6 @@ static int32_t tsdbDoRetention2(void *arg) {
      }
    }
  }
-  }
-
-  code = tsdbDoRetentionEnd(rtner);
-  TSDB_CHECK_CODE(code, lino, _exit);

 _exit:
  if (code) {
@ -389,30 +372,105 @@ _exit:
  return code;
 }

-static void tsdbFreeRtnArg(void *arg) {
-  SRtnArg *rArg = (SRtnArg *)arg;
-  if (rArg->sync) {
-    tsem_post(&rArg->tsdb->pVnode->canCommit);
+static int32_t tsdbDoRetentionSync(void *arg) {
+  int32_t code = 0;
+  int32_t lino = 0;
+  SRTNer  rtner[1] = {0};
+
+  code = tsdbDoRetentionBegin(arg, rtner);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+  STFileSet *fset;
+  TARRAY2_FOREACH(rtner->fsetArr, fset) {
+    code = tsdbDoRetentionOnFileSet(rtner, fset);
+    TSDB_CHECK_CODE(code, lino, _exit);
  }
-  taosMemoryFree(arg);
+
+  code = tsdbDoRetentionEnd(rtner);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+_exit:
+  if (code) {
+    TSDB_ERROR_LOG(TD_VID(rtner->tsdb->pVnode), lino, code);
+  }
+  tsem_post(&((SRtnArg *)arg)->tsdb->pVnode->canCommit);
+  return code;
 }

-int32_t tsdbRetention(STsdb *tsdb, int64_t now, int32_t sync) {
-  SRtnArg *arg = taosMemoryMalloc(sizeof(*arg));
-  if (arg == NULL) return TSDB_CODE_OUT_OF_MEMORY;
-  arg->tsdb = tsdb;
-  arg->sync = sync;
-  arg->now = now;
+static int32_t tsdbDoRetentionAsync(void *arg) {
+  int32_t code = 0;
+  int32_t lino = 0;
+  SRTNer  rtner[1] = {0};

-  if (sync) {
-    tsem_wait(&tsdb->pVnode->canCommit);
+  code = tsdbDoRetentionBegin(arg, rtner);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+  STFileSet *fset;
+  TARRAY2_FOREACH(rtner->fsetArr, fset) {
+    if (fset->fid != ((SRtnArg *)arg)->fid) continue;
+
+    code = tsdbDoRetentionOnFileSet(rtner, fset);
+    TSDB_CHECK_CODE(code, lino, _exit);
  }

-  int64_t taskid;
-  int32_t code =
-      tsdbFSScheduleBgTask(tsdb->pFS, TSDB_BG_TASK_RETENTION, tsdbDoRetention2, tsdbFreeRtnArg, arg, &taskid);
+  code = tsdbDoRetentionEnd(rtner);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
+_exit:
  if (code) {
-    tsdbFreeRtnArg(arg);
+    TSDB_ERROR_LOG(TD_VID(rtner->tsdb->pVnode), lino, code);
  }
  return code;
 }
+
+static void tsdbFreeRtnArg(void *arg) { taosMemoryFree(arg); }
+
+int32_t tsdbRetention(STsdb *tsdb, int64_t now, int32_t sync) {
+  int32_t code = 0;
+
+  if (sync) {  // sync retention
+    SRtnArg *arg = taosMemoryMalloc(sizeof(*arg));
+    if (arg == NULL) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+
+    arg->tsdb = tsdb;
+    arg->now = now;
+    arg->fid = INT32_MAX;
+
+    tsem_wait(&tsdb->pVnode->canCommit);
+    code = vnodeScheduleTask(tsdbDoRetentionSync, arg);
+    if (code) {
+      tsem_post(&tsdb->pVnode->canCommit);
+      taosMemoryFree(arg);
+      return code;
+    }
+  } else {  // async retention
+    taosThreadMutexLock(&tsdb->mutex);
+
+    STFileSet *fset;
+    TARRAY2_FOREACH(tsdb->pFS->fSetArr, fset) {
+      SRtnArg *arg = taosMemoryMalloc(sizeof(*arg));
+      if (arg == NULL) {
+        taosThreadMutexUnlock(&tsdb->mutex);
+        return TSDB_CODE_OUT_OF_MEMORY;
+      }
+
+      arg->tsdb = tsdb;
+      arg->now = now;
+      arg->fid = fset->fid;
+
+      code = tsdbFSScheduleBgTask(tsdb->pFS, fset->fid, TSDB_BG_TASK_RETENTION, tsdbDoRetentionAsync, tsdbFreeRtnArg,
+                                  arg, NULL);
+      if (code) {
+        tsdbFreeRtnArg(arg);
+        taosThreadMutexUnlock(&tsdb->mutex);
+        return code;
+      }
+    }
+
+    taosThreadMutexUnlock(&tsdb->mutex);
+  }
+
+  return code;
+}
--- a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c
@ -1095,17 +1095,17 @@ int32_t tsdbSnapWriterClose(STsdbSnapWriter** writer, int8_t rollback) {
    code = tsdbFSEditAbort(writer[0]->tsdb->pFS);
    TSDB_CHECK_CODE(code, lino, _exit);
  } else {
-    taosThreadRwlockWrlock(&writer[0]->tsdb->rwLock);
+    taosThreadMutexLock(&writer[0]->tsdb->mutex);

    code = tsdbFSEditCommit(writer[0]->tsdb->pFS);
    if (code) {
-      taosThreadRwlockUnlock(&writer[0]->tsdb->rwLock);
+      taosThreadMutexUnlock(&writer[0]->tsdb->mutex);
      TSDB_CHECK_CODE(code, lino, _exit);
    }

    writer[0]->tsdb->pFS->fsstate = TSDB_FS_STATE_NORMAL;

-    taosThreadRwlockUnlock(&writer[0]->tsdb->rwLock);
+    taosThreadMutexUnlock(&writer[0]->tsdb->mutex);
  }
  tsdbFSEnableBgTask(tsdb->pFS);

@ -1299,7 +1299,7 @@ static STsdbSnapPartList* tsdbGetSnapPartList(STFileSystem* fs) {
  }

  int32_t code = 0;
-  taosThreadRwlockRdlock(&fs->tsdb->rwLock);
+  taosThreadMutexLock(&fs->tsdb->mutex);
  STFileSet* fset;
  TARRAY2_FOREACH(fs->fSetArr, fset) {
    STsdbSnapPartition* pItem = NULL;
@ -1311,7 +1311,7 @@ static STsdbSnapPartList* tsdbGetSnapPartList(STFileSystem* fs) {
    code = TARRAY2_SORT_INSERT(pList, pItem, tsdbSnapPartCmprFn);
    ASSERT(code == 0);
  }
-  taosThreadRwlockUnlock(&fs->tsdb->rwLock);
+  taosThreadMutexUnlock(&fs->tsdb->mutex);

  if (code) {
    TARRAY2_DESTROY(pList, tsdbSnapPartitionClear);
--- a/source/dnode/vnode/src/vnd/vnodeSnapshot.c
+++ b/source/dnode/vnode/src/vnd/vnodeSnapshot.c
@ -584,6 +584,7 @@ int32_t vnodeSnapWriterClose(SVSnapWriter *pWriter, int8_t rollback, SSnapshot *

  // commit json
  if (!rollback) {
+    ASSERT(pVnode->config.vgId == pWriter->info.config.vgId);
    pWriter->info.state.committed = pWriter->ever;
    pVnode->config = pWriter->info.config;
    pVnode->state = (SVState){.committed = pWriter->info.state.committed,
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@ -20,6 +20,7 @@
 #include "vnode.h"
 #include "vnodeInt.h"
 #include "audit.h"
+#include "tstrbuild.h"

 static int32_t vnodeProcessCreateStbReq(SVnode *pVnode, int64_t ver, void *pReq, int32_t len, SRpcMsg *pRsp);
 static int32_t vnodeProcessAlterStbReq(SVnode *pVnode, int64_t ver, void *pReq, int32_t len, SRpcMsg *pRsp);
@ -886,6 +887,7 @@ static int32_t vnodeProcessCreateTbReq(SVnode *pVnode, int64_t ver, void *pReq,
  char               tbName[TSDB_TABLE_FNAME_LEN];
  STbUidStore       *pStore = NULL;
  SArray            *tbUids = NULL;
+  SArray            *tbNames = NULL;

  pRsp->msgType = TDMT_VND_CREATE_TABLE_RSP;
  pRsp->code = TSDB_CODE_SUCCESS;
@ -902,7 +904,8 @@ static int32_t vnodeProcessCreateTbReq(SVnode *pVnode, int64_t ver, void *pReq,

  rsp.pArray = taosArrayInit(req.nReqs, sizeof(cRsp));
  tbUids = taosArrayInit(req.nReqs, sizeof(int64_t));
-  if (rsp.pArray == NULL || tbUids == NULL) {
+  tbNames = taosArrayInit(req.nReqs, sizeof(char*));
+  if (rsp.pArray == NULL || tbUids == NULL || tbNames == NULL) {
    rcode = -1;
    terrno = TSDB_CODE_OUT_OF_MEMORY;
    goto _exit;
@ -948,12 +951,9 @@ static int32_t vnodeProcessCreateTbReq(SVnode *pVnode, int64_t ver, void *pReq,
    taosArrayPush(rsp.pArray, &cRsp);

    if(tsEnableAuditCreateTable){
-      int64_t clusterId = pVnode->config.syncCfg.nodeInfo[0].clusterId;
-
-      SName name = {0};
-      tNameFromString(&name, pVnode->config.dbname, T_NAME_ACCT | T_NAME_DB);
-
-      auditRecord(NULL, clusterId, "createTable", name.dbname, "", pCreateReq->name, strlen(pCreateReq->name));
+      char* str = taosMemoryCalloc(1, TSDB_TABLE_FNAME_LEN);
+      strcpy(str, pCreateReq->name);
+      taosArrayPush(tbNames, &str);
    }
  }

@ -976,6 +976,30 @@ static int32_t vnodeProcessCreateTbReq(SVnode *pVnode, int64_t ver, void *pReq,
  tEncoderInit(&encoder, pRsp->pCont, pRsp->contLen);
  tEncodeSVCreateTbBatchRsp(&encoder, &rsp);

+  if(tsEnableAuditCreateTable){
+    int64_t clusterId = pVnode->config.syncCfg.nodeInfo[0].clusterId;
+
+    SName name = {0};
+    tNameFromString(&name, pVnode->config.dbname, T_NAME_ACCT | T_NAME_DB);
+
+    SStringBuilder sb = {0};
+    for(int32_t iReq = 0; iReq < req.nReqs; iReq++){
+      char** key = (char**)taosArrayGet(tbNames, iReq);
+      taosStringBuilderAppendStringLen(&sb, *key, strlen(*key));
+      if(iReq < req.nReqs - 1){
+        taosStringBuilderAppendChar(&sb, ',');
+      }
+      taosMemoryFreeClear(*key);
+    }
+
+    size_t    len = 0;
+    char*     keyJoined = taosStringBuilderGetResult(&sb, &len);
+
+    auditRecord(NULL, clusterId, "createTable", name.dbname, "", keyJoined, len);
+
+    taosStringBuilderDestroy(&sb);
+  }
+
 _exit:
  for (int32_t iReq = 0; iReq < req.nReqs; iReq++) {
    pCreateReq = req.pReqs + iReq;
@ -987,6 +1011,7 @@ _exit:
  taosArrayDestroy(tbUids);
  tDecoderClear(&decoder);
  tEncoderClear(&encoder);
+  taosArrayDestroy(tbNames);
  return rcode;
 }

@ -1120,6 +1145,7 @@ static int32_t vnodeProcessDropTbReq(SVnode *pVnode, int64_t ver, void *pReq, in
  int32_t          ret;
  SArray          *tbUids = NULL;
  STbUidStore     *pStore = NULL;
+  SArray          *tbNames = NULL;

  pRsp->msgType = TDMT_VND_DROP_TABLE_RSP;
  pRsp->pCont = NULL;
@ -1138,7 +1164,8 @@ static int32_t vnodeProcessDropTbReq(SVnode *pVnode, int64_t ver, void *pReq, in
  // process req
  tbUids = taosArrayInit(req.nReqs, sizeof(int64_t));
  rsp.pArray = taosArrayInit(req.nReqs, sizeof(SVDropTbRsp));
-  if (tbUids == NULL || rsp.pArray == NULL) goto _exit;
+  tbNames = taosArrayInit(req.nReqs, sizeof(char*));
+  if (tbUids == NULL || rsp.pArray == NULL || tbNames == NULL) goto _exit;

  for (int32_t iReq = 0; iReq < req.nReqs; iReq++) {
    SVDropTbReq *pDropTbReq = req.pReqs + iReq;
@ -1159,11 +1186,41 @@ static int32_t vnodeProcessDropTbReq(SVnode *pVnode, int64_t ver, void *pReq, in
    }

    taosArrayPush(rsp.pArray, &dropTbRsp);
+    
+    if(tsEnableAuditCreateTable){
+      char* str = taosMemoryCalloc(1, TSDB_TABLE_FNAME_LEN);
+      strcpy(str, pDropTbReq->name);
+      taosArrayPush(tbNames, &str);
+    }
  }

  tqUpdateTbUidList(pVnode->pTq, tbUids, false);
  tdUpdateTbUidList(pVnode->pSma, pStore, false);

+  if(tsEnableAuditCreateTable){
+    int64_t clusterId = pVnode->config.syncCfg.nodeInfo[0].clusterId;
+
+    SName name = {0};
+    tNameFromString(&name, pVnode->config.dbname, T_NAME_ACCT | T_NAME_DB);
+
+    SStringBuilder sb = {0};
+    for(int32_t iReq = 0; iReq < req.nReqs; iReq++){
+      char** key = (char**)taosArrayGet(tbNames, iReq);
+      taosStringBuilderAppendStringLen(&sb, *key, strlen(*key));
+      if(iReq < req.nReqs - 1){
+        taosStringBuilderAppendChar(&sb, ',');
+      }
+      taosMemoryFreeClear(*key);
+    }
+
+    size_t    len = 0;
+    char*     keyJoined = taosStringBuilderGetResult(&sb, &len);
+
+    auditRecord(NULL, clusterId, "dropTable", name.dbname, "", keyJoined, len);
+
+    taosStringBuilderDestroy(&sb);
+  }
+  
 _exit:
  taosArrayDestroy(tbUids);
  tdUidStoreFree(pStore);
@ -1174,6 +1231,7 @@ _exit:
  tEncodeSVDropTbBatchRsp(&encoder, &rsp);
  tEncoderClear(&encoder);
  taosArrayDestroy(rsp.pArray);
+  taosArrayDestroy(tbNames);
  return 0;
 }

--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@ -516,7 +516,10 @@ static int32_t vnodeSnapshotStopWrite(const SSyncFSM *pFsm, void *pWriter, bool
        pVnode->config.vgId, isApply, pSnapshot->lastApplyIndex, pSnapshot->lastApplyTerm, pSnapshot->lastConfigIndex);

  int32_t code = vnodeSnapWriterClose(pWriter, !isApply, pSnapshot);
-  vInfo("vgId:%d, apply vnode snapshot finished, code:0x%x", pVnode->config.vgId, code);
+  if (code != 0) {
+    vError("vgId:%d, failed to finish applying vnode snapshot since %s, code:0x%x", pVnode->config.vgId, terrstr(),
+           code);
+  }
  return code;
 }

--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@ -2083,6 +2083,34 @@ static int32_t translateToUnixtimestamp(SFunctionNode* pFunc, char* pErrBuf, int
  return TSDB_CODE_SUCCESS;
 }

+static int32_t translateToTimestamp(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
+  if (LIST_LENGTH(pFunc->pParameterList) != 2) {
+    return invaildFuncParaNumErrMsg(pErrBuf, len, pFunc->functionName);
+  }
+  uint8_t para1Type = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
+  uint8_t para2Type = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 1))->resType.type;
+  if (!IS_STR_DATA_TYPE(para1Type) || !IS_STR_DATA_TYPE(para2Type)) {
+    return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
+  }
+  pFunc->node.resType =
+      (SDataType){.bytes = tDataTypes[TSDB_DATA_TYPE_TIMESTAMP].bytes, .type = TSDB_DATA_TYPE_TIMESTAMP};
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t translateToChar(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
+  if (LIST_LENGTH(pFunc->pParameterList) != 2) {
+    return invaildFuncParaNumErrMsg(pErrBuf, len, pFunc->functionName);
+  }
+  uint8_t para1Type = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
+  uint8_t para2Type = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 1))->resType.type;
+  // currently only support to_char(timestamp, str)
+  if (!IS_STR_DATA_TYPE(para2Type) || !IS_TIMESTAMP_TYPE(para1Type)) {
+    return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
+  }
+  pFunc->node.resType = (SDataType){.bytes = 4096, .type = TSDB_DATA_TYPE_VARCHAR};
+  return TSDB_CODE_SUCCESS;
+}
+
 static int32_t translateTimeTruncate(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
  int32_t numOfParams = LIST_LENGTH(pFunc->pParameterList);
  if (2 != numOfParams && 3 != numOfParams) {
@ -3284,6 +3312,26 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
    .sprocessFunc = castFunction,
    .finalizeFunc = NULL
  },
+  {
+    .name = "to_timestamp",
+    .type = FUNCTION_TYPE_TO_TIMESTAMP,
+    .classification = FUNC_MGT_SCALAR_FUNC,
+    .translateFunc = translateToTimestamp,
+    .getEnvFunc = NULL,
+    .initFunc = NULL,
+    .sprocessFunc = toTimestampFunction,
+    .finalizeFunc = NULL
+  },
+  {
+    .name = "to_char",
+    .type = FUNCTION_TYPE_TO_CHAR,
+    .classification = FUNC_MGT_SCALAR_FUNC,
+    .translateFunc = translateToChar,
+    .getEnvFunc = NULL,
+    .initFunc = NULL,
+    .sprocessFunc = toCharFunction,
+    .finalizeFunc = NULL
+  },
  {
    .name = "to_iso8601",
    .type = FUNCTION_TYPE_TO_ISO8601,
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@ -1030,8 +1030,12 @@ SNode* createSelectStmt(SAstCreateContext* pCxt, bool isDistinct, SNodeList* pPr

 SNode* setSelectStmtTagMode(SAstCreateContext* pCxt, SNode* pStmt, bool bSelectTags) { 
  if (pStmt && QUERY_NODE_SELECT_STMT == nodeType(pStmt)) {
+    if (pCxt->pQueryCxt->biMode) {
+      ((SSelectStmt*)pStmt)->tagScan = true;
+    } else {  
      ((SSelectStmt*)pStmt)->tagScan = bSelectTags;
    }
+  }
  return pStmt;
 }

--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@ -3499,6 +3499,20 @@ static const char* getPrecisionStr(uint8_t precision) {
  return "unknown";
 }

+static int64_t getPrecisionMultiple(uint8_t precision) {
+  switch (precision) {
+    case TSDB_TIME_PRECISION_MILLI:
+      return 1;
+    case TSDB_TIME_PRECISION_MICRO:
+      return 1000;
+    case TSDB_TIME_PRECISION_NANO:
+      return 1000000;
+    default:
+      break;
+  }
+  return 1;
+}
+
 static void convertVarDuration(SValueNode* pOffset, uint8_t precision) {
  const int64_t factors[3] = {NANOSECOND_PER_MSEC, NANOSECOND_PER_USEC, 1};
  const int8_t  units[3] = {TIME_UNIT_MILLISECOND, TIME_UNIT_MICROSECOND, TIME_UNIT_NANOSECOND};
@ -3512,6 +3526,7 @@ static void convertVarDuration(SValueNode* pOffset, uint8_t precision) {
  pOffset->unit = units[precision];
 }

+static const int64_t  tsdbMaxKeepMS = (int64_t)60 * 1000 * TSDB_MAX_KEEP;
 static int32_t checkIntervalWindow(STranslateContext* pCxt, SIntervalWindowNode* pInterval) {
  uint8_t precision = ((SColumnNode*)pInterval->pCol)->node.resType.precision;

@ -3520,6 +3535,8 @@ static int32_t checkIntervalWindow(STranslateContext* pCxt, SIntervalWindowNode*
  if (pInter->datum.i <= 0 || (!valInter && pInter->datum.i < tsMinIntervalTime)) {
    return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INTER_VALUE_TOO_SMALL, tsMinIntervalTime,
                                getPrecisionStr(precision));
+  } else if (pInter->datum.i / getPrecisionMultiple(precision) > tsdbMaxKeepMS) {
+    return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INTER_VALUE_TOO_BIG, 1000, "years");
  }

  if (NULL != pInterval->pOffset) {
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
@ -65,6 +65,8 @@ static char* getSyntaxErrFormat(int32_t errCode) {
      return "This statement is no longer supported";
    case TSDB_CODE_PAR_INTER_VALUE_TOO_SMALL:
      return "Interval cannot be less than %d %s";
+    case TSDB_CODE_PAR_INTER_VALUE_TOO_BIG:
+      return "Interval cannot be more than %d %s";
    case TSDB_CODE_PAR_DB_NOT_SPECIFIED:
      return "Database not specified";
    case TSDB_CODE_PAR_INVALID_IDENTIFIER_NAME:
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@ -1197,6 +1197,83 @@ int32_t toJsonFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu
  return TSDB_CODE_SUCCESS;
 }

+#define TS_FORMAT_MAX_LEN 4096
+int32_t toTimestampFunction(SScalarParam* pInput, int32_t inputNum, SScalarParam* pOutput) {
+  int64_t ts;
+  char *  tsStr = taosMemoryMalloc(TS_FORMAT_MAX_LEN);
+  char *  format = taosMemoryMalloc(TS_FORMAT_MAX_LEN);
+  int32_t len, code = TSDB_CODE_SUCCESS;
+  SArray *formats = NULL;
+
+  for (int32_t i = 0; i < pInput[0].numOfRows; ++i) {
+    if (colDataIsNull_s(pInput[1].columnData, i) || colDataIsNull_s(pInput[0].columnData, i)) {
+      colDataSetNULL(pOutput->columnData, i);
+      continue;
+    }
+
+    char *tsData = colDataGetData(pInput[0].columnData, i);
+    char *formatData = colDataGetData(pInput[1].columnData, pInput[1].numOfRows > 1 ? i : 0);
+    len = TMIN(TS_FORMAT_MAX_LEN - 1, varDataLen(tsData));
+    strncpy(tsStr, varDataVal(tsData), len);
+    tsStr[len] = '\0';
+    len = TMIN(TS_FORMAT_MAX_LEN - 1, varDataLen(formatData));
+    if (pInput[1].numOfRows > 1 || i == 0) {
+      strncpy(format, varDataVal(formatData), len);
+      format[len] = '\0';
+      if (formats) {
+        taosArrayDestroy(formats);
+        formats = NULL;
+      }
+    }
+    int32_t precision = pOutput->columnData->info.precision;
+    char    errMsg[128] = {0};
+    code = taosChar2Ts(format, &formats, tsStr, &ts, precision, errMsg, 128);
+    if (code) {
+      qError("func to_timestamp failed %s", errMsg);
+      code = TSDB_CODE_FUNC_TO_TIMESTAMP_FAILED;
+      break;
+    }
+    colDataSetVal(pOutput->columnData, i, (char *)&ts, false);
+  }
+  if (formats) taosArrayDestroy(formats);
+  taosMemoryFree(tsStr);
+  taosMemoryFree(format);
+  return code;
+}
+
+int32_t toCharFunction(SScalarParam* pInput, int32_t inputNum, SScalarParam* pOutput) {
+  char *  format = taosMemoryMalloc(TS_FORMAT_MAX_LEN);
+  char *  out = taosMemoryCalloc(1, TS_FORMAT_MAX_LEN + VARSTR_HEADER_SIZE);
+  int32_t len;
+  SArray *formats = NULL;
+  for (int32_t i = 0; i < pInput[0].numOfRows; ++i) {
+    if (colDataIsNull_s(pInput[1].columnData, i) || colDataIsNull_s(pInput[0].columnData, i)) {
+      colDataSetNULL(pOutput->columnData, i);
+      continue;
+    }
+
+    char *ts = colDataGetData(pInput[0].columnData, i);
+    char *formatData = colDataGetData(pInput[1].columnData, pInput[1].numOfRows > 1 ? i : 0);
+    len = TMIN(TS_FORMAT_MAX_LEN - 1, varDataLen(formatData));
+    if (pInput[1].numOfRows > 1 || i == 0) {
+      strncpy(format, varDataVal(formatData), len);
+      format[len] = '\0';
+      if (formats) {
+        taosArrayDestroy(formats);
+        formats = NULL;
+      }
+    }
+    int32_t precision = pInput[0].columnData->info.precision;
+    taosTs2Char(format, &formats, *(int64_t *)ts, precision, varDataVal(out), TS_FORMAT_MAX_LEN);
+    varDataSetLen(out, strlen(varDataVal(out)));
+    colDataSetVal(pOutput->columnData, i, out, false);
+  }
+  if (formats) taosArrayDestroy(formats);
+  taosMemoryFree(format);
+  taosMemoryFree(out);
+  return TSDB_CODE_SUCCESS;
+}
+
 /** Time functions **/
 static int64_t offsetFromTz(char *timezone, int64_t factor) {
  char *minStr = &timezone[3];
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@ -249,8 +249,8 @@ int32_t syncNodeOnRequestVote(SSyncNode* pNode, const SRpcMsg* pMsg);
 int32_t syncNodeOnRequestVoteReply(SSyncNode* pNode, const SRpcMsg* pMsg);
 int32_t syncNodeOnAppendEntries(SSyncNode* pNode, const SRpcMsg* pMsg);
 int32_t syncNodeOnAppendEntriesReply(SSyncNode* ths, const SRpcMsg* pMsg);
-int32_t syncNodeOnSnapshot(SSyncNode* ths, const SRpcMsg* pMsg);
-int32_t syncNodeOnSnapshotRsp(SSyncNode* ths, const SRpcMsg* pMsg);
+int32_t syncNodeOnSnapshot(SSyncNode* ths, SRpcMsg* pMsg);
+int32_t syncNodeOnSnapshotRsp(SSyncNode* ths, SRpcMsg* pMsg);
 int32_t syncNodeOnHeartbeat(SSyncNode* ths, const SRpcMsg* pMsg);
 int32_t syncNodeOnHeartbeatReply(SSyncNode* ths, const SRpcMsg* pMsg);
 int32_t syncNodeOnLocalCmd(SSyncNode* ths, const SRpcMsg* pMsg);
--- a/source/libs/sync/inc/syncSnapshot.h
+++ b/source/libs/sync/inc/syncSnapshot.h
@ -22,21 +22,41 @@ extern "C" {

 #include "syncInt.h"

-#define SYNC_SNAPSHOT_SEQ_INVALID      -2
 #define SYNC_SNAPSHOT_SEQ_FORCE_CLOSE  -3
-#define SYNC_SNAPSHOT_SEQ_PREP_SNAPSHOT -1
+#define SYNC_SNAPSHOT_SEQ_INVALID      -2
+#define SYNC_SNAPSHOT_SEQ_PREP         -1
 #define SYNC_SNAPSHOT_SEQ_BEGIN        0
 #define SYNC_SNAPSHOT_SEQ_END          0x7FFFFFFF

 #define SYNC_SNAPSHOT_RETRY_MS 5000

+typedef struct SSyncSnapBuffer {
+  void         *entries[TSDB_SYNC_SNAP_BUFFER_SIZE];
+  int64_t       start;
+  int64_t       cursor;
+  int64_t       end;
+  int64_t       size;
+  TdThreadMutex mutex;
+  void (*entryDeleteCb)(void *ptr);
+} SSyncSnapBuffer;
+
+typedef struct SyncSnapBlock {
+  int32_t seq;
+  int8_t  acked;
+  int64_t sendTimeMs;
+
+  int16_t blockType;
+  void   *pBlock;
+  int32_t blockLen;
+} SyncSnapBlock;
+
+void syncSnapBlockDestroy(void *ptr);
+
 typedef struct SSyncSnapshotSender {
  int8_t         start;
  int32_t        seq;
  int32_t        ack;
  void          *pReader;
-  void          *pCurrentBlock;
-  int32_t        blockLen;
  SSnapshotParam snapshotParam;
  SSnapshot      snapshot;
  SSyncCfg       lastConfig;
@ -47,6 +67,9 @@ typedef struct SSyncSnapshotSender {
  int64_t        lastSendTime;
  bool           finish;

+  // ring buffer for ack
+  SSyncSnapBuffer *pSndBuf;
+
  // init when create
  SSyncNode *pSyncNode;
  int32_t    replicaIndex;
@ -72,6 +95,9 @@ typedef struct SSyncSnapshotReceiver {
  SSnapshotParam snapshotParam;
  SSnapshot      snapshot;

+  // buffer
+  SSyncSnapBuffer *pRcvBuf;
+
  // init when create
  SSyncNode *pSyncNode;
 } SSyncSnapshotReceiver;
@ -83,8 +109,8 @@ void                   snapshotReceiverStop(SSyncSnapshotReceiver *pReceiver);
 bool                   snapshotReceiverIsStart(SSyncSnapshotReceiver *pReceiver);

 // on message
-int32_t syncNodeOnSnapshot(SSyncNode *ths, const SRpcMsg *pMsg);
-int32_t syncNodeOnSnapshotRsp(SSyncNode *ths, const SRpcMsg *pMsg);
+// int32_t syncNodeOnSnapshot(SSyncNode *ths, const SRpcMsg *pMsg);
+// int32_t syncNodeOnSnapshotRsp(SSyncNode *ths, const SRpcMsg *pMsg);

 SyncIndex syncNodeGetSnapshotConfigIndex(SSyncNode *pSyncNode, SyncIndex snapshotLastApplyIndex);

--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@ -818,7 +818,8 @@ SSyncNode* syncNodeOpen(SSyncInfo* pSyncInfo, int32_t vnodeVersion) {

  if (!taosCheckExistFile(pSyncNode->configPath)) {
    // create a new raft config file
-    sInfo("vgId:%d, create a new raft config file", pSyncNode->vgId);
+    sInfo("vgId:%d, create a new raft config file", pSyncInfo->vgId);
+    pSyncNode->vgId = pSyncInfo->vgId;
    pSyncNode->raftCfg.isStandBy = pSyncInfo->isStandBy;
    pSyncNode->raftCfg.snapshotStrategy = pSyncInfo->snapshotStrategy;
    pSyncNode->raftCfg.lastConfigIndex = pSyncInfo->syncCfg.lastIndex;
--- a/source/libs/sync/src/syncPipeline.c
+++ b/source/libs/sync/src/syncPipeline.c
@ -797,7 +797,7 @@ _out:
    pMgr->retryBackoff = syncLogReplGetNextRetryBackoff(pMgr);
    SSyncLogBuffer* pBuf = pNode->pLogBuf;
    sInfo("vgId:%d, resend %d sync log entries. dest:%" PRIx64 ", indexes:%" PRId64 " ..., terms: ... %" PRId64
-          ", retryWaitMs:%" PRId64 ", mgr: [%" PRId64 " %" PRId64 ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64
+          ", retryWaitMs:%" PRId64 ", repl-mgr:[%" PRId64 " %" PRId64 ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64
          " %" PRId64 ", %" PRId64 ")",
          pNode->vgId, count, pDestId->addr, firstIndex, term, retryWaitMs, pMgr->startIndex, pMgr->matchIndex,
          pMgr->endIndex, pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
@ -815,9 +815,9 @@ int32_t syncLogReplRecover(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncAppendEn
    ASSERT(pMgr->matchIndex == 0);
    if (pMsg->matchIndex < 0) {
      pMgr->restored = true;
-      sInfo("vgId:%d, sync log repl restored. peer: dnode:%d (%" PRIx64 "), mgr: rs(%d) [%" PRId64 " %" PRId64
-            ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64 ")",
-            pNode->vgId, DID(&destId), destId.addr, pMgr->restored, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex,
+      sInfo("vgId:%d, sync log repl restored. peer: dnode:%d (%" PRIx64 "), repl-mgr:[%" PRId64 " %" PRId64 ", %" PRId64
+            "), buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64 ")",
+            pNode->vgId, DID(&destId), destId.addr, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex,
            pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
      return 0;
    }
@ -832,9 +832,9 @@ int32_t syncLogReplRecover(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncAppendEn
    if (pMsg->success && pMsg->matchIndex == pMsg->lastSendIndex) {
      pMgr->matchIndex = pMsg->matchIndex;
      pMgr->restored = true;
-      sInfo("vgId:%d, sync log repl restored. peer: dnode:%d (%" PRIx64 "), mgr: rs(%d) [%" PRId64 " %" PRId64
-            ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64 ")",
-            pNode->vgId, DID(&destId), destId.addr, pMgr->restored, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex,
+      sInfo("vgId:%d, sync log repl restored. peer: dnode:%d (%" PRIx64 "), repl-mgr:[%" PRId64 " %" PRId64 ", %" PRId64
+            "), buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64 ")",
+            pNode->vgId, DID(&destId), destId.addr, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex,
            pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
      return 0;
    }
@ -958,10 +958,10 @@ int32_t syncLogReplProbe(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncIndex inde
  pMgr->endIndex = index + 1;

  SSyncLogBuffer* pBuf = pNode->pLogBuf;
-  sTrace("vgId:%d, probe peer:%" PRIx64 " with msg of index:%" PRId64 " term:%" PRId64 ". mgr (rs:%d): [%" PRId64
+  sTrace("vgId:%d, probe peer:%" PRIx64 " with msg of index:%" PRId64 " term:%" PRId64 ". repl-mgr:[%" PRId64
         " %" PRId64 ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64 ")",
-        pNode->vgId, pDestId->addr, index, term, pMgr->restored, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex,
-        pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
+         pNode->vgId, pDestId->addr, index, term, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex, pBuf->startIndex,
+         pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
  return 0;
 }

@ -1002,9 +1002,9 @@ int32_t syncLogReplAttempt(SSyncLogReplMgr* pMgr, SSyncNode* pNode) {

    pMgr->endIndex = index + 1;
    if (barrier) {
-      sInfo("vgId:%d, replicated sync barrier to dnode:%d. index:%" PRId64 ", term:%" PRId64
-            ", repl mgr: rs(%d) [%" PRId64 " %" PRId64 ", %" PRId64 ")",
-            pNode->vgId, DID(pDestId), index, term, pMgr->restored, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex);
+      sInfo("vgId:%d, replicated sync barrier to dnode:%d. index:%" PRId64 ", term:%" PRId64 ", repl-mgr:[%" PRId64
+            " %" PRId64 ", %" PRId64 ")",
+            pNode->vgId, DID(pDestId), index, term, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex);
      break;
    }
  }
@ -1013,10 +1013,10 @@ int32_t syncLogReplAttempt(SSyncLogReplMgr* pMgr, SSyncNode* pNode) {

  SSyncLogBuffer* pBuf = pNode->pLogBuf;
  sTrace("vgId:%d, replicated %d msgs to peer:%" PRIx64 ". indexes:%" PRId64 "..., terms: ...%" PRId64
-         ", mgr: (rs:%d) [%" PRId64 " %" PRId64 ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64
+         ", repl-mgr:[%" PRId64 " %" PRId64 ", %" PRId64 "), buffer: [%" PRId64 " %" PRId64 " %" PRId64 ", %" PRId64
         ")",
-         pNode->vgId, count, pDestId->addr, firstIndex, term, pMgr->restored, pMgr->startIndex, pMgr->matchIndex,
-         pMgr->endIndex, pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
+         pNode->vgId, count, pDestId->addr, firstIndex, term, pMgr->startIndex, pMgr->matchIndex, pMgr->endIndex,
+         pBuf->startIndex, pBuf->commitIndex, pBuf->matchIndex, pBuf->endIndex);
  return 0;
 }

--- a/source/libs/sync/src/syncSnapshot.c
+++ b/source/libs/sync/src/syncSnapshot.c
@ -23,6 +23,44 @@
 #include "syncReplication.h"
 #include "syncUtil.h"

+static void syncSnapBufferReset(SSyncSnapBuffer *pBuf) {
+  taosThreadMutexLock(&pBuf->mutex);
+  for (int64_t i = pBuf->start; i < pBuf->end; ++i) {
+    if (pBuf->entryDeleteCb) {
+      pBuf->entryDeleteCb(pBuf->entries[i % pBuf->size]);
+    }
+    pBuf->entries[i % pBuf->size] = NULL;
+  }
+  pBuf->start = SYNC_SNAPSHOT_SEQ_BEGIN + 1;
+  pBuf->end = pBuf->start;
+  pBuf->cursor = pBuf->start - 1;
+  taosThreadMutexUnlock(&pBuf->mutex);
+}
+
+static void syncSnapBufferDestroy(SSyncSnapBuffer **ppBuf) {
+  if (ppBuf == NULL || ppBuf[0] == NULL) return;
+  SSyncSnapBuffer *pBuf = ppBuf[0];
+
+  syncSnapBufferReset(pBuf);
+
+  taosThreadMutexDestroy(&pBuf->mutex);
+  taosMemoryFree(ppBuf[0]);
+  ppBuf[0] = NULL;
+  return;
+}
+
+static SSyncSnapBuffer *syncSnapBufferCreate() {
+  SSyncSnapBuffer *pBuf = taosMemoryCalloc(1, sizeof(SSyncSnapBuffer));
+  if (pBuf == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return NULL;
+  }
+  pBuf->size = sizeof(pBuf->entries) / sizeof(void *);
+  ASSERT(pBuf->size == TSDB_SYNC_SNAP_BUFFER_SIZE);
+  taosThreadMutexInit(&pBuf->mutex, NULL);
+  return pBuf;
+}
+
 SSyncSnapshotSender *snapshotSenderCreate(SSyncNode *pSyncNode, int32_t replicaIndex) {
  bool condition = (pSyncNode->pFsm->FpSnapshotStartRead != NULL) && (pSyncNode->pFsm->FpSnapshotStopRead != NULL) &&
                   (pSyncNode->pFsm->FpSnapshotDoRead != NULL);
@ -38,8 +76,6 @@ SSyncSnapshotSender *snapshotSenderCreate(SSyncNode *pSyncNode, int32_t replicaI
  pSender->seq = SYNC_SNAPSHOT_SEQ_INVALID;
  pSender->ack = SYNC_SNAPSHOT_SEQ_INVALID;
  pSender->pReader = NULL;
-  pSender->pCurrentBlock = NULL;
-  pSender->blockLen = 0;
  pSender->sendingMS = SYNC_SNAPSHOT_RETRY_MS;
  pSender->pSyncNode = pSyncNode;
  pSender->replicaIndex = replicaIndex;
@ -49,24 +85,42 @@ SSyncSnapshotSender *snapshotSenderCreate(SSyncNode *pSyncNode, int32_t replicaI
  pSender->pSyncNode->pFsm->FpGetSnapshotInfo(pSender->pSyncNode->pFsm, &pSender->snapshot);
  pSender->finish = false;

+  SSyncSnapBuffer *pSndBuf = syncSnapBufferCreate();
+  if (pSndBuf == NULL) {
+    taosMemoryFree(pSender);
+    pSender = NULL;
+    return NULL;
+  }
+  pSndBuf->entryDeleteCb = syncSnapBlockDestroy;
+  pSender->pSndBuf = pSndBuf;
+
+  syncSnapBufferReset(pSender->pSndBuf);
  return pSender;
 }

+void syncSnapBlockDestroy(void *ptr) {
+  SyncSnapBlock *pBlk = ptr;
+  if (pBlk->pBlock != NULL) {
+    taosMemoryFree(pBlk->pBlock);
+    pBlk->pBlock = NULL;
+    pBlk->blockLen = 0;
+  }
+  taosMemoryFree(pBlk);
+}
+
 void snapshotSenderDestroy(SSyncSnapshotSender *pSender) {
  if (pSender == NULL) return;

-  // free current block
-  if (pSender->pCurrentBlock != NULL) {
-    taosMemoryFree(pSender->pCurrentBlock);
-    pSender->pCurrentBlock = NULL;
-  }
-
  // close reader
  if (pSender->pReader != NULL) {
    pSender->pSyncNode->pFsm->FpSnapshotStopRead(pSender->pSyncNode->pFsm, pSender->pReader);
    pSender->pReader = NULL;
  }

+  // free snap buffer
+  if (pSender->pSndBuf) {
+    syncSnapBufferDestroy(&pSender->pSndBuf);
+  }
  // free sender
  taosMemoryFree(pSender);
 }
@ -79,11 +133,9 @@ int32_t snapshotSenderStart(SSyncSnapshotSender *pSender) {
  int8_t started = atomic_val_compare_exchange_8(&pSender->start, false, true);
  if (started) return 0;

-  pSender->seq = SYNC_SNAPSHOT_SEQ_BEGIN;
+  pSender->seq = SYNC_SNAPSHOT_SEQ_PREP;
  pSender->ack = SYNC_SNAPSHOT_SEQ_INVALID;
  pSender->pReader = NULL;
-  pSender->pCurrentBlock = NULL;
-  pSender->blockLen = 0;
  pSender->snapshotParam.start = SYNC_INDEX_INVALID;
  pSender->snapshotParam.end = SYNC_INDEX_INVALID;
  pSender->snapshot.data = NULL;
@ -127,29 +179,28 @@ int32_t snapshotSenderStart(SSyncSnapshotSender *pSender) {
  SyncSnapshotSend *pMsg = rpcMsg.pCont;
  pMsg->srcId = pSender->pSyncNode->myRaftId;
  pMsg->destId = pSender->pSyncNode->replicasId[pSender->replicaIndex];
-  pMsg->term = raftStoreGetTerm(pSender->pSyncNode);
+  pMsg->term = pSender->term;
  pMsg->beginIndex = pSender->snapshotParam.start;
  pMsg->lastIndex = pSender->snapshot.lastApplyIndex;
  pMsg->lastTerm = pSender->snapshot.lastApplyTerm;
  pMsg->lastConfigIndex = pSender->snapshot.lastConfigIndex;
  pMsg->lastConfig = pSender->lastConfig;
  pMsg->startTime = pSender->startTime;
-  pMsg->seq = SYNC_SNAPSHOT_SEQ_PREP_SNAPSHOT;
+  pMsg->seq = pSender->seq;

  if (dataLen > 0) {
    pMsg->payloadType = snapInfo.type;
    memcpy(pMsg->data, snapInfo.data, dataLen);
  }

-  // event log
-  syncLogSendSyncSnapshotSend(pSender->pSyncNode, pMsg, "snapshot sender start");
-
  // send msg
  if (syncNodeSendMsgById(&pMsg->destId, pSender->pSyncNode, &rpcMsg) != 0) {
    sSError(pSender, "snapshot sender send msg failed since %s", terrstr());
    goto _out;
  }

+  sSInfo(pSender, "snapshot sender start, to dnode:%d.", DID(&pMsg->destId));
+
  code = 0;
 _out:
  if (snapInfo.data) {
@ -175,48 +226,59 @@ void snapshotSenderStop(SSyncSnapshotSender *pSender, bool finish) {
    pSender->pReader = NULL;
  }

-  // free current block
-  if (pSender->pCurrentBlock != NULL) {
-    taosMemoryFree(pSender->pCurrentBlock);
-    pSender->pCurrentBlock = NULL;
-    pSender->blockLen = 0;
-  }
+  syncSnapBufferReset(pSender->pSndBuf);
+
+  SRaftId destId = pSender->pSyncNode->replicasId[pSender->replicaIndex];
+  sSInfo(pSender, "snapshot sender stop, to dnode:%d, finish:%d", DID(&destId), finish);
 }

 // when sender receive ack, call this function to send msg from seq
 // seq = ack + 1, already updated
 static int32_t snapshotSend(SSyncSnapshotSender *pSender) {
-  // free memory last time (current seq - 1)
-  if (pSender->pCurrentBlock != NULL) {
-    taosMemoryFree(pSender->pCurrentBlock);
-    pSender->pCurrentBlock = NULL;
-    pSender->blockLen = 0;
+  int32_t        code = -1;
+  SyncSnapBlock *pBlk = NULL;
+
+  if (pSender->seq < SYNC_SNAPSHOT_SEQ_END) {
+    pSender->seq++;
+
+    if (pSender->seq > SYNC_SNAPSHOT_SEQ_BEGIN) {
+      pBlk = taosMemoryCalloc(1, sizeof(SyncSnapBlock));
+      if (pBlk == NULL) {
+        terrno = TSDB_CODE_OUT_OF_MEMORY;
+        goto _OUT;
      }

+      pBlk->seq = pSender->seq;
+
      // read data
      int32_t ret = pSender->pSyncNode->pFsm->FpSnapshotDoRead(pSender->pSyncNode->pFsm, pSender->pReader,
-                                                           &pSender->pCurrentBlock, &pSender->blockLen);
+                                                               &pBlk->pBlock, &pBlk->blockLen);
      if (ret != 0) {
        sSError(pSender, "snapshot sender read failed since %s", terrstr());
-    return -1;
+        goto _OUT;
      }

-  if (pSender->blockLen > 0) {
+      if (pBlk->blockLen > 0) {
        // has read data
-    sSDebug(pSender, "vgId:%d, snapshot sender continue to read, blockLen:%d seq:%d", pSender->pSyncNode->vgId,
-            pSender->blockLen, pSender->seq);
+        sSDebug(pSender, "snapshot sender continue to read, blockLen:%d seq:%d", pBlk->blockLen, pBlk->seq);
      } else {
        // read finish, update seq to end
        pSender->seq = SYNC_SNAPSHOT_SEQ_END;
-    sSInfo(pSender, "vgId:%d, snapshot sender read to the end, blockLen:%d seq:%d", pSender->pSyncNode->vgId,
-           pSender->blockLen, pSender->seq);
+        sSInfo(pSender, "snapshot sender read to the end");
+        code = 0;
+        goto _OUT;
+      }
+    }
  }

+  ASSERT(pSender->seq >= SYNC_SNAPSHOT_SEQ_BEGIN && pSender->seq <= SYNC_SNAPSHOT_SEQ_END);
+
+  int32_t blockLen = (pBlk != NULL) ? pBlk->blockLen : 0;
  // build msg
  SRpcMsg rpcMsg = {0};
-  if (syncBuildSnapshotSend(&rpcMsg, pSender->blockLen, pSender->pSyncNode->vgId) != 0) {
+  if (syncBuildSnapshotSend(&rpcMsg, blockLen, pSender->pSyncNode->vgId) != 0) {
    sSError(pSender, "vgId:%d, snapshot sender build msg failed since %s", pSender->pSyncNode->vgId, terrstr());
-    return -1;
+    goto _OUT;
  }

  SyncSnapshotSend *pMsg = rpcMsg.pCont;
@ -231,77 +293,83 @@ static int32_t snapshotSend(SSyncSnapshotSender *pSender) {
  pMsg->startTime = pSender->startTime;
  pMsg->seq = pSender->seq;

-  if (pSender->pCurrentBlock != NULL) {
-    memcpy(pMsg->data, pSender->pCurrentBlock, pSender->blockLen);
-  }
-
-  // event log
-  if (pSender->seq == SYNC_SNAPSHOT_SEQ_END) {
-    syncLogSendSyncSnapshotSend(pSender->pSyncNode, pMsg, "snapshot sender finish");
-  } else {
-    syncLogSendSyncSnapshotSend(pSender->pSyncNode, pMsg, "snapshot sender sending");
+  if (pBlk != NULL && pBlk->pBlock != NULL && pBlk->blockLen > 0) {
+    memcpy(pMsg->data, pBlk->pBlock, pBlk->blockLen);
  }

  // send msg
  if (syncNodeSendMsgById(&pMsg->destId, pSender->pSyncNode, &rpcMsg) != 0) {
    sSError(pSender, "snapshot sender send msg failed since %s", terrstr());
-    return -1;
+    goto _OUT;
  }

-  pSender->lastSendTime = taosGetTimestampMs();
-  return 0;
+  // put in buffer
+  int64_t nowMs = taosGetTimestampMs();
+  if (pBlk) {
+    ASSERT(pBlk->seq > SYNC_SNAPSHOT_SEQ_BEGIN && pBlk->seq < SYNC_SNAPSHOT_SEQ_END);
+    pBlk->sendTimeMs = nowMs;
+    pSender->pSndBuf->entries[pSender->seq % pSender->pSndBuf->size] = pBlk;
+    pBlk = NULL;
+    pSender->pSndBuf->end = TMAX(pSender->seq + 1, pSender->pSndBuf->end);
+  }
+  pSender->lastSendTime = nowMs;
+  code = 0;
+
+_OUT:;
+  if (pBlk != NULL) {
+    syncSnapBlockDestroy(pBlk);
+    pBlk = NULL;
+  }
+  return code;
 }

 // send snapshot data from cache
 int32_t snapshotReSend(SSyncSnapshotSender *pSender) {
+  SSyncSnapBuffer *pSndBuf = pSender->pSndBuf;
+  int32_t          code = -1;
+  taosThreadMutexLock(&pSndBuf->mutex);
+
+  for (int32_t seq = pSndBuf->cursor + 1; seq < pSndBuf->end; ++seq) {
+    SyncSnapBlock *pBlk = pSndBuf->entries[seq % pSndBuf->size];
+    ASSERT(pBlk && !pBlk->acked);
+    int64_t nowMs = taosGetTimestampMs();
+    if (nowMs < pBlk->sendTimeMs + SYNC_SNAP_RESEND_MS) {
+      continue;
+    }
    // build msg
    SRpcMsg rpcMsg = {0};
-  if (syncBuildSnapshotSend(&rpcMsg, pSender->blockLen, pSender->pSyncNode->vgId) != 0) {
+    if (syncBuildSnapshotSend(&rpcMsg, pBlk->blockLen, pSender->pSyncNode->vgId) != 0) {
      sSError(pSender, "snapshot sender build msg failed since %s", terrstr());
-    return -1;
+      goto _out;
    }

    SyncSnapshotSend *pMsg = rpcMsg.pCont;
    pMsg->srcId = pSender->pSyncNode->myRaftId;
    pMsg->destId = pSender->pSyncNode->replicasId[pSender->replicaIndex];
-  pMsg->term = raftStoreGetTerm(pSender->pSyncNode);
+    pMsg->term = pSender->term;
    pMsg->beginIndex = pSender->snapshotParam.start;
    pMsg->lastIndex = pSender->snapshot.lastApplyIndex;
    pMsg->lastTerm = pSender->snapshot.lastApplyTerm;
    pMsg->lastConfigIndex = pSender->snapshot.lastConfigIndex;
    pMsg->lastConfig = pSender->lastConfig;
    pMsg->startTime = pSender->startTime;
-  pMsg->seq = pSender->seq;
+    pMsg->seq = pBlk->seq;

-  if (pSender->pCurrentBlock != NULL && pSender->blockLen > 0) {
-    memcpy(pMsg->data, pSender->pCurrentBlock, pSender->blockLen);
+    if (pBlk->pBlock != NULL && pBlk->blockLen > 0) {
+      memcpy(pMsg->data, pBlk->pBlock, pBlk->blockLen);
    }

-  // event log
-  syncLogSendSyncSnapshotSend(pSender->pSyncNode, pMsg, "snapshot sender resend");
-
    // send msg
    if (syncNodeSendMsgById(&pMsg->destId, pSender->pSyncNode, &rpcMsg) != 0) {
      sSError(pSender, "snapshot sender resend msg failed since %s", terrstr());
-    return -1;
+      goto _out;
    }
-
-  pSender->lastSendTime = taosGetTimestampMs();
-  return 0;
-}
-
-static int32_t snapshotSenderUpdateProgress(SSyncSnapshotSender *pSender, SyncSnapshotRsp *pMsg) {
-  if (pMsg->ack != pSender->seq) {
-    sSError(pSender, "snapshot sender update seq failed, ack:%d seq:%d", pMsg->ack, pSender->seq);
-    terrno = TSDB_CODE_SYN_MISMATCHED_SIGNATURE;
-    return -1;
+    pBlk->sendTimeMs = nowMs;
  }
-
-  pSender->ack = pMsg->ack;
-  pSender->seq++;
-
-  sSDebug(pSender, "snapshot sender update seq:%d", pSender->seq);
-  return 0;
+  code = 0;
+_out:;
+  taosThreadMutexUnlock(&pSndBuf->mutex);
+  return code;
 }

 // return 0, start ok
@ -328,8 +396,6 @@ int32_t syncNodeStartSnapshot(SSyncNode *pSyncNode, SRaftId *pDestId) {
    return 0;
  }

-  sSInfo(pSender, "snapshot sender start");
-
  int32_t code = snapshotSenderStart(pSender);
  if (code != 0) {
    sSError(pSender, "snapshot sender start error since %s", terrstr());
@ -362,6 +428,16 @@ SSyncSnapshotReceiver *snapshotReceiverCreate(SSyncNode *pSyncNode, SRaftId from
  pReceiver->snapshot.lastApplyTerm = 0;
  pReceiver->snapshot.lastConfigIndex = SYNC_INDEX_INVALID;

+  SSyncSnapBuffer *pRcvBuf = syncSnapBufferCreate();
+  if (pRcvBuf == NULL) {
+    taosMemoryFree(pReceiver);
+    pReceiver = NULL;
+    return NULL;
+  }
+  pRcvBuf->entryDeleteCb = rpcFreeCont;
+  pReceiver->pRcvBuf = pRcvBuf;
+
+  syncSnapBufferReset(pReceiver->pRcvBuf);
  return pReceiver;
 }

@ -389,6 +465,11 @@ void snapshotReceiverDestroy(SSyncSnapshotReceiver *pReceiver) {
    pReceiver->snapshot.data = NULL;
  }

+  // free snap buf
+  if (pReceiver->pRcvBuf) {
+    syncSnapBufferDestroy(&pReceiver->pRcvBuf);
+  }
+
  // free receiver
  taosMemoryFree(pReceiver);
 }
@ -444,20 +525,19 @@ void snapshotReceiverStart(SSyncSnapshotReceiver *pReceiver, SyncSnapshotSend *p
  int8_t started = atomic_val_compare_exchange_8(&pReceiver->start, false, true);
  if (started) return;

-  pReceiver->ack = SYNC_SNAPSHOT_SEQ_PREP_SNAPSHOT;
+  pReceiver->ack = SYNC_SNAPSHOT_SEQ_PREP;
  pReceiver->term = pPreMsg->term;
  pReceiver->fromId = pPreMsg->srcId;
  pReceiver->startTime = pPreMsg->startTime;
  ASSERT(pReceiver->startTime);

-  // event log
-  sRInfo(pReceiver, "snapshot receiver is start");
+  sRInfo(pReceiver, "snapshot receiver start, from dnode:%d.", DID(&pReceiver->fromId));
 }

 // just set start = false
 // FpSnapshotStopWrite should not be called
 void snapshotReceiverStop(SSyncSnapshotReceiver *pReceiver) {
-  sRInfo(pReceiver, "snapshot receiver stop, not apply, writer:%p", pReceiver->pWriter);
+  sRDebug(pReceiver, "snapshot receiver stop, not apply, writer:%p", pReceiver->pWriter);

  int8_t stopped = !atomic_val_compare_exchange_8(&pReceiver->start, true, false);
  if (stopped) return;
@ -472,6 +552,8 @@ void snapshotReceiverStop(SSyncSnapshotReceiver *pReceiver) {
  } else {
    sRInfo(pReceiver, "snapshot receiver stop, writer is null");
  }
+
+  syncSnapBufferReset(pReceiver->pRcvBuf);
 }

 // when recv last snapshot block, apply data into snapshot
@ -479,7 +561,7 @@ static int32_t snapshotReceiverFinish(SSyncSnapshotReceiver *pReceiver, SyncSnap
  int32_t code = 0;
  if (pReceiver->pWriter != NULL) {
    // write data
-    sRInfo(pReceiver, "snapshot receiver write finish, blockLen:%d seq:%d", pMsg->dataLen, pMsg->seq);
+    sRInfo(pReceiver, "snapshot receiver write about to finish, blockLen:%d seq:%d", pMsg->dataLen, pMsg->seq);
    if (pMsg->dataLen > 0) {
      code = pReceiver->pSyncNode->pFsm->FpSnapshotDoWrite(pReceiver->pSyncNode->pFsm, pReceiver->pWriter, pMsg->data,
                                                           pMsg->dataLen);
@ -489,15 +571,6 @@ static int32_t snapshotReceiverFinish(SSyncSnapshotReceiver *pReceiver, SyncSnap
      }
    }

-    // reset wal
-    sRInfo(pReceiver, "snapshot receiver log restore");
-    code =
-        pReceiver->pSyncNode->pLogStore->syncLogRestoreFromSnapshot(pReceiver->pSyncNode->pLogStore, pMsg->lastIndex);
-    if (code != 0) {
-      sRError(pReceiver, "failed to snapshot receiver log restore since %s", terrstr());
-      return -1;
-    }
-
    // update commit index
    if (pReceiver->snapshot.lastApplyIndex > pReceiver->pSyncNode->commitIndex) {
      pReceiver->pSyncNode->commitIndex = pReceiver->snapshot.lastApplyIndex;
@ -509,7 +582,6 @@ static int32_t snapshotReceiverFinish(SSyncSnapshotReceiver *pReceiver, SyncSnap
    }

    // stop writer, apply data
-    sRInfo(pReceiver, "snapshot receiver apply write");
    code = pReceiver->pSyncNode->pFsm->FpSnapshotStopWrite(pReceiver->pSyncNode->pFsm, pReceiver->pWriter, true,
                                                           &pReceiver->snapshot);
    if (code != 0) {
@ -517,21 +589,29 @@ static int32_t snapshotReceiverFinish(SSyncSnapshotReceiver *pReceiver, SyncSnap
      return -1;
    }
    pReceiver->pWriter = NULL;
+    sRInfo(pReceiver, "snapshot receiver write stopped");

    // update progress
    pReceiver->ack = SYNC_SNAPSHOT_SEQ_END;

+    // get fsmState
    SSnapshot snapshot = {0};
    pReceiver->pSyncNode->pFsm->FpGetSnapshotInfo(pReceiver->pSyncNode->pFsm, &snapshot);
    pReceiver->pSyncNode->fsmState = snapshot.state;

+    // reset wal
+    code =
+        pReceiver->pSyncNode->pLogStore->syncLogRestoreFromSnapshot(pReceiver->pSyncNode->pLogStore, pMsg->lastIndex);
+    if (code != 0) {
+      sRError(pReceiver, "failed to snapshot receiver log restore since %s", terrstr());
+      return -1;
+    }
+    sRInfo(pReceiver, "wal log restored from snapshot");
  } else {
    sRError(pReceiver, "snapshot receiver finish error since writer is null");
    return -1;
  }

-  // event log
-  sRInfo(pReceiver, "snapshot receiver got last data and apply snapshot finished");
  return 0;
 }

@ -599,22 +679,22 @@ static int32_t syncNodeOnSnapshotPrep(SSyncNode *pSyncNode, SyncSnapshotSend *pM
    int32_t order = 0;
    if ((order = snapshotReceiverSignatureCmp(pReceiver, pMsg)) < 0) {
      sRInfo(pReceiver,
-             "received a new snapshot preparation. restart receiver"
-             "receiver signature: (%" PRId64 ", %" PRId64 "), msg signature:(%" PRId64 ", %" PRId64 ")",
-             pReceiver->term, pReceiver->startTime, pMsg->term, pMsg->startTime);
+             "received a new snapshot preparation. restart receiver."
+             " msg signature:(%" PRId64 ", %" PRId64 ")",
+             pMsg->term, pMsg->startTime);
      goto _START_RECEIVER;
    } else if (order == 0) {
      sRInfo(pReceiver,
-             "received a duplicate snapshot preparation. send reply"
-             "receiver signature: (%" PRId64 ", %" PRId64 "), msg signature:(%" PRId64 ", %" PRId64 ")",
-             pReceiver->term, pReceiver->startTime, pMsg->term, pMsg->startTime);
+             "received a duplicate snapshot preparation. send reply."
+             " msg signature:(%" PRId64 ", %" PRId64 ")",
+             pMsg->term, pMsg->startTime);
      goto _SEND_REPLY;
    } else {
      // ignore
      sRError(pReceiver,
-              "received a stale snapshot preparation. ignore"
-              "receiver signature: (%" PRId64 ", %" PRId64 "), msg signature:(%" PRId64 ", %" PRId64 ")",
-              pReceiver->term, pReceiver->startTime, pMsg->term, pMsg->startTime);
+              "received a stale snapshot preparation. ignore."
+              " msg signature:(%" PRId64 ", %" PRId64 ")",
+              pMsg->term, pMsg->startTime);
      terrno = TSDB_CODE_SYN_MISMATCHED_SIGNATURE;
      code = terrno;
      goto _SEND_REPLY;
@ -765,29 +845,8 @@ _SEND_REPLY:
  return code;
 }

-static int32_t syncNodeOnSnapshotReceive(SSyncNode *pSyncNode, SyncSnapshotSend *pMsg) {
-  // condition 4
-  // transfering
-  SSyncSnapshotReceiver *pReceiver = pSyncNode->pNewNodeReceiver;
-  int64_t timeNow = taosGetTimestampMs();
-  int32_t                code = 0;
-
-  if (snapshotReceiverSignatureCmp(pReceiver, pMsg) != 0) {
-    terrno = TSDB_CODE_SYN_MISMATCHED_SIGNATURE;
-    sRError(pReceiver, "failed to receive snapshot data since %s.", terrstr());
-    code = terrno;
-    goto _SEND_REPLY;
-  }
-
-  if (snapshotReceiverGotData(pReceiver, pMsg) != 0) {
-    code = terrno;
-    if (code >= SYNC_SNAPSHOT_SEQ_INVALID) {
-      code = TSDB_CODE_SYN_INTERNAL_ERROR;
-    }
-  }
-
-_SEND_REPLY:;
-
+static int32_t syncSnapSendRsp(SSyncSnapshotReceiver *pReceiver, SyncSnapshotSend *pMsg, int32_t code) {
+  SSyncNode *pSyncNode = pReceiver->pSyncNode;
  // build msg
  SRpcMsg rpcMsg = {0};
  if (syncBuildSnapshotSendRsp(&rpcMsg, 0, pSyncNode->vgId)) {
@ -811,10 +870,79 @@ _SEND_REPLY:;
    sRError(pReceiver, "failed to send snapshot receiver resp since %s", terrstr());
    return -1;
  }
+  return 0;
+}

+static int32_t syncSnapBufferRecv(SSyncSnapshotReceiver *pReceiver, SyncSnapshotSend **ppMsg) {
+  int32_t           code = 0;
+  SSyncSnapBuffer  *pRcvBuf = pReceiver->pRcvBuf;
+  SyncSnapshotSend *pMsg = ppMsg[0];
+  terrno = TSDB_CODE_SUCCESS;
+
+  taosThreadMutexLock(&pRcvBuf->mutex);
+
+  if (pMsg->seq - pRcvBuf->start >= pRcvBuf->size) {
+    terrno = TSDB_CODE_SYN_BUFFER_FULL;
+    code = terrno;
+    goto _out;
+  }
+
+  ASSERT(pRcvBuf->start <= pRcvBuf->cursor + 1 && pRcvBuf->cursor < pRcvBuf->end);
+
+  if (pMsg->seq > pRcvBuf->cursor) {
+    pRcvBuf->entries[pMsg->seq % pRcvBuf->size] = pMsg;
+    ppMsg[0] = NULL;
+    pRcvBuf->end = TMAX(pMsg->seq + 1, pRcvBuf->end);
+  } else {
+    syncSnapSendRsp(pReceiver, pMsg, code);
+    goto _out;
+  }
+
+  for (int64_t seq = pRcvBuf->cursor + 1; seq < pRcvBuf->end; ++seq) {
+    if (pRcvBuf->entries[seq]) {
+      pRcvBuf->cursor = seq;
+    } else {
+      break;
+    }
+  }
+
+  for (int64_t seq = pRcvBuf->start; seq <= pRcvBuf->cursor; ++seq) {
+    if (snapshotReceiverGotData(pReceiver, pRcvBuf->entries[seq % pRcvBuf->size]) != 0) {
+      code = terrno;
+      if (code >= SYNC_SNAPSHOT_SEQ_INVALID) {
+        code = TSDB_CODE_SYN_INTERNAL_ERROR;
+      }
+    }
+    pRcvBuf->start = seq + 1;
+    syncSnapSendRsp(pReceiver, pRcvBuf->entries[seq % pRcvBuf->size], code);
+    pRcvBuf->entryDeleteCb(pRcvBuf->entries[seq % pRcvBuf->size]);
+    pRcvBuf->entries[seq % pRcvBuf->size] = NULL;
+    if (code) goto _out;
+  }
+
+_out:
+  taosThreadMutexUnlock(&pRcvBuf->mutex);
  return code;
 }

+static int32_t syncNodeOnSnapshotReceive(SSyncNode *pSyncNode, SyncSnapshotSend **ppMsg) {
+  // condition 4
+  // transfering
+  SyncSnapshotSend *pMsg = ppMsg[0];
+  ASSERT(pMsg);
+  SSyncSnapshotReceiver *pReceiver = pSyncNode->pNewNodeReceiver;
+  int64_t                timeNow = taosGetTimestampMs();
+  int32_t                code = 0;
+
+  if (snapshotReceiverSignatureCmp(pReceiver, pMsg) != 0) {
+    terrno = TSDB_CODE_SYN_MISMATCHED_SIGNATURE;
+    sRError(pReceiver, "failed to receive snapshot data since %s.", terrstr());
+    return syncSnapSendRsp(pReceiver, pMsg, terrno);
+  }
+
+  return syncSnapBufferRecv(pReceiver, ppMsg);
+}
+
 static int32_t syncNodeOnSnapshotEnd(SSyncNode *pSyncNode, SyncSnapshotSend *pMsg) {
  // condition 2
  // end, finish FSM
@ -867,7 +995,7 @@ _SEND_REPLY:;

 // receiver on message
 //
-// condition 1, recv SYNC_SNAPSHOT_SEQ_PREP_SNAPSHOT
+// condition 1, recv SYNC_SNAPSHOT_SEQ_PREP
 //              if receiver already start
 //                    if sender.start-time > receiver.start-time, restart receiver(reply snapshot start)
 //                    if sender.start-time = receiver.start-time, maybe duplicate msg
@ -885,9 +1013,11 @@ _SEND_REPLY:;
 //
 // condition 5, got data, update ack
 //
-int32_t syncNodeOnSnapshot(SSyncNode *pSyncNode, const SRpcMsg *pRpcMsg) {
-  SyncSnapshotSend      *pMsg = pRpcMsg->pCont;
+int32_t syncNodeOnSnapshot(SSyncNode *pSyncNode, SRpcMsg *pRpcMsg) {
+  SyncSnapshotSend **ppMsg = (SyncSnapshotSend **)&pRpcMsg->pCont;
+  SyncSnapshotSend      *pMsg = ppMsg[0];
  SSyncSnapshotReceiver *pReceiver = pSyncNode->pNewNodeReceiver;
+  int32_t                code = 0;

  // if already drop replica, do not process
  if (!syncNodeInRaftGroup(pSyncNode, &pMsg->srcId)) {
@ -911,49 +1041,56 @@ int32_t syncNodeOnSnapshot(SSyncNode *pSyncNode, const SRpcMsg *pRpcMsg) {
    syncNodeUpdateTermWithoutStepDown(pSyncNode, pMsg->term);
  }

-  // state, term, seq/ack
-  int32_t code = 0;
-  if (pSyncNode->state == TAOS_SYNC_STATE_FOLLOWER || pSyncNode->state == TAOS_SYNC_STATE_LEARNER) {
-    if (pMsg->term == raftStoreGetTerm(pSyncNode)) {
-      if (pMsg->seq == SYNC_SNAPSHOT_SEQ_PREP_SNAPSHOT) {
-        sInfo("vgId:%d, receive pre-snapshot msg of snapshot replication. signature:(%" PRId64 ", %" PRId64 ")",
-              pSyncNode->vgId, pMsg->term, pMsg->startTime);
-        code = syncNodeOnSnapshotPrep(pSyncNode, pMsg);
-      } else if (pMsg->seq == SYNC_SNAPSHOT_SEQ_BEGIN) {
-        sInfo("vgId:%d, receive begin msg of snapshot replication. signature:(%" PRId64 ", %" PRId64 ")",
-              pSyncNode->vgId, pMsg->term, pMsg->startTime);
-        code = syncNodeOnSnapshotBegin(pSyncNode, pMsg);
-      } else if (pMsg->seq == SYNC_SNAPSHOT_SEQ_END) {
-        sInfo("vgId:%d, receive end msg of snapshot replication. signature: (%" PRId64 ", %" PRId64 ")",
-              pSyncNode->vgId, pMsg->term, pMsg->startTime);
-        code = syncNodeOnSnapshotEnd(pSyncNode, pMsg);
-        if (syncLogBufferReInit(pSyncNode->pLogBuf, pSyncNode) != 0) {
-          sRError(pReceiver, "failed to reinit log buffer since %s", terrstr());
-          code = -1;
-        }
-      } else if (pMsg->seq == SYNC_SNAPSHOT_SEQ_FORCE_CLOSE) {
-        // force close, no response
-        syncLogRecvSyncSnapshotSend(pSyncNode, pMsg, "process force stop");
-        snapshotReceiverStop(pReceiver);
-      } else if (pMsg->seq > SYNC_SNAPSHOT_SEQ_BEGIN && pMsg->seq < SYNC_SNAPSHOT_SEQ_END) {
-        syncLogRecvSyncSnapshotSend(pSyncNode, pMsg, "process seq data");
-        code = syncNodeOnSnapshotReceive(pSyncNode, pMsg);
-      } else {
-        // error log
-        sRError(pReceiver, "snapshot receiver recv error seq:%d, my ack:%d", pMsg->seq, pReceiver->ack);
-        code = -1;
-      }
-    } else {
-      // error log
-      sRError(pReceiver, "snapshot receiver term not equal");
-      code = -1;
-    }
-  } else {
-    // error log
-    sRError(pReceiver, "snapshot receiver not follower");
-    code = -1;
+  if (pSyncNode->state != TAOS_SYNC_STATE_FOLLOWER && pSyncNode->state != TAOS_SYNC_STATE_LEARNER) {
+    sRError(pReceiver, "snapshot receiver not a follower or learner");
+    return -1;
  }

+  if (pMsg->seq < SYNC_SNAPSHOT_SEQ_PREP || pMsg->seq > SYNC_SNAPSHOT_SEQ_END) {
+    sRError(pReceiver, "snap replication msg with invalid seq:%d", pMsg->seq);
+    return -1;
+  }
+
+  // prepare
+  if (pMsg->seq == SYNC_SNAPSHOT_SEQ_PREP) {
+    sInfo("vgId:%d, prepare snap replication. msg signature:(%" PRId64 ", %" PRId64 ")", pSyncNode->vgId, pMsg->term,
+          pMsg->startTime);
+    code = syncNodeOnSnapshotPrep(pSyncNode, pMsg);
+    goto _out;
+  }
+
+  // begin
+  if (pMsg->seq == SYNC_SNAPSHOT_SEQ_BEGIN) {
+    sInfo("vgId:%d, begin snap replication. msg signature:(%" PRId64 ", %" PRId64 ")", pSyncNode->vgId, pMsg->term,
+          pMsg->startTime);
+    code = syncNodeOnSnapshotBegin(pSyncNode, pMsg);
+    goto _out;
+  }
+
+  // data
+  if (pMsg->seq > SYNC_SNAPSHOT_SEQ_BEGIN && pMsg->seq < SYNC_SNAPSHOT_SEQ_END) {
+    code = syncNodeOnSnapshotReceive(pSyncNode, ppMsg);
+    goto _out;
+  }
+
+  // end
+  if (pMsg->seq == SYNC_SNAPSHOT_SEQ_END) {
+    sInfo("vgId:%d, end snap replication. msg signature:(%" PRId64 ", %" PRId64 ")", pSyncNode->vgId, pMsg->term,
+          pMsg->startTime);
+    code = syncNodeOnSnapshotEnd(pSyncNode, pMsg);
+    if (code != 0) {
+      sRError(pReceiver, "failed to end snapshot.");
+      goto _out;
+    }
+
+    code = syncLogBufferReInit(pSyncNode->pLogBuf, pSyncNode);
+    if (code != 0) {
+      sRError(pReceiver, "failed to reinit log buffer since %s", terrstr());
+    }
+    goto _out;
+  }
+
+_out:;
  syncNodeResetElectTimer(pSyncNode);
  return code;
 }
@ -993,41 +1130,7 @@ static int32_t syncNodeOnSnapshotPrepRsp(SSyncNode *pSyncNode, SSyncSnapshotSend
  // update next index
  syncIndexMgrSetIndex(pSyncNode->pNextIndex, &pMsg->srcId, snapshot.lastApplyIndex + 1);

-  // update seq
-  pSender->seq = SYNC_SNAPSHOT_SEQ_BEGIN;
-
-  // build begin msg
-  SRpcMsg rpcMsg = {0};
-  if (syncBuildSnapshotSend(&rpcMsg, 0, pSender->pSyncNode->vgId) != 0) {
-    sSError(pSender, "prepare snapshot failed since build msg error");
-    return -1;
-  }
-
-  SyncSnapshotSend *pSendMsg = rpcMsg.pCont;
-  pSendMsg->srcId = pSender->pSyncNode->myRaftId;
-  pSendMsg->destId = pSender->pSyncNode->replicasId[pSender->replicaIndex];
-  pSendMsg->term = raftStoreGetTerm(pSender->pSyncNode);
-  pSendMsg->beginIndex = pSender->snapshotParam.start;
-  pSendMsg->lastIndex = pSender->snapshot.lastApplyIndex;
-  pSendMsg->lastTerm = pSender->snapshot.lastApplyTerm;
-  pSendMsg->lastConfigIndex = pSender->snapshot.lastConfigIndex;
-  pSendMsg->lastConfig = pSender->lastConfig;
-  pSendMsg->startTime = pSender->startTime;
-  pSendMsg->seq = SYNC_SNAPSHOT_SEQ_BEGIN;
-
-  ASSERT(pSendMsg->startTime);
-
-  sSInfo(pSender, "begin snapshot replication to dnode %d. startTime:%" PRId64, DID(&pSendMsg->destId),
-         pSendMsg->startTime);
-
-  // send msg
-  syncLogSendSyncSnapshotSend(pSyncNode, pSendMsg, "snapshot sender reply pre");
-  if (syncNodeSendMsgById(&pSendMsg->destId, pSender->pSyncNode, &rpcMsg) != 0) {
-    sSError(pSender, "prepare snapshot failed since send msg error");
-    return -1;
-  }
-
-  return 0;
+  return snapshotSend(pSender);
 }

 static int32_t snapshotSenderSignatureCmp(SSyncSnapshotSender *pSender, SyncSnapshotRsp *pMsg) {
@ -1038,14 +1141,77 @@ static int32_t snapshotSenderSignatureCmp(SSyncSnapshotSender *pSender, SyncSnap
  return 0;
 }

+static int32_t syncSnapBufferSend(SSyncSnapshotSender *pSender, SyncSnapshotRsp **ppMsg) {
+  int32_t          code = 0;
+  SSyncSnapBuffer *pSndBuf = pSender->pSndBuf;
+  SyncSnapshotRsp *pMsg = ppMsg[0];
+
+  taosThreadMutexLock(&pSndBuf->mutex);
+  if (snapshotSenderSignatureCmp(pSender, pMsg) != 0) {
+    code = terrno = TSDB_CODE_SYN_MISMATCHED_SIGNATURE;
+    goto _out;
+  }
+
+  if (pSender->pReader == NULL || pSender->finish) {
+    code = terrno = TSDB_CODE_SYN_INTERNAL_ERROR;
+    goto _out;
+  }
+
+  if (pMsg->ack - pSndBuf->start >= pSndBuf->size) {
+    code = terrno = TSDB_CODE_SYN_BUFFER_FULL;
+    goto _out;
+  }
+
+  ASSERT(pSndBuf->start <= pSndBuf->cursor + 1 && pSndBuf->cursor < pSndBuf->end);
+
+  if (pMsg->ack > pSndBuf->cursor && pMsg->ack < pSndBuf->end) {
+    SyncSnapBlock *pBlk = pSndBuf->entries[pMsg->ack % pSndBuf->size];
+    ASSERT(pBlk);
+    pBlk->acked = 1;
+  }
+
+  for (int64_t ack = pSndBuf->cursor + 1; ack < pSndBuf->end; ++ack) {
+    SyncSnapBlock *pBlk = pSndBuf->entries[ack % pSndBuf->size];
+    if (pBlk->acked) {
+      pSndBuf->cursor = ack;
+    } else {
+      break;
+    }
+  }
+
+  for (int64_t ack = pSndBuf->start; ack <= pSndBuf->cursor; ++ack) {
+    pSndBuf->entryDeleteCb(pSndBuf->entries[ack % pSndBuf->size]);
+    pSndBuf->entries[ack % pSndBuf->size] = NULL;
+    pSndBuf->start = ack + 1;
+  }
+
+  while (pSender->seq != SYNC_SNAPSHOT_SEQ_END && pSender->seq - pSndBuf->start < (pSndBuf->size >> 2)) {
+    if (snapshotSend(pSender) != 0) {
+      code = terrno;
+      goto _out;
+    }
+  }
+
+  if (pSender->seq == SYNC_SNAPSHOT_SEQ_END && pSndBuf->end <= pSndBuf->start) {
+    if (snapshotSend(pSender) != 0) {
+      code = terrno;
+      goto _out;
+    }
+  }
+_out:
+  taosThreadMutexUnlock(&pSndBuf->mutex);
+  return code;
+}
+
 // sender on message
 //
 // condition 1 sender receives SYNC_SNAPSHOT_SEQ_END, close sender
 // condition 2 sender receives ack, set seq = ack + 1, send msg from seq
 // condition 3 sender receives error msg, just print error log
 //
-int32_t syncNodeOnSnapshotRsp(SSyncNode *pSyncNode, const SRpcMsg *pRpcMsg) {
-  SyncSnapshotRsp *pMsg = pRpcMsg->pCont;
+int32_t syncNodeOnSnapshotRsp(SSyncNode *pSyncNode, SRpcMsg *pRpcMsg) {
+  SyncSnapshotRsp **ppMsg = (SyncSnapshotRsp **)&pRpcMsg->pCont;
+  SyncSnapshotRsp  *pMsg = ppMsg[0];

  // if already drop replica, do not process
  if (!syncNodeInRaftGroup(pSyncNode, &pMsg->srcId)) {
@ -1071,10 +1237,7 @@ int32_t syncNodeOnSnapshotRsp(SSyncNode *pSyncNode, const SRpcMsg *pRpcMsg) {
  // check signature
  int32_t order = 0;
  if ((order = snapshotSenderSignatureCmp(pSender, pMsg)) > 0) {
-    sSError(pSender,
-            "received a stale snapshot rsp. ignore it"
-            "sender signature: (%" PRId64 ", %" PRId64 "), msg signature:(%" PRId64 ", %" PRId64 ")",
-            pSender->term, pSender->startTime, pMsg->term, pMsg->startTime);
+    sSWarn(pSender, "ignore a stale snap rsp, msg signature:(%" PRId64 ", %" PRId64 ").", pMsg->term, pMsg->startTime);
    terrno = TSDB_CODE_SYN_MISMATCHED_SIGNATURE;
    return -1;
  } else if (order < 0) {
@ -1083,9 +1246,7 @@ int32_t syncNodeOnSnapshotRsp(SSyncNode *pSyncNode, const SRpcMsg *pRpcMsg) {
    goto _ERROR;
  }

-  // state, term, seq/ack
  if (pSyncNode->state != TAOS_SYNC_STATE_LEADER) {
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "snapshot sender not leader");
    sSError(pSender, "snapshot sender not leader");
    terrno = TSDB_CODE_SYN_NOT_LEADER;
    goto _ERROR;
@ -1093,83 +1254,46 @@ int32_t syncNodeOnSnapshotRsp(SSyncNode *pSyncNode, const SRpcMsg *pRpcMsg) {

  SyncTerm currentTerm = raftStoreGetTerm(pSyncNode);
  if (pMsg->term != currentTerm) {
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "snapshot sender and receiver term not match");
-    sSError(pSender, "snapshot sender term not equal, msg term:%" PRId64 " currentTerm:%" PRId64, pMsg->term,
+    sSError(pSender, "snapshot sender term mismatch, msg term:%" PRId64 " currentTerm:%" PRId64, pMsg->term,
            currentTerm);
    terrno = TSDB_CODE_SYN_MISMATCHED_SIGNATURE;
    goto _ERROR;
  }

  if (pMsg->code != 0) {
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "receive error code");
    sSError(pSender, "snapshot sender receive error:%s 0x%x and stop sender", tstrerror(pMsg->code), pMsg->code);
    terrno = pMsg->code;
    goto _ERROR;
  }

-  // prepare <begin, end>, send begin msg
-  if (pMsg->ack == SYNC_SNAPSHOT_SEQ_PREP_SNAPSHOT) {
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "process seq pre-snapshot");
-    return syncNodeOnSnapshotPrepRsp(pSyncNode, pSender, pMsg);
-  }
-
-  if (pSender->pReader == NULL || pSender->finish) {
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "snapshot sender invalid");
-    sSError(pSender, "snapshot sender invalid error:%s 0x%x, pReader:%p finish:%d", tstrerror(pMsg->code), pMsg->code,
-            pSender->pReader, pSender->finish);
-    terrno = pMsg->code;
+  // send begin
+  if (pMsg->ack == SYNC_SNAPSHOT_SEQ_PREP) {
+    sSInfo(pSender, "process prepare rsp");
+    if (syncNodeOnSnapshotPrepRsp(pSyncNode, pSender, pMsg) != 0) {
      goto _ERROR;
    }
-
-  if (pMsg->ack == SYNC_SNAPSHOT_SEQ_BEGIN) {
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "process seq begin");
-    if (snapshotSenderUpdateProgress(pSender, pMsg) != 0) {
-      return -1;
  }

-    if (snapshotSend(pSender) != 0) {
-      return -1;
+  // send msg of data or end
+  if (pMsg->ack >= SYNC_SNAPSHOT_SEQ_BEGIN && pMsg->ack < SYNC_SNAPSHOT_SEQ_END) {
+    if (syncSnapBufferSend(pSender, ppMsg) != 0) {
+      sSError(pSender, "failed to replicate snap since %s. seq:%d, pReader:%p, finish:%d", terrstr(), pSender->seq,
+              pSender->pReader, pSender->finish);
+      goto _ERROR;
    }
-    return 0;
  }

-  // receive ack is finish, close sender
+  // end
  if (pMsg->ack == SYNC_SNAPSHOT_SEQ_END) {
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "process seq end");
+    sSInfo(pSender, "process end rsp");
    snapshotSenderStop(pSender, true);
    syncNodeReplicateReset(pSyncNode, &pMsg->srcId);
-    return 0;
-  }
-
-  // send next msg
-  if (pMsg->ack == pSender->seq) {
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "process seq data");
-    // update sender ack
-    if (snapshotSenderUpdateProgress(pSender, pMsg) != 0) {
-      return -1;
-    }
-    if (snapshotSend(pSender) != 0) {
-      return -1;
-    }
-  } else if (pMsg->ack == pSender->seq - 1) {
-    // maybe resend
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "process seq and resend");
-    if (snapshotReSend(pSender) != 0) {
-      return -1;
-    }
-  } else {
-    // error log
-    syncLogRecvSyncSnapshotRsp(pSyncNode, pMsg, "receive error ack");
-    sSError(pSender, "snapshot sender receive error ack:%d, my seq:%d", pMsg->ack, pSender->seq);
-    snapshotSenderStop(pSender, true);
-    syncNodeReplicateReset(pSyncNode, &pMsg->srcId);
-    return -1;
  }

  return 0;

 _ERROR:
-  snapshotSenderStop(pSender, true);
+  snapshotSenderStop(pSender, false);
  syncNodeReplicateReset(pSyncNode, &pMsg->srcId);
  return -1;
 }
--- a/source/libs/sync/src/syncTimeout.c
+++ b/source/libs/sync/src/syncTimeout.c
@ -77,12 +77,19 @@ static int32_t syncNodeTimerRoutine(SSyncNode* ths) {
  for (int i = 0; i < ths->peersNum; ++i) {
    SSyncSnapshotSender* pSender = syncNodeGetSnapshotSender(ths, &(ths->peersId[i]));
    if (pSender != NULL) {
-      if (ths->isStart && ths->state == TAOS_SYNC_STATE_LEADER && pSender->start &&
-          timeNow - pSender->lastSendTime > SYNC_SNAP_RESEND_MS) {
-        snapshotReSend(pSender);
+      if (ths->isStart && ths->state == TAOS_SYNC_STATE_LEADER && pSender->start) {
+        int64_t elapsedMs = timeNow - pSender->lastSendTime;
+        if (elapsedMs < SYNC_SNAP_RESEND_MS) {
+          continue;
+        }
+
+        if (elapsedMs > SYNC_SNAP_TIMEOUT_MS) {
+          sSError(pSender, "snap replication timeout, terminate.");
+          snapshotSenderStop(pSender, false);
        } else {
-        sTrace("vgId:%d, do not resend: nstart%d, now:%" PRId64 ", lstsend:%" PRId64 ", diff:%" PRId64, ths->vgId,
-               ths->isStart, timeNow, pSender->lastSendTime, timeNow - pSender->lastSendTime);
+          sSWarn(pSender, "snap replication resend.");
+          snapshotReSend(pSender);
+        }
      }
    }
  }
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
@ -267,21 +267,23 @@ void syncPrintSnapshotSenderLog(const char* flags, ELogLevel level, int32_t dfla
  va_end(argpointer);

  taosPrintLog(flags, level, dflag,
-               "vgId:%d, %s, sync:%s, snap-sender:{%p start:%" PRId64 " end:%" PRId64 " last-index:%" PRId64
-               " last-term:%" PRIu64 " last-cfg:%" PRId64
-               ", seq:%d ack:%d finish:%d, as:%d dnode:%d}"
+               "vgId:%d, %s, sync:%s, snap-sender:%p signature:(%" PRId64 ", %" PRId64 "), {start:%" PRId64
+               " end:%" PRId64 " last-index:%" PRId64 " last-term:%" PRIu64 " last-cfg:%" PRId64
+               ", seq:%d, ack:%d, "
+               " buf:[%" PRId64 " %" PRId64 ", %" PRId64
+               "), finish:%d, as:%d, to-dnode:%d}"
               ", term:%" PRIu64 ", commit-index:%" PRId64 ", firstver:%" PRId64 ", lastver:%" PRId64
               ", min-match:%" PRId64 ", snap:{last-index:%" PRId64 ", term:%" PRIu64
               "}, standby:%d, batch-sz:%d, replicas:%d, last-cfg:%" PRId64
-               ", chging:%d, restore:%d, quorum:%d, lc-timer:{elect:%" PRId64 ", hb:%" PRId64 "}, peer:%s, cfg:%s",
-               pNode->vgId, eventLog, syncStr(pNode->state), pSender, pSender->snapshotParam.start,
-               pSender->snapshotParam.end, pSender->snapshot.lastApplyIndex, pSender->snapshot.lastApplyTerm,
-               pSender->snapshot.lastConfigIndex, pSender->seq, pSender->ack, pSender->finish, pSender->replicaIndex,
-               DID(&pNode->replicasId[pSender->replicaIndex]), raftStoreGetTerm(pNode), pNode->commitIndex,
-               logBeginIndex, logLastIndex, pNode->minMatchIndex, snapshot.lastApplyIndex, snapshot.lastApplyTerm,
-               pNode->raftCfg.isStandBy, pNode->raftCfg.batchSize, pNode->replicaNum, pNode->raftCfg.lastConfigIndex,
-               pNode->changing, pNode->restoreFinish, syncNodeDynamicQuorum(pNode), pNode->electTimerLogicClock,
-               pNode->heartbeatTimerLogicClockUser, peerStr, cfgStr);
+               ", chging:%d, restore:%d, quorum:%d, peer:%s, cfg:%s",
+               pNode->vgId, eventLog, syncStr(pNode->state), pSender, pSender->term, pSender->startTime,
+               pSender->snapshotParam.start, pSender->snapshotParam.end, pSender->snapshot.lastApplyIndex,
+               pSender->snapshot.lastApplyTerm, pSender->snapshot.lastConfigIndex, pSender->seq, pSender->ack,
+               pSender->pSndBuf->start, pSender->pSndBuf->cursor, pSender->pSndBuf->end, pSender->finish,
+               pSender->replicaIndex, DID(&pNode->replicasId[pSender->replicaIndex]), raftStoreGetTerm(pNode),
+               pNode->commitIndex, logBeginIndex, logLastIndex, pNode->minMatchIndex, snapshot.lastApplyIndex,
+               snapshot.lastApplyTerm, pNode->raftCfg.isStandBy, pNode->raftCfg.batchSize, pNode->replicaNum,
+               pNode->raftCfg.lastConfigIndex, pNode->changing, pNode->restoreFinish, pNode->quorum, peerStr, cfgStr);
 }

 void syncPrintSnapshotReceiverLog(const char* flags, ELogLevel level, int32_t dflag, SSyncSnapshotReceiver* pReceiver,
@ -316,19 +318,21 @@ void syncPrintSnapshotReceiverLog(const char* flags, ELogLevel level, int32_t df
  taosPrintLog(
      flags, level, dflag,
      "vgId:%d, %s, sync:%s,"
-      " snap-receiver:{%p started:%d acked:%d term:%" PRIu64 " start-time:%" PRId64 " from-dnode:%d, start:%" PRId64
-      " end:%" PRId64 " last-index:%" PRId64 " last-term:%" PRIu64 " last-cfg:%" PRId64
+      " snap-receiver:%p signature:(%" PRId64 ", %" PRId64 "), {start:%d ack:%d buf:[%" PRId64 " %" PRId64 ", %" PRId64
+      ")"
+      " from-dnode:%d, start:%" PRId64 " end:%" PRId64 " last-index:%" PRId64 " last-term:%" PRIu64 " last-cfg:%" PRId64
      "}"
      ", term:%" PRIu64 ", commit-index:%" PRId64 ", firstver:%" PRId64 ", lastver:%" PRId64 ", min-match:%" PRId64
      ", snap:{last-index:%" PRId64 ", last-term:%" PRIu64 "}, standby:%d, batch-sz:%d, replicas:%d, last-cfg:%" PRId64
-      ", chging:%d, restore:%d, quorum:%d, lc-timers:{elect:%" PRId64 ", hb:%" PRId64 "}, peer:%s, cfg:%s",
-      pNode->vgId, eventLog, syncStr(pNode->state), pReceiver, pReceiver->start, pReceiver->ack, pReceiver->term,
-      pReceiver->startTime, DID(&pReceiver->fromId), pReceiver->snapshotParam.start, pReceiver->snapshotParam.end,
+      ", chging:%d, restore:%d, quorum:%d, peer:%s, cfg:%s",
+      pNode->vgId, eventLog, syncStr(pNode->state), pReceiver, pReceiver->term, pReceiver->startTime, pReceiver->start,
+      pReceiver->ack, pReceiver->pRcvBuf->start, pReceiver->pRcvBuf->cursor, pReceiver->pRcvBuf->end,
+      DID(&pReceiver->fromId), pReceiver->snapshotParam.start, pReceiver->snapshotParam.end,
      pReceiver->snapshot.lastApplyIndex, pReceiver->snapshot.lastApplyTerm, pReceiver->snapshot.lastConfigIndex,
      raftStoreGetTerm(pNode), pNode->commitIndex, logBeginIndex, logLastIndex, pNode->minMatchIndex,
      snapshot.lastApplyIndex, snapshot.lastApplyTerm, pNode->raftCfg.isStandBy, pNode->raftCfg.batchSize,
-      pNode->replicaNum, pNode->raftCfg.lastConfigIndex, pNode->changing, pNode->restoreFinish,
-      syncNodeDynamicQuorum(pNode), pNode->electTimerLogicClock, pNode->heartbeatTimerLogicClockUser, peerStr, cfgStr);
+      pNode->replicaNum, pNode->raftCfg.lastConfigIndex, pNode->changing, pNode->restoreFinish, pNode->quorum, peerStr,
+      cfgStr);
 }

 void syncLogRecvTimer(SSyncNode* pSyncNode, const SyncTimeout* pMsg, const char* s) {
--- a/source/libs/tfs/src/tfsTier.c
+++ b/source/libs/tfs/src/tfsTier.c
@ -110,7 +110,9 @@ int32_t tfsAllocDiskOnTier(STfsTier *pTier) {
  }

  int32_t retId = -1;
+  int64_t avail = 0;
  for (int32_t id = 0; id < TFS_MAX_DISKS_PER_TIER; ++id) {
+#if 0  // round-robin
    int32_t   diskId = (pTier->nextid + id) % pTier->ndisk;
    STfsDisk *pDisk = pTier->disks[diskId];

@ -126,6 +128,18 @@ int32_t tfsAllocDiskOnTier(STfsTier *pTier) {
    terrno = 0;
    pTier->nextid = (diskId + 1) % pTier->ndisk;
    break;
+#else  // select the disk with the most available space
+    STfsDisk *pDisk = pTier->disks[id];
+    if (pDisk == NULL) continue;
+
+    if (pDisk->size.avail < tsMinDiskFreeSize) continue;
+
+    if (pDisk->size.avail > avail) {
+      avail = pDisk->size.avail;
+      retId = id;
+      terrno = 0;
+    }
+#endif
  }

  tfsUnLockTier(pTier);
--- a/source/libs/tfs/test/CMakeLists.txt
+++ b/source/libs/tfs/test/CMakeLists.txt
@ -8,7 +8,7 @@ target_link_libraries(
  PUBLIC gtest_main
 )

-add_test(
-    NAME tfs_test
-    COMMAND tfs_test
-)
+# add_test(
+#     NAME tfs_test
+#     COMMAND tfs_test
+# )
--- a/source/os/src/osTime.c
+++ b/source/os/src/osTime.c
@ -477,7 +477,6 @@ struct tm *taosLocalTime(const time_t *timep, struct tm *result, char *buf) {
    return res;
  }
 #ifdef WINDOWS
-  if (*timep < 0) {
  if (*timep < -2208988800LL) {
    if (buf != NULL) {
      sprintf(buf, "NaN");
@ -490,7 +489,7 @@ struct tm *taosLocalTime(const time_t *timep, struct tm *result, char *buf) {
  LARGE_INTEGER offset;
  struct tm     tm1;
  time_t        tt = 0;
-    if (localtime_s(&tm1, &tt) != 0 ) {
+  if (localtime_s(&tm1, &tt) != 0) {
    if (buf != NULL) {
      sprintf(buf, "NaN");
    }
@ -510,14 +509,6 @@ struct tm *taosLocalTime(const time_t *timep, struct tm *result, char *buf) {
  result->tm_wday = s.wDayOfWeek;
  result->tm_yday = 0;
  result->tm_isdst = 0;
-  } else {
-    if (localtime_s(result, timep) != 0) {
-      if (buf != NULL) {
-        sprintf(buf, "NaN");
-      }
-      return NULL;
-    }
-  }
 #else
  res = localtime_r(timep, result);
  if (res == NULL && buf != NULL) {
--- a/source/os/test/osTimeTests.cpp
+++ b/source/os/test/osTimeTests.cpp
@ -114,10 +114,6 @@ TEST(osTimeTests, taosLocalTime) {
  ASSERT_EQ(local_time->tm_min, 0);
  ASSERT_EQ(local_time->tm_sec, 0);

-  time_t over_timep = 6406301441633558;
-  local_time = taosLocalTime(&over_timep, &result, NULL);
-  ASSERT_EQ(local_time, nullptr);
-
  time_t neg_timep3 = -78115158887;
  local_time = taosLocalTime(&neg_timep3, &result, NULL);
  ASSERT_EQ(local_time, nullptr);
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@ -518,6 +518,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_PORT,              "Port should be an in
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_ENDPOINT,          "Endpoint should be in the format of 'fqdn:port'")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_EXPRIE_STATEMENT,          "This statement is no longer supported")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_VALUE_TOO_SMALL,     "Interval too small")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INTER_VALUE_TOO_BIG,       "Interval too big")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_DB_NOT_SPECIFIED,          "Database not specified")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_IDENTIFIER_NAME,   "Invalid identifier name")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_CORRESPONDING_STABLE_ERR,  "Corresponding super table not in this db")
@ -602,6 +603,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_FUNC_FUNTION_PARA_TYPE,        "Invalid function par
 TAOS_DEFINE_ERROR(TSDB_CODE_FUNC_FUNTION_PARA_VALUE,       "Invalid function para value")
 TAOS_DEFINE_ERROR(TSDB_CODE_FUNC_NOT_BUILTIN_FUNTION,      "Not buildin function")
 TAOS_DEFINE_ERROR(TSDB_CODE_FUNC_DUP_TIMESTAMP,            "Duplicate timestamps not allowed in function")
+TAOS_DEFINE_ERROR(TSDB_CODE_FUNC_TO_TIMESTAMP_FAILED,      "Func to_timestamp failed, check log for detail")

 //udf
 TAOS_DEFINE_ERROR(TSDB_CODE_UDF_STOPPING,                   "udf is stopping")
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@ -65,6 +65,10 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/interval_limit_opt_2.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/interval_limit_opt_2.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/interval_limit_opt_2.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/func_to_char_timestamp.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/func_to_char_timestamp.py -Q 2
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/func_to_char_timestamp.py -Q 3
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/func_to_char_timestamp.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqShow.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqDropStb.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb0.py
@ -1044,6 +1048,7 @@ e
 ,,y,script,./test.sh -f tsim/query/tableCount.sim 
 ,,y,script,./test.sh -f tsim/query/show_db_table_kind.sim
 ,,y,script,./test.sh -f tsim/query/bi_star_table.sim
+,,y,script,./test.sh -f tsim/query/bi_tag_scan.sim
 ,,y,script,./test.sh -f tsim/query/tag_scan.sim
 ,,y,script,./test.sh -f tsim/query/nullColSma.sim
 ,,y,script,./test.sh -f tsim/query/bug3398.sim
--- a/tests/parallel_test/container_build.sh
+++ b/tests/parallel_test/container_build.sh
@ -69,7 +69,7 @@ docker run \
    -v ${REP_REAL_PATH}/community/contrib/libuv/:${REP_DIR}/community/contrib/libuv \
    -v ${REP_REAL_PATH}/community/contrib/lz4/:${REP_DIR}/community/contrib/lz4 \
    -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y;pip3 install taospy==2.7.2;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_TAOSX=true -DJEMALLOC_ENABLED=0;make -j 10|| exit 1"
+    --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y;pip3 install taospy==2.7.2;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j 10|| exit 1"
 # -v ${REP_REAL_PATH}/community/contrib/jemalloc/:${REP_DIR}/community/contrib/jemalloc \

 if [[ -d ${WORKDIR}/debugNoSan  ]] ;then
@ -99,7 +99,7 @@ docker run \
    -v ${REP_REAL_PATH}/community/contrib/lz4/:${REP_DIR}/community/contrib/lz4 \
    -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \
    -v ${REP_REAL_PATH}/community/contrib/jemalloc/:${REP_DIR}/community/contrib/jemalloc \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y;pip3 install taospy==2.7.2;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true   -DBUILD_SANITIZER=1  -DTOOLS_SANITIZE=true -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=true -DJEMALLOC_ENABLED=0;make -j 10|| exit 1 "
+    --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y;pip3 install taospy==2.7.2;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true   -DBUILD_SANITIZER=1  -DTOOLS_SANITIZE=true -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j 10|| exit 1 "

 mv  ${REP_REAL_PATH}/debug  ${WORKDIR}/debugSan

--- a/tests/script/tsim/query/bi_tag_scan.sim
+++ b/tests/script/tsim/query/bi_tag_scan.sim
@ -0,0 +1,31 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql drop database if exists db1;
+sql create database db1 vgroups 3;
+sql create database db1;
+sql use db1;
+sql create stable sta (ts timestamp, f1 int, f2 binary(200)) tags(t1 int, t2 int, t3 int);
+sql create stable stb (ts timestamp, f1 int, f2 binary(200)) tags(t1 int, t2 int, t3 int);
+sql create table tba1 using sta tags(1, 1, 1);
+sql create table tba2 using sta tags(2, 2, 2);
+sql insert into tba1 values(now, 1, "1")(now+3s, 3, "3")(now+5s, 5, "5");
+sql insert into tba2 values(now + 1s, 2, "2")(now+2s, 2, "2")(now+4s, 4, "4");
+sql create table tbn1 (ts timestamp, f1 int);
+
+set_bi_mode 1
+sql select t1,t2,t3 from db1.sta order by t1;
+print $rows $data00 $data10
+if $rows != 2 then
+  return -1
+endi
+if $data00 != 1 then
+  return -1
+endi
+if $data10 != 2 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/stream/sliding.sim
+++ b/tests/script/tsim/stream/sliding.sim
@ -21,6 +21,7 @@ sql create stream streams1 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0   in
 sql create stream streams2 trigger at_once watermark 1d IGNORE EXPIRED 0 IGNORE UPDATE 0  into streamt2 as select  _wstart, count(*) c1, sum(a) c3 , max(b)  c4, min(c) c5 from t1 interval(10s) sliding (5s);
 sql create stream stream_t1 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0   into streamtST as select  _wstart, count(*) c1, sum(a) c3 , max(b)  c4, min(c) c5 from st interval(10s) sliding (5s);
 sql create stream stream_t2 trigger at_once watermark 1d IGNORE EXPIRED 0 IGNORE UPDATE 0  into streamtST2 as select  _wstart, count(*) c1, sum(a) c3 , max(b)  c4, min(c) c5 from st interval(10s) sliding (5s);
+sleep 1000

 sql insert into t1 values(1648791210000,1,2,3,1.0);
 sql insert into t1 values(1648791216000,2,2,3,1.1);
@ -311,6 +312,7 @@ sql create table t2 using st tags(2,2,2);

 sql create stream streams11 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0   into streamt as select  _wstart, count(*) c1, sum(a) c3 , max(b)  c4, min(c) c5 from t1 interval(10s, 5s);
 sql create stream streams12 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0   into streamt2 as select  _wstart, count(*) c1, sum(a) c3 , max(b)  c4, min(c) c5 from st interval(10s, 5s);
+sleep 1000

 sql insert into t1 values(1648791213000,1,2,3,1.0);
 sql insert into t1 values(1648791223001,2,2,3,1.1);
@ -444,6 +446,7 @@ sql create table t2 using st tags(2,2,2);

 sql create stream streams21 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0   into streamt21 as select  _wstart, count(*) c1, sum(a) c3 , max(b)  c4, min(c) c5 from t1 interval(10s, 5s);
 sql create stream streams22 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0   into streamt22 as select  _wstart, count(*) c1, sum(a) c3 , max(b)  c4, min(c) c5 from st interval(10s, 5s);
+sleep 1000

 sql insert into t1 values(1648791213000,1,1,1,1.0);
 sql insert into t1 values(1648791223001,2,2,2,1.1);
@ -707,6 +710,7 @@ sql create table t1 using st tags(1,1,1);
 sql create table t2 using st tags(2,2,2);

 sql create stream streams4 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0   into streamt4 as select  _wstart as ts, count(*),min(a) c1 from st interval(10s) sliding(5s);
+sleep 1000

 sql insert into t1 values(1648791213000,1,1,1,1.0);
 sql insert into t1 values(1648791243000,2,1,1,1.0);
--- a/tests/system-test/2-query/func_to_char_timestamp.py
+++ b/tests/system-test/2-query/func_to_char_timestamp.py
@ -0,0 +1,177 @@
+import taos
+import sys
+import time
+import socket
+import os
+import threading
+import math
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+from util.common import *
+# from tmqCommon import *
+
+class TDTestCase:
+    def __init__(self):
+        self.vgroups    = 4
+        self.ctbNum     = 10
+        self.rowsPerTbl = 10000
+        self.duraion = '1h'
+
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor(), False)
+
+    def create_database(self,tsql, dbName,dropFlag=1,vgroups=2,replica=1, duration:str='1d'):
+        if dropFlag == 1:
+            tsql.execute("drop database if exists %s"%(dbName))
+
+        tsql.execute("create database if not exists %s vgroups %d replica %d duration %s"%(dbName, vgroups, replica, duration))
+        tdLog.debug("complete to create database %s"%(dbName))
+        return
+
+    def create_stable(self,tsql, paraDict):
+        colString = tdCom.gen_column_type_str(colname_prefix=paraDict["colPrefix"], column_elm_list=paraDict["colSchema"])
+        tagString = tdCom.gen_tag_type_str(tagname_prefix=paraDict["tagPrefix"], tag_elm_list=paraDict["tagSchema"])
+        sqlString = f"create table if not exists %s.%s (%s) tags (%s)"%(paraDict["dbName"], paraDict["stbName"], colString, tagString)
+        tdLog.debug("%s"%(sqlString))
+        tsql.execute(sqlString)
+        return
+
+    def create_ctable(self,tsql=None, dbName='dbx',stbName='stb',ctbPrefix='ctb',ctbNum=1,ctbStartIdx=0):
+        for i in range(ctbNum):
+            sqlString = "create table %s.%s%d using %s.%s tags(%d, 'tb%d', 'tb%d', %d, %d, %d)" % \
+                    (dbName,ctbPrefix,i+ctbStartIdx,dbName,stbName,(i+ctbStartIdx) % 5,i+ctbStartIdx,i+ctbStartIdx,i+ctbStartIdx,i+ctbStartIdx,i+ctbStartIdx)
+            tsql.execute(sqlString)
+
+        tdLog.debug("complete to create %d child tables by %s.%s" %(ctbNum, dbName, stbName))
+        return
+
+    def insert_data(self,tsql,dbName,ctbPrefix,ctbNum,rowsPerTbl,batchNum,startTs,tsStep):
+        tdLog.debug("start to insert data ............")
+        tsql.execute("use %s" %dbName)
+        pre_insert = "insert into "
+        sql = pre_insert
+
+        for i in range(ctbNum):
+            rowsBatched = 0
+            sql += " %s%d values "%(ctbPrefix,i)
+            for j in range(rowsPerTbl):
+                if i % 3 == 0:
+                    ts_format = 'NULL'
+                else:
+                    ts_format = "'yyyy-mm-dd hh24:mi:ss'"
+
+                if (i < ctbNum/2):
+                    sql += "(%d, %d, %d, %d,%d,%d,%d,true,'2023-11-01 10:10:%d', %s, 'nchar%d') "%(startTs + j*tsStep, j%10, j%10, j%10, j%10, j%10, j%10, j%10, ts_format, j%10)
+                else:
+                    sql += "(%d, %d, NULL, %d,NULL,%d,%d,true,NULL , %s, 'nchar%d') "%(startTs + j*tsStep, j%10, j%10, j%10, j%10, ts_format, j%10)
+                rowsBatched += 1
+                if ((rowsBatched == batchNum) or (j == rowsPerTbl - 1)):
+                    tsql.execute(sql)
+                    rowsBatched = 0
+                    if j < rowsPerTbl - 1:
+                        sql = "insert into %s%d values " %(ctbPrefix,i)
+                    else:
+                        sql = "insert into "
+        if sql != pre_insert:
+            tsql.execute(sql)
+        tdLog.debug("insert data ............ [OK]")
+        return
+
+    def prepareTestEnv(self):
+        tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
+        paraDict = {'dbName':     'test',
+                    'dropFlag':   1,
+                    'vgroups':    2,
+                    'stbName':    'meters',
+                    'colPrefix':  'c',
+                    'tagPrefix':  't',
+                    'colSchema':   [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'FLOAT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'smallint', 'count':1},{'type': 'tinyint', 'count':1},{'type': 'bool', 'count':1},{'type': 'varchar', 'len':1024, 'count':2},{'type': 'nchar', 'len':10, 'count':1}],
+                    'tagSchema':   [{'type': 'INT', 'count':1},{'type': 'nchar', 'len':20, 'count':1},{'type': 'binary', 'len':20, 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'smallint', 'count':1},{'type': 'DOUBLE', 'count':1}],
+                    'ctbPrefix':  't',
+                    'ctbStartIdx': 0,
+                    'ctbNum':     100,
+                    'rowsPerTbl': 10000,
+                    'batchNum':   3000,
+                    'startTs':    1537146000000,
+                    'tsStep':     600000}
+
+        paraDict['vgroups'] = self.vgroups
+        paraDict['ctbNum'] = self.ctbNum
+        paraDict['rowsPerTbl'] = self.rowsPerTbl
+
+        tdLog.info("create database")
+        self.create_database(tsql=tdSql, dbName=paraDict["dbName"], dropFlag=paraDict["dropFlag"], vgroups=paraDict["vgroups"], replica=self.replicaVar, duration=self.duraion)
+
+        tdLog.info("create stb")
+        self.create_stable(tsql=tdSql, paraDict=paraDict)
+
+        tdLog.info("create child tables")
+        self.create_ctable(tsql=tdSql, dbName=paraDict["dbName"], \
+                stbName=paraDict["stbName"],ctbPrefix=paraDict["ctbPrefix"],\
+                ctbNum=paraDict["ctbNum"],ctbStartIdx=paraDict["ctbStartIdx"])
+        self.insert_data(tsql=tdSql, dbName=paraDict["dbName"],\
+                ctbPrefix=paraDict["ctbPrefix"],ctbNum=paraDict["ctbNum"],\
+                rowsPerTbl=paraDict["rowsPerTbl"],batchNum=paraDict["batchNum"],\
+                startTs=paraDict["startTs"],tsStep=paraDict["tsStep"])
+        return
+
+    def convert_ts_and_check(self, ts_str: str, ts_format: str, expect_ts_char: str, expect_ts: str):
+        tdSql.query("select to_timestamp('%s', '%s')" % (ts_str, ts_format), queryTimes=1)
+        tdSql.checkData(0, 0, expect_ts)
+        tdSql.query("select to_char(to_timestamp('%s', '%s'), '%s')" % (ts_str, ts_format, ts_format), queryTimes=1)
+        tdSql.checkData(0, 0, expect_ts_char)
+
+    def test_to_timestamp(self):
+        self.convert_ts_and_check('2023-10-10 12:13:14.123', 'YYYY-MM-DD HH:MI:SS.MS', '2023-10-10 12:13:14.123', '2023-10-10 00:13:14.123000')
+        self.convert_ts_and_check('2023-10-10 12:00:00.000AM', 'YYYY-DD-MM HH12:MI:SS.MSPM', '2023-10-10 12:00:00.000AM', '2023-10-10 00:00:00.000000')
+        self.convert_ts_and_check('2023-01-01 12:10:10am', 'yyyy-mm-dd HH12:MI:SSAM', '2023-01-01 12:10:10AM', '2023-1-1 00:10:10.000000')
+        self.convert_ts_and_check('23-1-01 9:10:10.123p.m.', 'yy-MM-dd HH12:MI:ss.msa.m.', '23-01-01 09:10:10.123p.m.', '2023-1-1 21:10:10.123000')
+        self.convert_ts_and_check('23-1-01 9:10:10.123.000456.000000789p.m.', 'yy-MM-dd HH12:MI:ss.ms.us.nsa.m.', '23-01-01 09:10:10.123.123000.123000000p.m.', '2023-1-1 21:10:10.123000')
+        self.convert_ts_and_check('  23   -1  - 01   \t 21:10:10 . 12 . \t 00045 . 00000078 \t', 'yy-MM-dd HH24:MI:SS.ms.us.ns', '23-01-01 21:10:10.120.120000.120000000', '2023-1-1 21:10:10.120000')
+        self.convert_ts_and_check('  23  年 -1 月 - 01  日 \t 21:10:10 . 12 . \t 00045 . 00000078 \t+08', 'yy\"年\"-MM月-dd日 HH24:MI:SS.ms.us.ns TZH', '23年-01月-01日 21:10:10.120.120000.120000000 +08', '2023-1-1 21:10:10.120000')
+        self.convert_ts_and_check('23-1-01 7:10:10.123p.m.6', 'yy-MM-dd HH:MI:ss.msa.m.TZH', '23-01-01 09:10:10.123p.m.+08', '2023-1-1 21:10:10.123000')
+
+        self.convert_ts_and_check('2023-OCTober-19 10:10:10AM Thu', 'yyyy-month-dd hh24:mi:ssam dy', '2023-october  -19 10:10:10am thu', '2023-10-19 10:10:10')
+
+        tdSql.error("select to_timestamp('210013/2', 'yyyyMM/dd')")
+        tdSql.error("select to_timestamp('2100111111111/13/2', 'yyyyMM/dd')")
+
+        tdSql.error("select to_timestamp('210a12/2', 'yyyyMM/dd')")
+
+        tdSql.query("select to_timestamp(to_char(ts, 'yy-mon-dd hh24:mi:ss dy'), 'yy-mon-dd hh24:mi:ss dy') == ts from meters limit 10")
+        tdSql.checkData(0, 0, 1)
+        tdSql.checkData(1, 0, 1)
+        tdSql.checkRows(10)
+
+        tdSql.query("select to_char(ts, 'yy-mon-dd hh24:mi:ss.msa.m.TZH Day') from meters where to_timestamp(to_char(ts, 'yy-mon-dd hh24:mi:ss dy'), 'yy-mon-dd hh24:mi:ss dy') != ts")
+        tdSql.checkRows(0)
+
+        tdSql.query("select to_timestamp(c8, 'YYYY-MM-DD hh24:mi:ss') from meters")
+        tdSql.query("select to_timestamp(c8, c9) from meters")
+
+        format = "YYYY-MM-DD HH:MI:SS"
+        for i in range(500):
+            format = format + "1234567890"
+        tdSql.query("select to_char(ts, '%s') from meters" % (format), queryTimes=1)
+        time_str = '2023-11-11 10:10:10'
+        for i in range(500):
+            time_str  = time_str + "1234567890"
+        tdSql.query("select to_timestamp('%s', '%s')" % (time_str, format))
+
+    def run(self):
+        self.prepareTestEnv()
+        self.test_to_timestamp()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+event = threading.Event()
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())