From: "v.shpilevoy@tarantool.org" <v.shpilevoy@tarantool.org> To: tarantool-patches@freelists.org Cc: Konstantin Osipov <kostja@tarantool.org>, Vladimir Davydov <vdavydov.dev@gmail.com> Subject: Re: [tarantool-patches] [PATCH 05/12] vinyl: do not reallocate tuple formats on alter Date: Sun, 1 Apr 2018 14:12:26 +0300 [thread overview] Message-ID: <998CF4CA-7826-4848-B895-C82D8C8DDB22@tarantool.org> (raw) In-Reply-To: <475ebc439ee72ccd55b1158c354a01b2452a6bd5.1522572161.git.vdavydov.dev@gmail.com> > 1 апр. 2018 г., в 12:05, Vladimir Davydov <vdavydov.dev@gmail.com> написал(а): > > We create new formats for all indexes of the new space in > vinyl_space_commit_alter() while we don't actually need to > do this, because the new formats have already been created > by vy_lsm_new() - all we need to do is reuse them somehow. > > This patch does the trick: it implements the swap_index() > space virtual method for vinyl so that it swaps tuple formats > between the old and new spaces. > --- > src/box/vinyl.c | 58 ++++++++++++++++++++++----------------------------------- > 1 file changed, 22 insertions(+), 36 deletions(-) > > diff --git a/src/box/vinyl.c b/src/box/vinyl.c > index fc37283a..f3cef52f 100644 > --- a/src/box/vinyl.c > +++ b/src/box/vinyl.c > +static void > +vinyl_space_swap_index(struct space *old_space, struct space *new_space, > + uint32_t old_index_id, uint32_t new_index_id) > +{ > + struct vy_lsm *old_lsm = vy_lsm(old_space->index_map[old_index_id]); > + struct vy_lsm *new_lsm = vy_lsm(new_space->index_map[new_index_id]); > + > + /* > + * Swap the two indexes between the two spaces, > + * but leave tuple formats. > + */ > + generic_space_swap_index(old_space, new_space, > + old_index_id, new_index_id); > + > + SWAP(old_lsm->mem_format, new_lsm->mem_format); How do you swap the formats, if they are variable length structures? 1) Their fields[] arrays are not swapped here, 2) even if you will try to swap - they can have different length. > + SWAP(old_lsm->mem_format_with_colmask, > + new_lsm->mem_format_with_colmask); > + SWAP(old_lsm->disk_format, new_lsm->disk_format); > + SWAP(old_lsm->opts, new_lsm->opts); > } > > static int > @@ -3938,7 +3924,7 @@ static const struct space_vtab vinyl_space_vtab = { > /* .drop_primary_key = */ vinyl_space_drop_primary_key, > /* .check_format = */ vinyl_space_check_format, > /* .build_secondary_key = */ vinyl_space_build_secondary_key, > - /* .swap_index = */ generic_space_swap_index, > + /* .swap_index = */ vinyl_space_swap_index, > /* .prepare_alter = */ vinyl_space_prepare_alter, > /* .commit_alter = */ vinyl_space_commit_alter, > }; > -- > 2.11.0 > >
next prev parent reply other threads:[~2018-04-01 11:12 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-01 9:05 [PATCH 00/12] vinyl: allow to extend key def of non-empty index Vladimir Davydov 2018-04-01 9:05 ` [PATCH 01/12] index: add commit_modify virtual method Vladimir Davydov 2018-04-01 9:05 ` [PATCH 02/12] alter: require rebuild of all secondary vinyl indexes if pk changes Vladimir Davydov 2018-04-01 9:05 ` [PATCH 03/12] alter: do not rebuild secondary indexes on compatible " Vladimir Davydov 2018-04-05 12:30 ` Konstantin Osipov 2018-04-01 9:05 ` [PATCH 04/12] space: make space_swap_index method virtual Vladimir Davydov 2018-04-01 9:05 ` [PATCH 05/12] vinyl: do not reallocate tuple formats on alter Vladimir Davydov 2018-04-01 11:12 ` v.shpilevoy [this message] 2018-04-01 11:24 ` [tarantool-patches] " Vladimir Davydov 2018-04-01 9:05 ` [PATCH 06/12] vinyl: zap vy_lsm_validate_formats Vladimir Davydov 2018-04-01 9:05 ` [PATCH 07/12] vinyl: zap vy_mem_update_formats Vladimir Davydov 2018-04-01 9:05 ` [PATCH 08/12] vinyl: remove pointless is_nullable initialization for disk_format Vladimir Davydov 2018-04-01 9:05 ` [PATCH 09/12] vinyl: use source tuple format when copying field map Vladimir Davydov 2018-04-01 9:05 ` [PATCH 10/12] vinyl: rename vy_log_record::commit_lsn to create_lsn Vladimir Davydov 2018-04-01 9:05 ` [PATCH 11/12] vinyl: do not write VY_LOG_DUMP_LSM record to snapshot Vladimir Davydov 2018-04-01 9:05 ` [PATCH 12/12] vinyl: allow to modify key definition if it does not require rebuild Vladimir Davydov 2018-04-02 8:46 ` Vladimir Davydov 2018-04-05 14:32 ` Konstantin Osipov 2018-04-05 14:45 ` Konstantin Osipov 2018-04-05 14:48 ` Konstantin Osipov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=998CF4CA-7826-4848-B895-C82D8C8DDB22@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [tarantool-patches] [PATCH 05/12] vinyl: do not reallocate tuple formats on alter' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox