Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7932/Tests
Modified Files:
Tag: XQuery_0-16
All qmapi1.stable.out qmapi1.xq qmil1.milS qmil1.stable.out
qmil2.milS qmil2.stable.out
Added Files:
Tag: XQuery_0-16
createcoll0.milS createcoll0.modules createcoll0.stable.err
createcoll0.stable.out
Log Message:
approved changed output for test cases
Index: All
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/All,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- All 18 Jan 2007 15:20:49 -0000 1.4
+++ All 15 Feb 2007 14:00:35 -0000 1.4.2.1
@@ -1,5 +1,6 @@
load
sigs
+createcoll0
createcoll1
test_split2frag
test_indexmerge
Index: qmapi1.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/qmapi1.stable.out,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- qmapi1.stable.out 18 Jan 2007 15:20:50 -0000 1.1
+++ qmapi1.stable.out 15 Feb 2007 14:00:37 -0000 1.1.2.1
@@ -22,7 +22,7 @@
# 16:05:50 >
<?xml version="1.0" encoding="utf-8"?>
-<XQueryResult>112.000000<panel id="d1">
+<XQueryResult><panel id="d1">
<dat>19930216</dat>
<speech>
<character>Pointy-Haired Boss</character>
Index: qmapi1.xq
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/qmapi1.xq,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- qmapi1.xq 18 Jan 2007 15:20:50 -0000 1.1
+++ qmapi1.xq 15 Feb 2007 14:00:37 -0000 1.1.2.1
@@ -1,4 +1,2 @@
-let $opt:=<TijahOptions milfile="/tmp/x" collection="testcoll1"
txtmodel_model="NLLR" debug="0"/>
-let $x := pf:tijah-query-id($opt,(),"//panel[about(.,speed)]")
-let $n := pf:tijah-nodes($x)
-for $i in $n return (fn:round(100*pf:tijah-score($x,$i)),$i)
+let $opt:=<TijahOptions collection="testcoll1" txtmodel_model="NLLR"
debug="0"/>
+return pf:tijah-query($opt,(),"//panel[about(.,speed)]")
--- NEW FILE: createcoll0.stable.err ---
stderr of test 'createcoll0` in directory 'modules/pftijah` itself:
# 14:44:49 >
# 14:44:49 > Mtimeout -timeout 60 Mserver
"--config=/local/rodeh/monet//etc/MonetDB.conf" --debug=0 --set
"monet_mod_path=/local/rodeh/monet//lib/MonetDB4:/local/rodeh/monet//lib/MonetDB4/lib:/local/rodeh/monet//lib/MonetDB4/bin"
--set "gdk_dbfarm=/local/rodeh/monet//var/MonetDB4/dbfarm" --set
"sql_logdir=/local/rodeh/monet//var/MonetDB4/sql_logs" --set
"xquery_logdir=/local/rodeh/monet//var/MonetDB4/xquery_logs" --set
mapi_port=35247 --set monet_prompt= --trace --dbname=mTests_modules_pftijah <
createcoll0.milS
# 14:44:49 >
# builtin opt gdk_arch = 64bitx86_64-suse-linux
# builtin opt gdk_version = 1.16.1
# builtin opt monet_pid = 23300
# builtin opt prefix = /local/rodeh/monet/
# 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 gdk_mem_pagebits = 14
# builtin opt monet_admin = adm
# builtin opt monet_prompt = >
# builtin opt monet_welcome = yes
# builtin opt monet_mod_path =
${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/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/sql_logs
# builtin opt xquery_logdir = ${prefix}/var/MonetDB/xquery_logs
# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
# builtin opt standoff_start = start
# builtin opt standoff_end = end
# config opt prefix = /local/rodeh/monet/
# config opt config = ${prefix}/etc/MonetDB.conf
# config opt prefix = /local/rodeh/monet/
# config opt exec_prefix = ${prefix}
# config opt gdk_dbfarm = ${prefix}/var/MonetDB4/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 =
${exec_prefix}/lib/MonetDB4:${exec_prefix}/lib/MonetDB4/lib:${exec_prefix}/lib/MonetDB4/bin
# config opt monet_daemon = no
# config opt mapi_port = 50000
# config opt mapi_open = false
# config opt mapi_debug = 0
# config opt sql_debug = 0
# config opt sql_logdir = ${prefix}/var/MonetDB4/sql_logs
# config opt xquery_output = dm
# config opt xquery_cacheMB = 100
# config opt xquery_cacherules =
# config opt xquery_procMB = 128
# config opt xquery_logdir = ${prefix}/var/MonetDB4/xquery_logs
# config opt xrpc_port =
# config opt xrpc_open = yes
# config opt xrpc_admin = 127.0.0.1
# config opt xrpc_trusted =
http://monetdb.cwi.nl;${prefix}/share/MonetDB/www/export
# config opt standoff_ns =
# config opt standoff_start = start
# config opt standoff_end = end
# cmdline opt config = /local/rodeh/monet//etc/MonetDB.conf
# cmdline opt gdk_debug = 0
# cmdline opt monet_mod_path =
/local/rodeh/monet//lib/MonetDB4:/local/rodeh/monet//lib/MonetDB4/lib:/local/rodeh/monet//lib/MonetDB4/bin
# cmdline opt gdk_dbfarm = /local/rodeh/monet//var/MonetDB4/dbfarm
# cmdline opt sql_logdir = /local/rodeh/monet//var/MonetDB4/sql_logs
# cmdline opt xquery_logdir = /local/rodeh/monet//var/MonetDB4/xquery_logs
# cmdline opt mapi_port = 35247
# cmdline opt monet_prompt =
# cmdline opt gdk_dbname = mTests_modules_pftijah
# 14:44:49 >
# 14:44:49 > Done.
# 14:44:49 >
Index: qmil2.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/qmil2.stable.out,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- qmil2.stable.out 19 Jan 2007 13:41:08 -0000 1.2
+++ qmil2.stable.out 15 Feb 2007 14:00:41 -0000 1.2.2.1
@@ -12,10 +12,9 @@
module(pftijah);
# test long queries
-var res := xquery("dm","let $opt:=<TijahOptions collection=\"testcoll1\"
txtmodel_model=\"NLLR\" debug=\"0\" top=\"99\"/> let $x :=
pf:tijah-query-id($opt,(),\"//panel[about(.,dilbert Geschwindigkeit ist der
Schluessel zum Erfolg speed is the key to success)]\") let $n :=
pf:tijah-nodes($x) for $i in $n return
(fn:round(100*pf:tijah-score($x,$i)),$i)");
+var res := xquery("dm"," let $opt:=<TijahOptions collection=\"testcoll1\"
txtmodel_model=\"NLLR\" debug=\"0\" top=\"99\"/> return
pf:tijah-query($opt,(),\"//panel[about(.,dilbert Geschwindigkeit ist der
Schluessel zum Erfolg speed is the key to success)]\") ");
printf("%s",res);
-42.000000,
<panel id="d4">
<dat>19910216</dat>
<speech>
@@ -23,7 +22,6 @@
<bubble>Geschwindigkeit ist der Schluessel zum Erfolg.</bubble>
</speech>
</panel>,
-23.000000,
<panel id="d1">
<dat>19930216</dat>
<speech>
@@ -31,7 +29,6 @@
<bubble>Speed is the key to success.</bubble>
</speech>
</panel>,
-7.000000,
<panel id="d5">
<dat>19920216</dat>
<speech>
@@ -39,7 +36,6 @@
<bubble>Ist es in Ordnung, Fehler zu machen, wenn wir dafuer wirklich
wirklich schnell sind?</bubble>
</speech>
</panel>,
-5.000000,
<panel id="d2">
<dat>19940216</dat>
<speech>
Index: qmil1.milS
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/qmil1.milS,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- qmil1.milS 17 Jan 2007 15:57:00 -0000 1.3
+++ qmil1.milS 15 Feb 2007 14:00:37 -0000 1.3.2.1
@@ -1,6 +1,7 @@
module(pftijah);
-var res := xquery("dm","let $opt:=<TijahOptions collection=\"testcoll1\"
txtmodel_model=\"NLLR\" debug=\"0\" top=\"99\"/> let $x :=
pf:tijah-query-id($opt,(),\"//panel[about(.,dilbert)]\") let $n :=
pf:tijah-nodes($x) for $i in $n return
(fn:round(100*pf:tijah-score($x,$i)),$i)");
+# test score calculation
+var res := xquery("dm"," let $opt:=<TijahOptions collection=\"testcoll0\"
txtmodel_model=\"NLLR\" debug=\"0\" top=\"99\"/> let $x :=
pf:tijah-query-id($opt,(),\"//panel[about(.,dilbert)]\") let $n :=
pf:tijah-nodes($x) for $i in $n return (fn:round(100*pf:tijah-score($x,$i)),$i)
");
printf("%s",res);
--- NEW FILE: createcoll0.modules ---
pftijah
--- NEW FILE: createcoll0.milS ---
module(pftijah);
module(unix);
# should run if you set TSTTRGDIR to pwd
var path:=getenv("TSTSRCDIR");
# index collection 0
tj_init_collection("testcoll0",
new(str,str).insert("stemmer","snowball-english"));
tj_add2collection("testcoll0",path+"/xml-docs/dilbert.xml","dilbert.xml",true);
--- NEW FILE: createcoll0.stable.out ---
stdout of test 'createcoll0` in directory 'modules/pftijah` itself:
# 14:44:49 >
# 14:44:49 > Mtimeout -timeout 60 Mserver
"--config=/local/rodeh/monet//etc/MonetDB.conf" --debug=0 --set
"monet_mod_path=/local/rodeh/monet//lib/MonetDB4:/local/rodeh/monet//lib/MonetDB4/lib:/local/rodeh/monet//lib/MonetDB4/bin"
--set "gdk_dbfarm=/local/rodeh/monet//var/MonetDB4/dbfarm" --set
"sql_logdir=/local/rodeh/monet//var/MonetDB4/sql_logs" --set
"xquery_logdir=/local/rodeh/monet//var/MonetDB4/xquery_logs" --set
mapi_port=35247 --set monet_prompt= --trace --dbname=mTests_modules_pftijah <
createcoll0.milS
# 14:44:49 >
# Monet Database Server V4.16.1
# Copyright (c) 1993-2007, CWI. All rights reserved.
# Compiled for x86_64-suse-linux/64bit with 32bit OIDs; dynamically linked.
# Visit http://monetdb.cwi.nl/ for further information.
module(pftijah);
module(unix);
# should run if you set TSTTRGDIR to pwd
var path:=getenv("TSTSRCDIR");
# index collection 0
tj_init_collection("testcoll0",
new(str,str).insert("stemmer","snowball-english"));
tj_add2collection("testcoll0",path+"/xml-docs/dilbert.xml","dilbert.xml",true);
# Elapsed time = 810us [013us/node]
# Shredded 1 XML document (dilbert.xml), total time after commit=0.007s
quit();
# 14:44:49 >
# 14:44:49 > Done.
# 14:44:49 >
Index: qmil1.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/qmil1.stable.out,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- qmil1.stable.out 17 Jan 2007 15:57:00 -0000 1.4
+++ qmil1.stable.out 15 Feb 2007 14:00:38 -0000 1.4.2.1
@@ -11,24 +11,17 @@
# Visit http://monetdb.cwi.nl/ for further information.
module(pftijah);
-var res := xquery("dm","let $opt:=<TijahOptions collection=\"testcoll1\"
txtmodel_model=\"NLLR\" debug=\"0\" top=\"99\"/> let $x :=
pf:tijah-query-id($opt,(),\"//panel[about(.,dilbert)]\") let $n :=
pf:tijah-nodes($x) for $i in $n return
(fn:round(100*pf:tijah-score($x,$i)),$i)");
+# test score calculation
+var res := xquery("dm"," let $opt:=<TijahOptions collection=\"testcoll0\"
txtmodel_model=\"NLLR\" debug=\"0\" top=\"99\"/> let $x :=
pf:tijah-query-id($opt,(),\"//panel[about(.,dilbert)]\") let $n :=
pf:tijah-nodes($x) for $i in $n return (fn:round(100*pf:tijah-score($x,$i)),$i)
");
printf("%s",res);
-67.000000,
+44.000000,
<panel id="d2">
<dat>19940216</dat>
<speech>
<character>Dilbert</character>
<bubble>Is it okay to do things wrong if we're really, really
fast?</bubble>
</speech>
- </panel>,
-47.000000,
-<panel id="d5">
- <dat>19920216</dat>
- <speech>
- <character>Dilbert</character>
- <bubble>Ist es in Ordnung, Fehler zu machen, wenn wir dafuer wirklich
wirklich schnell sind?</bubble>
- </speech>
</panel>
quit();
Index: qmil2.milS
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/qmil2.milS,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- qmil2.milS 17 Jan 2007 15:57:00 -0000 1.1
+++ qmil2.milS 15 Feb 2007 14:00:38 -0000 1.1.2.1
@@ -1,7 +1,7 @@
module(pftijah);
# test long queries
-var res := xquery("dm","let $opt:=<TijahOptions collection=\"testcoll1\"
txtmodel_model=\"NLLR\" debug=\"0\" top=\"99\"/> let $x :=
pf:tijah-query-id($opt,(),\"//panel[about(.,dilbert Geschwindigkeit ist der
Schluessel zum Erfolg speed is the key to success)]\") let $n :=
pf:tijah-nodes($x) for $i in $n return
(fn:round(100*pf:tijah-score($x,$i)),$i)");
+var res := xquery("dm"," let $opt:=<TijahOptions collection=\"testcoll1\"
txtmodel_model=\"NLLR\" debug=\"0\" top=\"99\"/> return
pf:tijah-query($opt,(),\"//panel[about(.,dilbert Geschwindigkeit ist der
Schluessel zum Erfolg speed is the key to success)]\") ");
printf("%s",res);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
