-
Notifications
You must be signed in to change notification settings - Fork 447
feat: enable caching when using object store #928
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c274680
feat: enable caching when using object store
e1ijah1 9c8bd70
feat: support file cache for object store
e1ijah1 dec0c07
feat: maintaining the cached files with lru
e1ijah1 47bcf6c
fix: improve the code
e1ijah1 20a0ddc
empty commit
e1ijah1 b35d8d3
improve the code
e1ijah1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,125 @@ | ||
| // Copyright 2023 Greptime Team | ||
| // | ||
| // Licensed 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 std::num::NonZeroUsize; | ||
| use std::ops::DerefMut; | ||
| use std::sync::Arc; | ||
|
|
||
| use async_trait::async_trait; | ||
| use futures::future::BoxFuture; | ||
| use lru::LruCache; | ||
| use opendal::layers::CachePolicy; | ||
| use opendal::raw::output::Reader; | ||
| use opendal::raw::{Accessor, RpDelete, RpRead}; | ||
| use opendal::{ErrorKind, OpDelete, OpRead, OpWrite, Result}; | ||
| use tokio::sync::Mutex; | ||
|
|
||
| struct LruValue; | ||
|
|
||
| #[derive(Debug)] | ||
| pub struct LruCachePolicy { | ||
| lru_cache: Arc<Mutex<LruCache<String, LruValue>>>, | ||
| } | ||
|
|
||
| impl LruCachePolicy { | ||
| pub fn new(capacity: usize) -> Self { | ||
| Self { | ||
| lru_cache: Arc::new(Mutex::new(LruCache::new( | ||
| NonZeroUsize::new(capacity).unwrap(), | ||
| ))), | ||
| } | ||
| } | ||
|
|
||
| fn cache_path(&self, path: &str, args: &OpRead) -> String { | ||
| format!("{}.cache-{}", path, args.range().to_header()) | ||
| } | ||
| } | ||
|
|
||
| #[async_trait] | ||
| impl CachePolicy for LruCachePolicy { | ||
| fn on_read( | ||
| &self, | ||
| inner: Arc<dyn Accessor>, | ||
| cache: Arc<dyn Accessor>, | ||
| path: &str, | ||
| args: OpRead, | ||
| ) -> BoxFuture<'static, Result<(RpRead, Reader)>> { | ||
| let path = path.to_string(); | ||
| let cache_path = self.cache_path(&path, &args); | ||
| let lru_cache = self.lru_cache.clone(); | ||
| Box::pin(async move { | ||
| match cache.read(&cache_path, OpRead::default()).await { | ||
| Ok(v) => { | ||
| // update lru when cache hit | ||
| let mut lru_cache = lru_cache.lock().await; | ||
| lru_cache.get_or_insert(cache_path.clone(), || LruValue {}); | ||
| Ok(v) | ||
| } | ||
| Err(err) if err.kind() == ErrorKind::ObjectNotFound => { | ||
| let (rp, reader) = inner.read(&path, args.clone()).await?; | ||
| let size = rp.clone().into_metadata().content_length(); | ||
| let _ = cache | ||
| .write(&cache_path, OpWrite::new(size), Box::new(reader)) | ||
| .await?; | ||
| match cache.read(&cache_path, OpRead::default()).await { | ||
| Ok(v) => { | ||
| let r = { | ||
| // push new cache file name to lru | ||
| let mut lru_cache = lru_cache.lock().await; | ||
| lru_cache.push(cache_path.clone(), LruValue {}) | ||
| }; | ||
| // delete the evicted cache file | ||
| if let Some((k, _v)) = r { | ||
| let _ = cache.delete(&k, OpDelete::new()).await; | ||
| } | ||
| Ok(v) | ||
| } | ||
| Err(_) => return inner.read(&path, args).await, | ||
| } | ||
| } | ||
| Err(_) => return inner.read(&path, args).await, | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| fn on_delete( | ||
| &self, | ||
| inner: Arc<dyn Accessor>, | ||
| cache: Arc<dyn Accessor>, | ||
| path: &str, | ||
| args: OpDelete, | ||
| ) -> BoxFuture<'static, Result<RpDelete>> { | ||
| let path = path.to_string(); | ||
| let lru_cache = self.lru_cache.clone(); | ||
| Box::pin(async move { | ||
| let cache_files: Vec<String> = { | ||
| let mut guard = lru_cache.lock().await; | ||
| let lru = guard.deref_mut(); | ||
| let cache_files = lru | ||
| .iter() | ||
| .filter(|(k, _v)| k.starts_with(format!("{path}.cache-").as_str())) | ||
| .map(|(k, _v)| k.clone()) | ||
| .collect::<Vec<_>>(); | ||
| for k in &cache_files { | ||
| lru.pop(k); | ||
| } | ||
| cache_files | ||
| }; | ||
| for file in cache_files { | ||
| let _ = cache.delete(&file, OpDelete::new()).await; | ||
| } | ||
| return inner.delete(&path, args).await; | ||
| }) | ||
| } | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.