Skip to content

Commit 359bd5e

Browse files
committed
[fix](filecache) fix filecache microbench bvar (#56360)
read_at should update read latency bvar instead of write latency bvar Signed-off-by: zhengyu <zhangzhengyu@selectdb.com>
1 parent 92203ea commit 359bd5e

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

be/src/io/cache/block_file_cache.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class LockScopedTimer {
5656
};
5757

5858
// Note: the cache_lock is scoped, so do not add do...while(0) here.
59-
#ifdef ENABLE_CACHE_LOCK_DEBUG
6059
#define SCOPED_CACHE_LOCK(MUTEX, cache) \
6160
std::chrono::time_point<std::chrono::steady_clock> start_time = \
6261
std::chrono::steady_clock::now(); \
@@ -71,9 +70,6 @@ class LockScopedTimer {
7170
<< get_stack_trace() << std::endl; \
7271
} \
7372
LockScopedTimer cache_lock_timer;
74-
#else
75-
#define SCOPED_CACHE_LOCK(MUTEX, cache) std::lock_guard cache_lock(MUTEX);
76-
#endif
7773

7874
class FSFileCacheStorage;
7975

be/src/io/tools/file_cache_microbench.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ class MicrobenchFileReader {
328328
if (read_bvar) {
329329
SCOPED_BVAR_LATENCY(*read_bvar);
330330
}
331-
SCOPED_BVAR_LATENCY(microbench_write_latency);
331+
SCOPED_BVAR_LATENCY(microbench_read_latency);
332332
return _base_reader->read_at(offset, result, bytes_read, io_ctx);
333333
}
334334

@@ -1309,12 +1309,14 @@ class JobManager {
13091309
file_size = exist_job_perfile_size;
13101310
}
13111311

1312-
// Verify read data
1312+
#if 0 // TODO(dengxin): fix verify \
1313+
// Verify read data
13131314
if (!DataVerifier::verify_data(key, file_size, read_offset, read_buffer,
13141315
read_length)) {
13151316
throw std::runtime_error("Data verification failed for key: " +
13161317
key);
13171318
}
1319+
#endif
13181320

13191321
LOG(INFO)
13201322
<< "read_offset=" << read_offset
@@ -2358,4 +2360,4 @@ int main(int argc, char* argv[]) {
23582360
LOG(INFO) << "Program exiting normally";
23592361
return 0;
23602362
}
2361-
#endif
2363+
#endif

build.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,8 @@ if [[ -z "${ENABLE_INJECTION_POINT}" ]]; then
450450
ENABLE_INJECTION_POINT='OFF'
451451
fi
452452

453-
if [[ -z "${ENABLE_CACHE_LOCK_DEBUG}" ]]; then
454-
ENABLE_CACHE_LOCK_DEBUG='ON'
453+
if [[ -z "${BUILD_BENCHMARK}" ]]; then
454+
BUILD_BENCHMARK='OFF'
455455
fi
456456

457457
if [[ -z "${RECORD_COMPILER_SWITCHES}" ]]; then
@@ -504,7 +504,6 @@ echo "Get params:
504504
USE_JEMALLOC -- ${USE_JEMALLOC}
505505
USE_BTHREAD_SCANNER -- ${USE_BTHREAD_SCANNER}
506506
ENABLE_INJECTION_POINT -- ${ENABLE_INJECTION_POINT}
507-
ENABLE_CACHE_LOCK_DEBUG -- ${ENABLE_CACHE_LOCK_DEBUG}
508507
DENABLE_CLANG_COVERAGE -- ${DENABLE_CLANG_COVERAGE}
509508
DISPLAY_BUILD_TIME -- ${DISPLAY_BUILD_TIME}
510509
ENABLE_PCH -- ${ENABLE_PCH}
@@ -604,7 +603,6 @@ if [[ "${BUILD_BE}" -eq 1 ]]; then
604603
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
605604
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
606605
-DENABLE_INJECTION_POINT="${ENABLE_INJECTION_POINT}" \
607-
-DENABLE_CACHE_LOCK_DEBUG="${ENABLE_CACHE_LOCK_DEBUG}" \
608606
-DMAKE_TEST=OFF \
609607
-DBUILD_FS_BENCHMARK="${BUILD_FS_BENCHMARK}" \
610608
${CMAKE_USE_CCACHE:+${CMAKE_USE_CCACHE}} \

0 commit comments

Comments
 (0)