MonetDB: Jan2022 - Merge with Jul2021 branch.

[Sjoerd Mullender]

Changeset: c28bf3ca1308 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c28bf3ca1308
Modified Files:
        monetdb5/ChangeLog.Jan2022
        monetdb5/optimizer/opt_support.c
Branch: Jan2022
Log Message:

Merge with Jul2021 branch.


diffs (22 lines):

diff --git a/monetdb5/ChangeLog.Jan2022 b/monetdb5/ChangeLog.Jan2022
--- a/monetdb5/ChangeLog.Jan2022
+++ b/monetdb5/ChangeLog.Jan2022
@@ -1,3 +1,7 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Wed Oct 19 2022 Sjoerd Mullender <sjo...@acm.org>
+- Fix a bug where the MAL optimizer would use the starttime of the
+  previous query to determine whether a query timeout occurred.
+
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -137,6 +137,7 @@ optimizeMALBlock(Client cntxt, MalBlkPtr
        }
 
        oldstop = mb->stop;
+       mb->starttime = GDKusec();
        for (pc = 0; pc < mb->stop; pc++) {
                p = getInstrPtr(mb, pc);
                if (getModuleId(p) == optimizerRef && p->fcn && p->token != 
REMsymbol) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org