diff --git a/source/libs/parser/src/parInsertSql.c b/source/libs/parser/src/parInsertSql.c
index 3fbe23592a8ed2344b4df8898cec9f80c5dc906d..18d65dd47711e445633a4b2969decfab5f5dd07e 100644
--- a/source/libs/parser/src/parInsertSql.c
+++ b/source/libs/parser/src/parInsertSql.c
@@ -1492,6 +1492,7 @@ static void resetEnvPreTable(SInsertParseContext* pCxt, SVnodeModifyOpStmt* pStm
   pStmt->pBoundCols = NULL;
   pStmt->usingTableProcessing = false;
   pStmt->fileProcessing = false;
+  pStmt->usingTableName.type = 0;
 }
 
 // input pStmt->pSql: [(field1_name, ...)] [ USING ... ] VALUES ... | FILE ...
@@ -1539,6 +1540,10 @@ static int32_t checkTableClauseFirstToken(SInsertParseContext* pCxt, SVnodeModif
     }
   }
 
+  if (TK_NK_ID != pTbName->type && TK_NK_STRING != pTbName->type && TK_NK_QUESTION != pTbName->type) {
+    return buildSyntaxErrMsg(&pCxt->msg, "table_name is expected", pTbName->z);
+  }
+
   *pHasData = true;
   return TSDB_CODE_SUCCESS;
 }
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index dac8f61d05520dc509341dc72921bb8ad56b5076..02c38b2653392dad0e559434866a8d5311d891e6 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -6422,14 +6422,16 @@ static int32_t translateCreateFunction(STranslateContext* pCxt, SCreateFunctionS
     return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_FUNCTION_NAME);
   }
 
-  if (TSDB_DATA_TYPE_JSON == pStmt->outputDt.type ||
-      TSDB_DATA_TYPE_VARBINARY == pStmt->outputDt.type ||
-      TSDB_DATA_TYPE_DECIMAL == pStmt->outputDt.type ||
-      TSDB_DATA_TYPE_BLOB == pStmt->outputDt.type ||
+  if (TSDB_DATA_TYPE_JSON == pStmt->outputDt.type || TSDB_DATA_TYPE_VARBINARY == pStmt->outputDt.type ||
+      TSDB_DATA_TYPE_DECIMAL == pStmt->outputDt.type || TSDB_DATA_TYPE_BLOB == pStmt->outputDt.type ||
       TSDB_DATA_TYPE_MEDIUMBLOB == pStmt->outputDt.type) {
     return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_SYNTAX_ERROR, "Unsupported output type for UDF");
   }
 
+  if (!pStmt->isAgg && pStmt->bufSize > 0) {
+    return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_SYNTAX_ERROR, "BUFSIZE can only be used with UDAF");
+  }
+
   SCreateFuncReq req = {0};
   strcpy(req.name, pStmt->funcName);
   req.igExists = pStmt->ignoreExists;
diff --git a/tests/script/tsim/query/udf.sim b/tests/script/tsim/query/udf.sim
index 66a3d811a15c499043a4839a57ee8704f3be7d29..e539f115317abcd2b64279ec476f8f3464a559d5 100644
--- a/tests/script/tsim/query/udf.sim
+++ b/tests/script/tsim/query/udf.sim
@@ -23,10 +23,10 @@ if $system_content == Windows_NT then
   return 0;
 endi
 if $system_content == Windows_NT then
-  sql create function bit_and as 'C:\\Windows\\Temp\\bitand.dll' outputtype int bufSize 8;
+  sql create function bit_and as 'C:\\Windows\\Temp\\bitand.dll' outputtype int;
   sql create aggregate function l2norm as 'C:\\Windows\\Temp\\l2norm.dll' outputtype double bufSize 8;
 else
-  sql create function bit_and as '/tmp/udf/libbitand.so' outputtype int bufSize 8;
+  sql create function bit_and as '/tmp/udf/libbitand.so' outputtype int;
   sql create aggregate function l2norm as '/tmp/udf/libl2norm.so' outputtype double bufSize 8;
 endi
 
diff --git a/tests/script/tsim/query/udf_with_const.sim b/tests/script/tsim/query/udf_with_const.sim
index 7a2a3389bd155e1c384823ce94c3fdd96b14139e..4a12dd68682a1afe39bf31be1b5b249d2433ee72 100644
--- a/tests/script/tsim/query/udf_with_const.sim
+++ b/tests/script/tsim/query/udf_with_const.sim
@@ -23,9 +23,9 @@ if $system_content == Windows_NT then
 endi
 
 if $system_content == Windows_NT then
-  sql create function gpd as 'C:\\Windows\\Temp\\gpd.dll' outputtype int bufSize 8;
+  sql create function gpd as 'C:\\Windows\\Temp\\gpd.dll' outputtype int;
 else
-  sql create function gpd as '/tmp/udf/libgpd.so' outputtype int bufSize 8;
+  sql create function gpd as '/tmp/udf/libgpd.so' outputtype int;
 endi
 sql show functions;
 if $rows != 1 then
diff --git a/tests/script/tsim/query/udfpy.sim b/tests/script/tsim/query/udfpy.sim
index 7a5aa863cfe3705b110039883e79e5711527700f..2340235daa37edbbf11ca018c36eb462d9980231 100644
--- a/tests/script/tsim/query/udfpy.sim
+++ b/tests/script/tsim/query/udfpy.sim
@@ -29,10 +29,10 @@ if $system_content == Windows_NT then
   return 0;
 endi
 if $system_content == Windows_NT then
-  sql create function bit_and as 'C:\\Windows\\Temp\\bitand.dll' outputtype int bufSize 8;
+  sql create function bit_and as 'C:\\Windows\\Temp\\bitand.dll' outputtype int;
   sql create aggregate function l2norm as 'C:\\Windows\\Temp\\l2norm.dll' outputtype double bufSize 8;
 else
-  sql create function bit_and as '/tmp/udf/libbitand.so' outputtype int bufSize 8;
+  sql create function bit_and as '/tmp/udf/libbitand.so' outputtype int;
   sql create aggregate function l2norm as '/tmp/udf/libl2norm.so' outputtype double bufSize 8;
 endi
 sql create function pybitand as '/tmp/pyudf/pybitand.py' outputtype int language 'python';
diff --git a/tests/script/tsim/valgrind/checkUdf.sim b/tests/script/tsim/valgrind/checkUdf.sim
index caf316bd868a057cd8a161817c85d8664a9db82e..dc703e155d3bacf2ed17648c0020192f5bf77eab 100644
--- a/tests/script/tsim/valgrind/checkUdf.sim
+++ b/tests/script/tsim/valgrind/checkUdf.sim
@@ -15,10 +15,10 @@ sql insert into t values(now, 1)(now+1s, 2);
 
 system_content printf %OS%
 if $system_content == Windows_NT then
-  sql create function udf1 as 'C:\\Windows\\Temp\\udf1.dll' outputtype int bufSize 8;
+  sql create function udf1 as 'C:\\Windows\\Temp\\udf1.dll' outputtype int;
   sql create aggregate function udf2 as 'C:\\Windows\\Temp\\udf2.dll' outputtype double bufSize 8;
 else
-  sql create function udf1 as '/tmp/udf/libudf1.so' outputtype int bufSize 8;
+  sql create function udf1 as '/tmp/udf/libudf1.so' outputtype int;
   sql create aggregate function udf2 as '/tmp/udf/libudf2.so' outputtype double bufSize 8;
 endi
 sql show functions;
diff --git a/tests/system-test/0-others/udfTest.py b/tests/system-test/0-others/udfTest.py
index 15253df0c4eda40378ed2c875f01a8448f73003d..da77078208d5f54eb8b4d09ab5e489bb9eb2f1ff 100644
--- a/tests/system-test/0-others/udfTest.py
+++ b/tests/system-test/0-others/udfTest.py
@@ -146,7 +146,7 @@ class TDTestCase:
 
         for i in range(5):
             # create  scalar functions
-            tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+            tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
             # create aggregate functions
 
@@ -171,7 +171,7 @@ class TDTestCase:
                 tdLog.info("drop two udf functions success ")
 
         # create  scalar functions
-        tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+        tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
         # create aggregate functions
 
@@ -562,7 +562,7 @@ class TDTestCase:
 
         # create function without buffer
         tdSql.execute("create  aggregate function udf1 as '%s' outputtype int bufSize 8 "%self.libudf1)
-        tdSql.execute("create  function udf2 as '%s' outputtype double bufSize 8"%self.libudf2)
+        tdSql.execute("create  function udf2 as '%s' outputtype double"%self.libudf2)
         udf1_sqls ,udf2_sqls = self.try_query_sql()
 
         for scalar_sql in udf1_sqls:
@@ -570,7 +570,7 @@ class TDTestCase:
         for aggregate_sql in udf2_sqls:
             tdSql.error(aggregate_sql)
 
-        tdSql.execute(" create function db as '%s' outputtype int bufSize 8 "%self.libudf1)
+        tdSql.execute(" create function db as '%s' outputtype int "%self.libudf1)
         tdSql.execute(" create aggregate function test as '%s' outputtype int bufSize 8 "%self.libudf1)
         tdSql.error(" select db(c1) from stb1 ")
         tdSql.error(" select db(c1,c6), db(c6) from stb1 ")
@@ -619,9 +619,9 @@ class TDTestCase:
         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 '%s' outputtype int bufSize 8"%self.libudf1)
+        tdSql.error("create function max as '%s' outputtype int "%self.libudf1)
         tdSql.error("create aggregate function sum as '%s' outputtype double bufSize 8"%self.libudf2)
-        tdSql.error("create function max as '%s' outputtype int bufSize 8"%self.libudf1)
+        tdSql.error("create function max as '%s' outputtype int "%self.libudf1)
         tdSql.error("create aggregate function sum as '%s' outputtype double bufSize 8"%self.libudf2)
         tdSql.error("create aggregate function tbname as '%s' outputtype double bufSize 8"%self.libudf2)
         tdSql.error("create aggregate function function as '%s' outputtype double bufSize 8"%self.libudf2)
diff --git a/tests/system-test/0-others/udf_cfg1.py b/tests/system-test/0-others/udf_cfg1.py
index 35d43ea9b73eedc7b9432cf0590d90927ad2932c..913e5fcca14283579f6d2cc72d9674b448fc0c2b 100644
--- a/tests/system-test/0-others/udf_cfg1.py
+++ b/tests/system-test/0-others/udf_cfg1.py
@@ -148,7 +148,7 @@ class TDTestCase:
 
         for i in range(5):
             # create  scalar functions
-            tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+            tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
             # create aggregate functions
 
@@ -173,7 +173,7 @@ class TDTestCase:
                 tdLog.info("drop two udf functions success ")
 
         # create  scalar functions
-        tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+        tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
         # create aggregate functions
 
diff --git a/tests/system-test/0-others/udf_cfg2.py b/tests/system-test/0-others/udf_cfg2.py
index 869cb098e2e0415acf931179dc4e6887aa781f4a..cc6da81847126d91e2aed8c14f11ebfbc0729b01 100644
--- a/tests/system-test/0-others/udf_cfg2.py
+++ b/tests/system-test/0-others/udf_cfg2.py
@@ -148,7 +148,7 @@ class TDTestCase:
 
         for i in range(5):
             # create  scalar functions
-            tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+            tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
             # create aggregate functions
 
@@ -173,7 +173,7 @@ class TDTestCase:
                 tdLog.info("drop two udf functions success ")
 
         # create  scalar functions
-        tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+        tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
         # create aggregate functions
 
@@ -564,7 +564,7 @@ class TDTestCase:
 
         # create function without buffer
         tdSql.execute("create  aggregate function udf1 as '%s' outputtype int bufSize 8 "%self.libudf1)
-        tdSql.execute("create  function udf2 as '%s' outputtype double bufSize 8"%self.libudf2)
+        tdSql.execute("create  function udf2 as '%s' outputtype double"%self.libudf2)
         udf1_sqls ,udf2_sqls = self.try_query_sql()
 
         for scalar_sql in udf1_sqls:
@@ -572,7 +572,7 @@ class TDTestCase:
         for aggregate_sql in udf2_sqls:
             tdSql.error(aggregate_sql)
 
-        tdSql.execute(" create function db as '%s' outputtype int bufSize 8 "%self.libudf1)
+        tdSql.execute(" create function db as '%s' outputtype int "%self.libudf1)
         tdSql.execute(" create aggregate function test as '%s' outputtype int bufSize 8 "%self.libudf1)
         tdSql.error(" select db(c1) from stb1 ")
         tdSql.error(" select db(c1,c6), db(c6) from stb1 ")
@@ -621,9 +621,9 @@ class TDTestCase:
         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 '%s' outputtype int bufSize 8"%self.libudf1)
+        tdSql.error("create function max as '%s' outputtype int"%self.libudf1)
         tdSql.error("create aggregate function sum as '%s' outputtype double bufSize 8"%self.libudf2)
-        tdSql.error("create function max as '%s' outputtype int bufSize 8"%self.libudf1)
+        tdSql.error("create function max as '%s' outputtype int"%self.libudf1)
         tdSql.error("create aggregate function sum as '%s' outputtype double bufSize 8"%self.libudf2)
         tdSql.error("create aggregate function tbname as '%s' outputtype double bufSize 8"%self.libudf2)
         tdSql.error("create aggregate function function as '%s' outputtype double bufSize 8"%self.libudf2)
diff --git a/tests/system-test/0-others/udf_create.py b/tests/system-test/0-others/udf_create.py
index 65dad6400041e8c52d39d0ff4e484bdc29099894..d35688c8dae3c419084e2f0414c5fb9031a4bea3 100644
--- a/tests/system-test/0-others/udf_create.py
+++ b/tests/system-test/0-others/udf_create.py
@@ -148,7 +148,7 @@ class TDTestCase:
 
         for i in range(5):
             # create  scalar functions
-            tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+            tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
             # create aggregate functions
 
@@ -173,7 +173,7 @@ class TDTestCase:
                 tdLog.info("drop two udf functions success ")
 
         # create  scalar functions
-        tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+        tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
         # create aggregate functions
 
@@ -574,7 +574,7 @@ class TDTestCase:
 
         # create function without buffer
         tdSql.execute("create  aggregate function udf1 as '%s' outputtype int bufSize 8 "%self.libudf1)
-        tdSql.execute("create  function udf2 as '%s' outputtype double bufSize 8"%self.libudf2)
+        tdSql.execute("create  function udf2 as '%s' outputtype double "%self.libudf2)
         udf1_sqls ,udf2_sqls = self.try_query_sql()
 
         for scalar_sql in udf1_sqls:
@@ -582,7 +582,7 @@ class TDTestCase:
         for aggregate_sql in udf2_sqls:
             tdSql.error(aggregate_sql)
 
-        tdSql.execute(" create function db as '%s' outputtype int bufSize 8 "%self.libudf1)
+        tdSql.execute(" create function db as '%s' outputtype int "%self.libudf1)
         tdSql.execute(" create aggregate function test as '%s' outputtype int bufSize 8 "%self.libudf1)
         tdSql.error(" select db(c1) from stb1 ")
         tdSql.error(" select db(c1,c6), db(c6) from stb1 ")
@@ -631,9 +631,9 @@ class TDTestCase:
         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 '%s' outputtype int bufSize 8"%self.libudf1)
+        tdSql.error("create function max as '%s' outputtype int"%self.libudf1)
         tdSql.error("create aggregate function sum as '%s' outputtype double bufSize 8"%self.libudf2)
-        tdSql.error("create function max as '%s' outputtype int bufSize 8"%self.libudf1)
+        tdSql.error("create function max as '%s' outputtype int"%self.libudf1)
         tdSql.error("create aggregate function sum as '%s' outputtype double bufSize 8"%self.libudf2)
         tdSql.error("create aggregate function tbname as '%s' outputtype double bufSize 8"%self.libudf2)
         tdSql.error("create aggregate function function as '%s' outputtype double bufSize 8"%self.libudf2)
diff --git a/tests/system-test/0-others/udf_restart_taosd.py b/tests/system-test/0-others/udf_restart_taosd.py
index dae707520f55e2e2c6b02c60e5d9015f8c613d3d..a0f70ccd49be9884ad1c0eeb5b7ee91c67ea4bee 100644
--- a/tests/system-test/0-others/udf_restart_taosd.py
+++ b/tests/system-test/0-others/udf_restart_taosd.py
@@ -145,7 +145,7 @@ class TDTestCase:
 
         for i in range(5):
             # create  scalar functions
-            tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+            tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
             # create aggregate functions
 
@@ -170,7 +170,7 @@ class TDTestCase:
                 tdLog.info("drop two udf functions success ")
 
         # create  scalar functions
-        tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+        tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
         # create aggregate functions
 
@@ -561,7 +561,7 @@ class TDTestCase:
 
         # create function without buffer
         tdSql.execute("create  aggregate function udf1 as '%s' outputtype int bufSize 8 "%self.libudf1)
-        tdSql.execute("create  function udf2 as '%s' outputtype double bufSize 8"%self.libudf2)
+        tdSql.execute("create  function udf2 as '%s' outputtype double"%self.libudf2)
         udf1_sqls ,udf2_sqls = self.try_query_sql()
 
         for scalar_sql in udf1_sqls:
@@ -569,7 +569,7 @@ class TDTestCase:
         for aggregate_sql in udf2_sqls:
             tdSql.error(aggregate_sql)
 
-        tdSql.execute(" create function db as '%s' outputtype int bufSize 8 "%self.libudf1)
+        tdSql.execute(" create function db as '%s' outputtype int "%self.libudf1)
         tdSql.execute(" create aggregate function test as '%s' outputtype int bufSize 8 "%self.libudf1)
         tdSql.error(" select db(c1) from stb1 ")
         tdSql.error(" select db(c1,c6), db(c6) from stb1 ")
@@ -618,9 +618,9 @@ class TDTestCase:
         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 '%s' outputtype int bufSize 8"%self.libudf1)
+        tdSql.error("create function max as '%s' outputtype int"%self.libudf1)
         tdSql.error("create aggregate function sum as '%s' outputtype double bufSize 8"%self.libudf2)
-        tdSql.error("create function max as '%s' outputtype int bufSize 8"%self.libudf1)
+        tdSql.error("create function max as '%s' outputtype int"%self.libudf1)
         tdSql.error("create aggregate function sum as '%s' outputtype double bufSize 8"%self.libudf2)
         tdSql.error("create aggregate function tbname as '%s' outputtype double bufSize 8"%self.libudf2)
         tdSql.error("create aggregate function function as '%s' outputtype double bufSize 8"%self.libudf2)
diff --git a/tests/system-test/7-tmq/tmqUdf-multCtb-snapshot0.py b/tests/system-test/7-tmq/tmqUdf-multCtb-snapshot0.py
index 297429b495b4bbc42e6d53a58295ef306b5d6903..5b17d3f5838db2dbb4baebab20489527ac70c788 100644
--- a/tests/system-test/7-tmq/tmqUdf-multCtb-snapshot0.py
+++ b/tests/system-test/7-tmq/tmqUdf-multCtb-snapshot0.py
@@ -50,7 +50,7 @@ class TDTestCase:
 
     def create_udf_function(self):
         # create  scalar functions
-        tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+        tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
         functions = tdSql.getResult("show functions")
         function_nums = len(functions)
diff --git a/tests/system-test/7-tmq/tmqUdf-multCtb-snapshot1.py b/tests/system-test/7-tmq/tmqUdf-multCtb-snapshot1.py
index 9c139b50de71902d743236c503d6cca12cb8296a..0a7bf5e3499d592da04757f80773d3fa8e37cbb0 100644
--- a/tests/system-test/7-tmq/tmqUdf-multCtb-snapshot1.py
+++ b/tests/system-test/7-tmq/tmqUdf-multCtb-snapshot1.py
@@ -50,7 +50,7 @@ class TDTestCase:
 
     def create_udf_function(self):
         # create  scalar functions
-        tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+        tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
         functions = tdSql.getResult("show functions")
         function_nums = len(functions)
diff --git a/tests/system-test/7-tmq/tmqUdf.py b/tests/system-test/7-tmq/tmqUdf.py
index 8593fd4f1e5969d9eb8083a66200301a6524d8c1..5a0a0481d70debda6f7e4aacf4982b28eba5d928 100644
--- a/tests/system-test/7-tmq/tmqUdf.py
+++ b/tests/system-test/7-tmq/tmqUdf.py
@@ -50,7 +50,7 @@ class TDTestCase:
 
     def create_udf_function(self):
         # create  scalar functions
-        tdSql.execute("create function udf1 as '%s' outputtype int bufSize 8;"%self.libudf1)
+        tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
 
         functions = tdSql.getResult("show functions")
         function_nums = len(functions)