Changeset: 779a4cf6cfce for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/779a4cf6cfce Modified Files: monetdb5/modules/mal/pp_algebra.c monetdb5/modules/mal/pp_hash.c monetdb5/modules/mal/pp_hash.h Branch: pp_hashjoin Log Message:
some more type/cast fixes
diffs (truncated from 696 to 300 lines):
diff --git a/monetdb5/modules/mal/pp_algebra.c
b/monetdb5/modules/mal/pp_algebra.c
--- a/monetdb5/modules/mal/pp_algebra.c
+++ b/monetdb5/modules/mal/pp_algebra.c
@@ -931,11 +931,11 @@ LOCKEDAGGRnull(Client ctx, bat *result,
for(; !fnd; ) { \
NEW_VAL; \
gid hv = HASH_VAL&h->mask, k = hv; \
- gid g = ATOMIC_GET(h->gids+k); \
+ gid g = ATOMIC_GET_GID(h->gids+k); \
for(gid l=1;g && VAL_NOT_EQUAL; l++) { \
NEXTK; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -1179,11 +1179,11 @@ LALGunique(Client ctx, bat *rid, bat *ui
for(; !fnd;) { \
NEW_VAL; \
gid hv = (gid)combine(gi[i], HASH_VAL,
prime)&h->mask, k = hv; \
- gid g = ATOMIC_GET(h->gids+k); \
+ gid g = ATOMIC_GET_GID(h->gids+k); \
for(gid l=1; g && (pgids[g] != gi[i] ||
VAL_NOT_EQUAL); l++) { \
NEXTK; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -1435,11 +1435,11 @@ LALGgroup_unique(Client ctx, bat *rid, b
for(; !fnd; ) { \
NEW_VAL; \
gid hv = HASH_VAL&h->mask, k = hv; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
for(gid l=1; g && VAL_NOT_EQUAL; l++) { \
NEXTK; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -1494,11 +1494,11 @@ LALGgroup_unique(Client ctx, bat *rid, b
gid g = 0; \
for(; !fnd; ) { \
gid k = (gid)_hash_oid(oid_nil)&h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
for(;g && vals[g] != bpi;) { \
k++; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -1742,7 +1742,7 @@ LALGgroup(Client ctx, bat *rid, bat *uid
pipeline_lock2(g);
BATnegateprops(g);
/* props */
- gid last = ATOMIC_GET(&h->last);
+ gid last = ATOMIC_GET_GID(&h->last);
/* pass max id */
g->tmaxval = last;
pipeline_unlock2(g);
@@ -1771,11 +1771,11 @@ LALGgroup(Client ctx, bat *rid, bat *uid
for(; !fnd; ) { \
NEW_VAL; \
gid hv = (gid)combine(gi[i], HASH_VAL,
prime)&h->mask, k = hv; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
for(gid l=1; g && (pgids[g] != gi[i] ||
VAL_NOT_EQUAL); l++) { \
NEXTK; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -2038,7 +2038,7 @@ LALGderive(Client ctx, bat *rid, bat *ui
pipeline_lock2(g);
BATnegateprops(g);
/* props */
- gid last = ATOMIC_GET(&h->last);
+ gid last = ATOMIC_GET_GID(&h->last);
/* pass max id */
g->tmaxval = last;
pipeline_unlock2(g);
@@ -4452,7 +4452,7 @@ LALGcnull(Client ctx, bat *rid, bat *gid
} \
}
-/* TODO this implementation is unfinisehd, therefore its corresponding MAL
+/* TODO this implementation is unfinisehd, therefore its corresponding MAL
* function iaggr.ord_quantile is never called. */
static str
IALGquantile(Client ctx, bat *rid, bat *gid, bat *bid, bte *perc)
diff --git a/monetdb5/modules/mal/pp_hash.c b/monetdb5/modules/mal/pp_hash.c
--- a/monetdb5/modules/mal/pp_hash.c
+++ b/monetdb5/modules/mal/pp_hash.c
@@ -153,10 +153,10 @@ ht_deactivate(hash_table *ht)
#define REHASH(Type) \
for(size_t i = 0; i < oldsize; i++) { \
Type *vals = ht->vals;
\
- gid og = ogids[i];
\
+ hash_key_t og = ogids[i];
\
if (og) {
\
gid hv = (gid)_hash_##Type(vals[og])&ht->mask,
k = hv; \
- gid g = ngids[k];
\
+ hash_key_t g = ngids[k];
\
for (gid l=1; g; l++) {
\
nextk;
\
k &= ht->mask;
\
@@ -170,10 +170,10 @@ ht_deactivate(hash_table *ht)
#define REHASH_f(Type,Type2) \
for(size_t i = 0; i < oldsize; i++) { \
Type *vals = ht->vals;
\
- gid og = ogids[i];
\
+ hash_key_t og = ogids[i];
\
if (og) {
\
gid hv =
(gid)_hash_##Type(*(Type2*)(vals+og))&ht->mask, k = hv; \
- gid g = ngids[k];
\
+ hash_key_t g = ngids[k];
\
for (gid l=1; g; l++) {
\
nextk;
\
k &= ht->mask;
\
@@ -187,10 +187,10 @@ ht_deactivate(hash_table *ht)
#define REHASH_a() \
for(size_t i = 0; i < oldsize; i++) { \
char **vals = ht->vals;
\
- gid og = ogids[i];
\
+ hash_key_t og = ogids[i];
\
if (og) {
\
gid hv = (gid)ht->hsh(vals[og])&ht->mask, k =
hv; \
- gid g = ngids[k]; \
+ hash_key_t g = ngids[k];
\
for (gid l=1; g; l++) {
\
nextk;
\
k &= ht->mask;
\
@@ -204,10 +204,10 @@ ht_deactivate(hash_table *ht)
#define CREHASH(Type) \
for(size_t i = 0; i < oldsize; i++) { \
Type *vals = ht->vals;
\
- gid og = ogids[i];
\
+ hash_key_t og = ogids[i];
\
if (og) {
\
gid hv = (gid)combine(pgids[og],
_hash_##Type(vals[og]), prime)&ht->mask, k = hv; \
- gid g = ngids[k]; \
+ hash_key_t g = ngids[k];
\
for (gid l=1; g; l++) {
\
nextk;
\
k &= ht->mask;
\
@@ -221,10 +221,10 @@ ht_deactivate(hash_table *ht)
#define CREHASH_f(Type, Type2) \
for(size_t i = 0; i < oldsize; i++) { \
Type *vals = ht->vals;
\
- gid og = ogids[i];
\
+ hash_key_t og = ogids[i];
\
if (og) {
\
gid hv = (gid)combine(pgids[og],
_hash_##Type(*(Type2*)(vals+og)), prime)&ht->mask, k = hv; \
- gid g = ngids[k]; \
+ hash_key_t g = ngids[k];
\
for (gid l=1; g; l++) {
\
nextk;
\
k &= ht->mask;
\
@@ -238,10 +238,10 @@ ht_deactivate(hash_table *ht)
#define CREHASH_a() \
for(size_t i = 0; i < oldsize; i++) { \
char **vals = ht->vals;
\
- gid og = ogids[i];
\
+ hash_key_t og = ogids[i];
\
if (og) {
\
gid hv = (gid)combine(pgids[og],
ht->hsh(vals[og]), prime)&ht->mask, k = hv; \
- gid g = ngids[k]; \
+ hash_key_t g = ngids[k];
\
for (gid l=1; g; l++) {
\
nextk;
\
k &= ht->mask;
\
@@ -490,7 +490,7 @@ OAHASHhashmark_init(Client ctx, bat *res
mrk[i] = bit_nil;
}
TIMEOUT_LOOP_IDX_DECL(i, h->size, qry_ctx) {
- g = ATOMIC_GET(h->gids+i);
+ g = ATOMIC_GET_GID(h->gids+i);
if(g) {
mrk[g-1] = false;
}
@@ -612,12 +612,12 @@ UHASHext(Client cntxt, MalBlkPtr m, MalS
gid g = 0; \
while (!fnd) { \
gid k = (gid)_hash_##Type(bp[i])&h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
assert(g<(gid)h->size); \
while (g && vals[g] != bp[i]) { \
k++; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -658,11 +658,11 @@ UHASHext(Client cntxt, MalBlkPtr m, MalS
gid g = 0; \
while (!fnd) { \
gid k = (gid)_hash_oid(bpi)&h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
while (g && vals[g] != bpi) { \
k++; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -699,12 +699,12 @@ UHASHext(Client cntxt, MalBlkPtr m, MalS
gid g = 0; \
while (!fnd) { \
gid k =
(gid)_hash_##Type(*(((BaseType*)bp)+i))&h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
while (g && (!(is_##Type##_nil(bp[i]) &&
is_##Type##_nil(vals[g])) && \
vals[g] != bp[i])) { \
k++; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -742,11 +742,11 @@ UHASHext(Client cntxt, MalBlkPtr m, MalS
gid g = 0; \
while (!fnd) { \
gid k = (gid)h->hsh(bpi)&h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
while (g && (vals[g] && h->cmp(vals[g], bpi) !=
0)) { \
k++; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -787,11 +787,11 @@ UHASHext(Client cntxt, MalBlkPtr m, MalS
gid g = 0; \
while (!fnd) { \
gid k = (gid)str_hsh(bpi)&h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
while (g && (vals[g] && h->cmp(vals[g],
bpi) != 0)) { \
k++; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -824,11 +824,11 @@ UHASHext(Client cntxt, MalBlkPtr m, MalS
gid g = 0; \
while (!fnd) { \
gid k = (gid)h->hsh(bpi)&h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
while (g && (vals[g] &&
atomcmp(vals[g], bpi) != 0)) { \
k++; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -969,7 +969,7 @@ OAHASHbuild_tbl(Client ctx, bat *slot_id
BBPunfix(b->batCacheid);
BATsetcount(g, cnt);
BATnegateprops(g);
- gid last = ATOMIC_GET(&h->last);
+ gid last = ATOMIC_GET_GID(&h->last);
g->tmaxval = (oid) last;
g->tkey = FALSE;
*slot_id = g->batCacheid;
@@ -997,11 +997,11 @@ error:
gid g = 0; \
while (!fnd) { \
gid k = (gid)combine(gi[i],
_hash_##Type(bp[i]), prime)&h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
while (g && (pgids[g] != gi[i] || vals[g] !=
bp[i])) { \
k++; \
k &= h->mask; \
- g = ATOMIC_GET(h->gids+k); \
+ g = ATOMIC_GET_GID(h->gids+k); \
} \
if (!g) { \
if (slots == 0) { \
@@ -1045,11 +1045,11 @@ error:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
