Skip to content

Commit

Permalink
ref(redis): Changes redis fork to improved PR for timeout issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Dav1dde committed Sep 19, 2024
1 parent 84fb625 commit 8f805ba
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
5 changes: 2 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ rand_pcg = "0.3.1"
rayon = "1.10"
rdkafka = "0.36.2"
rdkafka-sys = "4.3.0"
# Git revision until https://github.com/redis-rs/redis-rs/pull/1097 (merged) and https://github.com/redis-rs/redis-rs/pull/1253 are released.
redis = { git = "https://github.com/getsentry/redis-rs.git", rev = "939e5df6f9cc976b0a53987f6eb3f76b2c398bd6", default-features = false }
# Git revision until https://github.com/redis-rs/redis-rs/pull/1097 (merged) and https://github.com/redis-rs/redis-rs/pull/1290 are released.
redis = { git = "https://github.com/getsentry/redis-rs.git", rev = "fc7d98cc10c16fa7c0c31de64dc1b713354a4384", default-features = false }
regex = "1.10.2"
regex-lite = "0.1.6"
reqwest = "0.12.7"
Expand Down
2 changes: 1 addition & 1 deletion relay-cardinality/benches/redis_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fn build_limiter(redis: RedisPool, reset_redis: bool) -> RedisSetLimiter {
let mut connection = client.connection().unwrap();

if reset_redis {
redis::cmd("FLUSHALL").execute(&mut connection);
redis::cmd("FLUSHALL").exec(&mut connection).unwrap();
}

RedisSetLimiter::new(
Expand Down
5 changes: 4 additions & 1 deletion relay-cardinality/src/redis/script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,10 @@ mod tests {
let script = CardinalityScript::load();
let keys = keys(Uuid::new_v4(), &["a", "b", "c"]);

redis::cmd("SCRIPT").arg("FLUSH").execute(&mut connection);
redis::cmd("SCRIPT")
.arg("FLUSH")
.exec(&mut connection)
.unwrap();
script
.invoke_one(&mut connection, 50, 3600, 0..30, keys)
.unwrap();
Expand Down
3 changes: 1 addition & 2 deletions relay-server/src/services/processor/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -872,8 +872,7 @@ mod tests {

let event = Annotated::new(Event {
release: Annotated::new(
String::from("���7��#1G����7��#1G����7��#1G����7��#1G����7��#")
.into(),
String::from("���7��#1G����7��#1G����7��#1G����7��#1G����7��#").into(),
),
..Default::default()
});
Expand Down

0 comments on commit 8f805ba

Please sign in to comment.