diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap
index 0bb446fb6903ac3ef630c419b909f7db3df0372a..a6d94673831550d5c122f29de513f017790cfe44 100644
Binary files a/src/box/bootstrap.snap and b/src/box/bootstrap.snap differ
diff --git a/src/box/index_def.c b/src/box/index_def.c
index 6c37f9f1d72308aa48c918457462870935ff9796..c743d12ce514ec91286e5778f617650206fbf562 100644
--- a/src/box/index_def.c
+++ b/src/box/index_def.c
@@ -62,6 +62,7 @@ const struct opt_def index_opts_reg[] = {
OPT_DEF("run_size_ratio", OPT_FLOAT, struct index_opts, run_size_ratio),
OPT_DEF("bloom_fpr", OPT_FLOAT, struct index_opts, bloom_fpr),
OPT_DEF("lsn", OPT_INT64, struct index_opts, lsn),
+ OPT_DEF_LEGACY("sql"),
OPT_END,
};
diff --git a/src/box/lua/upgrade.lua b/src/box/lua/upgrade.lua
index c72711ff755676d642c1881311edf40b79495730..dc7328714c1bf622246bdffc43e9f4855298f145 100644
--- a/src/box/lua/upgrade.lua
+++ b/src/box/lua/upgrade.lua
@@ -616,6 +616,22 @@ local function upgrade_to_2_1_0()
upgrade_priv_to_2_1_0()
end
+--------------------------------------------------------------------------------
+-- Tarantool 2.1.1
+--------------------------------------------------------------------------------
+
+local function upgrade_to_2_1_1()
+ local _index = box.space[box.schema.INDEX_ID]
+ for _, index in _index:pairs() do
+ local opts = index.opts
+ if opts['sql'] ~= nil then
+ opts['sql'] = nil
+ _index:replace(box.tuple.new({index.id, index.iid, index.name,
+ index.type, opts, index.parts}))
+ end
+ end
+end
+
local function get_version()
local version = box.space._schema:get{'version'}
if version == nil then
@@ -643,7 +659,8 @@ local function upgrade(options)
{version = mkversion(1, 7, 7), func = upgrade_to_1_7_7, auto = true},
{version = mkversion(1, 10, 0), func = upgrade_to_1_10_0, auto = true},
{version = mkversion(1, 10, 2), func = upgrade_to_1_10_2, auto = true},
- {version = mkversion(2, 1, 0), func = upgrade_to_2_1_0, auto = true}
+ {version = mkversion(2, 1, 0), func = upgrade_to_2_1_0, auto = true},
+ {version = mkversion(2, 1, 1), func = upgrade_to_2_1_1, auto = true}
}
for _, handler in ipairs(handlers) do
diff --git a/src/box/opt_def.c b/src/box/opt_def.c
index 1d1f09ed5dc1dc26b941a229f274c6b2a7279883..c780214408b661a9c8aa9d4ca1ece371edb1bdac 100644
--- a/src/box/opt_def.c
+++ b/src/box/opt_def.c
@@ -45,6 +45,7 @@ const char *opt_type_strs[] = {
/* [OPT_STRPTR] = */ "string",
/* [OPT_ENUM] = */ "enum",
/* [OPT_ARRAY] = */ "array",
+ /* [OPT_LEGACY] = */ "legacy",
};
static int
@@ -145,6 +146,9 @@ opt_set(void *opts, const struct opt_def *def, const char **val,
if (def->to_array(val, ival, opt, errcode, field_no) != 0)
return -1;
break;
+ case OPT_LEGACY:
+ mp_next(val);
+ break;
default:
unreachable();
}
diff --git a/src/box/opt_def.h b/src/box/opt_def.h
index 318204e912f177e063b9c3a12b9fe2bc238fad12..21544412c53f88d2fdd521e6ab809ba9c1dd862e 100644
--- a/src/box/opt_def.h
+++ b/src/box/opt_def.h
@@ -48,6 +48,7 @@ enum opt_type {
OPT_STRPTR, /* char* */
OPT_ENUM, /* enum */
OPT_ARRAY, /* array */
+ OPT_LEGACY, /* any type, skipped */
opt_type_MAX,
};
@@ -106,6 +107,9 @@ struct opt_def {
{ key, OPT_ARRAY, offsetof(opts, field), sizeof(((opts *)0)->field), \
NULL, 0, NULL, 0, {(void *)to_array} }
+#define OPT_DEF_LEGACY(key) \
+ { key, OPT_LEGACY, 0, 0, NULL, 0, NULL, 0, {NULL} }
+
#define OPT_END {NULL, opt_type_MAX, 0, 0, NULL, 0, NULL, 0, {NULL}}
struct region;
diff --git a/test/box-py/bootstrap.result b/test/box-py/bootstrap.result
index 3e4394557ba07478bae336bf5020c3d6b0d4d569..cdf07117e0f38e46bd081296f36e61b24ae44bb1 100644
--- a/test/box-py/bootstrap.result
+++ b/test/box-py/bootstrap.result
@@ -4,7 +4,7 @@ box.internal.bootstrap()
box.space._schema:select{}
---
- - ['max_id', 511]
- - ['version', 2, 1, 0]
+ - ['version', 2, 1, 1]
...
box.space._cluster:select{}
---
diff --git a/test/sql/upgrade.result b/test/sql/upgrade.result
index 02ab9b42b912aa79472e2a1375efeefe5d5cdc36..0e2a4d54a764d83362183f3cb65868c9f9b93e27 100644
--- a/test/sql/upgrade.result
+++ b/test/sql/upgrade.result
@@ -158,3 +158,52 @@ test_run:cmd('cleanup server upgrade')
---
- true
...
+-- Test Tarantool 2.1.0 to 2.1.1 migration.
+work_dir = 'sql/upgrade/2.1.0/'
+---
+...
+test_run:cmd('create server upgrade210 with script="sql/upgrade/upgrade.lua", workdir="' .. work_dir .. '"')
+---
+- true
+...
+test_run:cmd('start server upgrade210')
+---
+- true
+...
+test_run:switch('upgrade210')
+---
+- true
+...
+s = box.space.T5
+---
+...
+s ~= nil
+---
+- true
+...
+i = box.space._index:select(s.id)
+---
+...
+i ~= nil
+---
+- true
+...
+i[1].opts.sql == nil
+---
+- true
+...
+s:drop()
+---
+...
+test_run:switch('default')
+---
+- true
+...
+test_run:cmd('stop server upgrade210')
+---
+- true
+...
+test_run:cmd('cleanup server upgrade210')
+---
+- true
+...
diff --git a/test/sql/upgrade.test.lua b/test/sql/upgrade.test.lua
index cd4dd3cca9dab04713106e9607e857432d45f826..58bba0a85cae7dba1c2582c7cc0dd39e973c92e7 100644
--- a/test/sql/upgrade.test.lua
+++ b/test/sql/upgrade.test.lua
@@ -53,3 +53,21 @@ box.sql.execute("DROP TABLE T_OUT;")
test_run:switch('default')
test_run:cmd('stop server upgrade')
test_run:cmd('cleanup server upgrade')
+
+-- Test Tarantool 2.1.0 to 2.1.1 migration.
+work_dir = 'sql/upgrade/2.1.0/'
+test_run:cmd('create server upgrade210 with script="sql/upgrade/upgrade.lua", workdir="' .. work_dir .. '"')
+test_run:cmd('start server upgrade210')
+
+test_run:switch('upgrade210')
+
+s = box.space.T5
+s ~= nil
+i = box.space._index:select(s.id)
+i ~= nil
+i[1].opts.sql == nil
+s:drop()
+
+test_run:switch('default')
+test_run:cmd('stop server upgrade210')
+test_run:cmd('cleanup server upgrade210')
diff --git a/test/sql/upgrade/2.1.0/00000000000000000003.snap b/test/sql/upgrade/2.1.0/00000000000000000003.snap
new file mode 100644
index 0000000000000000000000000000000000000000..3fb5ddff862ff242df271c9c724cc55de871f3ed
Binary files /dev/null and b/test/sql/upgrade/2.1.0/00000000000000000003.snap differ