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

fix windows compile issue

This commit is contained in:
dapan1121 2022-06-11 08:22:18 +08:00
parent ffa069e4ed
commit 1ed710094b
1 changed files with 52 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
source/libs/scheduler/test/schedulerTests.cpp
View File

@ -503,18 +503,17 @@ void* schtRunJobThread(void *aa) {
taosArrayPush(qnodeList, &qnodeAddr); taosArrayPush(qnodeList, &qnodeAddr);
queryDone = 0; queryDone = 0;
SRequestConnInfo conn = {.pTrans = mockPointer,
.requestId = 0, SRequestConnInfo conn = {0};
.requestObjRefId = 0 conn.pTrans = mockPointer;
}; SSchedulerReq req = {0};
SSchedulerReq req = {.pConn = &conn, req.pConn = &conn;
.pNodeList = qnodeList, req.pNodeList = qnodeList;
.pDag = &dag, req.pDag = &dag;
.sql = "select * from tb", req.sql = "select * from tb";
.startTs = 0, req.fp = schtQueryCb;
.fp = schtQueryCb, req.cbParam = &queryDone;
.cbParam = &queryDone
};
code = schedulerAsyncExecJob(&req, &queryJobRefId); code = schedulerAsyncExecJob(&req, &queryJobRefId);
assert(code == 0); assert(code == 0);
@ -656,18 +655,17 @@ TEST(queryTest, normalCase) {
schtSetAsyncSendMsgToServer(); schtSetAsyncSendMsgToServer();
int32_t queryDone = 0; int32_t queryDone = 0;
SRequestConnInfo conn = {.pTrans = mockPointer,
.requestId = 0, SRequestConnInfo conn = {0};
.requestObjRefId = 0 conn.pTrans = mockPointer;
}; SSchedulerReq req = {0};
SSchedulerReq req = {.pConn = &conn, req.pConn = &conn;
.pNodeList = qnodeList, req.pNodeList = qnodeList;
.pDag = &dag, req.pDag = &dag;
.sql = "select * from tb", req.sql = "select * from tb";
.startTs = 0, req.fp = schtQueryCb;
.fp = schtQueryCb, req.cbParam = &queryDone;
.cbParam = &queryDone
};
code = schedulerAsyncExecJob(&req, &job); code = schedulerAsyncExecJob(&req, &job);
ASSERT_EQ(code, 0); ASSERT_EQ(code, 0);
@ -761,18 +759,16 @@ TEST(queryTest, readyFirstCase) {
schtSetAsyncSendMsgToServer(); schtSetAsyncSendMsgToServer();
int32_t queryDone = 0; int32_t queryDone = 0;
SRequestConnInfo conn = {.pTrans = mockPointer,
.requestId = 0, SRequestConnInfo conn = {0};
.requestObjRefId = 0 conn.pTrans = mockPointer;
}; SSchedulerReq req = {0};
SSchedulerReq req = {.pConn = &conn, req.pConn = &conn;
.pNodeList = qnodeList, req.pNodeList = qnodeList;
.pDag = &dag, req.pDag = &dag;
.sql = "select * from tb", req.sql = "select * from tb";
.startTs = 0, req.fp = schtQueryCb;
.fp = schtQueryCb, req.cbParam = &queryDone;
.cbParam = &queryDone
};
code = schedulerAsyncExecJob(&req, &job); code = schedulerAsyncExecJob(&req, &job);
ASSERT_EQ(code, 0); ASSERT_EQ(code, 0);
@ -871,18 +867,16 @@ TEST(queryTest, flowCtrlCase) {
schtSetAsyncSendMsgToServer(); schtSetAsyncSendMsgToServer();
int32_t queryDone = 0; int32_t queryDone = 0;
SRequestConnInfo conn = {.pTrans = mockPointer, SRequestConnInfo conn = {0};
.requestId = 0, conn.pTrans = mockPointer;
.requestObjRefId = 0 SSchedulerReq req = {0};
}; req.pConn = &conn;
SSchedulerReq req = {.pConn = &conn, req.pNodeList = qnodeList;
.pNodeList = qnodeList, req.pDag = &dag;
.pDag = &dag, req.sql = "select * from tb";
.sql = "select * from tb", req.fp = schtQueryCb;
.startTs = 0, req.cbParam = &queryDone;
.fp = schtQueryCb,
.cbParam = &queryDone
};
code = schedulerAsyncExecJob(&req, &job); code = schedulerAsyncExecJob(&req, &job);
ASSERT_EQ(code, 0); ASSERT_EQ(code, 0);
@ -985,19 +979,17 @@ TEST(insertTest, normalCase) {
taosThreadCreate(&(thread1), &thattr, schtSendRsp, &insertJobRefId); taosThreadCreate(&(thread1), &thattr, schtSendRsp, &insertJobRefId);
SQueryResult res = {0}; SQueryResult res = {0};
SRequestConnInfo conn = {.pTrans = mockPointer,
.requestId = 0, SRequestConnInfo conn = {0};
.requestObjRefId = 0 conn.pTrans = mockPointer;
}; SSchedulerReq req = {0};
req.pConn = &conn;
req.pNodeList = qnodeList;
req.pDag = &dag;
req.sql = "insert into tb values(now,1)";
req.fp = schtQueryCb;
req.cbParam = NULL;
SSchedulerReq req = {.pConn = &conn,
.pNodeList = qnodeList,
.pDag = &dag,
.sql = "insert into tb values(now,1)",
.startTs = 0,
.fp = NULL,
.cbParam = NULL
};
code = schedulerExecJob(&req, &insertJobRefId, &res); code = schedulerExecJob(&req, &insertJobRefId, &res);
ASSERT_EQ(code, 0); ASSERT_EQ(code, 0);
ASSERT_EQ(res.numOfRows, 20); ASSERT_EQ(res.numOfRows, 20);