Changeset: 4e75b961d68a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e75b961d68a
Modified Files:
sql/backends/monet5/sql.mx
sql/test/BugTracker-2011/Tests/All
sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.sql
sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.err
sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.out
Branch: Aug2011
Log Message:
fixed bug 2923. Precedence rule problem...
diffs (143 lines):
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -4597,7 +4597,7 @@ str bat@2_dec2_@1( int *res, int *s1, in
if ( b->T->nonil){
if (scale)
for (; p<q; p++, o++)
- *o = (@1) ((*p + (*p<0)?-5:5) / scales[scale]);
+ *o = (@1) ((*p + ((*p<0)?-5:5)) /
scales[scale]);
else
for (; p<q; p++, o++)
*o = (@1) (*p);
@@ -4607,7 +4607,7 @@ str bat@2_dec2_@1( int *res, int *s1, in
*o = @1_nil;
bn->T->nonil= FALSE;
} else if (scale) {
- *o = (@1) ((*p + (*p<0)?-5:5) / scales[scale]);
+ *o = (@1) ((*p + ((*p<0)?-5:5)) /
scales[scale]);
} else {
*o = (@1) (*p);
}
@@ -5095,7 +5095,7 @@ str bat@2_dec2_@1( int *res, int *s1, in
if ( b->T->nonil){
for (; p<q; p++, o++) {
if (scale)
- val = (@2) ((*p+ (*p<0)?-5:5)/scales[scale]);
+ val = (@2) ((*p+ ((*p<0)?-5:5))/scales[scale]);
else
val = (@2) (*p);
/* see if the number fits in the data type */
@@ -5115,7 +5115,7 @@ str bat@2_dec2_@1( int *res, int *s1, in
bn->T->nonil= FALSE;
} else {
if (scale)
- val = (@2) (( *p + (
*p<0)?-5:5)/scales[scale]);
+ val = (@2) (( *p + ((
*p<0)?-5:5))/scales[scale]);
else
val = (@2) (*p);
/* see if the number fits in the data type */
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -56,3 +56,4 @@ history.Bug-2909
interrupted-initialization.Bug-2875
case-overflow.Bug-2239
sqltables.Bug-2921
+Multiplication_and_cast.Bug-2923
diff --git
a/sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.sql
b/sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.sql
@@ -0,0 +1,4 @@
+create table test234(t decimal(3,2));
+insert into test234 (t) values (-1.21);
+select cast((t * 100) as integer) from test234;
+drop table test234;
diff --git
a/sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.err
b/sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'Multiplication_and_cast.Bug-2923` in directory
'test/BugTracker-2011` itself:
+
+
+# 11:01:58 >
+# 11:01:58 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=31057" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011"
"--set" "mal_listing=0"
+# 11:01:58 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# 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 gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 31057
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 11:01:58 >
+# 11:01:58 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=31057"
+# 11:01:58 >
+
+
+# 11:01:58 >
+# 11:01:58 > "Done."
+# 11:01:58 >
+
diff --git
a/sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.out
b/sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.out
@@ -0,0 +1,40 @@
+stdout of test 'Multiplication_and_cast.Bug-2923` in directory
'test/BugTracker-2011` itself:
+
+
+# 11:01:58 >
+# 11:01:58 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=31057" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011"
"--set" "mal_listing=0"
+# 11:01:58 >
+
+# MonetDB 5 server v11.5.4
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.788 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:31057/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 11:01:58 >
+# 11:01:58 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=31057"
+# 11:01:58 >
+
+#create table test234(t decimal(3,2));
+#insert into test234 (t) values (-1.21);
+[ 1 ]
+#select cast((t * 100) as integer) from test234;
+% sys. # table_name
+% sql_mul_t # name
+% int # type
+% 4 # length
+[ -121 ]
+#drop table test234;
+
+# 11:01:58 >
+# 11:01:58 > "Done."
+# 11:01:58 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
