Merge pull request #28195 from taosdata/fix/ostime/mem

dapan1121 · web-flow · commit b51331355161 · 2024-10-08T08:44:13.000+08:00
fix: ostime
diff --git a/source/libs/catalog/src/ctgCache.c b/source/libs/catalog/src/ctgCache.c
@@ -906,7 +906,7 @@ int32_t ctgEnqueue(SCatalog *pCtg, SCtgCacheOperation *operation) {
   if (gCtgMgmt.queue.stopQueue) {
     ctgFreeQNode(node);
     CTG_UNLOCK(CTG_WRITE, &gCtgMgmt.queue.qlock);
-    CTG_RET(TSDB_CODE_CTG_EXIT);
+    CTG_ERR_JRET(TSDB_CODE_CTG_EXIT);
   }
 
   gCtgMgmt.queue.tail->next = node;
@@ -924,7 +924,7 @@ int32_t ctgEnqueue(SCatalog *pCtg, SCtgCacheOperation *operation) {
   code = tsem_post(&gCtgMgmt.queue.reqSem);
   if (TSDB_CODE_SUCCESS != code) {
     qError("tsem_post failed, code:%x", code);
-    CTG_RET(code);
+    CTG_ERR_JRET(code);
   }
 
   if (syncOp) {
@@ -935,9 +935,15 @@ int32_t ctgEnqueue(SCatalog *pCtg, SCtgCacheOperation *operation) {
     if (!operation->unLocked) {
       CTG_LOCK(CTG_READ, &gCtgMgmt.lock);
     }
-    taosMemoryFree(operation);
+    TAOS_UNUSED(tsem_destroy(&operation->rspSem));
+    taosMemoryFreeClear(operation);
   }
+  return code;
 
+_return:
+  if (syncOp && operation) {
+    TAOS_UNUSED(tsem_destroy(&operation->rspSem));
+  }
   return code;
 }
 
diff --git a/source/os/src/osTimezone.c b/source/os/src/osTimezone.c
@@ -742,6 +742,20 @@ char *tz_win[554][2] = {{"Asia/Shanghai", "China Standard Time"},
 
 static int isdst_now = 0;
 
+void parseTimeStr(char *p, char to[5]) {
+  for (int i = 0; i < 5; ++i) {
+    if (strlen(p) > i) {
+      to[i] = p[i];
+    } else {
+      to[i] = '0';
+    }
+  }
+  if (strlen(p) == 2) {
+    to[1] = '0';
+    to[2] = p[1];
+  }
+}
+
 int32_t taosSetSystemTimezone(const char *inTimezoneStr, char *outTimezoneStr, int8_t *outDaylight,
                            enum TdTimezone *tsTimezone) {
   if (inTimezoneStr == NULL || inTimezoneStr[0] == 0) {
@@ -798,15 +812,19 @@ int32_t taosSetSystemTimezone(const char *inTimezoneStr, char *outTimezoneStr, i
         memcpy(&winStr[3], pp, ppp - pp);
         indexStr = ppp - pp + 3;
       }
-      sprintf(&winStr[indexStr], "%c%c%c:%c%c:00", (p[0] == '+' ? '+' : '-'), p[1], p[2], p[3], p[4]);
+      char to[5];
+      parseTimeStr(p, to);
+      sprintf(&winStr[indexStr], "%c%c%c:%c%c:00", (to[0] == '+' ? '+' : '-'), to[1], to[2], to[3], to[4]);
       *tsTimezone = -taosStr2Int32(p, NULL, 10);
     } else {
       *tsTimezone = 0;
     }
   }
   _putenv(winStr);
   _tzset();
-  strcpy(outTimezoneStr, inTimezoneStr);
+  if (outTimezoneStr != inTimezoneStr) {
+    strcpy(outTimezoneStr, inTimezoneStr);
+  }
   *outDaylight = 0;
 
 #elif defined(_TD_DARWIN_64)

Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,7 @@ int32_t ctgEnqueue(SCatalog pCtg, SCtgCacheOperation operation) {`
`906`	`906`	`if (gCtgMgmt.queue.stopQueue) {`
`907`	`907`	`ctgFreeQNode(node);`
`908`	`908`	`CTG_UNLOCK(CTG_WRITE, &gCtgMgmt.queue.qlock);`
`909`		`- CTG_RET(TSDB_CODE_CTG_EXIT);`
	`909`	`+ CTG_ERR_JRET(TSDB_CODE_CTG_EXIT);`
`910`	`910`	`}`
`911`	`911`
`912`	`912`	`gCtgMgmt.queue.tail->next = node;`
`@@ -924,7 +924,7 @@ int32_t ctgEnqueue(SCatalog pCtg, SCtgCacheOperation operation) {`
`924`	`924`	`code = tsem_post(&gCtgMgmt.queue.reqSem);`
`925`	`925`	`if (TSDB_CODE_SUCCESS != code) {`
`926`	`926`	`qError("tsem_post failed, code:%x", code);`
`927`		`- CTG_RET(code);`
	`927`	`+ CTG_ERR_JRET(code);`
`928`	`928`	`}`
`929`	`929`
`930`	`930`	`if (syncOp) {`
`@@ -935,9 +935,15 @@ int32_t ctgEnqueue(SCatalog pCtg, SCtgCacheOperation operation) {`
`935`	`935`	`if (!operation->unLocked) {`
`936`	`936`	`CTG_LOCK(CTG_READ, &gCtgMgmt.lock);`
`937`	`937`	`}`
`938`		`- taosMemoryFree(operation);`
	`938`	`+ TAOS_UNUSED(tsem_destroy(&operation->rspSem));`
	`939`	`+ taosMemoryFreeClear(operation);`
`939`	`940`	`}`
	`941`	`+ return code;`
`940`	`942`
	`943`	`+_return:`
	`944`	`+ if (syncOp && operation) {`
	`945`	`+ TAOS_UNUSED(tsem_destroy(&operation->rspSem));`
	`946`	`+ }`
`941`	`947`	`return code;`
`942`	`948`	`}`
`943`	`949`