Changeset: cbd15dd7757b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbd15dd7757b
Modified Files:
gdk/gdk_batop.c
gdk/gdk_orderidx.c
gdk/gdk_private.h
gdk/gdk_ssort_impl.h
Branch: default
Log Message:
Change interface of GDKssort* functions to return GDK_SUCCEED/GDK_FAIL.
diffs (79 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1189,17 +1189,13 @@ do_sort(void *h, void *t, const void *ba
return GDK_SUCCEED;
if (reverse) {
if (stable) {
- if (GDKssort_rev(h, t, base, n, hs, ts, tpe) < 0) {
- return GDK_FAIL;
- }
+ return GDKssort_rev(h, t, base, n, hs, ts, tpe);
} else {
GDKqsort_rev(h, t, base, n, hs, ts, tpe);
}
} else {
if (stable) {
- if (GDKssort(h, t, base, n, hs, ts, tpe) < 0) {
- return GDK_FAIL;
- }
+ return GDKssort(h, t, base, n, hs, ts, tpe);
} else {
GDKqsort(h, t, base, n, hs, ts, tpe);
}
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -164,7 +164,7 @@ BATorderidx(BAT *b, int stable)
if (GDKssort(Tloc(bn, 0), mv,
bn->tvheap ? bn->tvheap->base : NULL,
BATcount(bn), Tsize(bn), SIZEOF_OID,
- bn->ttype) < 0) {
+ bn->ttype) != GDK_SUCCEED) {
HEAPfree(m, 1);
GDKfree(m);
MT_lock_unset(&GDKhashLock(b->batCacheid));
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -123,9 +123,9 @@ void BBPdump(void); /* never called: fo
__attribute__((__visibility__("hidden")));
__hidden gdk_return GDKsave(int farmid, const char *nme, const char *ext, void
*buf, size_t size, storage_t mode, int dosync)
__attribute__((__visibility__("hidden")));
-__hidden int GDKssort_rev(void *h, void *t, const void *base, size_t n, int
hs, int ts, int tpe)
+__hidden gdk_return GDKssort_rev(void *h, void *t, const void *base, size_t n,
int hs, int ts, int tpe)
__attribute__((__visibility__("hidden")));
-__hidden int GDKssort(void *h, void *t, const void *base, size_t n, int hs,
int ts, int tpe)
+__hidden gdk_return GDKssort(void *h, void *t, const void *base, size_t n, int
hs, int ts, int tpe)
__attribute__((__visibility__("hidden")));
__hidden gdk_return GDKunlink(int farmid, const char *dir, const char *nme,
const char *extension)
__attribute__((__visibility__("hidden")));
diff --git a/gdk/gdk_ssort_impl.h b/gdk/gdk_ssort_impl.h
--- a/gdk/gdk_ssort_impl.h
+++ b/gdk/gdk_ssort_impl.h
@@ -796,14 +796,14 @@ do_ssort(MergeState *ms, ssize_t nremain
* is non-NULL, the key is actually an offset relative to "heap" and
* the actual key is found at that offset (MonetDB var-sized
* atoms). */
-int
+gdk_return
GDKssortimpl(void *h, void *t, const void *heap, size_t nitems,
int hs, int ts, int tpe)
{
char temp;
MergeState ms;
ssize_t nremaining;
- int result = -1;
+ gdk_return result = GDK_FAIL;
size_t lo, hi;
ssize_t minrun;
@@ -882,7 +882,7 @@ GDKssortimpl(void *h, void *t, const voi
assert(ms.pending[0].len == (ssize_t) nitems);
succeed:
- result = 0;
+ result = GDK_SUCCEED;
fail:
merge_freemem(&ms);
return result;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
