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

Merge pull request #1511 from taosdata/feature/query 

[td-98] suppress warnings
This commit is contained in:
slguan 2020-04-04 14:28:42 +08:00 committed by GitHub
parent 92cf7c4253 3826deff56
commit 772120966b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -926,7 +926,7 @@ void tSQLBinaryExprTrv(tExprNode *pExprs, int32_t *val, int16_t *ids) {
} }
} }
static int32_t exprTreeToBinaryImpl(tExprNode* pExprTree, SBuffer* pBuf) { static void exprTreeToBinaryImpl(tExprNode* pExprTree, SBuffer* pBuf) {
tbufWrite(pBuf, &pExprTree->nodeType, sizeof(pExprTree->nodeType)); tbufWrite(pBuf, &pExprTree->nodeType, sizeof(pExprTree->nodeType));
if (pExprTree->nodeType == TSQL_NODE_VALUE) { if (pExprTree->nodeType == TSQL_NODE_VALUE) {
@ -973,7 +973,7 @@ SBuffer exprTreeToBinary(tExprNode* pExprTree) {
return buf; return buf;
} }
static tExprNode* exprTreeFromBinaryImpl(tExprNode** pExprTree, SBuffer* pBuf) { static void exprTreeFromBinaryImpl(tExprNode** pExprTree, SBuffer* pBuf) {
tExprNode* pExpr = calloc(1, sizeof(tExprNode)); tExprNode* pExpr = calloc(1, sizeof(tExprNode));
tbufReadToBuffer(pBuf, &pExpr->nodeType, sizeof(pExpr->nodeType)); tbufReadToBuffer(pBuf, &pExpr->nodeType, sizeof(pExpr->nodeType));
@ -1014,7 +1014,7 @@ static tExprNode* exprTreeFromBinaryImpl(tExprNode** pExprTree, SBuffer* pBuf) {
tExprNode* exprTreeFromBinary(const void* pBuf, size_t size) { tExprNode* exprTreeFromBinary(const void* pBuf, size_t size) {
SBuffer rbuf = {0}; SBuffer rbuf = {0};
int32_t code = tbufBeginRead(&rbuf, pBuf, size); /*int32_t code =*/ tbufBeginRead(&rbuf, pBuf, size);
tExprNode* pExprNode = NULL; tExprNode* pExprNode = NULL;
exprTreeFromBinaryImpl(&pExprNode, &rbuf); exprTreeFromBinaryImpl(&pExprNode, &rbuf);

6
src/util/src/ihash.c
View File

@ -221,10 +221,9 @@ void taosCleanUpIntHashWithFp(void *handle, void (*fp)(char *)) {
void taosVisitIntHashWithFp(void *handle, int (*fp)(char *, void *), void *param) { void taosVisitIntHashWithFp(void *handle, int (*fp)(char *, void *), void *param) {
IHashObj * pObj; IHashObj * pObj;
IHashNode *pNode, *pNext; IHashNode *pNode, *pNext;
char * pData = NULL;
pObj = (IHashObj *)handle; pObj = (IHashObj *)handle;
if (pObj == NULL || pObj->maxSessions <= 0) return NULL; if (pObj == NULL || pObj->maxSessions <= 0) return;
pthread_mutex_lock(&pObj->mutex); pthread_mutex_lock(&pObj->mutex);
@ -245,11 +244,10 @@ void taosVisitIntHashWithFp(void *handle, int (*fp)(char *, void *), void *param
int32_t taosGetIntHashSize(void *handle) { int32_t taosGetIntHashSize(void *handle) {
IHashObj * pObj; IHashObj * pObj;
IHashNode *pNode, *pNext; IHashNode *pNode, *pNext;
char * pData = NULL;
int32_t num = 0; int32_t num = 0;
pObj = (IHashObj *)handle; pObj = (IHashObj *)handle;
if (pObj == NULL || pObj->maxSessions <= 0) return NULL; if (pObj == NULL || pObj->maxSessions <= 0) return 0;
pthread_mutex_lock(&pObj->mutex); pthread_mutex_lock(&pObj->mutex);

16
src/vnode/tsdb/src/tsdbRead.c
View File

@ -444,6 +444,7 @@ static bool doLoadDataFromFileBlock(STsdbQueryHandle *pQueryHandle) {
} }
tsdbLoadDataBlock(pFile, pBlock, 1, pCheckInfo->pDataCols, data); tsdbLoadDataBlock(pFile, pBlock, 1, pCheckInfo->pDataCols, data);
return true;
} }
static bool loadQualifiedDataFromFileBlock(STsdbQueryHandle *pQueryHandle) { static bool loadQualifiedDataFromFileBlock(STsdbQueryHandle *pQueryHandle) {
@ -484,7 +485,7 @@ bool moveToNextBlock(STsdbQueryHandle *pQueryHandle, int32_t step) {
(pQueryHandle->cur.slot == pCheckInfo->compIndex[tid].numOfSuperBlocks - 1)) || (pQueryHandle->cur.slot == pCheckInfo->compIndex[tid].numOfSuperBlocks - 1)) ||
(step == QUERY_DESC_FORWARD_STEP && (pQueryHandle->cur.slot == 0))) { (step == QUERY_DESC_FORWARD_STEP && (pQueryHandle->cur.slot == 0))) {
// temporarily keep the position value, in case of no data qualified when move forwards(backwards) // temporarily keep the position value, in case of no data qualified when move forwards(backwards)
SQueryFilePos save = pQueryHandle->cur; // SQueryFilePos save = pQueryHandle->cur;
SFileGroup* fgroup = tsdbGetFileGroupNext(&pCheckInfo->fileIter); SFileGroup* fgroup = tsdbGetFileGroupNext(&pCheckInfo->fileIter);
int32_t fid = -1; int32_t fid = -1;
@ -524,6 +525,8 @@ bool moveToNextBlock(STsdbQueryHandle *pQueryHandle, int32_t step) {
} else { // data in cache } else { // data in cache
return hasMoreDataInCacheForSingleModel(pQueryHandle); return hasMoreDataInCacheForSingleModel(pQueryHandle);
} }
return false;
} }
int vnodeBinarySearchKey(char *pValue, int num, TSKEY key, int order) { int vnodeBinarySearchKey(char *pValue, int num, TSKEY key, int order) {
@ -751,8 +754,6 @@ static bool getQualifiedDataBlock(STsdbQueryHandle *pQueryHandle, STableCheckInf
break; break;
} }
SFile* pFile = &pCheckInfo->pFileGroup->files[TSDB_FILE_TYPE_DATA];
// no data block in current file, try next // no data block in current file, try next
if (pCheckInfo->compIndex[tid].numOfSuperBlocks == 0) { if (pCheckInfo->compIndex[tid].numOfSuperBlocks == 0) {
dTrace("QInfo:%p no data block in file, fid:%d, tid:%d, try next", pQueryHandle->qinfo, dTrace("QInfo:%p no data block in file, fid:%d, tid:%d, try next", pQueryHandle->qinfo,
@ -836,7 +837,7 @@ static bool hasMoreDataInFileForSingleTableModel(STsdbQueryHandle* pHandle) {
assert(pHandle->activeIndex == 0 && taosArrayGetSize(pHandle->pTableCheckInfo) == 1); assert(pHandle->activeIndex == 0 && taosArrayGetSize(pHandle->pTableCheckInfo) == 1);
STsdbFileH* pFileHandle = tsdbGetFile(pHandle->pTsdb); STsdbFileH* pFileHandle = tsdbGetFile(pHandle->pTsdb);
SQueryFilePos* cur = &pHandle->cur; // SQueryFilePos* cur = &pHandle->cur;
STableCheckInfo* pCheckInfo = taosArrayGet(pHandle->pTableCheckInfo, pHandle->activeIndex); STableCheckInfo* pCheckInfo = taosArrayGet(pHandle->pTableCheckInfo, pHandle->activeIndex);
@ -1329,20 +1330,19 @@ static int32_t doQueryTableList(STable* pSTable, SArray* pRes, const char* pCond
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
// SArray *tsdbQueryTableList(struct STsdbRepo* tsdb, int64_t uid, const wchar_t *pTagCond, size_t len) {
SArray *tsdbQueryTableList(tsdb_repo_t* tsdb, int64_t uid, const wchar_t *pTagCond, size_t len) { SArray *tsdbQueryTableList(tsdb_repo_t* tsdb, int64_t uid, const wchar_t *pTagCond, size_t len) {
// no condition, all tables created according to the stable will involved in querying // no condition, all tables created according to the stable will involved in querying
SArray* result = taosArrayInit(8, POINTER_BYTES);
if (pTagCond == NULL || wcslen(pTagCond) == 0) { if (pTagCond == NULL || wcslen(pTagCond) == 0) {
return createTableIdArrayList(tsdb, uid); return createTableIdArrayList(tsdb, uid);
} else { } else {
char* str = convertTagQueryStr(pTagCond, len); char* str = convertTagQueryStr(pTagCond, len);
SArray* result = taosArrayInit(8, POINTER_BYTES);
STable* pSTable = tsdbGetTableByUid(tsdbGetMeta(tsdb), uid); STable* pSTable = tsdbGetTableByUid(tsdbGetMeta(tsdb), uid);
assert(pSTable != NULL); assert(pSTable != NULL);
if (doQueryTableList(pSTable, result, str) == TSDB_CODE_SUCCESS) { doQueryTableList(pSTable, result, str);
return result; return result;
} }
}
} }