[Tarantool-patches] [PATCH v2 4/6] alter: parse data dictionary version
imeevma at tarantool.org
imeevma at tarantool.org
Mon Aug 9 10:19:00 MSK 2021
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 | 3 +++
src/box/schema.h | 1 +
3 files changed, 22 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..5659e15b7 100644
--- a/src/box/schema.cc
+++ b/src/box/schema.cc
@@ -70,6 +70,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 = 0;
+
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
More information about the Tarantool-patches
mailing list