Changeset: fa0dfee86f7b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa0dfee86f7b Modified Files: monetdb5/optimizer/opt_cquery.c Branch: trails Log Message:
Minor: add a bit info. for the code diffs (41 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 @@ -193,11 +193,11 @@ OPTcqueryImplementation(Client cntxt, Ma #ifdef DEBUG_OPT_CQUERY mnstr_printf(cntxt->fdout, "#cquery optimizer found stream %d\n",fnd); #endif + // replace this sql.tid with basket.tid if( fnd){ getModuleId(p) = basketRef; pushInstruction(mb,p); alias[getArg(p,0)] = -1; - //freeInstruction(p); continue; } } @@ -208,6 +208,7 @@ OPTcqueryImplementation(Client cntxt, Ma continue; } + // when it's an updating continuous query, we don't want to return the number of affected rows back to the caller. if (getModuleId(p) == sqlRef && getFunctionId(p) == affectedRowsRef ){ if(cq) freeInstruction(p); @@ -224,7 +225,7 @@ OPTcqueryImplementation(Client cntxt, Ma retseen = 1; if(p->token != ENDsymbol || !retseen) { - // watch out for second transaction in same block + // watch out for second transaction in the same block if( mvcseen){ // unlock the tables for( j=btop-1; j>= 0; j--){ @@ -278,6 +279,7 @@ OPTcqueryImplementation(Client cntxt, Ma } } + // Update the X_NNN numbers for this instruction for (j = 0; j < p->argc; j++) if (alias[getArg(p, j)] > 0) getArg(p, j) = alias[getArg(p, j)]; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list