enh: logic optimization
This commit is contained in:
parent
bc44659826
commit
c04fb6d543
|
@ -75,31 +75,24 @@ int32_t tqBuildDeleteReq(STQ* pTq, const char* stbFullName, const SSDataBlock* p
|
||||||
originName = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE);
|
originName = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE);
|
||||||
if (metaGetTableNameByUid(pTq->pVnode, groupId, originName) == 0) {
|
if (metaGetTableNameByUid(pTq->pVnode, groupId, originName) == 0) {
|
||||||
name = varDataVal(originName);
|
name = varDataVal(originName);
|
||||||
} else {
|
|
||||||
terrno = TSDB_CODE_OUT_OF_MEMORY;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!name || *name == '\0') {
|
if (!name || *name == '\0') {
|
||||||
tqError("s-task:%s build delete msg groupId:%" PRId64 ", skey:%" PRId64 " ekey:%" PRId64
|
tqWarn("s-task:%s failed to build delete msg groupId:%" PRId64 ", skey:%" PRId64 " ekey:%" PRId64
|
||||||
" failed since invalid tbname:%s",
|
" since invalid tbname:%s",
|
||||||
pIdStr, groupId, skey, ekey, name ? name : "NULL");
|
pIdStr, groupId, skey, ekey, name ? name : "NULL");
|
||||||
taosArrayDestroy(deleteReq->deleteReqs);
|
} else {
|
||||||
code = terrno ? terrno : TSDB_CODE_APP_ERROR;
|
tqDebug("s-task:%s build delete msg groupId:%" PRId64 ", name:%s, skey:%" PRId64 " ekey:%" PRId64, pIdStr,
|
||||||
return code;
|
groupId, name, skey, ekey);
|
||||||
}
|
|
||||||
|
|
||||||
tqDebug("s-task:%s build delete msg groupId:%" PRId64 ", name:%s, skey:%" PRId64 " ekey:%" PRId64,
|
|
||||||
pIdStr, groupId, name, skey, ekey);
|
|
||||||
|
|
||||||
SSingleDeleteReq req = {.startTs = skey, .endTs = ekey};
|
SSingleDeleteReq req = {.startTs = skey, .endTs = ekey};
|
||||||
strncpy(req.tbname, name, TSDB_TABLE_NAME_LEN - 1);
|
strncpy(req.tbname, name, TSDB_TABLE_NAME_LEN - 1);
|
||||||
|
|
||||||
if (originName) name = originName;
|
|
||||||
taosMemoryFree(name);
|
|
||||||
|
|
||||||
taosArrayPush(deleteReq->deleteReqs, &req);
|
taosArrayPush(deleteReq->deleteReqs, &req);
|
||||||
}
|
}
|
||||||
|
if (originName) name = originName;
|
||||||
|
taosMemoryFreeClear(name);
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue