Update of /cvsroot/monetdb/pathfinder/compiler/debug
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20677/compiler/debug
Modified Files:
Tag: PF_ROX
logdebug.c physdebug.c
Log Message:
propagated changes of Friday May 30 2008 - Saturday May 31 2008
from the development trunk to the PF_ROX branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/30 - mayrm: compiler/algebra/builtins.c,1.97(Current_DailyBuild-31)
compiler/algebra/logical.c,1.100(Current_DailyBuild-31)
compiler/debug/logdebug.c,1.102(Current_DailyBuild-31)
compiler/include/algebra.h,1.87(Current_DailyBuild-31)
compiler/include/builtins.h,1.51(Current_DailyBuild-31)
compiler/semantics/xquery_fo.c,1.162(Current_DailyBuild-31)
compiler/sql/lalg2sql.brg,1.134(Current_DailyBuild-31)
Implementation for ``fn:node-name($arg as node()?) as xs:QName?'',
which forms the backbone of
- fn:name (),
- fn:local_name() and
- fn:namespace_uri ().
doc_access-operator now has another accessor ``doc_QName'',
which supports access to the QName. ``doc_QName'' is not supported
by the MIL translation, yet.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/31 - stmane: compiler/algebra/physical.c,1.71(Current_DailyBuild-31)
compiler/algebra/planner.c,1.64(Current_DailyBuild-31)
compiler/algebra/opt/opt_complex.c,1.46(Current_DailyBuild-31)
compiler/debug/physdebug.c,1.63(Current_DailyBuild-31)
propagated changes of Friday May 30 2008 - Saturday May 31 2008
from the XQuery_0-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/30 - tsheyar:
compiler/debug/physdebug.c,1.62.2.1(XQuery_0-24,xrpcdemo_sync,Stable_DailyBuild-31)
-- Only print properties if we really have them (fixes a segfault).
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/30 - tsheyar:
compiler/algebra/physical.c,1.69.2.2(XQuery_0-24,Stable_DailyBuild-31)
-- doc_tbl is trivially sorted for inputs of cardinality 1.
(This change avoids the planning of a physical sort operator.)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/30 - tsheyar:
compiler/algebra/planner.c,1.62.2.2(XQuery_0-24,Stable_DailyBuild-31)
-- add missing physical implementation for the step_join operator.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/30 - tsheyar:
compiler/algebra/opt/opt_complex.c,1.45.2.1(XQuery_0-24,Stable_DailyBuild-31)
-- performance fix for step_joins.
(Merge step_join pair implementing descendant-or-self::node()/child::___
into a single step_join descendant::___.)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/31 - stmane: compiler/algebra/planner.c,1.62.2.3(XQuery_0-24)
fixed compilation: removed unused variable
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U logdebug.c
Index: logdebug.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/debug/logdebug.c,v
retrieving revision 1.89.2.7
retrieving revision 1.89.2.8
diff -u -d -r1.89.2.7 -r1.89.2.8
--- logdebug.c 30 May 2008 12:42:51 -0000 1.89.2.7
+++ logdebug.c 31 May 2008 11:45:14 -0000 1.89.2.8
@@ -873,6 +873,9 @@
case doc_pi_text:
PFarray_printf (dot, "processing instruction");
break;
+ case doc_qname:
+ PFarray_printf (dot, "qname");
+ break;
default: PFoops (OOPS_FATAL,
"unknown document access in dot output");
}
U physdebug.c
Index: physdebug.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/debug/physdebug.c,v
retrieving revision 1.50.2.7
retrieving revision 1.50.2.8
diff -u -d -r1.50.2.7 -r1.50.2.8
--- physdebug.c 22 May 2008 08:48:32 -0000 1.50.2.7
+++ physdebug.c 31 May 2008 11:45:16 -0000 1.50.2.8
@@ -658,6 +658,45 @@
fmt = prop_args;
while (*fmt) {
+ if (*fmt == '+' || *fmt == 'c') {
+ PFarray_printf (dot, "\\ncost: %lu", n->cost);
+ }
+ if (*fmt == '+' || *fmt == 'o') {
+ PFarray_printf (dot, "\\norderings:");
+ for (unsigned int i = 0;
+ i < PFarray_last (n->orderings); i++)
+ PFarray_printf (
+ dot, "\\n%s",
+ PFord_str (
+ *(PFord_ordering_t *)
+ PFarray_at (n->orderings,i)));
+ }
+
+ /* stop after all properties have been printed */
+ if (*fmt == '+')
+ break;
+ else
+ fmt++;
+ }
+ }
+ if (prop_args && n->prop) {
+
+ char *fmt = prop_args;
+ /* format character '+' overwrites all others */
+ bool all = false;
+ while (*fmt) {
+ if (*fmt == '+') {
+ all = true;
+ break;
+ }
+ fmt++;
+ }
+ /* iterate over all format characters
+ if we haven't found a '+' character */
+ if (!all)
+ fmt = prop_args;
+
+ while (*fmt) {
if (*fmt == '+' || *fmt == 'A') {
/* if present print cardinality */
if (PFprop_card (n->prop))
@@ -883,19 +922,6 @@
}
}
}
- if (*fmt == '+' || *fmt == 'c') {
- PFarray_printf (dot, "\\ncost: %lu", n->cost);
- }
- if (*fmt == '+' || *fmt == 'o') {
- PFarray_printf (dot, "\\norderings:");
- for (unsigned int i = 0;
- i < PFarray_last (n->orderings); i++)
- PFarray_printf (
- dot, "\\n%s",
- PFord_str (
- *(PFord_ordering_t *)
- PFarray_at (n->orderings,i)));
- }
/* stop after all properties have been printed */
if (*fmt == '+')
-------------------------------------------------------------------------
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
