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

Modified Files:
        milgen.brg 
Log Message:
propagated changes of Tuesday Jun 17 2008 - Wednesday Jun 18 2008
from the XQuery_0-24 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/17 - tsheyar:
        compiler/mil/milgen.brg,1.157.2.18(XQuery_0-24,Stable_DailyBuild-18)
-- Fix serialization of mixed result sequences containing boolean values.
   (Thanks to Stefan Klinger for detecting the problem.)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/17 - boncz:
        runtime/pathfinder.mx,1.416.2.9(XQuery_0-24,Stable_DailyBuild-18)
check in correct branch (just in time for testing?)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/17 - boncz:
        runtime/pf_support.mx,1.299.2.6(XQuery_0-24,Stable_DailyBuild-18)
- bugfix in docsused (found during xrpc demo but unrelated to it)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/17 - boncz: runtime/xrpc/export/xrpc.html,1.4.6.3(XQuery_0-24)
- fix link in demo page
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/18 - stmane: benchmarks/Music/mod/MIL/Tests/All,1.1.18.2(XQuery_0-24)
        benchmarks/Music/mod/MIL/Tests/xq2mil.py,1.5.4.1(XQuery_0-24)
        benchmarks/Music/opt/MIL/Tests/All,1.1.18.2(XQuery_0-24)
        benchmarks/XMark/mod/MIL/Tests/All,1.1.18.2(XQuery_0-24)
        benchmarks/XMark/mod/MIL/Tests/xq2mil.py,1.5.4.1(XQuery_0-24)
        benchmarks/XMark/opt/MIL/Tests/All,1.1.18.2(XQuery_0-24)

after Peter's fix for
[ 1995879 ] algebra kills admin GUI
http://sourceforge.net/tracker/index.php?func=detail&aid=1995879&group_id=56967&atid=482468

When we ensure that XQuery modules are translates to MIL modules
using the (old) "milprint_summer" back-end (explicitly via `pf -M`),
we can run the respective tests also in case the (new) "Algebra" back-end
is used by default.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/18 - stmane: tests/BugTracker/Tests/All,1.102.2.6(XQuery_0-24)

after Peter's fix for
[ 1995879 ] algebra kills admin GUI
http://sourceforge.net/tracker/index.php?func=detail&aid=1995879&group_id=56967&atid=482468

these two tests using XRPC seem to work also when the Algebra back-end is 
default.

All other XRPC tests still FAIL when the Algebra back-end is default,
and hence remain disabled in the XQuery_0-24 release branch.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/18 - stmane: compiler/main.c,1.104.2.1(XQuery_0-24)
        runtime/pathfinder.mx,1.416.2.10(XQuery_0-24)
        tests/StandOff/basic/Tests/All,1.3.20.2(XQuery_0-24)
        tests/StandOff/parser/Tests/All,1.2.22.2(XQuery_0-24)
        tests/StandOff/update/Tests/All,1.1.16.2(XQuery_0-24)
        tests/StandOff/video/Tests/All,1.3.20.2(XQuery_0-24)

analogously to Peter's fix for
[ 1995879 ] algebra kills admin GUI
http://sourceforge.net/tracker/index.php?func=detail&aid=1995879&group_id=56967&atid=482468
that falls back to MPS for XRPC and cachable queries,
even if ALG is default:

For StandOff extensions, we no proceed as follows:
In case
(1) Pathfinder is configured with --with-default-backend=algebra AND
(2) StandOff extensions are enabled at runtime via
    `Mserver --set standoff=enabled` and/or `pf --enable-standoff` AND
(3) the Algebra back-end is NOT explicitly requested via
    `Mserver --set xquery_backend=algebra`, `pf -A`, or `mclient -G`
then,
Pathfinder automatically falls back to MPS
to enable support for the StandOff extensions.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


U milgen.brg
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- milgen.brg  16 Jun 2008 23:38:41 -0000      1.165
+++ milgen.brg  18 Jun 2008 17:32:39 -0000      1.166
@@ -3362,22 +3362,22 @@
                         sorted = true;
                     }
                     else {
+                        mvar_t *v = new_var (1);
                         execute (
+                            assgn (
+                                var (v->name),
+                                select2 (VAR (L(p)->env, pa_item, aat_bln),
+                                         cast (type (mty_bit), nil ()),
+                                         cast (type (mty_bit), nil ()))),
                             binsert (
                                 var (item->name),
-                                mcast (type (mty_oid),
-                                       VAR (L(p)->env, pa_item, aat_bln))),
+                                mcast (type (mty_oid), var (v->name))),
                             binsert (
                                 var (kind->name),
-                                project (select2 (VAR (L(p)->env,
-                                                       pa_item,
-                                                       aat_bln),
-                                                  cast (type (mty_bit),
-                                                        nil ()),
-                                                  cast (type (mty_bit),
-                                                        nil ())),
+                                project (var (v->name),
                                          var (PF_MIL_VAR_BOOL)))
                         );
+                        unpin (v, 1);
                     }
                 }
 


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