Changeset: 5828738145ab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5828738145ab
Modified Files:
Branch: sciql
Log Message:
Merge with default branch.
diffs (69 lines):
diff --git a/monetdb5/optimizer/opt_dictionary.mx
b/monetdb5/optimizer/opt_dictionary.mx
--- a/monetdb5/optimizer/opt_dictionary.mx
+++ b/monetdb5/optimizer/opt_dictionary.mx
@@ -788,7 +788,7 @@
ratio = (double) BATcount(bh) / (double) BATcount(bs);
#ifdef DEBUG_OPT_DICTIONARY
if ( bs && bh )
- mnstr_printf(GDKout,"#dictionary.compress sample " SZFMT " "
SZFMT" %f %f\n", BATcount(bs), BATcount(bh),ratio, ratio * BATcount(b));
+ mnstr_printf(GDKout,"#dictionary.compress sample " BUNFMT " "
BUNFMT" %f %f\n", BATcount(bs), BATcount(bh),ratio, ratio * BATcount(b));
#endif
if ( bs) BBPreleaseref(bs->batCacheid);
if ( bh) BBPreleaseref(bh->batCacheid);
@@ -843,7 +843,7 @@
bx = BATjoin(b,BATmirror(bv), BUN_NONE);
BATpropcheck(bx, BATPROPS_QUICK);
#ifdef DEBUG_OPT_DICTIONARY
- mnstr_printf(GDKout,"#dictionary.new values table " SZFMT " \n",
BATcount(bv));
+ mnstr_printf(GDKout,"#dictionary.new values table " BUNFMT " \n",
BATcount(bv));
#endif
if (!(bx->batDirty&2)) bx = BATsetaccess(bx, BAT_READ);
@@ -894,7 +894,7 @@
bn = BATsemijoin(BATmirror(b), BATmirror(rv));
#ifdef DEBUG_OPT_DICTIONARY
mnstr_printf(GDKout,"#dictionary.expand %d %d\n",*val,*bid);
- mnstr_printf(GDKout,"#dictionary.expand " SZFMT " " SZFMT " " SZFMT
"\n",
+ mnstr_printf(GDKout,"#dictionary.expand " BUNFMT " " BUNFMT " " BUNFMT
"\n",
BATcount(rv), BATcount(b), BATcount(bn));
#endif
if ( BATcount(bn) == 0){
@@ -915,7 +915,7 @@
o++;
}
#ifdef DEBUG_OPT_DICTIONARY
- mnstr_printf(GDKout,"#dictionary.new values in encoding table" SZFMT "
\n", BATcount(bv));
+ mnstr_printf(GDKout,"#dictionary.new values in encoding table" BUNFMT "
\n", BATcount(bv));
#endif
} break;
@c
@@ -952,7 +952,7 @@
bx = BATjoin(b,BATmirror(bv), BUN_NONE);
#ifdef DEBUG_OPT_DICTIONARY
- mnstr_printf(GDKout,"#dictionary.encode index in encoding table" SZFMT
" \n", BATcount(bx));
+ mnstr_printf(GDKout,"#dictionary.encode index in encoding table" BUNFMT
" \n", BATcount(bx));
#endif
BBPkeepref(*ridx= bx->batCacheid);
BBPreleaseref(b->batCacheid);
@@ -1014,7 +1014,7 @@
BUNins(b, &o, BUNtail(bvi,p), FALSE);
}
#ifdef DEBUG_OPT_DICTIONARY
- mnstr_printf(GDKout,"#dictionary.new values in encoding table" SZFMT "
\n", BATcount(bv));
+ mnstr_printf(GDKout,"#dictionary.new values in encoding table" BUNFMT "
\n", BATcount(bv));
#endif
} break;
@c
diff --git a/monetdb5/optimizer/opt_mitosis.mx
b/monetdb5/optimizer/opt_mitosis.mx
--- a/monetdb5/optimizer/opt_mitosis.mx
+++ b/monetdb5/optimizer/opt_mitosis.mx
@@ -167,7 +167,7 @@
return 0;
OPTDEBUGmitosis
mnstr_printf(cntxt->fdout,"#opt_mitosis: target is %s.%s "
- " with " BUNFMT " rows into " BUNFMT " rows/piece %d
threads %d pieces\n",
+ " with " SSZFMT " rows into " SSZFMT " rows/piece %d
threads %d pieces\n",
getVarConstant(mb, getArg(target,2)).val.sval,
getVarConstant(mb, getArg(target,3)).val.sval,
rowcnt, r, threads, pieces);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
