Skip to content
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
14 changes: 8 additions & 6 deletions be/src/olap/page_cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,21 @@ StoragePageCache* StoragePageCache::create_global_cache(size_t capacity,
StoragePageCache::StoragePageCache(size_t capacity, int32_t index_cache_percentage,
int64_t pk_index_cache_capacity, uint32_t num_shards)
: _index_cache_percentage(index_cache_percentage) {
size_t data_page_capacity = 0;
size_t index_page_capacity = 0;
if (index_cache_percentage == 0) {
_data_page_cache = std::make_unique<DataPageCache>(capacity, num_shards);
data_page_capacity = capacity;
} else if (index_cache_percentage == 100) {
_index_page_cache = std::make_unique<IndexPageCache>(capacity, num_shards);
index_page_capacity = capacity;
} else if (index_cache_percentage > 0 && index_cache_percentage < 100) {
_data_page_cache = std::make_unique<DataPageCache>(
capacity * (100 - index_cache_percentage) / 100, num_shards);
_index_page_cache = std::make_unique<IndexPageCache>(
capacity * index_cache_percentage / 100, num_shards);
data_page_capacity = capacity * (100 - index_cache_percentage) / 100;
index_page_capacity = capacity * index_cache_percentage / 100;
} else {
CHECK(false) << "invalid index page cache percentage";
}

_data_page_cache = std::make_unique<DataPageCache>(data_page_capacity, num_shards);
_index_page_cache = std::make_unique<IndexPageCache>(index_page_capacity, num_shards);
_pk_index_page_cache = std::make_unique<PKIndexPageCache>(pk_index_cache_capacity, num_shards);
}

Expand Down
8 changes: 4 additions & 4 deletions be/src/runtime/memory/lru_cache_policy.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ class LRUCachePolicy : public CachePolicy {
void reset_cache() { _cache.reset(); }

bool check_capacity(size_t capacity, uint32_t num_shards) {
if (capacity < num_shards) {
if (capacity == 0 || capacity < num_shards) {
LOG(INFO) << fmt::format(
"{} lru cache capacity({} B) less than num_shards({}), init failed, will be "
"disabled.",
type_string(type()), capacity, num_shards);
"{} lru cache capacity({} B) {} num_shards({}), will be disabled.",
type_string(type()), capacity, capacity == 0 ? "is 0, ignore" : "less than",
num_shards);
_enable_prune = false;
return false;
}
Expand Down
104 changes: 104 additions & 0 deletions be/test/olap/page_cache_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,4 +286,108 @@ TEST_F(StoragePageCacheTest, mixed_pages) {
}
}

TEST_F(StoragePageCacheTest, zero_index_cache_percentage) {
StoragePageCache cache(kNumShards * 2048, 0, 0, kNumShards);

StoragePageCache::CacheKey data_key("data", 0, 0);
StoragePageCache::CacheKey index_key("index", 0, 0);

segment_v2::PageTypePB page_type_data = segment_v2::DATA_PAGE;
segment_v2::PageTypePB page_type_index = segment_v2::INDEX_PAGE;

{
PageCacheHandle handle;
auto* data = new DataPage(1024, true, page_type_data);
cache.insert(data_key, data, &handle, page_type_data, false);
auto found = cache.lookup(data_key, &handle, page_type_data);
EXPECT_TRUE(found);
}

{
PageCacheHandle handle;
auto* index = new DataPage(1024, true, page_type_index);
cache.insert(index_key, index, &handle, page_type_index, false);
auto found = cache.lookup(index_key, &handle, page_type_index);
EXPECT_FALSE(found);
}
}

TEST_F(StoragePageCacheTest, full_index_cache_percentage) {
StoragePageCache cache(kNumShards * 2048, 100, 0, kNumShards);

StoragePageCache::CacheKey data_key("data", 0, 0);
StoragePageCache::CacheKey index_key("index", 0, 0);

segment_v2::PageTypePB page_type_data = segment_v2::DATA_PAGE;
segment_v2::PageTypePB page_type_index = segment_v2::INDEX_PAGE;

{
PageCacheHandle handle;
auto* data = new DataPage(1024, true, page_type_data);
cache.insert(data_key, data, &handle, page_type_data, false);
auto found = cache.lookup(data_key, &handle, page_type_data);
EXPECT_FALSE(found);
}

{
PageCacheHandle handle;
auto* index = new DataPage(1024, true, page_type_index);
cache.insert(index_key, index, &handle, page_type_index, false);
auto found = cache.lookup(index_key, &handle, page_type_index);
EXPECT_TRUE(found);
}
}

TEST_F(StoragePageCacheTest, zero_total_capacity) {
StoragePageCache cache(0, 50, 0, kNumShards);

StoragePageCache::CacheKey data_key("data", 0, 0);
StoragePageCache::CacheKey index_key("index", 0, 0);

segment_v2::PageTypePB page_type_data = segment_v2::DATA_PAGE;
segment_v2::PageTypePB page_type_index = segment_v2::INDEX_PAGE;

{
PageCacheHandle handle;
auto* data = new DataPage(1024, true, page_type_data);
cache.insert(data_key, data, &handle, page_type_data, false);
auto found = cache.lookup(data_key, &handle, page_type_data);
EXPECT_FALSE(found);
}

{
PageCacheHandle handle;
auto* index = new DataPage(1024, true, page_type_index);
cache.insert(index_key, index, &handle, page_type_index, false);
auto found = cache.lookup(index_key, &handle, page_type_index);
EXPECT_FALSE(found);
}
}

TEST_F(StoragePageCacheTest, capacity_less_than_num_shards) {
StoragePageCache cache(10, 50, 0, kNumShards);

StoragePageCache::CacheKey data_key("data", 0, 0);
StoragePageCache::CacheKey index_key("index", 0, 0);

segment_v2::PageTypePB page_type_data = segment_v2::DATA_PAGE;
segment_v2::PageTypePB page_type_index = segment_v2::INDEX_PAGE;

{
PageCacheHandle handle;
auto* data = new DataPage(1024, true, page_type_data);
cache.insert(data_key, data, &handle, page_type_data, false);
auto found = cache.lookup(data_key, &handle, page_type_data);
EXPECT_FALSE(found);
}

{
PageCacheHandle handle;
auto* index = new DataPage(1024, true, page_type_index);
cache.insert(index_key, index, &handle, page_type_index, false);
auto found = cache.lookup(index_key, &handle, page_type_index);
EXPECT_FALSE(found);
}
}

} // namespace doris
Loading