Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14778/modules/pftijah/Tests
Modified Files:
Tag: M5XQ
procs.stable.out
Log Message:
propagated changes of Wednesday Oct 14 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/14 - hrode: modules/pftijah/Tests/procs.stable.out,1.60
- introduce fragmented indexing on XQuery level
- fixed bugs on MIL level function for fragemented indexing
- adapted the test cases
what still misses is the querying on the fragmented index,
but the default for indexing is currently set to create only
one single index, which allows querying to work as before
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: procs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/procs.stable.out,v
retrieving revision 1.57.2.2
retrieving revision 1.57.2.3
diff -u -d -r1.57.2.2 -r1.57.2.3
--- procs.stable.out 20 May 2009 15:56:29 -0000 1.57.2.2
+++ procs.stable.out 14 Oct 2009 12:07:36 -0000 1.57.2.3
@@ -20,12 +20,14 @@
[ "ADDHELP(str, str, str, str, str) : void"
]
[ "ALG_tj_add_fti_tape(str, BAT[oid,BAT], BAT[oid,BAT], BAT[void,any],
BAT[oid,BAT], BAT[str,BAT]) : BAT[str,BAT]" ]
[ "ALG_tj_docmgmt_tape(BAT[str,BAT], BAT[void,BAT], BAT[void,str],
BAT[void,str], BAT[void,str], BAT[void,lng]) : bit" ]
+[ "ALG_tj_docmgmt_tape2(BAT[str,BAT], BAT[void,BAT], BAT[void,str],
BAT[void,str], BAT[void,str], BAT[void,lng]) : bit"
]
[ "ALG_tj_ft_index_info(BAT[oid,BAT], BAT[void,any], BAT[oid,BAT]) :
BAT[void,BAT]"
]
[ "ALG_tj_ftfun_handler(bit, BAT[oid,BAT], BAT[oid,BAT], BAT[oid,BAT],
BAT[oid,BAT], BAT[void,any], BAT[oid,BAT], BAT[oid,BAT]) : BAT[void,BAT]"
]
[ "ALG_tj_pfop(BAT[oid,oid], BAT[oid,any], BAT[oid,any], BAT[oid,oid]) :
BAT[void,BAT]"
]
[ "ALG_tj_pfop(BAT[oid,oid], BAT[oid,any], BAT[oid,any], BAT[oid,oid],
BAT[oid,dbl]) : BAT[void,BAT]"
]
[ "ALG_tj_pfop(BAT[oid,oid], BAT[oid,any], int, BAT[oid,oid]) : BAT[void,BAT]"
]
[ "ALG_tj_query_handler(bit, BAT[oid,BAT], BAT[oid,BAT], BAT[oid,BAT],
BAT[void,any], BAT[oid,BAT], BAT[oid,BAT]) : BAT[void,BAT]" ]
+[ "ALG_tj_query_handler2(bit, BAT[oid,BAT], BAT[oid,BAT], BAT[oid,BAT],
BAT[void,any], BAT[oid,BAT], BAT[oid,BAT]) : BAT[void,BAT]"
]
[ "ALG_tj_query_nodes(BAT[void,any], BAT[oid,BAT], BAT[oid,BAT]) :
BAT[void,BAT]" ]
[ "ALG_tj_query_score(BAT[void,any], BAT[oid,BAT], BAT[oid,BAT], BAT[oid,BAT])
: BAT[void,BAT]" ]
[ "CTderive(BAT[oid,any], BAT[oid,any]) : grp"
]
@@ -112,15 +114,26 @@
[ "_tj_TagBat(str) : str"
]
[ "_tj_TermBat(str) : str"
]
[ "_tj_add2collection(str, BAT[oid,BAT], BAT[str,BAT], str, str, bit) : void"
]
+[ "_tj_add2collection_frag(str, BAT[str,BAT], str, str, bit) : void"
]
+[ "_tj_build_inverted_index_frag(str, BAT[str,BAT], BAT[str,BAT]) : void"
]
[ "_tj_chk_modified_fragments(str, BAT[str,BAT]) : BAT[void,str]"
]
[ "_tj_collection(str) : BAT[str,BAT]"
]
[ "_tj_collection_str(str) : BAT[void,BAT]"
]
[ "_tj_commit(BAT[str,BAT]) : void"
]
+[ "_tj_commit_frag(BAT[str,BAT], BAT[str,BAT]) : void"
]
+[ "_tj_create_commitBats() : BAT[str,BAT]"
]
[ "_tj_finalize_collection(str, BAT[str,BAT], bit) : void"
]
+[ "_tj_finalize_collection_frag(str, BAT[str,BAT], BAT[str,BAT], bit) : void"
]
+[ "_tj_get_collection_frag(str, BAT[str,BAT]) : void"
]
[ "_tj_get_parameter(BAT[str,BAT], str) : str"
]
+[ "_tj_get_parameter2(BAT[str,BAT], str) : str"
]
[ "_tj_init_collection(str, BAT[str,str], BAT[void,str], bit) : void"
]
+[ "_tj_init_collection_base(str, BAT[str,str], BAT[str,BAT]) : void"
]
+[ "_tj_init_collection_frag(str, int, BAT[str,BAT]) : void"
]
[ "_tj_safe_remove(str) : void"
]
+[ "_tj_set_forwardindex_access(BAT[str,BAT], int) : void"
]
[ "_tj_set_parameter(BAT[str,BAT], str, str) : void"
]
+[ "_tj_set_parameter2(BAT[str,BAT], str, str) : void"
]
[ "_ws_coll_isolate(lng, BAT[void,BAT], str, BAT[void,oid], BAT[void,oid],
BAT[void,oid], BAT[void,oid]) : void" ]
[ "_ws_free(lng) : BAT[void,any]"
]
[ "_ws_new(int, oid, int) : BAT[void,BAT]"
]
@@ -575,6 +588,7 @@
[ "rule(int, int, int, int, int) : rule"
]
[ "rule(int, str, int, int) : rule"
]
[ "rule(int, str, int, int, int) : rule"
]
+[ "run_nexi_query(str, BAT[str,str]) : BAT[oid,dbl]"
]
[ "run_tijah_query(str, BAT[str,str], bit, BAT[void,oid]) : BAT[oid,dbl]"
]
[ "runtime(lock, lock) : BAT[lock,BAT]"
]
[ "save(BAT[any::1,any::2]) : BAT[any::1,any::2]"
]
@@ -652,9 +666,12 @@
[ "timestamp_sub_sec_interval(timestamp, lng) : timestamp"
]
[ "tj_add2collection(str, BAT[str,str], bit) : void"
]
[ "tj_add2collection(str, str, str, bit) : void"
]
+[ "tj_add2collection_frag(str, BAT[str,str], bit) : void"
]
+[ "tj_add2collection_frag(str, str, str, bit) : void"
]
[ "tj_add_pre(BAT[oid,any]) : BAT[oid,oid]"
]
[ "tj_and_comb(BAT[any,any], BAT[any,any]) : BAT[any,any]"
]
[ "tj_and_nocomb(BAT[any,any], BAT[any,any]) : BAT[any,any]"
]
+[ "tj_collection_delete(str) : void"
]
[ "tj_contained_by_noprop_nest_nid(BAT[oid,oid], BAT[oid,oid]) : BAT[oid,any]"
]
[ "tj_contained_by_noprop_nest_pre(BAT[oid,oid], BAT[oid,oid]) : BAT[oid,any]"
]
[ "tj_contained_by_noprop_unnest_nid(BAT[oid,oid], BAT[oid,oid]) :
BAT[oid,any]"
]
@@ -674,43 +691,43 @@
[ "tj_containing_query_nest_nid_entity_LogSum(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
[ "tj_containing_query_nest_nid_entity_min(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
[ "tj_containing_query_nest_nid_entity_plus(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_phrase(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_term_LM(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_term_LMs(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_term_NLLR(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_term_OKAPI(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_term_min(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_term_plus(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_nid_phrase(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_nid_term_LM(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_nid_term_LMs(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_nid_term_NLLR(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_nid_term_OKAPI(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_nid_term_min(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_nid_term_plus(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
[ "tj_containing_query_nest_pre_entity_LogSum(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
[ "tj_containing_query_nest_pre_entity_min(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
[ "tj_containing_query_nest_pre_entity_plus(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_phrase(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_term_LM(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_term_LMs(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_term_NLLR(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_term_OKAPI(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_term_min(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_term_plus(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_pre_phrase(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_pre_term_LM(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_pre_term_LMs(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_pre_term_NLLR(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_pre_term_OKAPI(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_pre_term_min(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_nest_pre_term_plus(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
[ "tj_containing_query_unnest_nid_entity_LogSum(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
[ "tj_containing_query_unnest_nid_entity_min(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
[ "tj_containing_query_unnest_nid_entity_plus(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
-[ "tj_containing_query_unnest_nid_phrase(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_nid_term_LM(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_nid_term_LMs(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_nid_term_NLLR(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_nid_term_OKAPI(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
-[ "tj_containing_query_unnest_nid_term_min(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_nid_term_plus(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_nid_phrase(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_nid_term_LM(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_nid_term_LMs(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_nid_term_NLLR(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_nid_term_OKAPI(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_nid_term_min(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_nid_term_plus(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
[ "tj_containing_query_unnest_pre_entity_LogSum(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
[ "tj_containing_query_unnest_pre_entity_min(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
[ "tj_containing_query_unnest_pre_entity_plus(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
-[ "tj_containing_query_unnest_pre_phrase(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_pre_term_LM(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_pre_term_LMs(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_pre_term_NLLR(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_pre_term_OKAPI(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]" ]
-[ "tj_containing_query_unnest_pre_term_min(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_pre_term_plus(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_pre_phrase(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_pre_term_LM(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_pre_term_LMs(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_pre_term_NLLR(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_pre_term_OKAPI(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_pre_term_min(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
+[ "tj_containing_query_unnest_pre_term_plus(BAT[oid,any], BAT[oid,BAT]) :
BAT[oid,dbl]"
]
[ "tj_delete_collection(str) : void"
]
[ "tj_delete_collection(str, bit) : void"
]
[ "tj_delete_global() : void"
]
@@ -719,8 +736,10 @@
[ "tj_extend_collection(str, BAT[void,str]) : void"
]
[ "tj_get_collection_lock(str) : lock"
]
[ "tj_get_ft_index(BAT[str,str], bit) : str"
]
+[ "tj_global_delete() : void"
]
[ "tj_init_collection(str, BAT[str,str]) : void"
]
[ "tj_init_collection(str, BAT[str,str], BAT[void,str]) : void"
]
+[ "tj_init_collection_base(str, BAT[str,str]) : void"
]
[ "tj_init_global() : void"
]
[ "tj_init_global(BAT[str,str]) : void"
]
[ "tj_init_global(BAT[str,str], bit) : void"
]
@@ -728,14 +747,19 @@
[ "tj_init_termHash(str) : void"
]
[ "tj_is_indexed(str) : bit"
]
[ "tj_is_indexed(str) : bit"
]
+[ "tj_merge_frag_results(BAT[void,BAT], int) : BAT[str,dbl]"
]
+[ "tj_merge_frag_results_inex(BAT[void,BAT], int) : BAT[str,dbl]"
]
[ "tj_nid2pre(BAT[oid,any]) : BAT[oid,any]"
]
[ "tj_nid2pre(BAT[oid,any], BAT[oid,str]) : BAT[oid,any]"
]
[ "tj_or_comb(BAT[any,any], BAT[any,any]) : BAT[any,any]"
]
[ "tj_or_nocomb(BAT[any,any], BAT[any,any]) : BAT[any,any]"
]
[ "tj_pfop(BAT[void,oid], BAT[void,any], BAT[void,int], BAT[void,oid]) :
BAT[void,BAT]"
]
[ "tj_play_doc_tape(BAT[void,BAT], BAT[void,oid], BAT[void,int],
BAT[void,lng], BAT[void,str]) : void"
]
+[ "tj_pre2inexpath(BAT[oid,dbl]) : BAT[str,dbl]"
]
[ "tj_pre2nid_noprop(BAT[oid,any]) : BAT[oid,any]"
]
[ "tj_pre2nid_prop(BAT[oid,any]) : BAT[oid,any]"
]
+[ "tj_pre2pfpre(BAT[oid,dbl]) : BAT[void,BAT]"
]
+[ "tj_prepare_query(BAT[str,dbl]) : BAT[void,BAT]"
]
[ "tj_prior_ls(BAT[oid,dbl]) : BAT[any,any]"
]
[ "tj_query_handler(bit, BAT[void,BAT], BAT[void,BAT], BAT[void,BAT],
BAT[oid,any], BAT[oid,BAT], BAT[void,lng], BAT[void,dbl], BAT[void,str],
BAT[void,BAT]) : BAT[void,BAT]" ]
[ "tj_rebuild_collection(str) : void"
]
@@ -770,6 +794,10 @@
[ "vx_maintain(BAT[oid,oid], BAT[oid,oid], BAT[oid,oid], BAT[oid,str]) :
BAT[int,oid]"
]
[ "vx_maintain(BAT[oid,oid], BAT[oid,str]) : BAT[int,oid]"
]
[ "vx_reduce(BAT[void,int], BAT[void,oid]) : BAT[oid,oid]"
]
+[ "ws_cache_end(BAT[any,any]) : void"
]
+[ "ws_cache_expr(BAT[any,any], str) : bit"
]
+[ "ws_cache_get(BAT[any,any], str) : bit"
]
+[ "ws_cache_put(BAT[any,any], str, BAT[any,any]) : void"
]
[ "ws_collection(BAT[void,BAT], BAT[oid,str], BAT[void,oid]) : BAT[oid,oid]"
]
[ "ws_collection_check(BAT[any::1,str]) : BAT[any::1,oid]"
]
[ "ws_collection_root(BAT[void,BAT], BAT[void,str]) : BAT[oid,oid]"
]
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
