Changeset: 1788b21f12b9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1788b21f12b9
Modified Files:
clients/Tests/exports.stable.out
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_batop.c
Branch: default
Log Message:
Removed BATrevert.
diffs (123 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
@@ -166,7 +166,6 @@ gdk_return BATprod(void *res, int tp, BA
BAT *BATproject(BAT *l, BAT *r);
BAT *BATrangejoin(BAT *l, BAT *rl, BAT *rh, bit li, bit hi);
gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bit force);
-gdk_return BATrevert(BAT *b);
void BATroles(BAT *b, const char *hnme, const char *tnme);
BAT *BATsample(BAT *b, BUN n);
gdk_return BATsave(BAT *b);
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 9 2015 Sjoerd Mullender <sjo...@acm.org>
+- Removed function BATrevert.
- BATordered now works on the TAIL column.
* Tue Sep 8 2015 Sjoerd Mullender <sjo...@acm.org>
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1595,8 +1595,6 @@ gdk_export gdk_return BATprintf(stream *
/*
* @- BAT clustering
* @multitable @columnfractions 0.08 0.7
- * @item BAT *
- * @tab BATrevert (BAT *b)
* @item int
* @tab BATordered (BAT *b)
* @end multitable
@@ -1612,11 +1610,8 @@ gdk_export gdk_return BATprintf(stream *
*
* BATordered starts a check on the tail values to see if they are
* ordered. The result is returned and stored in the tsorted field of
- * the BAT. The BATrevert puts all the live BUNs of a BAT in reverse
- * order. It just reverses the sequence, so this does not necessarily
- * mean that they are sorted in reverse order!
+ * the BAT.
*/
-gdk_export gdk_return BATrevert(BAT *b);
gdk_export int BATordered(BAT *b);
gdk_export int BATordered_rev(BAT *b);
gdk_export gdk_return BATsubsort(BAT **sorted, BAT **order, BAT **groups, BAT
*b, BAT *o, BAT *g, int reverse, int stable);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1396,72 +1396,6 @@ BATsubsort(BAT **sorted, BAT **order, BA
}
/*
- * Reverse a BAT
- * BATrevert rearranges a BAT in reverse order.
- */
-gdk_return
-BATrevert(BAT *b)
-{
- char *h, *t;
- BUN p, q;
- BATiter bi = bat_iterator(b);
- size_t s;
- int x;
-
- BATcheck(b, "BATrevert", GDK_FAIL);
- if ((b->htype == TYPE_void && b->hseqbase != oid_nil) || (b->ttype ==
TYPE_void && b->tseqbase != oid_nil)) {
- /* materialize void columns in-place */
- if (BATmaterialize(b) != GDK_SUCCEED)
- return GDK_FAIL;
- }
- ALIGNdel(b, "BATrevert", FALSE, GDK_FAIL);
- s = Hsize(b);
- if (s > 0) {
- h = (char *) GDKmalloc(s);
- if (!h) {
- return GDK_FAIL;
- }
- for (p = BUNlast(b) ? BUNlast(b) - 1 : 0, q = BUNfirst(b); p >
q; p--, q++) {
- char *ph = BUNhloc(bi, p);
- char *qh = BUNhloc(bi, q);
-
- memcpy(h, ph, s);
- memcpy(ph, qh, s);
- memcpy(qh, h, s);
- }
- GDKfree(h);
- }
- s = Tsize(b);
- if (s > 0) {
- t = (char *) GDKmalloc(s);
- if (!t) {
- return GDK_FAIL;
- }
- for (p = BUNlast(b) ? BUNlast(b) - 1 : 0, q = BUNfirst(b); p >
q; p--, q++) {
- char *pt = BUNtloc(bi, p);
- char *qt = BUNtloc(bi, q);
-
- memcpy(t, pt, s);
- memcpy(pt, qt, s);
- memcpy(qt, t, s);
- }
- GDKfree(t);
- }
- HASHdestroy(b);
- IMPSdestroy(b);
- /* interchange sorted and revsorted */
- x = b->hrevsorted;
- b->hrevsorted = b->hsorted;
- b->hsorted = x;
- x = b->trevsorted;
- b->trevsorted = b->tsorted;
- b->tsorted = x;
- b->hdense = FALSE;
- b->tdense = FALSE;
- return GDK_SUCCEED;
-}
-
-/*
* return a view on b consisting of the head of b and a new dense tail
* starting at oid_base.
*/
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
