Update of /cvsroot/monetdb/pathfinder/runtime/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23220/runtime/Tests
Modified Files:
merged_union.stable.out.64bit merged_union2.stable.out
procs.stable.out sigs.stable.out
Log Message:
finally, I managed to fullfil JanR's "small wish":
replaced
PROC multi_merged_union (BAT[void, BAT] b) : BAT[void,BAT]
by
.COMMAND multi_merged_union (BAT[void, BAT] b)
: BAT[void,BAT] = CMDmulti_merged_union;
"PARAMETERS:
BAT[void,BAT t[void,BAT c[VoID,any]]]:
a void-headed BAT of n void-headed BATs t such that each BAT t represents a
relational table t of m columns c, each represented by a dense-headed BAT c;
the first column of each table must be sorted.
DESCRIPTION:
Merges the n relational tables t according to the value-order as defined by the
first columns of all tables."
At a slight performance decrease with only 2 or 3 tables,
it yields a performance gain of 25% - 63% with 4-9 tables
(each table has 9 columns and 1000000 tuples):
# Old New New-Old (N-O)/O
2 289745 339914 50169 17%
3 719059 904862 185803 25%
4 1302676 955985 -346691 -26%
5 2023403 1082348 -941055 -46%
6 2922657 1359887 -1562770 -53%
7 3757045 1597463 -2159582 -57%
8 5151854 1878731 -3273123 -63%
9 6028759 2177258 -3851501 -63%
Index: sigs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Tests/sigs.stable.out,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- sigs.stable.out 16 May 2007 07:55:54 -0000 1.84
+++ sigs.stable.out 20 Jul 2007 21:12:47 -0000 1.85
@@ -65,6 +65,7 @@
[ "merged_union(any, any, ..any..) : BAT[void,BAT]"
]
[ "movedata(BAT[void,BAT], oid, oid, int, int) : void"
]
[ "mposjoin(BAT[oid,oid], BAT[oid,oid], BAT[oid,BAT]) : BAT[void,any]"
]
+[ "multi_merged_union(BAT[void,BAT]) : BAT[void,BAT]"
]
[ "mvaljoin(BAT[oid,oid], BAT[oid,oid], BAT[oid,BAT]) : BAT[oid,oid]"
]
[ "myupdate(BAT[any::1,any::2], BAT[any::1,any::2]) : BAT[any::1,any::2]"
]
[ "myupdate(BAT[any::1,any::2], any::1, any::2) : BAT[any::1,any::2]"
]
Index: merged_union.stable.out.64bit
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/runtime/Tests/merged_union.stable.out.64bit,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- merged_union.stable.out.64bit 6 Jun 2007 12:16:37 -0000 1.2
+++ merged_union.stable.out.64bit 20 Jul 2007 21:12:46 -0000 1.3
@@ -79,8 +79,8 @@
# h tmp_32 # name
# void BAT # type
#-------------------------#
-[ [EMAIL PROTECTED], <tmp_170> ]
-[ [EMAIL PROTECTED], <tmp_171> ]
+[ [EMAIL PROTECTED], <tmp_171> ]
+[ [EMAIL PROTECTED], <tmp_172> ]
print(fetch(x,0),fetch(x,1));
#-------------------------#
# h tmp_33 tmp_34 # name
@@ -152,8 +152,8 @@
# h tmp_32 # name
# void BAT # type
#-------------------------#
-[ [EMAIL PROTECTED], <tmp_170> ]
-[ [EMAIL PROTECTED], <tmp_171> ]
+[ [EMAIL PROTECTED], <tmp_176> ]
+[ [EMAIL PROTECTED], <tmp_172> ]
print(fetch(x,0),fetch(x,1));
#-------------------------#
# h tmp_29 tmp_28 # name
Index: procs.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Tests/procs.stable.out,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- procs.stable.out 27 Jun 2007 13:46:51 -0000 1.69
+++ procs.stable.out 20 Jul 2007 21:12:47 -0000 1.70
@@ -451,7 +451,6 @@
[ "mposjoin(any, oid, BAT[oid,BAT]) : BAT[void,any]"
]
[ "msecs(int, int, int, int, int) : lng"
]
[ "msync(BAT[void,any::1], oid, bit) : BAT[void,any::1]"
]
-[ "multi_merged_union(BAT[void,BAT]) : BAT[void,BAT]"
]
[ "mvaljoin(any, oid, BAT[oid,BAT]) : BAT[oid,oid]"
]
[ "mylog_delta(logger, BAT[any,any], str) : void"
]
[ "myupdate(BAT[any::1,any::2], BAT[any::1,any::2]) : BAT[any::1,any::2]"
]
Index: merged_union2.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Tests/merged_union2.stable.out,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- merged_union2.stable.out 29 Aug 2006 10:47:07 -0000 1.5
+++ merged_union2.stable.out 20 Jul 2007 21:12:47 -0000 1.6
@@ -832,16 +832,16 @@
res_mu := merged_union (a1, a5, b5, b1); # wrong length
-!ERROR: merged_union: BAT 3 (hseqbase=2) must have the same hseqbase as BAT 1
(hseqbase=0).
+!ERROR: merged_union: BAT/column 2 of table 1 (hseqbase=2) must have the same
hseqbase as all other BATs/columns of table 1 (hseqbase=0).
!ERROR: CMDmerged_union: operation failed.
res_mu := merged_union (a1, a5, e, a5); # wrong seqbase
res_mu := merged_union (b1, b2); # string, string
res_mu := merged_union (a1, b2); # oid, string
-!ERROR: merged_union: BATs 1 (ttype=7) & 2 (ttype=13) must have the same tail
types.
+!ERROR: merged_union: BAT/column 1 of table 2 (ttype=13) must have the same
tail type as BAT/column 1 of all other tables (ttype=7).
!ERROR: CMDmerged_union: operation failed.
res_mu := merged_union (c1, a2); # int, oid
-!ERROR: merged_union: BATs 1 (ttype=6) & 2 (ttype=7) must have the same tail
types.
+!ERROR: merged_union: BAT/column 1 of table 2 (ttype=7) must have the same
tail type as BAT/column 1 of all other tables (ttype=6).
!ERROR: CMDmerged_union: operation failed.
var z1 := a1.copy();
@@ -876,10 +876,10 @@
[ [EMAIL PROTECTED], [EMAIL PROTECTED] ]
res_mu := merged_union (z1, a2); # first not dense
-!ERROR: merged_union: BAT 1 must have a dense head.
+!ERROR: merged_union: BAT/column 1 of table 1 must have a dense head.
!ERROR: CMDmerged_union: operation failed.
res_mu := merged_union (a2, z1); # snd not dens
-!ERROR: merged_union: BAT 2 must have a dense head.
+!ERROR: merged_union: BAT/column 1 of table 2 must have a dense head.
!ERROR: CMDmerged_union: operation failed.
z1.delete([EMAIL PROTECTED],[EMAIL PROTECTED]);
@@ -922,10 +922,10 @@
z1.insert([EMAIL PROTECTED],[EMAIL PROTECTED]);
res_mu := merged_union (z1, a2); # fst not sorted
-!ERROR: merged_union: tail of first BAT must be sorted.
+!ERROR: merged_union: tail of first BAT/column of table 1 must be sorted.
!ERROR: CMDmerged_union: operation failed.
res_mu := merged_union (a2, z1); # snd not sorted
-!ERROR: merged_union: tail of second BAT must be sorted.
+!ERROR: merged_union: tail of first BAT/column of table 2 must be sorted.
!ERROR: CMDmerged_union: operation failed.
quit();
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
