Merge pull request #3143 from taosdata/hotfix/os

TD-1186 show database error while in different account

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__

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;