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

Merge branch 'enh/TD-29367-3.0-cache' of https://github.com/taosdata/TDengine into enh/TD-29367-3.0

This commit is contained in:
Hongze Cheng 2024-12-16 17:35:35 +08:00
parent dc883e95ce 7aacaf580e
commit fe84704bdb
1 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
source/dnode/vnode/src/meta/metaEntry2.c
View File

@ -1622,6 +1622,60 @@ static int32_t metaHandleSuperTableUpdate(SMeta *pMeta, const SMetaEntry *pEntry
return code;
}
int nCols = pEntry->stbEntry.schemaRow.nCols;
int onCols = pOldEntry->stbEntry.schemaRow.nCols;
int32_t deltaCol = nCols - onCols;
bool updStat = deltaCol != 0 && !metaTbInFilterCache(pMeta, pEntry->name, 1);
if (!TSDB_CACHE_NO(pMeta->pVnode->config)) {
STsdb *pTsdb = pMeta->pVnode->pTsdb;
SArray *uids = NULL; /*taosArrayInit(8, sizeof(int64_t));
if (uids == NULL) {
metaErr(TD_VID(pMeta->pVnode), code);
metaFetchEntryFree(&pOldEntry);
return terrno;
}*/
if (deltaCol == 1) {
int16_t cid = pEntry->stbEntry.schemaRow.pSchema[nCols - 1].colId;
int8_t col_type = pEntry->stbEntry.schemaRow.pSchema[nCols - 1].type;
code = metaGetChildUidsOfSuperTable(pMeta, pEntry->uid, &uids);
if (code) {
metaErr(TD_VID(pMeta->pVnode), code);
metaFetchEntryFree(&pOldEntry);
return code;
}
// TAOS_CHECK_RETURN(metaGetSubtables(pMeta, pEntry->uid, uids));
TAOS_CHECK_RETURN(tsdbCacheNewSTableColumn(pTsdb, uids, cid, col_type));
} else if (deltaCol == -1) {
int16_t cid = -1;
bool hasPrimaryKey = false;
if (onCols >= 2) {
hasPrimaryKey = (pOldEntry->stbEntry.schemaRow.pSchema[1].flags & COL_IS_KEY) ? true : false;
}
for (int i = 0, j = 0; i < nCols && j < onCols; ++i, ++j) {
if (pEntry->stbEntry.schemaRow.pSchema[i].colId != pOldEntry->stbEntry.schemaRow.pSchema[j].colId) {
cid = pOldEntry->stbEntry.schemaRow.pSchema[j].colId;
break;
}
}
if (cid != -1) {
code = metaGetChildUidsOfSuperTable(pMeta, pEntry->uid, &uids);
if (code) {
metaErr(TD_VID(pMeta->pVnode), code);
metaFetchEntryFree(&pOldEntry);
return code;
}
// TAOS_CHECK_RETURN(metaGetSubtables(pMeta, pEntry->uid, uids));
TAOS_CHECK_RETURN(tsdbCacheDropSTableColumn(pTsdb, uids, cid, hasPrimaryKey));
}
}
if (uids) taosArrayDestroy(uids);
tsdbCacheInvalidateSchema(pTsdb, pEntry->uid, -1, pEntry->stbEntry.schemaRow.version);
}
metaFetchEntryFree(&pOldEntry);
return code;
}
@ -1743,6 +1797,11 @@ static int32_t metaHandleSuperTableDrop(SMeta *pMeta, const SMetaEntry *pEntry)
return code;
}
if (tsdbCacheDropSubTables(pMeta->pVnode->pTsdb, childList, pEntry->uid) < 0) {
metaError("vgId:%d, failed to drop stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pEntry->name,
pEntry->uid, tstrerror(terrno));
}
// loop to drop all child tables
for (int32_t i = 0; i < taosArrayGetSize(childList); i++) {
SMetaEntry childEntry = {
@ -1857,4 +1916,4 @@ int32_t metaHandleEntry2(SMeta *pMeta, const SMetaEntry *pEntry) {
metaErr(vgId, code);
}
TAOS_RETURN(code);
}
}