From 054a700a2943d320aab4e868d315b7be9ba0efd7 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Mon, 25 Jan 2021 18:43:34 +0800
Subject: [PATCH] TD-2837

---
 src/mnode/src/mnodeCluster.c      | 8 --------
 src/os/src/darwin/darwinSysInfo.c | 8 +++++++-
 src/plugins/http/inc/httpUtil.h   | 2 +-
 src/plugins/http/src/httpUtil.c   | 4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/mnode/src/mnodeCluster.c b/src/mnode/src/mnodeCluster.c
index 94ec59b1b0..169d2ebd9d 100644
--- a/src/mnode/src/mnodeCluster.c
+++ b/src/mnode/src/mnodeCluster.c
@@ -138,14 +138,6 @@ void mnodeDecClusterRef(SClusterObj *pCluster) {
   sdbDecRef(tsClusterSdb, pCluster);
 }
 
-#ifdef __APPLE__
-bool taosGetSystemUid(char *uid) {
-  fprintf(stderr, "%s[%d]%s(): not implemented yet!\n", basename(__FILE__), __LINE__, __func__);
-  abort();
-  return false;
-}
-#endif // __APPLE__
-
 static int32_t mnodeCreateCluster() {
   int64_t numOfClusters = sdbGetNumOfRows(tsClusterSdb);
   if (numOfClusters != 0) return TSDB_CODE_SUCCESS;
diff --git a/src/os/src/darwin/darwinSysInfo.c b/src/os/src/darwin/darwinSysInfo.c
index ad3facdcee..5fa61b07ac 100644
--- a/src/os/src/darwin/darwinSysInfo.c
+++ b/src/os/src/darwin/darwinSysInfo.c
@@ -103,4 +103,10 @@ int taosSystem(const char *cmd) {
 
 void taosSetCoreDump() {}
 
-char *taosGetCmdlineByPID(int pid) { return ""; }
\ No newline at end of file
+char *taosGetCmdlineByPID(int pid) { return ""; }
+
+bool taosGetSystemUid(char *uid) {
+  fprintf(stderr, "%s[%d]%s(): not implemented yet!\n", basename(__FILE__), __LINE__, __func__);
+  abort();
+  return false;
+}
\ No newline at end of file
diff --git a/src/plugins/http/inc/httpUtil.h b/src/plugins/http/inc/httpUtil.h
index 61cd50a77a..54c95b6980 100644
--- a/src/plugins/http/inc/httpUtil.h
+++ b/src/plugins/http/inc/httpUtil.h
@@ -17,7 +17,7 @@
 #define TDENGINE_HTTP_UTIL_H
 
 bool httpCheckUsedbSql(char *sql);
-void httpTimeToString(time_t t, char *buf, int32_t buflen);
+void httpTimeToString(int32_t t, char *buf, int32_t buflen);
 
 bool    httpUrlMatch(HttpContext *pContext, int32_t pos, char *cmp);
 bool    httpParseRequest(HttpContext *pContext);
diff --git a/src/plugins/http/src/httpUtil.c b/src/plugins/http/src/httpUtil.c
index 7f1e2a94d1..a84ae9f617 100644
--- a/src/plugins/http/src/httpUtil.c
+++ b/src/plugins/http/src/httpUtil.c
@@ -29,7 +29,7 @@ bool httpCheckUsedbSql(char *sql) {
   return false;
 }
 
-void httpTimeToString(time_t t, char *buf, int32_t buflen) {
+void httpTimeToString(int32_t t, char *buf, int32_t buflen) {
   memset(buf, 0, (size_t)buflen);
   char ts[32] = {0};
 
@@ -37,7 +37,7 @@ void httpTimeToString(time_t t, char *buf, int32_t buflen) {
   time_t     tt = t / 1000;
   ptm = localtime(&tt);
   strftime(ts, 31, "%Y-%m-%d %H:%M:%S", ptm);
-  sprintf(buf, "%s.%03" PRId64, ts, t % 1000);
+  sprintf(buf, "%s.%03d", ts, t % 1000);
 }
 
 int32_t httpAddToSqlCmdBuffer(HttpContext *pContext, const char *const format, ...) {
-- 
GitLab