Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16:/tmp/cvs-serv23707/runtime
Modified Files:
pf_support.mx
Log Message:
... fast is good, correct is (even) better ...
made new PROC log2(any i) : int behave equally as
the old PROC log2(lng i) : int
i.e., turn log_2(i)+1 iso. log_2(i)
this makes the following tests work correctly, again:
benchmarks/MBench/qs31.xq
benchmarks/XMark/q03.xq
benchmarks/XMark/XRpc/q03.xq
benchmarks/XMark/mod/MIL/q03.xq
benchmarks/XMark/mod/XQ/q03.xq
benchmarks/XMark/opt/MIL/q03.xq
benchmarks/XMark/opt/XQ/q03.xq
tests/W3C_use_cases/XQ/STRING/Q5.xq
Peter,
could you please check, whether this fix/change still matches your intention
with
runtime/pf_support:
@@ -1667,7 +1660,7 @@
@= prefilter
cands := ws.fetch(PRE_SIZE).fetch(contID).mirror();
var pre_cont := ws.fetch(PRE_CONT).fetch(contID);
- if (is_constant(pre_cont)) {
+ if (is_constant(pre_cont) and (count(result_part_item) >
16*log2(count(cands)))) {
var qn_sel :=
ws.fetch(@2).fetch(bat2constant(pre_cont)).ord_uselect(@1);
if (isnil(CATCH(cands := ws_lookup(ws, contID,
qn_sel.mirror())))) {
var map_pid := ws.fetch(MAP_PID).fetch(contID);
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- pf_support.mx 18 Apr 2007 12:38:50 -0000 1.210
+++ pf_support.mx 19 Apr 2007 08:13:58 -0000 1.211
@@ -435,7 +435,7 @@
const sema_nil := sema(nil);
const timestamp_nil := timestamp(nil);
-PROC log2(any i) : int { return int(log(dbl(i))/M_LN2); }
+PROC log2(any i) : int { return int(log(dbl(i))/M_LN2) + 1; }
PROC addValues(bat[void,any::1] container, any::1 delta) : oid
{
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
