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

fix:compare func for topic & doublue free in taosArrayRemoveDuplicateP for topic

This commit is contained in:
cyang 2023-02-21 00:54:34 +08:00
parent 16bc8cb5df
commit ad56390a08
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/mnode/impl/src/mndConsumer.c
View File

@ -626,7 +626,7 @@ static int32_t mndProcessSubscribeReq(SRpcMsg *pMsg) {
} else { } else {
char *oldTopic = taosArrayGetP(pConsumerOld->currentTopics, i); char *oldTopic = taosArrayGetP(pConsumerOld->currentTopics, i);
char *newTopic = taosArrayGetP(newSub, j); char *newTopic = taosArrayGetP(newSub, j);
int comp = compareLenPrefixedStr(oldTopic, newTopic); int comp = strcmp(oldTopic, newTopic);
if (comp == 0) { if (comp == 0) {
i++; i++;
j++; j++;

5
source/util/src/tarray.c
View File

@ -133,13 +133,14 @@ void taosArrayRemoveDuplicate(SArray* pArray, __compar_fn_t comparFn, void (*fp)
// do nothing // do nothing
} else { } else {
if (pos + 1 != i) { if (pos + 1 != i) {
void* p = taosArrayGet(pArray, pos + 1); void* p = taosArrayGetp(pArray, pos + 1);
if (fp != NULL) { if (fp != NULL) {
fp(p); fp(p);
} }
taosArraySet(pArray, pos + 1, p2); taosArraySet(pArray, pos + 1, p2);
pos += 1; memset(TARRAY_GET_ELEM(pArray, i), 0, pArray->elemSize);
pos += 1;
} else { } else {
pos += 1; pos += 1;
} }

2
source/util/src/tcompare.c
View File

@ -1232,7 +1232,7 @@ int32_t taosArrayCompareString(const void *a, const void *b) {
const char *x = *(const char **)a; const char *x = *(const char **)a;
const char *y = *(const char **)b; const char *y = *(const char **)b;
return compareLenPrefixedStr(x, y); return strcmp(x, y);
} }
int32_t comparestrPatternMatch(const void *pLeft, const void *pRight) { int32_t comparestrPatternMatch(const void *pLeft, const void *pRight) {