Changeset: 1a60fb8b1321 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a60fb8b1321
Added Files:
clients/Tests/SQL-dump.timeout
sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.sql
sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.err
sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2013/Tests/All
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (165 lines):
diff --git a/clients/Tests/SQL-dump.timeout b/clients/Tests/SQL-dump.timeout
new file mode 100644
--- /dev/null
+++ b/clients/Tests/SQL-dump.timeout
@@ -0,0 +1,1 @@
+2
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
@@ -1443,7 +1443,7 @@ rel_push_func_down(int *changes, mvc *sq
append(r->exps,
ne);
else
append(l->exps,
ne);
- ne =
exp_column(sql->sa, NULL, exp_name(ne), exp_subtype(ne), ne->card, has_nil(ne),
is_intern(ne));
+ ne =
exp_column(sql->sa, exp_relname(ne), exp_name(ne), exp_subtype(ne), ne->card,
has_nil(ne), is_intern(ne));
(*changes)++;
}
e->l = ne;
@@ -1457,7 +1457,7 @@ rel_push_func_down(int *changes, mvc *sq
append(r->exps,
ne);
else
append(l->exps,
ne);
- ne =
exp_column(sql->sa, NULL, exp_name(ne), exp_subtype(ne), ne->card, has_nil(ne),
is_intern(ne));
+ ne =
exp_column(sql->sa, exp_relname(ne), exp_name(ne), exp_subtype(ne), ne->card,
has_nil(ne), is_intern(ne));
(*changes)++;
}
e->r = ne;
@@ -1472,7 +1472,7 @@ rel_push_func_down(int *changes, mvc *sq
append(r->exps, ne);
else
append(l->exps, ne);
- ne =
exp_column(sql->sa, NULL, exp_name(ne), exp_subtype(ne), ne->card, has_nil(ne),
is_intern(ne));
+ ne =
exp_column(sql->sa, exp_relname(ne), exp_name(ne), exp_subtype(ne), ne->card,
has_nil(ne), is_intern(ne));
(*changes)++;
}
e->f = ne;
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
@@ -48,3 +48,4 @@ binary_copy_into.Bug-3345
copy-into-compressed.Bug-3351
median.Bug-3352
check-constraint.Bug-3335
+crash_after_creation_of_unique_key.Bug-3363
diff --git
a/sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.sql
b/sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.sql
@@ -0,0 +1,19 @@
+CREATE TABLE mmtest10 (
+ a1 varchar(4) NOT NULL,
+ a2 bigint NOT NULL,
+ a3 bigint NOT NULL,
+ a4 bigint NOT NULL );
+
+CREATE TABLE mmtest20 (
+ a1 varchar(9) NOT NULL,
+ a2 bigint NOT NULL,
+ a3 bigint NOT NULL,
+ a4 bigint NOT NULL );
+
+ALTER TABLE mmtest20 ADD CONSTRAINT mmtest20_uk1 UNIQUE (a1,a2,a3,a4);
+SELECT p.a1, p.a2, p.a3, v.a3
+ FROM mmtest10 v JOIN mmtest20 p
+ ON (p.a1 = v.a1 AND p.a2 = v.a2 AND p.a3 = v.a3 AND p.a4 = v.a4);
+
+drop table mmtest20;
+drop table mmtest10;
diff --git
a/sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.err
b/sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'crash_after_creation_of_unique_key.Bug-3363` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 16:50:25 >
+# 16:50:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33150" "--set"
"mapi_usock=/var/tmp/mtest-2732/.s.monetdb.33150" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 16:50:25 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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 = 33150
+# cmdline opt mapi_usock = /var/tmp/mtest-2732/.s.monetdb.33150
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 16:50:26 >
+# 16:50:26 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2732" "--port=33150"
+# 16:50:26 >
+
+
+# 16:50:26 >
+# 16:50:26 > "Done."
+# 16:50:26 >
+
diff --git
a/sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.out
b/sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.out
@@ -0,0 +1,52 @@
+stdout of test 'crash_after_creation_of_unique_key.Bug-3363` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 16:50:25 >
+# 16:50:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33150" "--set"
"mapi_usock=/var/tmp/mtest-2732/.s.monetdb.33150" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 16:50:25 >
+
+# MonetDB 5 server v11.15.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.775 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://niels.nesco.mine.nu:33150/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-2732/.s.monetdb.33150
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 16:50:26 >
+# 16:50:26 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2732" "--port=33150"
+# 16:50:26 >
+
+#CREATE TABLE mmtest10 (
+# a1 varchar(4) NOT NULL,
+# a2 bigint NOT NULL,
+# a3 bigint NOT NULL,
+# a4 bigint NOT NULL );
+#CREATE TABLE mmtest20 (
+# a1 varchar(9) NOT NULL,
+# a2 bigint NOT NULL,
+# a3 bigint NOT NULL,
+# a4 bigint NOT NULL );
+#ALTER TABLE mmtest20 ADD CONSTRAINT mmtest20_uk1 UNIQUE (a1,a2,a3,a4);
+#SELECT p.a1, p.a2, p.a3, v.a3
+# FROM mmtest10 v JOIN mmtest20 p
+# ON (p.a1 = v.a1 AND p.a2 = v.a2 AND p.a3 = v.a3 AND p.a4 = v.a4);
+% sys.p, sys.p, sys.p, sys.v # table_name
+% a1, a2, a3, a3 # name
+% varchar, bigint, bigint, bigint # type
+% 0, 1, 1, 1 # length
+#drop table mmtest20;
+#drop table mmtest10;
+
+# 16:50:26 >
+# 16:50:26 > "Done."
+# 16:50:26 >
+
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
