Skip to content

NOW MANAGED ON CODEBERG

Search: Fixed formatting timeout with many term occurrences

Dan Brown1df850ea3ec8
diff --git a/app/Search/SearchResultsFormatter.php b/app/Search/SearchResultsFormatter.php
index b06f81e0e..7bb5e03cc 100644
--- a/app/Search/SearchResultsFormatter.php
+++ b/app/Search/SearchResultsFormatter.php
@@ -91,7 +91,7 @@ class SearchResultsFormatter
$offset = 0;
$term = mb_strtolower($term);
$pos = mb_strpos($text, $term, $offset);
- while ($pos !== false) {
+ while ($pos !== false && count($matchRefs) < 25) {
$end = $pos + mb_strlen($term);
$matchRefs[$pos] = $end;
$offset = $end;
diff --git a/tests/Search/EntitySearchTest.php b/tests/Search/EntitySearchTest.php
index ca900c2ed..8501b65c4 100644
--- a/tests/Search/EntitySearchTest.php
+++ b/tests/Search/EntitySearchTest.php
@@ -378,6 +378,21 @@ class EntitySearchTest extends TestCase
$search->assertSee('<strong>На</strong> <strong>мен</strong> <strong>ми</strong> <strong>трябва</strong> <strong>нещо</strong> <strong>добро</strong> test', false);
}
+ public function test_match_highlighting_is_efficient_with_large_frequency_in_content()
+ {
+ $content = str_repeat('superbeans ', 10000);
+ $this->entities->newPage([
+ 'name' => 'Test Page',
+ 'html' => "<p>{$content}</p>",
+ ]);
+
+ $time = microtime(true);
+ $resp = $this->asEditor()->get('/search?term=' . urlencode('superbeans'));
+ $this->assertLessThan(0.5, microtime(true) - $time);
+
+ $resp->assertSee('<strong>superbeans</strong>', false);
+ }
+
public function test_html_entities_in_item_details_remains_escaped_in_search_results()
{
$this->entities->newPage(['name' => 'My <cool> TestPageContent', 'html' => '<p>My supercool &lt;great&gt; TestPageContent page</p>']);