MonetDB: Dec2023 - Don't double count sizes from views.

[Sjoerd Mullender via checkin-list]

Changeset: 2232be6380f5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2232be6380f5
Modified Files:
        gdk/gdk_bbp.c
Branch: Dec2023
Log Message:

Don't double count sizes from views.


diffs (20 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -4934,8 +4934,14 @@ BBPprintinfo(void)
                                ATOMIC_BASE_TYPE status = BBP_status(i);
                                struct counters *bt = &bats[r > 
0][BATdirty(b)][(status & BBPPERSISTENT) != 0][(status & BBPLOADED) != 
0][(status & BBPHOT) != 0];
                                bt->nr++;
-                               bt->sz += HEAPmemsize(b->theap) + 
HEAPmemsize(b->tvheap);
-                               bt->vmsz += HEAPvmsize(b->theap) + 
HEAPvmsize(b->tvheap);
+                               if (b->theap && b->batCacheid == 
b->theap->parentid) {
+                                       bt->sz += HEAPmemsize(b->theap);
+                                       bt->vmsz += HEAPvmsize(b->theap);
+                               }
+                               if (b->tvheap && b->batCacheid == 
b->tvheap->parentid) {
+                                       bt->sz += HEAPmemsize(b->tvheap);
+                                       bt->vmsz += HEAPvmsize(b->tvheap);
+                               }
                                MT_lock_unset(&b->theaplock);
                        }
                }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org