Skip to content

T
TDengine

慢慢CG / TDengine
与 Fork 源项目一致

Fork自 taosdata / TDengine

通知 1
Star 0
Fork 0
T
TDengine
提交 d2effbae 编写于 作者: S slguan
浏览文件
操作

fix compile errors

上级 2d149dae
隐藏空白更改
内联 并排
Showing with 23 addition and 23 deletion
src/mnode/src/mgmtTable.c
浏览文件 @ d2effbae
...@@ -872,17 +872,17 @@ static int32_t mgmtAddSuperTableColumn(SSuperTableObj *pStable, SSchema schema[] ...@@ -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[] ...@@ -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, ...@@ -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, ...@@ -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;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或