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

Merge pull request #1627 from taosdata/hotfix/move_header 

move header
This commit is contained in:
slguan 2020-04-16 18:58:46 +08:00 committed by GitHub
parent 84e0df6b7e 48872f6c4b
commit e425a1a30e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/tsdb/inc/tsdb.h → src/inc/tsdb.h
View File

2
src/util/src/talgo.c
View File

@ -168,6 +168,7 @@ void * taosbsearch(const void *key, const void *base, size_t nmemb, size_t size,
if (flags == TD_EQ) { if (flags == TD_EQ) {
return bsearch(key, base, nmemb, size, compar); return bsearch(key, base, nmemb, size, compar);
} else if (flags == TD_GE) { } else if (flags == TD_GE) {
if (nmemb <= 0) return NULL;
if ((*compar)(key, elePtrAt(base, size, 0)) <= 0) return elePtrAt(base, size, 0); if ((*compar)(key, elePtrAt(base, size, 0)) <= 0) return elePtrAt(base, size, 0);
if ((*compar)(key, elePtrAt(base, size, nmemb - 1)) > 0) return NULL; if ((*compar)(key, elePtrAt(base, size, nmemb - 1)) > 0) return NULL;
@ -193,6 +194,7 @@ void * taosbsearch(const void *key, const void *base, size_t nmemb, size_t size,
} }
} }
} else if (flags == TD_LE) { } else if (flags == TD_LE) {
if (nmemb <= 0) return NULL;
if ((*compar)(key, elePtrAt(base, size, nmemb - 1)) >= 0) return elePtrAt(base, size, nmemb - 1); if ((*compar)(key, elePtrAt(base, size, nmemb - 1)) >= 0) return elePtrAt(base, size, nmemb - 1);
if ((*compar)(key, elePtrAt(base, size, 0)) < 0) return NULL; if ((*compar)(key, elePtrAt(base, size, 0)) < 0) return NULL;