Skip to content
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

chore(deps): bump lru to 95f347b #14728

Merged
merged 4 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,15 @@ arrow-schema-deltalake = { package = "arrow-schema", version = "48.0.1" }
deltalake = { git = "https://github.com/risingwavelabs/delta-rs", rev = "5c2dccd4640490202ffe98adbd13b09cef8e007b", features = [
"s3-no-concurrent-write",
] }
lru = { git = "https://github.com/risingwavelabs/lru-rs.git", rev = "95f347b" }
parquet = "50"
thiserror-ext = "0.0.11"
tikv-jemalloc-ctl = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", features = [
"profiling",
"stats",
], rev = "64a2d9" }
tokio-util = "0.7"

risingwave_backup = { path = "./src/storage/backup" }
risingwave_batch = { path = "./src/batch" }
Expand Down Expand Up @@ -190,7 +192,6 @@ risingwave_variables = { path = "./src/utils/variables" }
risingwave_java_binding = { path = "./src/java_binding" }
risingwave_jni_core = { path = "src/jni_core" }
rw_futures_util = { path = "src/utils/futures_util" }
tokio-util = "0.7"

[workspace.lints.rust]
# `forbid` will also prevent the misuse of `#[allow(unused)]`
Expand Down
2 changes: 1 addition & 1 deletion src/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ hytra = { workspace = true }
itertools = "0.12"
itoa = "1.0"
jsonbb = "0.1.2"
lru = { git = "https://github.com/risingwavelabs/lru-rs.git", rev = "cb2d7c7" }
lru = { workspace = true }
memcomparable = { version = "0.2", features = ["decimal"] }
num-integer = "0.1"
num-traits = "0.2"
Expand Down
6 changes: 3 additions & 3 deletions src/common/src/estimate_size/collections/lru.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use std::alloc::{Allocator, Global};
use std::borrow::Borrow;
use std::hash::{BuildHasher, Hash};

use lru::{DefaultHasher, KeyRef, LruCache};
use lru::{DefaultHasher, LruCache};

use super::{AtomicMutGuard, MutGuard};
use crate::estimate_size::{EstimateSize, KvSize};
Expand Down Expand Up @@ -66,7 +66,7 @@ impl<K: Hash + Eq + EstimateSize, V: EstimateSize, S: BuildHasher, A: Clone + Al

pub fn get<Q>(&mut self, k: &Q) -> Option<&V>
where
KeyRef<K>: Borrow<Q>,
K: Borrow<Q>,
Q: Hash + Eq + ?Sized,
{
self.inner.get(k)
Expand Down Expand Up @@ -100,7 +100,7 @@ impl<K: Hash + Eq + EstimateSize, V: EstimateSize, S: BuildHasher, A: Clone + Al

pub fn contains<Q>(&self, k: &Q) -> bool
where
KeyRef<K>: Borrow<Q>,
K: Borrow<Q>,
Q: Hash + Eq + ?Sized,
{
self.inner.contains(k)
Expand Down
2 changes: 1 addition & 1 deletion src/stream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ governor = { version = "0.6", default-features = false, features = [
hytra = "0.1.2"
itertools = "0.12"
local_stats_alloc = { path = "../utils/local_stats_alloc" }
lru = { git = "https://github.com/risingwavelabs/lru-rs.git", rev = "cb2d7c7" }
lru = { workspace = true }
maplit = "1.0.2"
memcomparable = "0.2"
multimap = "0.10"
Expand Down
6 changes: 3 additions & 3 deletions src/stream/src/cache/managed_lru.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use std::ops::{Deref, DerefMut};
use std::sync::atomic::{AtomicU64, Ordering};
use std::sync::Arc;

use lru::{DefaultHasher, KeyRef, LruCache};
use lru::{DefaultHasher, LruCache};
use risingwave_common::estimate_size::EstimateSize;
use risingwave_common::metrics::LabelGuardedIntGauge;
use risingwave_common::util::epoch::Epoch;
Expand Down Expand Up @@ -150,7 +150,7 @@ impl<K: Hash + Eq + EstimateSize, V: EstimateSize, S: BuildHasher, A: Clone + Al

pub fn get<Q>(&mut self, k: &Q) -> Option<&V>
where
KeyRef<K>: Borrow<Q>,
K: Borrow<Q>,
Q: Hash + Eq + ?Sized,
{
self.inner.get(k)
Expand Down Expand Up @@ -181,7 +181,7 @@ impl<K: Hash + Eq + EstimateSize, V: EstimateSize, S: BuildHasher, A: Clone + Al

pub fn contains<Q>(&self, k: &Q) -> bool
where
KeyRef<K>: Borrow<Q>,
K: Borrow<Q>,
Q: Hash + Eq + ?Sized,
{
self.inner.contains(k)
Expand Down
2 changes: 1 addition & 1 deletion src/tests/simulation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fail = { version = "0.5" }
futures = { version = "0.3", default-features = false, features = ["alloc"] }
glob = "0.3"
itertools = "0.12"
lru = { git = "https://github.com/risingwavelabs/lru-rs.git", rev = "cb2d7c7" }
lru = { workspace = true }
madsim = "0.2.22"
paste = "1"
pin-project = "1.1"
Expand Down
1 change: 0 additions & 1 deletion src/workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ generic-array = { version = "0.14", default-features = false, features = ["more_
governor = { version = "0.6", default-features = false, features = ["dashmap", "jitter", "std"] }
hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14", features = ["nightly", "raw"] }
hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13", features = ["raw"] }
hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features = ["nightly", "raw"] }
hmac = { version = "0.12", default-features = false, features = ["reset"] }
hyper = { version = "0.14", features = ["full"] }
indexmap-dff4ba8e3ae991db = { package = "indexmap", version = "1", default-features = false, features = ["serde"] }
Expand Down
Loading