Changeset: 5db9d0678dbe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5db9d0678dbe
Added Files:
sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.sql
sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.err
sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.out
sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.err
sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out
Modified Files:
monetdb5/modules/kernel/algebra.mx
sql/server/rel_optimizer.c
sql/test/BugTracker-2012/Tests/All
Branch: default
Log Message:
Merge with Oct2012 branch, not including 96df3b8b4bcc.
diffs (truncated from 350 to 300 lines):
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
@@ -50,7 +50,7 @@ static sql_subfunc *find_func( mvc *sql,
*/
/* currently we only find simple column expressions */
-static sql_column *
+static void *
name_find_column( sql_rel *rel, char *rname, char *name, int pnr, sql_rel **bt
)
{
sql_exp *alias = NULL;
@@ -85,6 +85,15 @@ name_find_column( sql_rel *rel, char *rn
return c;
}
}
+ for (cn = t->idxs.set->h; cn; cn = cn->next) {
+ sql_idx *c = cn->data;
+ if (strcmp(c->base.name, name+1 /* skip % */) == 0) {
+ *bt = rel;
+ if (pnr < 0 || (c->t->p &&
+ list_position(c->t->p->tables.set, c->t) ==
pnr))
+ return c;
+ }
+ }
break;
}
case op_table:
@@ -136,7 +145,7 @@ name_find_column( sql_rel *rel, char *rn
else
alias = exps_bind_column(rel->r, alias->r,
NULL);
}
- if (!alias && rel->l) {
+ if (is_groupby(rel->op) && !alias && rel->l) {
/* Group by column not found as alias in projection
* list, fall back to check plain input columns */
return name_find_column( rel->l, rname, name, pnr, bt);
@@ -650,8 +659,10 @@ find_fk(sql_allocator *sa, list *rels, l
int swapped = 0;
list *aaje = matching_joins(sa, rels, aje, je);
list *eje = list_select(aaje, (void*)1, (fcmp)
&exp_is_eqjoin, (fdup)NULL);
- sql_rel *lr = find_rel(rels, le);
- sql_rel *rr = find_rel(rels, re);
+ sql_rel *lr = find_rel(rels, le), *olr = lr;
+ sql_rel *rr = find_rel(rels, re), *orr = rr;
+ sql_rel *bt = NULL;
+ char *iname;
sql_table *l, *r;
list *lexps = list_map(eje, lr, (fmap) &joinexp_col);
@@ -678,7 +689,12 @@ find_fk(sql_allocator *sa, list *rels, l
swapped = 1;
}
- if (idx) {
+ if (idx && (iname = sa_strconcat( sa, "%",
idx->base.name)) != NULL &&
+ ((!swapped && name_find_column(olr, NULL,
iname, -2, &bt) == NULL) ||
+ ( swapped && name_find_column(orr, NULL,
iname, -2, &bt) == NULL)))
+ idx = NULL;
+
+ if (idx) {
prop *p;
node *n;
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
@@ -48,6 +48,7 @@ insert_serial_with_unique_key.Bug-3091
with_and_exists.Bug-3099
index_column_crash.Bug-3113
foreign_key.Bug-3114
+insert_into_table_with_2_foreignkeys.Bug-3124
cast-tinyint-Bug-3137
not-equal-Bug.3139
many-columns-truncated.Bug-3161
diff --git
a/sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.sql
b/sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.sql
@@ -0,0 +1,11 @@
+start transaction;
+create table t3 (id int auto_increment ,text varchar(8) ,primary key (id));
+create table t2 (id int auto_increment ,ds int not null ,ra double not null
,primary key (id) ,foreign key (ds) references t3 (id)) ;
+create table t1 (id int auto_increment ,runcat int ,ds int not null ,ra double
default 0 ,primary key (id) ,foreign key (runcat) references t2 (id) ,foreign
key (ds) references t3 (id)) ;
+insert into t3 (text) values ('test');
+insert into t2 (ds,ra) select id,20 from t3;
+--This one does not work:
+insert into t1 (runcat,ds,ra) select id,ds,0 from t2;
+--This one does work:
+insert into t1 (runcat,ds,ra) select id,1,0 from t2;
+rollback;
diff --git
a/sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.err
b/sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'insert_into_table_with_2_foreignkeys.Bug-3124` in directory
'test/BugTracker-2012` itself:
+
+
+# 20:27:25 >
+# 20:27:25 > "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=35242" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 20:27:25 >
+
+# 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_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 = 35242
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 20:27:25 >
+# 20:27:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35242"
+# 20:27:25 >
+
+
+# 20:27:25 >
+# 20:27:25 > "Done."
+# 20:27:25 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.out
b/sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.out
@@ -0,0 +1,44 @@
+stdout of test 'insert_into_table_with_2_foreignkeys.Bug-3124` in directory
'test/BugTracker-2012` itself:
+
+
+# 20:27:25 >
+# 20:27:25 > "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=35242" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 20:27:25 >
+
+# MonetDB 5 server v11.13.4
+# 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:35242/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 20:27:25 >
+# 20:27:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35242"
+# 20:27:25 >
+
+#start transaction;
+#create table t3 (id int auto_increment ,text varchar(8) ,primary key (id));
+#create table t2 (id int auto_increment ,ds int not null ,ra double not null
,primary key (id) ,foreign key (ds) references t3 (id)) ;
+#create table t1 (id int auto_increment ,runcat int ,ds int not null ,ra
double default 0 ,primary key (id) ,foreign key (runcat) references t2 (id)
,foreign key (ds) references t3 (id)) ;
+#insert into t3 (text) values ('test');
+[ 1 ]
+#insert into t2 (ds,ra) select id,20 from t3;
+[ 1 ]
+#insert into t1 (runcat,ds,ra) select id,ds,0 from t2;
+[ 1 ]
+#insert into t1 (runcat,ds,ra) select id,1,0 from t2;
+[ 1 ]
+#rollback;
+
+# 20:27:25 >
+# 20:27:25 > "Done."
+# 20:27:25 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql
@@ -0,0 +1,45 @@
+
+CREATE TABLE RX (
+ u int NOT NULL,
+ v int NOT NULL,
+ r int NOT NULL
+);
+
+CREATE TABLE trans (
+ s int NOT NULL,
+ t int NOT NULL,
+ comp int NOT NULL
+);
+
+CREATE INDEX trans_st_idx ON trans (s, t);
+
+
+INSERT INTO trans(s, t, comp) VALUES
+(1, 2, 31),
+(1, 16, 31),
+(1, 3, 255),
+(255, 3, 255);
+
+INSERT INTO RX (u, v, r) VALUES
+(0, 1, 1),
+(1, 2, 3),
+(2, 4, 3),
+(1, 4, 16),
+(1, 3, 2),
+(3, 2, 255);
+
+
+SELECT TR.x, TR.z, comp
+FROM
+(SELECT TR1.u as x, TR1.v as y, TR2.v as z, TR1.r as rxy, TR2.r as ryz
+ FROM
+ RX as TR1 JOIN R as TR2
+ ON (TR1.v = TR2.u AND TR1.u <> TR2.v)
+ ) as TR
+ JOIN
+ trans
+ ON (TR.rxy = s AND TR.ryz = t);
+
+Drop index trans_st_idx;
+Drop table trans;
+Drop table rx;
diff --git
a/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.err
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'join_over_multitable_using_index.Bug-3181` in directory
'test/BugTracker-2012` itself:
+
+
+# 15:30:47 >
+# 15:30:47 > "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=35063" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 15:30:47 >
+
+# 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_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 = 35063
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 15:30:48 >
+# 15:30:48 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35063"
+# 15:30:48 >
+
+
+# 15:30:48 >
+# 15:30:48 > "Done."
+# 15:30:48 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out
@@ -0,0 +1,73 @@
+stdout of test 'join_over_multitable_using_index.Bug-3181` in directory
'test/BugTracker-2012` itself:
+
+
+# 15:30:47 >
+# 15:30:47 > "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=35063" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 15:30:47 >
+
+# MonetDB 5 server v11.13.4
+# 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:35063/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 15:30:48 >
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
