Changeset: 08a0bc9d6d85 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08a0bc9d6d85
Modified Files:
sql/backends/monet5/sql.mx
sql/server/rel_select.c
Branch: Aug2011
Log Message:
Merge with Apr2011 branch.
diffs (241 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
@@ -4237,10 +4237,10 @@
} else {
str v = (str)p;
strLength(&sz, v);
- if (len == 0 || sz <= len)
+ if (len == 0 || (sz >= 0 && sz <= len))
r = GDKstrdup(v);
}
- if (len > 0 && sz > len) {
+ if ((len > 0 && sz > len) || sz < 0) {
if (r)
GDKfree(r);
if (ATOMcmp(TYPE_str, ATOMnilptr(TYPE_str), p) != 0) {
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2488,8 +2488,16 @@
return rel_lastexp(sql, *rel);
return NULL;
}
- default:
- return sql_error(sql, 02, "Predicate %s %d: time to implement
some more", token2string(sc->token), sc->token);
+ default: {
+ sql_exp *re, *le = rel_value_exp(sql, rel, sc, f, ek);
+
+ if (!le)
+ return NULL;
+ re = exp_atom_bool(sql->sa, 1);
+ if (rel_convert_types(sql, &le, &re, 1, type_equal) < 0)
+ return NULL;
+ return rel_binop_(sql, le, re, NULL, "=", 0);
+ }
}
}
@@ -3553,6 +3561,8 @@
res = rel_nop_(sql, cond, result, res, NULL, NULL,
"ifthenelse", card_value);
if (!res)
return NULL;
+ /* ugh overwrite res type */
+ ((sql_subfunc*)res->f)->res = *restype;
}
return res;
}
diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out
@@ -33,7 +33,7 @@
% sys. # table_name
% ifthenelse_isnull_=_i # name
% char # type
-% 0 # length
+% 23 # length
[ "base table" ]
[ "system table" ]
[ "view" ]
diff --git
a/sql/test/BugDay_2005-11-09_2.8/Tests/crash_in_case.SF-1097749.stable.out
b/sql/test/BugDay_2005-11-09_2.8/Tests/crash_in_case.SF-1097749.stable.out
--- a/sql/test/BugDay_2005-11-09_2.8/Tests/crash_in_case.SF-1097749.stable.out
+++ b/sql/test/BugDay_2005-11-09_2.8/Tests/crash_in_case.SF-1097749.stable.out
@@ -28,7 +28,7 @@
% . # table_name
% isnull_>_single_value # name
% char # type
-% 0 # length
+% 5 # length
[ "true" ]
# 12:45:07 >
diff --git
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
---
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
+++
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
@@ -28,7 +28,7 @@
% . # table_name
% isnull_=_single_value # name
% char # type
-% 0 # length
+% 5 # length
[ NULL ]
# 12:45:31 >
diff --git a/sql/test/BugTracker-2009/Tests/IS_NULL_in_CASE.stable.out
b/sql/test/BugTracker-2009/Tests/IS_NULL_in_CASE.stable.out
--- a/sql/test/BugTracker-2009/Tests/IS_NULL_in_CASE.stable.out
+++ b/sql/test/BugTracker-2009/Tests/IS_NULL_in_CASE.stable.out
@@ -31,14 +31,14 @@
% sys.sometable, sys. # table_name
% somecol, NewColumnName # name
% int, char # type
-% 1, 0 # length
+% 1, 10 # length
[ 0, "small" ]
[ 1, "small" ]
[ NULL, "NULL FOUND" ]
% sys.sometable, sys. # table_name
% somecol, NewColumnName # name
% int, char # type
-% 1, 0 # length
+% 1, 10 # length
[ 0, "small" ]
[ 1, "small" ]
[ NULL, "NULL FOUND" ]
diff --git
a/sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out
b/sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out
---
a/sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out
+++
b/sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out
@@ -35,7 +35,7 @@
% sys. # table_name
% avg_cost_cpc # name
% decimal # type
-% 21 # length
+% 20 # length
[ 0.0000 ]
# 18:09:40 >
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
@@ -27,3 +27,4 @@
with-scope.Bug-2058
blob-update-crash.Bug-2832
select_value_insert_into.Bug-2845
+recursive_case.Bug-2838
diff --git a/sql/test/BugTracker-2011/Tests/recursive_case.Bug-2838.sql
b/sql/test/BugTracker-2011/Tests/recursive_case.Bug-2838.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/recursive_case.Bug-2838.sql
@@ -0,0 +1,6 @@
+CREATE TABLE t (c int);
+INSERT INTO t VALUES (1);
+INSERT INTO t VALUES (3);
+SELECT CASE WHEN CASE t.c WHEN 3 THEN TRUE ELSE FALSE END THEN 5 ELSE 7 END
+FROM t;
+drop table t;
diff --git a/sql/test/BugTracker-2011/Tests/recursive_case.Bug-2838.stable.err
b/sql/test/BugTracker-2011/Tests/recursive_case.Bug-2838.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/recursive_case.Bug-2838.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'recursive_case.Bug-2838` in directory 'test/BugTracker-2011`
itself:
+
+
+# 20:25:42 >
+# 20:25:42 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/ufs/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" --set
mapi_open=true --set mapi_port=32631 --set monet_prompt= --trace --forcemito
--set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0
; echo ; echo Over..
+# 20:25:42 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/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 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
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32631
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 20:25:42 >
+# 20:25:42 > mclient -lsql -ftest -i -e --host=alf --port=32631
+# 20:25:42 >
+
+
+# 20:25:42 >
+# 20:25:42 > Done.
+# 20:25:42 >
+
diff --git a/sql/test/BugTracker-2011/Tests/recursive_case.Bug-2838.stable.out
b/sql/test/BugTracker-2011/Tests/recursive_case.Bug-2838.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/recursive_case.Bug-2838.stable.out
@@ -0,0 +1,46 @@
+stdout of test 'recursive_case.Bug-2838` in directory 'test/BugTracker-2011`
itself:
+
+
+# 20:25:42 >
+# 20:25:42 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/ufs/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" --set
mapi_open=true --set mapi_port=32631 --set monet_prompt= --trace --forcemito
--set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0
; echo ; echo Over..
+# 20:25:42 >
+
+# MonetDB 5 server v11.3.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 7.752 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://alf.ins.cwi.nl:32631/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+Over..
+
+# 20:25:42 >
+# 20:25:42 > mclient -lsql -ftest -i -e --host=alf --port=32631
+# 20:25:42 >
+
+#CREATE TABLE t (c int);
+#INSERT INTO t VALUES (1);
+[ 1 ]
+#INSERT INTO t VALUES (3);
+[ 1 ]
+#SELECT CASE WHEN CASE t.c WHEN 3 THEN TRUE ELSE FALSE END THEN 5 ELSE 7 END
+#FROM t;
+% sys. # table_name
+% ifthenelse_isnull_=_c # name
+% tinyint # type
+% 1 # length
+[ 7 ]
+[ 5 ]
+#drop table t;
+
+# 20:25:42 >
+# 20:25:42 > Done.
+# 20:25:42 >
+
diff --git a/sql/test/Tests/coalesce.stable.out
b/sql/test/Tests/coalesce.stable.out
--- a/sql/test/Tests/coalesce.stable.out
+++ b/sql/test/Tests/coalesce.stable.out
@@ -70,7 +70,7 @@
% . # table_name
% isnull_single_value # name
% char # type
-% 0 # length
+% 1 # length
[ "x" ]
% sys.coalescetest, sys.coalescetest, sys.coalescetest # table_name
% id, name, age # name
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
