From 4c846895ff60bd37b5ed4a10d17b0588b831ba81 Mon Sep 17 00:00:00 2001
From: afwerar <1296468573@qq.com>
Date: Fri, 24 Jun 2022 14:36:41 +0800
Subject: [PATCH] test: add test time count print

---
 source/dnode/mnode/impl/test/db/CMakeLists.txt    | 10 ++++------
 source/dnode/mnode/impl/test/func/CMakeLists.txt  | 10 ++++------
 .../dnode/mnode/impl/test/profile/CMakeLists.txt  | 10 ++++------
 source/dnode/mnode/impl/test/show/CMakeLists.txt  | 10 ++++------
 source/dnode/mnode/impl/test/sma/CMakeLists.txt   | 10 ++++------
 source/dnode/mnode/impl/test/stb/CMakeLists.txt   | 10 ++++------
 source/dnode/mnode/impl/test/user/CMakeLists.txt  | 10 ++++------
 source/libs/parser/src/parInsertData.c            | 15 +++++++++++++--
 source/libs/planner/test/CMakeLists.txt           | 10 ++++------
 9 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/source/dnode/mnode/impl/test/db/CMakeLists.txt b/source/dnode/mnode/impl/test/db/CMakeLists.txt
index e28cdd4f61..3f6a80835f 100644
--- a/source/dnode/mnode/impl/test/db/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/db/CMakeLists.txt
@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
-    add_test(
-        NAME dbTest
-        COMMAND dbTest
-    )
-endif(NOT TD_WINDOWS)
+add_test(
+    NAME dbTest
+    COMMAND dbTest
+)
diff --git a/source/dnode/mnode/impl/test/func/CMakeLists.txt b/source/dnode/mnode/impl/test/func/CMakeLists.txt
index 17adfde801..3b6f2b5782 100644
--- a/source/dnode/mnode/impl/test/func/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/func/CMakeLists.txt
@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-# if(NOT TD_WINDOWS)
-    add_test(
-        NAME funcTest
-        COMMAND funcTest
-    )
-# endif(NOT TD_WINDOWS)
+add_test(
+    NAME funcTest
+    COMMAND funcTest
+)
\ No newline at end of file
diff --git a/source/dnode/mnode/impl/test/profile/CMakeLists.txt b/source/dnode/mnode/impl/test/profile/CMakeLists.txt
index 049a4f3a9f..8b811ebfed 100644
--- a/source/dnode/mnode/impl/test/profile/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/profile/CMakeLists.txt
@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-# if(NOT TD_WINDOWS)
-    add_test(
-        NAME profileTest
-        COMMAND profileTest
-    )
-# endif(NOT TD_WINDOWS)
+add_test(
+    NAME profileTest
+    COMMAND profileTest
+)
diff --git a/source/dnode/mnode/impl/test/show/CMakeLists.txt b/source/dnode/mnode/impl/test/show/CMakeLists.txt
index 33ba0c5697..69e93e7086 100644
--- a/source/dnode/mnode/impl/test/show/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/show/CMakeLists.txt
@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-# if(NOT TD_WINDOWS)
-    add_test(
-        NAME showTest
-        COMMAND showTest
-    )
-# endif(NOT TD_WINDOWS)
+add_test(
+    NAME showTest
+    COMMAND showTest
+)
diff --git a/source/dnode/mnode/impl/test/sma/CMakeLists.txt b/source/dnode/mnode/impl/test/sma/CMakeLists.txt
index fd596c5021..3f9ec123a8 100644
--- a/source/dnode/mnode/impl/test/sma/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/sma/CMakeLists.txt
@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
-    add_test(
-        NAME smaTest
-        COMMAND smaTest
-    )
-endif(NOT TD_WINDOWS)
+add_test(
+    NAME smaTest
+    COMMAND smaTest
+)
diff --git a/source/dnode/mnode/impl/test/stb/CMakeLists.txt b/source/dnode/mnode/impl/test/stb/CMakeLists.txt
index 857c404c1c..dcfbe658fc 100644
--- a/source/dnode/mnode/impl/test/stb/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/stb/CMakeLists.txt
@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
-    add_test(
-        NAME stbTest
-        COMMAND stbTest
-    )
-endif(NOT TD_WINDOWS)
\ No newline at end of file
+add_test(
+    NAME stbTest
+    COMMAND stbTest
+)
\ No newline at end of file
diff --git a/source/dnode/mnode/impl/test/user/CMakeLists.txt b/source/dnode/mnode/impl/test/user/CMakeLists.txt
index ed4d964617..b39ea0e73f 100644
--- a/source/dnode/mnode/impl/test/user/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/user/CMakeLists.txt
@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
-    add_test(
-        NAME userTest
-        COMMAND userTest
-    )
-endif(NOT TD_WINDOWS)
+add_test(
+    NAME userTest
+    COMMAND userTest
+)
diff --git a/source/libs/parser/src/parInsertData.c b/source/libs/parser/src/parInsertData.c
index 2b505d4bf7..56301c072c 100644
--- a/source/libs/parser/src/parInsertData.c
+++ b/source/libs/parser/src/parInsertData.c
@@ -26,6 +26,7 @@
 typedef struct SBlockKeyTuple {
   TSKEY skey;
   void* payloadAddr;
+  int16_t index;
 } SBlockKeyTuple;
 
 typedef struct SBlockKeyInfo {
@@ -36,7 +37,6 @@ typedef struct SBlockKeyInfo {
 static int32_t rowDataCompar(const void* lhs, const void* rhs) {
   TSKEY left = *(TSKEY*)lhs;
   TSKEY right = *(TSKEY*)rhs;
-
   if (left == right) {
     return 0;
   } 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) {
   pColList->numOfCols = numOfCols;
   pColList->numOfBound = numOfCols;
@@ -343,6 +353,7 @@ int sortRemoveDataBlockDupRows(STableDataBlocks* dataBuf, SBlockKeyInfo* pBlkKey
   while (n < nRows) {
     pBlkKeyTuple->skey = TD_ROW_KEY((STSRow*)pBlockData);
     pBlkKeyTuple->payloadAddr = pBlockData;
+    pBlkKeyTuple->index = n;
 
     // next loop
     pBlockData += extendedRowSize;
@@ -354,7 +365,7 @@ int sortRemoveDataBlockDupRows(STableDataBlocks* dataBuf, SBlockKeyInfo* pBlkKey
     pBlkKeyTuple = pBlkKeyInfo->pKeyTuple;
 
     // 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;
     int32_t i = 0;
diff --git a/source/libs/planner/test/CMakeLists.txt b/source/libs/planner/test/CMakeLists.txt
index b34ffa7bb1..a21b36fef6 100644
--- a/source/libs/planner/test/CMakeLists.txt
+++ b/source/libs/planner/test/CMakeLists.txt
@@ -32,9 +32,7 @@ if(${BUILD_WINGETOPT})
     target_link_libraries(plannerTest PUBLIC wingetopt)
 endif()
 
-# if(NOT TD_WINDOWS)
-    add_test(
-        NAME plannerTest
-        COMMAND plannerTest
-    )
-# endif(NOT TD_WINDOWS)
+add_test(
+    NAME plannerTest
+    COMMAND plannerTest
+)