fix: memory issues
This commit is contained in:
parent
2ef1671ec0
commit
216731aa60
|
@ -287,6 +287,8 @@ void schtBuildInsertDag(SQueryPlan *dag) {
|
||||||
insertPlan->pParents = NULL;
|
insertPlan->pParents = NULL;
|
||||||
insertPlan->pNode = NULL;
|
insertPlan->pNode = NULL;
|
||||||
insertPlan->pDataSink = (SDataSinkNode*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN_INSERT);
|
insertPlan->pDataSink = (SDataSinkNode*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN_INSERT);
|
||||||
|
((SDataInserterNode*)insertPlan->pDataSink)->size = 1;
|
||||||
|
((SDataInserterNode*)insertPlan->pDataSink)->pData = taosMemoryCalloc(1, 1);
|
||||||
insertPlan->msgType = TDMT_VND_SUBMIT;
|
insertPlan->msgType = TDMT_VND_SUBMIT;
|
||||||
|
|
||||||
nodesListAppend(inserta->pNodeList, (SNode *)insertPlan);
|
nodesListAppend(inserta->pNodeList, (SNode *)insertPlan);
|
||||||
|
@ -307,6 +309,8 @@ void schtBuildInsertDag(SQueryPlan *dag) {
|
||||||
insertPlan->pParents = NULL;
|
insertPlan->pParents = NULL;
|
||||||
insertPlan->pNode = NULL;
|
insertPlan->pNode = NULL;
|
||||||
insertPlan->pDataSink = (SDataSinkNode*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN_INSERT);
|
insertPlan->pDataSink = (SDataSinkNode*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN_INSERT);
|
||||||
|
((SDataInserterNode*)insertPlan->pDataSink)->size = 1;
|
||||||
|
((SDataInserterNode*)insertPlan->pDataSink)->pData = taosMemoryCalloc(1, 1);
|
||||||
insertPlan->msgType = TDMT_VND_SUBMIT;
|
insertPlan->msgType = TDMT_VND_SUBMIT;
|
||||||
|
|
||||||
nodesListAppend(inserta->pNodeList, (SNode *)insertPlan);
|
nodesListAppend(inserta->pNodeList, (SNode *)insertPlan);
|
||||||
|
@ -542,12 +546,13 @@ void *schtRunJobThread(void *aa) {
|
||||||
while (!schtTestStop) {
|
while (!schtTestStop) {
|
||||||
schtBuildQueryDag(dag);
|
schtBuildQueryDag(dag);
|
||||||
|
|
||||||
SArray *qnodeList = taosArrayInit(1, sizeof(SEp));
|
SArray *qnodeList = taosArrayInit(1, sizeof(SQueryNodeLoad));
|
||||||
|
|
||||||
SEp qnodeAddr = {0};
|
SQueryNodeLoad load = {0};
|
||||||
strcpy(qnodeAddr.fqdn, "qnode0.ep");
|
load.addr.epSet.numOfEps = 1;
|
||||||
qnodeAddr.port = 6031;
|
strcpy(load.addr.epSet.eps[0].fqdn, "qnode0.ep");
|
||||||
taosArrayPush(qnodeList, &qnodeAddr);
|
load.addr.epSet.eps[0].port = 6031;
|
||||||
|
taosArrayPush(qnodeList, &load);
|
||||||
|
|
||||||
queryDone = 0;
|
queryDone = 0;
|
||||||
|
|
||||||
|
@ -690,12 +695,13 @@ TEST(queryTest, normalCase) {
|
||||||
int64_t job = 0;
|
int64_t job = 0;
|
||||||
SQueryPlan* dag = (SQueryPlan*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN);
|
SQueryPlan* dag = (SQueryPlan*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN);
|
||||||
|
|
||||||
SArray *qnodeList = taosArrayInit(1, sizeof(SEp));
|
SArray *qnodeList = taosArrayInit(1, sizeof(SQueryNodeLoad));
|
||||||
|
|
||||||
SEp qnodeAddr = {0};
|
SQueryNodeLoad load = {0};
|
||||||
strcpy(qnodeAddr.fqdn, "qnode0.ep");
|
load.addr.epSet.numOfEps = 1;
|
||||||
qnodeAddr.port = 6031;
|
strcpy(load.addr.epSet.eps[0].fqdn, "qnode0.ep");
|
||||||
taosArrayPush(qnodeList, &qnodeAddr);
|
load.addr.epSet.eps[0].port = 6031;
|
||||||
|
taosArrayPush(qnodeList, &load);
|
||||||
|
|
||||||
int32_t code = schedulerInit();
|
int32_t code = schedulerInit();
|
||||||
ASSERT_EQ(code, 0);
|
ASSERT_EQ(code, 0);
|
||||||
|
@ -800,12 +806,13 @@ TEST(queryTest, readyFirstCase) {
|
||||||
int64_t job = 0;
|
int64_t job = 0;
|
||||||
SQueryPlan* dag = (SQueryPlan*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN);
|
SQueryPlan* dag = (SQueryPlan*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN);
|
||||||
|
|
||||||
SArray *qnodeList = taosArrayInit(1, sizeof(SEp));
|
SArray *qnodeList = taosArrayInit(1, sizeof(SQueryNodeLoad));
|
||||||
|
|
||||||
SEp qnodeAddr = {0};
|
SQueryNodeLoad load = {0};
|
||||||
strcpy(qnodeAddr.fqdn, "qnode0.ep");
|
load.addr.epSet.numOfEps = 1;
|
||||||
qnodeAddr.port = 6031;
|
strcpy(load.addr.epSet.eps[0].fqdn, "qnode0.ep");
|
||||||
taosArrayPush(qnodeList, &qnodeAddr);
|
load.addr.epSet.eps[0].port = 6031;
|
||||||
|
taosArrayPush(qnodeList, &load);
|
||||||
|
|
||||||
int32_t code = schedulerInit();
|
int32_t code = schedulerInit();
|
||||||
ASSERT_EQ(code, 0);
|
ASSERT_EQ(code, 0);
|
||||||
|
@ -912,12 +919,14 @@ TEST(queryTest, flowCtrlCase) {
|
||||||
|
|
||||||
taosSeedRand(taosGetTimestampSec());
|
taosSeedRand(taosGetTimestampSec());
|
||||||
|
|
||||||
SArray *qnodeList = taosArrayInit(1, sizeof(SEp));
|
SArray *qnodeList = taosArrayInit(1, sizeof(SQueryNodeLoad));
|
||||||
|
|
||||||
|
SQueryNodeLoad load = {0};
|
||||||
|
load.addr.epSet.numOfEps = 1;
|
||||||
|
strcpy(load.addr.epSet.eps[0].fqdn, "qnode0.ep");
|
||||||
|
load.addr.epSet.eps[0].port = 6031;
|
||||||
|
taosArrayPush(qnodeList, &load);
|
||||||
|
|
||||||
SEp qnodeAddr = {0};
|
|
||||||
strcpy(qnodeAddr.fqdn, "qnode0.ep");
|
|
||||||
qnodeAddr.port = 6031;
|
|
||||||
taosArrayPush(qnodeList, &qnodeAddr);
|
|
||||||
|
|
||||||
int32_t code = schedulerInit();
|
int32_t code = schedulerInit();
|
||||||
ASSERT_EQ(code, 0);
|
ASSERT_EQ(code, 0);
|
||||||
|
@ -1000,12 +1009,13 @@ TEST(insertTest, normalCase) {
|
||||||
SQueryPlan* dag = (SQueryPlan*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN);
|
SQueryPlan* dag = (SQueryPlan*)nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN);
|
||||||
uint64_t numOfRows = 0;
|
uint64_t numOfRows = 0;
|
||||||
|
|
||||||
SArray *qnodeList = taosArrayInit(1, sizeof(SEp));
|
SArray *qnodeList = taosArrayInit(1, sizeof(SQueryNodeLoad));
|
||||||
|
|
||||||
SEp qnodeAddr = {0};
|
SQueryNodeLoad load = {0};
|
||||||
strcpy(qnodeAddr.fqdn, "qnode0.ep");
|
load.addr.epSet.numOfEps = 1;
|
||||||
qnodeAddr.port = 6031;
|
strcpy(load.addr.epSet.eps[0].fqdn, "qnode0.ep");
|
||||||
taosArrayPush(qnodeList, &qnodeAddr);
|
load.addr.epSet.eps[0].port = 6031;
|
||||||
|
taosArrayPush(qnodeList, &load);
|
||||||
|
|
||||||
int32_t code = schedulerInit();
|
int32_t code = schedulerInit();
|
||||||
ASSERT_EQ(code, 0);
|
ASSERT_EQ(code, 0);
|
||||||
|
|
Loading…
Reference in New Issue