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

Parallelize decryption of reports #1512

Merged
merged 2 commits into from
Dec 21, 2024
Merged

Parallelize decryption of reports #1512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a65171
Parallelize decryption of reports
andyleiserson Dec 19, 2024
5511e63
Merge remote-tracking branch 'ipa/main' into parallel-decryption-2
andyleiserson Dec 20, 2024
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
33 changes: 16 additions & 17 deletions ipa-core/src/query/runner/hybrid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::{
sync::Arc,
};

use futures::{stream::iter, StreamExt, TryStreamExt};
use futures::{StreamExt, TryStreamExt};
use generic_array::ArrayLength;

use super::QueryResult;
Expand All @@ -20,7 +20,9 @@ use crate::{
},
helpers::{
query::{DpMechanism, HybridQueryParams, QueryConfig, QuerySize},
setup_cross_shard_prss, BodyStream, Gateway, LengthDelimitedStream,
setup_cross_shard_prss,
stream::TryFlattenItersExt,
BodyStream, Gateway, LengthDelimitedStream,
},
hpke::PrivateKeyRegistry,
protocol::{
Expand Down Expand Up @@ -105,7 +107,7 @@ where
config,
key_registry,
phantom_data: _,
} = self;
} = &self;

tracing::info!("New hybrid query: {config:?}");
let ctx = ctx.narrow(&Hybrid);
Expand All @@ -118,21 +120,18 @@ where
}

let stream = LengthDelimitedStream::<EncryptedHybridReport<BA8, BA3>, _>::new(input_stream)
.map_err(Into::<Error>::into)
.map_ok(|enc_reports| {
iter(enc_reports.into_iter().map({
|enc_report| {
let dec_report = enc_report
.decrypt(key_registry.as_ref())
.map_err(Into::<Error>::into);
let unique_tag = UniqueTag::from_unique_bytes(&enc_report);
dec_report.map(|dec_report1| (dec_report1, unique_tag))
}
}))
.map_err(Into::into)
.try_flatten_iters()
.map(|enc_report_res| async move {
enc_report_res.and_then(|enc_report| {
let dec_report = enc_report
.decrypt(key_registry.as_ref())
.map_err(Into::<Error>::into);
let unique_tag = UniqueTag::from_unique_bytes(&enc_report);
dec_report.map(|dec_report1| (dec_report1, unique_tag))
})
})
.try_flatten()
.take(sz)
.map(|v| async move { v });
.take(sz);

let (decrypted_reports, resharded_tags) = reshard_aad(
ctx.narrow(&HybridStep::ReshardByTag),
Expand Down
Loading