Skip to content

ARROW-7734: [C++] check status details for nullptr in equality #6332

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

Closed
lidavidm wants to merge 1 commit into from
Closed

ARROW-7734: [C++] check status details for nullptr in equality #6332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions cpp/src/arrow/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ class ARROW_EXPORT Status : public util::EqualityComparable<Status>,
}

bool IsExecutionError() const { return code() == StatusCode::ExecutionError; }
bool IsAlreadyExists() const { return code() == StatusCode::AlreadyExists; }

/// \brief Return a string representation of this status suitable for printing.
///
Expand Down Expand Up @@ -385,8 +386,11 @@ bool Status::Equals(const Status& s) const {
return false;
}

if (detail() != s.detail() && !(*detail() == *s.detail())) {
return false;
if (detail() != s.detail()) {
if ((detail() && !s.detail()) || (!detail() && s.detail())) {
return false;
}
return *detail() == *s.detail();
}

return code() == s.code() && message() == s.message();
Expand Down
13 changes: 13 additions & 0 deletions cpp/src/arrow/status_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,17 @@ TEST(StatusTest, TestEquality) {
ASSERT_NE(Status::Invalid("error"), Status::Invalid("other error"));
}

TEST(StatusTest, TestDetailEquality) {
const auto status_with_detail =
arrow::Status(StatusCode::IOError, "", std::make_shared<TestStatusDetail>());
const auto status_with_detail2 =
arrow::Status(StatusCode::IOError, "", std::make_shared<TestStatusDetail>());
const auto status_without_detail = arrow::Status::IOError("");

ASSERT_EQ(*status_with_detail.detail(), *status_with_detail2.detail());
ASSERT_EQ(status_with_detail, status_with_detail2);
ASSERT_NE(status_with_detail, status_without_detail);
ASSERT_NE(status_without_detail, status_with_detail);
}

} // namespace arrow