Changeset: c5127de6b9d6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c5127de6b9d6
Modified Files:
sql/server/rel_optimizer.c
Branch: Oct2020
Log Message:
Merged with Jun2020
diffs (44 lines):
diff --git a/sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.sql
b/sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.sql
--- a/sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.sql
+++ b/sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.sql
@@ -54,4 +54,14 @@ select count(*) FROM (
FROM "myschema"."mymerge" myalias
GROUP BY field1, field2) AS mycount;
+-- These statements are related to the same issue
+create merge table merge_table (mcol1 int, mcol2 int, mcol3 int);
+create table child1 (mcol1 int, mcol2 int, mcol3 int);
+insert into child1 values (1,1,1);
+create table child2 (mcol1 int, mcol2 int, mcol3 int);
+insert into child2 values (2,2,2);
+alter table merge_table add table child1;
+alter table merge_table add table child2;
+select cast(sum(mcol1) as bigint), cast(sum(mcol2) as bigint) from merge_table
group by mcol1, mcol2, mcol3 order by mcol1 limit 2;
+
rollback;
diff --git
a/sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.stable.out
b/sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.stable.out
--- a/sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.stable.out
+++ b/sql/test/mergetables/Tests/mergetable_rel_push_aggr_down.stable.out
@@ -80,6 +80,22 @@ stdout of test 'mergetable_rel_push_aggr
% bigint # type
% 1 # length
[ 0 ]
+#create merge table merge_table (mcol1 int, mcol2 int, mcol3 int);
+#create table child1 (mcol1 int, mcol2 int, mcol3 int);
+#insert into child1 values (1,1,1);
+[ 1 ]
+#create table child2 (mcol1 int, mcol2 int, mcol3 int);
+#insert into child2 values (2,2,2);
+[ 1 ]
+#alter table merge_table add table child1;
+#alter table merge_table add table child2;
+#select cast(sum(mcol1) as bigint), cast(sum(mcol2) as bigint) from
merge_table group by mcol1, mcol2, mcol3 order by mcol1 limit 2;
+% .%2, .%4 # table_name
+% %2, %4 # name
+% bigint, bigint # type
+% 1, 1 # length
+[ 1, 1 ]
+[ 2, 2 ]
#rollback;
# 12:55:05 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
