Skip to content

Commit 1cf782c

Browse files
clrxblclrxbl
committed
Revert "Implement redis clustering (#5189)"
This reverts commit fb1050e.
1 parent fb1050e commit 1cf782c

File tree

13 files changed

+124
-200
lines changed

13 files changed

+124
-200
lines changed

‎Cargo.lock‎

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const_format = "0.2.34"
6060
daedalus = { path = "packages/daedalus" }
6161
dashmap = "6.1.0"
6262
data-url = "0.3.2"
63-
deadpool-redis = { version ="0.22.0", features = ["cluster-async"] }
63+
deadpool-redis = "0.22.0"
6464
derive_more = "2.0.1"
6565
directories = "6.0.0"
6666
dirs = "6.0.0"

‎apps/labrinth/src/database/models/notification_item.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,10 +557,9 @@ impl DBNotification {
557557
let mut redis = redis.connect().await?;
558558

559559
redis
560-
.delete_many(
561-
USER_NOTIFICATIONS_NAMESPACE,
562-
user_ids.into_iter().map(|id| Some(id.0.to_string())),
563-
)
560+
.delete_many(user_ids.into_iter().map(|id| {
561+
(USER_NOTIFICATIONS_NAMESPACE, Some(id.0.to_string()))
562+
}))
564563
.await?;
565564

566565
Ok(())

‎apps/labrinth/src/database/models/organization_item.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,16 +256,15 @@ impl DBOrganization {
256256
) -> Result<(), super::DatabaseError> {
257257
let mut redis = redis.connect().await?;
258258

259-
if let Some(slug) = slug {
260-
redis
261-
.delete(ORGANIZATIONS_TITLES_NAMESPACE, slug.to_lowercase())
262-
.await?;
263-
}
264-
265259
redis
266-
.delete(ORGANIZATIONS_NAMESPACE, id.0.to_string())
260+
.delete_many([
261+
(ORGANIZATIONS_NAMESPACE, Some(id.0.to_string())),
262+
(
263+
ORGANIZATIONS_TITLES_NAMESPACE,
264+
slug.map(|x| x.to_lowercase()),
265+
),
266+
])
267267
.await?;
268-
269268
Ok(())
270269
}
271270
}

‎apps/labrinth/src/database/models/pat_item.rs‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -209,26 +209,18 @@ impl DBPersonalAccessToken {
209209
}
210210

211211
redis
212-
.delete_many(
213-
PATS_NAMESPACE,
214-
clear_pats
215-
.iter()
216-
.map(|(x, _, _)| x.map(|i| i.0.to_string())),
217-
)
218-
.await?;
219-
redis
220-
.delete_many(
221-
PATS_TOKENS_NAMESPACE,
222-
clear_pats.iter().map(|(_, token, _)| token.clone()),
223-
)
224-
.await?;
225-
redis
226-
.delete_many(
227-
PATS_USERS_NAMESPACE,
228-
clear_pats
229-
.iter()
230-
.map(|(_, _, x)| x.map(|i| i.0.to_string())),
231-
)
212+
.delete_many(clear_pats.into_iter().flat_map(
213+
|(id, token, user_id)| {
214+
[
215+
(PATS_NAMESPACE, id.map(|i| i.0.to_string())),
216+
(PATS_TOKENS_NAMESPACE, token),
217+
(
218+
PATS_USERS_NAMESPACE,
219+
user_id.map(|i| i.0.to_string()),
220+
),
221+
]
222+
},
223+
))
232224
.await?;
233225

234226
Ok(())

‎apps/labrinth/src/database/models/project_item.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -953,20 +953,20 @@ impl DBProject {
953953
) -> Result<(), DatabaseError> {
954954
let mut redis = redis.connect().await?;
955955

956-
redis.delete(PROJECTS_NAMESPACE, id.0.to_string()).await?;
957-
958-
if let Some(slug) = slug {
959-
redis
960-
.delete(PROJECTS_SLUGS_NAMESPACE, slug.to_lowercase())
961-
.await?;
962-
}
963-
964-
if clear_dependencies.unwrap_or(false) {
965-
redis
966-
.delete(PROJECTS_DEPENDENCIES_NAMESPACE, id.0.to_string())
967-
.await?;
968-
}
969-
956+
redis
957+
.delete_many([
958+
(PROJECTS_NAMESPACE, Some(id.0.to_string())),
959+
(PROJECTS_SLUGS_NAMESPACE, slug.map(|x| x.to_lowercase())),
960+
(
961+
PROJECTS_DEPENDENCIES_NAMESPACE,
962+
if clear_dependencies.unwrap_or(false) {
963+
Some(id.0.to_string())
964+
} else {
965+
None
966+
},
967+
),
968+
])
969+
.await?;
970970
Ok(())
971971
}
972972
}

‎apps/labrinth/src/database/models/session_item.rs‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -268,28 +268,19 @@ impl DBSession {
268268
}
269269

270270
redis
271-
.delete_many(
272-
SESSIONS_NAMESPACE,
273-
clear_sessions
274-
.iter()
275-
.map(|(x, _, _)| x.map(|x| x.0.to_string())),
276-
)
277-
.await?;
278-
redis
279-
.delete_many(
280-
SESSIONS_IDS_NAMESPACE,
281-
clear_sessions.iter().map(|(_, session, _)| session.clone()),
282-
)
271+
.delete_many(clear_sessions.into_iter().flat_map(
272+
|(id, session, user_id)| {
273+
[
274+
(SESSIONS_NAMESPACE, id.map(|i| i.0.to_string())),
275+
(SESSIONS_IDS_NAMESPACE, session),
276+
(
277+
SESSIONS_USERS_NAMESPACE,
278+
user_id.map(|i| i.0.to_string()),
279+
),
280+
]
281+
},
282+
))
283283
.await?;
284-
redis
285-
.delete_many(
286-
SESSIONS_USERS_NAMESPACE,
287-
clear_sessions
288-
.iter()
289-
.map(|(_, _, x)| x.map(|x| x.0.to_string())),
290-
)
291-
.await?;
292-
293284
Ok(())
294285
}
295286

‎apps/labrinth/src/database/models/user_item.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -470,16 +470,15 @@ impl DBUser {
470470
let mut redis = redis.connect().await?;
471471

472472
redis
473-
.delete_many(
474-
USERS_NAMESPACE,
475-
user_ids.iter().map(|(id, _)| Some(id.0.to_string())),
476-
)
477-
.await?;
478-
redis
479-
.delete_many(
480-
USER_USERNAMES_NAMESPACE,
481-
user_ids.iter().map(|(_, username)| username.clone()),
482-
)
473+
.delete_many(user_ids.iter().flat_map(|(id, username)| {
474+
[
475+
(USERS_NAMESPACE, Some(id.0.to_string())),
476+
(
477+
USER_USERNAMES_NAMESPACE,
478+
username.clone().map(|i| i.to_lowercase()),
479+
),
480+
]
481+
}))
483482
.await?;
484483
Ok(())
485484
}
@@ -492,8 +491,9 @@ impl DBUser {
492491

493492
redis
494493
.delete_many(
495-
USERS_PROJECTS_NAMESPACE,
496-
user_ids.iter().map(|id| Some(id.0.to_string())),
494+
user_ids.iter().map(|id| {
495+
(USERS_PROJECTS_NAMESPACE, Some(id.0.to_string()))
496+
}),
497497
)
498498
.await?;
499499

‎apps/labrinth/src/database/models/version_item.rs‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use itertools::Itertools;
1414
use serde::{Deserialize, Serialize};
1515
use std::cmp::Ordering;
1616
use std::collections::HashMap;
17+
use std::iter;
1718

1819
pub const VERSIONS_NAMESPACE: &str = "versions";
1920
const VERSION_FILES_NAMESPACE: &str = "versions_files";
@@ -913,21 +914,24 @@ impl DBVersion {
913914
) -> Result<(), DatabaseError> {
914915
let mut redis = redis.connect().await?;
915916

916-
redis
917-
.delete(VERSIONS_NAMESPACE, version.inner.id.0.to_string())
918-
.await?;
919-
920917
redis
921918
.delete_many(
922-
VERSION_FILES_NAMESPACE,
923-
version.files.iter().flat_map(|file| {
924-
file.hashes
925-
.iter()
926-
.map(|(algo, hash)| Some(format!("{algo}_{hash}")))
927-
}),
919+
iter::once((
920+
VERSIONS_NAMESPACE,
921+
Some(version.inner.id.0.to_string()),
922+
))
923+
.chain(version.files.iter().flat_map(
924+
|file| {
925+
file.hashes.iter().map(|(algo, hash)| {
926+
(
927+
VERSION_FILES_NAMESPACE,
928+
Some(format!("{algo}_{hash}")),
929+
)
930+
})
931+
},
932+
)),
928933
)
929934
.await?;
930-
931935
Ok(())
932936
}
933937
}

0 commit comments

Comments
 (0)