From 8ce76f741962fd76f71ab9838c73e67ab2294ad9 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Fri, 17 Jun 2022 17:30:57 +0800
Subject: [PATCH] fix case issues

---
 source/libs/command/src/explain.c           | 6 ++++++
 source/libs/planner/src/planOptimizer.c     | 1 +
 source/libs/scheduler/src/schJob.c          | 5 ++++-
 tests/script/tsim/db/alter_option.sim       | 2 +-
 tests/script/tsim/db/basic6.sim             | 4 ++--
 tests/script/tsim/db/create_all_options.sim | 2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/source/libs/command/src/explain.c b/source/libs/command/src/explain.c
index 79861dfa05..8f91282480 100644
--- a/source/libs/command/src/explain.c
+++ b/source/libs/command/src/explain.c
@@ -194,6 +194,11 @@ int32_t qExplainGenerateResChildren(SPhysiNode *pNode, SExplainGroup *group, SNo
       pPhysiChildren = fillPhysiNode->node.pChildren;
       break;
     }
+    case QUERY_NODE_PHYSICAL_PLAN_TABLE_MERGE_SCAN: {
+      STableMergeScanPhysiNode *mergePhysiNode = (STableMergeScanPhysiNode *)pNode;
+      pPhysiChildren = mergePhysiNode->scan.node.pChildren;
+      break;
+    }
     default:
       qError("not supported physical node type %d", pNode->type);
       QRY_ERR_RET(TSDB_CODE_QRY_APP_ERROR);
@@ -398,6 +403,7 @@ int32_t qExplainResNodeToRowsImpl(SExplainResNode *pResNode, SExplainCtx *ctx, i
       break;
     }
     case QUERY_NODE_PHYSICAL_PLAN_TABLE_SEQ_SCAN:
+    case QUERY_NODE_PHYSICAL_PLAN_TABLE_MERGE_SCAN:
     case QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN: {
       STableScanPhysiNode *pTblScanNode = (STableScanPhysiNode *)pNode;
       EXPLAIN_ROW_NEW(level, EXPLAIN_TBL_SCAN_FORMAT, pTblScanNode->scan.tableName.tname);
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 9d7cd0cf27..a7c25162b7 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -731,6 +731,7 @@ static int32_t opkDoOptimized(SOptimizeContext* pCxt, SSortLogicNode* pSort, SNo
   FOREACH(pNode, pSort->node.pParent->pChildren) {
     if (nodesEqualNode(pNode, (SNode*)pSort)) {
       REPLACE_NODE(pDownNode);
+      ((SLogicNode*)pDownNode)->pParent = pSort->node.pParent;
       break;
     }
   }
diff --git a/source/libs/scheduler/src/schJob.c b/source/libs/scheduler/src/schJob.c
index 972ec4586c..733f8694cc 100644
--- a/source/libs/scheduler/src/schJob.c
+++ b/source/libs/scheduler/src/schJob.c
@@ -116,7 +116,7 @@ int32_t schInitJob(SSchedulerReq *pReq, SSchJob **pSchJob, SQueryResult* pRes, b
 
   SCH_JOB_DLOG("job refId:0x%" PRIx64" created", pJob->refId);
 
-  pJob->status = JOB_TASK_STATUS_NOT_START;
+  schUpdateJobStatus(pJob, JOB_TASK_STATUS_NOT_START);
 
   *pSchJob = pJob;
 
@@ -1623,12 +1623,15 @@ int32_t schExecStaticExplainJob(SSchedulerReq *pReq, int64_t *job, bool sync) {
   }
 
   pJob->sql = pReq->sql;
+  pJob->reqKilled = pReq->reqKilled;
   pJob->attr.queryJob = true;
   pJob->attr.explainMode = pReq->pDag->explainInfo.mode;
   pJob->queryId = pReq->pDag->queryId;
   pJob->subPlans = pReq->pDag->pSubplans;
   pJob->userRes.execFp = pReq->fp;
   pJob->userRes.userParam = pReq->cbParam;
+  
+  schUpdateJobStatus(pJob, JOB_TASK_STATUS_NOT_START);
 
   code = schBeginOperation(pJob, SCH_OP_EXEC, sync);
   if (code) {
diff --git a/tests/script/tsim/db/alter_option.sim b/tests/script/tsim/db/alter_option.sim
index 4351ee5cb1..fede960a6a 100644
--- a/tests/script/tsim/db/alter_option.sim
+++ b/tests/script/tsim/db/alter_option.sim
@@ -92,7 +92,7 @@ endi
 if $data5_db != no_strict then  # strict
   return -1
 endi
-if $data6_db != 345600 then  # duration
+if $data6_db != 345600m then  # duration
   return -1
 endi
 if $data7_db != 1440000m,1440000m,1440000m then # keep
diff --git a/tests/script/tsim/db/basic6.sim b/tests/script/tsim/db/basic6.sim
index 64103b5dac..7525fe2087 100644
--- a/tests/script/tsim/db/basic6.sim
+++ b/tests/script/tsim/db/basic6.sim
@@ -34,7 +34,7 @@ endi
 if $data24 != 1 then
   return -1
 endi
-if $data26 != 2880 then
+if $data26 != 2880m then
   return -1
 endi
 if $data27 != 14400m,14400m,14400m then
@@ -78,7 +78,7 @@ endi
 if $data24 != 1 then
   return -1
 endi
-if $data26 != 21600 then
+if $data26 != 21600m then
   return -1
 endi
 
diff --git a/tests/script/tsim/db/create_all_options.sim b/tests/script/tsim/db/create_all_options.sim
index 284875ee08..efe7ff99cf 100644
--- a/tests/script/tsim/db/create_all_options.sim
+++ b/tests/script/tsim/db/create_all_options.sim
@@ -113,7 +113,7 @@ endi
 if $data5_db != no_strict then  # strict
   return -1
 endi
-if $data6_db != 14400 then  # duration
+if $data6_db != 14400m then  # duration
   return -1
 endi
 if $data7_db != 5256000m,5256000m,5256000m then # keep
-- 
GitLab