From dca359c2abd341868dc11f37dc72fe4eefcec0f4 Mon Sep 17 00:00:00 2001
From: Alexey Antipovsky <alexey.vladimirovich@mariadb.com>
Date: Fri, 1 Oct 2021 16:10:46 +0300
Subject: [PATCH] Fix excessive memory consumption at the last stage of
 aggregation

---
 utils/rowgroup/rowstorage.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/utils/rowgroup/rowstorage.cpp b/utils/rowgroup/rowstorage.cpp
index 438c9ef9e..9d90c2bad 100644
--- a/utils/rowgroup/rowstorage.cpp
+++ b/utils/rowgroup/rowstorage.cpp
@@ -684,7 +684,13 @@ class RowGroupStorage
               logging::ERR_AGGREGATION_TOO_BIG);
         }
 
-        fLRU->add(rgid);
+        if (fMM->getFree() < memSz * 2)
+        {
+          saveRG(rgid);
+          fRGDatas[rgid].reset();
+        }
+        else
+          fLRU->add(rgid);
       }
       else
       {