From 5269f2eaa6261b7870dd7550be064c6241a40b94 Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov@tarantool.org>
Date: Wed, 27 Apr 2022 13:02:59 +0300
Subject: [PATCH] space_upgrade: pass format to space_upgrade_new
We need the new format to apply the upgrade function to a tuple.
Follow-up commit 38b25832f9fb ("box: add space upgrade stubs").
NO_DOC=internal
NO_TEST=internal
NO_CHANGELOG=internal
---
src/box/space.c | 2 +-
src/box/space_upgrade.h | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/box/space.c b/src/box/space.c
index ed5d8c2eff..0832121348 100644
--- a/src/box/space.c
+++ b/src/box/space.c
@@ -234,7 +234,7 @@ space_create(struct space *space, struct engine *engine,
if (space->def->opts.upgrade_def != NULL) {
space->upgrade = space_upgrade_new(
- space->def->opts.upgrade_def);
+ space->def->opts.upgrade_def, format);
if (space->upgrade == NULL)
goto fail;
}
diff --git a/src/box/space_upgrade.h b/src/box/space_upgrade.h
index c322793541..d312dc20eb 100644
--- a/src/box/space_upgrade.h
+++ b/src/box/space_upgrade.h
@@ -25,6 +25,7 @@ struct space_def;
struct space_upgrade;
struct space_upgrade_def;
struct tuple;
+struct tuple_format;
/**
* Decodes space upgrade definition from MsgPack data.
@@ -59,14 +60,16 @@ space_upgrade_def_delete(struct space_upgrade_def *def)
}
/**
- * Creates a space upgrade state from a definition.
+ * Creates a space upgrade state from a definition and the new space format.
* Returns NULL and sets diag on error.
* The reference count of the new state is set to 1.
*/
static inline struct space_upgrade *
-space_upgrade_new(const struct space_upgrade_def *def)
+space_upgrade_new(const struct space_upgrade_def *def,
+ struct tuple_format *format)
{
(void)def;
+ (void)format;
unreachable();
return NULL;
}
--
GitLab