Merge branch '3.0' into feature/3.0_interval_hash_optimize

source/libs/transport/src/thttp.c

@@ -21,11 +21,14 @@
 #include "taoserror.h"
 #include "tlog.h"
 
+
+#define HTTP_RECV_BUF_SIZE 1024
 typedef struct SHttpClient {
   uv_connect_t conn;
   uv_tcp_t     tcp;
   uv_write_t   req;
-  uv_buf_t*    buf;
+  uv_buf_t*    wbuf;
+  char         *rbuf; 
   char*        addr;
   uint16_t     port;
 } SHttpClient;
@@ -122,14 +125,30 @@ _OVER:
 }
 
 static void destroyHttpClient(SHttpClient* cli) {
-  taosMemoryFree(cli->buf);
+  taosMemoryFree(cli->wbuf);
+  taosMemoryFree(cli->rbuf);
   taosMemoryFree(cli->addr);
   taosMemoryFree(cli);
+
 }
 static void clientCloseCb(uv_handle_t* handle) {
   SHttpClient* cli = handle->data;
   destroyHttpClient(cli);
 }
+static void clientAllocBuffCb(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf) {
+  SHttpClient* cli = handle->data; 
+  buf->base = cli->rbuf; 
+  buf->len = HTTP_RECV_BUF_SIZE;  
+}
+static void clientRecvCb(uv_stream_t* handle, ssize_t nread, const uv_buf_t *buf) {
+  SHttpClient* cli = handle->data; 
+  if (nread < 0) {
+    uError("http-report read error:%s", uv_err_name(nread));
+  } else {
+    uInfo("http-report succ to read %d bytes, just ignore it", nread);
+  }
+  uv_close((uv_handle_t*)&cli->tcp, clientCloseCb);
+} 
 static void clientSentCb(uv_write_t* req, int32_t status) {
   SHttpClient* cli = req->data;
   if (status != 0) {
@@ -138,7 +157,7 @@ static void clientSentCb(uv_write_t* req, int32_t status) {
   } else {
     uInfo("http-report succ to send data");
   }
-  uv_close((uv_handle_t*)&cli->tcp, clientCloseCb);
+  uv_read_start((uv_stream_t *)&cli->tcp, clientAllocBuffCb, clientRecvCb); 
 }
 static void clientConnCb(uv_connect_t* req, int32_t status) {
   SHttpClient* cli = req->data;
@@ -148,7 +167,7 @@ static void clientConnCb(uv_connect_t* req, int32_t status) {
     uv_close((uv_handle_t*)&cli->tcp, clientCloseCb);
     return;
   }
-  uv_write(&cli->req, (uv_stream_t*)&cli->tcp, cli->buf, 2, clientSentCb);
+  uv_write(&cli->req, (uv_stream_t*)&cli->tcp, cli->wbuf, 2, clientSentCb);
 }
 
 static int32_t taosBuildDstAddr(const char* server, uint16_t port, struct sockaddr_in* dest) {
@@ -189,7 +208,8 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32
   cli->conn.data = cli;
   cli->tcp.data = cli;
   cli->req.data = cli;
-  cli->buf = wb;
+  cli->wbuf = wb;
+  cli->rbuf = taosMemoryCalloc(1, HTTP_RECV_BUF_SIZE); 
   cli->addr = tstrdup(server);
   cli->port = port;
 
@@ -199,7 +219,6 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32
   int32_t fd = taosCreateSocketWithTimeout(5);
   uv_tcp_open((uv_tcp_t*)&cli->tcp, fd);
 
-
   int32_t ret = uv_tcp_connect(&cli->conn, &cli->tcp, (const struct sockaddr*)&dest, clientConnCb);
   if (ret != 0) {
     uError("http-report failed to connect to server, reason:%s, dst:%s:%d", uv_strerror(ret), cli->addr, cli->port);

tools/CMakeLists.txt

@@ -174,15 +174,15 @@ ELSE ()
                 BUILD_COMMAND
                 COMMAND set CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client
                 COMMAND set CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib
-                COMMAND go build -ldflags "-s -w -X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
-                COMMAND go build -o taosadapter-debug -ldflags "-X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
+                COMMAND go build -a -o taosadapter.exe -ldflags "-s -w -X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
+                COMMAND go build -a -o taosadapter-debug.exe -ldflags "-X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
                 INSTALL_COMMAND
                 COMMAND ${_upx_prefix}/src/upx/upx taosadapter.exe
                 COMMAND cmake -E copy taosadapter.exe ${CMAKE_BINARY_DIR}/build/bin
                 COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
                 COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
                 COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
-                COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
+                COMMAND cmake -E copy taosadapter-debug.exe ${CMAKE_BINARY_DIR}/build/bin
                 )
         unset(_upx_prefix)
     ELSE ()