eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

fixed redis deserialization issue (#775)

Browse Source
This commit is contained in:
Wyatt Verchere
2023-11-30 19:57:15 -08:00
committed by GitHub
parent b3b55210f7
commit 756c14d988
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/database/redis.rs
View File

@@ -1,7 +1,7 @@
use super::models::DatabaseError; use super::models::DatabaseError;
use deadpool_redis::{Config, Runtime}; use deadpool_redis::{Config, Runtime};
use itertools::Itertools; use itertools::Itertools;
use redis::{cmd, Cmd}; use redis::{cmd, Cmd, FromRedisValue};
use std::fmt::Display; use std::fmt::Display;
const DEFAULT_EXPIRY: i64 = 1800; // 30 minutes const DEFAULT_EXPIRY: i64 = 1800; // 30 minutes
@@ -126,21 +126,18 @@ impl RedisConnection {
ids: impl IntoIterator<Item = impl Display>, ids: impl IntoIterator<Item = impl Display>,
) -> Result<Vec<Option<R>>, DatabaseError> ) -> Result<Vec<Option<R>>, DatabaseError>
where where
R: for<'a> serde::Deserialize<'a>, R: FromRedisValue,
{ {
let mut cmd = cmd("MGET"); let mut cmd = cmd("MGET");
let ids = ids.into_iter().map(|x| x.to_string()).collect_vec();
redis_args( redis_args(
&mut cmd, &mut cmd,
&ids.into_iter() &ids.into_iter()
.map(|x| format!("{}_{}:{}", self.meta_namespace, namespace, x)) .map(|x| format!("{}_{}:{}", self.meta_namespace, namespace, x))
.collect_vec(), .collect_vec(),
); );
let res: Vec<Option<String>> = redis_execute(&mut cmd, &mut self.connection).await?; Ok(redis_execute(&mut cmd, &mut self.connection).await?)
Ok(res
.into_iter()
.map(|x| x.and_then(|x| serde_json::from_str(&x).ok()))
.collect())
} }
pub async fn delete<T1>(&mut self, namespace: &str, id: T1) -> Result<(), DatabaseError> pub async fn delete<T1>(&mut self, namespace: &str, id: T1) -> Result<(), DatabaseError>