Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24215/Tests
Modified Files:
Tag: May2009
procs.stable.out sigs.stable.out test_indexmerge.milS
test_indexmerge.stable.out
Log Message:
Backport from HEAD:
Fixed some more PROC signatures after recent changes for having count() type as
wrd instead of int.
Fixed and approved accordingly Tests/test_indexmerge
U sigs.stable.out
Index: sigs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/sigs.stable.out,v
retrieving revision 1.37
retrieving revision 1.37.4.1
diff -u -d -r1.37 -r1.37.4.1
--- sigs.stable.out 8 Apr 2009 07:04:55 -0000 1.37
+++ sigs.stable.out 20 May 2009 15:03:10 -0000 1.37.4.1
@@ -35,9 +35,9 @@
[ "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]"
]
-[ "mergeindex2(BAT[oid,oid], BAT[oid,int], BAT[void,oid], BAT[void,oid],
BAT[void,int], int) : BAT[void,BAT]"
]
-[ "offsetindex(BAT[void,oid], int) : BAT[void,oid]"
]
+[ "mergeindex(BAT[oid,oid], BAT[void,oid], BAT[void,oid], wrd) :
BAT[void,BAT]"
]
+[ "mergeindex2(BAT[oid,oid], BAT[oid,int], BAT[void,oid], BAT[void,oid],
BAT[void,int], wrd) : BAT[void,BAT]"
]
+[ "offsetindex(BAT[void,oid], wrd) : BAT[void,oid]"
]
[ "pf2tijah_node(bit, BAT[oid,str], BAT[oid,oid], BAT[oid,oid], BAT[oid,oid],
BAT[oid,int], BAT[oid,str]) : BAT[oid,oid]"
]
[ "serialize_tijah_opt(BAT[void,BAT], int, BAT[void,oid], BAT[void,oid],
BAT[void,oid], BAT[void,int], BAT[void,lng], BAT[void,dbl], BAT[void,str]) :
BAT[str,str]" ]
[ "set_tailkeysorted(BAT[any,any]) : BAT[any,any]"
]
U test_indexmerge.stable.out
Index: test_indexmerge.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/modules/pftijah/Tests/test_indexmerge.stable.out,v
retrieving revision 1.2
retrieving revision 1.2.24.1
diff -u -d -r1.2 -r1.2.24.1
--- test_indexmerge.stable.out 11 Mar 2007 23:26:38 -0000 1.2
+++ test_indexmerge.stable.out 20 May 2009 15:03:10 -0000 1.2.24.1
@@ -29,7 +29,7 @@
tid_pre.insert(2...@0,5...@0);
tid_pre.insert(3...@0,1...@0);
-var x := mergeindex(tid_pre, index, pre, 5);
+var x := mergeindex(tid_pre, index, pre, wrd(5));
x.fetch(0).print();
#-----------------#
# h t # name
U procs.stable.out
Index: procs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/procs.stable.out,v
retrieving revision 1.58
retrieving revision 1.58.2.1
diff -u -d -r1.58 -r1.58.2.1
--- procs.stable.out 13 May 2009 07:38:26 -0000 1.58
+++ procs.stable.out 20 May 2009 15:03:09 -0000 1.58.2.1
@@ -92,15 +92,15 @@
[ "_runtime_create(str, lock, lock) : BAT[lock,BAT]"
]
[ "_runtime_flush() : void"
]
[ "_runtime_get(str) : BAT[lock,BAT]"
]
-[ "_score_LM(dbl, int, int, BAT[oid,int], BAT[void,int]) : BAT[oid,dbl]"
]
-[ "_score_LM(int, int, int, int, BAT[oid,int], BAT[void,int], dbl) :
BAT[oid,dbl]"
]
-[ "_score_LMs(dbl, int, int, BAT[oid,int], BAT[void,int]) : BAT[oid,dbl]"
]
-[ "_score_LMs(int, int, int, int, BAT[oid,int], BAT[void,int], dbl) :
BAT[oid,dbl]"
]
+[ "_score_LM(dbl, wrd, wrd, BAT[oid,int], BAT[void,int]) : BAT[oid,dbl]"
]
+[ "_score_LM(int, wrd, wrd, wrd, BAT[oid,int], BAT[void,int], dbl) :
BAT[oid,dbl]"
]
+[ "_score_LMs(dbl, wrd, wrd, BAT[oid,int], BAT[void,int]) : BAT[oid,dbl]"
]
+[ "_score_LMs(int, wrd, wrd, wrd, BAT[oid,int], BAT[void,int], dbl) :
BAT[oid,dbl]"
]
[ "_score_LogSum(dbl, BAT[oid,dbl]) : BAT[oid,dbl]"
]
-[ "_score_NLLR(dbl, dbl, int, int, BAT[oid,int], BAT[void,int]) :
BAT[oid,dbl]"
]
-[ "_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]"
]
+[ "_score_NLLR(dbl, dbl, wrd, wrd, BAT[oid,int], BAT[void,int]) :
BAT[oid,dbl]"
]
+[ "_score_NLLR(int, wrd, wrd, wrd, BAT[oid,int], BAT[void,int], dbl) :
BAT[oid,dbl]"
]
+[ "_score_OKAPI(dbl, BAT[oid,int], BAT[void,int], wrd, dbl) : BAT[oid,dbl]"
]
+[ "_score_OKAPI(int, BAT[oid,int], BAT[void,int], wrd, 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]"
]
@@ -192,6 +192,7 @@
[ "cosh(flt) : flt"
]
[ "cot(flt) : flt"
]
[ "count_no_nil(BAT[any,any]) : int"
]
+[ "count_wrd(BAT[any,any]) : wrd"
]
[ "cpu() : BAT[str,int]"
]
[ "create_qenv() : BAT[oid,str]"
]
[ "current_date() : date"
]
U test_indexmerge.milS
Index: test_indexmerge.milS
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/modules/pftijah/Tests/test_indexmerge.milS,v
retrieving revision 1.2
retrieving revision 1.2.24.1
diff -u -d -r1.2 -r1.2.24.1
--- test_indexmerge.milS 11 Mar 2007 23:26:38 -0000 1.2
+++ test_indexmerge.milS 20 May 2009 15:03:10 -0000 1.2.24.1
@@ -18,6 +18,6 @@
tid_pre.insert(2...@0,5...@0);
tid_pre.insert(3...@0,1...@0);
-var x := mergeindex(tid_pre, index, pre, 5);
+var x := mergeindex(tid_pre, index, pre, wrd(5));
x.fetch(0).print();
x.fetch(1).print();
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
