From 4540739c45866641c3fd1a7a0f9f1db809ca9b72 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 8 Mar 2022 11:34:38 +0800 Subject: [PATCH] minor changes --- source/libs/monitor/CMakeLists.txt | 1 - source/libs/monitor/inc/monInt.h | 1 - source/libs/transport/CMakeLists.txt | 1 + source/libs/transport/inc/thttp.h | 33 ++++++++++++++++++++++++++++ source/util/CMakeLists.txt | 2 +- 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 source/libs/transport/inc/thttp.h diff --git a/source/libs/monitor/CMakeLists.txt b/source/libs/monitor/CMakeLists.txt index 050372fab3..58f1c08039 100644 --- a/source/libs/monitor/CMakeLists.txt +++ b/source/libs/monitor/CMakeLists.txt @@ -3,7 +3,6 @@ add_library(monitor STATIC ${MONITOR_SRC}) target_include_directories( monitor PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/monitor" - PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/transport" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) diff --git a/source/libs/monitor/inc/monInt.h b/source/libs/monitor/inc/monInt.h index c3b6569555..6ef901410b 100644 --- a/source/libs/monitor/inc/monInt.h +++ b/source/libs/monitor/inc/monInt.h @@ -19,7 +19,6 @@ #include "monitor.h" #include "tarray.h" -#include "tlockfree.h" #include "tjson.h" typedef struct { diff --git a/source/libs/transport/CMakeLists.txt b/source/libs/transport/CMakeLists.txt index 465646ac95..5cc436cf32 100644 --- a/source/libs/transport/CMakeLists.txt +++ b/source/libs/transport/CMakeLists.txt @@ -12,6 +12,7 @@ target_link_libraries( PUBLIC os PUBLIC util PUBLIC common + PUBLIC zlib ) if (${BUILD_WITH_UV_TRANS}) if (${BUILD_WITH_UV}) diff --git a/source/libs/transport/inc/thttp.h b/source/libs/transport/inc/thttp.h new file mode 100644 index 0000000000..a9e3953f57 --- /dev/null +++ b/source/libs/transport/inc/thttp.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * This program is free software: you can use, redistribute, and/or modify + * it under the terms of the GNU Affero General Public License, version 3 + * or later ("AGPL"), as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +#ifndef _TD_TRANSPORT_HTTP_H_ +#define _TD_TRANSPORT_HTTP_H_ + +#include "os.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { HTTP_GZIP, HTTP_FLAT } EHttpCompFlag; + +int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32_t contLen, EHttpCompFlag flag); + +#ifdef __cplusplus +} +#endif + +#endif /*_TD_UTIL_UTIL_H_*/ diff --git a/source/util/CMakeLists.txt b/source/util/CMakeLists.txt index 4b28800c28..7a47639e75 100644 --- a/source/util/CMakeLists.txt +++ b/source/util/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries( util PRIVATE os PUBLIC lz4_static - PUBLIC api cjson zlib + PUBLIC api cjson ) if(${BUILD_TEST})