Changeset: 50de40d39eea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50de40d39eea
Modified Files:
sql/src/server/rel_select.mx
Branch: default
Log Message:
merged fix & test for bug #2549 "crash with prepare statement" from Jun2010
diffs (198 lines):
diff -r 0e8fa15d9ea2 -r 50de40d39eea sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx Thu Jun 03 22:40:51 2010 +0200
+++ b/sql/src/server/rel_select.mx Fri Jun 04 00:30:40 2010 +0200
@@ -3106,7 +3106,6 @@
}
return exp_binop(l, r, f);
} else {
- int digits = t1->digits + t2->digits;
sql_exp *ol = exp_dup(l);
sql_exp *or = exp_dup(r);
@@ -3153,7 +3152,7 @@
} else if (f->func->fix_scale == SCALE_MUL) {
l = exp_sum_scales(sql, f, l, r);
} else if (f->func->fix_scale == DIGITS_ADD) {
- f->res.digits = digits;
+ f->res.digits = t1->digits + t2->digits;
}
exp_destroy(ol);
exp_destroy(or);
diff -r 0e8fa15d9ea2 -r 50de40d39eea sql/src/test/Bugzilla-2010/Tests/All
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/Bugzilla-2010/Tests/All Fri Jun 04 00:30:40 2010 +0200
@@ -0,0 +1,1 @@
+crash_with_prepare_statement.ID-2549
diff -r 0e8fa15d9ea2 -r 50de40d39eea
sql/src/test/Bugzilla-2010/Tests/crash_with_prepare_statement.ID-2549.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/Bugzilla-2010/Tests/crash_with_prepare_statement.ID-2549.sql
Fri Jun 04 00:30:40 2010 +0200
@@ -0,0 +1,32 @@
+CREATE SCHEMA TB;
+
+CREATE TABLE TB.STOCK_ITEM (
+ S_W_ID INTEGER NOT NULL,
+ S_I_ID INTEGER NOT NULL,
+ S_QUANTITY INTEGER NOT NULL,
+ S_DIST_01 CHAR(24) NOT NULL,
+ S_DIST_02 CHAR(24) NOT NULL,
+ S_DIST_03 CHAR(24) NOT NULL,
+ S_DIST_04 CHAR(24) NOT NULL,
+ S_DIST_05 CHAR(24) NOT NULL,
+ S_DIST_06 CHAR(24) NOT NULL,
+ S_DIST_07 CHAR(24) NOT NULL,
+ S_DIST_08 CHAR(24) NOT NULL,
+ S_DIST_09 CHAR(24) NOT NULL ,
+ S_DIST_10 CHAR(24) NOT NULL,
+ S_YTD DECIMAL(8,0) NOT NULL,
+ S_ORDER_CNT INTEGER NOT NULL,
+ S_REMOTE_CNT INTEGER NOT NULL,
+ S_DATA VARCHAR(50) NOT NULL
+);
+
+PREPARE
+UPDATE TB.STOCK_ITEM SET
+ S_QUANTITY = ?,
+ S_YTD = S_YTD + ?,
+ S_ORDER_CNT = S_ORDER_CNT + 1
+WHERE S_W_ID = ? AND S_I_ID = ?;
+
+drop table TB.STOCK_ITEM;
+
+drop schema TB;
diff -r 0e8fa15d9ea2 -r 50de40d39eea
sql/src/test/Bugzilla-2010/Tests/crash_with_prepare_statement.ID-2549.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/Bugzilla-2010/Tests/crash_with_prepare_statement.ID-2549.stable.err
Fri Jun 04 00:30:40 2010 +0200
@@ -0,0 +1,87 @@
+stderr of test 'crash_with_prepare_statement.ID-2549` in directory
'src/test/Bugzilla-2010` itself:
+
+
+# 00:18:04 >
+# 00:18:04 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=34918 --set
xrpc_port=49630 --set monet_prompt= --trace
"--dbname=mTests_src_test_Bugzilla-2010" --set mal_listing=0 "--dbinit= include
sql;" ; echo ; e
cho Over..
+# 00:18:04 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.36.6
+# builtin opt prefix =
/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = tst
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
+# builtin opt gdk_debug = 8
+# builtin opt gdk_alloc_map = yes
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib64/MonetDB
+# builtin opt monet_daemon = yes
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_noheaders = no
+# builtin opt mapi_debug = 0
+# builtin opt mapi_clients = 2
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix =
/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix =
/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt gdk_dbname = demo
+# config opt gdk_alloc_map = no
+# config opt gdk_embedded = no
+# config opt gdk_debug = 0
+# config opt monet_mod_path =
${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_prefix}/lib64/MonetDB5/bin
+# config opt monet_daemon = no
+# config opt monet_welcome = yes
+# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt mal_init = ${exec_prefix}/lib64/MonetDB5/mal_init.mal
+# config opt mal_listing = 2
+# config opt mapi_port = 50000
+# config opt mapi_autosense = false
+# config opt mapi_open = false
+# config opt sql_optimizer = default_pipe
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,garbageCollector,dataflow,history,multiplex
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,garbageCollector,dataflow,history,multiplex
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
+# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,derivePath,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# cmdline opt config =
/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 34918
+# cmdline opt xrpc_port = 49630
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbname = mTests_src_test_Bugzilla-2010
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see
/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf)
+
+# 00:18:05 >
+# 00:18:05 > mclient -lsql -ftest -i -e --host=rig --port=34918
+# 00:18:05 >
+
+
+# 00:18:05 >
+# 00:18:05 > Done.
+# 00:18:05 >
+
diff -r 0e8fa15d9ea2 -r 50de40d39eea
sql/src/test/Bugzilla-2010/Tests/crash_with_prepare_statement.ID-2549.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/Bugzilla-2010/Tests/crash_with_prepare_statement.ID-2549.stable.out
Fri Jun 04 00:30:40 2010 +0200
@@ -0,0 +1,42 @@
+stdout of test 'crash_with_prepare_statement.ID-2549` in directory
'src/test/Bugzilla-2010` itself:
+
+
+# 00:18:04 >
+# 00:18:04 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Feb2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=34918 --set
xrpc_port=49630 --set monet_prompt= --trace
"--dbname=mTests_src_test_Bugzilla-2010" --set mal_listing=0 "--dbinit= include
sql;" ; echo ; e
cho Over..
+# 00:18:04 >
+
+# MonetDB server v5.18.6, based on kernel v1.36.6
+# Serving database 'mTests_src_test_Bugzilla-2010', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.751 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:34918/
+# MonetDB/SQL module v2.36.6 loaded
+
+Ready.
+#function user.main():void;
+# clients.quit();
+#end main;
+
+Over..
+
+# 00:21:12 >
+# 00:21:12 > mclient -lsql -ftest -i -e --host=rig --port=38530
+# 00:21:12 >
+
+#PREPARE
+% .prepare, .prepare, .prepare # table_name
+% type, digits, scale # name
+% varchar, int, int # type
+% 0, 0, 0 # length
+[ "int", 32, 0 ]
+[ "decimal", 8, 0 ]
+[ "int", 32, 0 ]
+[ "int", 32, 0 ]
+
+# 00:21:13 >
+# 00:21:13 > Done.
+# 00:21:13 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
