Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
2e14f634
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
2e14f634
编写于
1月 21, 2022
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove warnings
上级
8cdd7023
变更
29
展开全部
隐藏空白更改
内联
并排
Showing
29 changed file
with
328 addition
and
283 deletion
+328
-283
2.0/src/query/tests/astTest.cpp
2.0/src/query/tests/astTest.cpp
+3
-1
2.0/src/query/tests/cSortTest.cpp
2.0/src/query/tests/cSortTest.cpp
+4
-1
2.0/src/query/tests/histogramTest.cpp
2.0/src/query/tests/histogramTest.cpp
+3
-0
2.0/src/query/tests/patternMatchTest.cpp
2.0/src/query/tests/patternMatchTest.cpp
+3
-0
2.0/src/query/tests/percentileTest.cpp
2.0/src/query/tests/percentileTest.cpp
+3
-0
2.0/src/query/tests/rangeMergeTest.cpp
2.0/src/query/tests/rangeMergeTest.cpp
+3
-0
2.0/src/query/tests/resultBufferTest.cpp
2.0/src/query/tests/resultBufferTest.cpp
+3
-0
2.0/src/query/tests/tsBufTest.cpp
2.0/src/query/tests/tsBufTest.cpp
+3
-0
2.0/src/query/tests/unitTest.cpp
2.0/src/query/tests/unitTest.cpp
+2
-0
CMakeLists.txt
CMakeLists.txt
+2
-2
source/client/test/clientTests.cpp
source/client/test/clientTests.cpp
+5
-2
source/common/test/commonTests.cpp
source/common/test/commonTests.cpp
+4
-1
source/dnode/vnode/inc/tq.h
source/dnode/vnode/inc/tq.h
+2
-0
source/dnode/vnode/src/meta/metaTbCfg.c
source/dnode/vnode/src/meta/metaTbCfg.c
+1
-1
source/dnode/vnode/src/vnd/vnodeQuery.c
source/dnode/vnode/src/vnd/vnodeQuery.c
+4
-1
source/libs/catalog/test/catalogTests.cpp
source/libs/catalog/test/catalogTests.cpp
+205
-236
source/libs/executor/test/executorTests.cpp
source/libs/executor/test/executorTests.cpp
+5
-2
source/libs/parser/test/mockCatalog.cpp
source/libs/parser/test/mockCatalog.cpp
+6
-0
source/libs/parser/test/parserTests.cpp
source/libs/parser/test/parserTests.cpp
+5
-2
source/libs/parser/test/plannerTest.cpp
source/libs/parser/test/plannerTest.cpp
+5
-2
source/libs/parser/test/tokenizerTest.cpp
source/libs/parser/test/tokenizerTest.cpp
+3
-1
source/libs/planner/test/plannerTests.cpp
source/libs/planner/test/plannerTests.cpp
+4
-2
source/libs/qcom/src/querymsg.c
source/libs/qcom/src/querymsg.c
+4
-4
source/libs/qcom/test/queryTest.cpp
source/libs/qcom/test/queryTest.cpp
+4
-1
source/libs/qworker/inc/qworkerInt.h
source/libs/qworker/inc/qworkerInt.h
+1
-2
source/libs/qworker/test/qworkerTests.cpp
source/libs/qworker/test/qworkerTests.cpp
+10
-5
source/libs/scheduler/inc/schedulerInt.h
source/libs/scheduler/inc/schedulerInt.h
+9
-6
source/libs/scheduler/test/schedulerTests.cpp
source/libs/scheduler/test/schedulerTests.cpp
+11
-7
source/util/test/encodeTest.cpp
source/util/test/encodeTest.cpp
+11
-4
未找到文件。
2.0/src/query/tests/astTest.cpp
浏览文件 @
2e14f634
...
...
@@ -632,4 +632,6 @@ void exprSerializeTest2() {
TEST(testCase, astTest) {
// exprSerializeTest2();
}
#endif
\ No newline at end of file
#endif
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/cSortTest.cpp
浏览文件 @
2e14f634
...
...
@@ -5,6 +5,7 @@
#include "tsdb.h"
#include "qExtbuffer.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -121,4 +122,6 @@ TEST(testCase, columnsort_test) {
printf
(
"
\n
"
);
destroyColumnModel
(
pModel
);
}
\ No newline at end of file
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/histogramTest.cpp
浏览文件 @
2e14f634
...
...
@@ -6,6 +6,7 @@
#include "taos.h"
#include "qHistogram.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -140,3 +141,5 @@ TEST(testCase, heapsort) {
//
// free(pEntry);
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/patternMatchTest.cpp
浏览文件 @
2e14f634
...
...
@@ -6,6 +6,7 @@
#include "qAggMain.h"
#include "tcompare.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -84,3 +85,5 @@ TEST(testCase, patternMatchTest) {
ret
=
patternMatch
(
"%9"
,
str
,
2
,
&
info
);
EXPECT_EQ
(
ret
,
TSDB_PATTERN_MATCH
);
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/percentileTest.cpp
浏览文件 @
2e14f634
...
...
@@ -7,6 +7,7 @@
#include "qPercentile.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -255,3 +256,5 @@ TEST(testCase, percentileTest) {
unsignedDataTest
();
largeDataTest
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/rangeMergeTest.cpp
浏览文件 @
2e14f634
...
...
@@ -7,6 +7,7 @@
#include "qFilter.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -365,3 +366,5 @@ TEST(testCase, rangeMergeTest) {
intDataTest
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/resultBufferTest.cpp
浏览文件 @
2e14f634
...
...
@@ -6,6 +6,7 @@
#include "taos.h"
#include "tsdb.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -161,3 +162,5 @@ TEST(testCase, resultBufferTest) {
writeDownTest
();
recyclePageTest
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/tsBufTest.cpp
浏览文件 @
2e14f634
...
...
@@ -9,6 +9,7 @@
#include "ttoken.h"
#include "tutil.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
...
...
@@ -513,3 +514,5 @@ TEST(testCase, tsBufTest) {
mergeDiffVnodeBufferTest
();
mergeIdenticalVnodeBufferTest
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/unitTest.cpp
浏览文件 @
2e14f634
...
...
@@ -4,6 +4,7 @@
#include "taos.h"
#include "tsdb.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -910,3 +911,4 @@ TEST(testCase, getTempFilePath_test) {
printf
(
"%s
\n
"
,
path
);
}
#pragma GCC diagnostic pop
\ No newline at end of file
CMakeLists.txt
浏览文件 @
2e14f634
...
...
@@ -10,8 +10,8 @@ set(CMAKE_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/cmake")
set
(
CMAKE_CONTRIB_DIR
"
${
CMAKE_SOURCE_DIR
}
/contrib"
)
include
(
${
CMAKE_SUPPORT_DIR
}
/cmake.options
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-fPIC -gdwarf-2 -msse4.2 -mfma -g3"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_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
}
-
Werror -
fPIC -gdwarf-2 -msse4.2 -mfma -g3"
)
# contrib
add_subdirectory
(
contrib
)
...
...
source/client/test/clientTests.cpp
浏览文件 @
2e14f634
...
...
@@ -17,8 +17,9 @@
#include <taoserror.h>
#include <tglobal.h>
#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-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
...
...
@@ -678,4 +679,6 @@ TEST(testCase, create_topic_Test) {
//
// taos_free_result(pRes);
// taos_close(pConn);
//}
\ No newline at end of file
//}
#pragma GCC diagnostic pop
\ No newline at end of file
source/common/test/commonTests.cpp
浏览文件 @
2e14f634
#include <gtest/gtest.h>
#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-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
);
ASSERT_EQ
(
ret
,
-
1
);
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/dnode/vnode/inc/tq.h
浏览文件 @
2e14f634
...
...
@@ -320,6 +320,8 @@ void tqClose(STQ*);
int
tqPushMsg
(
STQ
*
,
void
*
msg
,
int64_t
version
);
int
tqCommit
(
STQ
*
);
int
tqSetCursor
(
STQ
*
,
STqSetCurReq
*
pMsg
);
#if 0
int tqConsume(STQ*, SRpcMsg* pReq, SRpcMsg** pRsp);
int tqSetCursor(STQ*, STqSetCurReq* pMsg);
...
...
source/dnode/vnode/src/meta/metaTbCfg.c
浏览文件 @
2e14f634
...
...
@@ -32,7 +32,7 @@ size_t metaEncodeTbObjFromTbOptions(const STbCfg *pTbOptions, void *pBuf, size_t
switch
(
pTbOptions
->
type
)
{
case
META_SUPER_TABLE
:
tlen
+=
taosEncodeFixedU64
(
ppBuf
,
pTbOptions
->
stbCfg
.
suid
);
tlen
+=
tdEncodeSchema
(
ppBuf
,
pTbOptions
->
stbCfg
.
pTagSchema
);
tlen
+=
tdEncodeSchema
(
ppBuf
,
(
STSchema
*
)
pTbOptions
->
stbCfg
.
pTagSchema
);
// TODO: encode schema version array
break
;
case
META_CHILD_TABLE
:
...
...
source/dnode/vnode/src/vnd/vnodeQuery.c
浏览文件 @
2e14f634
...
...
@@ -19,7 +19,10 @@
static
int32_t
vnodeGetTableList
(
SVnode
*
pVnode
,
SRpcMsg
*
pMsg
);
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
)
{
vTrace
(
"query message is processing"
);
...
...
source/libs/catalog/test/catalogTests.cpp
浏览文件 @
2e14f634
此差异已折叠。
点击以展开。
source/libs/executor/test/executorTests.cpp
浏览文件 @
2e14f634
...
...
@@ -17,8 +17,9 @@
#include <gtest/gtest.h>
#include <tglobal.h>
#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-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
...
...
@@ -219,4 +220,6 @@ TEST(testCase, build_executor_tree_Test) {
SExecTaskInfo
*
pTaskInfo
=
nullptr
;
DataSinkHandle
sinkHandle
=
nullptr
;
int32_t
code
=
qCreateExecTask
((
void
*
)
1
,
2
,
NULL
,
(
void
**
)
&
pTaskInfo
,
&
sinkHandle
);
}
\ No newline at end of file
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/libs/parser/test/mockCatalog.cpp
浏览文件 @
2e14f634
...
...
@@ -18,8 +18,14 @@
#include <iostream>
#include "stub.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat"
#include "addr_any.h"
#pragma GCC diagnostic pop
namespace
{
void
generateTestT1
(
MockCatalogService
*
mcs
)
{
...
...
source/libs/parser/test/parserTests.cpp
浏览文件 @
2e14f634
...
...
@@ -17,8 +17,9 @@
#include <gtest/gtest.h>
#include <iostream>
#include "tglobal.h"
#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-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
...
...
@@ -781,4 +782,6 @@ TEST(testCase, create_user_Test) {
ASSERT_NE
(
output
,
nullptr
);
destroySqlInfo
(
&
info1
);
}
\ No newline at end of file
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/libs/parser/test/plannerTest.cpp
浏览文件 @
2e14f634
...
...
@@ -17,8 +17,9 @@
#include <gtest/gtest.h>
#include <tglobal.h>
#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-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
...
...
@@ -203,4 +204,6 @@ TEST(testCase, displayPlan) {
// Projection(cols: [ts #0], [a #1], [b #2]) filters:(nil)
// TableScan(t.1abc #110) time_range: -9223372036854775808 - 9223372036854775807
}
\ No newline at end of file
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/libs/parser/test/tokenizerTest.cpp
浏览文件 @
2e14f634
#include <gtest/gtest.h>
#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-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
...
...
@@ -722,3 +723,4 @@ TEST(testCase, extractMeta_test) {
destroySqlInfo
(
&
info1
);
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/libs/planner/test/plannerTests.cpp
浏览文件 @
2e14f634
...
...
@@ -22,8 +22,8 @@
#include "parser.h"
#include "mockCatalog.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
...
...
@@ -102,4 +102,6 @@ TEST(testCase, planner_test) {
// destroyQueryInfo(pQueryInfo);
// qParserCleanupMetaRequestInfo(&req);
// destroySqlInfo(&info1);
}
\ No newline at end of file
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/libs/qcom/src/querymsg.c
浏览文件 @
2e14f634
...
...
@@ -18,6 +18,9 @@
#include "query.h"
#include "trpc.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-truncation"
int32_t
(
*
queryBuildMsg
[
TDMT_MAX
])(
void
*
input
,
char
**
msg
,
int32_t
msgSize
,
int32_t
*
msgLen
)
=
{
0
};
int32_t
(
*
queryProcessMsgRsp
[
TDMT_MAX
])(
void
*
output
,
char
*
msg
,
int32_t
msgSize
)
=
{
0
};
...
...
@@ -288,7 +291,4 @@ void initQueryModuleMsgHandle() {
queryProcessMsgRsp
[
TMSG_INDEX
(
TDMT_MND_USE_DB
)]
=
queryProcessUseDBRsp
;
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/libs/qcom/test/queryTest.cpp
浏览文件 @
2e14f634
...
...
@@ -18,8 +18,9 @@
#include "tmsg.h"
#include "query.h"
#include "trpc.h"
#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-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
...
...
@@ -82,3 +83,5 @@ TEST(testCase, error_in_async_test) {
usleep
(
1000
);
printf
(
"Error code:%d after asynchronously exec function
\n
"
,
code
);
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/libs/qworker/inc/qworkerInt.h
浏览文件 @
2e14f634
...
...
@@ -219,8 +219,7 @@ typedef struct SQWorkerMgmt {
} \
} while (0)
int32_t
qwBuildAndSendCancelRsp
(
SRpcMsg
*
pMsg
,
int32_t
code
);
#ifdef __cplusplus
}
...
...
source/libs/qworker/test/qworkerTests.cpp
浏览文件 @
2e14f634
...
...
@@ -16,11 +16,17 @@
#include <gtest/gtest.h>
#include <tglobal.h>
#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-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wformat"
#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
#pragma GCC diagnostic ignored "-Wpointer-arith"
#include "os.h"
#include "taos.h"
...
...
@@ -461,11 +467,11 @@ void *controlThread(void *param) {
}
void
*
queryQueueThread
(
void
*
param
)
{
return
NULL
;
}
void
*
fetchQueueThread
(
void
*
param
)
{
return
NULL
;
}
...
...
@@ -783,5 +789,4 @@ int main(int argc, char** argv) {
return
RUN_ALL_TESTS
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/libs/scheduler/inc/schedulerInt.h
浏览文件 @
2e14f634
...
...
@@ -146,12 +146,15 @@ typedef struct SSchJob {
#define SCH_SET_JOB_TYPE(pAttr, type) (pAttr)->queryJob = ((type) != QUERY_TYPE_MODIFY)
#define SCH_JOB_NEED_FETCH(pAttr) ((pAttr)->queryJob)
#define SCH_JOB_ELOG(param, ...) qError("QID:%"PRIx64" " param, pJob->queryId, __VA_ARGS__)
#define SCH_JOB_DLOG(param, ...) qDebug("QID:%"PRIx64" " param, pJob->queryId, __VA_ARGS__)
#define SCH_TASK_ELOG(param, ...) qError("QID:%"PRIx64",TID:%"PRId64" " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
#define SCH_TASK_DLOG(param, ...) qDebug("QID:%"PRIx64",TID:%"PRId64" " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
#define SCH_TASK_WLOG(param, ...) qWarn("QID:%"PRIx64",TID:%"PRId64" " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
#define SCH_JOB_ELOG(param, ...) qError("QID:%" PRIx64 " " param, pJob->queryId, __VA_ARGS__)
#define SCH_JOB_DLOG(param, ...) qDebug("QID:%" PRIx64 " " param, pJob->queryId, __VA_ARGS__)
#define SCH_TASK_ELOG(param, ...) \
qError("QID:%" PRIx64 ",TID:%" PRId64 " " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
#define SCH_TASK_DLOG(param, ...) \
qDebug("QID:%" PRIx64 ",TID:%" PRId64 " " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
#define SCH_TASK_WLOG(param, ...) \
qWarn("QID:%" PRIx64 ",TID:%" PRId64 " " param, pJob->queryId, pTask->taskId, __VA_ARGS__)
#define SCH_ERR_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; return _code; } } while (0)
#define SCH_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; } return _code; } while (0)
...
...
source/libs/scheduler/test/schedulerTests.cpp
浏览文件 @
2e14f634
...
...
@@ -16,11 +16,7 @@
#include <gtest/gtest.h>
#include <tglobal.h>
#include <iostream>
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
#include "os.h"
#include "taos.h"
...
...
@@ -30,6 +26,16 @@
#include "scheduler.h"
#include "tep.h"
#include "trpc.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic ignored "-Wliteral-suffix"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wreturn-type"
#pragma GCC diagnostic ignored "-Wformat"
#include "schedulerInt.h"
#include "stub.h"
#include "addr_any.h"
...
...
@@ -680,6 +686,4 @@ int main(int argc, char** argv) {
return
RUN_ALL_TESTS
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/util/test/encodeTest.cpp
浏览文件 @
2e14f634
...
...
@@ -4,6 +4,11 @@
#include "encode.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshift-count-overflow"
#pragma GCC diagnostic ignored "-Woverflow"
#pragma GCC diagnostic ignored "-Woverflow"
#define BUF_SIZE 64
td_endian_t
endian_arr
[
2
]
=
{
TD_LITTLE_ENDIAN
,
TD_BIG_ENDIAN
};
...
...
@@ -354,10 +359,10 @@ TEST(td_encode_test, compound_struct_encode_test) {
SCoder
encoder
,
decoder
;
uint8_t
*
buf1
;
int32_t
buf1size
;
uint8_t
*
buf2
;
uint8_t
*
buf2
;
int32_t
buf2size
;
SStructA_v1
sa1
=
{.
A_a
=
10
,
.
A_b
=
65478
,
.
A_c
=
"Hello"
};
SStructA_v2
sa2
=
{.
A_a
=
10
,
.
A_b
=
65478
,
.
A_c
=
"Hello"
,
.
A_d
=
67
,
.
A_e
=
13
};
SStructA_v1
sa1
=
{.
A_a
=
10
,
.
A_b
=
65478
,
.
A_c
=
(
char
*
)
"Hello"
};
SStructA_v2
sa2
=
{.
A_a
=
10
,
.
A_b
=
65478
,
.
A_c
=
(
char
*
)
"Hello"
,
.
A_d
=
67
,
.
A_e
=
13
};
SFinalReq_v1
req1
=
{.
pA
=
&
sa1
,
.
v_a
=
15
,
.
v_b
=
35
};
SFinalReq_v2
req2
=
{.
pA
=
&
sa2
,
.
v_a
=
15
,
.
v_b
=
32
,
.
v_c
=
37
};
SFinalReq_v1
dreq11
,
dreq21
;
...
...
@@ -430,4 +435,6 @@ TEST(td_encode_test, compound_struct_encode_test) {
GTEST_ASSERT_EQ
(
dreq21
.
v_a
,
req2
.
v_a
);
GTEST_ASSERT_EQ
(
dreq21
.
v_b
,
req2
.
v_b
);
tCoderClear
(
&
decoder
);
}
\ No newline at end of file
}
#pragma GCC diagnostic pop
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录