From 6a2fd3a0b0ae2b7717d8633701f45e6a27535c4a Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov@tarantool.org>
Date: Tue, 25 Oct 2022 13:19:00 +0300
Subject: [PATCH] read_view: rename flags
needs_FOO looks awkward for a flag name. Let's rename the flags to
enable_FOO. The new names will also look better in conjunction with the
disable_decompression flag that will be added in the scope of #7815.
NO_DOC=internal
NO_TEST=internal
NO_CHANGELOG=internal
---
src/box/memtx_engine.cc | 2 +-
src/box/read_view.c | 12 ++++++------
src/box/read_view.h | 12 ++++++------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/box/memtx_engine.cc b/src/box/memtx_engine.cc
index d5889551d8..7d20689b8e 100644
--- a/src/box/memtx_engine.cc
+++ b/src/box/memtx_engine.cc
@@ -515,7 +515,7 @@ memtx_engine_create_read_view(struct engine *engine,
(struct memtx_read_view *)xmalloc(sizeof(*rv));
rv->base.vtab = &vtab;
struct memtx_read_view_opts memtx_opts;
- memtx_opts.include_temporary_tuples = opts->needs_temporary_spaces;
+ memtx_opts.include_temporary_tuples = opts->enable_temporary_spaces;
rv->allocators_rv = memtx_allocators_open_read_view(memtx_opts);
return (struct engine_read_view *)rv;
}
diff --git a/src/box/read_view.c b/src/box/read_view.c
index f5812e7180..95a5e9a59d 100644
--- a/src/box/read_view.c
+++ b/src/box/read_view.c
@@ -46,9 +46,9 @@ read_view_opts_create(struct read_view_opts *opts)
opts->filter_space = default_space_filter;
opts->filter_index = default_index_filter;
opts->filter_arg = NULL;
- opts->needs_field_names = false;
- opts->needs_space_upgrade = false;
- opts->needs_temporary_spaces = false;
+ opts->enable_field_names = false;
+ opts->enable_space_upgrade = false;
+ opts->enable_temporary_spaces = false;
}
static void
@@ -88,7 +88,7 @@ space_read_view_new(struct space *space, const struct read_view_opts *opts)
space_rv->id = space_id(space);
space_rv->group_id = space_group_id(space);
- if (opts->needs_field_names && space->def->field_count > 0) {
+ if (opts->enable_field_names && space->def->field_count > 0) {
space_rv->fields = field_def_array_dup(space->def->fields,
space->def->field_count);
assert(space_rv->fields != NULL);
@@ -98,7 +98,7 @@ space_read_view_new(struct space *space, const struct read_view_opts *opts)
space_rv->field_count = 0;
}
space_rv->format = NULL;
- if (opts->needs_space_upgrade && space->upgrade != NULL) {
+ if (opts->enable_space_upgrade && space->upgrade != NULL) {
space_rv->upgrade = space_upgrade_read_view_new(space->upgrade);
assert(space_rv->upgrade != NULL);
} else {
@@ -137,7 +137,7 @@ read_view_add_space_cb(struct space *space, void *arg_raw)
struct read_view *rv = arg->rv;
const struct read_view_opts *opts = arg->opts;
if ((space->engine->flags & ENGINE_SUPPORTS_READ_VIEW) == 0 ||
- (space_is_temporary(space) && !opts->needs_temporary_spaces) ||
+ (space_is_temporary(space) && !opts->enable_temporary_spaces) ||
!opts->filter_space(space, opts->filter_arg))
return 0;
struct space_read_view *space_rv = space_read_view_new(space, opts);
diff --git a/src/box/read_view.h b/src/box/read_view.h
index 48fe63178c..998e990095 100644
--- a/src/box/read_view.h
+++ b/src/box/read_view.h
@@ -35,7 +35,7 @@ struct space_read_view {
char *name;
/**
* Tuple field definition array used by this space. Allocated only if
- * read_view_opts::needs_field_names is set, otherwise set to NULL.
+ * read_view_opts::enable_field_names is set, otherwise set to NULL.
* Used for creation of space_read_view::format.
*/
struct field_def *fields;
@@ -45,7 +45,7 @@ struct space_read_view {
* Runtime tuple format needed to access tuple field names by name.
* Referenced (ref counter incremented).
*
- * A new format is created only if read_view_opts::needs_field_names
+ * A new format is created only if read_view_opts::enable_field_names
* is set, otherwise runtime_tuple_format is used.
*
* We can't just use the space tuple format as is because it allocates
@@ -59,7 +59,7 @@ struct space_read_view {
/**
* Upgrade function for this space read view or NULL if there wasn't
* a space upgrade in progress at the time when this read view was
- * created or read_view_opts::needs_space_upgrade wasn't set.
+ * created or read_view_opts::enable_space_upgrade wasn't set.
*/
struct space_upgrade_read_view *upgrade;
/** Replication group id. See space_opts::group_id. */
@@ -127,19 +127,19 @@ struct read_view_opts {
* otherwise the preallocated name-less runtime tuple format will be
* used instead.
*/
- bool needs_field_names;
+ bool enable_field_names;
/**
* If this flag is set and there's a space upgrade in progress at the
* time when this read view is created, create an upgrade function that
* can be applied to tuples retrieved from this read view. See also
* space_read_view::upgrade.
*/
- bool needs_space_upgrade;
+ bool enable_space_upgrade;
/**
* Temporary spaces aren't included into this read view unless this
* flag is set.
*/
- bool needs_temporary_spaces;
+ bool enable_temporary_spaces;
};
/** Sets read view options to default values. */
--
GitLab