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

fix(os): win python case error

This commit is contained in:
afwerar 2022-06-03 16:13:06 +08:00
parent 3d351b768c
commit 490889f8e7
10 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/util/tutil.h
View File

@ -57,11 +57,13 @@ static FORCE_INLINE void taosEncryptPass_c(uint8_t *inBuf, size_t len, char *tar
tMD5Init(&context); tMD5Init(&context);
tMD5Update(&context, inBuf, (uint32_t)len); tMD5Update(&context, inBuf, (uint32_t)len);
tMD5Final(&context); tMD5Final(&context);
char buf[TSDB_PASSWORD_LEN + 1];
sprintf(target, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0], sprintf(buf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0],
context.digest[1], context.digest[2], context.digest[3], context.digest[4], context.digest[5], context.digest[1], context.digest[2], context.digest[3], context.digest[4], context.digest[5],
context.digest[6], context.digest[7], context.digest[8], context.digest[9], context.digest[10], context.digest[6], context.digest[7], context.digest[8], context.digest[9], context.digest[10],
context.digest[11], context.digest[12], context.digest[13], context.digest[14], context.digest[15]); context.digest[11], context.digest[12], context.digest[13], context.digest[14], context.digest[15]);
memcpy(target, buf, TSDB_PASSWORD_LEN);
} }
#ifdef __cplusplus #ifdef __cplusplus

2
source/dnode/mnode/impl/src/mndFunc.c
View File

@ -538,7 +538,7 @@ static int32_t mndRetrieveFuncs(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
colDataAppend(pColInfo, numOfRows, (const char *)&isAgg, false); colDataAppend(pColInfo, numOfRows, (const char *)&isAgg, false);
char b3[TSDB_TYPE_STR_MAX_LEN] = {0}; char b3[TSDB_TYPE_STR_MAX_LEN + 1] = {0};
STR_WITH_MAXSIZE_TO_VARSTR(b3, mnodeGenTypeStr(buf, TSDB_TYPE_STR_MAX_LEN, pFunc->outputType, pFunc->outputLen), STR_WITH_MAXSIZE_TO_VARSTR(b3, mnodeGenTypeStr(buf, TSDB_TYPE_STR_MAX_LEN, pFunc->outputType, pFunc->outputLen),
pShow->pMeta->pSchemas[cols].bytes); pShow->pMeta->pSchemas[cols].bytes);

2
source/dnode/mnode/impl/test/acct/CMakeLists.txt
View File

@ -5,9 +5,7 @@ target_link_libraries(
PUBLIC sut PUBLIC sut
) )
if(NOT TD_WINDOWS)
add_test( add_test(
NAME acctTest NAME acctTest
COMMAND acctTest COMMAND acctTest
) )
endif(NOT TD_WINDOWS)

4
source/dnode/mnode/impl/test/func/CMakeLists.txt
View File

@ -5,9 +5,9 @@ target_link_libraries(
PUBLIC sut PUBLIC sut
) )
if(NOT TD_WINDOWS) # if(NOT TD_WINDOWS)
add_test( add_test(
NAME funcTest NAME funcTest
COMMAND funcTest COMMAND funcTest
) )
endif(NOT TD_WINDOWS) # endif(NOT TD_WINDOWS)

4
source/dnode/mnode/impl/test/profile/CMakeLists.txt
View File

@ -5,9 +5,9 @@ target_link_libraries(
PUBLIC sut PUBLIC sut
) )
if(NOT TD_WINDOWS) # if(NOT TD_WINDOWS)
add_test( add_test(
NAME profileTest NAME profileTest
COMMAND profileTest COMMAND profileTest
) )
endif(NOT TD_WINDOWS) # endif(NOT TD_WINDOWS)

4
source/dnode/mnode/impl/test/show/CMakeLists.txt
View File

@ -5,9 +5,9 @@ target_link_libraries(
PUBLIC sut PUBLIC sut
) )
if(NOT TD_WINDOWS) # if(NOT TD_WINDOWS)
add_test( add_test(
NAME showTest NAME showTest
COMMAND showTest COMMAND showTest
) )
endif(NOT TD_WINDOWS) # endif(NOT TD_WINDOWS)

2
source/libs/index/test/CMakeLists.txt
View File

@ -92,7 +92,6 @@ target_link_libraries (idxJsonUT
index index
) )
if(NOT TD_WINDOWS)
add_test( add_test(
NAME idxtest NAME idxtest
COMMAND idxTest COMMAND idxTest
@ -101,7 +100,6 @@ if(NOT TD_WINDOWS)
NAME idxJsonUT NAME idxJsonUT
COMMAND idxJsonUT COMMAND idxJsonUT
) )
endif(NOT TD_WINDOWS)
add_test( add_test(
NAME idxUtilUT NAME idxUtilUT
COMMAND idxUtilUT COMMAND idxUtilUT

4
source/libs/planner/test/CMakeLists.txt
View File

@ -32,9 +32,9 @@ if(${BUILD_WINGETOPT})
target_link_libraries(plannerTest PUBLIC wingetopt) target_link_libraries(plannerTest PUBLIC wingetopt)
endif() endif()
if(NOT TD_WINDOWS) # if(NOT TD_WINDOWS)
add_test( add_test(
NAME plannerTest NAME plannerTest
COMMAND plannerTest COMMAND plannerTest
) )
endif(NOT TD_WINDOWS) # endif(NOT TD_WINDOWS)

2
source/libs/scalar/src/sclfunc.c
View File

@ -718,7 +718,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
int16_t outputType = GET_PARAM_TYPE(&pOutput[0]); int16_t outputType = GET_PARAM_TYPE(&pOutput[0]);
int64_t outputLen = GET_PARAM_BYTES(&pOutput[0]); int64_t outputLen = GET_PARAM_BYTES(&pOutput[0]);
char *outputBuf = taosMemoryCalloc(outputLen * pInput[0].numOfRows, 1); char *outputBuf = taosMemoryCalloc(outputLen * pInput[0].numOfRows + 1, 1);
char *output = outputBuf; char *output = outputBuf;
for (int32_t i = 0; i < pInput[0].numOfRows; ++i) { for (int32_t i = 0; i < pInput[0].numOfRows; ++i) {

2
tests/pytest/util/dnodes.py
View File

@ -247,7 +247,7 @@ class TDDnode:
if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]: if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]:
print(updatecfgDict[0][0]) print(updatecfgDict[0][0])
for key, value in updatecfgDict[0][0].items(): for key, value in updatecfgDict[0][0].items():
if key == "clientCfg": if key == "clientCfg" and self.remoteIP == "" and not platform.system().lower() == 'windows':
continue continue
if value == 'dataDir': if value == 'dataDir':
if isFirstDir: if isFirstDir: