Skip to content

Don't hold DashMap lock over await points. #4138

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

Merged
merged 1 commit into from
Jun 18, 2025
Merged

Don't hold DashMap lock over await points. #4138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 32 additions & 36 deletions linera-views/src/backends/scylla_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use std::{
};

use async_lock::{Semaphore, SemaphoreGuard};
use dashmap::{mapref::entry::Entry, DashMap};
use dashmap::DashMap;
use futures::{future::join_all, StreamExt as _};
use linera_base::ensure;
use scylla::{
Expand Down Expand Up @@ -240,48 +240,44 @@ impl ScyllaDbClient {
&self,
num_markers: usize,
) -> Result<PreparedStatement, ScyllaDbStoreInternalError> {
let entry = self.multi_key_values.entry(num_markers);
match entry {
Entry::Occupied(entry) => Ok(entry.get().clone()),
Entry::Vacant(entry) => {
let markers = std::iter::repeat_n("?", num_markers)
.collect::<Vec<_>>()
.join(",");
let prepared_statement = self
.session
.prepare(format!(
"SELECT k,v FROM {}.{} WHERE root_key = ? AND k IN ({})",
KEYSPACE, self.namespace, markers
))
.await?;
entry.insert(prepared_statement.clone());
Ok(prepared_statement)
}
if let Some(prepared_statement) = self.multi_key_values.get(&num_markers) {
return Ok(prepared_statement.clone());
}
let markers = std::iter::repeat_n("?", num_markers)
.collect::<Vec<_>>()
.join(",");
let prepared_statement = self
.session
.prepare(format!(
"SELECT k,v FROM {}.{} WHERE root_key = ? AND k IN ({})",
KEYSPACE, self.namespace, markers
))
.await?;
self.multi_key_values
.insert(num_markers, prepared_statement.clone());
Ok(prepared_statement)
}

async fn get_multi_keys_statement(
&self,
num_markers: usize,
) -> Result<PreparedStatement, ScyllaDbStoreInternalError> {
let entry = self.multi_keys.entry(num_markers);
match entry {
Entry::Occupied(entry) => Ok(entry.get().clone()),
Entry::Vacant(entry) => {
let markers = std::iter::repeat_n("?", num_markers)
.collect::<Vec<_>>()
.join(",");
let prepared_statement = self
.session
.prepare(format!(
"SELECT k FROM {}.{} WHERE root_key = ? AND k IN ({})",
KEYSPACE, self.namespace, markers
))
.await?;
entry.insert(prepared_statement.clone());
Ok(prepared_statement)
}
}
if let Some(prepared_statement) = self.multi_keys.get(&num_markers) {
return Ok(prepared_statement.clone());
};
let markers = std::iter::repeat_n("?", num_markers)
.collect::<Vec<_>>()
.join(",");
let prepared_statement = self
.session
.prepare(format!(
"SELECT k FROM {}.{} WHERE root_key = ? AND k IN ({})",
KEYSPACE, self.namespace, markers
))
.await?;
self.multi_keys
.insert(num_markers, prepared_statement.clone());
Ok(prepared_statement)
}

fn check_key_size(key: &[u8]) -> Result<(), ScyllaDbStoreInternalError> {
Expand Down
Loading