diff --git a/source/client/test/smlTest.cpp b/source/client/test/smlTest.cpp index 87be16e467..d64cd9c971 100644 --- a/source/client/test/smlTest.cpp +++ b/source/client/test/smlTest.cpp @@ -276,7 +276,7 @@ TEST(testCase, smlParseCols_Test) { info->dataFormat = false; SSmlLineInfo elements = {0}; info->msgBuf = msgBuf; - ASSERT_EQ(smlInitHandle(NULL), 0); + ASSERT_EQ(smlInitHandle(NULL), TSDB_CODE_INVALID_PARA); const char *data = "st,t=1 cb\\=in=\"pass\\,it " diff --git a/source/dnode/vnode/src/tq/tqOffset.c b/source/dnode/vnode/src/tq/tqOffset.c index a131f30a04..6996f3578c 100644 --- a/source/dnode/vnode/src/tq/tqOffset.c +++ b/source/dnode/vnode/src/tq/tqOffset.c @@ -95,7 +95,7 @@ END: if (code != 0){ tqError("%s failed at %d since %s", __func__, lino, tstrerror(code)); } - taosCloseFile(&pFile); + (void)taosCloseFile(&pFile); taosMemoryFree(pMemBuf); tDeleteSTqOffset(pOffset); diff --git a/source/dnode/vnode/test/CMakeLists.txt b/source/dnode/vnode/test/CMakeLists.txt index 826296e99f..ff7e5a2196 100644 --- a/source/dnode/vnode/test/CMakeLists.txt +++ b/source/dnode/vnode/test/CMakeLists.txt @@ -3,23 +3,25 @@ MESSAGE(STATUS "tq unit test") # GoogleTest requires at least C++11 SET(CMAKE_CXX_STANDARD 11) -add_executable(tqTest tqTest.cpp) -target_include_directories(tqTest - PUBLIC - "${CMAKE_CURRENT_SOURCE_DIR}/../inc" -) +IF(NOT TD_WINDOWS) + add_executable(tqTest tqTest.cpp) + target_include_directories(tqTest + PUBLIC + "${CMAKE_CURRENT_SOURCE_DIR}/../inc" + ) -TARGET_LINK_LIBRARIES( - tqTest - PUBLIC os util common vnode gtest_main -) + TARGET_LINK_LIBRARIES( + tqTest + PUBLIC os util common vnode gtest_main + ) -enable_testing() + enable_testing() -add_test( - NAME tq_test - COMMAND tqTest -) + add_test( + NAME tq_test + COMMAND tqTest + ) +ENDIF() # ADD_EXECUTABLE(tsdbSmaTest tsdbSmaTest.cpp) # TARGET_LINK_LIBRARIES( diff --git a/source/libs/parser/src/parInsertSml.c b/source/libs/parser/src/parInsertSml.c index bf86ef718e..676aed4464 100644 --- a/source/libs/parser/src/parInsertSml.c +++ b/source/libs/parser/src/parInsertSml.c @@ -123,7 +123,7 @@ static int32_t smlBuildTagRow(SArray* cols, SBoundColInfo* tags, SSchema* pSchem val.pData = (uint8_t*)kv->value; val.nData = kv->length; } else if (pTagSchema->type == TSDB_DATA_TYPE_NCHAR) { - code = smlMbsToUcs4(kv->value, kv->length, (void**)&val.pData, &val.nData, kv->length * TSDB_NCHAR_SIZE, charsetCxt); + code = smlMbsToUcs4(kv->value, kv->length, (void**)&val.pData, (int32_t*)&val.nData, kv->length * TSDB_NCHAR_SIZE, charsetCxt); TSDB_CHECK_CODE(code, lino, end); } else { (void)memcpy(&val.i64, &(kv->value), kv->length); @@ -316,7 +316,7 @@ int32_t smlBindData(SQuery* query, bool dataFormat, SArray* tags, SArray* colsSc kv->i = convertTimePrecision(kv->i, TSDB_TIME_PRECISION_NANO, pTableMeta->tableInfo.precision); } if (kv->type == TSDB_DATA_TYPE_NCHAR) { - ret = smlMbsToUcs4(kv->value, kv->length, (void**)&pVal->value.pData, &pVal->value.nData, pColSchema->bytes - VARSTR_HEADER_SIZE, charsetCxt); + ret = smlMbsToUcs4(kv->value, kv->length, (void**)&pVal->value.pData, (int32_t*)&pVal->value.nData, pColSchema->bytes - VARSTR_HEADER_SIZE, charsetCxt); TSDB_CHECK_CODE(ret, lino, end); } else if (kv->type == TSDB_DATA_TYPE_BINARY) { pVal->value.nData = kv->length; @@ -345,7 +345,7 @@ int32_t smlBindData(SQuery* query, bool dataFormat, SArray* tags, SArray* colsSc end: if (ret != 0){ uError("%s failed at %d since %s", __func__, lino, tstrerror(ret)); - buildInvalidOperationMsg(&pBuf, tstrerror(ret)); + ret = buildInvalidOperationMsg(&pBuf, tstrerror(ret)); } insDestroyBoundColInfo(&bindTags); tdDestroySVCreateTbReq(pCreateTblReq);