On Thu, Feb 23, 2012 at 04:32:06PM +0100, Stefan Manegold wrote: > As slightly different alternative of this was actually included in > > changeset: 43263:86d94f21e92c > branch: Dec2011 > tag: tip > parent: 43257:cca19fbbc97a > user: Niels Nes <[email protected]> > date: Thu Feb 23 14:44:20 2012 +0100 > files: sql/backends/monet5/sql.mx sql/include/sql_relation.h > sql/server/rel_bin.c sql/server/rel_exp.c sql/server/rel_optimizer.c > sql/server/rel_select.c sql/server/rel_select.h > sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.stable.out > sql/test/BugTracker-2012/Tests/All sql/t > est/BugTracker-2012/Tests/innerjoin_subquery.Bug-3034.sql > sql/test/BugTracker-2012/Tests/innerjoin_subquery.Bug-3034.stable.err > sql/test/BugTracker-2012/Tests/innerjoin_subquery.Bug-3034.stable.out > sql/test/BugTracker-2012/Tests/outerjoin_predicate.Bug-2964.sql > sql/test/BugTracker-2012/Tests/out > erjoin_predicate.Bug-2964.stable.err > sql/test/BugTracker-2012/Tests/outerjoin_predicate.Bug-2964.stable.out > sql/test/BugTracker-2012/Tests/outerjoin_select.Bug-2946.sql > sql/test/BugTracker-2012/Tests/outerjoin_select.Bug-2946.stable.err > sql/test/BugTracker-2012/Tests/outerjoin_select.Bug-2946.st > able.out sql/test/BugTracker-2012/Tests/rangejoin.Bug-3017.sql > sql/test/BugTracker-2012/Tests/rangejoin.Bug-3017.stable.err > sql/test/BugTracker-2012/Tests/rangejoin.Bug-3017.stable.out > description: > fixed bugs 3034, 2964 2946 and 3017 > > The rel2bin_join didn't handle a bunch of corner cases > > diff -r cca19fbbc97a -r 86d94f21e92c sql/backends/monet5/sql.mx > --- a/sql/backends/monet5/sql.mx Wed Feb 22 20:51:23 2012 +0100 > +++ b/sql/backends/monet5/sql.mx Thu Feb 23 14:44:20 2012 +0100 > @@ -1693,6 +1693,7 @@ > if (err < 0) > c->session->status = err; > scanner_query_processed(&(c->scanner)); > + c->point_query = 0; > return err; > } > [...] > > > Not sure, though, whether it makes a logical/semantical difference, whether > c->point_query = 0; > is done before (default branch; see below) or after (Dec2011 branch; see > above) > scanner_query_processed(&(c->scanner)); > > > With the next merge from Dec2011 to default, > c->point_query = 0; > would occur both before and after > scanner_query_processed(&(c->scanner)); > in the default branch (unless cleaned by hand ...)
here: Changeset: 79dabc8675d7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=79dabc8675d7 Modified Files: sql/backends/monet5/sql.mx sql/include/sql_relation.h sql/server/rel_bin.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_select.c sql/server/rel_select.h sql/test/BugTracker-2009/Tests/decimal_needs_truncation.SF-2605686.sql sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.sql sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.sql sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.sql sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.sql sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.sql sql/test/BugTracker/Tests/large_prepare.SF-1363729.sql sql/test/BugTracker/Tests/large_prepare_2.SF-1363729.sql sql/test/BugTracker/Tests/prepare_decimal_float.SF-1675795.sql Branch: default Log Message: Merge with Dec2011 branch. [...] diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx --- a/sql/backends/monet5/sql.mx +++ b/sql/backends/monet5/sql.mx @@ -1696,6 +1696,7 @@ sqlcleanup(mvc *c, int err) c->label = 0; c->point_query = 0; scanner_query_processed(&(c->scanner)); + c->point_query = 0; return err; } > ... > > Stefan > > > On Thu, Feb 23, 2012 at 02:44:05PM +0100, Sjoerd Mullender wrote: > > Would this also be appropriate for the Dec2011 branch? > > > > On 2012-02-23 14:22, Niels Nes wrote: > > > Changeset: 656d66d54802 for MonetDB > > > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=656d66d54802 > > > Modified Files: > > > sql/backends/monet5/sql.mx > > > Branch: default > > > Log Message: > > > > > > make sure we reset the point_query flag > > > > > > > > > diffs (11 lines): > > > > > > diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx > > > --- a/sql/backends/monet5/sql.mx > > > +++ b/sql/backends/monet5/sql.mx > > > @@ -1694,6 +1694,7 @@ sqlcleanup(mvc *c, int err) > > > if (err < 0) > > > c->session->status = err; > > > c->label = 0; > > > + c->point_query = 0; > > > scanner_query_processed(&(c->scanner)); > > > return err; > > > } > > > _______________________________________________ > > > Checkin-list mailing list > > > [email protected] > > > http://mail.monetdb.org/mailman/listinfo/checkin-list > > > > > > -- > > Sjoerd Mullender > > > > > > > ------------------------------------------------------------------------------ > > Virtualization & Cloud Management Using Capacity Planning > > Cloud computing makes use of virtualization - but cloud computing > > also focuses on allowing computing to be delivered as a service. > > http://www.accelacomm.com/jaw/sfnl/114/51521223/ > > > _______________________________________________ > > Monetdb-developers mailing list > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/monetdb-developers > > > -- > | 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) | > > ------------------------------------------------------------------------------ > Virtualization & Cloud Management Using Capacity Planning > Cloud computing makes use of virtualization - but cloud computing > also focuses on allowing computing to be delivered as a service. > http://www.accelacomm.com/jaw/sfnl/114/51521223/ > _______________________________________________ > Monetdb-developers mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/monetdb-developers > -- | 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) | ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Monetdb-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/monetdb-developers
