Update of /cvsroot/monetdb/pathfinder/compiler/algebra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1988/compiler/algebra
Modified Files:
Tag: XQuery_0-24
logical.c physical.c
Log Message:
* fix the replace-element update function
- the core translation was not casting the uA to string when constracting
a text node,
- the assert was asserting aat_str instead of aat_pnode.
* made the findnodes milgen code slightly more compact.
U physical.c
Index: physical.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/physical.c,v
retrieving revision 1.69
retrieving revision 1.69.2.1
diff -u -d -r1.69 -r1.69.2.1
--- physical.c 23 May 2008 20:46:39 -0000 1.69
+++ physical.c 28 May 2008 11:08:12 -0000 1.69.2.1
@@ -1775,7 +1775,7 @@
break;
case alg_fun_upd_replace_element:
assert(n->schema.items[ix[0]].type & aat_pnode);
- assert(n->schema.items[ix[1]].type & aat_str);
+ assert(n->schema.items[ix[1]].type & aat_pnode);
assert((n->schema.items[ix[0]].type << 4) & aat_pnode1);
break;
default: assert(!"should never reach here"); break;
U logical.c
Index: logical.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/logical.c,v
retrieving revision 1.98
retrieving revision 1.98.2.1
diff -u -d -r1.98 -r1.98.2.1
--- logical.c 21 May 2008 10:58:05 -0000 1.98
+++ logical.c 28 May 2008 11:08:11 -0000 1.98.2.1
@@ -1595,7 +1595,7 @@
break;
case alg_fun_upd_replace_element:
assert(n->schema.items[ix[0]].type & aat_pnode);
- assert(n->schema.items[ix[1]].type & aat_str);
+ assert(n->schema.items[ix[1]].type & aat_pnode);
assert((n->schema.items[ix[0]].type << 4) & aat_pnode1);
break;
default: assert(!"should never reach here"); break;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
