Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix FXIOS-5344 [v109] fixes search highlights getting interrupted #12578

Merged
merged 2 commits into from
Dec 7, 2022
Merged

Bugfix FXIOS-5344 [v109] fixes search highlights getting interrupted #12578

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7005f57
fixes search highlights getting interrupted
Dec 4, 2022
81aac50
Safely retrieves search results
Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions Client/Frontend/Browser/SearchLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class SearchLoader: Loader<Cursor<Site>, SearchViewController>, FeatureFlaggable
currentDeferredHistoryQuery = deferredHistory
return deferredHistory
case .new:
profile.places.interruptReader()
return self.profile.places.queryAutocomplete(matchingSearchQuery: query, limit: limit).bind { result in
guard let historyItems = result.successValue else {
SentryIntegration.shared.sendWithStacktrace(
Expand All @@ -89,39 +90,40 @@ class SearchLoader: Loader<Cursor<Site>, SearchViewController>, FeatureFlaggable
var query: String = "" {
didSet {
let timerid = GleanMetrics.Awesomebar.queryTime.start()
guard self.profile is BrowserProfile else {
guard profile is BrowserProfile else {
assertionFailure("nil profile")
GleanMetrics.Awesomebar.queryTime.cancel(timerid)
return
}

profile.places.interruptReader()
if query.isEmpty {
load(Cursor(status: .success, msg: "Empty query"))
GleanMetrics.Awesomebar.queryTime.cancel(timerid)
return
}

let deferredHistory = getHistoryAsSites(matchingSearchQuery: query, limit: 100)

let deferredBookmarks = getBookmarksAsSites(matchingSearchQuery: query, limit: 5)

all([deferredHistory, deferredBookmarks]).uponQueue(.main) { results in
var deferredQueries = [deferredBookmarks]
let historyHighlightsEnabled = featureFlags.isFeatureEnabled(.searchHighlights, checking: .buildOnly)
if !historyHighlightsEnabled {
// Lets only add the history query if history highlights are not enabled
deferredQueries.append(getHistoryAsSites(matchingSearchQuery: query, limit: 100))
}

all(deferredQueries).uponQueue(.main) { results in
defer {
self.currentDeferredHistoryQuery = nil
GleanMetrics.Awesomebar.queryTime.stopAndAccumulate(timerid)
}

let cancellableHistory = deferredHistory as? CancellableDeferred
if let cancellableHistory = cancellableHistory, cancellableHistory.cancelled {
return
}

let deferredHistorySites = results[0].successValue?.asArray() ?? []
let deferredBookmarksSites = results[1].successValue?.asArray() ?? []
let deferredBookmarksSites = results[safe: 0]?.successValue?.asArray() ?? []
var combinedSites = deferredBookmarksSites

if !self.featureFlags.isFeatureEnabled(.searchHighlights, checking: .buildOnly) {
if !historyHighlightsEnabled {
let cancellableHistory = deferredQueries[safe: 1] as? CancellableDeferred
if let cancellableHistory = cancellableHistory, cancellableHistory.cancelled {
return
}
let deferredHistorySites = results[safe: 1]?.successValue?.asArray() ?? []
combinedSites += deferredHistorySites
}

Expand Down