<HTML><BODY>Thanks for the patch!<br>LGTM.<br>Sergos<br><br><br><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Wednesday, November 6, 2019 6:08 PM +03:00 from Vladislav Shpilevoy <v.shpilevoy@tarantool.org>:<br>
<br>
<div id="">
<div class="js-helper js-readmsg-msg">
<style type="text/css"></style>
<div>
<div id="style_15730529122022353082_BODY">Tuple_update is a too general name for the updates implemented<br>
in these files. Indeed, a tuple can be updated from Lua, from<br>
SQL, from update microlanguage. Xrow_update is a more specific<br>
name, which is already widely used in tuple_update.c.<br>
<br>
Part of #1261<br>
---<br>
src/box/CMakeLists.txt | 2 +-<br>
src/box/lua/tuple.c | 2 +-<br>
src/box/memtx_space.c | 2 +-<br>
src/box/space.c | 2 +-<br>
src/box/tuple.c | 3 +--<br>
src/box/tuple.h | 2 +-<br>
src/box/vinyl.c | 2 +-<br>
src/box/vy_upsert.c | 2 +-<br>
src/box/{tuple_update.c => xrow_update.c} | 3 +--<br>
src/box/{tuple_update.h => xrow_update.h} | 6 +++---<br>
test/unit/column_mask.c | 2 +-<br>
11 files changed, 13 insertions(+), 15 deletions(-)<br>
rename src/box/{tuple_update.c => xrow_update.c} (99%)<br>
rename src/box/{tuple_update.h => xrow_update.h} (95%)<br>
<br>
diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt<br>
index 9d2fcea4b..2f921fc1c 100644<br>
--- a/src/box/CMakeLists.txt<br>
+++ b/src/box/CMakeLists.txt<br>
@@ -40,7 +40,7 @@ add_library(tuple STATIC<br>
tuple.c<br>
field_map.c<br>
tuple_format.c<br>
- tuple_update.c<br>
+ xrow_update.c<br>
tuple_compare.cc<br>
tuple_extract_key.cc<br>
tuple_hash.cc<br>
diff --git a/src/box/lua/tuple.c b/src/box/lua/tuple.c<br>
index 4b6298cb5..f97df4bc0 100644<br>
--- a/src/box/lua/tuple.c<br>
+++ b/src/box/lua/tuple.c<br>
@@ -29,7 +29,7 @@<br>
* SUCH DAMAGE.<br>
*/<br>
#include "box/lua/tuple.h"<br>
-#include "box/tuple_update.h"<br>
+#include "box/xrow_update.h"<br>
<br>
#include "lua/utils.h" /* luaT_error() */<br>
#include "lua/msgpack.h" /* luamp_encode_XXX() */<br>
diff --git a/src/box/memtx_space.c b/src/box/memtx_space.c<br>
index 601e98ce5..86de4dada 100644<br>
--- a/src/box/memtx_space.c<br>
+++ b/src/box/memtx_space.c<br>
@@ -33,7 +33,7 @@<br>
#include "iproto_constants.h"<br>
#include "txn.h"<br>
#include "tuple.h"<br>
-#include "tuple_update.h"<br>
+#include "xrow_update.h"<br>
#include "xrow.h"<br>
#include "memtx_hash.h"<br>
#include "memtx_tree.h"<br>
diff --git a/src/box/space.c b/src/box/space.c<br>
index 042be042c..f0c1f2ce8 100644<br>
--- a/src/box/space.c<br>
+++ b/src/box/space.c<br>
@@ -39,7 +39,7 @@<br>
#include "session.h"<br>
#include "txn.h"<br>
#include "tuple.h"<br>
-#include "tuple_update.h"<br>
+#include "xrow_update.h"<br>
#include "request.h"<br>
#include "xrow.h"<br>
#include "iproto_constants.h"<br>
diff --git a/src/box/tuple.c b/src/box/tuple.c<br>
index 261505f9a..04a723892 100644<br>
--- a/src/box/tuple.c<br>
+++ b/src/box/tuple.c<br>
@@ -35,8 +35,7 @@<br>
#include "fiber.h"<br>
#include "small/quota.h"<br>
#include "small/small.h"<br>
-<br>
-#include "tuple_update.h"<br>
+#include "xrow_update.h"<br>
#include "coll_id_cache.h"<br>
<br>
static struct mempool tuple_iterator_pool;<br>
diff --git a/src/box/tuple.h b/src/box/tuple.h<br>
index ab0c7a99b..db615ce1a 100644<br>
--- a/src/box/tuple.h<br>
+++ b/src/box/tuple.h<br>
@@ -1115,7 +1115,7 @@ tuple_to_buf(struct tuple *tuple, char *buf, size_t size);<br>
#if defined(__cplusplus)<br>
} /* extern "C" */<br>
<br>
-#include "tuple_update.h"<br>
+#include "xrow_update.h"<br>
#include "errinj.h"<br>
<br>
/* @copydoc tuple_field_with_type() */<br>
diff --git a/src/box/vinyl.c b/src/box/vinyl.c<br>
index a2bbaa529..2f0b548af 100644<br>
--- a/src/box/vinyl.c<br>
+++ b/src/box/vinyl.c<br>
@@ -58,7 +58,7 @@<br>
#include "coio_task.h"<br>
#include "cbus.h"<br>
#include "histogram.h"<br>
-#include "tuple_update.h"<br>
+#include "xrow_update.h"<br>
#include "txn.h"<br>
#include "xrow.h"<br>
#include "xlog.h"<br>
diff --git a/src/box/vy_upsert.c b/src/box/vy_upsert.c<br>
index 817d29cfd..5b4a75d25 100644<br>
--- a/src/box/vy_upsert.c<br>
+++ b/src/box/vy_upsert.c<br>
@@ -34,7 +34,7 @@<br>
#include <small/region.h><br>
#include <msgpuck/msgpuck.h><br>
#include "vy_stmt.h"<br>
-#include "tuple_update.h"<br>
+#include "xrow_update.h"<br>
#include "fiber.h"<br>
#include "column_mask.h"<br>
<br>
diff --git a/src/box/tuple_update.c b/src/box/xrow_update.c<br>
similarity index 99%<br>
rename from src/box/tuple_update.c<br>
rename to src/box/xrow_update.c<br>
index 9e926d59d..958ed1c99 100644<br>
--- a/src/box/tuple_update.c<br>
+++ b/src/box/xrow_update.c<br>
@@ -28,8 +28,7 @@<br>
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF<br>
* SUCH DAMAGE.<br>
*/<br>
-<br>
-#include "tuple_update.h"<br>
+#include "xrow_update.h"<br>
#include <stdbool.h><br>
<br>
#include "say.h"<br>
diff --git a/src/box/tuple_update.h b/src/box/xrow_update.h<br>
similarity index 95%<br>
rename from src/box/tuple_update.h<br>
rename to src/box/xrow_update.h<br>
index b6210dd38..3aac74e60 100644<br>
--- a/src/box/tuple_update.h<br>
+++ b/src/box/xrow_update.h<br>
@@ -1,5 +1,5 @@<br>
-#ifndef TARANTOOL_BOX_TUPLE_UPDATE_H_INCLUDED<br>
-#define TARANTOOL_BOX_TUPLE_UPDATE_H_INCLUDED<br>
+#ifndef TARANTOOL_BOX_XROW_UPDATE_H_INCLUDED<br>
+#define TARANTOOL_BOX_XROW_UPDATE_H_INCLUDED<br>
/*<br>
* Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.<br>
*<br>
@@ -83,4 +83,4 @@ tuple_upsert_squash(const char *expr1, const char *expr1_end,<br>
} /* extern "C" */<br>
#endif /* defined(__cplusplus) */<br>
<br>
-#endif /* TARANTOOL_BOX_TUPLE_UPDATE_H_INCLUDED */<br>
+#endif /* TARANTOOL_BOX_XROW_UPDATE_H_INCLUDED */<br>
diff --git a/test/unit/column_mask.c b/test/unit/column_mask.c<br>
index 5ee8b7332..b3047860e 100644<br>
--- a/test/unit/column_mask.c<br>
+++ b/test/unit/column_mask.c<br>
@@ -1,5 +1,5 @@<br>
#include "column_mask.h"<br>
-#include "tuple_update.h"<br>
+#include "xrow_update.h"<br>
#include "unit.h"<br>
#include "msgpuck.h"<br>
#include "trivia/util.h"<br>
-- <br>
2.21.0 (Apple Git-122.2)<br></div></div></div></div></blockquote></BODY></HTML>