Changeset: 64850f9dfeac for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=64850f9dfeac Removed Files: gdk/gdk_setop.c Modified Files: gdk/ChangeLog gdk/Makefile.ag gdk/gdk_batop.c gdk/gdk_private.h Branch: default Log Message:
Removed BATkdiff. diffs (122 lines): 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 Oct 1 2015 Sjoerd Mullender <[email protected]> +- Removed Batkdiff. Use BATsubdiff instead. + * Wed Sep 16 2015 Sjoerd Mullender <[email protected]> - Removed BATselect. Use BATsubselect instead. - Removed BATsemijoin. Use BATsubsemijoin instead. @@ -24,8 +27,7 @@ * Sat Sep 5 2015 Sjoerd Mullender <[email protected]> - Implemented BATsubdiff which returns a list of OIDs (sorted, i.e. usable as candidate list) of tuples in the left input whose value does not - occur in the right input. Reimplemented BATkdiff (to be removed later) - using this new function. + occur in the right input. * Fri Sep 4 2015 Sjoerd Mullender <[email protected]> - Removed function BATkintersect. It wasn't used anymore. It's diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag --- a/gdk/Makefile.ag +++ b/gdk/Makefile.ag @@ -16,7 +16,7 @@ lib_gdk = { gdk_select.c \ gdk_search.c gdk_search.h gdk_tm.c \ gdk_align.c gdk_bbp.c gdk_bbp.h \ - gdk_heap.c gdk_setop.c gdk_utils.c gdk_utils.h \ + gdk_heap.c gdk_utils.c gdk_utils.h \ gdk_atoms.c gdk_atoms.h \ gdk_qsort.c gdk_qsort_impl.h gdk_ssort.c gdk_ssort_impl.h \ gdk_storage.c gdk_bat.c \ diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_batop.c @@ -461,13 +461,8 @@ BATins(BAT *b, BAT *n, bit force) } if (b->T->hash == NULL && (b->tkey & BOUND2BTRUE) == 0 && - ((b->hkey & BOUND2BTRUE) == 0 || n->hkey) && + (b->hkey & BOUND2BTRUE) == 0 && (b->H->hash == NULL || ATOMstorage(b->htype) == ATOMstorage(TYPE_oid))) { - if (b->hkey & BOUND2BTRUE && b->batCount > 0) { - tmp = n = BATkdiff(n, b); - if (n == NULL) - return GDK_FAIL; - } fastpath = 1; } diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h --- a/gdk/gdk_private.h +++ b/gdk/gdk_private.h @@ -67,8 +67,6 @@ struct BATstore { __attribute__((__visibility__("hidden"))); __hidden void BATinit_idents(BAT *bn) __attribute__((__visibility__("hidden"))); -__hidden BAT *BATkdiff(BAT *b, BAT *c) - __attribute__((__visibility__("hidden"))); __hidden BAT *BATload_intern(bat bid, int lock) __attribute__((__visibility__("hidden"))); __hidden gdk_return BATmaterialize(BAT *b) @@ -509,17 +507,6 @@ GDKmremap_debug(const char *path, int mo #ifdef __GNUC__ /* in debug builds, complain (warn) about usage of legacy functions */ -#define BATkdiff(l, r) \ - ({ \ - BAT *_l = (l), *_r = (r); \ - HEADLESSDEBUG fprintf(stderr, \ - "#BATkdiff([%s,%s]#"BUNFMT",[%s,%s]#"BUNFMT") %s[%s:%d]\n", \ - _COL_TYPE(_l->H), _COL_TYPE(_l->T), BATcount(_l), \ - _COL_TYPE(_r->H), _COL_TYPE(_r->T), BATcount(_r), \ - __func__, __FILE__, __LINE__); \ - BATkdiff(_l, _r); \ - }) - #define BATmaterializeh(b) \ ({ \ BAT *_b = (b); \ diff --git a/gdk/gdk_setop.c b/gdk/gdk_setop.c deleted file mode 100644 --- a/gdk/gdk_setop.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Copyright 2008-2015 MonetDB B.V. - */ - -#include "monetdb_config.h" -#include "gdk.h" -#include "gdk_private.h" - -#undef BATkdiff - -BAT * -BATkdiff(BAT *l, BAT *r) -{ - BAT *l1, *l2, *r1, *d; - - l1 = BATmirror(BATmark(l, 0)); - l2 = BATmirror(BATmark(BATmirror(l), 0)); - r1 = BATmirror(BATmark(r, 0)); - d = BATsubdiff(l1, r1, NULL, NULL, 0, BUN_NONE); - BBPunfix(r1->batCacheid); - r1 = BATproject(d, l1); - BBPunfix(l1->batCacheid); - l1 = BATproject(d, l2); - BBPunfix(d->batCacheid); - BBPunfix(l2->batCacheid); - d = VIEWcreate(BATmirror(r1), l1); - BBPunfix(r1->batCacheid); - BBPunfix(l1->batCacheid); - return d; -} _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
