Update of /cvsroot/monetdb/pathfinder/compiler/algebra/opt
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6096/algebra/opt
Modified Files:
opt_complex.c
Log Message:
-- get rid of unique name references to decide the applicability of rewrites
U opt_complex.c
Index: opt_complex.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_complex.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- opt_complex.c 10 Jun 2008 09:20:16 -0000 1.48
+++ opt_complex.c 18 Jun 2008 11:15:21 -0000 1.49
@@ -550,12 +550,14 @@
/* discard join attributes as one of them always remains */
for (unsigned int i = 0; i < L(p)->schema.count; i++) {
left_arg_req = left_arg_req ||
- (PFprop_unq_name (
- L(p)->prop,
- L(p)->schema.items[i].name) !=
- PFprop_unq_name (
- p->prop,
- p->sem.eqjoin.att1) &&
+ (!PFprop_subdom (
+ p->prop,
+ PFprop_dom_left (
+ p->prop,
+ p->sem.eqjoin.att1),
+ PFprop_dom_left (
+ p->prop,
+ L(p)->schema.items[i].name)) &&
PFprop_icol (
p->prop,
L(p)->schema.items[i].name));
@@ -594,12 +596,14 @@
/* discard join attributes as one of them always remains */
for (unsigned int i = 0; i < R(p)->schema.count; i++) {
right_arg_req = right_arg_req ||
- (PFprop_unq_name (
- R(p)->prop,
- R(p)->schema.items[i].name) !=
- PFprop_unq_name (
- p->prop,
- p->sem.eqjoin.att2) &&
+ (!PFprop_subdom (
+ p->prop,
+ PFprop_dom_right (
+ p->prop,
+ p->sem.eqjoin.att2),
+ PFprop_dom_right (
+ p->prop,
+ R(p)->schema.items[i].name)) &&
PFprop_icol (
p->prop,
R(p)->schema.items[i].name));
@@ -1466,12 +1470,9 @@
PFla_op_t *
PFalgopt_complex (PFla_op_t *root)
{
- /* Infer key, icols, domain, and unique names
- properties first */
- PFprop_infer_unq_names (root);
- /* already inferred by PFprop_infer_unq_names
+ /* Infer key, icols, domain, reqval,
+ and refctr properties first */
PFprop_infer_key (root);
- */
PFprop_infer_level (root);
PFprop_infer_icol (root);
PFprop_infer_set (root);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
