Changeset: 712b6af1b55a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=712b6af1b55a
Modified Files:
monetdb5/optimizer/opt_emptycolumn.c
Branch: jit
Log Message:
Enable the strong defense line for now
diffs (31 lines):
diff --git a/monetdb5/optimizer/opt_emptycolumn.c
b/monetdb5/optimizer/opt_emptycolumn.c
--- a/monetdb5/optimizer/opt_emptycolumn.c
+++ b/monetdb5/optimizer/opt_emptycolumn.c
@@ -54,7 +54,7 @@
int
OPTemptycolumnImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
{
- int i, actions = 0;
+ int i;
int *marked;
int limit = mb->stop;
InstrPtr p, *old = mb->stmt;
@@ -179,13 +179,11 @@ OPTemptycolumnImplementation(Client cntx
GDKfree(old);
GDKfree(marked);
/* Defense line against incorrect plans */
- if( actions > 0){
- chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
- chkFlow(cntxt->fdout, mb);
- chkDeclarations(cntxt->fdout, mb);
- }
+ chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
+ chkFlow(cntxt->fdout, mb);
+ chkDeclarations(cntxt->fdout, mb);
/* keep all actions taken as a post block comment */
- snprintf(buf,256,"%-20s actions=%2d time=" LLFMT "
usec","emptycolumn",actions,GDKusec() - usec);
+ snprintf(buf,256,"%-20s actions=%2d time=" LLFMT "
usec","emptycolumn",1,GDKusec() - usec);
newComment(mb,buf);
- return actions;
+ return 1;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
