fix windows compile issue
This commit is contained in:
parent
ffa069e4ed
commit
1ed710094b
|
@ -503,18 +503,17 @@ void* schtRunJobThread(void *aa) {
|
|||
taosArrayPush(qnodeList, &qnodeAddr);
|
||||
|
||||
queryDone = 0;
|
||||
SRequestConnInfo conn = {.pTrans = mockPointer,
|
||||
.requestId = 0,
|
||||
.requestObjRefId = 0
|
||||
};
|
||||
SSchedulerReq req = {.pConn = &conn,
|
||||
.pNodeList = qnodeList,
|
||||
.pDag = &dag,
|
||||
.sql = "select * from tb",
|
||||
.startTs = 0,
|
||||
.fp = schtQueryCb,
|
||||
.cbParam = &queryDone
|
||||
};
|
||||
|
||||
SRequestConnInfo conn = {0};
|
||||
conn.pTrans = mockPointer;
|
||||
SSchedulerReq req = {0};
|
||||
req.pConn = &conn;
|
||||
req.pNodeList = qnodeList;
|
||||
req.pDag = &dag;
|
||||
req.sql = "select * from tb";
|
||||
req.fp = schtQueryCb;
|
||||
req.cbParam = &queryDone;
|
||||
|
||||
code = schedulerAsyncExecJob(&req, &queryJobRefId);
|
||||
assert(code == 0);
|
||||
|
||||
|
@ -656,18 +655,17 @@ TEST(queryTest, normalCase) {
|
|||
schtSetAsyncSendMsgToServer();
|
||||
|
||||
int32_t queryDone = 0;
|
||||
SRequestConnInfo conn = {.pTrans = mockPointer,
|
||||
.requestId = 0,
|
||||
.requestObjRefId = 0
|
||||
};
|
||||
SSchedulerReq req = {.pConn = &conn,
|
||||
.pNodeList = qnodeList,
|
||||
.pDag = &dag,
|
||||
.sql = "select * from tb",
|
||||
.startTs = 0,
|
||||
.fp = schtQueryCb,
|
||||
.cbParam = &queryDone
|
||||
};
|
||||
|
||||
SRequestConnInfo conn = {0};
|
||||
conn.pTrans = mockPointer;
|
||||
SSchedulerReq req = {0};
|
||||
req.pConn = &conn;
|
||||
req.pNodeList = qnodeList;
|
||||
req.pDag = &dag;
|
||||
req.sql = "select * from tb";
|
||||
req.fp = schtQueryCb;
|
||||
req.cbParam = &queryDone;
|
||||
|
||||
code = schedulerAsyncExecJob(&req, &job);
|
||||
ASSERT_EQ(code, 0);
|
||||
|
||||
|
@ -761,18 +759,16 @@ TEST(queryTest, readyFirstCase) {
|
|||
schtSetAsyncSendMsgToServer();
|
||||
|
||||
int32_t queryDone = 0;
|
||||
SRequestConnInfo conn = {.pTrans = mockPointer,
|
||||
.requestId = 0,
|
||||
.requestObjRefId = 0
|
||||
};
|
||||
SSchedulerReq req = {.pConn = &conn,
|
||||
.pNodeList = qnodeList,
|
||||
.pDag = &dag,
|
||||
.sql = "select * from tb",
|
||||
.startTs = 0,
|
||||
.fp = schtQueryCb,
|
||||
.cbParam = &queryDone
|
||||
};
|
||||
|
||||
SRequestConnInfo conn = {0};
|
||||
conn.pTrans = mockPointer;
|
||||
SSchedulerReq req = {0};
|
||||
req.pConn = &conn;
|
||||
req.pNodeList = qnodeList;
|
||||
req.pDag = &dag;
|
||||
req.sql = "select * from tb";
|
||||
req.fp = schtQueryCb;
|
||||
req.cbParam = &queryDone;
|
||||
code = schedulerAsyncExecJob(&req, &job);
|
||||
ASSERT_EQ(code, 0);
|
||||
|
||||
|
@ -871,18 +867,16 @@ TEST(queryTest, flowCtrlCase) {
|
|||
schtSetAsyncSendMsgToServer();
|
||||
|
||||
int32_t queryDone = 0;
|
||||
SRequestConnInfo conn = {.pTrans = mockPointer,
|
||||
.requestId = 0,
|
||||
.requestObjRefId = 0
|
||||
};
|
||||
SSchedulerReq req = {.pConn = &conn,
|
||||
.pNodeList = qnodeList,
|
||||
.pDag = &dag,
|
||||
.sql = "select * from tb",
|
||||
.startTs = 0,
|
||||
.fp = schtQueryCb,
|
||||
.cbParam = &queryDone
|
||||
};
|
||||
SRequestConnInfo conn = {0};
|
||||
conn.pTrans = mockPointer;
|
||||
SSchedulerReq req = {0};
|
||||
req.pConn = &conn;
|
||||
req.pNodeList = qnodeList;
|
||||
req.pDag = &dag;
|
||||
req.sql = "select * from tb";
|
||||
req.fp = schtQueryCb;
|
||||
req.cbParam = &queryDone;
|
||||
|
||||
code = schedulerAsyncExecJob(&req, &job);
|
||||
ASSERT_EQ(code, 0);
|
||||
|
||||
|
@ -985,19 +979,17 @@ TEST(insertTest, normalCase) {
|
|||
taosThreadCreate(&(thread1), &thattr, schtSendRsp, &insertJobRefId);
|
||||
|
||||
SQueryResult res = {0};
|
||||
SRequestConnInfo conn = {.pTrans = mockPointer,
|
||||
.requestId = 0,
|
||||
.requestObjRefId = 0
|
||||
};
|
||||
|
||||
SRequestConnInfo conn = {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);
|
||||
ASSERT_EQ(code, 0);
|
||||
ASSERT_EQ(res.numOfRows, 20);
|
||||
|
|
Loading…
Reference in New Issue