MonetDB: default - Merge with Aug2024 branch.

[Sjoerd Mullender via checkin-list]

Changeset: fde7f69e370f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fde7f69e370f
Modified Files:
        testing/Mtest.py.in
        testing/sqllogictest.py
Branch: default
Log Message:

Merge with Aug2024 branch.


diffs (75 lines):

diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2979,7 +2979,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
             elif CALL == 'python':
                 # do clean up between tests if no dependent tests
                 # borrow clean up function from sqllogictest
-                if not nodrop and not os.path.exists(TST+'.reqtests'):
+                if not nodrop and not os.path.exists(TST+'.reqtests') and 
pSrvr is not None:
                     import MonetDBtesting.sqllogictest as sqllogictest
                     with sqllogictest.SQLLogic(out=ClntErr) as sql:
                         try:
diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -156,7 +156,7 @@ class SQLLogic:
         if self.timeout > 0:
             t = time.time()
             if self.starttime + self.timeout > t:
-                return self.starttime + self.timeout - t
+                return int(self.starttime + self.timeout - t)
             return 0
         return -1
 
@@ -213,6 +213,9 @@ class SQLLogic:
                                          autocommit=True,
                                          connect_timeout=t)
                 crs = dbh.cursor()
+                if t > 0:
+                    dbh.settimeout(t)
+                    crs.execute(f'call sys.setsessiontimeout({t})')
             else:
                 dbh = malmapi.Connection()
                 dbh.connect(database=database,
@@ -223,6 +226,9 @@ class SQLLogic:
                             port=port,
                             connect_timeout=t)
                 crs = MapiCursor(dbh)
+                if t > 0:
+                    dbh.settimeout(t)
+                    crs.execute(f'clients.setsessiontimeout({t}:int)')
             conn = SQLLogicConnection(conn_id, dbh=dbh, crs=crs, 
language=language)
             self.conn_map[conn_id] = conn
             return conn
@@ -242,7 +248,10 @@ class SQLLogic:
                 pass
             self.crs = None
         if self.dbh:
-            self.dbh.close()
+            try:
+                self.dbh.close()
+            except AttributeError:
+                pass
             self.dbh = None
 
 
@@ -808,12 +817,16 @@ class SQLLogic:
         self.approve = approve
         self.initfile(f, defines, run_until=run_until)
         nthreads = None
+        if self.timeout:
+            timeout = int((time.time() - self.starttime) + self.timeout)
+        else:
+            timeout = 0
         if self.language == 'sql':
-            self.crs.execute(f'call sys.setsessiontimeout({self.timeout or 
0})')
+            self.crs.execute(f'call sys.setsessiontimeout({timeout})')
             global hashge
             hashge = self.crs.execute("select * from sys.types where sqlname = 
'hugeint'") == 1
         else:
-            self.crs.execute(f'clients.setsessiontimeout({self.timeout or 
0}:int)')
+            self.crs.execute(f'clients.setsessiontimeout({timeout}:int)')
         skiprest = False
         while True:
             skipping = skiprest
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org