Changeset: f30ae497f2c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f30ae497f2c3
Modified Files:
pathfinder/compiler/algebra-m5sql/lalg2msa.c
Branch: default
Log Message:
The name "bind" is already used for sockets, so choose a different name.
diffs (74 lines):
diff -r 05da8d9dd82c -r f30ae497f2c3
pathfinder/compiler/algebra-m5sql/lalg2msa.c
--- a/pathfinder/compiler/algebra-m5sql/lalg2msa.c Wed Aug 11 01:34:41
2010 +0200
+++ b/pathfinder/compiler/algebra-m5sql/lalg2msa.c Tue Aug 10 17:17:36
2010 +0200
@@ -112,7 +112,7 @@
Put a selection and projection operator on top of the current
operator to 'materialize' changes in schema and predicates */
static void
-bind(PFla_op_t *n)
+bindop(PFla_op_t *n)
{
PFmsa_op_t *sel = PFmsa_op_select (OP(n), SEL_LIST(n));
PFmsa_op_t *prj = PFmsa_op_project (sel, false, PRJ_LIST(n));
@@ -157,7 +157,7 @@
PFalg_collist_t *collist;
/* bind node containing la DAG */
- bind(R(n));
+ bindop(R(n));
/* la_side_effects node will not be bound */
@@ -180,7 +180,7 @@
/* FIXME: NOT TESTED YET! */
/* bind node with la DAG */
- bind(R(n));
+ bindop(R(n));
/* la_side_effects node will not be bound */
@@ -280,8 +280,8 @@
case la_cross:
- bind(L(n));
- bind(R(n));
+ bindop(L(n));
+ bindop(R(n));
/* build operator and lists */
op = PFmsa_op_cross(OP(L(n)), OP(R(n)));
@@ -495,8 +495,8 @@
case la_disjunion:
- bind(L(n));
- bind(R(n));
+ bindop(L(n));
+ bindop(R(n));
/* build operator and lists */
op = PFmsa_op_union(OP (L(n)), OP (R(n)));
@@ -518,8 +518,8 @@
PFmsa_exprlist_t *exprlist;
PFmsa_expr_t *expr;
- bind(L(n));
- bind(R(n));
+ bindop(L(n));
+ bindop(R(n));
exprlist = el(n->schema.count);
@@ -549,8 +549,8 @@
case la_difference:
- bind(L(n));
- bind(R(n));
+ bindop(L(n));
+ bindop(R(n));
/* build operator and lists */
op = PFmsa_op_except(OP (L(n)), OP (R(n)));
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
