diff --git a/client-distributed/src/search.rs b/client-distributed/src/search.rs index 74a777c945f96a1774324f41d1eb99a834f1809e..0f03806dcbc6b7eebe104619d5ae2c3addc54638 100644 --- a/client-distributed/src/search.rs +++ b/client-distributed/src/search.rs @@ -52,10 +52,15 @@ pub async fn search( } } } + for covers in existing_covers.values_mut() { + covers.sort(); + covers.dedup(); + } // println!("{:?}", existing_covers.values()); let mut queries: Vec<(Url, String)> = Vec::new(); for (urls, covers) in existing_covers { for cover in covers { + println!("{}: {:?}", urls, cover); queries.push((urls.clone(), prf(&prf_key, format!("{:?}", cover))?)); } } @@ -93,21 +98,18 @@ pub async fn search( .get(metadata.index as usize) .ok_or(anyhow!("Index out of range"))? .parse::<isize>()?; - info!("{}", decrypted.0); fnl.push((parsed, decrypted.0, decrypted.1, decrypted.2)); } else { info!("Ignoring {:?}", decrypted); } } } - fnl.sort_by(|a, b| a.3.cmp(&b.3)); fnl.dedup(); // remove elements that are at some point removed let mut hm: HashMap<isize, Vec<String>> = HashMap::new(); for (key, value, add, _) in fnl { if add { - // info!("Adding {:?} {:?}", key, value); hm.entry(key).or_default().push(value); } else { info!("Removing {:?}", key); diff --git a/server-distributed/src/main.rs b/server-distributed/src/main.rs index ea5852fcd709c8dcfb498645947d2e6b84b1b65e..d11abce1bac09e1954ff02cf8e131d154a5e2c95 100644 --- a/server-distributed/src/main.rs +++ b/server-distributed/src/main.rs @@ -72,11 +72,11 @@ async fn main() { .route("/metadata", post(init_metadata)) .route("/metadata", get(get_metadata)) .layer(DefaultBodyLimit::disable()) - // .layer( - // TraceLayer::new_for_http() - // .make_span_with(trace::DefaultMakeSpan::new().level(Level::INFO)) - // .on_response(trace::DefaultOnResponse::new().level(Level::INFO)), - // ) + .layer( + TraceLayer::new_for_http() + .make_span_with(trace::DefaultMakeSpan::new().level(Level::INFO)) + .on_response(trace::DefaultOnResponse::new().level(Level::INFO)), + ) .with_state(config); axum::serve(listener, app).await.unwrap(); } @@ -391,7 +391,7 @@ async fn search( while let Some(ciphertext) = db.get(&hash_with_counter_and_nonce(key.clone(), n, &nonce).unwrap()) { - // info!("Found {}({}) in sda level {} ", key, n, i); + info!("Found {}({}) in sda level {} ", key, n, i); ret_vec.push(ciphertext.to_owned()); n += 1; }