Update of /cvsroot/monetdb/pathfinder/compiler/algebra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29815/compiler/algebra
Modified Files:
Tag: xquery-decomposition
algebra_cse.c logical.c
Log Message:
propagated changes of Saturday Feb 16 2008 - Monday Feb 18 2008
from the development trunk to the xquery-decomposition branch
Index: algebra_cse.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/algebra_cse.c,v
retrieving revision 1.65.2.2
retrieving revision 1.65.2.3
diff -u -d -r1.65.2.2 -r1.65.2.3
--- algebra_cse.c 18 Feb 2008 16:21:05 -0000 1.65.2.2
+++ algebra_cse.c 19 Feb 2008 10:39:40 -0000 1.65.2.3
@@ -347,7 +347,7 @@
case la_guide_step_join:
if (a->sem.step.spec.axis != b->sem.step.spec.axis
|| a->sem.step.spec.kind != b->sem.step.spec.kind
- || !PFqname_eq (a->sem.step.spec.qname, b->sem.step.spec.qname)
+ || PFqname_eq (a->sem.step.spec.qname, b->sem.step.spec.qname)
|| a->sem.step.guide_count != b->sem.step.guide_count
|| a->sem.step.level != b->sem.step.level
|| a->sem.step.iter != b->sem.step.iter
Index: logical.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/logical.c,v
retrieving revision 1.75.2.4
retrieving revision 1.75.2.5
diff -u -d -r1.75.2.4 -r1.75.2.5
--- logical.c 18 Feb 2008 16:21:09 -0000 1.75.2.4
+++ logical.c 19 Feb 2008 10:39:40 -0000 1.75.2.5
@@ -986,13 +986,11 @@
/* see if we have duplicate attributes now */
for (j = 0; j < i; j++)
- if (ret->sem.proj.items[i].new == ret->sem.proj.items[j].new) {
- fprintf (stderr, "foo\n");
+ if (ret->sem.proj.items[i].new == ret->sem.proj.items[j].new)
PFoops (OOPS_FATAL,
"projection results in duplicate attribute `%s' "
"(attributes %i and %i)",
PFatt_str (ret->sem.proj.items[i].new), i+1, j+1);
- }
}
return ret;
-------------------------------------------------------------------------
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
