Changeset: 991e4d17abeb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=991e4d17abeb
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_aggr.c
gdk/gdk_calc.h
monetdb5/modules/kernel/aggr.c
Branch: default
Log Message:
Fix function interface.
A "const str" and a "const char *" are very different things, and we
need the latter (the characters pointed to are constant, the pointer
itself isn't).
diffs (76 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
@@ -131,7 +131,7 @@ BAT *BATgroupquantile(BAT *b, BAT *g, BA
BAT *BATgroupsize(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool
abort_on_error);
BAT *BATgroupstdev_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool
skip_nils, bool abort_on_error);
BAT *BATgroupstdev_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool
skip_nils, bool abort_on_error);
-BAT *BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils,
bool abort_on_error, const str separator);
+BAT *BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils,
bool abort_on_error, const char *separator);
BAT *BATgroupsum(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool
abort_on_error);
BAT *BATgroupvariance_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool
skip_nils, bool abort_on_error);
BAT *BATgroupvariance_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool
skip_nils, bool abort_on_error);
@@ -173,7 +173,7 @@ void BATsetcount(BAT *b, BUN cnt);
void BATsetprop(BAT *b, int idx, int type, const void *v);
BAT *BATslice(BAT *b, BUN low, BUN high);
gdk_return BATsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o,
BAT *g, bool reverse, bool stable) __attribute__((__warn_unused_result__));
-gdk_return BATstr_group_concat(ValPtr res, BAT *b, BAT *s, bool skip_nils,
bool abort_on_error, bool nil_if_empty, const str separator);
+gdk_return BATstr_group_concat(ValPtr res, BAT *b, BAT *s, bool skip_nils,
bool abort_on_error, bool nil_if_empty, const char *separator);
gdk_return BATsubcross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr)
__attribute__((__warn_unused_result__));
gdk_return BATsum(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool
abort_on_error, bool nil_if_empty);
gdk_return BATthetajoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, int op, bool nil_matches, BUN estimate)
__attribute__((__warn_unused_result__));
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -3359,7 +3359,7 @@ BATgroupvariance_population(BAT *b, BAT
static gdk_return
concat_strings(void *res, int what, BAT* b, int nonil, oid seqb, BUN start,
BUN end, BUN ngrp, const oid *restrict cand,
- const oid *candend, const oid *restrict gids, oid
min, oid max, bool skip_nils, const str separator,
+ const oid *candend, const oid *restrict gids, oid
min, oid max, bool skip_nils, const char *separator,
const char *func, BUN *has_nils)
{
oid gid;
@@ -3686,7 +3686,7 @@ finish:
}
gdk_return
-BATstr_group_concat(ValPtr res, BAT *b, BAT *s, bool skip_nils, bool
abort_on_error, bool nil_if_empty, const str separator)
+BATstr_group_concat(ValPtr res, BAT *b, BAT *s, bool skip_nils, bool
abort_on_error, bool nil_if_empty, const char *separator)
{
oid min, max;
BUN ngrp, start, end;
@@ -3716,7 +3716,7 @@ BATstr_group_concat(ValPtr res, BAT *b,
}
BAT *
-BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils, bool
abort_on_error, const str separator)
+BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils, bool
abort_on_error, const char *separator)
{
const oid *restrict gids;
BAT *bn = NULL;
diff --git a/gdk/gdk_calc.h b/gdk/gdk_calc.h
--- a/gdk/gdk_calc.h
+++ b/gdk/gdk_calc.h
@@ -151,5 +151,5 @@ gdk_export dbl BATcalcvariance_sample(db
gdk_export BAT *BATgroupvariance_sample(BAT *b, BAT *g, BAT *e, BAT *s, int
tp, bool skip_nils, bool abort_on_error);
gdk_export BAT *BATgroupvariance_population(BAT *b, BAT *g, BAT *e, BAT *s,
int tp, bool skip_nils, bool abort_on_error);
-gdk_export BAT *BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, bool
skip_nils, bool abort_on_error, const str separator);
-gdk_export gdk_return BATstr_group_concat(ValPtr res, BAT *b, BAT *s, bool
skip_nils, bool abort_on_error, bool nil_if_empty, const str separator);
+gdk_export BAT *BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, bool
skip_nils, bool abort_on_error, const char *separator);
+gdk_export gdk_return BATstr_group_concat(ValPtr res, BAT *b, BAT *s, bool
skip_nils, bool abort_on_error, bool nil_if_empty, const char *separator);
diff --git a/monetdb5/modules/kernel/aggr.c b/monetdb5/modules/kernel/aggr.c
--- a/monetdb5/modules/kernel/aggr.c
+++ b/monetdb5/modules/kernel/aggr.c
@@ -923,8 +923,8 @@ AGGRsubquantilecand(bat *retval, const b
static str
AGGRgroup_str_concat(bat *retval1, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, bool skip_nils,
- bool abort_on_error, BAT
*(*str_func)(BAT *, BAT *, BAT *, BAT *, bool, bool, const str),
- const str separator, const char
*malfunc)
+ bool abort_on_error, BAT
*(*str_func)(BAT *, BAT *, BAT *, BAT *, bool, bool, const char *),
+ const char *separator, const char
*malfunc)
{
BAT *b, *g, *e, *s, *bn = NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
