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

Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TD-30837

This commit is contained in:
54liuyao 2024-07-31 08:58:02 +08:00
parent 745f14d140 ffc09562fa
commit 521603c3c0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/vnode/src/vnd/vnodeCommit.c
View File

@ -256,8 +256,10 @@ int vnodeLoadInfo(const char *dir, SVnodeInfo *pInfo) {
_exit: _exit:
if (code) { if (code) {
if (pFile) {
vError("vgId:%d %s failed at %s:%d since %s", pInfo->config.vgId, __func__, __FILE__, lino, tstrerror(code)); vError("vgId:%d %s failed at %s:%d since %s", pInfo->config.vgId, __func__, __FILE__, lino, tstrerror(code));
} }
}
taosMemoryFree(pData); taosMemoryFree(pData);
(void)taosCloseFile(&pFile); (void)taosCloseFile(&pFile);
return code; return code;

3
source/libs/executor/src/sysscanoperator.c
View File

@ -2369,11 +2369,12 @@ static FORCE_INLINE int optSysBinarySearch(SArray* arr, int s, int e, uint64_t k
int32_t optSysIntersection(SArray* in, SArray* out) { int32_t optSysIntersection(SArray* in, SArray* out) {
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
int32_t lino = 0; int32_t lino = 0;
MergeIndex* mi = NULL;
int32_t sz = (int32_t)taosArrayGetSize(in); int32_t sz = (int32_t)taosArrayGetSize(in);
if (sz <= 0) { if (sz <= 0) {
goto _end; goto _end;
} }
MergeIndex* mi = taosMemoryCalloc(sz, sizeof(MergeIndex)); mi = taosMemoryCalloc(sz, sizeof(MergeIndex));
QUERY_CHECK_NULL(mi, code, lino, _end, terrno); QUERY_CHECK_NULL(mi, code, lino, _end, terrno);
for (int i = 0; i < sz; i++) { for (int i = 0; i < sz; i++) {
SArray* t = taosArrayGetP(in, i); SArray* t = taosArrayGetP(in, i);