-
Notifications
You must be signed in to change notification settings - Fork 453
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(core/redis): Replace client requests with connection pool (#5117)
* use pool * fix * fix * fix * fix * fix * fix --------- Co-authored-by: lizhenglei <673421862@qq.com>
- Loading branch information
1 parent
f2c5739
commit f9f31f3
Showing
4 changed files
with
217 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use crate::Buffer; | ||
| use crate::Error; | ||
| use crate::ErrorKind; | ||
|
|
||
| use redis::aio::ConnectionLike; | ||
| use redis::aio::ConnectionManager; | ||
|
|
||
| use redis::cluster::ClusterClient; | ||
| use redis::cluster_async::ClusterConnection; | ||
| use redis::from_redis_value; | ||
| use redis::AsyncCommands; | ||
| use redis::Client; | ||
| use redis::RedisError; | ||
|
|
||
| use std::time::Duration; | ||
|
|
||
| #[derive(Clone)] | ||
| pub enum RedisConnection { | ||
| Normal(ConnectionManager), | ||
| Cluster(ClusterConnection), | ||
| } | ||
| impl RedisConnection { | ||
| pub async fn get(&mut self, key: &str) -> crate::Result<Option<Buffer>> { | ||
| let result: Option<bytes::Bytes> = match self { | ||
| RedisConnection::Normal(ref mut conn) => { | ||
| conn.get(key).await.map_err(format_redis_error) | ||
| } | ||
| RedisConnection::Cluster(ref mut conn) => { | ||
| conn.get(key).await.map_err(format_redis_error) | ||
| } | ||
| }?; | ||
| Ok(result.map(Buffer::from)) | ||
| } | ||
|
|
||
| pub async fn set( | ||
| &mut self, | ||
| key: &str, | ||
| value: Vec<u8>, | ||
| ttl: Option<Duration>, | ||
| ) -> crate::Result<()> { | ||
| let value = value.to_vec(); | ||
| if let Some(ttl) = ttl { | ||
| match self { | ||
| RedisConnection::Normal(ref mut conn) => conn | ||
| .set_ex(key, value, ttl.as_secs()) | ||
| .await | ||
| .map_err(format_redis_error)?, | ||
| RedisConnection::Cluster(ref mut conn) => conn | ||
| .set_ex(key, value, ttl.as_secs()) | ||
| .await | ||
| .map_err(format_redis_error)?, | ||
| } | ||
| } else { | ||
| match self { | ||
| RedisConnection::Normal(ref mut conn) => { | ||
| conn.set(key, value).await.map_err(format_redis_error)? | ||
| } | ||
| RedisConnection::Cluster(ref mut conn) => { | ||
| conn.set(key, value).await.map_err(format_redis_error)? | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| pub async fn delete(&mut self, key: &str) -> crate::Result<()> { | ||
| match self { | ||
| RedisConnection::Normal(ref mut conn) => { | ||
| let _: () = conn.del(key).await.map_err(format_redis_error)?; | ||
| } | ||
| RedisConnection::Cluster(ref mut conn) => { | ||
| let _: () = conn.del(key).await.map_err(format_redis_error)?; | ||
| } | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| pub async fn append(&mut self, key: &str, value: &[u8]) -> crate::Result<()> { | ||
| match self { | ||
| RedisConnection::Normal(ref mut conn) => { | ||
| () = conn.append(key, value).await.map_err(format_redis_error)?; | ||
| } | ||
| RedisConnection::Cluster(ref mut conn) => { | ||
| () = conn.append(key, value).await.map_err(format_redis_error)?; | ||
| } | ||
| } | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct RedisConnectionManager { | ||
| pub client: Option<Client>, | ||
| pub cluster_client: Option<ClusterClient>, | ||
| } | ||
|
|
||
| #[async_trait::async_trait] | ||
| impl bb8::ManageConnection for RedisConnectionManager { | ||
| type Connection = RedisConnection; | ||
| type Error = Error; | ||
|
|
||
| async fn connect(&self) -> Result<RedisConnection, Self::Error> { | ||
| if let Some(client) = self.client.clone() { | ||
| ConnectionManager::new(client.clone()) | ||
| .await | ||
| .map_err(format_redis_error) | ||
| .map(RedisConnection::Normal) | ||
| } else { | ||
| self.cluster_client | ||
| .clone() | ||
| .unwrap() | ||
| .get_async_connection() | ||
| .await | ||
| .map_err(format_redis_error) | ||
| .map(RedisConnection::Cluster) | ||
| } | ||
| } | ||
|
|
||
| async fn is_valid(&self, conn: &mut Self::Connection) -> Result<(), Self::Error> { | ||
| let pong_value = match conn { | ||
| RedisConnection::Normal(ref mut conn) => conn | ||
| .send_packed_command(&redis::cmd("PING")) | ||
| .await | ||
| .map_err(format_redis_error)?, | ||
|
|
||
| RedisConnection::Cluster(ref mut conn) => conn | ||
| .req_packed_command(&redis::cmd("PING")) | ||
| .await | ||
| .map_err(format_redis_error)?, | ||
| }; | ||
| let pong: String = from_redis_value(&pong_value).map_err(format_redis_error)?; | ||
|
|
||
| if pong == "PONG" { | ||
| Ok(()) | ||
| } else { | ||
| Err(Error::new(ErrorKind::Unexpected, "PING ERROR")) | ||
| } | ||
| } | ||
|
|
||
| fn has_broken(&self, _: &mut Self::Connection) -> bool { | ||
| false | ||
| } | ||
| } | ||
|
|
||
| pub fn format_redis_error(e: RedisError) -> Error { | ||
| Error::new(ErrorKind::Unexpected, e.category()) | ||
| .set_source(e) | ||
| .set_temporary() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters