MonetDB: default - Add algorithmic debugging out

[Martin Kersten]

Changeset: cf0b547cc120 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf0b547cc120
Modified Files:
        monetdb5/optimizer/opt_joinpath.mx
Branch: default
Log Message:

Add algorithmic debugging out
To test choices made easy


diffs (33 lines):

diff --git a/monetdb5/optimizer/opt_joinpath.mx 
b/monetdb5/optimizer/opt_joinpath.mx
--- a/monetdb5/optimizer/opt_joinpath.mx
+++ b/monetdb5/optimizer/opt_joinpath.mx
@@ -627,10 +627,14 @@ ALGjoinPathBody(Client cntxt, int top, B
                        if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
                        postponed = 0;
                }
-               OPTDEBUGjoinPath
-                       if (b )
-                               mnstr_printf(cntxt->fdout, "#joinPath %d:= 
join(%d,%d)\n", 
-                                       b->batCacheid, joins[j]->batCacheid, 
joins[j + 1]->batCacheid);
+               ALGODEBUG{
+                       if (b ) {
+                               mnstr_printf(GDKout, "#joinPath %d:= 
join(%d,%d)"
+                               " arguments %d (cnt= "BUNFMT") against (cnt 
"BUNFMT") cost "BUNFMT"\n", 
+                                       b->batCacheid, joins[j]->batCacheid, 
joins[j + 1]->batCacheid,
+                                       j, BATcount(joins[j]),  
BATcount(joins[j+1]), e);
+                       }
+               }
 
                if ( b == 0 ){
                        for( --top; top>=0; top--)
@@ -683,6 +687,10 @@ ALGjoinPath(Client cntxt, MalBlkPtr mb, 
                }
                joins[top++] = b;
        }
+       ALGODEBUG{
+               mnstr_printf(GDKout,"#joinpath ");
+               printInstruction( GDKout,mb,0,pci,0);
+       }
        b= ALGjoinPathBody(cntxt,top,joins, (getFunctionId(pci)== 
joinPathRef?1: (getFunctionId(pci) == leftjoinPathRef? 0:2)));
        GDKfree(joins);
        if ( b)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list