Changeset: 37b6ac312803 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37b6ac312803 Modified Files: clients/Tests/exports.stable.out gdk/ChangeLog gdk/gdk.h gdk/gdk_setop.c Branch: default Log Message:
Removed BATkintersect. diffs (99 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 @@ -142,7 +142,6 @@ BAT *BATintersectcand(BAT *a, BAT *b); BAT *BATjoin(BAT *l, BAT *r, BUN estimate); BAT *BATkdiff(BAT *b, BAT *c); gdk_return BATkey(BAT *b, int onoff); -BAT *BATkintersect(BAT *b, BAT *c); BAT *BATleftfetchjoin(BAT *b, BAT *s, BUN estimate); BAT *BATleftjoin(BAT *l, BAT *r, BUN estimate); BAT *BATmark(BAT *b, oid base); diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog +* Fri Sep 4 2015 Sjoerd Mullender <[email protected]> +- Removed function BATkintersect. It wasn't used anymore. It's + functionality can be obtained by using BATsubsemijoin. + * Fri Aug 14 2015 Sjoerd Mullender <[email protected]> - Removed the function BATkunion. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -3112,8 +3112,6 @@ gdk_export void BATsetprop(BAT *b, int i * @tab BATfragment (BAT *b, ptr l, ptr h, ptr L, ptr H) * @item * @item BAT * - * @tab BATkintersect (BAT *b, BAT *c) - * @item BAT * * @tab BATkdiff (BAT *b, BAT *c) * @end multitable * @@ -3189,7 +3187,6 @@ gdk_export BAT *BATleftfetchjoin(BAT *b, gdk_export BAT *BATsubunique(BAT *b, BAT *s); -gdk_export BAT *BATkintersect(BAT *b, BAT *c); gdk_export BAT *BATkdiff(BAT *b, BAT *c); gdk_export BAT *BATmergecand(BAT *a, BAT *b); diff --git a/gdk/gdk_setop.c b/gdk/gdk_setop.c --- a/gdk/gdk_setop.c +++ b/gdk/gdk_setop.c @@ -51,22 +51,15 @@ #include "gdk_private.h" #include "gdk_search.h" -#define HITintersect(h,t) bunfastins(bn,h,t) #define HITdiff(h,t) -#define MISSintersect(h,t) #define MISSdiff(h,t) bunfastins(bn,h,t) -#define HITintersect_nocheck(h,t) bunfastins_nocheck(bn,BUNlast(bn),h,t,Hsize(bn),Tsize(bn)) #define HITdiff_nocheck(h,t) -#define MISSintersect_nocheck(h,t) #define MISSdiff_nocheck(h,t) bunfastins_nocheck(bn,BUNlast(bn),h,t,Hsize(bn),Tsize(bn)) -#define DHITintersect(h,t) bnh[o] = *(h); bnt[o++] = t; #define DHITdiff(h,t) -#define DMISSintersect(h,t) #define DMISSdiff(h,t) bnh[o] = *(h); bnt[o++] = t; -#define ENDintersect(h,t) #define ENDdiff(h,t) for(;p1<q1;p1++) bunfastins(bn,h,t) /* @@ -418,7 +411,6 @@ BATins_k##a1(BAT *bn, BAT *l, BAT *r) return NULL; \ } -batcheck(intersect) batcheck(diff) @@ -465,9 +457,6 @@ diff_intersect(BAT *l, BAT *r, int diff) if (diff) { ALGODEBUG fprintf(stderr, "#diff_intersect: BATins_kdiff(bn, l, r);\n"); bn = BATins_kdiff(bn, l, r); - } else { - ALGODEBUG fprintf(stderr, "#diff_intersect: BATins_kintersect(bn, l, r);\n"); - bn = BATins_kintersect(bn, l, r); } if (bn == NULL) return NULL; @@ -507,9 +496,3 @@ BATkdiff(BAT *l, BAT *r) { return diff_intersect(l, r, 1); } - -BAT * -BATkintersect(BAT *l, BAT *r) -{ - return diff_intersect(l, r, 0); -} _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
