diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index fb175618c0429d08e86976c5dc7f20c91918f653..e98acfc9a68b2dfd108e047b580b115e72bcac42 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -13,8 +13,6 @@
* along with this program. If not, see .
*/
-#include
-
#include "os.h"
#include "com_taosdata_jdbc_TSDBJNIConnector.h"
#include "taos.h"
diff --git a/src/client/src/tscAst.c b/src/client/src/tscAst.c
index 845a9fd36d1a694d39e35f1ad3c0b06ec0f1b59c..fe0921c64d72af1d36202dfd57d8c93a33cc0b4d 100644
--- a/src/client/src/tscAst.c
+++ b/src/client/src/tscAst.c
@@ -13,12 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-#include
-#include
-
#include "os.h"
#include "taosmsg.h"
#include "tast.h"
diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 6e0e1ae7c5c73720a53558701b01fb79af592e27..aad02959591eab0b1ea48e0336ea4d0eed3774b6 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -13,8 +13,7 @@
* along with this program. If not, see .
*/
-#include
-#include
+#include "os.h"
#include "tlog.h"
#include "trpc.h"
diff --git a/src/client/src/tscCache.c b/src/client/src/tscCache.c
index 866b6e7dbc137c6e07d21d1e140ded39d1f4cd88..f508857ce1bc1477dc898de400b96c234ffe9bd8 100644
--- a/src/client/src/tscCache.c
+++ b/src/client/src/tscCache.c
@@ -13,14 +13,7 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "os.h"
#include "tglobalcfg.h"
#include "tlog.h"
diff --git a/src/client/src/tscFunctionImpl.c b/src/client/src/tscFunctionImpl.c
index 0f9be904128c76f57746fe5eb3c043d58cf2c311..35011a259b9c46e9d26a97034c11cef47d64debe 100644
--- a/src/client/src/tscFunctionImpl.c
+++ b/src/client/src/tscFunctionImpl.c
@@ -15,16 +15,6 @@
#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
#include "os.h"
#include "taosmsg.h"
#include "tast.h"
diff --git a/src/client/src/tscJoinProcess.c b/src/client/src/tscJoinProcess.c
index 4965498eff0dbadbbf87d3e04d757e6afd002fa4..dfeebc8c61e868b9b7c558287b40ad0fbc093099 100644
--- a/src/client/src/tscJoinProcess.c
+++ b/src/client/src/tscJoinProcess.c
@@ -13,13 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-#include
-#include
-#include
-
#include "os.h"
#include "tcache.h"
#include "tscJoinProcess.h"
diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index 9afb74fec201353dc5980aa572a1a7af2fe4cae9..d217d0958833fad40c2a2aaf7cb135e43222f56c 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -13,9 +13,7 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
+#include "os.h"
#include "taosmsg.h"
#include "tcache.h"
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 37a32e9ebb360ed0a3bc1f9f97a5b70955782ec5..c8ce728de15858e2628bb6a8debd011197ecd184 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -21,22 +21,8 @@
#pragma GCC diagnostic ignored "-Woverflow"
#pragma GCC diagnostic ignored "-Wunused-variable"
-#include
-#include
-#include
-
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "ihash.h"
#include "os.h"
+#include "ihash.h"
#include "tscSecondaryMerge.h"
#include "tscUtil.h"
#include "tschemautil.h"
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index e956d6159e4a02707e15197672b59edc66466043..03f644ac36ddb985402a7a72ce68283abaafc63a 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -13,9 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-
#include "taos.h"
#include "tsclient.h"
#include "tsql.h"
diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index 770e61e27827f06fc22e0d73831041a86b8f3bf8..7d74f62dccabe2888b7f82ef43a56106172af5e3 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -13,9 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-
#include "os.h"
#include "tlog.h"
#include "tsclient.h"
diff --git a/src/client/src/tscSQLParserImpl.c b/src/client/src/tscSQLParserImpl.c
index 7e1b4a7cf19e75274f65f10d8344c200c7ad8fb7..4fefe1665c514bce7215c395132c7b4290d433ce 100644
--- a/src/client/src/tscSQLParserImpl.c
+++ b/src/client/src/tscSQLParserImpl.c
@@ -13,13 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-#include
-#include
-#include
-
#include "os.h"
#include "tglobalcfg.h"
#include "tsql.h"
diff --git a/src/client/src/tscSchemaUtil.c b/src/client/src/tscSchemaUtil.c
index 9728811ae70286264ed0ee6d91b144a1743a1120..5e50c27ab1af180009a4aa13a221073f33168a5f 100644
--- a/src/client/src/tscSchemaUtil.c
+++ b/src/client/src/tscSchemaUtil.c
@@ -13,10 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-
#include "os.h"
#include "taosmsg.h"
#include "tschemautil.h"
diff --git a/src/client/src/tscSecondaryMerge.c b/src/client/src/tscSecondaryMerge.c
index ac2638f635961bcdab3593994228164d79fdb6a0..398cd1cca6ceb4de0042788e78ab3336448019ed 100644
--- a/src/client/src/tscSecondaryMerge.c
+++ b/src/client/src/tscSecondaryMerge.c
@@ -13,13 +13,8 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-#include
-#include
-#include "tlosertree.h"
+#include "os.h"
#include "tlosertree.h"
#include "tscSecondaryMerge.h"
#include "tscUtil.h"
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 6edec3d4773f94bd0c6de975653dfd56f6d4f8a8..73e612962a488bd6c687dae3c33f767a8c6e6506 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -13,12 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-#include
-#include
-
#include "os.h"
#include "tcache.h"
#include "trpc.h"
@@ -3613,7 +3607,7 @@ int tscRenewMeterMeta(SSqlObj *pSql, char *meterId) {
code = tscDoGetMeterMeta(pSql, meterId, 0); // todo ??
} else {
- tscTrace("%p metric query not update metric meta, numOfTags:%d, numOfCols:%d, uid:%d, addr:%p", pSql,
+ tscTrace("%p metric query not update metric meta, numOfTags:%d, numOfCols:%d, uid:%lld, addr:%p", pSql,
pMeterMetaInfo->pMeterMeta->numOfTags, pCmd->numOfCols, pMeterMetaInfo->pMeterMeta->uid,
pMeterMetaInfo->pMeterMeta);
}
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index e6714bb4cb25747a10c695e9261d5e5dcfc47137..1727840a980650c6f384f1a1d6716fae35fe5ec5 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -13,9 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-
#include "os.h"
#include "tcache.h"
#include "tlog.h"
diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index dee8f02118c0fd2ef22428d67393a801073c23c8..bcbcaba4c4a207c07763198db72357459630b977 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -13,7 +13,7 @@
* along with this program. If not, see .
*/
-#include
+#include "os.h"
#include "shash.h"
#include "taos.h"
diff --git a/src/client/src/tscSyntaxtreefunction.c b/src/client/src/tscSyntaxtreefunction.c
index 00781919e466c5049de84650eacd1d0badf58b72..bbd30c1fa942c7fd9132f24a4e03ca2e034fd30b 100644
--- a/src/client/src/tscSyntaxtreefunction.c
+++ b/src/client/src/tscSyntaxtreefunction.c
@@ -13,10 +13,7 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-#include
+#include "os.h"
#include "tscSyntaxtreefunction.h"
#include "tsql.h"
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 7ebd43cd19d2b6b1f94ec21651c0fa3c2578c84f..708ceee4054c2f22dd44d1cf5a5c72a419994eff 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -13,15 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
#include "os.h"
#include "taosmsg.h"
#include "tcache.h"
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index ec5c9806129197929667bfa30f2e55ce1f7446d7..579365647718d177053e114029ff52661b369086 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -13,10 +13,6 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-
#include "os.h"
#include "ihash.h"
#include "taosmsg.h"