Changeset: 3f9f06e41f41 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3f9f06e41f41
Modified Files:
monetdb5/modules/mal/pp_hash.c
monetdb5/modules/mal/pp_hash.h
Branch: pp_hashjoin
Log Message:
more small type changes
diffs (33 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
@@ -238,7 +238,7 @@ ht_deactivate(hash_table *ht)
}
\
}
\
-#define CREHASH_a(TYPE) \
+#define CREHASH_a() \
for(size_t i = 0; i < oldsize; i++) { \
char **vals = ht->vals;
\
gid og = ogids[i];
\
@@ -420,7 +420,7 @@ OAHASHnew(Client cntxt, MalBlkPtr m, Mal
BBPreclaim(pht);
return createException(MAL, "oahash.new", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
- b->tsink = (Sink*)ht_create(tt, size*1.2*2.1, parent);
+ b->tsink = (Sink*)ht_create(tt, (size_t)(size*1.2*2.1), parent);
BBPreclaim(pht);
if (b->tsink == NULL) {
BBPunfix(b->batCacheid);
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
@@ -167,7 +167,7 @@ typedef struct hash_table {
int pinned_nr;
allocator **allocators;
int nr_allocators;
- int processed;
+ size_t processed;
MT_RWLock rwlock; /* needed for save resizing */
} hash_table;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
