Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-45099: [C++] Avoid static const variable in the status.h #45100

Merged
merged 2 commits into from
Dec 25, 2024
+12 −8
Merged

GH-45099: [C++] Avoid static const variable in the status.h #45100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e858b8
GH-45099: [C++] Avoid static const variable in the status.h
wgtmac Dec 23, 2024
38d8edf
fix detail
wgtmac Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cpp/src/arrow/status.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,16 @@ std::string Status::ToStringWithoutContextLines() const {
return message;
}

const std::string& Status::message() const {
static const std::string no_message = "";
return ok() ? no_message : state_->msg;
}

const std::shared_ptr<StatusDetail>& Status::detail() const {
static std::shared_ptr<StatusDetail> no_detail = NULLPTR;
return state_ ? state_->detail : no_detail;
}

void Status::Abort() const { Abort(std::string()); }

void Status::Abort(const std::string& message) const {
Expand Down
10 changes: 2 additions & 8 deletions cpp/src/arrow/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,16 +332,10 @@ class ARROW_EXPORT [[nodiscard]] Status : public util::EqualityComparable<Status
constexpr StatusCode code() const { return ok() ? StatusCode::OK : state_->code; }

/// \brief Return the specific error message attached to this status.
const std::string& message() const {
static const std::string no_message = "";
return ok() ? no_message : state_->msg;
}
const std::string& message() const;

/// \brief Return the status detail attached to this message.
const std::shared_ptr<StatusDetail>& detail() const {
static std::shared_ptr<StatusDetail> no_detail = NULLPTR;
return state_ ? state_->detail : no_detail;
}
const std::shared_ptr<StatusDetail>& detail() const;

/// \brief Return a new Status copying the existing status, but
/// updating with the existing detail.
Expand Down
Loading