Implement getter and setters for nullability and metadata in Ruby extension

Author: stenlarsson

c_glib/arrow-glib/compute.cpp

@@ -8355,6 +8355,8 @@ garrow_pairwise_options_new(void)
 
 enum {
   PROP_MAKE_STRUCT_OPTIONS_FIELD_NAMES = 1,
+  PROP_MAKE_STRUCT_OPTIONS_FIELD_NULLABILITY,
+  PROP_MAKE_STRUCT_OPTIONS_FIELD_METADATA,
 };
 
 G_DEFINE_TYPE(GArrowMakeStructOptions,
@@ -8381,8 +8383,42 @@ garrow_make_struct_options_set_property(GObject *object,
         }
       }
       // Keep nullability and metadata vectors in sync with names.
-      options->field_nullability.assign(options->field_names.size(), true);
-      options->field_metadata.assign(options->field_names.size(), NULLPTR);
+      const auto new_size = options->field_names.size();
+      if (options->field_nullability.size() != new_size) {
+        options->field_nullability.assign(new_size, true);
+      }
+      if (options->field_metadata.size() != new_size) {
+        options->field_metadata.assign(new_size, nullptr);
+      }
+    }
+    break;
+  case PROP_MAKE_STRUCT_OPTIONS_FIELD_NULLABILITY:
+    {
+      auto array = static_cast<GArray *>(g_value_get_boxed(value));
+      options->field_nullability.clear();
+      if (array) {
+        for (guint i = 0; i < array->len; ++i) {
+          auto nullability = g_array_index(array, gboolean, i);
+          options->field_nullability.push_back(nullability != FALSE);
+        }
+      }
+    }
+    break;
+  case PROP_MAKE_STRUCT_OPTIONS_FIELD_METADATA:
+    {
+      auto array = static_cast<GPtrArray *>(g_value_get_boxed(value));
+      options->field_metadata.clear();
+      if (array) {
+        for (guint i = 0; i < array->len; ++i) {
+          auto metadata = static_cast<GHashTable *>(g_ptr_array_index(array, i));
+          if (metadata) {
+            options->field_metadata.push_back(
+              garrow_internal_hash_table_to_metadata(metadata));
+          } else {
+            options->field_metadata.push_back(nullptr);
+          }
+        }
+      }
     }
     break;
   default:
@@ -8411,6 +8447,31 @@ garrow_make_struct_options_get_property(GObject *object,
       g_value_take_boxed(value, strv);
     }
     break;
+  case PROP_MAKE_STRUCT_OPTIONS_FIELD_NULLABILITY:
+    {
+      const auto &nullability = options->field_nullability;
+      auto array = g_array_sized_new(FALSE, FALSE, sizeof(gboolean), nullability.size());
+      for (gsize i = 0; i < nullability.size(); ++i) {
+        gboolean val = nullability[i] ? TRUE : FALSE;
+        g_array_append_val(array, val);
+      }
+      g_value_take_boxed(value, array);
+    }
+    break;
+  case PROP_MAKE_STRUCT_OPTIONS_FIELD_METADATA:
+    {
+      const auto &metadata = options->field_metadata;
+      auto array = g_ptr_array_sized_new(metadata.size());
+      for (gsize i = 0; i < metadata.size(); ++i) {
+        GHashTable *hash_table = nullptr;
+        if (metadata[i]) {
+          hash_table = garrow_internal_hash_table_from_metadata(metadata[i]);
+        }
+        g_ptr_array_add(array, hash_table);
+      }
+      g_value_take_boxed(value, array);
+    }
+    break;
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
     break;
@@ -8451,6 +8512,40 @@ garrow_make_struct_options_class_init(GArrowMakeStructOptionsClass *klass)
   g_object_class_install_property(gobject_class,
                                   PROP_MAKE_STRUCT_OPTIONS_FIELD_NAMES,
                                   spec);
+
+  /**
+   * GArrowMakeStructOptions:field-nullability:
+   *
+   * Nullability for each field. This is a #GArray of #gboolean values.
+   *
+   * Since: 23.0.0
+   */
+  spec = g_param_spec_boxed("field-nullability",
+                            "Field nullability",
+                            "Nullability for each field",
+                            G_TYPE_ARRAY,
+                            static_cast<GParamFlags>(G_PARAM_READWRITE));
+  g_object_class_install_property(gobject_class,
+                                  PROP_MAKE_STRUCT_OPTIONS_FIELD_NULLABILITY,
+                                  spec);
+
+  /**
+   * GArrowMakeStructOptions:field-metadata:
+   *
+   * Metadata for each field. This is a #GPtrArray of #GHashTable pointers
+   * (each hash table has utf8 keys and utf8 values), or %NULL for fields
+   * without metadata.
+   *
+   * Since: 23.0.0
+   */
+  spec = g_param_spec_boxed("field-metadata",
+                            "Field metadata",
+                            "Metadata for each field",
+                            G_TYPE_PTR_ARRAY,
+                            static_cast<GParamFlags>(G_PARAM_READWRITE));
+  g_object_class_install_property(gobject_class,
+                                  PROP_MAKE_STRUCT_OPTIONS_FIELD_METADATA,
+                                  spec);
 }
 
 /**
@@ -8467,37 +8562,6 @@ garrow_make_struct_options_new(void)
   return GARROW_MAKE_STRUCT_OPTIONS(options);
 }
 
-/**
- * garrow_make_struct_options_add_field:
- * @options: A #GArrowMakeStructOptions.
- * @name: The name of the field to add.
- * @nullability: Whether the field is nullable.
- * @metadata: (nullable) (element-type utf8 utf8): A #GHashTable for the field's
- *   metadata, or %NULL.
- *
- * Adds a field to the struct options with the specified name, nullability,
- * and optional metadata.
- *
- * Since: 23.0.0
- */
-void
-garrow_make_struct_options_add_field(GArrowMakeStructOptions *options,
-                                     const char *name,
-                                     gboolean nullability,
-                                     GHashTable *metadata)
-{
-  auto arrow_options = static_cast<arrow::compute::MakeStructOptions *>(
-    garrow_function_options_get_raw(GARROW_FUNCTION_OPTIONS(options)));
-  arrow_options->field_names.emplace_back(name);
-  arrow_options->field_nullability.push_back(nullability != FALSE);
-  if (metadata) {
-    arrow_options->field_metadata.push_back(
-      garrow_internal_hash_table_to_metadata(metadata));
-  } else {
-    arrow_options->field_metadata.push_back(nullptr);
-  }
-}
-
 G_END_DECLS
 
 arrow::Result<arrow::FieldRef>

c_glib/arrow-glib/compute.h

@@ -1491,11 +1491,4 @@ GARROW_AVAILABLE_IN_23_0
 GArrowMakeStructOptions *
 garrow_make_struct_options_new(void);
 
-GARROW_AVAILABLE_IN_23_0
-void
-garrow_make_struct_options_add_field(GArrowMakeStructOptions *options,
-                                     const char *name,
-                                     gboolean nullability,
-                                     GHashTable *metadata);
-
 G_END_DECLS

c_glib/test/test-make-struct-options.rb

@@ -28,23 +28,14 @@ def test_field_names_property
     assert_equal(["a", "b", "c"], @options.field_names)
   end
 
-  def test_add_field
-    @options.add_field("a", true, nil)
-    @options.add_field("b", false, nil)
-    metadata = {"key1" => "value1", "key2" => "value2"}
-    @options.add_field("c", true, metadata)
-    assert_equal(["a", "b", "c"], @options.field_names)
-  end
-
   def test_make_struct_function
     a = build_int8_array([1, 2, 3])
     b = build_boolean_array([true, false, nil])
     args = [
       Arrow::ArrayDatum.new(a),
       Arrow::ArrayDatum.new(b),
     ]
-    @options.add_field("a", true, nil)
-    @options.add_field("b", true, nil)
+    @options.field_names = ["a", "b"]
     make_struct_function = Arrow::Function.find("make_struct")
     result = make_struct_function.execute(args, @options).value
 
@@ -61,49 +52,4 @@ def test_make_struct_function
     )
     assert_equal(expected, result)
   end
-
-  def test_make_struct_function_with_nullability
-    a = build_int8_array([1, 2, 3])
-    b = build_boolean_array([true, false, nil])
-    args = [
-      Arrow::ArrayDatum.new(a),
-      Arrow::ArrayDatum.new(b),
-    ]
-    @options.add_field("a", false, nil)
-    @options.add_field("b", true, nil)
-    make_struct_function = Arrow::Function.find("make_struct")
-    result = make_struct_function.execute(args, @options).value
-
-    expected = build_struct_array(
-      [
-        Arrow::Field.new("a", Arrow::Int8DataType.new, false),
-        Arrow::Field.new("b", Arrow::BooleanDataType.new, true),
-      ],
-      [
-        {"a" => 1, "b" => true},
-        {"a" => 2, "b" => false},
-        {"a" => 3, "b" => nil},
-      ]
-    )
-    assert_equal(expected, result)
-  end
-
-  def test_make_struct_function_with_metadata
-    a = build_int8_array([1, 2, 3])
-    b = build_boolean_array([true, false, nil])
-    args = [
-      Arrow::ArrayDatum.new(a),
-      Arrow::ArrayDatum.new(b),
-    ]
-    metadata1 = {"key1" => "value1"}
-    metadata2 = {"key2" => "value2"}
-    @options.add_field("a", true, metadata1)
-    @options.add_field("b", true, metadata2)
-    make_struct_function = Arrow::Function.find("make_struct")
-    result = make_struct_function.execute(args, @options).value
-
-    fields = result.value_data_type.fields
-    assert_equal(metadata1, fields[0].metadata)
-    assert_equal(metadata2, fields[1].metadata)
-  end
 end