You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by GitBox <gi...@apache.org> on 2020/07/14 06:58:10 UTC
[GitHub] [arrow] mrkn opened a new pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
mrkn opened a new pull request #7747:
URL: https://github.com/apache/arrow/pull/7747
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] mrkn commented on a change in pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
Posted by GitBox <gi...@apache.org>.
mrkn commented on a change in pull request #7747:
URL: https://github.com/apache/arrow/pull/7747#discussion_r458473605
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -4182,6 +4182,32 @@ gint64 garrow_string_dictionary_array_builder_get_dictionary_length(GArrowString
return arrow_builder->dictionary_length();
}
+/**
+ * garrow_string_dictionary_array_builder_finish_delta:
+ * @builder: A #GArrowStringDictionaryArrayBuilder.
+ * @out_delta: (transfer full): The built #GArrowArray containing dictionary.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full): The built #GArrowArray containing indices on
+ * success, %NULL on error.
+ *
+ * Since: 1.0
+ */
+GArrowArray *
+garrow_string_dictionary_array_builder_finish_delta(GArrowStringDictionaryArrayBuilder* builder,
+ GArrowArray **out_delta,
Review comment:
Thanks!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] mrkn commented on a change in pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
Posted by GitBox <gi...@apache.org>.
mrkn commented on a change in pull request #7747:
URL: https://github.com/apache/arrow/pull/7747#discussion_r456917750
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -4182,6 +4182,32 @@ gint64 garrow_string_dictionary_array_builder_get_dictionary_length(GArrowString
return arrow_builder->dictionary_length();
}
+/**
+ * garrow_string_dictionary_array_builder_finish_delta:
+ * @builder: A #GArrowStringDictionaryArrayBuilder.
+ * @out_delta: (transfer full): The built #GArrowArray containing dictionary.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full): The built #GArrowArray containing indices on
+ * success, %NULL on error.
+ *
+ * Since: 1.0
+ */
+GArrowArray *
+garrow_string_dictionary_array_builder_finish_delta(GArrowStringDictionaryArrayBuilder* builder,
+ GArrowArray **out_delta,
Review comment:
@kou I don't know how to handle this `out_delta` in the test code written in Ruby. Could you tell me the way to handle it?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou closed pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
Posted by GitBox <gi...@apache.org>.
kou closed pull request #7747:
URL: https://github.com/apache/arrow/pull/7747
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on a change in pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
Posted by GitBox <gi...@apache.org>.
kou commented on a change in pull request #7747:
URL: https://github.com/apache/arrow/pull/7747#discussion_r456960478
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -4182,6 +4182,32 @@ gint64 garrow_string_dictionary_array_builder_get_dictionary_length(GArrowString
return arrow_builder->dictionary_length();
}
+/**
+ * garrow_string_dictionary_array_builder_finish_delta:
+ * @builder: A #GArrowStringDictionaryArrayBuilder.
+ * @out_delta: (transfer full): The built #GArrowArray containing dictionary.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full): The built #GArrowArray containing indices on
+ * success, %NULL on error.
+ *
+ * Since: 1.0
+ */
+GArrowArray *
+garrow_string_dictionary_array_builder_finish_delta(GArrowStringDictionaryArrayBuilder* builder,
+ GArrowArray **out_delta,
Review comment:
See d3395c9.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] github-actions[bot] commented on pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #7747:
URL: https://github.com/apache/arrow/pull/7747#issuecomment-658017492
https://issues.apache.org/jira/browse/ARROW-9454
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on a change in pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
Posted by GitBox <gi...@apache.org>.
kou commented on a change in pull request #7747:
URL: https://github.com/apache/arrow/pull/7747#discussion_r458488424
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
Review comment:
```suggestion
* Since: 2.0.0
```
##########
File path: c_glib/arrow-glib/array-builder.h
##########
@@ -44,6 +44,24 @@ GArrowType garrow_array_builder_get_value_type(GArrowArrayBuilder *builder);
GArrowArray *garrow_array_builder_finish (GArrowArrayBuilder *builder,
GError **error);
+GARROW_AVAILABLE_IN_1_0
Review comment:
```suggestion
GARROW_AVAILABLE_IN_2_0
```
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
+ */
+GArrowBinaryDictionaryArrayBuilder *
+garrow_binary_dictionary_array_builder_new(void)
+{
+ auto memory_pool = arrow::default_memory_pool();
+ auto arrow_builder = new arrow::BinaryDictionaryBuilder(memory_pool);
+ auto builder = garrow_array_builder_new_raw(arrow_builder, GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER);
+ return GARROW_BINARY_DICTIONARY_ARRAY_BUILDER(builder);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_null:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_null(GArrowBinaryDictionaryArrayBuilder *builder,
+ GError **error)
+{
+ return garrow_array_builder_append_null<arrow::BinaryDictionaryBuilder *>
+ (GARROW_ARRAY_BUILDER(builder),
+ error,
+ "[binary-dictionary-array-builder][append-null]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_value_bytes:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @value: A binary value.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_value_bytes(GArrowBinaryDictionaryArrayBuilder *builder,
+ GBytes *value,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+
+ gsize size;
+ gconstpointer data = g_bytes_get_data(value, &size);
Review comment:
```suggestion
auto data = g_bytes_get_data(value, &size);
```
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
+ */
+GArrowBinaryDictionaryArrayBuilder *
+garrow_binary_dictionary_array_builder_new(void)
+{
+ auto memory_pool = arrow::default_memory_pool();
+ auto arrow_builder = new arrow::BinaryDictionaryBuilder(memory_pool);
+ auto builder = garrow_array_builder_new_raw(arrow_builder, GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER);
+ return GARROW_BINARY_DICTIONARY_ARRAY_BUILDER(builder);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_null:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_null(GArrowBinaryDictionaryArrayBuilder *builder,
+ GError **error)
+{
+ return garrow_array_builder_append_null<arrow::BinaryDictionaryBuilder *>
+ (GARROW_ARRAY_BUILDER(builder),
+ error,
+ "[binary-dictionary-array-builder][append-null]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_value_bytes:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @value: A binary value.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_value_bytes(GArrowBinaryDictionaryArrayBuilder *builder,
+ GBytes *value,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+
+ gsize size;
+ gconstpointer data = g_bytes_get_data(value, &size);
+ auto status = arrow_builder->Append(static_cast<const uint8_t *>(data),
+ size);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-value-bytes]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_binary_array:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @array: A #GArrowBinaryArray.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_binary_array(GArrowBinaryDictionaryArrayBuilder *builder,
+ GArrowBinaryArray *array,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto arrow_array = garrow_array_get_raw<arrow::BinaryType>(GARROW_ARRAY(array));
+
+ auto status = arrow_builder->AppendArray(*arrow_array);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-binary-array]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_indices:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @values: (array length=values_length): The array of indices.
+ * @values_length: The length of `values`.
+ * @is_valids: (nullable) (array length=is_valids_length): The array of
+ * 0 or 1 that shows whether the Nth value is valid or not. If the
+ * Nth `is_valids` is 1, the Nth `values` is valid value. Otherwise
+ * the Nth value is null value.
+ * @is_valids_length: The length of `is_valids`.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Append dictionary indices directly without modifying the internal memo.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_indices(GArrowBinaryDictionaryArrayBuilder *builder,
+ const gint64 *values,
+ gint64 values_length,
+ const gboolean *is_valids,
+ gint64 is_valids_length,
+ GError **error)
+{
+ static const char *context = "[binary-dictionary-array-builder][append-indices]";
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto append_function = [&arrow_builder](
+ const gint64 *values,
+ gint64 values_length,
+ const uint8_t *valid_bytes) -> arrow::Status {
+ return arrow_builder->AppendIndices(values, values_length, valid_bytes);
+ };
+ return garrow_array_builder_append_values(values, values_length, is_valids,
+ is_valids_length, error, context,
+ append_function);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_get_dictionary_length:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Returns: A number of entries in the dicitonary.
+ *
+ * Since: 1.0
+ */
+gint64 garrow_binary_dictionary_array_builder_get_dictionary_length(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ return arrow_builder->dictionary_length();
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_finish_delta:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @out_delta: (out): The built #GArrowArray containing dictionary.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full): The built #GArrowArray containing indices on
+ * success, %NULL on error.
+ *
+ * Since: 1.0
+ */
+GArrowArray *
+garrow_binary_dictionary_array_builder_finish_delta(GArrowBinaryDictionaryArrayBuilder* builder,
+ GArrowArray **out_delta,
+ GError **error)
+{
+ static const char *context = "[binary-dictionary-array-builder][finish-delta]";
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ std::shared_ptr<arrow::Array> arrow_indices, arrow_delta;
+ auto status = arrow_builder->FinishDelta(&arrow_indices, &arrow_delta);
+ if (!garrow_error_check(error, status, context)) {
+ return NULL;
+ }
+ *out_delta = garrow_array_new_raw(&arrow_delta);
+ return garrow_array_new_raw(&arrow_indices);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_insert_memo_values:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @array: A #GArrowBinaryArray.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_insert_memo_values(GArrowBinaryDictionaryArrayBuilder *builder,
+ GArrowBinaryArray *values,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto arrow_array = garrow_array_get_raw<arrow::BinaryType>(GARROW_ARRAY(values));
+
+ auto status = arrow_builder->InsertMemoValues(*arrow_array);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][insert-memo-values]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_reset_full:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ */
Review comment:
```suggestion
*
* Reset and also clear accumulated dictionary values in memo table.
*/
```
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
+ */
+GArrowBinaryDictionaryArrayBuilder *
+garrow_binary_dictionary_array_builder_new(void)
+{
+ auto memory_pool = arrow::default_memory_pool();
+ auto arrow_builder = new arrow::BinaryDictionaryBuilder(memory_pool);
+ auto builder = garrow_array_builder_new_raw(arrow_builder, GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER);
+ return GARROW_BINARY_DICTIONARY_ARRAY_BUILDER(builder);
Review comment:
Can we use `garrow_array_builder_new()` here?
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
+ */
+GArrowBinaryDictionaryArrayBuilder *
+garrow_binary_dictionary_array_builder_new(void)
+{
+ auto memory_pool = arrow::default_memory_pool();
+ auto arrow_builder = new arrow::BinaryDictionaryBuilder(memory_pool);
+ auto builder = garrow_array_builder_new_raw(arrow_builder, GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER);
+ return GARROW_BINARY_DICTIONARY_ARRAY_BUILDER(builder);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_null:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_null(GArrowBinaryDictionaryArrayBuilder *builder,
+ GError **error)
+{
+ return garrow_array_builder_append_null<arrow::BinaryDictionaryBuilder *>
+ (GARROW_ARRAY_BUILDER(builder),
+ error,
+ "[binary-dictionary-array-builder][append-null]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_value_bytes:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @value: A binary value.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_value_bytes(GArrowBinaryDictionaryArrayBuilder *builder,
+ GBytes *value,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+
+ gsize size;
+ gconstpointer data = g_bytes_get_data(value, &size);
+ auto status = arrow_builder->Append(static_cast<const uint8_t *>(data),
+ size);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-value-bytes]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_binary_array:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @array: A #GArrowBinaryArray.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_binary_array(GArrowBinaryDictionaryArrayBuilder *builder,
+ GArrowBinaryArray *array,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto arrow_array = garrow_array_get_raw<arrow::BinaryType>(GARROW_ARRAY(array));
+
+ auto status = arrow_builder->AppendArray(*arrow_array);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-binary-array]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_indices:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @values: (array length=values_length): The array of indices.
+ * @values_length: The length of `values`.
+ * @is_valids: (nullable) (array length=is_valids_length): The array of
+ * 0 or 1 that shows whether the Nth value is valid or not. If the
+ * Nth `is_valids` is 1, the Nth `values` is valid value. Otherwise
+ * the Nth value is null value.
+ * @is_valids_length: The length of `is_valids`.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Append dictionary indices directly without modifying the internal memo.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_indices(GArrowBinaryDictionaryArrayBuilder *builder,
+ const gint64 *values,
+ gint64 values_length,
+ const gboolean *is_valids,
+ gint64 is_valids_length,
+ GError **error)
+{
+ static const char *context = "[binary-dictionary-array-builder][append-indices]";
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto append_function = [&arrow_builder](
+ const gint64 *values,
+ gint64 values_length,
+ const uint8_t *valid_bytes) -> arrow::Status {
+ return arrow_builder->AppendIndices(values, values_length, valid_bytes);
+ };
+ return garrow_array_builder_append_values(values, values_length, is_valids,
+ is_valids_length, error, context,
+ append_function);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_get_dictionary_length:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Returns: A number of entries in the dicitonary.
+ *
+ * Since: 1.0
+ */
+gint64 garrow_binary_dictionary_array_builder_get_dictionary_length(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ return arrow_builder->dictionary_length();
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_finish_delta:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @out_delta: (out): The built #GArrowArray containing dictionary.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full): The built #GArrowArray containing indices on
+ * success, %NULL on error.
+ *
+ * Since: 1.0
+ */
+GArrowArray *
+garrow_binary_dictionary_array_builder_finish_delta(GArrowBinaryDictionaryArrayBuilder* builder,
+ GArrowArray **out_delta,
+ GError **error)
Review comment:
How about returning indices by output parameter instead of return value?
Because there are no importance different between indices and delta.
```suggestion
gboolean
garrow_binary_dictionary_array_builder_finish_delta(GArrowBinaryDictionaryArrayBuilder* builder,
GArrowArray **out_indices,
GArrowArray **out_delta,
GError **error)
```
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
+ */
+GArrowBinaryDictionaryArrayBuilder *
+garrow_binary_dictionary_array_builder_new(void)
+{
+ auto memory_pool = arrow::default_memory_pool();
+ auto arrow_builder = new arrow::BinaryDictionaryBuilder(memory_pool);
+ auto builder = garrow_array_builder_new_raw(arrow_builder, GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER);
+ return GARROW_BINARY_DICTIONARY_ARRAY_BUILDER(builder);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_null:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_null(GArrowBinaryDictionaryArrayBuilder *builder,
+ GError **error)
+{
+ return garrow_array_builder_append_null<arrow::BinaryDictionaryBuilder *>
+ (GARROW_ARRAY_BUILDER(builder),
+ error,
+ "[binary-dictionary-array-builder][append-null]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_value_bytes:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @value: A binary value.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_value_bytes(GArrowBinaryDictionaryArrayBuilder *builder,
+ GBytes *value,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+
+ gsize size;
+ gconstpointer data = g_bytes_get_data(value, &size);
+ auto status = arrow_builder->Append(static_cast<const uint8_t *>(data),
+ size);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-value-bytes]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_binary_array:
Review comment:
How about removing `binary_`?
Because we only accept binary array. (We don't have any other `append_*_array` variants.)
##########
File path: c_glib/test/test-dictionary-array-builder.rb
##########
@@ -0,0 +1,342 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+class TestDictinaryArrayBuilder < Test::Unit::TestCase
+ include Helper::Buildable
+
+ def setup
+ @values = [
+ *%w(foo bar foo),
+ nil,
+ *%w(foo baz bar baz baz)
+ ]
+ end
+
+ sub_test_case("BinaryDictionaryArrayBuilder") do
+ sub_test_case("constructed from empty") do
+ def setup
+ super
+
+ @dictionary = %w(foo bar baz)
+ @dictionary_array = build_binary_array(@dictionary)
+ @indices = @values.map {|x| x ? @dictionary.index(x) : nil }
+ @indices_array = build_int8_array(@indices)
+ @data_type = Arrow::DictionaryDataType.new(@indices_array.value_data_type,
+ @dictionary_array.value_data_type,
+ false)
+ @expected_array = Arrow::DictionaryArray.new(@data_type,
+ @indices_array,
+ @dictionary_array)
+ @builder = Arrow::BinaryDictionaryArrayBuilder.new
+ @values.each do |value|
+ if value
+ @builder.append_value_bytes(value)
+ else
+ @builder.append_null
+ end
+ end
+ end
+
+ test("append_value_bytes") do
+ dictionary_array = build_binary_array([*@dictionary, "qux"])
+ indices_array = build_int8_array([*@indices, 3])
+ expected_array = Arrow::DictionaryArray.new(@data_type,
+ indices_array,
+ dictionary_array)
+
+ @builder.append_value_bytes("qux")
+ assert do
+ expected_array == @builder.finish
+ end
Review comment:
```suggestion
assert_equal(expected_array, @builder.finish)
```
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
+ */
+GArrowBinaryDictionaryArrayBuilder *
+garrow_binary_dictionary_array_builder_new(void)
+{
+ auto memory_pool = arrow::default_memory_pool();
+ auto arrow_builder = new arrow::BinaryDictionaryBuilder(memory_pool);
+ auto builder = garrow_array_builder_new_raw(arrow_builder, GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER);
+ return GARROW_BINARY_DICTIONARY_ARRAY_BUILDER(builder);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_null:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_null(GArrowBinaryDictionaryArrayBuilder *builder,
+ GError **error)
+{
+ return garrow_array_builder_append_null<arrow::BinaryDictionaryBuilder *>
+ (GARROW_ARRAY_BUILDER(builder),
+ error,
+ "[binary-dictionary-array-builder][append-null]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_value_bytes:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @value: A binary value.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_value_bytes(GArrowBinaryDictionaryArrayBuilder *builder,
+ GBytes *value,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+
+ gsize size;
+ gconstpointer data = g_bytes_get_data(value, &size);
+ auto status = arrow_builder->Append(static_cast<const uint8_t *>(data),
+ size);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-value-bytes]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_binary_array:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @array: A #GArrowBinaryArray.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_binary_array(GArrowBinaryDictionaryArrayBuilder *builder,
+ GArrowBinaryArray *array,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto arrow_array = garrow_array_get_raw<arrow::BinaryType>(GARROW_ARRAY(array));
+
+ auto status = arrow_builder->AppendArray(*arrow_array);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-binary-array]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_indices:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @values: (array length=values_length): The array of indices.
+ * @values_length: The length of `values`.
+ * @is_valids: (nullable) (array length=is_valids_length): The array of
+ * 0 or 1 that shows whether the Nth value is valid or not. If the
+ * Nth `is_valids` is 1, the Nth `values` is valid value. Otherwise
+ * the Nth value is null value.
Review comment:
```suggestion
* %TRUE or %FALSE that shows whether the Nth value is valid or not. If the
* Nth `is_valids` is %TRUE, the Nth `values` is valid value. Otherwise
* the Nth value is null value.
```
##########
File path: c_glib/arrow-glib/basic-array.hpp
##########
@@ -35,3 +35,10 @@ garrow_array_new_raw_valist(std::shared_ptr<arrow::Array> *arrow_array,
va_list args);
std::shared_ptr<arrow::Array>
garrow_array_get_raw(GArrowArray *array);
+
+template <typename DataType>
+inline std::shared_ptr<typename arrow::TypeTraits<DataType>::ArrayType>
+garrow_array_get_raw(GArrowArray *array) {
+ auto arrow_array = garrow_array_get_raw(GARROW_ARRAY(array));
Review comment:
```suggestion
auto arrow_array = garrow_array_get_raw(array);
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on a change in pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
Posted by GitBox <gi...@apache.org>.
kou commented on a change in pull request #7747:
URL: https://github.com/apache/arrow/pull/7747#discussion_r464746088
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
+ */
+GArrowBinaryDictionaryArrayBuilder *
+garrow_binary_dictionary_array_builder_new(void)
+{
+ auto memory_pool = arrow::default_memory_pool();
+ auto arrow_builder = new arrow::BinaryDictionaryBuilder(memory_pool);
+ auto builder = garrow_array_builder_new_raw(arrow_builder, GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER);
+ return GARROW_BINARY_DICTIONARY_ARRAY_BUILDER(builder);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_null:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_null(GArrowBinaryDictionaryArrayBuilder *builder,
+ GError **error)
+{
+ return garrow_array_builder_append_null<arrow::BinaryDictionaryBuilder *>
+ (GARROW_ARRAY_BUILDER(builder),
+ error,
+ "[binary-dictionary-array-builder][append-null]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_value_bytes:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @value: A binary value.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_value_bytes(GArrowBinaryDictionaryArrayBuilder *builder,
+ GBytes *value,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+
+ gsize size;
+ gconstpointer data = g_bytes_get_data(value, &size);
+ auto status = arrow_builder->Append(static_cast<const uint8_t *>(data),
+ size);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-value-bytes]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_binary_array:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @array: A #GArrowBinaryArray.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_binary_array(GArrowBinaryDictionaryArrayBuilder *builder,
+ GArrowBinaryArray *array,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto arrow_array = garrow_array_get_raw<arrow::BinaryType>(GARROW_ARRAY(array));
+
+ auto status = arrow_builder->AppendArray(*arrow_array);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-binary-array]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_indices:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @values: (array length=values_length): The array of indices.
+ * @values_length: The length of `values`.
+ * @is_valids: (nullable) (array length=is_valids_length): The array of
+ * 0 or 1 that shows whether the Nth value is valid or not. If the
+ * Nth `is_valids` is 1, the Nth `values` is valid value. Otherwise
+ * the Nth value is null value.
+ * @is_valids_length: The length of `is_valids`.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Append dictionary indices directly without modifying the internal memo.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_indices(GArrowBinaryDictionaryArrayBuilder *builder,
+ const gint64 *values,
+ gint64 values_length,
+ const gboolean *is_valids,
+ gint64 is_valids_length,
+ GError **error)
+{
+ static const char *context = "[binary-dictionary-array-builder][append-indices]";
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto append_function = [&arrow_builder](
+ const gint64 *values,
+ gint64 values_length,
+ const uint8_t *valid_bytes) -> arrow::Status {
+ return arrow_builder->AppendIndices(values, values_length, valid_bytes);
+ };
+ return garrow_array_builder_append_values(values, values_length, is_valids,
+ is_valids_length, error, context,
+ append_function);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_get_dictionary_length:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Returns: A number of entries in the dicitonary.
+ *
+ * Since: 1.0
+ */
+gint64 garrow_binary_dictionary_array_builder_get_dictionary_length(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ return arrow_builder->dictionary_length();
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_finish_delta:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @out_delta: (out): The built #GArrowArray containing dictionary.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full): The built #GArrowArray containing indices on
+ * success, %NULL on error.
+ *
+ * Since: 1.0
+ */
+GArrowArray *
+garrow_binary_dictionary_array_builder_finish_delta(GArrowBinaryDictionaryArrayBuilder* builder,
+ GArrowArray **out_delta,
+ GError **error)
Review comment:
Yes.
We can ignore the first boolean in Ruby layer.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] mrkn commented on a change in pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
Posted by GitBox <gi...@apache.org>.
mrkn commented on a change in pull request #7747:
URL: https://github.com/apache/arrow/pull/7747#discussion_r464740479
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
+ */
+GArrowBinaryDictionaryArrayBuilder *
+garrow_binary_dictionary_array_builder_new(void)
+{
+ auto memory_pool = arrow::default_memory_pool();
+ auto arrow_builder = new arrow::BinaryDictionaryBuilder(memory_pool);
+ auto builder = garrow_array_builder_new_raw(arrow_builder, GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER);
+ return GARROW_BINARY_DICTIONARY_ARRAY_BUILDER(builder);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_null:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_null(GArrowBinaryDictionaryArrayBuilder *builder,
+ GError **error)
+{
+ return garrow_array_builder_append_null<arrow::BinaryDictionaryBuilder *>
+ (GARROW_ARRAY_BUILDER(builder),
+ error,
+ "[binary-dictionary-array-builder][append-null]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_value_bytes:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @value: A binary value.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_value_bytes(GArrowBinaryDictionaryArrayBuilder *builder,
+ GBytes *value,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+
+ gsize size;
+ gconstpointer data = g_bytes_get_data(value, &size);
+ auto status = arrow_builder->Append(static_cast<const uint8_t *>(data),
+ size);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-value-bytes]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_binary_array:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @array: A #GArrowBinaryArray.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_binary_array(GArrowBinaryDictionaryArrayBuilder *builder,
+ GArrowBinaryArray *array,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto arrow_array = garrow_array_get_raw<arrow::BinaryType>(GARROW_ARRAY(array));
+
+ auto status = arrow_builder->AppendArray(*arrow_array);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-binary-array]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_indices:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @values: (array length=values_length): The array of indices.
+ * @values_length: The length of `values`.
+ * @is_valids: (nullable) (array length=is_valids_length): The array of
+ * 0 or 1 that shows whether the Nth value is valid or not. If the
+ * Nth `is_valids` is 1, the Nth `values` is valid value. Otherwise
+ * the Nth value is null value.
+ * @is_valids_length: The length of `is_valids`.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Append dictionary indices directly without modifying the internal memo.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_indices(GArrowBinaryDictionaryArrayBuilder *builder,
+ const gint64 *values,
+ gint64 values_length,
+ const gboolean *is_valids,
+ gint64 is_valids_length,
+ GError **error)
+{
+ static const char *context = "[binary-dictionary-array-builder][append-indices]";
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto append_function = [&arrow_builder](
+ const gint64 *values,
+ gint64 values_length,
+ const uint8_t *valid_bytes) -> arrow::Status {
+ return arrow_builder->AppendIndices(values, values_length, valid_bytes);
+ };
+ return garrow_array_builder_append_values(values, values_length, is_valids,
+ is_valids_length, error, context,
+ append_function);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_get_dictionary_length:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Returns: A number of entries in the dicitonary.
+ *
+ * Since: 1.0
+ */
+gint64 garrow_binary_dictionary_array_builder_get_dictionary_length(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ return arrow_builder->dictionary_length();
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_finish_delta:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @out_delta: (out): The built #GArrowArray containing dictionary.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full): The built #GArrowArray containing indices on
+ * success, %NULL on error.
+ *
+ * Since: 1.0
+ */
+GArrowArray *
+garrow_binary_dictionary_array_builder_finish_delta(GArrowBinaryDictionaryArrayBuilder* builder,
+ GArrowArray **out_delta,
+ GError **error)
Review comment:
@kou This change lets `finish_delta` return a triplet of (boolean, indices, delta).
Is this return-value change intentional?
See [here](https://github.com/apache/arrow/pull/7747/commits/ceae1fee6928cf3d965d705e55174f23fb583222#diff-f69ee1822872cdd0148e49b5c8949cdbR101) about the effect.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] mrkn commented on a change in pull request #7747: ARROW-9454: [GLib] Add binding of some dictionary builders
Posted by GitBox <gi...@apache.org>.
mrkn commented on a change in pull request #7747:
URL: https://github.com/apache/arrow/pull/7747#discussion_r464747555
##########
File path: c_glib/arrow-glib/array-builder.cpp
##########
@@ -3914,6 +4023,466 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
}
+G_DEFINE_TYPE(GArrowBinaryDictionaryArrayBuilder,
+ garrow_binary_dictionary_array_builder,
+ GARROW_TYPE_ARRAY_BUILDER)
+
+static void
+garrow_binary_dictionary_array_builder_init(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+}
+
+static void
+garrow_binary_dictionary_array_builder_class_init(GArrowBinaryDictionaryArrayBuilderClass *klass)
+{
+}
+
+
+/**
+ * garrow_binary_dictionary_array_builder_new:
+ *
+ * Returns: A newly created #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Since: 1.0
+ */
+GArrowBinaryDictionaryArrayBuilder *
+garrow_binary_dictionary_array_builder_new(void)
+{
+ auto memory_pool = arrow::default_memory_pool();
+ auto arrow_builder = new arrow::BinaryDictionaryBuilder(memory_pool);
+ auto builder = garrow_array_builder_new_raw(arrow_builder, GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER);
+ return GARROW_BINARY_DICTIONARY_ARRAY_BUILDER(builder);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_null:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_null(GArrowBinaryDictionaryArrayBuilder *builder,
+ GError **error)
+{
+ return garrow_array_builder_append_null<arrow::BinaryDictionaryBuilder *>
+ (GARROW_ARRAY_BUILDER(builder),
+ error,
+ "[binary-dictionary-array-builder][append-null]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_value_bytes:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @value: A binary value.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_value_bytes(GArrowBinaryDictionaryArrayBuilder *builder,
+ GBytes *value,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+
+ gsize size;
+ gconstpointer data = g_bytes_get_data(value, &size);
+ auto status = arrow_builder->Append(static_cast<const uint8_t *>(data),
+ size);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-value-bytes]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_binary_array:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @array: A #GArrowBinaryArray.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_binary_array(GArrowBinaryDictionaryArrayBuilder *builder,
+ GArrowBinaryArray *array,
+ GError **error)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto arrow_array = garrow_array_get_raw<arrow::BinaryType>(GARROW_ARRAY(array));
+
+ auto status = arrow_builder->AppendArray(*arrow_array);
+
+ return garrow_error_check(error,
+ status,
+ "[binary-dictionary-array-builder][append-binary-array]");
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_append_indices:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @values: (array length=values_length): The array of indices.
+ * @values_length: The length of `values`.
+ * @is_valids: (nullable) (array length=is_valids_length): The array of
+ * 0 or 1 that shows whether the Nth value is valid or not. If the
+ * Nth `is_valids` is 1, the Nth `values` is valid value. Otherwise
+ * the Nth value is null value.
+ * @is_valids_length: The length of `is_valids`.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Append dictionary indices directly without modifying the internal memo.
+ *
+ * Returns: %TRUE on success, %FALSE if there was an error.
+ *
+ * Since: 1.0
+ */
+gboolean
+garrow_binary_dictionary_array_builder_append_indices(GArrowBinaryDictionaryArrayBuilder *builder,
+ const gint64 *values,
+ gint64 values_length,
+ const gboolean *is_valids,
+ gint64 is_valids_length,
+ GError **error)
+{
+ static const char *context = "[binary-dictionary-array-builder][append-indices]";
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ auto append_function = [&arrow_builder](
+ const gint64 *values,
+ gint64 values_length,
+ const uint8_t *valid_bytes) -> arrow::Status {
+ return arrow_builder->AppendIndices(values, values_length, valid_bytes);
+ };
+ return garrow_array_builder_append_values(values, values_length, is_valids,
+ is_valids_length, error, context,
+ append_function);
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_get_dictionary_length:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ *
+ * Returns: A number of entries in the dicitonary.
+ *
+ * Since: 1.0
+ */
+gint64 garrow_binary_dictionary_array_builder_get_dictionary_length(GArrowBinaryDictionaryArrayBuilder *builder)
+{
+ auto arrow_builder =
+ static_cast<arrow::BinaryDictionaryBuilder *>(
+ garrow_array_builder_get_raw(GARROW_ARRAY_BUILDER(builder)));
+ return arrow_builder->dictionary_length();
+}
+
+/**
+ * garrow_binary_dictionary_array_builder_finish_delta:
+ * @builder: A #GArrowBinaryDictionaryArrayBuilder.
+ * @out_delta: (out): The built #GArrowArray containing dictionary.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full): The built #GArrowArray containing indices on
+ * success, %NULL on error.
+ *
+ * Since: 1.0
+ */
+GArrowArray *
+garrow_binary_dictionary_array_builder_finish_delta(GArrowBinaryDictionaryArrayBuilder* builder,
+ GArrowArray **out_delta,
+ GError **error)
Review comment:
I got it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org