diff --git a/tests/army/query/function/ans/char_length_1.csv b/tests/army/query/function/ans/char_length_1.csv
index 00f542aa84..a872e8cd88 100644
--- a/tests/army/query/function/ans/char_length_1.csv
+++ b/tests/army/query/function/ans/char_length_1.csv
@@ -247,12 +247,12 @@ taos> select nch1, char_length(nch1) from ts_4893.meters limit 1
 =========================================================
  novel                          |                     5 |
 
-taos> select groupid, max(char_length(name)) from ts_4893.meters group by groupid
+taos> select groupid, max(char_length(name)) from ts_4893.meters group by groupid order by ts
  groupid | max(char_length(name)) |
 ===================================
        1 |                      4 |
 
-taos> select location, avg(char_length(name)) from ts_4893.meters group by location
+taos> select location, avg(char_length(name)) from ts_4893.meters group by location order by location
       location      |  avg(char_length(name))   |
 =================================================
  beijing            |         3.244600000000000 |
diff --git a/tests/army/query/function/ans/dayofweek_1.csv b/tests/army/query/function/ans/dayofweek_1.csv
index 5e47b30018..ff80e7aa80 100644
--- a/tests/army/query/function/ans/dayofweek_1.csv
+++ b/tests/army/query/function/ans/dayofweek_1.csv
@@ -255,7 +255,7 @@ taos> select id, dayofweek(ts) from ts_4893.meters where id = 1 limit 1
 ======================================
            1 |                     6 |
 
-taos> select groupid, sum(dayofweek(ts)) from ts_4893.meters group by groupid
+taos> select groupid, sum(dayofweek(ts)) from ts_4893.meters group by groupid order by groupid
  groupid |  sum(dayofweek(ts))   |
 ==================================
        1 |                400012 |
diff --git a/tests/army/query/function/ans/max_1.csv b/tests/army/query/function/ans/max_1.csv
index d5ae61037c..f150ad1208 100644
--- a/tests/army/query/function/ans/max_1.csv
+++ b/tests/army/query/function/ans/max_1.csv
@@ -573,21 +573,6 @@ taos> select max(total_voltage) from (select sum(voltage) as total_voltage from
 ========================
               21948660 |
 
-taos> select location, max(current) from ts_4893.meters group by location
-      location      |     max(current)     |
-============================================
- beijing            |           11.9989996 |
-
-taos> select location, max(id) from ts_4893.meters group by location
-      location      |   max(id)   |
-===================================
- beijing            |        9999 |
-
-taos> select groupid, max(voltage) from ts_4893.meters group by groupid
- groupid | max(voltage) |
-=========================
-       1 |          224 |
-
 taos> select round(max(current), 2) from ts_4893.meters
  round(max(current), 2) |
 =========================
@@ -603,3 +588,18 @@ taos> select log(max(voltage) + 1) from ts_4893.meters
 ============================
          5.416100402204420 |
 
+taos> select groupid, max(voltage) from ts_4893.meters group by groupid order by groupid
+ groupid | max(voltage) |
+=========================
+       1 |          224 |
+
+taos> select location, max(id) from ts_4893.meters group by location order by location
+      location      |   max(id)   |
+===================================
+ beijing            |        9999 |
+
+taos> select location, max(current) from ts_4893.meters group by location order by location
+      location      |     max(current)     |
+============================================
+ beijing            |           11.9989996 |
+
diff --git a/tests/army/query/function/ans/min_1.csv b/tests/army/query/function/ans/min_1.csv
index d3d05e7bc4..9a8ba15287 100644
--- a/tests/army/query/function/ans/min_1.csv
+++ b/tests/army/query/function/ans/min_1.csv
@@ -573,21 +573,6 @@ taos> select min(total_voltage) from (select sum(voltage) as total_voltage from
 ========================
               21948660 |
 
-taos> select groupid, min(voltage) from ts_4893.meters group by groupid
- groupid | min(voltage) |
-=========================
-       1 |          215 |
-
-taos> select location, min(current) from ts_4893.meters group by location
-      location      |     min(current)     |
-============================================
- beijing            |            8.0000000 |
-
-taos> select location, min(id) from ts_4893.meters group by location
-      location      |   min(id)   |
-===================================
- beijing            |           0 |
-
 taos> select round(min(current), 2) from ts_4893.meters
  round(min(current), 2) |
 =========================
@@ -603,3 +588,18 @@ taos> select log(min(voltage) + 1) from ts_4893.meters
 ============================
          5.375278407684165 |
 
+taos> select groupid, min(voltage) from ts_4893.meters group by groupid order by groupid
+ groupid | min(voltage) |
+=========================
+       1 |          215 |
+
+taos> select location, min(current) from ts_4893.meters group by location order by location
+      location      |     min(current)     |
+============================================
+ beijing            |            8.0000000 |
+
+taos> select location, min(id) from ts_4893.meters group by location order by location
+      location      |   min(id)   |
+===================================
+ beijing            |           0 |
+
diff --git a/tests/army/query/function/ans/stddev_1.csv b/tests/army/query/function/ans/stddev_1.csv
index 3650107f80..95af278013 100644
--- a/tests/army/query/function/ans/stddev_1.csv
+++ b/tests/army/query/function/ans/stddev_1.csv
@@ -106,21 +106,6 @@ taos> select stddev_pop(total_voltage) from (select sum(voltage) as total_voltag
 ============================
          0.000000000000000 |
 
-taos> select groupid, stddev_pop(voltage) from ts_4893.meters group by groupid
- groupid |    stddev_pop(voltage)    |
-======================================
-       1 |         2.876459705957324 |
-
-taos> select location, stddev_pop(current) from ts_4893.meters group by location
-      location      |    stddev_pop(current)    |
-=================================================
- beijing            |         1.154339668872967 |
-
-taos> select location, stddev_pop(voltage) from ts_4893.meters group by location
-      location      |    stddev_pop(voltage)    |
-=================================================
- beijing            |         2.876459705957324 |
-
 taos> select round(stddev_pop(current), 2) from ts_4893.meters
  round(stddev_pop(current), 2) |
 ================================
@@ -136,3 +121,18 @@ taos> select log(stddev_pop(voltage) + 1) from ts_4893.meters
 ===============================
         1.354922290183882e+00 |
 
+taos> select groupid, stddev_pop(voltage) from ts_4893.meters group by groupid order by groupid
+ groupid |    stddev_pop(voltage)    |
+======================================
+       1 |         2.876459705957324 |
+
+taos> select location, stddev_pop(current) from ts_4893.meters group by location order by location
+      location      |    stddev_pop(current)    |
+=================================================
+ beijing            |         1.154339668872967 |
+
+taos> select location, stddev_pop(voltage) from ts_4893.meters group by location order by location
+      location      |    stddev_pop(voltage)    |
+=================================================
+ beijing            |         2.876459705957324 |
+
diff --git a/tests/army/query/function/ans/varpop_1.csv b/tests/army/query/function/ans/varpop_1.csv
index b04205e4df..7cfb67dbea 100644
--- a/tests/army/query/function/ans/varpop_1.csv
+++ b/tests/army/query/function/ans/varpop_1.csv
@@ -96,21 +96,6 @@ taos> select var_pop(total_voltage) from (select sum(voltage) as total_voltage f
 ============================
          0.000000000000000 |
 
-taos> select groupid, var_pop(voltage) from ts_4893.meters group by groupid
- groupid |     var_pop(voltage)      |
-======================================
-       1 |         8.274020439996093 |
-
-taos> select location, var_pop(current) from ts_4893.meters group by location
-      location      |     var_pop(current)      |
-=================================================
- beijing            |         1.332500071133751 |
-
-taos> select location, var_pop(voltage) from ts_4893.meters group by location
-      location      |     var_pop(voltage)      |
-=================================================
- beijing            |         8.274020439996093 |
-
 taos> select round(var_pop(current), 2) from ts_4893.meters
  round(var_pop(current), 2) |
 =============================
@@ -126,3 +111,18 @@ taos> select log(var_pop(voltage) + 1) from ts_4893.meters
 ============================
          2.227216989977633 |
 
+taos> select groupid, var_pop(voltage) from ts_4893.meters group by groupid order by groupid
+ groupid |     var_pop(voltage)      |
+======================================
+       1 |         8.274020439996093 |
+
+taos> select location, var_pop(current) from ts_4893.meters group by location order by location
+      location      |     var_pop(current)      |
+=================================================
+ beijing            |         1.332500071133751 |
+
+taos> select location, var_pop(voltage) from ts_4893.meters group by location order by location
+      location      |     var_pop(voltage)      |
+=================================================
+ beijing            |         8.274020439996093 |
+
diff --git a/tests/army/query/function/ans/week_1.csv b/tests/army/query/function/ans/week_1.csv
index 7cb48a4643..650d4aacfc 100644
--- a/tests/army/query/function/ans/week_1.csv
+++ b/tests/army/query/function/ans/week_1.csv
@@ -558,7 +558,7 @@ taos> select id, week(ts) from ts_4893.meters where id = 1 limit 1
 ======================================
            1 |                    28 |
 
-taos> select groupid, sum(week(ts)) from ts_4893.meters group by groupid
+taos> select groupid, sum(week(ts)) from ts_4893.meters group by groupid order by groupid
  groupid |     sum(week(ts))     |
 ==================================
        1 |               2669490 |
diff --git a/tests/army/query/function/ans/weekday_1.csv b/tests/army/query/function/ans/weekday_1.csv
index 8dc059480d..5b3dddebf6 100644
--- a/tests/army/query/function/ans/weekday_1.csv
+++ b/tests/army/query/function/ans/weekday_1.csv
@@ -235,16 +235,16 @@ taos> select weekday('2023-09-25')
 ========================
                      0 |
 
-taos> select weekday(name) from ts_4893.meters limit 1
-     weekday(name)     |
-========================
- NULL                  |
-
 taos> select weekday('9999-12-31')
  weekday('9999-12-31') |
 ========================
                      4 |
 
+taos> select weekday(name) from ts_4893.meters limit 1
+     weekday(name)     |
+========================
+ NULL                  |
+
 taos> select weekday(ts), dayofweek(ts) from ts_4893.meters limit 1
       weekday(ts)      |     dayofweek(ts)     |
 ================================================
@@ -265,7 +265,7 @@ taos> select id, weekday(ts) from ts_4893.meters where id = 1 limit 1
 ======================================
            1 |                     4 |
 
-taos> select groupid, sum(weekday(ts)) from ts_4893.meters group by groupid
+taos> select groupid, sum(weekday(ts)) from ts_4893.meters group by groupid order by groupid
  groupid |   sum(weekday(ts))    |
 ==================================
        1 |                300007 |
diff --git a/tests/army/query/function/ans/weekofyear_1.csv b/tests/army/query/function/ans/weekofyear_1.csv
index b614483f6b..2d9697a4c5 100644
--- a/tests/army/query/function/ans/weekofyear_1.csv
+++ b/tests/army/query/function/ans/weekofyear_1.csv
@@ -230,6 +230,11 @@ taos> select weekofyear('2024-12-31')
 ===========================
                         1 |
 
+taos> select weekofyear('9999-12-31')
+ weekofyear('9999-12-31') |
+===========================
+                       52 |
+
 taos> select weekofyear(name) from ts_4893.meters limit 1
    weekofyear(name)    |
 ========================
@@ -240,11 +245,6 @@ taos> select weekofyear(ts) from ts_4893.meters limit 1
 ========================
                     28 |
 
-taos> select weekofyear('9999-12-31')
- weekofyear('9999-12-31') |
-===========================
-                       52 |
-
 taos> select weekofyear(ts), dayofweek(ts) from ts_4893.meters limit 1
     weekofyear(ts)     |     dayofweek(ts)     |
 ================================================
@@ -260,7 +260,7 @@ taos> select id, weekofyear(ts) from ts_4893.meters where id = 1 limit 1
 ======================================
            1 |                    28 |
 
-taos> select groupid, sum(weekofyear(ts)) from ts_4893.meters group by groupid
+taos> select groupid, sum(weekofyear(ts)) from ts_4893.meters group by groupid order by groupid
  groupid |  sum(weekofyear(ts))  |
 ==================================
        1 |               2720120 |
diff --git a/tests/army/query/function/in/char_length.in b/tests/army/query/function/in/char_length.in
index 30b4323377..31aafaea07 100644
--- a/tests/army/query/function/in/char_length.in
+++ b/tests/army/query/function/in/char_length.in
@@ -34,5 +34,5 @@ select concat(name, ' - ', location), char_length(concat(name, ' - ', location))
 select substring(name, 1, 5), char_length(substring(name, 1, 5)) from ts_4893.meters limit 1
 select name, char_length(name) from ts_4893.meters limit 1
 select nch1, char_length(nch1) from ts_4893.meters limit 1
-select groupid, max(char_length(name)) from ts_4893.meters group by groupid
-select location, avg(char_length(name)) from ts_4893.meters group by location
+select groupid, max(char_length(name)) from ts_4893.meters group by groupid order by ts
+select location, avg(char_length(name)) from ts_4893.meters group by location order by location
diff --git a/tests/army/query/function/in/dayofweek.in b/tests/army/query/function/in/dayofweek.in
index 08a07345f6..49be283860 100644
--- a/tests/army/query/function/in/dayofweek.in
+++ b/tests/army/query/function/in/dayofweek.in
@@ -33,4 +33,4 @@ select dayofweek(ts) from ts_4893.meters limit 1
 select dayofweek(name) from ts_4893.meters limit 1
 select dayofweek(timediff(ts, '2024-10-10 09:36:50.172')) from ts_4893.meters limit 1
 select id, dayofweek(ts) from ts_4893.meters where id = 1 limit 1
-select groupid, sum(dayofweek(ts)) from ts_4893.meters group by groupid
+select groupid, sum(dayofweek(ts)) from ts_4893.meters group by groupid order by groupid
diff --git a/tests/army/query/function/in/max.in b/tests/army/query/function/in/max.in
index c81222d3fe..efd4620f7b 100644
--- a/tests/army/query/function/in/max.in
+++ b/tests/army/query/function/in/max.in
@@ -20,9 +20,9 @@ select max(id) from ts_4893.meters where id <= 0
 select max(phase) from ts_4893.meters where ts between '2023-01-01 00:00:00' and '2023-12-31 23:59:59'
 select max(voltage) from ts_4893.meters where voltage is not null
 select max(total_voltage) from (select sum(voltage) as total_voltage from ts_4893.meters group by location)
-select location, max(current) from ts_4893.meters group by location
-select location, max(id) from ts_4893.meters group by location
-select groupid, max(voltage) from ts_4893.meters group by groupid
 select round(max(current), 2) from ts_4893.meters
 select pow(max(current), 2) from ts_4893.meters
 select log(max(voltage) + 1) from ts_4893.meters
+select groupid, max(voltage) from ts_4893.meters group by groupid order by groupid
+select location, max(id) from ts_4893.meters group by location order by location
+select location, max(current) from ts_4893.meters group by location order by location
diff --git a/tests/army/query/function/in/min.in b/tests/army/query/function/in/min.in
index b31254cb69..910b8cc7bd 100644
--- a/tests/army/query/function/in/min.in
+++ b/tests/army/query/function/in/min.in
@@ -20,9 +20,9 @@ select min(id) from ts_4893.meters where id <= 0
 select min(phase) from ts_4893.meters where ts between '2023-01-01 00:00:00' and '2023-12-31 23:59:59'
 select min(voltage) from ts_4893.meters where voltage is not null
 select min(total_voltage) from (select sum(voltage) as total_voltage from ts_4893.meters group by location)
-select groupid, min(voltage) from ts_4893.meters group by groupid
-select location, min(current) from ts_4893.meters group by location
-select location, min(id) from ts_4893.meters group by location
 select round(min(current), 2) from ts_4893.meters
 select pow(min(current), 2) from ts_4893.meters
 select log(min(voltage) + 1) from ts_4893.meters
+select groupid, min(voltage) from ts_4893.meters group by groupid order by groupid
+select location, min(current) from ts_4893.meters group by location order by location
+select location, min(id) from ts_4893.meters group by location order by location
diff --git a/tests/army/query/function/in/stddev.in b/tests/army/query/function/in/stddev.in
index 30e5c590a8..d3db1bb56b 100644
--- a/tests/army/query/function/in/stddev.in
+++ b/tests/army/query/function/in/stddev.in
@@ -14,9 +14,9 @@ select stddev_pop(voltage) from ts_4893.meters where voltage is not null
 select stddev_pop(phase) from ts_4893.meters
 select stddev_pop(phase) from ts_4893.meters where ts between '2023-01-01 00:00:00' and '2023-12-31 23:59:59'
 select stddev_pop(total_voltage) from (select sum(voltage) as total_voltage from ts_4893.meters group by location)
-select groupid, stddev_pop(voltage) from ts_4893.meters group by groupid
-select location, stddev_pop(current) from ts_4893.meters group by location
-select location, stddev_pop(voltage) from ts_4893.meters group by location
 select round(stddev_pop(current), 2) from ts_4893.meters
 select pow(stddev_pop(current), 2) from ts_4893.meters
 select log(stddev_pop(voltage) + 1) from ts_4893.meters
+select groupid, stddev_pop(voltage) from ts_4893.meters group by groupid order by groupid
+select location, stddev_pop(current) from ts_4893.meters group by location order by location
+select location, stddev_pop(voltage) from ts_4893.meters group by location order by location
diff --git a/tests/army/query/function/in/varpop.in b/tests/army/query/function/in/varpop.in
index 70f7773f95..d828f268a3 100644
--- a/tests/army/query/function/in/varpop.in
+++ b/tests/army/query/function/in/varpop.in
@@ -12,9 +12,9 @@ select var_pop(voltage) from ts_4893.meters where voltage is not null
 select var_pop(phase) from ts_4893.meters
 select var_pop(phase) from ts_4893.meters where ts between '2023-01-01 00:00:00' and '2023-12-31 23:59:59'
 select var_pop(total_voltage) from (select sum(voltage) as total_voltage from ts_4893.meters group by location)
-select groupid, var_pop(voltage) from ts_4893.meters group by groupid
-select location, var_pop(current) from ts_4893.meters group by location
-select location, var_pop(voltage) from ts_4893.meters group by location
 select round(var_pop(current), 2) from ts_4893.meters
 select pow(var_pop(current), 2) from ts_4893.meters
 select log(var_pop(voltage) + 1) from ts_4893.meters
+select groupid, var_pop(voltage) from ts_4893.meters group by groupid order by groupid
+select location, var_pop(current) from ts_4893.meters group by location order by location
+select location, var_pop(voltage) from ts_4893.meters group by location order by location
diff --git a/tests/army/query/function/in/week.in b/tests/army/query/function/in/week.in
index 86738021bc..d449bf1e89 100644
--- a/tests/army/query/function/in/week.in
+++ b/tests/army/query/function/in/week.in
@@ -90,4 +90,4 @@ select week(name) from ts_4893.meters limit 1
 select week(ts), dayofweek(ts) from ts_4893.meters limit 1
 select week(timediff(ts, '2024-10-10 09:36:50.172')) from ts_4893.meters limit 1
 select id, week(ts) from ts_4893.meters where id = 1 limit 1
-select groupid, sum(week(ts)) from ts_4893.meters group by groupid
+select groupid, sum(week(ts)) from ts_4893.meters group by groupid order by groupid
diff --git a/tests/army/query/function/in/weekday.in b/tests/army/query/function/in/weekday.in
index a60f055af1..b421fa3930 100644
--- a/tests/army/query/function/in/weekday.in
+++ b/tests/army/query/function/in/weekday.in
@@ -29,10 +29,10 @@ select weekday('01-JAN-20')
 select weekday('2024-02-29')
 select weekday('2023-09-24')
 select weekday('2023-09-25')
-select weekday(name) from ts_4893.meters limit 1
 select weekday('9999-12-31')
+select weekday(name) from ts_4893.meters limit 1
 select weekday(ts), dayofweek(ts) from ts_4893.meters limit 1
 select weekday(timediff(ts, '2024-10-10 09:36:50.172')) from ts_4893.meters limit 1
 select weekday(ts) from ts_4893.meters limit 1
 select id, weekday(ts) from ts_4893.meters where id = 1 limit 1
-select groupid, sum(weekday(ts)) from ts_4893.meters group by groupid
+select groupid, sum(weekday(ts)) from ts_4893.meters group by groupid order by groupid
diff --git a/tests/army/query/function/in/weekofyear.in b/tests/army/query/function/in/weekofyear.in
index d2e1cc6606..ac201c37c6 100644
--- a/tests/army/query/function/in/weekofyear.in
+++ b/tests/army/query/function/in/weekofyear.in
@@ -28,10 +28,10 @@ select weekofyear('01-JAN-20')
 select weekofyear('2024-02-29')
 select weekofyear('2024-01-01')
 select weekofyear('2024-12-31')
+select weekofyear('9999-12-31')
 select weekofyear(name) from ts_4893.meters limit 1
 select weekofyear(ts) from ts_4893.meters limit 1
-select weekofyear('9999-12-31')
 select weekofyear(ts), dayofweek(ts) from ts_4893.meters limit 1
 select weekofyear(timediff(ts, '2024-10-10 09:36:50.172')) from ts_4893.meters limit 1
 select id, weekofyear(ts) from ts_4893.meters where id = 1 limit 1
-select groupid, sum(weekofyear(ts)) from ts_4893.meters group by groupid
+select groupid, sum(weekofyear(ts)) from ts_4893.meters group by groupid order by groupid