fix double slashed paths in DatabaseOrdinary by switching to std::filesystem::path#11900
fix double slashed paths in DatabaseOrdinary by switching to std::filesystem::path#11900tavplubix merged 6 commits intoClickHouse:masterfrom bharatnc:ncb/fix-file-path
Conversation
src/Databases/DatabaseOrdinary.cpp
Outdated
| std::atomic<size_t> tables_processed{0}; | ||
|
|
||
| auto startup_one_table = [&](const StoragePtr & table) { | ||
| // clang-format off |
There was a problem hiding this comment.
Looks like when I run clang-format, it doesn't respect brace wrapping for lambdas like it does for classes and functions. After adding clang-format off and clang-format on tags and manually formatting these lines, it passes the style checks now: https://clickhouse-test-reports.s3.yandex.net/11900/1244ca562759c4b92a08f4350080cc01567e8c99/style_check.html
Once I had fixed the formatting, I have removed these tags in the latest commit. I'm not sure if this is specific to my dev environment (using Clion and clang-format).
|
The changes LGTM, but could you please replace |
bharatnc
changed the title
Sure 👍. I've changed to std:: filesystem::path. |
4 participants
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Improve path concatenation and fix double slashed paths using std::filesystem::path instead of std::string in
DatabaseOrdinary.cpp.Detailed description / Documentation draft:
The concatenation of path doesn't always happen reliably and can cause outputs which contain double slashed paths: (Referencing from issue #8301 and this PR relates to that)
2019.12.19 17:33:18.401719 [ 1 ] {} <Error> Application: DB::Exception: Cannot parse definition from metadata file /var/lib/clickhouse/metadata/default//aaaa.sql, error: DB::Exception: Syntax error (in file /var/lib/clickhouse/metadata/default//aaaa.sql): failed at position 21 (line 3, col 1): )To fix this I have chosen
std::filesystem::pathto concatenate the file paths instead of usingstd::string.I have also removed several imports that are not being used. Also
clangformatted the file and it looks like that did generate several changes to formatting inDatabaseOrdinary.cpp.