From 751c1cb5d2a1c3bdca77ecb2019c1b7b9933dd88 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 20 Feb 2023 10:12:27 +0800
Subject: [PATCH] refactor:do some internal refactor.

---
 include/util/tarray.h                   | 2 +-
 source/common/src/tdatablock.c          | 2 +-
 source/dnode/mnode/impl/src/mndStream.c | 4 ++--
 source/libs/catalog/src/ctgAsync.c      | 4 ++--
 source/libs/stream/src/streamData.c     | 2 +-
 source/util/src/tarray.c                | 2 +-
 source/util/src/tjson.c                 | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/util/tarray.h b/include/util/tarray.h
index af9cf5fde1..fe758f06c7 100644
--- a/include/util/tarray.h
+++ b/include/util/tarray.h
@@ -53,7 +53,7 @@ typedef struct SArray {
  * @return
  */
 SArray* taosArrayInit(size_t size, size_t elemSize);
-SArray* taosArrayInit_s(size_t size, size_t elemSize, size_t initialSize);
+SArray* taosArrayInit_s(size_t elemSize, size_t initialSize);
 
 /**
  *
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 47cbc2a068..ebe634648d 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -2383,7 +2383,7 @@ const char* blockDecode(SSDataBlock* pBlock, const char* pData) {
   pStart += sizeof(uint64_t);
 
   if (pBlock->pDataBlock == NULL) {
-    pBlock->pDataBlock = taosArrayInit_s(numOfCols, sizeof(SColumnInfoData), numOfCols);
+    pBlock->pDataBlock = taosArrayInit_s(sizeof(SColumnInfoData), numOfCols);
   }
 
   for (int32_t i = 0; i < numOfCols; ++i) {
diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
index 7931cdb87c..19be32708f 100644
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -479,7 +479,7 @@ static int32_t mndCreateStbForStream(SMnode *pMnode, STrans *pTrans, const SStre
   tstrncpy(createReq.name, pStream->targetSTbName, TSDB_TABLE_FNAME_LEN);
   createReq.numOfColumns = pStream->outputSchema.nCols;
   createReq.numOfTags = 1;  // group id
-  createReq.pColumns = taosArrayInit_s(createReq.numOfColumns, sizeof(SField), createReq.numOfColumns);
+  createReq.pColumns = taosArrayInit_s(sizeof(SField), createReq.numOfColumns);
   // build fields
   for (int32_t i = 0; i < createReq.numOfColumns; i++) {
     SField *pField = taosArrayGet(createReq.pColumns, i);
@@ -488,7 +488,7 @@ static int32_t mndCreateStbForStream(SMnode *pMnode, STrans *pTrans, const SStre
     pField->type = pStream->outputSchema.pSchema[i].type;
     pField->bytes = pStream->outputSchema.pSchema[i].bytes;
   }
-  createReq.pTags = taosArrayInit_s(createReq.numOfTags, sizeof(SField), 1);
+  createReq.pTags = taosArrayInit_s(sizeof(SField), 1);
 
   // build tags
   SField *pField = taosArrayGet(createReq.pTags, 0);
diff --git a/source/libs/catalog/src/ctgAsync.c b/source/libs/catalog/src/ctgAsync.c
index 89e92b0cc8..f62e93b82a 100644
--- a/source/libs/catalog/src/ctgAsync.c
+++ b/source/libs/catalog/src/ctgAsync.c
@@ -1707,7 +1707,7 @@ int32_t ctgLaunchGetTbMetasTask(SCtgTask* pTask) {
     return TSDB_CODE_SUCCESS;
   }
 
-  pTask->msgCtxs = taosArrayInit_s(pCtx->fetchNum, sizeof(SCtgMsgCtx), pCtx->fetchNum);
+  pTask->msgCtxs = taosArrayInit_s(sizeof(SCtgMsgCtx), pCtx->fetchNum);
   for (int32_t i = 0; i < pCtx->fetchNum; ++i) {
     SCtgFetch*  pFetch = taosArrayGet(pCtx->pFetchs, i);
     SName*      pName = ctgGetFetchName(pCtx->pNames, pFetch);
@@ -1857,7 +1857,7 @@ int32_t ctgLaunchGetTbHashsTask(SCtgTask* pTask) {
     return TSDB_CODE_SUCCESS;
   }
 
-  pTask->msgCtxs = taosArrayInit_s(pCtx->fetchNum, sizeof(SCtgMsgCtx), pCtx->fetchNum);
+  pTask->msgCtxs = taosArrayInit_s(sizeof(SCtgMsgCtx), pCtx->fetchNum);
 
   for (int32_t i = 0; i < pCtx->fetchNum; ++i) {
     SCtgFetch*  pFetch = taosArrayGet(pCtx->pFetchs, i);
diff --git a/source/libs/stream/src/streamData.c b/source/libs/stream/src/streamData.c
index 8b869cc59f..12ce483c0c 100644
--- a/source/libs/stream/src/streamData.c
+++ b/source/libs/stream/src/streamData.c
@@ -17,7 +17,7 @@
 
 int32_t streamDispatchReqToData(const SStreamDispatchReq* pReq, SStreamDataBlock* pData) {
   int32_t blockNum = pReq->blockNum;
-  SArray* pArray = taosArrayInit_s(blockNum, sizeof(SSDataBlock), blockNum);
+  SArray* pArray = taosArrayInit_s(sizeof(SSDataBlock), blockNum);
   if (pArray == NULL) {
     return -1;
   }
diff --git a/source/util/src/tarray.c b/source/util/src/tarray.c
index 64701574bb..e37ef5b395 100644
--- a/source/util/src/tarray.c
+++ b/source/util/src/tarray.c
@@ -48,7 +48,7 @@ SArray* taosArrayInit(size_t size, size_t elemSize) {
   return pArray;
 }
 
-SArray* taosArrayInit_s(size_t size, size_t elemSize, size_t initialSize) {
+SArray* taosArrayInit_s(size_t elemSize, size_t initialSize) {
   SArray* pArray = taosMemoryMalloc(sizeof(SArray));
   if (pArray == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
diff --git a/source/util/src/tjson.c b/source/util/src/tjson.c
index 27d14d05b1..33182eca49 100644
--- a/source/util/src/tjson.c
+++ b/source/util/src/tjson.c
@@ -325,7 +325,7 @@ int32_t tjsonToTArray(const SJson* pJson, const char* pName, FToObject func, SAr
   const cJSON* jArray = tjsonGetObjectItem(pJson, pName);
   int32_t      size = tjsonGetArraySize(jArray);
   if (size > 0) {
-    *pArray = taosArrayInit_s(size, itemSize, size);
+    *pArray = taosArrayInit_s(itemSize, size);
     if (NULL == *pArray) {
       return TSDB_CODE_OUT_OF_MEMORY;
     }
-- 
GitLab