Merge #1492: Overhaul stats: Simplify torrent-repository package before adding events

7215f6e refactor: [#1491] clean tests in torrent-repository (Jose Celano)
1f5d18f refactor: [#1491] remove duplicate code (Jose Celano)
09bbef7 refactor: [#1491] rename varaible (Jose Celano)
32acbb1 refactor: [#1491] rename method (Jose Celano)
21b18e4 refactor: [#1491] move functionality from InMemoryTorrentRepository to TorrentRepository (Jose Celano)
df00533 refactor: [#1491] rename main types in torrent-repository pkg (Jose Celano)
9be7c68 refactor: [#1491] remove redundant type aliases (Jose Celano)
71aa8d0 fix: [#1491] deadlock running tests (Jose Celano)
f106c01 refactor: [#1491] move type alias to torrent-repository pkg (Jose Celano)
2b0727e refactor: [#1491] reorganize repository module (Jose Celano)
0acfc8f refactor: [#1491] remove unneeded type alias EntrySingle (Jose Celano)
f868b04 refactor: [#1491] put implementation and type in the same module (Jose Celano)
e87479e refactor: [#1491] extract mod torrent (Jose Celano)
e0a4aac feat!: [#1491] remove unneeded generic (Jose Celano)
ecd2266 feat!: [#1491] remove unused traits Entry and EntrySync (Jose Celano)
382e0af faet!: [#1491] remove unused trait Repository (Jose Celano)
89123fa feat!: [#1491] remove unused traits RepositoryAsync and EntryAsync (Jose Celano)
b2a9684 feat!: [#1491] remove unused torrent repository entry types (Jose Celano)
16a6d08 feat!: [#1491] remove unused torrent repositories (Jose Celano)
3d53b23 feat: [#1491] copy torrent repo benchmarking into a new pkg (Jose Celano)

Pull request description:

  Simplify `torrent-repository` package [before adding events](#1358). It would be overkill to maintain all the implementations.

  ### Subtasks

  - [x] Copy benchmarking code to a new workspace package `torrent-repository-benchmarking`.
  - [x] Remove code not used in production from the `torrent-repository` package.
    - [x] Unused repositories
    - [x] Unused entries
  - [x] Remove unused traits `RepositoryAsync`, `EntryAsync`, `Entry`, `EntrySync`, etc.
  - [x] Remove generics.
  - [x] Rename main types
  - [x] ~~Import the `bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository` type from the `tracker-repo` package.~~ **DISCARDED**. See #1358 (comment).
  - [x] Clean tests

ACKs for top commit:
  josecelano:
    ACK 7215f6e

Tree-SHA512: a7616eae597ad15302bd30f216437bdf2bcf101e7bcc5d2391c6d23646826aed92cf393d5b79865a57ad10e827da06b6adbb830c1cd5b55eb44dcd0b985853dc

Author: josecelano

.github/workflows/deployment.yaml

@@ -78,5 +78,6 @@ jobs:
           cargo publish -p torrust-tracker-metrics
           cargo publish -p torrust-tracker-primitives
           cargo publish -p torrust-tracker-test-helpers
+          cargo publish -p torrust-tracker-torrent-benchmarking
           cargo publish -p torrust-tracker-torrent-repository
           cargo publish -p torrust-udp-tracker-server

Cargo.lock

@@ -68,7 +68,7 @@ torrust-rest-tracker-api-client = { version = "3.0.0-develop", path = "packages/
 torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "packages/test-helpers" }
 
 [workspace]
-members = ["console/tracker-client"]
+members = ["console/tracker-client", "packages/torrent-repository-benchmarking"]
 
 [profile.dev]
 debug = 1

Cargo.toml

@@ -47,7 +47,7 @@ pub async fn get_metrics(
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     stats_repository: Arc<Repository>,
 ) -> TrackerMetrics {
-    let torrents_metrics = in_memory_torrent_repository.get_torrents_metrics();
+    let torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata();
     let stats = stats_repository.get_stats().await;
 
     TrackerMetrics {

packages/http-tracker-core/src/statistics/services.rs

@@ -32,7 +32,7 @@ pub async fn get_metrics(
     http_stats_repository: Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
     udp_server_stats_repository: Arc<udp_server_statistics::repository::Repository>,
 ) -> TrackerMetrics {
-    let torrents_metrics = in_memory_torrent_repository.get_torrents_metrics();
+    let torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata();
     let udp_banned_ips_total = ban_service.read().await.get_banned_ips_total();
     let http_stats = http_stats_repository.get_stats().await;
     let udp_server_stats = udp_server_stats_repository.get_stats().await;
@@ -97,7 +97,7 @@ pub async fn get_labeled_metrics(
     udp_stats_repository: Arc<bittorrent_udp_tracker_core::statistics::repository::Repository>,
     udp_server_stats_repository: Arc<udp_server_statistics::repository::Repository>,
 ) -> TrackerLabeledMetrics {
-    let _torrents_metrics = in_memory_torrent_repository.get_torrents_metrics();
+    let _torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata();
     let _udp_banned_ips_total = ban_service.read().await.get_banned_ips_total();
 
     let http_stats = http_stats_repository.get_stats().await;

packages/rest-tracker-api-core/src/statistics/services.rs

@@ -0,0 +1,38 @@
+[package]
+description = "A library to runt benchmarking for different implementations of a repository of torrents files and their peers."
+keywords = ["library", "repository", "torrents"]
+name = "torrust-tracker-torrent-repository-benchmarking"
+readme = "README.md"
+
+authors.workspace = true
+categories.workspace = true
+documentation.workspace = true
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+publish.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
+
+[dependencies]
+aquatic_udp_protocol = "0"
+bittorrent-primitives = "0.1.0"
+crossbeam-skiplist = "0"
+dashmap = "6"
+futures = "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" }
+torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
+zerocopy = "0.7"
+
+[dev-dependencies]
+async-std = { version = "1", features = ["attributes", "tokio1"] }
+criterion = { version = "0", features = ["async_tokio"] }
+rstest = "0"
+
+[[bench]]
+harness = false
+name = "repository_benchmark"

packages/torrent-repository-benchmarking/Cargo.toml

@@ -0,0 +1,32 @@
+# Torrust Tracker Torrent Repository Benchmarking
+
+A library to runt benchmarking for different implementations of a repository of torrents files and their peers. Torrent repositories are used by the [Torrust Tracker](https://github.com/torrust/torrust-tracker).
+
+## Benchmarking
+
+```console
+cargo bench -p torrust-tracker-torrent-repository
+```
+
+Example partial output:
+
+```output
+     Running benches/repository_benchmark.rs (target/release/deps/repository_benchmark-a9b0013c8d09c3c3)
+add_one_torrent/RwLockStd
+                        time:   [63.057 ns 63.242 ns 63.506 ns]
+Found 12 outliers among 100 measurements (12.00%)
+  2 (2.00%) low severe
+  2 (2.00%) low mild
+  2 (2.00%) high mild
+  6 (6.00%) high severe
+add_one_torrent/RwLockStdMutexStd
+                        time:   [62.505 ns 63.077 ns 63.817 ns]
+```
+
+## Documentation
+
+[Crate documentation](https://docs.rs/torrust-tracker-torrent-repository).
+
+## License
+
+The project is licensed under the terms of the [GNU AFFERO GENERAL PUBLIC LICENSE](./LICENSE).

packages/torrent-repository-benchmarking/README.md

@@ -3,7 +3,7 @@ use std::time::{Duration, Instant};
 
 use bittorrent_primitives::info_hash::InfoHash;
 use futures::stream::FuturesUnordered;
-use torrust_tracker_torrent_repository::repository::RepositoryAsync;
+use torrust_tracker_torrent_repository_benchmarking::repository::RepositoryAsync;
 
 use super::utils::{generate_unique_info_hashes, DEFAULT_PEER};
 

…rrent-repository/benches/helpers/asyn.rs …ory-benchmarking/benches/helpers/asyn.rspackages/torrent-repository/benches/helpers/asyn.rs renamed to packages/torrent-repository-benchmarking/benches/helpers/asyn.rs packages/torrent-repository/benches/helpers/asyn.rs renamed to packages/torrent-repository-benchmarking/benches/helpers/asyn.rs

@@ -3,7 +3,7 @@ use std::time::{Duration, Instant};
 
 use bittorrent_primitives::info_hash::InfoHash;
 use futures::stream::FuturesUnordered;
-use torrust_tracker_torrent_repository::repository::Repository;
+use torrust_tracker_torrent_repository_benchmarking::repository::Repository;
 
 use super::utils::{generate_unique_info_hashes, DEFAULT_PEER};