You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by ka...@apache.org on 2025/05/16 07:14:39 UTC

(druid) branch master updated: Fix window function quidem tests (#18007)

This is an automated email from the ASF dual-hosted git repository.

karan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/master by this push:
     new bb4beb9e1f1 Fix window function quidem tests (#18007)
bb4beb9e1f1 is described below

commit bb4beb9e1f160e795697d5fa74862c858236f174
Author: Andy Tsai <61...@users.noreply.github.com>
AuthorDate: Fri May 16 00:14:33 2025 -0700

    Fix window function quidem tests (#18007)
    
    When there are not enough order by columns to fix the order of a window functions, occassionally the query result may change.  This is especially true for order sensetive window functions such as first_value, last_value, or row_number.  This PR fixes the tests by adding more columns to the window order by list to fix the order.
---
 .../qaWin/basics_basic_syntax.all.iq               |  28 +-
 .../qaWin/basics_data_types_and_exprs.all.iq       | 400 ++++++-----
 .../qaWin/basics_group_by.all.iq                   |  10 +-
 .../qaWin/basics_multi_windows.all.iq              | 152 ++--
 .../qaWin/basics_order_by_basic.all.iq             |  60 +-
 .../qaWin/basics_order_by_nulls_first_last.all.iq  |  18 +-
 .../qaWin/basics_window_and_aggr.all.iq            | 104 +--
 .../qaWin/basics_window_func_in_func.all.iq        |  74 +-
 .../qaWin/basics_window_funcs.01.all.iq            | 392 +++++-----
 .../qaWin/basics_window_funcs.02.all.iq            | 278 +++----
 .../qaWin/basics_window_funcs.03.all.iq            | 170 +++--
 .../orderby_range_0_following_first_last.01.all.iq | 220 +++---
 .../orderby_range_0_following_first_last.02.all.iq | 130 ++--
 .../orderby_range_0_following_first_last.03.all.iq | 196 +++--
 .../orderby_range_0_following_first_last.04.all.iq | 166 +++--
 .../orderby_range_0_following_first_last.05.all.iq | 184 +++--
 .../orderby_range_0_following_first_last.06.all.iq | 178 +++--
 .../orderby_range_0_following_first_last.07.all.iq | 158 ++--
 .../orderby_range_0_following_first_last.08.all.iq | 213 +++---
 .../orderby_range_0_following_first_last.09.all.iq | 127 ++--
 .../orderby_range_0_following_first_last.10.all.iq | 199 ++++--
 .../orderby_range_0_following_first_last.11.all.iq | 165 +++--
 .../orderby_range_0_following_first_last.12.all.iq | 185 +++--
 .../orderby_range_0_following_first_last.13.all.iq | 175 +++--
 .../orderby_range_0_following_first_last.14.all.iq | 168 +++--
 .../orderby_range_0_following_sum_count.01.all.iq  | 220 +++---
 .../orderby_range_0_following_sum_count.02.all.iq  | 130 ++--
 .../orderby_range_0_following_sum_count.03.all.iq  | 196 +++--
 .../orderby_range_0_following_sum_count.04.all.iq  | 166 +++--
 .../orderby_range_0_following_sum_count.05.all.iq  | 184 +++--
 .../orderby_range_0_following_sum_count.06.all.iq  | 178 +++--
 .../orderby_range_0_following_sum_count.07.all.iq  | 158 ++--
 .../orderby_range_0_following_sum_count.08.all.iq  | 213 +++---
 .../orderby_range_0_following_sum_count.09.all.iq  | 127 ++--
 .../orderby_range_0_following_sum_count.10.all.iq  | 199 ++++--
 .../orderby_range_0_following_sum_count.11.all.iq  | 165 +++--
 .../orderby_range_0_following_sum_count.12.all.iq  | 185 +++--
 .../orderby_range_0_following_sum_count.13.all.iq  | 175 +++--
 .../orderby_range_0_following_sum_count.14.all.iq  | 168 +++--
 .../orderby_range_0_preceding_first_last.01.all.iq | 220 +++---
 .../orderby_range_0_preceding_first_last.02.all.iq | 130 ++--
 .../orderby_range_0_preceding_first_last.03.all.iq | 196 +++--
 .../orderby_range_0_preceding_first_last.04.all.iq | 166 +++--
 .../orderby_range_0_preceding_first_last.05.all.iq | 184 +++--
 .../orderby_range_0_preceding_first_last.06.all.iq | 178 +++--
 .../orderby_range_0_preceding_first_last.07.all.iq | 158 ++--
 .../orderby_range_0_preceding_first_last.08.all.iq | 213 +++---
 .../orderby_range_0_preceding_first_last.09.all.iq | 127 ++--
 .../orderby_range_0_preceding_first_last.10.all.iq | 199 ++++--
 .../orderby_range_0_preceding_first_last.11.all.iq | 165 +++--
 .../orderby_range_0_preceding_first_last.12.all.iq | 185 +++--
 .../orderby_range_0_preceding_first_last.13.all.iq | 175 +++--
 .../orderby_range_0_preceding_first_last.14.all.iq | 168 +++--
 .../orderby_range_0_preceding_sum_count.01.all.iq  | 220 +++---
 .../orderby_range_0_preceding_sum_count.02.all.iq  | 130 ++--
 .../orderby_range_0_preceding_sum_count.03.all.iq  | 196 +++--
 .../orderby_range_0_preceding_sum_count.04.all.iq  | 166 +++--
 .../orderby_range_0_preceding_sum_count.05.all.iq  | 184 +++--
 .../orderby_range_0_preceding_sum_count.06.all.iq  | 178 +++--
 .../orderby_range_0_preceding_sum_count.07.all.iq  | 158 ++--
 .../orderby_range_0_preceding_sum_count.08.all.iq  | 213 +++---
 .../orderby_range_0_preceding_sum_count.09.all.iq  | 127 ++--
 .../orderby_range_0_preceding_sum_count.10.all.iq  | 199 ++++--
 .../orderby_range_0_preceding_sum_count.11.all.iq  | 165 +++--
 .../orderby_range_0_preceding_sum_count.12.all.iq  | 185 +++--
 .../orderby_range_0_preceding_sum_count.13.all.iq  | 175 +++--
 .../orderby_range_0_preceding_sum_count.14.all.iq  | 168 +++--
 .../orderby_range_1_following_first_last.01.all.iq | 220 +++---
 .../orderby_range_1_following_first_last.02.all.iq | 130 ++--
 .../orderby_range_1_following_first_last.03.all.iq | 196 +++--
 .../orderby_range_1_following_first_last.04.all.iq | 166 +++--
 .../orderby_range_1_following_first_last.05.all.iq | 184 +++--
 .../orderby_range_1_following_first_last.06.all.iq | 178 +++--
 .../orderby_range_1_following_first_last.07.all.iq | 158 ++--
 .../orderby_range_1_following_first_last.08.all.iq | 213 +++---
 .../orderby_range_1_following_first_last.09.all.iq | 127 ++--
 .../orderby_range_1_following_first_last.10.all.iq | 199 ++++--
 .../orderby_range_1_following_first_last.11.all.iq | 165 +++--
 .../orderby_range_1_following_first_last.12.all.iq | 185 +++--
 .../orderby_range_1_following_first_last.13.all.iq | 175 +++--
 .../orderby_range_1_following_first_last.14.all.iq | 168 +++--
 .../orderby_range_1_following_sum_count.01.all.iq  | 220 +++---
 .../orderby_range_1_following_sum_count.02.all.iq  | 130 ++--
 .../orderby_range_1_following_sum_count.03.all.iq  | 196 +++--
 .../orderby_range_1_following_sum_count.04.all.iq  | 166 +++--
 .../orderby_range_1_following_sum_count.05.all.iq  | 184 +++--
 .../orderby_range_1_following_sum_count.06.all.iq  | 178 +++--
 .../orderby_range_1_following_sum_count.07.all.iq  | 158 ++--
 .../orderby_range_1_following_sum_count.08.all.iq  | 213 +++---
 .../orderby_range_1_following_sum_count.09.all.iq  | 127 ++--
 .../orderby_range_1_following_sum_count.10.all.iq  | 199 ++++--
 .../orderby_range_1_following_sum_count.11.all.iq  | 165 +++--
 .../orderby_range_1_following_sum_count.12.all.iq  | 185 +++--
 .../orderby_range_1_following_sum_count.13.all.iq  | 175 +++--
 .../orderby_range_1_following_sum_count.14.all.iq  | 168 +++--
 .../orderby_range_1_preceding_first_last.01.all.iq | 220 +++---
 .../orderby_range_1_preceding_first_last.02.all.iq | 130 ++--
 .../orderby_range_1_preceding_first_last.03.all.iq | 196 +++--
 .../orderby_range_1_preceding_first_last.04.all.iq | 166 +++--
 .../orderby_range_1_preceding_first_last.05.all.iq | 184 +++--
 .../orderby_range_1_preceding_first_last.06.all.iq | 178 +++--
 .../orderby_range_1_preceding_first_last.07.all.iq | 158 ++--
 .../orderby_range_1_preceding_first_last.08.all.iq | 213 +++---
 .../orderby_range_1_preceding_first_last.09.all.iq | 127 ++--
 .../orderby_range_1_preceding_first_last.10.all.iq | 199 ++++--
 .../orderby_range_1_preceding_first_last.11.all.iq | 165 +++--
 .../orderby_range_1_preceding_first_last.12.all.iq | 185 +++--
 .../orderby_range_1_preceding_first_last.13.all.iq | 175 +++--
 .../orderby_range_1_preceding_first_last.14.all.iq | 168 +++--
 .../orderby_range_1_preceding_sum_count.01.all.iq  | 220 +++---
 .../orderby_range_1_preceding_sum_count.02.all.iq  | 130 ++--
 .../orderby_range_1_preceding_sum_count.03.all.iq  | 196 +++--
 .../orderby_range_1_preceding_sum_count.04.all.iq  | 166 +++--
 .../orderby_range_1_preceding_sum_count.05.all.iq  | 184 +++--
 .../orderby_range_1_preceding_sum_count.06.all.iq  | 178 +++--
 .../orderby_range_1_preceding_sum_count.07.all.iq  | 158 ++--
 .../orderby_range_1_preceding_sum_count.08.all.iq  | 213 +++---
 .../orderby_range_1_preceding_sum_count.09.all.iq  | 127 ++--
 .../orderby_range_1_preceding_sum_count.10.all.iq  | 199 ++++--
 .../orderby_range_1_preceding_sum_count.11.all.iq  | 165 +++--
 .../orderby_range_1_preceding_sum_count.12.all.iq  | 185 +++--
 .../orderby_range_1_preceding_sum_count.13.all.iq  | 175 +++--
 .../orderby_range_1_preceding_sum_count.14.all.iq  | 168 +++--
 .../orderby_range_current_first_last.01.all.iq     | 220 +++---
 .../orderby_range_current_first_last.02.all.iq     | 130 ++--
 .../orderby_range_current_first_last.03.all.iq     | 196 +++--
 .../orderby_range_current_first_last.04.all.iq     | 166 +++--
 .../orderby_range_current_first_last.05.all.iq     | 184 +++--
 .../orderby_range_current_first_last.06.all.iq     | 178 +++--
 .../orderby_range_current_first_last.07.all.iq     | 158 ++--
 .../orderby_range_current_first_last.08.all.iq     | 213 +++---
 .../orderby_range_current_first_last.09.all.iq     | 127 ++--
 .../orderby_range_current_first_last.10.all.iq     | 199 ++++--
 .../orderby_range_current_first_last.11.all.iq     | 165 +++--
 .../orderby_range_current_first_last.12.all.iq     | 185 +++--
 .../orderby_range_current_first_last.13.all.iq     | 175 +++--
 .../orderby_range_current_first_last.14.all.iq     | 232 +++---
 .../orderby_range_current_sum_count.01.all.iq      | 796 +++++++++++----------
 .../orderby_range_current_sum_count.02.all.iq      | 322 +++++----
 .../orderby_range_current_sum_count.03.all.iq      | 196 +++--
 .../orderby_range_current_sum_count.04.all.iq      | 166 +++--
 .../orderby_range_current_sum_count.05.all.iq      | 184 +++--
 .../orderby_range_current_sum_count.06.all.iq      | 178 +++--
 .../orderby_range_current_sum_count.07.all.iq      | 158 ++--
 .../orderby_range_current_sum_count.08.all.iq      | 773 ++++++++++----------
 .../orderby_range_current_sum_count.09.all.iq      | 335 +++++----
 .../orderby_range_current_sum_count.10.all.iq      | 199 ++++--
 .../orderby_range_current_sum_count.11.all.iq      | 165 +++--
 .../orderby_range_current_sum_count.12.all.iq      | 185 +++--
 .../orderby_range_current_sum_count.13.all.iq      | 467 ++++++------
 .../orderby_range_current_sum_count.14.all.iq      | 492 +++++++------
 .../orderby_range_negative_first_last.01.all.iq    | 220 +++---
 .../orderby_range_negative_first_last.02.all.iq    | 130 ++--
 .../orderby_range_negative_first_last.03.all.iq    | 196 +++--
 .../orderby_range_negative_first_last.04.all.iq    | 166 +++--
 .../orderby_range_negative_first_last.05.all.iq    | 184 +++--
 .../orderby_range_negative_first_last.06.all.iq    | 178 +++--
 .../orderby_range_negative_first_last.07.all.iq    | 158 ++--
 .../orderby_range_negative_first_last.08.all.iq    | 213 +++---
 .../orderby_range_negative_first_last.09.all.iq    | 127 ++--
 .../orderby_range_negative_first_last.10.all.iq    | 199 ++++--
 .../orderby_range_negative_first_last.11.all.iq    | 165 +++--
 .../orderby_range_negative_first_last.12.all.iq    | 185 +++--
 .../orderby_range_negative_first_last.13.all.iq    |  35 +-
 .../orderby_range_negative_sum_count.01.all.iq     | 220 +++---
 .../orderby_range_negative_sum_count.02.all.iq     | 130 ++--
 .../orderby_range_negative_sum_count.03.all.iq     | 196 +++--
 .../orderby_range_negative_sum_count.04.all.iq     | 166 +++--
 .../orderby_range_negative_sum_count.05.all.iq     | 184 +++--
 .../orderby_range_negative_sum_count.06.all.iq     | 178 +++--
 .../orderby_range_negative_sum_count.07.all.iq     | 158 ++--
 .../orderby_range_negative_sum_count.08.all.iq     | 213 +++---
 .../orderby_range_negative_sum_count.09.all.iq     | 127 ++--
 .../orderby_range_negative_sum_count.10.all.iq     | 199 ++++--
 .../orderby_range_negative_sum_count.11.all.iq     | 165 +++--
 .../orderby_range_negative_sum_count.12.all.iq     | 185 +++--
 .../orderby_range_negative_sum_count.13.all.iq     |  35 +-
 ...orderby_range_ub_following_first_last.01.all.iq | 220 +++---
 ...orderby_range_ub_following_first_last.02.all.iq | 194 ++---
 ...orderby_range_ub_following_first_last.03.all.iq | 196 +++--
 ...orderby_range_ub_following_first_last.04.all.iq | 166 +++--
 ...orderby_range_ub_following_first_last.05.all.iq | 184 +++--
 ...orderby_range_ub_following_first_last.06.all.iq | 178 +++--
 ...orderby_range_ub_following_first_last.07.all.iq | 158 ++--
 ...orderby_range_ub_following_first_last.08.all.iq | 213 +++---
 ...orderby_range_ub_following_first_last.09.all.iq | 127 ++--
 ...orderby_range_ub_following_first_last.10.all.iq | 199 ++++--
 ...orderby_range_ub_following_first_last.11.all.iq | 165 +++--
 ...orderby_range_ub_following_first_last.12.all.iq | 185 +++--
 ...orderby_range_ub_following_first_last.13.all.iq | 175 +++--
 ...orderby_range_ub_following_first_last.14.all.iq | 168 +++--
 .../orderby_range_ub_following_sum_count.01.all.iq | 684 ++++++++++--------
 .../orderby_range_ub_following_sum_count.02.all.iq | 282 ++++----
 .../orderby_range_ub_following_sum_count.03.all.iq | 196 +++--
 .../orderby_range_ub_following_sum_count.04.all.iq | 166 +++--
 .../orderby_range_ub_following_sum_count.05.all.iq | 184 +++--
 .../orderby_range_ub_following_sum_count.06.all.iq | 178 +++--
 .../orderby_range_ub_following_sum_count.07.all.iq | 158 ++--
 .../orderby_range_ub_following_sum_count.08.all.iq | 213 +++---
 .../orderby_range_ub_following_sum_count.09.all.iq | 127 ++--
 .../orderby_range_ub_following_sum_count.10.all.iq | 199 ++++--
 .../orderby_range_ub_following_sum_count.11.all.iq | 165 +++--
 .../orderby_range_ub_following_sum_count.12.all.iq | 185 +++--
 .../orderby_range_ub_following_sum_count.13.all.iq | 175 +++--
 .../orderby_range_ub_following_sum_count.14.all.iq | 168 +++--
 ...orderby_range_ub_preceding_first_last.01.all.iq | 220 +++---
 ...orderby_range_ub_preceding_first_last.02.all.iq | 130 ++--
 ...orderby_range_ub_preceding_first_last.03.all.iq | 196 +++--
 ...orderby_range_ub_preceding_first_last.04.all.iq | 166 +++--
 ...orderby_range_ub_preceding_first_last.05.all.iq | 184 +++--
 ...orderby_range_ub_preceding_first_last.06.all.iq | 178 +++--
 ...orderby_range_ub_preceding_first_last.07.all.iq | 158 ++--
 ...orderby_range_ub_preceding_first_last.08.all.iq | 213 +++---
 ...orderby_range_ub_preceding_first_last.09.all.iq | 127 ++--
 ...orderby_range_ub_preceding_first_last.10.all.iq | 199 ++++--
 ...orderby_range_ub_preceding_first_last.11.all.iq | 165 +++--
 ...orderby_range_ub_preceding_first_last.12.all.iq | 185 +++--
 ...orderby_range_ub_preceding_first_last.13.all.iq | 175 +++--
 ...orderby_range_ub_preceding_first_last.14.all.iq | 232 +++---
 .../orderby_range_ub_preceding_sum_count.01.all.iq | 732 ++++++++++---------
 .../orderby_range_ub_preceding_sum_count.02.all.iq | 290 ++++----
 .../orderby_range_ub_preceding_sum_count.03.all.iq | 196 +++--
 .../orderby_range_ub_preceding_sum_count.04.all.iq | 166 +++--
 .../orderby_range_ub_preceding_sum_count.05.all.iq | 184 +++--
 .../orderby_range_ub_preceding_sum_count.06.all.iq | 178 +++--
 .../orderby_range_ub_preceding_sum_count.07.all.iq | 158 ++--
 .../orderby_range_ub_preceding_sum_count.08.all.iq | 709 +++++++++---------
 .../orderby_range_ub_preceding_sum_count.09.all.iq | 303 ++++----
 .../orderby_range_ub_preceding_sum_count.10.all.iq | 199 ++++--
 .../orderby_range_ub_preceding_sum_count.11.all.iq | 165 +++--
 .../orderby_range_ub_preceding_sum_count.12.all.iq | 185 +++--
 .../orderby_range_ub_preceding_sum_count.13.all.iq | 175 +++--
 .../orderby_range_ub_preceding_sum_count.14.all.iq | 168 +++--
 .../orderby_rows_0_following_first_last.01.all.iq  | 220 +++---
 .../orderby_rows_0_following_first_last.02.all.iq  | 130 ++--
 .../orderby_rows_0_following_first_last.03.all.iq  | 196 +++--
 .../orderby_rows_0_following_first_last.04.all.iq  | 166 +++--
 .../orderby_rows_0_following_first_last.05.all.iq  | 184 +++--
 .../orderby_rows_0_following_first_last.06.all.iq  | 178 +++--
 .../orderby_rows_0_following_first_last.07.all.iq  | 158 ++--
 .../orderby_rows_0_following_first_last.08.all.iq  | 213 +++---
 .../orderby_rows_0_following_first_last.09.all.iq  | 127 ++--
 .../orderby_rows_0_following_first_last.10.all.iq  | 199 ++++--
 .../orderby_rows_0_following_first_last.11.all.iq  | 165 +++--
 .../orderby_rows_0_following_first_last.12.all.iq  | 185 +++--
 .../orderby_rows_0_following_first_last.13.all.iq  | 175 +++--
 .../orderby_rows_0_following_first_last.14.all.iq  | 168 +++--
 .../orderby_rows_0_following_sum_count.01.all.iq   | 220 +++---
 .../orderby_rows_0_following_sum_count.02.all.iq   | 130 ++--
 .../orderby_rows_0_following_sum_count.03.all.iq   | 196 +++--
 .../orderby_rows_0_following_sum_count.04.all.iq   | 166 +++--
 .../orderby_rows_0_following_sum_count.05.all.iq   | 184 +++--
 .../orderby_rows_0_following_sum_count.06.all.iq   | 178 +++--
 .../orderby_rows_0_following_sum_count.07.all.iq   | 158 ++--
 .../orderby_rows_0_following_sum_count.08.all.iq   | 213 +++---
 .../orderby_rows_0_following_sum_count.09.all.iq   | 127 ++--
 .../orderby_rows_0_following_sum_count.10.all.iq   | 199 ++++--
 .../orderby_rows_0_following_sum_count.11.all.iq   | 173 +++--
 .../orderby_rows_0_following_sum_count.12.all.iq   | 289 ++++----
 .../orderby_rows_0_following_sum_count.13.all.iq   | 399 ++++++-----
 .../orderby_rows_0_following_sum_count.14.all.iq   | 408 ++++++-----
 .../orderby_rows_0_preceding_first_last.01.all.iq  | 220 +++---
 .../orderby_rows_0_preceding_first_last.02.all.iq  | 130 ++--
 .../orderby_rows_0_preceding_first_last.03.all.iq  | 196 +++--
 .../orderby_rows_0_preceding_first_last.04.all.iq  | 166 +++--
 .../orderby_rows_0_preceding_first_last.05.all.iq  | 184 +++--
 .../orderby_rows_0_preceding_first_last.06.all.iq  | 178 +++--
 .../orderby_rows_0_preceding_first_last.07.all.iq  | 158 ++--
 .../orderby_rows_0_preceding_first_last.08.all.iq  | 213 +++---
 .../orderby_rows_0_preceding_first_last.09.all.iq  | 127 ++--
 .../orderby_rows_0_preceding_first_last.10.all.iq  | 199 ++++--
 .../orderby_rows_0_preceding_first_last.11.all.iq  | 165 +++--
 .../orderby_rows_0_preceding_first_last.12.all.iq  | 185 +++--
 .../orderby_rows_0_preceding_first_last.13.all.iq  | 175 +++--
 .../orderby_rows_0_preceding_first_last.14.all.iq  | 168 +++--
 .../orderby_rows_0_preceding_sum_count.01.all.iq   | 220 +++---
 .../orderby_rows_0_preceding_sum_count.02.all.iq   | 130 ++--
 .../orderby_rows_0_preceding_sum_count.03.all.iq   | 196 +++--
 .../orderby_rows_0_preceding_sum_count.04.all.iq   | 166 +++--
 .../orderby_rows_0_preceding_sum_count.05.all.iq   | 184 +++--
 .../orderby_rows_0_preceding_sum_count.06.all.iq   | 178 +++--
 .../orderby_rows_0_preceding_sum_count.07.all.iq   | 158 ++--
 .../orderby_rows_0_preceding_sum_count.08.all.iq   | 213 +++---
 .../orderby_rows_0_preceding_sum_count.09.all.iq   | 127 ++--
 .../orderby_rows_0_preceding_sum_count.10.all.iq   | 199 ++++--
 .../orderby_rows_0_preceding_sum_count.11.all.iq   | 173 +++--
 .../orderby_rows_0_preceding_sum_count.12.all.iq   | 289 ++++----
 .../orderby_rows_0_preceding_sum_count.13.all.iq   | 399 ++++++-----
 .../orderby_rows_0_preceding_sum_count.14.all.iq   | 408 ++++++-----
 .../orderby_rows_1_following_first_last.01.all.iq  | 220 +++---
 .../orderby_rows_1_following_first_last.02.all.iq  | 130 ++--
 .../orderby_rows_1_following_first_last.03.all.iq  | 196 +++--
 .../orderby_rows_1_following_first_last.04.all.iq  | 166 +++--
 .../orderby_rows_1_following_first_last.05.all.iq  | 184 +++--
 .../orderby_rows_1_following_first_last.06.all.iq  | 178 +++--
 .../orderby_rows_1_following_first_last.07.all.iq  | 158 ++--
 .../orderby_rows_1_following_first_last.08.all.iq  | 213 +++---
 .../orderby_rows_1_following_first_last.09.all.iq  | 127 ++--
 .../orderby_rows_1_following_first_last.10.all.iq  | 199 ++++--
 .../orderby_rows_1_following_first_last.11.all.iq  | 165 +++--
 .../orderby_rows_1_following_first_last.12.all.iq  | 185 +++--
 .../orderby_rows_1_following_first_last.13.all.iq  | 175 +++--
 .../orderby_rows_1_following_first_last.14.all.iq  | 168 +++--
 .../orderby_rows_1_following_sum_count.01.all.iq   | 316 ++++----
 .../orderby_rows_1_following_sum_count.02.all.iq   | 146 ++--
 .../orderby_rows_1_following_sum_count.03.all.iq   | 196 +++--
 .../orderby_rows_1_following_sum_count.04.all.iq   | 166 +++--
 .../orderby_rows_1_following_sum_count.05.all.iq   | 184 +++--
 .../orderby_rows_1_following_sum_count.06.all.iq   | 178 +++--
 .../orderby_rows_1_following_sum_count.07.all.iq   | 158 ++--
 .../orderby_rows_1_following_sum_count.08.all.iq   | 213 +++---
 .../orderby_rows_1_following_sum_count.09.all.iq   | 127 ++--
 .../orderby_rows_1_following_sum_count.10.all.iq   | 199 ++++--
 .../orderby_rows_1_following_sum_count.11.all.iq   | 173 +++--
 .../orderby_rows_1_following_sum_count.12.all.iq   | 289 ++++----
 .../orderby_rows_1_following_sum_count.13.all.iq   | 399 ++++++-----
 .../orderby_rows_1_following_sum_count.14.all.iq   | 408 ++++++-----
 .../orderby_rows_1_preceding_first_last.01.all.iq  | 220 +++---
 .../orderby_rows_1_preceding_first_last.02.all.iq  | 130 ++--
 .../orderby_rows_1_preceding_first_last.03.all.iq  | 196 +++--
 .../orderby_rows_1_preceding_first_last.04.all.iq  | 166 +++--
 .../orderby_rows_1_preceding_first_last.05.all.iq  | 184 +++--
 .../orderby_rows_1_preceding_first_last.06.all.iq  | 178 +++--
 .../orderby_rows_1_preceding_first_last.07.all.iq  | 158 ++--
 .../orderby_rows_1_preceding_first_last.08.all.iq  | 213 +++---
 .../orderby_rows_1_preceding_first_last.09.all.iq  | 127 ++--
 .../orderby_rows_1_preceding_first_last.10.all.iq  | 199 ++++--
 .../orderby_rows_1_preceding_first_last.11.all.iq  | 165 +++--
 .../orderby_rows_1_preceding_first_last.12.all.iq  | 185 +++--
 .../orderby_rows_1_preceding_first_last.13.all.iq  | 175 +++--
 .../orderby_rows_1_preceding_first_last.14.all.iq  | 168 +++--
 .../orderby_rows_1_preceding_sum_count.01.all.iq   | 316 ++++----
 .../orderby_rows_1_preceding_sum_count.02.all.iq   | 130 ++--
 .../orderby_rows_1_preceding_sum_count.03.all.iq   | 196 +++--
 .../orderby_rows_1_preceding_sum_count.04.all.iq   | 190 +++--
 .../orderby_rows_1_preceding_sum_count.05.all.iq   | 256 ++++---
 .../orderby_rows_1_preceding_sum_count.06.all.iq   | 226 +++---
 .../orderby_rows_1_preceding_sum_count.07.all.iq   | 206 +++---
 .../orderby_rows_1_preceding_sum_count.08.all.iq   | 305 ++++----
 .../orderby_rows_1_preceding_sum_count.09.all.iq   | 131 ++--
 .../orderby_rows_1_preceding_sum_count.10.all.iq   | 295 ++++----
 .../orderby_rows_1_preceding_sum_count.11.all.iq   | 173 +++--
 .../orderby_rows_1_preceding_sum_count.12.all.iq   | 321 +++++----
 .../orderby_rows_1_preceding_sum_count.13.all.iq   | 383 +++++-----
 .../orderby_rows_1_preceding_sum_count.14.all.iq   | 392 +++++-----
 .../orderby_rows_current_first_last.01.all.iq      | 220 +++---
 .../orderby_rows_current_first_last.02.all.iq      | 130 ++--
 .../orderby_rows_current_first_last.03.all.iq      | 196 +++--
 .../orderby_rows_current_first_last.04.all.iq      | 166 +++--
 .../orderby_rows_current_first_last.05.all.iq      | 184 +++--
 .../orderby_rows_current_first_last.06.all.iq      | 178 +++--
 .../orderby_rows_current_first_last.07.all.iq      | 158 ++--
 .../orderby_rows_current_first_last.08.all.iq      | 213 +++---
 .../orderby_rows_current_first_last.09.all.iq      | 127 ++--
 .../orderby_rows_current_first_last.10.all.iq      | 199 ++++--
 .../orderby_rows_current_first_last.11.all.iq      | 165 +++--
 .../orderby_rows_current_first_last.12.all.iq      | 185 +++--
 .../orderby_rows_current_first_last.13.all.iq      | 175 +++--
 .../orderby_rows_current_first_last.14.all.iq      | 232 +++---
 .../qaWin/orderby_rows_current_sum_count.01.all.iq | 220 +++---
 .../qaWin/orderby_rows_current_sum_count.02.all.iq | 130 ++--
 .../qaWin/orderby_rows_current_sum_count.03.all.iq | 196 +++--
 .../qaWin/orderby_rows_current_sum_count.04.all.iq | 166 +++--
 .../qaWin/orderby_rows_current_sum_count.05.all.iq | 184 +++--
 .../qaWin/orderby_rows_current_sum_count.06.all.iq | 178 +++--
 .../qaWin/orderby_rows_current_sum_count.07.all.iq | 158 ++--
 .../qaWin/orderby_rows_current_sum_count.08.all.iq | 213 +++---
 .../qaWin/orderby_rows_current_sum_count.09.all.iq | 127 ++--
 .../qaWin/orderby_rows_current_sum_count.10.all.iq | 199 ++++--
 .../qaWin/orderby_rows_current_sum_count.11.all.iq | 173 +++--
 .../qaWin/orderby_rows_current_sum_count.12.all.iq | 289 ++++----
 .../qaWin/orderby_rows_current_sum_count.13.all.iq | 399 ++++++-----
 .../qaWin/orderby_rows_current_sum_count.14.all.iq | 408 ++++++-----
 .../orderby_rows_negative_first_last.01.all.iq     | 220 +++---
 .../orderby_rows_negative_first_last.02.all.iq     | 130 ++--
 .../orderby_rows_negative_first_last.03.all.iq     | 196 +++--
 .../orderby_rows_negative_first_last.04.all.iq     | 166 +++--
 .../orderby_rows_negative_first_last.05.all.iq     | 184 +++--
 .../orderby_rows_negative_first_last.06.all.iq     | 178 +++--
 .../orderby_rows_negative_first_last.07.all.iq     | 158 ++--
 .../orderby_rows_negative_first_last.08.all.iq     | 213 +++---
 .../orderby_rows_negative_first_last.09.all.iq     | 127 ++--
 .../orderby_rows_negative_first_last.10.all.iq     | 199 ++++--
 .../orderby_rows_negative_first_last.11.all.iq     | 165 +++--
 .../orderby_rows_negative_first_last.12.all.iq     | 185 +++--
 .../orderby_rows_negative_first_last.13.all.iq     |  35 +-
 .../orderby_rows_negative_sum_count.01.all.iq      | 220 +++---
 .../orderby_rows_negative_sum_count.02.all.iq      | 130 ++--
 .../orderby_rows_negative_sum_count.03.all.iq      | 196 +++--
 .../orderby_rows_negative_sum_count.04.all.iq      | 166 +++--
 .../orderby_rows_negative_sum_count.05.all.iq      | 184 +++--
 .../orderby_rows_negative_sum_count.06.all.iq      | 178 +++--
 .../orderby_rows_negative_sum_count.07.all.iq      | 158 ++--
 .../orderby_rows_negative_sum_count.08.all.iq      | 213 +++---
 .../orderby_rows_negative_sum_count.09.all.iq      | 127 ++--
 .../orderby_rows_negative_sum_count.10.all.iq      | 199 ++++--
 .../orderby_rows_negative_sum_count.11.all.iq      | 165 +++--
 .../orderby_rows_negative_sum_count.12.all.iq      | 185 +++--
 .../orderby_rows_negative_sum_count.13.all.iq      |  35 +-
 .../orderby_rows_ub_following_first_last.01.all.iq | 220 +++---
 .../orderby_rows_ub_following_first_last.02.all.iq | 194 ++---
 .../orderby_rows_ub_following_first_last.03.all.iq | 196 +++--
 .../orderby_rows_ub_following_first_last.04.all.iq | 166 +++--
 .../orderby_rows_ub_following_first_last.05.all.iq | 184 +++--
 .../orderby_rows_ub_following_first_last.06.all.iq | 178 +++--
 .../orderby_rows_ub_following_first_last.07.all.iq | 158 ++--
 .../orderby_rows_ub_following_first_last.08.all.iq | 213 +++---
 .../orderby_rows_ub_following_first_last.09.all.iq | 127 ++--
 .../orderby_rows_ub_following_first_last.10.all.iq | 199 ++++--
 .../orderby_rows_ub_following_first_last.11.all.iq | 165 +++--
 .../orderby_rows_ub_following_first_last.12.all.iq | 185 +++--
 .../orderby_rows_ub_following_first_last.13.all.iq | 175 +++--
 .../orderby_rows_ub_following_first_last.14.all.iq | 168 +++--
 .../orderby_rows_ub_following_sum_count.01.all.iq  | 604 +++++++++-------
 .../orderby_rows_ub_following_sum_count.02.all.iq  | 210 +++---
 .../orderby_rows_ub_following_sum_count.03.all.iq  | 196 +++--
 .../orderby_rows_ub_following_sum_count.04.all.iq  | 166 +++--
 .../orderby_rows_ub_following_sum_count.05.all.iq  | 184 +++--
 .../orderby_rows_ub_following_sum_count.06.all.iq  | 178 +++--
 .../orderby_rows_ub_following_sum_count.07.all.iq  | 158 ++--
 .../orderby_rows_ub_following_sum_count.08.all.iq  | 213 +++---
 .../orderby_rows_ub_following_sum_count.09.all.iq  | 127 ++--
 .../orderby_rows_ub_following_sum_count.10.all.iq  | 199 ++++--
 .../orderby_rows_ub_following_sum_count.11.all.iq  | 165 +++--
 .../orderby_rows_ub_following_sum_count.12.all.iq  | 185 +++--
 .../orderby_rows_ub_following_sum_count.13.all.iq  | 175 +++--
 .../orderby_rows_ub_following_sum_count.14.all.iq  | 168 +++--
 .../orderby_rows_ub_preceding_first_last.01.all.iq | 220 +++---
 .../orderby_rows_ub_preceding_first_last.02.all.iq | 130 ++--
 .../orderby_rows_ub_preceding_first_last.03.all.iq | 196 +++--
 .../orderby_rows_ub_preceding_first_last.04.all.iq | 166 +++--
 .../orderby_rows_ub_preceding_first_last.05.all.iq | 184 +++--
 .../orderby_rows_ub_preceding_first_last.06.all.iq | 178 +++--
 .../orderby_rows_ub_preceding_first_last.07.all.iq | 158 ++--
 .../orderby_rows_ub_preceding_first_last.08.all.iq | 213 +++---
 .../orderby_rows_ub_preceding_first_last.09.all.iq | 127 ++--
 .../orderby_rows_ub_preceding_first_last.10.all.iq | 199 ++++--
 .../orderby_rows_ub_preceding_first_last.11.all.iq | 165 +++--
 .../orderby_rows_ub_preceding_first_last.12.all.iq | 185 +++--
 .../orderby_rows_ub_preceding_first_last.13.all.iq | 175 +++--
 .../orderby_rows_ub_preceding_first_last.14.all.iq | 232 +++---
 .../orderby_rows_ub_preceding_sum_count.01.all.iq  | 604 +++++++++-------
 .../orderby_rows_ub_preceding_sum_count.02.all.iq  | 210 +++---
 .../orderby_rows_ub_preceding_sum_count.03.all.iq  | 196 +++--
 .../orderby_rows_ub_preceding_sum_count.04.all.iq  | 278 +++----
 .../orderby_rows_ub_preceding_sum_count.05.all.iq  | 536 +++++++-------
 .../orderby_rows_ub_preceding_sum_count.06.all.iq  | 402 ++++++-----
 .../orderby_rows_ub_preceding_sum_count.07.all.iq  | 398 ++++++-----
 .../orderby_rows_ub_preceding_sum_count.08.all.iq  | 581 ++++++++-------
 .../orderby_rows_ub_preceding_sum_count.09.all.iq  | 231 +++---
 .../orderby_rows_ub_preceding_sum_count.10.all.iq  | 599 +++++++++-------
 .../orderby_rows_ub_preceding_sum_count.11.all.iq  | 297 ++++----
 .../orderby_rows_ub_preceding_sum_count.12.all.iq  | 517 +++++++------
 .../orderby_rows_ub_preceding_sum_count.13.all.iq  | 175 +++--
 .../orderby_rows_ub_preceding_sum_count.14.all.iq  | 168 +++--
 .../qaWin/sql_explain.msq.iq                       | 220 ++++--
 .../qaWin/sql_explain.std.iq                       | 122 ++--
 .../qaWin/sql_group_by.msq.iq                      | 116 +--
 .../qaWin/sql_group_by.std.iq                      | 284 ++++----
 .../qaWin/sql_join.01.msq.iq                       | 692 ++++++++++--------
 .../qaWin/sql_join.01.std.iq                       | 692 ++++++++++--------
 .../qaWin/sql_join.02.msq.iq                       |  92 ++-
 .../qaWin/sql_join.02.std.iq                       |  92 ++-
 .../qaWin/sql_limit_offset.all.iq                  |  84 ++-
 .../qaWin/sql_order_by.all.iq                      | 510 +++++++------
 .../qaWin/sql_select_count.all.iq                  | 316 ++++----
 .../qaWin/sql_select_distinct.all.iq               | 212 +++---
 .../qaWin/sql_subquery_with_where.all.iq           | 300 ++++----
 .../qaWin/sql_union_all.msq.iq                     | 142 ++--
 .../qaWin/sql_union_all.std.iq                     | 270 +++----
 470 files changed, 56268 insertions(+), 38338 deletions(-)

diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_basic_syntax.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_basic_syntax.all.iq
index db9012b3649..714b18e7062 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_basic_syntax.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_basic_syntax.all.iq
@@ -26,7 +26,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -64,7 +64,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -110,7 +110,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -143,7 +144,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -182,7 +184,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW 123 AS (PARTITION BY client_ip
                                                  ORDER BY server_ip,
-                                                          timezone);
+                                                          timezone,
+                                                          time_floor(__time, 'PT12H'));
 QueryInterruptedException
 !error
 
@@ -202,7 +205,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW 123 AS (PARTITION BY client_ip
                                                     ORDER BY server_ip,
-                                                             timezone);
+                                                             timezone,
+                                                             time_floor(__time, 'PT12H'));
 QueryInterruptedException
 !error
 
@@ -228,7 +232,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW "123" AS (PARTITION BY client_ip
                                                    ORDER BY server_ip,
-                                                            timezone);
+                                                            timezone,
+                                                            time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -261,7 +266,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW "123" AS (PARTITION BY client_ip
                                                       ORDER BY server_ip,
-                                                               timezone);
+                                                               timezone,
+                                                               time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -300,7 +306,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 Window 'doesntexist' not found
 !error
 
@@ -320,7 +327,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 Window 'doesntexist' not found
 !error
 
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_data_types_and_exprs.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_data_types_and_exprs.all.iq
index 38d1274a073..db89906c6b6 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_data_types_and_exprs.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_data_types_and_exprs.all.iq
@@ -26,7 +26,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY timezone
-                          ORDER BY server_ip, timezone, timezone) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), timezone) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -46,10 +46,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -77,8 +77,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY timezone
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         timezone);
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -86,10 +88,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -104,7 +106,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY timezone
-                          ORDER BY server_ip, timezone, timezone) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), timezone) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -118,10 +120,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -143,8 +145,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY timezone
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            timezone);
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -152,10 +156,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -170,7 +174,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY length(timezone)
-                          ORDER BY server_ip, timezone, length(timezone)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), length(timezone)) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -190,10 +194,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -221,8 +225,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY length(timezone)
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         length(timezone));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -230,10 +236,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -248,7 +254,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY length(timezone)
-                          ORDER BY server_ip, timezone, length(timezone)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), length(timezone)) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -262,10 +268,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -287,8 +293,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY length(timezone)
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            length(timezone));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -296,10 +304,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -314,7 +322,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY cos(length(timezone))
-                          ORDER BY server_ip, timezone, cos(length(timezone))) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), cos(length(timezone))) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -334,10 +342,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -365,8 +373,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY cos(length(timezone))
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         cos(length(timezone)));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -374,10 +384,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -392,7 +402,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY cos(length(timezone))
-                          ORDER BY server_ip, timezone, cos(length(timezone))) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), cos(length(timezone))) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -406,10 +416,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -431,8 +441,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY cos(length(timezone))
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            cos(length(timezone)));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -440,10 +452,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -458,7 +470,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY (timezone IS NULL)
-                          ORDER BY server_ip, timezone, (timezone IS NULL)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), (timezone IS NULL)) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -478,10 +490,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -509,18 +521,20 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY (timezone IS NULL)
-                                               ORDER BY server_ip,
-                                                        timezone, (timezone IS NULL));
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'), (timezone IS NULL));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -535,7 +549,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY (timezone IS NULL)
-                          ORDER BY server_ip, timezone, (timezone IS NULL)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), (timezone IS NULL)) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -549,10 +563,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -574,18 +588,20 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY (timezone IS NULL)
-                                                  ORDER BY server_ip,
-                                                           timezone, (timezone IS NULL));
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'), (timezone IS NULL));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -600,7 +616,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY time_parse(cast(length(timezone) AS char))
-                          ORDER BY server_ip, timezone, time_parse(cast(length(timezone) AS char))) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), time_parse(cast(length(timezone) AS char))) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -620,10 +636,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -651,8 +667,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY time_parse(cast(length(timezone) AS char))
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         time_parse(cast(length(timezone) AS char)));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -660,10 +678,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -678,7 +696,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY time_parse(cast(length(timezone) AS char))
-                          ORDER BY server_ip, timezone, time_parse(cast(length(timezone) AS char))) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), time_parse(cast(length(timezone) AS char))) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -692,10 +710,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -717,8 +735,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY time_parse(cast(length(timezone) AS char))
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            time_parse(cast(length(timezone) AS char)));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -726,10 +746,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -744,7 +764,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY json_object('key': 'k', 'value': timezone)
-                          ORDER BY server_ip, timezone, json_object('key': 'k', 'value': timezone)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), json_object('key': 'k', 'value': timezone)) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -764,10 +784,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -795,8 +815,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY json_object('key': 'k', 'value': timezone)
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         json_object('key': 'k', 'value': timezone));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -804,10 +826,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -822,7 +844,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY json_object('key': 'k', 'value': timezone)
-                          ORDER BY server_ip, timezone, json_object('key': 'k', 'value': timezone)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), json_object('key': 'k', 'value': timezone)) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -836,10 +858,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -861,8 +883,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY json_object('key': 'k', 'value': timezone)
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            json_object('key': 'k', 'value': timezone));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -870,10 +894,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -888,7 +912,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY array['A', 'B', timezone]
-                          ORDER BY server_ip, timezone, array['A', 'B', timezone]) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), array['A', 'B', timezone]) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -908,10 +932,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -941,20 +965,22 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY array['A',
                                                                   'B',
                                                                   timezone]
-                                               ORDER BY server_ip,
-                                                        timezone, array['A',
-                                                                        'B',
-                                                                        timezone]);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'), array['A',
+                                                                                           'B',
+                                                                                           timezone]);
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -969,7 +995,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY array['A', 'B', timezone]
-                          ORDER BY server_ip, timezone, array['A', 'B', timezone]) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), array['A', 'B', timezone]) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -983,10 +1009,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -1010,20 +1036,22 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY array['A',
                                                                      'B',
                                                                      timezone]
-                                                  ORDER BY server_ip,
-                                                           timezone, array['A',
-                                                                           'B',
-                                                                           timezone]);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'), array['A',
+                                                                                              'B',
+                                                                                              timezone]);
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -1038,7 +1066,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY array[1, 2, length(timezone)]
-                          ORDER BY server_ip, timezone, array[1, 2, length(timezone)]) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), array[1, 2, length(timezone)]) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1058,10 +1086,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -1091,20 +1119,22 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY array[1,
                                                                   2,
                                                                   length(timezone)]
-                                               ORDER BY server_ip,
-                                                        timezone, array[1,
-                                                                        2,
-                                                                        length(timezone)]);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'), array[1,
+                                                                                           2,
+                                                                                           length(timezone)]);
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -1119,7 +1149,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY array[1, 2, length(timezone)]
-                          ORDER BY server_ip, timezone, array[1, 2, length(timezone)]) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), array[1, 2, length(timezone)]) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1133,10 +1163,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -1160,20 +1190,22 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY array[1,
                                                                      2,
                                                                      length(timezone)]
-                                                  ORDER BY server_ip,
-                                                           timezone, array[1,
-                                                                           2,
-                                                                           length(timezone)]);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'), array[1,
+                                                                                              2,
+                                                                                              length(timezone)]);
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -1188,7 +1220,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY string_to_mv('1,2,3', ',')
-                          ORDER BY server_ip, timezone, string_to_mv('1,2,3', ',')) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), string_to_mv('1,2,3', ',')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1226,8 +1258,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY string_to_mv('1,2,3', ',')
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         string_to_mv('1,2,3', ','));
 Window processing does not support MVDs. Consider using UNNEST or MV_TO_ARRAY.
 !error
@@ -1240,7 +1274,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY string_to_mv('1,2,3', ',')
-                          ORDER BY server_ip, timezone, string_to_mv('1,2,3', ',')) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), string_to_mv('1,2,3', ',')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1266,8 +1300,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY string_to_mv('1,2,3', ',')
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            string_to_mv('1,2,3', ','));
 Window processing does not support MVDs. Consider using UNNEST or MV_TO_ARRAY.
 !error
@@ -1280,7 +1316,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY array_to_mv(array['A', 'B', timezone])
-                          ORDER BY server_ip, timezone, array_to_mv(array['A', 'B', timezone])) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), array_to_mv(array['A', 'B', timezone])) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1318,8 +1354,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY array_to_mv(array['A', 'B', timezone])
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         array_to_mv(array['A', 'B', timezone]));
 Window processing does not support MVDs. Consider using UNNEST or MV_TO_ARRAY.
 !error
@@ -1332,7 +1370,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY array_to_mv(array['A', 'B', timezone])
-                          ORDER BY server_ip, timezone, array_to_mv(array['A', 'B', timezone])) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), array_to_mv(array['A', 'B', timezone])) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1358,8 +1396,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY array_to_mv(array['A', 'B', timezone])
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            array_to_mv(array['A', 'B', timezone]));
 Window processing does not support MVDs. Consider using UNNEST or MV_TO_ARRAY.
 !error
@@ -1372,7 +1412,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY length(timezone)+length(timezone)
-                          ORDER BY server_ip, timezone, length(timezone)+length(timezone)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), length(timezone)+length(timezone)) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1392,10 +1432,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -1423,8 +1463,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY length(timezone)+length(timezone)
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         length(timezone)+length(timezone));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -1432,10 +1474,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -1450,7 +1492,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY length(timezone)+length(timezone)
-                          ORDER BY server_ip, timezone, length(timezone)+length(timezone)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), length(timezone)+length(timezone)) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1464,10 +1506,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -1489,8 +1531,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY length(timezone)+length(timezone)
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            length(timezone)+length(timezone));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
@@ -1498,10 +1542,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_group_by.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_group_by.all.iq
index af8311bb211..61a61052dbd 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_group_by.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_group_by.all.iq
@@ -26,7 +26,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -78,7 +78,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -103,7 +104,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -143,7 +144,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_multi_windows.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_multi_windows.all.iq
index 69bb71162e6..6780fc30ba0 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_multi_windows.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_multi_windows.all.iq
@@ -26,9 +26,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c1,
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c1,
        count(timezone) OVER (PARTITION BY timezone
-                             ORDER BY server_ip, timezone) AS c2
+                             ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c2
 FROM
   (SELECT server_ip,
           client_ip,
@@ -45,13 +45,13 @@ WHERE client_ip IN ('107.13.54.103',
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  2 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  1 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  3 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  4 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  4 |
 +--------------+---------------+----------+---------------------+----+----+
 (8 rows)
@@ -66,9 +66,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c1,
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c1,
        count(timezone) OVER (PARTITION BY timezone
-                             ORDER BY server_ip, timezone) AS c2
+                             ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c2
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -79,13 +79,13 @@ GROUP BY server_ip,
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  2 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  1 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  3 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  4 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  4 |
 +--------------+---------------+----------+---------------------+----+----+
 (8 rows)
@@ -115,10 +115,13 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w1 AS (PARTITION BY client_ip
                                                 ORDER BY server_ip,
-                                                         timezone),
+                                                         timezone,
+                                                         time_floor(__time, 'PT12H')),
                                          w2 OVER (PARTITION BY timezone
-                                                  ORDER BY server_ip,
-                                                           timezone);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 Received an unexpected token
 !error
 
@@ -139,10 +142,13 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w1 AS (PARTITION BY client_ip
                                                    ORDER BY server_ip,
-                                                            timezone),
+                                                            timezone,
+                                                            time_floor(__time, 'PT12H')),
                                             w2 OVER (PARTITION BY timezone
-                                                     ORDER BY server_ip,
-                                                              timezone);
+                                                     ORDER BY client_ip,
+                                                              server_ip,
+                                                              timezone,
+                                                              time_floor(__time, 'PT12H'));
 Received an unexpected token
 !error
 
@@ -154,9 +160,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c1,
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c1,
        count(timezone) OVER (PARTITION BY client_ip
-                             ORDER BY server_ip, timezone) AS c2
+                             ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c2
 FROM
   (SELECT server_ip,
           client_ip,
@@ -173,11 +179,11 @@ WHERE client_ip IN ('107.13.54.103',
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  5 |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  2 |
@@ -194,9 +200,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c1,
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c1,
        count(timezone) OVER (PARTITION BY client_ip
-                             ORDER BY server_ip, timezone) AS c2
+                             ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c2
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -207,11 +213,11 @@ GROUP BY server_ip,
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  5 |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  2 |
@@ -243,15 +249,16 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  5 |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  2 |
@@ -277,15 +284,16 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  5 |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  2 |
@@ -302,9 +310,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        count(timezone) OVER (PARTITION BY client_ip
-                             ORDER BY server_ip, timezone) AS c1,
+                             ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c1,
        count(timezone) OVER (PARTITION BY timezone
-                             ORDER BY server_ip, timezone) AS c2
+                             ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c2
 FROM
   (SELECT server_ip,
           client_ip,
@@ -321,13 +329,13 @@ WHERE client_ip IN ('107.13.54.103',
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  2 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  2 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  5 |  4 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  1 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  3 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  4 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  4 |
 +--------------+---------------+----------+---------------------+----+----+
 (8 rows)
@@ -342,9 +350,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        count(timezone) OVER (PARTITION BY client_ip
-                             ORDER BY server_ip, timezone) AS c1,
+                             ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c1,
        count(timezone) OVER (PARTITION BY timezone
-                             ORDER BY server_ip, timezone) AS c2
+                             ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c2
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -355,13 +363,13 @@ GROUP BY server_ip,
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  2 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  2 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  5 |  4 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  1 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  3 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  3 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  4 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  2 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  4 |
 +--------------+---------------+----------+---------------------+----+----+
 (8 rows)
@@ -391,10 +399,13 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w1 AS (PARTITION BY client_ip
                                                 ORDER BY server_ip,
-                                                         timezone),
+                                                         timezone,
+                                                         time_floor(__time, 'PT12H')),
                                          w2 OVER (PARTITION BY timezone
-                                                  ORDER BY server_ip,
-                                                           timezone);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 Received an unexpected token
 !error
 
@@ -415,10 +426,13 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w1 AS (PARTITION BY client_ip
                                                    ORDER BY server_ip,
-                                                            timezone),
+                                                            timezone,
+                                                            time_floor(__time, 'PT12H')),
                                             w2 OVER (PARTITION BY timezone
-                                                     ORDER BY server_ip,
-                                                              timezone);
+                                                     ORDER BY client_ip,
+                                                              server_ip,
+                                                              timezone,
+                                                              time_floor(__time, 'PT12H'));
 Received an unexpected token
 !error
 
@@ -430,9 +444,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        count(timezone) OVER (PARTITION BY client_ip
-                             ORDER BY server_ip, timezone) AS c1,
+                             ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c1,
        count(timezone) OVER (PARTITION BY client_ip
-                             ORDER BY server_ip, timezone) AS c2
+                             ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c2
 FROM
   (SELECT server_ip,
           client_ip,
@@ -449,11 +463,11 @@ WHERE client_ip IN ('107.13.54.103',
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  2 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  5 |  5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  5 |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  2 |
@@ -470,9 +484,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        count(timezone) OVER (PARTITION BY client_ip
-                             ORDER BY server_ip, timezone) AS c1,
+                             ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c1,
        count(timezone) OVER (PARTITION BY client_ip
-                             ORDER BY server_ip, timezone) AS c2
+                             ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c2
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -483,11 +497,11 @@ GROUP BY server_ip,
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  2 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  5 |  5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  5 |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  2 |
@@ -519,15 +533,16 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  2 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  5 |  5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  5 |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  2 |
@@ -553,15 +568,16 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+----+----+
 | server_ip    | client_ip     | timezone | t                   | c1 | c2 |
 +--------------+---------------+----------+---------------------+----+----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  2 |  2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  1 |  1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  2 |  2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  3 |  3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1 |  1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  5 |  5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  4 |  4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  5 |  5 |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  6 |  6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  2 |  2 |
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_order_by_basic.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_order_by_basic.all.iq
index a9d2c7e19cb..ab6bb34ec17 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_order_by_basic.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_order_by_basic.all.iq
@@ -250,7 +250,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip ASC, timezone) AS c
+                          ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -302,7 +302,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -327,7 +328,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip ASC, timezone) AS c
+                          ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -367,7 +368,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -392,7 +394,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip DESC, timezone) AS c
+                          ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -444,7 +446,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -469,7 +472,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip DESC, timezone) AS c
+                          ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -509,7 +512,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -534,7 +538,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip ASC, length(server_ip) DESC, timezone) AS c
+                          ORDER BY server_ip ASC, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -586,7 +590,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
-                                                        length(server_ip) DESC, timezone);
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -611,7 +616,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip ASC, length(server_ip) DESC, timezone) AS c
+                          ORDER BY server_ip ASC, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -651,7 +656,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
-                                                           length(server_ip) DESC, timezone);
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -676,7 +682,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip DESC, length(server_ip) ASC, CURRENT_TIMESTAMP, timezone) AS c
+                          ORDER BY server_ip DESC, length(server_ip) ASC, CURRENT_TIMESTAMP, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -729,7 +735,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
                                                         length(server_ip) ASC, CURRENT_TIMESTAMP,
-                                                                               timezone);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -754,7 +761,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip DESC, length(server_ip) ASC, CURRENT_TIMESTAMP, timezone) AS c
+                          ORDER BY server_ip DESC, length(server_ip) ASC, CURRENT_TIMESTAMP, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -795,7 +802,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
                                                            length(server_ip) ASC, CURRENT_TIMESTAMP,
-                                                                                  timezone);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -820,7 +828,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, server_ip, server_ip, timezone) AS c
+                          ORDER BY server_ip, server_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -874,7 +882,8 @@ WHERE client_ip IN ('107.13.54.103',
                                                ORDER BY server_ip,
                                                         server_ip,
                                                         server_ip,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -899,7 +908,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, server_ip, server_ip, timezone) AS c
+                          ORDER BY server_ip, server_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -941,7 +950,8 @@ GROUP BY server_ip,
                                                   ORDER BY server_ip,
                                                            server_ip,
                                                            server_ip,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -966,7 +976,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip ASC, server_ip DESC, server_ip ASC, timezone) AS c
+                          ORDER BY server_ip ASC, server_ip DESC, server_ip ASC, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1020,7 +1030,8 @@ WHERE client_ip IN ('107.13.54.103',
                                                ORDER BY server_ip ASC,
                                                         server_ip DESC,
                                                         server_ip ASC,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -1045,7 +1056,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip ASC, server_ip DESC, server_ip ASC, timezone) AS c
+                          ORDER BY server_ip ASC, server_ip DESC, server_ip ASC, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1087,7 +1098,8 @@ GROUP BY server_ip,
                                                   ORDER BY server_ip ASC,
                                                            server_ip DESC,
                                                            server_ip ASC,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_order_by_nulls_first_last.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_order_by_nulls_first_last.all.iq
index 3b54c07551c..e4c1eba2704 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_order_by_nulls_first_last.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_order_by_nulls_first_last.all.iq
@@ -34,7 +34,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone NULLS FIRST);
+                                                           timezone NULLS FIRST,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -67,7 +68,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone NULLS LAST);
+                                                           timezone NULLS LAST,
+                                                           time_floor(__time, 'PT12H'));
 ASCENDING ordering with NULLS LAST is not supported
 !error
 
@@ -87,7 +89,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone ASC NULLS FIRST);
+                                                           timezone ASC NULLS FIRST,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -120,7 +123,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone ASC NULLS LAST);
+                                                           timezone ASC NULLS LAST,
+                                                           time_floor(__time, 'PT12H'));
 ASCENDING ordering with NULLS LAST is not supported
 !error
 
@@ -140,7 +144,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone DESC NULLS FIRST);
+                                                           timezone DESC NULLS FIRST,
+                                                           time_floor(__time, 'PT12H'));
 DESCENDING ordering with NULLS FIRST is not supported
 !error
 
@@ -160,7 +165,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone DESC NULLS LAST);
+                                                           timezone DESC NULLS LAST,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_and_aggr.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_and_aggr.all.iq
index 1bc018531c6..7d3ac9d1f07 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_and_aggr.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_and_aggr.all.iq
@@ -27,7 +27,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        length(timezone) AS mycol,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -80,7 +80,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip,
-                                                        timezone);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-------+---+
 | server_ip    | client_ip     | timezone | t                   | mycol | c |
 +--------------+---------------+----------+---------------------+-------+---+
@@ -106,7 +107,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        length(timezone) AS mycol,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -147,7 +148,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-------+---+
 | server_ip    | client_ip     | timezone | t                   | mycol | c |
 +--------------+---------------+----------+---------------------+-------+---+
@@ -173,7 +175,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        length(timezone) AS mycol,
        row_number() OVER (PARTITION BY length(timezone)
-                          ORDER BY server_ip, timezone, length(timezone)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), length(timezone)) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -193,10 +195,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 8 |
 +--------------+---------------+----------+---------------------+-------+---+
 (8 rows)
@@ -225,8 +227,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY length(timezone)
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         length(timezone));
 +--------------+---------------+----------+---------------------+-------+---+
 | server_ip    | client_ip     | timezone | t                   | mycol | c |
@@ -234,10 +238,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 8 |
 +--------------+---------------+----------+---------------------+-------+---+
 (8 rows)
@@ -253,7 +257,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        length(timezone) AS mycol,
        row_number() OVER (PARTITION BY length(timezone)
-                          ORDER BY server_ip, timezone, length(timezone)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), length(timezone)) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -267,10 +271,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 8 |
 +--------------+---------------+----------+---------------------+-------+---+
 (8 rows)
@@ -293,8 +297,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY length(timezone)
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            length(timezone));
 +--------------+---------------+----------+---------------------+-------+---+
 | server_ip    | client_ip     | timezone | t                   | mycol | c |
@@ -302,10 +308,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |     3 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |     3 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |     3 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |     3 | 8 |
 +--------------+---------------+----------+---------------------+-------+---+
 (8 rows)
@@ -321,7 +327,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        length(timezone) AS mycol,
        row_number() OVER (PARTITION BY mycol
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -360,8 +366,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY mycol
-                                               ORDER BY server_ip,
-                                                        timezone);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 Column 'mycol' not found in any table
 !error
 
@@ -374,7 +382,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        length(timezone) AS mycol,
        row_number() OVER (PARTITION BY mycol
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -401,8 +409,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY mycol
-                                                  ORDER BY server_ip,
-                                                           timezone);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 Column 'mycol' not found in any table
 !error
 
@@ -415,7 +425,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        length(timezone) AS mycol,
        row_number() OVER (PARTITION BY timezone
-                          ORDER BY server_ip, timezone, mycol) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), mycol) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -454,8 +464,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY timezone
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         timezone,
+                                                        time_floor(__time, 'PT12H'),
                                                         mycol);
 Column 'mycol' not found in any table
 !error
@@ -469,7 +481,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        length(timezone) AS mycol,
        row_number() OVER (PARTITION BY timezone
-                          ORDER BY server_ip, timezone, mycol) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), mycol) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -496,8 +508,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY timezone
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            mycol);
 Column 'mycol' not found in any table
 !error
@@ -511,7 +525,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        count(*) AS mycol,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -552,7 +566,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
-                                                           timezone);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-------+---+
 | server_ip    | client_ip     | timezone | t                   | mycol | c |
 +--------------+---------------+----------+---------------------+-------+---+
@@ -578,7 +593,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        count(*) AS mycol,
        row_number() OVER (PARTITION BY count(*)
-                          ORDER BY server_ip, timezone, count(*)) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'), count(*)) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -618,8 +633,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY count(*)
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            count(*));
 Aggregation inside window is currently not supported with syntax WINDOW W AS <DEF>. Try providing window definition directly without alias
 !error
@@ -633,7 +650,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        count(*) AS mycol,
        row_number() OVER (PARTITION BY mycol
-                          ORDER BY server_ip, timezone) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -660,8 +677,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY mycol
-                                                  ORDER BY server_ip,
-                                                           timezone);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 Column 'mycol' not found in any table
 !error
 
@@ -674,7 +693,7 @@ SELECT server_ip,
        cast(time_floor(__time, 'PT12H') AS char) t,
        count(*) AS mycol,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip, timezone, mycol) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H'), mycol) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -703,6 +722,7 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip,
                                                            timezone,
+                                                           time_floor(__time, 'PT12H'),
                                                            mycol);
 Column 'mycol' not found in any table
 !error
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_func_in_func.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_func_in_func.all.iq
index 61af1d4c4c6..c6d12ec32a6 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_func_in_func.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_func_in_func.all.iq
@@ -26,7 +26,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        floor(avg(length(client_ip)) OVER (PARTITION BY client_ip
-                                          ORDER BY server_ip)) AS c
+                                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H'))) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -77,7 +77,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+------+
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
@@ -102,7 +104,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        floor(avg(length(client_ip)) OVER (PARTITION BY client_ip
-                                          ORDER BY server_ip)) AS c
+                                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H'))) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -141,7 +143,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+------+
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
@@ -166,7 +170,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        floor(avg(length(client_ip)) OVER (
-                                          ORDER BY server_ip)) AS c
+                                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'))) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -183,13 +187,13 @@ WHERE client_ip IN ('107.13.54.103',
 +--------------+---------------+----------+---------------------+------+
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 12.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 12.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 13.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 13.0 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 13.0 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 12.0 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 13.0 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 13.0 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 13.0 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 12.0 |
 +--------------+---------------+----------+---------------------+------+
 (8 rows)
@@ -217,17 +221,20 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+------+
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 12.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 12.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 13.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 13.0 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 13.0 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 12.0 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 13.0 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 13.0 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 13.0 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 12.0 |
 +--------------+---------------+----------+---------------------+------+
 (8 rows)
@@ -242,7 +249,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        floor(avg(length(client_ip)) OVER (
-                                          ORDER BY server_ip)) AS c
+                                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H'))) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -253,13 +260,13 @@ GROUP BY server_ip,
 +--------------+---------------+----------+---------------------+------+
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 12.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 12.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 13.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 13.0 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 13.0 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 12.0 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 13.0 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 13.0 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 13.0 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 12.0 |
 +--------------+---------------+----------+---------------------+------+
 (8 rows)
@@ -281,17 +288,20 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+------+
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 12.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 12.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 13.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 13.0 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 13.0 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 12.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 12.0 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 13.0 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 13.0 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 13.0 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 12.0 |
 +--------------+---------------+----------+---------------------+------+
 (8 rows)
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.01.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.01.all.iq
index 4cc002f2413..b8f0fc02311 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.01.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.01.all.iq
@@ -26,7 +26,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -77,7 +77,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -102,7 +104,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -141,7 +143,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -166,7 +170,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (
-                          ORDER BY server_ip) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -186,10 +190,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -217,17 +221,20 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -242,7 +249,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        row_number() OVER (
-                          ORDER BY server_ip) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -256,10 +263,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -281,17 +288,20 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -306,7 +316,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        rank() OVER (PARTITION BY client_ip
-                    ORDER BY server_ip) AS c
+                    ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -324,12 +334,12 @@ WHERE client_ip IN ('107.13.54.103',
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -357,17 +367,19 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -382,7 +394,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        rank() OVER (PARTITION BY client_ip
-                    ORDER BY server_ip) AS c
+                    ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -394,12 +406,12 @@ GROUP BY server_ip,
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -421,17 +433,19 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -446,7 +460,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        rank() OVER (
-                    ORDER BY server_ip) AS c
+                    ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -464,13 +478,13 @@ WHERE client_ip IN ('107.13.54.103',
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 5 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
 
@@ -497,18 +511,21 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 5 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
 
@@ -522,7 +539,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        rank() OVER (
-                    ORDER BY server_ip) AS c
+                    ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -534,13 +551,13 @@ GROUP BY server_ip,
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 5 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
 
@@ -561,18 +578,21 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 5 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
 
@@ -754,7 +774,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        dense_rank() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -772,12 +792,12 @@ WHERE client_ip IN ('107.13.54.103',
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -805,17 +825,19 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -830,7 +852,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        dense_rank() OVER (PARTITION BY client_ip
-                          ORDER BY server_ip) AS c
+                          ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -842,12 +864,12 @@ GROUP BY server_ip,
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -869,17 +891,19 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -894,7 +918,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        dense_rank() OVER (
-                          ORDER BY server_ip) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -912,13 +936,13 @@ WHERE client_ip IN ('107.13.54.103',
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
 
@@ -945,18 +969,21 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
 
@@ -970,7 +997,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        dense_rank() OVER (
-                          ORDER BY server_ip) AS c
+                          ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -982,13 +1009,13 @@ GROUP BY server_ip,
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
 
@@ -1009,18 +1036,21 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 2 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
 
@@ -1202,7 +1232,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        round(percent_rank() OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip), 2) AS c
+                                  ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')), 2) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1220,12 +1250,12 @@ WHERE client_ip IN ('107.13.54.103',
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.4 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.0 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.6 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.6 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.8 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
 +--------------+---------------+----------+---------------------+-----+
 (8 rows)
@@ -1253,17 +1283,19 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.4 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.0 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.6 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.6 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.8 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
 +--------------+---------------+----------+---------------------+-----+
 (8 rows)
@@ -1278,7 +1310,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        round(percent_rank() OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip), 2) AS c
+                                  ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')), 2) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1290,12 +1322,12 @@ GROUP BY server_ip,
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.4 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.0 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.6 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.6 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.8 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
 +--------------+---------------+----------+---------------------+-----+
 (8 rows)
@@ -1317,17 +1349,19 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.0 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.2 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.4 |
 | 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.0 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.6 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.6 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.8 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
 +--------------+---------------+----------+---------------------+-----+
 (8 rows)
@@ -1342,7 +1376,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        round(percent_rank() OVER (
-                                  ORDER BY server_ip), 2) AS c
+                                  ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')), 2) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1360,13 +1394,13 @@ WHERE client_ip IN ('107.13.54.103',
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  0.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.57 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.14 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.29 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.86 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.43 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.57 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.57 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.57 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.71 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
 +--------------+---------------+----------+---------------------+------+
 (8 rows)
 
@@ -1393,18 +1427,21 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+------+
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  0.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.57 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.14 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.29 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.86 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.43 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.57 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.57 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.57 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.71 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
 +--------------+---------------+----------+---------------------+------+
 (8 rows)
 
@@ -1418,7 +1455,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        round(percent_rank() OVER (
-                                  ORDER BY server_ip), 2) AS c
+                                  ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')), 2) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1430,13 +1467,13 @@ GROUP BY server_ip,
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  0.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.57 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.14 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.29 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.86 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.43 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.57 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.57 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.57 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.71 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
 +--------------+---------------+----------+---------------------+------+
 (8 rows)
 
@@ -1457,18 +1494,21 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+------+
 | server_ip    | client_ip     | timezone | t                   | c    |
 +--------------+---------------+----------+---------------------+------+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  0.0 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  0.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.57 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.14 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.29 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.86 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.43 |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.57 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.57 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.57 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.71 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
 +--------------+---------------+----------+---------------------+------+
 (8 rows)
 
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.02.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.02.all.iq
index 4a859eb77a7..1f79cc47034 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.02.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.02.all.iq
@@ -154,7 +154,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        round(cume_dist() OVER (PARTITION BY client_ip
-                               ORDER BY server_ip), 2) AS c
+                               ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')), 2) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -168,18 +168,18 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22');
-+--------------+---------------+----------+---------------------+-----+
-| server_ip    | client_ip     | timezone | t                   | c   |
-+--------------+---------------+----------+---------------------+-----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
-+--------------+---------------+----------+---------------------+-----+
++--------------+---------------+----------+---------------------+------+
+| server_ip    | client_ip     | timezone | t                   | c    |
++--------------+---------------+----------+---------------------+------+
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.17 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.33 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  0.5 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  0.5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.67 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.83 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  1.0 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
++--------------+---------------+----------+---------------------+------+
 (8 rows)
 
 !ok
@@ -205,19 +205,21 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
-+--------------+---------------+----------+---------------------+-----+
-| server_ip    | client_ip     | timezone | t                   | c   |
-+--------------+---------------+----------+---------------------+-----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
-+--------------+---------------+----------+---------------------+-----+
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
++--------------+---------------+----------+---------------------+------+
+| server_ip    | client_ip     | timezone | t                   | c    |
++--------------+---------------+----------+---------------------+------+
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.17 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.33 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  0.5 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  0.5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.67 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.83 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  1.0 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
++--------------+---------------+----------+---------------------+------+
 (8 rows)
 
 !ok
@@ -230,7 +232,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        round(cume_dist() OVER (PARTITION BY client_ip
-                               ORDER BY server_ip), 2) AS c
+                               ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')), 2) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -238,18 +240,18 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H');
-+--------------+---------------+----------+---------------------+-----+
-| server_ip    | client_ip     | timezone | t                   | c   |
-+--------------+---------------+----------+---------------------+-----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
-+--------------+---------------+----------+---------------------+-----+
++--------------+---------------+----------+---------------------+------+
+| server_ip    | client_ip     | timezone | t                   | c    |
++--------------+---------------+----------+---------------------+------+
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.17 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.33 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  0.5 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  0.5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.67 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.83 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  1.0 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
++--------------+---------------+----------+---------------------+------+
 (8 rows)
 
 !ok
@@ -269,19 +271,21 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
-+--------------+---------------+----------+---------------------+-----+
-| server_ip    | client_ip     | timezone | t                   | c   |
-+--------------+---------------+----------+---------------------+-----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
-+--------------+---------------+----------+---------------------+-----+
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
++--------------+---------------+----------+---------------------+------+
+| server_ip    | client_ip     | timezone | t                   | c    |
++--------------+---------------+----------+---------------------+------+
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.17 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.33 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  0.5 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  0.5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.67 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.83 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 |  1.0 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
++--------------+---------------+----------+---------------------+------+
 (8 rows)
 
 !ok
@@ -294,7 +298,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        round(cume_dist() OVER (
-                               ORDER BY server_ip), 2) AS c
+                               ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')), 2) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -308,18 +312,18 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22');
-+--------------+---------------+----------+---------------------+-----+
-| server_ip    | client_ip     | timezone | t                   | c   |
-+--------------+---------------+----------+---------------------+-----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
-+--------------+---------------+----------+---------------------+-----+
++--------------+---------------+----------+---------------------+------+
+| server_ip    | client_ip     | timezone | t                   | c    |
++--------------+---------------+----------+---------------------+------+
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.13 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.25 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.38 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.88 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  0.5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.63 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.75 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
++--------------+---------------+----------+---------------------+------+
 (8 rows)
 
 !ok
@@ -345,19 +349,22 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
-+--------------+---------------+----------+---------------------+-----+
-| server_ip    | client_ip     | timezone | t                   | c   |
-+--------------+---------------+----------+---------------------+-----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
-+--------------+---------------+----------+---------------------+-----+
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
++--------------+---------------+----------+---------------------+------+
+| server_ip    | client_ip     | timezone | t                   | c    |
++--------------+---------------+----------+---------------------+------+
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.13 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.25 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.38 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.88 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  0.5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.63 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.75 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
++--------------+---------------+----------+---------------------+------+
 (8 rows)
 
 !ok
@@ -370,7 +377,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        round(cume_dist() OVER (
-                               ORDER BY server_ip), 2) AS c
+                               ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')), 2) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -378,18 +385,18 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H');
-+--------------+---------------+----------+---------------------+-----+
-| server_ip    | client_ip     | timezone | t                   | c   |
-+--------------+---------------+----------+---------------------+-----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
-+--------------+---------------+----------+---------------------+-----+
++--------------+---------------+----------+---------------------+------+
+| server_ip    | client_ip     | timezone | t                   | c    |
++--------------+---------------+----------+---------------------+------+
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.13 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.25 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.38 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.88 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  0.5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.63 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.75 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
++--------------+---------------+----------+---------------------+------+
 (8 rows)
 
 !ok
@@ -409,19 +416,22 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
-+--------------+---------------+----------+---------------------+-----+
-| server_ip    | client_ip     | timezone | t                   | c   |
-+--------------+---------------+----------+---------------------+-----+
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 1.0 |
-| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 1.0 |
-+--------------+---------------+----------+---------------------+-----+
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
++--------------+---------------+----------+---------------------+------+
+| server_ip    | client_ip     | timezone | t                   | c    |
++--------------+---------------+----------+---------------------+------+
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 0.13 |
+| 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.25 |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.38 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 0.88 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 |  0.5 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 0.63 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 0.75 |
+| 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 |  1.0 |
++--------------+---------------+----------+---------------------+------+
 (8 rows)
 
 !ok
@@ -602,7 +612,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(0) OVER (PARTITION BY client_ip
-                      ORDER BY server_ip) AS c
+                      ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -640,7 +650,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 numBuckets[0] must be greater than zero
 !error
 
@@ -652,7 +664,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(0) OVER (PARTITION BY client_ip
-                      ORDER BY server_ip) AS c
+                      ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -678,7 +690,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 numBuckets[0] must be greater than zero
 !error
 
@@ -690,7 +704,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(0) OVER (
-                      ORDER BY server_ip) AS c
+                      ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -728,7 +742,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 numBuckets[0] must be greater than zero
 !error
 
@@ -740,7 +757,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(0) OVER (
-                      ORDER BY server_ip) AS c
+                      ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -766,7 +783,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 numBuckets[0] must be greater than zero
 !error
 
@@ -946,7 +966,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(1) OVER (PARTITION BY client_ip
-                      ORDER BY server_ip) AS c
+                      ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -997,7 +1017,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -1022,7 +1044,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(1) OVER (PARTITION BY client_ip
-                      ORDER BY server_ip) AS c
+                      ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1061,7 +1083,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -1086,7 +1110,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(1) OVER (
-                      ORDER BY server_ip) AS c
+                      ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1137,7 +1161,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -1162,7 +1189,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(1) OVER (
-                      ORDER BY server_ip) AS c
+                      ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1201,7 +1228,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -1226,7 +1256,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(10) OVER (PARTITION BY client_ip
-                       ORDER BY server_ip) AS c
+                       ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1277,7 +1307,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -1302,7 +1334,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(10) OVER (PARTITION BY client_ip
-                       ORDER BY server_ip) AS c
+                       ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.03.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.03.all.iq
index 8e18840b488..7393f21d50b 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.03.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/basics_window_funcs.03.all.iq
@@ -17,7 +17,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
@@ -42,7 +44,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(10) OVER (
-                       ORDER BY server_ip) AS c
+                       ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -62,10 +64,10 @@ WHERE client_ip IN ('107.13.54.103',
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -93,17 +95,20 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -118,7 +123,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        ntile(10) OVER (
-                       ORDER BY server_ip) AS c
+                       ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -132,10 +137,10 @@ GROUP BY server_ip,
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -157,17 +162,20 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+---+
 | server_ip    | client_ip     | timezone | t                   | c |
 +--------------+---------------+----------+---------------------+---+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 1 |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 2 |
 | 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 3 |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 4 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 5 |
-| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 6 |
-| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 7 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | 4 |
+| 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | 5 |
+| 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | 6 |
 | 172.31.57.89 | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | 8 |
 +--------------+---------------+----------+---------------------+---+
 (8 rows)
@@ -182,7 +190,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        lag(timezone, 1) OVER (PARTITION BY client_ip
-                              ORDER BY server_ip) AS c
+                              ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -233,7 +241,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -258,7 +268,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        lag(timezone, 1) OVER (PARTITION BY client_ip
-                              ORDER BY server_ip) AS c
+                              ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -297,7 +307,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -322,7 +334,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        lag(timezone, 1) OVER (
-                              ORDER BY server_ip) AS c
+                              ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -373,7 +385,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -398,7 +413,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        lag(timezone, 1) OVER (
-                              ORDER BY server_ip) AS c
+                              ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -437,7 +452,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -462,7 +480,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        lead(timezone, 1) OVER (PARTITION BY client_ip
-                               ORDER BY server_ip) AS c
+                               ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -513,7 +531,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -538,7 +558,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        lead(timezone, 1) OVER (PARTITION BY client_ip
-                               ORDER BY server_ip) AS c
+                               ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -577,7 +597,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -602,7 +624,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        lead(timezone, 1) OVER (
-                               ORDER BY server_ip) AS c
+                               ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -621,8 +643,8 @@ WHERE client_ip IN ('107.13.54.103',
 +--------------+---------------+----------+---------------------+-----+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | EDT |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | N/A |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | N/A |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | EDT |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | EDT |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | N/A |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | EDT |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | N/A |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | N/A |
@@ -653,14 +675,17 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | EDT |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | N/A |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | N/A |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | EDT |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | EDT |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | N/A |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | EDT |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | N/A |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | N/A |
@@ -678,7 +703,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        lead(timezone, 1) OVER (
-                               ORDER BY server_ip) AS c
+                               ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -691,8 +716,8 @@ GROUP BY server_ip,
 +--------------+---------------+----------+---------------------+-----+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | EDT |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | N/A |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | N/A |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | EDT |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | EDT |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | N/A |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | EDT |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | N/A |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | N/A |
@@ -717,14 +742,17 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | EDT |
 | 172.31.11.5  | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | N/A |
-| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | N/A |
-| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | EDT |
+| 172.31.11.5  | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | EDT |
+| 172.31.11.5  | 99.9.55.22    | N/A      | 2019-08-25 12:00:00 | N/A |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 00:00:00 | EDT |
 | 172.31.57.89 | 107.13.54.103 | EDT      | 2019-08-25 12:00:00 | N/A |
 | 172.31.57.89 | 107.13.54.103 | N/A      | 2019-08-25 12:00:00 | N/A |
@@ -742,7 +770,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip) AS c
+                                   ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -793,7 +821,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -818,7 +848,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip) AS c
+                                   ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -857,7 +887,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -882,7 +914,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip) AS c
+                                   ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -933,7 +965,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -958,7 +993,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip) AS c
+                                   ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -997,7 +1032,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -1022,7 +1060,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip) AS c
+                                  ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1073,7 +1111,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY server_ip);
+                                               ORDER BY server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -1098,7 +1138,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip) AS c
+                                  ORDER BY server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1137,7 +1177,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY server_ip);
+                                                  ORDER BY server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -1162,7 +1204,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip) AS c
+                                  ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1213,7 +1255,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
@@ -1238,7 +1283,7 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip) AS c
+                                  ORDER BY client_ip, server_ip, timezone, time_floor(__time, 'PT12H')) AS c
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1277,7 +1322,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H'));
 +--------------+---------------+----------+---------------------+-----+
 | server_ip    | client_ip     | timezone | t                   | c   |
 +--------------+---------------+----------+---------------------+-----+
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.01.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.01.all.iq
index fce49a75ff9..282bc344ac8 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.01.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.01.all.iq
@@ -26,9 +26,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -68,7 +68,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
-                                                        timezone RANGE 0 FOLLOWING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -80,9 +81,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -110,7 +111,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
-                                                           timezone RANGE 0 FOLLOWING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -122,9 +124,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -164,7 +166,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
-                                                        timezone RANGE 0 FOLLOWING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -176,9 +179,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -206,7 +209,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
-                                                           timezone RANGE 0 FOLLOWING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -218,9 +222,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -259,8 +263,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip ASC,
-                                                        timezone RANGE 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -272,9 +278,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -301,8 +307,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip ASC,
-                                                           timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -314,9 +322,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -355,8 +363,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip DESC,
-                                                        timezone RANGE 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -368,9 +378,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -397,8 +407,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip DESC,
-                                                           timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -410,9 +422,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -451,7 +463,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -463,9 +477,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -492,7 +506,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -504,9 +520,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -545,7 +561,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -557,9 +575,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -586,7 +604,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -598,9 +618,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -639,7 +659,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -651,9 +674,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -680,7 +703,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -692,9 +718,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -733,7 +759,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -745,9 +774,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -774,7 +803,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -786,9 +818,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -827,8 +859,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE 0 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -840,9 +874,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -869,8 +903,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -882,9 +918,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -923,8 +959,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE 0 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -936,9 +974,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -965,8 +1003,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -978,9 +1018,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1019,8 +1059,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1032,9 +1075,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1061,8 +1104,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1074,9 +1120,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1115,8 +1161,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1128,9 +1177,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1157,8 +1206,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.02.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.02.all.iq
index 206fed4a9ad..d2fc36e6538 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.02.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.02.all.iq
@@ -175,9 +175,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -216,7 +216,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
@@ -229,9 +230,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -258,7 +259,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') ASC, timezone RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
@@ -271,9 +273,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -312,7 +314,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
@@ -325,9 +328,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -354,7 +357,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') DESC, timezone RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
@@ -367,9 +371,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -410,7 +414,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE 0 FOLLOWING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -422,9 +427,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -453,7 +458,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE 0 FOLLOWING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -465,9 +471,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -508,7 +514,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE 0 FOLLOWING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -520,9 +527,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -551,7 +558,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE 0 FOLLOWING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -563,9 +571,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -605,8 +613,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip ASC,
+                                                        server_ip,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE 0 FOLLOWING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -618,9 +628,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -648,8 +658,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip ASC,
+                                                           server_ip,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE 0 FOLLOWING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -661,9 +673,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -703,8 +715,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip DESC,
+                                                        server_ip,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE 0 FOLLOWING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -716,9 +730,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -746,8 +760,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip DESC,
+                                                           server_ip,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE 0 FOLLOWING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -935,9 +951,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -977,7 +993,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -989,9 +1006,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1019,7 +1036,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1031,9 +1049,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1073,7 +1091,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1085,9 +1104,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1115,7 +1134,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1127,9 +1147,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1168,8 +1188,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1181,9 +1203,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.03.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.03.all.iq
index ba90f972eac..3ecde6580ab 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.03.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.03.all.iq
@@ -18,8 +18,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -31,9 +33,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -72,8 +74,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -85,9 +89,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -114,8 +118,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -127,9 +133,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -168,7 +174,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -180,9 +188,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -209,7 +217,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -221,9 +231,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -262,7 +272,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -274,9 +286,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -303,7 +315,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -315,9 +329,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -356,7 +370,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -368,9 +385,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -397,7 +414,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -409,9 +429,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -450,7 +470,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -462,9 +485,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -491,7 +514,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -503,9 +529,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -544,8 +570,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -557,9 +585,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -586,8 +614,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -599,9 +629,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -640,8 +670,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -653,9 +685,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -682,8 +714,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -695,9 +729,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -736,8 +770,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -749,9 +786,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -778,8 +815,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -791,9 +831,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -832,8 +872,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -845,9 +888,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -874,8 +917,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1079,9 +1125,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1120,7 +1166,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
@@ -1133,9 +1180,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1162,7 +1209,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
@@ -1175,9 +1223,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.04.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.04.all.iq
index 40ae1df5ec3..1ab2dc7b0c4 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.04.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.04.all.iq
@@ -24,7 +24,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
@@ -37,9 +38,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -66,7 +67,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
@@ -79,9 +81,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -122,7 +124,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -134,9 +137,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -165,7 +168,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -177,9 +181,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -220,7 +224,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -232,9 +237,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -263,7 +268,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -275,9 +281,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -317,8 +323,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip ASC,
+                                                        server_ip,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -330,9 +338,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -360,8 +368,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip ASC,
+                                                           server_ip,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -373,9 +383,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -415,8 +425,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip DESC,
+                                                        server_ip,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -428,9 +440,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -458,8 +470,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip DESC,
+                                                           server_ip,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND UNBOUNDED PRECEDING);
 QueryInterruptedException
 !error
 
@@ -647,9 +661,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -689,7 +703,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -701,9 +716,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -731,7 +746,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -743,9 +759,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -785,7 +801,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -797,9 +814,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -827,7 +844,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -839,9 +857,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -880,8 +898,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -893,9 +913,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -922,8 +942,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -935,9 +957,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -976,8 +998,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -989,9 +1013,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1018,8 +1042,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1031,9 +1057,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1072,7 +1098,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1084,9 +1112,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1113,7 +1141,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1125,9 +1155,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1166,7 +1196,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1178,9 +1210,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.05.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.05.all.iq
index 1923432f546..74e54ef3003 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.05.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.05.all.iq
@@ -18,7 +18,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -30,9 +32,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -71,7 +73,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -83,9 +88,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -112,7 +117,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -124,9 +132,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -165,7 +173,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -177,9 +188,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -206,7 +217,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -218,9 +232,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -259,8 +273,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -272,9 +288,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -301,8 +317,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -314,9 +332,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -355,8 +373,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -368,9 +388,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -397,8 +417,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -410,9 +432,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -451,8 +473,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -464,9 +489,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -493,8 +518,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -506,9 +534,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -547,8 +575,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -560,9 +591,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -589,8 +620,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -794,9 +828,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -835,7 +869,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
@@ -848,9 +883,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -877,7 +912,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
@@ -890,9 +926,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -931,7 +967,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
@@ -944,9 +981,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -973,7 +1010,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
@@ -986,9 +1024,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1029,7 +1067,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1041,9 +1080,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1072,7 +1111,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1084,9 +1124,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1127,7 +1167,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1139,9 +1180,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1170,7 +1211,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1182,9 +1224,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.06.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.06.all.iq
index 15e0042159f..b226c2b5a89 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.06.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.06.all.iq
@@ -25,8 +25,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip ASC,
+                                                        server_ip,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -38,9 +40,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -68,8 +70,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip ASC,
+                                                           server_ip,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -81,9 +85,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -123,8 +127,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip DESC,
+                                                        server_ip,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -136,9 +142,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -166,8 +172,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip DESC,
+                                                           server_ip,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -355,9 +363,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -397,7 +405,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -409,9 +418,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -439,7 +448,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -451,9 +461,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -493,7 +503,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -505,9 +516,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -535,7 +546,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -547,9 +559,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -588,8 +600,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -601,9 +615,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -630,8 +644,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -643,9 +659,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -684,8 +700,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -697,9 +715,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -726,8 +744,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -739,9 +759,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -780,7 +800,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -792,9 +814,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -821,7 +843,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -833,9 +857,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -874,7 +898,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -886,9 +912,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -915,7 +941,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -927,9 +955,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -968,7 +996,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -980,9 +1011,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1009,7 +1040,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1021,9 +1055,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1062,7 +1096,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1074,9 +1111,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1103,7 +1140,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1115,9 +1155,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1156,8 +1196,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1169,9 +1211,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.07.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.07.all.iq
index 7b4f33fae64..dd65dcc8079 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.07.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.07.all.iq
@@ -18,8 +18,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -31,9 +33,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -72,8 +74,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -85,9 +89,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -114,8 +118,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -127,9 +133,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -168,8 +174,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -181,9 +190,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -210,8 +219,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -223,9 +235,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -264,8 +276,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -277,9 +292,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -306,8 +321,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -511,9 +529,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -552,7 +570,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
@@ -565,9 +584,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -594,7 +613,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
@@ -607,9 +627,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -648,7 +668,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
@@ -661,9 +682,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -690,7 +711,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
@@ -703,9 +725,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -746,7 +768,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -758,9 +781,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -789,7 +812,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -801,9 +825,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -844,7 +868,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -856,9 +881,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -887,7 +912,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -899,9 +925,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -941,8 +967,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip ASC,
+                                                        server_ip,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -954,9 +982,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -984,8 +1012,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip ASC,
+                                                           server_ip,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -997,9 +1027,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1039,8 +1069,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip DESC,
+                                                        server_ip,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
@@ -1052,9 +1084,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1082,8 +1114,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip DESC,
+                                                           server_ip,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING);
 QueryInterruptedException
 !error
 
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.08.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.08.all.iq
index b1f466150d1..ccf7264eb0d 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.08.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.08.all.iq
@@ -73,9 +73,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -115,7 +115,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -127,9 +128,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -157,7 +158,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -169,9 +171,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -211,7 +213,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -223,9 +226,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -253,7 +256,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -265,9 +269,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -306,8 +310,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY client_ip,
+                                                        server_ip ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -319,9 +325,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -348,8 +354,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY client_ip,
+                                                           server_ip ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -361,9 +369,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -402,8 +410,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY client_ip,
+                                                        server_ip DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -415,9 +425,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -444,8 +454,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY client_ip,
+                                                           server_ip DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -457,9 +469,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -498,7 +510,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -510,9 +524,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -539,7 +553,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -551,9 +567,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -592,7 +608,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -604,9 +622,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -633,7 +651,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -645,9 +665,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -686,7 +706,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -698,9 +721,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -727,7 +750,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -739,9 +765,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -780,7 +806,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -792,9 +821,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -821,7 +850,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -833,9 +865,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -874,8 +906,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -887,9 +921,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -916,8 +950,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -929,9 +965,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -970,8 +1006,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -983,9 +1021,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1012,8 +1050,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -1025,9 +1065,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1066,8 +1106,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -1079,9 +1122,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1108,8 +1151,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -1121,9 +1167,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1162,8 +1208,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -1175,9 +1224,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.09.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.09.all.iq
index 34c48100e53..0d26cc3b496 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.09.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.09.all.iq
@@ -18,8 +18,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -223,9 +226,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -264,7 +267,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
@@ -277,9 +281,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -306,7 +310,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
@@ -319,9 +324,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -360,7 +365,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
@@ -373,9 +379,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -402,7 +408,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
@@ -415,9 +422,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -458,7 +465,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -470,9 +478,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -501,7 +509,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -513,9 +522,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -556,7 +565,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -568,9 +578,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -599,7 +609,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -611,9 +622,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -653,8 +664,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip ASC,
+                                                        server_ip,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -666,9 +679,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -696,8 +709,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip ASC,
+                                                           server_ip,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -709,9 +724,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -751,8 +766,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip DESC,
+                                                        server_ip,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -764,9 +781,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -794,8 +811,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip DESC,
+                                                           server_ip,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW);
 QueryInterruptedException
 !error
 
@@ -983,9 +1002,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1025,7 +1044,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1037,9 +1057,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1067,7 +1087,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1079,9 +1100,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1121,7 +1142,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1133,9 +1155,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1163,7 +1185,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1175,9 +1198,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.10.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.10.all.iq
index 11463795f06..5da2a2ffae8 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.10.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.10.all.iq
@@ -24,8 +24,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -37,9 +39,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -66,8 +68,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -79,9 +83,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -120,8 +124,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -133,9 +139,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -162,8 +168,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -175,9 +183,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -216,7 +224,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -228,9 +238,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -257,7 +267,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -269,9 +281,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -310,7 +322,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -322,9 +336,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -351,7 +365,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -363,9 +379,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -404,7 +420,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -416,9 +435,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -445,7 +464,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -457,9 +479,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -498,7 +520,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -510,9 +535,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -539,7 +564,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -551,9 +579,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -592,8 +620,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -605,9 +635,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -634,8 +664,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -647,9 +679,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -688,8 +720,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -701,9 +735,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -730,8 +764,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -743,9 +779,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -784,8 +820,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -797,9 +836,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -826,8 +865,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -839,9 +881,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -880,8 +922,11 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip,
+                                                        cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -893,9 +938,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -922,8 +967,11 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip,
+                                                           cast(length(server_ip) AS DOUBLE)+0.123 DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1127,9 +1175,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1168,7 +1216,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
@@ -1181,9 +1230,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.11.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.11.all.iq
index 79cdffbefe7..7b70ee0a351 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.11.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.11.all.iq
@@ -18,7 +18,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
@@ -31,9 +32,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -72,7 +73,8 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip,
+                                               ORDER BY client_ip,
+                                                        server_ip,
                                                         time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
@@ -85,9 +87,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip, time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -114,7 +116,8 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip,
+                                                  ORDER BY client_ip,
+                                                           server_ip,
                                                            time_floor(__time, 'PT12H') DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
@@ -127,9 +130,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -170,7 +173,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -182,9 +186,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -213,7 +217,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -225,9 +230,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -268,7 +273,8 @@ WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -280,9 +286,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -311,7 +317,8 @@ GROUP BY server_ip,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -323,9 +330,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -365,8 +372,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip ASC,
+                                                        server_ip,
                                                         length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                               timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                                               timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -378,9 +387,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, server_ip, length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -408,8 +417,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip ASC,
+                                                           server_ip,
                                                            length(server_ip) ASC, cast(length(server_ip) AS DOUBLE)+0.123 ASC,
-                                                                                  timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                                                  timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -421,9 +432,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -463,8 +474,10 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
                                                ORDER BY server_ip DESC,
+                                                        server_ip,
                                                         length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                                                timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -476,9 +489,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, server_ip, length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -506,8 +519,10 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
                                                   ORDER BY server_ip DESC,
+                                                           server_ip,
                                                            length(server_ip) DESC, cast(length(server_ip) AS DOUBLE)+0.123 DESC,
-                                                                                   timezone RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
+                                                                                   timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 0 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -695,9 +710,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -737,7 +752,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -749,9 +765,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -779,7 +795,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -791,9 +808,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -833,7 +850,8 @@ FROM
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
                                                ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -845,9 +863,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -875,7 +893,8 @@ GROUP BY server_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
                                                   ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -887,9 +906,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -928,8 +947,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip ASC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip ASC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -941,9 +962,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -970,8 +991,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip ASC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip ASC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -983,9 +1006,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1024,8 +1047,10 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (
-                                               ORDER BY server_ip DESC,
-                                                        timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                               ORDER BY client_ip,
+                                                        server_ip DESC,
+                                                        timezone,
+                                                        time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1037,9 +1062,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (
-                                   ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (
-                                  ORDER BY server_ip DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY client_ip, server_ip DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1066,8 +1091,10 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (
-                                                  ORDER BY server_ip DESC,
-                                                           timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                                  ORDER BY client_ip,
+                                                           server_ip DESC,
+                                                           timezone,
+                                                           time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1079,9 +1106,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
@@ -1120,7 +1147,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) ASC, timezone,
+                                                                               time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1132,9 +1161,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) ASC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -1161,7 +1190,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) ASC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) ASC, timezone,
+                                                                                  time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -1173,9 +1204,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM
   (SELECT server_ip,
           client_ip,
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.12.all.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.12.all.iq
index 8b37a22a442..e6c9bc37748 100644
--- a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.12.all.iq
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaWin/orderby_range_0_following_first_last.12.all.iq
@@ -24,7 +24,9 @@ FROM
             time_floor(__time, 'PT12H'))
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22') WINDOW w AS (PARTITION BY client_ip
-                                               ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                               ORDER BY server_ip,
+                                                        length(server_ip) DESC, timezone,
+                                                                                time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -36,9 +38,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
        first_value(timezone) OVER (PARTITION BY client_ip
-                                   ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
+                                   ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) first_val,
        last_value(timezone) OVER (PARTITION BY client_ip
-                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
+                                  ORDER BY server_ip, length(server_ip) DESC, timezone, time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING) last_val
 FROM test_win
 WHERE client_ip IN ('107.13.54.103',
                     '99.9.55.22')
@@ -65,7 +67,9 @@ GROUP BY server_ip,
          client_ip,
          timezone,
          time_floor(__time, 'PT12H') WINDOW w AS (PARTITION BY client_ip
-                                                  ORDER BY length(server_ip) DESC, timezone RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
+                                                  ORDER BY server_ip,
+                                                           length(server_ip) DESC, timezone,
+                                                                                   time_floor(__time, 'PT12H') RANGE BETWEEN 0 FOLLOWING AND 1 FOLLOWING);
 QueryInterruptedException
 !error
 
@@ -77,9 +81,9 @@ SELECT server_ip,
        timezone,
        cast(time_floor(__time, 'PT12H') AS char) t,
... 238375 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org