Changeset: b78091f9bf3b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b78091f9bf3b Modified Files: clients/Tests/exports.stable.out gdk/ChangeLog gdk/gdk.h gdk/gdk_cross.c monetdb5/modules/kernel/algebra.c Branch: default Log Message:
Removed BATcross1 from list of exported functions. Use BATsubcross instead. diffs (70 lines): 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 @@ -107,7 +107,6 @@ BAT *BATconstant(int tt, const void *val BAT *BATconvert(BAT *b, BAT *s, int tp, int abort_on_error); BAT *BATcopy(BAT *b, int ht, int tt, int writeable, int role); BUN BATcount_no_nil(BAT *b); -gdk_return BATcross1(BAT **r1p, BAT **r2p, BAT *l, BAT *r); gdk_return BATdel(BAT *b, BAT *c, bit force); BAT *BATdelta(BAT *b); void BATderiveHeadProps(BAT *b, int expensive); diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog +* Thu Dec 3 2015 Sjoerd Mullender <[email protected]> +- Removed BATcross1. Use BATsubcross instead. + * Thu Oct 8 2015 Sjoerd Mullender <[email protected]> - Removed all versions of the SORTloop macro. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -3029,7 +3029,6 @@ gdk_export BAT *BATthetasubselect(BAT *b gdk_export BAT *BATconstant(int tt, const void *val, BUN cnt, int role); gdk_export BAT *BATconst(BAT *l, int tt, const void *val, int role); -gdk_export gdk_return BATcross1(BAT **r1p, BAT **r2p, BAT *l, BAT *r); gdk_export gdk_return BATsubcross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr); gdk_export gdk_return BATsubleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate); diff --git a/gdk/gdk_cross.c b/gdk/gdk_cross.c --- a/gdk/gdk_cross.c +++ b/gdk/gdk_cross.c @@ -10,7 +10,7 @@ #include "gdk.h" #include "gdk_private.h" -gdk_return +static gdk_return BATcross1(BAT **r1p, BAT **r2p, BAT *l, BAT *r) { BAT *bn1, *bn2; @@ -57,6 +57,10 @@ BATcross1(BAT **r1p, BAT **r2p, BAT *l, return GDK_SUCCEED; } +/* Calculate a cross product between bats l and r with optional + * candidate lists sl for l and sr for r. + * The result is two bats r1 and r2 which contain the OID (head + * values) of the input bats l and r. */ gdk_return BATsubcross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr) { diff --git a/monetdb5/modules/kernel/algebra.c b/monetdb5/modules/kernel/algebra.c --- a/monetdb5/modules/kernel/algebra.c +++ b/monetdb5/modules/kernel/algebra.c @@ -737,7 +737,7 @@ ALGcrossproduct2( bat *l, bat *r, const BBPunfix(L->batCacheid); throw(MAL, "algebra.crossproduct", RUNTIME_OBJECT_MISSING); } - ret = BATcross1(&bn1, &bn2, L, R); + ret = BATsubcross(&bn1, &bn2, L, R, NULL, NULL); BBPunfix(L->batCacheid); BBPunfix(R->batCacheid); if (ret != GDK_SUCCEED) _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
