ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 5 commits into from
Closed

ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10837a6
Add abstract stream writer and reader C++ APIs. Rename record batch s…
wesm May 12, 2017
22346d4
Fix unit tests
wesm May 13, 2017
04fa285
Feedback on ipc reader/writer names. Add open_stream/open_file Python…
wesm May 13, 2017
a797ee3
Fix glib
wesm May 13, 2017
d7b7c9c
Add missing dtors for pimpl pattern
wesm May 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions c_glib/arrow-glib/stream-reader.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ G_BEGIN_DECLS
*/

typedef struct GArrowStreamReaderPrivate_ {
std::shared_ptr<arrow::ipc::StreamReader> stream_reader;
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> stream_reader;
} GArrowStreamReaderPrivate;

enum {
Expand DownExpand Up@@ -85,7 +85,7 @@ garrow_stream_reader_set_property(GObject *object,
switch (prop_id) {
case PROP_STREAM_READER:
priv->stream_reader =
*static_cast<std::shared_ptr<arrow::ipc::StreamReader> *>(g_value_get_pointer(value));
*static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *>(g_value_get_pointer(value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -124,8 +124,8 @@ garrow_stream_reader_class_init(GArrowStreamReaderClass *klass)
gobject_class->get_property = garrow_stream_reader_get_property;

spec = g_param_spec_pointer("stream-reader",
"ipc::StreamReader",
"The raw std::shared<arrow::ipc::StreamReader> *",
"ipc::RecordBatchStreamReader",
"The raw std::shared<arrow::ipc::RecordBatchStreamReader> *",
static_cast<GParamFlags>(G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property(gobject_class, PROP_STREAM_READER, spec);
Expand All@@ -143,10 +143,10 @@ GArrowStreamReader *
garrow_stream_reader_new(GArrowInputStream *stream,
GError **error)
{
std::shared_ptr<arrow::ipc::StreamReader> arrow_stream_reader;
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> arrow_stream_reader;
auto status =
arrow::ipc::StreamReader::Open(garrow_input_stream_get_raw(stream),
&arrow_stream_reader);
arrow::ipc::RecordBatchStreamReader::Open(garrow_input_stream_get_raw(stream),
&arrow_stream_reader);
if (garrow_error_check(error, status, "[ipc][stream-reader][open]")) {
return garrow_stream_reader_new_raw(&arrow_stream_reader);
} else {
Expand DownExpand Up@@ -179,7 +179,7 @@ garrow_stream_reader_get_schema(GArrowStreamReader *stream_reader)
*/
GArrowRecordBatch *
garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
GError **error)
GError **error)
{
auto arrow_stream_reader =
garrow_stream_reader_get_raw(stream_reader);
Expand All@@ -202,7 +202,7 @@ garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
G_END_DECLS

GArrowStreamReader *
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader)
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader)
{
auto stream_reader =
GARROW_STREAM_READER(g_object_new(GARROW_TYPE_STREAM_READER,
Expand All@@ -211,7 +211,7 @@ garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_st
return stream_reader;
}

std::shared_ptr<arrow::ipc::StreamReader>
std::shared_ptr<arrow::ipc::RecordBatchStreamReader>
garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader)
{
GArrowStreamReaderPrivate *priv;
Expand Down
2 changes: 1 addition & 1 deletion c_glib/arrow-glib/stream-reader.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ typedef struct _GArrowStreamReaderClass GArrowStreamReaderClass;
/**
* GArrowStreamReader:
*
* It wraps `arrow::ipc::StreamReader`.
* It wraps `arrow::ipc::InputStreamReader`.
*/
struct _GArrowStreamReader
{
Expand Down
4 changes: 2 additions & 2 deletions c_glib/arrow-glib/stream-reader.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,5 @@

#include <arrow-glib/stream-reader.h>

GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::StreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);
GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);
16 changes: 8 additions & 8 deletions c_glib/arrow-glib/writer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ G_BEGIN_DECLS
*/

typedef struct GArrowStreamWriterPrivate_ {
std::shared_ptr<arrow::ipc::StreamWriter> stream_writer;
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> stream_writer;
} GArrowStreamWriterPrivate;

enum {
Expand DownExpand Up@@ -89,7 +89,7 @@ garrow_stream_writer_set_property(GObject *object,
switch (prop_id) {
case PROP_STREAM_WRITER:
priv->stream_writer =
*static_cast<std::shared_ptr<arrow::ipc::StreamWriter> *>(g_value_get_pointer(value));
*static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *>(g_value_get_pointer(value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -128,8 +128,8 @@ garrow_stream_writer_class_init(GArrowStreamWriterClass *klass)
gobject_class->get_property = garrow_stream_writer_get_property;

spec = g_param_spec_pointer("stream-writer",
"ipc::StreamWriter",
"The raw std::shared<arrow::ipc::StreamWriter> *",
"ipc::RecordBatchStreamWriter",
"The raw std::shared<arrow::ipc::RecordBatchStreamWriter> *",
static_cast<GParamFlags>(G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property(gobject_class, PROP_STREAM_WRITER, spec);
Expand All@@ -149,11 +149,11 @@ garrow_stream_writer_new(GArrowOutputStream *sink,
GArrowSchema *schema,
GError **error)
{
std::shared_ptr<arrow::ipc::StreamWriter> arrow_stream_writer;
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> arrow_stream_writer;
auto status =
arrow::ipc::StreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
garrow_schema_get_raw(schema),
&arrow_stream_writer);
arrow::ipc::RecordBatchStreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
garrow_schema_get_raw(schema),
&arrow_stream_writer);
if (garrow_error_check(error, status, "[ipc][stream-writer][open]")) {
return garrow_stream_writer_new_raw(&arrow_stream_writer);
} else {
Expand Down
2 changes: 1 addition & 1 deletion c_glib/arrow-glib/writer.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ typedef struct _GArrowStreamWriterClass GArrowStreamWriterClass;
/**
* GArrowStreamWriter:
*
* It wraps `arrow::ipc::StreamWriter`.
* It wraps `arrow::ipc::RecordBatchStreamWriter`.
*/
struct _GArrowStreamWriter
{
Expand Down
8 changes: 4 additions & 4 deletions c_glib/arrow-glib/writer.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,8 +24,8 @@

#include <arrow-glib/writer.h>

GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::StreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::StreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);
GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);

GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::FileWriter> *arrow_file_writer);
arrow::ipc::FileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);
GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchFileWriter> *arrow_file_writer);
arrow::ipc::RecordBatchFileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);
2 changes: 2 additions & 0 deletions ci/travis_before_script_cpp.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,10 +38,12 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
cmake -DARROW_TEST_MEMCHECK=on \
$CMAKE_COMMON_FLAGS \
-DARROW_CXXFLAGS="-Wconversion -Werror" \
-DARROW_NO_DEPRECATED_API=on \
$ARROW_CPP_DIR
else
cmake $CMAKE_COMMON_FLAGS \
-DARROW_CXXFLAGS=-Werror \
-DARROW_NO_DEPRECATED_API=on \
$ARROW_CPP_DIR
fi

Expand Down
8 changes: 8 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
"Build the Arrow micro benchmarks"
OFF)

option(ARROW_NO_DEPRECATED_API
"Exclude deprecated APIs from build"
OFF)

option(ARROW_IPC
"Build the Arrow IPC extensions"
ON)
Expand DownExpand Up@@ -154,6 +158,10 @@ include(BuildUtils)

include(SetupCxxFlags)

if (ARROW_NO_DEPRECATED_API)
add_definitions(-DARROW_NO_DEPRECATED_API)
endif()

# Add common flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_COMMON_FLAGS}")
set(EP_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Expand Down
12 changes: 7 additions & 5 deletions cpp/src/arrow/ipc/file-to-stream.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,18 +24,19 @@
#include "arrow/util/io-util.h"

namespace arrow {
namespace ipc {

// Reads a file on the file system and prints to stdout the stream version of it.
Status ConvertToStream(const char* path) {
std::shared_ptr<io::ReadableFile> in_file;
std::shared_ptr<ipc::FileReader> reader;
std::shared_ptr<RecordBatchFileReader> reader;

RETURN_NOT_OK(io::ReadableFile::Open(path, &in_file));
RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

io::StdoutStream sink;
std::shared_ptr<ipc::StreamWriter> writer;
RETURN_NOT_OK(ipc::StreamWriter::Open(&sink, reader->schema(), &writer));
std::shared_ptr<RecordBatchStreamWriter> writer;
RETURN_NOT_OK(RecordBatchStreamWriter::Open(&sink, reader->schema(), &writer));
for (int i = 0; i < reader->num_record_batches(); ++i) {
std::shared_ptr<RecordBatch> chunk;
RETURN_NOT_OK(reader->GetRecordBatch(i, &chunk));
Expand All@@ -44,14 +45,15 @@ Status ConvertToStream(const char* path) {
return writer->Close();
}

} // namespace ipc
} // namespace arrow

int main(int argc, char** argv) {
if (argc != 2) {
std::cerr << "Usage: file-to-stream <input arrow file>" << std::endl;
return 1;
}
arrow::Status status = arrow::ConvertToStream(argv[1]);
arrow::Status status = arrow::ipc::ConvertToStream(argv[1]);
if (!status.ok()) {
std::cerr << "Could not convert to stream: " << status.ToString() << std::endl;
return 1;
Expand Down
25 changes: 13 additions & 12 deletions cpp/src/arrow/ipc/ipc-read-write-test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,16 +140,16 @@ class IpcTestFixture : public io::MemoryMapFixture {
if (zero_data) { RETURN_NOT_OK(ZeroMemoryMap(mmap_.get())); }
RETURN_NOT_OK(mmap_->Seek(0));

std::shared_ptr<FileWriter> file_writer;
RETURN_NOT_OK(FileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
std::shared_ptr<RecordBatchFileWriter> file_writer;
RETURN_NOT_OK(RecordBatchFileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
RETURN_NOT_OK(file_writer->WriteRecordBatch(batch, true));
RETURN_NOT_OK(file_writer->Close());

int64_t offset;
RETURN_NOT_OK(mmap_->Tell(&offset));

std::shared_ptr<FileReader> file_reader;
RETURN_NOT_OK(FileReader::Open(mmap_, offset, &file_reader));
std::shared_ptr<RecordBatchFileReader> file_reader;
RETURN_NOT_OK(RecordBatchFileReader::Open(mmap_, offset, &file_reader));

return file_reader->GetRecordBatch(0, result);
}
Expand DownExpand Up@@ -487,8 +487,9 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

Status RoundTripHelper(const BatchVector& in_batches, BatchVector* out_batches) {
// Write the file
std::shared_ptr<FileWriter> writer;
RETURN_NOT_OK(FileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));
std::shared_ptr<RecordBatchFileWriter> writer;
RETURN_NOT_OK(
RecordBatchFileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));

const int num_batches = static_cast<int>(in_batches.size());

Expand All@@ -504,8 +505,8 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

// Open the file
auto buf_reader = std::make_shared<io::BufferReader>(buffer_);
std::shared_ptr<FileReader> reader;
RETURN_NOT_OK(FileReader::Open(buf_reader, footer_offset, &reader));
std::shared_ptr<RecordBatchFileReader> reader;
RETURN_NOT_OK(RecordBatchFileReader::Open(buf_reader, footer_offset, &reader));

EXPECT_EQ(num_batches, reader->num_record_batches());
for (int i = 0; i < num_batches; ++i) {
Expand DownExpand Up@@ -553,8 +554,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
Status RoundTripHelper(
const RecordBatch& batch, std::vector<std::shared_ptr<RecordBatch>>* out_batches) {
// Write the file
std::shared_ptr<StreamWriter> writer;
RETURN_NOT_OK(StreamWriter::Open(sink_.get(), batch.schema(), &writer));
std::shared_ptr<RecordBatchStreamWriter> writer;
RETURN_NOT_OK(RecordBatchStreamWriter::Open(sink_.get(), batch.schema(), &writer));
int num_batches = 5;
for (int i = 0; i < num_batches; ++i) {
RETURN_NOT_OK(writer->WriteRecordBatch(batch));
Expand All@@ -565,8 +566,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
// Open the file
auto buf_reader = std::make_shared<io::BufferReader>(buffer_);

std::shared_ptr<StreamReader> reader;
RETURN_NOT_OK(StreamReader::Open(buf_reader, &reader));
std::shared_ptr<RecordBatchStreamReader> reader;
RETURN_NOT_OK(RecordBatchStreamReader::Open(buf_reader, &reader));

std::shared_ptr<RecordBatch> chunk;
while (true) {
Expand Down
13 changes: 7 additions & 6 deletions cpp/src/arrow/ipc/json-integration-test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,9 @@ static Status ConvertJsonToArrow(
std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
}

std::shared_ptr<ipc::FileWriter> writer;
RETURN_NOT_OK(ipc::FileWriter::Open(out_file.get(), reader->schema(), &writer));
std::shared_ptr<ipc::RecordBatchFileWriter> writer;
RETURN_NOT_OK(
ipc::RecordBatchFileWriter::Open(out_file.get(), reader->schema(), &writer));

for (int i = 0; i < reader->num_record_batches(); ++i) {
std::shared_ptr<RecordBatch> batch;
Expand All@@ -96,8 +97,8 @@ static Status ConvertArrowToJson(
RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &in_file));
RETURN_NOT_OK(io::FileOutputStream::Open(json_path, &out_file));

std::shared_ptr<ipc::FileReader> reader;
RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
std::shared_ptr<ipc::RecordBatchFileReader> reader;
RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

if (FLAGS_verbose) {
std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
Expand DownExpand Up@@ -137,8 +138,8 @@ static Status ValidateArrowVsJson(
std::shared_ptr<io::ReadableFile> arrow_file;
RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &arrow_file));

std::shared_ptr<ipc::FileReader> arrow_reader;
RETURN_NOT_OK(ipc::FileReader::Open(arrow_file, &arrow_reader));
std::shared_ptr<ipc::RecordBatchFileReader> arrow_reader;
RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(arrow_file, &arrow_reader));

auto json_schema = json_reader->schema();
auto arrow_schema = arrow_reader->schema();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
5
commits into

from

 Closed


ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes
#679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
10837a6

Add abstract stream writer and reader C++ APIs. Rename record batch s…


wesm May 12, 2017
22346d4

Fix unit tests


wesm May 13, 2017
04fa285

Feedback on ipc reader/writer names. Add open_stream/open_file Python…


wesm May 13, 2017
a797ee3

Fix glib


wesm May 13, 2017
d7b7c9c

Add missing dtors for pimpl pattern


wesm May 13, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
c_glib/arrow-glib/stream-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamReaderPrivate_ {
 std::shared_ptr<arrow::ipc::StreamReader> stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> stream_reader;
} GArrowStreamReaderPrivate;

enum {
Expand DownExpand Up@@ -85,7 +85,7 @@ garrow_stream_reader_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_READER:
 priv->stream_reader =
 *static_cast<std::shared_ptr<arrow::ipc::StreamReader> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -124,8 +124,8 @@ garrow_stream_reader_class_init(GArrowStreamReaderClass *klass)
 gobject_class->get_property = garrow_stream_reader_get_property;

 spec = g_param_spec_pointer("stream-reader",
 "ipc::StreamReader",
 "The raw std::shared<arrow::ipc::StreamReader> *",
 "ipc::RecordBatchStreamReader",
 "The raw std::shared<arrow::ipc::RecordBatchStreamReader> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_READER, spec);
Expand All@@ -143,10 +143,10 @@ GArrowStreamReader *
garrow_stream_reader_new(GArrowInputStream *stream,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamReader> arrow_stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> arrow_stream_reader;
 auto status =
 arrow::ipc::StreamReader::Open(garrow_input_stream_get_raw(stream),
 &arrow_stream_reader);
 arrow::ipc::RecordBatchStreamReader::Open(garrow_input_stream_get_raw(stream),
&arrow_stream_reader);
 if (garrow_error_check(error, status, "[ipc][stream-reader][open]")) {
 return garrow_stream_reader_new_raw(&arrow_stream_reader);
 } else {
Expand DownExpand Up@@ -179,7 +179,7 @@ garrow_stream_reader_get_schema(GArrowStreamReader *stream_reader)
 */
GArrowRecordBatch *
garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
GError **error)
 GError **error)
{
 auto arrow_stream_reader =
 garrow_stream_reader_get_raw(stream_reader);
Expand All@@ -202,7 +202,7 @@ garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
G_END_DECLS

GArrowStreamReader *
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader)
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader)
{
 auto stream_reader =
 GARROW_STREAM_READER(g_object_new(GARROW_TYPE_STREAM_READER,
Expand All@@ -211,7 +211,7 @@ garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_st
 return stream_reader;
}

std::shared_ptr<arrow::ipc::StreamReader>
std::shared_ptr<arrow::ipc::RecordBatchStreamReader>
garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader)
{
 GArrowStreamReaderPrivate *priv;
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/stream-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ typedef struct _GArrowStreamReaderClass GArrowStreamReaderClass;
/**
 * GArrowStreamReader:
 *
 * It wraps `arrow::ipc::StreamReader`.
 * It wraps `arrow::ipc::InputStreamReader`.
 */
struct _GArrowStreamReader
{
Expand Down

4 changes: 2 additions & 2 deletions
c_glib/arrow-glib/stream-reader.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,5 @@

#include <arrow-glib/stream-reader.h>

GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::StreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);
GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);

16 changes: 8 additions & 8 deletions
c_glib/arrow-glib/writer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamWriterPrivate_ {
 std::shared_ptr<arrow::ipc::StreamWriter> stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> stream_writer;
} GArrowStreamWriterPrivate;

enum {
Expand DownExpand Up@@ -89,7 +89,7 @@ garrow_stream_writer_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_WRITER:
 priv->stream_writer =
 *static_cast<std::shared_ptr<arrow::ipc::StreamWriter> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -128,8 +128,8 @@ garrow_stream_writer_class_init(GArrowStreamWriterClass *klass)
 gobject_class->get_property = garrow_stream_writer_get_property;

 spec = g_param_spec_pointer("stream-writer",
 "ipc::StreamWriter",
 "The raw std::shared<arrow::ipc::StreamWriter> *",
 "ipc::RecordBatchStreamWriter",
 "The raw std::shared<arrow::ipc::RecordBatchStreamWriter> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_WRITER, spec);
Expand All@@ -149,11 +149,11 @@ garrow_stream_writer_new(GArrowOutputStream *sink,
 GArrowSchema *schema,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamWriter> arrow_stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> arrow_stream_writer;
 auto status =
 arrow::ipc::StreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
 garrow_schema_get_raw(schema),
 &arrow_stream_writer);
 arrow::ipc::RecordBatchStreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
garrow_schema_get_raw(schema),
&arrow_stream_writer);
 if (garrow_error_check(error, status, "[ipc][stream-writer][open]")) {
 return garrow_stream_writer_new_raw(&arrow_stream_writer);
 } else {
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/writer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ typedef struct _GArrowStreamWriterClass GArrowStreamWriterClass;
/**
 * GArrowStreamWriter:
 *
 * It wraps `arrow::ipc::StreamWriter`.
 * It wraps `arrow::ipc::RecordBatchStreamWriter`.
 */
struct _GArrowStreamWriter
{
Expand Down

8 changes: 4 additions & 4 deletions
c_glib/arrow-glib/writer.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,8 +24,8 @@

#include <arrow-glib/writer.h>

GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::StreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::StreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);
GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);

GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::FileWriter> *arrow_file_writer);
arrow::ipc::FileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);
GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchFileWriter> *arrow_file_writer);
arrow::ipc::RecordBatchFileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);

2 changes: 2 additions & 0 deletions
ci/travis_before_script_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,10 +38,12 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
 cmake -DARROW_TEST_MEMCHECK=on \
 $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS="-Wconversion -Werror" \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
else
 cmake $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS=-Werror \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
fi

Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 "Build the Arrow micro benchmarks"
 OFF)

 option(ARROW_NO_DEPRECATED_API
 "Exclude deprecated APIs from build"
 OFF)

 option(ARROW_IPC
 "Build the Arrow IPC extensions"
 ON)
Expand DownExpand Up@@ -154,6 +158,10 @@ include(BuildUtils)

include(SetupCxxFlags)

if (ARROW_NO_DEPRECATED_API)
 add_definitions(-DARROW_NO_DEPRECATED_API)
endif()

# Add common flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_COMMON_FLAGS}")
set(EP_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Expand Down

12 changes: 7 additions & 5 deletions
cpp/src/arrow/ipc/file-to-stream.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,18 +24,19 @@
#include "arrow/util/io-util.h"

namespace arrow {
namespace ipc {

// Reads a file on the file system and prints to stdout the stream version of it.
Status ConvertToStream(const char* path) {
 std::shared_ptr<io::ReadableFile> in_file;
 std::shared_ptr<ipc::FileReader> reader;
 std::shared_ptr<RecordBatchFileReader> reader;

 RETURN_NOT_OK(io::ReadableFile::Open(path, &in_file));
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 io::StdoutStream sink;
 std::shared_ptr<ipc::StreamWriter> writer;
 RETURN_NOT_OK(ipc::StreamWriter::Open(&sink, reader->schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(&sink, reader->schema(), &writer));
 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> chunk;
 RETURN_NOT_OK(reader->GetRecordBatch(i, &chunk));
Expand All@@ -44,14 +45,15 @@ Status ConvertToStream(const char* path) {
 return writer->Close();
}

} // namespace ipc
} // namespace arrow

int main(int argc, char** argv) {
 if (argc != 2) {
 std::cerr << "Usage: file-to-stream <input arrow file>" << std::endl;
 return 1;
 }
 arrow::Status status = arrow::ConvertToStream(argv[1]);
 arrow::Status status = arrow::ipc::ConvertToStream(argv[1]);
 if (!status.ok()) {
 std::cerr << "Could not convert to stream: " << status.ToString() << std::endl;
 return 1;
Expand Down

25 changes: 13 additions & 12 deletions
cpp/src/arrow/ipc/ipc-read-write-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,16 +140,16 @@ class IpcTestFixture : public io::MemoryMapFixture {
 if (zero_data) { RETURN_NOT_OK(ZeroMemoryMap(mmap_.get())); }
 RETURN_NOT_OK(mmap_->Seek(0));

 std::shared_ptr<FileWriter> file_writer;
 RETURN_NOT_OK(FileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 std::shared_ptr<RecordBatchFileWriter> file_writer;
 RETURN_NOT_OK(RecordBatchFileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 RETURN_NOT_OK(file_writer->WriteRecordBatch(batch, true));
 RETURN_NOT_OK(file_writer->Close());

 int64_t offset;
 RETURN_NOT_OK(mmap_->Tell(&offset));

 std::shared_ptr<FileReader> file_reader;
 RETURN_NOT_OK(FileReader::Open(mmap_, offset, &file_reader));
 std::shared_ptr<RecordBatchFileReader> file_reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(mmap_, offset, &file_reader));

 return file_reader->GetRecordBatch(0, result);
 }
Expand DownExpand Up@@ -487,8 +487,9 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 Status RoundTripHelper(const BatchVector& in_batches, BatchVector* out_batches) {
 // Write the file
 std::shared_ptr<FileWriter> writer;
 RETURN_NOT_OK(FileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));
 std::shared_ptr<RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 RecordBatchFileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));

 const int num_batches = static_cast<int>(in_batches.size());

Expand All@@ -504,8 +505,8 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);
 std::shared_ptr<FileReader> reader;
 RETURN_NOT_OK(FileReader::Open(buf_reader, footer_offset, &reader));
 std::shared_ptr<RecordBatchFileReader> reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(buf_reader, footer_offset, &reader));

 EXPECT_EQ(num_batches, reader->num_record_batches());
 for (int i = 0; i < num_batches; ++i) {
Expand DownExpand Up@@ -553,8 +554,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 Status RoundTripHelper(
 const RecordBatch& batch, std::vector<std::shared_ptr<RecordBatch>>* out_batches) {
 // Write the file
 std::shared_ptr<StreamWriter> writer;
 RETURN_NOT_OK(StreamWriter::Open(sink_.get(), batch.schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(sink_.get(), batch.schema(), &writer));
 int num_batches = 5;
 for (int i = 0; i < num_batches; ++i) {
 RETURN_NOT_OK(writer->WriteRecordBatch(batch));
Expand All@@ -565,8 +566,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);

 std::shared_ptr<StreamReader> reader;
 RETURN_NOT_OK(StreamReader::Open(buf_reader, &reader));
 std::shared_ptr<RecordBatchStreamReader> reader;
 RETURN_NOT_OK(RecordBatchStreamReader::Open(buf_reader, &reader));

 std::shared_ptr<RecordBatch> chunk;
 while (true) {
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/arrow/ipc/json-integration-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,9 @@ static Status ConvertJsonToArrow(
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
 }

 std::shared_ptr<ipc::FileWriter> writer;
 RETURN_NOT_OK(ipc::FileWriter::Open(out_file.get(), reader->schema(), &writer));
 std::shared_ptr<ipc::RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 ipc::RecordBatchFileWriter::Open(out_file.get(), reader->schema(), &writer));

 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> batch;
Expand All@@ -96,8 +97,8 @@ static Status ConvertArrowToJson(
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &in_file));
 RETURN_NOT_OK(io::FileOutputStream::Open(json_path, &out_file));

 std::shared_ptr<ipc::FileReader> reader;
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 std::shared_ptr<ipc::RecordBatchFileReader> reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 if (FLAGS_verbose) {
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
Expand DownExpand Up@@ -137,8 +138,8 @@ static Status ValidateArrowVsJson(
 std::shared_ptr<io::ReadableFile> arrow_file;
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &arrow_file));

 std::shared_ptr<ipc::FileReader> arrow_reader;
 RETURN_NOT_OK(ipc::FileReader::Open(arrow_file, &arrow_reader));
 std::shared_ptr<ipc::RecordBatchFileReader> arrow_reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(arrow_file, &arrow_reader));

 auto json_schema = json_reader->schema();
 auto arrow_schema = arrow_reader->schema();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
5
commits into

from

 Closed


ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes
#679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
10837a6

Add abstract stream writer and reader C++ APIs. Rename record batch s…


wesm May 12, 2017
22346d4

Fix unit tests


wesm May 13, 2017
04fa285

Feedback on ipc reader/writer names. Add open_stream/open_file Python…


wesm May 13, 2017
a797ee3

Fix glib


wesm May 13, 2017
d7b7c9c

Add missing dtors for pimpl pattern


wesm May 13, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
c_glib/arrow-glib/stream-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamReaderPrivate_ {
 std::shared_ptr<arrow::ipc::StreamReader> stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> stream_reader;
} GArrowStreamReaderPrivate;

enum {
Expand DownExpand Up@@ -85,7 +85,7 @@ garrow_stream_reader_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_READER:
 priv->stream_reader =
 *static_cast<std::shared_ptr<arrow::ipc::StreamReader> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -124,8 +124,8 @@ garrow_stream_reader_class_init(GArrowStreamReaderClass *klass)
 gobject_class->get_property = garrow_stream_reader_get_property;

 spec = g_param_spec_pointer("stream-reader",
 "ipc::StreamReader",
 "The raw std::shared<arrow::ipc::StreamReader> *",
 "ipc::RecordBatchStreamReader",
 "The raw std::shared<arrow::ipc::RecordBatchStreamReader> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_READER, spec);
Expand All@@ -143,10 +143,10 @@ GArrowStreamReader *
garrow_stream_reader_new(GArrowInputStream *stream,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamReader> arrow_stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> arrow_stream_reader;
 auto status =
 arrow::ipc::StreamReader::Open(garrow_input_stream_get_raw(stream),
 &arrow_stream_reader);
 arrow::ipc::RecordBatchStreamReader::Open(garrow_input_stream_get_raw(stream),
&arrow_stream_reader);
 if (garrow_error_check(error, status, "[ipc][stream-reader][open]")) {
 return garrow_stream_reader_new_raw(&arrow_stream_reader);
 } else {
Expand DownExpand Up@@ -179,7 +179,7 @@ garrow_stream_reader_get_schema(GArrowStreamReader *stream_reader)
 */
GArrowRecordBatch *
garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
GError **error)
 GError **error)
{
 auto arrow_stream_reader =
 garrow_stream_reader_get_raw(stream_reader);
Expand All@@ -202,7 +202,7 @@ garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
G_END_DECLS

GArrowStreamReader *
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader)
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader)
{
 auto stream_reader =
 GARROW_STREAM_READER(g_object_new(GARROW_TYPE_STREAM_READER,
Expand All@@ -211,7 +211,7 @@ garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_st
 return stream_reader;
}

std::shared_ptr<arrow::ipc::StreamReader>
std::shared_ptr<arrow::ipc::RecordBatchStreamReader>
garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader)
{
 GArrowStreamReaderPrivate *priv;
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/stream-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ typedef struct _GArrowStreamReaderClass GArrowStreamReaderClass;
/**
 * GArrowStreamReader:
 *
 * It wraps `arrow::ipc::StreamReader`.
 * It wraps `arrow::ipc::InputStreamReader`.
 */
struct _GArrowStreamReader
{
Expand Down

4 changes: 2 additions & 2 deletions
c_glib/arrow-glib/stream-reader.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,5 @@

#include <arrow-glib/stream-reader.h>

GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::StreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);
GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);

16 changes: 8 additions & 8 deletions
c_glib/arrow-glib/writer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamWriterPrivate_ {
 std::shared_ptr<arrow::ipc::StreamWriter> stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> stream_writer;
} GArrowStreamWriterPrivate;

enum {
Expand DownExpand Up@@ -89,7 +89,7 @@ garrow_stream_writer_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_WRITER:
 priv->stream_writer =
 *static_cast<std::shared_ptr<arrow::ipc::StreamWriter> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -128,8 +128,8 @@ garrow_stream_writer_class_init(GArrowStreamWriterClass *klass)
 gobject_class->get_property = garrow_stream_writer_get_property;

 spec = g_param_spec_pointer("stream-writer",
 "ipc::StreamWriter",
 "The raw std::shared<arrow::ipc::StreamWriter> *",
 "ipc::RecordBatchStreamWriter",
 "The raw std::shared<arrow::ipc::RecordBatchStreamWriter> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_WRITER, spec);
Expand All@@ -149,11 +149,11 @@ garrow_stream_writer_new(GArrowOutputStream *sink,
 GArrowSchema *schema,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamWriter> arrow_stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> arrow_stream_writer;
 auto status =
 arrow::ipc::StreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
 garrow_schema_get_raw(schema),
 &arrow_stream_writer);
 arrow::ipc::RecordBatchStreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
garrow_schema_get_raw(schema),
&arrow_stream_writer);
 if (garrow_error_check(error, status, "[ipc][stream-writer][open]")) {
 return garrow_stream_writer_new_raw(&arrow_stream_writer);
 } else {
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/writer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ typedef struct _GArrowStreamWriterClass GArrowStreamWriterClass;
/**
 * GArrowStreamWriter:
 *
 * It wraps `arrow::ipc::StreamWriter`.
 * It wraps `arrow::ipc::RecordBatchStreamWriter`.
 */
struct _GArrowStreamWriter
{
Expand Down

8 changes: 4 additions & 4 deletions
c_glib/arrow-glib/writer.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,8 +24,8 @@

#include <arrow-glib/writer.h>

GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::StreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::StreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);
GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);

GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::FileWriter> *arrow_file_writer);
arrow::ipc::FileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);
GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchFileWriter> *arrow_file_writer);
arrow::ipc::RecordBatchFileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);

2 changes: 2 additions & 0 deletions
ci/travis_before_script_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,10 +38,12 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
 cmake -DARROW_TEST_MEMCHECK=on \
 $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS="-Wconversion -Werror" \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
else
 cmake $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS=-Werror \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
fi

Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 "Build the Arrow micro benchmarks"
 OFF)

 option(ARROW_NO_DEPRECATED_API
 "Exclude deprecated APIs from build"
 OFF)

 option(ARROW_IPC
 "Build the Arrow IPC extensions"
 ON)
Expand DownExpand Up@@ -154,6 +158,10 @@ include(BuildUtils)

include(SetupCxxFlags)

if (ARROW_NO_DEPRECATED_API)
 add_definitions(-DARROW_NO_DEPRECATED_API)
endif()

# Add common flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_COMMON_FLAGS}")
set(EP_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Expand Down

12 changes: 7 additions & 5 deletions
cpp/src/arrow/ipc/file-to-stream.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,18 +24,19 @@
#include "arrow/util/io-util.h"

namespace arrow {
namespace ipc {

// Reads a file on the file system and prints to stdout the stream version of it.
Status ConvertToStream(const char* path) {
 std::shared_ptr<io::ReadableFile> in_file;
 std::shared_ptr<ipc::FileReader> reader;
 std::shared_ptr<RecordBatchFileReader> reader;

 RETURN_NOT_OK(io::ReadableFile::Open(path, &in_file));
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 io::StdoutStream sink;
 std::shared_ptr<ipc::StreamWriter> writer;
 RETURN_NOT_OK(ipc::StreamWriter::Open(&sink, reader->schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(&sink, reader->schema(), &writer));
 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> chunk;
 RETURN_NOT_OK(reader->GetRecordBatch(i, &chunk));
Expand All@@ -44,14 +45,15 @@ Status ConvertToStream(const char* path) {
 return writer->Close();
}

} // namespace ipc
} // namespace arrow

int main(int argc, char** argv) {
 if (argc != 2) {
 std::cerr << "Usage: file-to-stream <input arrow file>" << std::endl;
 return 1;
 }
 arrow::Status status = arrow::ConvertToStream(argv[1]);
 arrow::Status status = arrow::ipc::ConvertToStream(argv[1]);
 if (!status.ok()) {
 std::cerr << "Could not convert to stream: " << status.ToString() << std::endl;
 return 1;
Expand Down

25 changes: 13 additions & 12 deletions
cpp/src/arrow/ipc/ipc-read-write-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,16 +140,16 @@ class IpcTestFixture : public io::MemoryMapFixture {
 if (zero_data) { RETURN_NOT_OK(ZeroMemoryMap(mmap_.get())); }
 RETURN_NOT_OK(mmap_->Seek(0));

 std::shared_ptr<FileWriter> file_writer;
 RETURN_NOT_OK(FileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 std::shared_ptr<RecordBatchFileWriter> file_writer;
 RETURN_NOT_OK(RecordBatchFileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 RETURN_NOT_OK(file_writer->WriteRecordBatch(batch, true));
 RETURN_NOT_OK(file_writer->Close());

 int64_t offset;
 RETURN_NOT_OK(mmap_->Tell(&offset));

 std::shared_ptr<FileReader> file_reader;
 RETURN_NOT_OK(FileReader::Open(mmap_, offset, &file_reader));
 std::shared_ptr<RecordBatchFileReader> file_reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(mmap_, offset, &file_reader));

 return file_reader->GetRecordBatch(0, result);
 }
Expand DownExpand Up@@ -487,8 +487,9 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 Status RoundTripHelper(const BatchVector& in_batches, BatchVector* out_batches) {
 // Write the file
 std::shared_ptr<FileWriter> writer;
 RETURN_NOT_OK(FileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));
 std::shared_ptr<RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 RecordBatchFileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));

 const int num_batches = static_cast<int>(in_batches.size());

Expand All@@ -504,8 +505,8 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);
 std::shared_ptr<FileReader> reader;
 RETURN_NOT_OK(FileReader::Open(buf_reader, footer_offset, &reader));
 std::shared_ptr<RecordBatchFileReader> reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(buf_reader, footer_offset, &reader));

 EXPECT_EQ(num_batches, reader->num_record_batches());
 for (int i = 0; i < num_batches; ++i) {
Expand DownExpand Up@@ -553,8 +554,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 Status RoundTripHelper(
 const RecordBatch& batch, std::vector<std::shared_ptr<RecordBatch>>* out_batches) {
 // Write the file
 std::shared_ptr<StreamWriter> writer;
 RETURN_NOT_OK(StreamWriter::Open(sink_.get(), batch.schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(sink_.get(), batch.schema(), &writer));
 int num_batches = 5;
 for (int i = 0; i < num_batches; ++i) {
 RETURN_NOT_OK(writer->WriteRecordBatch(batch));
Expand All@@ -565,8 +566,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);

 std::shared_ptr<StreamReader> reader;
 RETURN_NOT_OK(StreamReader::Open(buf_reader, &reader));
 std::shared_ptr<RecordBatchStreamReader> reader;
 RETURN_NOT_OK(RecordBatchStreamReader::Open(buf_reader, &reader));

 std::shared_ptr<RecordBatch> chunk;
 while (true) {
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/arrow/ipc/json-integration-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,9 @@ static Status ConvertJsonToArrow(
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
 }

 std::shared_ptr<ipc::FileWriter> writer;
 RETURN_NOT_OK(ipc::FileWriter::Open(out_file.get(), reader->schema(), &writer));
 std::shared_ptr<ipc::RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 ipc::RecordBatchFileWriter::Open(out_file.get(), reader->schema(), &writer));

 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> batch;
Expand All@@ -96,8 +97,8 @@ static Status ConvertArrowToJson(
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &in_file));
 RETURN_NOT_OK(io::FileOutputStream::Open(json_path, &out_file));

 std::shared_ptr<ipc::FileReader> reader;
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 std::shared_ptr<ipc::RecordBatchFileReader> reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 if (FLAGS_verbose) {
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
Expand DownExpand Up@@ -137,8 +138,8 @@ static Status ValidateArrowVsJson(
 std::shared_ptr<io::ReadableFile> arrow_file;
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &arrow_file));

 std::shared_ptr<ipc::FileReader> arrow_reader;
 RETURN_NOT_OK(ipc::FileReader::Open(arrow_file, &arrow_reader));
 std::shared_ptr<ipc::RecordBatchFileReader> arrow_reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(arrow_file, &arrow_reader));

 auto json_schema = json_reader->schema();
 auto arrow_schema = arrow_reader->schema();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
5
commits into

from

 Closed


ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes
#679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
10837a6

Add abstract stream writer and reader C++ APIs. Rename record batch s…


wesm May 12, 2017
22346d4

Fix unit tests


wesm May 13, 2017
04fa285

Feedback on ipc reader/writer names. Add open_stream/open_file Python…


wesm May 13, 2017
a797ee3

Fix glib


wesm May 13, 2017
d7b7c9c

Add missing dtors for pimpl pattern


wesm May 13, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
c_glib/arrow-glib/stream-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamReaderPrivate_ {
 std::shared_ptr<arrow::ipc::StreamReader> stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> stream_reader;
} GArrowStreamReaderPrivate;

enum {
Expand DownExpand Up@@ -85,7 +85,7 @@ garrow_stream_reader_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_READER:
 priv->stream_reader =
 *static_cast<std::shared_ptr<arrow::ipc::StreamReader> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -124,8 +124,8 @@ garrow_stream_reader_class_init(GArrowStreamReaderClass *klass)
 gobject_class->get_property = garrow_stream_reader_get_property;

 spec = g_param_spec_pointer("stream-reader",
 "ipc::StreamReader",
 "The raw std::shared<arrow::ipc::StreamReader> *",
 "ipc::RecordBatchStreamReader",
 "The raw std::shared<arrow::ipc::RecordBatchStreamReader> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_READER, spec);
Expand All@@ -143,10 +143,10 @@ GArrowStreamReader *
garrow_stream_reader_new(GArrowInputStream *stream,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamReader> arrow_stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> arrow_stream_reader;
 auto status =
 arrow::ipc::StreamReader::Open(garrow_input_stream_get_raw(stream),
 &arrow_stream_reader);
 arrow::ipc::RecordBatchStreamReader::Open(garrow_input_stream_get_raw(stream),
&arrow_stream_reader);
 if (garrow_error_check(error, status, "[ipc][stream-reader][open]")) {
 return garrow_stream_reader_new_raw(&arrow_stream_reader);
 } else {
Expand DownExpand Up@@ -179,7 +179,7 @@ garrow_stream_reader_get_schema(GArrowStreamReader *stream_reader)
 */
GArrowRecordBatch *
garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
GError **error)
 GError **error)
{
 auto arrow_stream_reader =
 garrow_stream_reader_get_raw(stream_reader);
Expand All@@ -202,7 +202,7 @@ garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
G_END_DECLS

GArrowStreamReader *
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader)
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader)
{
 auto stream_reader =
 GARROW_STREAM_READER(g_object_new(GARROW_TYPE_STREAM_READER,
Expand All@@ -211,7 +211,7 @@ garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_st
 return stream_reader;
}

std::shared_ptr<arrow::ipc::StreamReader>
std::shared_ptr<arrow::ipc::RecordBatchStreamReader>
garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader)
{
 GArrowStreamReaderPrivate *priv;
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/stream-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ typedef struct _GArrowStreamReaderClass GArrowStreamReaderClass;
/**
 * GArrowStreamReader:
 *
 * It wraps `arrow::ipc::StreamReader`.
 * It wraps `arrow::ipc::InputStreamReader`.
 */
struct _GArrowStreamReader
{
Expand Down

4 changes: 2 additions & 2 deletions
c_glib/arrow-glib/stream-reader.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,5 @@

#include <arrow-glib/stream-reader.h>

GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::StreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);
GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);

16 changes: 8 additions & 8 deletions
c_glib/arrow-glib/writer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamWriterPrivate_ {
 std::shared_ptr<arrow::ipc::StreamWriter> stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> stream_writer;
} GArrowStreamWriterPrivate;

enum {
Expand DownExpand Up@@ -89,7 +89,7 @@ garrow_stream_writer_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_WRITER:
 priv->stream_writer =
 *static_cast<std::shared_ptr<arrow::ipc::StreamWriter> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -128,8 +128,8 @@ garrow_stream_writer_class_init(GArrowStreamWriterClass *klass)
 gobject_class->get_property = garrow_stream_writer_get_property;

 spec = g_param_spec_pointer("stream-writer",
 "ipc::StreamWriter",
 "The raw std::shared<arrow::ipc::StreamWriter> *",
 "ipc::RecordBatchStreamWriter",
 "The raw std::shared<arrow::ipc::RecordBatchStreamWriter> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_WRITER, spec);
Expand All@@ -149,11 +149,11 @@ garrow_stream_writer_new(GArrowOutputStream *sink,
 GArrowSchema *schema,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamWriter> arrow_stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> arrow_stream_writer;
 auto status =
 arrow::ipc::StreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
 garrow_schema_get_raw(schema),
 &arrow_stream_writer);
 arrow::ipc::RecordBatchStreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
garrow_schema_get_raw(schema),
&arrow_stream_writer);
 if (garrow_error_check(error, status, "[ipc][stream-writer][open]")) {
 return garrow_stream_writer_new_raw(&arrow_stream_writer);
 } else {
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/writer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ typedef struct _GArrowStreamWriterClass GArrowStreamWriterClass;
/**
 * GArrowStreamWriter:
 *
 * It wraps `arrow::ipc::StreamWriter`.
 * It wraps `arrow::ipc::RecordBatchStreamWriter`.
 */
struct _GArrowStreamWriter
{
Expand Down

8 changes: 4 additions & 4 deletions
c_glib/arrow-glib/writer.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,8 +24,8 @@

#include <arrow-glib/writer.h>

GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::StreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::StreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);
GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);

GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::FileWriter> *arrow_file_writer);
arrow::ipc::FileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);
GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchFileWriter> *arrow_file_writer);
arrow::ipc::RecordBatchFileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);

2 changes: 2 additions & 0 deletions
ci/travis_before_script_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,10 +38,12 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
 cmake -DARROW_TEST_MEMCHECK=on \
 $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS="-Wconversion -Werror" \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
else
 cmake $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS=-Werror \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
fi

Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 "Build the Arrow micro benchmarks"
 OFF)

 option(ARROW_NO_DEPRECATED_API
 "Exclude deprecated APIs from build"
 OFF)

 option(ARROW_IPC
 "Build the Arrow IPC extensions"
 ON)
Expand DownExpand Up@@ -154,6 +158,10 @@ include(BuildUtils)

include(SetupCxxFlags)

if (ARROW_NO_DEPRECATED_API)
 add_definitions(-DARROW_NO_DEPRECATED_API)
endif()

# Add common flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_COMMON_FLAGS}")
set(EP_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Expand Down

12 changes: 7 additions & 5 deletions
cpp/src/arrow/ipc/file-to-stream.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,18 +24,19 @@
#include "arrow/util/io-util.h"

namespace arrow {
namespace ipc {

// Reads a file on the file system and prints to stdout the stream version of it.
Status ConvertToStream(const char* path) {
 std::shared_ptr<io::ReadableFile> in_file;
 std::shared_ptr<ipc::FileReader> reader;
 std::shared_ptr<RecordBatchFileReader> reader;

 RETURN_NOT_OK(io::ReadableFile::Open(path, &in_file));
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 io::StdoutStream sink;
 std::shared_ptr<ipc::StreamWriter> writer;
 RETURN_NOT_OK(ipc::StreamWriter::Open(&sink, reader->schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(&sink, reader->schema(), &writer));
 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> chunk;
 RETURN_NOT_OK(reader->GetRecordBatch(i, &chunk));
Expand All@@ -44,14 +45,15 @@ Status ConvertToStream(const char* path) {
 return writer->Close();
}

} // namespace ipc
} // namespace arrow

int main(int argc, char** argv) {
 if (argc != 2) {
 std::cerr << "Usage: file-to-stream <input arrow file>" << std::endl;
 return 1;
 }
 arrow::Status status = arrow::ConvertToStream(argv[1]);
 arrow::Status status = arrow::ipc::ConvertToStream(argv[1]);
 if (!status.ok()) {
 std::cerr << "Could not convert to stream: " << status.ToString() << std::endl;
 return 1;
Expand Down

25 changes: 13 additions & 12 deletions
cpp/src/arrow/ipc/ipc-read-write-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,16 +140,16 @@ class IpcTestFixture : public io::MemoryMapFixture {
 if (zero_data) { RETURN_NOT_OK(ZeroMemoryMap(mmap_.get())); }
 RETURN_NOT_OK(mmap_->Seek(0));

 std::shared_ptr<FileWriter> file_writer;
 RETURN_NOT_OK(FileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 std::shared_ptr<RecordBatchFileWriter> file_writer;
 RETURN_NOT_OK(RecordBatchFileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 RETURN_NOT_OK(file_writer->WriteRecordBatch(batch, true));
 RETURN_NOT_OK(file_writer->Close());

 int64_t offset;
 RETURN_NOT_OK(mmap_->Tell(&offset));

 std::shared_ptr<FileReader> file_reader;
 RETURN_NOT_OK(FileReader::Open(mmap_, offset, &file_reader));
 std::shared_ptr<RecordBatchFileReader> file_reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(mmap_, offset, &file_reader));

 return file_reader->GetRecordBatch(0, result);
 }
Expand DownExpand Up@@ -487,8 +487,9 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 Status RoundTripHelper(const BatchVector& in_batches, BatchVector* out_batches) {
 // Write the file
 std::shared_ptr<FileWriter> writer;
 RETURN_NOT_OK(FileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));
 std::shared_ptr<RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 RecordBatchFileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));

 const int num_batches = static_cast<int>(in_batches.size());

Expand All@@ -504,8 +505,8 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);
 std::shared_ptr<FileReader> reader;
 RETURN_NOT_OK(FileReader::Open(buf_reader, footer_offset, &reader));
 std::shared_ptr<RecordBatchFileReader> reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(buf_reader, footer_offset, &reader));

 EXPECT_EQ(num_batches, reader->num_record_batches());
 for (int i = 0; i < num_batches; ++i) {
Expand DownExpand Up@@ -553,8 +554,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 Status RoundTripHelper(
 const RecordBatch& batch, std::vector<std::shared_ptr<RecordBatch>>* out_batches) {
 // Write the file
 std::shared_ptr<StreamWriter> writer;
 RETURN_NOT_OK(StreamWriter::Open(sink_.get(), batch.schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(sink_.get(), batch.schema(), &writer));
 int num_batches = 5;
 for (int i = 0; i < num_batches; ++i) {
 RETURN_NOT_OK(writer->WriteRecordBatch(batch));
Expand All@@ -565,8 +566,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);

 std::shared_ptr<StreamReader> reader;
 RETURN_NOT_OK(StreamReader::Open(buf_reader, &reader));
 std::shared_ptr<RecordBatchStreamReader> reader;
 RETURN_NOT_OK(RecordBatchStreamReader::Open(buf_reader, &reader));

 std::shared_ptr<RecordBatch> chunk;
 while (true) {
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/arrow/ipc/json-integration-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,9 @@ static Status ConvertJsonToArrow(
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
 }

 std::shared_ptr<ipc::FileWriter> writer;
 RETURN_NOT_OK(ipc::FileWriter::Open(out_file.get(), reader->schema(), &writer));
 std::shared_ptr<ipc::RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 ipc::RecordBatchFileWriter::Open(out_file.get(), reader->schema(), &writer));

 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> batch;
Expand All@@ -96,8 +97,8 @@ static Status ConvertArrowToJson(
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &in_file));
 RETURN_NOT_OK(io::FileOutputStream::Open(json_path, &out_file));

 std::shared_ptr<ipc::FileReader> reader;
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 std::shared_ptr<ipc::RecordBatchFileReader> reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 if (FLAGS_verbose) {
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
Expand DownExpand Up@@ -137,8 +138,8 @@ static Status ValidateArrowVsJson(
 std::shared_ptr<io::ReadableFile> arrow_file;
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &arrow_file));

 std::shared_ptr<ipc::FileReader> arrow_reader;
 RETURN_NOT_OK(ipc::FileReader::Open(arrow_file, &arrow_reader));
 std::shared_ptr<ipc::RecordBatchFileReader> arrow_reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(arrow_file, &arrow_reader));

 auto json_schema = json_reader->schema();
 auto arrow_schema = arrow_reader->schema();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
5
commits into

from

 Closed


ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes
#679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
10837a6

Add abstract stream writer and reader C++ APIs. Rename record batch s…


wesm May 12, 2017
22346d4

Fix unit tests


wesm May 13, 2017
04fa285

Feedback on ipc reader/writer names. Add open_stream/open_file Python…


wesm May 13, 2017
a797ee3

Fix glib


wesm May 13, 2017
d7b7c9c

Add missing dtors for pimpl pattern


wesm May 13, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
c_glib/arrow-glib/stream-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamReaderPrivate_ {
 std::shared_ptr<arrow::ipc::StreamReader> stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> stream_reader;
} GArrowStreamReaderPrivate;

enum {
Expand DownExpand Up@@ -85,7 +85,7 @@ garrow_stream_reader_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_READER:
 priv->stream_reader =
 *static_cast<std::shared_ptr<arrow::ipc::StreamReader> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -124,8 +124,8 @@ garrow_stream_reader_class_init(GArrowStreamReaderClass *klass)
 gobject_class->get_property = garrow_stream_reader_get_property;

 spec = g_param_spec_pointer("stream-reader",
 "ipc::StreamReader",
 "The raw std::shared<arrow::ipc::StreamReader> *",
 "ipc::RecordBatchStreamReader",
 "The raw std::shared<arrow::ipc::RecordBatchStreamReader> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_READER, spec);
Expand All@@ -143,10 +143,10 @@ GArrowStreamReader *
garrow_stream_reader_new(GArrowInputStream *stream,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamReader> arrow_stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> arrow_stream_reader;
 auto status =
 arrow::ipc::StreamReader::Open(garrow_input_stream_get_raw(stream),
 &arrow_stream_reader);
 arrow::ipc::RecordBatchStreamReader::Open(garrow_input_stream_get_raw(stream),
&arrow_stream_reader);
 if (garrow_error_check(error, status, "[ipc][stream-reader][open]")) {
 return garrow_stream_reader_new_raw(&arrow_stream_reader);
 } else {
Expand DownExpand Up@@ -179,7 +179,7 @@ garrow_stream_reader_get_schema(GArrowStreamReader *stream_reader)
 */
GArrowRecordBatch *
garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
GError **error)
 GError **error)
{
 auto arrow_stream_reader =
 garrow_stream_reader_get_raw(stream_reader);
Expand All@@ -202,7 +202,7 @@ garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
G_END_DECLS

GArrowStreamReader *
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader)
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader)
{
 auto stream_reader =
 GARROW_STREAM_READER(g_object_new(GARROW_TYPE_STREAM_READER,
Expand All@@ -211,7 +211,7 @@ garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_st
 return stream_reader;
}

std::shared_ptr<arrow::ipc::StreamReader>
std::shared_ptr<arrow::ipc::RecordBatchStreamReader>
garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader)
{
 GArrowStreamReaderPrivate *priv;
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/stream-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ typedef struct _GArrowStreamReaderClass GArrowStreamReaderClass;
/**
 * GArrowStreamReader:
 *
 * It wraps `arrow::ipc::StreamReader`.
 * It wraps `arrow::ipc::InputStreamReader`.
 */
struct _GArrowStreamReader
{
Expand Down

4 changes: 2 additions & 2 deletions
c_glib/arrow-glib/stream-reader.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,5 @@

#include <arrow-glib/stream-reader.h>

GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::StreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);
GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);

16 changes: 8 additions & 8 deletions
c_glib/arrow-glib/writer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamWriterPrivate_ {
 std::shared_ptr<arrow::ipc::StreamWriter> stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> stream_writer;
} GArrowStreamWriterPrivate;

enum {
Expand DownExpand Up@@ -89,7 +89,7 @@ garrow_stream_writer_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_WRITER:
 priv->stream_writer =
 *static_cast<std::shared_ptr<arrow::ipc::StreamWriter> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -128,8 +128,8 @@ garrow_stream_writer_class_init(GArrowStreamWriterClass *klass)
 gobject_class->get_property = garrow_stream_writer_get_property;

 spec = g_param_spec_pointer("stream-writer",
 "ipc::StreamWriter",
 "The raw std::shared<arrow::ipc::StreamWriter> *",
 "ipc::RecordBatchStreamWriter",
 "The raw std::shared<arrow::ipc::RecordBatchStreamWriter> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_WRITER, spec);
Expand All@@ -149,11 +149,11 @@ garrow_stream_writer_new(GArrowOutputStream *sink,
 GArrowSchema *schema,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamWriter> arrow_stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> arrow_stream_writer;
 auto status =
 arrow::ipc::StreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
 garrow_schema_get_raw(schema),
 &arrow_stream_writer);
 arrow::ipc::RecordBatchStreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
garrow_schema_get_raw(schema),
&arrow_stream_writer);
 if (garrow_error_check(error, status, "[ipc][stream-writer][open]")) {
 return garrow_stream_writer_new_raw(&arrow_stream_writer);
 } else {
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/writer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ typedef struct _GArrowStreamWriterClass GArrowStreamWriterClass;
/**
 * GArrowStreamWriter:
 *
 * It wraps `arrow::ipc::StreamWriter`.
 * It wraps `arrow::ipc::RecordBatchStreamWriter`.
 */
struct _GArrowStreamWriter
{
Expand Down

8 changes: 4 additions & 4 deletions
c_glib/arrow-glib/writer.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,8 +24,8 @@

#include <arrow-glib/writer.h>

GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::StreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::StreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);
GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);

GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::FileWriter> *arrow_file_writer);
arrow::ipc::FileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);
GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchFileWriter> *arrow_file_writer);
arrow::ipc::RecordBatchFileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);

2 changes: 2 additions & 0 deletions
ci/travis_before_script_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,10 +38,12 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
 cmake -DARROW_TEST_MEMCHECK=on \
 $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS="-Wconversion -Werror" \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
else
 cmake $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS=-Werror \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
fi

Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 "Build the Arrow micro benchmarks"
 OFF)

 option(ARROW_NO_DEPRECATED_API
 "Exclude deprecated APIs from build"
 OFF)

 option(ARROW_IPC
 "Build the Arrow IPC extensions"
 ON)
Expand DownExpand Up@@ -154,6 +158,10 @@ include(BuildUtils)

include(SetupCxxFlags)

if (ARROW_NO_DEPRECATED_API)
 add_definitions(-DARROW_NO_DEPRECATED_API)
endif()

# Add common flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_COMMON_FLAGS}")
set(EP_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Expand Down

12 changes: 7 additions & 5 deletions
cpp/src/arrow/ipc/file-to-stream.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,18 +24,19 @@
#include "arrow/util/io-util.h"

namespace arrow {
namespace ipc {

// Reads a file on the file system and prints to stdout the stream version of it.
Status ConvertToStream(const char* path) {
 std::shared_ptr<io::ReadableFile> in_file;
 std::shared_ptr<ipc::FileReader> reader;
 std::shared_ptr<RecordBatchFileReader> reader;

 RETURN_NOT_OK(io::ReadableFile::Open(path, &in_file));
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 io::StdoutStream sink;
 std::shared_ptr<ipc::StreamWriter> writer;
 RETURN_NOT_OK(ipc::StreamWriter::Open(&sink, reader->schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(&sink, reader->schema(), &writer));
 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> chunk;
 RETURN_NOT_OK(reader->GetRecordBatch(i, &chunk));
Expand All@@ -44,14 +45,15 @@ Status ConvertToStream(const char* path) {
 return writer->Close();
}

} // namespace ipc
} // namespace arrow

int main(int argc, char** argv) {
 if (argc != 2) {
 std::cerr << "Usage: file-to-stream <input arrow file>" << std::endl;
 return 1;
 }
 arrow::Status status = arrow::ConvertToStream(argv[1]);
 arrow::Status status = arrow::ipc::ConvertToStream(argv[1]);
 if (!status.ok()) {
 std::cerr << "Could not convert to stream: " << status.ToString() << std::endl;
 return 1;
Expand Down

25 changes: 13 additions & 12 deletions
cpp/src/arrow/ipc/ipc-read-write-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,16 +140,16 @@ class IpcTestFixture : public io::MemoryMapFixture {
 if (zero_data) { RETURN_NOT_OK(ZeroMemoryMap(mmap_.get())); }
 RETURN_NOT_OK(mmap_->Seek(0));

 std::shared_ptr<FileWriter> file_writer;
 RETURN_NOT_OK(FileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 std::shared_ptr<RecordBatchFileWriter> file_writer;
 RETURN_NOT_OK(RecordBatchFileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 RETURN_NOT_OK(file_writer->WriteRecordBatch(batch, true));
 RETURN_NOT_OK(file_writer->Close());

 int64_t offset;
 RETURN_NOT_OK(mmap_->Tell(&offset));

 std::shared_ptr<FileReader> file_reader;
 RETURN_NOT_OK(FileReader::Open(mmap_, offset, &file_reader));
 std::shared_ptr<RecordBatchFileReader> file_reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(mmap_, offset, &file_reader));

 return file_reader->GetRecordBatch(0, result);
 }
Expand DownExpand Up@@ -487,8 +487,9 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 Status RoundTripHelper(const BatchVector& in_batches, BatchVector* out_batches) {
 // Write the file
 std::shared_ptr<FileWriter> writer;
 RETURN_NOT_OK(FileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));
 std::shared_ptr<RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 RecordBatchFileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));

 const int num_batches = static_cast<int>(in_batches.size());

Expand All@@ -504,8 +505,8 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);
 std::shared_ptr<FileReader> reader;
 RETURN_NOT_OK(FileReader::Open(buf_reader, footer_offset, &reader));
 std::shared_ptr<RecordBatchFileReader> reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(buf_reader, footer_offset, &reader));

 EXPECT_EQ(num_batches, reader->num_record_batches());
 for (int i = 0; i < num_batches; ++i) {
Expand DownExpand Up@@ -553,8 +554,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 Status RoundTripHelper(
 const RecordBatch& batch, std::vector<std::shared_ptr<RecordBatch>>* out_batches) {
 // Write the file
 std::shared_ptr<StreamWriter> writer;
 RETURN_NOT_OK(StreamWriter::Open(sink_.get(), batch.schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(sink_.get(), batch.schema(), &writer));
 int num_batches = 5;
 for (int i = 0; i < num_batches; ++i) {
 RETURN_NOT_OK(writer->WriteRecordBatch(batch));
Expand All@@ -565,8 +566,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);

 std::shared_ptr<StreamReader> reader;
 RETURN_NOT_OK(StreamReader::Open(buf_reader, &reader));
 std::shared_ptr<RecordBatchStreamReader> reader;
 RETURN_NOT_OK(RecordBatchStreamReader::Open(buf_reader, &reader));

 std::shared_ptr<RecordBatch> chunk;
 while (true) {
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/arrow/ipc/json-integration-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,9 @@ static Status ConvertJsonToArrow(
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
 }

 std::shared_ptr<ipc::FileWriter> writer;
 RETURN_NOT_OK(ipc::FileWriter::Open(out_file.get(), reader->schema(), &writer));
 std::shared_ptr<ipc::RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 ipc::RecordBatchFileWriter::Open(out_file.get(), reader->schema(), &writer));

 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> batch;
Expand All@@ -96,8 +97,8 @@ static Status ConvertArrowToJson(
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &in_file));
 RETURN_NOT_OK(io::FileOutputStream::Open(json_path, &out_file));

 std::shared_ptr<ipc::FileReader> reader;
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 std::shared_ptr<ipc::RecordBatchFileReader> reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 if (FLAGS_verbose) {
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
Expand DownExpand Up@@ -137,8 +138,8 @@ static Status ValidateArrowVsJson(
 std::shared_ptr<io::ReadableFile> arrow_file;
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &arrow_file));

 std::shared_ptr<ipc::FileReader> arrow_reader;
 RETURN_NOT_OK(ipc::FileReader::Open(arrow_file, &arrow_reader));
 std::shared_ptr<ipc::RecordBatchFileReader> arrow_reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(arrow_file, &arrow_reader));

 auto json_schema = json_reader->schema();
 auto arrow_schema = arrow_reader->schema();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
5
commits into

from

 Closed


ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes
#679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
10837a6

Add abstract stream writer and reader C++ APIs. Rename record batch s…


wesm May 12, 2017
22346d4

Fix unit tests


wesm May 13, 2017
04fa285

Feedback on ipc reader/writer names. Add open_stream/open_file Python…


wesm May 13, 2017
a797ee3

Fix glib


wesm May 13, 2017
d7b7c9c

Add missing dtors for pimpl pattern


wesm May 13, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
c_glib/arrow-glib/stream-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamReaderPrivate_ {
 std::shared_ptr<arrow::ipc::StreamReader> stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> stream_reader;
} GArrowStreamReaderPrivate;

enum {
Expand DownExpand Up@@ -85,7 +85,7 @@ garrow_stream_reader_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_READER:
 priv->stream_reader =
 *static_cast<std::shared_ptr<arrow::ipc::StreamReader> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -124,8 +124,8 @@ garrow_stream_reader_class_init(GArrowStreamReaderClass *klass)
 gobject_class->get_property = garrow_stream_reader_get_property;

 spec = g_param_spec_pointer("stream-reader",
 "ipc::StreamReader",
 "The raw std::shared<arrow::ipc::StreamReader> *",
 "ipc::RecordBatchStreamReader",
 "The raw std::shared<arrow::ipc::RecordBatchStreamReader> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_READER, spec);
Expand All@@ -143,10 +143,10 @@ GArrowStreamReader *
garrow_stream_reader_new(GArrowInputStream *stream,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamReader> arrow_stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> arrow_stream_reader;
 auto status =
 arrow::ipc::StreamReader::Open(garrow_input_stream_get_raw(stream),
 &arrow_stream_reader);
 arrow::ipc::RecordBatchStreamReader::Open(garrow_input_stream_get_raw(stream),
&arrow_stream_reader);
 if (garrow_error_check(error, status, "[ipc][stream-reader][open]")) {
 return garrow_stream_reader_new_raw(&arrow_stream_reader);
 } else {
Expand DownExpand Up@@ -179,7 +179,7 @@ garrow_stream_reader_get_schema(GArrowStreamReader *stream_reader)
 */
GArrowRecordBatch *
garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
GError **error)
 GError **error)
{
 auto arrow_stream_reader =
 garrow_stream_reader_get_raw(stream_reader);
Expand All@@ -202,7 +202,7 @@ garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
G_END_DECLS

GArrowStreamReader *
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader)
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader)
{
 auto stream_reader =
 GARROW_STREAM_READER(g_object_new(GARROW_TYPE_STREAM_READER,
Expand All@@ -211,7 +211,7 @@ garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_st
 return stream_reader;
}

std::shared_ptr<arrow::ipc::StreamReader>
std::shared_ptr<arrow::ipc::RecordBatchStreamReader>
garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader)
{
 GArrowStreamReaderPrivate *priv;
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/stream-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ typedef struct _GArrowStreamReaderClass GArrowStreamReaderClass;
/**
 * GArrowStreamReader:
 *
 * It wraps `arrow::ipc::StreamReader`.
 * It wraps `arrow::ipc::InputStreamReader`.
 */
struct _GArrowStreamReader
{
Expand Down

4 changes: 2 additions & 2 deletions
c_glib/arrow-glib/stream-reader.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,5 @@

#include <arrow-glib/stream-reader.h>

GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::StreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);
GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);

16 changes: 8 additions & 8 deletions
c_glib/arrow-glib/writer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamWriterPrivate_ {
 std::shared_ptr<arrow::ipc::StreamWriter> stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> stream_writer;
} GArrowStreamWriterPrivate;

enum {
Expand DownExpand Up@@ -89,7 +89,7 @@ garrow_stream_writer_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_WRITER:
 priv->stream_writer =
 *static_cast<std::shared_ptr<arrow::ipc::StreamWriter> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -128,8 +128,8 @@ garrow_stream_writer_class_init(GArrowStreamWriterClass *klass)
 gobject_class->get_property = garrow_stream_writer_get_property;

 spec = g_param_spec_pointer("stream-writer",
 "ipc::StreamWriter",
 "The raw std::shared<arrow::ipc::StreamWriter> *",
 "ipc::RecordBatchStreamWriter",
 "The raw std::shared<arrow::ipc::RecordBatchStreamWriter> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_WRITER, spec);
Expand All@@ -149,11 +149,11 @@ garrow_stream_writer_new(GArrowOutputStream *sink,
 GArrowSchema *schema,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamWriter> arrow_stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> arrow_stream_writer;
 auto status =
 arrow::ipc::StreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
 garrow_schema_get_raw(schema),
 &arrow_stream_writer);
 arrow::ipc::RecordBatchStreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
garrow_schema_get_raw(schema),
&arrow_stream_writer);
 if (garrow_error_check(error, status, "[ipc][stream-writer][open]")) {
 return garrow_stream_writer_new_raw(&arrow_stream_writer);
 } else {
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/writer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ typedef struct _GArrowStreamWriterClass GArrowStreamWriterClass;
/**
 * GArrowStreamWriter:
 *
 * It wraps `arrow::ipc::StreamWriter`.
 * It wraps `arrow::ipc::RecordBatchStreamWriter`.
 */
struct _GArrowStreamWriter
{
Expand Down

8 changes: 4 additions & 4 deletions
c_glib/arrow-glib/writer.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,8 +24,8 @@

#include <arrow-glib/writer.h>

GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::StreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::StreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);
GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);

GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::FileWriter> *arrow_file_writer);
arrow::ipc::FileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);
GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchFileWriter> *arrow_file_writer);
arrow::ipc::RecordBatchFileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);

2 changes: 2 additions & 0 deletions
ci/travis_before_script_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,10 +38,12 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
 cmake -DARROW_TEST_MEMCHECK=on \
 $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS="-Wconversion -Werror" \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
else
 cmake $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS=-Werror \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
fi

Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 "Build the Arrow micro benchmarks"
 OFF)

 option(ARROW_NO_DEPRECATED_API
 "Exclude deprecated APIs from build"
 OFF)

 option(ARROW_IPC
 "Build the Arrow IPC extensions"
 ON)
Expand DownExpand Up@@ -154,6 +158,10 @@ include(BuildUtils)

include(SetupCxxFlags)

if (ARROW_NO_DEPRECATED_API)
 add_definitions(-DARROW_NO_DEPRECATED_API)
endif()

# Add common flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_COMMON_FLAGS}")
set(EP_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Expand Down

12 changes: 7 additions & 5 deletions
cpp/src/arrow/ipc/file-to-stream.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,18 +24,19 @@
#include "arrow/util/io-util.h"

namespace arrow {
namespace ipc {

// Reads a file on the file system and prints to stdout the stream version of it.
Status ConvertToStream(const char* path) {
 std::shared_ptr<io::ReadableFile> in_file;
 std::shared_ptr<ipc::FileReader> reader;
 std::shared_ptr<RecordBatchFileReader> reader;

 RETURN_NOT_OK(io::ReadableFile::Open(path, &in_file));
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 io::StdoutStream sink;
 std::shared_ptr<ipc::StreamWriter> writer;
 RETURN_NOT_OK(ipc::StreamWriter::Open(&sink, reader->schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(&sink, reader->schema(), &writer));
 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> chunk;
 RETURN_NOT_OK(reader->GetRecordBatch(i, &chunk));
Expand All@@ -44,14 +45,15 @@ Status ConvertToStream(const char* path) {
 return writer->Close();
}

} // namespace ipc
} // namespace arrow

int main(int argc, char** argv) {
 if (argc != 2) {
 std::cerr << "Usage: file-to-stream <input arrow file>" << std::endl;
 return 1;
 }
 arrow::Status status = arrow::ConvertToStream(argv[1]);
 arrow::Status status = arrow::ipc::ConvertToStream(argv[1]);
 if (!status.ok()) {
 std::cerr << "Could not convert to stream: " << status.ToString() << std::endl;
 return 1;
Expand Down

25 changes: 13 additions & 12 deletions
cpp/src/arrow/ipc/ipc-read-write-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,16 +140,16 @@ class IpcTestFixture : public io::MemoryMapFixture {
 if (zero_data) { RETURN_NOT_OK(ZeroMemoryMap(mmap_.get())); }
 RETURN_NOT_OK(mmap_->Seek(0));

 std::shared_ptr<FileWriter> file_writer;
 RETURN_NOT_OK(FileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 std::shared_ptr<RecordBatchFileWriter> file_writer;
 RETURN_NOT_OK(RecordBatchFileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 RETURN_NOT_OK(file_writer->WriteRecordBatch(batch, true));
 RETURN_NOT_OK(file_writer->Close());

 int64_t offset;
 RETURN_NOT_OK(mmap_->Tell(&offset));

 std::shared_ptr<FileReader> file_reader;
 RETURN_NOT_OK(FileReader::Open(mmap_, offset, &file_reader));
 std::shared_ptr<RecordBatchFileReader> file_reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(mmap_, offset, &file_reader));

 return file_reader->GetRecordBatch(0, result);
 }
Expand DownExpand Up@@ -487,8 +487,9 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 Status RoundTripHelper(const BatchVector& in_batches, BatchVector* out_batches) {
 // Write the file
 std::shared_ptr<FileWriter> writer;
 RETURN_NOT_OK(FileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));
 std::shared_ptr<RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 RecordBatchFileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));

 const int num_batches = static_cast<int>(in_batches.size());

Expand All@@ -504,8 +505,8 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);
 std::shared_ptr<FileReader> reader;
 RETURN_NOT_OK(FileReader::Open(buf_reader, footer_offset, &reader));
 std::shared_ptr<RecordBatchFileReader> reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(buf_reader, footer_offset, &reader));

 EXPECT_EQ(num_batches, reader->num_record_batches());
 for (int i = 0; i < num_batches; ++i) {
Expand DownExpand Up@@ -553,8 +554,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 Status RoundTripHelper(
 const RecordBatch& batch, std::vector<std::shared_ptr<RecordBatch>>* out_batches) {
 // Write the file
 std::shared_ptr<StreamWriter> writer;
 RETURN_NOT_OK(StreamWriter::Open(sink_.get(), batch.schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(sink_.get(), batch.schema(), &writer));
 int num_batches = 5;
 for (int i = 0; i < num_batches; ++i) {
 RETURN_NOT_OK(writer->WriteRecordBatch(batch));
Expand All@@ -565,8 +566,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);

 std::shared_ptr<StreamReader> reader;
 RETURN_NOT_OK(StreamReader::Open(buf_reader, &reader));
 std::shared_ptr<RecordBatchStreamReader> reader;
 RETURN_NOT_OK(RecordBatchStreamReader::Open(buf_reader, &reader));

 std::shared_ptr<RecordBatch> chunk;
 while (true) {
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/arrow/ipc/json-integration-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,9 @@ static Status ConvertJsonToArrow(
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
 }

 std::shared_ptr<ipc::FileWriter> writer;
 RETURN_NOT_OK(ipc::FileWriter::Open(out_file.get(), reader->schema(), &writer));
 std::shared_ptr<ipc::RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 ipc::RecordBatchFileWriter::Open(out_file.get(), reader->schema(), &writer));

 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> batch;
Expand All@@ -96,8 +97,8 @@ static Status ConvertArrowToJson(
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &in_file));
 RETURN_NOT_OK(io::FileOutputStream::Open(json_path, &out_file));

 std::shared_ptr<ipc::FileReader> reader;
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 std::shared_ptr<ipc::RecordBatchFileReader> reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 if (FLAGS_verbose) {
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
Expand DownExpand Up@@ -137,8 +138,8 @@ static Status ValidateArrowVsJson(
 std::shared_ptr<io::ReadableFile> arrow_file;
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &arrow_file));

 std::shared_ptr<ipc::FileReader> arrow_reader;
 RETURN_NOT_OK(ipc::FileReader::Open(arrow_file, &arrow_reader));
 std::shared_ptr<ipc::RecordBatchFileReader> arrow_reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(arrow_file, &arrow_reader));

 auto json_schema = json_reader->schema();
 auto arrow_schema = arrow_reader->schema();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
5
commits into

from

 Closed


ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes
#679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
10837a6

Add abstract stream writer and reader C++ APIs. Rename record batch s…


wesm May 12, 2017
22346d4

Fix unit tests


wesm May 13, 2017
04fa285

Feedback on ipc reader/writer names. Add open_stream/open_file Python…


wesm May 13, 2017
a797ee3

Fix glib


wesm May 13, 2017
d7b7c9c

Add missing dtors for pimpl pattern


wesm May 13, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
c_glib/arrow-glib/stream-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamReaderPrivate_ {
 std::shared_ptr<arrow::ipc::StreamReader> stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> stream_reader;
} GArrowStreamReaderPrivate;

enum {
Expand DownExpand Up@@ -85,7 +85,7 @@ garrow_stream_reader_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_READER:
 priv->stream_reader =
 *static_cast<std::shared_ptr<arrow::ipc::StreamReader> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -124,8 +124,8 @@ garrow_stream_reader_class_init(GArrowStreamReaderClass *klass)
 gobject_class->get_property = garrow_stream_reader_get_property;

 spec = g_param_spec_pointer("stream-reader",
 "ipc::StreamReader",
 "The raw std::shared<arrow::ipc::StreamReader> *",
 "ipc::RecordBatchStreamReader",
 "The raw std::shared<arrow::ipc::RecordBatchStreamReader> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_READER, spec);
Expand All@@ -143,10 +143,10 @@ GArrowStreamReader *
garrow_stream_reader_new(GArrowInputStream *stream,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamReader> arrow_stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> arrow_stream_reader;
 auto status =
 arrow::ipc::StreamReader::Open(garrow_input_stream_get_raw(stream),
 &arrow_stream_reader);
 arrow::ipc::RecordBatchStreamReader::Open(garrow_input_stream_get_raw(stream),
&arrow_stream_reader);
 if (garrow_error_check(error, status, "[ipc][stream-reader][open]")) {
 return garrow_stream_reader_new_raw(&arrow_stream_reader);
 } else {
Expand DownExpand Up@@ -179,7 +179,7 @@ garrow_stream_reader_get_schema(GArrowStreamReader *stream_reader)
 */
GArrowRecordBatch *
garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
GError **error)
 GError **error)
{
 auto arrow_stream_reader =
 garrow_stream_reader_get_raw(stream_reader);
Expand All@@ -202,7 +202,7 @@ garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
G_END_DECLS

GArrowStreamReader *
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader)
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader)
{
 auto stream_reader =
 GARROW_STREAM_READER(g_object_new(GARROW_TYPE_STREAM_READER,
Expand All@@ -211,7 +211,7 @@ garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_st
 return stream_reader;
}

std::shared_ptr<arrow::ipc::StreamReader>
std::shared_ptr<arrow::ipc::RecordBatchStreamReader>
garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader)
{
 GArrowStreamReaderPrivate *priv;
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/stream-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ typedef struct _GArrowStreamReaderClass GArrowStreamReaderClass;
/**
 * GArrowStreamReader:
 *
 * It wraps `arrow::ipc::StreamReader`.
 * It wraps `arrow::ipc::InputStreamReader`.
 */
struct _GArrowStreamReader
{
Expand Down

4 changes: 2 additions & 2 deletions
c_glib/arrow-glib/stream-reader.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,5 @@

#include <arrow-glib/stream-reader.h>

GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::StreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);
GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);

16 changes: 8 additions & 8 deletions
c_glib/arrow-glib/writer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamWriterPrivate_ {
 std::shared_ptr<arrow::ipc::StreamWriter> stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> stream_writer;
} GArrowStreamWriterPrivate;

enum {
Expand DownExpand Up@@ -89,7 +89,7 @@ garrow_stream_writer_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_WRITER:
 priv->stream_writer =
 *static_cast<std::shared_ptr<arrow::ipc::StreamWriter> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -128,8 +128,8 @@ garrow_stream_writer_class_init(GArrowStreamWriterClass *klass)
 gobject_class->get_property = garrow_stream_writer_get_property;

 spec = g_param_spec_pointer("stream-writer",
 "ipc::StreamWriter",
 "The raw std::shared<arrow::ipc::StreamWriter> *",
 "ipc::RecordBatchStreamWriter",
 "The raw std::shared<arrow::ipc::RecordBatchStreamWriter> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_WRITER, spec);
Expand All@@ -149,11 +149,11 @@ garrow_stream_writer_new(GArrowOutputStream *sink,
 GArrowSchema *schema,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamWriter> arrow_stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> arrow_stream_writer;
 auto status =
 arrow::ipc::StreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
 garrow_schema_get_raw(schema),
 &arrow_stream_writer);
 arrow::ipc::RecordBatchStreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
garrow_schema_get_raw(schema),
&arrow_stream_writer);
 if (garrow_error_check(error, status, "[ipc][stream-writer][open]")) {
 return garrow_stream_writer_new_raw(&arrow_stream_writer);
 } else {
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/writer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ typedef struct _GArrowStreamWriterClass GArrowStreamWriterClass;
/**
 * GArrowStreamWriter:
 *
 * It wraps `arrow::ipc::StreamWriter`.
 * It wraps `arrow::ipc::RecordBatchStreamWriter`.
 */
struct _GArrowStreamWriter
{
Expand Down

8 changes: 4 additions & 4 deletions
c_glib/arrow-glib/writer.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,8 +24,8 @@

#include <arrow-glib/writer.h>

GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::StreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::StreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);
GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);

GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::FileWriter> *arrow_file_writer);
arrow::ipc::FileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);
GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchFileWriter> *arrow_file_writer);
arrow::ipc::RecordBatchFileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);

2 changes: 2 additions & 0 deletions
ci/travis_before_script_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,10 +38,12 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
 cmake -DARROW_TEST_MEMCHECK=on \
 $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS="-Wconversion -Werror" \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
else
 cmake $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS=-Werror \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
fi

Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 "Build the Arrow micro benchmarks"
 OFF)

 option(ARROW_NO_DEPRECATED_API
 "Exclude deprecated APIs from build"
 OFF)

 option(ARROW_IPC
 "Build the Arrow IPC extensions"
 ON)
Expand DownExpand Up@@ -154,6 +158,10 @@ include(BuildUtils)

include(SetupCxxFlags)

if (ARROW_NO_DEPRECATED_API)
 add_definitions(-DARROW_NO_DEPRECATED_API)
endif()

# Add common flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_COMMON_FLAGS}")
set(EP_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Expand Down

12 changes: 7 additions & 5 deletions
cpp/src/arrow/ipc/file-to-stream.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,18 +24,19 @@
#include "arrow/util/io-util.h"

namespace arrow {
namespace ipc {

// Reads a file on the file system and prints to stdout the stream version of it.
Status ConvertToStream(const char* path) {
 std::shared_ptr<io::ReadableFile> in_file;
 std::shared_ptr<ipc::FileReader> reader;
 std::shared_ptr<RecordBatchFileReader> reader;

 RETURN_NOT_OK(io::ReadableFile::Open(path, &in_file));
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 io::StdoutStream sink;
 std::shared_ptr<ipc::StreamWriter> writer;
 RETURN_NOT_OK(ipc::StreamWriter::Open(&sink, reader->schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(&sink, reader->schema(), &writer));
 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> chunk;
 RETURN_NOT_OK(reader->GetRecordBatch(i, &chunk));
Expand All@@ -44,14 +45,15 @@ Status ConvertToStream(const char* path) {
 return writer->Close();
}

} // namespace ipc
} // namespace arrow

int main(int argc, char** argv) {
 if (argc != 2) {
 std::cerr << "Usage: file-to-stream <input arrow file>" << std::endl;
 return 1;
 }
 arrow::Status status = arrow::ConvertToStream(argv[1]);
 arrow::Status status = arrow::ipc::ConvertToStream(argv[1]);
 if (!status.ok()) {
 std::cerr << "Could not convert to stream: " << status.ToString() << std::endl;
 return 1;
Expand Down

25 changes: 13 additions & 12 deletions
cpp/src/arrow/ipc/ipc-read-write-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,16 +140,16 @@ class IpcTestFixture : public io::MemoryMapFixture {
 if (zero_data) { RETURN_NOT_OK(ZeroMemoryMap(mmap_.get())); }
 RETURN_NOT_OK(mmap_->Seek(0));

 std::shared_ptr<FileWriter> file_writer;
 RETURN_NOT_OK(FileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 std::shared_ptr<RecordBatchFileWriter> file_writer;
 RETURN_NOT_OK(RecordBatchFileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 RETURN_NOT_OK(file_writer->WriteRecordBatch(batch, true));
 RETURN_NOT_OK(file_writer->Close());

 int64_t offset;
 RETURN_NOT_OK(mmap_->Tell(&offset));

 std::shared_ptr<FileReader> file_reader;
 RETURN_NOT_OK(FileReader::Open(mmap_, offset, &file_reader));
 std::shared_ptr<RecordBatchFileReader> file_reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(mmap_, offset, &file_reader));

 return file_reader->GetRecordBatch(0, result);
 }
Expand DownExpand Up@@ -487,8 +487,9 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 Status RoundTripHelper(const BatchVector& in_batches, BatchVector* out_batches) {
 // Write the file
 std::shared_ptr<FileWriter> writer;
 RETURN_NOT_OK(FileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));
 std::shared_ptr<RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 RecordBatchFileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));

 const int num_batches = static_cast<int>(in_batches.size());

Expand All@@ -504,8 +505,8 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);
 std::shared_ptr<FileReader> reader;
 RETURN_NOT_OK(FileReader::Open(buf_reader, footer_offset, &reader));
 std::shared_ptr<RecordBatchFileReader> reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(buf_reader, footer_offset, &reader));

 EXPECT_EQ(num_batches, reader->num_record_batches());
 for (int i = 0; i < num_batches; ++i) {
Expand DownExpand Up@@ -553,8 +554,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 Status RoundTripHelper(
 const RecordBatch& batch, std::vector<std::shared_ptr<RecordBatch>>* out_batches) {
 // Write the file
 std::shared_ptr<StreamWriter> writer;
 RETURN_NOT_OK(StreamWriter::Open(sink_.get(), batch.schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(sink_.get(), batch.schema(), &writer));
 int num_batches = 5;
 for (int i = 0; i < num_batches; ++i) {
 RETURN_NOT_OK(writer->WriteRecordBatch(batch));
Expand All@@ -565,8 +566,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);

 std::shared_ptr<StreamReader> reader;
 RETURN_NOT_OK(StreamReader::Open(buf_reader, &reader));
 std::shared_ptr<RecordBatchStreamReader> reader;
 RETURN_NOT_OK(RecordBatchStreamReader::Open(buf_reader, &reader));

 std::shared_ptr<RecordBatch> chunk;
 while (true) {
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/arrow/ipc/json-integration-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,9 @@ static Status ConvertJsonToArrow(
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
 }

 std::shared_ptr<ipc::FileWriter> writer;
 RETURN_NOT_OK(ipc::FileWriter::Open(out_file.get(), reader->schema(), &writer));
 std::shared_ptr<ipc::RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 ipc::RecordBatchFileWriter::Open(out_file.get(), reader->schema(), &writer));

 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> batch;
Expand All@@ -96,8 +97,8 @@ static Status ConvertArrowToJson(
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &in_file));
 RETURN_NOT_OK(io::FileOutputStream::Open(json_path, &out_file));

 std::shared_ptr<ipc::FileReader> reader;
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 std::shared_ptr<ipc::RecordBatchFileReader> reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 if (FLAGS_verbose) {
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
Expand DownExpand Up@@ -137,8 +138,8 @@ static Status ValidateArrowVsJson(
 std::shared_ptr<io::ReadableFile> arrow_file;
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &arrow_file));

 std::shared_ptr<ipc::FileReader> arrow_reader;
 RETURN_NOT_OK(ipc::FileReader::Open(arrow_file, &arrow_reader));
 std::shared_ptr<ipc::RecordBatchFileReader> arrow_reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(arrow_file, &arrow_reader));

 auto json_schema = json_reader->schema();
 auto arrow_schema = arrow_reader->schema();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
5
commits into

from

 Closed


ARROW-1008: [C++] Add abstract stream writer and reader C++ APIs. Give clearer names to IPC reader/writer classes
#679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
10837a6

Add abstract stream writer and reader C++ APIs. Rename record batch s…


wesm May 12, 2017
22346d4

Fix unit tests


wesm May 13, 2017
04fa285

Feedback on ipc reader/writer names. Add open_stream/open_file Python…


wesm May 13, 2017
a797ee3

Fix glib


wesm May 13, 2017
d7b7c9c

Add missing dtors for pimpl pattern


wesm May 13, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
c_glib/arrow-glib/stream-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamReaderPrivate_ {
 std::shared_ptr<arrow::ipc::StreamReader> stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> stream_reader;
} GArrowStreamReaderPrivate;

enum {
Expand DownExpand Up@@ -85,7 +85,7 @@ garrow_stream_reader_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_READER:
 priv->stream_reader =
 *static_cast<std::shared_ptr<arrow::ipc::StreamReader> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -124,8 +124,8 @@ garrow_stream_reader_class_init(GArrowStreamReaderClass *klass)
 gobject_class->get_property = garrow_stream_reader_get_property;

 spec = g_param_spec_pointer("stream-reader",
 "ipc::StreamReader",
 "The raw std::shared<arrow::ipc::StreamReader> *",
 "ipc::RecordBatchStreamReader",
 "The raw std::shared<arrow::ipc::RecordBatchStreamReader> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_READER, spec);
Expand All@@ -143,10 +143,10 @@ GArrowStreamReader *
garrow_stream_reader_new(GArrowInputStream *stream,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamReader> arrow_stream_reader;
 std::shared_ptr<arrow::ipc::RecordBatchStreamReader> arrow_stream_reader;
 auto status =
 arrow::ipc::StreamReader::Open(garrow_input_stream_get_raw(stream),
 &arrow_stream_reader);
 arrow::ipc::RecordBatchStreamReader::Open(garrow_input_stream_get_raw(stream),
&arrow_stream_reader);
 if (garrow_error_check(error, status, "[ipc][stream-reader][open]")) {
 return garrow_stream_reader_new_raw(&arrow_stream_reader);
 } else {
Expand DownExpand Up@@ -179,7 +179,7 @@ garrow_stream_reader_get_schema(GArrowStreamReader *stream_reader)
 */
GArrowRecordBatch *
garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
GError **error)
 GError **error)
{
 auto arrow_stream_reader =
 garrow_stream_reader_get_raw(stream_reader);
Expand All@@ -202,7 +202,7 @@ garrow_stream_reader_get_next_record_batch(GArrowStreamReader *stream_reader,
G_END_DECLS

GArrowStreamReader *
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader)
garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader)
{
 auto stream_reader =
 GARROW_STREAM_READER(g_object_new(GARROW_TYPE_STREAM_READER,
Expand All@@ -211,7 +211,7 @@ garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_st
 return stream_reader;
}

std::shared_ptr<arrow::ipc::StreamReader>
std::shared_ptr<arrow::ipc::RecordBatchStreamReader>
garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader)
{
 GArrowStreamReaderPrivate *priv;
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/stream-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,7 @@ typedef struct _GArrowStreamReaderClass GArrowStreamReaderClass;
/**
 * GArrowStreamReader:
 *
 * It wraps `arrow::ipc::StreamReader`.
 * It wraps `arrow::ipc::InputStreamReader`.
 */
struct _GArrowStreamReader
{
Expand Down

4 changes: 2 additions & 2 deletions
c_glib/arrow-glib/stream-reader.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,5 +24,5 @@

#include <arrow-glib/stream-reader.h>

GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::StreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::StreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);
GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader);

16 changes: 8 additions & 8 deletions
c_glib/arrow-glib/writer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 */

typedef struct GArrowStreamWriterPrivate_ {
 std::shared_ptr<arrow::ipc::StreamWriter> stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> stream_writer;
} GArrowStreamWriterPrivate;

enum {
Expand DownExpand Up@@ -89,7 +89,7 @@ garrow_stream_writer_set_property(GObject *object,
 switch (prop_id) {
 case PROP_STREAM_WRITER:
 priv->stream_writer =
 *static_cast<std::shared_ptr<arrow::ipc::StreamWriter> *>(g_value_get_pointer(value));
 *static_cast<std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *>(g_value_get_pointer(value));
 break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
Expand DownExpand Up@@ -128,8 +128,8 @@ garrow_stream_writer_class_init(GArrowStreamWriterClass *klass)
 gobject_class->get_property = garrow_stream_writer_get_property;

 spec = g_param_spec_pointer("stream-writer",
 "ipc::StreamWriter",
 "The raw std::shared<arrow::ipc::StreamWriter> *",
 "ipc::RecordBatchStreamWriter",
 "The raw std::shared<arrow::ipc::RecordBatchStreamWriter> *",
 static_cast<GParamFlags>(G_PARAM_WRITABLE |
 G_PARAM_CONSTRUCT_ONLY));
 g_object_class_install_property(gobject_class, PROP_STREAM_WRITER, spec);
Expand All@@ -149,11 +149,11 @@ garrow_stream_writer_new(GArrowOutputStream *sink,
 GArrowSchema *schema,
 GError **error)
{
 std::shared_ptr<arrow::ipc::StreamWriter> arrow_stream_writer;
 std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> arrow_stream_writer;
 auto status =
 arrow::ipc::StreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
 garrow_schema_get_raw(schema),
 &arrow_stream_writer);
 arrow::ipc::RecordBatchStreamWriter::Open(garrow_output_stream_get_raw(sink).get(),
garrow_schema_get_raw(schema),
&arrow_stream_writer);
 if (garrow_error_check(error, status, "[ipc][stream-writer][open]")) {
 return garrow_stream_writer_new_raw(&arrow_stream_writer);
 } else {
Expand Down

2 changes: 1 addition & 1 deletion
c_glib/arrow-glib/writer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ typedef struct _GArrowStreamWriterClass GArrowStreamWriterClass;
/**
 * GArrowStreamWriter:
 *
 * It wraps `arrow::ipc::StreamWriter`.
 * It wraps `arrow::ipc::RecordBatchStreamWriter`.
 */
struct _GArrowStreamWriter
{
Expand Down

8 changes: 4 additions & 4 deletions
c_glib/arrow-glib/writer.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,8 +24,8 @@

#include <arrow-glib/writer.h>

GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::StreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::StreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);
GArrowStreamWriter *garrow_stream_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> *arrow_stream_writer);
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> garrow_stream_writer_get_raw(GArrowStreamWriter *stream_writer);

GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::FileWriter> *arrow_file_writer);
arrow::ipc::FileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);
GArrowFileWriter *garrow_file_writer_new_raw(std::shared_ptr<arrow::ipc::RecordBatchFileWriter> *arrow_file_writer);
arrow::ipc::RecordBatchFileWriter *garrow_file_writer_get_raw(GArrowFileWriter *file_writer);

2 changes: 2 additions & 0 deletions
ci/travis_before_script_cpp.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,10 +38,12 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
 cmake -DARROW_TEST_MEMCHECK=on \
 $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS="-Wconversion -Werror" \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
else
 cmake $CMAKE_COMMON_FLAGS \
 -DARROW_CXXFLAGS=-Werror \
 -DARROW_NO_DEPRECATED_API=on \
 $ARROW_CPP_DIR
fi

Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 "Build the Arrow micro benchmarks"
 OFF)

 option(ARROW_NO_DEPRECATED_API
 "Exclude deprecated APIs from build"
 OFF)

 option(ARROW_IPC
 "Build the Arrow IPC extensions"
 ON)
Expand DownExpand Up@@ -154,6 +158,10 @@ include(BuildUtils)

include(SetupCxxFlags)

if (ARROW_NO_DEPRECATED_API)
 add_definitions(-DARROW_NO_DEPRECATED_API)
endif()

# Add common flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_COMMON_FLAGS}")
set(EP_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Expand Down

12 changes: 7 additions & 5 deletions
cpp/src/arrow/ipc/file-to-stream.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,18 +24,19 @@
#include "arrow/util/io-util.h"

namespace arrow {
namespace ipc {

// Reads a file on the file system and prints to stdout the stream version of it.
Status ConvertToStream(const char* path) {
 std::shared_ptr<io::ReadableFile> in_file;
 std::shared_ptr<ipc::FileReader> reader;
 std::shared_ptr<RecordBatchFileReader> reader;

 RETURN_NOT_OK(io::ReadableFile::Open(path, &in_file));
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 io::StdoutStream sink;
 std::shared_ptr<ipc::StreamWriter> writer;
 RETURN_NOT_OK(ipc::StreamWriter::Open(&sink, reader->schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(&sink, reader->schema(), &writer));
 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> chunk;
 RETURN_NOT_OK(reader->GetRecordBatch(i, &chunk));
Expand All@@ -44,14 +45,15 @@ Status ConvertToStream(const char* path) {
 return writer->Close();
}

} // namespace ipc
} // namespace arrow

int main(int argc, char** argv) {
 if (argc != 2) {
 std::cerr << "Usage: file-to-stream <input arrow file>" << std::endl;
 return 1;
 }
 arrow::Status status = arrow::ConvertToStream(argv[1]);
 arrow::Status status = arrow::ipc::ConvertToStream(argv[1]);
 if (!status.ok()) {
 std::cerr << "Could not convert to stream: " << status.ToString() << std::endl;
 return 1;
Expand Down

25 changes: 13 additions & 12 deletions
cpp/src/arrow/ipc/ipc-read-write-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,16 +140,16 @@ class IpcTestFixture : public io::MemoryMapFixture {
 if (zero_data) { RETURN_NOT_OK(ZeroMemoryMap(mmap_.get())); }
 RETURN_NOT_OK(mmap_->Seek(0));

 std::shared_ptr<FileWriter> file_writer;
 RETURN_NOT_OK(FileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 std::shared_ptr<RecordBatchFileWriter> file_writer;
 RETURN_NOT_OK(RecordBatchFileWriter::Open(mmap_.get(), batch.schema(), &file_writer));
 RETURN_NOT_OK(file_writer->WriteRecordBatch(batch, true));
 RETURN_NOT_OK(file_writer->Close());

 int64_t offset;
 RETURN_NOT_OK(mmap_->Tell(&offset));

 std::shared_ptr<FileReader> file_reader;
 RETURN_NOT_OK(FileReader::Open(mmap_, offset, &file_reader));
 std::shared_ptr<RecordBatchFileReader> file_reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(mmap_, offset, &file_reader));

 return file_reader->GetRecordBatch(0, result);
 }
Expand DownExpand Up@@ -487,8 +487,9 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 Status RoundTripHelper(const BatchVector& in_batches, BatchVector* out_batches) {
 // Write the file
 std::shared_ptr<FileWriter> writer;
 RETURN_NOT_OK(FileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));
 std::shared_ptr<RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 RecordBatchFileWriter::Open(sink_.get(), in_batches[0]->schema(), &writer));

 const int num_batches = static_cast<int>(in_batches.size());

Expand All@@ -504,8 +505,8 @@ class TestFileFormat : public ::testing::TestWithParam<MakeRecordBatch*> {

 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);
 std::shared_ptr<FileReader> reader;
 RETURN_NOT_OK(FileReader::Open(buf_reader, footer_offset, &reader));
 std::shared_ptr<RecordBatchFileReader> reader;
 RETURN_NOT_OK(RecordBatchFileReader::Open(buf_reader, footer_offset, &reader));

 EXPECT_EQ(num_batches, reader->num_record_batches());
 for (int i = 0; i < num_batches; ++i) {
Expand DownExpand Up@@ -553,8 +554,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 Status RoundTripHelper(
 const RecordBatch& batch, std::vector<std::shared_ptr<RecordBatch>>* out_batches) {
 // Write the file
 std::shared_ptr<StreamWriter> writer;
 RETURN_NOT_OK(StreamWriter::Open(sink_.get(), batch.schema(), &writer));
 std::shared_ptr<RecordBatchStreamWriter> writer;
 RETURN_NOT_OK(RecordBatchStreamWriter::Open(sink_.get(), batch.schema(), &writer));
 int num_batches = 5;
 for (int i = 0; i < num_batches; ++i) {
 RETURN_NOT_OK(writer->WriteRecordBatch(batch));
Expand All@@ -565,8 +566,8 @@ class TestStreamFormat : public ::testing::TestWithParam<MakeRecordBatch*> {
 // Open the file
 auto buf_reader = std::make_shared<io::BufferReader>(buffer_);

 std::shared_ptr<StreamReader> reader;
 RETURN_NOT_OK(StreamReader::Open(buf_reader, &reader));
 std::shared_ptr<RecordBatchStreamReader> reader;
 RETURN_NOT_OK(RecordBatchStreamReader::Open(buf_reader, &reader));

 std::shared_ptr<RecordBatch> chunk;
 while (true) {
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/arrow/ipc/json-integration-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,9 @@ static Status ConvertJsonToArrow(
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
 }

 std::shared_ptr<ipc::FileWriter> writer;
 RETURN_NOT_OK(ipc::FileWriter::Open(out_file.get(), reader->schema(), &writer));
 std::shared_ptr<ipc::RecordBatchFileWriter> writer;
 RETURN_NOT_OK(
 ipc::RecordBatchFileWriter::Open(out_file.get(), reader->schema(), &writer));

 for (int i = 0; i < reader->num_record_batches(); ++i) {
 std::shared_ptr<RecordBatch> batch;
Expand All@@ -96,8 +97,8 @@ static Status ConvertArrowToJson(
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &in_file));
 RETURN_NOT_OK(io::FileOutputStream::Open(json_path, &out_file));

 std::shared_ptr<ipc::FileReader> reader;
 RETURN_NOT_OK(ipc::FileReader::Open(in_file, &reader));
 std::shared_ptr<ipc::RecordBatchFileReader> reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(in_file, &reader));

 if (FLAGS_verbose) {
 std::cout << "Found schema: " << reader->schema()->ToString() << std::endl;
Expand DownExpand Up@@ -137,8 +138,8 @@ static Status ValidateArrowVsJson(
 std::shared_ptr<io::ReadableFile> arrow_file;
 RETURN_NOT_OK(io::ReadableFile::Open(arrow_path, &arrow_file));

 std::shared_ptr<ipc::FileReader> arrow_reader;
 RETURN_NOT_OK(ipc::FileReader::Open(arrow_file, &arrow_reader));
 std::shared_ptr<ipc::RecordBatchFileReader> arrow_reader;
 RETURN_NOT_OK(ipc::RecordBatchFileReader::Open(arrow_file, &arrow_reader));

 auto json_schema = json_reader->schema();
 auto arrow_schema = arrow_reader->schema();
Expand Down
Loading