Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14607/modules/pftijah/Tests
Modified Files:
Tag: M5XQ
createcoll1_frag.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/createcoll1_frag.stable.out,1.6
- 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: createcoll1_frag.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/modules/pftijah/Tests/createcoll1_frag.stable.out,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -d -r1.5 -r1.5.10.1
--- createcoll1_frag.stable.out 7 May 2008 12:29:27 -0000 1.5
+++ createcoll1_frag.stable.out 14 Oct 2009 12:07:12 -0000 1.5.10.1
@@ -24,43 +24,39 @@
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
+tj_init_collection_base("coll1_frag", coll_opt);
+tj_add2collection_frag("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);
+tj_init_collection_base("coll2_frag", coll_opt);
+tj_add2collection_frag("coll2_frag",path+"/xml-docs/dilbert.xml","dilbert.xml",true);
+tj_add2collection_frag("coll2_frag",path+"/xml-docs/dilbert2.xml","dilbert2.xml",true);
+
+
+tj_add2collection_frag("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);
+tj_init_collection_base("coll1_frag100", coll_opt);
+tj_add2collection_frag("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);
+tj_init_collection_base("coll2_frag100", coll_opt);
+tj_add2collection_frag("coll2_frag100",path+"/xml-docs/dilbert.xml","dilbert.xml",true);
+tj_add2collection_frag("coll2_frag100",path+"/xml-docs/dilbert2.xml","dilbert2.xml",true);
+
+
+tj_add2collection_frag("coll2_frag100",path+"/xml-docs/special.xml","special.xml",true);
# compare indexed collections
-var tids1 := bat(_tj_TermBat("coll1_frag")).sort().reverse();
-var tids2 := bat(_tj_TermBat("coll2_frag")).sort().reverse();
-var tids3 := bat(_tj_TermBat("coll1_frag100")).sort().reverse();
-var tids4 := bat(_tj_TermBat("coll2_frag100")).sort().reverse();
-var coll1 := indexfetchjoin(tids1, bat("tj_coll1_frag_TermIndex"),
bat("tj_coll1_frag_Terms"));
-var coll2 := indexfetchjoin(tids2, bat("tj_coll2_frag_TermIndex"),
bat("tj_coll2_frag_Terms"));
-var coll3 := indexfetchjoin(tids3, bat("tj_coll1_frag100_TermIndex"),
bat("tj_coll1_frag100_Terms"));
-var coll4 := indexfetchjoin(tids4, bat("tj_coll2_frag100_TermIndex"),
bat("tj_coll2_frag100_Terms"));
+var coll1 := bat("tj_coll1_frag_termfreq");
+var coll2 := bat("tj_coll2_frag_termfreq");
+var coll3 := bat("tj_coll1_frag100_termfreq");
+var coll4 := bat("tj_coll2_frag100_termfreq");
diff(coll1,coll2).print();
#-----------------#
------------------------------------------------------------------------------
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
