Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13411/modules/pftijah
Modified Files:
Tag: M5XQ
pftijah.mx
Log Message:
propagated changes of Tuesday Sep 22 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/22 - jflokstra: modules/pftijah/pftijah.mx,1.235
- Implement the INEX path generator to the serialiser.
For every element node indexed a INEX style path is stored in a BAT.
This functionality is hidden by a #ifdef USE_INEX_PATH which should be
switched on manually.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.226.2.7
retrieving revision 1.226.2.8
diff -u -d -r1.226.2.7 -r1.226.2.8
--- pftijah.mx 17 Sep 2009 11:13:26 -0000 1.226.2.7
+++ pftijah.mx 22 Sep 2009 11:37:59 -0000 1.226.2.8
@@ -654,6 +654,7 @@
}
bat("tj_" + ftiName + "_tid1").delete();
bat("tj_" + ftiName + "_size1").delete();
+ bat("tj_" + ftiName + "_path1").delete();
bat("tj_" + ftiName + "_fragments").delete();
bat("tj_" + ftiName + "_fragments").append(1...@0);
bat("tj_" + ftiName + "_pfpre").delete();
@@ -668,6 +669,7 @@
new(void,oid).seqbase(1...@0).persists(true).access(BAT_APPEND).bbpname("tj_" +
ftiName + "_tid1");
new(void,int).seqbase(1...@0).persists(true).access(BAT_APPEND).bbpname("tj_" +
ftiName + "_size1");
+ new(oid,str).persists(true).access(BAT_APPEND).bbpname("tj_" +
ftiName + "_path1");
# bat contains the start oid of every tid/size frag. Head is postfix
# string to _tid/_size. Normally "", "2", "3"
new(void,oid).seqbase(1...@0).append(1...@0).persists(true).access(BAT_APPEND).bbpname("tj_"
+ ftiName + "_fragments");
@@ -982,6 +984,7 @@
{
tjCollBat.append("tj_" + ftiName + "_tid" + str(int($t)));
tjCollBat.append("tj_" + ftiName + "_size"+ str(int($t)));
+ tjCollBat.append("tj_" + ftiName + "_path"+ str(int($t)));
}
if (isnil(CATCH(bat("tj_" + ftiName + "_TermIndex").count_wrd()))) {
tjCollBat.append("tj_" + ftiName + "_Terms");
@@ -1025,6 +1028,7 @@
var fpfx := str(bat("tj_" + ftiName + "_fragments").count_wrd());
tjCollBat.insert("_tid", bat("tj_" + ftiName + "_tid"+fpfx));
tjCollBat.insert("_size", bat("tj_" + ftiName + "_size"+fpfx));
+ tjCollBat.insert("_path", bat("tj_" + ftiName + "_path"+fpfx));
tjCollBat.insert("_pfpre", bat("tj_" + ftiName + "_pfpre"));
tjCollBat.insert("_conceptdict", bat("tj_" + ftiName +
"_conceptdict"));
tjCollBat.insert("_concept_tid", bat("tj_" + ftiName +
"_concept_tid"));
@@ -1101,6 +1105,7 @@
bat("tj_" + ftiName + "_doc_firstpre").access(BAT_APPEND);
bat("tj_" + ftiName + "_tid1").access(BAT_APPEND);
bat("tj_" + ftiName + "_size1").access(BAT_APPEND);
+ bat("tj_" + ftiName + "_path1").access(BAT_APPEND);
bat("tj_" + ftiName + "_fragments").access(BAT_APPEND);
bat("tj_" + ftiName + "_pfpre").access(BAT_APPEND);
bat("tj_" + ftiName + "_concept_tid").access(BAT_APPEND);
@@ -1199,6 +1204,7 @@
bat("tj_" + ftiName + "_doc_firstpre").access(BAT_READ);
bat("tj_" + ftiName + "_tid1").access(BAT_READ);
bat("tj_" + ftiName + "_size1").access(BAT_READ);
+ bat("tj_" + ftiName + "_path1").access(BAT_READ);
bat("tj_" + ftiName + "_fragments").access(BAT_READ);
bat("tj_" + ftiName + "_pfpre").access(BAT_READ);
bat("tj_" + ftiName + "_concept_tid").access(BAT_READ);
@@ -1310,6 +1316,7 @@
bat(_tj_TagBat(ftiName)).print();
print(bat("tj_" + ftiName + "_tid1"));
print(bat("tj_" + ftiName + "_size1"));
+ print(bat("tj_" + ftiName + "_path1"));
print(bat("tj_" + ftiName + "_pfpre"));
print(bat("tj_" + ftiName + "_conceptdict"));
print(bat("tj_" + ftiName + "_concept_tid"));
@@ -1343,6 +1350,7 @@
sum :+= batdsksize(bat("tj_" + ftiName + "_TagIndex"));
sum :+= batdsksize(bat("tj_" + ftiName + "_TermIndex"));
sum :+= batdsksize(bat("tj_" + ftiName + "_size1"));
+ sum :+= batdsksize(bat("tj_" + ftiName + "_path1"));
print(sum);
}
@@ -1907,7 +1915,7 @@
var orcomb := "sum";
var returnall := TRUE;
- var tjPre_score :=
tj_containing_query_nest_pre_NLLR(iter_tjPre.reverse(), Q);
+ var tjPre_score :=
tj_containing_query_nest_pre_term_NLLR(iter_tjPre.reverse(), Q);
var iter_score := iter_tjPre.leftjoin(tjPre_score);
result_item_s.append(iter_score);
------------------------------------------------------------------------------
Come build with us! The BlackBerry® 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/devconf
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
