Changeset: cf697c4d5857 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cf697c4d5857
Modified Files:
gdk/gdk_string.c
sql/backends/monet5/vaults/parquet/parquet.c
Branch: pp_hashjoin
Log Message:
stridx_t -> var_t
diffs (32 lines):
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -9871,13 +9871,13 @@ fstrPut(BAT *b, var_t *dst, const void *
size_t pos, len = strlen(v) + 1;
if (h->free == 0) {
- if (h->size < GDK_STRHASHTABLE * sizeof(stridx_t) + BATTINY *
GDK_VARALIGN) {
- if (HEAPgrow(&b->tvheap, GDK_STRHASHTABLE *
sizeof(stridx_t) + BATTINY * GDK_VARALIGN, true) != GDK_SUCCEED) {
+ if (h->size < GDK_STRHASHTABLE * sizeof(var_t) + BATTINY *
GDK_VARALIGN) {
+ if (HEAPgrow(&b->tvheap, GDK_STRHASHTABLE *
sizeof(var_t) + BATTINY * GDK_VARALIGN, true) != GDK_SUCCEED) {
return (var_t) -1;
}
h = b->tvheap;
}
- h->free = GDK_STRHASHTABLE * sizeof(stridx_t);
+ h->free = GDK_STRHASHTABLE * sizeof(var_t);
memset(h->base, 0, h->free);
h->dirty = true;
b->tascii = true;
diff --git a/sql/backends/monet5/vaults/parquet/parquet.c
b/sql/backends/monet5/vaults/parquet/parquet.c
--- a/sql/backends/monet5/vaults/parquet/parquet.c
+++ b/sql/backends/monet5/vaults/parquet/parquet.c
@@ -660,7 +660,7 @@ PARQUETread_large(BAT **R, pqc_creader *
throw(SQL, "parquet.read", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
Heap *h = rb->tvheap;
- unsigned int varoff = is_string?GDK_STRHASHTABLE *
sizeof(stridx_t):0;
+ unsigned int varoff = is_string?GDK_STRHASHTABLE *
sizeof(var_t):0;
BUN size = varoff + ssize/* * GDK_VARALIGN*/ + 8;
if (h->storage == STORE_INVALID) {
if (h->size < size && HEAPalloc(h, size, 1) !=
GDK_SUCCEED) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
