diff --git a/connector/c/include/libtnt/tnt_update.h b/connector/c/include/libtnt/tnt_update.h
index e317faea444f60e85e55366ea69eac1143c917cb..7cdeecd38ca560d75335d00b2f846abd70f0cf30 100644
--- a/connector/c/include/libtnt/tnt_update.h
+++ b/connector/c/include/libtnt/tnt_update.h
@@ -34,8 +34,7 @@ enum {
TNT_UPDATE_OR,
TNT_UPDATE_SPLICE,
TNT_UPDATE_DELETE,
- TNT_UPDATE_INSERT_BEFORE,
- TNT_UPDATE_INSERT_AFTER,
+ TNT_UPDATE_INSERT,
};
ssize_t
@@ -55,12 +54,8 @@ ssize_t
tnt_update_delete(struct tnt_stream *s, uint32_t field);
ssize_t
-tnt_update_insert_before(struct tnt_stream *s, uint32_t field,
- char *data, uint32_t size);
-
-ssize_t
-tnt_update_insert_after(struct tnt_stream *s, uint32_t field,
- char *data, uint32_t size);
+tnt_update_insert(struct tnt_stream *s, uint32_t field,
+ char *data, uint32_t size);
ssize_t
tnt_update(struct tnt_stream *s, uint32_t ns, uint32_t flags,
diff --git a/connector/c/tnt/tnt_update.c b/connector/c/tnt/tnt_update.c
index ae4e863f68e3332a4cc5fe5cf9ccf2ac840cd864..3be13e3f2b25bcd2413c040d069d74785303c089 100644
--- a/connector/c/tnt/tnt_update.c
+++ b/connector/c/tnt/tnt_update.c
@@ -169,17 +169,10 @@ tnt_update_delete(struct tnt_stream *s, uint32_t field)
}
ssize_t
-tnt_update_insert_before(struct tnt_stream *s, uint32_t field,
+tnt_update_insert(struct tnt_stream *s, uint32_t field,
char *data, uint32_t size)
{
- return tnt_update_op(s, field, TNT_UPDATE_INSERT_BEFORE, data, size);
-}
-
-ssize_t
-tnt_update_insert_after(struct tnt_stream *s, uint32_t field,
- char *data, uint32_t size)
-{
- return tnt_update_op(s, field, TNT_UPDATE_INSERT_AFTER, data, size);
+ return tnt_update_op(s, field, TNT_UPDATE_INSERT, data, size);
}
diff --git a/mod/box/box.h b/mod/box/box.h
index f6e9521b1d5cd98cda17db34301ad788f53ff22e..4b7cbf8768960997dace3bb8958fb7384ca41d8b 100644
--- a/mod/box/box.h
+++ b/mod/box/box.h
@@ -158,10 +158,9 @@ ENUM(messages, MESSAGES);
_(UPDATE_OP_OR, 4) \
_(UPDATE_OP_SPLICE, 5) \
_(UPDATE_OP_DELETE, 6) \
- _(UPDATE_OP_INSERT_BEFORE, 7) \
- _(UPDATE_OP_INSERT_AFTER, 8) \
- _(UPDATE_OP_NONE, 9) \
- _(UPDATE_OP_MAX, 10) \
+ _(UPDATE_OP_INSERT, 7) \
+ _(UPDATE_OP_NONE, 8) \
+ _(UPDATE_OP_MAX, 9) \
ENUM(update_op_codes, UPDATE_OP_CODES);
diff --git a/mod/box/box.m b/mod/box/box.m
index 248a9169233b011c2bf83763e91242509dffd650..8c9a5fc61389cd95418c59478806c53bf9d1611b 100644
--- a/mod/box/box.m
+++ b/mod/box/box.m
@@ -415,15 +415,11 @@ update_op_cmp(const void *op1_ptr, const void *op2_ptr)
if (op1_field_no > op2_field_no)
return 1;
- if (op1->opcode == UPDATE_OP_INSERT_BEFORE)
+ if (op1->opcode == UPDATE_OP_INSERT)
op1_field_no -= 1;
- else if (op1->opcode == UPDATE_OP_INSERT_AFTER)
- op1_field_no += 1;
- if (op2->opcode == UPDATE_OP_INSERT_BEFORE)
+ if (op2->opcode == UPDATE_OP_INSERT)
op2_field_no -= 1;
- else if (op2->opcode == UPDATE_OP_INSERT_AFTER)
- op2_field_no += 1;
if (op1_field_no < op2_field_no)
return -1;
@@ -624,7 +620,6 @@ static struct update_op_meta update_op_meta[UPDATE_OP_MAX + 1] = {
{ init_update_op_splice, (do_op_func) do_update_op_splice, false },
{ init_update_op_delete, (do_op_func) NULL, true },
{ init_update_op_insert, (do_op_func) do_update_op_insert, true },
- { init_update_op_insert, (do_op_func) do_update_op_insert, true },
{ init_update_op_none, (do_op_func) do_update_op_none, false },
{ init_update_op_error, (do_op_func) NULL, true }
};
@@ -697,8 +692,7 @@ update_field_init(struct update_cmd *cmd, struct update_field *field,
return;
}
- if (op->opcode == UPDATE_OP_INSERT_BEFORE ||
- op->opcode == UPDATE_OP_INSERT_AFTER) {
+ if (op->opcode == UPDATE_OP_INSERT) {
/* insert operaion always creates a new field */
field->new_len = 0;
field->old = "";
@@ -755,8 +749,7 @@ init_update_operations(struct box_txn *txn, struct update_cmd *cmd)
/*
* 2. Take care of the old tuple head.
*/
- if (cmd->op->field_no != 0 ||
- cmd->op->opcode == UPDATE_OP_INSERT_AFTER) {
+ if (cmd->op->field_no != 0) {
/*
* We need to copy part of the old tuple to the
* new one.
@@ -819,28 +812,23 @@ init_update_operations(struct box_txn *txn, struct update_cmd *cmd)
/* copy whole tail: from last opearation to */
skip_count = old_field_count - op->field_no - 1;
- if (op->opcode == UPDATE_OP_INSERT_BEFORE)
+ if (op->opcode == UPDATE_OP_INSERT)
/* we should copy field which before
inserting a new field */
skip_count += 1;
next_field = true;
} else if (op->field_no < next_op->field_no ||
- op->opcode == UPDATE_OP_INSERT_BEFORE ||
- next_op->opcode == UPDATE_OP_INSERT_AFTER) {
+ op->opcode == UPDATE_OP_INSERT) {
/* skip field in the middle of current operation and
next */
skip_count = MIN(next_op->field_no, old_field_count)
- op->field_no - 1;
- if (op->opcode == UPDATE_OP_INSERT_BEFORE)
+ if (op->opcode == UPDATE_OP_INSERT)
/* we should copy field which before inserting
a new field */
skip_count += 1;
- if (next_op->opcode == UPDATE_OP_INSERT_AFTER)
- /* we should copy field whitch after inserting
- a new field */
- skip_count += 1;
next_field = true;
}
diff --git a/test/connector_c/update.c b/test/connector_c/update.c
index b7f6d2db3f4e7dbfa5b1ffa716aa37468374d10c..8e2c35934d383e79c33fcbb0da26413e749cd8d9 100644
--- a/test/connector_c/update.c
+++ b/test/connector_c/update.c
@@ -98,19 +98,11 @@ update_delete_field(struct tnt_stream *stream, i32 field);
/** add update fields operation: insert before int32 */
void
-update_insert_before_i32(struct tnt_stream *stream, i32 field, i32 value);
+update_insert_i32(struct tnt_stream *stream, i32 field, i32 value);
/** add update fields operation: insert before string */
void
-update_insert_before_str(struct tnt_stream *stream, i32 field, char *str);
-
-/** add update fields operation: insert before int32 */
-void
-update_insert_after_i32(struct tnt_stream *stream, i32 field, i32 value);
-
-/** add update fields operation: insert before string */
-void
-update_insert_after_str(struct tnt_stream *stream, i32 field, char *str);
+update_insert_str(struct tnt_stream *stream, i32 field, char *str);
/** receive reply from server */
void
@@ -286,39 +278,22 @@ update_delete_field(struct tnt_stream *stream, i32 field)
}
void
-update_insert_before_i32(struct tnt_stream *stream, i32 field, i32 value)
+update_insert_i32(struct tnt_stream *stream, i32 field, i32 value)
{
- int result = tnt_update_insert_before(stream, field, (char *)&value,
- sizeof(value));
+ int result = tnt_update_insert(stream, field, (char *)&value,
+ sizeof(value));
if (result < 0)
- fail_tnt_error("tnt_update_insert_before", result);
+ fail_tnt_error("tnt_update_insert", result);
}
void
-update_insert_before_str(struct tnt_stream *stream, i32 field, char *str)
+update_insert_str(struct tnt_stream *stream, i32 field, char *str)
{
- int result = tnt_update_insert_before(stream, field, str, strlen(str));
+ int result = tnt_update_insert(stream, field, str, strlen(str));
if (result < 0)
fail_tnt_error("tnt_update_insert_before", result);
}
-void
-update_insert_after_i32(struct tnt_stream *stream, i32 field, i32 value)
-{
- int result = tnt_update_insert_after(stream, field, (char *)&value,
- sizeof(value));
- if (result < 0)
- fail_tnt_error("tnt_update_insert_after", result);
-}
-
-void
-update_insert_after_str(struct tnt_stream *stream, i32 field, char *str)
-{
- int result = tnt_update_insert_after(stream, field, str, strlen(str));
- if (result < 0)
- fail_tnt_error("tnt_update_insert_after", result);
-}
-
void
recv_command(char *command)
{
@@ -857,99 +832,60 @@ test_insert_field()
insert_tuple(tuple);
tnt_tuple_free(tuple);
- struct tnt_stream *stream = tnt_buf(NULL);
printf("# insert new field before primary key\n");
- update_insert_before_i32(stream, 0, 7);
+ struct tnt_stream *stream = tnt_buf(NULL);
+ update_insert_i32(stream, 0, 7);
+ update_insert_i32(stream, 0, 8);
update(9, stream);
tnt_stream_free(stream);
- stream = tnt_buf(NULL);
- printf("# insert a new field after primary key\n");
- update_insert_after_i32(stream, 0, 8);
- update(7, stream);
- tnt_stream_free(stream);
-
- stream = tnt_buf(NULL);
printf("# insert a new field before last field\n");
- update_insert_before_i32(stream, 3, 10);
- update(7, stream);
- tnt_stream_free(stream);
-
stream = tnt_buf(NULL);
- printf("# insert a new field after last field\n");
- update_insert_after_i32(stream, 4, 15);
+ update_insert_i32(stream, 3, 10);
update(7, stream);
tnt_stream_free(stream);
- stream = tnt_buf(NULL);
printf("# double insert before\n");
- update_insert_before_i32(stream, 5, 13);
- update_insert_before_i32(stream, 5, 14);
- update(7, stream);
- tnt_stream_free(stream);
-
stream = tnt_buf(NULL);
- printf("# insert before and after\n");
- update_insert_before_i32(stream, 5, 12);
- update_insert_after_i32(stream, 7, 16);
+ update_set_i32(stream, 5, 14);
update(7, stream);
tnt_stream_free(stream);
stream = tnt_buf(NULL);
- printf("# multi insert\n");
- update_set_i32(stream, 4, 1);
- update_insert_after_i32(stream, 9, 20);
- tnt_update_arith(stream, 4, TNT_UPDATE_ADD, 5);
- update_insert_after_i32(stream, 9, 21);
- tnt_update_arith(stream, 4, TNT_UPDATE_ADD, 5);
- update_set_i32(stream, 10, -3);
- tnt_update_arith(stream, 10, TNT_UPDATE_ADD, 5);
- tnt_update_arith(stream, 10, TNT_UPDATE_ADD, 5);
- tnt_update_arith(stream, 10, TNT_UPDATE_ADD, 5);
- tnt_update_arith(stream, 10, TNT_UPDATE_ADD, 5);
- tnt_update_arith(stream, 10, TNT_UPDATE_ADD, 5);
+ update_insert_i32(stream, 5, 12);
+ update_insert_i32(stream, 5, 13);
update(7, stream);
tnt_stream_free(stream);
printf("# insert second tuple\n");
- tuple = tnt_tuple(NULL, "%d%s%d", 0, "one", 15);
+ tuple = tnt_tuple(NULL, "%d%s%d", 0, "one", 11);
insert_tuple(tuple);
tnt_tuple_free(tuple);
stream = tnt_buf(NULL);
printf("# multi insert\n");
- update_insert_after_i32(stream, 1, 11);
- update_insert_after_i32(stream, 1, 12);
update_set_i32(stream, 1, -11);
tnt_update_arith(stream, 1, TNT_UPDATE_ADD, 1);
- update_insert_before_i32(stream, 1, 1);
+ update_insert_i32(stream, 1, 1);
tnt_update_arith(stream, 1, TNT_UPDATE_ADD, 2);
- update_insert_before_i32(stream, 1, 2);
- update_insert_before_i32(stream, 1, 3);
+ update_insert_i32(stream, 1, 2);
+ update_insert_i32(stream, 1, 3);
tnt_update_arith(stream, 1, TNT_UPDATE_ADD, 3);
tnt_update_arith(stream, 1, TNT_UPDATE_ADD, 4);
tnt_update_arith(stream, 1, TNT_UPDATE_ADD, 5);
- update_insert_before_i32(stream, 1, 4);
- update_insert_before_i32(stream, 1, 5);
+ update_insert_i32(stream, 1, 4);
+ update_insert_i32(stream, 1, 5);
tnt_update_arith(stream, 1, TNT_UPDATE_ADD, 6);
- update_insert_before_i32(stream, 1, 6);
- update_insert_after_i32(stream, 1, 13);
- update_insert_before_i32(stream, 1, 7);
- update_insert_before_i32(stream, 1, 8);
- update_insert_before_i32(stream, 1, 9);
- update_insert_after_i32(stream, 1, 14);
+ update_insert_i32(stream, 1, 6);
+ update_insert_i32(stream, 1, 7);
+ update_insert_i32(stream, 1, 8);
+ update_insert_i32(stream, 1, 9);
update(0, stream);
tnt_stream_free(stream);
stream = tnt_buf(NULL);
printf("# insert before invalid field number\n");
- update_insert_before_str(stream, 100000, "ooppps!");
- update(7, stream);
- tnt_stream_free(stream);
-
- stream = tnt_buf(NULL);
- printf("# insert after invalid field number\n");
- update_insert_after_str(stream, 100000, "ooppps!");
+ update_insert_str(stream, 100000, "ooppps!");
update(7, stream);
tnt_stream_free(stream);
diff --git a/test/connector_c/update.result b/test/connector_c/update.result
index b417d13c8e82523cf0d516041dcef3df9c139811..925016de3ac3231bb4c93d9d19274e4f132729fb 100644
--- a/test/connector_c/update.result
+++ b/test/connector_c/update.result
@@ -201,33 +201,21 @@ insert: respond ok (op: 13, reqid: 0, code: 0, count: 1)
(9 (0x00000009), 'eleven')
# insert new field before primary key
update fields: respond ok (op: 19, reqid: 0, code: 0, count: 1)
-(7 (0x00000007), 9 (0x00000009), 'eleven')
-# insert a new field after primary key
-update fields: respond ok (op: 19, reqid: 0, code: 0, count: 1)
(7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 'eleven')
# insert a new field before last field
update fields: respond ok (op: 19, reqid: 0, code: 0, count: 1)
(7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 10 (0x0000000a), 'eleven')
-# insert a new field after last field
-update fields: respond ok (op: 19, reqid: 0, code: 0, count: 1)
-(7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 10 (0x0000000a), 'eleven', 15 (0x0000000f))
# double insert before
update fields: respond ok (op: 19, reqid: 0, code: 0, count: 1)
-(7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 10 (0x0000000a), 'eleven', 13 (0x0000000d), 14 (0x0000000e), 15 (0x0000000f))
-# insert before and after
+(7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 10 (0x0000000a), 'eleven', 14 (0x0000000e))
update fields: respond ok (op: 19, reqid: 0, code: 0, count: 1)
-(7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 10 (0x0000000a), 'eleven', 12 (0x0000000c), 13 (0x0000000d), 14 (0x0000000e), 15 (0x0000000f), 16 (0x00000010))
-# multi insert
-update fields: respond ok (op: 19, reqid: 0, code: 0, count: 1)
-(7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 10 (0x0000000a), 11 (0x0000000b), 12 (0x0000000c), 13 (0x0000000d), 14 (0x0000000e), 15 (0x0000000f), 16 (0x00000010), 20 (0x00000014), 21 (0x00000015), 22 (0x00000016))
+(7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 10 (0x0000000a), 'eleven', 12 (0x0000000c), 13 (0x0000000d), 14 (0x0000000e))
# insert second tuple
insert: respond ok (op: 13, reqid: 0, code: 0, count: 1)
-(0 (0x00000000), 'one', 15 (0x0000000f))
+(0 (0x00000000), 'one', 11 (0x0000000b))
# multi insert
update fields: respond ok (op: 19, reqid: 0, code: 0, count: 1)
-(0 (0x00000000), 1 (0x00000001), 2 (0x00000002), 3 (0x00000003), 4 (0x00000004), 5 (0x00000005), 6 (0x00000006), 7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 10 (0x0000000a), 11 (0x0000000b), 12 (0x0000000c), 13 (0x0000000d), 14 (0x0000000e), 15 (0x0000000f))
+(0 (0x00000000), 1 (0x00000001), 2 (0x00000002), 3 (0x00000003), 4 (0x00000004), 5 (0x00000005), 6 (0x00000006), 7 (0x00000007), 8 (0x00000008), 9 (0x00000009), 10 (0x0000000a), 11 (0x0000000b))
# insert before invalid field number
update fields: respond ok (op: 19, reqid: 0, code: 13826, count: 0)
-# insert after invalid field number
-update fields: respond ok (op: 19, reqid: 0, code: 13826, count: 0)
<<< insert field test done