fixes

emkornfield · pitrou · commit 74d563cd738d · 2019-07-02T17:58:29.000+02:00
diff --git a/cpp/src/arrow/python/common.cc b/cpp/src/arrow/python/common.cc
@@ -160,7 +160,8 @@ bool IsPythonError(const Status& status) {
     return false;
   }
   auto detail = status.detail();
-  return detail != nullptr && detail->type_id() == kErrorDetailTypeId;
+  bool result = detail != nullptr && detail->type_id() == kErrorDetailTypeId;
+  return result;
 }
 
 }  // namespace py
diff --git a/cpp/src/arrow/status.cc b/cpp/src/arrow/status.cc
@@ -31,7 +31,6 @@ Status::Status(StatusCode code, std::string msg, std::shared_ptr<StatusDetail> d
   state_->code = code;
   state_->msg = std::move(msg);
   if (detail != nullptr) {
-    std::cerr << "!!!!!!non null detail" << detail;
     state_->detail = std::move(detail);
   }
 }
@@ -42,7 +41,6 @@ void Status::CopyFrom(const Status& s) {
     state_ = nullptr;
   } else {
     state_ = new State(*s.state_);
-    std::cerr << "!!!!copy_from " << state_->detail;
   }
 }
 
diff --git a/cpp/src/plasma/common.cc b/cpp/src/plasma/common.cc
@@ -51,6 +51,9 @@ class PlasmaStatusDetail : public arrow::StatusDetail {
       case PlasmaErrorCode::PlasmaObjectAlreadySealed:
         type = "Plasma object is already sealed";
         break;
+      default:
+        type = "Unknown plasma error";
+        break;
     }
     return std::string(type);
   }
diff --git a/python/pyarrow/includes/libarrow.pxd b/python/pyarrow/includes/libarrow.pxd
@@ -1207,7 +1207,7 @@ cdef extern from "arrow/python/api.h" namespace "arrow::py" nogil:
     shared_ptr[CDataType] GetPrimitiveType(Type type)
     shared_ptr[CDataType] GetTimestampType(TimeUnit unit)
 
-    cdef c_bool IsPythonError(const CStatus& status)
+    c_bool IsPythonError(const CStatus& status)
     object PyHalf_FromHalf(npy_half value)
 
     cdef cppclass PyConversionOptions:

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,8 @@ bool IsPythonError(const Status& status) {`
`160`	`160`	`return false;`
`161`	`161`	`}`
`162`	`162`	`auto detail = status.detail();`
`163`		`- return detail != nullptr && detail->type_id() == kErrorDetailTypeId;`
	`163`	`+ bool result = detail != nullptr && detail->type_id() == kErrorDetailTypeId;`
	`164`	`+ return result;`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`} // namespace py`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ Status::Status(StatusCode code, std::string msg, std::shared_ptr<StatusDetail> d`
`31`	`31`	`state_->code = code;`
`32`	`32`	`state_->msg = std::move(msg);`
`33`	`33`	`if (detail != nullptr) {`
`34`		`- std::cerr << "!!!!!!non null detail" << detail;`
`35`	`34`	`state_->detail = std::move(detail);`
`36`	`35`	`}`
`37`	`36`	`}`
`@@ -42,7 +41,6 @@ void Status::CopyFrom(const Status& s) {`
`42`	`41`	`state_ = nullptr;`
`43`	`42`	`} else {`
`44`	`43`	`state_ = new State(*s.state_);`
`45`		`- std::cerr << "!!!!copy_from " << state_->detail;`
`46`	`44`	`}`
`47`	`45`	`}`
`48`	`46`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ class PlasmaStatusDetail : public arrow::StatusDetail {`
`51`	`51`	`case PlasmaErrorCode::PlasmaObjectAlreadySealed:`
`52`	`52`	`type = "Plasma object is already sealed";`
`53`	`53`	`break;`
	`54`	`+ default:`
	`55`	`+ type = "Unknown plasma error";`
	`56`	`+ break;`
`54`	`57`	`}`
`55`	`58`	`return std::string(type);`
`56`	`59`	`}`