feat!: [torrust#1491] remove unused torrent repository entry types

Entry types that are not used in production. They have been moved to a new package `torrent-repository-benchmarking`.

Author: josecelano

Cargo.lock

@@ -19,7 +19,6 @@ version.workspace = true
 aquatic_udp_protocol = "0"
 bittorrent-primitives = "0.1.0"
 crossbeam-skiplist = "0"
-parking_lot = "0"
 tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }

packages/torrent-repository/Cargo.toml

@@ -8,11 +8,8 @@ use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
 
 use self::peer_list::PeerList;
 
-pub mod mutex_parking_lot;
 pub mod mutex_std;
-pub mod mutex_tokio;
 pub mod peer_list;
-pub mod rw_lock_parking_lot;
 pub mod single;
 
 pub trait Entry {

packages/torrent-repository/src/entry/mod.rs

@@ -7,12 +7,8 @@ pub mod entry;
 pub mod repository;
 
 // Repo Entries
-
 pub type EntrySingle = entry::Torrent;
 pub type EntryMutexStd = Arc<std::sync::Mutex<entry::Torrent>>;
-pub type EntryMutexTokio = Arc<tokio::sync::Mutex<entry::Torrent>>;
-pub type EntryMutexParkingLot = Arc<parking_lot::Mutex<entry::Torrent>>;
-pub type EntryRwLockParkingLot = Arc<parking_lot::RwLock<entry::Torrent>>;
 
 // Repository
 pub type TorrentsSkipMapMutexStd = CrossbeamSkipList<EntryMutexStd>;

packages/torrent-repository/src/entry/mutex_parking_lot.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use bittorrent_primitives::info_hash::InfoHash;
 use crossbeam_skiplist::SkipMap;
 use torrust_tracker_configuration::TrackerPolicy;
@@ -10,7 +8,7 @@ use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent
 use super::Repository;
 use crate::entry::peer_list::PeerList;
 use crate::entry::{Entry, EntrySync};
-use crate::{EntryMutexParkingLot, EntryMutexStd, EntryRwLockParkingLot, EntrySingle};
+use crate::{EntryMutexStd, EntrySingle};
 
 #[derive(Default, Debug)]
 pub struct CrossbeamSkipList<T> {
@@ -140,189 +138,3 @@ where
         }
     }
 }
-
-impl Repository<EntryRwLockParkingLot> for CrossbeamSkipList<EntryRwLockParkingLot>
-where
-    EntryRwLockParkingLot: EntrySync,
-    EntrySingle: Entry,
-{
-    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<PersistentTorrent>) -> bool {
-        // todo: load persistent torrent data if provided
-
-        let entry = self.torrents.get_or_insert(*info_hash, Arc::default());
-        entry.value().upsert_peer(peer)
-    }
-
-    fn get_swarm_metadata(&self, info_hash: &InfoHash) -> Option<SwarmMetadata> {
-        self.torrents.get(info_hash).map(|entry| entry.value().get_swarm_metadata())
-    }
-
-    fn get(&self, key: &InfoHash) -> Option<EntryRwLockParkingLot> {
-        let maybe_entry = self.torrents.get(key);
-        maybe_entry.map(|entry| entry.value().clone())
-    }
-
-    fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
-
-        for entry in &self.torrents {
-            let stats = entry.value().read().get_swarm_metadata();
-            metrics.total_complete += u64::from(stats.complete);
-            metrics.total_downloaded += u64::from(stats.downloaded);
-            metrics.total_incomplete += u64::from(stats.incomplete);
-            metrics.total_torrents += 1;
-        }
-
-        metrics
-    }
-
-    fn get_paginated(&self, pagination: Option<&Pagination>) -> Vec<(InfoHash, EntryRwLockParkingLot)> {
-        match pagination {
-            Some(pagination) => self
-                .torrents
-                .iter()
-                .skip(pagination.offset as usize)
-                .take(pagination.limit as usize)
-                .map(|entry| (*entry.key(), entry.value().clone()))
-                .collect(),
-            None => self
-                .torrents
-                .iter()
-                .map(|entry| (*entry.key(), entry.value().clone()))
-                .collect(),
-        }
-    }
-
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
-        for (info_hash, completed) in persistent_torrents {
-            if self.torrents.contains_key(info_hash) {
-                continue;
-            }
-
-            let entry = EntryRwLockParkingLot::new(
-                EntrySingle {
-                    swarm: PeerList::default(),
-                    downloaded: *completed,
-                }
-                .into(),
-            );
-
-            // Since SkipMap is lock-free the torrent could have been inserted
-            // after checking if it exists.
-            self.torrents.get_or_insert(*info_hash, entry);
-        }
-    }
-
-    fn remove(&self, key: &InfoHash) -> Option<EntryRwLockParkingLot> {
-        self.torrents.remove(key).map(|entry| entry.value().clone())
-    }
-
-    fn remove_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) {
-        for entry in &self.torrents {
-            entry.value().remove_inactive_peers(current_cutoff);
-        }
-    }
-
-    fn remove_peerless_torrents(&self, policy: &TrackerPolicy) {
-        for entry in &self.torrents {
-            if entry.value().meets_retaining_policy(policy) {
-                continue;
-            }
-
-            entry.remove();
-        }
-    }
-}
-
-impl Repository<EntryMutexParkingLot> for CrossbeamSkipList<EntryMutexParkingLot>
-where
-    EntryMutexParkingLot: EntrySync,
-    EntrySingle: Entry,
-{
-    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<PersistentTorrent>) -> bool {
-        // todo: load persistent torrent data if provided
-
-        let entry = self.torrents.get_or_insert(*info_hash, Arc::default());
-        entry.value().upsert_peer(peer)
-    }
-
-    fn get_swarm_metadata(&self, info_hash: &InfoHash) -> Option<SwarmMetadata> {
-        self.torrents.get(info_hash).map(|entry| entry.value().get_swarm_metadata())
-    }
-
-    fn get(&self, key: &InfoHash) -> Option<EntryMutexParkingLot> {
-        let maybe_entry = self.torrents.get(key);
-        maybe_entry.map(|entry| entry.value().clone())
-    }
-
-    fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
-
-        for entry in &self.torrents {
-            let stats = entry.value().lock().get_swarm_metadata();
-            metrics.total_complete += u64::from(stats.complete);
-            metrics.total_downloaded += u64::from(stats.downloaded);
-            metrics.total_incomplete += u64::from(stats.incomplete);
-            metrics.total_torrents += 1;
-        }
-
-        metrics
-    }
-
-    fn get_paginated(&self, pagination: Option<&Pagination>) -> Vec<(InfoHash, EntryMutexParkingLot)> {
-        match pagination {
-            Some(pagination) => self
-                .torrents
-                .iter()
-                .skip(pagination.offset as usize)
-                .take(pagination.limit as usize)
-                .map(|entry| (*entry.key(), entry.value().clone()))
-                .collect(),
-            None => self
-                .torrents
-                .iter()
-                .map(|entry| (*entry.key(), entry.value().clone()))
-                .collect(),
-        }
-    }
-
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
-        for (info_hash, completed) in persistent_torrents {
-            if self.torrents.contains_key(info_hash) {
-                continue;
-            }
-
-            let entry = EntryMutexParkingLot::new(
-                EntrySingle {
-                    swarm: PeerList::default(),
-                    downloaded: *completed,
-                }
-                .into(),
-            );
-
-            // Since SkipMap is lock-free the torrent could have been inserted
-            // after checking if it exists.
-            self.torrents.get_or_insert(*info_hash, entry);
-        }
-    }
-
-    fn remove(&self, key: &InfoHash) -> Option<EntryMutexParkingLot> {
-        self.torrents.remove(key).map(|entry| entry.value().clone())
-    }
-
-    fn remove_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) {
-        for entry in &self.torrents {
-            entry.value().remove_inactive_peers(current_cutoff);
-        }
-    }
-
-    fn remove_peerless_torrents(&self, policy: &TrackerPolicy) {
-        for entry in &self.torrents {
-            if entry.value().meets_retaining_policy(policy) {
-                continue;
-            }
-
-            entry.remove();
-        }
-    }
-}