Update of /cvsroot/monetdb/pathfinder/compiler/algebra/opt
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26852/compiler/algebra/opt
Modified Files:
Tag: PF_ROX
opt_algebra_cse.c opt_general.brg
Log Message:
propagated changes of Tuesday Mar 25 2008 - Thursday Mar 27 2008
from the development trunk to the PF_ROX branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/25 - tsheyar: compiler/algebra/opt/opt_general.brg,1.49
-- More consistency checks.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/26 - tsheyar: compiler/algebra/planner.c,1.56
-- align physical planning for attribute steps
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/26 - tsheyar: compiler/algebra/opt/opt_algebra_cse.c,1.29
-- Fixed indexing bug (i -> j).
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/26 - tsheyar: compiler/algebra/opt/opt_general.brg,1.50
-- Fixed bug in brg-based optimization.
(Added missing state-label assignments for new logical operators.)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/26 - tsheyar: compiler/algebra/prop/prop_key.c,1.43
-- Use the correct boolean test to check for guide nodes.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/26 - tsheyar: compiler/algebra/logical.c,1.87
compiler/algebra/physical.c,1.63 compiler/algebra/prop/prop_ocol.c,1.54
-- Prepare {ancestor-or-|descendant-or-|}self steps in the algebra
for attribute context nodes.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/26 - tsheyar: compiler/algebra/load_stats.c,1.14
compiler/algebra/prop/prop_guide.c,1.26
compiler/include/load_stats.h,1.6
-- Extended guide loading to cope with QNames (instead of strings).
-- Cleaned up and simplified guide property inference.
-- Extended guide property inference. (QName support; Steps evaluated
on the guide without result nodes now get an empty guide mapping
---instead of no mapping.)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/26 - tsheyar: compiler/algebra/opt/opt_general.brg,1.51
-- Fix last check-in.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/27 - tsheyar: compiler/algebra/prop/prop_key.c,1.44
-- Fixed wrong property inference (-- we cannot get a key out of nowhere).
-- Extended property inference for positional selections to compensate the
``restriction'' for the above fix.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U opt_general.brg
Index: opt_general.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_general.brg,v
retrieving revision 1.45.4.2
retrieving revision 1.45.4.3
diff -u -d -r1.45.4.2 -r1.45.4.3
--- opt_general.brg 18 Feb 2008 16:57:18 -0000 1.45.4.2
+++ opt_general.brg 27 Mar 2008 11:20:21 -0000 1.45.4.3
@@ -468,6 +468,7 @@
*p = *PFla_lit_tbl_ (PFalg_attlist_ (acount, atts), tcount,
tuples);
SEEN(p) = false;
+ label (p);
} break;
/* Rel: cross (lit_tbl, lit_tbl) */
@@ -663,6 +664,7 @@
*p = *PFla_lit_tbl_ (PFalg_attlist_ (acount, atts), tcount,
tuples);
SEEN(p) = false;
+ label (p);
} break;
/* Rel: select_ (Rel) */
@@ -879,6 +881,7 @@
*p = *PFla_lit_tbl_ (PFalg_attlist_ (acount, atts), tcount,
tuples);
SEEN(p) = false;
+ label (p);
} break;
/* Rel: disjunion (EmptyRel, Rel) */
@@ -1170,7 +1173,7 @@
*/
*p = *PFla_empty_tbl_ (p->schema);
SEEN(p) = true;
- relabel (p, kids);
+ label (p);
} break;
default:
@@ -1271,6 +1274,7 @@
}
assert (STATE_LABEL (p));
+ assert (0 <= STATE_LABEL (p) && STATE_LABEL (p) <=
PFopt_general_Max_state);
assert (counter <= 50 &&
"tree relabeling in general optimization phase " &&
@@ -1333,6 +1337,7 @@
SEEN(p) = true;
assert (STATE_LABEL (p));
+ assert (0 <= STATE_LABEL (p) && STATE_LABEL (p) <=
PFopt_general_Max_state);
}
/**
U opt_algebra_cse.c
Index: opt_algebra_cse.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_algebra_cse.c,v
retrieving revision 1.11.4.6
retrieving revision 1.11.4.7
diff -u -d -r1.11.4.6 -r1.11.4.7
--- opt_algebra_cse.c 21 Mar 2008 13:31:39 -0000 1.11.4.6
+++ opt_algebra_cse.c 27 Mar 2008 11:20:18 -0000 1.11.4.7
@@ -139,16 +139,16 @@
/**
* maps original subtrees to their corresponding cse subtrees
*/
-PFarray_t *cse_map;
+static PFarray_t *cse_map;
/**
*maps ori subtrees to their corresponding actual attributes
*/
-PFarray_t *actatt_map;
+static PFarray_t *actatt_map;
/**
* maps cse subtrees to their original subtrees, triggered the
* creation of the cse node
*/
-PFarray_t *ori_map;
+static PFarray_t *ori_map;
/**
* Subexpressions that we already saw.
@@ -1283,7 +1283,7 @@
* if we want to use a column twice */
for (unsigned int j = 0; j < PFarray_last (seen); j++)
if (littbl2->schema.items[i].name ==
- *((PFalg_att_t *)PFarray_at (seen, i)))
+ *((PFalg_att_t *)PFarray_at (seen, j)))
match = true;
if (match) continue;
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
