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

fix: no more fetch when it is already fetching

This commit is contained in:
slzhou 2023-04-07 10:30:36 +08:00
parent 455719befa
commit 596764479f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/libs/catalog/test/catalogTests.cpp
View File

@ -672,12 +672,15 @@ void ctgTestRspUdfInfo(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pR
SRetrieveFuncRsp funcRsp = {0}; SRetrieveFuncRsp funcRsp = {0};
funcRsp.numOfFuncs = 1; funcRsp.numOfFuncs = 1;
funcRsp.pFuncInfos = taosArrayInit(1, sizeof(SFuncInfo)); funcRsp.pFuncInfos = taosArrayInit(1, sizeof(SFuncInfo));
funcRsp.pFuncVersions = taosArrayInit(1, sizeof(int32_t));
SFuncInfo funcInfo = {0}; SFuncInfo funcInfo = {0};
strcpy(funcInfo.name, "func1"); strcpy(funcInfo.name, "func1");
funcInfo.funcType = ctgTestFuncType; funcInfo.funcType = ctgTestFuncType;
(void)taosArrayPush(funcRsp.pFuncInfos, &funcInfo); (void)taosArrayPush(funcRsp.pFuncInfos, &funcInfo);
int32_t version = 0;
(void)taosArrayPush(funcRsp.pFuncVersions, &version);
int32_t rspLen = tSerializeSRetrieveFuncRsp(NULL, 0, &funcRsp); int32_t rspLen = tSerializeSRetrieveFuncRsp(NULL, 0, &funcRsp);
void *pReq = rpcMallocCont(rspLen); void *pReq = rpcMallocCont(rspLen);
tSerializeSRetrieveFuncRsp(pReq, rspLen, &funcRsp); tSerializeSRetrieveFuncRsp(pReq, rspLen, &funcRsp);

6
source/libs/function/src/udfd.c
View File

@ -581,6 +581,7 @@ int32_t udfdInitUdf(char *udfName, SUdf *udf) {
SUdf *udfdNewUdf(const char *udfName) { SUdf *udfdNewUdf(const char *udfName) {
SUdf *udfNew = taosMemoryCalloc(1, sizeof(SUdf)); SUdf *udfNew = taosMemoryCalloc(1, sizeof(SUdf));
udfNew->refCount = 1; udfNew->refCount = 1;
udfNew->lastFetchTime = taosGetTimestampUs();
strncpy(udfNew->name, udfName, TSDB_FUNC_NAME_LEN); strncpy(udfNew->name, udfName, TSDB_FUNC_NAME_LEN);
udfNew->state = UDF_STATE_INIT; udfNew->state = UDF_STATE_INIT;
@ -618,6 +619,7 @@ SUdf *udfdGetOrCreateUdf(const char *udfName) {
} }
SUdf *udf = udfdNewUdf(udfName); SUdf *udf = udfdNewUdf(udfName);
SUdf **pUdf = &udf; SUdf **pUdf = &udf;
taosHashPut(global.udfsHash, udfName, strlen(udfName), pUdf, POINTER_BYTES); taosHashPut(global.udfsHash, udfName, strlen(udfName), pUdf, POINTER_BYTES);
uv_mutex_unlock(&global.udfsMutex); uv_mutex_unlock(&global.udfsMutex);
@ -902,8 +904,8 @@ void udfdProcessRpcRsp(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet) {
udf->version = *(int32_t *)taosArrayGet(retrieveRsp.pFuncVersions, 0); udf->version = *(int32_t *)taosArrayGet(retrieveRsp.pFuncVersions, 0);
msgInfo->code = udfdSaveFuncBodyToFile(pFuncInfo, udf); msgInfo->code = udfdSaveFuncBodyToFile(pFuncInfo, udf);
if (msgInfo->code == 0) { if (msgInfo->code != 0) {
udf->lastFetchTime = taosGetTimestampUs(); udf->lastFetchTime = 0;
} }
tFreeSFuncInfo(pFuncInfo); tFreeSFuncInfo(pFuncInfo);
taosArrayDestroy(retrieveRsp.pFuncInfos); taosArrayDestroy(retrieveRsp.pFuncInfos);