diff --git a/source/os/src/osSocket.c b/source/os/src/osSocket.c
index 2065ba68fe..09a5579e13 100644
--- a/source/os/src/osSocket.c
+++ b/source/os/src/osSocket.c
@@ -55,7 +55,7 @@ typedef struct TdSocket {
 #endif
   int      refId;
   SocketFd fd;
-} *TdSocketPtr, TdSocket;
+} * TdSocketPtr, TdSocket;
 
 typedef struct TdSocketServer {
 #if SOCKET_WITH_LOCK
@@ -63,7 +63,7 @@ typedef struct TdSocketServer {
 #endif
   int      refId;
   SocketFd fd;
-} *TdSocketServerPtr, TdSocketServer;
+} * TdSocketServerPtr, TdSocketServer;
 
 typedef struct TdEpoll {
 #if SOCKET_WITH_LOCK
@@ -71,52 +71,7 @@ typedef struct TdEpoll {
 #endif
   int     refId;
   EpollFd fd;
-} *TdEpollPtr, TdEpoll;
-
-#if 0
-int32_t taosSendto(TdSocketPtr pSocket, void *buf, int len, unsigned int flags, const struct sockaddr *dest_addr,
-                   int addrlen) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return sendto(pSocket->fd, buf, len, flags, dest_addr, addrlen);
-#else
-  return sendto(pSocket->fd, buf, len, flags, dest_addr, addrlen);
-#endif
-}
-
-int32_t taosWriteSocket(TdSocketPtr pSocket, void *buf, int len) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return send(pSocket->fd, buf, len, 0);
-  ;
-#else
-  return write(pSocket->fd, buf, len);
-#endif
-}
-int32_t taosReadSocket(TdSocketPtr pSocket, void *buf, int len) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return recv(pSocket->fd, buf, len, 0);
-  ;
-#else
-  return read(pSocket->fd, buf, len);
-#endif
-}
-
-int32_t taosReadFromSocket(TdSocketPtr pSocket, void *buf, int32_t len, int32_t flags, struct sockaddr *destAddr,
-                           int *addrLen) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-  return recvfrom(pSocket->fd, buf, len, flags, destAddr, addrLen);
-}
-#endif  // endif 0
+} * TdEpollPtr, TdEpoll;
 
 int32_t taosCloseSocketNoCheck1(SocketFd fd) {
 #ifdef WINDOWS
@@ -145,136 +100,16 @@ int32_t taosCloseSocket(TdSocketPtr *ppSocket) {
   code = taosCloseSocketNoCheck1((*ppSocket)->fd);
   (*ppSocket)->fd = -1;
   taosMemoryFree(*ppSocket);
-  
+
   return code;
 }
 
-#if 0
-int32_t taosCloseSocketServer(TdSocketServerPtr *ppSocketServer) {
-  int32_t code;
-  if (ppSocketServer == NULL || *ppSocketServer == NULL || (*ppSocketServer)->fd < 0) {
-    return -1;
-  }
-  code = taosCloseSocketNoCheck1((*ppSocketServer)->fd);
-  (*ppSocketServer)->fd = -1;
-  taosMemoryFree(*ppSocketServer);
-  return code;
-}
-
-int32_t taosShutDownSocketRD(TdSocketPtr pSocket) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return closesocket(pSocket->fd);
-#elif __APPLE__
-  return close(pSocket->fd);
-#else
-  return shutdown(pSocket->fd, SHUT_RD);
-#endif
-}
-int32_t taosShutDownSocketServerRD(TdSocketServerPtr pSocketServer) {
-  if (pSocketServer == NULL || pSocketServer->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return closesocket(pSocketServer->fd);
-#elif __APPLE__
-  return close(pSocketServer->fd);
-#else
-  return shutdown(pSocketServer->fd, SHUT_RD);
-#endif
-}
-
-int32_t taosShutDownSocketWR(TdSocketPtr pSocket) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return closesocket(pSocket->fd);
-#elif __APPLE__
-  return close(pSocket->fd);
-#else
-  return shutdown(pSocket->fd, SHUT_WR);
-#endif
-}
-int32_t taosShutDownSocketServerWR(TdSocketServerPtr pSocketServer) {
-  if (pSocketServer == NULL || pSocketServer->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return closesocket(pSocketServer->fd);
-#elif __APPLE__
-  return close(pSocketServer->fd);
-#else
-  return shutdown(pSocketServer->fd, SHUT_WR);
-#endif
-}
-int32_t taosShutDownSocketRDWR(TdSocketPtr pSocket) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return closesocket(pSocket->fd);
-#elif __APPLE__
-  return close(pSocket->fd);
-#else
-  return shutdown(pSocket->fd, SHUT_RDWR);
-#endif
-}
-int32_t taosShutDownSocketServerRDWR(TdSocketServerPtr pSocketServer) {
-  if (pSocketServer == NULL || pSocketServer->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return closesocket(pSocketServer->fd);
-#elif __APPLE__
-  return close(pSocketServer->fd);
-#else
-  return shutdown(pSocketServer->fd, SHUT_RDWR);
-#endif
-}
-
-int32_t taosSetNonblocking(TdSocketPtr pSocket, int32_t on) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  u_long mode;
-  if (on) {
-    mode = 1;
-    ioctlsocket(pSocket->fd, FIONBIO, &mode);
-  } else {
-    mode = 0;
-    ioctlsocket(pSocket->fd, FIONBIO, &mode);
-  }
-#else
-  int32_t flags = 0;
-  if ((flags = fcntl(pSocket->fd, F_GETFL, 0)) < 0) {
-    // printf("fcntl(F_GETFL) error: %d (%s)\n", errno, strerror(errno));
-    return 1;
-  }
-
-  if (on)
-    flags |= O_NONBLOCK;
-  else
-    flags &= ~O_NONBLOCK;
-
-  if ((flags = fcntl(pSocket->fd, F_SETFL, flags)) < 0) {
-    // printf("fcntl(F_SETFL) error: %d (%s)\n", errno, strerror(errno));
-    return 1;
-  }
-#endif
-  return 0;
-}
-#endif  // endif 0
-
 int32_t taosSetSockOpt(TdSocketPtr pSocket, int32_t level, int32_t optname, void *optval, int32_t optlen) {
   if (pSocket == NULL || pSocket->fd < 0) {
     terrno = TSDB_CODE_INVALID_PARA;
     return terrno;
   }
-  
+
 #ifdef WINDOWS
 #ifdef TCP_KEEPCNT
   if (level == SOL_SOCKET && optname == TCP_KEEPCNT) {
@@ -300,11 +135,11 @@ int32_t taosSetSockOpt(TdSocketPtr pSocket, int32_t level, int32_t optname, void
   }
 #endif
 
-int ret = setsockopt(pSocket->fd, level, optname, optval, optlen);
-if (ret == SOCKET_ERROR) {
-  int errorCode = WSAGetLastError();
-  return terrno = TAOS_SYSTEM_WINSOCKET_ERROR(errorCode);
-}
+  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) {
@@ -315,22 +150,8 @@ if (ret == SOCKET_ERROR) {
 #endif
 }
 
-#if 0
-int32_t taosGetSockOpt(TdSocketPtr pSocket, int32_t level, int32_t optname, void *optval, int32_t *optlen) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-#ifdef WINDOWS
-  return -1;
-#else
-  return getsockopt(pSocket->fd, level, optname, optval, (int *)optlen);
-#endif
-}
-
-#endif
-
 const char *taosInetNtoa(struct in_addr ipInt, char *dstStr, int32_t len) {
-  const char* r = inet_ntop(AF_INET, &ipInt, dstStr, len);
+  const char *r = inet_ntop(AF_INET, &ipInt, dstStr, len);
   if (NULL == r) {
     terrno = TAOS_SYSTEM_ERROR(errno);
   }
@@ -344,403 +165,6 @@ const char *taosInetNtoa(struct in_addr ipInt, char *dstStr, int32_t len) {
 
 #define TCP_CONN_TIMEOUT 3000  // conn timeout
 
-#if 0
-int32_t taosWriteMsg(TdSocketPtr pSocket, void *buf, int32_t nbytes) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-  int32_t nleft, nwritten;
-  char   *ptr = (char *)buf;
-
-  nleft = nbytes;
-
-  while (nleft > 0) {
-    nwritten = taosWriteSocket(pSocket, (char *)ptr, (size_t)nleft);
-    if (nwritten <= 0) {
-      if (errno == EINTR /* || errno == EAGAIN || errno == EWOULDBLOCK */)
-        continue;
-      else
-        return -1;
-    } else {
-      nleft -= nwritten;
-      ptr += nwritten;
-    }
-
-    if (errno == SIGPIPE || errno == EPIPE) {
-      return -1;
-    }
-  }
-
-  return (nbytes - nleft);
-}
-
-int32_t taosReadMsg(TdSocketPtr pSocket, void *buf, int32_t nbytes) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-  int32_t nleft, nread;
-  char   *ptr = (char *)buf;
-
-  nleft = nbytes;
-
-  while (nleft > 0) {
-    nread = taosReadSocket(pSocket, ptr, (size_t)nleft);
-    if (nread == 0) {
-      break;
-    } else if (nread < 0) {
-      if (errno == EINTR /* || errno == EAGAIN || errno == EWOULDBLOCK*/) {
-        continue;
-      } else {
-        return -1;
-      }
-    } else {
-      nleft -= nread;
-      ptr += nread;
-    }
-
-    if (errno == SIGPIPE || errno == EPIPE) {
-      return -1;
-    }
-  }
-
-  return (nbytes - nleft);
-}
-
-int32_t taosNonblockwrite(TdSocketPtr pSocket, char *ptr, int32_t nbytes) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-  taosSetNonblocking(pSocket, 1);
-
-  int32_t        nleft, nwritten, nready;
-  fd_set         fset;
-  struct timeval tv;
-
-  nleft = nbytes;
-  while (nleft > 0) {
-    tv.tv_sec = 30;
-    tv.tv_usec = 0;
-    FD_ZERO(&fset);
-    FD_SET(pSocket->fd, &fset);
-    if ((nready = select((SocketFd)(pSocket->fd + 1), NULL, &fset, NULL, &tv)) == 0) {
-      errno = ETIMEDOUT;
-      // printf("fd %d timeout, no enough space to write", fd);
-      break;
-
-    } else if (nready < 0) {
-      if (errno == EINTR) continue;
-
-      // printf("select error, %d (%s)", errno, strerror(errno));
-      return -1;
-    }
-
-    nwritten = (int32_t)send(pSocket->fd, ptr, (size_t)nleft, MSG_NOSIGNAL);
-    if (nwritten <= 0) {
-      if (errno == EAGAIN || errno == EINTR) continue;
-
-      // printf("write error, %d (%s)", errno, strerror(errno));
-      return -1;
-    }
-
-    nleft -= nwritten;
-    ptr += nwritten;
-  }
-
-  taosSetNonblocking(pSocket, 0);
-
-  return (nbytes - nleft);
-}
-
-TdSocketPtr taosOpenUdpSocket(uint32_t ip, uint16_t port) {
-  struct sockaddr_in localAddr;
-  SocketFd           fd;
-  int32_t            bufSize = 1024000;
-
-  // printf("open udp socket:0x%x:%hu", ip, port);
-
-  memset((char *)&localAddr, 0, sizeof(localAddr));
-  localAddr.sin_family = AF_INET;
-  localAddr.sin_addr.s_addr = ip;
-  localAddr.sin_port = (uint16_t)htons(port);
-
-  if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) <= 2) {
-    // printf("failed to open udp socket: %d (%s)", errno, strerror(errno));
-    taosCloseSocketNoCheck1(fd);
-    return NULL;
-  }
-
-  TdSocketPtr pSocket = (TdSocketPtr)taosMemoryMalloc(sizeof(TdSocket));
-  if (pSocket == NULL) {
-    taosCloseSocketNoCheck1(fd);
-    return NULL;
-  }
-  pSocket->fd = fd;
-  pSocket->refId = 0;
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_SNDBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    // printf("failed to set the send buffer size for UDP socket\n");
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_RCVBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    // printf("failed to set the receive buffer size for UDP socket\n");
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  /* bind socket to local address */
-  if (bind(pSocket->fd, (struct sockaddr *)&localAddr, sizeof(localAddr)) < 0) {
-    // printf("failed to bind udp socket: %d (%s), 0x%x:%hu", errno, strerror(errno), ip, port);
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  return pSocket;
-}
-
-TdSocketPtr taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clientIp) {
-  SocketFd           fd = -1;
-  int32_t            ret;
-  struct sockaddr_in serverAddr, clientAddr;
-  int32_t            bufSize = 1024 * 1024;
-
-  fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-
-  if (fd <= 2) {
-    // printf("failed to open the socket: %d (%s)", errno, strerror(errno));
-    if (fd >= 0) taosCloseSocketNoCheck1(fd);
-    return NULL;
-  }
-
-  TdSocketPtr pSocket = (TdSocketPtr)taosMemoryMalloc(sizeof(TdSocket));
-  if (pSocket == NULL) {
-    taosCloseSocketNoCheck1(fd);
-    return NULL;
-  }
-  pSocket->fd = fd;
-  pSocket->refId = 0;
-
-  /* set REUSEADDR option, so the portnumber can be re-used */
-  int32_t reuse = 1;
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_REUSEADDR, (void *)&reuse, sizeof(reuse)) < 0) {
-    // printf("setsockopt SO_REUSEADDR failed: %d (%s)", errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_SNDBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    // printf("failed to set the send buffer size for TCP socket\n");
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_RCVBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    // printf("failed to set the receive buffer size for TCP socket\n");
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  if (clientIp != 0) {
-    memset((char *)&clientAddr, 0, sizeof(clientAddr));
-    clientAddr.sin_family = AF_INET;
-    clientAddr.sin_addr.s_addr = clientIp;
-    clientAddr.sin_port = 0;
-
-    /* bind socket to client address */
-    if (bind(pSocket->fd, (struct sockaddr *)&clientAddr, sizeof(clientAddr)) < 0) {
-      // printf("bind tcp client socket failed, client(0x%x:0), dest(0x%x:%d), reason:(%s)", clientIp, destIp, destPort,
-      //        strerror(errno));
-      taosCloseSocket(&pSocket);
-      return NULL;
-    }
-  }
-
-  memset((char *)&serverAddr, 0, sizeof(serverAddr));
-  serverAddr.sin_family = AF_INET;
-  serverAddr.sin_addr.s_addr = destIp;
-  serverAddr.sin_port = (uint16_t)htons((uint16_t)destPort);
-
-#ifdef _TD_LINUX
-  taosSetNonblocking(pSocket, 1);
-  ret = connect(pSocket->fd, (struct sockaddr *)&serverAddr, sizeof(serverAddr));
-  if (ret == -1) {
-    if (errno == EHOSTUNREACH) {
-      // printf("failed to connect socket, ip:0x%x, port:%hu(%s)", destIp, destPort, strerror(errno));
-      taosCloseSocket(&pSocket);
-      return -1;
-    } else if (errno == EINPROGRESS || errno == EAGAIN || errno == EWOULDBLOCK) {
-      struct pollfd wfd[1];
-
-      wfd[0].fd = pSocket->fd;
-      wfd[0].events = POLLOUT;
-
-      int res = poll(wfd, 1, TCP_CONN_TIMEOUT);
-      if (res == -1 || res == 0) {
-        // printf("failed to connect socket, ip:0x%x, port:%hu(poll error/conn timeout)", destIp, destPort);
-        taosCloseSocket(&pSocket);  //
-        return -1;
-      }
-      int optVal = -1, optLen = sizeof(int);
-      if ((0 != taosGetSockOpt(pSocket, SOL_SOCKET, SO_ERROR, &optVal, &optLen)) || (optVal != 0)) {
-        // printf("failed to connect socket, ip:0x%x, port:%hu(connect host error)", destIp, destPort);
-        taosCloseSocket(&pSocket);  //
-        return -1;
-      }
-      ret = 0;
-    } else {  // Other error
-      // printf("failed to connect socket, ip:0x%x, port:%hu(target host cannot be reached)", destIp, destPort);
-      taosCloseSocket(&pSocket);  //
-      return -1;
-    }
-  }
-  taosSetNonblocking(pSocket, 0);
-
-#else
-  ret = connect(pSocket->fd, (struct sockaddr *)&serverAddr, sizeof(serverAddr));
-#endif
-
-  if (ret != 0) {
-    // printf("failed to connect socket, ip:0x%x, port:%hu(%s)", destIp, destPort, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return NULL;
-  } else {
-    if (taosKeepTcpAlive(pSocket) == -1) {
-      return NULL;
-    }
-  }
-
-  return pSocket;
-}
-
-int32_t taosKeepTcpAlive(TdSocketPtr pSocket) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-  int32_t alive = 1;
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_KEEPALIVE, (void *)&alive, sizeof(alive)) < 0) {
-    // printf("fd:%d setsockopt SO_KEEPALIVE failed: %d (%s)", sockFd, errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-#ifndef __APPLE__
-  // all fails on macosx
-#ifdef TCP_KEEPCNT
-  int32_t probes = 3;
-  if (taosSetSockOpt(pSocket, SOL_TCP, TCP_KEEPCNT, (void *)&probes, sizeof(probes)) < 0) {
-    // printf("fd:%d setsockopt SO_KEEPCNT failed: %d (%s)", sockFd, errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-#endif
-
-#ifdef TCP_KEEPIDLE
-  int32_t alivetime = 10;
-  if (taosSetSockOpt(pSocket, SOL_TCP, TCP_KEEPIDLE, (void *)&alivetime, sizeof(alivetime)) < 0) {
-    // printf("fd:%d setsockopt SO_KEEPIDLE failed: %d (%s)", sockFd, errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-#endif
-
-#ifdef TCP_KEEPINTVL
-  int32_t interval = 3;
-  if (taosSetSockOpt(pSocket, SOL_TCP, TCP_KEEPINTVL, (void *)&interval, sizeof(interval)) < 0) {
-    // printf("fd:%d setsockopt SO_KEEPINTVL failed: %d (%s)", sockFd, errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-#endif
-#endif  // __APPLE__
-
-  int32_t nodelay = 1;
-  if (taosSetSockOpt(pSocket, IPPROTO_TCP, TCP_NODELAY, (void *)&nodelay, sizeof(nodelay)) < 0) {
-    // printf("fd:%d setsockopt TCP_NODELAY failed %d (%s)", sockFd, errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  struct linger linger = {0};
-  linger.l_onoff = 1;
-  linger.l_linger = 3;
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_LINGER, (void *)&linger, sizeof(linger)) < 0) {
-    // printf("setsockopt SO_LINGER failed: %d (%s)", errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  return 0;
-}
-
-int taosGetLocalIp(const char *eth, char *ip) {
-#if defined(WINDOWS)
-  // DO NOTHAING
-  return -1;
-#else
-  int                fd;
-  struct ifreq       ifr;
-  struct sockaddr_in sin;
-
-  fd = socket(AF_INET, SOCK_DGRAM, 0);
-  if (-1 == fd) {
-    return -1;
-  }
-  strncpy(ifr.ifr_name, eth, IFNAMSIZ);
-  ifr.ifr_name[IFNAMSIZ - 1] = 0;
-
-  if (ioctl(fd, SIOCGIFADDR, &ifr) < 0) {
-    taosCloseSocketNoCheck1(fd);
-    return -1;
-  }
-  memcpy(&sin, &ifr.ifr_addr, sizeof(sin));
-  taosInetNtoa(sin.sin_addr, ip, 64);
-  taosCloseSocketNoCheck1(fd);
-#endif
-  return 0;
-}
-int taosValidIp(uint32_t ip) {
-#if defined(WINDOWS)
-  // DO NOTHAING
-  return -1;
-#else
-  int ret = -1;
-  int fd;
-
-  struct ifconf ifconf;
-
-  char buf[512] = {0};
-  ifconf.ifc_len = 512;
-  ifconf.ifc_buf = buf;
-
-  if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-    return -1;
-  }
-
-  ioctl(fd, SIOCGIFCONF, &ifconf);
-  struct ifreq *ifreq = (struct ifreq *)ifconf.ifc_buf;
-  for (int i = (ifconf.ifc_len / sizeof(struct ifreq)); i > 0; i--) {
-    char ip_str[64] = {0};
-    if (ifreq->ifr_flags == AF_INET) {
-      ret = taosGetLocalIp(ifreq->ifr_name, ip_str);
-      if (ret != 0) {
-        break;
-      }
-      ret = -1;
-      if (ip == (uint32_t)taosInetAddr(ip_str)) {
-        ret = 0;
-        break;
-      }
-      ifreq++;
-    }
-  }
-  taosCloseSocketNoCheck1(fd);
-  return ret;
-#endif
-  return 0;
-}
-#endif  // endif 0
-
 bool taosValidIpAndPort(uint32_t ip, uint16_t port) {
   struct sockaddr_in serverAdd;
   SocketFd           fd;
@@ -778,138 +202,19 @@ bool taosValidIpAndPort(uint32_t ip, uint16_t port) {
     TAOS_SKIP_ERROR(taosCloseSocket(&pSocket));
     return false;
   }
-  
+
   /* bind socket to server address */
   if (-1 == bind(pSocket->fd, (struct sockaddr *)&serverAdd, sizeof(serverAdd))) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     TAOS_SKIP_ERROR(taosCloseSocket(&pSocket));
     return false;
   }
-  
+
   TAOS_SKIP_ERROR(taosCloseSocket(&pSocket));
-  
+
   return true;
 }
 
-#if 0
-TdSocketServerPtr taosOpenTcpServerSocket(uint32_t ip, uint16_t port) {
-  struct sockaddr_in serverAdd;
-  SocketFd           fd;
-  int32_t            reuse;
-
-  // printf("open tcp server socket:0x%x:%hu", ip, port);
-
-  bzero((char *)&serverAdd, sizeof(serverAdd));
-  serverAdd.sin_family = AF_INET;
-  serverAdd.sin_addr.s_addr = ip;
-  serverAdd.sin_port = (uint16_t)htons(port);
-
-  if ((fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) <= 2) {
-    // printf("failed to open TCP socket: %d (%s)", errno, strerror(errno));
-    taosCloseSocketNoCheck1(fd);
-    return NULL;
-  }
-
-  TdSocketPtr pSocket = (TdSocketPtr)taosMemoryMalloc(sizeof(TdSocket));
-  if (pSocket == NULL) {
-    taosCloseSocketNoCheck1(fd);
-    return NULL;
-  }
-  pSocket->refId = 0;
-  pSocket->fd = fd;
-
-  /* set REUSEADDR option, so the portnumber can be re-used */
-  reuse = 1;
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_REUSEADDR, (void *)&reuse, sizeof(reuse)) < 0) {
-    // printf("setsockopt SO_REUSEADDR failed: %d (%s)", errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  /* bind socket to server address */
-  if (bind(pSocket->fd, (struct sockaddr *)&serverAdd, sizeof(serverAdd)) < 0) {
-    // printf("bind tcp server socket failed, 0x%x:%hu(%s)", ip, port, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  if (taosKeepTcpAlive(pSocket) < 0) {
-    // printf("failed to set tcp server keep-alive option, 0x%x:%hu(%s)", ip, port, strerror(errno));
-    return NULL;
-  }
-
-  if (listen(pSocket->fd, 1024) < 0) {
-    // printf("listen tcp server socket failed, 0x%x:%hu(%s)", ip, port, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  return (TdSocketServerPtr)pSocket;
-}
-
-TdSocketPtr taosAcceptTcpConnectSocket(TdSocketServerPtr pServerSocket, struct sockaddr *destAddr, int *addrLen) {
-  if (pServerSocket == NULL || pServerSocket->fd < 0) {
-    return NULL;
-  }
-  SocketFd fd = accept(pServerSocket->fd, destAddr, addrLen);
-  if (fd == -1) {
-    // tError("TCP accept failure(%s)", strerror(errno));
-    return NULL;
-  }
-
-  TdSocketPtr pSocket = (TdSocketPtr)taosMemoryMalloc(sizeof(TdSocket));
-  if (pSocket == NULL) {
-    taosCloseSocketNoCheck1(fd);
-    return NULL;
-  }
-  pSocket->fd = fd;
-  pSocket->refId = 0;
-  return pSocket;
-}
-#define COPY_SIZE 32768
-// sendfile shall be used
-
-int64_t taosCopyFds(TdSocketPtr pSrcSocket, TdSocketPtr pDestSocket, int64_t len) {
-  if (pSrcSocket == NULL || pSrcSocket->fd < 0 || pDestSocket == NULL || pDestSocket->fd < 0) {
-    return -1;
-  }
-  int64_t leftLen;
-  int64_t readLen, writeLen;
-  char    temp[COPY_SIZE];
-
-  leftLen = len;
-
-  while (leftLen > 0) {
-    if (leftLen < COPY_SIZE)
-      readLen = leftLen;
-    else
-      readLen = COPY_SIZE;  // 4K
-
-    int64_t retLen = taosReadMsg(pSrcSocket, temp, (int32_t)readLen);
-    if (readLen != retLen) {
-      // printf("read error, readLen:%" PRId64 " retLen:%" PRId64 " len:%" PRId64 " leftLen:%" PRId64 ", reason:%s",
-      //        readLen, retLen, len, leftLen, strerror(errno));
-      return -1;
-    }
-
-    writeLen = taosWriteMsg(pDestSocket, temp, (int32_t)readLen);
-
-    if (readLen != writeLen) {
-      // printf("copy error, readLen:%" PRId64 " writeLen:%" PRId64 " len:%" PRId64 " leftLen:%" PRId64 ", reason:%s",
-      //        readLen, writeLen, len, leftLen, strerror(errno));
-      return -1;
-    }
-
-    leftLen -= readLen;
-  }
-
-  return len;
-}
-
-// Function converting an IP address string to an uint32_t.
-
-#endif  // endif 0
-
 int32_t taosBlockSIGPIPE() {
 #ifdef WINDOWS
   return 0;
@@ -1029,7 +334,7 @@ int32_t taosGetFqdn(char *fqdn) {
   // hints.ai_family = AF_INET;
   strcpy(fqdn, hostname);
   strcpy(fqdn + strlen(hostname), ".local");
-#else   // linux
+#else  // linux
 
 #endif  // linux
 
@@ -1048,7 +353,7 @@ int32_t taosGetFqdn(char *fqdn) {
         terrno = TAOS_SYSTEM_ERROR(errno);
         return terrno;
       }
-    
+
       terrno = TAOS_SYSTEM_ERROR(ret);
       return terrno;
     }
@@ -1067,7 +372,7 @@ 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 TAOS_SYSTEM_WINSOCKET_ERROR(WSAGetLastError());
   }
   strcpy(fqdn, result->ai_canonname);
@@ -1082,41 +387,16 @@ void tinet_ntoa(char *ipstr, uint32_t ip) {
   (void)sprintf(ipstr, "%d.%d.%d.%d", ip & 0xFF, (ip >> 8) & 0xFF, (ip >> 16) & 0xFF, ip >> 24);
 }
 
-int32_t taosIgnSIGPIPE() { 
-  sighandler_t h = signal(SIGPIPE, SIG_IGN); 
+int32_t taosIgnSIGPIPE() {
+  sighandler_t h = signal(SIGPIPE, SIG_IGN);
   if (SIG_ERR == h) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     return terrno;
   }
 
-  return 0; 
+  return 0;
 }
 
-#if 0
-
-int32_t taosSetMaskSIGPIPE() {
-#ifdef WINDOWS
-  return -1;
-#else
-  sigset_t signal_mask;
-  (void)sigemptyset(&signal_mask);
-  (void)sigaddset(&signal_mask, SIGPIPE);
-  
-  int32_t rc = pthread_sigmask(SIG_SETMASK, &signal_mask, NULL);
-  if (rc != 0) {
-    // printf("failed to setmask SIGPIPE");
-  }
-#endif
-}
-
-int32_t taosGetSocketName(TdSocketPtr pSocket, struct sockaddr *destAddr, int *addrLen) {
-  if (pSocket == NULL || pSocket->fd < 0) {
-    return -1;
-  }
-  return getsockname(pSocket->fd, destAddr, addrLen);
-}
-#endif  // endif 0
-
 /*
  * Set TCP connection timeout per-socket level.
  * ref [https://github.com/libuv/help/issues/54]
@@ -1132,7 +412,7 @@ int32_t taosCreateSocketWithTimeout(uint32_t timeout) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     return terrno;
   }
-  
+
 #if defined(WINDOWS)
   if (0 != setsockopt(fd, IPPROTO_TCP, TCP_MAXRT, (char *)&timeout, sizeof(timeout))) {
     taosCloseSocketNoCheck1(fd);