From 95c1b0005610d033b0d524c2c3ace9a0fafcd754 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Thu, 23 Jun 2022 14:25:30 +0800
Subject: [PATCH] enh: modify delete output res

---
 include/common/tcommon.h                | 1 +
 include/libs/executor/dataSinkMgt.h     | 5 +++--
 include/libs/qworker/qworker.h          | 2 +-
 source/libs/executor/src/dataDeleter.c  | 2 +-
 source/libs/executor/src/executil.c     | 2 ++
 source/libs/executor/src/executorimpl.c | 1 +
 source/libs/qworker/src/qworker.c       | 2 +-
 tests/script/tsim/show/basic.sim        | 2 +-
 8 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index 5dac79551a..5c102dc30a 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -54,6 +54,7 @@ typedef struct {
   SHashObj* map;  // speedup acquire the tableQueryInfo by table uid
   void*     pTagCond;
   void*     pTagIndexCond;
+  uint64_t  suid;
 } STableListInfo;
 
 typedef struct SColumnDataAgg {
diff --git a/include/libs/executor/dataSinkMgt.h b/include/libs/executor/dataSinkMgt.h
index c23cf162aa..957c40f21e 100644
--- a/include/libs/executor/dataSinkMgt.h
+++ b/include/libs/executor/dataSinkMgt.h
@@ -33,7 +33,7 @@ struct SDataSink;
 struct SSDataBlock;
 
 typedef struct SDeleterRes {
-  uint64_t uid;
+  uint64_t suid;
   SArray*  uidList;
   int64_t  skey;
   int64_t  ekey;
@@ -41,7 +41,8 @@ typedef struct SDeleterRes {
 } SDeleterRes;
 
 typedef struct SDeleterParam {
-  SArray* pUidList;
+  uint64_t suid;
+  SArray*  pUidList;
 } SDeleterParam;
 
 typedef struct SDataSinkStat {
diff --git a/include/libs/qworker/qworker.h b/include/libs/qworker/qworker.h
index 3b8a37f420..36e9b3309c 100644
--- a/include/libs/qworker/qworker.h
+++ b/include/libs/qworker/qworker.h
@@ -32,7 +32,7 @@ enum {
 };
 
 typedef struct SDeleteRes {
-  uint64_t uid;
+  uint64_t suid;
   SArray*  uidList;
   int64_t  skey;
   int64_t  ekey;
diff --git a/source/libs/executor/src/dataDeleter.c b/source/libs/executor/src/dataDeleter.c
index 33b7811e6c..9db2783ccd 100644
--- a/source/libs/executor/src/dataDeleter.c
+++ b/source/libs/executor/src/dataDeleter.c
@@ -86,7 +86,7 @@ static void toDataCacheEntry(SDataDeleterHandle* pHandle, const SInputData* pInp
   SColumnInfoData* pColRes = (SColumnInfoData*)taosArrayGet(pInput->pData->pDataBlock, 0);
 
   SDeleterRes* pRes = (SDeleterRes*)pEntry->data;
-  pRes->uid = pHandle->pDeleter->tableId;
+  pRes->suid = pHandle->pParam->suid;
   pRes->uidList = pHandle->pParam->pUidList;
   pRes->skey = pHandle->pDeleter->deleteTimeRange.skey;
   pRes->ekey = pHandle->pDeleter->deleteTimeRange.ekey;
diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c
index 0282d9cccb..ac38fd8de9 100644
--- a/source/libs/executor/src/executil.c
+++ b/source/libs/executor/src/executil.c
@@ -300,6 +300,8 @@ int32_t getTableList(void* metaHandle, SScanPhysiNode* pScanNode, STableListInfo
 
   uint64_t tableUid = pScanNode->uid;
 
+  pListInfo->suid = pScanNode->suid;
+  
   SNode* pTagCond = (SNode*)pListInfo->pTagCond;
   SNode* pTagIndexCond = (SNode*)pListInfo->pTagIndexCond;
   if (pScanNode->tableType == TSDB_SUPER_TABLE) {
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 30ed44b872..8c9a6ac3a5 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4464,6 +4464,7 @@ int32_t createDataSinkParam(SDataSinkNode* pNode, void** pParam, qTaskInfo_t* pT
         return TSDB_CODE_OUT_OF_MEMORY;
       }
       int32_t tbNum = taosArrayGetSize(pTask->tableqinfoList.pTableList);
+      pDeleterParam->suid = pTask->tableqinfoList.suid;
       pDeleterParam->pUidList = taosArrayInit(tbNum, sizeof(uint64_t));
       if (NULL == pDeleterParam->pUidList) {
         taosMemoryFree(pDeleterParam);
diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c
index 28181d7e11..4250785f7c 100644
--- a/source/libs/qworker/src/qworker.c
+++ b/source/libs/qworker/src/qworker.c
@@ -271,7 +271,7 @@ int32_t qwGetDeleteResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen
   SDeleterRes* pDelRes = (SDeleterRes*)output.pData;
   
   rsp.affectedRows = pDelRes->affectedRows;
-  pRes->uid = pDelRes->uid;
+  pRes->suid = pDelRes->suid;
   pRes->uidList = pDelRes->uidList;
   pRes->skey = pDelRes->skey;
   pRes->ekey = pDelRes->ekey;
diff --git a/tests/script/tsim/show/basic.sim b/tests/script/tsim/show/basic.sim
index 8f9362fc69..e2138e0008 100644
--- a/tests/script/tsim/show/basic.sim
+++ b/tests/script/tsim/show/basic.sim
@@ -233,7 +233,7 @@ if $rows != 4 then
 endi
 
 sql show dnode 1 variables;
-if $rows != 114 then
+if $rows != 116 then
   return -1
 endi