Changeset: bd8e11325a5e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd8e11325a5e
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/profiler.h
Branch: default
Log Message:
Cleanup: declarations without definitions, and unused functions.
diffs (208 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
@@ -707,7 +707,6 @@ str ALGprojectionpath(Client cntxt, MalB
str ALGprojecttail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGrangejoin(bat *r1, bat *r2, const bat *lid, const bat *rlid, const bat
*rhid, const bat *slid, const bat *srid, const bit *li, const bit *hi, const
lng *estimate);
str ALGreuse(bat *ret, const bat *bid);
-str ALGsample(bat *result, const bat *bid, const int *param);
str ALGselect1(bat *result, const bat *bid, const void *low, const void *high,
const bit *li, const bit *hi, const bit *anti);
str ALGselect2(bat *result, const bat *bid, const bat *sid, const void *low,
const void *high, const bit *li, const bit *hi, const bit *anti);
str ALGselectNotNil(bat *result, const bat *bid);
@@ -728,14 +727,9 @@ str ALGsort33(bat *result, bat *norder,
str ALGstdev(dbl *res, const bat *bid);
str ALGstdevp(dbl *res, const bat *bid);
str ALGsubslice_lng(bat *ret, const bat *bid, const lng *start, const lng
*end);
-str ALGtdiff(bat *result, const bat *lid, const bat *rid);
str ALGthetajoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat *sl,
const bat *sr, const int *op, const bit *nil_matches, const lng *estimate);
str ALGthetaselect1(bat *result, const bat *bid, const void *val, const char
**op);
str ALGthetaselect2(bat *result, const bat *bid, const bat *sid, const void
*val, const char **op);
-str ALGtinter(bat *result, const bat *lid, const bat *rid);
-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 ALGunique1(bat *result, const bat *bid);
str ALGunique2(bat *result, const bat *bid, const bat *sid);
str ALGvariance(dbl *res, const bat *bid);
@@ -812,7 +806,6 @@ str BKCisTransient(bit *res, const bat *
str BKCmergecand(bat *ret, const bat *aid, const bat *bid);
str BKCmirror(bat *ret, const bat *bid);
str BKCnewBAT(bat *res, const int *tt, const BUN *cap, int role);
-str BKCpersists(void *r, const bat *bid, const bit *flg);
str BKCreuseBAT(bat *ret, const bat *bid, const bat *did);
str BKCreuseBATmap(bat *ret, const bat *bid, const bat *did);
str BKCsave(bit *res, const char *const *input);
@@ -826,7 +819,6 @@ str BKCsetPersistent(void *r, const bat
str BKCsetTransient(void *r, const bat *bid);
str BKCsetkey(bat *res, const bat *bid, const bit *param);
str BKCshrinkBAT(bat *ret, const bat *bid, const bat *did);
-str BKCshrinkBATmap(bat *ret, const bat *bid, const bat *did);
str BLOBblob_blob(blob **d, blob **s);
str BLOBblob_fromstr(blob **b, str *d);
void BLOBdel(Heap *h, var_t *index);
@@ -988,9 +980,7 @@ str CMDcalcavg(Client cntxt, MalBlkPtr m
str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDcleanup(void *ret);
str CMDcleanupTraces(void *res);
-str CMDclearTrace(void *res);
str CMDcloseProfilerStream(void *res);
str CMDconvert_bit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDconvert_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
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
@@ -812,50 +812,6 @@ ALGcount_no_nil(lng *result, const bat *
}
str
-ALGtmark(bat *result, const bat *bid, const oid *base)
-{
- BAT *b, *bn = NULL;
-
- if ((b = BATdescriptor(*bid)) == NULL) {
- throw(MAL, "algebra.mark", RUNTIME_OBJECT_MISSING);
- }
- bn = BATdense(b->hseqbase, *base, BATcount(b));
- if (bn != NULL) {
- BBPunfix(b->batCacheid);
- *result = bn->batCacheid;
- BBPkeepref(*result);
- return MAL_SUCCEED;
- }
- BBPunfix(b->batCacheid);
- throw(MAL, "algebra.mark", GDK_EXCEPTION);
-}
-
-str
-ALGtmark_default(bat *result, const bat *bid)
-{
- oid o = 0;
-
- return ALGtmark(result, bid, &o);
-}
-
-str
-ALGtmarkp(bat *result, const bat *bid, const int *nr_parts, const int *part_nr)
-{
-#if SIZEOF_OID == 4
- int bits = 31;
-#else
- int bits = 63;
-#endif
- oid base = 0;
-
- assert(*part_nr < *nr_parts);
- base = ((oid)1)<<bits;
- base /= *nr_parts;
- base *= *part_nr;
- return ALGtmark(result, bid, &base);
-}
-
-str
ALGslice(bat *ret, const bat *bid, const lng *start, const lng *end)
{
BAT *b, *bn = 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
@@ -47,9 +47,6 @@ mal_export str ALGcopy(bat *result, cons
mal_export str ALGunique2(bat *result, const bat *bid, const bat *sid);
mal_export str ALGunique1(bat *result, const bat *bid);
mal_export str ALGprojection(bat *result, const bat *lid, const bat *rid);
-mal_export str ALGtinter(bat *result, const bat *lid, const bat *rid);
-mal_export str ALGtdiff(bat *result, const bat *lid, const bat *rid);
-mal_export str ALGsample(bat *result, const bat *bid, const int *param);
mal_export str ALGsort11(bat *result, const bat *bid, const bit *reverse,
const bit *stable);
mal_export str ALGsort12(bat *result, bat *norder, const bat *bid, const bit
*reverse, const bit *stable);
@@ -63,9 +60,6 @@ mal_export str ALGsort33(bat *result, ba
mal_export str ALGcount_bat(lng *result, const bat *bid);
mal_export str ALGcount_nil(lng *result, const bat *bid, const bit
*ignore_nils);
mal_export str ALGcount_no_nil(lng *result, const bat *bid);
-mal_export str ALGtmark(bat *result, const bat *bid, const oid *base);
-mal_export str ALGtmark_default(bat *result, const bat *bid);
-mal_export str ALGtmarkp(bat *result, const bat *bid, const int *nr_parts,
const int *part_nr);
mal_export str ALGslice(bat *ret, const bat *bid, const lng *start, const lng
*end);
mal_export str ALGslice_int(bat *ret, const bat *bid, const int *start, const
int *end);
mal_export str ALGslice_lng(bat *ret, const bat *bid, const lng *start, const
lng *end);
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -548,7 +548,7 @@ BKCgetKey(bit *ret, const bat *bid)
return MAL_SUCCEED;
}
-str
+static str
BKCpersists(void *r, const bat *bid, const bit *flg)
{
BAT *b;
@@ -1101,6 +1101,7 @@ BKCshrinkBAT(bat *ret, const bat *bid, c
return MAL_SUCCEED;
}
+#if 0
str
BKCshrinkBATmap(bat *ret, const bat *bid, const bat *did)
{
@@ -1156,6 +1157,8 @@ BKCshrinkBATmap(bat *ret, const bat *bid
BBPkeepref(*ret= bn->batCacheid);
return MAL_SUCCEED;
}
+#endif /* unused */
+
/*
* Shrinking a void-headed BAT using a list of oids to ignore.
*/
diff --git a/monetdb5/modules/kernel/bat5.h b/monetdb5/modules/kernel/bat5.h
--- a/monetdb5/modules/kernel/bat5.h
+++ b/monetdb5/modules/kernel/bat5.h
@@ -36,7 +36,6 @@ mal_export str BKCsetkey(bat *res, const
mal_export str BKCisSorted(bit *res, const bat *bid);
mal_export str BKCisSortedReverse(bit *res, const bat *bid);
mal_export str BKCgetKey(bit *ret, const bat *bid);
-mal_export str BKCpersists(void *r, const bat *bid, const bit *flg);
mal_export str BKCsetPersistent(void *r, const bat *bid);
mal_export str BKCisPersistent(bit *res, const bat *bid);
mal_export str BKCsetTransient(void *r, const bat *bid);
@@ -56,7 +55,6 @@ mal_export str BKCsetImprints(bit *ret,
mal_export str BKCgetSequenceBase(oid *r, const bat *bid);
mal_export str BKCshrinkBAT(bat *ret, const bat *bid, const bat *did);
mal_export str BKCreuseBAT(bat *ret, const bat *bid, const bat *did);
-mal_export str BKCshrinkBATmap(bat *ret, const bat *bid, const bat *did);
mal_export str BKCreuseBATmap(bat *ret, const bat *bid, const bat *did);
mal_export str BKCmergecand(bat *ret, const bat *aid, const bat *bid);
mal_export str BKCintersectcand(bat *ret, const bat *aid, const bat *bid);
diff --git a/monetdb5/modules/mal/profiler.c b/monetdb5/modules/mal/profiler.c
--- a/monetdb5/modules/mal/profiler.c
+++ b/monetdb5/modules/mal/profiler.c
@@ -120,6 +120,7 @@ CMDcleanupTraces(void *res)
return MAL_SUCCEED;
}
+#if 0
str
CMDclearTrace(void *res)
{
@@ -127,6 +128,7 @@ CMDclearTrace(void *res)
clearTrace();
return MAL_SUCCEED;
}
+#endif /* unused */
str
CMDgetTrace(bat *res, str *ev)
diff --git a/monetdb5/modules/mal/profiler.h b/monetdb5/modules/mal/profiler.h
--- a/monetdb5/modules/mal/profiler.h
+++ b/monetdb5/modules/mal/profiler.h
@@ -38,8 +38,6 @@ mal_export str CMDnoopProfiler(void *res
mal_export str CMDsetHeartbeat(void *res, int *ev);
mal_export str CMDopenProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
mal_export str CMDcloseProfilerStream(void *res);
-mal_export str CMDcleanup(void *ret);
-mal_export str CMDclearTrace(void *res);
mal_export str CMDcleanupTraces(void *res);
mal_export str CMDgetTrace(bat *res, str *ev);
mal_export str CMDgetprofilerlimit(int *res);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
