xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix/TD-31891-remove-void-mnode4

This commit is contained in:
dmchen 2024-09-20 06:17:33 +00:00
parent 96824ca012
commit 5934fe8857
3 changed files with 362 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/dnode/mnode/mnode.h
View File

@ -119,9 +119,9 @@ void mndPostProcessQueryMsg(SRpcMsg *pMsg);
*/ */
void mndGenerateMachineCode(); void mndGenerateMachineCode();
void mndDumpSdb(); int32_t mndDumpSdb();
void mndDeleteTrans(); int32_t mndDeleteTrans();
#ifdef __cplusplus #ifdef __cplusplus
} }

6
source/dnode/mgmt/exe/dmMain.c
View File

@ -433,7 +433,8 @@ int mainWindows(int argc, char **argv) {
} }
if (global.dumpSdb) { if (global.dumpSdb) {
mndDumpSdb(); int32_t code = 0;
TAOS_CHECK_RETURN(mndDumpSdb());
taosCleanupCfg(); taosCleanupCfg();
taosCloseLog(); taosCloseLog();
taosCleanupArgs(); taosCleanupArgs();
@ -442,6 +443,7 @@ int mainWindows(int argc, char **argv) {
} }
if (global.deleteTrans) { if (global.deleteTrans) {
int32_t code = 0;
TdFilePtr pFile; TdFilePtr pFile;
if ((code = dmCheckRunning(tsDataDir, &pFile)) != 0) { if ((code = dmCheckRunning(tsDataDir, &pFile)) != 0) {
printf("failed to generate encrypt code since taosd is running, please stop it first, reason:%s", printf("failed to generate encrypt code since taosd is running, please stop it first, reason:%s",
@ -449,7 +451,7 @@ int mainWindows(int argc, char **argv) {
return code; return code;
} }
mndDeleteTrans(); TAOS_CHECK_RETURN(mndDeleteTrans());
taosCleanupCfg(); taosCleanupCfg();
taosCloseLog(); taosCloseLog();
taosCleanupArgs(); taosCleanupArgs();

603
source/dnode/mnode/impl/src/mndDump.c
View File

@ -16,6 +16,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "mndDb.h" #include "mndDb.h"
#include "mndInt.h" #include "mndInt.h"
#include "mndShow.h"
#include "mndStb.h" #include "mndStb.h"
#include "sdb.h" #include "sdb.h"
#include "tconfig.h" #include "tconfig.h"
@ -46,6 +47,8 @@ char *i642str(int64_t val) {
} }
void dumpFunc(SSdb *pSdb, SJson *json) { void dumpFunc(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "funcs"); SJson *items = tjsonAddArrayToObject(json, "funcs");
@ -55,26 +58,30 @@ void dumpFunc(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "name", pObj->name); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "name", pObj->name), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "funcType", i642str(pObj->funcType)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "funcType", i642str(pObj->funcType)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "scriptType", i642str(pObj->scriptType)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "scriptType", i642str(pObj->scriptType)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "align", i642str(pObj->align)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "align", i642str(pObj->align)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "outputType", i642str(pObj->outputType)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "outputType", i642str(pObj->outputType)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "outputLen", i642str(pObj->outputLen)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "outputLen", i642str(pObj->outputLen)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "bufSize", i642str(pObj->bufSize)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "bufSize", i642str(pObj->bufSize)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "signature", i642str(pObj->signature)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "signature", i642str(pObj->signature)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "commentSize", i642str(pObj->commentSize)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "commentSize", i642str(pObj->commentSize)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "codeSize", i642str(pObj->codeSize)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "codeSize", i642str(pObj->codeSize)), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump func info at line:%d since %s", lino, tstrerror(code));
} }
void dumpDb(SSdb *pSdb, SJson *json) { void dumpDb(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonCreateObject(); SJson *items = tjsonCreateObject();
(void)tjsonAddItemToObject(json, "dbs", items); TAOS_CHECK_GOTO(tjsonAddItemToObject(json, "dbs", items), &lino, _OVER);
while (1) { while (1) {
SDbObj *pObj = NULL; SDbObj *pObj = NULL;
@ -82,65 +89,86 @@ void dumpDb(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToObject(items, "db", item); RETRIEVE_CHECK_GOTO(tjsonAddItemToObject(items, "db", item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "name", mndGetDbStr(pObj->name)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "name", mndGetDbStr(pObj->name)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "acct", pObj->acct); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "acct", pObj->acct), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createUser", pObj->createUser); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createUser", pObj->createUser), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "uid", i642str(pObj->uid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "uid", i642str(pObj->uid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "cfgVersion", i642str(pObj->cfgVersion)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "cfgVersion", i642str(pObj->cfgVersion)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "vgVersion", i642str(pObj->vgVersion)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "vgVersion", i642str(pObj->vgVersion)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "numOfVgroups", i642str(pObj->cfg.numOfVgroups)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "numOfVgroups", i642str(pObj->cfg.numOfVgroups)), pObj, &lino,
(void)tjsonAddStringToObject(item, "numOfStables", i642str(pObj->cfg.numOfStables)); _OVER);
(void)tjsonAddStringToObject(item, "buffer", i642str(pObj->cfg.buffer)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "numOfStables", i642str(pObj->cfg.numOfStables)), pObj, &lino,
(void)tjsonAddStringToObject(item, "pageSize", i642str(pObj->cfg.pageSize)); _OVER);
(void)tjsonAddStringToObject(item, "pages", i642str(pObj->cfg.pages)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "buffer", i642str(pObj->cfg.buffer)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "cacheLastSize", i642str(pObj->cfg.cacheLastSize)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "pageSize", i642str(pObj->cfg.pageSize)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "daysPerFile", i642str(pObj->cfg.daysPerFile)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "pages", i642str(pObj->cfg.pages)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "daysToKeep0", i642str(pObj->cfg.daysToKeep0)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "cacheLastSize", i642str(pObj->cfg.cacheLastSize)), pObj, &lino,
(void)tjsonAddStringToObject(item, "daysToKeep1", i642str(pObj->cfg.daysToKeep1)); _OVER);
(void)tjsonAddStringToObject(item, "daysToKeep2", i642str(pObj->cfg.daysToKeep2)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "daysPerFile", i642str(pObj->cfg.daysPerFile)), pObj, &lino,
(void)tjsonAddStringToObject(item, "minRows", i642str(pObj->cfg.minRows)); _OVER);
(void)tjsonAddStringToObject(item, "maxRows", i642str(pObj->cfg.maxRows)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "daysToKeep0", i642str(pObj->cfg.daysToKeep0)), pObj, &lino,
(void)tjsonAddStringToObject(item, "precision", i642str(pObj->cfg.precision)); _OVER);
(void)tjsonAddStringToObject(item, "compression", i642str(pObj->cfg.compression)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "daysToKeep1", i642str(pObj->cfg.daysToKeep1)), pObj, &lino,
(void)tjsonAddStringToObject(item, "encryptAlgorithm", i642str(pObj->cfg.encryptAlgorithm)); _OVER);
(void)tjsonAddStringToObject(item, "replications", i642str(pObj->cfg.replications)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "daysToKeep2", i642str(pObj->cfg.daysToKeep2)), pObj, &lino,
(void)tjsonAddStringToObject(item, "strict", i642str(pObj->cfg.strict)); _OVER);
(void)tjsonAddStringToObject(item, "cacheLast", i642str(pObj->cfg.cacheLast)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "minRows", i642str(pObj->cfg.minRows)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "hashMethod", i642str(pObj->cfg.hashMethod)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "maxRows", i642str(pObj->cfg.maxRows)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "hashPrefix", i642str(pObj->cfg.hashPrefix)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "precision", i642str(pObj->cfg.precision)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "hashSuffix", i642str(pObj->cfg.hashSuffix)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "compression", i642str(pObj->cfg.compression)), pObj, &lino,
(void)tjsonAddStringToObject(item, "sstTrigger", i642str(pObj->cfg.sstTrigger)); _OVER);
(void)tjsonAddStringToObject(item, "tsdbPageSize", i642str(pObj->cfg.tsdbPageSize)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "encryptAlgorithm", i642str(pObj->cfg.encryptAlgorithm)), pObj,
(void)tjsonAddStringToObject(item, "schemaless", i642str(pObj->cfg.schemaless)); &lino, _OVER);
(void)tjsonAddStringToObject(item, "walLevel", i642str(pObj->cfg.walLevel)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "replications", i642str(pObj->cfg.replications)), pObj, &lino,
(void)tjsonAddStringToObject(item, "walFsyncPeriod", i642str(pObj->cfg.walFsyncPeriod)); _OVER);
(void)tjsonAddStringToObject(item, "walRetentionPeriod", i642str(pObj->cfg.walRetentionPeriod)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "strict", i642str(pObj->cfg.strict)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "walRetentionSize", i642str(pObj->cfg.walRetentionSize)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "cacheLast", i642str(pObj->cfg.cacheLast)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "walRollPeriod", i642str(pObj->cfg.walRollPeriod)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "hashMethod", i642str(pObj->cfg.hashMethod)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "walSegmentSize", i642str(pObj->cfg.walSegmentSize)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "hashPrefix", i642str(pObj->cfg.hashPrefix)), pObj, &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "hashSuffix", i642str(pObj->cfg.hashSuffix)), pObj, &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "sstTrigger", i642str(pObj->cfg.sstTrigger)), pObj, &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "tsdbPageSize", i642str(pObj->cfg.tsdbPageSize)), pObj, &lino,
_OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "schemaless", i642str(pObj->cfg.schemaless)), pObj, &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "walLevel", i642str(pObj->cfg.walLevel)), pObj, &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "walFsyncPeriod", i642str(pObj->cfg.walFsyncPeriod)), pObj, &lino,
_OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "walRetentionPeriod", i642str(pObj->cfg.walRetentionPeriod)), pObj,
&lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "walRetentionSize", i642str(pObj->cfg.walRetentionSize)), pObj,
&lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "walRollPeriod", i642str(pObj->cfg.walRollPeriod)), pObj, &lino,
_OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "walSegmentSize", i642str(pObj->cfg.walSegmentSize)), pObj, &lino,
_OVER);
(void)tjsonAddStringToObject(item, "numOfRetensions", i642str(pObj->cfg.numOfRetensions)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "numOfRetensions", i642str(pObj->cfg.numOfRetensions)), pObj,
&lino, _OVER);
for (int32_t i = 0; i < pObj->cfg.numOfRetensions; ++i) { for (int32_t i = 0; i < pObj->cfg.numOfRetensions; ++i) {
SJson *rentensions = tjsonAddArrayToObject(item, "rentensions"); SJson *rentensions = tjsonAddArrayToObject(item, "rentensions");
SJson *rentension = tjsonCreateObject(); SJson *rentension = tjsonCreateObject();
(void)tjsonAddItemToArray(rentensions, rentension); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(rentensions, rentension), pObj, &lino, _OVER);
SRetention *pRetension = taosArrayGet(pObj->cfg.pRetensions, i); SRetention *pRetension = taosArrayGet(pObj->cfg.pRetensions, i);
(void)tjsonAddStringToObject(item, "freq", i642str(pRetension->freq)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "freq", i642str(pRetension->freq)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "freqUnit", i642str(pRetension->freqUnit)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "freqUnit", i642str(pRetension->freqUnit)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "keep", i642str(pRetension->keep)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "keep", i642str(pRetension->keep)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "keepUnit", i642str(pRetension->keepUnit)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "keepUnit", i642str(pRetension->keepUnit)), pObj, &lino, _OVER);
} }
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump db info at line:%d since %s", lino, tstrerror(code));
} }
void dumpStb(SSdb *pSdb, SJson *json) { void dumpStb(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "stbs"); SJson *items = tjsonAddArrayToObject(json, "stbs");
@ -150,62 +178,67 @@ void dumpStb(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "name", mndGetStbStr(pObj->name)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "name", mndGetStbStr(pObj->name)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "db", mndGetDbStr(pObj->db)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "db", mndGetDbStr(pObj->db)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "uid", i642str(pObj->uid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "uid", i642str(pObj->uid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "tagVer", i642str(pObj->tagVer)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "tagVer", i642str(pObj->tagVer)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "colVer", i642str(pObj->colVer)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "colVer", i642str(pObj->colVer)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "smaVer", i642str(pObj->smaVer)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "smaVer", i642str(pObj->smaVer)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "nextColId", i642str(pObj->nextColId)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "nextColId", i642str(pObj->nextColId)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "watermark1", i642str(pObj->watermark[0])); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "watermark1", i642str(pObj->watermark[0])), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "watermark2", i642str(pObj->watermark[1])); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "watermark2", i642str(pObj->watermark[1])), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "maxdelay0", i642str(pObj->maxdelay[0])); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "maxdelay0", i642str(pObj->maxdelay[0])), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "maxdelay1", i642str(pObj->maxdelay[1])); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "maxdelay1", i642str(pObj->maxdelay[1])), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "ttl", i642str(pObj->ttl)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "ttl", i642str(pObj->ttl)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "numOfFuncs", i642str(pObj->numOfFuncs)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "numOfFuncs", i642str(pObj->numOfFuncs)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "commentLen", i642str(pObj->commentLen)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "commentLen", i642str(pObj->commentLen)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "ast1Len", i642str(pObj->ast1Len)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "ast1Len", i642str(pObj->ast1Len)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "ast2Len", i642str(pObj->ast2Len)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "ast2Len", i642str(pObj->ast2Len)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "numOfColumns", i642str(pObj->numOfColumns)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "numOfColumns", i642str(pObj->numOfColumns)), pObj, &lino, _OVER);
SJson *columns = tjsonAddArrayToObject(item, "columns"); SJson *columns = tjsonAddArrayToObject(item, "columns");
for (int32_t i = 0; i < pObj->numOfColumns; ++i) { for (int32_t i = 0; i < pObj->numOfColumns; ++i) {
SJson *column = tjsonCreateObject(); SJson *column = tjsonCreateObject();
(void)tjsonAddItemToArray(columns, column); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(columns, column), pObj, &lino, _OVER);
SSchema *pColumn = &pObj->pColumns[i]; SSchema *pColumn = &pObj->pColumns[i];
(void)tjsonAddStringToObject(column, "type", i642str(pColumn->type)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(column, "type", i642str(pColumn->type)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(column, "typestr", tDataTypes[pColumn->type].name); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(column, "typestr", tDataTypes[pColumn->type].name), pObj, &lino,
(void)tjsonAddStringToObject(column, "flags", i642str(pColumn->flags)); _OVER);
(void)tjsonAddStringToObject(column, "colId", i642str(pColumn->colId)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(column, "flags", i642str(pColumn->flags)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(column, "bytes", i642str(pColumn->bytes)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(column, "colId", i642str(pColumn->colId)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(column, "name", pColumn->name); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(column, "bytes", i642str(pColumn->bytes)), pObj, &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(column, "name", pColumn->name), pObj, &lino, _OVER);
} }
(void)tjsonAddStringToObject(item, "numOfTags", i642str(pObj->numOfTags)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "numOfTags", i642str(pObj->numOfTags)), pObj, &lino, _OVER);
SJson *tags = tjsonAddArrayToObject(item, "tags"); SJson *tags = tjsonAddArrayToObject(item, "tags");
for (int32_t i = 0; i < pObj->numOfTags; ++i) { for (int32_t i = 0; i < pObj->numOfTags; ++i) {
SJson *tag = tjsonCreateObject(); SJson *tag = tjsonCreateObject();
(void)tjsonAddItemToArray(tags, tag); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(tags, tag), pObj, &lino, _OVER);
SSchema *pTag = &pObj->pTags[i]; SSchema *pTag = &pObj->pTags[i];
(void)tjsonAddStringToObject(tag, "type", i642str(pTag->type)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(tag, "type", i642str(pTag->type)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(tag, "typestr", tDataTypes[pTag->type].name); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(tag, "typestr", tDataTypes[pTag->type].name), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(tag, "flags", i642str(pTag->flags)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(tag, "flags", i642str(pTag->flags)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(tag, "colId", i642str(pTag->colId)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(tag, "colId", i642str(pTag->colId)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(tag, "bytes", i642str(pTag->bytes)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(tag, "bytes", i642str(pTag->bytes)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(tag, "name", pTag->name); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(tag, "name", pTag->name), pObj, &lino, _OVER);
} }
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump stable info at line:%d since %s", lino, tstrerror(code));
} }
void dumpSma(SSdb *pSdb, SJson *json) { void dumpSma(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "smas"); SJson *items = tjsonAddArrayToObject(json, "smas");
@ -215,32 +248,37 @@ void dumpSma(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "name", mndGetStbStr(pObj->name)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "name", mndGetStbStr(pObj->name)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "stb", mndGetStbStr(pObj->stb)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "stb", mndGetStbStr(pObj->stb)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "db", mndGetDbStr(pObj->db)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "db", mndGetDbStr(pObj->db)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "dstTbName", mndGetStbStr(pObj->dstTbName)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "dstTbName", mndGetStbStr(pObj->dstTbName)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "uid", i642str(pObj->uid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "uid", i642str(pObj->uid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "stbUid", i642str(pObj->stbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "stbUid", i642str(pObj->stbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "dstTbUid", i642str(pObj->dstTbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "dstTbUid", i642str(pObj->dstTbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "intervalUnit", i642str(pObj->intervalUnit)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "intervalUnit", i642str(pObj->intervalUnit)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "slidingUnit", i642str(pObj->slidingUnit)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "slidingUnit", i642str(pObj->slidingUnit)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "timezone", i642str(pObj->timezone)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "timezone", i642str(pObj->timezone)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "dstVgId", i642str(pObj->dstVgId)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "dstVgId", i642str(pObj->dstVgId)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "interval", i642str(pObj->interval)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "interval", i642str(pObj->interval)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "offset", i642str(pObj->offset)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "offset", i642str(pObj->offset)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "sliding", i642str(pObj->sliding)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "sliding", i642str(pObj->sliding)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "exprLen", i642str(pObj->exprLen)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "exprLen", i642str(pObj->exprLen)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "tagsFilterLen", i642str(pObj->tagsFilterLen)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "tagsFilterLen", i642str(pObj->tagsFilterLen)), pObj, &lino,
(void)tjsonAddStringToObject(item, "sqlLen", i642str(pObj->sqlLen)); _OVER);
(void)tjsonAddStringToObject(item, "astLen", i642str(pObj->astLen)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "sqlLen", i642str(pObj->sqlLen)), pObj, &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "astLen", i642str(pObj->astLen)), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump sma info at line:%d since %s", lino, tstrerror(code));
} }
void dumpVgroup(SSdb *pSdb, SJson *json) { void dumpVgroup(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "vgroups"); SJson *items = tjsonAddArrayToObject(json, "vgroups");
@ -250,28 +288,33 @@ void dumpVgroup(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "vgId", i642str(pObj->vgId)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "vgId", i642str(pObj->vgId)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "version", i642str(pObj->version)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "version", i642str(pObj->version)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "hashBegin", i642str(pObj->hashBegin)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "hashBegin", i642str(pObj->hashBegin)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "hashEnd", i642str(pObj->hashEnd)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "hashEnd", i642str(pObj->hashEnd)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "db", mndGetDbStr(pObj->dbName)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "db", mndGetDbStr(pObj->dbName)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "isTsma", i642str(pObj->isTsma)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "isTsma", i642str(pObj->isTsma)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "replica", i642str(pObj->replica)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "replica", i642str(pObj->replica)), pObj, &lino, _OVER);
for (int32_t i = 0; i < pObj->replica; ++i) { for (int32_t i = 0; i < pObj->replica; ++i) {
SJson *replicas = tjsonAddArrayToObject(item, "replicas"); SJson *replicas = tjsonAddArrayToObject(item, "replicas");
SJson *replica = tjsonCreateObject(); SJson *replica = tjsonCreateObject();
(void)tjsonAddItemToArray(replicas, replica); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(replicas, replica), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(replica, "dnodeId", i642str(pObj->vnodeGid[i].dnodeId)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(replica, "dnodeId", i642str(pObj->vnodeGid[i].dnodeId)), pObj, &lino,
_OVER);
} }
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump vgroup info at line:%d since %s", lino, tstrerror(code));
} }
void dumpTopic(SSdb *pSdb, SJson *json) { void dumpTopic(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "topics"); SJson *items = tjsonAddArrayToObject(json, "topics");
@ -281,28 +324,32 @@ void dumpTopic(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "name", mndGetDbStr(pObj->name)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "name", mndGetDbStr(pObj->name)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "name", mndGetDbStr(pObj->db)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "name", mndGetDbStr(pObj->db)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createTime", i642str(pObj->createTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createTime", i642str(pObj->createTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "uid", i642str(pObj->uid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "uid", i642str(pObj->uid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "version", i642str(pObj->version)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "version", i642str(pObj->version)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "subType", i642str(pObj->subType)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "subType", i642str(pObj->subType)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "withMeta", i642str(pObj->withMeta)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "withMeta", i642str(pObj->withMeta)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "stbUid", i642str(pObj->stbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "stbUid", i642str(pObj->stbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "stbName", mndGetStableStr(pObj->stbName)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "stbName", mndGetStableStr(pObj->stbName)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "sqlLen", i642str(pObj->sqlLen)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "sqlLen", i642str(pObj->sqlLen)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "astLen", i642str(pObj->astLen)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "astLen", i642str(pObj->astLen)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "sqlLen", i642str(pObj->sqlLen)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "sqlLen", i642str(pObj->sqlLen)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "ntbUid", i642str(pObj->ntbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "ntbUid", i642str(pObj->ntbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "ctbStbUid", i642str(pObj->ctbStbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "ctbStbUid", i642str(pObj->ctbStbUid)), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump topic info at line:%d since %s", lino, tstrerror(code));
} }
void dumpConsumer(SSdb *pSdb, SJson *json) { void dumpConsumer(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "consumers"); SJson *items = tjsonAddArrayToObject(json, "consumers");
@ -312,14 +359,18 @@ void dumpConsumer(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "consumerId", i642str(pObj->consumerId)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "consumerId", i642str(pObj->consumerId)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "cgroup", pObj->cgroup); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "cgroup", pObj->cgroup), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump consumer info at line:%d since %s", lino, tstrerror(code));
} }
void dumpSubscribe(SSdb *pSdb, SJson *json) { void dumpSubscribe(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "subscribes"); SJson *items = tjsonAddArrayToObject(json, "subscribes");
@ -329,15 +380,19 @@ void dumpSubscribe(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "key", pObj->key); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "key", pObj->key), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "dbUid", i642str(pObj->dbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "stbUid", i642str(pObj->stbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "stbUid", i642str(pObj->stbUid)), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump subscribe info at line:%d since %s", lino, tstrerror(code));
} }
void dumpStream(SSdb *pSdb, SJson *json) { void dumpStream(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "streams"); SJson *items = tjsonAddArrayToObject(json, "streams");
@ -347,31 +402,38 @@ void dumpStream(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "name", mndGetDbStr(pObj->name)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "name", mndGetDbStr(pObj->name)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createTime", i642str(pObj->createTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createTime", i642str(pObj->createTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "version", i642str(pObj->version)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "version", i642str(pObj->version)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "totalLevel", i642str(pObj->totalLevel)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "totalLevel", i642str(pObj->totalLevel)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "smaId", i642str(pObj->smaId)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "smaId", i642str(pObj->smaId)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "uid", i642str(pObj->uid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "uid", i642str(pObj->uid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "status", i642str(pObj->status)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "status", i642str(pObj->status)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "igExpired", i642str(pObj->conf.igExpired)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "igExpired", i642str(pObj->conf.igExpired)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "trigger", i642str(pObj->conf.trigger)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "trigger", i642str(pObj->conf.trigger)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "triggerParam", i642str(pObj->conf.triggerParam)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "triggerParam", i642str(pObj->conf.triggerParam)), pObj, &lino,
(void)tjsonAddStringToObject(item, "watermark", i642str(pObj->conf.watermark)); _OVER);
(void)tjsonAddStringToObject(item, "sourceDbUid", i642str(pObj->sourceDbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "watermark", i642str(pObj->conf.watermark)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "targetDbUid", i642str(pObj->targetDbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "sourceDbUid", i642str(pObj->sourceDbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "sourceDb", mndGetDbStr(pObj->sourceDb)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "targetDbUid", i642str(pObj->targetDbUid)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "targetDb", mndGetDbStr(pObj->targetDb)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "sourceDb", mndGetDbStr(pObj->sourceDb)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "targetSTbName", mndGetStbStr(pObj->targetSTbName)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "targetDb", mndGetDbStr(pObj->targetDb)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "targetStbUid", i642str(pObj->targetStbUid)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "targetSTbName", mndGetStbStr(pObj->targetSTbName)), pObj, &lino,
(void)tjsonAddStringToObject(item, "fixedSinkVgId", i642str(pObj->fixedSinkVgId)); _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "targetStbUid", i642str(pObj->targetStbUid)), pObj, &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "fixedSinkVgId", i642str(pObj->fixedSinkVgId)), pObj, &lino,
_OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump stream info at line:%d since %s", lino, tstrerror(code));
} }
void dumpAcct(SSdb *pSdb, SJson *json) { void dumpAcct(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "accts"); SJson *items = tjsonAddArrayToObject(json, "accts");
@ -381,13 +443,15 @@ void dumpAcct(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "acct", pObj->acct); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "acct", pObj->acct), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "acctId", i642str(pObj->acctId)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "acctId", i642str(pObj->acctId)), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump acct info at line:%d since %s", lino, tstrerror(code));
} }
void dumpAuth(SSdb *pSdb, SJson *json) { void dumpAuth(SSdb *pSdb, SJson *json) {
@ -395,6 +459,8 @@ void dumpAuth(SSdb *pSdb, SJson *json) {
} }
void dumpUser(SSdb *pSdb, SJson *json) { void dumpUser(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "users"); SJson *items = tjsonAddArrayToObject(json, "users");
@ -404,21 +470,27 @@ void dumpUser(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "name", pObj->user); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "name", pObj->user), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "acct", pObj->acct); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "acct", pObj->acct), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "superUser", i642str(pObj->superUser)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "superUser", i642str(pObj->superUser)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "authVersion", i642str(pObj->authVersion)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "authVersion", i642str(pObj->authVersion)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "passVersion", i642str(pObj->passVersion)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "passVersion", i642str(pObj->passVersion)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "numOfReadDbs", i642str(taosHashGetSize(pObj->readDbs))); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "numOfReadDbs", i642str(taosHashGetSize(pObj->readDbs))), pObj,
(void)tjsonAddStringToObject(item, "numOfWriteDbs", i642str(taosHashGetSize(pObj->writeDbs))); &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "numOfWriteDbs", i642str(taosHashGetSize(pObj->writeDbs))), pObj,
&lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump user info at line:%d since %s", lino, tstrerror(code));
} }
void dumpDnode(SSdb *pSdb, SJson *json) { void dumpDnode(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "dnodes"); SJson *items = tjsonAddArrayToObject(json, "dnodes");
@ -428,17 +500,21 @@ void dumpDnode(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "id", i642str(pObj->id)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "id", i642str(pObj->id)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "port", i642str(pObj->port)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "port", i642str(pObj->port)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "fqdn", pObj->fqdn); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "fqdn", pObj->fqdn), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump dnode info at line:%d since %s", lino, tstrerror(code));
} }
void dumpSnode(SSdb *pSdb, SJson *json) { void dumpSnode(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "snodes"); SJson *items = tjsonAddArrayToObject(json, "snodes");
@ -448,15 +524,19 @@ void dumpSnode(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "id", i642str(pObj->id)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "id", i642str(pObj->id)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump snode info at line:%d since %s", lino, tstrerror(code));
} }
void dumpQnode(SSdb *pSdb, SJson *json) { void dumpQnode(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "qnodes"); SJson *items = tjsonAddArrayToObject(json, "qnodes");
@ -466,15 +546,19 @@ void dumpQnode(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "id", i642str(pObj->id)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "id", i642str(pObj->id)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump qnode info at line:%d since %s", lino, tstrerror(code));
} }
void dumpMnode(SSdb *pSdb, SJson *json) { void dumpMnode(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "mnodes"); SJson *items = tjsonAddArrayToObject(json, "mnodes");
@ -484,15 +568,20 @@ void dumpMnode(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "id", i642str(pObj->id)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "id", i642str(pObj->id)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump mnode info at line:%d since %s", lino, tstrerror(code));
} }
void dumpCluster(SSdb *pSdb, SJson *json) { void dumpCluster(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "clusters"); SJson *items = tjsonAddArrayToObject(json, "clusters");
@ -502,16 +591,21 @@ void dumpCluster(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "id", i642str(pObj->id)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "id", i642str(pObj->id)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "updateTime", i642str(pObj->updateTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "name", pObj->name); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "name", pObj->name), pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump cluster info at line:%d since %s", lino, tstrerror(code));
} }
void dumpTrans(SSdb *pSdb, SJson *json) { void dumpTrans(SSdb *pSdb, SJson *json) {
int32_t code = 0;
int32_t lino = 0;
void *pIter = NULL; void *pIter = NULL;
SJson *items = tjsonAddArrayToObject(json, "transactions"); SJson *items = tjsonAddArrayToObject(json, "transactions");
@ -521,53 +615,64 @@ void dumpTrans(SSdb *pSdb, SJson *json) {
if (pIter == NULL) break; if (pIter == NULL) break;
SJson *item = tjsonCreateObject(); SJson *item = tjsonCreateObject();
(void)tjsonAddItemToArray(items, item); RETRIEVE_CHECK_GOTO(tjsonAddItemToArray(items, item), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "id", i642str(pObj->id)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "id", i642str(pObj->id)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "stage", i642str(pObj->stage)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "stage", i642str(pObj->stage)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "policy", i642str(pObj->policy)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "policy", i642str(pObj->policy)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "conflict", i642str(pObj->conflict)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "conflict", i642str(pObj->conflict)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "exec", i642str(pObj->exec)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "exec", i642str(pObj->exec)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "oper", i642str(pObj->oper)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "oper", i642str(pObj->oper)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "createdTime", i642str(pObj->createdTime)), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "dbname", pObj->dbname); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "dbname", pObj->dbname), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "stbname", pObj->stbname); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "stbname", pObj->stbname), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "opername", pObj->opername); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "opername", pObj->opername), pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "commitLogNum", i642str(taosArrayGetSize(pObj->commitActions))); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "commitLogNum", i642str(taosArrayGetSize(pObj->commitActions))),
(void)tjsonAddStringToObject(item, "redoActionNum", i642str(taosArrayGetSize(pObj->redoActions))); pObj, &lino, _OVER);
(void)tjsonAddStringToObject(item, "undoActionNum", i642str(taosArrayGetSize(pObj->undoActions))); RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "redoActionNum", i642str(taosArrayGetSize(pObj->redoActions))),
pObj, &lino, _OVER);
RETRIEVE_CHECK_GOTO(tjsonAddStringToObject(item, "undoActionNum", i642str(taosArrayGetSize(pObj->undoActions))),
pObj, &lino, _OVER);
sdbRelease(pSdb, pObj); sdbRelease(pSdb, pObj);
} }
_OVER:
if (code != 0) mError("failed to dump trans info at line:%d since %s", lino, tstrerror(code));
} }
void dumpHeader(SSdb *pSdb, SJson *json) { void dumpHeader(SSdb *pSdb, SJson *json) {
(void)tjsonAddStringToObject(json, "sver", i642str(1)); int32_t code = 0;
(void)tjsonAddStringToObject(json, "applyIndex", i642str(pSdb->applyIndex)); int32_t lino = 0;
(void)tjsonAddStringToObject(json, "applyTerm", i642str(pSdb->applyTerm)); TAOS_CHECK_GOTO(tjsonAddStringToObject(json, "sver", i642str(1)), &lino, _OVER);
(void)tjsonAddStringToObject(json, "applyConfig", i642str(pSdb->applyConfig)); TAOS_CHECK_GOTO(tjsonAddStringToObject(json, "applyIndex", i642str(pSdb->applyIndex)), &lino, _OVER);
TAOS_CHECK_GOTO(tjsonAddStringToObject(json, "applyTerm", i642str(pSdb->applyTerm)), &lino, _OVER);
TAOS_CHECK_GOTO(tjsonAddStringToObject(json, "applyConfig", i642str(pSdb->applyConfig)), &lino, _OVER);
SJson *maxIdsJson = tjsonCreateObject(); SJson *maxIdsJson = tjsonCreateObject();
(void)tjsonAddItemToObject(json, "maxIds", maxIdsJson); TAOS_CHECK_GOTO(tjsonAddItemToObject(json, "maxIds", maxIdsJson), &lino, _OVER);
for (int32_t i = 0; i < SDB_MAX; ++i) { for (int32_t i = 0; i < SDB_MAX; ++i) {
if(i == 5) continue; if(i == 5) continue;
int64_t maxId = 0; int64_t maxId = 0;
if (i < SDB_MAX) { if (i < SDB_MAX) {
maxId = pSdb->maxId[i]; maxId = pSdb->maxId[i];
} }
(void)tjsonAddStringToObject(maxIdsJson, sdbTableName(i), i642str(maxId)); TAOS_CHECK_GOTO(tjsonAddStringToObject(maxIdsJson, sdbTableName(i), i642str(maxId)), &lino, _OVER);
} }
SJson *tableVersJson = tjsonCreateObject(); SJson *tableVersJson = tjsonCreateObject();
(void)tjsonAddItemToObject(json, "tableVers", tableVersJson); TAOS_CHECK_GOTO(tjsonAddItemToObject(json, "tableVers", tableVersJson), &lino, _OVER);
for (int32_t i = 0; i < SDB_MAX; ++i) { for (int32_t i = 0; i < SDB_MAX; ++i) {
int64_t tableVer = 0; int64_t tableVer = 0;
if (i < SDB_MAX) { if (i < SDB_MAX) {
tableVer = pSdb->tableVer[i]; tableVer = pSdb->tableVer[i];
} }
(void)tjsonAddStringToObject(tableVersJson, sdbTableName(i), i642str(tableVer)); TAOS_CHECK_GOTO(tjsonAddStringToObject(tableVersJson, sdbTableName(i), i642str(tableVer)), &lino, _OVER);
}
} }
void mndDumpSdb() { _OVER:
if (code != 0) mError("failed to dump sdb info at line:%d since %s", lino, tstrerror(code));
}
int32_t mndDumpSdb() {
mInfo("start to dump sdb info to sdb.json"); mInfo("start to dump sdb info to sdb.json");
char path[PATH_MAX * 2] = {0}; char path[PATH_MAX * 2] = {0};
@ -581,12 +686,12 @@ void mndDumpSdb() {
msgCb.mgmt = (SMgmtWrapper *)(&msgCb); // hack msgCb.mgmt = (SMgmtWrapper *)(&msgCb); // hack
tmsgSetDefault(&msgCb); tmsgSetDefault(&msgCb);
(void)walInit(NULL); TAOS_CHECK_RETURN(walInit(NULL));
(void)syncInit(); TAOS_CHECK_RETURN(syncInit());
SMnodeOpt opt = {.msgCb = msgCb}; SMnodeOpt opt = {.msgCb = msgCb};
SMnode *pMnode = mndOpen(path, &opt); SMnode *pMnode = mndOpen(path, &opt);
if (pMnode == NULL) return; if (pMnode == NULL) return -1;
SSdb *pSdb = pMnode->pSdb; SSdb *pSdb = pMnode->pSdb;
SJson *json = tjsonCreateObject(); SJson *json = tjsonCreateObject();
@ -616,21 +721,21 @@ void mndDumpSdb() {
char file[] = "sdb.json"; char file[] = "sdb.json";
TdFilePtr pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC | TD_FILE_WRITE_THROUGH); TdFilePtr pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC | TD_FILE_WRITE_THROUGH);
if (pFile == NULL) { if (pFile == NULL) {
terrno = terrno;
mError("failed to write %s since %s", file, terrstr()); mError("failed to write %s since %s", file, terrstr());
return; return terrno;
} }
(void)taosWriteFile(pFile, pCont, contLen); TAOS_CHECK_RETURN(taosWriteFile(pFile, pCont, contLen));
(void)taosWriteFile(pFile, "\n", 1); TAOS_CHECK_RETURN(taosWriteFile(pFile, "\n", 1));
UNUSED(taosFsyncFile(pFile)); TAOS_CHECK_RETURN(taosFsyncFile(pFile));
(void)taosCloseFile(&pFile); TAOS_CHECK_RETURN(taosCloseFile(&pFile));
tjsonDelete(json); tjsonDelete(json);
taosMemoryFree(pCont); taosMemoryFree(pCont);
mInfo("dump sdb info success"); mInfo("dump sdb info success");
return 0;
} }
void mndDeleteTrans() { int32_t mndDeleteTrans() {
mInfo("start to dump sdb info to sdb.json"); mInfo("start to dump sdb info to sdb.json");
char path[PATH_MAX * 2] = {0}; char path[PATH_MAX * 2] = {0};
@ -644,16 +749,18 @@ void mndDeleteTrans() {
msgCb.mgmt = (SMgmtWrapper *)(&msgCb); // hack msgCb.mgmt = (SMgmtWrapper *)(&msgCb); // hack
tmsgSetDefault(&msgCb); tmsgSetDefault(&msgCb);
(void)walInit(NULL); TAOS_CHECK_RETURN(walInit(NULL));
(void)syncInit(); TAOS_CHECK_RETURN(syncInit());
SMnodeOpt opt = {.msgCb = msgCb}; SMnodeOpt opt = {.msgCb = msgCb};
SMnode *pMnode = mndOpen(path, &opt); SMnode *pMnode = mndOpen(path, &opt);
if (pMnode == NULL) return; if (pMnode == NULL) return terrno;
(void)sdbWriteFileForDump(pMnode->pSdb); TAOS_CHECK_RETURN(sdbWriteFileForDump(pMnode->pSdb));
mInfo("dump sdb info success"); mInfo("dump sdb info success");
return 0;
} }
#pragma GCC diagnostic pop #pragma GCC diagnostic pop