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

[TD-4034]get latest schema from super table

This commit is contained in:
lichuang 2021-05-20 15:32:25 +08:00
parent 61b2473bf9
commit e51fd4bf77
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tsdb/src/tsdbMain.c
View File

@ -616,17 +616,34 @@ static void tsdbStopStream(STsdbRepo *pRepo) {
} }
} }
static STSchema* getTableLatestSchema(STable *pTable) {
if (pTable->numOfSchemas > 0) {
return pTable->schema[pTable->numOfSchemas - 1];
}
if (pTable->type == TSDB_CHILD_TABLE) {
if (pTable->pSuper && pTable->pSuper->numOfSchemas) {
tsdbInfo("getTableLatestSchema of table %s from super table", pTable->name->data);
return pTable->pSuper->schema[pTable->pSuper->numOfSchemas - 1];
}
}
return NULL;
}
static int restoreLastColumns(STsdbRepo *pRepo, STable *pTable, SReadH* pReadh) { static int restoreLastColumns(STsdbRepo *pRepo, STable *pTable, SReadH* pReadh) {
if (pTable->numOfSchemas == 0) { STSchema *pSchema = getTableLatestSchema(pTable);
if (pSchema == NULL) {
tsdbError("getTableLatestSchema of table %s fail", pTable->name->data);
return 0; return 0;
} }
SBlock* pBlock; SBlock* pBlock;
int numColumns; int numColumns;
int32_t blockIdx; int32_t blockIdx;
SDataStatis* pBlockStatis = NULL; SDataStatis* pBlockStatis = NULL;
SDataRow row = NULL; SDataRow row = NULL;
// restore last column data with last schema // restore last column data with last schema
STSchema *pSchema = pTable->schema[pTable->numOfSchemas - 1];
int err = 0; int err = 0;
numColumns = schemaNCols(pSchema); numColumns = schemaNCols(pSchema);