Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26436/algebra/prop
Modified Files:
prop_key.c
Log Message:
-- some recently added property inference (for path steps) was to optimistic.
U prop_key.c
Index: prop_key.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_key.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- prop_key.c 21 May 2008 10:04:12 -0000 1.46
+++ prop_key.c 23 May 2008 13:01:27 -0000 1.47
@@ -564,15 +564,6 @@
PFprop_key (R(n)->prop, n->sem.step.item))
union_ (n->prop->keys, n->sem.step.item_res);
- /* if child step is only a 'filter' (at most a single
- node for each context node) we can copy all keys */
- if (n->sem.step.spec.axis == alg_chld &&
- n->sem.step.spec.kind == node_kind_elem &&
- ! (PFQNAME_NS_WILDCARD (n->sem.step.spec.qname)
- || PFQNAME_LOC_WILDCARD (n->sem.step.spec.qname)) &&
- PFprop_key (R(n)->prop, n->sem.step.iter))
- union_ (n->prop->keys, n->sem.step.iter);
-
/* if attribute step is only a 'filter' (at most a single
attribute for each context node) we can copy all keys */
if (n->sem.step.spec.axis == alg_attr &&
@@ -622,15 +613,6 @@
union_ (n->prop->keys, n->sem.step.item_res);
}
- /* if child step is only a 'filter' (at most a single
- node for each context node) we can copy all keys */
- if (n->sem.step.spec.axis == alg_chld &&
- n->sem.step.spec.kind == node_kind_elem &&
- ! (PFQNAME_NS_WILDCARD (n->sem.step.spec.qname)
- || PFQNAME_LOC_WILDCARD (n->sem.step.spec.qname)) &&
- PFprop_key (R(n)->prop, n->sem.step.item))
- copy (n->prop->keys, R(n)->prop->keys);
-
/* if attribute step is only a 'filter' (at most a single
attribute for each context node) we can copy all keys */
if (n->sem.step.spec.axis == alg_attr &&
-------------------------------------------------------------------------
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
