From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 3F99B6EC58; Wed, 4 Aug 2021 16:00:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3F99B6EC58 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628082040; bh=uilyB8IT5ck/I07sBmlDgl/MCGjwlRX3nssbVkhrPWk=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=l+bNkyjW6y2LUpYeCg++5i6Ct//IUP38ngoqDEiFhEVUM5mV3bV6eJsx3DOwN4DmA bKR6h72xmEi2HkC47s5vj8Al486bqhQkTPAzFsxTMaK/9qoAe9PfOYcvX9BGU8OM4s ss8SmzulNTW8iCRw79DX4n6YZAvSwlOsMQUBtqFM= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 6B2426F3E0 for ; Wed, 4 Aug 2021 15:58:44 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6B2426F3E0 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mBGTr-0000GN-Rs; Wed, 04 Aug 2021 15:58:44 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Wed, 4 Aug 2021 15:58:43 +0300 Message-Id: <6033113bc5174be7b6e2b38b7dc07a2c61755e13.1628081224.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD941C43E597735A9C3FDAB68B812060C77E97CF8617D978122182A05F538085040DD3C9C242B8BC3C5ECEEA54F7ACF33B78973BD8F546EE6DD5D52829B73E173C6 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78D584A18421A528BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063726CA83C7ABDB938E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D836303A2AE408FC22DAE20293CCF2EB4D117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC8C7ADC89C2F0B2A5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C30CE973C7F71088D83DFFE185EBE630B89DCCD7B40FBA8609C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF3033054805BDE987699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34ADE558D2B396DA7CC277B35D7F325FECA2795BC164936D9F832977DB7D761EECBD595791C3A8C1FC1D7E09C32AA3244CBEA0949CC976CE265B347B9FCAF3B34BB018FE5BB746DCD1729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojeDyvyeZJDJHp0PuT0vQK0g== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DF704C5DB7EC0F37FBB43A9A4D43ED8FC83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 4/6] alter: parse data dictionary version X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mergen Imeev via Tarantool-patches Reply-To: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Version is needed to disallow creation of SQL built-in functions using _func starting with 2.9.0. Needed for #6106 --- src/box/alter.cc | 18 ++++++++++++++++++ src/box/schema.cc | 4 ++++ src/box/schema.h | 1 + 3 files changed, 23 insertions(+) diff --git a/src/box/alter.cc b/src/box/alter.cc index 935790df4..217b882ba 100644 --- a/src/box/alter.cc +++ b/src/box/alter.cc @@ -4167,6 +4167,24 @@ on_replace_dd_schema(struct trigger * /* trigger */, void *event) return -1; REPLICASET_UUID = uu; say_info("cluster uuid %s", tt_uuid_str(&uu)); + } else if (strcmp(key, "version") == 0) { + if (new_tuple != NULL) { + uint32_t major, minor, patch; + if (tuple_field_u32(new_tuple, 1, &major) != 0 || + tuple_field_u32(new_tuple, 2, &minor) != 0) + tnt_raise(ClientError, ER_WRONG_DD_VERSION); + /* Version can be major.minor with no patch. */ + if (tuple_field_u32(new_tuple, 3, &patch) != 0) + patch = 0; + dd_version_id = version_id(major, minor, patch); + } else { + assert(old_tuple != NULL); + /* + * _schema:delete({'version'}) for + * example, for box.internal.bootstrap(). + */ + dd_version_id = tarantool_version_id(); + } } return 0; } diff --git a/src/box/schema.cc b/src/box/schema.cc index 963278b19..35026619a 100644 --- a/src/box/schema.cc +++ b/src/box/schema.cc @@ -38,6 +38,7 @@ #include "user.h" #include "vclock/vclock.h" #include "fiber.h" +#include "version.h" /** * @module Data Dictionary @@ -70,6 +71,9 @@ uint32_t schema_version = 0; */ uint32_t space_cache_version = 0; +/** Persistent version of the schema, stored in _schema["version"]. */ +uint32_t dd_version_id = tarantool_version_id(); + struct rlist on_schema_init = RLIST_HEAD_INITIALIZER(on_schema_init); struct rlist on_alter_space = RLIST_HEAD_INITIALIZER(on_alter_space); struct rlist on_alter_sequence = RLIST_HEAD_INITIALIZER(on_alter_sequence); diff --git a/src/box/schema.h b/src/box/schema.h index 25ac6f110..d3bbdd590 100644 --- a/src/box/schema.h +++ b/src/box/schema.h @@ -44,6 +44,7 @@ struct func; extern uint32_t schema_version; extern uint32_t space_cache_version; +extern uint32_t dd_version_id; /** Triggers invoked after schema initialization. */ extern struct rlist on_schema_init; -- 2.25.1