Changeset: d8cf2cac6e42 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8cf2cac6e42
Added Files:
sql/test/mergetables/Tests/mergedb.Bug-6820.stable.err
sql/test/mergetables/Tests/mergedb.Bug-6820.stable.out
sql/test/mergetables/Tests/mergedb_create.sql
sql/test/mergetables/Tests/mergedb_create.stable.err
sql/test/mergetables/Tests/mergedb_create.stable.out
sql/test/mergetables/Tests/mergedb_drop.stable.err
sql/test/mergetables/Tests/mergedb_drop.stable.out
Removed Files:
sql/test/mergetables/Tests/mergedb.sql
Modified Files:
sql/server/rel_optimizer.c
sql/test/mergetables/Tests/All
Branch: Jul2017
Log Message:
fixed bug 6820 and approved output
diffs (truncated from 432 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
@@ -7419,13 +7419,13 @@ rel_split_outerjoin(int *changes, mvc *s
{
if ((rel->op == op_left || rel->op == op_right || rel->op == op_full)
&&
list_length(rel->exps) == 1 && exps_nr_of_or(rel->exps)
== list_length(rel->exps)) {
- sql_rel *l = rel_dup(rel->l), *nl, *nll, *nlr;
- sql_rel *r = rel_dup(rel->r), *nr;
+ sql_rel *l = rel->l, *nl, *nll, *nlr;
+ sql_rel *r = rel->r, *nr;
sql_exp *e;
list *exps;
- nll = rel_crossproduct(sql->sa, l, r, op_join);
- nlr = rel_crossproduct(sql->sa, l, r, op_join);
+ nll = rel_crossproduct(sql->sa, rel_dup(l), rel_dup(r),
op_join);
+ nlr = rel_crossproduct(sql->sa, rel_dup(l), rel_dup(r),
op_join);
/* TODO find or exp, ie handle rest with extra joins */
/* expect only a single or expr for now */
@@ -7435,16 +7435,11 @@ rel_split_outerjoin(int *changes, mvc *s
nlr->exps = exps_copy(sql->sa, e->r);
nl = rel_or( sql, NULL, nll, nlr, NULL, NULL, NULL);
- if (rel->op == op_full) {
- l = rel_dup(l);
- r = rel_dup(r);
- }
-
if (rel->op == op_left || rel->op == op_full) {
/* split in 2 anti joins */
- nr = rel_crossproduct(sql->sa, l, r, op_anti);
+ nr = rel_crossproduct(sql->sa, rel_dup(l), rel_dup(r),
op_anti);
nr->exps = exps_copy(sql->sa, e->l);
- nr = rel_crossproduct(sql->sa, nr, r, op_anti);
+ nr = rel_crossproduct(sql->sa, nr, rel_dup(r), op_anti);
nr->exps = exps_copy(sql->sa, e->r);
/* project left */
@@ -7459,9 +7454,9 @@ rel_split_outerjoin(int *changes, mvc *s
}
if (rel->op == op_right || rel->op == op_full) {
/* split in 2 anti joins */
- nr = rel_crossproduct(sql->sa, r, l, op_anti);
+ nr = rel_crossproduct(sql->sa, rel_dup(r), rel_dup(l),
op_anti);
nr->exps = exps_copy(sql->sa, e->l);
- nr = rel_crossproduct(sql->sa, nr, l, op_anti);
+ nr = rel_crossproduct(sql->sa, nr, rel_dup(l), op_anti);
nr->exps = exps_copy(sql->sa, e->r);
nr = rel_project(sql->sa, nr, sa_list(sql->sa));
@@ -7477,8 +7472,6 @@ rel_split_outerjoin(int *changes, mvc *s
set_processed(nl);
}
- rel->l = NULL;
- rel->r = NULL;
rel_destroy(rel);
*changes = 1;
rel = nl;
diff --git a/sql/test/mergetables/Tests/All b/sql/test/mergetables/Tests/All
--- a/sql/test/mergetables/Tests/All
+++ b/sql/test/mergetables/Tests/All
@@ -20,6 +20,6 @@ part-elim
mergedropcascade
addtable
-mergedb
+mergedb_create
mergedb.Bug-6820
mergedb_drop
diff --git a/sql/test/mergetables/Tests/mergedb.Bug-6820.stable.err
b/sql/test/mergetables/Tests/mergedb.Bug-6820.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedb.Bug-6820.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'mergedb.Bug-6820` in directory 'sql/test/mergetables` itself:
+
+
+# 23:53:19 >
+# 23:53:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36041" "--set"
"mapi_usock=/var/tmp/mtest-11852/.s.monetdb.36041" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
+# 23:53:19 >
+
+# 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 = 36041
+# cmdline opt mapi_usock = /var/tmp/mtest-11852/.s.monetdb.36041
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
+# cmdline opt gdk_debug = 536870922
+
+# 23:53:19 >
+# 23:53:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11852" "--port=36041"
+# 23:53:19 >
+
+
+# 23:53:19 >
+# 23:53:19 > "Done."
+# 23:53:19 >
+
diff --git a/sql/test/mergetables/Tests/mergedb.Bug-6820.stable.out
b/sql/test/mergetables/Tests/mergedb.Bug-6820.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedb.Bug-6820.stable.out
@@ -0,0 +1,72 @@
+stdout of test 'mergedb.Bug-6820` in directory 'sql/test/mergetables` itself:
+
+
+# 23:53:19 >
+# 23:53:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36041" "--set"
"mapi_usock=/var/tmp/mtest-11852/.s.monetdb.36041" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
+# 23:53:19 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_mergetables', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.330 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:36041/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11852/.s.monetdb.36041
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 23:53:19 >
+# 23:53:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11852" "--port=36041"
+# 23:53:19 >
+
+#select
+# sample_8.dimpos as c0,
+# ref_4.x as c1,
+# ref_2.y as c2
+#from
+# sys.r3 as ref_2
+# left join tmp._tables as sample_6
+# on (ref_2.y = sample_6.id )
+# left join sys._tables as sample_7
+# right join sys.netcdf_vardim as sample_8
+# left join sys.querylog_catalog as ref_3
+# on (sample_8.dimpos = ref_3.mal )
+# on (true)
+# left join sys.s1 as ref_4
+# on (sample_8.dimpos = ref_4.x )
+# on ((sample_7.id is NULL)
+# or (sample_8.var_id is not NULL))
+% .L14, .L16, .L20 # table_name
+% c0, c1, c2 # name
+% int, int, int # type
+% 1, 1, 1 # length
+#select
+# ref_7.length as c0,
+# sample_1.type as c1,
+# ref_7.length as c2,
+# sample_8.function_type_id as c3
+#from
+# sys.columns as sample_1
+# inner join bam.rg as ref_4
+# left join sys.keys as ref_6
+# on (ref_4.pi = ref_6.id )
+# right join sys.table_types as sample_7
+# left join sys.function_types as sample_8
+# left join sys.r as sample_9
+# on (sample_9.y is not NULL)
+# on (sample_7.table_type_name = sample_8.function_type_name )
+# left join sys.r as sample_10
+% .L14, .L16, .L20, .L22 # table_name
+% c0, c1, c2, c3 # name
+% int, varchar, int, smallint # type
+% 1, 0, 1, 1 # length
+
+# 23:53:19 >
+# 23:53:19 > "Done."
+# 23:53:19 >
+
diff --git a/sql/test/mergetables/Tests/mergedb.sql
b/sql/test/mergetables/Tests/mergedb_create.sql
rename from sql/test/mergetables/Tests/mergedb.sql
rename to sql/test/mergetables/Tests/mergedb_create.sql
diff --git a/sql/test/mergetables/Tests/mergedb_create.stable.err
b/sql/test/mergetables/Tests/mergedb_create.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedb_create.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'mergedb_create` in directory 'sql/test/mergetables` itself:
+
+
+# 23:53:18 >
+# 23:53:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36041" "--set"
"mapi_usock=/var/tmp/mtest-11852/.s.monetdb.36041" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
+# 23:53:18 >
+
+# 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 = 36041
+# cmdline opt mapi_usock = /var/tmp/mtest-11852/.s.monetdb.36041
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
+# cmdline opt gdk_debug = 536870922
+
+# 23:53:18 >
+# 23:53:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11852" "--port=36041"
+# 23:53:18 >
+
+
+# 23:53:19 >
+# 23:53:19 > "Done."
+# 23:53:19 >
+
diff --git a/sql/test/mergetables/Tests/mergedb_create.stable.out
b/sql/test/mergetables/Tests/mergedb_create.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedb_create.stable.out
@@ -0,0 +1,115 @@
+stdout of test 'mergedb_create` in directory 'sql/test/mergetables` itself:
+
+
+# 23:53:18 >
+# 23:53:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36041" "--set"
"mapi_usock=/var/tmp/mtest-11852/.s.monetdb.36041" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
+# 23:53:18 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_mergetables', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.330 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:36041/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11852/.s.monetdb.36041
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 23:53:18 >
+# 23:53:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11852" "--port=36041"
+# 23:53:18 >
+
+#CREATE TABLE R1 ( x integer primary key, y integer, z string);
+#COPY 4 RECORDS INTO R1 FROM stdin USING DELIMITERS ' ','\n';
+#0 0 hello
+#1 0 hello
+#2 1 world
+#3 1 world
+[ 4 ]
+#CREATE TABLE R2 ( x integer primary key, y integer, z string);
+#COPY 4 RECORDS INTO R2 FROM stdin USING DELIMITERS ' ','\n';
+#5 0 hello
+#6 0 hello
+#7 1 world
+#8 1 world
+[ 4 ]
+#CREATE TABLE R3 ( x integer primary key, y integer, z string);
+#COPY 4 RECORDS INTO R3 FROM stdin USING DELIMITERS ' ','\n';
+#10 0 hello
+#11 0 hello
+#12 1 world
+#13 1 world
+[ 4 ]
+#CREATE MERGE TABLE R ( x integer primary key, y integer, z string);
+#ALTER TABLE R ADD TABLE R1;
+#ALTER TABLE R ADD TABLE R2;
+#ALTER TABLE R ADD TABLE R3;
+#SELECT * FROM R;
+% .r, .r, .r # table_name
+% x, y, z # name
+% int, int, clob # type
+% 2, 1, 5 # length
+[ 0, 0, "hello" ]
+[ 1, 0, "hello" ]
+[ 2, 1, "world" ]
+[ 3, 1, "world" ]
+[ 5, 0, "hello" ]
+[ 6, 0, "hello" ]
+[ 7, 1, "world" ]
+[ 8, 1, "world" ]
+[ 10, 0, "hello" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
