Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests
In directory
sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18765/modules/pftijah/Tests
Modified Files:
All sigs.stable.out
Added Files:
createcoll1_frag.milS createcoll1_frag.stable.err
createcoll1_frag.stable.out
Log Message:
propagated changes of Thursday Feb 22 2007 - Friday Feb 23 2007
from the XQuery_0-16 branch to the development trunk
Index: sigs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/sigs.stable.out,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sigs.stable.out 22 Feb 2007 11:34:44 -0000 1.7
+++ sigs.stable.out 23 Feb 2007 15:11:16 -0000 1.8
@@ -31,7 +31,7 @@
[ "indexfetchjoin(BAT[any,oid], BAT[void,oid], BAT[void,oid]) : BAT[void,oid]"
]
[ "mergeindex(BAT[oid,oid], BAT[void,oid], BAT[void,oid], int) :
BAT[void,BAT]"
]
[ "offsetindex(BAT[void,oid], int) : BAT[void,oid]"
]
-[ "pf2tijah_node(BAT[void,str], BAT[void,int], BAT[oid,oid], BAT[void,oid],
BAT[void,int], BAT[void,str]) : BAT[void,oid]"
]
+[ "pf2tijah_node(BAT[oid,str], BAT[oid,int], BAT[oid,oid], BAT[oid,oid],
BAT[oid,int], BAT[oid,str]) : BAT[void,oid]"
]
[ "run_tijah_command(str) : bit"
]
[ "run_tijah_query(BAT[str,str], BAT[void,oid], str) : BAT[oid,dbl]"
]
[ "score_NLLR(BAT[oid,oid], BAT[void,int], BAT[oid,int], BAT[oid,int],
BAT[oid,any], dbl, int) : BAT[oid,dbl]"
]
@@ -46,6 +46,7 @@
[ "tj_finalize_collection(str) : void"
]
[ "tj_init_collection(str, BAT[str,str]) : void"
]
[ "tj_init_global(BAT[str,str]) : void"
]
+[ "tj_log(str, int) : void"
]
[ "tj_normalizeTerm(str, str) : str"
]
[ "tj_ping() : void"
]
[ "tj_setCollName(str) : void"
]
--- NEW FILE: createcoll1_frag.stable.out ---
stdout of test 'createcoll1_frag` in directory 'modules/pftijah` itself:
# 20:39:37 >
# 20:39:37 > 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=35761 --set xrpc_port=41445 --set monet_prompt= --trace
--dbname=mTests_modules_pftijah < createcoll1_frag.milS
# 20:39:37 >
# 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");
var coll_opt := new(str,str);
coll_opt.insert("stemmer","snowball-english");
coll_opt.insert("fragmentSize","10");
# index collection at once
var docs := new(str,str);
docs.insert(path+"/xml-docs/dilbert.xml","dilbert.xml");
docs.insert(path+"/xml-docs/dilbert2.xml","dilbert2.xml");
docs.insert(path+"/xml-docs/special.xml","special.xml");
tj_init_collection("coll1_frag", coll_opt);
tj_add2collection("coll1_frag",docs,true);
# Elapsed time = 708us [012us/node]
# Shredded 1 XML document (dilbert.xml), total time after commit=0.007s
# Elapsed time = 571us [009us/node]
# Shredded 1 XML document (dilbert2.xml), total time after commit=0.005s
# Elapsed time = 551us [025us/node]
# Shredded 1 XML document (special.xml), total time after commit=0.005s
# index collection incrementally
tj_init_collection("coll2_frag", coll_opt);
tj_add2collection("coll2_frag",path+"/xml-docs/dilbert.xml","dilbert.xml",true);
tj_add2collection("coll2_frag",path+"/xml-docs/dilbert2.xml","dilbert2.xml",true);
tj_add2collection("coll2_frag",path+"/xml-docs/special.xml","special.xml",true);
coll_opt.replace("fragmentSize","60");
# index collection at once
tj_init_collection("coll1_frag100", coll_opt);
tj_add2collection("coll1_frag100",docs,true);
# index collection incrementally
tj_init_collection("coll2_frag100", coll_opt);
tj_add2collection("coll2_frag100",path+"/xml-docs/dilbert.xml","dilbert.xml",true);
tj_add2collection("coll2_frag100",path+"/xml-docs/dilbert2.xml","dilbert2.xml",true);
tj_add2collection("coll2_frag100",path+"/xml-docs/special.xml","special.xml",true);
# compare indexed collections
var tids := bat("tj_globalTerms").sort().kunique().hmark([EMAIL PROTECTED]);
var coll1 := indexfetchjoin(tids, bat("tj_coll1_frag_TermIndex"),
bat("tj_coll1_frag_Terms"));
var coll2 := indexfetchjoin(tids, bat("tj_coll2_frag_TermIndex"),
bat("tj_coll2_frag_Terms"));
var coll3 := indexfetchjoin(tids, bat("tj_coll1_frag100_TermIndex"),
bat("tj_coll1_frag100_Terms"));
var coll4 := indexfetchjoin(tids, bat("tj_coll2_frag100_TermIndex"),
bat("tj_coll2_frag100_Terms"));
diff(coll1,coll2).print();
#-----------------#
# h t # name
# oid oid # type
#-----------------#
diff(coll2,coll3).print();
#-----------------#
# h t # name
# oid oid # type
#-----------------#
diff(coll3,coll4).print();
#-----------------#
# h t # name
# oid oid # type
#-----------------#
quit();
# 20:39:37 >
# 20:39:37 > Done.
# 20:39:37 >
Index: All
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/All,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- All 20 Feb 2007 12:06:53 -0000 1.5
+++ All 23 Feb 2007 15:11:13 -0000 1.6
@@ -3,6 +3,7 @@
loadthesis
createcoll0
createcoll1
+createcoll1_frag
test_split2frag
test_indexmerge
test_nllr
--- NEW FILE: createcoll1_frag.milS ---
module(pftijah);
module(unix);
# should run if you set TSTTRGDIR to pwd
var path:=getenv("TSTSRCDIR");
var coll_opt := new(str,str);
coll_opt.insert("stemmer","snowball-english");
coll_opt.insert("fragmentSize","10");
# index collection at once
var docs := new(str,str);
docs.insert(path+"/xml-docs/dilbert.xml","dilbert.xml");
docs.insert(path+"/xml-docs/dilbert2.xml","dilbert2.xml");
docs.insert(path+"/xml-docs/special.xml","special.xml");
tj_init_collection("coll1_frag", coll_opt);
tj_add2collection("coll1_frag",docs,true);
# index collection incrementally
tj_init_collection("coll2_frag", coll_opt);
tj_add2collection("coll2_frag",path+"/xml-docs/dilbert.xml","dilbert.xml",true);
tj_add2collection("coll2_frag",path+"/xml-docs/dilbert2.xml","dilbert2.xml",true);
tj_add2collection("coll2_frag",path+"/xml-docs/special.xml","special.xml",true);
coll_opt.replace("fragmentSize","60");
# index collection at once
tj_init_collection("coll1_frag100", coll_opt);
tj_add2collection("coll1_frag100",docs,true);
# index collection incrementally
tj_init_collection("coll2_frag100", coll_opt);
tj_add2collection("coll2_frag100",path+"/xml-docs/dilbert.xml","dilbert.xml",true);
tj_add2collection("coll2_frag100",path+"/xml-docs/dilbert2.xml","dilbert2.xml",true);
tj_add2collection("coll2_frag100",path+"/xml-docs/special.xml","special.xml",true);
# compare indexed collections
var tids := bat("tj_globalTerms").sort().kunique().hmark([EMAIL PROTECTED]);
var coll1 := indexfetchjoin(tids, bat("tj_coll1_frag_TermIndex"),
bat("tj_coll1_frag_Terms"));
var coll2 := indexfetchjoin(tids, bat("tj_coll2_frag_TermIndex"),
bat("tj_coll2_frag_Terms"));
var coll3 := indexfetchjoin(tids, bat("tj_coll1_frag100_TermIndex"),
bat("tj_coll1_frag100_Terms"));
var coll4 := indexfetchjoin(tids, bat("tj_coll2_frag100_TermIndex"),
bat("tj_coll2_frag100_Terms"));
diff(coll1,coll2).print();
diff(coll2,coll3).print();
diff(coll3,coll4).print();
--- NEW FILE: createcoll1_frag.stable.err ---
stderr of test 'createcoll1_frag` in directory 'modules/pftijah` itself:
# 20:39:37 >
# 20:39:37 > 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=35761 --set xrpc_port=41445 --set monet_prompt= --trace
--dbname=mTests_modules_pftijah < createcoll1_frag.milS
# 20:39:37 >
# builtin opt gdk_arch = 64bitx86_64-suse-linux
# builtin opt gdk_version = 1.16.1
# builtin opt monet_pid = 7097
# 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 datadir = ${prefix}/share
# 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 = true
# config opt xrpc_admin = 127.0.0.1
# config opt xrpc_user = 127.0.0.1
# config opt xrpc_trusted =
http://monetdb.cwi.nl;${prefix}/share/MonetDB/xrpc/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 = 35761
# cmdline opt xrpc_port = 41445
# cmdline opt monet_prompt =
# cmdline opt gdk_dbname = mTests_modules_pftijah
# 20:39:37 >
# 20:39:37 > Done.
# 20:39:37 >
-------------------------------------------------------------------------
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
