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

Modified Files:
        logdebug.c physdebug.c 
Log Message:
propagated changes of Friday Jun 13 2008 - Monday Jun 16 2008
from the XQuery_0-24 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/13 - tsheyar: compiler/algebra/prop/prop_trace_names.c,1.23.2.1
-- Try to fix bug #1991938 XQ: iter in join

   During name tracing keep conflicting names until the end as a projection
   may map them shortly before the last operator into the same column name.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/13 - tsheyar: compiler/debug/logdebug.c,1.100.2.3
        compiler/debug/physdebug.c,1.62.2.2 compiler/mil/milgen.brg,1.157.2.16
-- small fixes
   - do not address the static column name in MIL generation
     (for the fun_call operator the order of the schema stays fixed)
   - fun_call operators without QNames should not result in a segfault
     during debug printing
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/13 - tsheyar: compiler/algebra/map/map_ori_names.c,1.33.2.3
-- avoid double memory allocation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


U logdebug.c
Index: logdebug.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/debug/logdebug.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- logdebug.c  5 Jun 2008 09:20:02 -0000       1.103
+++ logdebug.c  16 Jun 2008 09:30:47 -0000      1.104
@@ -934,10 +934,15 @@
             break;
 
         case la_fun_call:
-            PFarray_printf (dot,
-                            "%s function \\\"%s\\\" (",
-                            PFalg_fun_call_kind_str (n->sem.fun_call.kind),
-                            PFqname_uri_str (n->sem.fun_call.qname));
+            if (PFqname_loc (n->sem.fun_call.qname))
+                PFarray_printf (dot,
+                                "%s function \\\"%s\\\" (",
+                                PFalg_fun_call_kind_str (n->sem.fun_call.kind),
+                                PFqname_uri_str (n->sem.fun_call.qname));
+            else
+                PFarray_printf (dot,
+                                "%s function (",
+                                PFalg_fun_call_kind_str 
(n->sem.fun_call.kind));
             for (unsigned int i = 0; i < n->schema.count; i++)
                 PFarray_printf (dot, "%s%s",
                                 i?", ":"",

U physdebug.c
Index: physdebug.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/debug/physdebug.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- physdebug.c 31 May 2008 05:28:10 -0000      1.63
+++ physdebug.c 16 Jun 2008 09:30:48 -0000      1.64
@@ -598,10 +598,15 @@
             break;
 
         case pa_fun_call:
-            PFarray_printf (dot,
-                            "%s function \\\"%s\\\" (",
-                            PFalg_fun_call_kind_str (n->sem.fun_call.kind),
-                            PFqname_uri_str (n->sem.fun_call.qname));
+            if (PFqname_loc (n->sem.fun_call.qname))
+                PFarray_printf (dot,
+                                "%s function \\\"%s\\\" (",
+                                PFalg_fun_call_kind_str (n->sem.fun_call.kind),
+                                PFqname_uri_str (n->sem.fun_call.qname));
+            else
+                PFarray_printf (dot,
+                                "%s function (",
+                                PFalg_fun_call_kind_str 
(n->sem.fun_call.kind));
             for (unsigned int i = 0; i < n->schema.count; i++)
                 PFarray_printf (dot, "%s%s",
                                 i?", ":"",


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