Changeset: 7968019ee0e0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7968019ee0e0
Removed Files:
        sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out.int128
        
sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out.int128
Modified Files:
        sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.sql
        sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql
        sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out
Branch: default
Log Message:

Eliminated *.int128 output files (by adding cast(... as bigint))


diffs (truncated from 424 to 300 lines):

diff --git a/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.sql 
b/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.sql
--- a/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.sql
+++ b/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.sql
@@ -21,8 +21,8 @@ insert into "t1" values
 -- Works
 select
     "c1",
-    sum("d1") as "d1",
-    sum("d2") as "d2"
+    cast(sum("d1") as bigint) as "d1",
+    cast(sum("d2") as bigint) as "d2"
 from "t1"
 group by "c1"
 having sum("d1") < case when 5 > 10 then 500 else 400 end;
@@ -30,18 +30,18 @@ having sum("d1") < case when 5 > 10 then
 -- Works
 select
     "c1",
-    sum("d1")as "d1",
-    sum("d2") as "d2",
-    1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else null 
end) as "formula"
+    cast(sum("d1")as bigint)as "d1",
+    cast(sum("d2") as bigint) as "d2",
+    cast(1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else 
null end) as decimal(18,3)) as "formula"
 from "t1"
 group by "c1";
 
 -- Crashes
 select
     "c1",
-    sum("d1")as "d1",
-    sum("d2") as "d2",
-    1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else null 
end) as "formula"
+    cast(sum("d1")as bigint)as "d1",
+    cast(sum("d2") as bigint) as "d2",
+    cast(1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else 
null end) as decimal(18,3)) as "formula"
 from "t1"
 group by "c1"
 having (1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else 
null end)) > 1;
diff --git 
a/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out.int128 
b/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out.int128
deleted file mode 100644
--- a/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out.int128
+++ /dev/null
@@ -1,89 +0,0 @@
-stdout of test 'aggr-in-case.Bug-6526` in directory 'sql/test/BugTracker-2018` 
itself:
-
-
-# 18:07:27 >  
-# 18:07:27 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=35745" "--set" 
"mapi_usock=/var/tmp/mtest-17690/.s.monetdb.35745" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
-# 18:07:27 >  
-
-# MonetDB 5 server v11.27.14
-# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2018', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
-# Found 7.324 GiB available main-memory.
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://localhost.nes.nl:35745/
-# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-17690/.s.monetdb.35745
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-
-# 18:07:27 >  
-# 18:07:27 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-17690" "--port=35745"
-# 18:07:27 >  
-
-#start transaction;
-#create table "t1" (
-#    "id" int,
-#    "c1" varchar(100),
-#    "d1" int,
-#    "d2" int
-#);
-#insert into "t1" values
-#(1, 'A', 50, 80),
-#(2, 'A', 200, 350),
-#(3, 'A', 89, 125),
-#(4, 'B', 4845, 13),
-#(5, 'B', 194, 597),
-#(6, 'C', 5636, 5802),
-#(7, 'C', 375, 3405),
-#(7, 'D', 365, 0),
-#(7, 'D', 87, 0);
-[ 9    ]
-#select
-#    "c1",
-#    sum("d1") as "d1",
-#    sum("d2") as "d2"
-#from "t1"
-#group by "c1"
-#having sum("d1") < case when 5 > 10 then 500 else 400 end;
-% sys.t1,      sys.L4, sys.L7 # table_name
-% c1,  d1,     d2 # name
-% varchar,     hugeint,        hugeint # type
-% 1,   3,      3 # length
-[ "A", 339,    555     ]
-#select
-#    "c1",
-#    sum("d1")as "d1",
-#    sum("d2") as "d2",
-#    1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else null 
end) as "formula"
-#from "t1"
-#group by "c1";
-% sys.t1,      sys.L4, sys.L7, sys.L14 # table_name
-% c1,  d1,     d2,     formula # name
-% varchar,     hugeint,        hugeint,        decimal # type
-% 1,   4,      4,      40 # length
-[ "A", 339,    555,    0.610   ]
-[ "B", 5039,   610,    8.260   ]
-[ "C", 6011,   9207,   0.652   ]
-[ "D", 452,    0,      NULL    ]
-#select
-#    "c1",
-#    sum("d1")as "d1",
-#    sum("d2") as "d2",
-#    1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else null 
end) as "formula"
-#from "t1"
-#group by "c1"
-#having (1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else 
null end)) > 1;
-% sys.t1,      sys.L4, sys.L7, sys.L14 # table_name
-% c1,  d1,     d2,     formula # name
-% varchar,     hugeint,        hugeint,        decimal # type
-% 1,   4,      3,      40 # length
-[ "B", 5039,   610,    8.260   ]
-#rollback;
-
-# 18:07:27 >  
-# 18:07:27 >  "Done."
-# 18:07:27 >  
-
diff --git a/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql 
b/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql
--- a/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql
+++ b/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.sql
@@ -1,10 +1,11 @@
 start transaction;
 create table segments (meter int, distance int, speed int);
 insert into segments values (1,1,1),(9,9,9);
-select t.* from segments as s, lateral generate_series(s.meter, 
s.meter+s.distance+1) as t;
-select t.value, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, s.meter+s.distance+1) as t;
-select * from segments as s, lateral generate_series(s.meter, 
s.meter+s.distance+1);
-select t.*, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, s.meter+s.distance+1) as t;
-select t.meter, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, s.meter+s.distance+1) as t(meter);
-select t.*, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, s.meter+s.distance+1) as t(meter);
+select t.*                          from segments as s, lateral 
generate_series(s.meter, cast(s.meter+s.distance+1 as int)) as t;
+select t.value, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, cast(s.meter+s.distance+1 as int)) as t;
+select *                            from segments as s, lateral 
generate_series(s.meter, cast(s.meter+s.distance+1 as int));
+select t.*, s.distance, s.speed     from segments as s, lateral 
generate_series(s.meter, cast(s.meter+s.distance+1 as int)) as t;
+select t.meter, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, cast(s.meter+s.distance+1 as int)) as t(meter);
+select t.*, s.distance, s.speed     from segments as s, lateral 
generate_series(s.meter, cast(s.meter+s.distance+1 as int)) as t(meter);
 rollback;
+
diff --git 
a/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out 
b/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out
--- a/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out
+++ b/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out
@@ -29,7 +29,7 @@ stdout of test 'lateral-join-crash.Bug-6
 #select t.* from segments as s, lateral generate_series(s.meter, 
s.meter+s.distance+1) as t;
 % .t # table_name
 % value # name
-% bigint # type
+% int # type
 % 2 # length
 [ 1    ]
 [ 2    ]
@@ -58,7 +58,7 @@ stdout of test 'lateral-join-crash.Bug-6
 #select t.value, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, s.meter+s.distance+1) as t;
 % .t,  sys.s,  sys.s # table_name
 % value,       distance,       speed # name
-% bigint,      int,    int # type
+% int, int,    int # type
 % 2,   1,      1 # length
 [ 1,   1,      1       ]
 [ 2,   1,      1       ]
@@ -87,7 +87,7 @@ stdout of test 'lateral-join-crash.Bug-6
 #select * from segments as s, lateral generate_series(s.meter, 
s.meter+s.distance+1);
 % sys.s,       sys.s,  sys.s,  .L2 # table_name
 % meter,       distance,       speed,  value # name
-% int, int,    int,    bigint # type
+% int, int,    int,    int # type
 % 1,   1,      1,      2 # length
 [ 1,   1,      1,      1       ]
 [ 1,   1,      1,      2       ]
@@ -116,7 +116,7 @@ stdout of test 'lateral-join-crash.Bug-6
 #select t.*, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, s.meter+s.distance+1) as t;
 % .t,  sys.s,  sys.s # table_name
 % value,       distance,       speed # name
-% bigint,      int,    int # type
+% int, int,    int # type
 % 2,   1,      1 # length
 [ 1,   1,      1       ]
 [ 2,   1,      1       ]
@@ -145,7 +145,7 @@ stdout of test 'lateral-join-crash.Bug-6
 #select t.meter, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, s.meter+s.distance+1) as t(meter);
 % .t,  sys.s,  sys.s # table_name
 % meter,       distance,       speed # name
-% bigint,      int,    int # type
+% int, int,    int # type
 % 2,   1,      1 # length
 [ 1,   1,      1       ]
 [ 2,   1,      1       ]
@@ -174,7 +174,7 @@ stdout of test 'lateral-join-crash.Bug-6
 #select t.*, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, s.meter+s.distance+1) as t(meter);
 % .t,  sys.s,  sys.s # table_name
 % meter,       distance,       speed # name
-% bigint,      int,    int # type
+% int, int,    int # type
 % 2,   1,      1 # length
 [ 1,   1,      1       ]
 [ 2,   1,      1       ]
diff --git 
a/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out.int128 
b/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out.int128
deleted file mode 100644
--- 
a/sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out.int128
+++ /dev/null
@@ -1,208 +0,0 @@
-stdout of test 'lateral-join-crash.Bug-6613` in directory 
'sql/test/BugTracker-2018` itself:
-
-
-# 00:28:46 >  
-# 00:28:46 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=34098" "--set" 
"mapi_usock=/var/tmp/mtest-13250/.s.monetdb.34098" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
 "--set" "embedded_c=true"
-# 00:28:46 >  
-
-# MonetDB 5 server v11.34.0 (hg id: 9b9d1f1578b1+)
-# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
-# Found 15.385 GiB available main-memory.
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on 
mapi:monetdb://localhost.localdomain:34098/
-# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-13250/.s.monetdb.34098
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-# 00:28:47 >  
-# 00:28:47 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-13250" "--port=34098"
-# 00:28:47 >  
-
-#start transaction;
-#create table segments (meter int, distance int, speed int);
-#insert into segments values (1,1,1),(9,9,9);
-[ 2    ]
-#select t.* from segments as s, lateral generate_series(s.meter, 
s.meter+s.distance+1) as t;
-% .t # table_name
-% value # name
-% hugeint # type
-% 2 # length
-[ 1    ]
-[ 2    ]
-[ 9    ]
-[ 10   ]
-[ 11   ]
-[ 12   ]
-[ 13   ]
-[ 14   ]
-[ 15   ]
-[ 16   ]
-[ 17   ]
-[ 18   ]
-[ 1    ]
-[ 2    ]
-[ 9    ]
-[ 10   ]
-[ 11   ]
-[ 12   ]
-[ 13   ]
-[ 14   ]
-[ 15   ]
-[ 16   ]
-[ 17   ]
-[ 18   ]
-#select t.value, s.distance, s.speed from segments as s, lateral 
generate_series(s.meter, s.meter+s.distance+1) as t;
-% .t,  sys.s,  sys.s # table_name
-% value,       distance,       speed # name
-% hugeint,     int,    int # type
-% 2,   1,      1 # length
-[ 1,   1,      1       ]
-[ 2,   1,      1       ]
-[ 9,   1,      1       ]
-[ 10,  1,      1       ]
-[ 11,  1,      1       ]
-[ 12,  1,      1       ]
-[ 13,  1,      1       ]
-[ 14,  1,      1       ]
-[ 15,  1,      1       ]
-[ 16,  1,      1       ]
-[ 17,  1,      1       ]
-[ 18,  1,      1       ]
-[ 1,   9,      9       ]
-[ 2,   9,      9       ]
-[ 9,   9,      9       ]
-[ 10,  9,      9       ]
-[ 11,  9,      9       ]
-[ 12,  9,      9       ]
-[ 13,  9,      9       ]
-[ 14,  9,      9       ]
-[ 15,  9,      9       ]
-[ 16,  9,      9       ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to