diff --git a/docs-en/07-develop/03-insert-data/01-sql-writing.mdx b/docs-en/07-develop/03-insert-data/01-sql-writing.mdx
index 9f66992d3de755389c3a0722ebb09097177742f1..ae170a2bef3496c49026e05d7d60399cc88e90a7 100644
--- a/docs-en/07-develop/03-insert-data/01-sql-writing.mdx
+++ b/docs-en/07-develop/03-insert-data/01-sql-writing.mdx
@@ -22,11 +22,11 @@ import CStmt from "./_c_stmt.mdx";
 
 ## Introduction
 
-Application program can execute `INSERT` statement through connectors to insert rows. TAOS CLI can be launched manually to insert data too.
+Application programs can execute `INSERT` statement through connectors to insert rows. The TAOS CLI can also be used to manually insert data.
 
 ### Insert Single Row
 
-Below SQL statement is used to insert one row into table "d1001".
+The below SQL statement is used to insert one row into table "d1001".
 
 ```sql
 INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31);
@@ -34,7 +34,7 @@ INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31);
 
 ### Insert Multiple Rows
 
-Multiple rows can be inserted in single SQL statement. Below example inserts 2 rows into table "d1001".
+Multiple rows can be inserted in a single SQL statement. The example below inserts 2 rows into table "d1001".
 
 ```sql
 INSERT INTO d1001 VALUES (1538548684000, 10.2, 220, 0.23) (1538548696650, 10.3, 218, 0.25);
@@ -42,7 +42,7 @@ INSERT INTO d1001 VALUES (1538548684000, 10.2, 220, 0.23) (1538548696650, 10.3,
 
 ### Insert into Multiple Tables
 
-Data can be inserted into multiple tables in same SQL statement. Below example inserts 2 rows into table "d1001" and 1 row into table "d1002".
+Data can be inserted into multiple tables in the same SQL statement. The example below inserts 2 rows into table "d1001" and 1 row into table "d1002".
 
 ```sql
 INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31) (1538548695000, 12.6, 218, 0.33) d1002 VALUES (1538548696800, 12.3, 221, 0.31);
@@ -52,14 +52,14 @@ For more details about `INSERT` please refer to [INSERT](/taos-sql/insert).
 
 :::info
 
-- Inserting in batch can gain better performance. Normally, the higher the batch size, the better the performance. Please be noted each single row can't exceed 16K bytes and each single SQL statement can't exceed 1M bytes.
-- Inserting with multiple threads can gain better performance too. However, depending on the system resources on the application side and the server side, with the number of inserting threads grows to a specific point, the performance may drop instead of growing. The proper number of threads need to be tested in a specific environment to find the best number.
+- Inserting in batches can improve performance. Normally, the higher the batch size, the better the performance. Please note that a single row can't exceed 16K bytes and each SQL statement can't exceed 1MB.
+- Inserting with multiple threads can also improve performance. However, depending on the system resources on the application side and the server side, when the number of inserting threads grows beyond a specific point the performance may drop instead of improving. The proper number of threads needs to be tested in a specific environment to find the best number.
 
 :::
 
 :::warning
 
-- If the timestamp for the row to be inserted already exists in the table, the behavior depends on the value of parameter `UPDATE`. If it's set to 0 (also the default value), the row will be discarded. If it's set to 1, the new values will override the old values for the same row.
+- If the timestamp for the row to be inserted already exists in the table, the behavior depends on the value of parameter `UPDATE`. If it's set to 0 (the default value), the row will be discarded. If it's set to 1, the new values will override the old values for the same row.
 - The timestamp to be inserted must be newer than the timestamp of subtracting current time by the parameter `KEEP`. If `KEEP` is set to 3650 days, then the data older than 3650 days ago can't be inserted. The timestamp to be inserted can't be newer than the timestamp of current time plus parameter `DAYS`. If `DAYS` is set to 2, the data newer than 2 days later can't be inserted.
 
 :::
@@ -95,13 +95,13 @@ For more details about `INSERT` please refer to [INSERT](/taos-sql/insert).
 :::note
 
 1. With either native connection or REST connection, the above samples can work well.
-2. Please be noted that `use db` can't be used with REST connection because REST connection is stateless, so in the samples `dbName.tbName` is used to specify the table name.
+2. Please note that `use db` can't be used with a REST connection because REST connections are stateless, so in the samples `dbName.tbName` is used to specify the table name.
 
 :::
 
 ### Insert with Parameter Binding
 
-TDengine also provides Prepare API that support parameter binding. Similar to MySQL, only `?` can be used in these APIs to represent the parameters to bind. From version 2.1.1.0 and 2.1.2.0, parameter binding support for inserting data has been improved significantly to improve the insert performance by avoiding the cost of parsing SQL statements.
+TDengine also provides API support for parameter binding. Similar to MySQL, only `?` can be used in these APIs to represent the parameters to bind. From version 2.1.1.0 and 2.1.2.0, parameter binding support for inserting data has improved significantly to improve the insert performance by avoiding the cost of parsing SQL statements.
 
 Parameter binding is available only with native connection.
 
diff --git a/docs-en/07-develop/03-insert-data/03-opentsdb-telnet.mdx b/docs-en/07-develop/03-insert-data/03-opentsdb-telnet.mdx
index 66bb67c25669b906183526377f60b969ea3d1e85..3656e5fd3bb40735ab0f59187463c913c87573a1 100644
--- a/docs-en/07-develop/03-insert-data/03-opentsdb-telnet.mdx
+++ b/docs-en/07-develop/03-insert-data/03-opentsdb-telnet.mdx
@@ -15,16 +15,16 @@ import CTelnet from "./_c_opts_telnet.mdx";
 
 ## Introduction
 
-A single line of text is used in OpenTSDB line protocol to represent one row of data. OpenTSDB employs single column data model, so one line can only contains single data column. There can be multiple tags. Each line contains 4 parts as below:
+A single line of text is used in OpenTSDB line protocol to represent one row of data. OpenTSDB employs single column data model, so one line can only contain a single data column. There can be multiple tags. Each line contains 4 parts as below:
 
 ```
 <metric> <timestamp> <value> <tagk_1>=<tagv_1>[ <tagk_n>=<tagv_n>]
 ```
 
-- `metric` will be used as STable name.
-- `timestamp` is the timestamp of current row of data. The time precision will be determined automatically based on the length of the timestamp. second and millisecond time precision are supported.\
+- `metric` will be used as the STable name.
+- `timestamp` is the timestamp of current row of data. The time precision will be determined automatically based on the length of the timestamp. Second and millisecond time precision are supported.
 - `value` is a metric which must be a numeric value, the corresponding column name is "value".
-- The last part is tag sets separated by space, all tags will be converted to nchar type automatically.
+- The last part is the tag set separated by spaces, all tags will be converted to nchar type automatically.
 
 For example:
 
diff --git a/docs-en/07-develop/03-insert-data/index.md b/docs-en/07-develop/03-insert-data/index.md
index ee80d436f11f19b422df261845f1c209620251f2..ba31a951ff0805b48f90c87ddc635c04978d3cd2 100644
--- a/docs-en/07-develop/03-insert-data/index.md
+++ b/docs-en/07-develop/03-insert-data/index.md
@@ -2,11 +2,11 @@
 title: Insert
 ---
 
-TDengine supports multiple protocols of inserting data, including SQL, InfluxDB Line protocol, OpenTSDB Telnet protocol, OpenTSDB JSON protocol. Data can be inserted row by row, or in batch. Data from one or more collecting points can be inserted simultaneously. In the meantime, data can be inserted with multiple threads, out of order data and historical data can be inserted too. InfluxDB Line protocol, OpenTSDB Telnet protocol and OpenTSDB JSON protocol are the 3 kinds of schemaless insert protocols supported by TDengine. It's not necessary to create stable and table in advance if using schemaless protocols, and the schemas can be adjusted automatically according to the data to be inserted.
+TDengine supports multiple protocols of inserting data, including SQL, InfluxDB Line protocol, OpenTSDB Telnet protocol, and OpenTSDB JSON protocol. Data can be inserted row by row, or in batches. Data from one or more collection points can be inserted simultaneously. Data can be inserted with multiple threads, and out of order data and historical data can be inserted as well. InfluxDB Line protocol, OpenTSDB Telnet protocol and OpenTSDB JSON protocol are the 3 kinds of schemaless insert protocols supported by TDengine. It's not necessary to create STables and tables in advance if using schemaless protocols, and the schemas can be adjusted automatically based on the data being inserted.
 
 ```mdx-code-block
 import DocCardList from '@theme/DocCardList';
 import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
 
 <DocCardList items={useCurrentSidebarCategory().items}/>
-```
\ No newline at end of file
+```
diff --git a/docs-en/07-develop/04-query-data/index.mdx b/docs-en/07-develop/04-query-data/index.mdx
index 4016f8453ba9e0679a2798b92cd40efcb926343b..539b8867a7aa197fd9c80790ad63e7d9577bbc31 100644
--- a/docs-en/07-develop/04-query-data/index.mdx
+++ b/docs-en/07-develop/04-query-data/index.mdx
@@ -20,7 +20,7 @@ import CAsync from "./_c_async.mdx";
 
 ## Introduction
 
-SQL is used by TDengine as the query language. Application programs can send SQL statements to TDengine through REST API or connectors. TDengine CLI `taos` can also be used to execute SQL Ad-Hoc query. Here is the list of major query functionalities supported by TDengine：
+SQL is used by TDengine as the query language. Application programs can send SQL statements to TDengine through REST API or connectors. TDengine CLI `taos` can also be used to execute SQL Ad-Hoc queries. Here is the list of major query functionalities supported by TDengine：
 
 - Query on single column or multiple columns
 - Filter on tags or data columns：>, <, =, <\>, like
@@ -31,7 +31,7 @@ SQL is used by TDengine as the query language. Application programs can send SQL
 - Join query with timestamp alignment
 - Aggregate functions: count, max, min, avg, sum, twa, stddev, leastsquares, top, bottom, first, last, percentile, apercentile, last_row, spread, diff
 
-For example, below SQL statement can be executed in TDengine CLI `taos` to select the rows whose voltage column is bigger than 215 and limit the output to only 2 rows.
+For example, the SQL statement below can be executed in TDengine CLI `taos` to select the rows whose voltage column is bigger than 215 and limit the output to only 2 rows.
 
 ```sql
 select * from d1001 where voltage > 215 order by ts desc limit 2;
@@ -46,15 +46,15 @@ taos> select * from d1001 where voltage > 215 order by ts desc limit 2;
 Query OK, 2 row(s) in set (0.001100s)
 ```
 
-To meet the requirements in many use cases, some special functions have been added in TDengine, for example `twa` (Time Weighted Average), `spared` (The difference between the maximum and the minimum), `last_row` (the last row), more and more functions will be added to better perform in many use cases. Furthermore, continuous query is also supported in TDengine.
+To meet the requirements of many use cases, some special functions have been added in TDengine, for example `twa` (Time Weighted Average), `spared` (The difference between the maximum and the minimum), and `last_row` (the last row). Furthermore, continuous query is also supported in TDengine.
 
 For detailed query syntax please refer to [Select](/taos-sql/select).
 
 ## Aggregation among Tables
 
-In many use cases, there are always multiple kinds of data collection points. A new concept, called STable (abbreviated for super table), is used in TDengine to represent a kind of data collection points, and a table is used to represent a specific data collection point. Tags are used by TDengine to represent the static properties of data collection points. A specific data collection point has its own values for static properties. By specifying filter conditions on tags, aggregation can be performed efficiently among all the subtables created via the same STable, i.e. same kind of data collection points, can be. Aggregate functions applicable for tables can be used directly on STables, syntax is exactly same.
+In many use cases, there are always multiple kinds of data collection points. A new concept, called STable (abbreviated for super table), is used in TDengine to represent a kind of data collection point, and a subtable is used to represent a specific data collection point. Tags are used by TDengine to represent the static properties of data collection points. A specific data collection point has its own values for static properties. By specifying filter conditions on tags, aggregation can be performed efficiently among all the subtables created via the same STable, i.e. same kind of data collection points. Aggregate functions applicable for tables can be used directly on STables, the syntax is exactly the same.
 
-In summary, for a STable, its subtables can be aggregated by a simple query on STable, it's kind of join operation. But tables belong to different STables could not be aggregated. 
+In summary, for a STable, its subtables can be aggregated by a simple query on the STable, it's a kind of join operation. But tables belong to different STables can not be aggregated. 
 
 ### Example 1
 
@@ -81,11 +81,11 @@ taos> SELECT count(*), max(current) FROM meters where groupId = 2 and ts > now -
 Query OK, 1 row(s) in set (0.002136s)
 ```
 
-Join query is allowed between only the tables of same STable. In [Select](/taos-sql/select), all query operations are marked as whether it supports STable or not.
+Join queries are only allowed between the subtables of the same STable. In [Select](/taos-sql/select), all query operations are marked as to whether they supports STables or not.
 
 ## Down Sampling and Interpolation
 
-In IoT use cases, down sampling is widely used to aggregate the data by time range. `INTERVAL` keyword in TDengine can be used to simplify the query by time window. For example, below SQL statement can be used to get the sum of current every 10 seconds from meters table d1001.
+In IoT use cases, down sampling is widely used to aggregate the data by time range. The `INTERVAL` keyword in TDengine can be used to simplify the query by time window. For example, the SQL statement below can be used to get the sum of current every 10 seconds from meters table d1001.
 
 ```
 taos> SELECT sum(current) FROM d1001 INTERVAL(10s);
@@ -96,7 +96,7 @@ taos> SELECT sum(current) FROM d1001 INTERVAL(10s);
 Query OK, 2 row(s) in set (0.000883s)
 ```
 
-Down sampling can also be used for STable. For example, below SQL statement can be used to get the sum of current from all meters in BeiJing.
+Down sampling can also be used for STable. For example, the below SQL statement can be used to get the sum of current from all meters in BeiJing.
 
 ```
 taos> SELECT SUM(current) FROM meters where location like "Beijing%" INTERVAL(1s);
@@ -110,7 +110,7 @@ taos> SELECT SUM(current) FROM meters where location like "Beijing%" INTERVAL(1s
 Query OK, 5 row(s) in set (0.001538s)
 ```
 
-Down sampling also supports time offset. For example, below SQL statement can be used to get the sum of current from all meters but each time window must start at the boundary of 500 milliseconds.
+Down sampling also supports time offset. For example, the below SQL statement can be used to get the sum of current from all meters but each time window must start at the boundary of 500 milliseconds.
 
 ```
 taos> SELECT SUM(current) FROM meters INTERVAL(1s, 500a);
@@ -124,7 +124,7 @@ taos> SELECT SUM(current) FROM meters INTERVAL(1s, 500a);
 Query OK, 5 row(s) in set (0.001521s)
 ```
 
-In many use cases, it's hard to align the timestamp of the data collected by each collection point. However, a lot of algorithms like FFT require the data to be aligned with same time interval and application programs have to handle by themselves in many systems. In TDengine, it's easy to achieve the alignment using down sampling.
+In many use cases, it's hard to align the timestamp of the data collected by each collection point. However, a lot of algorithms like FFT require the data to be aligned with same time interval and application programs have to handle this by themselves. In TDengine, it's easy to achieve the alignment using down sampling.
 
 Interpolation can be performed in TDengine if there is no data in a time range.
 
@@ -162,16 +162,16 @@ In the section describing [Insert](/develop/insert-data/sql-writing), a database
 
 :::note
 
-1. With either REST connection or native connection, the above sample code work well.
-2. Please be noted that `use db` can't be used in case of REST connection because it's stateless.
+1. With either REST connection or native connection, the above sample code works well.
+2. Please note that `use db` can't be used in case of REST connection because it's stateless.
 
 :::
 
 ### Asynchronous Query
 
-Besides synchronous query, asynchronous query API is also provided by TDengine to insert or query data more efficiently. With similar hardware and software environment, async API is 2~4 times faster than sync APIs. Async API works in non-blocking mode, which means an operation can be returned without finishing so that the calling thread can switch to other works to improve the performance of the whole application system. Async APIs perform especially better in case of poor network.
+Besides synchronous queries, an asynchronous query API is also provided by TDengine to insert or query data more efficiently. With a similar hardware and software environment, the async API is 2~4 times faster than sync APIs. Async API works in non-blocking mode, which means an operation can be returned without finishing so that the calling thread can switch to other works to improve the performance of the whole application system. Async APIs perform especially better in the case of poor networks.
 
-Please be noted that async query can only be used with native connection.
+Please note that async query can only be used with a native connection.
 
 <Tabs defaultValue="python" groupId="lang">
   <TabItem label="Python" value="python">
diff --git a/source/dnode/vnode/src/inc/tq.h b/source/dnode/vnode/src/inc/tq.h
index ad3f8cc869fe61bc2a265d630863b2bd481c3de7..06ff6329e0b3ddc69cc50ec1becc9541e3939ca5 100644
--- a/source/dnode/vnode/src/inc/tq.h
+++ b/source/dnode/vnode/src/inc/tq.h
@@ -96,7 +96,8 @@ struct STQ {
   SHashObj* pStreamTasks;
   SVnode*   pVnode;
   SWal*     pWal;
-  TDB*      pTdb;
+  TDB*      pMetaStore;
+  TTB*      pExecStore;
 };
 
 typedef struct {
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index bd48ed9b4c3cf0f91bec701e7167964b4473ad07..979db9169e448ac6a5ffd5f76006070e7fd6c697 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -14,6 +14,7 @@
  */
 
 #include "tq.h"
+#include "tdbInt.h"
 
 int32_t tqInit() {
   int8_t old;
@@ -46,6 +47,10 @@ void tqCleanUp() {
   }
 }
 
+int tqExecKeyCompare(const void* pKey1, int32_t kLen1, const void* pKey2, int32_t kLen2) {
+  return strcmp(pKey1, pKey2);
+}
+
 STQ* tqOpen(const char* path, SVnode* pVnode, SWal* pWal) {
   STQ* pTq = taosMemoryMalloc(sizeof(STQ));
   if (pTq == NULL) {
@@ -55,9 +60,6 @@ STQ* tqOpen(const char* path, SVnode* pVnode, SWal* pWal) {
   pTq->path = strdup(path);
   pTq->pVnode = pVnode;
   pTq->pWal = pWal;
-  if (tdbOpen(path, 4096, 1, &pTq->pTdb) < 0) {
-    ASSERT(0);
-  }
 
   pTq->execs = taosHashInit(64, MurmurHash3_32, true, HASH_ENTRY_LOCK);
 
@@ -65,6 +67,43 @@ STQ* tqOpen(const char* path, SVnode* pVnode, SWal* pWal) {
 
   pTq->pushMgr = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_ENTRY_LOCK);
 
+  if (tdbOpen(path, 16 * 1024, 1, &pTq->pMetaStore) < 0) {
+    ASSERT(0);
+  }
+
+  if (tdbTbOpen("exec", -1, -1, tqExecKeyCompare, pTq->pMetaStore, &pTq->pExecStore) < 0) {
+    ASSERT(0);
+  }
+
+  TXN txn;
+
+  if (tdbTxnOpen(&txn, 0, tdbDefaultMalloc, tdbDefaultFree, NULL, 0) < 0) {
+    ASSERT(0);
+  }
+
+  /*if (tdbBegin(pTq->pMetaStore, &txn) < 0) {*/
+  /*ASSERT(0);*/
+  /*}*/
+
+  TBC* pCur;
+  if (tdbTbcOpen(pTq->pExecStore, &pCur, &txn) < 0) {
+    ASSERT(0);
+  }
+
+  void* pKey;
+  int   kLen;
+  void* pVal;
+  int   vLen;
+
+  tdbTbcMoveToFirst(pCur);
+  while (tdbTbcNext(pCur, &pKey, &kLen, &pVal, &vLen) == 0) {
+    // create, put into execsj
+  }
+
+  if (tdbTxnClose(&txn) < 0) {
+    ASSERT(0);
+  }
+
   return pTq;
 }
 
@@ -74,7 +113,7 @@ void tqClose(STQ* pTq) {
     taosHashCleanup(pTq->execs);
     taosHashCleanup(pTq->pStreamTasks);
     taosHashCleanup(pTq->pushMgr);
-    tdbClose(pTq->pTdb);
+    tdbClose(pTq->pMetaStore);
     taosMemoryFree(pTq);
   }
   // TODO
@@ -91,7 +130,6 @@ int32_t tEncodeSTqExec(SEncoder* pEncoder, const STqExec* pExec) {
   if (tEncodeI8(pEncoder, pExec->withTag) < 0) return -1;
   if (pExec->subType == TOPIC_SUB_TYPE__TABLE) {
     if (tEncodeCStr(pEncoder, pExec->qmsg) < 0) return -1;
-    // TODO encode modified exec
   }
   tEndEncode(pEncoder);
   return pEncoder->pos;
@@ -108,7 +146,6 @@ int32_t tDecodeSTqExec(SDecoder* pDecoder, STqExec* pExec) {
   if (tDecodeI8(pDecoder, &pExec->withTag) < 0) return -1;
   if (pExec->subType == TOPIC_SUB_TYPE__TABLE) {
     if (tDecodeCStrAlloc(pDecoder, &pExec->qmsg) < 0) return -1;
-    // TODO decode modified exec
   }
   tEndDecode(pDecoder);
   return 0;
@@ -556,6 +593,23 @@ int32_t tqProcessVgDeleteReq(STQ* pTq, char* msg, int32_t msgLen) {
 
   int32_t code = taosHashRemove(pTq->execs, pReq->subKey, strlen(pReq->subKey));
   ASSERT(code == 0);
+
+  TXN txn;
+
+  if (tdbTxnOpen(&txn, 0, tdbDefaultMalloc, tdbDefaultFree, NULL, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED) < 0) {
+    ASSERT(0);
+  }
+
+  if (tdbBegin(pTq->pMetaStore, &txn) < 0) {
+    ASSERT(0);
+  }
+
+  tdbTbDelete(pTq->pExecStore, pReq->subKey, (int)strlen(pReq->subKey), &txn);
+
+  if (tdbCommit(pTq->pMetaStore, &txn) < 0) {
+    ASSERT(0);
+  }
+
   return 0;
 }
 
@@ -604,6 +658,45 @@ int32_t tqProcessVgChangeReq(STQ* pTq, char* msg, int32_t msgLen) {
       pExec->pDropTbUid = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
     }
     taosHashPut(pTq->execs, req.subKey, strlen(req.subKey), pExec, sizeof(STqExec));
+
+    int32_t code;
+    int32_t vlen;
+    tEncodeSize(tEncodeSTqExec, pExec, vlen, code);
+    ASSERT(code == 0);
+
+    void* buf = taosMemoryCalloc(1, vlen);
+    if (buf == NULL) {
+      ASSERT(0);
+    }
+
+    SEncoder encoder;
+    tEncoderInit(&encoder, buf, vlen);
+
+    if (tEncodeSTqExec(&encoder, pExec) < 0) {
+      ASSERT(0);
+    }
+
+    TXN txn;
+
+    if (tdbTxnOpen(&txn, 0, tdbDefaultMalloc, tdbDefaultFree, NULL, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED) < 0) {
+      ASSERT(0);
+    }
+
+    if (tdbBegin(pTq->pMetaStore, &txn) < 0) {
+      ASSERT(0);
+    }
+
+    if (tdbTbUpsert(pTq->pExecStore, req.subKey, (int)strlen(req.subKey), buf, vlen, &txn) < 0) {
+      ASSERT(0);
+    }
+
+    if (tdbCommit(pTq->pMetaStore, &txn) < 0) {
+      ASSERT(0);
+    }
+
+    tEncoderClear(&encoder);
+    taosMemoryFree(buf);
+
     return 0;
   } else {
     /*if (req.newConsumerId != -1) {*/
diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index be8d786de2e7c015f938e87431129f5b2d067d00..9f4c5fc81e05f7a39cd76612af0809f42f01700e 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -83,11 +83,11 @@ bool tqNextDataBlockFilterOut(STqReadHandle* pHandle, SHashObj* filterOutUids) {
 
 int32_t tqRetrieveDataBlock(SArray** ppCols, STqReadHandle* pHandle, uint64_t* pGroupId, uint64_t* pUid,
                             int32_t* pNumOfRows, int16_t* pNumOfCols) {
-  /*int32_t         sversion = pHandle->pBlock->sversion;*/
-  // TODO set to real sversion
   *pUid = 0;
 
-  int32_t sversion = 1;
+  // TODO set to real sversion
+  /*int32_t sversion = 1;*/
+  int32_t sversion = htonl(pHandle->pBlock->sversion);
   if (pHandle->sver != sversion || pHandle->cachedSchemaUid != pHandle->msgIter.suid) {
     pHandle->pSchema = metaGetTbTSchema(pHandle->pVnodeMeta, pHandle->msgIter.uid, sversion);
     if (pHandle->pSchema == NULL) {
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 6eb03be003d4ef2aca37bb354db5ca2f54758d4e..7aaf1e1eca1d74a6c9a82cbc8da835150faf0fe6 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -93,6 +93,8 @@
 #./test.sh -f tsim/stable/show.sim
 ./test.sh -f tsim/stable/values.sim
 ./test.sh -f tsim/stable/vnode3.sim
+./test.sh -f tsim/stable/column_add.sim
+./test.sh -f tsim/stable/column_drop.sim
 
 
 # --- for multi process mode
diff --git a/tests/script/tsim/stable/add_column.sim b/tests/script/tsim/stable/add_column.sim
deleted file mode 100644
index 0a96a7a7d15155c83ac3086db84d47cca0e008bc..0000000000000000000000000000000000000000
--- a/tests/script/tsim/stable/add_column.sim
+++ /dev/null
@@ -1,141 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-print ========== prepare stb and ctb
-sql create database db vgroups 1
-sql create table db.stb (ts timestamp, c1 int, c2 binary(4)) tags(t1 int, t2 float, t3 binary(16)) comment "abd"
-sql create table db.ctb using db.stb tags(101, 102, "103")
-sql insert into db.ctb values(now, 1, "2")
-
-sql show db.stables
-if $rows != 1 then
-  return -1
-endi
-if $data[0][0] != stb then
-  return -1
-endi
-if $data[0][1] != db then
-  return -1
-endi
-if $data[0][3] != 3 then
-  return -1
-endi
-if $data[0][4] != 3 then
-  return -1
-endi
-if $data[0][6] != abd then
-  return -1
-endi
-
-sql show db.tables
-if $rows != 1 then
-  return -1
-endi
-if $data[0][0] != ctb then
-  return -1
-endi
-if $data[0][1] != db then
-  return -1
-endi
-if $data[0][3] != 3 then
-  return -1
-endi
-if $data[0][4] != stb then
-  return -1
-endi
-if $data[0][6] != 2 then
-  return -1
-endi
-if $data[0][9] != CHILD_TABLE then
-  return -1
-endi
-
-sql select * from db.stb
-if $rows != 1 then
-  return -1
-endi
-if $data[0][1] != 1 then
-  return -1
-endi
-if $data[0][2] != 2 then
-  return -1
-endi
-if $data[0][3] != 101 then
-  return -1
-endi
-
-print ========== add column c3
-sql alter table db.stb add column c3 int
-sql show db.stables
-if $data[0][3] != 4 then
-  return -1
-endi
-
-sql show db.tables
-if $data[0][3] != 4 then
-  return -1
-endi
-
-sql select * from db.stb
-sql select * from db.stb
-print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-if $rows != 1 then
-  return -1
-endi
-if $data[0][1] != 1 then
-  return -1
-endi
-if $data[0][2] != 2 then
-  return -1
-endi
-if $data[0][3] != NULL then
-  return -1
-endi
-if $data[0][4] != 101 then
-  return -1
-endi
-
-sql insert into db.ctb values(now+1s, 1, 2, 3)
-sql select * from db.stb
-print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-
-if $rows != 2 then
-  return -1
-endi
-if $data[0][1] != 1 then
-  return -1
-endi
-if $data[0][2] != 2 then
-  return -1
-endi  
-if $data[0][3] != NULL then
-  return -1
-endi
-if $data[0][4] != 101 then
-  return -1
-endi
-if $data[1][1] != 1 then
-  return -1
-endi
-if $data[1][2] != 2 then
-  return -1
-endi
-if $data[1][3] != 3 then
-  return -1
-endi
-if $data[1][4] != 101 then
-  return -1
-endi
-
-print ========== add column c4
-sql alter table db.stb add column c4 bigint
-sql insert into db.ctb values(now+2s, 1, 2, 3, 4)
-sql select * from db.stb
-sql select * from db.stb
-print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-
diff --git a/tests/script/tsim/stable/column_add.sim b/tests/script/tsim/stable/column_add.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a5d9b48508baa78e7266a9af7d1473b192643041
--- /dev/null
+++ b/tests/script/tsim/stable/column_add.sim
@@ -0,0 +1,303 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ========== prepare stb and ctb
+sql create database db vgroups 1
+sql create table db.stb (ts timestamp, c1 int, c2 binary(4)) tags(t1 int, t2 float, t3 binary(16)) comment "abd"
+sql create table db.ctb using db.stb tags(101, 102, "103")
+sql insert into db.ctb values(now, 1, "2")
+
+sql show db.stables
+if $rows != 1 then
+  return -1
+endi
+if $data[0][0] != stb then
+  return -1
+endi
+if $data[0][1] != db then
+  return -1
+endi
+if $data[0][3] != 3 then
+  return -1
+endi
+if $data[0][4] != 3 then
+  return -1
+endi
+if $data[0][6] != abd then
+  return -1
+endi
+
+sql show db.tables
+if $rows != 1 then
+  return -1
+endi
+if $data[0][0] != ctb then
+  return -1
+endi
+if $data[0][1] != db then
+  return -1
+endi
+if $data[0][3] != 3 then
+  return -1
+endi
+if $data[0][4] != stb then
+  return -1
+endi
+if $data[0][6] != 2 then
+  return -1
+endi
+if $data[0][9] != CHILD_TABLE then
+  return -1
+endi
+
+sql select * from db.stb
+if $rows != 1 then
+  return -1
+endi
+if $data[0][1] != 1 then
+  return -1
+endi
+if $data[0][2] != 2 then
+  return -1
+endi
+if $data[0][3] != 101 then
+  return -1
+endi
+
+sql_error alter table db.stb add column ts int
+sql_error alter table db.stb add column t1 int
+sql_error alter table db.stb add column t2 int
+sql_error alter table db.stb add column t3 int
+sql_error alter table db.stb add column c1 int
+
+print ========== step1 add column c3
+sql alter table db.stb add column c3 int
+sql show db.stables
+if $data[0][3] != 4 then
+  return -1
+endi
+
+sql show db.tables
+if $data[0][3] != 4 then
+  return -1
+endi
+
+sql select * from db.stb
+sql select * from db.stb
+print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
+if $rows != 1 then
+  return -1
+endi
+if $data[0][1] != 1 then
+  return -1
+endi
+if $data[0][2] != 2 then
+  return -1
+endi
+if $data[0][3] != NULL then
+  return -1
+endi
+if $data[0][4] != 101 then
+  return -1
+endi
+
+sql insert into db.ctb values(now+1s, 1, 2, 3)
+sql select * from db.stb
+print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
+print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
+
+if $rows != 2 then
+  return -1
+endi
+if $data[0][1] != 1 then
+  return -1
+endi
+if $data[0][2] != 2 then
+  return -1
+endi  
+if $data[0][3] != NULL then
+  return -1
+endi
+if $data[0][4] != 101 then
+  return -1
+endi
+if $data[1][1] != 1 then
+  return -1
+endi
+if $data[1][2] != 2 then
+  return -1
+endi
+if $data[1][3] != 3 then
+  return -1
+endi
+if $data[1][4] != 101 then
+  return -1
+endi
+
+print ========== step2 add column c4
+sql alter table db.stb add column c4 bigint
+sql select * from db.stb
+sql insert into db.ctb values(now+2s, 1, 2, 3, 4)
+sql select * from db.stb
+print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
+print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
+print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
+
+if $rows != 3 then
+  return -1
+endi
+if $data[0][1] != 1 then
+  return -1
+endi
+if $data[0][2] != 2 then
+  return -1
+endi  
+if $data[0][3] != NULL then
+  return -1
+endi
+if $data[0][4] != NULL then
+  return -1
+endi
+if $data[0][5] != 101 then
+  return -1
+endi
+if $data[1][1] != 1 then
+  return -1
+endi
+if $data[1][2] != 2 then
+  return -1
+endi
+if $data[1][3] != 3 then
+  return -1
+endi
+if $data[1][4] != NULL then
+  return -1
+endi
+if $data[1][5] != 101 then
+  return -1
+endi
+if $data[2][1] != 1 then
+  return -1
+endi
+if $data[2][2] != 2 then
+  return -1
+endi
+if $data[2][3] != 3 then
+  return -1
+endi
+if $data[2][4] != 4 then
+  return -1
+endi
+if $data[2][5] != 101 then
+  return -1
+endi
+
+print ========== step3 add column c5
+sql alter table db.stb add column c5 int
+sql insert into db.ctb values(now+3s, 1, 2, 3, 4, 5)
+sql select * from db.stb
+print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
+print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
+print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
+print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
+
+if $rows != 4 then
+  return -1
+endi
+if $data[2][1] != 1 then
+  return -1
+endi
+if $data[2][2] != 2 then
+  return -1
+endi
+if $data[2][3] != 3 then
+  return -1
+endi
+if $data[2][4] != 4 then
+  return -1
+endi
+if $data[2][5] != NULL then
+  return -1
+endi
+if $data[2][6] != 101 then
+  return -1
+endi
+if $data[3][1] != 1 then
+  return -1
+endi
+if $data[3][2] != 2 then
+  return -1
+endi
+if $data[3][3] != 3 then
+  return -1
+endi
+if $data[3][4] != 4 then
+  return -1
+endi
+if $data[3][5] != 5 then
+  return -1
+endi
+if $data[3][6] != 101 then
+  return -1
+endi
+
+print ========== step4 add column c6
+sql alter table db.stb add column c6 int
+sql insert into db.ctb values(now+4s, 1, 2, 3, 4, 5, 6)
+sql select * from db.stb
+
+if $rows != 5 then
+  return -1
+endi
+if $data[3][1] != 1 then
+  return -1
+endi
+if $data[3][2] != 2 then
+  return -1
+endi
+if $data[3][3] != 3 then
+  return -1
+endi
+if $data[3][4] != 4 then
+  return -1
+endi
+if $data[3][5] != 5 then
+  return -1
+endi
+if $data[3][6] != NULL then
+  return -1
+endi
+if $data[3][7] != 101 then
+  return -1
+endi
+if $data[4][1] != 1 then
+  return -1
+endi
+if $data[4][2] != 2 then
+  return -1
+endi
+if $data[4][3] != 3 then
+  return -1
+endi
+if $data[4][4] != 4 then
+  return -1
+endi
+if $data[4][5] != 5 then
+  return -1
+endi
+if $data[4][6] != 6 then
+  return -1
+endi
+if $data[4][7] != 101 then
+  return -1
+endi
+
+print ========== step5 describe
+sql describe db.ctb
+if $rows != 10 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/stable/column_drop.sim b/tests/script/tsim/stable/column_drop.sim
new file mode 100644
index 0000000000000000000000000000000000000000..af84a3ecac28da9f6dbf41d08af707d1aa6226a4
--- /dev/null
+++ b/tests/script/tsim/stable/column_drop.sim
@@ -0,0 +1,209 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ========== prepare stb and ctb
+sql create database db vgroups 1
+sql create table db.stb (ts timestamp, c1 int, c2 binary(4), c3 int, c4 bigint, c5 int, c6 int) tags(t1 int, t2 float, t3 binary(16)) comment "abd"
+sql create table db.ctb using db.stb tags(101, 102, "103")
+sql insert into db.ctb values(now, 1, "2", 3, 4, 5, 6)
+
+sql show db.stables
+if $rows != 1 then
+  return -1
+endi
+if $data[0][0] != stb then
+  return -1
+endi
+if $data[0][1] != db then
+  return -1
+endi
+if $data[0][3] != 7 then
+  return -1
+endi
+if $data[0][4] != 3 then
+  return -1
+endi
+if $data[0][6] != abd then
+  return -1
+endi
+
+sql show db.tables
+if $rows != 1 then
+  return -1
+endi
+if $data[0][0] != ctb then
+  return -1
+endi
+if $data[0][1] != db then
+  return -1
+endi
+if $data[0][3] != 7 then
+  return -1
+endi
+if $data[0][4] != stb then
+  return -1
+endi
+if $data[0][6] != 2 then
+  return -1
+endi
+if $data[0][9] != CHILD_TABLE then
+  return -1
+endi
+
+sql select * from db.stb
+if $rows != 1 then
+  return -1
+endi
+if $data[0][1] != 1 then
+  return -1
+endi
+if $data[0][2] != 2 then
+  return -1
+endi
+if $data[0][3] != 3 then
+  return -1
+endi
+if $data[0][4] != 4 then
+  return -1
+endi
+if $data[0][5] != 5 then
+  return -1
+endi
+if $data[0][6] != 6 then
+  return -1
+endi
+if $data[0][7] != 101 then
+  return -1
+endi
+
+sql_error alter table db.stb drop column ts
+sql_error alter table db.stb drop column t1
+sql_error alter table db.stb drop column t2
+sql_error alter table db.stb drop column t3
+sql_error alter table db.stb drop column c9
+
+print ========== step1 drop column c6
+sql alter table db.stb drop column c6
+sql show db.stables
+if $data[0][3] != 6 then
+  return -1
+endi
+
+sql show db.tables
+if $data[0][3] != 6 then
+  return -1
+endi
+
+sql select * from db.stb
+sql select * from db.stb
+print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
+if $rows != 1 then
+  return -1
+endi
+if $data[0][1] != 1 then
+  return -1
+endi
+if $data[0][2] != 2 then
+  return -1
+endi
+if $data[0][3] != 3 then
+  return -1
+endi
+if $data[0][4] != 4 then
+  return -1
+endi
+if $data[0][5] != 5 then
+  return -1
+endi
+if $data[0][6] != 101 then
+  return -1
+endi
+
+sql insert into db.ctb values(now+1s, 1, 2, 3, 4, 5)
+sql select * from db.stb
+if $rows != 2 then
+  return -1
+endi
+
+print ========== step2 drop column c5
+sql alter table db.stb drop column c5
+sql insert into db.ctb values(now+2s, 1, 2, 3, 4, 5)
+sql insert into db.ctb values(now+3s, 1, 2, 3, 4)
+sql_error insert into db.ctb values(now+2s, 1, 2, 3, 4, 5)
+
+sql select * from db.stb
+if $rows != 4 then
+  return -1
+endi
+
+print ========== step3 drop column c4
+sql alter table db.stb drop column c4
+sql select * from db.stb
+sql_error insert into db.ctb values(now+2s, 1, 2, 3, 4, 5)
+sql_error insert into db.ctb values(now+2s, 1, 2, 3, 4)
+sql insert into db.ctb values(now+3s, 1, 2, 3)
+
+sql select * from db.stb
+if $rows != 5 then
+  return -1
+endi
+
+print ========== step4 add column c4
+sql alter table db.stb add column c4 binary(13)
+sql insert into db.ctb values(now+4s, 1, 2, 3, '4')
+sql select * from db.stb
+if $rows != 6 then
+  return -1
+endi
+if $data[1][4] != NULL then
+  return -1
+endi
+if $data[2][4] != NULL then
+  return -1
+endi
+if $data[3][4] != NULL then
+  return -1
+endi
+if $data[5][4] != 4 then
+  return -1
+endi
+
+print ========== step5 describe
+sql describe db.ctb
+if $rows != 8 then
+  return -1
+endi
+if $data[0][0] != ts then
+  return -1
+endi
+if $data[1][0] != c1 then
+  return -1
+endi
+if $data[2][0] != c2 then
+  return -1
+endi
+if $data[3][0] != c3 then
+  return -1
+endi
+if $data[4][0] != c4 then
+  return -1
+endi
+if $data[4][1] != VARCHAR then
+  return -1
+endi
+if $data[4][2] != 13 then
+  return -1
+endi
+if $data[5][0] != t1 then
+  return -1
+endi
+if $data[6][0] != t2 then
+  return -1
+endi
+if $data[7][0] != t3 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/stable/column_modify.sim b/tests/script/tsim/stable/column_modify.sim
new file mode 100644
index 0000000000000000000000000000000000000000..732e449c4aea74f5df310a9af71411e99eeb9f25
--- /dev/null
+++ b/tests/script/tsim/stable/column_modify.sim
@@ -0,0 +1,78 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ========== prepare stb and ctb
+sql create database db vgroups 1
+sql create table db.stb (ts timestamp, c1 int, c2 binary(4)) tags(t1 int, t2 float, t3 binary(16)) comment "abd"
+sql create table db.ctb using db.stb tags(101, 102, "103")
+sql insert into db.ctb values(now, 1, "1234")
+
+sql_error alter table db.stb MODIFY column c2 binary(3)
+sql_error alter table db.stb MODIFY column c2 int
+sql_error alter table db.stb MODIFY column c1 int
+sql_error alter table db.stb MODIFY column ts int
+sql_error insert into db.ctb values(now, 1, "12345")
+
+print ========== step1 modify column
+sql alter table db.stb MODIFY column c2 binary(5)
+sql insert into db.ctb values(now, 1, "12345")
+
+sql select * from db.stb
+print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
+print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
+
+if $rows != 2 then
+  return -1
+endi
+if $data[0][1] != 1 then
+  return -1
+endi
+if $data[0][2] != 1234 then
+  return -1
+endi  
+if $data[0][3] != 101 then
+  return -1
+endi
+if $data[1][1] != 1 then
+  return -1
+endi
+if $data[1][2] != 12345 then
+  return -1
+endi
+if $data[1][3] != 101 then
+  return -1
+endi
+
+print ========== step2 describe
+sql describe db.ctb
+if $rows != 7 then
+  return -1
+endi
+if $data[0][0] != ts then
+  return -1
+endi
+if $data[1][0] != c1 then
+  return -1
+endi
+if $data[2][0] != c2 then
+  return -1
+endi
+if $data[2][1] != VARCHAR then
+  return -1
+endi
+if $data[2][2] != 5 then
+  return -1
+endi
+if $data[3][0] != t1 then
+  return -1
+endi
+if $data[4][0] != t2 then
+  return -1
+endi
+if $data[5][0] != t3 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/system-test/0-others/udfTest.py b/tests/system-test/0-others/udfTest.py
index 679b41509891d1efe92507a81f7add51b9f76253..46d0a6968875a5e6c484c932abb41946f56bc8ee 100644
--- a/tests/system-test/0-others/udfTest.py
+++ b/tests/system-test/0-others/udfTest.py
@@ -134,7 +134,7 @@ class TDTestCase:
 
     def create_udf_function(self):
 
-        for i in range(10):
+        for i in range(5):
             # create  scalar functions
             tdSql.execute("create function udf1 as '/tmp/udf/libudf1.so' outputtype int bufSize 8;")
 
@@ -644,16 +644,12 @@ class TDTestCase:
         self.create_udf_function()
         self.basic_udf_query()
         self.loop_kill_udfd()
-        
-        self.unexpected_create()
         tdSql.execute(" drop function udf1 ")
         tdSql.execute(" drop function udf2 ")
         self.create_udf_function()
         time.sleep(2)
         self.basic_udf_query()
         self.test_function_name()
-        self.restart_taosd_query_udf()
-       
         
 
     def stop(self):
diff --git a/tests/system-test/0-others/udf_create.py b/tests/system-test/0-others/udf_create.py
new file mode 100644
index 0000000000000000000000000000000000000000..e2c6e3c10bd1520c58c4400fd58c741d2904a420
--- /dev/null
+++ b/tests/system-test/0-others/udf_create.py
@@ -0,0 +1,654 @@
+from distutils.log import error
+import taos
+import sys
+import time
+import os
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+import subprocess
+
+class TDTestCase:
+
+    def init(self, conn, logSql):
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor(), logSql)
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+    
+    def prepare_udf_so(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+        print(projPath)
+
+        libudf1 = subprocess.Popen('find %s -name "libudf1.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+        libudf2 = subprocess.Popen('find %s -name "libudf2.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+        os.system("mkdir /tmp/udf/")
+        os.system("cp %s /tmp/udf/ "%libudf1.replace("\n" ,""))
+        os.system("cp  %s /tmp/udf/ "%libudf2.replace("\n" ,""))
+
+
+    def prepare_data(self):
+        
+        tdSql.execute("drop database if exists db ")
+        tdSql.execute("create database if not exists db  days 300")
+        tdSql.execute("use db")
+        tdSql.execute(
+        '''create table stb1
+        (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
+        tags (t1 int)
+        '''
+        )
+        
+        tdSql.execute(
+            '''
+            create table t1
+            (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
+            '''
+        )
+        for i in range(4):
+            tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )')
+
+        for i in range(9):
+            tdSql.execute(
+                f"insert into ct1 values ( now()-{i*10}s, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
+            )
+            tdSql.execute(
+                f"insert into ct4 values ( now()-{i*90}d, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
+            )
+        tdSql.execute("insert into ct1 values (now()-45s, 0, 0, 0, 0, 0, 0, 0, 'binary0', 'nchar0', now()+8a )")
+        tdSql.execute("insert into ct1 values (now()+10s, 9, -99999, -999, -99, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
+        tdSql.execute("insert into ct1 values (now()+15s, 9, -99999, -999, -99, -9.99, NULL, 1, 'binary9', 'nchar9', now()+9a )")
+        tdSql.execute("insert into ct1 values (now()+20s, 9, -99999, -999, NULL, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
+
+        tdSql.execute("insert into ct4 values (now()-810d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
+        tdSql.execute("insert into ct4 values (now()-400d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
+        tdSql.execute("insert into ct4 values (now()+90d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL  ) ")
+
+        tdSql.execute(
+            f'''insert into t1 values
+            ( '2020-04-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+            ( '2020-10-21 01:01:01.000', 1, 11111, 111, 11, 1.11, 11.11, 1, "binary1", "nchar1", now()+1a )
+            ( '2020-12-31 01:01:01.000', 2, 22222, 222, 22, 2.22, 22.22, 0, "binary2", "nchar2", now()+2a )
+            ( '2021-01-01 01:01:06.000', 3, 33333, 333, 33, 3.33, 33.33, 0, "binary3", "nchar3", now()+3a )
+            ( '2021-05-07 01:01:10.000', 4, 44444, 444, 44, 4.44, 44.44, 1, "binary4", "nchar4", now()+4a )
+            ( '2021-07-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+            ( '2021-09-30 01:01:16.000', 5, 55555, 555, 55, 5.55, 55.55, 0, "binary5", "nchar5", now()+5a )
+            ( '2022-02-01 01:01:20.000', 6, 66666, 666, 66, 6.66, 66.66, 1, "binary6", "nchar6", now()+6a )
+            ( '2022-10-28 01:01:26.000', 7, 00000, 000, 00, 0.00, 00.00, 1, "binary7", "nchar7", "1970-01-01 08:00:00.000" )
+            ( '2022-12-01 01:01:30.000', 8, -88888, -888, -88, -8.88, -88.88, 0, "binary8", "nchar8", "1969-01-01 01:00:00.000" )
+            ( '2022-12-31 01:01:36.000', 9, -99999999999999999, -999, -99, -9.99, -999999999999999999999.99, 1, "binary9", "nchar9", "1900-01-01 00:00:00.000" )
+            ( '2023-02-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+            '''
+        )
+
+        tdSql.execute("create table tb (ts timestamp , num1 int , num2 int, num3 double , num4 binary(30))")
+        tdSql.execute(
+            f'''insert into tb values
+            ( '2020-04-21 01:01:01.000',   NULL,    1,       1,     "binary1" )
+            ( '2020-10-21 01:01:01.000',   1,       1,      1.11,   "binary1" )
+            ( '2020-12-31 01:01:01.000',   2,    22222,      22,    "binary1" )
+            ( '2021-01-01 01:01:06.000',   3,    33333,      33,    "binary1" )
+            ( '2021-05-07 01:01:10.000',   4,    44444,      44,    "binary1" )
+            ( '2021-07-21 01:01:01.000',   NULL,   NULL,     NULL,  "binary1" )
+            ( '2021-09-30 01:01:16.000',   5,    55555,      55,    "binary1" )
+            ( '2022-02-01 01:01:20.000',   6,    66666,      66,    "binary1" )
+            ( '2022-10-28 01:01:26.000',   0,    00000,      00,    "binary1" )
+            ( '2022-12-01 01:01:30.000',   8,   -88888,     -88,    "binary1" )
+            ( '2022-12-31 01:01:36.000',   9, -9999999,     -99,    "binary1" )
+            ( '2023-02-21 01:01:01.000',  NULL,    NULL,    NULL,   "binary1" )
+            '''
+        )
+
+        # udf functions with join
+        ts_start = 1652517451000
+        tdSql.execute("create stable st (ts timestamp , c1 int , c2 int ,c3 double ,c4 double ) tags(ind int)")
+        tdSql.execute("create table sub1 using st tags(1)")
+        tdSql.execute("create table sub2 using st tags(2)")
+
+        for i in range(10):
+            ts = ts_start + i *1000
+            tdSql.execute(" insert into sub1 values({} , {},{},{},{})".format(ts,i ,i*10,i*100.0,i*1000.0))
+            tdSql.execute(" insert into sub2 values({} , {},{},{},{})".format(ts,i ,i*10,i*100.0,i*1000.0))
+
+
+    def create_udf_function(self):
+
+        for i in range(5):
+            # create  scalar functions
+            tdSql.execute("create function udf1 as '/tmp/udf/libudf1.so' outputtype int bufSize 8;")
+
+            # create aggregate functions
+
+            tdSql.execute("create aggregate function udf2 as '/tmp/udf/libudf2.so' outputtype double bufSize 8;")
+            
+            functions = tdSql.getResult("show functions")
+            function_nums = len(functions)
+            if function_nums == 2:
+                tdLog.info("create two udf functions success ")
+
+            # drop functions
+
+            tdSql.execute("drop function udf1")
+            tdSql.execute("drop function udf2")
+
+            functions = tdSql.getResult("show functions")
+            for function in functions:
+                if "udf1" in function[0] or  "udf2" in function[0]:
+                    tdLog.info("drop udf functions failed ")
+                    tdLog.exit("drop udf functions failed")
+
+                tdLog.info("drop two udf functions success ")
+
+        # create  scalar functions
+        tdSql.execute("create function udf1 as '/tmp/udf/libudf1.so' outputtype int bufSize 8;")
+
+        # create aggregate functions
+
+        tdSql.execute("create aggregate function udf2 as '/tmp/udf/libudf2.so' outputtype double bufSize 8;")
+        
+        functions = tdSql.getResult("show functions")
+        function_nums = len(functions)
+        if function_nums == 2:
+            tdLog.info("create two udf functions success ")
+       
+    def basic_udf_query(self):
+        
+        # scalar functions
+
+        tdSql.execute("use db ")
+        tdSql.query("select num1 , udf1(num1) ,num2 ,udf1(num2),num3 ,udf1(num3),num4 ,udf1(num4) from tb")
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,None)
+        tdSql.checkData(0,2,1)
+        tdSql.checkData(0,3,88)
+        tdSql.checkData(0,4,1.000000000)
+        tdSql.checkData(0,5,88)
+        tdSql.checkData(0,6,"binary1")
+        tdSql.checkData(0,7,88)
+
+        tdSql.checkData(3,0,3)
+        tdSql.checkData(3,1,88)
+        tdSql.checkData(3,2,33333)
+        tdSql.checkData(3,3,88)
+        tdSql.checkData(3,4,33.000000000)
+        tdSql.checkData(3,5,88)
+        tdSql.checkData(3,6,"binary1")
+        tdSql.checkData(3,7,88)
+
+        tdSql.checkData(11,0,None)
+        tdSql.checkData(11,1,None)
+        tdSql.checkData(11,2,None)
+        tdSql.checkData(11,3,None)
+        tdSql.checkData(11,4,None)
+        tdSql.checkData(11,5,None)
+        tdSql.checkData(11,6,"binary1")
+        tdSql.checkData(11,7,88)
+
+        tdSql.query("select c1 , udf1(c1) ,c2 ,udf1(c2), c3 ,udf1(c3), c4 ,udf1(c4) from stb1 order by c1")
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,None)
+        tdSql.checkData(0,2,None)
+        tdSql.checkData(0,3,None)
+        tdSql.checkData(0,4,None)
+        tdSql.checkData(0,5,None)
+        tdSql.checkData(0,6,None)
+        tdSql.checkData(0,7,None)
+
+        tdSql.checkData(20,0,8)
+        tdSql.checkData(20,1,88)
+        tdSql.checkData(20,2,88888)
+        tdSql.checkData(20,3,88)
+        tdSql.checkData(20,4,888)
+        tdSql.checkData(20,5,88)
+        tdSql.checkData(20,6,88)
+        tdSql.checkData(20,7,88)
+
+
+        # aggregate functions
+        tdSql.query("select udf2(num1) ,udf2(num2), udf2(num3) from tb")
+        tdSql.checkData(0,0,15.362291496)
+        tdSql.checkData(0,1,10000949.553189287)
+        tdSql.checkData(0,2,168.633425216)
+
+        # Arithmetic compute
+        tdSql.query("select udf2(num1)+100 ,udf2(num2)-100, udf2(num3)*100 ,udf2(num3)/100 from tb")
+        tdSql.checkData(0,0,115.362291496)
+        tdSql.checkData(0,1,10000849.553189287)
+        tdSql.checkData(0,2,16863.342521576)
+        tdSql.checkData(0,3,1.686334252)
+
+        tdSql.query("select udf2(c1) ,udf2(c6) from stb1 ")
+        tdSql.checkData(0,0,25.514701644)
+        tdSql.checkData(0,1,265.247614504)
+
+        tdSql.query("select udf2(c1)+100 ,udf2(c6)-100 ,udf2(c1)*100 ,udf2(c6)/100 from stb1 ")
+        tdSql.checkData(0,0,125.514701644)
+        tdSql.checkData(0,1,165.247614504)
+        tdSql.checkData(0,2,2551.470164435)
+        tdSql.checkData(0,3,2.652476145)
+        
+        # # bug for crash when query sub table
+        tdSql.query("select udf2(c1+100) ,udf2(c6-100) ,udf2(c1*100) ,udf2(c6/100) from ct1")
+        tdSql.checkData(0,0,378.215547010)
+        tdSql.checkData(0,1,353.808067460)
+        tdSql.checkData(0,2,2114.237451187)
+        tdSql.checkData(0,3,2.125468151)
+
+        tdSql.query("select udf2(c1+100) ,udf2(c6-100) ,udf2(c1*100) ,udf2(c6/100) from stb1 ")
+        tdSql.checkData(0,0,490.358032462)
+        tdSql.checkData(0,1,400.460106627)
+        tdSql.checkData(0,2,2551.470164435)
+        tdSql.checkData(0,3,2.652476145)
+
+
+        # regular table with aggregate functions
+
+        tdSql.error("select udf1(num1) , count(num1) from tb;")
+        tdSql.error("select udf1(num1) , avg(num1) from tb;")
+        tdSql.error("select udf1(num1) , twa(num1) from tb;")
+        tdSql.error("select udf1(num1) , irate(num1) from tb;")
+        tdSql.error("select udf1(num1) , sum(num1) from tb;")
+        tdSql.error("select udf1(num1) , stddev(num1) from tb;")
+        tdSql.error("select udf1(num1) , mode(num1) from tb;")
+        tdSql.error("select udf1(num1) , HYPERLOGLOG(num1) from tb;")
+        # stable 
+        tdSql.error("select udf1(c1) , count(c1) from stb1;")
+        tdSql.error("select udf1(c1) , avg(c1) from stb1;")
+        tdSql.error("select udf1(c1) , twa(c1) from stb1;")
+        tdSql.error("select udf1(c1) , irate(c1) from stb1;")
+        tdSql.error("select udf1(c1) , sum(c1) from stb1;")
+        tdSql.error("select udf1(c1) , stddev(c1) from stb1;")
+        tdSql.error("select udf1(c1) , mode(c1) from stb1;")
+        tdSql.error("select udf1(c1) , HYPERLOGLOG(c1) from stb1;")
+
+        # regular table with select functions
+
+        tdSql.query("select udf1(num1) , max(num1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.query("select floor(num1) , max(num1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.query("select udf1(num1) , min(num1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.query("select ceil(num1) , min(num1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.error("select udf1(num1) , first(num1) from tb;")
+        
+        tdSql.error("select abs(num1) , first(num1) from tb;")
+        
+        tdSql.error("select udf1(num1) , last(num1) from tb;")
+        
+        tdSql.error("select round(num1) , last(num1) from tb;")
+        
+        tdSql.query("select udf1(num1) , top(num1,1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.query("select udf1(num1) , bottom(num1,1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.error("select udf1(num1) , last_row(num1) from tb;")
+       
+        tdSql.error("select round(num1) , last_row(num1) from tb;")
+   
+        
+        # stable 
+        tdSql.query("select udf1(c1) , max(c1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select abs(c1) , max(c1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select udf1(c1) , min(c1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select floor(c1) , min(c1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.error("select udf1(c1) , first(c1) from stb1;")
+        
+        tdSql.error("select udf1(c1) , last(c1) from stb1;")
+        
+        tdSql.query("select udf1(c1) , top(c1 ,1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select abs(c1) , top(c1 ,1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select udf1(c1) , bottom(c1,1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select ceil(c1) , bottom(c1,1) from stb1;")
+        tdSql.checkRows(1)
+
+        tdSql.error("select udf1(c1) , last_row(c1) from stb1;")
+        tdSql.error("select ceil(c1) , last_row(c1) from stb1;")
+        
+        # regular table with compute functions
+
+        tdSql.query("select udf1(num1) , abs(num1) from tb;")
+        tdSql.checkRows(12)
+        tdSql.query("select floor(num1) , abs(num1) from tb;")
+        tdSql.checkRows(12)
+
+        # # bug need fix 
+
+        #tdSql.query("select udf1(num1) , csum(num1) from tb;")
+        #tdSql.checkRows(9)
+        #tdSql.query("select ceil(num1) , csum(num1) from tb;")
+        #tdSql.checkRows(9)
+        #tdSql.query("select udf1(c1) , csum(c1) from stb1;")
+        #tdSql.checkRows(22)
+        #tdSql.query("select floor(c1) , csum(c1) from stb1;")
+        #tdSql.checkRows(22)
+
+        # stable  with compute functions
+        tdSql.query("select udf1(c1) , abs(c1) from stb1;")
+        tdSql.checkRows(25)
+        tdSql.query("select abs(c1) , ceil(c1) from stb1;")
+        tdSql.checkRows(25)
+
+        # nest query
+        tdSql.query("select abs(udf1(c1)) , abs(ceil(c1)) from stb1 order by ts;")
+        tdSql.checkRows(25)
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,None)
+        tdSql.checkData(1,0,88)
+        tdSql.checkData(1,1,8)
+
+        tdSql.query("select abs(udf1(c1)) , abs(ceil(c1)) from ct1 order by ts;")
+        tdSql.checkRows(13)
+        tdSql.checkData(0,0,88)
+        tdSql.checkData(0,1,8)
+        tdSql.checkData(1,0,88)
+        tdSql.checkData(1,1,7)
+
+        # bug fix for crash 
+        # order by udf function result 
+        for _ in range(50):
+            tdSql.query("select udf2(c1) from stb1 group by 1-udf1(c1)")
+            print(tdSql.queryResult)
+
+        # udf functions with filter
+
+        tdSql.query("select abs(udf1(c1)) , abs(ceil(c1)) from stb1 where c1 is null  order by ts;")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,None)
+
+        tdSql.query("select c1 ,udf1(c1) , c6 ,udf1(c6) from stb1 where c1 > 8  order by ts")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,0,9)
+        tdSql.checkData(0,1,88)
+        tdSql.checkData(0,2,-99.990000000)
+        tdSql.checkData(0,3,88)
+        
+        tdSql.query("select sub1.c1, sub2.c2 from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,0)
+        tdSql.checkData(0,1,0)
+        tdSql.checkData(1,0,1)
+        tdSql.checkData(1,1,10)
+
+        tdSql.query("select udf1(sub1.c1), udf1(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,88)
+        tdSql.checkData(0,1,88)
+        tdSql.checkData(1,0,88)
+        tdSql.checkData(1,1,88)
+
+        tdSql.query("select sub1.c1 , udf1(sub1.c1), sub2.c2 ,udf1(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,0)
+        tdSql.checkData(0,1,88)
+        tdSql.checkData(0,2,0)
+        tdSql.checkData(0,3,88)
+        tdSql.checkData(1,0,1)
+        tdSql.checkData(1,1,88)
+        tdSql.checkData(1,2,10)
+        tdSql.checkData(1,3,88)
+
+        tdSql.query("select udf2(sub1.c1), udf2(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,16.881943016)
+        tdSql.checkData(0,1,168.819430161)
+        tdSql.error("select sub1.c1 , udf2(sub1.c1), sub2.c2 ,udf2(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+
+        # udf functions with  group by 
+        tdSql.query("select udf1(c1) from ct1 group by c1")
+        tdSql.checkRows(10)
+        tdSql.query("select udf1(c1) from stb1 group by c1")
+        tdSql.checkRows(11)
+        tdSql.query("select c1,c2, udf1(c1,c2) from ct1 group by c1,c2")
+        tdSql.checkRows(10)
+        tdSql.query("select c1,c2, udf1(c1,c2) from stb1 group by c1,c2")
+        tdSql.checkRows(11)
+
+        tdSql.query("select udf2(c1) from ct1 group by c1")
+        tdSql.checkRows(10)
+        tdSql.query("select udf2(c1) from stb1 group by c1")
+        tdSql.checkRows(11)
+        tdSql.query("select c1,c2, udf2(c1,c6) from ct1 group by c1,c2")
+        tdSql.checkRows(10)
+        tdSql.query("select c1,c2, udf2(c1,c6) from stb1 group by c1,c2")
+        tdSql.checkRows(11)
+        tdSql.query("select udf2(c1) from stb1 group by udf1(c1)")
+        tdSql.checkRows(2)
+        tdSql.query("select udf2(c1) from stb1 group by floor(c1)")
+        tdSql.checkRows(11)
+
+        # udf mix with order by  
+        tdSql.query("select udf2(c1) from stb1 group by floor(c1) order by udf2(c1)")
+        tdSql.checkRows(11)
+
+
+    def multi_cols_udf(self):
+        tdSql.query("select num1,num2,num3,udf1(num1,num2,num3) from tb")
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,1)
+        tdSql.checkData(0,2,1.000000000)
+        tdSql.checkData(0,3,None)
+        tdSql.checkData(1,0,1)
+        tdSql.checkData(1,1,1)
+        tdSql.checkData(1,2,1.110000000)
+        tdSql.checkData(1,3,88)
+
+        tdSql.query("select c1,c6,udf1(c1,c6) from stb1 order by ts")
+        tdSql.checkData(1,0,8)
+        tdSql.checkData(1,1,88.880000000)
+        tdSql.checkData(1,2,88)
+
+        tdSql.query("select abs(udf1(c1,c6,c1,c6)) , abs(ceil(c1)) from stb1 where c1 is not null  order by ts;")
+        tdSql.checkRows(22)
+
+        tdSql.query("select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,169.661427555)
+        tdSql.checkData(0,1,169.661427555)
+
+    def try_query_sql(self):
+        udf1_sqls = [ 
+        "select num1 , udf1(num1) ,num2 ,udf1(num2),num3 ,udf1(num3),num4 ,udf1(num4) from tb" ,
+        "select c1 , udf1(c1) ,c2 ,udf1(c2), c3 ,udf1(c3), c4 ,udf1(c4) from stb1 order by c1" ,
+        "select udf1(num1) , max(num1) from tb;" ,
+        "select udf1(num1) , min(num1) from tb;" ,
+        #"select udf1(num1) , top(num1,1) from tb;" ,
+        #"select udf1(num1) , bottom(num1,1) from tb;" ,
+        "select udf1(c1) , max(c1) from stb1;" ,
+        "select udf1(c1) , min(c1) from stb1;" ,
+        #"select udf1(c1) , top(c1 ,1) from stb1;" ,
+        #"select udf1(c1) , bottom(c1,1) from stb1;" ,
+        "select udf1(num1) , abs(num1) from tb;" ,
+        #"select udf1(num1) , csum(num1) from tb;" ,
+        #"select udf1(c1) , csum(c1) from stb1;" ,
+        "select udf1(c1) , abs(c1) from stb1;" ,
+        "select abs(udf1(c1)) , abs(ceil(c1)) from stb1 order by ts;" ,
+        "select abs(udf1(c1)) , abs(ceil(c1)) from ct1 order by ts;" ,
+        "select abs(udf1(c1)) , abs(ceil(c1)) from stb1 where c1 is null  order by ts;" ,
+        "select c1 ,udf1(c1) , c6 ,udf1(c6) from stb1 where c1 > 8  order by ts" ,
+        "select udf1(sub1.c1), udf1(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select sub1.c1 , udf1(sub1.c1), sub2.c2 ,udf1(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf1(c1) from ct1 group by c1" ,
+        "select udf1(c1) from stb1 group by c1" ,
+        "select c1,c2, udf1(c1,c2) from ct1 group by c1,c2" ,
+        "select c1,c2, udf1(c1,c2) from stb1 group by c1,c2" ,
+        "select num1,num2,num3,udf1(num1,num2,num3) from tb" ,
+        "select c1,c6,udf1(c1,c6) from stb1 order by ts" ,
+        "select abs(udf1(c1,c6,c1,c6)) , abs(ceil(c1)) from stb1 where c1 is not null  order by ts;" 
+        ]
+        udf2_sqls = ["select udf2(sub1.c1), udf2(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf2(c1) from stb1 group by 1-udf1(c1)" ,
+        "select udf2(num1) ,udf2(num2), udf2(num3) from tb" ,
+        "select udf2(num1)+100 ,udf2(num2)-100, udf2(num3)*100 ,udf2(num3)/100 from tb" ,
+        "select udf2(c1) ,udf2(c6) from stb1 " ,
+        "select udf2(c1)+100 ,udf2(c6)-100 ,udf2(c1)*100 ,udf2(c6)/100 from stb1 " ,
+        "select udf2(c1+100) ,udf2(c6-100) ,udf2(c1*100) ,udf2(c6/100) from ct1" ,
+        "select udf2(c1+100) ,udf2(c6-100) ,udf2(c1*100) ,udf2(c6/100) from stb1 " ,
+        "select udf2(c1) from ct1 group by c1" ,
+        "select udf2(c1) from stb1 group by c1" ,
+        "select c1,c2, udf2(c1,c6) from ct1 group by c1,c2" ,
+        "select c1,c2, udf2(c1,c6) from stb1 group by c1,c2" ,
+        "select udf2(c1) from stb1 group by udf1(c1)" ,
+        "select udf2(c1) from stb1 group by floor(c1)" ,
+        "select udf2(c1) from stb1 group by floor(c1) order by udf2(c1)" ,
+    
+        "select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null"]
+
+        return udf1_sqls ,udf2_sqls
+
+
+
+    def unexpected_create(self):
+
+        tdLog.info(" create function with out bufsize ")
+        tdSql.query("drop function udf1 ")
+        tdSql.query("drop function udf2 ")
+
+        # create function without buffer
+        tdSql.execute("create function udf1 as '/tmp/udf/libudf1.so' outputtype int")
+        tdSql.execute("create aggregate function udf2 as '/tmp/udf/libudf2.so' outputtype double")
+        udf1_sqls ,udf2_sqls = self.try_query_sql()
+
+        for scalar_sql in udf1_sqls:
+            tdSql.query(scalar_sql)
+        for aggregate_sql in udf2_sqls:
+            tdSql.error(aggregate_sql)
+
+        # create function without aggregate 
+
+        tdLog.info(" create function with out aggregate ")
+        tdSql.query("drop function udf1 ")
+        tdSql.query("drop function udf2 ")
+
+        # create function without buffer
+        tdSql.execute("create  aggregate function udf1 as '/tmp/udf/libudf1.so' outputtype int bufSize 8 ")
+        tdSql.execute("create  function udf2 as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        udf1_sqls ,udf2_sqls = self.try_query_sql()
+
+        for scalar_sql in udf1_sqls:
+            tdSql.error(scalar_sql)
+        for aggregate_sql in udf2_sqls:
+            tdSql.error(aggregate_sql)
+
+        tdSql.execute(" create function db as '/tmp/udf/libudf1.so' outputtype int bufSize 8 ")
+        tdSql.execute(" create aggregate function test as '/tmp/udf/libudf1.so' outputtype int bufSize 8 ")
+        tdSql.error(" select db(c1) from stb1 ")
+        tdSql.error(" select db(c1,c6), db(c6) from stb1 ")
+        tdSql.error(" select db(num1,num2), db(num1) from tb ")
+        tdSql.error(" select test(c1) from stb1 ")
+        tdSql.error(" select test(c1,c6), test(c6) from stb1 ")
+        tdSql.error(" select test(num1,num2), test(num1) from tb ")
+        
+        
+
+    def loop_kill_udfd(self):
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+        
+        cfgPath = buildPath + "/../sim/dnode1/cfg"
+        udfdPath = buildPath +'/build/bin/udfd'
+
+        for i in range(3):
+
+            tdLog.info(" loop restart udfd  %d_th" % i)
+
+            tdSql.query("select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+            tdSql.checkData(0,0,169.661427555)
+            tdSql.checkData(0,1,169.661427555)
+            # stop udfd cmds 
+            get_processID = "ps -ef | grep -w udfd | grep -v grep| grep -v defunct | awk '{print $2}'"
+            processID = subprocess.check_output(get_processID, shell=True).decode("utf-8")
+            stop_udfd = " kill -9 %s" % processID
+            os.system(stop_udfd)
+
+            time.sleep(2)
+            
+            tdSql.query("select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+            tdSql.checkData(0,0,169.661427555)
+            tdSql.checkData(0,1,169.661427555)
+
+            # # start udfd  cmds 
+            # start_udfd = "nohup " + udfdPath +'-c' +cfgPath +" > /dev/null 2>&1 &"
+            # tdLog.info("start udfd : %s " % start_udfd)
+
+    def test_function_name(self):
+        tdLog.info(" create function name is not build_in functions ")
+        tdSql.execute(" drop function udf1 ")
+        tdSql.execute(" drop function udf2 ")
+        tdSql.error("create function max as '/tmp/udf/libudf1.so' outputtype int bufSize 8")
+        tdSql.error("create aggregate function sum as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create function max as '/tmp/udf/libudf1.so' outputtype int bufSize 8")
+        tdSql.error("create aggregate function sum as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function tbname as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function function as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function stable as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function union as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function 123 as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function 123db as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function mnode as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+
+    def restart_taosd_query_udf(self):
+
+        self.create_udf_function()
+
+        for i in range(5):
+            tdLog.info("  this is %d_th restart taosd " %i)
+            tdSql.execute("use db ")
+            tdSql.query("select count(*) from stb1")
+            tdSql.checkRows(1)
+            tdSql.query("select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+            tdSql.checkData(0,0,169.661427555)
+            tdSql.checkData(0,1,169.661427555)
+            tdDnodes.stop(1)
+            tdDnodes.start(1)
+            time.sleep(2)
+            
+            
+    def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
+        
+        print(" env is ok for all ") 
+        self.prepare_udf_so()
+        self.prepare_data()
+        self.create_udf_function()
+        self.basic_udf_query()
+        self.unexpected_create()
+        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/system-test/0-others/udf_restart_taosd.py b/tests/system-test/0-others/udf_restart_taosd.py
new file mode 100644
index 0000000000000000000000000000000000000000..24d3b5a9c3cf702c4839e83ff02794f5bf08fcb5
--- /dev/null
+++ b/tests/system-test/0-others/udf_restart_taosd.py
@@ -0,0 +1,654 @@
+from distutils.log import error
+import taos
+import sys
+import time
+import os
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+import subprocess
+
+class TDTestCase:
+
+    def init(self, conn, logSql):
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor(), logSql)
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+    
+    def prepare_udf_so(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+        print(projPath)
+
+        libudf1 = subprocess.Popen('find %s -name "libudf1.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+        libudf2 = subprocess.Popen('find %s -name "libudf2.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+        os.system("mkdir /tmp/udf/")
+        os.system("cp %s /tmp/udf/ "%libudf1.replace("\n" ,""))
+        os.system("cp  %s /tmp/udf/ "%libudf2.replace("\n" ,""))
+
+
+    def prepare_data(self):
+        
+        tdSql.execute("drop database if exists db ")
+        tdSql.execute("create database if not exists db  days 300")
+        tdSql.execute("use db")
+        tdSql.execute(
+        '''create table stb1
+        (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
+        tags (t1 int)
+        '''
+        )
+        
+        tdSql.execute(
+            '''
+            create table t1
+            (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
+            '''
+        )
+        for i in range(4):
+            tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )')
+
+        for i in range(9):
+            tdSql.execute(
+                f"insert into ct1 values ( now()-{i*10}s, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
+            )
+            tdSql.execute(
+                f"insert into ct4 values ( now()-{i*90}d, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
+            )
+        tdSql.execute("insert into ct1 values (now()-45s, 0, 0, 0, 0, 0, 0, 0, 'binary0', 'nchar0', now()+8a )")
+        tdSql.execute("insert into ct1 values (now()+10s, 9, -99999, -999, -99, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
+        tdSql.execute("insert into ct1 values (now()+15s, 9, -99999, -999, -99, -9.99, NULL, 1, 'binary9', 'nchar9', now()+9a )")
+        tdSql.execute("insert into ct1 values (now()+20s, 9, -99999, -999, NULL, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
+
+        tdSql.execute("insert into ct4 values (now()-810d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
+        tdSql.execute("insert into ct4 values (now()-400d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
+        tdSql.execute("insert into ct4 values (now()+90d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL  ) ")
+
+        tdSql.execute(
+            f'''insert into t1 values
+            ( '2020-04-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+            ( '2020-10-21 01:01:01.000', 1, 11111, 111, 11, 1.11, 11.11, 1, "binary1", "nchar1", now()+1a )
+            ( '2020-12-31 01:01:01.000', 2, 22222, 222, 22, 2.22, 22.22, 0, "binary2", "nchar2", now()+2a )
+            ( '2021-01-01 01:01:06.000', 3, 33333, 333, 33, 3.33, 33.33, 0, "binary3", "nchar3", now()+3a )
+            ( '2021-05-07 01:01:10.000', 4, 44444, 444, 44, 4.44, 44.44, 1, "binary4", "nchar4", now()+4a )
+            ( '2021-07-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+            ( '2021-09-30 01:01:16.000', 5, 55555, 555, 55, 5.55, 55.55, 0, "binary5", "nchar5", now()+5a )
+            ( '2022-02-01 01:01:20.000', 6, 66666, 666, 66, 6.66, 66.66, 1, "binary6", "nchar6", now()+6a )
+            ( '2022-10-28 01:01:26.000', 7, 00000, 000, 00, 0.00, 00.00, 1, "binary7", "nchar7", "1970-01-01 08:00:00.000" )
+            ( '2022-12-01 01:01:30.000', 8, -88888, -888, -88, -8.88, -88.88, 0, "binary8", "nchar8", "1969-01-01 01:00:00.000" )
+            ( '2022-12-31 01:01:36.000', 9, -99999999999999999, -999, -99, -9.99, -999999999999999999999.99, 1, "binary9", "nchar9", "1900-01-01 00:00:00.000" )
+            ( '2023-02-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+            '''
+        )
+
+        tdSql.execute("create table tb (ts timestamp , num1 int , num2 int, num3 double , num4 binary(30))")
+        tdSql.execute(
+            f'''insert into tb values
+            ( '2020-04-21 01:01:01.000',   NULL,    1,       1,     "binary1" )
+            ( '2020-10-21 01:01:01.000',   1,       1,      1.11,   "binary1" )
+            ( '2020-12-31 01:01:01.000',   2,    22222,      22,    "binary1" )
+            ( '2021-01-01 01:01:06.000',   3,    33333,      33,    "binary1" )
+            ( '2021-05-07 01:01:10.000',   4,    44444,      44,    "binary1" )
+            ( '2021-07-21 01:01:01.000',   NULL,   NULL,     NULL,  "binary1" )
+            ( '2021-09-30 01:01:16.000',   5,    55555,      55,    "binary1" )
+            ( '2022-02-01 01:01:20.000',   6,    66666,      66,    "binary1" )
+            ( '2022-10-28 01:01:26.000',   0,    00000,      00,    "binary1" )
+            ( '2022-12-01 01:01:30.000',   8,   -88888,     -88,    "binary1" )
+            ( '2022-12-31 01:01:36.000',   9, -9999999,     -99,    "binary1" )
+            ( '2023-02-21 01:01:01.000',  NULL,    NULL,    NULL,   "binary1" )
+            '''
+        )
+
+        # udf functions with join
+        ts_start = 1652517451000
+        tdSql.execute("create stable st (ts timestamp , c1 int , c2 int ,c3 double ,c4 double ) tags(ind int)")
+        tdSql.execute("create table sub1 using st tags(1)")
+        tdSql.execute("create table sub2 using st tags(2)")
+
+        for i in range(10):
+            ts = ts_start + i *1000
+            tdSql.execute(" insert into sub1 values({} , {},{},{},{})".format(ts,i ,i*10,i*100.0,i*1000.0))
+            tdSql.execute(" insert into sub2 values({} , {},{},{},{})".format(ts,i ,i*10,i*100.0,i*1000.0))
+
+
+    def create_udf_function(self):
+
+        for i in range(5):
+            # create  scalar functions
+            tdSql.execute("create function udf1 as '/tmp/udf/libudf1.so' outputtype int bufSize 8;")
+
+            # create aggregate functions
+
+            tdSql.execute("create aggregate function udf2 as '/tmp/udf/libudf2.so' outputtype double bufSize 8;")
+            
+            functions = tdSql.getResult("show functions")
+            function_nums = len(functions)
+            if function_nums == 2:
+                tdLog.info("create two udf functions success ")
+
+            # drop functions
+
+            tdSql.execute("drop function udf1")
+            tdSql.execute("drop function udf2")
+
+            functions = tdSql.getResult("show functions")
+            for function in functions:
+                if "udf1" in function[0] or  "udf2" in function[0]:
+                    tdLog.info("drop udf functions failed ")
+                    tdLog.exit("drop udf functions failed")
+
+                tdLog.info("drop two udf functions success ")
+
+        # create  scalar functions
+        tdSql.execute("create function udf1 as '/tmp/udf/libudf1.so' outputtype int bufSize 8;")
+
+        # create aggregate functions
+
+        tdSql.execute("create aggregate function udf2 as '/tmp/udf/libudf2.so' outputtype double bufSize 8;")
+        
+        functions = tdSql.getResult("show functions")
+        function_nums = len(functions)
+        if function_nums == 2:
+            tdLog.info("create two udf functions success ")
+       
+    def basic_udf_query(self):
+        
+        # scalar functions
+
+        tdSql.execute("use db ")
+        tdSql.query("select num1 , udf1(num1) ,num2 ,udf1(num2),num3 ,udf1(num3),num4 ,udf1(num4) from tb")
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,None)
+        tdSql.checkData(0,2,1)
+        tdSql.checkData(0,3,88)
+        tdSql.checkData(0,4,1.000000000)
+        tdSql.checkData(0,5,88)
+        tdSql.checkData(0,6,"binary1")
+        tdSql.checkData(0,7,88)
+
+        tdSql.checkData(3,0,3)
+        tdSql.checkData(3,1,88)
+        tdSql.checkData(3,2,33333)
+        tdSql.checkData(3,3,88)
+        tdSql.checkData(3,4,33.000000000)
+        tdSql.checkData(3,5,88)
+        tdSql.checkData(3,6,"binary1")
+        tdSql.checkData(3,7,88)
+
+        tdSql.checkData(11,0,None)
+        tdSql.checkData(11,1,None)
+        tdSql.checkData(11,2,None)
+        tdSql.checkData(11,3,None)
+        tdSql.checkData(11,4,None)
+        tdSql.checkData(11,5,None)
+        tdSql.checkData(11,6,"binary1")
+        tdSql.checkData(11,7,88)
+
+        tdSql.query("select c1 , udf1(c1) ,c2 ,udf1(c2), c3 ,udf1(c3), c4 ,udf1(c4) from stb1 order by c1")
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,None)
+        tdSql.checkData(0,2,None)
+        tdSql.checkData(0,3,None)
+        tdSql.checkData(0,4,None)
+        tdSql.checkData(0,5,None)
+        tdSql.checkData(0,6,None)
+        tdSql.checkData(0,7,None)
+
+        tdSql.checkData(20,0,8)
+        tdSql.checkData(20,1,88)
+        tdSql.checkData(20,2,88888)
+        tdSql.checkData(20,3,88)
+        tdSql.checkData(20,4,888)
+        tdSql.checkData(20,5,88)
+        tdSql.checkData(20,6,88)
+        tdSql.checkData(20,7,88)
+
+
+        # aggregate functions
+        tdSql.query("select udf2(num1) ,udf2(num2), udf2(num3) from tb")
+        tdSql.checkData(0,0,15.362291496)
+        tdSql.checkData(0,1,10000949.553189287)
+        tdSql.checkData(0,2,168.633425216)
+
+        # Arithmetic compute
+        tdSql.query("select udf2(num1)+100 ,udf2(num2)-100, udf2(num3)*100 ,udf2(num3)/100 from tb")
+        tdSql.checkData(0,0,115.362291496)
+        tdSql.checkData(0,1,10000849.553189287)
+        tdSql.checkData(0,2,16863.342521576)
+        tdSql.checkData(0,3,1.686334252)
+
+        tdSql.query("select udf2(c1) ,udf2(c6) from stb1 ")
+        tdSql.checkData(0,0,25.514701644)
+        tdSql.checkData(0,1,265.247614504)
+
+        tdSql.query("select udf2(c1)+100 ,udf2(c6)-100 ,udf2(c1)*100 ,udf2(c6)/100 from stb1 ")
+        tdSql.checkData(0,0,125.514701644)
+        tdSql.checkData(0,1,165.247614504)
+        tdSql.checkData(0,2,2551.470164435)
+        tdSql.checkData(0,3,2.652476145)
+        
+        # # bug for crash when query sub table
+        tdSql.query("select udf2(c1+100) ,udf2(c6-100) ,udf2(c1*100) ,udf2(c6/100) from ct1")
+        tdSql.checkData(0,0,378.215547010)
+        tdSql.checkData(0,1,353.808067460)
+        tdSql.checkData(0,2,2114.237451187)
+        tdSql.checkData(0,3,2.125468151)
+
+        tdSql.query("select udf2(c1+100) ,udf2(c6-100) ,udf2(c1*100) ,udf2(c6/100) from stb1 ")
+        tdSql.checkData(0,0,490.358032462)
+        tdSql.checkData(0,1,400.460106627)
+        tdSql.checkData(0,2,2551.470164435)
+        tdSql.checkData(0,3,2.652476145)
+
+
+        # regular table with aggregate functions
+
+        tdSql.error("select udf1(num1) , count(num1) from tb;")
+        tdSql.error("select udf1(num1) , avg(num1) from tb;")
+        tdSql.error("select udf1(num1) , twa(num1) from tb;")
+        tdSql.error("select udf1(num1) , irate(num1) from tb;")
+        tdSql.error("select udf1(num1) , sum(num1) from tb;")
+        tdSql.error("select udf1(num1) , stddev(num1) from tb;")
+        tdSql.error("select udf1(num1) , mode(num1) from tb;")
+        tdSql.error("select udf1(num1) , HYPERLOGLOG(num1) from tb;")
+        # stable 
+        tdSql.error("select udf1(c1) , count(c1) from stb1;")
+        tdSql.error("select udf1(c1) , avg(c1) from stb1;")
+        tdSql.error("select udf1(c1) , twa(c1) from stb1;")
+        tdSql.error("select udf1(c1) , irate(c1) from stb1;")
+        tdSql.error("select udf1(c1) , sum(c1) from stb1;")
+        tdSql.error("select udf1(c1) , stddev(c1) from stb1;")
+        tdSql.error("select udf1(c1) , mode(c1) from stb1;")
+        tdSql.error("select udf1(c1) , HYPERLOGLOG(c1) from stb1;")
+
+        # regular table with select functions
+
+        tdSql.query("select udf1(num1) , max(num1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.query("select floor(num1) , max(num1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.query("select udf1(num1) , min(num1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.query("select ceil(num1) , min(num1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.error("select udf1(num1) , first(num1) from tb;")
+        
+        tdSql.error("select abs(num1) , first(num1) from tb;")
+        
+        tdSql.error("select udf1(num1) , last(num1) from tb;")
+        
+        tdSql.error("select round(num1) , last(num1) from tb;")
+        
+        tdSql.query("select udf1(num1) , top(num1,1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.query("select udf1(num1) , bottom(num1,1) from tb;")
+        tdSql.checkRows(1)
+        tdSql.error("select udf1(num1) , last_row(num1) from tb;")
+       
+        tdSql.error("select round(num1) , last_row(num1) from tb;")
+   
+        
+        # stable 
+        tdSql.query("select udf1(c1) , max(c1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select abs(c1) , max(c1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select udf1(c1) , min(c1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select floor(c1) , min(c1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.error("select udf1(c1) , first(c1) from stb1;")
+        
+        tdSql.error("select udf1(c1) , last(c1) from stb1;")
+        
+        tdSql.query("select udf1(c1) , top(c1 ,1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select abs(c1) , top(c1 ,1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select udf1(c1) , bottom(c1,1) from stb1;")
+        tdSql.checkRows(1)
+        tdSql.query("select ceil(c1) , bottom(c1,1) from stb1;")
+        tdSql.checkRows(1)
+
+        tdSql.error("select udf1(c1) , last_row(c1) from stb1;")
+        tdSql.error("select ceil(c1) , last_row(c1) from stb1;")
+        
+        # regular table with compute functions
+
+        tdSql.query("select udf1(num1) , abs(num1) from tb;")
+        tdSql.checkRows(12)
+        tdSql.query("select floor(num1) , abs(num1) from tb;")
+        tdSql.checkRows(12)
+
+        # # bug need fix 
+
+        #tdSql.query("select udf1(num1) , csum(num1) from tb;")
+        #tdSql.checkRows(9)
+        #tdSql.query("select ceil(num1) , csum(num1) from tb;")
+        #tdSql.checkRows(9)
+        #tdSql.query("select udf1(c1) , csum(c1) from stb1;")
+        #tdSql.checkRows(22)
+        #tdSql.query("select floor(c1) , csum(c1) from stb1;")
+        #tdSql.checkRows(22)
+
+        # stable  with compute functions
+        tdSql.query("select udf1(c1) , abs(c1) from stb1;")
+        tdSql.checkRows(25)
+        tdSql.query("select abs(c1) , ceil(c1) from stb1;")
+        tdSql.checkRows(25)
+
+        # nest query
+        tdSql.query("select abs(udf1(c1)) , abs(ceil(c1)) from stb1 order by ts;")
+        tdSql.checkRows(25)
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,None)
+        tdSql.checkData(1,0,88)
+        tdSql.checkData(1,1,8)
+
+        tdSql.query("select abs(udf1(c1)) , abs(ceil(c1)) from ct1 order by ts;")
+        tdSql.checkRows(13)
+        tdSql.checkData(0,0,88)
+        tdSql.checkData(0,1,8)
+        tdSql.checkData(1,0,88)
+        tdSql.checkData(1,1,7)
+
+        # bug fix for crash 
+        # order by udf function result 
+        for _ in range(50):
+            tdSql.query("select udf2(c1) from stb1 group by 1-udf1(c1)")
+            print(tdSql.queryResult)
+
+        # udf functions with filter
+
+        tdSql.query("select abs(udf1(c1)) , abs(ceil(c1)) from stb1 where c1 is null  order by ts;")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,None)
+
+        tdSql.query("select c1 ,udf1(c1) , c6 ,udf1(c6) from stb1 where c1 > 8  order by ts")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,0,9)
+        tdSql.checkData(0,1,88)
+        tdSql.checkData(0,2,-99.990000000)
+        tdSql.checkData(0,3,88)
+        
+        tdSql.query("select sub1.c1, sub2.c2 from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,0)
+        tdSql.checkData(0,1,0)
+        tdSql.checkData(1,0,1)
+        tdSql.checkData(1,1,10)
+
+        tdSql.query("select udf1(sub1.c1), udf1(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,88)
+        tdSql.checkData(0,1,88)
+        tdSql.checkData(1,0,88)
+        tdSql.checkData(1,1,88)
+
+        tdSql.query("select sub1.c1 , udf1(sub1.c1), sub2.c2 ,udf1(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,0)
+        tdSql.checkData(0,1,88)
+        tdSql.checkData(0,2,0)
+        tdSql.checkData(0,3,88)
+        tdSql.checkData(1,0,1)
+        tdSql.checkData(1,1,88)
+        tdSql.checkData(1,2,10)
+        tdSql.checkData(1,3,88)
+
+        tdSql.query("select udf2(sub1.c1), udf2(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,16.881943016)
+        tdSql.checkData(0,1,168.819430161)
+        tdSql.error("select sub1.c1 , udf2(sub1.c1), sub2.c2 ,udf2(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+
+        # udf functions with  group by 
+        tdSql.query("select udf1(c1) from ct1 group by c1")
+        tdSql.checkRows(10)
+        tdSql.query("select udf1(c1) from stb1 group by c1")
+        tdSql.checkRows(11)
+        tdSql.query("select c1,c2, udf1(c1,c2) from ct1 group by c1,c2")
+        tdSql.checkRows(10)
+        tdSql.query("select c1,c2, udf1(c1,c2) from stb1 group by c1,c2")
+        tdSql.checkRows(11)
+
+        tdSql.query("select udf2(c1) from ct1 group by c1")
+        tdSql.checkRows(10)
+        tdSql.query("select udf2(c1) from stb1 group by c1")
+        tdSql.checkRows(11)
+        tdSql.query("select c1,c2, udf2(c1,c6) from ct1 group by c1,c2")
+        tdSql.checkRows(10)
+        tdSql.query("select c1,c2, udf2(c1,c6) from stb1 group by c1,c2")
+        tdSql.checkRows(11)
+        tdSql.query("select udf2(c1) from stb1 group by udf1(c1)")
+        tdSql.checkRows(2)
+        tdSql.query("select udf2(c1) from stb1 group by floor(c1)")
+        tdSql.checkRows(11)
+
+        # udf mix with order by  
+        tdSql.query("select udf2(c1) from stb1 group by floor(c1) order by udf2(c1)")
+        tdSql.checkRows(11)
+
+
+    def multi_cols_udf(self):
+        tdSql.query("select num1,num2,num3,udf1(num1,num2,num3) from tb")
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,1)
+        tdSql.checkData(0,2,1.000000000)
+        tdSql.checkData(0,3,None)
+        tdSql.checkData(1,0,1)
+        tdSql.checkData(1,1,1)
+        tdSql.checkData(1,2,1.110000000)
+        tdSql.checkData(1,3,88)
+
+        tdSql.query("select c1,c6,udf1(c1,c6) from stb1 order by ts")
+        tdSql.checkData(1,0,8)
+        tdSql.checkData(1,1,88.880000000)
+        tdSql.checkData(1,2,88)
+
+        tdSql.query("select abs(udf1(c1,c6,c1,c6)) , abs(ceil(c1)) from stb1 where c1 is not null  order by ts;")
+        tdSql.checkRows(22)
+
+        tdSql.query("select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+        tdSql.checkData(0,0,169.661427555)
+        tdSql.checkData(0,1,169.661427555)
+
+    def try_query_sql(self):
+        udf1_sqls = [ 
+        "select num1 , udf1(num1) ,num2 ,udf1(num2),num3 ,udf1(num3),num4 ,udf1(num4) from tb" ,
+        "select c1 , udf1(c1) ,c2 ,udf1(c2), c3 ,udf1(c3), c4 ,udf1(c4) from stb1 order by c1" ,
+        "select udf1(num1) , max(num1) from tb;" ,
+        "select udf1(num1) , min(num1) from tb;" ,
+        #"select udf1(num1) , top(num1,1) from tb;" ,
+        #"select udf1(num1) , bottom(num1,1) from tb;" ,
+        "select udf1(c1) , max(c1) from stb1;" ,
+        "select udf1(c1) , min(c1) from stb1;" ,
+        #"select udf1(c1) , top(c1 ,1) from stb1;" ,
+        #"select udf1(c1) , bottom(c1,1) from stb1;" ,
+        "select udf1(num1) , abs(num1) from tb;" ,
+        #"select udf1(num1) , csum(num1) from tb;" ,
+        #"select udf1(c1) , csum(c1) from stb1;" ,
+        "select udf1(c1) , abs(c1) from stb1;" ,
+        "select abs(udf1(c1)) , abs(ceil(c1)) from stb1 order by ts;" ,
+        "select abs(udf1(c1)) , abs(ceil(c1)) from ct1 order by ts;" ,
+        "select abs(udf1(c1)) , abs(ceil(c1)) from stb1 where c1 is null  order by ts;" ,
+        "select c1 ,udf1(c1) , c6 ,udf1(c6) from stb1 where c1 > 8  order by ts" ,
+        "select udf1(sub1.c1), udf1(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select sub1.c1 , udf1(sub1.c1), sub2.c2 ,udf1(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf1(c1) from ct1 group by c1" ,
+        "select udf1(c1) from stb1 group by c1" ,
+        "select c1,c2, udf1(c1,c2) from ct1 group by c1,c2" ,
+        "select c1,c2, udf1(c1,c2) from stb1 group by c1,c2" ,
+        "select num1,num2,num3,udf1(num1,num2,num3) from tb" ,
+        "select c1,c6,udf1(c1,c6) from stb1 order by ts" ,
+        "select abs(udf1(c1,c6,c1,c6)) , abs(ceil(c1)) from stb1 where c1 is not null  order by ts;" 
+        ]
+        udf2_sqls = ["select udf2(sub1.c1), udf2(sub2.c2) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf2(c1) from stb1 group by 1-udf1(c1)" ,
+        "select udf2(num1) ,udf2(num2), udf2(num3) from tb" ,
+        "select udf2(num1)+100 ,udf2(num2)-100, udf2(num3)*100 ,udf2(num3)/100 from tb" ,
+        "select udf2(c1) ,udf2(c6) from stb1 " ,
+        "select udf2(c1)+100 ,udf2(c6)-100 ,udf2(c1)*100 ,udf2(c6)/100 from stb1 " ,
+        "select udf2(c1+100) ,udf2(c6-100) ,udf2(c1*100) ,udf2(c6/100) from ct1" ,
+        "select udf2(c1+100) ,udf2(c6-100) ,udf2(c1*100) ,udf2(c6/100) from stb1 " ,
+        "select udf2(c1) from ct1 group by c1" ,
+        "select udf2(c1) from stb1 group by c1" ,
+        "select c1,c2, udf2(c1,c6) from ct1 group by c1,c2" ,
+        "select c1,c2, udf2(c1,c6) from stb1 group by c1,c2" ,
+        "select udf2(c1) from stb1 group by udf1(c1)" ,
+        "select udf2(c1) from stb1 group by floor(c1)" ,
+        "select udf2(c1) from stb1 group by floor(c1) order by udf2(c1)" ,
+    
+        "select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null" ,
+        "select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null"]
+
+        return udf1_sqls ,udf2_sqls
+
+
+
+    def unexpected_create(self):
+
+        tdLog.info(" create function with out bufsize ")
+        tdSql.query("drop function udf1 ")
+        tdSql.query("drop function udf2 ")
+
+        # create function without buffer
+        tdSql.execute("create function udf1 as '/tmp/udf/libudf1.so' outputtype int")
+        tdSql.execute("create aggregate function udf2 as '/tmp/udf/libudf2.so' outputtype double")
+        udf1_sqls ,udf2_sqls = self.try_query_sql()
+
+        for scalar_sql in udf1_sqls:
+            tdSql.query(scalar_sql)
+        for aggregate_sql in udf2_sqls:
+            tdSql.error(aggregate_sql)
+
+        # create function without aggregate 
+
+        tdLog.info(" create function with out aggregate ")
+        tdSql.query("drop function udf1 ")
+        tdSql.query("drop function udf2 ")
+
+        # create function without buffer
+        tdSql.execute("create  aggregate function udf1 as '/tmp/udf/libudf1.so' outputtype int bufSize 8 ")
+        tdSql.execute("create  function udf2 as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        udf1_sqls ,udf2_sqls = self.try_query_sql()
+
+        for scalar_sql in udf1_sqls:
+            tdSql.error(scalar_sql)
+        for aggregate_sql in udf2_sqls:
+            tdSql.error(aggregate_sql)
+
+        tdSql.execute(" create function db as '/tmp/udf/libudf1.so' outputtype int bufSize 8 ")
+        tdSql.execute(" create aggregate function test as '/tmp/udf/libudf1.so' outputtype int bufSize 8 ")
+        tdSql.error(" select db(c1) from stb1 ")
+        tdSql.error(" select db(c1,c6), db(c6) from stb1 ")
+        tdSql.error(" select db(num1,num2), db(num1) from tb ")
+        tdSql.error(" select test(c1) from stb1 ")
+        tdSql.error(" select test(c1,c6), test(c6) from stb1 ")
+        tdSql.error(" select test(num1,num2), test(num1) from tb ")
+        
+        
+
+    def loop_kill_udfd(self):
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+        
+        cfgPath = buildPath + "/../sim/dnode1/cfg"
+        udfdPath = buildPath +'/build/bin/udfd'
+
+        for i in range(3):
+
+            tdLog.info(" loop restart udfd  %d_th" % i)
+
+            tdSql.query("select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+            tdSql.checkData(0,0,169.661427555)
+            tdSql.checkData(0,1,169.661427555)
+            # stop udfd cmds 
+            get_processID = "ps -ef | grep -w udfd | grep -v grep| grep -v defunct | awk '{print $2}'"
+            processID = subprocess.check_output(get_processID, shell=True).decode("utf-8")
+            stop_udfd = " kill -9 %s" % processID
+            os.system(stop_udfd)
+
+            time.sleep(2)
+            
+            tdSql.query("select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+            tdSql.checkData(0,0,169.661427555)
+            tdSql.checkData(0,1,169.661427555)
+
+            # # start udfd  cmds 
+            # start_udfd = "nohup " + udfdPath +'-c' +cfgPath +" > /dev/null 2>&1 &"
+            # tdLog.info("start udfd : %s " % start_udfd)
+
+    def test_function_name(self):
+        tdLog.info(" create function name is not build_in functions ")
+        tdSql.execute(" drop function udf1 ")
+        tdSql.execute(" drop function udf2 ")
+        tdSql.error("create function max as '/tmp/udf/libudf1.so' outputtype int bufSize 8")
+        tdSql.error("create aggregate function sum as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create function max as '/tmp/udf/libudf1.so' outputtype int bufSize 8")
+        tdSql.error("create aggregate function sum as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function tbname as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function function as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function stable as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function union as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function 123 as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function 123db as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+        tdSql.error("create aggregate function mnode as '/tmp/udf/libudf2.so' outputtype double bufSize 8")
+
+    def restart_taosd_query_udf(self):
+
+        for i in range(3):
+            tdLog.info("  this is %d_th restart taosd " %i)
+            tdSql.execute("use db ")
+            tdSql.query("select count(*) from stb1")
+            tdSql.checkRows(1)
+            tdSql.query("select udf2(sub1.c1 ,sub1.c2), udf2(sub2.c2 ,sub2.c1) from sub1, sub2 where sub1.ts=sub2.ts and sub1.c1 is not null")
+            tdSql.checkData(0,0,169.661427555)
+            tdSql.checkData(0,1,169.661427555)
+            tdDnodes.stop(1)
+            tdDnodes.start(1)
+            time.sleep(2)
+            
+            
+    def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
+        
+        print(" env is ok for all ") 
+        self.prepare_udf_so()
+        self.prepare_data()
+        self.create_udf_function()
+        self.basic_udf_query()
+        self.multi_cols_udf()
+        self.restart_taosd_query_udf()
+       
+        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh
index 275f63007cd962732049086e0a541f1aea260634..ee650b778ef072c0f706a4d4acee8b60b3e5917b 100755
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -8,6 +8,8 @@ python3 ./test.py -f 0-others/taosShellNetChk.py
 python3 ./test.py -f 0-others/telemetry.py
 python3 ./test.py -f 0-others/taosdMonitor.py
 python3 ./test.py -f 0-others/udfTest.py
+python3 ./test.py -f 0-others/udf_create.py
+python3 ./test.py -f 0-others/udf_restart_taosd.py
 
 python3 ./test.py -f 0-others/user_control.py
 python3 ./test.py -f 0-others/fsync.py