Update of /cvsroot/monetdb/pathfinder/compiler/algebra/map
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26181/compiler/algebra/map
Modified Files:
Tag: xquery-decomposition
intro_proxy.c map_ori_names.c map_unq_names.c resolve_proxy.c
Log Message:
propagated changes of Friday 15 Feb 2008 - Monday Feb 18 2008
from the development trunk to the xquery-decomposition branch
Index: intro_proxy.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/intro_proxy.c,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -u -d -r1.31.2.1 -r1.31.2.2
--- intro_proxy.c 16 Feb 2008 01:02:09 -0000 1.31.2.1
+++ intro_proxy.c 18 Feb 2008 16:21:11 -0000 1.31.2.2
@@ -1655,8 +1655,7 @@
PFla_step_join (
L(step),
proxy_exit,
- step->sem.step.axis,
- step->sem.step.ty,
+ step->sem.step.spec,
step->sem.step.level,
item,
item_res),
@@ -1667,8 +1666,7 @@
PFla_guide_step_join (
L(step),
proxy_exit,
- step->sem.step.axis,
- step->sem.step.ty,
+ step->sem.step.spec,
step->sem.step.guide_count,
step->sem.step.guides,
step->sem.step.level,
Index: map_ori_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/map_ori_names.c,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -u -d -r1.26.2.2 -r1.26.2.3
--- map_ori_names.c 16 Feb 2008 01:02:09 -0000 1.26.2.2
+++ map_ori_names.c 18 Feb 2008 16:21:12 -0000 1.26.2.3
@@ -589,16 +589,14 @@
project (PROJ(RIGHT, p),
proj (iter, iter),
proj (item_out, item_in)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
iter,
item_out,
item_out);
} else
res = step (O(L(p)), PROJ(RIGHT, p),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
ONAME(p, p->sem.step.iter),
ONAME(p, p->sem.step.item),
@@ -608,8 +606,7 @@
case la_step_join:
res = step_join (O(L(p)),
SEC_PROJ(RIGHT, p, p->sem.step.item_res),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
ONAME(p, p->sem.step.item),
ONAME(p, p->sem.step.item_res));
@@ -634,8 +631,7 @@
project (PROJ(RIGHT, p),
proj (iter, iter),
proj (item_out, item_in)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
@@ -644,8 +640,7 @@
item_out);
} else
res = guide_step (O(L(p)), PROJ(RIGHT, p),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
@@ -657,8 +652,7 @@
case la_guide_step_join:
res = guide_step_join (O(L(p)),
SEC_PROJ(RIGHT, p, p->sem.step.item_res),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
Index: map_unq_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/map_unq_names.c,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -d -r1.25.2.2 -r1.25.2.3
--- map_unq_names.c 16 Feb 2008 01:02:09 -0000 1.25.2.2
+++ map_unq_names.c 18 Feb 2008 16:21:13 -0000 1.25.2.3
@@ -581,8 +581,7 @@
case la_step:
res = step (U(L(p)), U(R(p)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
UNAME(p, p->sem.step.iter),
/* unique name of input attribute item is
@@ -593,8 +592,7 @@
case la_step_join:
res = step_join (U(L(p)), U(R(p)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
UNAME(p, p->sem.step.item),
UNAME(p, p->sem.step.item_res));
@@ -602,8 +600,7 @@
case la_guide_step:
res = guide_step (U(L(p)), U(R(p)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
@@ -616,8 +613,7 @@
case la_guide_step_join:
res = guide_step_join (U(L(p)), U(R(p)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
Index: resolve_proxy.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/resolve_proxy.c,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- resolve_proxy.c 16 Feb 2008 01:02:09 -0000 1.10.2.1
+++ resolve_proxy.c 18 Feb 2008 16:21:13 -0000 1.10.2.2
@@ -115,8 +115,7 @@
PFalg_proj (join_att1, join_att2),
PFalg_proj (p->sem.step.item_res,
p->sem.step.item)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
join_att1,
p->sem.step.item_res,
@@ -129,8 +128,7 @@
PFalg_proj (join_att1, join_att2),
PFalg_proj (p->sem.step.item_res,
p->sem.step.item)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
-------------------------------------------------------------------------
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
