xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:[TD-33272]add test case

This commit is contained in:
wangmm0220 2024-12-24 09:21:09 +08:00
parent 4b62a9a587
commit e65a3802a2
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/test/smlTest.cpp
View File

@ -276,7 +276,7 @@ TEST(testCase, smlParseCols_Test) {
info->dataFormat = false; info->dataFormat = false;
SSmlLineInfo elements = {0}; SSmlLineInfo elements = {0};
info->msgBuf = msgBuf; info->msgBuf = msgBuf;
ASSERT_EQ(smlInitHandle(NULL), 0); ASSERT_EQ(smlInitHandle(NULL), TSDB_CODE_INVALID_PARA);
const char *data = const char *data =
"st,t=1 cb\\=in=\"pass\\,it " "st,t=1 cb\\=in=\"pass\\,it "

2
source/dnode/vnode/src/tq/tqOffset.c
View File

@ -95,7 +95,7 @@ END:
if (code != 0){ if (code != 0){
tqError("%s failed at %d since %s", __func__, lino, tstrerror(code)); tqError("%s failed at %d since %s", __func__, lino, tstrerror(code));
} }
taosCloseFile(&pFile); (void)taosCloseFile(&pFile);
taosMemoryFree(pMemBuf); taosMemoryFree(pMemBuf);
tDeleteSTqOffset(pOffset); tDeleteSTqOffset(pOffset);

30
source/dnode/vnode/test/CMakeLists.txt
View File

@ -3,23 +3,25 @@ MESSAGE(STATUS "tq unit test")
# GoogleTest requires at least C++11 # GoogleTest requires at least C++11
SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_CXX_STANDARD 11)
add_executable(tqTest tqTest.cpp) IF(NOT TD_WINDOWS)
target_include_directories(tqTest add_executable(tqTest tqTest.cpp)
PUBLIC target_include_directories(tqTest
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" PUBLIC
) "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
tqTest tqTest
PUBLIC os util common vnode gtest_main PUBLIC os util common vnode gtest_main
) )
enable_testing() enable_testing()
add_test( add_test(
NAME tq_test NAME tq_test
COMMAND tqTest COMMAND tqTest
) )
ENDIF()
# ADD_EXECUTABLE(tsdbSmaTest tsdbSmaTest.cpp) # ADD_EXECUTABLE(tsdbSmaTest tsdbSmaTest.cpp)
# TARGET_LINK_LIBRARIES( # TARGET_LINK_LIBRARIES(

6
source/libs/parser/src/parInsertSml.c
View File

@ -123,7 +123,7 @@ static int32_t smlBuildTagRow(SArray* cols, SBoundColInfo* tags, SSchema* pSchem
val.pData = (uint8_t*)kv->value; val.pData = (uint8_t*)kv->value;
val.nData = kv->length; val.nData = kv->length;
} else if (pTagSchema->type == TSDB_DATA_TYPE_NCHAR) { } 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); TSDB_CHECK_CODE(code, lino, end);
} else { } else {
(void)memcpy(&val.i64, &(kv->value), kv->length); (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); kv->i = convertTimePrecision(kv->i, TSDB_TIME_PRECISION_NANO, pTableMeta->tableInfo.precision);
} }
if (kv->type == TSDB_DATA_TYPE_NCHAR) { 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); TSDB_CHECK_CODE(ret, lino, end);
} else if (kv->type == TSDB_DATA_TYPE_BINARY) { } else if (kv->type == TSDB_DATA_TYPE_BINARY) {
pVal->value.nData = kv->length; pVal->value.nData = kv->length;
@ -345,7 +345,7 @@ int32_t smlBindData(SQuery* query, bool dataFormat, SArray* tags, SArray* colsSc
end: end:
if (ret != 0){ if (ret != 0){
uError("%s failed at %d since %s", __func__, lino, tstrerror(ret)); uError("%s failed at %d since %s", __func__, lino, tstrerror(ret));
buildInvalidOperationMsg(&pBuf, tstrerror(ret)); ret = buildInvalidOperationMsg(&pBuf, tstrerror(ret));
} }
insDestroyBoundColInfo(&bindTags); insDestroyBoundColInfo(&bindTags);
tdDestroySVCreateTbReq(pCreateTblReq); tdDestroySVCreateTbReq(pCreateTblReq);