Merge pull request #8966 from taosdata/hotfix/TS-810

[TS-810][grafana]data display issue

src/client/src/tscSQLParser.c

@@ -7264,7 +7264,7 @@ int32_t validateFunctionFromUpstream(SQueryInfo* pQueryInfo, char* msg) {
         SQueryInfo* pUp = taosArrayGetP(pQueryInfo->pUpstream, j);
         STableMetaInfo  *pTableMetaInfo = tscGetMetaInfo(pUp, 0);
         bool isSTable = UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo);
-        if ((!isSTable) || groupbyTbname(pUp)) {
+        if ((!isSTable) || groupbyTbname(pUp) || pUp->interval.interval > 0) {
           return TSDB_CODE_SUCCESS;
         }
       }

tests/script/general/parser/function.sim

@@ -1197,3 +1197,16 @@ if $data00 != 0.000000000 then
   return -1
 endi
 
+sql select derivative(aa,1m,0) from (select avg(voltage) as aa from smeters where ts>='2021-08-08 10:10:10.000' and ts < '2021-08-08 10:10:20.000'  and current=10 interval(1000a));
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @21-08-08 10:10:12.000@ then
+  return -1
+endi
+if $data01 != 0.000000000 then
+  return -1
+endi
+
+
+