Changeset: 6df359498f13 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6df359498f13
Added Files:
sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.sql
sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.err
sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.out
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/rel_optimizer.c
sql/server/sql_atom.c
sql/test/BugTracker-2017/Tests/All
Branch: Dec2016
Log Message:
fixed bug 6288, ie meretable wasn't rewritten within functions
Found/fixed problem in atom_mul, initialize result type
diffs (235 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
@@ -4561,7 +4561,7 @@ rel2bin_ddl(mvc *sql, sql_rel *rel, list
sql->type = Q_TABLE;
} else if (rel->flag <= DDL_LIST) {
s = rel2bin_list(sql, rel, refs);
- } else if (rel->flag <= DDL_PSM) {
+ } else if (rel->flag == DDL_PSM) {
s = rel2bin_psm(sql, rel);
} else if (rel->flag <= DDL_ALTER_SEQ) {
s = rel2bin_seq(sql, rel, refs);
@@ -4898,7 +4898,7 @@ rel_deps(sql_allocator *sa, sql_rel *r,
return rel_deps(sa, r->l, refs, l);
if (r->r)
return rel_deps(sa, r->r, refs, l);
- } else if (r->flag <= DDL_PSM) {
+ } else if (r->flag == DDL_PSM) {
exps_deps(sa, r->exps, refs, l);
} else if (r->flag <= DDL_ALTER_SEQ) {
if (r->l)
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
@@ -29,6 +29,7 @@ typedef struct global_props {
} global_props;
typedef sql_rel *(*rewrite_fptr)(int *changes, mvc *sql, sql_rel *rel);
+typedef sql_rel *(*rewrite_rel_fptr)(mvc *sql, sql_rel *rel, rewrite_fptr
rewriter, int *has_changes);
typedef int (*find_prop_fptr)(mvc *sql, sql_rel *rel);
static sql_rel * rewrite_topdown(mvc *sql, sql_rel *rel, rewrite_fptr
rewriter, int *has_changes);
@@ -8555,6 +8556,36 @@ rel_apply_rewrite(int *changes, mvc *sql
return rel;
}
+static sql_exp *
+rewrite_exp(mvc *sql, sql_exp *e, rewrite_rel_fptr rewrite_rel, rewrite_fptr
rewriter, int *has_changes)
+{
+ if (e->type != e_psm)
+ return e;
+ if (e->flag & PSM_SET || e->flag & PSM_VAR)
+ return e;
+ if (e->flag & PSM_RETURN) {
+ e->l = rewrite_exp(sql, e->l, rewrite_rel, rewriter,
has_changes);
+ }
+ if (e->flag & PSM_WHILE || e->flag & PSM_IF)
+ return e;
+ if (e->flag & PSM_REL)
+ e->l = rewrite_rel(sql, e->l, rewriter, has_changes);
+ return e;
+}
+
+static list *
+rewrite_exps(mvc *sql, list *l, rewrite_rel_fptr rewrite_rel, rewrite_fptr
rewriter, int *has_changes)
+{
+ node *n;
+
+ if (!l)
+ return l;
+ for(n = l->h; n; n = n->next)
+ n->data = rewrite_exp(sql, n->data, rewrite_rel, rewriter,
has_changes);
+ return l;
+}
+
+
static sql_rel *
rewrite(mvc *sql, sql_rel *rel, rewrite_fptr rewriter, int *has_changes)
{
@@ -8590,6 +8621,8 @@ rewrite(mvc *sql, sql_rel *rel, rewrite_
rel->l = rewrite(sql, rel->l, rewriter, has_changes);
break;
case op_ddl:
+ if (rel->flag == DDL_PSM && rel->exps)
+ rel->exps = rewrite_exps(sql, rel->exps, &rewrite,
rewriter, has_changes);
rel->l = rewrite(sql, rel->l, rewriter, has_changes);
if (rel->r)
rel->r = rewrite(sql, rel->r, rewriter, has_changes);
@@ -8647,6 +8680,8 @@ rewrite_topdown(mvc *sql, sql_rel *rel,
rel->l = rewrite_topdown(sql, rel->l, rewriter, has_changes);
break;
case op_ddl:
+ if (rel->flag == DDL_PSM && rel->exps)
+ rewrite_exps(sql, rel->exps, &rewrite_topdown,
rewriter, has_changes);
rel->l = rewrite_topdown(sql, rel->l, rewriter, has_changes);
if (rel->r)
rel->r = rewrite_topdown(sql, rel->r, rewriter,
has_changes);
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -1210,12 +1210,13 @@ atom *
atom_mul(atom *a1, atom *a2)
{
ValRecord dst;
+
if (!EC_COMPUTE(a1->tpe.type->eclass))
return NULL;
if (a1->tpe.type->localtype == TYPE_dbl ||
a2->tpe.type->localtype == TYPE_dbl) {
ValRecord v1, v2;
- v1.vtype = v2.vtype = TYPE_dbl;
+ dst.vtype = v1.vtype = v2.vtype = TYPE_dbl;
v1.val.dval = a1->d;
v2.val.dval = a2->d;
if (VARcalcmul(&dst, &v1, &v2, 1) != GDK_SUCCEED)
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
@@ -32,3 +32,4 @@ crash_correlated_subqueries_in_select.Bu
fullouterjoinfilter.Bug-6256
wrong_aggregation_count.Bug-6257
select.Bug-6259
+function_and_mergetable.Bug-6288
diff --git
a/sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.sql
b/sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.sql
@@ -0,0 +1,20 @@
+CREATE SCHEMA banana;
+SET SCHEMA banana;
+
+CREATE MERGE TABLE t ( num DECIMAL(8,2) DEFAULT NULL );
+CREATE TABLE t0 ( num DECIMAL(8,2) DEFAULT NULL );
+ALTER TABLE t ADD TABLE t0;
+
+SELECT * FROM t;
+
+CREATE FUNCTION foo ()
+RETURNS TABLE (i DECIMAL(8,2))
+BEGIN
+ RETURN SELECT * FROM t;
+END;
+
+-- this fails unexpectedly
+SELECT * FROM foo();
+
+SET SCHEMA sys;
+DROP SCHEMA banana;
diff --git
a/sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.err
b/sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'function_and_mergetable.Bug-6288` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 13:52:12 >
+# 13:52:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32178" "--set"
"mapi_usock=/var/tmp/mtest-22381/.s.monetdb.32178" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 13:52:12 >
+
+# 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 = 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 = 32178
+# cmdline opt mapi_usock = /var/tmp/mtest-22381/.s.monetdb.32178
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 13:52:13 >
+# 13:52:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-22381" "--port=32178"
+# 13:52:13 >
+
+
+# 13:52:13 >
+# 13:52:13 > "Done."
+# 13:52:13 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.out
b/sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.out
@@ -0,0 +1,53 @@
+stdout of test 'function_and_mergetable.Bug-6288` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 13:52:12 >
+# 13:52:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32178" "--set"
"mapi_usock=/var/tmp/mtest-22381/.s.monetdb.32178" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 13:52:12 >
+
+# MonetDB 5 server v11.25.10
+# 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.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32178/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-22381/.s.monetdb.32178
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 13:52:13 >
+# 13:52:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-22381" "--port=32178"
+# 13:52:13 >
+
+#CREATE SCHEMA banana;
+#SET SCHEMA banana;
+#CREATE MERGE TABLE t ( num DECIMAL(8,2) DEFAULT NULL );
+#CREATE TABLE t0 ( num DECIMAL(8,2) DEFAULT NULL );
+#ALTER TABLE t ADD TABLE t0;
+#SELECT * FROM t;
+% banana.t # table_name
+% num # name
+% decimal # type
+% 10 # length
+#CREATE FUNCTION foo ()
+#RETURNS TABLE (i DECIMAL(8,2))
+#BEGIN
+# RETURN SELECT * FROM t;
+#END;
+#SELECT * FROM foo();
+% .L1 # table_name
+% i # name
+% decimal # type
+% 10 # length
+#SET SCHEMA sys;
+#DROP SCHEMA banana;
+
+# 13:52:13 >
+# 13:52:13 > "Done."
+# 13:52:13 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
