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

more code

This commit is contained in:
Hongze Cheng 2024-12-13 16:47:05 +08:00
parent 8525df81a8
commit a6463884f0
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libs/executor/storageapi.h
View File

@ -62,7 +62,7 @@ typedef struct SMetaEntry {
struct { struct {
int64_t btime; int64_t btime;
int32_t ttlDays; int32_t ttlDays;
int32_t commentLen; int32_t commentLen; // not include '\0'
char* comment; char* comment;
tb_uid_t suid; tb_uid_t suid;
uint8_t* pTags; uint8_t* pTags;

4
source/dnode/vnode/src/meta/metaEntry.c
View File

@ -317,7 +317,7 @@ int32_t metaCloneEntry(const SMetaEntry *pEntry, SMetaEntry **ppEntry) {
metaCloneEntryFree(ppEntry); metaCloneEntryFree(ppEntry);
return code; return code;
} }
memcpy((*ppEntry)->ctbEntry.comment, pEntry->ctbEntry.comment, pEntry->ctbEntry.commentLen); memcpy((*ppEntry)->ctbEntry.comment, pEntry->ctbEntry.comment, pEntry->ctbEntry.commentLen + 1);
} }
// tags // tags
@ -350,7 +350,7 @@ int32_t metaCloneEntry(const SMetaEntry *pEntry, SMetaEntry **ppEntry) {
metaCloneEntryFree(ppEntry); metaCloneEntryFree(ppEntry);
return code; return code;
} }
memcpy((*ppEntry)->ntbEntry.comment, pEntry->ntbEntry.comment, pEntry->ntbEntry.commentLen); memcpy((*ppEntry)->ntbEntry.comment, pEntry->ntbEntry.comment, pEntry->ntbEntry.commentLen + 1);
} }
} else { } else {
return TSDB_CODE_INVALID_PARA; return TSDB_CODE_INVALID_PARA;

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

@ -964,7 +964,7 @@ static int32_t metaHandleNormalTableCreate(SMeta *pMeta, const SMetaEntry *pEntr
metaULock(pMeta); metaULock(pMeta);
// update other stuff // update other stuff
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS == code) {
pMeta->pVnode->config.vndStats.numOfNTables++; pMeta->pVnode->config.vndStats.numOfNTables++;
pMeta->pVnode->config.vndStats.numOfNTimeSeries += pEntry->ntbEntry.schemaRow.nCols - 1; pMeta->pVnode->config.vndStats.numOfNTimeSeries += pEntry->ntbEntry.schemaRow.nCols - 1;
pMeta->changed = true; pMeta->changed = true;
@ -1041,7 +1041,7 @@ static int32_t metaHandleChildTableCreate(SMeta *pMeta, const SMetaEntry *pEntry
metaULock(pMeta); metaULock(pMeta);
// update other stuff // update other stuff
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS == code) {
pMeta->pVnode->config.vndStats.numOfCTables++; pMeta->pVnode->config.vndStats.numOfCTables++;
if (!metaTbInFilterCache(pMeta, pSuperEntry->name, 1)) { if (!metaTbInFilterCache(pMeta, pSuperEntry->name, 1)) {

4
source/dnode/vnode/src/meta/metaTable.c
View File

@ -3003,10 +3003,6 @@ int metaAlterTable(SMeta *pMeta, int64_t version, SVAlterTbReq *pReq, STableMeta
return metaUpdateTableMultiTagValue(pMeta, version, pReq); return metaUpdateTableMultiTagValue(pMeta, version, pReq);
case TSDB_ALTER_TABLE_UPDATE_OPTIONS: case TSDB_ALTER_TABLE_UPDATE_OPTIONS:
return metaUpdateTableOptions2(pMeta, version, pReq); return metaUpdateTableOptions2(pMeta, version, pReq);
case TSDB_ALTER_TABLE_ADD_TAG_INDEX:
return metaAddTagIndex(pMeta, version, pReq);
case TSDB_ALTER_TABLE_DROP_TAG_INDEX:
return metaDropTagIndex(pMeta, version, pReq);
case TSDB_ALTER_TABLE_UPDATE_COLUMN_COMPRESS: case TSDB_ALTER_TABLE_UPDATE_COLUMN_COMPRESS:
return metaUpdateTableColCompress2(pMeta, version, pReq); return metaUpdateTableColCompress2(pMeta, version, pReq);
default: default:

8
source/dnode/vnode/src/meta/metaTable2.c
View File

@ -1402,9 +1402,6 @@ int32_t metaUpdateTableOptions2(SMeta *pMeta, int64_t version, SVAlterTbReq *pRe
if (pEntry->type == TSDB_CHILD_TABLE) { if (pEntry->type == TSDB_CHILD_TABLE) {
if (pReq->updateTTL) { if (pReq->updateTTL) {
pEntry->ctbEntry.ttlDays = pReq->newTTL; pEntry->ctbEntry.ttlDays = pReq->newTTL;
// metaDeleteTtl(pMeta, &entry);
// entry.ctbEntry.ttlDays = pReq->newTTL;
// metaUpdateTtl(pMeta, &entry);
} }
if (pReq->newCommentLen >= 0) { if (pReq->newCommentLen >= 0) {
char *pNewComment = taosMemoryRealloc(pEntry->ctbEntry.comment, pReq->newCommentLen + 1); char *pNewComment = taosMemoryRealloc(pEntry->ctbEntry.comment, pReq->newCommentLen + 1);
@ -1414,15 +1411,13 @@ int32_t metaUpdateTableOptions2(SMeta *pMeta, int64_t version, SVAlterTbReq *pRe
metaFetchEntryFree(&pEntry); metaFetchEntryFree(&pEntry);
TAOS_RETURN(terrno); TAOS_RETURN(terrno);
} }
memcpy(pNewComment, pReq->newComment, pReq->newCommentLen + 1);
pEntry->ctbEntry.comment = pNewComment; pEntry->ctbEntry.comment = pNewComment;
pEntry->ctbEntry.commentLen = pReq->newCommentLen; pEntry->ctbEntry.commentLen = pReq->newCommentLen;
} }
} else if (pEntry->type == TSDB_NORMAL_TABLE) { } else if (pEntry->type == TSDB_NORMAL_TABLE) {
if (pReq->updateTTL) { if (pReq->updateTTL) {
pEntry->ntbEntry.ttlDays = pReq->newTTL; pEntry->ntbEntry.ttlDays = pReq->newTTL;
// metaDeleteTtl(pMeta, &entry);
// entry.ntbEntry.ttlDays = pReq->newTTL;
// metaUpdateTtl(pMeta, &entry);
} }
if (pReq->newCommentLen >= 0) { if (pReq->newCommentLen >= 0) {
char *pNewComment = taosMemoryRealloc(pEntry->ntbEntry.comment, pReq->newCommentLen + 1); char *pNewComment = taosMemoryRealloc(pEntry->ntbEntry.comment, pReq->newCommentLen + 1);
@ -1432,6 +1427,7 @@ int32_t metaUpdateTableOptions2(SMeta *pMeta, int64_t version, SVAlterTbReq *pRe
metaFetchEntryFree(&pEntry); metaFetchEntryFree(&pEntry);
TAOS_RETURN(terrno); TAOS_RETURN(terrno);
} }
memcpy(pNewComment, pReq->newComment, pReq->newCommentLen + 1);
pEntry->ntbEntry.comment = pNewComment; pEntry->ntbEntry.comment = pNewComment;
pEntry->ntbEntry.commentLen = pReq->newCommentLen; pEntry->ntbEntry.commentLen = pReq->newCommentLen;
} }