You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ap...@apache.org on 2018/04/19 14:29:19 UTC
[arrow] branch master updated: ARROW-2469: [C++] Make out arguments
last in ReadMessage.
This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 18999bb ARROW-2469: [C++] Make out arguments last in ReadMessage.
18999bb is described below
commit 18999bb6fe81e093f095eb64b460c6d60e020d0f
Author: Robert Nishihara <ro...@gmail.com>
AuthorDate: Thu Apr 19 16:29:01 2018 +0200
ARROW-2469: [C++] Make out arguments last in ReadMessage.
Author: Robert Nishihara <ro...@gmail.com>
Closes #1910 from robertnishihara/readmessageapi and squashes the following commits:
431f37e <Robert Nishihara> Fix linting.
8a75df0 <Robert Nishihara> Make out arguments last in ReadMessage.
---
cpp/src/arrow/ipc/message.cc | 6 +++---
cpp/src/arrow/ipc/message.h | 10 +++++-----
cpp/src/arrow/ipc/reader.cc | 14 +++++++++-----
cpp/src/arrow/ipc/reader.h | 2 +-
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/cpp/src/arrow/ipc/message.cc b/cpp/src/arrow/ipc/message.cc
index 5173ae1..c14fb49 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 de195d4..e5ea409 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 aefd491..6441bc3 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 1763527..faa63d5 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
--
To stop receiving notification emails like this one, please contact
apitrou@apache.org.