Changeset: 0d6176697c41 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d6176697c41
Modified Files:
MonetDB5/src/modules/mal/recycle.mx
Branch: default
Log Message:
merge with Jun2010: fiexd test
diffs (49 lines):
diff -r aab8cd191893 -r 0d6176697c41 MonetDB5/src/mal/Tests/recycle12.mal
--- a/MonetDB5/src/mal/Tests/recycle12.mal Mon Jun 21 17:43:35 2010 +0200
+++ b/MonetDB5/src/mal/Tests/recycle12.mal Mon Jun 21 18:47:24 2010 +0200
@@ -35,7 +35,7 @@
recycle.setAdmPolicy(1);
recycle.setReusePolicy(1);
-recycle.setCachePolicy(3);
+recycle.setCachePolicy(1);
optimizer.recycle("user","qry");
optimizer.recycle("user","qry1");
diff -r aab8cd191893 -r 0d6176697c41 MonetDB5/src/mal/Tests/recycle12.stable.out
--- a/MonetDB5/src/mal/Tests/recycle12.stable.out Mon Jun 21 17:43:35
2010 +0200
+++ b/MonetDB5/src/mal/Tests/recycle12.stable.out Mon Jun 21 18:47:24
2010 +0200
@@ -94,7 +94,7 @@
#inter-query commonality
recycle.setAdmPolicy(1);
recycle.setReusePolicy(1);
- recycle.setCachePolicy(3);
+ recycle.setCachePolicy(1);
user.qry(2,8);
user.qry1(10);
user.qry1(10);
diff -r aab8cd191893 -r 0d6176697c41 MonetDB5/src/modules/mal/recycle.mx
--- a/MonetDB5/src/modules/mal/recycle.mx Mon Jun 21 17:43:35 2010 +0200
+++ b/MonetDB5/src/modules/mal/recycle.mx Mon Jun 21 18:47:24 2010 +0200
@@ -295,7 +295,7 @@
void
RECYCLEdumpQPat(stream *s)
{
- int i, j;
+ int i;
QryStatPtr qs;
if (!recycleQPat) {
@@ -307,11 +307,8 @@
stream_printf(s,"#RecID\tcalls\tglobRec\tlocRec\tCreditWL\n");
for(i=0; i< recycleQPat->cnt; i++){
qs = recycleQPat->ptrn[i];
- stream_printf(s,"# "LLFMT"\t%2d\t%2d\t%2d\t%2d\n#",
+ stream_printf(s,"# "LLFMT"\t\t%2d\t\t%2d\t\t%2d\t\t%2d\n",
qs->recid, qs->calls, qs->greuse, qs->lreuse, qs->wl);
- for (j=0; j<qs->stop; j++)
- stream_printf(s,"%2d(%1d) ",qs->crd[j],qs->gl[j]);
- stream_printf(s,"\n");
}
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
