Changeset: d6b55762ae95 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6b55762ae95 Added Files: sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.out Modified Files: sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/test/BugTracker-2015/Tests/null.Bug-3833.stable.out sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out Branch: Mar2018 Log Message:
fixes for bug 6551, ie make sure we detect NULL better, when rewriting simple math expressions. diffs (203 lines): diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c --- a/sql/server/rel_exp.c +++ b/sql/server/rel_exp.c @@ -1391,6 +1391,41 @@ exp_is_not_null(mvc *sql, sql_exp *e) } int +exp_is_null(mvc *sql, sql_exp *e ) +{ + switch (e->type) { + case e_atom: + if (e->f) /* values list */ + return 0; + if (e->l) { + return (atom_null(e->l)); + } else if (sql->emode == m_normal && sql->argc > e->flag) { + return atom_null(sql->args[e->flag]); + } + return 0; + case e_convert: + return exp_is_null(sql, e->l); + case e_func: + case e_aggr: + { + int r = 0; + node *n; + list *l = e->l; + + if (!r && l) + for (n = l->h; n && r; n = n->next) + r |= exp_is_null(sql, n->data); + return r; + } + case e_column: + case e_cmp: + case e_psm: + return 0; + } + return 0; +} + +int exp_is_atom( sql_exp *e ) { switch (e->type) { diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h --- a/sql/server/rel_exp.h +++ b/sql/server/rel_exp.h @@ -122,6 +122,7 @@ extern int exp_is_atom(sql_exp *e); extern int exp_is_true(mvc *sql, sql_exp *e); extern int exp_is_zero(mvc *sql, sql_exp *e); extern int exp_is_not_null(mvc *sql, sql_exp *e); +extern int exp_is_null(mvc *sql, sql_exp *e); extern int exps_are_atoms(list *exps); extern int exp_has_func(sql_exp *e); extern int exp_unsafe(sql_exp *e); 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 @@ -2808,17 +2808,33 @@ exp_simplify_math( mvc *sql, sql_exp *e, le = l->h->data; if (!exp_subtype(le) || (!EC_COMPUTE(exp_subtype(le)->type->eclass) && exp_subtype(le)->type->eclass != EC_DEC)) return e; + + if (!f->func->s && list_length(l) == 2) { + sql_exp *le = l->h->data; + sql_exp *re = l->h->next->data; + + if (exp_is_atom(le) && exp_is_null(sql, le)) { + (*changes)++; + exp_setname(sql->sa, le, exp_relname(e), exp_name(e)); + return le; + } + if (exp_is_atom(re) && exp_is_null(sql, re)) { + (*changes)++; + exp_setname(sql->sa, re, exp_relname(e), exp_name(e)); + return re; + } + } if (!f->func->s && !strcmp(f->func->base.name, "sql_mul") && list_length(l) == 2) { sql_exp *le = l->h->data; sql_exp *re = l->h->next->data; /* 0*a = 0 */ - if (exp_is_atom(le) && exp_is_zero(sql, le) && exp_is_not_null(sql, re)) { + if (exp_is_atom(le) && exp_is_zero(sql, le) && exp_is_atom(re) && exp_is_not_null(sql, re)) { (*changes)++; exp_setname(sql->sa, le, exp_relname(e), exp_name(e)); return le; } /* a*0 = 0 */ - if (exp_is_atom(re) && exp_is_zero(sql, re) && exp_is_not_null(sql, le)) { + if (exp_is_atom(re) && exp_is_zero(sql, re) && exp_is_atom(le) && exp_is_not_null(sql, le)) { (*changes)++; exp_setname(sql->sa, re, exp_relname(e), exp_name(e)); return re; diff --git a/sql/test/BugTracker-2015/Tests/null.Bug-3833.stable.out b/sql/test/BugTracker-2015/Tests/null.Bug-3833.stable.out --- a/sql/test/BugTracker-2015/Tests/null.Bug-3833.stable.out +++ b/sql/test/BugTracker-2015/Tests/null.Bug-3833.stable.out @@ -43,8 +43,8 @@ Ready. #SELECT (1 = NULL); % .L2 # table_name % L2 # name -% boolean # type -% 5 # length +% tinyint # type +% 1 # length [ NULL ] #SELECT (TRUE OR NULL); % .L2 # table_name diff --git a/sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out b/sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out --- a/sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out +++ b/sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out @@ -38,8 +38,8 @@ Ready. #select null in (1); % .L3 # table_name % L3 # name -% boolean # type -% 5 # length +% tinyint # type +% 1 # length [ NULL ] #select null between null and null; % .L2 # table_name diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.err b/sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.err @@ -0,0 +1,34 @@ +stderr of test 'sqlitelogictest-wrong-cast-null.Bug-6551` in directory 'sql/test/BugTracker-2018` itself: + + +# 14:54:45 > +# 14:54:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34161" "--set" "mapi_usock=/var/tmp/mtest-1674/.s.monetdb.34161" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018" +# 14:54:45 > + +# 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 = 34161 +# cmdline opt mapi_usock = /var/tmp/mtest-1674/.s.monetdb.34161 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018 +# cmdline opt gdk_debug = 553648138 + +# 14:54:45 > +# 14:54:45 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1674" "--port=34161" +# 14:54:45 > + + +# 14:54:45 > +# 14:54:45 > "Done." +# 14:54:45 > + diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.out b/sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.out @@ -0,0 +1,36 @@ +stdout of test 'sqlitelogictest-wrong-cast-null.Bug-6551` in directory 'sql/test/BugTracker-2018` itself: + + +# 14:54:45 > +# 14:54:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34161" "--set" "mapi_usock=/var/tmp/mtest-1674/.s.monetdb.34161" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018" +# 14:54:45 > + +# MonetDB 5 server v11.29.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.387 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.localdomain:34161/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1674/.s.monetdb.34161 +# MonetDB/SQL module loaded + +Ready. + +# 14:54:45 > +# 14:54:45 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1674" "--port=34161" +# 14:54:45 > + +#SELECT 0 * + 77 * CAST ( NULL AS INTEGER ) AS col2; +% .L3 # table_name +% col2 # name +% int # type +% 1 # length +[ NULL ] + +# 14:54:45 > +# 14:54:45 > "Done." +# 14:54:45 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list