Changeset: a54f686011a1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a54f686011a1
Modified Files:
monetdb5/optimizer/opt_garbageCollector.c
Branch: Jul2017
Log Message:
Partially revert patch f7970a6cabf2
The introduction of the firm defense line
in the garbageoptimizer was causing a problem.
diffs (18 lines):
diff --git a/monetdb5/optimizer/opt_garbageCollector.c
b/monetdb5/optimizer/opt_garbageCollector.c
--- a/monetdb5/optimizer/opt_garbageCollector.c
+++ b/monetdb5/optimizer/opt_garbageCollector.c
@@ -154,9 +154,11 @@ OPTgarbageCollectorImplementation(Client
/* leave a consistent scope admin behind */
setVariableScope(mb);
/* Defense line against incorrect plans */
- chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
- chkFlow(cntxt->fdout, mb);
- chkDeclarations(cntxt->fdout, mb);
+ if( actions > 0){
+ chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
+ chkFlow(cntxt->fdout, mb);
+ chkDeclarations(cntxt->fdout, mb);
+ }
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
snprintf(buf,256,"%-20s actions=%2d time=" LLFMT "
usec","garbagecollector",actions, usec);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
