From 06a3c1c9c0b4cf2b7334fbf5cafb9da453d406d4 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 18 Feb 2023 17:32:43 +0800
Subject: [PATCH] refactor: do some internal refactor and add some logs.

---
 source/client/test/clientTests.cpp   |  2 +-
 source/dnode/mnode/impl/src/mndDef.c | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/source/client/test/clientTests.cpp b/source/client/test/clientTests.cpp
index 59c931d9aa..cb3c2f8c68 100644
--- a/source/client/test/clientTests.cpp
+++ b/source/client/test/clientTests.cpp
@@ -912,7 +912,7 @@ TEST(clientCase, subscription_test) {
   tmq_conf_t* conf = tmq_conf_new();
   tmq_conf_set(conf, "enable.auto.commit", "true");
   tmq_conf_set(conf, "auto.commit.interval.ms", "1000");
-  tmq_conf_set(conf, "group.id", "cgrpName");
+  tmq_conf_set(conf, "group.id", "newabcdefgjhijlm__");
   tmq_conf_set(conf, "td.connect.user", "root");
   tmq_conf_set(conf, "td.connect.pass", "taosdata");
   tmq_conf_set(conf, "auto.offset.reset", "earliest");
diff --git a/source/dnode/mnode/impl/src/mndDef.c b/source/dnode/mnode/impl/src/mndDef.c
index 75177f4158..6e651c1954 100644
--- a/source/dnode/mnode/impl/src/mndDef.c
+++ b/source/dnode/mnode/impl/src/mndDef.c
@@ -411,19 +411,21 @@ void *tDecodeSMqConsumerEp(const void *buf, SMqConsumerEp *pConsumerEp) {
   return (void *)buf;
 }
 
-SMqSubscribeObj *tNewSubscribeObj(const char key[TSDB_SUBSCRIBE_KEY_LEN]) {
-  SMqSubscribeObj *pSubNew = taosMemoryCalloc(1, sizeof(SMqSubscribeObj));
-  if (pSubNew == NULL) return NULL;
-  memcpy(pSubNew->key, key, TSDB_SUBSCRIBE_KEY_LEN);
-  taosInitRWLatch(&pSubNew->lock);
-  pSubNew->vgNum = 0;
-  pSubNew->consumerHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
-  // TODO set hash free fp
-  /*taosHashSetFreeFp(pSubNew->consumerHash, tDeleteSMqConsumerEp);*/
+SMqSubscribeObj *tNewSubscribeObj(const char* key) {
+  SMqSubscribeObj *pSubObj = taosMemoryCalloc(1, sizeof(SMqSubscribeObj));
+  if (pSubObj == NULL) {
+    return NULL;
+  }
 
-  pSubNew->unassignedVgs = taosArrayInit(0, sizeof(void *));
+  memcpy(pSubObj->key, key, TSDB_SUBSCRIBE_KEY_LEN);
+  taosInitRWLatch(&pSubObj->lock);
+  pSubObj->vgNum = 0;
+  pSubObj->consumerHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
 
-  return pSubNew;
+  // TODO set hash free fp
+  /*taosHashSetFreeFp(pSubObj->consumerHash, tDeleteSMqConsumerEp);*/
+  pSubObj->unassignedVgs = taosArrayInit(0, POINTER_BYTES);
+  return pSubObj;
 }
 
 SMqSubscribeObj *tCloneSubscribeObj(const SMqSubscribeObj *pSub) {
-- 
GitLab