MonetDB: default - Merges Aug2024

[stefanos mavros via checkin-list]

Changeset: fd9ff8ddfe43 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fd9ff8ddfe43
Branch: default
Log Message:

Merges Aug2024


diffs (23 lines):

diff --git a/ctest/tools/monetdbe/Tests/example_proxy.SQL.py 
b/ctest/tools/monetdbe/Tests/example_proxy.SQL.py
--- a/ctest/tools/monetdbe/Tests/example_proxy.SQL.py
+++ b/ctest/tools/monetdbe/Tests/example_proxy.SQL.py
@@ -19,6 +19,7 @@ results = subprocess.run(cmd, stdout=sub
 
 if results.stderr:
     print(results.stderr)
+    exit(1)
 
 lines = results.stdout.splitlines()
 
diff --git a/gdk/gdk_rtree.c b/gdk/gdk_rtree.c
--- a/gdk/gdk_rtree.c
+++ b/gdk/gdk_rtree.c
@@ -313,7 +313,7 @@ RTREEdestroy(BAT *b)
        }
        //If the rtree is not loaded (pb->trtree is null), but there is a file 
with the index (from previous execution),
        //we should remove the file
-       else if (RTREEexistsonfile(pb)) {
+       else if (pb->theap && !GDKinmemory(pb->theap->farmid) && 
RTREEexistsonfile(pb)) {
                GDKunlink(pb->theap->farmid,
                        BATDIR,
                        BBP_physical(b->batCacheid),
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org