From 3942a83480d6db84a1e7fecb715c5465488a0f53 Mon Sep 17 00:00:00 2001
From: PragmaTwice <twice.mliu@gmail.com>
Date: Thu, 2 Feb 2023 22:22:15 +0800
Subject: [PATCH] Add more rvalue overload for Status::operator&

---
 cpp/src/arrow/status.h       | 26 ++++++++++++++++++++++----
 cpp/src/arrow/status_test.cc | 15 +++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/cpp/src/arrow/status.h b/cpp/src/arrow/status.h
index 1b9ba2863783..17a37d4253a8 100644
--- a/cpp/src/arrow/status.h
+++ b/cpp/src/arrow/status.h
@@ -157,8 +157,10 @@ class ARROW_EXPORT [[nodiscard]] Status : public util::EqualityComparable<Status
   inline bool Equals(const Status& s) const;
 
   // AND the statuses.
-  inline Status operator&(const Status& s) const noexcept;
-  inline Status operator&(Status&& s) const noexcept;
+  inline Status operator&(const Status& s) const& noexcept;
+  inline Status operator&(const Status& s) && noexcept;
+  inline Status operator&(Status&& s) const& noexcept;
+  inline Status operator&(Status&& s) && noexcept;
   inline Status& operator&=(const Status& s) noexcept;
   inline Status& operator&=(Status&& s) noexcept;
 
@@ -422,7 +424,7 @@ bool Status::Equals(const Status& s) const {
 /// \cond FALSE
 // (note: emits warnings on Doxygen < 1.8.15,
 //  see https://github.com/doxygen/doxygen/issues/6295)
-Status Status::operator&(const Status& s) const noexcept {
+Status Status::operator&(const Status& s) const& noexcept {
   if (ok()) {
     return s;
   } else {
@@ -430,7 +432,15 @@ Status Status::operator&(const Status& s) const noexcept {
   }
 }
 
-Status Status::operator&(Status&& s) const noexcept {
+Status Status::operator&(const Status& s) && noexcept {
+  if (ok()) {
+    return s;
+  } else {
+    return std::move(*this);
+  }
+}
+
+Status Status::operator&(Status&& s) const& noexcept {
   if (ok()) {
     return std::move(s);
   } else {
@@ -438,6 +448,14 @@ Status Status::operator&(Status&& s) const noexcept {
   }
 }
 
+Status Status::operator&(Status&& s) && noexcept {
+  if (ok()) {
+    return std::move(s);
+  } else {
+    return std::move(*this);
+  }
+}
+
 Status& Status::operator&=(const Status& s) noexcept {
   if (ok() && !s.ok()) {
     CopyFrom(s);
diff --git a/cpp/src/arrow/status_test.cc b/cpp/src/arrow/status_test.cc
index b44670593328..fe53de24b00b 100644
--- a/cpp/src/arrow/status_test.cc
+++ b/cpp/src/arrow/status_test.cc
@@ -104,6 +104,21 @@ TEST(StatusTest, AndStatus) {
   res = Status::Invalid("foo") & Status::IOError("bar");
   ASSERT_TRUE(res.IsInvalid());
 
+  ASSERT_TRUE((a & Status::OK()).ok());
+  ASSERT_TRUE((c & Status::OK()).IsInvalid());
+  ASSERT_TRUE((a & Status::IOError("")).IsIOError());
+  ASSERT_TRUE((c & Status::IOError("")).IsInvalid());
+
+  ASSERT_TRUE((Status::OK() & a).ok());
+  ASSERT_TRUE((Status::OK() & c).IsInvalid());
+  ASSERT_TRUE((Status::IOError("") & a).IsIOError());
+  ASSERT_TRUE((Status::IOError("") & c).IsIOError());
+
+  ASSERT_TRUE((Status::OK() & Status::OK()).ok());
+  ASSERT_TRUE((Status::Invalid("") & Status::OK()).IsInvalid());
+  ASSERT_TRUE((Status::OK() & Status::IOError("")).IsIOError());
+  ASSERT_TRUE((Status::IOError("") & Status::Invalid("")).IsIOError());
+
   res = Status::OK();
   res &= Status::OK();
   ASSERT_TRUE(res.ok());