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

catalog

This commit is contained in:
dapan1121 2021-12-28 17:25:44 +08:00
parent 7ad9a9b510
commit 2340bbd7fa
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/libs/catalog/inc/catalogInt.h
View File

@ -46,7 +46,6 @@ typedef struct STableMetaCache {
} STableMetaCache; } STableMetaCache;
typedef struct SCatalog { typedef struct SCatalog {
SVgroupListCache vgroupCache;
SDBVgroupCache dbCache; SDBVgroupCache dbCache;
STableMetaCache tableCache; STableMetaCache tableCache;
} SCatalog; } SCatalog;

10
source/libs/catalog/src/catalog.c
View File

@ -415,16 +415,16 @@ int32_t catalogGetHandle(const char* clusterId , struct SCatalog** catalogHandle
} }
size_t clen = strlen(clusterId); size_t clen = strlen(clusterId);
SCatalog *clusterCtg = (SCatalog *)taosHashGet(ctgMgmt.pCluster, clusterId, clen); SCatalog **ctg = (SCatalog **)taosHashGet(ctgMgmt.pCluster, clusterId, clen);
if (clusterCtg) { if (ctg && (*ctg)) {
*catalogHandle = clusterCtg; *catalogHandle = *ctg;
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
clusterCtg = calloc(1, sizeof(*clusterCtg)); SCatalog *clusterCtg = calloc(1, sizeof(SCatalog));
if (NULL == clusterCtg) { if (NULL == clusterCtg) {
ctgError("calloc %d failed", (int32_t)sizeof(*clusterCtg)); ctgError("calloc %d failed", (int32_t)sizeof(SCatalog));
CTG_ERR_RET(TSDB_CODE_CTG_MEM_ERROR); CTG_ERR_RET(TSDB_CODE_CTG_MEM_ERROR);
} }