enh: create from csv rm tbname hash
This commit is contained in:
parent
84e675c248
commit
8af5e89d4e
|
@ -13801,7 +13801,6 @@ _OUT:
|
|||
}
|
||||
|
||||
typedef struct SParseFileContext {
|
||||
SHashObj* pTbNameHash;
|
||||
SArray* aTagNames;
|
||||
bool tagNameFilled;
|
||||
STableMeta* pStbMeta;
|
||||
|
@ -13936,18 +13935,6 @@ static int32_t parseCsvFile(SMsgBuf* pMsgBuf, SParseContext* pParseCxt, SParseFi
|
|||
|
||||
code = parseOneStbRow(pMsgBuf, pParFileCxt);
|
||||
|
||||
if (TSDB_CODE_SUCCESS == code) {
|
||||
if (taosHashGet(pParFileCxt->pTbNameHash, pParFileCxt->ctbName.tname, strlen(pParFileCxt->ctbName.tname) + 1) !=
|
||||
NULL) {
|
||||
taosMemoryFreeClear(pParFileCxt->pTag);
|
||||
code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_TBNAME_DUPLICATED, pParFileCxt->ctbName.tname);
|
||||
break;
|
||||
}
|
||||
|
||||
code = taosHashPut(pParFileCxt->pTbNameHash, pParFileCxt->ctbName.tname, strlen(pParFileCxt->ctbName.tname) + 1,
|
||||
NULL, 0);
|
||||
}
|
||||
|
||||
if (TSDB_CODE_SUCCESS == code) {
|
||||
code = fillVgroupInfo(pParseCxt, &pParFileCxt->ctbName, &pParFileCxt->vg);
|
||||
}
|
||||
|
@ -13987,7 +13974,6 @@ static void destructParseFileContext(SParseFileContext** ppParFileCxt) {
|
|||
|
||||
SParseFileContext* pParFileCxt = *ppParFileCxt;
|
||||
|
||||
taosHashCleanup(pParFileCxt->pTbNameHash);
|
||||
taosArrayDestroy(pParFileCxt->aTagNames);
|
||||
taosMemoryFreeClear(pParFileCxt->pStbMeta);
|
||||
taosArrayDestroy(pParFileCxt->aTagIndexs);
|
||||
|
@ -14012,15 +13998,6 @@ static int32_t constructParseFileContext(SCreateSubTableFromFileClause* pStmt, S
|
|||
pParFileCxt->ctbName.acctId = acctId;
|
||||
strcpy(pParFileCxt->ctbName.dbname, pStmt->useDbName);
|
||||
|
||||
if (NULL == pParFileCxt->pTbNameHash) {
|
||||
pParFileCxt->pTbNameHash =
|
||||
taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_VARCHAR), false, HASH_NO_LOCK);
|
||||
if (!pParFileCxt->pTbNameHash) {
|
||||
code = TSDB_CODE_OUT_OF_MEMORY;
|
||||
goto _ERR;
|
||||
}
|
||||
}
|
||||
|
||||
if (NULL == pParFileCxt->aTagNames) {
|
||||
pParFileCxt->aTagNames = taosArrayInit(8, TSDB_COL_NAME_LEN);
|
||||
if (NULL == pParFileCxt->aTagNames) {
|
||||
|
|
Loading…
Reference in New Issue