MonetDB: default - Merge with Jan2022 branch.

[Sjoerd Mullender]

Changeset: 50e5f8c0b298 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/50e5f8c0b298
Modified Files:
        gdk/gdk_logger_old.c
Branch: default
Log Message:

Merge with Jan2022 branch.


diffs (29 lines):

diff --git a/gdk/gdk_logger_old.c b/gdk/gdk_logger_old.c
--- a/gdk/gdk_logger_old.c
+++ b/gdk/gdk_logger_old.c
@@ -1715,6 +1715,13 @@ old_logger_destroy(old_logger *lg)
        BATloop(lg->add, p, q) {
                b = BATdescriptor(bids[p]);
                if (b) {
+                       if (b != lg->lg->catalog_bid &&
+                           b != lg->lg->catalog_id &&
+                           b != lg->lg->dcatalog &&
+                           b != lg->lg->seqs_id &&
+                           b != lg->lg->seqs_val &&
+                           b != lg->lg->dseqs)
+                               b = BATsetaccess(b, BAT_READ);
                        BATmode(b, false);
                        BBPunfix(bids[p]);
                }
diff --git a/sql/test/sysmon/Tests/sys_queue_expand.SQL.py 
b/sql/test/sysmon/Tests/sys_queue_expand.SQL.py
--- a/sql/test/sysmon/Tests/sys_queue_expand.SQL.py
+++ b/sql/test/sysmon/Tests/sys_queue_expand.SQL.py
@@ -54,7 +54,7 @@ def main():
 
         # Check the long running query, but lets first wait for a moment for 
the
         #   workers to start with their queries
-        mstcur.execute('call sys.sleep(500)')
+        mstcur.execute('call sys.sleep(1000)')
         query = 'select username, status, query from sys.queue() where query 
like \'call sys.sleep(5000)%\' order by query'
         expected_res = [
         ('monetdb', 'running', 'call sys.sleep('+SLEEP_TIME+')\n;'),
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org