diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index fe9b97bf49..611f52676e 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -317,7 +317,7 @@ typedef struct {
   struct SLocalReducer *pLocalReducer;
 } SSqlRes;
 
-typedef struct _tsc_obj {
+typedef struct STscObj {
   void *           signature;
   void *           pTimer;
   char             mgmtIp[TSDB_USER_LEN];
@@ -332,7 +332,7 @@ typedef struct _tsc_obj {
   struct SSqlObj *pSql;
   struct SSqlObj *pHb;
   struct SSqlObj *sqlList;
-  struct _sstream *streamList;
+  struct SSqlStream *streamList;
   pthread_mutex_t  mutex;
 } STscObj;
 
@@ -365,7 +365,7 @@ typedef struct SSqlObj {
   struct SSqlObj * prev, *next;
 } SSqlObj;
 
-typedef struct _sstream {
+typedef struct SSqlStream {
   SSqlObj *pSql;
   uint32_t streamId;
   char     listed;
@@ -390,7 +390,7 @@ typedef struct _sstream {
   void *param;
 
   void (*callback)(void *);  // Callback function when stream is stopped from client level
-  struct _sstream *prev, *next;
+  struct SSqlStream *prev, *next;
 } SSqlStream;
 
 int32_t tscInitRpc(const char *user, const char *secret);
diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 47d0a31a35..2bab6e03fe 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -84,7 +84,7 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, void (*fp)(), void* param, const
 }
 
 // TODO return the correct error code to client in tscQueueAsyncError
-void taos_query_a(TAOS *taos, const char *sqlstr, void (*fp)(void *, TAOS_RES *, int), void *param) {
+void taos_query_a(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *param) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
     tscError("bug!!! pObj:%p", pObj);
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 13a827697d..7dd8925509 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2497,12 +2497,6 @@ int tscRenewMeterMeta(SSqlObj *pSql, char *tableId) {
              pTableMetaInfo->pTableMeta);
   }
 
-  if (code != TSDB_CODE_ACTION_IN_PROGRESS) {
-    if (pSql->fp == (void *)0x1) {
-      pSql->fp = NULL;
-    }
-  }
-
   return code;
 }
 
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index aa24247ced..c3cc6ec9a8 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -52,7 +52,7 @@ static bool validPassword(const char* passwd) {
   return validImpl(passwd, TSDB_PASSWORD_LEN);
 }
 
-STscObj *taos_connect_imp(const char *ip, const char *user, const char *pass, const char *db, uint16_t port,
+STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, const char *db, uint16_t port,
                        void (*fp)(void *, TAOS_RES *, int), void *param, void **taos) {
   taos_init();
   
@@ -163,7 +163,7 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
   
   tscTrace("try to create a connection to %s", ip);
 
-  STscObj *pObj = taos_connect_imp(ip, user, pass, db, port, NULL, NULL, NULL);
+  STscObj *pObj = taosConnectImpl(ip, user, pass, db, port, NULL, NULL, NULL);
   if (pObj != NULL) {
     SSqlObj* pSql = pObj->pSql;
     assert(pSql != NULL);
@@ -198,7 +198,7 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
 
 TAOS *taos_connect_a(char *ip, char *user, char *pass, char *db, uint16_t port, void (*fp)(void *, TAOS_RES *, int),
                      void *param, void **taos) {
-  STscObj* pObj = taos_connect_imp(ip, user, pass, db, port, fp, param, taos);
+  STscObj* pObj = taosConnectImpl(ip, user, pass, db, port, fp, param, taos);
   if (pObj == NULL) {
     return NULL;
   }