Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19972
Modified Files:
milprint_summer.c
Log Message:
- rolling back the exactly-one test again: it was correct after all
- resolve long-standing irritation that real errors are obscured
by a bogus error subsequently caused in the timing code.
(error on "-() maybe you mean.. ")
Index: milprint_summer.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milprint_summer.c,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -d -r1.384 -r1.385
--- milprint_summer.c 24 May 2007 11:37:05 -0000 1.384
+++ milprint_summer.c 25 May 2007 09:54:36 -0000 1.385
@@ -6820,8 +6820,10 @@
else if (!PFqname_eq(fnQname,PFqname (PFns_fn,"exactly-one")))
{
rc = translate2MIL (f, code, cur_level, counter, L(args));
+
milprintf(f,
- "if (iter.tunique().count() != ipik.count())"
+ "var cnt := iter.tunique().count();\n"
+ "if ((cnt != loop%03u.count()) or (cnt != ipik.count()))"
"{ ERROR (\"err:FORG0005: function fn:exactly-one expects "
"exactly one value.\"); }\n",
cur_level);
@@ -11506,9 +11508,9 @@
" ws_destroy(ws);\n"\
"}}\n"\
PF_STOP_PFTIJAH\
- "time_print := usec() - time_print;\n"\
"if (not(isnil(err))) ERROR(err);\n"\
"else if (genType.startsWith(\"timing\")) {\n"\
+ " time_print := usec() - time_print;\n"\
" printf(\"\\nTrans %% 10.3f msec\\nShred %% 10.3f msec\\nQuery
%% 10.3f msec\\n" LASTPHASE " %% 10.3f msec\\n\","\
" dbl(time_compile)/1000.0, dbl(time_shred)/1000.0,
dbl(time_exec - time_shred)/1000.0, time_print/1000.0);\n}"
const char* PFstopMIL(int statement_type) {
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
