[
https://issues.apache.org/jira/browse/ARROW-2469?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16444122#comment-16444122
]
ASF GitHub Bot commented on ARROW-2469:
---------------------------------------
pitrou closed pull request #1910: ARROW-2469: [C++] Make out arguments last in
ReadMessage.
URL: https://github.com/apache/arrow/pull/1910
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/cpp/src/arrow/ipc/message.cc b/cpp/src/arrow/ipc/message.cc
index 5173ae194..c14fb4927 100644
--- a/cpp/src/arrow/ipc/message.cc
+++ b/cpp/src/arrow/ipc/message.cc
@@ -208,8 +208,8 @@ Status ReadMessage(int64_t offset, int32_t metadata_length,
io::RandomAccessFile
return Message::ReadFrom(metadata, file, message);
}
-Status ReadMessage(io::InputStream* file, std::unique_ptr<Message>* message,
- bool aligned) {
+Status ReadMessage(io::InputStream* file, bool aligned,
+ std::unique_ptr<Message>* message) {
int32_t message_length = 0;
int64_t bytes_read = 0;
RETURN_NOT_OK(file->Read(sizeof(int32_t), &bytes_read,
@@ -249,7 +249,7 @@ Status ReadMessage(io::InputStream* file,
std::unique_ptr<Message>* message,
}
Status ReadMessage(io::InputStream* file, std::unique_ptr<Message>* message) {
- return ReadMessage(file, message, false /* aligned */);
+ return ReadMessage(file, false /* aligned */, message);
}
// ----------------------------------------------------------------------
// Implement InputStream message reader
diff --git a/cpp/src/arrow/ipc/message.h b/cpp/src/arrow/ipc/message.h
index de195d49a..e5ea40911 100644
--- a/cpp/src/arrow/ipc/message.h
+++ b/cpp/src/arrow/ipc/message.h
@@ -158,7 +158,7 @@ class ARROW_EXPORT MessageReader {
virtual Status ReadNextMessage(std::unique_ptr<Message>* message) = 0;
};
-/// \brief Read encapulated RPC message from position in file
+/// \brief Read encapsulated RPC message from position in file
///
/// Read a length-prefixed message flatbuffer starting at the indicated file
/// offset. If the message has a body with non-zero length, it will also be
@@ -176,16 +176,16 @@ ARROW_EXPORT
Status ReadMessage(const int64_t offset, const int32_t metadata_length,
io::RandomAccessFile* file, std::unique_ptr<Message>*
message);
-/// \brief Read encapulated RPC message (metadata and body) from InputStream
+/// \brief Read encapsulated RPC message (metadata and body) from InputStream
///
/// Read length-prefixed message with as-yet unknown length. Returns null if
/// there are not enough bytes available or the message length is 0 (e.g. EOS
/// in a stream)
ARROW_EXPORT
-Status ReadMessage(io::InputStream* stream, std::unique_ptr<Message>* message,
- bool aligned);
+Status ReadMessage(io::InputStream* stream, bool aligned,
+ std::unique_ptr<Message>* message);
-/// \brief Read encapulated RPC message (metadata and body) from InputStream.
+/// \brief Read encapsulated RPC message (metadata and body) from InputStream.
///
/// This is a version of ReadMessage that does not have the aligned argument
/// for backwards compatibility.
diff --git a/cpp/src/arrow/ipc/reader.cc b/cpp/src/arrow/ipc/reader.cc
index aefd491a3..6441bc33c 100644
--- a/cpp/src/arrow/ipc/reader.cc
+++ b/cpp/src/arrow/ipc/reader.cc
@@ -683,16 +683,20 @@ Status RecordBatchFileReader::ReadRecordBatch(int i,
return impl_->ReadRecordBatch(i, batch);
}
-static Status ReadContiguousPayload(io::InputStream* file,
- std::unique_ptr<Message>* message,
- bool aligned = false) {
- RETURN_NOT_OK(ReadMessage(file, message, aligned));
+static Status ReadContiguousPayload(io::InputStream* file, bool aligned,
+ std::unique_ptr<Message>* message) {
+ RETURN_NOT_OK(ReadMessage(file, aligned, message));
if (*message == nullptr) {
return Status::Invalid("Unable to read metadata at offset");
}
return Status::OK();
}
+static Status ReadContiguousPayload(io::InputStream* file,
+ std::unique_ptr<Message>* message) {
+ return ReadContiguousPayload(file, false /* aligned */, message);
+}
+
Status ReadSchema(io::InputStream* stream, std::shared_ptr<Schema>* out) {
std::shared_ptr<RecordBatchReader> reader;
RETURN_NOT_OK(RecordBatchStreamReader::Open(stream, &reader));
@@ -716,7 +720,7 @@ Status ReadTensor(int64_t offset, io::RandomAccessFile*
file,
RETURN_NOT_OK(file->Seek(offset));
std::unique_ptr<Message> message;
- RETURN_NOT_OK(ReadContiguousPayload(file, &message, true /* aligned */));
+ RETURN_NOT_OK(ReadContiguousPayload(file, true /* aligned */, &message));
return ReadTensor(*message, out);
}
diff --git a/cpp/src/arrow/ipc/reader.h b/cpp/src/arrow/ipc/reader.h
index 1763527de..faa63d5a7 100644
--- a/cpp/src/arrow/ipc/reader.h
+++ b/cpp/src/arrow/ipc/reader.h
@@ -196,7 +196,7 @@ ARROW_EXPORT
Status ReadRecordBatch(const Buffer& metadata, const std::shared_ptr<Schema>&
schema,
io::RandomAccessFile* file,
std::shared_ptr<RecordBatch>* out);
-/// \brief Read record batch from encapulated Message
+/// \brief Read record batch from encapsulated Message
///
/// \param[in] message a message instance containing metadata and body
/// \param[in] schema the record batch schema
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Make out arguments last in ReadMessage API.
> -------------------------------------------
>
> Key: ARROW-2469
> URL: https://issues.apache.org/jira/browse/ARROW-2469
> Project: Apache Arrow
> Issue Type: Improvement
> Components: C++
> Reporter: Robert Nishihara
> Assignee: Robert Nishihara
> Priority: Major
> Labels: pull-request-available
> Fix For: 0.10.0
>
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
