mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
MDEV-18373: DENSE_RANK is not calculated correctly
Need to call split_sum_func if an aggregate function is part of order by or partition by clause so that we have the required fields inside the temporary table, as all the fields inside the partition by and order by clause of the window function needs to be there in the temp table used for window function computation.
This commit is contained in:
parent
a6ea799651
commit
4345868382
3 changed files with 49 additions and 0 deletions
|
@ -3581,5 +3581,31 @@ x b c
|
|||
8 64 248
|
||||
drop table t1;
|
||||
#
|
||||
# MDEV-18373: DENSE_RANK is not calculated correctly
|
||||
#
|
||||
create table t1 (a int, b int);
|
||||
insert into t1 values (60, 1515),(60, 2000),(70, 2000),(55, 1600);
|
||||
select b, dense_rank() over (order by sum(a)) from t1 group by b;
|
||||
b dense_rank() over (order by sum(a))
|
||||
1515 2
|
||||
1600 1
|
||||
2000 3
|
||||
select b, dense_rank() over (order by sum(a)+1) from t1 group by b;
|
||||
b dense_rank() over (order by sum(a)+1)
|
||||
1515 2
|
||||
1600 1
|
||||
2000 3
|
||||
select b, row_number() over (partition by sum(a)) from t1 group by b;
|
||||
b row_number() over (partition by sum(a))
|
||||
1515 1
|
||||
1600 1
|
||||
2000 1
|
||||
select b, row_number() over (partition by sum(a)+1) from t1 group by b;
|
||||
b row_number() over (partition by sum(a)+1)
|
||||
1515 1
|
||||
1600 1
|
||||
2000 1
|
||||
drop table t1;
|
||||
#
|
||||
# End of 10.2 tests
|
||||
#
|
||||
|
|
|
@ -2310,6 +2310,21 @@ SELECT max(t1.a) over (partition by c) as x, b, c from t1 order by max(t1.a) ove
|
|||
|
||||
drop table t1;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-18373: DENSE_RANK is not calculated correctly
|
||||
--echo #
|
||||
|
||||
create table t1 (a int, b int);
|
||||
insert into t1 values (60, 1515),(60, 2000),(70, 2000),(55, 1600);
|
||||
|
||||
select b, dense_rank() over (order by sum(a)) from t1 group by b;
|
||||
select b, dense_rank() over (order by sum(a)+1) from t1 group by b;
|
||||
|
||||
select b, row_number() over (partition by sum(a)) from t1 group by b;
|
||||
select b, row_number() over (partition by sum(a)+1) from t1 group by b;
|
||||
|
||||
drop table t1;
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.2 tests
|
||||
--echo #
|
||||
|
|
|
@ -22576,6 +22576,10 @@ int setup_order(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables,
|
|||
my_error(ER_WINDOW_FUNCTION_IN_WINDOW_SPEC, MYF(0));
|
||||
return 1;
|
||||
}
|
||||
if (from_window_spec && (*order->item)->with_sum_func &&
|
||||
(*order->item)->type() != Item::SUM_FUNC_ITEM)
|
||||
(*order->item)->split_sum_func(thd, ref_pointer_array,
|
||||
all_fields, SPLIT_SUM_SELECT);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -22643,6 +22647,10 @@ setup_group(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables,
|
|||
my_error(ER_WINDOW_FUNCTION_IN_WINDOW_SPEC, MYF(0));
|
||||
return 1;
|
||||
}
|
||||
if (from_window_spec && (*ord->item)->with_sum_func &&
|
||||
(*ord->item)->type() != Item::SUM_FUNC_ITEM)
|
||||
(*ord->item)->split_sum_func(thd, ref_pointer_array,
|
||||
all_fields, SPLIT_SUM_SELECT);
|
||||
}
|
||||
if (thd->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY &&
|
||||
context_analysis_place == IN_GROUP_BY)
|
||||
|
|
Loading…
Reference in a new issue