Nice catch! Thanks!!! Stefan
----- Reply message ----- From: "Sjoerd Mullender" <[email protected]> To: <[email protected]> Subject: MonetDB: Aug2011 - When clearing variables also clear eolife field. Date: Tue, Sep 20, 2011 21:23 Changeset: 9d839b4fd018 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d839b4fd018 Modified Files: monetdb5/mal/mal_instruction.mx sql/sql/15_history.sql Branch: Aug2011 Log Message: When clearing variables also clear eolife field. Not clearing the field could cause a bogus dependency in the dataflow scheduler which in turn could cause a circular dependecy among instructions. This fixes bug 2865 and the server timeouts of bug 2888. (The problem that Mtest.py has with all the hanging servers is not solved but may not be a problem anymore.) diffs (36 lines): diff --git a/monetdb5/mal/mal_instruction.mx b/monetdb5/mal/mal_instruction.mx --- a/monetdb5/mal/mal_instruction.mx +++ b/monetdb5/mal/mal_instruction.mx @@ -1356,6 +1356,7 @@ clearVariable(MalBlkPtr mb, int varid) v->flags = 0; v->tmpindex = 0; v->propc = 0; + v->eolife = 0; } void diff --git a/sql/sql/15_history.sql b/sql/sql/15_history.sql --- a/sql/sql/15_history.sql +++ b/sql/sql/15_history.sql @@ -23,13 +23,6 @@ -- Whenever a query is compiled and added to the cache, it is also entered -- into the 'queryHistory' table using a hardwired call to 'keepQuery'. --- Temporary and locally disable mitosis to prevent yet undiscoved deadlock; --- cf., bug 2865 (http://bugs.monetdb.org/show_bug.cgi?id=2865) -declare dft_opt string; -set dft_opt = ( select optimizer ); -set optimizer = 'no_mitosis_pipe'; --- cf., `set optimizer = dft_opt` at the end of this script - create table queryHistory( id wrd primary key, defined timestamp, -- when entered into the cache @@ -117,7 +110,4 @@ begin delete from queryHistory; end; --- cf., top of this script -set optimizer = dft_opt; - -- set history=true; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
_______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
