Changeset: 8a1c190bb361 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a1c190bb361 Modified Files: gdk/gdk_value.mx monetdb5/optimizer/opt_commonTerms.mx monetdb5/optimizer/opt_mergetable.mx Branch: default Log Message:
remove debugging assert diffs (52 lines): diff --git a/gdk/gdk_value.mx b/gdk/gdk_value.mx --- a/gdk/gdk_value.mx +++ b/gdk/gdk_value.mx @@ -98,7 +98,7 @@ VALset(ValPtr v, int t, ptr p) return v; } -void * +inline void * VALget(ValPtr v) { switch (ATOMstorage(v->vtype)) { @@ -133,7 +133,7 @@ VALclear(ValPtr v) VALempty(v); } -void +inline void VALempty(ValPtr v) { v->len = 0; diff --git a/monetdb5/optimizer/opt_commonTerms.mx b/monetdb5/optimizer/opt_commonTerms.mx --- a/monetdb5/optimizer/opt_commonTerms.mx +++ b/monetdb5/optimizer/opt_commonTerms.mx @@ -204,7 +204,7 @@ OPTcommonTermsImplementation(Client cntx if ( !prop) for (; j ; j = list[j]) - if ( (q=getInstrPtr(mb,j))->fcn == p->fcn && !isUnsafeFunction(q)){ + if ( (q=getInstrPtr(mb,j))->fcn == p->fcn ){ #ifdef DEBUG_OPT_COMMONTERMS_MORE mnstr_printf(cntxt->fdout,"#CANDIDATE %d, %d %d %d ", i, j, hasSameSignature(mb, p, q, p->retc), @@ -228,6 +228,7 @@ OPTcommonTermsImplementation(Client cntx if ( hasSameArguments(mb, p, q) && hasSameSignature(mb, p, q, p->retc) && !hasCommonResults(p, q) && + !isUnsafeFunction(q) && isLinearFlow(q) ) { if (safetyBarrier(p, q) ){ diff --git a/monetdb5/optimizer/opt_mergetable.mx b/monetdb5/optimizer/opt_mergetable.mx --- a/monetdb5/optimizer/opt_mergetable.mx +++ b/monetdb5/optimizer/opt_mergetable.mx @@ -2338,7 +2338,6 @@ OPTmergetableImplementation(Client cntxt if ( mb->errors == 0) { for(i=0; i<slimit; i++) if (old[i]) { - assert(!check_instr(mb, old[i])); freeInstruction(old[i]); } GDKfree(old); _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list