Changeset: 12645898c39d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/12645898c39d
Modified Files:
monetdb5/modules/mal/pp_hash.c
monetdb5/modules/mal/pp_hash.h
Branch: pp_hashjoin
Log Message:
a bit more stable use of oid for hash table
diffs (46 lines):
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
@@ -2371,8 +2371,8 @@ OAHASHprobe_cmbd_single(Client ctx, bat
oid *sltd = Tloc(s, 0);
oid *oid_mtd = Tloc(res_o, 0);
oid *slt = Tloc(res_s, 0);
- lng *gi = Tloc(p, 0);
- lng *pgids = ht->pgids;
+ gid *gi = Tloc(p, 0);
+ gid *pgids = ht->pgids;
BUN off = k->hseqbase;
switch(tt) {
@@ -2743,8 +2743,8 @@ OAHASHomprobe_cmbd(Client ctx, bat *PRB_
oid *sltd = Tloc(s, 0);
oid *oid_mtd = Tloc(res_o, 0);
oid *slt = Tloc(res_s, 0);
- lng *gi = Tloc(p, 0);
- lng *pgids = ht->pgids;
+ gid *gi = Tloc(p, 0);
+ gid *pgids = ht->pgids;
bit *mark = Tloc(res_m, 0);
BUN off = k->hseqbase;
switch(tt) {
@@ -2899,7 +2899,7 @@ OAHASHexpand(Client ctx, bat *expanded,
if (selcnt) {
if (freq) {
TIMEOUT_LOOP_IDX_DECL(i, selcnt, qry_ctx) {
- if (sid[i] != lng_nil && freq[sid[i]])
+ if (sid[i] != oid_nil && freq[sid[i]])
xpdcnt += freq[sid[i]];
else
xpdcnt++;
diff --git a/monetdb5/modules/mal/pp_hash.h b/monetdb5/modules/mal/pp_hash.h
--- a/monetdb5/modules/mal/pp_hash.h
+++ b/monetdb5/modules/mal/pp_hash.h
@@ -115,7 +115,7 @@ hash_prime_nr[32] = {
1610612741 };
-typedef lng gid;
+typedef oid gid;
typedef ATOMIC_TYPE hash_key_t;
typedef int (*fcmp)(const void *v1, const void *v2);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
