Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14612
Modified Files:
colltest0.milS colltest0.stable.out sigs.stable.out
test_lms_manyqueries.xq test_nllr_manyqueries.xq
Log Message:
- Several test updates, Try to make testweb green for pftijah
Index: test_nllr_manyqueries.xq
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/modules/pftijah/Tests/test_nllr_manyqueries.xq,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test_nllr_manyqueries.xq 10 May 2007 09:26:20 -0000 1.5
+++ test_nllr_manyqueries.xq 1 Jun 2007 12:21:00 -0000 1.6
@@ -6,6 +6,6 @@
let $query := "//chapter[about(.//title,information) and
about(.//title,retrieval)]//section[about(.,pathfinder) or about(.,tijah)]"
-for $i in (0 to 1000)
+for $i in (0 to 200)
for $n at $r in tijah:queryall($query,$opt)
return <node rank="{$r}">{$n}</node>
Index: test_lms_manyqueries.xq
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/modules/pftijah/Tests/test_lms_manyqueries.xq,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test_lms_manyqueries.xq 10 May 2007 09:26:15 -0000 1.5
+++ test_lms_manyqueries.xq 1 Jun 2007 12:21:00 -0000 1.6
@@ -6,6 +6,6 @@
let $query := "//chapter[about(.//title,information) and
about(.//title,retrieval)]//section[about(.,pathfinder) or about(.,tijah)]"
-for $i in (0 to 1000)
+for $i in (0 to 200)
for $n at $r in tijah:queryall($query,$opt)
return <node rank="{$r}">{$n}</node>
Index: colltest0.milS
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/colltest0.milS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- colltest0.milS 25 May 2007 14:13:42 -0000 1.1
+++ colltest0.milS 1 Jun 2007 12:20:59 -0000 1.2
@@ -5,7 +5,22 @@
var path:=getenv("TSTSRCDIR");
# create the 3 document PFCOLL collection
-shred_doc(path+"/xml-docs/cdilbert1.xml","cdilbert1.xml","PFCOLL",0LL);
-shred_doc(path+"/xml-docs/cdilbert2.xml","cdilbert2.xml","PFCOLL",0LL);
-shred_doc(path+"/xml-docs/cdilbert3.xml","cdilbert3.xml","PFCOLL",0LL);
+# 3 individual shreds gave spurious warnings, this sould work everywhere
+shred_doc(bat(void,str)
+ .append(path+"/xml-docs/cdilbert1.xml")
+ .append(path+"/xml-docs/cdilbert2.xml")
+ .append(path+"/xml-docs/cdilbert3.xml").seqbase([EMAIL
PROTECTED]),
+ bat(void,str)
+ .append("cdilbert1.xml")
+ .append("cdilbert2.xml")
+ .append("cdilbert3.xml").seqbase([EMAIL PROTECTED]),
+ bat(void,str)
+ .append("PFCOLL")
+ .append("PFCOLL")
+ .append("PFCOLL").seqbase([EMAIL PROTECTED]),
+ bat(void,lng)
+ .append(0LL)
+ .append(0LL)
+ .append(0LL).seqbase([EMAIL PROTECTED]));
+
Index: sigs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/sigs.stable.out,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sigs.stable.out 30 May 2007 14:01:54 -0000 1.13
+++ sigs.stable.out 1 Jun 2007 12:21:00 -0000 1.14
@@ -27,6 +27,12 @@
[ "_tj_throw2collection(BAT[str,BAT], BAT[oid,BAT], str, str) : void"
]
[ "_tj_throw2collection_index(BAT[str,BAT], str) : void"
]
[ "indexfetchjoin(BAT[any,oid], BAT[void,oid], BAT[void,oid]) : BAT[void,oid]"
]
+[ "left_add(BAT[oid,dbl], BAT[oid,dbl]) : BAT[oid,dbl]"
]
+[ "left_div(BAT[oid,dbl], BAT[oid,dbl]) : BAT[oid,dbl]"
]
+[ "left_div(BAT[oid,dbl], BAT[oid,int]) : BAT[oid,dbl]"
]
+[ "left_log(BAT[oid,dbl]) : BAT[oid,dbl]"
]
+[ "left_mul(BAT[oid,dbl], BAT[oid,dbl]) : BAT[oid,dbl]"
]
+[ "left_sub(BAT[oid,dbl], BAT[oid,dbl]) : BAT[oid,dbl]"
]
[ "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[oid,str], BAT[oid,oid], BAT[oid,oid], BAT[oid,oid],
BAT[oid,int], BAT[oid,str]) : BAT[void,oid]"
]
Index: colltest0.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/modules/pftijah/Tests/colltest0.stable.out,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- colltest0.stable.out 29 May 2007 14:41:53 -0000 1.2
+++ colltest0.stable.out 1 Jun 2007 12:21:00 -0000 1.3
@@ -17,14 +17,26 @@
var path:=getenv("TSTSRCDIR");
# create the 3 document PFCOLL collection
-shred_doc(path+"/xml-docs/cdilbert1.xml","cdilbert1.xml","PFCOLL",0LL);
-# Elapsed time = 574us [009us/node]
-# Shredded 1 XML document (cdilbert1.xml), total time after commit=0.015s
-shred_doc(path+"/xml-docs/cdilbert2.xml","cdilbert2.xml","PFCOLL",0LL);
-# Elapsed time = 261us [004us/node]
-# Shredded 1 XML document (cdilbert2.xml), total time after commit=0.015s
-shred_doc(path+"/xml-docs/cdilbert3.xml","cdilbert3.xml","PFCOLL",0LL);
-# Elapsed time = 529us [009us/node]
+shred_doc(bat(void,str)
+ .append(path+"/xml-docs/cdilbert1.xml")
+ .append(path+"/xml-docs/cdilbert2.xml")
+ .append(path+"/xml-docs/cdilbert3.xml").seqbase([EMAIL
PROTECTED]),
+ bat(void,str)
+ .append("cdilbert1.xml")
+ .append("cdilbert2.xml")
+ .append("cdilbert3.xml").seqbase([EMAIL PROTECTED]),
+ bat(void,str)
+ .append("PFCOLL")
+ .append("PFCOLL")
+ .append("PFCOLL").seqbase([EMAIL PROTECTED]),
+ bat(void,lng)
+ .append(0LL)
+ .append(0LL)
+ .append(0LL).seqbase([EMAIL PROTECTED]));
+# Elapsed time = 583us [010us/node]
+# Elapsed time = 178us [003us/node]
+# Elapsed time = 142us [002us/node]
+# Shredded 3 XML documents, total time after commit=0.015s
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
