Merge pull request #16607 from taosdata/fix/dnode

enh: let show vnodes works

source/common/src/systable.c

@@ -257,10 +257,12 @@ static const SSysDbTableSchema subscriptionSchema[] = {
 };
 
 static const SSysDbTableSchema vnodesSchema[] = {
-    {.name = "dnode_id", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = true},
-    {.name = "dnode_endpoint", .bytes = TSDB_EP_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
     {.name = "vgroup_id", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = true},
-    {.name = "status", .bytes = 20 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY, .sysInfo = true},
+    {.name = "replica", .bytes = 1, .type = TSDB_DATA_TYPE_TINYINT, .sysInfo = true},
+    {.name = "status", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
+    {.name = "db_name", .bytes = SYSTABLE_SCH_DB_NAME_LEN, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
+    {.name = "dnode_id", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = true},
+    {.name = "dnode_ep", .bytes = TSDB_EP_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
 };
 
 static const SSysTableMeta infosMeta[] = {

source/dnode/mnode/impl/src/mndVgroup.c

@@ -791,32 +791,43 @@ static int32_t mndRetrieveVnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
     if (pShow->pIter == NULL) break;
 
     for (int32_t i = 0; i < pVgroup->replica && numOfRows < rows; ++i) {
-      SVnodeGid *pVgid = &pVgroup->vnodeGid[i];
+      SVnodeGid       *pVgid = &pVgroup->vnodeGid[i];
+      SColumnInfoData *pColInfo = NULL;
       cols = 0;
 
-      SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataAppend(pColInfo, numOfRows, (const char *)&pVgroup->vgId, false);
-
-      SName name = {0};
-      char  db[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-      tNameFromString(&name, pVgroup->dbName, T_NAME_ACCT | T_NAME_DB);
-      tNameGetDbName(&name, varDataVal(db));
-      varDataSetLen(db, strlen(varDataVal(db)));
-
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataAppend(pColInfo, numOfRows, (const char *)db, false);
+      colDataAppend(pColInfo, numOfRows, (const char *)&pVgroup->vgId, false);
 
-      uint32_t val = 0;
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataAppend(pColInfo, numOfRows, (const char *)&val, false);
+      colDataAppend(pColInfo, numOfRows, (const char *)&pVgroup->replica, false);
 
       char buf[20] = {0};
       STR_TO_VARSTR(buf, syncStr(pVgid->role));
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
       colDataAppend(pColInfo, numOfRows, (const char *)buf, false);
 
+      const char *dbname = mndGetDbStr(pVgroup->dbName);
+      char        b1[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
+      if (dbname != NULL) {
+        STR_WITH_MAXSIZE_TO_VARSTR(b1, dbname, TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE);
+      } else {
+        STR_WITH_MAXSIZE_TO_VARSTR(b1, "NULL", TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE);
+      }
+      pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+      colDataAppend(pColInfo, numOfRows, (const char *)b1, false);
+
+      pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+      colDataAppend(pColInfo, numOfRows, (const char *)&pVgid->dnodeId, false);
+
+      SDnodeObj *pDnode = mndAcquireDnode(pMnode, pVgid->dnodeId);
+      char       b2[TSDB_EP_LEN + VARSTR_HEADER_SIZE] = {0};
+      if (pDnode != NULL) {
+        STR_WITH_MAXSIZE_TO_VARSTR(b2, pDnode->ep, TSDB_EP_LEN + VARSTR_HEADER_SIZE);
+      } else {
+        STR_WITH_MAXSIZE_TO_VARSTR(b2, "NULL", TSDB_EP_LEN + VARSTR_HEADER_SIZE);
+      }
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataAppend(pColInfo, numOfRows, (const char *)&pVgroup->replica, false);  // onlines
+      colDataAppend(pColInfo, numOfRows, (const char *)b2, false);
 
       numOfRows++;
     }

tests/script/tsim/db/basic1.sim

@@ -107,6 +107,37 @@ if $data30 != 12 then
   return -1
 endi
 
+print =============== show vnodes
+sql show vnodes 1
+if $rows != 9 then
+  return -1
+endi
+
+if $data(4)[1] != 1 then
+  return -1
+endi
+
+if $data(4)[2] != leader then
+  return -1
+endi
+
+if $data(4)[3] != d2 then
+  return -1
+endi
+
+if $data(4)[4] != 1 then
+  return -1
+endi
+
+if $data(4)[5] != localhost:7100 then
+  return -1
+endi
+
+#sql show vnodes 'localhost:7100'
+#if $rows != 9 then
+#  return -1
+#endi
+
 print =============== drop database
 sql drop database d2
 sql drop database d3