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

feat(rust): optimize sqlite queries #8714

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

feat(rust): optimize sqlite queries #8714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
697a720
feat(rust): optimize sqlite queries
SanjoDeundiak Dec 19, 2024
e1b1bdd
chore(rust): change sqlite configuration
SanjoDeundiak Dec 19, 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
62 changes: 19 additions & 43 deletions ...st/ockam/ockam_api/src/authenticator/storage/authority_enrollment_token_repository_sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,49 +53,25 @@ impl AuthorityEnrollmentTokenRepository for AuthorityEnrollmentTokenSqlxDatabase
one_time_code: OneTimeCode,
now: TimestampInSeconds,
) -> Result<Option<EnrollmentToken>> {
// We need to delete expired tokens regularly
// Also makes sure we don't get expired tokens later inside this function
let query1 = query("DELETE FROM authority_enrollment_token WHERE expires_at <= $1")
.bind(now.0 as i64);

let res = query1.execute(&*self.database.pool).await.into_core()?;
debug!("Deleted {} expired enrollment tokens", res.rows_affected());

let mut transaction = self.database.pool.begin().await.into_core()?;

let query2 = query_as("SELECT one_time_code, reference, issued_by, created_at, expires_at, ttl_count, attributes FROM authority_enrollment_token WHERE one_time_code = $1")
.bind(one_time_code);
let row: Option<EnrollmentTokenRow> =
query2.fetch_optional(&mut *transaction).await.into_core()?;
let token: Option<EnrollmentToken> = row.map(|r| r.try_into()).transpose()?;

if let Some(token) = &token {
if token.ttl_count <= 1 {
let query3 =
query("DElETE FROM authority_enrollment_token WHERE one_time_code = $1")
.bind(one_time_code);
query3.execute(&mut *transaction).await.void()?;
debug!(
"Deleted enrollment token because it has been used. Reference: {}",
token.reference()
);
} else {
let new_ttl_count = token.ttl_count - 1;
let query3 = query(
"UPDATE authority_enrollment_token SET ttl_count = $1 WHERE one_time_code = $2",
)
.bind(new_ttl_count as i64)
.bind(one_time_code);
query3.execute(&mut *transaction).await.void()?;
debug!(
"Decreasing enrollment token usage count to {}. Reference: {}",
new_ttl_count,
token.reference()
);
}
}

transaction.commit().await.void()?;
// FIXME: We need to delete expired tokens regularly
// FIXME 2: Also now need to clear tokens with ttl_count = 0

let query = query_as("UPDATE authority_enrollment_token SET ttl_count = ttl_count - 1 WHERE one_time_code = $1 AND expires_at > $2 AND ttl_count > 0 RETURNING one_time_code, reference, issued_by, created_at, expires_at, ttl_count, attributes")
.bind(one_time_code)
.bind(now);
let row: Option<EnrollmentTokenRow> = query
.fetch_optional(&*self.database.pool)
.await
.into_core()?;
let token = if let Some(row) = row {
let mut t = EnrollmentToken::try_from(row)?;

t.ttl_count += 1; // We decremented it inside the query

Some(t)
} else {
None
};

Ok(token)
}
Expand Down
8 changes: 6 additions & 2 deletions implementations/rust/ockam/ockam_identity/src/identities/identities_attributes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,12 @@ impl IdentitiesAttributes {
subject: &Identifier,
attested_by: &Identifier,
) -> Result<Option<AttributesEntry>> {
self.repository.delete_expired_attributes(now()?).await?;
self.repository.get_attributes(subject, attested_by).await
let now = now()?;
// FIXME: This should be run periodically in a separate task
// self.repository.delete_expired_attributes(now()?).await?;
self.repository
.get_non_expired_attributes(subject, attested_by, now)
.await
}

/// Set the attributes associated with the given identity identifier.
Expand Down
10 changes: 7 additions & 3 deletions ...ations/rust/ockam/ockam_identity/src/identities/storage/identity_attributes_repository.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ use ockam_node::retry;
#[async_trait]
pub trait IdentityAttributesRepository: Send + Sync + 'static {
/// Get the attributes associated with the given identity identifier
async fn get_attributes(
async fn get_non_expired_attributes(
&self,
subject: &Identifier,
attested_by: &Identifier,
now: TimestampInSeconds,
) -> Result<Option<AttributesEntry>>;

/// Set the attributes associated with the given identity identifier.
Expand All @@ -28,12 +29,15 @@ pub trait IdentityAttributesRepository: Send + Sync + 'static {
#[cfg(feature = "std")]
#[async_trait]
impl<T: IdentityAttributesRepository> IdentityAttributesRepository for AutoRetry<T> {
async fn get_attributes(
async fn get_non_expired_attributes(
&self,
subject: &Identifier,
attested_by: &Identifier,
now: TimestampInSeconds,
) -> Result<Option<AttributesEntry>> {
retry!(self.wrapped.get_attributes(subject, attested_by))
retry!(self
.wrapped
.get_non_expired_attributes(subject, attested_by, now))
}

async fn put_attributes(&self, subject: &Identifier, entry: AttributesEntry) -> Result<()> {
Expand Down
18 changes: 10 additions & 8 deletions ...ns/rust/ockam/ockam_identity/src/identities/storage/identity_attributes_repository_sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,18 @@ impl IdentityAttributesSqlxDatabase {

#[async_trait]
impl IdentityAttributesRepository for IdentityAttributesSqlxDatabase {
async fn get_attributes(
async fn get_non_expired_attributes(
&self,
identity: &Identifier,
attested_by: &Identifier,
now: TimestampInSeconds,
) -> Result<Option<AttributesEntry>> {
let query = query_as(
"SELECT identifier, attributes, added, expires, attested_by FROM identity_attributes WHERE identifier = $1 AND attested_by = $2 AND node_name = $3"
"SELECT identifier, attributes, added, expires, attested_by FROM identity_attributes WHERE identifier = $1 AND attested_by = $2 AND (expires > $3 or expires IS NULL) AND node_name = $4"
)
.bind(identity)
.bind(attested_by)
.bind(now)
.bind(&self.node_name);
let identity_attributes: Option<IdentityAttributesRow> = query
.fetch_optional(&*self.database.pool)
Expand Down Expand Up @@ -186,12 +188,12 @@ mod tests {
.await?;

let result = repository
.get_attributes(&identifier1, &identifier1)
.get_non_expired_attributes(&identifier1, &identifier1, now)
.await?;
assert_eq!(result, Some(attributes1.clone()));

let result = repository
.get_attributes(&identifier2, &identifier2)
.get_non_expired_attributes(&identifier2, &identifier2, now)
.await?;
assert_eq!(result, Some(attributes2.clone()));

Expand Down Expand Up @@ -236,17 +238,17 @@ mod tests {
repository.delete_expired_attributes(now.add(10)).await?;

let result = repository
.get_attributes(&identifier1, &identifier1)
.get_non_expired_attributes(&identifier1, &identifier1, now)
.await?;
assert_eq!(result, None);

let result = repository
.get_attributes(&identifier2, &identifier2)
.get_non_expired_attributes(&identifier2, &identifier2, now)
.await?;
assert_eq!(result, None);

let result = repository
.get_attributes(&identifier3, &identifier3)
.get_non_expired_attributes(&identifier3, &identifier3, now)
.await?;
assert_eq!(
result,
Expand All @@ -255,7 +257,7 @@ mod tests {
);

let result = repository
.get_attributes(&identifier4, &identifier4)
.get_non_expired_attributes(&identifier4, &identifier4, now)
.await?;
assert_eq!(
result,
Expand Down
4 changes: 3 additions & 1 deletion implementations/rust/ockam/ockam_node/src/storage/database/sqlx_database.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,11 @@ impl SqlxDatabase {
let _ = connection
.execute(
r#"
PRAGMA synchronous = EXTRA;
PRAGMA synchronous = NORMAL;
PRAGMA locking_mode = NORMAL;
PRAGMA busy_timeout = 10000;
PRAGMA cache_size = -50000; -- 50 MB
PRAGMA mmap_size = 52428800; -- 50 MB
"#,
)
.await
Expand Down
Loading