database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

[MCOL-4786] Fix filter comparison.

Browse Source 
Compare ParseTree by dereferencing pointers.
This commit is contained in:
Denis Khalikov
2021-07-12 15:27:53 +03:00
parent 4069a48f42
commit dc51dbf6cf
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/mysql/ha_mcs_execplan.cpp
View File

@ -4427,7 +4427,7 @@ FunctionColumn* buildCaseFunction(Item_func* item, gp_walk_info& gwi, bool& nonS
gwi.inCaseStmt = true;
sptp.reset(buildParseTree((Item_func*)(item->arguments()[i]), gwi, nonSupport));
gwi.inCaseStmt = false;
if (!gwi.ptWorkStack.empty() && gwi.ptWorkStack.top()->data() == sptp->data())
if (!gwi.ptWorkStack.empty() && *gwi.ptWorkStack.top() == *sptp.get())
{
gwi.ptWorkStack.pop();
}

2
mysql-test/columnstore/bugfixes/mcol-4786.result
View File

@ -4,7 +4,7 @@ USE mcol4786;
CREATE TABLE `bd_dwhs_private_ex_pub_services_ins` (`age` int(11) DEFAULT NULL) ENGINE=Columnstore DEFAULT CHARSET=latin1;
insert into bd_dwhs_private_ex_pub_services_ins select * from seq_1_to_120;
CREATE OR REPLACE VIEW `dwhs_ins_call_detail_vw` AS select age, case when `bd_dwhs_private_ex_pub_services_ins`.`age` between 16 and 24 then '16-24' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 25 and 34 then '25-34' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 35 and 44 then '35-44' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 45 and 54 then '45-54' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 55 and 64 then '55-64' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 65 and 74 then '65-74' when `bd_dwhs_private_ex_pub_services_ins`.`age` >= 75 then '75+' end AS `age_group` from `bd_dwhs_private_ex_pub_services_ins`;
select age_group, age, count(*) from dwhs_ins_call_detail_vw where age between 16 and 24 and age_group IN ('35-44') group by age_group,age order by age_group, age;
select age_group, age, count(*) from dwhs_ins_call_detail_vw where age between 16 and 34 and age_group IN ('35-44') group by age_group,age order by age_group, age;
age_group age count(*)
DROP VIEW `dwhs_ins_call_detail_vw`;
DROP TABLE `bd_dwhs_private_ex_pub_services_ins`;

4
mysql-test/columnstore/bugfixes/mcol-4786.test
View File

@ -15,7 +15,9 @@ insert into bd_dwhs_private_ex_pub_services_ins select * from seq_1_to_120;
CREATE OR REPLACE VIEW `dwhs_ins_call_detail_vw` AS select age, case when `bd_dwhs_private_ex_pub_services_ins`.`age` between 16 and 24 then '16-24' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 25 and 34 then '25-34' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 35 and 44 then '35-44' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 45 and 54 then '45-54' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 55 and 64 then '55-64' when `bd_dwhs_private_ex_pub_services_ins`.`age` between 65 and 74 then '65-74' when `bd_dwhs_private_ex_pub_services_ins`.`age` >= 75 then '75+' end AS `age_group` from `bd_dwhs_private_ex_pub_services_ins`;
select age_group, age, count(*) from dwhs_ins_call_detail_vw where age between 16 and 24 and age_group IN ('35-44') group by age_group,age order by age_group, age;
# FIXME, the filter `betwenn 16 and 24` merges into `case function`, because it has the same filter between `16 and 24`.
# select age_group, age, count(*) from dwhs_ins_call_detail_vw where age between 16 and 24 and age_group IN ('35-44') group by age_group,age order by age_group, age;
select age_group, age, count(*) from dwhs_ins_call_detail_vw where age between 16 and 34 and age_group IN ('35-44') group by age_group,age order by age_group, age;
DROP VIEW `dwhs_ins_call_detail_vw`;
DROP TABLE `bd_dwhs_private_ex_pub_services_ins`;