From 46cac24cd5693b05f287e9e60340df50c071016c Mon Sep 17 00:00:00 2001 From: Nikita Zheleztsov <n.zheleztsov@proton.me> Date: Mon, 7 Oct 2024 13:23:28 +0300 Subject: [PATCH] upgrade: introduce 2.11.5 schema version We decided to introduce new schema version, which does nothing in order to distinguish, which 2.11 schema we can safely use to allow persistent names on it. Follow up #10549 NO_DOC=internal NO_CHANGELOG=internal NO_TEST=nothing to test --- src/box/bootstrap.snap | Bin 4925 -> 4938 bytes src/box/lua/upgrade.lua | 10 ++++++++++ test/box-py/bootstrap.result | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap index f5ee0cbbce46b79d3475ff023688d7a2a6e04b95..05a7f7f169e7c47b0c7bfd03fa307991c6c79238 100644 GIT binary patch delta 2522 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 delta 2509 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 XD+;tpb3c<37_rW2?x$9>(+PJ8e1XZ@ diff --git a/src/box/lua/upgrade.lua b/src/box/lua/upgrade.lua index b8134d00fc..09cd448423 100644 --- a/src/box/lua/upgrade.lua +++ b/src/box/lua/upgrade.lua @@ -1406,7 +1406,15 @@ end local function upgrade_to_2_11_1() drop_schema_max_id() end + +-------------------------------------------------------------------------------- +-- Tarantool 2.11.5 -------------------------------------------------------------------------------- +local function upgrade_to_2_11_5() + -- NoOp. We need to bump schema version to distinguish, where persistent + -- names properly work before box.schema.upgrade is called. + return +end local handlers = { {version = mkversion(1, 7, 5), func = upgrade_to_1_7_5}, @@ -1428,6 +1436,7 @@ local handlers = { {version = mkversion(2, 10, 5), func = upgrade_to_2_10_5}, {version = mkversion(2, 11, 0), func = upgrade_to_2_11_0}, {version = mkversion(2, 11, 1), func = upgrade_to_2_11_1}, + {version = mkversion(2, 11, 5), func = upgrade_to_2_11_5}, } -- Schema version of the snapshot. @@ -2031,6 +2040,7 @@ local downgrade_versions = { "2.11.2", "2.11.3", "2.11.4", + "2.11.5", -- DOWNGRADE VERSIONS END } diff --git a/test/box-py/bootstrap.result b/test/box-py/bootstrap.result index a5ca5d40fd..7c63946fba 100644 --- a/test/box-py/bootstrap.result +++ b/test/box-py/bootstrap.result @@ -3,7 +3,7 @@ box.internal.bootstrap() ... box.space._schema:select{} --- -- - ['version', 2, 11, 1] +- - ['version', 2, 11, 5] ... box.space._cluster:select{} --- -- GitLab