Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29129/compiler/algebra/prop
Modified Files:
Tag: PF_ROX
prop_key.c
Log Message:
propagated changes of Thursday May 22 2008 - Saturday May 24 2008
from the development trunk to the PF_ROX branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/22 - sjoerd:
runtime/pf_support.mx,1.299(Current_DailyBuild-24,Current_DailyBuild-23)
Fixed some type punning problems.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - sjoerd: NT/Makefile,1.20(Current_DailyBuild-24)
NT/MonetDB4-XQuery/MonetDB4-XQuery64.sln,1.1(Stable_DailyBuild-24,Current_DailyBuild-24)
NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj,1.1(Stable_DailyBuild-24,Current_DailyBuild-24)
Added 64 bit Windows installer.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - sjoerd:
NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj,1.3(Stable_DailyBuild-24,Current_DailyBuild-24)
Use registry to store where the product is installed.
This means you only get to choose the location in MonetDB-Common.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - tsheyar:
compiler/algebra/prop/prop_key.c,1.47(Current_DailyBuild-24)
-- some recently added property inference (for path steps) was to optimistic.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - tsheyar:
compiler/semantics/subtyping.c,1.48(Current_DailyBuild-24)
-- Complete the hierarchy information (integer <-> decimal) for disjoint types.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - lsidir: compiler/algebra/physical.c,1.69(Current_DailyBuild-24)
compiler/algebra/planner.c,1.62(Current_DailyBuild-24)
compiler/include/physical.h,1.45(Current_DailyBuild-24)
compiler/mil/milgen.brg,1.157(Current_DailyBuild-24)
compiler/mil/milprint.c,1.78(Current_DailyBuild-24)
implementation for id/idref...
works only for elements for now, but I wanted to commit before the branching.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U prop_key.c
Index: prop_key.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_key.c,v
retrieving revision 1.37.4.6
retrieving revision 1.37.4.7
diff -u -d -r1.37.4.6 -r1.37.4.7
--- prop_key.c 22 May 2008 08:48:32 -0000 1.37.4.6
+++ prop_key.c 24 May 2008 10:51:32 -0000 1.37.4.7
@@ -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
