fix: os return

include/os/osSocket.h

@@ -165,7 +165,6 @@ int32_t     taosGetFqdn(char *);
 void        tinet_ntoa(char *ipstr, uint32_t ip);
 uint32_t    ip2uint(const char *const ip_addr);
 int32_t     taosIgnSIGPIPE();
-uint32_t    taosInetAddr(const char *ipAddr);
 const char *taosInetNtoa(struct in_addr ipInt, char *dstStr, int32_t len);
 
 uint64_t taosHton64(uint64_t val);

source/client/src/clientImpl.c

@@ -2043,7 +2043,7 @@ static int32_t doPrepareResPtr(SReqResultInfo* pResInfo) {
 static int32_t doConvertUCS4(SReqResultInfo* pResultInfo, int32_t numOfRows, int32_t numOfCols, int32_t* colLength) {
   int32_t idx = -1;
   iconv_t conv = taosAcquireConv(&idx, C2M);
-  if (!conv) return TSDB_CODE_TSC_INTERNAL_ERROR;
+  if (conv == (iconv_t)-1) return TSDB_CODE_TSC_INTERNAL_ERROR;
 
   for (int32_t i = 0; i < numOfCols; ++i) {
     int32_t type = pResultInfo->fields[i].type;

source/dnode/mnode/impl/src/mndUser.c

@@ -342,7 +342,8 @@ int32_t mndUpdateIpWhiteImpl(SHashObj *pIpWhiteTab, char *user, char *fqdn, int8
   SIpV4Range range = {.ip = 0, .mask = 32};
   int32_t    code = taosGetIpv4FromFqdn(fqdn, &range.ip);
   if (code) {
-    //TODO
+    mError("failed to get ip from fqdn: %s at line %d since %s", fqdn, lino, tstrerror(code));
+    TAOS_RETURN(TSDB_CODE_TSC_INVALID_FQDN);
   }
   mDebug("ip-white-list may update for user: %s, fqdn: %s", user, fqdn);
   SIpWhiteList **ppList = taosHashGet(pIpWhiteTab, user, strlen(user));

source/dnode/vnode/src/tsdb/tsdbCacheRead.c

@@ -243,7 +243,7 @@ static int32_t setTableSchema(SCacheRowsReader* p, uint64_t suid, const char* id
     code = metaGetTbTSchemaNotNull(p->pVnode->pMeta, suid, -1, 1, &p->pSchema);
     if (TSDB_CODE_SUCCESS != code) {
       tsdbWarn("stable:%" PRIu64 " has been dropped, failed to retrieve cached rows, %s", suid, idstr);
-      if(code != TSDB_CODE_OUT_OF_MEMORY) {
+      if(code == TSDB_CODE_NOT_FOUND) {
         return TSDB_CODE_PAR_TABLE_NOT_EXIST;
       }  else {
         return code;

source/libs/function/src/udfd.c

@@ -85,7 +85,10 @@ int32_t udfdCPluginUdfInitLoadAggFuncs(SUdfCPluginCtx *udfCtx, const char *udfNa
   char  mergeFuncName[TSDB_FUNC_NAME_LEN + 7] = {0};
   char *mergeSuffix = "_merge";
   snprintf(mergeFuncName, sizeof(mergeFuncName), "%s%s", processFuncName, mergeSuffix);
-  (void)(uv_dlsym(&udfCtx->lib, mergeFuncName, (void **)(&udfCtx->aggMergeFunc)));
+  int ret = uv_dlsym(&udfCtx->lib, mergeFuncName, (void **)(&udfCtx->aggMergeFunc));
+  if (ret != 0) {
+    fnInfo("uv_dlsym function %s. error: %s", mergeFuncName, uv_strerror(ret));
+  }
   return 0;
 }
 

source/libs/transport/src/thttp.c

@@ -616,7 +616,7 @@ static void httpHandleReq(SHttpMsg* msg) {
   int32_t fd = taosCreateSocketWithTimeout(5000);
   if (fd < 0) {
     tError("http-report failed to open socket, dst:%s:%d, chanId:%" PRId64 ", seq:%" PRId64 ", reason:%s", cli->addr,
-           cli->port, chanId, cli->seq, tstrerror(TAOS_SYSTEM_ERROR(errno)));
+           cli->port, chanId, cli->seq, tstrerror(terrno));
     destroyHttpClient(cli);
     (void)taosReleaseRef(httpRefMgt, chanId);
     return;

source/libs/transport/src/transCli.c

@@ -1403,7 +1403,7 @@ static void cliHandleBatchReq(SCliBatch* pBatch, SCliThrd* pThrd) {
     int32_t fd = taosCreateSocketWithTimeout(TRANS_CONN_TIMEOUT * 10);
     if (fd == -1) {
       tError("%s conn %p failed to create socket, reason:%s", transLabel(pTransInst), conn,
-             tstrerror(TAOS_SYSTEM_ERROR(errno)));
+             tstrerror(terrno));
       cliHandleFastFail(conn, -1);
       return;
     }
@@ -1883,9 +1883,9 @@ void cliHandleReq(SCliMsg* pMsg, SCliThrd* pThrd) {
     int32_t fd = taosCreateSocketWithTimeout(TRANS_CONN_TIMEOUT * 10);
     if (fd == -1) {
       tGError("%s conn %p failed to create socket, reason:%s", transLabel(pTransInst), conn,
-              tstrerror(TAOS_SYSTEM_ERROR(errno)));
+              tstrerror(terrno));
       cliHandleExcept(conn, -1);
-      errno = 0;
+      terrno = 0;
       return;
     }
 

source/os/src/osSignal.c

@@ -31,23 +31,35 @@ int32_t taosSetSignal(int32_t signum, FSignalHandler sigfp) {
 
   // SIGHUP doesn't exist in windows, we handle it in the way of ctrlhandler
   if (signum == SIGHUP) {
-    SetConsoleCtrlHandler((PHANDLER_ROUTINE)sigfp, TRUE);
+    if(SetConsoleCtrlHandler((PHANDLER_ROUTINE)sigfp, TRUE) == 0) {
+      terrno = TAOS_SYSTEM_WINAPI_ERROR(GetLastError());
+      return terrno;
+    }
   } else {
-    signal(signum, (FWinSignalHandler)sigfp);
+    if(signal(signum, (FWinSignalHandler)sigfp) == SIG_ERR) {
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      return terrno;
+    }
   }
   return 0;
 }
 
 int32_t taosIgnSignal(int32_t signum) {
   if (signum == SIGUSR1 || signum == SIGHUP) return 0;
-  signal(signum, SIG_IGN);
+  if(signal(signum, SIG_IGN) == SIG_ERR) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return terrno;
+  }
 
   return 0;
 }
 
 int32_t taosDflSignal(int32_t signum) {
   if (signum == SIGUSR1 || signum == SIGHUP) return 0;
-  signal(signum, SIG_DFL);
+  if(signal(signum, SIG_DFL) == SIG_ERR) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return terrno;
+  }
 
   return 0;
 }

source/os/src/osSocket.c

@@ -300,14 +300,18 @@ int32_t taosSetSockOpt(TdSocketPtr pSocket, int32_t level, int32_t optname, void
   }
 #endif
 
-  return setsockopt(pSocket->fd, level, optname, optval, optlen);
+int ret = setsockopt(pSocket->fd, level, optname, optval, optlen);
+if (ret == SOCKET_ERROR) {
+  int errorCode = WSAGetLastError();
+  return terrno = TAOS_SYSTEM_WINSOCKET_ERROR(errorCode);
+}
 #else
   int32_t code = setsockopt(pSocket->fd, level, optname, optval, (int)optlen);
   if (-1 == code) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     return terrno;
   }
-  return code;
+  return 0;
 #endif
 }
 
@@ -325,19 +329,6 @@ int32_t taosGetSockOpt(TdSocketPtr pSocket, int32_t level, int32_t optname, void
 
 #endif
 
-uint32_t taosInetAddr(const char *ipAddr) {
-#ifdef WINDOWS
-  uint32_t value;
-  int32_t  ret = inet_pton(AF_INET, ipAddr, &value);
-  if (ret <= 0) {
-    return INADDR_NONE;
-  } else {
-    return value;
-  }
-#else
-  return inet_addr(ipAddr);
-#endif
-}
 const char *taosInetNtoa(struct in_addr ipInt, char *dstStr, int32_t len) {
   const char* r = inet_ntop(AF_INET, &ipInt, dstStr, len);
   if (NULL == r) {
@@ -943,8 +934,7 @@ int32_t taosGetIpv4FromFqdn(const char *fqdn, uint32_t *ip) {
   int     iResult;
   iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
   if (iResult != 0) {
-    // printf("WSAStartup failed: %d\n", iResult);
+    return TAOS_SYSTEM_WINSOCKET_ERROR(WSAGetLastError());
-    return 0xFFFFFFFF;
   }
 #endif
 
@@ -1008,7 +998,7 @@ int32_t taosGetIpv4FromFqdn(const char *fqdn, uint32_t *ip) {
 #endif
 
     *ip = 0xFFFFFFFF;
-    return 0xFFFFFFFF;
+    return TSDB_CODE_RPC_FQDN_ERROR;
   }
 #endif
 }
@@ -1021,7 +1011,7 @@ int32_t taosGetFqdn(char *fqdn) {
   iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
   if (iResult != 0) {
     // printf("WSAStartup failed: %d\n", iResult);
-    return 1;
+    return TAOS_SYSTEM_WINSOCKET_ERROR(WSAGetLastError());
   }
 #endif
   char hostname[1024];
@@ -1077,8 +1067,8 @@ int32_t taosGetFqdn(char *fqdn) {
 
   int32_t ret = getaddrinfo(hostname, NULL, &hints, &result);
   if (!result) {
-    fprintf(stderr, "failed to get fqdn, code:%d, hostname:%s, reason:%s\n", ret, hostname, gai_strerror(ret));
+    //fprintf(stderr, "failed to get fqdn, code:%d, hostname:%s, reason:%s\n", ret, hostname, gai_strerror(ret));
-    return -1;
+    return TAOS_SYSTEM_WINSOCKET_ERROR(WSAGetLastError());
   }
   strcpy(fqdn, result->ai_canonname);
   freeaddrinfo(result);
@@ -1140,13 +1130,13 @@ int32_t taosCreateSocketWithTimeout(uint32_t timeout) {
 
   if ((fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) {
     terrno = TAOS_SYSTEM_ERROR(errno);
-    return -1;
+    return terrno;
   }
   
 #if defined(WINDOWS)
   if (0 != setsockopt(fd, IPPROTO_TCP, TCP_MAXRT, (char *)&timeout, sizeof(timeout))) {
     taosCloseSocketNoCheck1(fd);
-    return -1;
+    return TAOS_SYSTEM_WINSOCKET_ERROR(WSAGetLastError());
   }
 #elif defined(_TD_DARWIN_64)
   // invalid config
@@ -1160,7 +1150,7 @@ int32_t taosCreateSocketWithTimeout(uint32_t timeout) {
   if (-1 == setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, (char *)&conn_timeout_ms, sizeof(conn_timeout_ms))) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     TAOS_SKIP_ERROR(taosCloseSocketNoCheck1(fd));
-    return -1;
+    return terrno;
   }
 #endif
 

source/os/src/osString.c

@@ -216,14 +216,14 @@ int32_t taosConvInit(void) {
 
   for (int32_t i = 0; i < gConvMaxNum[M2C]; ++i) {
     gConv[M2C][i].conv = iconv_open(DEFAULT_UNICODE_ENCODEC, tsCharset);
-    if ((iconv_t)-1 == gConv[M2C][i].conv || (iconv_t)0 == gConv[M2C][i].conv) {
+    if ((iconv_t)-1 == gConv[M2C][i].conv) {
       terrno = TAOS_SYSTEM_ERROR(errno);
       return terrno;
     }
   }
   for (int32_t i = 0; i < gConvMaxNum[1 - M2C]; ++i) {
     gConv[1 - M2C][i].conv = iconv_open(tsCharset, DEFAULT_UNICODE_ENCODEC);
-    if ((iconv_t)-1 == gConv[1 - M2C][i].conv || (iconv_t)0 == gConv[1 - M2C][i].conv) {
+    if ((iconv_t)-1 == gConv[1 - M2C][i].conv) {
       terrno = TAOS_SYSTEM_ERROR(errno);
       return terrno;
     }
@@ -251,13 +251,13 @@ iconv_t taosAcquireConv(int32_t *idx, ConvType type) {
     *idx = -1;
     if (type == M2C) {
       iconv_t c = iconv_open(DEFAULT_UNICODE_ENCODEC, tsCharset);
-      if ((iconv_t)-1 == c || (iconv_t)0 == c) {
+      if ((iconv_t)-1 == c) {
         terrno = TAOS_SYSTEM_ERROR(errno);
       }
       return c;
     } else {
       iconv_t c = iconv_open(tsCharset, DEFAULT_UNICODE_ENCODEC);
-      if ((iconv_t)-1 == c || (iconv_t)0 == c) {
+      if ((iconv_t)-1 == c) {
         terrno = TAOS_SYSTEM_ERROR(errno);
       }
       return c;
@@ -312,7 +312,7 @@ bool taosMbsToUcs4(const char *mbs, size_t mbsLength, TdUcs4 *ucs4, int32_t ucs4
 
   int32_t idx = -1;
   iconv_t conv = taosAcquireConv(&idx, M2C);
-  if ((iconv_t)-1 == conv || (iconv_t)0 == conv) {
+  if ((iconv_t)-1 == conv) {
     return false;
   }
   
@@ -350,7 +350,7 @@ int32_t taosUcs4ToMbs(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs) {
   int32_t idx = -1;
   int32_t code = 0;
   iconv_t conv = taosAcquireConv(&idx, C2M);
-  if ((iconv_t)-1 == conv || (iconv_t)0 == conv) {
+  if ((iconv_t)-1 == conv) {
     return TSDB_CODE_APP_ERROR;
   }