diff --git a/include/libs/parser/parser.h b/include/libs/parser/parser.h
index fef624288a7eff2ce9ca83447d20076e15b76149..02cd07322622ab56ccc257f8f4bec140cecb73b7 100644
--- a/include/libs/parser/parser.h
+++ b/include/libs/parser/parser.h
@@ -57,6 +57,7 @@ typedef struct SQuery {
   SNode* pRoot;
   int32_t numOfResCols;
   SSchema* pResSchema;
+  int8_t   precision;
   SCmdMsgInfo* pCmdMsg;
   int32_t msgType;
   SArray* pDbList;
diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index 32668356eed5400c5e54be5712ff43de39cb6e6d..6af1fd6016446629c302275ea8df6b809034d655 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -204,11 +204,11 @@ typedef struct SRequestObj {
   uint64_t             requestId;
   int32_t              type;  // request type
   STscObj*             pTscObj;
-  char*                pDb;
+  char*                pDb;     // current database string
   char*                sqlstr;  // sql string
   int32_t              sqlLen;
   int64_t              self;
-  char*                msgBuf;
+  char*                msgBuf;  // error msg buffer
   int32_t              code;
   SArray*              dbList;
   SArray*              tableList;
@@ -276,8 +276,8 @@ int32_t buildRequest(STscObj* pTscObj, const char* sql, int sqlLen, SRequestObj*
 
 void*   doFetchRows(SRequestObj* pRequest, bool setupOneRowPtr, bool convertUcs4);
 void    doSetOneRowPtr(SReqResultInfo* pResultInfo);
-int32_t setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32_t numOfCols, int32_t numOfRows, bool convertUcs4);
 void    setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t numOfCols);
+void    setResPrecision(SReqResultInfo* pResInfo, int32_t precision);
 int32_t setQueryResultFromRsp(SReqResultInfo* pResultInfo, const SRetrieveTableRsp* pRsp, bool convertUcs4);
 
 // --- heartbeat
diff --git a/source/client/src/client.c b/source/client/src/client.c
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index a258fd305e0f2658ba7e7e952eeb2e3ebe138ccd..8efee9bffbfde038b59347031e9d0b4c7e68ef22 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -27,10 +27,10 @@
 #include "ttime.h"
 
 #define TSC_VAR_NOT_RELEASE 1
-#define TSC_VAR_RELEASED 0
+#define TSC_VAR_RELEASED    0
 
 SAppInfo appInfo;
-int32_t  clientReqRefPool = -1;
+int32_t  clientReqRefPool  = -1;
 int32_t  clientConnRefPool = -1;
 
 static TdThreadOnce   tscinit = PTHREAD_ONCE_INIT;
@@ -48,8 +48,8 @@ static void registerRequest(SRequestObj *pRequest) {
   if (pTscObj->pAppInfo) {
     SInstanceSummary *pSummary = &pTscObj->pAppInfo->summary;
 
-    int32_t total = atomic_add_fetch_64(&pSummary->totalRequests, 1);
-    int32_t currentInst = atomic_add_fetch_64(&pSummary->currentRequests, 1);
+    int32_t total = atomic_add_fetch_64((int64_t*)&pSummary->totalRequests, 1);
+    int32_t currentInst = atomic_add_fetch_64((int64_t*)&pSummary->currentRequests, 1);
     tscDebug("0x%" PRIx64 " new Request from connObj:0x%" PRIx64
              ", current:%d, app current:%d, total:%d, reqId:0x%" PRIx64,
              pRequest->self, pRequest->pTscObj->id, num, currentInst, total, pRequest->requestId);
@@ -62,7 +62,7 @@ static void deregisterRequest(SRequestObj *pRequest) {
   STscObj *         pTscObj = pRequest->pTscObj;
   SInstanceSummary *pActivity = &pTscObj->pAppInfo->summary;
 
-  int32_t currentInst = atomic_sub_fetch_64(&pActivity->currentRequests, 1);
+  int32_t currentInst = atomic_sub_fetch_64((int64_t*)&pActivity->currentRequests, 1);
   int32_t num = atomic_sub_fetch_32(&pTscObj->numOfReqs, 1);
 
   int64_t duration = taosGetTimestampUs() - pRequest->metric.start;
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index b3615c208c485be803fe55e30ee6e5445898c4e6..85e39794771bf04b8c2f184e0672e2498cd272f1 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -229,7 +229,7 @@ int32_t getPlan(SRequestObj* pRequest, SQuery* pQuery, SQueryPlan** pPlan, SArra
 }
 
 void setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t numOfCols) {
-  assert(pSchema != NULL && numOfCols > 0);
+  ASSERT(pSchema != NULL && numOfCols > 0);
 
   pResInfo->numOfCols = numOfCols;
   pResInfo->fields = taosMemoryCalloc(numOfCols, sizeof(TAOS_FIELD));