From e8932dfea39e4f850da100cff4187a7f9c17cad7 Mon Sep 17 00:00:00 2001
From: kaiserd <kaiserd@users.noreply.github.com>
Date: Thu, 23 Jun 2022 15:48:48 +0000
Subject: [PATCH] deploy: e2056e7dd5c30b6b8f73a29c36b1676251c4b22b

---
 waku/v2/node/storage/message/waku_message_store.nim | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/waku/v2/node/storage/message/waku_message_store.nim b/waku/v2/node/storage/message/waku_message_store.nim
index 91bc57cea..f08057497 100644
--- a/waku/v2/node/storage/message/waku_message_store.nim
+++ b/waku/v2/node/storage/message/waku_message_store.nim
@@ -267,8 +267,13 @@ method getAll*(db: WakuMessageStore, onData: message_store.DataProc): MessageSto
   ok gotMessages
 
 proc adjustDbPageSize(dbPageSize: uint64, matchCount: uint64, returnPageSize: uint64): uint64 {.inline.} =
-  var ret = if matchCount < 2: dbPageSize * returnPageSize
+  const maxDbPageSize: uint64 = 20000 # the maximum DB page size is limited to prevent excessive use of memory in case of very sparse or non-matching filters. TODO: dynamic, adjust to available memory
+  if dbPageSize >= maxDbPageSize: 
+    return maxDbPageSize
+  var ret =
+    if matchCount < 2: dbPageSize * returnPageSize
     else: dbPageSize * (returnPageSize div matchCount)
+  ret = min(ret, maxDbPageSize)
   trace "dbPageSize adjusted to: ",  ret
   ret