Changeset: ffdcc0d6f2fb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ffdcc0d6f2fb
Added Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out
Modified Files:
sql/server/sql_atom.c
Branch: Mar2018
Log Message:
fixed last part of bug 6600, ie correct digits (bits) in atom_mul
diffs (105 lines):
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -1275,6 +1275,7 @@ atom_mul(atom *a1, atom *a2)
dst.vtype = TYPE_dbl;
if (VARconvert(&dst, &a1->data, 1) == GDK_SUCCEED)
a1->d = dst.val.dval;
+ a1->tpe.digits += a2->tpe.digits;
return a1;
}
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'sqlitelogictest-select-errors.Bug-6600` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 12:42:15 >
+# 12:42:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38685" "--set"
"mapi_usock=/var/tmp/mtest-28541/.s.monetdb.38685" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 12:42:15 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-old/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 38685
+# cmdline opt mapi_usock = /var/tmp/mtest-28541/.s.monetdb.38685
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 12:42:15 >
+# 12:42:15 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28541" "--port=38685"
+# 12:42:15 >
+
+
+# 12:42:15 >
+# 12:42:15 > "Done."
+# 12:42:15 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out
@@ -0,0 +1,49 @@
+stdout of test 'sqlitelogictest-select-errors.Bug-6600` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 12:42:15 >
+# 12:42:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38685" "--set"
"mapi_usock=/var/tmp/mtest-28541/.s.monetdb.38685" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 12:42:15 >
+
+# MonetDB 5 server v11.29.4
+# 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.386 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:38685/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28541/.s.monetdb.38685
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 12:42:15 >
+# 12:42:15 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28541" "--port=38685"
+# 12:42:15 >
+
+#SELECT ALL + 60 * - NULLIF ( - CAST ( NULL AS INTEGER ), 51 * 70 * 62 / + 52
* + 58 / 90 - CAST ( + 44 AS INTEGER ) ) AS col2, 35;
+% .L4, .L6 # table_name
+% col2, L6 # name
+% bigint, tinyint # type
+% 1, 2 # length
+[ NULL, 35 ]
+#SELECT ALL 11 * COUNT ( * ) * + 2 * 6;
+% .L4 # table_name
+% L4 # name
+% hugeint # type
+% 3 # length
+[ 132 ]
+#SELECT ALL - 9 * NULLIF ( + 30, + 64 ) * + 46 * 1;
+% .L2 # table_name
+% L2 # name
+% int # type
+% 6 # length
+[ -12420 ]
+
+# 12:42:15 >
+# 12:42:15 > "Done."
+# 12:42:15 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
