From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Kirill Yukhin Subject: [PATCH 2/4] Set is_temporary flag for formats of ephemeral spaces Date: Tue, 22 Jan 2019 17:07:18 +0300 Message-Id: <648713a318a3ac1181db921b0894881e25cf810c.1548165435.git.kyukhin@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: vdavydov.dev@gmail.com Cc: tarantool-patches@freelists.org, Kirill Yukhin List-ID: Before the patch, when ephemeral space was created flag is_temporary was set after space was actually created. Which in turn lead to corresponding flag of tuple_format being set to `false`. So, having heavy load using ephemeral spaces (almost any SQL query) and snapshotting at the same time might lead to OOM, since tuples of ephemeral spaces were not marked as temporary and were not gc-ed. Patch sets the flag in space definition. --- src/box/space_def.c | 13 +++++++++++++ src/box/space_def.h | 9 +++++++++ src/box/sql.c | 6 +----- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/box/space_def.c b/src/box/space_def.c index 3516bdd..1d2bfcb 100644 --- a/src/box/space_def.c +++ b/src/box/space_def.c @@ -257,6 +257,19 @@ space_def_new(uint32_t id, uint32_t uid, uint32_t exact_field_count, return def; } +struct space_def* +space_def_new_ephemeral(uint32_t field_count) +{ + struct space_def *space_def = space_def_new(0, 0 , field_count, + "ephemeral", + strlen("ephemeral"), + "memtx", strlen("memtx"), + &space_opts_default, + &field_def_default, 0); + space_def->opts.is_temporary = true; + return space_def; +} + /** Free a default value's syntax trees of @a defs. */ void space_def_destroy_fields(struct field_def *fields, uint32_t field_count, diff --git a/src/box/space_def.h b/src/box/space_def.h index 8044f88..e8d46c5 100644 --- a/src/box/space_def.h +++ b/src/box/space_def.h @@ -169,6 +169,15 @@ space_def_new(uint32_t id, uint32_t uid, uint32_t exact_field_count, const struct space_opts *opts, const struct field_def *fields, uint32_t field_count); +/** + * Create a new ephemeral space. + * @param field_count Number of fields in the space. + * + * @retval Space definition. + */ +struct space_def * +space_def_new_ephemeral(uint32_t field_count); + /** * Size of the space_def. * @param name_len Length of the space name. diff --git a/src/box/sql.c b/src/box/sql.c index 081a038..387da7b 100644 --- a/src/box/sql.c +++ b/src/box/sql.c @@ -408,11 +408,7 @@ sql_ephemeral_space_create(uint32_t field_count, struct sql_key_info *key_info) rlist_add_entry(&key_list, ephemer_index_def, link); struct space_def *ephemer_space_def = - space_def_new(0 /* space id */, 0 /* user id */, field_count, - "ephemeral", strlen("ephemeral"), - "memtx", strlen("memtx"), - &space_opts_default, &field_def_default, - 0 /* length of field_def */); + space_def_new_ephemeral(field_count); if (ephemer_space_def == NULL) { index_def_delete(ephemer_index_def); return NULL; -- 2.19.1