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

test: add test time count print

This commit is contained in:
afwerar 2022-06-24 14:36:41 +08:00
parent d5ab6209c7
commit 4c846895ff
9 changed files with 45 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/dnode/mnode/impl/test/db/CMakeLists.txt
View File

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

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

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

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

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

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

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

10
source/dnode/mnode/impl/test/sma/CMakeLists.txt
View File

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

10
source/dnode/mnode/impl/test/stb/CMakeLists.txt
View File

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

10
source/dnode/mnode/impl/test/user/CMakeLists.txt
View File

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

15
source/libs/parser/src/parInsertData.c
View File

@ -26,6 +26,7 @@
typedef struct SBlockKeyTuple { typedef struct SBlockKeyTuple {
TSKEY skey; TSKEY skey;
void* payloadAddr; void* payloadAddr;
int16_t index;
} SBlockKeyTuple; } SBlockKeyTuple;
typedef struct SBlockKeyInfo { typedef struct SBlockKeyInfo {
@ -36,7 +37,6 @@ typedef struct SBlockKeyInfo {
static int32_t rowDataCompar(const void* lhs, const void* rhs) { static int32_t rowDataCompar(const void* lhs, const void* rhs) {
TSKEY left = *(TSKEY*)lhs; TSKEY left = *(TSKEY*)lhs;
TSKEY right = *(TSKEY*)rhs; TSKEY right = *(TSKEY*)rhs;
if (left == right) { if (left == right) {
return 0; return 0;
} else { } else {
@ -44,6 +44,16 @@ static int32_t rowDataCompar(const void* lhs, const void* rhs) {
} }
} }
static int32_t rowDataComparStable(const void* lhs, const void* rhs) {
TSKEY left = *(TSKEY*)lhs;
TSKEY right = *(TSKEY*)rhs;
if (left == right) {
return ((SBlockKeyTuple*)lhs)->index - ((SBlockKeyTuple*)rhs)->index;
} else {
return left > right ? 1 : -1;
}
}
void setBoundColumnInfo(SParsedDataColInfo* pColList, SSchema* pSchema, col_id_t numOfCols) { void setBoundColumnInfo(SParsedDataColInfo* pColList, SSchema* pSchema, col_id_t numOfCols) {
pColList->numOfCols = numOfCols; pColList->numOfCols = numOfCols;
pColList->numOfBound = numOfCols; pColList->numOfBound = numOfCols;
@ -343,6 +353,7 @@ int sortRemoveDataBlockDupRows(STableDataBlocks* dataBuf, SBlockKeyInfo* pBlkKey
while (n < nRows) { while (n < nRows) {
pBlkKeyTuple->skey = TD_ROW_KEY((STSRow*)pBlockData); pBlkKeyTuple->skey = TD_ROW_KEY((STSRow*)pBlockData);
pBlkKeyTuple->payloadAddr = pBlockData; pBlkKeyTuple->payloadAddr = pBlockData;
pBlkKeyTuple->index = n;
// next loop // next loop
pBlockData += extendedRowSize; pBlockData += extendedRowSize;
@ -354,7 +365,7 @@ int sortRemoveDataBlockDupRows(STableDataBlocks* dataBuf, SBlockKeyInfo* pBlkKey
pBlkKeyTuple = pBlkKeyInfo->pKeyTuple; pBlkKeyTuple = pBlkKeyInfo->pKeyTuple;
// todo. qsort is unstable, if timestamp is same, should get the last one // todo. qsort is unstable, if timestamp is same, should get the last one
qsort(pBlkKeyTuple, nRows, sizeof(SBlockKeyTuple), rowDataCompar); qsort(pBlkKeyTuple, nRows, sizeof(SBlockKeyTuple), rowDataComparStable);
pBlkKeyTuple = pBlkKeyInfo->pKeyTuple; pBlkKeyTuple = pBlkKeyInfo->pKeyTuple;
int32_t i = 0; int32_t i = 0;

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

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