Changeset: c1e07cf7bb31 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c1e07cf7bb31
Modified Files:
gdk/gdk_strimps.c
Branch: strimps-updates
Log Message:
Use portable format macro for printing query bitsring
diffs (33 lines):
diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -86,7 +86,7 @@
#include "gdk_private.h"
#include <stdint.h>
-
+#include <inttypes.h>
#define STRIMP_VERSION (uint64_t)2
#define STRIMP_HISTSIZE (256*256)
@@ -591,7 +591,7 @@ STRMPfilter(BAT *b, BAT *s, const char *
qbmask = STRMPmakebitstring(q, strmps);
assert((qbmask & ((uint64_t)0x1 << (STRIMP_HEADER_SIZE - 1))) == 0);
- TRC_DEBUG(ACCELERATOR, "strimp filtering with pattern %s bitmap:
0x%016lx",
+ TRC_DEBUG(ACCELERATOR, "strimp filtering with pattern '%s' bitmap:
%#016" PRIx64 "\n",
q, qbmask);
bitstring_array = (uint64_t *)strmps->bitstrings_base;
rvals = Tloc(r, 0);
@@ -610,9 +610,9 @@ STRMPfilter(BAT *b, BAT *s, const char *
r->tnonil = true;
TRC_DEBUG(ACCELERATOR, "strimp prefiltering of " BUNFMT
" items took " LLFMT " usec. Keeping " BUNFMT
- " items (%.2f%%). Filter string '%s'.\n",
+ " items (%.2f%%).\n",
ci.ncand, GDKusec()-t0, r->batCount,
- 100*r->batCount/(double)ci.ncand, q);
+ 100*r->batCount/(double)ci.ncand);
TRC_DEBUG(ACCELERATOR, "r->" ALGOBATFMT "\n", ALGOBATPAR(r) );
STRMPdecref(strmps, false);
if (pb != b)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
