Changeset: 03516346b4d5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03516346b4d5
Added Files:
sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.sql
sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err
sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.out
sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.sql
sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.err
sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.out
Modified Files:
sql/server/rel_bin.c
sql/server/rel_updates.c
sql/test/BugTracker-2012/Tests/All
Branch: Jul2012
Log Message:
fixed bugs 3113 and 3114
3113: single column indices aren't stored, ie don't have updates
3114: properly use the update 'column expression' instead of the original
column expression.
diffs (truncated from 302 to 300 lines):
diff --git a/sql/server/rel_bin.c b/sql/server/rel_bin.c
--- a/sql/server/rel_bin.c
+++ b/sql/server/rel_bin.c
@@ -2179,10 +2179,8 @@ rel2bin_project( mvc *sql, sql_rel *rel,
psub = stmt_list(sql->sa, pl);
for( en = rel->exps->h; en; en = en->next ) {
sql_exp *exp = en->data;
- stmt *s = exp_bin(sql, exp, sub, NULL, NULL, NULL);
-
- if (!s)
- s = exp_bin(sql, exp, sub, psub, NULL, NULL);
+ stmt *s = exp_bin(sql, exp, sub, psub, NULL, NULL);
+
if (!s) {
assert(0);
return NULL;
@@ -3879,7 +3877,8 @@ rel2bin_update( mvc *sql, sql_rel *rel,
if (i) {
stmt *is = bin_find_column(sql->sa, update, ce->l,
ce->r);
- is = stmt_join(sql->sa, stmt_reverse(sql->sa, tid), is,
cmp_equal);
+ if (is)
+ is = stmt_join(sql->sa, stmt_reverse(sql->sa,
tid), is, cmp_equal);
if ((hash_index(i->type) && list_length(i->columns) <=
1) || i->type == no_idx)
is = NULL;
if (i->key) {
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
@@ -619,7 +619,7 @@ rel_update_join_idx(mvc *sql, sql_idx *i
sql_rel *_nlls = NULL, *nnlls, *ups = updates->r;
sql_exp *lnll_exps = NULL, *rnll_exps = NULL, *e;
- list *join_exps = new_exp_list(sql->sa);
+ list *join_exps = new_exp_list(sql->sa), *pexps;
for (m = i->columns->h; m; m = m->next) {
sql_kc *c = m->data;
@@ -668,9 +668,10 @@ rel_update_join_idx(mvc *sql, sql_idx *i
nnlls = ups;
}
+ pexps = rel_projections(sql, nnlls, NULL, 1, 1);
nnlls = rel_crossproduct(sql->sa, nnlls, rt, op_join);
nnlls->exps = join_exps;
- nnlls = rel_project(sql->sa, nnlls, rel_projections(sql, nnlls->l,
NULL, 1, 1));
+ nnlls = rel_project(sql->sa, nnlls, pexps);
/* add row numbers */
e = exp_column(sql->sa, rel_name(rt), "%TID%",
sql_bind_localtype("oid"), CARD_MULTI, 0, 1);
exp_setname(sql->sa, e, i->t->base.name, iname);
diff --git a/sql/test/BugTracker-2012/Tests/All
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -45,3 +45,5 @@ hash_join_crash.Bug-3089
row-number-nyi.Bug-3087
insert_serial_with_unique_key.Bug-3091
with_and_exists.Bug-3099
+index_column_crash.Bug-3113
+foreign_key.Bug-3114
diff --git a/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.sql
b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.sql
@@ -0,0 +1,25 @@
+
+CREATE TABLE "sys"."first" (
+ "id" int NOT NULL,
+ CONSTRAINT "first_id_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE "sys"."second" (
+ "id" int NOT NULL,
+ "ref" int,
+ CONSTRAINT "second_id_pkey" PRIMARY KEY ("id"),
+ CONSTRAINT "second_ref_fkey" FOREIGN KEY
+("ref") REFERENCES "sys"."first" ("id")
+);
+
+insert into "second" values (100, null);
+insert into "second" values (101, 1);
+
+update "second" set ref = 1 WHERE id = 100;
+update "second" set ref = null WHERE id = 100;
+
+insert into "first" values (200);
+update "second" set ref = 1 WHERE id = 100;
+
+drop table "second";
+drop table "first";
diff --git a/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err
b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err
@@ -0,0 +1,46 @@
+stderr of test 'foreign_key.Bug-3114` in directory 'test/BugTracker-2012`
itself:
+
+
+# 17:09:13 >
+# 17:09:13 > "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=34838" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 17:09:13 >
+
+# 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 = 34838
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 17:09:13 >
+# 17:09:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=34838"
+# 17:09:13 >
+
+MAPI = monetdb@niels:34838
+QUERY = insert into "second" values (101, 1);
+ERROR = !INSERT INTO: FOREIGN KEY constraint 'second.second_ref_fkey' violated
+MAPI = monetdb@niels:34838
+QUERY = update "second" set ref = 1 WHERE id = 100;
+ERROR = !UPDATE: FOREIGN KEY constraint 'second.second_ref_fkey' violated
+MAPI = monetdb@niels:34838
+QUERY = update "second" set ref = 1 WHERE id = 100;
+ERROR = !UPDATE: FOREIGN KEY constraint 'second.second_ref_fkey' violated
+
+# 17:09:14 >
+# 17:09:14 > "Done."
+# 17:09:14 >
+
diff --git a/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.out
b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'foreign_key.Bug-3114` in directory 'test/BugTracker-2012`
itself:
+
+
+# 17:09:13 >
+# 17:09:13 > "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=34838" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 17:09:13 >
+
+# MonetDB 5 server v11.11.0
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.778 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 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:34838/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:09:13 >
+# 17:09:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=34838"
+# 17:09:13 >
+
+#CREATE TABLE "sys"."first" (
+# "id" int NOT NULL,
+# CONSTRAINT "first_id_pkey" PRIMARY KEY ("id")
+#);
+#CREATE TABLE "sys"."second" (
+# "id" int NOT NULL,
+# "ref" int,
+# CONSTRAINT "second_id_pkey" PRIMARY KEY ("id"),
+# CONSTRAINT "second_ref_fkey" FOREIGN KEY
+#("ref") REFERENCES "sys"."first" ("id")
+#);
+#insert into "second" values (100, null);
+[ 1 ]
+#update "second" set ref = null WHERE id = 100;
+[ 1 ]
+#insert into "first" values (200);
+[ 1 ]
+#drop table "second";
+#drop table "first";
+
+# 17:09:14 >
+# 17:09:14 > "Done."
+# 17:09:14 >
+
diff --git a/sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.sql
b/sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.sql
@@ -0,0 +1,12 @@
+
+create table "x"("id" int not null primary key);
+create table "y"("id" int not null primary key,"x_id" int,constraint
+"x_id_refs_id" FOREIGN KEY("x_id") references "x"("id"));
+
+create index "y_x_id" ON "y"("x_id");
+insert into "x" VALUES(1),(2),(3);
+insert into "y" VALUES(100,1),(101,2);
+update y SET x_id = 3 WHERE id = 101;
+
+drop table "y";
+drop table "x";
diff --git
a/sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.err
b/sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'index_column_crash.Bug-3113` in directory
'test/BugTracker-2012` itself:
+
+
+# 17:09:12 >
+# 17:09:12 > "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=34838" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 17:09:12 >
+
+# 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 = 34838
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 17:09:13 >
+# 17:09:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=34838"
+# 17:09:13 >
+
+
+# 17:09:13 >
+# 17:09:13 > "Done."
+# 17:09:13 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.out
b/sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.out
@@ -0,0 +1,43 @@
+stdout of test 'index_column_crash.Bug-3113` in directory
'test/BugTracker-2012` itself:
+
+
+# 17:09:12 >
+# 17:09:12 > "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=34838" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 17:09:12 >
+
+# MonetDB 5 server v11.11.0
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.778 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 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:34838/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:09:13 >
+# 17:09:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=34838"
+# 17:09:13 >
+
+#create table "x"("id" int not null primary key);
+#create table "y"("id" int not null primary key,"x_id" int,constraint
+#"x_id_refs_id" FOREIGN KEY("x_id") references "x"("id"));
+#create index "y_x_id" ON "y"("x_id");
+#insert into "x" VALUES(1),(2),(3);
+[ 3 ]
+#insert into "y" VALUES(100,1),(101,2);
+[ 2 ]
+#update y SET x_id = 3 WHERE id = 101;
+[ 1 ]
+#drop table "y";
+#drop table "x";
+
+# 17:09:13 >
+# 17:09:13 > "Done."
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
