Changeset: ef98d34102b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef98d34102b3
Modified Files:
clients/Tests/exports.stable.out
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_join_legacy.c
Branch: default
Log Message:
Removed BATleftfetchjoin.
diffs (75 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
@@ -140,7 +140,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 *BATleftfetchjoin(BAT *b, BAT *s, BUN estimate);
BAT *BATleftjoin(BAT *l, BAT *r, BUN estimate);
BAT *BATmark(BAT *b, oid base);
BAT *BATmark_grp(BAT *b, BAT *g, const oid *base);
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -2,6 +2,7 @@
# This file is updated with Maddlog
* Wed Sep 16 2015 Sjoerd Mullender <sjo...@acm.org>
+- Removed BATleftfetchjoin. Use BATproject instead.
- Removed BUNins from the list of exported functions.
* Thu Sep 10 2015 Sjoerd Mullender <sjo...@acm.org>
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -3134,7 +3134,6 @@ gdk_export gdk_return BATsubrangejoin(BA
gdk_export BAT *BATproject(BAT *l, BAT *r);
gdk_export BAT *BATslice(BAT *b, BUN low, BUN high);
-gdk_export BAT *BATleftfetchjoin(BAT *b, BAT *s, BUN estimate);
gdk_export BAT *BATsubunique(BAT *b, BAT *s);
@@ -3228,17 +3227,6 @@ gdk_export BAT *BATsample(BAT *b, BUN n)
BATleftjoin(_l, _r, (estimate)); \
})
-#define BATleftfetchjoin(l, r, estimate) \
- ({ \
- BAT *_l = (l), *_r = (r); \
- HEADLESSDEBUG fprintf(stderr, \
- "#BATleftfetchjoin([%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__); \
- BATleftfetchjoin(_l, _r, (estimate)); \
- })
-
#define BATkdiff(l, r) \
({ \
BAT *_l = (l), *_r = (r); \
diff --git a/gdk/gdk_join_legacy.c b/gdk/gdk_join_legacy.c
--- a/gdk/gdk_join_legacy.c
+++ b/gdk/gdk_join_legacy.c
@@ -15,7 +15,6 @@
#undef BATsemijoin
#undef BATjoin
#undef BATleftjoin
-#undef BATleftfetchjoin
/* Return a subset of l where head elements occur as head element in r. */
BAT *
@@ -198,12 +197,3 @@ BATleftjoin(BAT *l, BAT *r, BUN estimate
return do_batjoin(l, r, estimate,
BATsubleftjoin, "BATleftjoin");
}
-
-/* join [any_1,any_2] with [any_2,any_3], return [any_1,any_3];
- * if there is no match for a tuple in l, return nil in tail */
-BAT *
-BATleftfetchjoin(BAT *l, BAT *r, BUN estimate)
-{
- return do_batjoin(l, r, estimate,
- BATsubleftfetchjoin, "BATleftfetchjoin");
-}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
