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

TD-97: tbname query complete

This commit is contained in:
localvar 2020-04-23 15:50:03 +08:00
parent 87363383f9
commit 5741959c96
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/query/src/qast.c
View File

@ -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
} }
#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,
} }
if (addToResult) { if (addToResult) {
taosArrayPush(result, table); taosArrayPush(result, (void*)&table);
} }
} }
} }

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

@ -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) {