Changeset: 0900833d1a87 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0900833d1a87
Added Files:
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.out
Modified Files:
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_rel.c
Branch: Jul2017
Log Message:
fixed bug 6428, ie don't remove groupby if the alias is different
diffs (178 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
@@ -796,19 +796,19 @@ exp_match( sql_exp *e1, sql_exp *e2)
}
/* list already contains matching expression */
-int
+sql_exp*
exps_find_exp( list *l, sql_exp *e)
{
node *n;
if (!l || !l->h)
- return 0;
+ return NULL;
for(n=l->h; n; n = n->next) {
if (exp_match(n->data, e))
- return 1;
+ return n->data;
}
- return 0;
+ return NULL;
}
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
@@ -109,7 +109,7 @@ extern int exp_cmp( sql_exp *e1, sql_exp
extern int exp_equal( sql_exp *e1, sql_exp *e2);
extern int exp_refers( sql_exp *p, sql_exp *c);
extern int exp_match( sql_exp *e1, sql_exp *e2);
-extern int exps_find_exp( list *l, sql_exp *e);
+extern sql_exp* exps_find_exp( list *l, sql_exp *e);
extern int exp_match_exp( sql_exp *e1, sql_exp *e2);
/* match just the column (cmp equality) expressions */
extern int exp_match_col_exps( sql_exp *e, list *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
@@ -5179,9 +5179,6 @@ rel_groupby_distinct(int *changes, mvc *
if (list_length(arg) != 1 || list_length(rel->r) + nr !=
list_length(rel->exps))
return rel;
- darg = arg->h->data;
- exp_label(sql->sa, darg, ++sql->label);
-
gbe = rel->r;
ngbe = sa_list(sql->sa);
exps = sa_list(sql->sa);
@@ -5189,17 +5186,21 @@ rel_groupby_distinct(int *changes, mvc *
for (n=rel->exps->h; n; n = n->next) {
sql_exp *e = n->data;
if (e != distinct) {
- e = exp_column(sql->sa, exp_find_rel_name(e),
exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
+ e = exp_column(sql->sa, exp_relname(e),
exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
append(ngbe, e);
append(exps, e);
- e = exp_column(sql->sa, exp_find_rel_name(e),
exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
+ e = exp_column(sql->sa, exp_relname(e),
exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
append(nexps, e);
}
}
- list_append(gbe, exp_copy(sql->sa, darg));
- darg = exp_column(sql->sa, exp_find_rel_name(darg),
exp_name(darg), exp_subtype(darg), darg->card, has_nil(darg), is_intern(darg));
- list_append(exps, exp_copy(sql->sa, darg));
+ darg = arg->h->data;
+ list_append(gbe, darg = exp_copy(sql->sa, darg));
+ exp_label(sql->sa, darg, ++sql->label);
+
+ darg = exp_column(sql->sa, exp_relname(darg), exp_name(darg),
exp_subtype(darg), darg->card, has_nil(darg), is_intern(darg));
+ list_append(exps, darg);
+ darg = exp_column(sql->sa, exp_relname(darg), exp_name(darg),
exp_subtype(darg), darg->card, has_nil(darg), is_intern(darg));
arg->h->data = darg;
l = rel->l = rel_groupby(sql, rel->l, gbe);
l->exps = exps;
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -747,9 +747,11 @@ rel_groupby(mvc *sql, sql_rel *l, list *
list *gexps = sa_list(sql->sa);
for (en = groupbyexps->h; en; en = en->next) {
- sql_exp *e = en->data;
+ sql_exp *e = en->data, *ne;
- if (!exps_find_exp(gexps, e))
+ if ((ne=exps_find_exp(gexps, e)) == NULL ||
+ strcmp(exp_relname(e),exp_relname(ne)) != 0 ||
+ strcmp(exp_name(e),exp_name(ne)) != 0 )
append(gexps, e);
}
groupbyexps = gexps;
diff --git
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.err
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlitelogictest-aggregation-having-avg.Bug-6428` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 13:10:15 >
+# 13:10:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33745" "--set"
"mapi_usock=/var/tmp/mtest-24108/.s.monetdb.33745" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 13:10:15 >
+
+# 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 = 33745
+# cmdline opt mapi_usock = /var/tmp/mtest-24108/.s.monetdb.33745
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 13:10:16 >
+# 13:10:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24108" "--port=33745"
+# 13:10:16 >
+
+
+# 13:10:16 >
+# 13:10:16 > "Done."
+# 13:10:16 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.out
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.out
@@ -0,0 +1,38 @@
+stdout of test 'sqlitelogictest-aggregation-having-avg.Bug-6428` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 13:10:15 >
+# 13:10:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33745" "--set"
"mapi_usock=/var/tmp/mtest-24108/.s.monetdb.33745" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 13:10:15 >
+
+# MonetDB 5 server v11.27.6
+# 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.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:33745/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-24108/.s.monetdb.33745
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 13:10:16 >
+# 13:10:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24108" "--port=33745"
+# 13:10:16 >
+
+#CREATE TABLE tab0(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+#SELECT - col0 AS col1 FROM tab0 AS cor0 WHERE NOT + col0 IS NOT NULL GROUP BY
col1, col0 HAVING NOT - col1 + + AVG ( DISTINCT col0 ) IS NULL;
+% sys.L2 # table_name
+% col1 # name
+% int # type
+% 1 # length
+#DROP TABLE tab0;
+
+# 13:10:16 >
+# 13:10:16 > "Done."
+# 13:10:16 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
