Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/optimizer opt_recycler.mx, , 1.23, 1.24
Milena, is this a (bug-?) "fix" that should (have) go(ne) into the upcoming release (and hence release branch)? Stefan On Tue, May 27, 2008 at 09:37:31AM +0000, Milena Ivanova wrote:
Update of /cvsroot/monetdb/MonetDB5/src/optimizer In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17027/optimizer
Modified Files: opt_recycler.mx Log Message: Fixed chain of recycled instructions.
U opt_recycler.mx Index: opt_recycler.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_recycler.mx,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- opt_recycler.mx 20 May 2008 07:20:19 -0000 1.23 +++ opt_recycler.mx 27 May 2008 09:37:29 -0000 1.24 @@ -160,17 +160,18 @@ if( getFunctionId(p)== selectRef && recycled[getArg(p,1)] ) p->recycle = -1; if( getFunctionId(p)== uselectRef && recycled[getArg(p,1)] && - !ATOMvarsized( getGDKType( getArgType(mb,p,1))) - ){ - q= copyInstruction(p); - getArg(q,0)= newTmpVariable(mb,TYPE_any); - setFunctionId(q, selectRef); + !ATOMvarsized( getGDKType( getArgType(mb,p,1)))){ + q = copyInstruction(p); + getArg(q,0)= newTmpVariable(mb,TYPE_any); + setFunctionId(q, selectRef); q->recycle = -1; + recycled[getArg(q,0)] = 1; pushInstruction(mb,q); - getArg(p,1)= getArg(q,0); + getArg(p,1) = getArg(q,0); setFunctionId(p,markTRef); - p->argc=2; - p->recycle = -1; + p->argc = 2; + p->recycle = -1; + recycled[getArg(p,0)] = 1; } @- The sql.bind instructions should be handled carefully
------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |
Stefan Manegold wrote:
Milena,
is this a (bug-?) "fix" that should (have) go(ne) into the upcoming release (and hence release branch)?
The recycle code is still under development and not activated in the SQL optimizer by default. The Window errors are a reminder too.
Stefan
On Tue, May 27, 2008 at 09:37:31AM +0000, Milena Ivanova wrote:
Update of /cvsroot/monetdb/MonetDB5/src/optimizer In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17027/optimizer
Modified Files: opt_recycler.mx Log Message: Fixed chain of recycled instructions.
U opt_recycler.mx Index: opt_recycler.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_recycler.mx,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- opt_recycler.mx 20 May 2008 07:20:19 -0000 1.23 +++ opt_recycler.mx 27 May 2008 09:37:29 -0000 1.24 @@ -160,17 +160,18 @@ if( getFunctionId(p)== selectRef && recycled[getArg(p,1)] ) p->recycle = -1; if( getFunctionId(p)== uselectRef && recycled[getArg(p,1)] && - !ATOMvarsized( getGDKType( getArgType(mb,p,1))) - ){ - q= copyInstruction(p); - getArg(q,0)= newTmpVariable(mb,TYPE_any); - setFunctionId(q, selectRef); + !ATOMvarsized( getGDKType( getArgType(mb,p,1)))){ + q = copyInstruction(p); + getArg(q,0)= newTmpVariable(mb,TYPE_any); + setFunctionId(q, selectRef); q->recycle = -1; + recycled[getArg(q,0)] = 1; pushInstruction(mb,q); - getArg(p,1)= getArg(q,0); + getArg(p,1) = getArg(q,0); setFunctionId(p,markTRef); - p->argc=2; - p->recycle = -1; + p->argc = 2; + p->recycle = -1; + recycled[getArg(p,0)] = 1; } @- The sql.bind instructions should be handled carefully
------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
Martin Kersten wrote:
Stefan Manegold wrote:
Milena,
is this a (bug-?) "fix" that should (have) go(ne) into the upcoming release (and hence release branch)?
The recycle code is still under development and not activated in the SQL optimizer by default. The Window errors are a reminder too. This means that every test or compilation for recycle should be deactivated on the stable branch...
The job is done... I also closed the bugs... Romulo
Stefan
On Tue, May 27, 2008 at 09:37:31AM +0000, Milena Ivanova wrote:
Update of /cvsroot/monetdb/MonetDB5/src/optimizer In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17027/optimizer
Modified Files: opt_recycler.mx Log Message: Fixed chain of recycled instructions.
U opt_recycler.mx Index: opt_recycler.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_recycler.mx,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- opt_recycler.mx 20 May 2008 07:20:19 -0000 1.23 +++ opt_recycler.mx 27 May 2008 09:37:29 -0000 1.24 @@ -160,17 +160,18 @@ if( getFunctionId(p)== selectRef && recycled[getArg(p,1)] ) p->recycle = -1; if( getFunctionId(p)== uselectRef && recycled[getArg(p,1)] && - !ATOMvarsized( getGDKType( getArgType(mb,p,1))) - ){ - q= copyInstruction(p); - getArg(q,0)= newTmpVariable(mb,TYPE_any); - setFunctionId(q, selectRef); + !ATOMvarsized( getGDKType( getArgType(mb,p,1)))){ + q = copyInstruction(p); + getArg(q,0)= newTmpVariable(mb,TYPE_any); + setFunctionId(q, selectRef); q->recycle = -1; + recycled[getArg(q,0)] = 1; pushInstruction(mb,q); - getArg(p,1)= getArg(q,0); + getArg(p,1) = getArg(q,0); setFunctionId(p,markTRef); - p->argc=2; - p->recycle = -1; + p->argc = 2; + p->recycle = -1; + recycled[getArg(p,0)] = 1; } @- The sql.bind instructions should be handled carefully
------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Monetdb-developers mailing list Monetdb-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-developers
participants (3)
-
Martin Kersten -
Romulo Goncalves -
Stefan Manegold