From 1ed710094b3f00c88ab1299697402e34be71e3d0 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Sat, 11 Jun 2022 08:22:18 +0800
Subject: [PATCH] fix windows compile issue

---
 source/libs/scheduler/test/schedulerTests.cpp | 112 ++++++++----------
 1 file changed, 52 insertions(+), 60 deletions(-)

diff --git a/source/libs/scheduler/test/schedulerTests.cpp b/source/libs/scheduler/test/schedulerTests.cpp
index ba91620874..9b624ee5cd 100644
--- a/source/libs/scheduler/test/schedulerTests.cpp
+++ b/source/libs/scheduler/test/schedulerTests.cpp
@@ -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);