Skip to content

Commit

Permalink
always limit fetchMessagesAfterSummaryPoint to memoryWindow (#238)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielchalef committed Oct 19, 2023
1 parent 6b6627d commit 04d4698
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pkg/store/postgres/memorystore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,10 @@ func TestGetMessages(t *testing.T) {
withSummary bool
}{
{
name: "Get all messages",
name: "Get all messages within messageWindow",
sessionID: sessionID,
lastNMessages: 0,
expectedLength: len(messages),
expectedLength: messageWindow,
withSummary: false,
},
{
Expand Down
6 changes: 5 additions & 1 deletion pkg/store/postgres/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func getMessages(
if lastNMessages > 0 {
messages, err = fetchLastNMessages(ctx, db, sessionID, lastNMessages)
} else {
messages, err = fetchMessagesAfterSummaryPoint(ctx, db, sessionID, summary)
messages, err = fetchMessagesAfterSummaryPoint(ctx, db, sessionID, summary, memoryWindow)
}
if err != nil {
return nil, store.NewStorageError("failed to get messages", err)
Expand All @@ -201,6 +201,7 @@ func fetchMessagesAfterSummaryPoint(
db *bun.DB,
sessionID string,
summary *models.Summary,
memoryWindow int,
) ([]MessageStoreSchema, error) {
var summaryPointIndex int64
var err error
Expand All @@ -221,6 +222,9 @@ func fetchMessagesAfterSummaryPoint(
query.Where("id > ?", summaryPointIndex)
}

// Always limit to the memory window
query.Limit(memoryWindow)

return messages, query.Scan(ctx)
}

Expand Down

0 comments on commit 04d4698

Please sign in to comment.