From 6720f850b0a1eb2a9e07c4ef0b47d6723e10b006 Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Tue, 12 Nov 2024 10:12:30 +0800
Subject: [PATCH] fix: print multi dataDir for show variables

---
 source/common/src/tmisce.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/source/common/src/tmisce.c b/source/common/src/tmisce.c
index 4df458c2bb..1fd590bf79 100644
--- a/source/common/src/tmisce.c
+++ b/source/common/src/tmisce.c
@@ -267,7 +267,11 @@ int32_t dumpConfToDataBlock(SSDataBlock* pBlock, int32_t startCol) {
 
   int8_t locked = 0;
 
-  TAOS_CHECK_GOTO(blockDataEnsureCapacity(pBlock, cfgGetSize(pConf)), NULL, _exit);
+  SConfigItem* pDataDirItem = cfgGetItem(pConf, "dataDir");
+  size_t       exSize = TMAX(taosArrayGetSize(pDataDirItem->array), 1) - 1;
+  size_t       index = 0;
+
+  TAOS_CHECK_GOTO(blockDataEnsureCapacity(pBlock, cfgGetSize(pConf) + exSize), NULL, _exit);
 
   TAOS_CHECK_GOTO(cfgCreateIter(pConf, &pIter), NULL, _exit);
 
@@ -275,6 +279,7 @@ int32_t dumpConfToDataBlock(SSDataBlock* pBlock, int32_t startCol) {
   locked = 1;
 
   while ((pItem = cfgNextIter(pIter)) != NULL) {
+_start:
     col = startCol;
 
     // GRANT_CFG_SKIP;
@@ -291,7 +296,17 @@ int32_t dumpConfToDataBlock(SSDataBlock* pBlock, int32_t startCol) {
 
     char    value[TSDB_CONFIG_VALUE_LEN + VARSTR_HEADER_SIZE] = {0};
     int32_t valueLen = 0;
-    TAOS_CHECK_GOTO(cfgDumpItemValue(pItem, &value[VARSTR_HEADER_SIZE], TSDB_CONFIG_VALUE_LEN, &valueLen), NULL, _exit);
+
+    if (strcasecmp(pItem->name, "dataDir") == 0 && exSize > 0) {
+      char*     buf = &value[VARSTR_HEADER_SIZE];
+      SDiskCfg* pDiskCfg = taosArrayGet(pItem->array, index);
+      valueLen = snprintf(buf, TSDB_CONFIG_VALUE_LEN, "%s l:%d p:%d d:%" PRIi8, pDiskCfg->dir, pDiskCfg->level,
+                          pDiskCfg->primary, pDiskCfg->disable);
+      index++;
+    } else {
+      TAOS_CHECK_GOTO(cfgDumpItemValue(pItem, &value[VARSTR_HEADER_SIZE], TSDB_CONFIG_VALUE_LEN, &valueLen), NULL,
+                      _exit);
+    }
     varDataSetLen(value, valueLen);
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, col++);
@@ -314,7 +329,10 @@ int32_t dumpConfToDataBlock(SSDataBlock* pBlock, int32_t startCol) {
     TAOS_CHECK_GOTO(colDataSetVal(pColInfo, numOfRows, scope, false), NULL, _exit);
 
     numOfRows++;
-  }
+    if (index > 0 && index <= exSize) {
+      goto _start;
+    }
+}
   pBlock->info.rows = numOfRows;
 _exit:
   if (locked) cfgUnLock(pConf);