未验证 提交 bb714930 编写于 作者: D dapan1121 提交者: GitHub

Merge pull request #9446 from taosdata/fix/hot_merge

[TD-12577]<fix>(others):hot merge
...@@ -101,7 +101,7 @@ void tLoserTreeAdjust(SLoserTreeInfo* pTree, int32_t idx) { ...@@ -101,7 +101,7 @@ void tLoserTreeAdjust(SLoserTreeInfo* pTree, int32_t idx) {
* but the first element in SLoserTreeNode is int32_t * but the first element in SLoserTreeNode is int32_t
* and the comparFn get data as *(int32_t*)(void *), so it is just ok. * and the comparFn get data as *(int32_t*)(void *), so it is just ok.
*/ */
int32_t ret = pTree->comparFn(&pCur, &kLeaf, pTree->param); int32_t ret = pTree->comparFn(pCur, &kLeaf, pTree->param);
if (ret < 0) { if (ret < 0) {
SLoserTreeNode t = pTree->pNode[parentId]; SLoserTreeNode t = pTree->pNode[parentId];
pTree->pNode[parentId] = kLeaf; pTree->pNode[parentId] = kLeaf;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册