This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 6807f757bed [fix](recycler) Fix DCHECK in ObjectListIterator (#37112)
6807f757bed is described below
commit 6807f757bed4c36b67512dd36226e3a1bbda327e
Author: plat1ko <platonekos...@gmail.com>
AuthorDate: Tue Jul 2 10:13:22 2024 +0800
[fix](recycler) Fix DCHECK in ObjectListIterator (#37112)
Fix DCHECK in ObjectListIterator
---
cloud/src/recycler/azure_obj_client.cpp | 2 +-
cloud/src/recycler/s3_obj_client.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud/src/recycler/azure_obj_client.cpp
b/cloud/src/recycler/azure_obj_client.cpp
index 60cd79abb95..62386808d08 100644
--- a/cloud/src/recycler/azure_obj_client.cpp
+++ b/cloud/src/recycler/azure_obj_client.cpp
@@ -83,7 +83,7 @@ public:
try {
auto resp = client_->ListBlobs(req_);
has_more_ = resp.NextPageToken.HasValue();
- DCHECK(!has_more_ || resp.Blobs.empty()) << has_more_ << ' ' <<
resp.Blobs.empty();
+ DCHECK(!(has_more_ && resp.Blobs.empty())) << has_more_ << ' ' <<
resp.Blobs.empty();
req_.ContinuationToken = std::move(resp.NextPageToken);
results_.reserve(resp.Blobs.size());
for (auto&& item : std::ranges::reverse_view(resp.Blobs)) {
diff --git a/cloud/src/recycler/s3_obj_client.cpp
b/cloud/src/recycler/s3_obj_client.cpp
index e95a7409475..23e55711096 100644
--- a/cloud/src/recycler/s3_obj_client.cpp
+++ b/cloud/src/recycler/s3_obj_client.cpp
@@ -77,7 +77,7 @@ public:
const_cast<std::string&&>(outcome.GetResult().GetNextContinuationToken())));
auto&& content = outcome.GetResult().GetContents();
- DCHECK(!has_more_ || content.empty()) << has_more_ << ' ' <<
content.empty();
+ DCHECK(!(has_more_ && content.empty())) << has_more_ << ' ' <<
content.empty();
results_.reserve(content.size());
for (auto&& obj : std::ranges::reverse_view(content)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
