rgw: remove useless lines in RGWDeleteBucket::execute #19699
Conversation
src/rgw/rgw_op.cc
Outdated
| @@ -2896,7 +2896,6 @@ void RGWDeleteBucket::execute() | |||
| } | |||
|
|
|||
| string prefix, delimiter; | |||
|
|
|||
There was a problem hiding this comment.
Plz do not introduce this kind of cleanup, if you're not touching around. This will pollute the commit history, which make us can not use git show and git blame to dig commit history.
There was a problem hiding this comment.
This also introduces the headache for resolving rebase conflict.
There was a problem hiding this comment.
Do you mean don't delete blank lines?
src/rgw/rgw_op.cc
Outdated
| @@ -2911,13 +2910,11 @@ void RGWDeleteBucket::execute() | |||
| } | |||
|
|
|||
| op_ret = abort_bucket_multiparts(store, s->cct, s->bucket_info, prefix, delimiter); | |||
|
|
|||
src/rgw/rgw_op.cc
Outdated
| if (op_ret < 0) { | ||
| return; | ||
| } | ||
|
|
||
| op_ret = store->delete_bucket(s->bucket_info, ot, false); | ||
|
|
src/rgw/rgw_op.cc
Outdated
| @@ -2872,7 +2872,7 @@ void RGWDeleteBucket::execute() | |||
| } | |||
|
|
|||
| op_ret = rgw_bucket_sync_user_stats(store, s->user->user_id, s->bucket_info); | |||
| if ( op_ret < 0) { | |||
There was a problem hiding this comment.
@mikulely What about this one? Someone once let me delete the extra spaces.
Are there any guidelines for spaces and blank lines?
There was a problem hiding this comment.
sometimes whitespace changes do not get picked up while reviewing, otherwise introducing purely whitesepace changes makes it difficult when backporting, or when git blame etc.
Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
qrGitHub
force-pushed
the
wip-rgw-useless-line
branch
from
4ecbd0b
to
52c7531
Compare
|
@mikulely @ZVampirEM77 @theanalyst, remove unnecessary changes according to your advices, thanks. |
|
Hi @cbodley @adamemerson, would you help to review this? Thanks. |
|
jenkins test docs please |
|
Hi @cbodley, can this be merged? Thanks. |
|
jenkins test docs |
No description provided.