mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-29 17:15:39 +08:00
Code Activity

Fix glib

Browse Source 
Change-Id: I2b375c917e6004c3ffebf3657491d4756f792951
This commit is contained in:
Wes McKinney committed 2017-05-13 16:40:07 -04:00
1 parent 04fa2854e2
commit a797ee3e93
5 files changed
+24 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

c_glib/arrow-glib/stream-reader.cpp
+9 -9
View File
@@ -43,7 +43,7 @@ G_BEGIN_DECLS
*/
typedef struct GArrowStreamReaderPrivate_ {
std::shared_ptr<arrow::ipc::InputStreamReader> stream_reader;
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> stream_reader;
} GArrowStreamReaderPrivate;
enum {
@@ -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::InputStreamReader> *>(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);
@@ -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::InputStreamReader",
"The raw std::shared<arrow::ipc::InputStreamReader> *",
"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);
@@ -143,10 +143,10 @@ GArrowStreamReader *
garrow_stream_reader_new(GArrowInputStream *stream,
GError **error)
{
std::shared_ptr<arrow::ipc::InputStreamReader> arrow_stream_reader;
std::shared_ptr<arrow::ipc::RecordBatchStreamReader> arrow_stream_reader;
auto status =
arrow::ipc::InputStreamReader::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 {
@@ -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::InputStreamReader> *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,
@@ -211,7 +211,7 @@ garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::InputStreamReader> *arr
return stream_reader;
}
std::shared_ptr<arrow::ipc::InputStreamReader>
std::shared_ptr<arrow::ipc::RecordBatchStreamReader>
garrow_stream_reader_get_raw(GArrowStreamReader *stream_reader)
{
GArrowStreamReaderPrivate *priv;
c_glib/arrow-glib/stream-reader.hpp
+2 -2
View File
@@ -24,5 +24,5 @@
#include <arrow-glib/stream-reader.h>
GArrowStreamReader *garrow_stream_reader_new_raw(std::shared_ptr<arrow::ipc::InputStreamReader> *arrow_stream_reader);
std::shared_ptr<arrow::ipc::InputStreamReader> 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);
c_glib/arrow-glib/writer.cpp
+8 -8
View File
@@ -47,7 +47,7 @@ G_BEGIN_DECLS
*/
typedef struct GArrowStreamWriterPrivate_ {
std::shared_ptr<arrow::ipc::OutputStreamWriter> stream_writer;
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> stream_writer;
} GArrowStreamWriterPrivate;
enum {
@@ -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::OutputStreamWriter> *>(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);
@@ -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::OutputStreamWriter",
"The raw std::shared<arrow::ipc::OutputStreamWriter> *",
"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);
@@ -149,11 +149,11 @@ garrow_stream_writer_new(GArrowOutputStream *sink,
GArrowSchema *schema,
GError **error)
{
std::shared_ptr<arrow::ipc::OutputStreamWriter> arrow_stream_writer;
std::shared_ptr<arrow::ipc::RecordBatchStreamWriter> arrow_stream_writer;
auto status =
arrow::ipc::OutputStreamWriter::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 {
c_glib/arrow-glib/writer.h
+1 -1
View File
@@ -56,7 +56,7 @@ typedef struct _GArrowStreamWriterClass GArrowStreamWriterClass;
/**
* GArrowStreamWriter:
*
* It wraps `arrow::ipc::OutputStreamWriter`.
* It wraps `arrow::ipc::RecordBatchStreamWriter`.
*/
struct _GArrowStreamWriter
{
c_glib/arrow-glib/writer.hpp
+4 -4
View File
@@ -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);