Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3194/mil

Modified Files:
      Tag: XQuery_0-24
        milgen.brg 
Log Message:
-- try to avoid runtime errors for merged_union:

   If we infer in the physical algebra that something is ordered than
   we can also tell it the runtime. (In case there is a bug in the property
   inference debugmask -d8 will show it the problem at the correct place.)


U milgen.brg
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.157.2.16
retrieving revision 1.157.2.17
diff -u -d -r1.157.2.16 -r1.157.2.17
--- milgen.brg  13 Jun 2008 14:01:48 -0000      1.157.2.16
+++ milgen.brg  16 Jun 2008 14:44:45 -0000      1.157.2.17
@@ -4196,8 +4196,8 @@
                         " in the merge-union translation for MIL");
 
             /* first two arguments of merged_union() are the grouping atts */
-            args = arg (VAR (L(p)->env, grp_att, grp_ty),
-                        VAR (R(p)->env, grp_att, grp_ty));
+            args = arg (assert_order (VAR (L(p)->env, grp_att, grp_ty)),
+                        assert_order (VAR (R(p)->env, grp_att, grp_ty)));
 
             for (unsigned int i = 0; i < p->schema.count; i++)
                 if (p->schema.items[i].name != grp_att)


-------------------------------------------------------------------------
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

Reply via email to