Changeset: 450e5aadc00c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=450e5aadc00c
Modified Files:
sql/src/backends/monet5/sql_result.mx
sql/src/test/BugTracker-2010/Tests/All
sql/src/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.sql
sql/src/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.err
sql/src/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.out
Branch: Oct2010
Log Message:
fixed bug 2748 and added test for it
The string length check is now done based on the
string after escape conversion.
diffs (186 lines):
diff -r aa5a3f4473c9 -r 450e5aadc00c sql/src/backends/monet5/sql_result.mx
--- a/sql/src/backends/monet5/sql_result.mx Fri Dec 10 19:53:46 2010 +0100
+++ b/sql/src/backends/monet5/sql_result.mx Fri Dec 10 22:13:59 2010 +0100
@@ -358,17 +358,25 @@
(void)quote;
if (type == TYPE_str) {
sql_column *col = (sql_column*)c->extra;
+ int len = (int) (e - s + 1); /* 64bit: should check for
overflow */
- if (col->type.digits > 0 && (unsigned)(e-s) > col->type.digits){
- str v = (str)s;
- strLength(&len, v);
-
- if (len == int_nil)
- len = 4;
- if ((unsigned int) len > col->type.digits)
+ if (c->len < len){
+ c->len = len;
+ c->data = GDKrealloc(c->data,len);
+ }
+
+ if (s == e) {
+ len = -1;
+ *(char*)c->data = 0;
+ } else if ((len = GDKstrFromStr(c->data, (unsigned char *) s,
(ssize_t) (e - s))) < 0) {
+ return NULL;
+ }
+ if (col->type.digits > 0 && len > 0 && len >
(int)col->type.digits) {
+ strLength(&len, c->data);
+ if (len > (int)col->type.digits)
return NULL;
}
- return TABLETstrFrStr(c, s, e);
+ return c->data;
}
len = (*BATatoms[type].atomFromStr)(s, &c->len, (ptr) &c->data);
diff -r aa5a3f4473c9 -r 450e5aadc00c sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Fri Dec 10 19:53:46 2010 +0100
+++ b/sql/src/test/BugTracker-2010/Tests/All Fri Dec 10 22:13:59 2010 +0100
@@ -78,3 +78,4 @@
crash_default_unlocked.Bug-2744
foreign_key_type_mismatch.Bug-2745
store_function_argument_correctly.Bug-2750
+COPY_INTO_with_backslashes.Bug-2748
diff -r aa5a3f4473c9 -r 450e5aadc00c
sql/src/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.sql
Fri Dec 10 22:13:59 2010 +0100
@@ -0,0 +1,6 @@
+create table t2748 (x varchar(1));
+copy 1 records into t2748 from stdin;
+\\
+
+select * from t2748;
+drop table t2748;
diff -r aa5a3f4473c9 -r 450e5aadc00c
sql/src/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.err
Fri Dec 10 22:13:59 2010 +0100
@@ -0,0 +1,79 @@
+stderr of test 'COPY_INTO_with_backslashes.Bug-2748` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 22:10:58 >
+# 22:10:58 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --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 mapi_open=true --set xrpc_open=true --set mapi_port=34775 --set
xrpc_port=46184 --set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 22:10:58 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.40.0
+# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# 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}/lib/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt no_mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sequential_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
+# cmdline opt config = /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt 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
+# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 34775
+# cmdline opt xrpc_port = 46184
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2010
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
+
+# 22:10:58 >
+# 22:10:58 > mclient -lsql -ftest -i -e --host=alf --port=34775
+# 22:10:58 >
+
+
+# 22:10:58 >
+# 22:10:58 > Done.
+# 22:10:58 >
+
diff -r aa5a3f4473c9 -r 450e5aadc00c
sql/src/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.out
Fri Dec 10 22:13:59 2010 +0100
@@ -0,0 +1,44 @@
+stdout of test 'COPY_INTO_with_backslashes.Bug-2748` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 22:10:58 >
+# 22:10:58 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --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 mapi_open=true --set xrpc_open=true --set mapi_port=34775 --set
xrpc_port=46184 --set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 22:10:58 >
+
+# MonetDB server v5.22.0, based on kernel v1.40.0
+# Not released
+# Serving database 'mTests_src_test_BugTracker-2010', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.753 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
+#WARNING: LoaderException:loadLibrary:Loading error 'libmseed.so.2: cannot
open shared object file: No such file or directory' from within file 'vault'
+# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:34775/
+# MonetDB/SQL module v2.40.0 loaded
+
+Ready.
+
+Over..
+
+# 22:10:58 >
+# 22:10:58 > mclient -lsql -ftest -i -e --host=alf --port=34775
+# 22:10:58 >
+
+#create table t2748 (x varchar(1));
+#copy 1 records into t2748 from stdin;
+#\\
+#
+[ 1 ]
+#select * from t2748;
+% sys.t2748 # table_name
+% x # name
+% varchar # type
+% 1 # length
+[ "\\" ]
+#drop table t2748;
+
+# 22:10:58 >
+# 22:10:58 > Done.
+# 22:10:58 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
