Changeset: 90754b6a9a39 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90754b6a9a39
Added Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128
sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out.int128
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out.int128
Removed Files:
sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out.int128
Modified Files:
sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.sql
sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out
Branch: default
Log Message:
Approve non-hugeint output.
diffs (truncated from 330 to 300 lines):
diff --git a/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.sql
b/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.sql
--- a/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.sql
+++ b/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.sql
@@ -1,7 +1,7 @@
CREATE TABLE A(q1 bigint, q2 bigint);
INSERT INTO A VALUES('4567890123456789','4567890123456789');
-SELECT 2 * q1 AS q FROM A;
+SELECT CAST(2 * q1 AS BIGINT) AS q FROM A;
drop table A;
@@ -10,7 +10,7 @@ CREATE TABLE A2
COL2 INTEGER);
INSERT INTO A2 VALUES (111,1112);
-SELECT SUM(2 * COL1 * COL2)
+SELECT CAST(SUM(2 * COL1 * COL2) AS BIGINT)
FROM A2;
drop table A2;
@@ -23,7 +23,7 @@ COL3 INTEGER
INSERT INTO A VALUES(1000,-2000,NULL);
-SELECT (-COL2+COL1)
+SELECT CAST((-COL2+COL1) AS BIGINT)
FROM A
WHERE COL3 IS NULL;
diff --git
a/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out
b/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out
--- a/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out
+++ b/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out
@@ -24,8 +24,8 @@ Ready.
# 12:25:51 >
[ 1 ]
-#SELECT 2 * q1 AS q FROM A;
-% sys.L2 # table_name
+#SELECT CAST(2 * q1 AS BIGINT) AS q FROM A;
+% sys.L3 # table_name
% q # name
% bigint # type
% 16 # length
@@ -33,8 +33,8 @@ Ready.
[ 1 ]
#SELECT SUM(2 * COL1 * COL2)
#FROM A2;
-% sys.L2 # table_name
-% L1 # name
+% .L4 # table_name
+% L4 # name
% bigint # type
% 6 # length
[ 246864 ]
diff --git
a/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out.int128
b/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out.int128
deleted file mode 100644
---
a/sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out.int128
+++ /dev/null
@@ -1,54 +0,0 @@
-stdout of test 'auto_coersion_bug.SF-2075157` in directory
'sql/test/BugTracker-2008` itself:
-
-
-# 12:25:51 >
-# 12:25:51 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=30598 --set
xrpc_port=44185 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2008" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 12:25:51 >
-
-# MonetDB server v5.6.0, based on kernel v1.24.1
-# Serving database 'mTests_src_test_BugTracker-2008'
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:30598/
-# MonetDB/SQL module v2.24.1 loaded
-
-Ready.
-#function user.main():void;
-# clients.quit();
-#end main;
-
-
-# 12:25:51 >
-# 12:25:51 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30598
-# 12:25:51 >
-
-[ 1 ]
-#SELECT 2 * q1 AS q FROM A;
-% sys.L2 # table_name
-% q # name
-% hugeint # type
-% 16 # length
-[ 9135780246913578 ]
-[ 1 ]
-#SELECT SUM(2 * COL1 * COL2)
-#FROM A2;
-% .L3 # table_name
-% L3 # name
-% hugeint # type
-% 6 # length
-[ 246864 ]
-[ 1 ]
-#SELECT (-COL2+COL1)
-#FROM A
-#WHERE COL3 IS NULL;
-% sys.L2 # table_name
-% L2 # name
-% bigint # type
-% 4 # length
-[ 3000 ]
-
-# 12:25:51 >
-# 12:25:51 > Done.
-# 12:25:51 >
-
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
@@ -75,7 +75,7 @@ Ready.
#SELECT ALL + - 32 * - 32 + - - 76 - - - 43 * COUNT ( * ) + - + 84 * 0 * + +
39 + + 44 * + 76; -- 4401
% .L4 # table_name
% L4 # name
-% hugeint # type
+% bigint # type
% 4 # length
[ 4401 ]
#SELECT 38 + - 63 * 0 * - 13 AS col2; -- 38
@@ -112,13 +112,13 @@ Ready.
#SELECT - 13 * - ( + 0 ) + 39 * - COUNT ( * ) * - COUNT ( * ) col1; -- 39
% .L5 # table_name
% col1 # name
-% hugeint # type
+% bigint # type
% 2 # length
[ 39 ]
#SELECT COUNT ( - + 70 ) - - 99 * - 0 AS col2; -- 1
% .L4 # table_name
% col2 # name
-% hugeint # type
+% bigint # type
% 1 # length
[ 1 ]
#SELECT - ( - - 15 ) + - 53 * - 0; -- -15
@@ -130,7 +130,7 @@ Ready.
#SELECT - + 22 * + COUNT ( * ) + - - 58 - + 83 * + MAX ( - 94 * 0 ); -- 36
% .L5 # table_name
% L5 # name
-% hugeint # type
+% bigint # type
% 2 # length
[ 36 ]
#SELECT DISTINCT - 16 + ( + 37 ) - - 56 * - - 11 * - 0 + + MAX ( + 29 ) AS
col2; -- 50
@@ -148,13 +148,13 @@ Ready.
#SELECT ALL - 30 + + 85, - ( - + 43 ) - 71 + - 0 * - - 78 + - 78 + - - 47 * -
93 + 32 * + SUM ( 90 ) AS col0; -- 55, -1597
% .L2, .L6 # table_name
% L2, col0 # name
-% smallint, hugeint # type
+% smallint, bigint # type
% 2, 5 # length
[ 55, -1597 ]
#SELECT ALL + COUNT ( * ) - - + 0 * - 32; -- 1
% .L4 # table_name
% L4 # name
-% hugeint # type
+% bigint # type
% 1 # length
[ 1 ]
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out
@@ -27,7 +27,7 @@ Ready.
#SELECT COALESCE ( + 55, + 71 * - 23 + 20 + 74 / - COUNT ( ALL - 0 ) / + 75, -
85 / - 71 ) - + - 62 + - - CAST ( + 88 AS INTEGER ) * + + 83 AS col0;
% .L5 # table_name
% col0 # name
-% hugeint # type
+% bigint # type
% 4 # length
[ 7421 ]
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128
@@ -0,0 +1,37 @@
+stdout of test 'sqlitelogictest-coalesce-division-by-zero.Bug-6556` in
directory 'sql/test/BugTracker-2018` itself:
+
+
+# 19:49:40 >
+# 19:49:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34493" "--set"
"mapi_usock=/var/tmp/mtest-25061/.s.monetdb.34493" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 19:49:40 >
+
+# MonetDB 5 server v11.30.0
+# 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.387 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.localdomain:34493/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-25061/.s.monetdb.34493
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 19:49:40 >
+# 19:49:40 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25061" "--port=34493"
+# 19:49:40 >
+
+#SELECT COALESCE ( + 55, + 71 * - 23 + 20 + 74 / - COUNT ( ALL - 0 ) / + 75, -
85 / - 71 ) - + - 62 + - - CAST ( + 88 AS INTEGER ) * + + 83 AS col0;
+% .L5 # table_name
+% col0 # name
+% hugeint # type
+% 4 # length
+[ 7421 ]
+
+# 19:49:40 >
+# 19:49:40 > "Done."
+# 19:49:40 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out
@@ -27,7 +27,7 @@ Ready.
#SELECT - 59 + - 66, - 66 * + - COUNT ( ALL COALESCE ( NULLIF ( 90, + COALESCE
( - 67, 72 + - 30 ) + 17 ), 90 + 96, + 63 ) ) AS col1;
% .L2, .L6 # table_name
% L2, col1 # name
-% smallint, hugeint # type
+% smallint, bigint # type
% 4, 2 # length
[ -125, 66 ]
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out.int128
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out.int128
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out.int128
@@ -0,0 +1,37 @@
+stdout of test 'sqlitelogictest-count-coalesce-nullif.Bug-6586` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 15:44:28 >
+# 15:44:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38111" "--set"
"mapi_usock=/var/tmp/mtest-13646/.s.monetdb.38111" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 15:44:28 >
+
+# MonetDB 5 server v11.30.0
+# 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.387 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://xps13:38111/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-13646/.s.monetdb.38111
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 15:44:28 >
+# 15:44:28 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13646" "--port=38111"
+# 15:44:28 >
+
+#SELECT - 59 + - 66, - 66 * + - COUNT ( ALL COALESCE ( NULLIF ( 90, + COALESCE
( - 67, 72 + - 30 ) + 17 ), 90 + 96, + 63 ) ) AS col1;
+% .L2, .L6 # table_name
+% L2, col1 # name
+% smallint, hugeint # type
+% 4, 2 # length
+[ -125, 66 ]
+
+# 15:44:28 >
+# 15:44:28 > "Done."
+# 15:44:28 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out
@@ -28,7 +28,7 @@ Ready.
#THEN + 39 WHEN 70 * - 95 THEN 60 ELSE 15 + + 25 END * 5 ) WHEN + 36 THEN NULL
WHEN 24 THEN NULL ELSE 66 END ) ) AS col2;
% .L10 # table_name
% col2 # name
-% hugeint # type
+% bigint # type
% 4 # length
[ -225 ]
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out.int128
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out.int128
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out.int128
@@ -0,0 +1,38 @@
+stdout of test 'sqlitelogictest-select-nullif-case.Bug-6579` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 09:56:14 >
+# 09:56:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31815" "--set"
"mapi_usock=/var/tmp/mtest-15495/.s.monetdb.31815" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 09:56:14 >
+
+# MonetDB 5 server v11.30.0
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
