From 22225d31c361e8a3cc43ced4502c61d4bedda98d Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Wed, 24 Jan 2024 10:39:22 +0800 Subject: [PATCH 1/3] fix:[TD-28025]return 0 if create table failed if stable not exist --- source/client/src/clientRawBlockWrite.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c index db8de44f1c..739224be38 100644 --- a/source/client/src/clientRawBlockWrite.c +++ b/source/client/src/clientRawBlockWrite.c @@ -966,6 +966,12 @@ static int32_t taosCreateTable(TAOS* taos, void* meta, int32_t metaLen) { // pCreateReq->ctb.suid = processSuid(pCreateReq->ctb.suid, pRequest->pDb); toName(pTscObj->acctId, pRequest->pDb, pCreateReq->ctb.stbName, &sName); code = catalogGetTableMeta(pCatalog, &conn, &sName, &pTableMeta); + if (code == TSDB_CODE_PAR_TABLE_NOT_EXIST) { + code = TSDB_CODE_SUCCESS; + taosMemoryFreeClear(pTableMeta); + continue; + } + if (code != TSDB_CODE_SUCCESS) { goto end; } From 6e09164c3ae88f2104ab16f244e3e0a0bbdd0dec Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Wed, 24 Jan 2024 11:38:17 +0800 Subject: [PATCH 2/3] fix:[TD-28025]return 0 if create table failed if stable not exist --- source/client/src/clientRawBlockWrite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c index 739224be38..b0739b463f 100644 --- a/source/client/src/clientRawBlockWrite.c +++ b/source/client/src/clientRawBlockWrite.c @@ -955,7 +955,6 @@ static int32_t taosCreateTable(TAOS* taos, void* meta, int32_t metaLen) { if (code != TSDB_CODE_SUCCESS) { goto end; } - taosArrayPush(pRequest->tableList, &pName); pCreateReq->flags |= TD_CREATE_IF_NOT_EXISTS; // change tag cid to new cid @@ -989,6 +988,7 @@ static int32_t taosCreateTable(TAOS* taos, void* meta, int32_t metaLen) { } taosMemoryFreeClear(pTableMeta); } + taosArrayPush(pRequest->tableList, &pName); SVgroupCreateTableBatch* pTableBatch = taosHashGet(pVgroupHashmap, &pInfo.vgId, sizeof(pInfo.vgId)); if (pTableBatch == NULL) { From 7d3aa6974050d3fd8e1ea2aaf8e1e36c528b5946 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Wed, 24 Jan 2024 14:02:07 +0800 Subject: [PATCH 3/3] fix:[TD-28025]return 0 if create table failed if stable not exist --- source/client/src/clientRawBlockWrite.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c index b0739b463f..1ea3eaf219 100644 --- a/source/client/src/clientRawBlockWrite.c +++ b/source/client/src/clientRawBlockWrite.c @@ -1005,6 +1005,9 @@ static int32_t taosCreateTable(TAOS* taos, void* meta, int32_t metaLen) { } } + if (taosHashGetSize(pVgroupHashmap) == 0) { + goto end; + } SArray* pBufArray = serializeVgroupsCreateTableBatch(pVgroupHashmap); if (NULL == pBufArray) { code = TSDB_CODE_OUT_OF_MEMORY;