diff --git a/src/query/src/qast.c b/src/query/src/qast.c index 4da26e0746..7b97e6f9c5 100644 --- a/src/query/src/qast.c +++ b/src/query/src/qast.c @@ -30,6 +30,7 @@ #include "tarray.h" #include "tskiplist.h" #include "queryLog.h" +#include "tsdbMain.h" /* * @@ -796,7 +797,6 @@ static void tSQLBinaryTraverseOnSkipList(tExprNode *pExpr, SArray *pResult, SSki } -#include static void tQueryIndexlessColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, SArray* result) { SSkipListIterator* iter = tSkipListCreateIter(pSkipList); @@ -818,7 +818,7 @@ static void tQueryIndexlessColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, } if (addToResult) { - taosArrayPush(result, table); + taosArrayPush(result, (void*)&table); } } } diff --git a/src/util/src/tcompare.c b/src/util/src/tcompare.c index d4cfd983d5..98e0c9c9a2 100644 --- a/src/util/src/tcompare.c +++ b/src/util/src/tcompare.c @@ -217,7 +217,7 @@ static UNUSED_FUNC int32_t compareStrPatternComp(const void* pLeft, const void* static int32_t compareStrInList(const void* pLeft, const void* pRight) { const SArray* arr = (const SArray*)pRight; - return taosArraySearchString(arr, &pLeft) == NULL ? 0 : 1; + return taosArraySearchString(arr, pLeft) == NULL ? 0 : 1; } static UNUSED_FUNC int32_t compareWStrPatternComp(const void* pLeft, const void* pRight) {