Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7699
Modified Files:
Tag: XQuery_0-18
pathfinder.mx
Log Message:
It is possible that the NID_RID table contains nil values in the tail
(e.g. for deleted nodes). Protect against that.
This fixes the bug [ 1763495 ] XQ: illegal offsets in swizzle (2).
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.367.2.10
retrieving revision 1.367.2.11
diff -u -d -r1.367.2.10 -r1.367.2.11
--- pathfinder.mx 2 Aug 2007 20:20:41 -0000 1.367.2.10
+++ pathfinder.mx 3 Aug 2007 14:00:57 -0000 1.367.2.11
@@ -2481,7 +2481,7 @@
var key_pre := vx_lookup(ws, cont, key_val, uri, loc, false);
if (isid) { # for ID() we also perform NID access; merging with IDs,
conserves pre-order
- id_pre :=
id_split.leftjoin(split_nids).leftjoin(nid_rid).[swizzle](map_pid).tsort();
+ id_pre :=
id_split.leftjoin(split_nids).leftjoin(nid_rid).ord_select(oid_nil,oid_nil).[swizzle](map_pid).tsort();
id_pre := merged_union(id_pre.tmark([EMAIL PROTECTED]),
key_pre.tmark([EMAIL PROTECTED]),
id_pre.hmark([EMAIL PROTECTED]),
key_pre.hmark([EMAIL PROTECTED]).leftfetchjoin(key_id));
key_pre := id_pre.fetch(0);
@@ -4194,10 +4194,11 @@
YYSTREE ret = NULL, treebak = c->tree;
char* bufbak = c->input;
int listing_bak = c->listing;
+ int lineno = 1;
c->listing = 0;
c->input = buf;
c->tree = NULL;
- if (parseClient(c, FALSE))
+ if (parseClient(c, FALSE, "<xquery>", &lineno))
ret = c->tree;
c->tree = treebak;
c->input = bufbak;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
