Changeset: e7fd7b179529 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7fd7b179529
Modified Files:
clients/R/Tests/testrandom.R
sql/server/rel_optimizer.c
Branch: default
Log Message:
fixed crash in optimizer (solves dplyr-flights.R test/crash)
reduced size of testrandom.R (1000->100 random samples)
diffs (25 lines):
diff --git a/clients/R/Tests/testrandom.R b/clients/R/Tests/testrandom.R
--- a/clients/R/Tests/testrandom.R
+++ b/clients/R/Tests/testrandom.R
@@ -18,7 +18,7 @@ stopifnot(dbIsValid(db))
# End Mtest boilerplate
out <- NULL
-for ( i in 1:1000 ){
+for ( i in 1:100 ){
out <- c(out, dbGetQuery(db , "SELECT * FROM (SELECT 1 AS col UNION ALL
SELECT 2 AS col) AS temp SAMPLE 0.5"))
}
dbDisconnect(db)
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
@@ -4534,8 +4534,7 @@ rel_groupby_distinct2(int *changes, mvc
exp_setname(sql->sa, v, exp_find_rel_name(e),
exp_name(e));
append(naggrs, v);
} else if (e->type == e_aggr && !need_distinct(e)) {
- list *args = e->l;
- sql_exp *v = args->h->data;
+ sql_exp *v;
sql_subaggr *f = e->f;
int cnt = strcmp(f->aggr->base.name,"count")==0;
sql_subaggr *a = sql_bind_aggr(sql->sa,
sql->session->schema, (cnt)?"sum":f->aggr->base.name, exp_subtype(e));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
