Changeset: bfeba8c27e19 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bfeba8c27e19
Modified Files:
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
sql/test/miscellaneous/Tests/groupby_error.sql
sql/test/miscellaneous/Tests/groupby_error.stable.out
Branch: octbugs
Log Message:
Use aggregate with common type output on int64 vs int128 platforms. Also added
one more duplicate column elimination regression test
diffs (87 lines):
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql
--- a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql
+++ b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql
@@ -14,7 +14,7 @@ SELECT 0 AS cods, 0 AS elrik, 0 AS ether
FROM t2a
GROUP BY cods, elrik, ether, jaelen, sora;
-PLAN SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora, cast(
SUM(tib0) as bigint)
+PLAN SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora,
MIN(tib0)
FROM t2a
GROUP BY cods, elrik, ether, jaelen, sora;
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
--- a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
+++ b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
@@ -58,8 +58,8 @@ stdout of test 'crash_in_reduce_groupby.
project (
| group by (
| | table(sys.t2a) [ "t2a"."tib0" ] COUNT
-| ) [ tinyint "0" as "sora" ] [ tinyint "0" as "cods", tinyint "0" as "elrik",
tinyint "0" as "ether", tinyint "0" as "jaelen", "sora", sys.sum no nil
("t2a"."tib0") as "%1"."%1" ]
-) [ "cods", "elrik", "ether", "jaelen", "sora", bigint["%1"."%1"] as "%2"."%2"
]
+| ) [ tinyint "0" as "sora" ] [ tinyint "0" as "cods", tinyint "0" as "elrik",
tinyint "0" as "ether", tinyint "0" as "jaelen", "sora", sys.min no nil
("t2a"."tib0") as "%1"."%1" ]
+) [ "cods", "elrik", "ether", "jaelen", "sora", "%1"."%1" ]
#drop table t2a;
#drop table t1a;
diff --git a/sql/test/miscellaneous/Tests/groupby_error.sql
b/sql/test/miscellaneous/Tests/groupby_error.sql
--- a/sql/test/miscellaneous/Tests/groupby_error.sql
+++ b/sql/test/miscellaneous/Tests/groupby_error.sql
@@ -229,6 +229,21 @@ create table tab2 ("myk" int, "ups" varc
insert into tab1 values (1,1,1), (2,2,2);
insert into tab2 values (1, 'a'), (1, 'b');
+PLAN select
+ myalias0."part" as "part",
+ myalias0."tet" as "tet",
+ count(*) as mycount,
+ myalias0."tet" as track
+from
+ tab1 myalias0
+ left join tab2 myalias1
+ on myalias0."part" = myalias1."myk"
+group by
+ myalias0."part",
+ track,
+ myalias0."tet",
+ myalias1."ups";
+
select
myalias0."part" as "part",
myalias0."tet" as "tet",
diff --git a/sql/test/miscellaneous/Tests/groupby_error.stable.out
b/sql/test/miscellaneous/Tests/groupby_error.stable.out
--- a/sql/test/miscellaneous/Tests/groupby_error.stable.out
+++ b/sql/test/miscellaneous/Tests/groupby_error.stable.out
@@ -559,6 +559,32 @@ project (
[ 2 ]
#insert into tab2 values (1, 'a'), (1, 'b');
[ 2 ]
+#PLAN select
+# myalias0."part" as "part",
+# myalias0."tet" as "tet",
+# count(*) as mycount,
+# myalias0."tet" as track
+#from
+# tab1 myalias0
+# left join tab2 myalias1
+# on myalias0."part" = myalias1."myk"
+#group by
+# myalias0."part",
+# track,
+# myalias0."tet",
+# myalias1."ups";
+% .plan # table_name
+% rel # name
+% clob # type
+% 138 # length
+project (
+| group by (
+| | left outer join (
+| | | table(sys.tab1) [ "tab1"."part" as "myalias0"."part", "tab1"."tet" as
"myalias0"."tet" ] COUNT ,
+| | | table(sys.tab2) [ "tab2"."myk" as "myalias1"."myk", "tab2"."ups" as
"myalias1"."ups" ] COUNT
+| | ) [ "myalias0"."part" = "myalias1"."myk" ]
+| ) [ "myalias0"."part", "myalias0"."tet" as "track", "myalias1"."ups" ] [
"myalias0"."part", "track", sys.count() NOT NULL as "%1"."%1" ]
+) [ "myalias0"."part", "track" as "tet", "%1"."%1" NOT NULL as "mycount",
"track" ]
#select
# myalias0."part" as "part",
# myalias0."tet" as "tet",
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
