dev: create torrent repo trait and extract entry

torrust · Mar 25, 2024 · 1025125 · 1025125
1 parent 48ce426
commit 1025125
Show file tree

Hide file tree

Showing 21 changed files with 1,222 additions and 747 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cSpell.json b/cSpell.json
@@ -36,6 +36,7 @@
         "Containerfile",
         "curr",
         "Cyberneering",
+        "dashmap",
         "datagram",
         "datetime",
         "debuginfo",

diff --git a/packages/torrent-repository-benchmarks/src/benches/asyn.rs b/packages/torrent-repository-benchmarks/src/benches/asyn.rs
@@ -3,16 +3,17 @@ use std::time::Duration;
 
 use clap::Parser;
 use futures::stream::FuturesUnordered;
-use torrust_tracker::core::torrent::repository_asyn::{RepositoryAsync, RepositoryTokioRwLock};
-use torrust_tracker::core::torrent::UpdateTorrentAsync;
+use torrust_tracker::core::torrent::repository::tokio_sync::RepositoryTokioRwLock;
+use torrust_tracker::core::torrent::repository::UpdateTorrentAsync;
 use torrust_tracker::shared::bit_torrent::info_hash::InfoHash;
 
 use crate::args::Args;
 use crate::benches::utils::{generate_unique_info_hashes, get_average_and_adjusted_average_from_results, DEFAULT_PEER};
 
 pub async fn add_one_torrent<T>(samples: usize) -> (Duration, Duration)
 where
-    RepositoryTokioRwLock<T>: RepositoryAsync<T> + UpdateTorrentAsync,
+    T: Default,
+    RepositoryTokioRwLock<T>: UpdateTorrentAsync + Default,
 {
     let mut results: Vec<Duration> = Vec::with_capacity(samples);
 
@@ -38,8 +39,8 @@ where
 // Add one torrent ten thousand times in parallel (depending on the set worker threads)
 pub async fn update_one_torrent_in_parallel<T>(runtime: &tokio::runtime::Runtime, samples: usize) -> (Duration, Duration)
 where
-    T: Send + Sync + 'static,
-    RepositoryTokioRwLock<T>: RepositoryAsync<T> + UpdateTorrentAsync,
+    T: Default + Send + Sync + 'static,
+    RepositoryTokioRwLock<T>: UpdateTorrentAsync + Default,
 {
     let args = Args::parse();
     let mut results: Vec<Duration> = Vec::with_capacity(samples);
@@ -88,8 +89,8 @@ where
 // Add ten thousand torrents in parallel (depending on the set worker threads)
 pub async fn add_multiple_torrents_in_parallel<T>(runtime: &tokio::runtime::Runtime, samples: usize) -> (Duration, Duration)
 where
-    T: Send + Sync + 'static,
-    RepositoryTokioRwLock<T>: RepositoryAsync<T> + UpdateTorrentAsync,
+    T: Default + Send + Sync + 'static,
+    RepositoryTokioRwLock<T>: UpdateTorrentAsync + Default,
 {
     let args = Args::parse();
     let mut results: Vec<Duration> = Vec::with_capacity(samples);
@@ -133,8 +134,8 @@ where
 // Async update ten thousand torrents in parallel (depending on the set worker threads)
 pub async fn update_multiple_torrents_in_parallel<T>(runtime: &tokio::runtime::Runtime, samples: usize) -> (Duration, Duration)
 where
-    T: Send + Sync + 'static,
-    RepositoryTokioRwLock<T>: RepositoryAsync<T> + UpdateTorrentAsync,
+    T: Default + Send + Sync + 'static,
+    RepositoryTokioRwLock<T>: UpdateTorrentAsync + Default,
 {
     let args = Args::parse();
     let mut results: Vec<Duration> = Vec::with_capacity(samples);

diff --git a/packages/torrent-repository-benchmarks/src/benches/sync.rs b/packages/torrent-repository-benchmarks/src/benches/sync.rs
@@ -3,8 +3,8 @@ use std::time::Duration;
 
 use clap::Parser;
 use futures::stream::FuturesUnordered;
-use torrust_tracker::core::torrent::repository_sync::{RepositoryStdRwLock, RepositorySync};
-use torrust_tracker::core::torrent::UpdateTorrentSync;
+use torrust_tracker::core::torrent::repository::std_sync::RepositoryStdRwLock;
+use torrust_tracker::core::torrent::repository::UpdateTorrentSync;
 use torrust_tracker::shared::bit_torrent::info_hash::InfoHash;
 
 use crate::args::Args;
@@ -14,7 +14,7 @@ use crate::benches::utils::{generate_unique_info_hashes, get_average_and_adjuste
 #[must_use]
 pub fn add_one_torrent<T>(samples: usize) -> (Duration, Duration)
 where
-    RepositoryStdRwLock<T>: RepositorySync<T> + UpdateTorrentSync,
+    RepositoryStdRwLock<T>: UpdateTorrentSync + Default,
 {
     let mut results: Vec<Duration> = Vec::with_capacity(samples);
 
@@ -39,7 +39,7 @@ where
 pub async fn update_one_torrent_in_parallel<T>(runtime: &tokio::runtime::Runtime, samples: usize) -> (Duration, Duration)
 where
     T: Send + Sync + 'static,
-    RepositoryStdRwLock<T>: RepositorySync<T> + UpdateTorrentSync,
+    RepositoryStdRwLock<T>: UpdateTorrentSync + Default,
 {
     let args = Args::parse();
     let mut results: Vec<Duration> = Vec::with_capacity(samples);
@@ -85,7 +85,7 @@ where
 pub async fn add_multiple_torrents_in_parallel<T>(runtime: &tokio::runtime::Runtime, samples: usize) -> (Duration, Duration)
 where
     T: Send + Sync + 'static,
-    RepositoryStdRwLock<T>: RepositorySync<T> + UpdateTorrentSync,
+    RepositoryStdRwLock<T>: UpdateTorrentSync + Default,
 {
     let args = Args::parse();
     let mut results: Vec<Duration> = Vec::with_capacity(samples);
@@ -128,7 +128,7 @@ where
 pub async fn update_multiple_torrents_in_parallel<T>(runtime: &tokio::runtime::Runtime, samples: usize) -> (Duration, Duration)
 where
     T: Send + Sync + 'static,
-    RepositoryStdRwLock<T>: RepositorySync<T> + UpdateTorrentSync,
+    RepositoryStdRwLock<T>: UpdateTorrentSync + Default,
 {
     let args = Args::parse();
     let mut results: Vec<Duration> = Vec::with_capacity(samples);

diff --git a/packages/torrent-repository-benchmarks/src/benches/sync_asyn.rs b/packages/torrent-repository-benchmarks/src/benches/sync_asyn.rs
@@ -3,8 +3,8 @@ use std::time::Duration;
 
 use clap::Parser;
 use futures::stream::FuturesUnordered;
-use torrust_tracker::core::torrent::repository_sync::{RepositoryStdRwLock, RepositorySync};
-use torrust_tracker::core::torrent::UpdateTorrentAsync;
+use torrust_tracker::core::torrent::repository::std_sync::RepositoryStdRwLock;
+use torrust_tracker::core::torrent::repository::UpdateTorrentAsync;
 use torrust_tracker::shared::bit_torrent::info_hash::InfoHash;
 
 use crate::args::Args;
@@ -14,7 +14,7 @@ use crate::benches::utils::{generate_unique_info_hashes, get_average_and_adjuste
 #[must_use]
 pub async fn add_one_torrent<T>(samples: usize) -> (Duration, Duration)
 where
-    RepositoryStdRwLock<T>: RepositorySync<T> + UpdateTorrentAsync,
+    RepositoryStdRwLock<T>: UpdateTorrentAsync + Default,
 {
     let mut results: Vec<Duration> = Vec::with_capacity(samples);
 
@@ -41,7 +41,7 @@ where
 pub async fn update_one_torrent_in_parallel<T>(runtime: &tokio::runtime::Runtime, samples: usize) -> (Duration, Duration)
 where
     T: Send + Sync + 'static,
-    RepositoryStdRwLock<T>: RepositorySync<T> + UpdateTorrentAsync,
+    RepositoryStdRwLock<T>: UpdateTorrentAsync + Default,
 {
     let args = Args::parse();
     let mut results: Vec<Duration> = Vec::with_capacity(samples);
@@ -91,7 +91,7 @@ where
 pub async fn add_multiple_torrents_in_parallel<T>(runtime: &tokio::runtime::Runtime, samples: usize) -> (Duration, Duration)
 where
     T: Send + Sync + 'static,
-    RepositoryStdRwLock<T>: RepositorySync<T> + UpdateTorrentAsync,
+    RepositoryStdRwLock<T>: UpdateTorrentAsync + Default,
 {
     let args = Args::parse();
     let mut results: Vec<Duration> = Vec::with_capacity(samples);
@@ -136,7 +136,7 @@ where
 pub async fn update_multiple_torrents_in_parallel<T>(runtime: &tokio::runtime::Runtime, samples: usize) -> (Duration, Duration)
 where
     T: Send + Sync + 'static,
-    RepositoryStdRwLock<T>: RepositorySync<T> + UpdateTorrentAsync,
+    RepositoryStdRwLock<T>: UpdateTorrentAsync + Default,
 {
     let args = Args::parse();
     let mut results: Vec<Duration> = Vec::with_capacity(samples);

diff --git a/packages/torrent-repository-benchmarks/src/main.rs b/packages/torrent-repository-benchmarks/src/main.rs
@@ -1,7 +1,7 @@
 use clap::Parser;
 use torrust_torrent_repository_benchmarks::args::Args;
 use torrust_torrent_repository_benchmarks::benches::{asyn, sync, sync_asyn};
-use torrust_tracker::core::torrent::{Entry, EntryMutexStd, EntryMutexTokio};
+use torrust_tracker::core::torrent::entry::{Entry, MutexStd, MutexTokio};
 
 #[allow(clippy::too_many_lines)]
 #[allow(clippy::print_literal)]
@@ -68,22 +68,22 @@ fn main() {
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "add_one_torrent",
-            sync::add_one_torrent::<EntryMutexStd>(1_000_000)
+            sync::add_one_torrent::<MutexStd>(1_000_000)
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "update_one_torrent_in_parallel",
-            rt.block_on(sync::update_one_torrent_in_parallel::<EntryMutexStd>(&rt, 10))
+            rt.block_on(sync::update_one_torrent_in_parallel::<MutexStd>(&rt, 10))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "add_multiple_torrents_in_parallel",
-            rt.block_on(sync::add_multiple_torrents_in_parallel::<EntryMutexStd>(&rt, 10))
+            rt.block_on(sync::add_multiple_torrents_in_parallel::<MutexStd>(&rt, 10))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "update_multiple_torrents_in_parallel",
-            rt.block_on(sync::update_multiple_torrents_in_parallel::<EntryMutexStd>(&rt, 10))
+            rt.block_on(sync::update_multiple_torrents_in_parallel::<MutexStd>(&rt, 10))
         );
 
         println!();
@@ -92,22 +92,22 @@ fn main() {
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "add_one_torrent",
-            rt.block_on(sync_asyn::add_one_torrent::<EntryMutexTokio>(1_000_000))
+            rt.block_on(sync_asyn::add_one_torrent::<MutexTokio>(1_000_000))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "update_one_torrent_in_parallel",
-            rt.block_on(sync_asyn::update_one_torrent_in_parallel::<EntryMutexTokio>(&rt, 10))
+            rt.block_on(sync_asyn::update_one_torrent_in_parallel::<MutexTokio>(&rt, 10))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "add_multiple_torrents_in_parallel",
-            rt.block_on(sync_asyn::add_multiple_torrents_in_parallel::<EntryMutexTokio>(&rt, 10))
+            rt.block_on(sync_asyn::add_multiple_torrents_in_parallel::<MutexTokio>(&rt, 10))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "update_multiple_torrents_in_parallel",
-            rt.block_on(sync_asyn::update_multiple_torrents_in_parallel::<EntryMutexTokio>(&rt, 10))
+            rt.block_on(sync_asyn::update_multiple_torrents_in_parallel::<MutexTokio>(&rt, 10))
         );
 
         println!();
@@ -116,22 +116,22 @@ fn main() {
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "add_one_torrent",
-            rt.block_on(asyn::add_one_torrent::<EntryMutexStd>(1_000_000))
+            rt.block_on(asyn::add_one_torrent::<MutexStd>(1_000_000))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "update_one_torrent_in_parallel",
-            rt.block_on(asyn::update_one_torrent_in_parallel::<EntryMutexStd>(&rt, 10))
+            rt.block_on(asyn::update_one_torrent_in_parallel::<MutexStd>(&rt, 10))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "add_multiple_torrents_in_parallel",
-            rt.block_on(asyn::add_multiple_torrents_in_parallel::<EntryMutexStd>(&rt, 10))
+            rt.block_on(asyn::add_multiple_torrents_in_parallel::<MutexStd>(&rt, 10))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "update_multiple_torrents_in_parallel",
-            rt.block_on(asyn::update_multiple_torrents_in_parallel::<EntryMutexStd>(&rt, 10))
+            rt.block_on(asyn::update_multiple_torrents_in_parallel::<MutexStd>(&rt, 10))
         );
 
         println!();
@@ -140,22 +140,22 @@ fn main() {
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "add_one_torrent",
-            rt.block_on(asyn::add_one_torrent::<EntryMutexTokio>(1_000_000))
+            rt.block_on(asyn::add_one_torrent::<MutexTokio>(1_000_000))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "update_one_torrent_in_parallel",
-            rt.block_on(asyn::update_one_torrent_in_parallel::<EntryMutexTokio>(&rt, 10))
+            rt.block_on(asyn::update_one_torrent_in_parallel::<MutexTokio>(&rt, 10))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "add_multiple_torrents_in_parallel",
-            rt.block_on(asyn::add_multiple_torrents_in_parallel::<EntryMutexTokio>(&rt, 10))
+            rt.block_on(asyn::add_multiple_torrents_in_parallel::<MutexTokio>(&rt, 10))
         );
         println!(
             "{}: Avg/AdjAvg: {:?}",
             "update_multiple_torrents_in_parallel",
-            rt.block_on(asyn::update_multiple_torrents_in_parallel::<EntryMutexTokio>(&rt, 10))
+            rt.block_on(asyn::update_multiple_torrents_in_parallel::<MutexTokio>(&rt, 10))
         );
     }
 }
diff --git a/src/core/databases/mod.rs b/src/core/databases/mod.rs
@@ -56,6 +56,8 @@ use self::error::Error;
 use crate::core::auth::{self, Key};
 use crate::shared::bit_torrent::info_hash::InfoHash;
 
+pub type PersistentTorrents = Vec<(InfoHash, u32)>;
+
 struct Builder<T>
 where
     T: Database,
@@ -125,7 +127,7 @@ pub trait Database: Sync + Send {
     /// # Errors
     ///
     /// Will return `Err` if unable to load.
-    async fn load_persistent_torrents(&self) -> Result<Vec<(InfoHash, u32)>, Error>;
+    async fn load_persistent_torrents(&self) -> Result<PersistentTorrents, Error>;
 
     /// It saves the torrent metrics data into the database.
     ///