Update of /cvsroot/monetdb/pathfinder/compiler/algebra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18847/compiler/algebra
Modified Files:
Tag: xquery-decomposition
algebra.c core2alg.brg
Log Message:
propagated changes of Thursday Feb 21 2008 - Friday Feb 22 2008
from the development trunk to the xquery-decomposition branch
Index: core2alg.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/core2alg.brg,v
retrieving revision 1.60.2.3
retrieving revision 1.60.2.4
diff -u -d -r1.60.2.3 -r1.60.2.4
--- core2alg.brg 18 Feb 2008 16:21:07 -0000 1.60.2.3
+++ core2alg.brg 22 Feb 2008 13:26:02 -0000 1.60.2.4
@@ -2691,14 +2691,16 @@
/* ------------------- LOOP ------------------- */
- /* for strategy IFP we do not need to update the
- loop relation ... */
- if (strategy == IFP || strategy == IFP_OR_DELTA || !loop_used) {
+ /* In case the loop relation was not used
+ we don't need the recursion parameter */
+ if (!loop_used) {
loop_rec_param = res_rec_param;
-
- /* ... instead we have to make sure that the 'real'
- loop relation is used already at the beginning */
- *LOOP = *old_loop;
+ } else if (strategy == IFP || strategy == IFP_OR_DELTA) {
+ /* for IFP the loop doesn't change */
+ loop_rec_param = rec_param (rec_arg (old_loop,
+ base_loop,
+ base_loop),
+ res_rec_param);
} else {
/* update the loop relation after the recursion body
has been processed ... */
Index: algebra.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/algebra.c,v
retrieving revision 1.66.2.4
retrieving revision 1.66.2.5
diff -u -d -r1.66.2.4 -r1.66.2.5
--- algebra.c 18 Feb 2008 16:21:05 -0000 1.66.2.4
+++ algebra.c 22 Feb 2008 13:26:01 -0000 1.66.2.5
@@ -935,7 +935,7 @@
if (att & (1 << 3)) {
unsigned int id = att >> 4;
size_t len = sizeof ("iter0000");
- char *res = PFmalloc (len);
+ char *res = PFmalloc (len+1);
assert (id < 10000);
-------------------------------------------------------------------------
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
