Changeset: 31ccf082d736 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/31ccf082d736
Modified Files:
gdk/gdk_heap.c
Branch: default
Log Message:
Merge with Jul2021 branch.
diffs (28 lines):
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -813,6 +813,12 @@ HEAPload_intern(Heap *h, const char *nme
h->base = GDKmalloc(h->size);
h->wasempty = true;
} else {
+ if (h->free == 0) {
+ int fd = GDKfdlocate(h->farmid, nme, "wb", ext);
+ if (fd >= 0)
+ close(fd);
+ h->wasempty = true;
+ }
h->base = GDKload(h->farmid, nme, ext, h->free, &h->size,
h->storage);
}
if (h->base == NULL)
diff --git a/testing/process.py b/testing/process.py
--- a/testing/process.py
+++ b/testing/process.py
@@ -167,7 +167,7 @@ class Popen(subprocess.Popen):
def __init__(self, *args, **kwargs):
self.dotmonetdbfile = None
self.isserver = False
- if sys.version[:3] < '3.7':
+ if sys.version_info.major == 3 and sys.version_info.minor < 7:
kw = kwargs.copy()
if 'text' in kw:
kw['universal_newlines'] = kw['text']
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
