[GLib] Add GArrowRecordBatchBuilder

apache · Oct 29, 2017 · c6ed17a · c6ed17a
1 parent 74a934a
commit c6ed17a
Show file tree

Hide file tree

Showing 11 changed files with 510 additions and 2 deletions.
diff --git a/c_glib/arrow-glib/Makefile.am b/c_glib/arrow-glib/Makefile.am
@@ -57,6 +57,7 @@ libarrow_glib_la_headers =			\
 	record-batch.h				\
 	schema.h				\
 	table.h					\
+	table-builder.h				\
 	tensor.h				\
 	type.h
 
@@ -97,6 +98,7 @@ libarrow_glib_la_sources =			\
 	record-batch.cpp			\
 	schema.cpp				\
 	table.cpp				\
+	table-builder.cpp			\
 	tensor.cpp				\
 	type.cpp				\
 	$(libarrow_glib_la_headers)		\
@@ -133,6 +135,7 @@ libarrow_glib_la_cpp_headers =			\
 	record-batch.hpp			\
 	schema.hpp				\
 	table.hpp				\
+	table-builder.hpp			\
 	tensor.hpp				\
 	type.hpp
 

diff --git a/c_glib/arrow-glib/array-builder.cpp b/c_glib/arrow-glib/array-builder.cpp
@@ -202,6 +202,7 @@ G_BEGIN_DECLS
 
 typedef struct GArrowArrayBuilderPrivate_ {
   arrow::ArrayBuilder *array_builder;
+  gboolean have_ownership;
 } GArrowArrayBuilderPrivate;
 
 enum {
@@ -225,7 +226,9 @@ garrow_array_builder_finalize(GObject *object)
 
   priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(object);
 
-  delete priv->array_builder;
+  if (priv->have_ownership) {
+    delete priv->array_builder;
+  }
 
   G_OBJECT_CLASS(garrow_array_builder_parent_class)->finalize(object);
 }
@@ -267,6 +270,10 @@ garrow_array_builder_get_property(GObject *object,
 static void
 garrow_array_builder_init(GArrowArrayBuilder *builder)
 {
+  GArrowArrayBuilderPrivate *priv;
+
+  priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(builder);
+  priv->have_ownership = TRUE;
 }
 
 static void
@@ -301,7 +308,24 @@ garrow_array_builder_new(const std::shared_ptr<arrow::DataType> &type,
     return NULL;
   }
   return garrow_array_builder_new_raw(arrow_builder.release());
-};
+}
+
+/**
+ * garrow_array_builder_release_ownership: (skip)
+ * @builder: A #GArrowArrayBuilder.
+ *
+ * Release ownership of `arrow::ArrayBuilder` in `builder`.
+ *
+ * Since: 0.8.8
+ */
+void
+garrow_array_builder_release_ownership(GArrowArrayBuilder *builder)
+{
+  GArrowArrayBuilderPrivate *priv;
+
+  priv = GARROW_ARRAY_BUILDER_GET_PRIVATE(builder);
+  priv->have_ownership = FALSE;
+}
 
 /**
  * garrow_array_builder_finish:

diff --git a/c_glib/arrow-glib/array-builder.h b/c_glib/arrow-glib/array-builder.h
@@ -35,6 +35,8 @@ struct _GArrowArrayBuilderClass
   GObjectClass parent_class;
 };
 
+void garrow_array_builder_release_ownership(GArrowArrayBuilder *builder);
+
 GArrowArray        *garrow_array_builder_finish   (GArrowArrayBuilder *builder,
                                                    GError **error);
 

diff --git a/c_glib/arrow-glib/arrow-glib.h b/c_glib/arrow-glib/arrow-glib.h
@@ -33,6 +33,7 @@
 #include <arrow-glib/record-batch.h>
 #include <arrow-glib/schema.h>
 #include <arrow-glib/table.h>
+#include <arrow-glib/table-builder.h>
 #include <arrow-glib/tensor.h>
 #include <arrow-glib/type.h>
 

diff --git a/c_glib/arrow-glib/arrow-glib.hpp b/c_glib/arrow-glib/arrow-glib.hpp
@@ -32,6 +32,7 @@
 #include <arrow-glib/record-batch.hpp>
 #include <arrow-glib/schema.hpp>
 #include <arrow-glib/table.hpp>
+#include <arrow-glib/table-builder.hpp>
 #include <arrow-glib/tensor.hpp>
 #include <arrow-glib/type.hpp>
 

diff --git a/c_glib/arrow-glib/meson.build b/c_glib/arrow-glib/meson.build
@@ -30,6 +30,7 @@ sources = files(
   'record-batch.cpp',
   'schema.cpp',
   'table.cpp',
+  'table-builder.cpp',
   'tensor.cpp',
   'type.cpp',
 )
@@ -70,6 +71,7 @@ c_headers = files(
   'record-batch.h',
   'schema.h',
   'table.h',
+  'table-builder.h',
   'tensor.h',
   'type.h',
 )
@@ -110,6 +112,7 @@ cpp_headers = files(
   'record-batch.hpp',
   'schema.hpp',
   'table.hpp',
+  'table-builder.hpp',
   'tensor.hpp',
   'type.hpp',
 )