From 5bc703f69fe7d4d648696e2d96414c23a6d4136b Mon Sep 17 00:00:00 2001
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Date: Wed, 1 Mar 2023 22:53:59 +0100
Subject: [PATCH] alter: fix wrong usage of BOX_CLUSTER_FIELD_UUID
It was used for getting _schema tuple[1] field. Worked because
BOX_CLUSTER_FIELD_UUID is also 1. This commit introduces
BOX_SCHEMA_FIELD_VALUE.
It is going to be used in the next commits more extensively for
new _schema tuples.
Part of #5029
NO_DOC=refactoring
NO_CHANGELOG=refactoring
NO_TEST=already covered
---
src/box/alter.cc | 2 +-
src/box/schema_def.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/box/alter.cc b/src/box/alter.cc
index 068ac6ac46..62f9ecc68f 100644
--- a/src/box/alter.cc
+++ b/src/box/alter.cc
@@ -3904,7 +3904,7 @@ on_replace_dd_schema(struct trigger * /* trigger */, void *event)
return -1;
}
tt_uuid uu;
- if (tuple_field_uuid(new_tuple, BOX_CLUSTER_FIELD_UUID, &uu) != 0)
+ if (tuple_field_uuid(new_tuple, BOX_SCHEMA_FIELD_VALUE, &uu) != 0)
return -1;
REPLICASET_UUID = uu;
box_broadcast_id();
diff --git a/src/box/schema_def.h b/src/box/schema_def.h
index 34529790d2..8084303698 100644
--- a/src/box/schema_def.h
+++ b/src/box/schema_def.h
@@ -206,6 +206,7 @@ enum {
/** _schema fields. */
enum {
BOX_SCHEMA_FIELD_KEY = 0,
+ BOX_SCHEMA_FIELD_VALUE = 1,
};
/** _cluster fields. */
--
GitLab