Merge pull request #9969 from taosdata/feature/warning
Remove warnings and adjust dependencies
This commit is contained in:
commit
36df7def76
|
@ -633,3 +633,5 @@ TEST(testCase, astTest) {
|
||||||
// exprSerializeTest2();
|
// exprSerializeTest2();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -5,6 +5,7 @@
|
||||||
#include "tsdb.h"
|
#include "tsdb.h"
|
||||||
#include "qExtbuffer.h"
|
#include "qExtbuffer.h"
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
|
@ -122,3 +123,5 @@ TEST(testCase, columnsort_test) {
|
||||||
|
|
||||||
destroyColumnModel(pModel);
|
destroyColumnModel(pModel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -6,6 +6,7 @@
|
||||||
#include "taos.h"
|
#include "taos.h"
|
||||||
#include "qHistogram.h"
|
#include "qHistogram.h"
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
|
|
||||||
|
@ -140,3 +141,5 @@ TEST(testCase, heapsort) {
|
||||||
//
|
//
|
||||||
// free(pEntry);
|
// free(pEntry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -6,6 +6,7 @@
|
||||||
#include "qAggMain.h"
|
#include "qAggMain.h"
|
||||||
#include "tcompare.h"
|
#include "tcompare.h"
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
|
|
||||||
|
@ -84,3 +85,5 @@ TEST(testCase, patternMatchTest) {
|
||||||
ret = patternMatch("%9", str, 2, &info);
|
ret = patternMatch("%9", str, 2, &info);
|
||||||
EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
|
EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
#include "qPercentile.h"
|
#include "qPercentile.h"
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
|
|
||||||
|
@ -255,3 +256,5 @@ TEST(testCase, percentileTest) {
|
||||||
unsignedDataTest();
|
unsignedDataTest();
|
||||||
largeDataTest();
|
largeDataTest();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
#include "qFilter.h"
|
#include "qFilter.h"
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
|
|
||||||
|
@ -365,3 +366,5 @@ TEST(testCase, rangeMergeTest) {
|
||||||
intDataTest();
|
intDataTest();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -6,6 +6,7 @@
|
||||||
#include "taos.h"
|
#include "taos.h"
|
||||||
#include "tsdb.h"
|
#include "tsdb.h"
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
|
|
||||||
|
@ -161,3 +162,5 @@ TEST(testCase, resultBufferTest) {
|
||||||
writeDownTest();
|
writeDownTest();
|
||||||
recyclePageTest();
|
recyclePageTest();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -9,6 +9,7 @@
|
||||||
#include "ttoken.h"
|
#include "ttoken.h"
|
||||||
#include "tutil.h"
|
#include "tutil.h"
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
|
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
|
||||||
|
@ -513,3 +514,5 @@ TEST(testCase, tsBufTest) {
|
||||||
mergeDiffVnodeBufferTest();
|
mergeDiffVnodeBufferTest();
|
||||||
mergeIdenticalVnodeBufferTest();
|
mergeIdenticalVnodeBufferTest();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -4,6 +4,7 @@
|
||||||
#include "taos.h"
|
#include "taos.h"
|
||||||
#include "tsdb.h"
|
#include "tsdb.h"
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
|
@ -910,3 +911,4 @@ TEST(testCase, getTempFilePath_test) {
|
||||||
printf("%s\n", path);
|
printf("%s\n", path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -10,8 +10,8 @@ set(CMAKE_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/cmake")
|
||||||
set(CMAKE_CONTRIB_DIR "${CMAKE_SOURCE_DIR}/contrib")
|
set(CMAKE_CONTRIB_DIR "${CMAKE_SOURCE_DIR}/contrib")
|
||||||
include(${CMAKE_SUPPORT_DIR}/cmake.options)
|
include(${CMAKE_SUPPORT_DIR}/cmake.options)
|
||||||
|
|
||||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
|
||||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
|
||||||
|
|
||||||
# contrib
|
# contrib
|
||||||
add_subdirectory(contrib)
|
add_subdirectory(contrib)
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _TD_UTIL_COMPARE_H
|
#ifndef _TD_UTIL_COMPARE_H_
|
||||||
#define _TD_UTIL_COMPARE_H
|
#define _TD_UTIL_COMPARE_H_
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -35,62 +35,60 @@ extern "C" {
|
||||||
#define FLT_GREATEREQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) > (_y)))
|
#define FLT_GREATEREQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) > (_y)))
|
||||||
#define FLT_LESSEQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) < (_y)))
|
#define FLT_LESSEQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) < (_y)))
|
||||||
|
|
||||||
#define PATTERN_COMPARE_INFO_INITIALIZER { '%', '_' }
|
#define PATTERN_COMPARE_INFO_INITIALIZER \
|
||||||
|
{ '%', '_' }
|
||||||
|
|
||||||
typedef struct SPatternCompareInfo {
|
typedef struct SPatternCompareInfo {
|
||||||
char matchAll; // symbol for match all wildcard, default: '%'
|
char matchAll; // symbol for match all wildcard, default: '%'
|
||||||
char matchOne; // symbol for match one wildcard, default: '_'
|
char matchOne; // symbol for match one wildcard, default: '_'
|
||||||
} SPatternCompareInfo;
|
} SPatternCompareInfo;
|
||||||
|
|
||||||
int patternMatch(const char *pattern, const char *str, size_t size, const SPatternCompareInfo *pInfo);
|
int32_t patternMatch(const char *pattern, const char *str, size_t size, const SPatternCompareInfo *pInfo);
|
||||||
|
|
||||||
int WCSPatternMatch(const wchar_t *pattern, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo);
|
|
||||||
|
|
||||||
|
int32_t WCSPatternMatch(const wchar_t *pattern, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo);
|
||||||
|
|
||||||
int32_t taosArrayCompareString(const void *a, const void *b);
|
int32_t taosArrayCompareString(const void *a, const void *b);
|
||||||
|
|
||||||
int32_t setCompareBytes1(const void *pLeft, const void *pRight);
|
int32_t setCompareBytes1(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t setCompareBytes2(const void *pLeft, const void *pRight);
|
int32_t setCompareBytes2(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t setCompareBytes4(const void *pLeft, const void *pRight);
|
int32_t setCompareBytes4(const void *pLeft, const void *pRight);
|
||||||
int32_t setCompareBytes8(const void *pLeft, const void *pRight);
|
int32_t setCompareBytes8(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
|
int32_t compareInt8Val(const void *pLeft, const void *pRight);
|
||||||
|
int32_t compareInt16Val(const void *pLeft, const void *pRight);
|
||||||
int32_t compareInt32Val(const void *pLeft, const void *pRight);
|
int32_t compareInt32Val(const void *pLeft, const void *pRight);
|
||||||
int32_t compareInt64Val(const void *pLeft, const void *pRight);
|
int32_t compareInt64Val(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareInt16Val(const void *pLeft, const void *pRight);
|
int32_t compareUint8Val(const void *pLeft, const void *pRight);
|
||||||
|
int32_t compareUint16Val(const void *pLeft, const void *pRight);
|
||||||
int32_t compareInt8Val(const void *pLeft, const void *pRight);
|
|
||||||
|
|
||||||
int32_t compareUint32Val(const void *pLeft, const void *pRight);
|
int32_t compareUint32Val(const void *pLeft, const void *pRight);
|
||||||
int32_t compareUint64Val(const void *pLeft, const void *pRight);
|
int32_t compareUint64Val(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareUint16Val(const void *pLeft, const void *pRight);
|
|
||||||
|
|
||||||
int32_t compareUint8Val(const void* pLeft, const void* pRight);
|
|
||||||
|
|
||||||
int32_t compareFloatVal(const void *pLeft, const void *pRight);
|
int32_t compareFloatVal(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareDoubleVal(const void *pLeft, const void *pRight);
|
int32_t compareDoubleVal(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareLenPrefixedStr(const void *pLeft, const void *pRight);
|
int32_t compareLenPrefixedStr(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareLenPrefixedWStr(const void *pLeft, const void *pRight);
|
int32_t compareLenPrefixedWStr(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareStrRegexComp(const void *pLeft, const void *pRight);
|
int32_t compareStrRegexComp(const void *pLeft, const void *pRight);
|
||||||
int32_t compareStrRegexCompMatch(const void *pLeft, const void *pRight);
|
int32_t compareStrRegexCompMatch(const void *pLeft, const void *pRight);
|
||||||
int32_t compareStrRegexCompNMatch(const void *pLeft, const void *pRight);
|
int32_t compareStrRegexCompNMatch(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareFindItemInSet(const void *pLeft, const void *pRight);
|
int32_t compareFindItemInSet(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareInt8ValDesc(const void *pLeft, const void *pRight);
|
int32_t compareInt8ValDesc(const void *pLeft, const void *pRight);
|
||||||
int32_t compareInt16ValDesc(const void *pLeft, const void *pRight);
|
int32_t compareInt16ValDesc(const void *pLeft, const void *pRight);
|
||||||
int32_t compareInt32ValDesc(const void *pLeft, const void *pRight);
|
int32_t compareInt32ValDesc(const void *pLeft, const void *pRight);
|
||||||
int32_t compareInt64ValDesc(const void *pLeft, const void *pRight);
|
int32_t compareInt64ValDesc(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareFloatValDesc(const void *pLeft, const void *pRight);
|
int32_t compareFloatValDesc(const void *pLeft, const void *pRight);
|
||||||
int32_t compareDoubleValDesc(const void *pLeft, const void *pRight);
|
int32_t compareDoubleValDesc(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareUint8ValDesc(const void *pLeft, const void *pRight);
|
int32_t compareUint8ValDesc(const void *pLeft, const void *pRight);
|
||||||
int32_t compareUint16ValDesc(const void *pLeft, const void *pRight);
|
int32_t compareUint16ValDesc(const void *pLeft, const void *pRight);
|
||||||
int32_t compareUint32ValDesc(const void *pLeft, const void *pRight);
|
int32_t compareUint32ValDesc(const void *pLeft, const void *pRight);
|
||||||
int32_t compareUint64ValDesc(const void *pLeft, const void *pRight);
|
int32_t compareUint64ValDesc(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
int32_t compareLenPrefixedStrDesc(const void *pLeft, const void *pRight);
|
int32_t compareLenPrefixedStrDesc(const void *pLeft, const void *pRight);
|
||||||
int32_t compareLenPrefixedWStrDesc(const void *pLeft, const void *pRight);
|
int32_t compareLenPrefixedWStrDesc(const void *pLeft, const void *pRight);
|
||||||
|
|
||||||
|
@ -98,4 +96,4 @@ int32_t compareLenPrefixedWStrDesc(const void* pLeft, const void* pRight);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /*_TD_UTIL_COMPARE_H*/
|
#endif /*_TD_UTIL_COMPARE_H_*/
|
||||||
|
|
|
@ -17,8 +17,9 @@
|
||||||
#include <taoserror.h>
|
#include <taoserror.h>
|
||||||
#include <tglobal.h>
|
#include <tglobal.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
#pragma GCC diagnostic ignored "-Wsign-compare"
|
#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||||
|
@ -679,3 +680,5 @@ TEST(testCase, show_table_Test) {
|
||||||
// taos_free_result(pRes);
|
// taos_free_result(pRes);
|
||||||
// taos_close(pConn);
|
// taos_close(pConn);
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -100,12 +100,12 @@ int32_t taosParseTime(const char* timestr, int64_t* time, int32_t len, int32_t t
|
||||||
} else if (checkTzPresent(timestr, len)) {
|
} else if (checkTzPresent(timestr, len)) {
|
||||||
return parseTimeWithTz(timestr, time, timePrec, 0);
|
return parseTimeWithTz(timestr, time, timePrec, 0);
|
||||||
} else {
|
} else {
|
||||||
return (*parseLocaltimeFp[day_light])(timestr, time, timePrec);
|
return (*parseLocaltimeFp[day_light])((char*)timestr, time, timePrec);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool checkTzPresent(const char* str, int32_t len) {
|
bool checkTzPresent(const char* str, int32_t len) {
|
||||||
char *seg = forwardToTimeStringEnd(str);
|
char* seg = forwardToTimeStringEnd((char*)str);
|
||||||
int32_t seg_len = len - (int32_t)(seg - str);
|
int32_t seg_len = len - (int32_t)(seg - str);
|
||||||
|
|
||||||
char *c = &seg[seg_len - 1];
|
char *c = &seg[seg_len - 1];
|
||||||
|
@ -267,7 +267,7 @@ int32_t parseTimeWithTz(const char* timestr, int64_t* time, int32_t timePrec, ch
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int64_t fraction = 0;
|
int64_t fraction = 0;
|
||||||
str = forwardToTimeStringEnd(timestr);
|
str = forwardToTimeStringEnd((char*)timestr);
|
||||||
|
|
||||||
if ((str[0] == 'Z' || str[0] == 'z') && str[1] == '\0') {
|
if ((str[0] == 'Z' || str[0] == 'z') && str[1] == '\0') {
|
||||||
/* utc time, no millisecond, return directly*/
|
/* utc time, no millisecond, return directly*/
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
|
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
|
||||||
|
@ -94,3 +95,5 @@ TEST(testCase, toInteger_test) {
|
||||||
ret = toInteger(s, strlen(s), 10, &val, &sign);
|
ret = toInteger(s, strlen(s), 10, &val, &sign);
|
||||||
ASSERT_EQ(ret, -1);
|
ASSERT_EQ(ret, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
|
@ -303,6 +303,8 @@ void tqClose(STQ*);
|
||||||
int tqPushMsg(STQ*, void* msg, int64_t version);
|
int tqPushMsg(STQ*, void* msg, int64_t version);
|
||||||
int tqCommit(STQ*);
|
int tqCommit(STQ*);
|
||||||
|
|
||||||
|
int tqSetCursor(STQ*, STqSetCurReq* pMsg);
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
int tqConsume(STQ*, SRpcMsg* pReq, SRpcMsg** pRsp);
|
int tqConsume(STQ*, SRpcMsg* pReq, SRpcMsg** pRsp);
|
||||||
int tqSetCursor(STQ*, STqSetCurReq* pMsg);
|
int tqSetCursor(STQ*, STqSetCurReq* pMsg);
|
||||||
|
|
|
@ -32,7 +32,7 @@ size_t metaEncodeTbObjFromTbOptions(const STbCfg *pTbOptions, void *pBuf, size_t
|
||||||
switch (pTbOptions->type) {
|
switch (pTbOptions->type) {
|
||||||
case META_SUPER_TABLE:
|
case META_SUPER_TABLE:
|
||||||
tlen += taosEncodeFixedU64(ppBuf, pTbOptions->stbCfg.suid);
|
tlen += taosEncodeFixedU64(ppBuf, pTbOptions->stbCfg.suid);
|
||||||
tlen += tdEncodeSchema(ppBuf, pTbOptions->stbCfg.pTagSchema);
|
tlen += tdEncodeSchema(ppBuf, (STSchema *)pTbOptions->stbCfg.pTagSchema);
|
||||||
// TODO: encode schema version array
|
// TODO: encode schema version array
|
||||||
break;
|
break;
|
||||||
case META_CHILD_TABLE:
|
case META_CHILD_TABLE:
|
||||||
|
|
|
@ -19,7 +19,10 @@
|
||||||
static int32_t vnodeGetTableList(SVnode *pVnode, SRpcMsg *pMsg);
|
static int32_t vnodeGetTableList(SVnode *pVnode, SRpcMsg *pMsg);
|
||||||
static int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
|
static int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
|
||||||
|
|
||||||
int vnodeQueryOpen(SVnode *pVnode) { return qWorkerInit(NODE_TYPE_VNODE, pVnode->vgId, NULL, &pVnode->pQuery, pVnode, vnodePutReqToVQueryQ); }
|
int vnodeQueryOpen(SVnode *pVnode) {
|
||||||
|
return qWorkerInit(NODE_TYPE_VNODE, pVnode->vgId, NULL, (void **)&pVnode->pQuery, pVnode,
|
||||||
|
(putReqToQueryQFp)vnodePutReqToVQueryQ);
|
||||||
|
}
|
||||||
|
|
||||||
int vnodeProcessQueryReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
|
int vnodeProcessQueryReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
|
||||||
vTrace("query message is processing");
|
vTrace("query message is processing");
|
||||||
|
|
|
@ -16,27 +16,28 @@
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <tglobal.h>
|
#include <tglobal.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
#include "os.h"
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wwrite-strings"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
#pragma GCC diagnostic ignored "-Wsign-compare"
|
#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||||
#include "os.h"
|
#pragma GCC diagnostic ignored "-Wformat"
|
||||||
|
|
||||||
|
#include "addr_any.h"
|
||||||
|
#include "catalog.h"
|
||||||
|
#include "stub.h"
|
||||||
#include "taos.h"
|
#include "taos.h"
|
||||||
#include "tdef.h"
|
#include "tdef.h"
|
||||||
#include "tvariant.h"
|
|
||||||
#include "catalog.h"
|
|
||||||
#include "tep.h"
|
#include "tep.h"
|
||||||
#include "trpc.h"
|
#include "trpc.h"
|
||||||
#include "stub.h"
|
#include "tvariant.h"
|
||||||
#include "addr_any.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
extern "C" int32_t ctgGetTableMetaFromCache(struct SCatalog* pCatalog, const SName* pTableName, STableMeta** pTableMeta, int32_t *exist);
|
extern "C" int32_t ctgGetTableMetaFromCache(struct SCatalog *pCatalog, const SName *pTableName, STableMeta **pTableMeta,
|
||||||
|
int32_t *exist);
|
||||||
extern "C" int32_t ctgUpdateTableMetaCache(struct SCatalog *pCatalog, STableMetaOutput *output);
|
extern "C" int32_t ctgUpdateTableMetaCache(struct SCatalog *pCatalog, STableMetaOutput *output);
|
||||||
|
|
||||||
void ctgTestSetPrepareTableMeta();
|
void ctgTestSetPrepareTableMeta();
|
||||||
|
@ -66,7 +67,6 @@ char *ctgTestTablename = "table1";
|
||||||
char *ctgTestCTablename = "ctable1";
|
char *ctgTestCTablename = "ctable1";
|
||||||
char *ctgTestSTablename = "stable1";
|
char *ctgTestSTablename = "stable1";
|
||||||
|
|
||||||
|
|
||||||
void sendCreateDbMsg(void *shandle, SEpSet *pEpSet) {
|
void sendCreateDbMsg(void *shandle, SEpSet *pEpSet) {
|
||||||
SCreateDbReq *pReq = (SCreateDbReq *)rpcMallocCont(sizeof(SCreateDbReq));
|
SCreateDbReq *pReq = (SCreateDbReq *)rpcMallocCont(sizeof(SCreateDbReq));
|
||||||
strcpy(pReq->db, "1.db1");
|
strcpy(pReq->db, "1.db1");
|
||||||
|
@ -113,7 +113,6 @@ void ctgTestInitLogFile() {
|
||||||
if (taosInitLog(temp, tsNumOfLogLines, maxLogFileNum) < 0) {
|
if (taosInitLog(temp, tsNumOfLogLines, maxLogFileNum) < 0) {
|
||||||
printf("failed to open log file in directory:%s\n", tsLogDir);
|
printf("failed to open log file in directory:%s\n", tsLogDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t ctgTestGetVgNumFromVgVersion(int32_t vgVersion) {
|
int32_t ctgTestGetVgNumFromVgVersion(int32_t vgVersion) {
|
||||||
|
@ -174,7 +173,6 @@ void ctgTestBuildCTableMetaOutput(STableMetaOutput *output) {
|
||||||
s->colId = 3;
|
s->colId = 3;
|
||||||
s->bytes = 12;
|
s->bytes = 12;
|
||||||
strcpy(s->name, "tag1s");
|
strcpy(s->name, "tag1s");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ctgTestBuildDBVgroup(SDBVgroupInfo *dbVgroup) {
|
void ctgTestBuildDBVgroup(SDBVgroupInfo *dbVgroup) {
|
||||||
|
@ -245,9 +243,6 @@ void ctgTestPrepareDbVgroups(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcM
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void ctgTestPrepareTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
void ctgTestPrepareTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
||||||
STableMetaRsp *rspMsg = NULL; // todo
|
STableMetaRsp *rspMsg = NULL; // todo
|
||||||
|
|
||||||
|
@ -283,7 +278,6 @@ void ctgTestPrepareTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcM
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ctgTestPrepareCTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
void ctgTestPrepareCTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
||||||
STableMetaRsp *rspMsg = NULL; // todo
|
STableMetaRsp *rspMsg = NULL; // todo
|
||||||
|
|
||||||
|
@ -323,11 +317,9 @@ void ctgTestPrepareCTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpc
|
||||||
s->bytes = htonl(12);
|
s->bytes = htonl(12);
|
||||||
strcpy(s->name, "tag1s");
|
strcpy(s->name, "tag1s");
|
||||||
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ctgTestPrepareSTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
void ctgTestPrepareSTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
||||||
STableMetaRsp *rspMsg = NULL; // todo
|
STableMetaRsp *rspMsg = NULL; // todo
|
||||||
|
|
||||||
|
@ -367,7 +359,6 @@ void ctgTestPrepareSTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpc
|
||||||
s->bytes = htonl(12);
|
s->bytes = htonl(12);
|
||||||
strcpy(s->name, "tag1s");
|
strcpy(s->name, "tag1s");
|
||||||
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -416,8 +407,6 @@ void ctgTestPrepareMultiSTableMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void ctgTestPrepareDbVgroupsAndNormalMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
void ctgTestPrepareDbVgroupsAndNormalMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
||||||
ctgTestPrepareDbVgroups(shandle, pEpSet, pMsg, pRsp);
|
ctgTestPrepareDbVgroups(shandle, pEpSet, pMsg, pRsp);
|
||||||
|
|
||||||
|
@ -426,7 +415,6 @@ void ctgTestPrepareDbVgroupsAndNormalMeta(void *shandle, SEpSet *pEpSet, SRpcMsg
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ctgTestPrepareDbVgroupsAndChildMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
void ctgTestPrepareDbVgroupsAndChildMeta(void *shandle, SEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
|
||||||
ctgTestPrepareDbVgroups(shandle, pEpSet, pMsg, pRsp);
|
ctgTestPrepareDbVgroups(shandle, pEpSet, pMsg, pRsp);
|
||||||
|
|
||||||
|
@ -451,8 +439,6 @@ void ctgTestPrepareDbVgroupsAndMultiSuperMeta(void *shandle, SEpSet *pEpSet, SRp
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void ctgTestSetPrepareDbVgroups() {
|
void ctgTestSetPrepareDbVgroups() {
|
||||||
static Stub stub;
|
static Stub stub;
|
||||||
stub.set(rpcSendRecv, ctgTestPrepareDbVgroups);
|
stub.set(rpcSendRecv, ctgTestPrepareDbVgroups);
|
||||||
|
@ -518,7 +504,6 @@ void ctgTestSetPrepareMultiSTableMeta() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ctgTestSetPrepareDbVgroupsAndNormalMeta() {
|
void ctgTestSetPrepareDbVgroupsAndNormalMeta() {
|
||||||
static Stub stub;
|
static Stub stub;
|
||||||
stub.set(rpcSendRecv, ctgTestPrepareDbVgroupsAndNormalMeta);
|
stub.set(rpcSendRecv, ctgTestPrepareDbVgroupsAndNormalMeta);
|
||||||
|
@ -532,7 +517,6 @@ void ctgTestSetPrepareDbVgroupsAndNormalMeta() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ctgTestSetPrepareDbVgroupsAndChildMeta() {
|
void ctgTestSetPrepareDbVgroupsAndChildMeta() {
|
||||||
static Stub stub;
|
static Stub stub;
|
||||||
stub.set(rpcSendRecv, ctgTestPrepareDbVgroupsAndChildMeta);
|
stub.set(rpcSendRecv, ctgTestPrepareDbVgroupsAndChildMeta);
|
||||||
|
@ -572,8 +556,7 @@ void ctgTestSetPrepareDbVgroupsAndMultiSuperMeta() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
}
|
|
||||||
|
|
||||||
void *ctgTestGetDbVgroupThread(void *param) {
|
void *ctgTestGetDbVgroupThread(void *param) {
|
||||||
struct SCatalog *pCtg = (struct SCatalog *)param;
|
struct SCatalog *pCtg = (struct SCatalog *)param;
|
||||||
|
@ -625,7 +608,6 @@ void *ctgTestSetDbVgroupThread(void *param) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void *ctgTestGetCtableMetaThread(void *param) {
|
void *ctgTestGetCtableMetaThread(void *param) {
|
||||||
|
@ -685,10 +667,8 @@ void *ctgTestSetCtableMetaThread(void *param) {
|
||||||
tfree(output.tbMeta);
|
tfree(output.tbMeta);
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
TEST(tableMeta, normalTable) {
|
TEST(tableMeta, normalTable) {
|
||||||
struct SCatalog *pCtg = NULL;
|
struct SCatalog *pCtg = NULL;
|
||||||
void *mockPointer = (void *)0x1;
|
void *mockPointer = (void *)0x1;
|
||||||
|
@ -715,7 +695,6 @@ TEST(tableMeta, normalTable) {
|
||||||
ASSERT_EQ(vgInfo.vgId, 8);
|
ASSERT_EQ(vgInfo.vgId, 8);
|
||||||
ASSERT_EQ(vgInfo.numOfEps, 3);
|
ASSERT_EQ(vgInfo.numOfEps, 3);
|
||||||
|
|
||||||
|
|
||||||
ctgTestSetPrepareTableMeta();
|
ctgTestSetPrepareTableMeta();
|
||||||
|
|
||||||
STableMeta *tableMeta = NULL;
|
STableMeta *tableMeta = NULL;
|
||||||
|
@ -873,7 +852,6 @@ TEST(tableMeta, childTableCase) {
|
||||||
ASSERT_EQ(allDbNum, 1);
|
ASSERT_EQ(allDbNum, 1);
|
||||||
ASSERT_EQ(allStbNum, 1);
|
ASSERT_EQ(allStbNum, 1);
|
||||||
|
|
||||||
|
|
||||||
catalogDestroy();
|
catalogDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -975,7 +953,6 @@ TEST(tableMeta, superTableCase) {
|
||||||
ASSERT_EQ(allDbNum, 1);
|
ASSERT_EQ(allDbNum, 1);
|
||||||
ASSERT_EQ(allStbNum, 1);
|
ASSERT_EQ(allStbNum, 1);
|
||||||
|
|
||||||
|
|
||||||
catalogDestroy();
|
catalogDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1040,7 +1017,6 @@ TEST(tableDistVgroup, childTableCase) {
|
||||||
ASSERT_EQ(vgInfo->vgId, 9);
|
ASSERT_EQ(vgInfo->vgId, 9);
|
||||||
ASSERT_EQ(vgInfo->numOfEps, 4);
|
ASSERT_EQ(vgInfo->numOfEps, 4);
|
||||||
|
|
||||||
|
|
||||||
catalogDestroy();
|
catalogDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1078,7 +1054,6 @@ TEST(tableDistVgroup, superTableCase) {
|
||||||
ASSERT_EQ(vgInfo->vgId, 3);
|
ASSERT_EQ(vgInfo->vgId, 3);
|
||||||
ASSERT_EQ(vgInfo->numOfEps, 3);
|
ASSERT_EQ(vgInfo->numOfEps, 3);
|
||||||
|
|
||||||
|
|
||||||
catalogDestroy();
|
catalogDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1242,7 +1217,6 @@ TEST(multiThread, ctableMeta) {
|
||||||
catalogDestroy();
|
catalogDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
TEST(rentTest, allRent) {
|
TEST(rentTest, allRent) {
|
||||||
struct SCatalog *pCtg = NULL;
|
struct SCatalog *pCtg = NULL;
|
||||||
void *mockPointer = (void *)0x1;
|
void *mockPointer = (void *)0x1;
|
||||||
|
@ -1265,7 +1239,6 @@ TEST(rentTest, allRent) {
|
||||||
code = catalogGetHandle(ctgTestClusterId, &pCtg);
|
code = catalogGetHandle(ctgTestClusterId, &pCtg);
|
||||||
ASSERT_EQ(code, 0);
|
ASSERT_EQ(code, 0);
|
||||||
|
|
||||||
|
|
||||||
SName n = {.type = TSDB_TABLE_NAME_T, .acctId = 1};
|
SName n = {.type = TSDB_TABLE_NAME_T, .acctId = 1};
|
||||||
strcpy(n.dbname, "db1");
|
strcpy(n.dbname, "db1");
|
||||||
|
|
||||||
|
@ -1313,13 +1286,9 @@ TEST(rentTest, allRent) {
|
||||||
catalogDestroy();
|
catalogDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
testing::InitGoogleTest(&argc, argv);
|
testing::InitGoogleTest(&argc, argv);
|
||||||
return RUN_ALL_TESTS();
|
return RUN_ALL_TESTS();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
|
||||||
|