Changeset: c2944ad18a1b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2944ad18a1b
Modified Files:
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_mergetable.c
Branch: default
Log Message:
Sent bailout on mergetable. Avoid expensive tests in garbagecollector
diffs (35 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
@@ -80,13 +80,13 @@ OPTgarbageCollectorImplementation(Client
p->typechk = TYPE_UNKNOWN;
/* Set the program counter to ease profiling */
p->pc = i;
- for( j=0; j< p->retc; j++)
if ( i > 0 && getModuleId(p) != languageRef && getModuleId(p)
!= querylogRef && getModuleId(p) != sqlRef && !p->barrier)
- used[getArg(p,j)] = i;
- for( ; j< p->argc; j++)
+ for( j=0; j< p->retc; j++)
+ used[getArg(p,j)] = i;
if ( getModuleId(p) != languageRef && getFunctionId(p) !=
passRef){
- used[getArg(p,j)] = 0;
- }
+ for(j= p->retc ; j< p->argc; j++)
+ used[getArg(p,j)] = 0;
+ }
if ( p->token == ENDsymbol)
break;
}
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -2489,5 +2489,9 @@ cleanup:
newComment(mb,buf);
if( actions > 0)
addtoMalBlkHistory(mb);
+ if( bailout){
+ snprintf(buf,256,"Merge table bailout");
+ newComment(mb,buf);
+ }
return msg;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
