From 83fc90b3df7967cc4b8ed092002b6ae186b94eb4 Mon Sep 17 00:00:00 2001 From: Yi Wu Date: Wed, 8 Apr 2020 20:15:41 -0700 Subject: [PATCH] Fix info log source file display length (#5824) Summary: Source code path in info log is not truncated to the correct length. Fixing it. Pull Request resolved: https://github.com/facebook/rocksdb/pull/5824 Test Plan: Build and run db_bench. Before: ``` 2019/09/18-21:32:34.631181 7fdd42df6700 [_impl/db_impl_write.cc:1654] [default] New memtable created with log file: https://github.com/facebook/rocksdb/issues/9. Immutable memtables: 0. ``` After: ``` 2019/09/18-21:36:09.226532 7f141b5f6700 [/db_impl/db_impl_write.cc:1654] [default] New memtable created with log file: https://github.com/facebook/rocksdb/issues/9. Immutable memtables: 0. ``` Reviewed By: cheng-chang Differential Revision: D17511851 fbshipit-source-id: b2f92c85ce78726c27b7e0e736657fe2f983513e --- logging/logging.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logging/logging.h b/logging/logging.h index 178addcc3..585111569 100644 --- a/logging/logging.h +++ b/logging/logging.h @@ -19,9 +19,9 @@ inline const char* RocksLogShorterFileName(const char* file) { - // 15 is the length of "logging/logging.h". + // 18 is the length of "logging/logging.h". // If the name of this file changed, please change this number, too. - return file + (sizeof(__FILE__) > 15 ? sizeof(__FILE__) - 15 : 0); + return file + (sizeof(__FILE__) > 18 ? sizeof(__FILE__) - 18 : 0); } // Don't inclide file/line info in HEADER level