restore changed from top and bottom

src/client/src/tscSQLParser.c

@@ -9141,7 +9141,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
   const char* msg4 = "interval query not supported, since the result of sub query not include valid timestamp column";
   const char* msg5 = "only tag query not compatible with normal column filter";
   const char* msg6 = "not support stddev/percentile/interp in the outer query yet";
-  const char* msg7 = "derivative/twa/rate/irate/diff/top/bottom requires timestamp column exists in subquery";
+  const char* msg7 = "derivative/twa/rate/irate/diff requires timestamp column exists in subquery";
   const char* msg8 = "condition missing for join query";
   const char* msg9 = "not support 3 level select";
 
@@ -9226,8 +9226,8 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
         SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
 
         int32_t f = pExpr->base.functionId;
-        if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE || f == TSDB_FUNC_RATE || 
-            f == TSDB_FUNC_DIFF       || f == TSDB_FUNC_TOP || f == TSDB_FUNC_BOTTOM) {
+        if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE || 
+            f == TSDB_FUNC_RATE       || f == TSDB_FUNC_DIFF) {
           return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
         }
       }

tests/pytest/query/nestedQuery/queryInterval.py

@@ -83,13 +83,13 @@ class TDTestCase:
         tdSql.checkData(29, 0, "2020-07-01 05:10:00.000")
 
         # subquery and parent query with top and bottom
-        tdSql.query("select top(avg_val,2) from(select ts,avg(value) as avg_val,num from st where loc!='beijing0' group by num) order by avg_val desc;")
+        tdSql.query("select top(avg_val,2) from(select avg(value) as avg_val,num from st where loc!='beijing0' group by num) order by avg_val desc;")
         tdSql.checkData(0, 1, 117)
-        tdSql.query("select bottom(avg_val,3) from(select ts,avg(value) as avg_val,num from st where loc!='beijing0' group by num) order by avg_val asc;")
+        tdSql.query("select bottom(avg_val,3) from(select avg(value) as avg_val,num from st where loc!='beijing0' group by num) order by avg_val asc;")
         tdSql.checkData(0, 1, 111)
 
         # 
-        tdSql.query("select top(avg_val,2) from(select ts,avg(value) as avg_val from st where loc='beijing1' interval(8m) sliding(3m));")
+        tdSql.query("select top(avg_val,2) from(select avg(value) as avg_val from st where loc='beijing1' interval(8m) sliding(3m));")
         tdSql.checkData(0, 1, 120)
 
         # clear env