On Thu, May 26, 2011 at 09:43:05AM +0200, Stefan Manegold wrote: > Niels, > > back-porting both > > http://dev.monetdb.org/hg/MonetDB/rev/6767e865d917 > and > http://dev.monetdb.org/hg/MonetDB/rev/f4f146528020 > > to the Apr2011 branch does fix these two tests, i.e., restore the original > plan with selections pushed down. > > I'm currently running complete testing to see whether it does any harm to > other tests. > > If not, I could later commit the back-port (or transplant for that matter), > unless you advise differently. > > Also: should any other of your recent default-fixes be > back-ported/transplanted to the Apr2011 branch? > > Thanks! I'm looking into this. The fixes were a merge of fixes and features, ie probably best if I do it manual.
Niels > > Stefan > > On Wed, May 25, 2011 at 09:36:38PM +0200, Niels Nes wrote: > > On Wed, May 25, 2011 at 09:27:06PM +0200, Stefan Manegold wrote: > > > Niels, > > > > > > I not sure, whether this is related, but I just noticed that the test web > > > (cf., > > > http://monetdb.cwi.nl/testing/projects/monetdb/testweb/web/testgrid.php?serial=40290:01ab601fa501,40288:39aee28c9b0a,40277:6a22cb5e0f47,40259:b0180df2a35a,40228:a8b6988671d1,40218:c4d975ce2873&module=sql&targets=GNU-Fedora-x86_64-propcheck-assert&order=platform,arch,compiler&diff > > > and > > > http://monetdb.cwi.nl/testing/projects/monetdb/testweb/tests/40259:b0180df2a35a/GNU-Fedora-x86_64-propcheck-assert/sql/mTests/test/BugTracker/explain.SF-1739353.out.diff.html > > > http://monetdb.cwi.nl/testing/projects/monetdb/testweb/tests/40259:b0180df2a35a/GNU-Fedora-x86_64-propcheck-assert/sql/mTests/test/BugTracker/jdbc_no_debug.SF-1739356.out.diff.html > > > ) > > > suggest that one of these checkins > > > http://monetdb.cwi.nl/testing/projects/monetdb/testweb/logs/40259:b0180df2a35a/incoming_commits > > > > > > causes some selections to no longer be pushed below union in the Apr2011 > > > branch. > > > > > > However, simply back-porting your below fix to the Apr2011 branch does not > > > help on the Apr2011 branch. > > > > I think also the fix in exp_push_down is needed (ie the one for union > > is in the e_column part). I'll have a look later today. > > > > Niels > > > > > > Stefan > > > > > > On Wed, May 25, 2011 at 07:36:27PM +0200, Niels Nes wrote: > > > > Changeset: f4f146528020 for MonetDB > > > > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4f146528020 > > > > Modified Files: > > > > sql/server/rel_optimizer.c > > > > Branch: default > > > > Log Message: > > > > > > > > small fix in the optimizer for pushing a select through a union > > > > > > > > > > > > diffs (18 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 > > > > @@ -2270,12 +2270,12 @@ > > > > sql_exp *e = n->data, *ne = NULL; > > > > if (e->type == e_cmp) { > > > > int err = 0; > > > > - ne = exp_push_down(sql, e, r, sl); > > > > + ne = exp_push_down(sql, e, r, sl->l); > > > > if (ne && ne != e) { > > > > rel_select_add_exp(sl, ne); > > > > } else > > > > err = 1; > > > > - ne = exp_push_down(sql, e, r, sr); > > > > + ne = exp_push_down(sql, e, r, sr->l); > > > > if (ne && ne != e) { > > > > rel_select_add_exp(sr, ne); > > > > } else > > > > _______________________________________________ > > > > Checkin-list mailing list > > > > [email protected] > > > > http://mail.monetdb.org/mailman/listinfo/checkin-list > > > > > > -- > > > | Stefan.Manegold @ CWI.nl | DB Architectures (INS1) | > > > | http://CWI.nl/~manegold/ | Science Park 123 (L321) | > > > | Tel.: +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) | > > > > -- > > Niels Nes, Centrum Wiskunde & Informatica (CWI) > > Science Park 123, 1098 XG Amsterdam, The Netherlands > > room L3.14, phone ++31 20 592-4098 sip:[email protected] > > url: http://www.cwi.nl/~niels e-mail: [email protected] > > > > -- > | Stefan.Manegold @ CWI.nl | DB Architectures (INS1) | > | http://CWI.nl/~manegold/ | Science Park 123 (L321) | > | Tel.: +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) | -- Niels Nes, Centrum Wiskunde & Informatica (CWI) Science Park 123, 1098 XG Amsterdam, The Netherlands room L3.14, phone ++31 20 592-4098 sip:[email protected] url: http://www.cwi.nl/~niels e-mail: [email protected]
pgpgALb6t1iDz.pgp
Description: PGP signature
_______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
