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

fix compile errors

This commit is contained in:
slguan 2020-04-04 13:14:33 +08:00
parent 2d149dae64
commit d2effbaed7
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/mnode/src/mgmtTable.c
View File

@ -872,17 +872,17 @@ static int32_t mgmtAddSuperTableColumn(SSuperTableObj *pStable, SSchema schema[]
} }
} }
pMsg->pDb = mgmtGetDbByTableId(pStable->info.tableId); // pMsg->pDb = mgmtGetDbByTableId(pStable->info.tableId);
if (pMsg->pDb == NULL) { // if (pMsg->pDb == NULL) {
mError("meter: %s not belongs to any database", pStable->info.tableId); // mError("meter: %s not belongs to any database", pStable->info.tableId);
return TSDB_CODE_APP_ERROR; // return TSDB_CODE_APP_ERROR;
} // }
pMsg->pAcct = acctGetAcct(pMsg->pDb->cfg.acct); // pMsg->pAcct = acctGetAcct(pMsg->pDb->cfg.acct);
if (pMsg->pAcct == NULL) { // if (pMsg->pAcct == NULL) {
mError("DB: %s not belongs to andy account", pMsg->pDb->name); // mError("DB: %s not belongs to andy account", pMsg->pDb->name);
return TSDB_CODE_APP_ERROR; // return TSDB_CODE_APP_ERROR;
} // }
int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns); int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns);
pStable->schema = realloc(pStable->schema, schemaSize + sizeof(SSchema) * ncols); pStable->schema = realloc(pStable->schema, schemaSize + sizeof(SSchema) * ncols);
@ -899,7 +899,7 @@ static int32_t mgmtAddSuperTableColumn(SSuperTableObj *pStable, SSchema schema[]
pStable->numOfColumns += ncols; pStable->numOfColumns += ncols;
pStable->sversion++; pStable->sversion++;
pMsg->pAcct->acctInfo.numOfTimeSeries += (ncols * pStable->numOfTables); // pMsg->pAcct->acctInfo.numOfTimeSeries += (ncols * pStable->numOfTables);
// sdbUpdateRow(tsSuperTableSdb, pStable, tsSuperTableUpdateSize, SDB_OPER_GLOBAL); // sdbUpdateRow(tsSuperTableSdb, pStable, tsSuperTableUpdateSize, SDB_OPER_GLOBAL);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
@ -911,17 +911,17 @@ static int32_t mgmtProcessDropSuperTableMsgColumnByName(SSuperTableObj *pStable,
return TSDB_CODE_APP_ERROR; return TSDB_CODE_APP_ERROR;
} }
pMsg->pDb = mgmtGetDbByTableId(pStable->info.tableId); // pMsg->pDb = mgmtGetDbByTableId(pStable->info.tableId);
if (pMsg->pDb == NULL) { // if (pMsg->pDb == NULL) {
mError("meter: %s not belongs to any database", pStable->info.tableId); // mError("meter: %s not belongs to any database", pStable->info.tableId);
return TSDB_CODE_APP_ERROR; // return TSDB_CODE_APP_ERROR;
} // }
pMsg->pAcct = acctGetAcct(pMsg->pDb->cfg.acct); // pMsg->pAcct = acctGetAcct(pMsg->pDb->cfg.acct);
if (pMsg->pAcct == NULL) { // if (pMsg->pAcct == NULL) {
mError("DB: %s not belongs to andy account", pMsg->pDb->name); // mError("DB: %s not belongs to andy account", pMsg->pDb->name);
return TSDB_CODE_APP_ERROR; // return TSDB_CODE_APP_ERROR;
} // }
memmove(pStable->schema + sizeof(SSchema) * col, pStable->schema + sizeof(SSchema) * (col + 1), memmove(pStable->schema + sizeof(SSchema) * col, pStable->schema + sizeof(SSchema) * (col + 1),
sizeof(SSchema) * (pStable->numOfColumns + pStable->numOfTags - col - 1)); sizeof(SSchema) * (pStable->numOfColumns + pStable->numOfTags - col - 1));
@ -932,7 +932,7 @@ static int32_t mgmtProcessDropSuperTableMsgColumnByName(SSuperTableObj *pStable,
int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns); int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns);
pStable->schema = realloc(pStable->schema, schemaSize); pStable->schema = realloc(pStable->schema, schemaSize);
pMsg->pAcct->acctInfo.numOfTimeSeries -= (pStable->numOfTables); // pMsg->pAcct->acctInfo.numOfTimeSeries -= (pStable->numOfTables);
// sdbUpdateRow(tsSuperTableSdb, pStable, tsSuperTableUpdateSize, SDB_OPER_GLOBAL); // sdbUpdateRow(tsSuperTableSdb, pStable, tsSuperTableUpdateSize, SDB_OPER_GLOBAL);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;