+macro R_ERROR_NOT_OK similar to RETURN_NOT_OK but that Rcpp::stop()s

romainfrancois · romainfrancois · commit 421e471ab440 · 2018-09-24T20:15:02.000+02:00
diff --git a/r/src/arrow_types.h b/r/src/arrow_types.h
@@ -23,6 +23,8 @@
 #include <arrow/api.h>
 #include <arrow/type.h>
 
+#define R_ERROR_NOT_OK(s) do { if(!s.ok()) Rcpp::stop(s.ToString()); } while (0);
+
 template <typename T>
 class static_ptr {
 public:
diff --git a/r/src/buffer.cpp b/r/src/buffer.cpp
@@ -141,18 +141,16 @@ std::shared_ptr<arrow::Schema> Table_schema(const std::shared_ptr<arrow::Table>&
 // [[Rcpp::export]]
 int RecordBatch_to_file(const std::shared_ptr<arrow::RecordBatch>& batch, std::string path) {
   std::shared_ptr<arrow::io::OutputStream> stream;
-  auto s = arrow::io::FileOutputStream::Open(path, &stream);
-
   std::shared_ptr<arrow::ipc::RecordBatchWriter> file_writer;
-  s = arrow::ipc::RecordBatchFileWriter::Open(stream.get(), batch->schema(), &file_writer);
-  s = file_writer->WriteRecordBatch(*batch, true);
-  s = file_writer->Close();
+
+  R_ERROR_NOT_OK(arrow::io::FileOutputStream::Open(path, &stream));
+  R_ERROR_NOT_OK(arrow::ipc::RecordBatchFileWriter::Open(stream.get(), batch->schema(), &file_writer));
+  R_ERROR_NOT_OK(file_writer->WriteRecordBatch(*batch, true));
+  R_ERROR_NOT_OK(file_writer->Close());
+
   int64_t offset;
-  s = stream->Tell(&offset);
-  s = stream->Close();
+  R_ERROR_NOT_OK(stream->Tell(&offset));
+  R_ERROR_NOT_OK(stream->Close());
   return offset;
 }
 
-
-
-
