Replace getters and setters with an add_field method

Author: stenlarsson

c_glib/arrow-glib/compute.cpp

@@ -7617,112 +7617,34 @@ garrow_make_struct_options_new(void)
 }
 
 /**
- * garrow_make_struct_options_set_field_nullability:
+ * garrow_make_struct_options_add_field:
  * @options: A #GArrowMakeStructOptions.
- * @nullability: (element-type gboolean) (nullable) (transfer none): A #GList
- *   of nullability values, or %NULL.
+ * @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.
  *
- * Sets the nullability information for each struct field.
+ * Adds a field to the struct options with the specified name, nullability,
+ * and optional metadata.
  *
  * Since: 23.0.0
  */
 void
-garrow_make_struct_options_set_field_nullability(GArrowMakeStructOptions *options,
-                                                  GList *nullability)
+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_nullability.clear();
-  if (nullability) {
-    for (GList *node = nullability; node; node = node->next) {
-      gboolean value = GPOINTER_TO_INT(node->data);
-      arrow_options->field_nullability.push_back(value != FALSE);
-    }
-  }
-}
-
-/**
- * garrow_make_struct_options_get_field_nullability:
- * @options: A #GArrowMakeStructOptions.
- *
- * Returns: (element-type gboolean) (transfer full): A #GList of nullability
- *   values. It should be freed with g_list_free() when no longer needed.
- *
- * Gets the nullability information for each struct field.
- *
- * Since: 23.0.0
- */
-GList *
-garrow_make_struct_options_get_field_nullability(GArrowMakeStructOptions *options)
-{
-  auto arrow_options = static_cast<arrow::compute::MakeStructOptions *>(
-    garrow_function_options_get_raw(GARROW_FUNCTION_OPTIONS(options)));
-  const auto &arrow_nullability = arrow_options->field_nullability;
-  GList *list = NULL;
-  for (gsize i = 0; i < arrow_nullability.size(); ++i) {
-    gboolean value = arrow_nullability[i] ? TRUE : FALSE;
-    list = g_list_prepend(list, GINT_TO_POINTER(value));
-  }
-  return g_list_reverse(list);
-}
-
-/**
- * garrow_make_struct_options_set_field_metadata:
- * @options: A #GArrowMakeStructOptions.
- * @metadata: (element-type GHashTable) (nullable) (transfer none): A #GList of
- *   #GHashTable for each field's metadata, or %NULL.
- *
- * Sets the metadata for each struct field.
- *
- * Since: 23.0.0
- */
-void
-garrow_make_struct_options_set_field_metadata(GArrowMakeStructOptions *options,
-                                               GList *metadata)
-{
-  auto arrow_options = static_cast<arrow::compute::MakeStructOptions *>(
-    garrow_function_options_get_raw(GARROW_FUNCTION_OPTIONS(options)));
-  arrow_options->field_metadata.clear();
+  arrow_options->field_names.emplace_back(name);
+  arrow_options->field_nullability.push_back(nullability != FALSE);
   if (metadata) {
-    for (GList *node = metadata; node; node = node->next) {
-      auto hash_table = static_cast<GHashTable *>(node->data);
-      if (hash_table) {
-        arrow_options->field_metadata.push_back(
-          garrow_internal_hash_table_to_metadata(hash_table));
-      } else {
-        arrow_options->field_metadata.push_back(NULLPTR);
-      }
-    }
-  }
-}
-
-/**
- * garrow_make_struct_options_get_field_metadata:
- * @options: A #GArrowMakeStructOptions.
- *
- * Returns: (element-type GHashTable) (transfer full): A #GList of #GHashTable
- *   for each field's metadata. It should be freed with g_list_free_full() and
- *   g_hash_table_unref() when no longer needed.
- *
- * Gets the metadata for each struct field.
- *
- * Since: 23.0.0
- */
-GList *
-garrow_make_struct_options_get_field_metadata(GArrowMakeStructOptions *options)
-{
-  auto arrow_options = static_cast<arrow::compute::MakeStructOptions *>(
-    garrow_function_options_get_raw(GARROW_FUNCTION_OPTIONS(options)));
-  const auto &arrow_metadata = arrow_options->field_metadata;
-  GList *list = NULL;
-  for (gsize i = 0; i < arrow_metadata.size(); ++i) {
-    GHashTable *hash_table = NULL;
-    if (arrow_metadata[i] && arrow_metadata[i].get()) {
-      hash_table = garrow_internal_hash_table_from_metadata(arrow_metadata[i]);
-    }
-    list = g_list_prepend(list, hash_table);
+    arrow_options->field_metadata.push_back(
+      garrow_internal_hash_table_to_metadata(metadata));
+  } else {
+    arrow_options->field_metadata.push_back(nullptr);
   }
-  return g_list_reverse(list);
 }
 
 G_END_DECLS

c_glib/arrow-glib/compute.h

@@ -1356,20 +1356,9 @@ garrow_make_struct_options_new(void);
 
 GARROW_AVAILABLE_IN_23_0
 void
-garrow_make_struct_options_set_field_nullability(GArrowMakeStructOptions *options,
-                                                  GList *nullability);
-
-GARROW_AVAILABLE_IN_23_0
-GList *
-garrow_make_struct_options_get_field_nullability(GArrowMakeStructOptions *options);
-
-GARROW_AVAILABLE_IN_23_0
-void
-garrow_make_struct_options_set_field_metadata(GArrowMakeStructOptions *options,
-                                               GList *metadata);
-
-GARROW_AVAILABLE_IN_23_0
-GList *
-garrow_make_struct_options_get_field_metadata(GArrowMakeStructOptions *options);
+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,12 @@ def test_field_names_property
     assert_equal(["a", "b", "c"], @options.field_names)
   end
 
-  def test_field_nullability_property
-    assert_equal([], @options.field_nullability)
-    @options.field_names = ["a", "b", "c"]
-    @options.field_nullability = [true, false, true]
-    assert_equal([true, false, true], @options.field_nullability)
-  end
-
-  def test_field_metadata_property
-    assert_equal([], @options.field_metadata)
-    @options.field_names = ["a", "b"]
-    metadata1 = {"key1" => "value1", "key2" => "value2"}
-    metadata2 = {"key3" => "value3"}
-    @options.field_metadata = [metadata1, metadata2]
-    result = @options.field_metadata
-    assert_equal(2, result.size)
-    assert_equal(metadata1, result[0])
-    assert_equal(metadata2, result[1])
+  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
@@ -54,7 +43,8 @@ def test_make_struct_function
       Arrow::ArrayDatum.new(a),
       Arrow::ArrayDatum.new(b),
     ]
-    @options.field_names = ["a", "b"]
+    @options.add_field("a", true, nil)
+    @options.add_field("b", true, nil)
     make_struct_function = Arrow::Function.find("make_struct")
     result = make_struct_function.execute(args, @options).value
 
@@ -79,8 +69,8 @@ def test_make_struct_function_with_nullability
       Arrow::ArrayDatum.new(a),
       Arrow::ArrayDatum.new(b),
     ]
-    @options.field_names = ["a", "b"]
-    @options.field_nullability = [false, true]
+    @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
 
@@ -105,10 +95,10 @@ def test_make_struct_function_with_metadata
       Arrow::ArrayDatum.new(a),
       Arrow::ArrayDatum.new(b),
     ]
-    @options.field_names = ["a", "b"]
     metadata1 = {"key1" => "value1"}
     metadata2 = {"key2" => "value2"}
-    @options.field_metadata = [metadata1, metadata2]
+    @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