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

[td-225] refactor.

This commit is contained in:
Haojun Liao 2021-05-11 20:10:44 +08:00
parent 1d002f4aa7
commit a901745a03
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/src/tscSQLParser.c
View File

@ -7164,6 +7164,7 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
int32_t numOfTables = taosArrayGetSize(tableNameList); int32_t numOfTables = taosArrayGetSize(tableNameList);
STableMeta* pTableMeta = calloc(1, maxSize); STableMeta* pTableMeta = calloc(1, maxSize);
SArray* plist = taosArrayInit(4, sizeof(SName));
for(int32_t i = 0; i < numOfTables; ++i) { for(int32_t i = 0; i < numOfTables; ++i) {
SName* pname = taosArrayGet(tableNameList, i); SName* pname = taosArrayGet(tableNameList, i);
tNameExtractFullName(pname, name); tNameExtractFullName(pname, name);
@ -7183,9 +7184,16 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
STableMeta* pMeta = tscTableMetaDup(pTableMeta); STableMeta* pMeta = tscTableMetaDup(pTableMeta);
taosHashPut(pCmd->pTableMetaMap, name, strlen(name), &pMeta, POINTER_BYTES); taosHashPut(pCmd->pTableMetaMap, name, strlen(name), &pMeta, POINTER_BYTES);
} else {// add to the retrieve table meta array list.
taosArrayPush(plist, pname);
} }
} }
// load the table meta for a given table name list
if (taosArrayGetSize(plist) > 0) {
doGetTableMetaFromMnode();
}
// return getTableMetaFromMnode(pSql, pTableMetaInfo); // return getTableMetaFromMnode(pSql, pTableMetaInfo);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }

2
src/client/src/tscServer.c
View File

@ -2411,7 +2411,7 @@ static int32_t getTableMetaFromMnode(SSqlObj *pSql, STableMetaInfo *pTableMetaIn
} }
STableMetaInfo *pNewMeterMetaInfo = tscAddEmptyMetaInfo(pNewQueryInfo); STableMetaInfo *pNewMeterMetaInfo = tscAddEmptyMetaInfo(pNewQueryInfo);
assert(/*pNew->cmd.numOfClause == 1 && */pNewQueryInfo->numOfTables == 1); assert(pNewQueryInfo->numOfTables == 1);
tNameAssign(&pNewMeterMetaInfo->name, &pTableMetaInfo->name); tNameAssign(&pNewMeterMetaInfo->name, &pTableMetaInfo->name);