Changeset: 9efcf4710407 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9efcf4710407 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out Branch: subjoin Log Message:
approved output diffs (41 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -467,6 +467,7 @@ Ready. [ "algebra", "bandjoin", "command algebra.bandjoin(l:bat[:any_1], r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], c1:any_1, c2:any_1, li:bit, hi:bit, estimate:lng) (X_0:bat[:oid], X_1:bat[:oid]) ", "ALGbandjoin;", "Band join: values in l and r match if r - c1 <[=] l <[=] r + c2" ] [ "algebra", "copy", "command algebra.copy(b:bat[:any_1]):bat[:any_1] ", "ALGcopy;", "Returns physical copy of a BAT." ] [ "algebra", "crossproduct", "command algebra.crossproduct(left:bat[:any_1], right:bat[:any_2]) (l:bat[:oid], r:bat[:oid]) ", "ALGcrossproduct2;", "Returns 2 columns with all BUNs, consisting of the head-oids\n\t from 'left' and 'right' for which there are BUNs in 'left'\n\t and 'right' with equal tails" ] +[ "algebra", "crossproduct", "command algebra.crossproduct(left:bat[:any_1], right:bat[:any_2], sl:bat[:oid], sr:bat[:oid]) (l:bat[:oid], r:bat[:oid]) ", "ALGcrossproduct;", "Returns 2 columns with all BUNs, consisting of the head-oids\n\t from 'left' and 'right' for which there are BUNs in 'left'\n\t and 'right' with equal tails" ] [ "algebra", "difference", "command algebra.difference(l:bat[:any_1], r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng):bat[:oid] ", "ALGdifference;", "Difference of l and r with candidate lists" ] [ "algebra", "exist", "command algebra.exist(b:bat[:any_1], val:any_1):bit ", "ALGexist;", "Returns whether 'val' occurs in b." ] [ "algebra", "fetch", "command algebra.fetch(b:bat[:any_1], x:oid):any_1 ", "ALGfetchoid;", "Returns the value of the BUN at x-th position with 0 <= x < b.count" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -571,6 +571,7 @@ Ready. [ "algebra", "bandjoin", "command algebra.bandjoin(l:bat[:any_1], r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], c1:any_1, c2:any_1, li:bit, hi:bit, estimate:lng) (X_0:bat[:oid], X_1:bat[:oid]) ", "ALGbandjoin;", "Band join: values in l and r match if r - c1 <[=] l <[=] r + c2" ] [ "algebra", "copy", "command algebra.copy(b:bat[:any_1]):bat[:any_1] ", "ALGcopy;", "Returns physical copy of a BAT." ] [ "algebra", "crossproduct", "command algebra.crossproduct(left:bat[:any_1], right:bat[:any_2]) (l:bat[:oid], r:bat[:oid]) ", "ALGcrossproduct2;", "Returns 2 columns with all BUNs, consisting of the head-oids\n\t from 'left' and 'right' for which there are BUNs in 'left'\n\t and 'right' with equal tails" ] +[ "algebra", "crossproduct", "command algebra.crossproduct(left:bat[:any_1], right:bat[:any_2], sl:bat[:oid], sr:bat[:oid]) (l:bat[:oid], r:bat[:oid]) ", "ALGcrossproduct;", "Returns 2 columns with all BUNs, consisting of the head-oids\n\t from 'left' and 'right' for which there are BUNs in 'left'\n\t and 'right' with equal tails" ] [ "algebra", "difference", "command algebra.difference(l:bat[:any_1], r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng):bat[:oid] ", "ALGdifference;", "Difference of l and r with candidate lists" ] [ "algebra", "exist", "command algebra.exist(b:bat[:any_1], val:any_1):bit ", "ALGexist;", "Returns whether 'val' occurs in b." ] [ "algebra", "fetch", "command algebra.fetch(b:bat[:any_1], x:oid):any_1 ", "ALGfetchoid;", "Returns the value of the BUN at x-th position with 0 <= x < b.count" ] diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -687,6 +687,7 @@ str ALGcopy(bat *result, const bat *bid) str ALGcount_bat(lng *result, const bat *bid); str ALGcount_nil(lng *result, const bat *bid, const bit *ignore_nils); str ALGcount_no_nil(lng *result, const bat *bid); +str ALGcrossproduct(bat *l, bat *r, const bat *lid, const bat *rid, const bat *slid, const bat *srid); str ALGcrossproduct2(bat *l, bat *r, const bat *lid, const bat *rid); str ALGdifference(bat *r1, const bat *lid, const bat *rid, const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate); str ALGexist(bit *ret, const bat *bid, const void *val); @@ -2134,6 +2135,7 @@ int getHgeConstant(MalBlkPtr mb, hge val int getIntConstant(MalBlkPtr mb, int val); int getLngConstant(MalBlkPtr mb, lng val); MalBlkPtr getMalBlkHistory(MalBlkPtr mb, int idx); +MalBlkPtr getMalBlkOptimized(MalBlkPtr mb, str name); lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag); void getModuleList(Module **out, int *length); str getName(const char *nme); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
