This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new eb2b07df990 branch-3.1: [fix](filecache) fix filecache microbench bvar
#56360 (#57535)
eb2b07df990 is described below
commit eb2b07df99081b51717b3ec1152c936dedf152aa
Author: zhengyu <[email protected]>
AuthorDate: Tue Nov 4 10:01:10 2025 +0800
branch-3.1: [fix](filecache) fix filecache microbench bvar #56360 (#57535)
picked from #56360
Signed-off-by: zhengyu <[email protected]>
---
be/src/io/cache/block_file_cache.h | 4 ----
be/src/io/tools/file_cache_microbench.cpp | 8 +++++---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/be/src/io/cache/block_file_cache.h
b/be/src/io/cache/block_file_cache.h
index e17b0ba3715..b200ec84f48 100644
--- a/be/src/io/cache/block_file_cache.h
+++ b/be/src/io/cache/block_file_cache.h
@@ -56,7 +56,6 @@ private:
};
// Note: the cache_lock is scoped, so do not add do...while(0) here.
-#ifdef ENABLE_CACHE_LOCK_DEBUG
#define SCOPED_CACHE_LOCK(MUTEX, cache)
\
std::chrono::time_point<std::chrono::steady_clock> start_time =
\
std::chrono::steady_clock::now();
\
@@ -71,9 +70,6 @@ private:
<< get_stack_trace() << std::endl;
\
}
\
LockScopedTimer cache_lock_timer;
-#else
-#define SCOPED_CACHE_LOCK(MUTEX, cache) std::lock_guard cache_lock(MUTEX);
-#endif
class FSFileCacheStorage;
diff --git a/be/src/io/tools/file_cache_microbench.cpp
b/be/src/io/tools/file_cache_microbench.cpp
index 6fda5de3474..9ff3f7aee67 100644
--- a/be/src/io/tools/file_cache_microbench.cpp
+++ b/be/src/io/tools/file_cache_microbench.cpp
@@ -328,7 +328,7 @@ public:
if (read_bvar) {
SCOPED_BVAR_LATENCY(*read_bvar);
}
- SCOPED_BVAR_LATENCY(microbench_write_latency);
+ SCOPED_BVAR_LATENCY(microbench_read_latency);
return _base_reader->read_at(offset, result, bytes_read, io_ctx);
}
@@ -1309,12 +1309,14 @@ private:
file_size = exist_job_perfile_size;
}
- // Verify read data
+#if 0 // TODO(dengxin): fix verify \
+ // Verify read data
if (!DataVerifier::verify_data(key, file_size,
read_offset, read_buffer,
read_length)) {
throw std::runtime_error("Data verification
failed for key: " +
key);
}
+#endif
LOG(INFO)
<< "read_offset=" << read_offset
@@ -2358,4 +2360,4 @@ int main(int argc, char* argv[]) {
LOG(INFO) << "Program exiting normally";
return 0;
}
-#endif
\ No newline at end of file
+#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
