Skip to content

Commit

Permalink
Revert "Update redis/bb8"
Browse files Browse the repository at this point in the history
We are seeing potential issues with this version of redis
elsewhere. Let's revert for now until we can further
troubleshoot.

This reverts commit df8cd28.
  • Loading branch information
jaymell authored and svix-james committed Apr 10, 2024
1 parent df8cd28 commit a00efe9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions omniqueue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ async-trait = "0.1"
aws-config = { version = "1.1.5", features = ["behavior-version-latest"], optional = true }
aws-sdk-sqs = { version = "1.13.0", optional = true }
bb8 = { version = "0.8", optional = true }
bb8-redis = { version = "0.15.0", optional = true }
bb8-redis = { version = "0.14.0", optional = true }
futures-util = { version = "0.3.28", default-features = false, features = ["async-await", "std"], optional = true }
google-cloud-googleapis = { version = "0.12.0", optional = true }
google-cloud-pubsub = { version = "0.23.0", optional = true }
lapin = { version = "2", optional = true }
redis = { version = "0.25.3", features = ["tokio-comp", "tokio-native-tls-comp", "streams"], optional = true }
redis = { version = "0.24.0", features = ["tokio-comp", "tokio-native-tls-comp", "streams"], optional = true }
serde = "1.0.196"
serde_json = "1"
svix-ksuid = { version = "0.8.0", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions omniqueue/src/backends/redis/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use std::{marker::PhantomData, sync::Arc, time::Duration};

use async_trait::async_trait;
use bb8::ManageConnection;
pub use bb8_redis::RedisConnectionManager;
pub use bb8_redis::RedisMultiplexedConnectionManager;
use redis::{
streams::{StreamClaimReply, StreamId, StreamReadOptions, StreamReadReply},
FromRedisValue, RedisResult,
Expand Down Expand Up @@ -64,7 +64,7 @@ pub trait RedisConnection:
fn from_dsn(dsn: &str) -> Result<Self>;
}

impl RedisConnection for RedisConnectionManager {
impl RedisConnection for RedisMultiplexedConnectionManager {
type Connection = <Self as ManageConnection>::Connection;
type Error = <Self as ManageConnection>::Error;

Expand Down Expand Up @@ -96,7 +96,7 @@ pub struct RedisConfig {
pub ack_deadline_ms: i64,
}

pub struct RedisBackend<R = RedisConnectionManager>(PhantomData<R>);
pub struct RedisBackend<R = RedisMultiplexedConnectionManager>(PhantomData<R>);
#[cfg(feature = "redis_cluster")]
pub type RedisClusterBackend = RedisBackend<RedisClusterConnectionManager>;

Expand Down
2 changes: 1 addition & 1 deletion omniqueue/tests/it/redis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ async fn make_test_queue() -> (QueueBuilder<RedisBackend>, RedisStreamDrop) {
.collect();

let client = Client::open(ROOT_URL).unwrap();
let mut conn = client.get_multiplexed_async_connection().await.unwrap();
let mut conn = client.get_async_connection().await.unwrap();

let _: () = conn
.xgroup_create_mkstream(&stream_name, "test_cg", 0i8)
Expand Down

0 comments on commit a00efe9

Please sign in to comment.