提交 5741959c 编写于 作者: weixin_48148422's avatar weixin_48148422

TD-97: tbname query complete

上级 87363383
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "tarray.h" #include "tarray.h"
#include "tskiplist.h" #include "tskiplist.h"
#include "queryLog.h" #include "queryLog.h"
#include "tsdbMain.h"
/* /*
* *
...@@ -796,7 +797,6 @@ static void tSQLBinaryTraverseOnSkipList(tExprNode *pExpr, SArray *pResult, SSki ...@@ -796,7 +797,6 @@ static void tSQLBinaryTraverseOnSkipList(tExprNode *pExpr, SArray *pResult, SSki
} }
#include <tsdbMain.h>
static void tQueryIndexlessColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, SArray* result) { static void tQueryIndexlessColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, SArray* result) {
SSkipListIterator* iter = tSkipListCreateIter(pSkipList); SSkipListIterator* iter = tSkipListCreateIter(pSkipList);
...@@ -818,7 +818,7 @@ static void tQueryIndexlessColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, ...@@ -818,7 +818,7 @@ static void tQueryIndexlessColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo,
} }
if (addToResult) { if (addToResult) {
taosArrayPush(result, table); taosArrayPush(result, (void*)&table);
} }
} }
} }
......
...@@ -217,7 +217,7 @@ static UNUSED_FUNC int32_t compareStrPatternComp(const void* pLeft, const void* ...@@ -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) { static int32_t compareStrInList(const void* pLeft, const void* pRight) {
const SArray* arr = (const SArray*)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) { static UNUSED_FUNC int32_t compareWStrPatternComp(const void* pLeft, const void* pRight) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册