Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3017/Tests
Modified Files:
colltest2.stable.err procs.stable.out
Log Message:
introduce new text search features:
- phrase search
- mandatory terms
- negated/disliked terms
implementation of the new features required to
- extend the NEXI grammar (parser)
- introduce a new normalization phase for the query text
- reflect changes during optimization
- runtime support to execute the new operations on the tijah-index
U colltest2.stable.err
Index: colltest2.stable.err
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/modules/pftijah/Tests/colltest2.stable.err,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- colltest2.stable.err 25 Mar 2009 16:07:51 -0000 1.7
+++ colltest2.stable.err 16 Apr 2009 10:29:37 -0000 1.8
@@ -10,7 +10,7 @@
# 16:06:32 > Mtimeout -timeout 60 MapiClient -lxquery -fxml -umonetdb
-Pmonetdb --host=localhost --port=31150 colltest2.xq
# 16:06:32 >
-MAPI = mone...@asbjorn:36974
+MAPI = mone...@asbjorn:31515
QUERY = let $opt := <TijahOptions debug="0" ft-index="FT_PFCOLL"
ir-model="NLLR"/>
ERROR = !ERROR: CMDtijah_query: Error (new NEXI syntax): A query with
startnodes should start with a relative path expression.
!ERROR: CMDtijah_query: operation failed.
U procs.stable.out
Index: procs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/procs.stable.out,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- procs.stable.out 8 Apr 2009 07:04:55 -0000 1.55
+++ procs.stable.out 16 Apr 2009 10:29:37 -0000 1.56
@@ -71,18 +71,22 @@
[ "_collection_cleanup() : BAT[str,str]"
]
[ "_del_doc(bit, BAT[any,str], BAT[oid,str], BAT[oid,str]) : bit"
]
[ "_del_doc_replace(BAT[oid,str], BAT[oid,str]) : void"
]
-[ "_getConceptDocScr_nest_nid(BAT[oid,oid], BAT[void,int], BAT[void,oid]) :
BAT[oid,int]"
]
-[ "_getConceptDocScr_nest_pre(BAT[oid,any], BAT[void,int], BAT[void,oid]) :
BAT[oid,int]"
]
-[ "_getConceptDocScr_unnest_nid(BAT[oid,oid], BAT[void,int], BAT[void,oid]) :
BAT[oid,int]"
]
-[ "_getConceptDocScr_unnest_pre(BAT[oid,any], BAT[void,int], BAT[void,oid]) :
BAT[oid,int]"
]
+[ "_getConceptDocScr_nest_nid(BAT[oid,oid], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]" ]
+[ "_getConceptDocScr_nest_pre(BAT[oid,any], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]" ]
+[ "_getConceptDocScr_unnest_nid(BAT[oid,oid], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]" ]
+[ "_getConceptDocScr_unnest_pre(BAT[oid,any], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]" ]
[ "_getConceptPositions(oid) : BAT[void,oid]"
]
[ "_getTagPositions(oid, str) : BAT[void,oid]"
]
[ "_getTermColCnt(oid, BAT[oid,str]) : int"
]
[ "_getTermDocCnt(oid, BAT[oid,oid], BAT[void,int], BAT[oid,str]) :
BAT[oid,int]"
]
-[ "_getTermDocCnt_nest_nid(BAT[oid,oid], BAT[void,int], BAT[void,oid]) :
BAT[oid,int]"
]
-[ "_getTermDocCnt_nest_pre(BAT[oid,any], BAT[void,int], BAT[void,oid]) :
BAT[oid,int]"
]
-[ "_getTermDocCnt_unnest_nid(BAT[oid,oid], BAT[void,int], BAT[void,oid]) :
BAT[oid,int]"
]
-[ "_getTermDocCnt_unnest_pre(BAT[oid,any], BAT[void,int], BAT[void,oid]) :
BAT[oid,int]"
]
+[ "_getTermDocCnt_nest_nid(BAT[oid,oid], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]"
]
+[ "_getTermDocCnt_nest_pre(BAT[oid,any], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]"
]
+[ "_getTermDocCnt_unnest_nid(BAT[oid,oid], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]"
]
+[ "_getTermDocCnt_unnest_pre(BAT[oid,any], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]"
]
+[ "_getTermDoc_nest_nid(BAT[oid,oid], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]"
]
+[ "_getTermDoc_nest_pre(BAT[oid,any], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]"
]
+[ "_getTermDoc_unnest_nid(BAT[oid,oid], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]"
]
+[ "_getTermDoc_unnest_pre(BAT[oid,any], BAT[void,int], BAT[oid,oid]) :
BAT[oid,int]"
]
[ "_getTermPositions(oid) : BAT[void,oid]"
]
[ "_getTermPositions(oid, BAT[oid,str]) : BAT[void,oid]"
]
[ "_runtime_create(str, lock, lock) : BAT[lock,BAT]"
]
@@ -97,6 +101,7 @@
[ "_score_NLLR(int, int, int, int, BAT[oid,int], BAT[void,int], dbl) :
BAT[oid,dbl]"
]
[ "_score_OKAPI(dbl, BAT[oid,int], BAT[void,int], int, dbl) : BAT[oid,dbl]"
]
[ "_score_OKAPI(int, BAT[oid,int], BAT[void,int], int, dbl, dbl, dbl) :
BAT[oid,dbl]"
]
+[ "_selectPhrase(BAT[oid,dbl]) : BAT[oid,oid]"
]
[ "_shred_doc_base(BAT[oid,str], BAT[void,str], BAT[void,str], lng) :
BAT[oid,BAT]"
]
[ "_shred_doc_cleanup(lng, bit) : BAT[any,any]"
]
[ "_shred_into_docBAT(BAT[str,BAT], BAT[void,str], BAT[void,str],
BAT[void,timestamp], str, oid, lng) : oid"
]
@@ -656,10 +661,6 @@
[ "tj_contained_by_prop_nest_pre(BAT[oid,any], BAT[oid,dbl]) : BAT[oid,any]"
]
[ "tj_contained_by_prop_unnest_nid(BAT[oid,any], BAT[oid,dbl]) : BAT[oid,any]"
]
[ "tj_contained_by_prop_unnest_pre(BAT[oid,any], BAT[oid,dbl]) : BAT[oid,any]"
]
-[ "tj_containing_conceptquery_nest_nid_LogSum(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_conceptquery_nest_pre_LogSum(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_conceptquery_unnest_nid_LogSum(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_conceptquery_unnest_pre_LogSum(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
[ "tj_containing_noprop_nest_nid(BAT[oid,oid], BAT[oid,oid]) : BAT[oid,any]"
]
[ "tj_containing_noprop_nest_pre(BAT[oid,oid], BAT[oid,oid]) : BAT[oid,any]"
]
[ "tj_containing_noprop_unnest_nid(BAT[oid,oid], BAT[oid,oid]) : BAT[oid,any]"
]
@@ -668,22 +669,46 @@
[ "tj_containing_prop_nest_pre(BAT[oid,any], BAT[oid,dbl]) : BAT[oid,any]"
]
[ "tj_containing_prop_unnest_nid(BAT[oid,any], BAT[oid,dbl]) : BAT[oid,any]"
]
[ "tj_containing_prop_unnest_pre(BAT[oid,any], BAT[oid,dbl]) : BAT[oid,any]"
]
-[ "tj_containing_query_nest_nid_LM(BAT[oid,any], BAT[oid,dbl]) : BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_LMs(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_NLLR(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_nid_OKAPI(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_LM(BAT[oid,any], BAT[oid,dbl]) : BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_LMs(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_NLLR(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_nest_pre_OKAPI(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_nid_LM(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_nid_LMs(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_nid_NLLR(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_nid_OKAPI(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_pre_LM(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_pre_LMs(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_pre_NLLR(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
-[ "tj_containing_query_unnest_pre_OKAPI(BAT[oid,any], BAT[oid,dbl]) :
BAT[oid,dbl]"
]
+[ "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_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_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_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_delete_collection(str) : void"
]
[ "tj_delete_collection(str, bit) : void"
]
[ "tj_delete_global() : void"
]
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
