diff options
Diffstat (limited to '')
| -rw-r--r-- | crates/server/src/database/db/mod.rs (renamed from crates/turtle/src/atuin_server/database/db/mod.rs) | 13 | ||||
| -rw-r--r-- | crates/server/src/database/db/wrappers.rs (renamed from crates/turtle/src/atuin_server/database/db/wrappers.rs) | 4 | ||||
| -rw-r--r-- | crates/server/src/database/mod.rs (renamed from crates/turtle/src/atuin_server/database/mod.rs) | 0 | ||||
| -rw-r--r-- | crates/server/src/database/models.rs (renamed from crates/turtle/src/atuin_server/database/models.rs) | 0 |
4 files changed, 7 insertions, 10 deletions
diff --git a/crates/turtle/src/atuin_server/database/db/mod.rs b/crates/server/src/database/db/mod.rs index 77bd0c61..19a1fb3b 100644 --- a/crates/turtle/src/atuin_server/database/db/mod.rs +++ b/crates/server/src/database/db/mod.rs @@ -1,12 +1,9 @@ use std::collections::HashMap; -use rand::Rng; - -use crate::{ - atuin_common::record::{EncryptedData, HostId, Record, RecordIdx, RecordStatus}, - atuin_server::database::{DbError, DbResult, DbSettings, models::User}, -}; +use crate::database::{DbError, DbResult, DbSettings, models::User}; +use rand::RngExt; use sqlx::postgres::PgPoolOptions; +use turtle_common::record::{EncryptedData, HostId, Record, RecordIdx, RecordStatus}; use tracing::instrument; use uuid::Uuid; @@ -110,7 +107,7 @@ impl ServerPostgres { let mut heads = HashMap::<(HostId, &str), u64>::new(); for i in records { - let id = crate::atuin_common::utils::uuid_v7(); + let id = turtle_common::utils::uuid_v7(); let result = sqlx::query( " @@ -232,7 +229,7 @@ impl ServerPostgres { let idx_cache_rollout = std::env::var("IDX_CACHE_ROLLOUT").unwrap_or_else(|_| "0".to_string()); let idx_cache_rollout = idx_cache_rollout.parse::<f64>().unwrap_or(0.0); - let use_idx_cache = rand::thread_rng().gen_bool(idx_cache_rollout / 100.0); + let use_idx_cache = rand::rng().random_bool(idx_cache_rollout / 100.0); let mut res: Vec<(Uuid, String, i64)> = if use_idx_cache { tracing::debug!("using idx cache for user {}", user.id); diff --git a/crates/turtle/src/atuin_server/database/db/wrappers.rs b/crates/server/src/database/db/wrappers.rs index 0315e331..6bacf47f 100644 --- a/crates/turtle/src/atuin_server/database/db/wrappers.rs +++ b/crates/server/src/database/db/wrappers.rs @@ -1,7 +1,7 @@ -use crate::atuin_common::record::{EncryptedData, Host, Record}; +use turtle_common::record::{EncryptedData, Host, Record}; use sqlx::{Row, postgres::PgRow}; -pub(crate) struct DbRecord(pub Record<EncryptedData>); +pub(crate) struct DbRecord(pub(crate) Record<EncryptedData>); impl<'a> ::sqlx::FromRow<'a, PgRow> for DbRecord { fn from_row(row: &'a PgRow) -> ::sqlx::Result<Self> { diff --git a/crates/turtle/src/atuin_server/database/mod.rs b/crates/server/src/database/mod.rs index 43fe5c3b..43fe5c3b 100644 --- a/crates/turtle/src/atuin_server/database/mod.rs +++ b/crates/server/src/database/mod.rs diff --git a/crates/turtle/src/atuin_server/database/models.rs b/crates/server/src/database/models.rs index 3fa6f471..3fa6f471 100644 --- a/crates/turtle/src/atuin_server/database/models.rs +++ b/crates/server/src/database/models.rs |
