Changeset: a655ead1a982 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a655ead1a982
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_join.c
Branch: candidate-exceptions
Log Message:
Add some more restricts.
diffs (69 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -1082,7 +1082,7 @@ BATsum(void *res, int tp, BAT *b, BAT *s
} while (0)
static BUN
-doprod(const void *restrict values, oid seqb, struct canditer *ci, BUN ncand,
+doprod(const void *restrict values, oid seqb, struct canditer *restrict ci,
BUN ncand,
void *restrict results, BUN ngrp, int tp1, int tp2,
const oid *restrict gids, bool gidincr, oid min, oid max,
bool skip_nils, bool abort_on_error, bool nil_if_empty, const char
*func)
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -252,7 +252,7 @@ joininitresults(BAT **r1p, BAT **r2p, BU
* values of l, and *r2p (if r2p is not NULL) is all nil. If neither
* of those flags is set, the result is two empty BATs. */
static gdk_return
-nomatch(BAT **r1p, BAT **r2p, BAT *l, BAT *r, struct canditer *lci,
+nomatch(BAT **r1p, BAT **r2p, BAT *l, BAT *r, struct canditer *restrict lci,
bool nil_on_miss, bool only_misses, const char *func, lng t0)
{
BAT *r1, *r2 = NULL;
@@ -299,7 +299,7 @@ nomatch(BAT **r1p, BAT **r2p, BAT *l, BA
* point select to find matches in the right column. */
static gdk_return
selectjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
- struct canditer *lci, bool nil_matches, lng t0, bool swapped)
+ struct canditer *restrict lci, bool nil_matches, lng t0, bool
swapped)
{
BATiter li = bat_iterator(l);
const void *v;
@@ -409,7 +409,7 @@ selectjoin(BAT **r1p, BAT **r2p, BAT *l,
* need to do some more work. */
static gdk_return
mergejoin_void(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
- struct canditer *lci, struct canditer *rci,
+ struct canditer *restrict lci, struct canditer *restrict rci,
bool nil_on_miss, bool only_misses, lng t0, bool swapped)
{
oid lo, hi;
@@ -1569,7 +1569,7 @@ mergejoin_cand(BAT **r1p, BAT **r2p, BAT
*/
static gdk_return
mergejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
- struct canditer *lci, struct canditer *rci,
+ struct canditer *restrict lci, struct canditer *restrict rci,
bool nil_matches, bool nil_on_miss, bool semi, bool only_misses,
bool not_in, BUN estimate, lng t0, bool swapped)
{
@@ -2296,7 +2296,7 @@ mergejoin(BAT **r1p, BAT **r2p, BAT *l,
* column. */
static gdk_return
hashjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
- struct canditer *lci, struct canditer *rci,
+ struct canditer *restrict lci, struct canditer *restrict rci,
bool nil_matches, bool nil_on_miss, bool semi, bool only_misses,
bool not_in,
BUN estimate, lng t0, bool swapped, bool phash, const char *reason)
@@ -3101,7 +3101,7 @@ bandjoin(BAT **r1p, BAT **r2p, BAT *l, B
/* small ordered right, dense left, oid's only, do fetches */
static gdk_return
fetchjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r,
- struct canditer *lci, struct canditer *rci, lng t0)
+ struct canditer *restrict lci, struct canditer *restrict rci, lng t0)
{
oid lo = lci->seq - l->hseqbase + l->tseqbase, hi = lo + lci->ncand;
BUN b, e, p;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
