Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9810/compiler/algebra/prop
Modified Files:
prop_icol.c prop_reqval.c prop_unq_names.c
Log Message:
propagated changes of Friday 15 Feb 2008 - Monday Feb 18 2008
from the XQuery_0-22 branch to the development trunk
Note there were conflicts in compiler/algebra/opt_algebra_cse.c. Jan
and Manuel, please fight it out.
Index: prop_unq_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_unq_names.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- prop_unq_names.c 15 Feb 2008 12:15:59 -0000 1.30
+++ prop_unq_names.c 18 Feb 2008 15:54:42 -0000 1.31
@@ -247,7 +247,7 @@
argument are replaced by the overall join column name
and all columns that are also referenced on the other
side will be renamed by introducing a new unique name.
- All other column stay unchanged. */
+ All other columns stay unchanged. */
for (unsigned int i = 0; i < L(n)->schema.count; i++) {
ori = L(n)->schema.items[i].name;
child_unq = PFprop_unq_name (L(n)->prop, ori);
@@ -271,6 +271,8 @@
add_name_pair (np_list, ori, unq);
}
+ else if (child_unq == att2_unq)
+ add_name_pair (np_list, ori, PFalg_unq_name (ori, id++));
else
add_name_pair (np_list, ori, child_unq);
@@ -300,6 +302,8 @@
add_name_pair (np_list, ori, unq);
}
+ else if (child_unq == att1_unq)
+ add_name_pair (np_list, ori, PFalg_unq_name (ori, id++));
else
add_name_pair (np_list, ori, child_unq);
Index: prop_icol.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_icol.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- prop_icol.c 15 Feb 2008 12:15:58 -0000 1.34
+++ prop_icol.c 18 Feb 2008 15:54:42 -0000 1.35
@@ -49,7 +49,7 @@
bool
PFprop_icol (const PFprop_t *prop, PFalg_att_t attr)
{
- return prop->icols & attr;
+ return prop->icols & attr ? true : false;
}
/**
@@ -59,7 +59,7 @@
bool
PFprop_icol_left (const PFprop_t *prop, PFalg_att_t attr)
{
- return prop->l_icols & attr;
+ return prop->l_icols & attr ? true : false;
}
/**
@@ -69,7 +69,7 @@
bool
PFprop_icol_right (const PFprop_t *prop, PFalg_att_t attr)
{
- return prop->r_icols & attr;
+ return prop->r_icols & attr ? true : false;
}
/**
Index: prop_reqval.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_reqval.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- prop_reqval.c 15 Feb 2008 12:15:59 -0000 1.38
+++ prop_reqval.c 18 Feb 2008 15:54:42 -0000 1.39
@@ -51,7 +51,7 @@
#define EDGE(n) ((n)->refctr)
#define empty_list 0
-#define in(a,b) ((a) & (b))
+#define in(a,b) ((a) & (b) ? true : false)
/**
* Test if @a attr is in the list of required value columns
-------------------------------------------------------------------------
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
