PIR: Add support for multiple profile queries in PirScan and PirOptOut #6413
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
karlenDimla
reviewed
Jul 18, 2025
pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/optout/PirOptOut.kt
Outdated
Show resolved
Hide resolved
karlenDimla
requested changes
Jul 18, 2025
pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/common/BrokerStepsParser.kt
Outdated
Show resolved
Hide resolved
pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/optout/PirOptOut.kt
Outdated
Show resolved
Hide resolved
pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/optout/PirOptOut.kt
Outdated
Show resolved
Hide resolved
pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/scan/PirScan.kt
Show resolved
Hide resolved
landomen
commented
Jul 21, 2025
Comment on lines
+24
to
+38
| val partSize = this.size / parts | ||
| val remainder = this.size % parts | ||
|
|
||
| val result = mutableListOf<List<T>>() | ||
| var startIndex = 0 | ||
|
|
||
| for (i in 0 until parts) { | ||
| val currentPartSize = partSize + if (i < remainder) 1 else 0 | ||
| val endIndex = startIndex + currentPartSize | ||
|
|
||
| result.add(this.subList(startIndex, endIndex)) | ||
| startIndex = endIndex | ||
| } | ||
|
|
||
| return result |
There was a problem hiding this comment.
I noticed that the previous implementation would not use all 20 runners in some cases. Example:
- list size = 21
- parts (max web views) = 20
- result = 10 lists of 2 elements + 1 list of 1 element = 11 runners
The new implementation results in 1 list of 2 elements + 19 lists of 1 element = 20 runners
landomen
commented
Jul 21, 2025
Comment on lines
+226
to
+241
| // Load opt-out steps jsons for each broker | ||
| val brokerOptOutStepsJsons = brokers.mapNotNull { broker -> | ||
| repository.getBrokerOptOutSteps(broker)?.let { broker to it } | ||
| } | ||
|
|
||
| // Map broker steps with their associated profile queries | ||
| val allSteps = profileQueries.map { profileQuery -> | ||
| brokerOptOutStepsJsons.map { (broker, stepsJson) -> | ||
| brokerStepsParser.parseStep(broker, stepsJson, profileQuery.id) | ||
| }.flatten().map { step -> profileQuery to step } | ||
| }.flatten() | ||
|
|
||
| maxWebViewCount = if (brokerSteps.size <= MAX_DETACHED_WEBVIEW_COUNT) { | ||
| brokerSteps.size | ||
| } else { | ||
| MAX_DETACHED_WEBVIEW_COUNT | ||
| } | ||
| maxWebViewCount = minOf(allSteps.size, MAX_DETACHED_WEBVIEW_COUNT) | ||
|
|
||
| // Assign steps to runners based on the maximum number of WebViews we can use | ||
| val stepsPerRunner = allSteps.splitIntoParts(maxWebViewCount) |
There was a problem hiding this comment.
We now split the work between the maximum number of runners to max utilization.
|
@karlenDimla I've updated the runner logic to run steps in parallel on maximum number of runners. The PR is ready for another review. |
karlenDimla
approved these changes
Jul 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task/Issue URL: https://app.asana.com/1/137249556945/project/1210594645151737/task/1210750227652612?focus=true
Description
Adds support for running the initial PIR scan and PIR opt-out scan on multiple stored profiles instead of the first stored profile. See the task for more details and a full tech spec.
Steps to test this PR
1 profile (current behavior)
Multiple profiles (new behavior)
UI changes
No UI Changes