squash all of #1234

divviup · Aug 26, 2023 · e226dd7 · e226dd7
1 parent 8a40de8
commit e226dd7
Show file tree

Hide file tree

Showing 23 changed files with 3,480 additions and 2,010 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,7 +42,9 @@ janus_messages = { version = "0.5", path = "messages" }
 k8s-openapi = { version = "0.18.0", features = ["v1_24"] }  # keep this version in sync with what is referenced by the indirect dependency via `kube`
 kube = { version = "0.82.2", default-features = false, features = ["client", "rustls-tls"] }
 opentelemetry = { version = "0.20", features = ["metrics"] }
-prio = { version = "0.14.1", features = ["multithreaded"] }
+# TODO(timg): go back to a released version of prio
+#prio = { version = "0.14.1", features = ["multithreaded"] }
+prio = { git = "https://github.com/divviup/libprio-rs", branch = "timg/ping-pong-topology", features = ["multithreaded", "experimental"] }
 serde = { version = "1.0.185", features = ["derive"] }
 serde_json = "1.0.105"
 serde_test = "1.0.175"

diff --git a/aggregator/src/aggregator.rs b/aggregator/src/aggregator.rs
diff --git a/aggregator/src/aggregator/accumulator.rs b/aggregator/src/aggregator/accumulator.rs
@@ -26,7 +26,7 @@ use std::{
 /// Accumulates output shares in memory and eventually flushes accumulations to a datastore. We
 /// accumulate output shares into a [`HashMap`] mapping the batch identifier at which the batch
 /// interval begins to the accumulated aggregate share, report count and checksum.
-#[derive(Derivative)]
+#[derive(Clone, Derivative)]
 #[derivative(Debug)]
 pub struct Accumulator<
     const SEED_SIZE: usize,
@@ -40,7 +40,7 @@ pub struct Accumulator<
     aggregations: HashMap<Q::BatchIdentifier, BatchData<SEED_SIZE, Q, A>>,
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 struct BatchData<
     const SEED_SIZE: usize,
     Q: AccumulableQueryType,