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

fix tests

This commit is contained in:
wangjiaming0909 2024-12-06 16:37:53 +08:00
parent 0e08aa413f
commit 34f1f23ed3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/libs/nodes/src/nodesUtilFuncs.c
View File

@ -2952,8 +2952,7 @@ int32_t nodesValueNodeToVariant(const SValueNode* pNode, SVariant* pVal) {
case TSDB_DATA_TYPE_GEOMETRY: case TSDB_DATA_TYPE_GEOMETRY:
pVal->pz = taosMemoryMalloc(pVal->nLen + 1); pVal->pz = taosMemoryMalloc(pVal->nLen + 1);
if (pVal->pz) { if (pVal->pz) {
memcpy(pVal->pz, pNode->datum.p, pVal->nLen); memcpy(pVal->pz, pNode->datum.p, varDataTLen(pNode->datum.p));
pVal->pz[pVal->nLen] = 0;
} else { } else {
code = terrno; code = terrno;
} }
@ -2962,7 +2961,7 @@ int32_t nodesValueNodeToVariant(const SValueNode* pNode, SVariant* pVal) {
pVal->nLen = getJsonValueLen(pNode->datum.p); pVal->nLen = getJsonValueLen(pNode->datum.p);
pVal->pz = taosMemoryMalloc(pVal->nLen); pVal->pz = taosMemoryMalloc(pVal->nLen);
if (pVal->pz) { if (pVal->pz) {
memcpy(pVal->pz, pNode->datum.p, pVal->nLen); memcpy(pVal->pz, pNode->datum.p, varDataTLen(pNode->datum.p));
} else { } else {
code = terrno; code = terrno;
} }

6
source/libs/scheduler/src/schTask.c
View File

@ -1129,7 +1129,11 @@ int32_t schLaunchRemoteTask(SSchJob *pJob, SSchTask *pTask) {
int32_t schLaunchLocalTask(SSchJob *pJob, SSchTask *pTask) { int32_t schLaunchLocalTask(SSchJob *pJob, SSchTask *pTask) {
// SCH_ERR_JRET(schSetTaskCandidateAddrs(pJob, pTask)); // SCH_ERR_JRET(schSetTaskCandidateAddrs(pJob, pTask));
if (NULL == schMgmt.queryMgmt) { if (NULL == schMgmt.queryMgmt) {
SCH_ERR_RET(qWorkerInit(NODE_TYPE_CLIENT, CLIENT_HANDLE, (void **)&schMgmt.queryMgmt, NULL)); void* p = NULL;
SCH_ERR_RET(qWorkerInit(NODE_TYPE_CLIENT, CLIENT_HANDLE, &p, NULL));
if (atomic_val_compare_exchange_ptr(&schMgmt.queryMgmt, NULL, p)) {
qWorkerDestroy(&p);
}
} }
SArray *explainRes = NULL; SArray *explainRes = NULL;