|
16 | 16 | // under the License. |
17 | 17 |
|
18 | 18 | use crate::cache::CacheAccessor; |
19 | | -use crate::cache::cache_manager::{CachedFileMetadata, FileMetadataCache, FileStatisticsCache, FileStatisticsCacheEntry}; |
| 19 | +use crate::cache::cache_manager::{ |
| 20 | + CachedFileMetadata, FileMetadataCache, FileStatisticsCache, FileStatisticsCacheEntry, |
| 21 | +}; |
| 22 | +use object_store::path::Path; |
20 | 23 | use std::collections::HashMap; |
21 | 24 | use std::sync::Mutex; |
22 | 25 |
|
23 | 26 | pub use crate::cache::DefaultFilesMetadataCache; |
24 | 27 | use crate::cache::lru_queue::LruQueue; |
25 | 28 | use datafusion_common::heap_size::DFHeapSize; |
26 | | -use object_store::path::Path; |
27 | 29 |
|
28 | 30 | /// Default implementation of [`FileStatisticsCache`] |
29 | 31 | /// |
@@ -550,7 +552,10 @@ mod tests { |
550 | 552 | let (meta_2, value_2) = create_cached_file_metadata_with_stats("test2.parquet"); |
551 | 553 | let (meta_3, value_3) = create_cached_file_metadata_with_stats("test3.parquet"); |
552 | 554 |
|
553 | | - let limit_for_2_entries = &meta_1.location.heap_size() + value_1.heap_size() + &meta_2.location.heap_size() + value_2.heap_size(); |
| 555 | + let limit_for_2_entries = &meta_1.location.heap_size() |
| 556 | + + value_1.heap_size() |
| 557 | + + &meta_2.location.heap_size() |
| 558 | + + value_2.heap_size(); |
554 | 559 |
|
555 | 560 | // create a cache with a limit which fits exactly 2 entries |
556 | 561 | let cache = DefaultFileStatisticsCache::new(limit_for_2_entries); |
@@ -582,7 +587,10 @@ mod tests { |
582 | 587 |
|
583 | 588 | cache.remove(&meta_2.location); |
584 | 589 | assert_eq!(cache.len(), 1); |
585 | | - assert_eq!(cache.memory_used(), &meta_3.location.heap_size() + value_3.heap_size()); |
| 590 | + assert_eq!( |
| 591 | + cache.memory_used(), |
| 592 | + &meta_3.location.heap_size() + value_3.heap_size() |
| 593 | + ); |
586 | 594 |
|
587 | 595 | cache.clear(); |
588 | 596 | assert_eq!(cache.len(), 0); |
|
0 commit comments