From 3f4551fa01b219fb6d7a94566df8cb40a3f470d6 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 18 Jan 2022 11:44:03 +0000
Subject: [PATCH] fix ctb cursor issue

---
 source/dnode/vnode/src/meta/metaBDBImpl.c | 25 ++++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaBDBImpl.c b/source/dnode/vnode/src/meta/metaBDBImpl.c
index bbceaa3389..d8ee48ff23 100644
--- a/source/dnode/vnode/src/meta/metaBDBImpl.c
+++ b/source/dnode/vnode/src/meta/metaBDBImpl.c
@@ -374,22 +374,27 @@ static int metaCtbIdxCb(DB *pIdx, const DBT *pKey, const DBT *pValue, DBT *pSKey
   DBT *   pDbt;
 
   if (pTbCfg->type == META_CHILD_TABLE) {
-    pDbt = calloc(2, sizeof(DBT));
+    // pDbt = calloc(2, sizeof(DBT));
 
-    // First key is suid
-    pDbt[0].data = &(pTbCfg->ctbCfg.suid);
-    pDbt[0].size = sizeof(pTbCfg->ctbCfg.suid);
+    // // First key is suid
+    // pDbt[0].data = &(pTbCfg->ctbCfg.suid);
+    // pDbt[0].size = sizeof(pTbCfg->ctbCfg.suid);
 
-    // Second key is the first tag
-    void *pTagVal = tdGetKVRowValOfCol(pTbCfg->ctbCfg.pTag, (kvRowColIdx(pTbCfg->ctbCfg.pTag))[0].colId);
-    pDbt[1].data = pTagVal;
-    pDbt[1].size = sizeof(int32_t);
+    // // Second key is the first tag
+    // void *pTagVal = tdGetKVRowValOfCol(pTbCfg->ctbCfg.pTag, (kvRowColIdx(pTbCfg->ctbCfg.pTag))[0].colId);
+    // pDbt[1].data = pTagVal;
+    // pDbt[1].size = sizeof(int32_t);
 
     // Set index key
     memset(pSKey, 0, sizeof(*pSKey));
+#if 0
     pSKey->flags = DB_DBT_MULTIPLE | DB_DBT_APPMALLOC;
     pSKey->data = pDbt;
     pSKey->size = 2;
+#else
+    pSKey->data = &(pTbCfg->ctbCfg.suid);
+    pSKey->size = sizeof(pTbCfg->ctbCfg.suid);
+#endif
 
     return 0;
   } else {
@@ -673,8 +678,8 @@ tb_uid_t metaCtbCursorNext(SMCtbCursor *pCtbCur) {
     tb_uid_t id = *(tb_uid_t *)pkey.data;
     assert(id != 0);
     return id;
-//    metaDecodeTbInfo(pBuf, &tbCfg);
-//    return tbCfg.;
+    //    metaDecodeTbInfo(pBuf, &tbCfg);
+    //    return tbCfg.;
   } else {
     return 0;
   }
-- 
GitLab