From a1758458874f74766514337d914e592481cff2d4 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 19 Aug 2020 05:55:00 +0000 Subject: [PATCH 1/2] minor changes --- src/os/src/detail/osSysinfo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/os/src/detail/osSysinfo.c b/src/os/src/detail/osSysinfo.c index edf8fe6945..c75e254b0e 100644 --- a/src/os/src/detail/osSysinfo.c +++ b/src/os/src/detail/osSysinfo.c @@ -547,12 +547,12 @@ int taosSystem(const char *cmd) { int res; char buf[1024]; if (cmd == NULL) { - uError("taosSystem cmd is NULL!\n"); + uError("taosSystem cmd is NULL!"); return -1; } if ((fp = popen(cmd, "r")) == NULL) { - uError("popen cmd:%s error: %s/n", cmd, strerror(errno)); + uError("popen cmd:%s error: %s", cmd, strerror(errno)); return -1; } else { while (fgets(buf, sizeof(buf), fp)) { @@ -560,9 +560,9 @@ int taosSystem(const char *cmd) { } if ((res = pclose(fp)) == -1) { - uError("close popen file pointer fp error!\n"); + uError("close popen file pointer fp error!"); } else { - uDebug("popen res is :%d\n", res); + uDebug("popen res is :%d", res); } return res; From ecb7d9529b78e14ec92a99e396b600b4d56280b5 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 19 Aug 2020 09:58:54 +0000 Subject: [PATCH 2/2] TD-1186 show database error while in different account --- src/mnode/src/mnodeDb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c index f828bc5a3d..78c022ce46 100644 --- a/src/mnode/src/mnodeDb.c +++ b/src/mnode/src/mnodeDb.c @@ -636,6 +636,7 @@ static int32_t mnodeRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void while (numOfRows < rows) { pShow->pIter = mnodeGetNextDb(pShow->pIter, &pDb); if (pDb == NULL) break; + if (pDb->pAcct != pUser->pAcct) continue; cols = 0; @@ -687,8 +688,8 @@ static int32_t mnodeRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; char tmp[128] = {0}; - size_t n = sprintf(tmp, "%d,%d,%d", pDb->cfg.daysToKeep1, pDb->cfg.daysToKeep2, pDb->cfg.daysToKeep); - STR_WITH_SIZE_TO_VARSTR(pWrite, tmp, n); + sprintf(tmp, "%d,%d,%d", pDb->cfg.daysToKeep1, pDb->cfg.daysToKeep2, pDb->cfg.daysToKeep); + STR_WITH_SIZE_TO_VARSTR(pWrite, tmp, strlen(tmp)); cols++; #ifndef __CLOUD_VERSION__