Fix info log source file display length (facebook#5824)

Yi Wu · facebook-github-bot · commit 83fc90b3df79 · 2020-04-08T20:18:08.000-07:00
Summary: Source code path in info log is not truncated to the correct length. Fixing it. Pull Request resolved: facebook#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: facebook#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: facebook#9. Immutable memtables: 0. ``` Reviewed By: cheng-chang Differential Revision: D17511851 fbshipit-source-id: b2f92c85ce78726c27b7e0e736657fe2f983513e
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@`
`19`	`19`
`20`	`20`	`inline const char* RocksLogShorterFileName(const char* file)`
`21`	`21`	`{`
`22`		`- // 15 is the length of "logging/logging.h".`
	`22`	`+ // 18 is the length of "logging/logging.h".`
`23`	`23`	`// If the name of this file changed, please change this number, too.`
`24`		`- return file + (sizeof(__FILE__) > 15 ? sizeof(__FILE__) - 15 : 0);`
	`24`	`+ return file + (sizeof(__FILE__) > 18 ? sizeof(__FILE__) - 18 : 0);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// Don't inclide file/line info in HEADER level`