Changeset: 215b2e468626 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=215b2e468626
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
sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql
sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.err
sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.out
Modified Files:
gdk/gdk_batop.mx
monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
sql/backends/monet5/sql.mx
sql/server/rel_bin.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/test/BugTracker-2012/Tests/All
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/insert_queue.sql
tools/merovingian/ChangeLog.Jul2012
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/utils/properties.c
Branch: default
Log Message:
Merged from Jul2012
diffs (truncated from 937 to 300 lines):
diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -2764,8 +2764,10 @@ BATconst(BAT *b, int tailtype, const voi
bn = VIEWcreate(b, bt);
BBPunfix(bt->batCacheid);
}
- if (b != o)
+ if (b != o) {
BBPunfix(b->batCacheid);
+ b = o;
+ }
}
} else {
if (tailtype == TYPE_bat) {
diff --git a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
--- a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
+++ b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
@@ -16,6 +16,4 @@
# All Rights Reserved.
# This loads the opt_sql_append optimizer module
-library opt_sql_append;
include opt_sql_append;
-
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
@@ -7466,7 +7466,7 @@ address SQLmiddle;
function aggr.median(a:bat[:oid,:any_1]):any_1;
v := algebra.sortTail(a);
- return sql.middle_val(a);
+ return sql.middle_val(v);
end aggr.median;
function
aggr.median(a:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1];
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_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -1612,7 +1612,7 @@ table_ref(mvc *sql, sql_rel *rel, symbol
tpe->comp_type) {
temp_table = stack_find_rel_var(sql, tname);
t = tpe->comp_type;
- } else {
+ } else if (sql->use_views){
temp_table = stack_find_rel_view(sql, tname);
}
if (temp_table)
@@ -1771,7 +1771,7 @@ rel_column_ref(mvc *sql, sql_rel **rel,
/* some views are just in the stack,
like before and after updates views */
- if (!exp) {
+ if (!exp && sql->use_views) {
sql_rel *v = stack_find_rel_view(sql, tname);
if (v) {
@@ -5067,6 +5067,7 @@ rel_query(mvc *sql, sql_rel *rel, symbol
sql_rel *res = NULL;
SelectNode *sn = NULL;
int used = 0;
+ int old = sql->use_views;
if (sq->token != SQL_SELECT)
return table_ref(sql, rel, sq);
@@ -5080,6 +5081,7 @@ rel_query(mvc *sql, sql_rel *rel, symbol
return sql_error(sql, 01, "SELECT: ORDER BY only allowed on
outermost SELECT");
+ sql->use_views = 1;
if (sn->from) { /* keep variable list with tables and names */
dlist *fl = sn->from->data.lval;
dnode *n = NULL;
@@ -5111,8 +5113,10 @@ rel_query(mvc *sql, sql_rel *rel, symbol
res = rel_crossproduct(sql->sa, rel, res, op_join);
}
} else if (toplevel || !res) { /* only on top level query */
+ sql->use_views = old;
return rel_simple_select(sql, rel, sn->where, sn->selection,
sn->distinct);
}
+ sql->use_views = old;
if (res)
rel = rel_select_exp(sql, res, rel, sn, ek);
return rel;
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/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -409,6 +409,7 @@ mvc_create(int clientid, backend_stack s
m->vars = NEW_ARRAY(sql_var, m->sizevars);
m->topvars = 0;
m->frame = 1;
+ m->use_views = 0;
m->argmax = MAXPARAMS;
m->args = NEW_ARRAY(atom*,m->argmax);
m->argc = 0;
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -90,6 +90,7 @@ typedef struct mvc {
int topvars;
int sizevars;
int frame;
+ int use_views;
atom **args;
int argc;
int argmax;
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
@@ -44,3 +44,6 @@ predicate_select.Bug-3090
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 >
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
