MonetDB: Sep2022 - Merge with Jan2022 branch.

[Sjoerd Mullender]

Changeset: 4095db0bf53e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4095db0bf53e
Modified Files:
        gdk/gdk_select.c
Branch: Sep2022
Log Message:

Merge with Jan2022 branch.


diffs (23 lines):

diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -50,13 +50,14 @@ virtualize(BAT *bn)
             * (const oid *) Tloc(bn, 0) + BATcount(bn) - 1 ==
             * (const oid *) Tloc(bn, BATcount(bn) - 1))) {
                /* column is dense, replace by virtual oid */
-               TRC_DEBUG(ALGO, ALGOBATFMT ",seq=" OIDFMT "\n",
-                         ALGOBATPAR(bn),
-                         BATcount(bn) > 0 ? * (const oid *) Tloc(bn, 0) : 0);
+               oid tseq;       /* work around bug in Intel compiler */
                if (BATcount(bn) == 0)
-                       bn->tseqbase = 0;
+                       tseq = 0;
                else
-                       bn->tseqbase = * (const oid *) Tloc(bn, 0);
+                       tseq = * (const oid *) Tloc(bn, 0);
+               TRC_DEBUG(ALGO, ALGOBATFMT ",seq=" OIDFMT "\n",
+                         ALGOBATPAR(bn), tseq);
+               bn->tseqbase = tseq;
                if (VIEWtparent(bn)) {
                        Heap *h = GDKmalloc(sizeof(Heap));
                        bat bid = VIEWtparent(bn);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org