Changeset: 92df2d4aba1e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92df2d4aba1e
Modified Files:
monetdb5/optimizer/opt_aliases.c
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_wrapper.c
Branch: Feb2013
Log Message:
Minor textual issues.
diffs (91 lines):
diff --git a/monetdb5/optimizer/opt_aliases.c b/monetdb5/optimizer/opt_aliases.c
--- a/monetdb5/optimizer/opt_aliases.c
+++ b/monetdb5/optimizer/opt_aliases.c
@@ -74,7 +74,6 @@ OPTaliasesImplementation(Client cntxt, M
mb->stmt[i]= NULL;
mb->stop= k;
/*
- * @-
* The second phase is constant alias replacement should be implemented.
*/
GDKfree(span);
diff --git a/monetdb5/optimizer/opt_inline.c b/monetdb5/optimizer/opt_inline.c
--- a/monetdb5/optimizer/opt_inline.c
+++ b/monetdb5/optimizer/opt_inline.c
@@ -45,23 +45,18 @@ OPTinlineImplementation(Client cntxt, Ma
int actions = 0;
(void) p;
+ (void)stk;
for (i = 1; i < mb->stop; i++) {
q = getInstrPtr(mb, i);
if( q->blk ){
sig = getInstrPtr(q->blk,0);
/*
- * @-
* Time for inlining functions that are used in
multiplex operations.
* They are produced by SQL compiler.
*/
- OPTDEBUGinline {
- mnstr_printf(cntxt->fdout,"#check inline
statement\n");
-
printInstruction(cntxt->fdout,mb,0,q,LIST_MAL_ALL);
-
printInstruction(cntxt->fdout,q->blk,0,sig,LIST_MAL_ALL);
- }
- if( getModuleId(q) == malRef &&
- getFunctionId(q)== multiplexRef &&
+ if( getFunctionId(q)== multiplexRef &&
+ getModuleId(q) == malRef &&
OPTinlineMultiplex(cntxt,mb,q)){
OPTDEBUGinline {
@@ -72,7 +67,6 @@ OPTinlineImplementation(Client cntxt, Ma
varSetProp(mb, getArg(q,0), inlineProp, op_eq,
NULL);
} else
/*
- * @-
* Check if the function definition is tagged as being
inlined.
*/
if (sig->token == FUNCTIONsymbol &&
@@ -84,10 +78,10 @@ OPTinlineImplementation(Client cntxt, Ma
OPTDEBUGinline {
mnstr_printf(cntxt->fdout,"#inline
function at %d\n",i);
printFunction(cntxt->fdout, mb, 0,
LIST_MAL_ALL);
+
printInstruction(cntxt->fdout,q->blk,0,sig,LIST_MAL_ALL);
}
} else
/*
- * @-
* Check if the local call is tagged as being inlined.
*/
if (varGetProp(mb, getArg(q,0), inlineProp) != NULL) {
@@ -97,14 +91,11 @@ OPTinlineImplementation(Client cntxt, Ma
OPTDEBUGinline {
mnstr_printf(cntxt->fdout,"#inlined
called at %d\n",i);
printFunction(cntxt->fdout, mb, 0,
LIST_MAL_ALL);
+
printInstruction(cntxt->fdout,q->blk,0,sig,LIST_MAL_ALL);
}
}
}
}
- (void)stk;
- OPTDEBUGinline
- mnstr_printf(cntxt->fdout,"#mal program: %d MAL instr %d vars
(" SZFMT " K)\n",mb->stop,mb->vtop,
- ((sizeof( MalBlkRecord) +mb->ssize * sizeof(InstrRecord)+
mb->vtop* sizeof(VarRecord) + mb->vsize*sizeof(VarPtr)+1023)/1024));
return actions;
}
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -181,8 +181,8 @@ str OPTwrapper (Client cntxt, MalBlkPtr
printFunction(cntxt->fdout,mb,0,LIST_MAL_STMT | LIST_MAPI);
}
DEBUGoptimizers
- mnstr_printf(cntxt->fdout,"#optimizer %-11s %3d actions %5d MAL
instructions (%3d K) " LLFMT" usec\n", optimizer, actions, mb->stop,
- (int)((sizeof( MalBlkRecord) +mb->ssize * sizeof(InstrRecord)+
mb->vtop * sizeof(int) /* argv estimate */ +mb->vtop* sizeof(VarRecord) +
mb->vsize*sizeof(VarPtr)+1023)/1024),
+ mnstr_printf(cntxt->fdout,"#optimizer %-11s %3d actions %5d MAL
instructions ("SZFMT" K) " LLFMT" usec\n", optimizer, actions, mb->stop,
+ ((sizeof( MalBlkRecord) +mb->ssize * sizeof(InstrRecord)+
mb->vtop * sizeof(int) /* argv estimate */ +mb->vtop* sizeof(VarRecord) +
mb->vsize*sizeof(VarPtr)+1023)/1024),
t);
QOTupdateStatistics(getModuleId(q),actions,t);
addtoMalBlkHistory(mb,getModuleId(q));
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
