[tarantool-patches] [PATCH v2 4/8] tuple: account the whole array in field.data and size

[Vladislav Shpilevoy <v.shpilevoy@tarantool.org>]

Before the patch a struct field object, describing an array,
didn't account array header in its size and data. Indeed, it
was not needed, because anyway updates could be only 'flat',
and the header was regenerated anyway.

But after next patches an array update may be not on the top
level of an update tree. And its parent node with the current way
of accounting would not be able to see exact borders of each
child.

Part of #1261
---
 src/box/tuple_update.c        | 28 ++++++++++++++++------------
 src/box/update/update_array.c |  9 +++++----
 src/box/update/update_field.h |  6 ++++--
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/box/tuple_update.c b/src/box/tuple_update.c
index 87946919d..81e1f7e97 100644
--- a/src/box/tuple_update.c
+++ b/src/box/tuple_update.c
@@ -193,11 +193,12 @@ update_read_ops(struct tuple_update *update, const char *expr,
  * @retval -1 Error.
  */
 static int
-update_do_ops(struct tuple_update *update, const char *old_data,
-	      const char *old_data_end, uint32_t part_count)
+update_do_ops(struct tuple_update *update, const char *header,
+	      const char *old_data, const char *old_data_end,
+	      uint32_t part_count)
 {
-	if (update_array_create(&update->root_array, old_data, old_data_end,
-				part_count) != 0)
+	if (update_array_create(&update->root_array, header, old_data,
+				old_data_end, part_count) != 0)
 		return -1;
 	struct update_op *op = update->ops;
 	struct update_op *ops_end = op + update->op_count;
@@ -214,12 +215,12 @@ update_do_ops(struct tuple_update *update, const char *old_data,
  *        and it is enough to simply write the error to the log.
  */
 static int
-upsert_do_ops(struct tuple_update *update, const char *old_data,
-	      const char *old_data_end, uint32_t part_count,
-	      bool suppress_error)
+upsert_do_ops(struct tuple_update *update, const char *header,
+	      const char *old_data, const char *old_data_end,
+	      uint32_t part_count, bool suppress_error)
 {
-	if (update_array_create(&update->root_array, old_data, old_data_end,
-				part_count) != 0)
+	if (update_array_create(&update->root_array, header, old_data,
+				old_data_end, part_count) != 0)
 		return -1;
 	struct update_op *op = update->ops;
 	struct update_op *ops_end = op + update->op_count;
@@ -276,11 +277,13 @@ tuple_update_execute(const char *expr,const char *expr_end,
 {
 	struct tuple_update update;
 	update_init(&update, index_base);
+	const char *header = old_data;
 	uint32_t field_count = mp_decode_array(&old_data);
 
 	if (update_read_ops(&update, expr, expr_end, dict, field_count) != 0)
 		return NULL;
-	if (update_do_ops(&update, old_data, old_data_end, field_count))
+	if (update_do_ops(&update, header, old_data, old_data_end,
+			  field_count) != 0)
 		return NULL;
 	if (column_mask)
 		*column_mask = update.column_mask;
@@ -296,12 +299,13 @@ tuple_upsert_execute(const char *expr,const char *expr_end,
 {
 	struct tuple_update update;
 	update_init(&update, index_base);
+	const char *header = old_data;
 	uint32_t field_count = mp_decode_array(&old_data);
 
 	if (update_read_ops(&update, expr, expr_end, dict, field_count) != 0)
 		return NULL;
-	if (upsert_do_ops(&update, old_data, old_data_end, field_count,
-			  suppress_error))
+	if (upsert_do_ops(&update, header, old_data, old_data_end, field_count,
+			  suppress_error) != 0)
 		return NULL;
 	if (column_mask)
 		*column_mask = update.column_mask;
diff --git a/src/box/update/update_array.c b/src/box/update/update_array.c
index 985d555af..5b834b644 100644
--- a/src/box/update/update_array.c
+++ b/src/box/update/update_array.c
@@ -143,12 +143,13 @@ update_array_extract_item(struct update_field *field, struct update_op *op)
 }
 
 int
-update_array_create(struct update_field *field, const char *data,
-		    const char *data_end, uint32_t field_count)
+update_array_create(struct update_field *field, const char *header,
+		    const char *data, const char *data_end,
+		    uint32_t field_count)
 {
 	field->type = UPDATE_ARRAY;
-	field->data = data;
-	field->size = data_end - data;
+	field->data = header;
+	field->size = data_end - header;
 	field->array.rope = rope_new(&fiber()->gc);
 	if (field->array.rope == NULL)
 		return -1;
diff --git a/src/box/update/update_field.h b/src/box/update/update_field.h
index 87f1d0b74..8ce3c3e82 100644
--- a/src/box/update/update_field.h
+++ b/src/box/update/update_field.h
@@ -306,6 +306,7 @@ update_##type##_store(struct update_field *field, char *out, char *out_end);
 /**
  * Initialize @a field as an array to update.
  * @param[out] field Field to initialize.
+ * @param header Header of the MessagePack array @a data.
  * @param data MessagePack data of the array to update.
  * @param data_end End of @a data.
  * @param field_count Field count in @data.
@@ -314,8 +315,9 @@ update_##type##_store(struct update_field *field, char *out, char *out_end);
  * @retval -1 Error.
  */
 int
-update_array_create(struct update_field *field, const char *data,
-		    const char *data_end, uint32_t field_count);
+update_array_create(struct update_field *field, const char *header,
+		    const char *data, const char *data_end,
+		    uint32_t field_count);
 
 OP_DECL_GENERIC(array)
 
-- 
2.20.1 (Apple Git-117)