Changeset: f1bc4f634f11 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1bc4f634f11
Added Files:
sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.sql
sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.err
sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.out
Modified Files:
gdk/gdk_storage.c
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
sql/server/rel_optimizer.c
sql/server/rel_updates.c
sql/test/BugTracker-2013/Tests/All
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (260 lines):
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -136,7 +136,7 @@ GDKremovedir(const char *dirname)
int
GDKfdlocate(const char *nme, const char *mode, const char *extension)
{
- char buf[PATHLENGTH], *path = buf;
+ char path[PATHLENGTH];
int fd, flags = 0;
if ((nme == NULL) || (*nme == 0)) {
@@ -164,11 +164,8 @@ GDKfdlocate(const char *nme, const char
#endif
fd = open(path, flags, MONETDB_MODE);
if (fd < 0 && *mode == 'w') {
- /* try to create the directory, if that was the problem */
- char tmp[PATHLENGTH];
-
- strcpy(tmp, buf);
- if (GDKcreatedir(tmp)) {
+ /* try to create the directory, in case that was the problem */
+ if (GDKcreatedir(path)) {
fd = open(path, flags, MONETDB_MODE);
}
}
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
@@ -30,16 +30,16 @@ stderr of test 'opt_sql_append` in direc
# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
# 22:58:57 >
-MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+MAPI = monetdb@LAB03:34567
QUERY = explain copy into ttt from '/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+MAPI = monetdb@LAB03:34567
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+MAPI = monetdb@LAB03:34567
QUERY = explain copy into ttt from '/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+MAPI = monetdb@LAB03:34567
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -66,19 +66,14 @@ function user.s4_1{autoCommit=true}():vo
barrier X_35 := language.dataflow();
X_2 := sql.mvc();
(X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","a:\\tmp/xyz",-1:lng,0:lng,0);
-exit X_35;
- X_17 := sql.append(X_2,"sys","ttt","a",X_13);
- X_19 := sql.append(X_17,"sys","ttt","b",X_14);
- X_23 := sql.append(X_19,"sys","ttt","c",X_15);
- X_24 := aggr.count(X_15);
- sql.affectedRows(X_23,X_24,"");
-end s4_1;
-# querylog.define("explain copy into ttt from
\\'a:\\\\tmp/xyz\\';","default_pipe")
-#declare opt_pipe_name string;
-#set opt_pipe_name = ( select optimizer );
-#declare opt_pipe_def string;
-#set opt_pipe_def = ( select def from optimizers() where name = opt_pipe_name
);
-#set optimizer =
substring(opt_pipe_def,0,length(opt_pipe_def)-length('optimizer.garbageCollector();'))
|| 'optimizer.sql_append();optimizer.garbageCollector();';
+ X_16 := sql.append(X_2,"sys","ttt","a",X_13);
+ X_18 := sql.append(X_16,"sys","ttt","b",X_14);
+ X_20 := sql.append(X_18,"sys","ttt","c",X_15);
+ X_22 := aggr.count(X_15);
+ sql.affectedRows(X_20,X_22,"");
+end s2_1;
+# optimizer.mitosis()
+# optimizer.dataflow()
#select optimizer;
% .L # table_name
% single_value # name
@@ -100,14 +95,14 @@ function user.s12_1{autoCommit=true}():v
barrier X_36 := language.dataflow();
X_2 := sql.mvc();
(X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","Z:/tmp/xyz",-1:lng,0:lng,0);
-exit X_36;
- X_17 := sql.append(X_2,"sys","ttt","a",X_13);
- X_19 := sql.append(X_17,"sys","ttt","b",X_14);
- X_24 := aggr.count(X_15);
- X_23 := sql.append(X_19,"sys","ttt","c",X_15);
- sql.affectedRows(X_23,X_24,"");
-end s12_1;
-# querylog.define("explain copy into ttt from
\\'Z:/tmp/xyz\\';","default_pipe")
+ X_16 := sql.append(X_2,"sys","ttt","a",X_13);
+ X_18 := sql.append(X_16,"sys","ttt","b",X_14);
+ X_22 := aggr.count(X_15);
+ X_20 := sql.append(X_18,"sys","ttt","c",X_15);
+ sql.affectedRows(X_20,X_22,"");
+end s5_1;
+# optimizer.mitosis()
+# optimizer.dataflow()
#drop table ttt;
# 22:58:58 >
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -3882,7 +3882,7 @@ rel_reduce_groupby_exps(int *changes, mv
}
}
if (cnr && nr &&
list_length(tbls[j]->pkey->k.columns) == nr) {
- char rname[16], *rnme =
number2name(rname, 16, ++sql->label);
+ char rname[16], *rnme =
sa_strdup(sql->sa, number2name(rname, 16, ++sql->label));
sql_rel *r = rel_basetable(sql,
tbls[j], rnme);
list *ngbe = new_exp_list(sql->sa);
list *exps = rel->exps, *nexps =
new_exp_list(sql->sa);
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -612,7 +612,7 @@ rel_update_join_idx(mvc *sql, sql_idx *i
int need_nulls = 0;
node *m, *o;
sql_key *rk = &((sql_fkey *) i->key)->rkey->k;
- sql_rel *rt = rel_basetable(sql, rk->t, nme);
+ sql_rel *rt = rel_basetable(sql, rk->t, sa_strdup(sql->sa, nme));
sql_subtype *bt = sql_bind_localtype("bit");
sql_subfunc *or = sql_bind_func_result(sql->sa, sql->session->schema,
"or", bt, bt, bt);
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -47,3 +47,4 @@ duplicate_column_name.Bug-3349
binary_copy_into.Bug-3345
copy-into-compressed.Bug-3351
median.Bug-3352
+check-constraint.Bug-3335
diff --git a/sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.sql
b/sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.sql
@@ -0,0 +1,10 @@
+start transaction;
+
+create table t3335(x integer check(x > 0 and x < 2));
+insert into t3335 values(1);
+insert into t3335 values(0);
+insert into t3335 values(2);
+insert into t3335 values(-1);
+insert into t3335 values(3);
+
+rollback;
diff --git
a/sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.err
b/sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'check-constraint.Bug-3335` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 15:34:30 >
+# 15:34:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35083" "--set"
"mapi_usock=/var/tmp/mtest-26220/.s.monetdb.35083" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 15:34:30 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# 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 mapi_open = true
+# cmdline opt mapi_port = 35083
+# cmdline opt mapi_usock = /var/tmp/mtest-26220/.s.monetdb.35083
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 15:34:30 >
+# 15:34:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26220" "--port=35083"
+# 15:34:30 >
+
+We expect an error here.
+
+# 15:34:31 >
+# 15:34:31 > "Done."
+# 15:34:31 >
+
diff --git
a/sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.out
b/sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.out
@@ -0,0 +1,63 @@
+stdout of test 'check-constraint.Bug-3335` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 15:34:30 >
+# 15:34:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35083" "--set"
"mapi_usock=/var/tmp/mtest-26220/.s.monetdb.35083" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 15:34:30 >
+
+# MonetDB 5 server v11.15.12 (hg id: 9909a064c056)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:35083/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26220/.s.monetdb.35083
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 15:34:30 >
+# 15:34:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26220" "--port=35083"
+# 15:34:30 >
+
+#start transaction;
+#create table t3335(x integer check(x > 0 and x < 2));
+#insert into t3335 values(1);
+[ 1 ]
+#insert into t3335 values(0);
+[ 1 ]
+#insert into t3335 values(2);
+We expect an error here.
+
+# 15:34:31 >
+# 15:34:31 > "Done."
+# 15:34:31 >
+
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
