Update of /cvsroot/monetdb/pathfinder/benchmarks/XBench/TC/SD/Tests
In directory sc8-pr-cvs16:/tmp/cvs-serv1709/benchmarks/XBench/TC/SD/Tests

Modified Files:
        All 
Added Files:
        q02alg.py.src q02alg.stable.err q02alg.stable.out 
        q02alg.xq.in.src 
Log Message:

Fixing BUG #1611545 "XQ: wrong path step result (duplicates)"

loop-lifted child implementation did not properly cope with the case 
that the same item (context node) occurs more than once for the same iter,
i.e., in case [iter,item] ([iter,ctx]) is not a set (i.e., contains duplicates).

Fix: avoid producing duplicates in such cases in ll_child result generation.

ToDo:
Can we do this more efficiently, e.g.,
by upfront ensuring that [iter,item] ([iter,ctx])
is a set, i.e., duplicate free??


Added tests in
benchmarks/XBench/TC/SD/Tests/q02alg.*
benchmarks/XBench/TC/MD/Tests/q17alg.*


--- NEW FILE: q02alg.xq.in.src ---
$TSTSRCDIR/q02.xq.in

Index: All
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/benchmarks/XBench/TC/SD/Tests/All,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- All 14 Oct 2006 17:29:51 -0000      1.1
+++ All 6 May 2007 12:51:07 -0000       1.2
@@ -3,6 +3,7 @@
 count_nodes
 q01
 q02
+q02alg
 q03
 q04
 q05

--- NEW FILE: q02alg.py.src ---
$TSTSRCBASE/tests/alg.py

--- NEW FILE: q02alg.stable.err ---
stderr of test 'q02alg` in directory 'benchmarks/XBench/TC/SD` itself:


# 09:39:06 >  
# 09:39:06 >  Mtimeout -timeout 180 Mserver 
"--config=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/etc/MonetDB.conf"
 --debug=10 --set 
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./PATHFINDER/lib64/MonetDB:/ufs/manegold/_/scratch0/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./PATHFINDER/lib64/MonetDB/lib:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/lib64/MonetDB:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/lib64/MonetDB/lib:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/lib64/MonetDB/bin"
 --set "gdk_dbfarm=/net/corona.ins.cwi.nl/exp
 
ort/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/var/MonetDB/dbfarm"
 --set 
"sql_logdir=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/var/MonetDB/log"
 --set mapi_port=39481 --set monet_prompt= --trace 
"--dbname=mTests_benchmarks_XBench_TC_SD" --dbinit="module(pathfinder); 
pfstart();" ; echo ; echo Over..
# 09:39:06 >  

# builtin opt   config = ${prefix}/etc/MonetDB.conf
# builtin opt   gdk_arch = 64bitx86_64-redhat-linux-gnu
# builtin opt   gdk_version = 4.13.1
# builtin opt   monet_pid = 10613
# builtin opt   prefix = 
/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB
# builtin opt   exec_prefix = ${prefix}
# builtin opt   gdk_dbname = tst
# builtin opt   gdk_dbfarm = ${prefix}/var/MonetDB
# builtin opt   gdk_debug = 8
# builtin opt   gdk_mem_bigsize = 262144
# builtin opt   gdk_vm_minsize = 137438953472
# builtin opt   gdk_alloc_map = yes
# builtin opt   monet_admin = adm
# builtin opt   monet_prompt = >
# builtin opt   monet_welcome = yes
# builtin opt   monet_mod_path = ${prefix}/lib64/MonetDB:${prefix}/lib64/bin
# builtin opt   monet_daemon = yes
# builtin opt   host = localhost
# builtin opt   mapi_port = 50000
# builtin opt   mapi_noheaders = no
# builtin opt   mapi_debug = 0
# builtin opt   mapi_clients = 2
# builtin opt   sql_debug = 0
# builtin opt   sql_logdir = ${prefix}/var/MonetDB/log
# config opt    prefix = 
/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB
# config opt    exec_prefix = ${prefix}
# config opt    gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
# config opt    gdk_dbname = demo
# config opt    gdk_alloc_map = no
# config opt    gdk_embedded = no
# config opt    gdk_debug = 0
# config opt    monet_admin = adm
# config opt    monet_prompt = MonetDB>
# config opt    monet_welcome = yes
# config opt    monet_mod_path = 
${prefix}/lib64/MonetDB:${prefix}/lib64/MonetDB/lib:${prefix}/lib64/MonetDB/bin
# config opt    monet_daemon = no
# config opt    mapi_port = 50000
# config opt    mapi_debug = 0
# config opt    sql_debug = 0
# config opt    sql_logdir = ${prefix}/var/MonetDB/log
# config opt    pf_httpd_port = 48080
# config opt    xquery_output = xml
# config opt    xquery_cacheMB = 100
# cmdline opt   config = 
/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/etc/MonetDB.conf
# cmdline opt   gdk_debug = 10
# cmdline opt   monet_mod_path = 
/ufs/manegold/_/scratch0/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./PATHFINDER/lib64/MonetDB:/ufs/manegold/_/scratch0/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./PATHFINDER/lib64/MonetDB/lib:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/lib64/MonetDB:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/lib64/MonetDB/lib:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/lib64/MonetDB/bin
# cmdline opt   gdk_dbfarm = 
/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/var/MonetDB/dbfarm
# cmdline opt   sql_logdir = 
/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/var/MonetDB/log
# cmdline opt   mapi_port = 39481
# cmdline opt   monet_prompt = 
# cmdline opt   gdk_dbname = mTests_benchmarks_XBench_TC_SD

# 09:39:07 >  
# 09:39:07 >  Mtimeout -timeout 60 MapiClient -lxquery -oxml -umonetdb 
-Pmonetdb --host=localhost --port=39481 q02alg.xq
# 09:39:07 >  


# 09:39:08 >  
# 09:39:08 >  Done.
# 09:39:08 >  


--- NEW FILE: q02alg.stable.out ---
stdout of test 'q02alg` in directory 'benchmarks/XBench/TC/SD` itself:


# 09:56:58 >  
# 09:56:58 >  Mtimeout -timeout 180 Mserver 
"--config=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/etc/MonetDB.conf"
 --debug=10 --set 
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./PATHFINDER/lib64/MonetDB:/ufs/manegold/_/scratch0/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./PATHFINDER/lib64/MonetDB/lib:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/lib64/MonetDB:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/lib64/MonetDB/lib:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/lib64/MonetDB/bin"
 --set "gdk_dbfarm=/net/corona.ins.cwi.nl/exp
 
ort/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/var/MonetDB/dbfarm"
 --set 
"sql_logdir=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/.GNU.64.32.d.--disable-debug_--enable-optimize.PREFIX./MONETDB/var/MonetDB/log"
 --set mapi_port=38465 --set monet_prompt= --trace 
"--dbname=mTests_benchmarks_XBench_TC_SD" --dbinit="module(pathfinder); 
pfstart();" ; echo ; echo Over..
# 09:56:58 >  


<?xml version="1.0" encoding="utf-8"?>
<XQueryResult><hw>spurs</hw><hw>false</hw><hw>leaden</hw><hw>lac</hw><hw>knead</hw><hw>monastic</hw><hw>sot</hw><hw>vor</hw><hw>engraven</hw><hw>enwombed</hw><hw>tore</hw><hw>pentecost</hw><hw>hovers</hw><hw>unfolded</hw><hw>dismay</hw><hw>entreatments</hw><hw>amber</hw><hw>lids</hw><hw>disputable</hw></XQueryResult>

# 09:56:59 >  
# 09:56:59 >  Done.
# 09:56:59 >  



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

Reply via email to