From 9d148b42f98c4afa7dd5bbfdf5a3eaec7605c599 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Thu, 15 Sep 2022 15:15:35 +0800
Subject: [PATCH] enh: add client policy test cases

---
 source/libs/scheduler/src/schTask.c | 29 ++++++---
 tests/system-test/fulltest.sh       | 91 +++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 9 deletions(-)

diff --git a/source/libs/scheduler/src/schTask.c b/source/libs/scheduler/src/schTask.c
index 70da8d4a16..e725fb7e45 100644
--- a/source/libs/scheduler/src/schTask.c
+++ b/source/libs/scheduler/src/schTask.c
@@ -842,26 +842,37 @@ int32_t schHandleExplainRes(SArray *pExplainRes) {
   for (int32_t i = 0; i < resNum; ++i) {
     SExplainLocalRsp* localRsp = taosArrayGet(pExplainRes, i);
 
-    qDebug("QID:0x%" PRIx64 ",TID:0x%" PRIx64 ", begin to handle LOCAL explain rsp msg");
+    qDebug("QID:0x%" PRIx64 ",TID:0x%" PRIx64 ", begin to handle LOCAL explain rsp msg", localRsp->qId, localRsp->tId);
 
-    SCH_ERR_JRET(schProcessOnCbBegin(&pJob, &pTask, localRsp->qId, localRsp->rId, localRsp->tId));
-    
-    code = schProcessExplainRsp(pJob, pTask, &localRsp->rsp);
+    pJob = schAcquireJob(localRsp->rId);
+    if (NULL == pJob) {
+      qWarn("QID:0x%" PRIx64 ",TID:0x%" PRIx64 "job no exist, may be dropped, refId:0x%" PRIx64, localRsp->qId, localRsp->tId, localRsp->rId);
+      SCH_ERR_JRET(TSDB_CODE_QRY_JOB_NOT_EXIST);
+    }
 
-    if (pTask) {
-      SCH_UNLOCK_TASK(pTask);
+    int8_t status = 0;
+    if (schJobNeedToStop(pJob, &status)) {
+      SCH_TASK_DLOG("will not do further processing cause of job status %s", jobTaskStatusStr(status));
+      schReleaseJob(pJob->refId);
+      SCH_ERR_JRET(TSDB_CODE_SCH_IGNORE_ERROR);
     }
     
-    if (pJob) {
-      schReleaseJob(pJob->refId);
+    code = schGetTaskInJob(pJob, localRsp->tId, &pTask);
+
+    if (TSDB_CODE_SUCCESS == code) {
+      code = schProcessExplainRsp(pJob, pTask, &localRsp->rsp);
     }
+    
+    schReleaseJob(pJob->refId);
 
-    qDebug("QID:0x%" PRIx64 ",TID:0x%" PRIx64 ", end to handle LOCAL explain rsp msg");
+    qDebug("QID:0x%" PRIx64 ",TID:0x%" PRIx64 ", end to handle LOCAL explain rsp msg, code:%x", localRsp->qId, localRsp->tId, code);
 
     SCH_ERR_JRET(code);
 
     localRsp->rsp.numOfPlans = 0;
     localRsp->rsp.subplanInfo = NULL;
+    pTask = NULL;
+    pJob = NULL;
   }
 
 _return:
diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh
index 0b45b24258..4e8e9b4906 100755
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -515,3 +515,94 @@ python3 ./test.py -f 2-query/tsbsQuery.py -Q 3
 #python3 ./test.py -f 2-query/sml.py -Q 3
 python3 ./test.py -f 2-query/interp.py -Q 3
 
+
+#------------querPolicy  4-----------
+
+python3 ./test.py -f 2-query/between.py -Q  4
+python3 ./test.py -f 2-query/distinct.py -Q  4
+python3 ./test.py -f 2-query/varchar.py -Q  4
+python3 ./test.py -f 2-query/ltrim.py -Q  4
+python3 ./test.py -f 2-query/rtrim.py -Q  4
+python3 ./test.py -f 2-query/length.py -Q  4
+python3 ./test.py -f 2-query/char_length.py -Q  4
+python3 ./test.py -f 2-query/upper.py -Q  4
+python3 ./test.py -f 2-query/lower.py -Q  4
+python3 ./test.py -f 2-query/join.py -Q  4
+python3 ./test.py -f 2-query/join2.py -Q  4
+python3 ./test.py -f 2-query/cast.py -Q  4
+python3 ./test.py -f 2-query/substr.py -Q  4
+python3 ./test.py -f 2-query/union.py -Q  4
+python3 ./test.py -f 2-query/union1.py -Q  4
+python3 ./test.py -f 2-query/concat.py -Q  4
+python3 ./test.py -f 2-query/concat2.py -Q  4
+python3 ./test.py -f 2-query/concat_ws.py -Q  4
+python3 ./test.py -f 2-query/concat_ws2.py -Q  4
+#python3 ./test.py -f 2-query/check_tsdb.py -Q  4
+python3 ./test.py -f 2-query/spread.py -Q  4
+python3 ./test.py -f 2-query/hyperloglog.py -Q  4
+python3 ./test.py -f 2-query/explain.py -Q  4
+python3 ./test.py -f 2-query/leastsquares.py -Q  4
+python3 ./test.py -f 2-query/timezone.py -Q  4
+python3 ./test.py -f 2-query/Now.py -Q  4
+python3 ./test.py -f 2-query/Today.py -Q  4
+python3 ./test.py -f 2-query/max.py -Q  4
+python3 ./test.py -f 2-query/min.py -Q  4
+python3 ./test.py -f 2-query/count.py -Q  4
+#python3 ./test.py -f 2-query/last.py -Q  4
+python3 ./test.py -f 2-query/first.py -Q  4
+python3 ./test.py -f 2-query/To_iso8601.py -Q  4
+python3 ./test.py -f 2-query/To_unixtimestamp.py -Q  4
+python3 ./test.py -f 2-query/timetruncate.py -Q  4
+python3 ./test.py -f 2-query/diff.py -Q  4
+python3 ./test.py -f 2-query/Timediff.py -Q  4
+python3 ./test.py -f 2-query/json_tag.py -Q  4
+python3 ./test.py -f 2-query/top.py -Q  4
+python3 ./test.py -f 2-query/bottom.py -Q  4
+python3 ./test.py -f 2-query/percentile.py -Q  4
+python3 ./test.py -f 2-query/apercentile.py -Q  4
+python3 ./test.py -f 2-query/abs.py -Q  4
+python3 ./test.py -f 2-query/ceil.py -Q  4
+python3 ./test.py -f 2-query/floor.py -Q  4
+python3 ./test.py -f 2-query/round.py -Q  4 
+python3 ./test.py -f 2-query/log.py -Q  4
+python3 ./test.py -f 2-query/pow.py -Q  4
+python3 ./test.py -f 2-query/sqrt.py -Q  4
+python3 ./test.py -f 2-query/sin.py -Q  4
+python3 ./test.py -f 2-query/cos.py -Q  4
+python3 ./test.py -f 2-query/tan.py -Q  4
+python3 ./test.py -f 2-query/arcsin.py -Q  4
+python3 ./test.py -f 2-query/arccos.py -Q  4
+python3 ./test.py -f 2-query/arctan.py -Q  4
+python3 ./test.py -f 2-query/query_cols_tags_and_or.py -Q  4
+# python3 ./test.py -f 2-query/nestedQuery.py -Q  4
+# python3 ./test.py -f 2-query/nestedQuery_str.py -Q  4
+# python3 ./test.py -f 2-query/avg.py -Q  4
+# python3 ./test.py -f 2-query/elapsed.py -Q  4
+python3 ./test.py -f 2-query/csum.py -Q  4
+#python3 ./test.py -f 2-query/mavg.py -Q  4
+python3 ./test.py -f 2-query/sample.py -Q  4
+python3 ./test.py -f 2-query/function_diff.py -Q  4
+python3 ./test.py -f 2-query/unique.py -Q  4
+python3 ./test.py -f 2-query/stateduration.py -Q  4
+python3 ./test.py -f 2-query/function_stateduration.py -Q  4
+python3 ./test.py -f 2-query/statecount.py -Q  4
+python3 ./test.py -f 2-query/tail.py -Q  4
+python3 ./test.py -f 2-query/ttl_comment.py -Q  4
+python3 ./test.py -f 2-query/distribute_agg_count.py -Q  4
+python3 ./test.py -f 2-query/distribute_agg_max.py -Q  4
+python3 ./test.py -f 2-query/distribute_agg_min.py -Q  4
+python3 ./test.py -f 2-query/distribute_agg_sum.py -Q  4
+python3 ./test.py -f 2-query/distribute_agg_spread.py -Q  4
+python3 ./test.py -f 2-query/distribute_agg_apercentile.py -Q  4
+python3 ./test.py -f 2-query/distribute_agg_avg.py -Q  4
+python3 ./test.py -f 2-query/distribute_agg_stddev.py -Q  4
+python3 ./test.py -f 2-query/twa.py -Q  4
+python3 ./test.py -f 2-query/irate.py -Q  4
+python3 ./test.py -f 2-query/function_null.py -Q  4
+python3 ./test.py -f 2-query/count_partition.py -Q 4
+python3 ./test.py -f 2-query/max_partition.py -Q 4
+python3 ./test.py -f 2-query/last_row.py -Q 4
+python3 ./test.py -f 2-query/tsbsQuery.py -Q 4
+#python3 ./test.py -f 2-query/sml.py -Q 4
+python3 ./test.py -f 2-query/interp.py -Q 4
+
-- 
GitLab