This is an automated email from the ASF dual-hosted git repository.
gavinchou pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 112bbb810f3 branch-3.0: [fix](cloud) fix CHECK failed when transmit
from non-TTL to normal #45057 (#45182)
112bbb810f3 is described below
commit 112bbb810f3a9ea7eca39ea1842a6d763ff31944
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Dec 10 22:00:00 2024 +0800
branch-3.0: [fix](cloud) fix CHECK failed when transmit from non-TTL to
normal #45057 (#45182)
Cherry-picked from #45057
---
be/src/io/cache/block_file_cache.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/be/src/io/cache/block_file_cache.cpp
b/be/src/io/cache/block_file_cache.cpp
index 528ace90e3e..2a59a5158e4 100644
--- a/be/src/io/cache/block_file_cache.cpp
+++ b/be/src/io/cache/block_file_cache.cpp
@@ -1093,15 +1093,16 @@ bool BlockFileCache::remove_if_ttl_file_unlock(const
UInt128Wrapper& file_key, b
_key_to_time.find(file_key) != _key_to_time.end()) {
if (!remove_directly) {
for (auto& [_, cell] : _files[file_key]) {
- if (cell.file_block->cache_type() == FileCacheType::TTL) {
- Status st = cell.file_block->update_expiration_time(0);
- if (!st.ok()) {
- LOG_WARNING("Failed to update expiration time to
0").error(st);
- }
+ if (cell.file_block->cache_type() != FileCacheType::TTL) {
+ continue;
+ }
+ Status st = cell.file_block->update_expiration_time(0);
+ if (!st.ok()) {
+ LOG_WARNING("Failed to update expiration time to
0").error(st);
}
if (cell.file_block->cache_type() == FileCacheType::NORMAL)
continue;
- auto st =
cell.file_block->change_cache_type_between_ttl_and_others(
+ st = cell.file_block->change_cache_type_between_ttl_and_others(
FileCacheType::NORMAL);
if (st.ok()) {
if (cell.queue_iterator) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
