From e1b11fbb3bd8398103f8608b45aa6c8cecc0261f Mon Sep 17 00:00:00 2001
From: lihui <huili@taosdata.com>
Date: Tue, 10 Dec 2019 18:42:07 +0800
Subject: [PATCH] [TBASE-816]

---
 src/modules/monitor/src/monitorSystem.c | 25 +++++++++++++------------
 src/os/linux/src/tsystem.c              | 20 ++++++++++----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/modules/monitor/src/monitorSystem.c b/src/modules/monitor/src/monitorSystem.c
index c5f65eef36..f89f259688 100644
--- a/src/modules/monitor/src/monitorSystem.c
+++ b/src/modules/monitor/src/monitorSystem.c
@@ -14,6 +14,7 @@
  */
 
 #include "monitor.h"
+#include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -376,7 +377,7 @@ void monitorSaveSystemInfo() {
 
   int64_t ts = taosGetTimestampUs();
   char *  sql = monitor->sql;
-  int pos = snprintf(sql, SQL_LENGTH, "insert into %s.dn_%s values(%ld", tsMonitorDbName, monitor->privateIpStr, ts);
+  int pos = snprintf(sql, SQL_LENGTH, "insert into %s.dn_%s values(%" PRId64, tsMonitorDbName, monitor->privateIpStr, ts);
 
   pos += monitorBuildCpuSql(sql + pos);
   pos += monitorBuildMemorySql(sql + pos);
@@ -402,16 +403,16 @@ void monitorSaveAcctLog(char *acctId, int64_t currentPointsPerSecond, int64_t ma
   char sql[1024] = {0};
   sprintf(sql,
           "insert into %s.acct_%s using %s.acct tags('%s') values(now"
-          ", %ld, %ld "
-          ", %ld, %ld"
-          ", %ld, %ld"
-          ", %ld, %ld"
-          ", %ld, %ld"
-          ", %ld, %ld"
-          ", %ld, %ld"
-          ", %ld, %ld"
-          ", %ld, %ld"
-          ", %ld, %ld"
+	  ", %" PRId64, "%" PRId64
+	  ", %" PRId64, "%" PRId64
+	  ", %" PRId64, "%" PRId64
+	  ", %" PRId64, "%" PRId64
+	  ", %" PRId64, "%" PRId64
+	  ", %" PRId64, "%" PRId64
+	  ", %" PRId64, "%" PRId64
+	  ", %" PRId64, "%" PRId64
+	  ", %" PRId64, "%" PRId64
+	  ", %" PRId64, "%" PRId64
           ", %d)",
           tsMonitorDbName, acctId, tsMonitorDbName, acctId, currentPointsPerSecond, maxPointsPerSecond, totalTimeSeries,
           maxTimeSeries, totalStorage, maxStorage, totalQueryTime, maxQueryTime, totalInbound, maxInbound,
@@ -431,7 +432,7 @@ void monitorSaveLog(int level, const char *const format, ...) {
     return;
   }
 
-  int len = snprintf(sql, (size_t)max_length, "import into %s.log values(%ld, %d,'", tsMonitorDbName,
+  int len = snprintf(sql, (size_t)max_length, "import into %s.log values(%\" PRId64 \", %d,'", tsMonitorDbName,
                      taosGetTimestampUs(), level);
 
   va_start(argpointer, format);
diff --git a/src/os/linux/src/tsystem.c b/src/os/linux/src/tsystem.c
index 0a9d97b3cf..611ede73b5 100644
--- a/src/os/linux/src/tsystem.c
+++ b/src/os/linux/src/tsystem.c
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
+#include <inttypes.h>
 #include <ifaddrs.h>
 #include <locale.h>
 #include <netdb.h>
@@ -99,7 +99,7 @@ bool taosGetProcMemory(float *memoryUsedMB) {
 
   int64_t memKB = 0;
   char    tmp[10];
-  sscanf(line, "%s %ld", tmp, &memKB);
+  sscanf(line, "%s %" PRId64, tmp, &memKB);
   *memoryUsedMB = (float)((double)memKB / 1024);
 
   tfree(line);
@@ -124,7 +124,7 @@ bool taosGetSysCpuInfo(SysCpuInfo *cpuInfo) {
   }
 
   char cpu[10] = {0};
-  sscanf(line, "%s %lu %lu %lu %lu", cpu, &cpuInfo->user, &cpuInfo->nice, &cpuInfo->system, &cpuInfo->idle);
+  sscanf(line, "%s %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64, cpu, &cpuInfo->user, &cpuInfo->nice, &cpuInfo->system, &cpuInfo->idle);
 
   tfree(line);
   fclose(fp);
@@ -150,7 +150,7 @@ bool taosGetProcCpuInfo(ProcCpuInfo *cpuInfo) {
   for (int i = 0, blank = 0; line[i] != 0; ++i) {
     if (line[i] == ' ') blank++;
     if (blank == PROCESS_ITEM) {
-      sscanf(line + i + 1, "%lu %lu %lu %lu", &cpuInfo->utime, &cpuInfo->stime, &cpuInfo->cutime, &cpuInfo->cstime);
+      sscanf(line + i + 1, "%" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64, &cpuInfo->utime, &cpuInfo->stime, &cpuInfo->cutime, &cpuInfo->cstime);
       break;
     }
   }
@@ -420,7 +420,7 @@ bool taosGetCardInfo(int64_t *bytes) {
     }
   }
   if (line != NULL) {
-    sscanf(line, "%s %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld", nouse0, &rbytes, &rpackts, &nouse1, &nouse2, &nouse3,
+    sscanf(line, "%s %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64, nouse0, &rbytes, &rpackts, &nouse1, &nouse2, &nouse3,
            &nouse4, &nouse5, &nouse6, &tbytes, &tpackets);
     *bytes = rbytes + tbytes;
     tfree(line);
@@ -488,10 +488,10 @@ bool taosReadProcIO(int64_t *readbyte, int64_t *writebyte) {
       break;
     }
     if (strstr(line, "rchar:") != NULL) {
-      sscanf(line, "%s %ld", tmp, readbyte);
+      sscanf(line, "%s %" PRId64, tmp, readbyte);
       readIndex++;
     } else if (strstr(line, "wchar:") != NULL) {
-      sscanf(line, "%s %ld", tmp, writebyte);
+      sscanf(line, "%s %" PRId64, tmp, writebyte);
       readIndex++;
     } else {
     }
@@ -564,9 +564,9 @@ void taosGetSystemInfo() {
 }
 
 void tsPrintOsInfo() {
-  pPrint(" os pageSize:            %ld(KB)", tsPageSize);
-  pPrint(" os openMax:             %ld", tsOpenMax);
-  pPrint(" os streamMax:           %ld", tsStreamMax);
+  pPrint(" os pageSize:            %" PRId64 "(KB)", tsPageSize);
+  pPrint(" os openMax:             %" PRId64, tsOpenMax);
+  pPrint(" os streamMax:           %" PRId64, tsStreamMax);
   pPrint(" os numOfCores:          %d", tsNumOfCores);
   pPrint(" os totalDisk:           %f(GB)", tsTotalDataDirGB);
   pPrint(" os totalMemory:         %d(MB)", tsTotalMemoryMB);