diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c
index bf60d25976..68bfa99ead 100644
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
@@ -72,7 +72,7 @@ for (int i = 1; i < keyLen; ++i) {      \
 #define NCHAR_ADD_LEN 3         // L"nchar"   3 means L" "
 
 #define MAX_RETRY_TIMES 5
-#define LINE_BATCH  20
+#define LINE_BATCH  20000
 //=================================================================================================
 typedef TSDB_SML_PROTOCOL_TYPE SMLProtocolType;
 
@@ -161,7 +161,6 @@ typedef struct {
 
 typedef struct{
   SRequestObj*    request;
-  SCatalog*       catalog;
   tsem_t          sem;
   TdThreadSpinlock lock;
 } Params;
@@ -1292,9 +1291,46 @@ static void smlDestroyTableInfo(SSmlHandle* info, SSmlTableInfo *tag){
   taosMemoryFree(tag);
 }
 
+static int32_t smlKvTimeArrayCompare(const void* key1, const void* key2) {
+  SArray *s1 = *(SArray **)key1;
+  SArray *s2 = *(SArray **)key2;
+  SSmlKv *kv1 = (SSmlKv *)taosArrayGetP(s1, 0);
+  SSmlKv *kv2 = (SSmlKv *)taosArrayGetP(s2, 0);
+  ASSERT(kv1->type == TSDB_DATA_TYPE_TIMESTAMP);
+  ASSERT(kv2->type == TSDB_DATA_TYPE_TIMESTAMP);
+  if (kv1->i < kv2->i) {
+    return -1;
+  } else if (kv1->i > kv2->i) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+static int32_t smlKvTimeHashCompare(const void* key1, const void* key2) {
+  SHashObj *s1 = *(SHashObj **)key1;
+  SHashObj *s2 = *(SHashObj **)key2;
+  SSmlKv *kv1 = (SSmlKv *)taosHashGet(s1, TS, TS_LEN);
+  SSmlKv *kv2 = (SSmlKv *)taosHashGet(s2, TS, TS_LEN);
+  ASSERT(kv1->type == TSDB_DATA_TYPE_TIMESTAMP);
+  ASSERT(kv2->type == TSDB_DATA_TYPE_TIMESTAMP);
+  if (kv1->i < kv2->i) {
+    return -1;
+  } else if (kv1->i > kv2->i) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
 static int32_t smlDealCols(SSmlTableInfo* oneTable, bool dataFormat, SArray *cols){
   if(dataFormat){
-    taosArrayPush(oneTable->cols, &cols);
+    void *p = taosArraySearch(oneTable->cols, &cols, smlKvTimeArrayCompare, TD_GE);
+    if(p == NULL){
+      taosArrayPush(oneTable->cols, &cols);
+    }else{
+      taosArrayInsert(oneTable->cols, TARRAY_ELEM_IDX(oneTable->cols, p), &cols);
+    }
     return TSDB_CODE_SUCCESS;
   }
 
@@ -1307,8 +1343,13 @@ static int32_t smlDealCols(SSmlTableInfo* oneTable, bool dataFormat, SArray *col
     SSmlKv *kv = (SSmlKv *)taosArrayGetP(cols, i);
     taosHashPut(kvHash, kv->key, kv->keyLen, &kv, POINTER_BYTES);
   }
-  taosArrayPush(oneTable->cols, &kvHash);
 
+  void *p = taosArraySearch(oneTable->cols, &kvHash, smlKvTimeHashCompare, TD_GE);
+  if(p == NULL){
+    taosArrayPush(oneTable->cols, &kvHash);
+  }else{
+    taosArrayInsert(oneTable->cols, TARRAY_ELEM_IDX(oneTable->cols, p), &kvHash);
+  }
   return TSDB_CODE_SUCCESS;
 }
 
@@ -1419,6 +1460,11 @@ static SSmlHandle* smlBuildSmlInfo(TAOS* taos, SRequestObj* request, SMLProtocol
   ((SVnodeModifOpStmt*)(info->pQuery->pRoot))->payloadType = PAYLOAD_TYPE_KV;
 
   info->taos        = (STscObj *)taos;
+  code = catalogGetHandle(info->taos->pAppInfo->clusterId, &info->pCatalog);
+  if(code != TSDB_CODE_SUCCESS){
+    uError("SML:0x%"PRIx64" get catalog error %d", info->id, code);
+    goto cleanup;
+  }
 
   info->precision   = precision;
   info->protocol    = protocol;
@@ -2196,6 +2242,7 @@ static int32_t smlInsertData(SSmlHandle* info) {
     code = smlBindData(info->exec, tableData->tags, (*pMeta)->cols, tableData->cols, info->dataFormat,
                        (*pMeta)->tableMeta, tableData->childTableName, info->msgBuf.buf, info->msgBuf.len);
     if(code != TSDB_CODE_SUCCESS){
+      uError("SML:0x%"PRIx64" smlBindData failed", info->id);
       return code;
     }
     oneTable = (SSmlTableInfo**)taosHashIterate(info->childTables, oneTable);
@@ -2261,7 +2308,7 @@ static int smlProcess(SSmlHandle *info, char* lines[], int numLines) {
   code = smlParseLine(info, lines, numLines);
   if (code != 0) {
     uError("SML:0x%"PRIx64" smlParseLine error : %s", info->id, tstrerror(code));
-    goto cleanup;
+    return code;
   }
 
   info->cost.lineNum = numLines;
@@ -2277,24 +2324,27 @@ static int smlProcess(SSmlHandle *info, char* lines[], int numLines) {
 
   if (code != 0) {
     uError("SML:0x%"PRIx64" smlModifyDBSchemas error : %s", info->id, tstrerror(code));
-    goto cleanup;
+    return code;
   }
 
   info->cost.insertBindTime = taosGetTimestampUs();
   code = smlInsertData(info);
   if (code != 0) {
     uError("SML:0x%"PRIx64" smlInsertData error : %s", info->id, tstrerror(code));
-    goto cleanup;
+    return code;
   }
-  info->cost.endTime = taosGetTimestampUs();
 
-cleanup:
-  info->cost.code = code;
-  smlPrintStatisticInfo(info);
   return code;
 }
 
-static int32_t isSchemalessDb(STscObj *taos, SCatalog *catalog){
+static int32_t isSchemalessDb(STscObj *taos){
+  SCatalog* catalog = NULL;
+  int32_t code = catalogGetHandle(((STscObj *)taos)->pAppInfo->clusterId, &catalog);
+  if(code != TSDB_CODE_SUCCESS){
+    uError("SML get catalog error %d", code);
+    return code;
+  }
+
   SName          name;
   tNameSetDbName(&name, taos->acctId, taos->db, strlen(taos->db));
   char dbFname[TSDB_DB_FNAME_LEN] = {0};
@@ -2302,7 +2352,7 @@ static int32_t isSchemalessDb(STscObj *taos, SCatalog *catalog){
   SDbCfgInfo pInfo = {0};
   SEpSet ep = getEpSet_s(&taos->pAppInfo->mgmtEp);
 
-  int32_t code = catalogGetDBCfg(catalog, taos->pAppInfo->pTransporter, &ep, dbFname, &pInfo);
+  code = catalogGetDBCfg(catalog, taos->pAppInfo->pTransporter, &ep, dbFname, &pInfo);
   if (code != TSDB_CODE_SUCCESS) {
     return code;
   }
@@ -2329,6 +2379,9 @@ static void smlInsertCallback(void* param, void* res, int32_t code) {
   printf("SML:0x%" PRIx64 " insert finished, code: %d, total: %d\n", info->id, code, info->affectedRows);
   Params *pParam = info->params;
   bool isLast = info->isLast;
+  info->cost.endTime = taosGetTimestampUs();
+  info->cost.code = code;
+  smlPrintStatisticInfo(info);
   smlDestroyInfo(info);
 
   if(isLast){
@@ -2373,20 +2426,13 @@ TAOS_RES* taos_schemaless_insert(TAOS* taos, char* lines[], int numLines, int pr
   tsem_init(&params.sem, 0, 0);
   taosThreadSpinInit(&(params.lock), 0);
 
-  int32_t code = catalogGetHandle(((STscObj *)taos)->pAppInfo->clusterId, &params.catalog);
-  if(code != TSDB_CODE_SUCCESS){
-    uError("SML get catalog error %d", code);
-    request->code = code;
-    goto end;
-  }
-
   if(request->pDb == NULL){
     request->code = TSDB_CODE_PAR_DB_NOT_SPECIFIED;
     smlBuildInvalidDataMsg(&msg, "Database not specified", NULL);
     goto end;
   }
 
-  if(isSchemalessDb(((STscObj *)taos), params.catalog) != TSDB_CODE_SUCCESS){
+  if(isSchemalessDb(((STscObj *)taos)) != TSDB_CODE_SUCCESS){
     request->code = TSDB_CODE_SML_INVALID_DB_CONF;
     smlBuildInvalidDataMsg(&msg, "Cannot write data to a non schemaless database", NULL);
     goto end;
@@ -2436,11 +2482,10 @@ TAOS_RES* taos_schemaless_insert(TAOS* taos, char* lines[], int numLines, int pr
     }
 
     info->params = &params;
-    info->pCatalog = params.catalog;
     info->affectedRows = perBatch;
     info->pRequest->body.queryFp = smlInsertCallback;
     info->pRequest->body.param   = info;
-    code = smlProcess(info, lines, perBatch);
+    int32_t code = smlProcess(info, lines, perBatch);
     lines += perBatch;
     if (code != TSDB_CODE_SUCCESS){
       info->pRequest->body.queryFp(info, req, code);
diff --git a/source/client/test/smlTest.cpp b/source/client/test/smlTest.cpp
index 25bf13a113..49e26a818f 100644
--- a/source/client/test/smlTest.cpp
+++ b/source/client/test/smlTest.cpp
@@ -476,22 +476,39 @@ TEST(testCase, smlParseCols_Test) {
   taosMemoryFree(sql);
 }
 
+TEST(testCase, smlGetTimestampLen_Test) {
+  uint8_t len = smlGetTimestampLen(0);
+  ASSERT_EQ(len, 1);
+
+  len = smlGetTimestampLen(1);
+  ASSERT_EQ(len, 1);
+
+  len = smlGetTimestampLen(10);
+  ASSERT_EQ(len, 2);
+
+  len = smlGetTimestampLen(390);
+  ASSERT_EQ(len, 3);
+
+  len = smlGetTimestampLen(-1);
+  ASSERT_EQ(len, 1);
+
+  len = smlGetTimestampLen(-10);
+  ASSERT_EQ(len, 2);
+
+  len = smlGetTimestampLen(-390);
+  ASSERT_EQ(len, 3);
+}
+
 TEST(testCase, smlProcess_influx_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists inflx_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists inflx_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use inflx_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj*)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_LINE_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-
   const char *sql[] = {
     "readings,name=truck_0,fleet=South,driver=Trish,model=H-2,device_version=v2.3 load_capacity=1500,fuel_capacity=150,nominal_fuel_consumption=12,latitude=52.31854,longitude=4.72037,elevation=124,velocity=0,heading=221,grade=0 1451606401000000000",
     "readings,name=truck_0,fleet=South,driver=Trish,model=H-2,device_version=v2.3 load_capacity=1500,fuel_capacity=150,nominal_fuel_consumption=12,latitude=52.31854,longitude=4.72037,elevation=124,velocity=0,heading=221,grade=0,fuel_consumption=25 1451607402000000000",
@@ -505,19 +522,20 @@ TEST(testCase, smlProcess_influx_Test) {
     "stable,t1=t1,t2=t2,t3=t3 c1=1,c2=2,c3=\"kk\",c4=4 1451629501000000000",
     "stable,t2=t2,t1=t1,t3=t3 c1=1,c3=\"\",c4=4 1451629602000000000",
   };
-  int ret = smlProcess(info, (char**)sql, sizeof(sql)/sizeof(sql[0]));
-  ASSERT_EQ(ret, 0);
+  pRes = taos_schemaless_insert(taos, (char**)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_LINE_PROTOCOL, 0);
+  ASSERT_EQ(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 
   // case 1
-  TAOS_RES *res = taos_query(taos, "select * from t_91e0b182be80332b5c530cbf872f760e");
-  ASSERT_NE(res, nullptr);
-  int fieldNum = taos_field_count(res);
+  pRes = taos_query(taos, "select * from t_91e0b182be80332b5c530cbf872f760e");
+  ASSERT_NE(pRes, nullptr);
+  int fieldNum = taos_field_count(pRes);
   ASSERT_EQ(fieldNum, 11);
   printf("fieldNum:%d\n", fieldNum);
 
   TAOS_ROW row = NULL;
   int32_t rowIndex = 0;
-  while((row = taos_fetch_row(res)) != NULL) {
+  while((row = taos_fetch_row(pRes)) != NULL) {
     int64_t ts = *(int64_t*)row[0];
     double load_capacity = *(double*)row[1];
     double fuel_capacity = *(double*)row[2];
@@ -546,18 +564,18 @@ TEST(testCase, smlProcess_influx_Test) {
     }
     rowIndex++;
   }
-  taos_free_result(res);
+  taos_free_result(pRes);
 
   // case 2
-  res = taos_query(taos, "select * from t_6885c584b98481584ee13dac399e173d");
-  ASSERT_NE(res, nullptr);
-  fieldNum = taos_field_count(res);
+  pRes = taos_query(taos, "select * from t_6885c584b98481584ee13dac399e173d");
+  ASSERT_NE(pRes, nullptr);
+  fieldNum = taos_field_count(pRes);
   ASSERT_EQ(fieldNum, 5);
   printf("fieldNum:%d\n", fieldNum);
 
   rowIndex = 0;
-  while((row = taos_fetch_row(res)) != NULL) {
-    int *length = taos_fetch_lengths(res);
+  while((row = taos_fetch_row(pRes)) != NULL) {
+    int *length = taos_fetch_lengths(pRes);
 
     int64_t ts = *(int64_t*)row[0];
     double c1 = *(double*)row[1];
@@ -580,20 +598,16 @@ TEST(testCase, smlProcess_influx_Test) {
     }
     rowIndex++;
   }
-  taos_free_result(res);
+  taos_free_result(pRes);
 
   // case 2
-  res = taos_query(taos, "show tables");
-  ASSERT_NE(res, nullptr);
+  pRes = taos_query(taos, "show tables");
+  ASSERT_NE(pRes, nullptr);
 
-  row = taos_fetch_row(res);
-  int rowNum = taos_affected_rows(res);
+  row = taos_fetch_row(pRes);
+  int rowNum = taos_affected_rows(pRes);
   ASSERT_EQ(rowNum, 5);
-  taos_free_result(res);
-
-
-  destroyRequest(request);
-  smlDestroyInfo(info);
+  taos_free_result(pRes);
 }
 
 // different types
@@ -601,122 +615,79 @@ TEST(testCase, smlParseLine_error_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj*)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_LINE_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-
   const char *sql[] = {
       "measure,t1=3 c1=8",
       "measure,t2=3 c1=8u8"
   };
-  int ret = smlProcess(info, (char **)sql, sizeof(sql)/sizeof(sql[0]));
-  ASSERT_NE(ret, 0);
-  destroyRequest(request);
-  smlDestroyInfo(info);
-}
-
-TEST(testCase, smlGetTimestampLen_Test) {
-  uint8_t len = smlGetTimestampLen(0);
-  ASSERT_EQ(len, 1);
-
-  len = smlGetTimestampLen(1);
-  ASSERT_EQ(len, 1);
-
-  len = smlGetTimestampLen(10);
-  ASSERT_EQ(len, 2);
-
-  len = smlGetTimestampLen(390);
-  ASSERT_EQ(len, 3);
-
-  len = smlGetTimestampLen(-1);
-  ASSERT_EQ(len, 1);
-
-  len = smlGetTimestampLen(-10);
-  ASSERT_EQ(len, 2);
-
-  len = smlGetTimestampLen(-390);
-  ASSERT_EQ(len, 3);
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_LINE_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  ASSERT_NE(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, smlProcess_telnet_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists telnet_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists telnet_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use telnet_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj*)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_TELNET_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-
   const char *sql[] = {
      "sys.if.bytes.out  1479496100 1.3E0 host=web01 interface=eth0",
      "sys.if.bytes.out  1479496101 1.3E1 interface=eth0    host=web01   ",
      "sys.if.bytes.out  1479496102 1.3E3 network=tcp",
      " sys.procs.running   1479496100 42 host=web01   "
   };
-  int ret = smlProcess(info, (char**)sql, sizeof(sql)/sizeof(sql[0]));
-  ASSERT_EQ(ret, 0);
+
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_TELNET_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  ASSERT_EQ(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 
   // case 1
-  TAOS_RES *res = taos_query(taos, "select * from t_8c30283b3c4131a071d1e16cf6d7094a");
-  ASSERT_NE(res, nullptr);
-  int fieldNum = taos_field_count(res);
+  pRes = taos_query(taos, "select * from t_8c30283b3c4131a071d1e16cf6d7094a");
+  ASSERT_NE(pRes, nullptr);
+  int fieldNum = taos_field_count(pRes);
   ASSERT_EQ(fieldNum, 2);
 
-  TAOS_ROW row = taos_fetch_row(res);
+  TAOS_ROW row = taos_fetch_row(pRes);
   int64_t ts = *(int64_t*)row[0];
   double c1 = *(double*)row[1];
   ASSERT_EQ(ts, 1479496100000);
   ASSERT_EQ(c1, 42);
 
-  int rowNum = taos_affected_rows(res);
+  int rowNum = taos_affected_rows(pRes);
   ASSERT_EQ(rowNum, 1);
-  taos_free_result(res);
+  taos_free_result(pRes);
 
   // case 2
-  res = taos_query(taos, "show tables");
-  ASSERT_NE(res, nullptr);
+  pRes = taos_query(taos, "show tables");
+  ASSERT_NE(pRes, nullptr);
 
-  row = taos_fetch_row(res);
-  rowNum = taos_affected_rows(res);
+  row = taos_fetch_row(pRes);
+  rowNum = taos_affected_rows(pRes);
   ASSERT_EQ(rowNum, 3);
-  taos_free_result(res);
-
-  destroyRequest(request);
-  smlDestroyInfo(info);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, smlProcess_json1_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES *pRes = taos_query(taos, "create database if not exists json_db");
+  TAOS_RES *pRes = taos_query(taos, "create database if not exists json_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use json_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj *)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_JSON_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-
-  const char *sql =
+  const char *sql[] = {
      "[\n"
      "    {\n"
      "        \"metric\": \"sys.cpu.nice\",\n"
@@ -724,6 +695,7 @@ TEST(testCase, smlProcess_json1_Test) {
      "        \"value\": 18,\n"
      "        \"tags\": {\n"
      "           \"host\": \"web01\",\n"
+     "           \"id\": \"t1\",\n"
      "           \"dc\": \"lga\"\n"
      "        }\n"
      "    },\n"
@@ -736,55 +708,48 @@ TEST(testCase, smlProcess_json1_Test) {
      "           \"dc\": \"lga\"\n"
      "        }\n"
      "    }\n"
-     "]";
-  int ret = smlProcess(info, (char **)(&sql), 1);
-  ASSERT_EQ(ret, 0);
+     "]"};
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_JSON_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  ASSERT_EQ(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 
   // case 1
-  TAOS_RES *res = taos_query(taos, "select * from t_cb27a7198d637b4f1c6464bd73f756a7");
-  ASSERT_NE(res, nullptr);
-  int fieldNum = taos_field_count(res);
+  pRes = taos_query(taos, "select * from t1");
+  ASSERT_NE(pRes, nullptr);
+  int fieldNum = taos_field_count(pRes);
   ASSERT_EQ(fieldNum, 2);
 
-  TAOS_ROW row = taos_fetch_row(res);
+  TAOS_ROW row = taos_fetch_row(pRes);
   int64_t ts = *(int64_t*)row[0];
   double c1 = *(double*)row[1];
   ASSERT_EQ(ts, 1346846400000);
   ASSERT_EQ(c1, 18);
 
-  int rowNum = taos_affected_rows(res);
+  int rowNum = taos_affected_rows(pRes);
   ASSERT_EQ(rowNum, 1);
-  taos_free_result(res);
+  taos_free_result(pRes);
 
   // case 2
-  res = taos_query(taos, "show tables");
-  ASSERT_NE(res, nullptr);
+  pRes = taos_query(taos, "show tables");
+  ASSERT_NE(pRes, nullptr);
 
-  row = taos_fetch_row(res);
-  rowNum = taos_affected_rows(res);
+  row = taos_fetch_row(pRes);
+  rowNum = taos_affected_rows(pRes);
   ASSERT_EQ(rowNum, 2);
-  taos_free_result(res);
-
-  destroyRequest(request);
-  smlDestroyInfo(info);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, smlProcess_json2_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES *pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES *pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj *)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_JSON_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-  const char *sql =
+  const char *sql[] = {
      "{\n"
      "    \"metric\": \"meter_current0\",\n"
      "    \"timestamp\": {\n"
@@ -806,29 +771,23 @@ TEST(testCase, smlProcess_json2_Test) {
      "       },\n"
      "       \"id\": \"d1001\"\n"
      "    }\n"
-     "}";
-  int32_t ret = smlProcess(info, (char **)(&sql), -1);
-  ASSERT_EQ(ret, 0);
-  destroyRequest(request);
-  smlDestroyInfo(info);
+     "}"};
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_JSON_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  ASSERT_EQ(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, smlProcess_json3_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES *pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES *pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj *)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_JSON_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-  const char *sql =
+  const char *sql[] ={
      "{\n"
      "    \"metric\": \"meter_current1\",\n"
      "    \"timestamp\": {\n"
@@ -878,29 +837,23 @@ TEST(testCase, smlProcess_json3_Test) {
      "       },\n"
      "       \"id\": \"d1001\"\n"
      "    }\n"
-     "}";
-  int32_t ret = smlProcess(info, (char **)(&sql), -1);
-  ASSERT_EQ(ret, 0);
-  destroyRequest(request);
-  smlDestroyInfo(info);
+     "}"};
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_JSON_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  ASSERT_EQ(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, smlProcess_json4_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj*)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_JSON_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-  const char *sql = "{\n"
+  const char *sql[] = {"{\n"
      "    \"metric\": \"meter_current2\",\n"
      "    \"timestamp\": {\n"
      "        \"value\"  : 1346846500000,\n"
@@ -940,18 +893,17 @@ TEST(testCase, smlProcess_json4_Test) {
      "       \"t9\": false,\n"
      "       \"id\": \"d1001\"\n"
      "    }\n"
-     "}";
-  int32_t ret = smlProcess(info, (char**)(&sql), -1);
-  ASSERT_EQ(ret, 0);
-  destroyRequest(request);
-  smlDestroyInfo(info);
+     "}"};
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_JSON_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  ASSERT_EQ(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, smlParseTelnetLine_error_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
@@ -1000,34 +952,27 @@ TEST(testCase, smlParseTelnetLine_diff_type_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj*)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_TELNET_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-
   const char *sql[2] = {
       "sys.procs.running 1479496104000 42 host=web01",
       "sys.procs.running 1479496104000 42u8 host=web01"
   };
-  int32_t ret = smlProcess(info, (char**)sql, sizeof(sql)/sizeof(sql[0]));
-  ASSERT_NE(ret, 0);
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_TELNET_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  ASSERT_NE(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 
-  destroyRequest(request);
-  smlDestroyInfo(info);
 }
 
 TEST(testCase, smlParseTelnetLine_json_error_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
@@ -1095,19 +1040,13 @@ TEST(testCase, smlParseTelnetLine_diff_json_type1_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj*)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_TELNET_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-
-  const char *sql[2] = {
+  const char *sql[] = {
       "[\n"
       "    {\n"
       "        \"metric\": \"sys.cpu.nice\",\n"
@@ -1129,30 +1068,22 @@ TEST(testCase, smlParseTelnetLine_diff_json_type1_Test) {
       "    },\n"
       "]",
   };
-  int32_t ret = smlProcess(info, (char**)sql, sizeof(sql)/sizeof(sql[0]));
-  ASSERT_NE(ret, 0);
-
-  destroyRequest(request);
-  smlDestroyInfo(info);
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_TELNET_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  ASSERT_NE(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, smlParseTelnetLine_diff_json_type2_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj*)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_TELNET_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-
-  const char *sql[2] = {
+  const char *sql[] = {
       "[\n"
       "    {\n"
       "        \"metric\": \"sys.cpu.nice\",\n"
@@ -1174,90 +1105,64 @@ TEST(testCase, smlParseTelnetLine_diff_json_type2_Test) {
       "    },\n"
       "]",
   };
-  int32_t ret = smlProcess(info, (char**)sql, sizeof(sql)/sizeof(sql[0]));
-  ASSERT_NE(ret, 0);
-
-  destroyRequest(request);
-  smlDestroyInfo(info);
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_TELNET_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  ASSERT_NE(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, sml_TD15662_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES *pRes = taos_query(taos, "create database if not exists db_15662 precision 'ns'");
+  TAOS_RES *pRes = taos_query(taos, "create database if not exists db_15662 precision 'ns' schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use db_15662");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj *)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_LINE_PROTOCOL, TSDB_SML_TIMESTAMP_MILLI_SECONDS);
-  ASSERT_NE(info, nullptr);
-
   const char *sql[] = {
       "hetrey c0=f,c1=127i8 1626006833639",
       "hetrey,t1=r c0=f,c1=127i8 1626006833640",
   };
-  int ret = smlProcess(info, (char **)sql, sizeof(sql) / sizeof(sql[0]));
-  ASSERT_EQ(ret, 0);
-
-  destroyRequest(request);
-  smlDestroyInfo(info);
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_LINE_PROTOCOL, TSDB_SML_TIMESTAMP_MILLI_SECONDS);
+  ASSERT_EQ(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, sml_TD15735_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists sml_db schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use sml_db");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj*)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_TELNET_PROTOCOL, TSDB_SML_TIMESTAMP_NANO_SECONDS);
-  ASSERT_NE(info, nullptr);
-
   const char *sql[1] = {
       "{'metric': 'pekoiw', 'timestamp': {'value': 1626006833639000000, 'type': 'ns'}, 'value': {'value': False, 'type': 'bool'}, 'tags': {'t0': {'value': True, 'type': 'bool'}, 't1': {'value': 127, 'type': 'tinyint'}, 't2': {'value': 32767, 'type': 'smallint'}, 't3': {'value': 2147483647, 'type': 'int'}, 't4': {'value': 9223372036854775807, 'type': 'bigint'}, 't5': {'value': 11.12345027923584, 'type': 'float'}, 't6': {'value': 22.123456789, 'type': 'double'}, 't7': {'value': 'binaryTagValue', 'type': 'binary'}, 't8': {'value': 'ncharTagValue', 'type': 'nchar'}}}",
   };
-  int32_t ret = smlProcess(info, (char**)sql, sizeof(sql)/sizeof(sql[0]));
-  ASSERT_NE(ret, 0);
-
-  destroyRequest(request);
-  smlDestroyInfo(info);
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_JSON_PROTOCOL, TSDB_SML_TIMESTAMP_MILLI_SECONDS);
+  ASSERT_NE(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, sml_TD15742_Test) {
   TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
   ASSERT_NE(taos, nullptr);
 
-  TAOS_RES* pRes = taos_query(taos, "create database if not exists TD15742");
+  TAOS_RES* pRes = taos_query(taos, "create database if not exists TD15742 schemaless 1");
   taos_free_result(pRes);
 
   pRes = taos_query(taos, "use TD15742");
   taos_free_result(pRes);
 
-  SRequestObj *request = (SRequestObj *)createRequest((STscObj*)taos, TSDB_SQL_INSERT);
-  ASSERT_NE(request, nullptr);
-
-  SSmlHandle *info = smlBuildSmlInfo(taos, request, TSDB_SML_LINE_PROTOCOL, TSDB_SML_TIMESTAMP_MILLI_SECONDS);
-  ASSERT_NE(info, nullptr);
-
   const char *sql[] = {
       "test_ms,t0=t c0=f 1626006833641",
   };
-  int ret = smlProcess(info, (char**)sql, sizeof(sql)/sizeof(sql[0]));
-  ASSERT_EQ(ret, 0);
-
-  destroyRequest(request);
-  smlDestroyInfo(info);
+  pRes = taos_schemaless_insert(taos, (char **)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_LINE_PROTOCOL, TSDB_SML_TIMESTAMP_MILLI_SECONDS);
+  ASSERT_EQ(taos_errno(pRes), 0);
+  taos_free_result(pRes);
 }
 
 TEST(testCase, sml_params_Test) {
@@ -1325,8 +1230,8 @@ TEST(testCase, sml_oom_Test) {
   pRes = taos_query(taos, "use oom");
   taos_free_result(pRes);
 
-  TAOS_RES* res = taos_schemaless_insert(taos, (char**)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_LINE_PROTOCOL, 0);
-  ASSERT_EQ(taos_errno(res), 0);
+  pRes = taos_schemaless_insert(taos, (char**)sql, sizeof(sql)/sizeof(sql[0]), TSDB_SML_LINE_PROTOCOL, 0);
+  ASSERT_EQ(taos_errno(pRes), 0);
   taos_free_result(pRes);
 }
 
diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index 063a78b0c6..ebf5098a05 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -86,11 +86,15 @@ tb_uid_t metaGetTableEntryUidByName(SMeta *pMeta, const char *name) {
   int      nData = 0;
   tb_uid_t uid = 0;
 
+  metaRLock(pMeta);
+
   if (tdbTbGet(pMeta->pNameIdx, name, strlen(name) + 1, &pData, &nData) == 0) {
     uid = *(tb_uid_t *)pData;
     tdbFree(pData);
   }
 
+  metaULock(pMeta);
+
   return 0;
 }
 
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index 086694bdf5..ab2efa4791 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -793,7 +793,9 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t version, void *pReq
         msgIter.suid = 0;
       }
 
+#ifdef TD_DEBUG_PRINT_ROW
       vnodeDebugPrintSingleSubmitMsg(pVnode->pMeta, pBlock, &msgIter, "real uid");
+#endif
       tDecoderClear(&decoder);
     } else {
       submitBlkRsp.tblFName = taosMemoryMalloc(TSDB_TABLE_FNAME_LEN);