Changeset: 2cbddfe7dcb8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2cbddfe7dcb8
Added Files:
sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.sql
sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.err
sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.out
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/rel_dump.c
sql/server/rel_rel.c
sql/server/rel_updates.c
sql/test/BugTracker-2017/Tests/All
Branch: Jul2017
Log Message:
handle subqueries in value lists, solves bug 6336
diffs (214 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -260,7 +260,7 @@ handle_in_exps(backend *be, sql_exp *ce,
}
static stmt *
-value_list(backend *be, list *vals)
+value_list(backend *be, list *vals, stmt *left, stmt *sel)
{
node *n;
stmt *s;
@@ -269,7 +269,7 @@ value_list(backend *be, list *vals)
s = stmt_temp(be, exp_subtype(vals->h->data));
for( n = vals->h; n; n = n->next) {
sql_exp *e = n->data;
- stmt *i = exp_bin(be, e, NULL, NULL, NULL, NULL, NULL, NULL);
+ stmt *i = exp_bin(be, e, left, NULL, NULL, NULL, NULL, sel);
if (list_length(vals) == 1)
return i;
@@ -387,7 +387,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
} else if (e->r) { /* parameters */
s = stmt_var(be, sa_strdup(sql->sa, e->r),
e->tpe.type?&e->tpe:NULL, 0, e->flag);
} else if (e->f) { /* values */
- s = value_list(be, e->f);
+ s = value_list(be, e->f, left, sel);
} else { /* arguments */
s = stmt_varnr(be, e->flag, e->tpe.type?&e->tpe:NULL);
}
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -126,7 +126,8 @@ exp_print(mvc *sql, stream *fout, sql_ex
mnstr_printf(fout, "%s", name);
} else if (e->f) { /* values list */
list *l = e->f;
- exp_print(sql, fout, l->h->data, depth, 0, 0);
+ //exp_print(sql, fout, l->h->data, depth, 0, 0);
+ exps_print(sql, fout, l, depth, 0, 0);
} else { /* numbered arguments */
mnstr_printf(fout, "A%d", e->flag);
}
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -279,7 +279,7 @@ rel_bind_column2( mvc *sql, sql_rel *rel
if (rel->l)
return rel_bind_column2(sql, rel->l, tname, cname, f);
} else if (is_apply(rel->op)) {
- sql_exp *e = NULL;//exps_bind_column2(rel->exps, tname, cname);
+ sql_exp *e = NULL;
if (!e && rel->l)
e = rel_bind_column2(sql, rel->l, tname, cname, f);
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
@@ -492,8 +492,16 @@ insert_into(mvc *sql, dlist *qname, dlis
sql_column *c = m->data;
sql_rel *r = NULL;
sql_exp *ins =
insert_value(sql, c, &r, n->data.sym);
- if (!ins || r)
+ if (!ins)
return NULL;
+ if (r && inner)
+ inner =
rel_crossproduct(sql->sa, inner, r, op_join);
+ else if (r)
+ inner = r;
+ if (inner && !ins->name) {
+ exp_label(sql->sa, ins,
++sql->label);
+ ins =
exp_column(sql->sa, exp_relname(ins), exp_name(ins), exp_subtype(ins),
ins->card, has_nil(ins), is_intern(ins));
+ }
list_append(vals_list, ins);
}
} else {
@@ -505,7 +513,7 @@ insert_into(mvc *sql, dlist *qname, dlis
if (!ins)
return NULL;
if (r && inner)
- inner =
rel_crossproduct(sql->sa, inner,r, op_join);
+ inner =
rel_crossproduct(sql->sa, inner, r, op_join);
else if (r)
inner = r;
if (!ins->name)
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -58,3 +58,4 @@ crash-dce.Bug-6330
delete_from_merge_table.Bug-3743
statistics_nils_not_eq_zero.Bug-6331
crash-select_after_MAL_error.Bug-6332
+handle-values-subqueries.Bug-6336
diff --git
a/sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.sql
b/sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.sql
@@ -0,0 +1,13 @@
+START TRANSACTION;
+
+create table data(i integer);
+insert into data values(0),(1),(2);
+
+create table multiples(i integer);
+insert into multiples VALUES((select count(*) from data)), ((select
count(distinct i) from data));
+select * from multiples;
+
+insert into multiples VALUES((select count(*) from data));
+insert into multiples VALUES((select count(distinct i) from data));
+select * from multiples;
+ROLLBACK;
diff --git
a/sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.err
b/sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'handle-values-subqueries.Bug-6336` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 22:11:28 >
+# 22:11:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30613" "--set"
"mapi_usock=/var/tmp/mtest-5397/.s.monetdb.30613" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 22:11:28 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# 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 = 30613
+# cmdline opt mapi_usock = /var/tmp/mtest-5397/.s.monetdb.30613
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 22:11:29 >
+# 22:11:29 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5397" "--port=30613"
+# 22:11:29 >
+
+
+# 22:11:29 >
+# 22:11:29 > "Done."
+# 22:11:29 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.out
b/sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.out
@@ -0,0 +1,59 @@
+stdout of test 'handle-values-subqueries.Bug-6336` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 22:11:28 >
+# 22:11:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30613" "--set"
"mapi_usock=/var/tmp/mtest-5397/.s.monetdb.30613" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 22:11:28 >
+
+# MonetDB 5 server v11.27.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.331 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:30613/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5397/.s.monetdb.30613
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 22:11:29 >
+# 22:11:29 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5397" "--port=30613"
+# 22:11:29 >
+
+#START TRANSACTION;
+#create table data(i integer);
+#insert into data values(0),(1),(2);
+[ 3 ]
+#create table multiples(i integer);
+#insert into multiples VALUES((select count(*) from data)), ((select
count(distinct i) from data));
+[ 2 ]
+#select * from multiples;
+% sys.multiples # table_name
+% i # name
+% int # type
+% 1 # length
+[ 3 ]
+[ 3 ]
+#insert into multiples VALUES((select count(*) from data));
+[ 1 ]
+#insert into multiples VALUES((select count(distinct i) from data));
+[ 1 ]
+#select * from multiples;
+% sys.multiples # table_name
+% i # name
+% int # type
+% 1 # length
+[ 3 ]
+[ 3 ]
+[ 3 ]
+[ 3 ]
+#ROLLBACK;
+
+# 22:11:29 >
+# 22:11:29 > "Done."
+# 22:11:29 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
