Changeset: 77b343031a42 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77b343031a42
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
Branch: default
Log Message:
Removed ALGtsort and ALGtsort_rev: they were not used.
There was no MAL interface to these functions.
Also removed orphan declarations of ALGssort and ALGssort_rev.
diffs (87 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
@@ -763,8 +763,6 @@ str ALGslice(bat *ret, const bat *bid, c
str ALGslice_int(bat *ret, const bat *bid, const int *start, const int *end);
str ALGslice_oid(bat *ret, const bat *bid, const oid *start, const oid *end);
str ALGslice_wrd(bat *ret, const bat *bid, const wrd *start, const wrd *end);
-str ALGssort(bat *result, const bat *bid);
-str ALGssort_rev(bat *result, const bat *bid);
str ALGstdev(dbl *res, const bat *bid);
str ALGstdevp(dbl *res, const bat *bid);
str ALGsubbandjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat
*slid, const bat *srid, const void *low, const void *high, const bit *li, const
bit *hi, const lng *estimate);
@@ -800,8 +798,6 @@ str ALGtinter(bat *result, const bat *li
str ALGtmark(bat *result, const bat *bid, const oid *base);
str ALGtmark_default(bat *result, const bat *bid);
str ALGtmarkp(bat *result, const bat *bid, const int *nr_parts, const int
*part_nr);
-str ALGtsort(bat *result, const bat *bid);
-str ALGtsort_rev(bat *result, const bat *bid);
str ALGvariance(dbl *res, const bat *bid);
str ALGvariancep(dbl *res, const bat *bid);
str AUTHaddUser(oid *ret, Client c, str *user, str *pass);
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -1258,48 +1258,6 @@ ALGtinter(bat *result, const bat *bid, c
}
str
-ALGtsort(bat *result, const bat *bid)
-{
- BAT *b, *bn;
-
- if ((b = BATdescriptor(*bid)) == NULL) {
- throw(MAL, "algebra.tsort", RUNTIME_OBJECT_MISSING);
- }
- bn = BATsort(BATmirror(b));
- if (bn) {
- bn = BATmirror(bn);
- if (!(bn->batDirty&2)) BATsetaccess(bn, BAT_READ);
- *result = bn->batCacheid;
- BBPkeepref(*result);
- BBPunfix(b->batCacheid);
- return MAL_SUCCEED;
- }
- BBPunfix(b->batCacheid);
- throw(MAL, "algebra.tsort", GDK_EXCEPTION);
-}
-
-str
-ALGtsort_rev(bat *result, const bat *bid)
-{
- BAT *b, *bn;
-
- if ((b = BATdescriptor(*bid)) == NULL) {
- throw(MAL, "algebra.tsort", RUNTIME_OBJECT_MISSING);
- }
- bn = BATsort_rev(BATmirror(b));
- if (bn) {
- bn = BATmirror(bn);
- if (!(bn->batDirty&2)) BATsetaccess(bn, BAT_READ);
- *result = bn->batCacheid;
- BBPkeepref(*result);
- BBPunfix(b->batCacheid);
- return MAL_SUCCEED;
- }
- BBPunfix(b->batCacheid);
- throw(MAL, "algebra.tsort", GDK_EXCEPTION);
-}
-
-str
ALGsubsort33(bat *result, bat *norder, bat *ngroup, const bat *bid, const bat
*order, const bat *group, const bit *reverse, const bit *stable)
{
BAT *bn = NULL, *on = NULL, *gn = NULL;
diff --git a/monetdb5/modules/kernel/algebra.h
b/monetdb5/modules/kernel/algebra.h
--- a/monetdb5/modules/kernel/algebra.h
+++ b/monetdb5/modules/kernel/algebra.h
@@ -83,10 +83,6 @@ algebra_export str ALGkdiff(bat *result,
algebra_export str ALGtdiff(bat *result, const bat *lid, const bat *rid);
algebra_export str ALGsample(bat *result, const bat *bid, const int *param);
-algebra_export str ALGtsort(bat *result, const bat *bid);
-algebra_export str ALGtsort_rev(bat *result, const bat *bid);
-algebra_export str ALGssort(bat *result, const bat *bid);
-algebra_export str ALGssort_rev(bat *result, const bat *bid);
algebra_export str ALGsubsort11(bat *result, const bat *bid, const bit
*reverse, const bit *stable);
algebra_export str ALGsubsort12(bat *result, bat *norder, const bat *bid,
const bit *reverse, const bit *stable);
algebra_export str ALGsubsort13(bat *result, bat *norder, bat *ngroup, const
bat *bid, const bit *reverse, const bit *stable);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
