Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5807/runtime
Modified Files:
pathfinder.mx
Log Message:
propagated changes of Monday Jun 16 2008 - Tuesday Jun 17 2008
from the XQuery_0-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/16 - tsheyar:
compiler/mil/milgen.brg,1.157.2.17(XQuery_0-24,Stable_DailyBuild-17)
-- 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.)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/16 - stmane: configure.ag,1.130.2.2(XQuery_0-24,Stable_DailyBuild-17)
NT/rules.msc,1.31.2.2(XQuery_0-24,Stable_DailyBuild-17)
[finally]
changing compilation default for Pathfinder
for the old "milprint_summer" to the new "Algebra" back-end.
Still to do (tomorrow):
check testing results carefully and
approve new attribute order in stable output
where ever necessary.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/16 - stmane:
benchmarks/X007/Tests/q19.stable.out,1.1.18.1(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/X007/Tests/q19.stable.out.Algebra,1.1.4.1(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/DC/MD/Tests/q03.stable.out,1.2.10.1(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/DC/MD/Tests/q03.stable.out.Algebra,1.2.6.1(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/DC/SD/Tests/q03.stable.out,1.2.10.1(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/DC/SD/Tests/q03.stable.out.Algebra,1.2.6.1(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/TC/MD/Tests/q03.stable.out,1.2.10.1(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/TC/MD/Tests/q03.stable.out.Algebra,1.2.6.1(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/TC/SD/Tests/q03.stable.out,1.2.10.1(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/TC/SD/Tests/q03.stable.out.Algebra,1.2.6.1(XQuery_0-24,Stable_DailyBuild-17)
[ AUT 0 : 1 GER ]
approved the first stable outputs
according to default back-end change:
basically swapped MPS & ALG output
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/16 - stmane:
runtime/pathfinder.mx,1.416.2.8(XQuery_0-24,Stable_DailyBuild-17)
fixed bug in runtime back-end choice
in case compilation default is "algebra"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/16 - stmane:
benchmarks/X007/Tests/q19.stable.out,1.1.18.2(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/X007/Tests/q19.stable.out.Algebra,1.1.4.2(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/DC/MD/Tests/q03.stable.out,1.2.10.2(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/DC/MD/Tests/q03.stable.out.Algebra,1.2.6.2(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/DC/SD/Tests/q03.stable.out,1.2.10.2(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/DC/SD/Tests/q03.stable.out.Algebra,1.2.6.2(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/TC/MD/Tests/q03.stable.out,1.2.10.2(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/TC/MD/Tests/q03.stable.out.Algebra,1.2.6.2(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/TC/SD/Tests/q03.stable.out,1.2.10.2(XQuery_0-24,Stable_DailyBuild-17)
benchmarks/XBench/TC/SD/Tests/q03.stable.out.Algebra,1.2.6.2(XQuery_0-24,Stable_DailyBuild-17)
Reverting my previous output approval:
With my latest fix of the runtime back-end choice,
the output (luckily) matches the original output, again.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U pathfinder.mx
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -d -r1.420 -r1.421
--- pathfinder.mx 10 Jun 2008 09:22:16 -0000 1.420
+++ pathfinder.mx 16 Jun 2008 23:38:41 -0000 1.421
@@ -4367,8 +4367,8 @@
(GDKgetenv("xquery_backend") != NULL) &&
(strcmp(GDKgetenv("xquery_backend"),"algebra") == 0)))
options |= COMPILE_OPTION_ALGEBRA;
#else /* ALGEBRA_IS_DEFAULT */
- if (((ctx->mode & XQ_MILPRINT_SUMMER) != 0) && \
- (((ctx->mode & XQ_ALGEBRA) == 0) || \
+ if (((ctx->mode & XQ_MILPRINT_SUMMER) == 0) && \
+ (((ctx->mode & XQ_ALGEBRA) != 0) || \
(GDKgetenv("xquery_backend") == NULL) ||
(strcmp(GDKgetenv("xquery_backend"),"milprint_summer") != 0)))
options |= COMPILE_OPTION_ALGEBRA;
#endif
-------------------------------------------------------------------------
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
