Changeset: 4aa673eebda7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4aa673eebda7 Modified Files: monetdb5/optimizer/opt_cquery.c Branch: trails Log Message:
All operations on stream tables including this tumble function should be executed before unlocking them diffs (33 lines): diff --git a/monetdb5/optimizer/opt_cquery.c b/monetdb5/optimizer/opt_cquery.c --- a/monetdb5/optimizer/opt_cquery.c +++ b/monetdb5/optimizer/opt_cquery.c @@ -229,6 +229,14 @@ OPTcqueryImplementation(Client cntxt, Ma retseen = 1; if(p->token != ENDsymbol || !retseen) { + // empty all baskets used only when we are optimizing a cq + for(j = 0; j < btop; j++) + if( input[j] && !output[j] ){ + r = newStmt(mb, basketRef, tumbleRef); + r = pushStr(mb,r, schemas[j]); + r = pushStr(mb,r, tables[j]); + lastmvc = getArg(r,0); + } // watch out for second transaction in the same block if( mvcseen){ // NB: make sure this is only done once. @@ -241,14 +249,6 @@ OPTcqueryImplementation(Client cntxt, Ma lastmvc= getArg(r,0); } } - // empty all baskets used only when we are optimizing a cq - for(j = 0; j < btop; j++) - if( input[j] && !output[j] ){ - r = newStmt(mb, basketRef, tumbleRef); - r = pushStr(mb,r, schemas[j]); - r = pushStr(mb,r, tables[j]); - lastmvc = getArg(r,0); - } } if (p->token == ENDsymbol && noerror==0) { _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list