From b5125afd79e6ebc3174048aebde786f88819c2f1 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Tue, 28 Jun 2022 15:49:15 +0800
Subject: [PATCH] tsdbCache/delete: use new tsdbReadDelIdx/Data interfaces

---
 source/dnode/vnode/src/tsdb/tsdbCache.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index 8367a0c491..3b394931fb 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -165,21 +165,23 @@ static int32_t getMemLastRow(SMemTable *mem, tb_uid_t suid, tb_uid_t uid, STSRow
 static int32_t getTableDelDataFromDelIdx(SDelFReader *pDelReader, SDelIdx *pDelIdx, SArray *aDelData) {
   int32_t code = 0;
 
-  SMapData delDataMap;
-  SDelData delData;
+  // SMapData delDataMap;
+  // SDelData delData;
 
   if (pDelIdx) {
-    tMapDataReset(&delDataMap);
+    // tMapDataReset(&delDataMap);
 
     // code = tsdbReadDelData(pDelReader, pDelIdx, &delDataMap, NULL);
+    code = tsdbReadDelData(pDelReader, pDelIdx, aDelData, NULL);
     if (code) goto _err;
-
+    /*
     for (int32_t iDelData = 0; iDelData < delDataMap.nItem; ++iDelData) {
       code = tMapDataGetItemByIdx(&delDataMap, iDelData, &delData, tGetDelData);
       if (code) goto _err;
 
       taosArrayPush(aDelData, &delData);
     }
+    */
   }
 
 _err:
@@ -241,14 +243,17 @@ _err:
 static int32_t getTableDelIdx(SDelFReader *pDelFReader, tb_uid_t suid, tb_uid_t uid, SDelIdx *pDelIdx) {
   int32_t code = 0;
 
-  SMapData delIdxMap;
-  SDelIdx  idx = {.suid = suid, .uid = uid};
+  // SMapData delIdxMap;
+  SArray *pDelIdxArray = taosArrayInit(32, sizeof(SDelIdx));
+  SDelIdx idx = {.suid = suid, .uid = uid};
 
-  tMapDataReset(&delIdxMap);
-  // code = tsdbReadDelIdx(pDelFReader, &delIdxMap, NULL);
+  // tMapDataReset(&delIdxMap);
+  //  code = tsdbReadDelIdx(pDelFReader, &delIdxMap, NULL);
+  code = tsdbReadDelIdx(pDelFReader, pDelIdxArray, NULL);
   if (code) goto _err;
 
-  code = tMapDataSearch(&delIdxMap, &idx, tGetDelIdx, tCmprDelIdx, pDelIdx);
+  // code = tMapDataSearch(&delIdxMap, &idx, tGetDelIdx, tCmprDelIdx, pDelIdx);
+  pDelIdx = taosArraySearch(pDelIdxArray, &idx, tCmprDelIdx, TD_EQ);
   if (code) goto _err;
 
 _err: