Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2735/runtime
Modified Files:
Tag: M5XQ
pf_support.mx
Log Message:
propagated changes of Thursday Jun 18 2009 - Saturday Jun 20 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/06/18 - stmane: runtime/pf_support.mx,1.336
propagated changes of Tuesday Jun 16 2009 - Thursday Jun 18 2009
from the May2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/06/16 - stmane: runtime/pf_support.mx,1.334.2.2
fixed BUG #2805513 "fn:trace() produces output _and_ error":
in MIL, printing (the numeric value of) OIDs using printf()
requires to use format "%lli" to cope with 64-bit OIDs
(the undelying C implementation of monet_sprintf() takes care
of handling 32-bit OIDs correctly).
Added related test.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.333.2.2
retrieving revision 1.333.2.3
diff -u -d -r1.333.2.2 -r1.333.2.3
--- pf_support.mx 19 May 2009 14:35:37 -0000 1.333.2.2
+++ pf_support.mx 20 Jun 2009 09:49:12 -0000 1.333.2.3
@@ -851,8 +851,8 @@
# initial outer relation
var init_outer_val := 1...@0;
- pws (s); printf("<scope id=\"%i\">\n", init_id); s :+= 1;
- pws (s); printf("<iteration no=\"%i\">\n", init_outer_val); s :+= 1;
+ pws (s); printf("<scope id=\"%lli\">\n", init_id); s :+= 1;
+ pws (s); printf("<iteration no=\"%lli\">\n", init_outer_val); s :+= 1;
# first print all trace information in nested scopes ...
trace_scopes (ws,
@@ -899,7 +899,7 @@
var index1 := 0;
outer_r...@batloop () {
- pws (s); printf("<scope id=\"%i\">\n", $h); s :+= 1;
+ pws (s); printf("<scope id=\"%lli\">\n", $h); s :+= 1;
var next_id := $h;
var inner_rel := inner_rels.fetch(index1);
@@ -908,7 +908,7 @@
# iterate over the tuples of the outer|inner relation
in...@batloop () {
- pws (s); printf("<iteration no=\"%i\">\n", $t); s :+= 1;
+ pws (s); printf("<iteration no=\"%lli\">\n", $t); s :+= 1;
# first print all trace information in nested scopes ...
trace_scopes (ws,
@@ -960,7 +960,7 @@
# ... and pick the current iteration
var msg_row := $t.reverse().select(cur_inner).reverse();
if (msg_row.count() != 0) {
- pws (s); printf("<trace msg=\"%s\" id=\"%i\">\n",
+ pws (s); printf("<trace msg=\"%s\" id=\"%lli\">\n",
msg_row.fetch(0),
$h); s :+= 1;
@@ -1071,8 +1071,8 @@
printf (">%s", name);
}
else if (type_str = "node") {
- printf (" id=\"%i\"", node_id);
- printf (" fragment=\"%i\">", frag);
+ printf (" id=\"%lli\"", node_id);
+ printf (" fragment=\"%lli\">", frag);
# element, text, comment, pi, and doc nodes
print_result ("xml-noroot-noheader",
ws,
@@ -1087,11 +1087,11 @@
new (void,str).seqbase(0...@0));
}
else if (type_str = "attribute") {
- printf (" id=\"%i\"", attr_id);
+ printf (" id=\"%lli\"", attr_id);
if (not (isnil (node_id))) {
- printf (" parent_id=\"%i\"", node_id);
+ printf (" parent_id=\"%lli\"", node_id);
}
- printf (" fragment=\"%i\"", frag);
+ printf (" fragment=\"%lli\"", frag);
# attribute nodes
var qn_id := mposjoin (attr_id, frag, ws.fetch(ATTR_QN)).fetch(0);
var qn_frag := mposjoin (attr_id, frag,
ws.fetch(ATTR_CONT)).fetch(0);
------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
