ha_rocksdb.cc cleanups to minimize sysvar split diff #1470
Conversation
|
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
Hi @laurynas-biveinis, could you rebase this PR? |
laurynas-biveinis
force-pushed
the
pre-sysvars-split-cleanups
branch
from
9a6bc71
to
1bc196d
Compare
|
@laurynas-biveinis has updated the pull request. You must reimport the pull request before landing. |
Sure @luqun, rebased |
|
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
storage/rocksdb/ha_rocksdb.cc
Outdated
| @@ -17088,13 +17093,13 @@ bool ha_rocksdb::is_dd_update() const { | |||
| } | |||
|
|
|||
| #define DEF_STATUS_VAR(name) \ | |||
| { "rocksdb_" #name, (char *)&SHOW_FNAME(name), SHOW_FUNC, SHOW_SCOPE_GLOBAL } | |||
| {"rocksdb_" #name, (char *)&SHOW_FNAME(name), SHOW_FUNC, SHOW_SCOPE_GLOBAL} | |||
There was a problem hiding this comment.
our internal linter complain this change.. it recommend to add space ..:)
There was a problem hiding this comment.
Which clang-format version does your linter use?
There was a problem hiding this comment.
@luqun, does it want to add spaces only to this line or to the 2nd and 3rd similar change below too?
There was a problem hiding this comment.
all of these lines. Looks like internal linter like add a space before and after
{ "rocksdb_" #name, (char *)&SHOW_FNAME(name), SHOW_FUNC, SHOW_SCOPE_GLOBAL }
instead of
{"rocksdb_" #name, (char *)&SHOW_FNAME(name), SHOW_FUNC, SHOW_SCOPE_GLOBAL}
There was a problem hiding this comment.
Which clang-format version does your linter use?
clang-format --version
clang-format version 18.1.3
There was a problem hiding this comment.
@laurynas-biveinis , are you using clang-format 19? or
If I run your change with clang-format 18, it will show following output
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -17093,13 +17093,13 @@ bool ha_rocksdb::is_dd_update() const {
}
#define DEF_STATUS_VAR(name) \
- {"rocksdb_" #name, (char *)&SHOW_FNAME(name), SHOW_FUNC, SHOW_SCOPE_GLOBAL}
+ { "rocksdb_" #name, (char *)&SHOW_FNAME(name), SHOW_FUNC, SHOW_SCOPE_GLOBAL }
#define DEF_STATUS_VAR_PTR(name, ptr, option) \
- {"rocksdb_" name, (char *)ptr, option, SHOW_SCOPE_GLOBAL}
+ { "rocksdb_" name, (char *)ptr, option, SHOW_SCOPE_GLOBAL }
#define DEF_STATUS_VAR_FUNC(name, ptr, option) \
- {name, reinterpret_cast<char *>(ptr), option, SHOW_SCOPE_GLOBAL}
+ { name, reinterpret_cast<char *>(ptr), option, SHOW_SCOPE_GLOBAL }
There was a problem hiding this comment.
@luqun , rebased and reformatted, ready for review
I am using clangd 19, which effectively should be clang-format 19. Interestingly if I run this file through clang-format 18.1.5 after it is already formatted with 19, the diff is empty. I have re-added the spaces manually.
|
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
laurynas-biveinis
force-pushed
the
pre-sysvars-split-cleanups
branch
from
1bc196d
to
a9e9ebf
Compare
|
@laurynas-biveinis has updated the pull request. You must reimport the pull request before landing. |
|
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
1 similar comment
|
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@laurynas-biveinis, could you also rebase this one? |
- Move #include directives to the right places. - Factor out repeated THDVAR & ha_thd calls, & current_thd reads. - Use the C++11 range for loop in one place, use auto more for local variable declarations, add assert(false) to one can't-happen branch, move locals to narrower scopes. - Reformat the source file.
laurynas-biveinis
force-pushed
the
pre-sysvars-split-cleanups
branch
from
a9e9ebf
to
33cb360
Compare
|
@laurynas-biveinis has updated the pull request. You must reimport the pull request before landing. |
|
@luqun , rebased |
|
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
This pull request has been merged in 3def38f. |
declarations, add assert(false) to one can't-happen branch.