<HTML><BODY><div>Hi Sergey, thank you for the patch, LGTM.<br><br> <blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Среда, 8 апреля 2020, 18:43 +03:00 от Sergey Bronnikov <estetus@gmail.com>:<br> <div id=""><div class="js-helper js-readmsg-msg"><style type="text/css"></style><div><div id="style_15863606111193640343_BODY">From: Sergey Bronnikov <<a href="/compose?To=sergeyb@tarantool.org">sergeyb@tarantool.org</a>><br><br>Closes #4681<br>---<br> src/box/lua/upgrade.lua | 12 ++++++------<br> 1 file changed, 6 insertions(+), 6 deletions(-)<br><br>diff --git a/src/box/lua/upgrade.lua b/src/box/lua/upgrade.lua<br>index 075cc236e..6b8ece513 100644<br>--- a/src/box/lua/upgrade.lua<br>+++ b/src/box/lua/upgrade.lua<br>@@ -173,7 +173,7 @@ local function initial_1_7_5()<br> format[5] = {name='field_count', type='unsigned'}<br> format[6] = {name='flags', type='map'}<br> format[7] = {name='format', type='array'}<br>- local def = _space:insert{_space.id, ADMIN, '_space', 'memtx', 0, MAP, format}<br>+ _space:insert{_space.id, ADMIN, '_space', 'memtx', 0, MAP, format}<br> -- space name is unique<br> log.info("create index primary on _space")<br> _index:insert{_space.id, 0, 'primary', 'tree', { unique = true }, {{0, 'unsigned'}}}<br>@@ -194,7 +194,7 @@ local function initial_1_7_5()<br> format[4] = {name = 'type', type = 'string'}<br> format[5] = {name = 'opts', type = 'map'}<br> format[6] = {name = 'parts', type = 'array'}<br>- def = _space:insert{_index.id, ADMIN, '_index', 'memtx', 0, MAP, format}<br>+ _space:insert{_index.id, ADMIN, '_index', 'memtx', 0, MAP, format}<br> -- index name is unique within a space<br> log.info("create index primary on _index")<br> _index:insert{_index.id, 0, 'primary', 'tree', {unique = true}, {{0, 'unsigned'}, {1, 'unsigned'}}}<br>@@ -211,7 +211,7 @@ local function initial_1_7_5()<br> format[2] = {name='owner', type='unsigned'}<br> format[3] = {name='name', type='string'}<br> format[4] = {name='setuid', type='unsigned'}<br>- def = _space:insert{_func.id, ADMIN, '_func', 'memtx', 0, MAP, format}<br>+ _space:insert{_func.id, ADMIN, '_func', 'memtx', 0, MAP, format}<br> -- function name and id are unique<br> log.info("create index _func:primary")<br> _index:insert{_func.id, 0, 'primary', 'tree', {unique = true}, {{0, 'unsigned'}}}<br>@@ -231,7 +231,7 @@ local function initial_1_7_5()<br> format[3] = {name='name', type='string'}<br> format[4] = {name='type', type='string'}<br> format[5] = {name='auth', type='map'}<br>- def = _space:insert{_user.id, ADMIN, '_user', 'memtx', 0, MAP, format}<br>+ _space:insert{_user.id, ADMIN, '_user', 'memtx', 0, MAP, format}<br> -- user name and id are unique<br> log.info("create index _func:primary")<br> _index:insert{_user.id, 0, 'primary', 'tree', {unique = true}, {{0, 'unsigned'}}}<br>@@ -251,7 +251,7 @@ local function initial_1_7_5()<br> format[3] = {name='object_type', type='string'}<br> format[4] = {name='object_id', type='unsigned'}<br> format[5] = {name='privilege', type='unsigned'}<br>- def = _space:insert{_priv.id, ADMIN, '_priv', 'memtx', 0, MAP, format}<br>+ _space:insert{_priv.id, ADMIN, '_priv', 'memtx', 0, MAP, format}<br> -- user id, object type and object id are unique<br> log.info("create index primary on _priv")<br> _index:insert{_priv.id, 0, 'primary', 'tree', {unique = true}, {{1, 'unsigned'}, {2, 'string'}, {3, 'unsigned'}}}<br>@@ -580,7 +580,7 @@ local function upgrade_to_2_1_0()<br> -- Now, abscent field means NULL, so we can safely set second<br> -- field in format, marking it nullable.<br> log.info("Add nullable value field to space _schema")<br>- local format = {}<br>+ format = {}<br> format[1] = {type='string', name='key'}<br> format[2] = {type='any', name='value', is_nullable=true}<br> box.space._schema:format(format)<br>--<br>2.23.0<br> </div></div></div></div></blockquote> <div> </div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Alexander Tikhonov</div></div></div><div> </div></div></BODY></HTML>