From d1b298bca60b375a88a0253274e158c5a6e7f7b7 Mon Sep 17 00:00:00 2001 From: hjxilinx Date: Thu, 12 Mar 2020 14:15:40 +0800 Subject: [PATCH] fix compile errors --- src/client/src/tscSql.c | 4 +++- src/query/src/tscAst.c | 1 - tests/examples/c/CMakeLists.txt | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index 06121b7923..bbe2fa8d3a 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -705,8 +705,10 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) { } // current data are exhausted, fetch more data - if (pRes->data == NULL || (pRes->data != NULL && pRes->row >= pRes->numOfRows && pCmd->command == TSDB_SQL_RETRIEVE)) { + if (pRes->data == NULL || (pRes->data != NULL && pRes->row >= pRes->numOfRows && + (pCmd->command == TSDB_SQL_RETRIEVE || pCmd->command == TSDB_SQL_RETRIEVE_METRIC || pCmd->command == TSDB_SQL_FETCH))) { taos_fetch_rows_a(res, asyncFetchCallback, pSql->pTscObj); + sem_wait(&pSql->rspSem); } diff --git a/src/query/src/tscAst.c b/src/query/src/tscAst.c index 7be583a5ea..ef83083a2c 100644 --- a/src/query/src/tscAst.c +++ b/src/query/src/tscAst.c @@ -14,7 +14,6 @@ */ #include "os.h" -#include "sskiplist.h" #include "taosdef.h" #include "taosmsg.h" #include "tast.h" diff --git a/tests/examples/c/CMakeLists.txt b/tests/examples/c/CMakeLists.txt index 287fca7d41..81d912fc00 100644 --- a/tests/examples/c/CMakeLists.txt +++ b/tests/examples/c/CMakeLists.txt @@ -1,13 +1,13 @@ PROJECT(TDengine) IF (TD_WINDOWS_64) - INCLUDE_DIRECTORIES(${TD_ROOT_DIR}/deps/pthread) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread) ENDIF () -INCLUDE_DIRECTORIES(. ${TD_ROOT_DIR}/src/inc ${TD_ROOT_DIR}/src/client/inc ${TD_OS_DIR}/inc) +INCLUDE_DIRECTORIES(. ${TD_COMMUNITY_DIR}/src/inc ${TD_COMMUNITY_DIR}/src/client/inc ${TD_COMMUNITY_DIR}/inc) AUX_SOURCE_DIRECTORY(. SRC) -#ADD_EXECUTABLE(demo ${SRC}) -#TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread ) +ADD_EXECUTABLE(demo demo.c) +TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread ) -- GitLab