From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [PATCH 2/2] vinyl: introduce statement flags Date: Fri, 17 Aug 2018 16:34:54 +0300 [thread overview] Message-ID: <e8893a2fac877b1564050ab6fafb81fea7878f37.1534512655.git.vdavydov.dev@gmail.com> (raw) In-Reply-To: <cover.1534512655.git.vdavydov.dev@gmail.com> In-Reply-To: <cover.1534512655.git.vdavydov.dev@gmail.com> In the scope of #2129 we need to mark REPLACE statements for which we generated DELETE in secondary indexes so that we don't generate DELETE again on compaction. We also need to mark DELETE statements that were generated on compaction so that we can skip them on SELECT. Let's add flags field to struct vy_stmt. Flags are stored both in memory and on disk - they are encoded in tuple meta in the latter case. Needed for #2129 --- src/box/vy_stmt.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/box/vy_stmt.h | 15 +++++++++++++ 2 files changed, 79 insertions(+) diff --git a/src/box/vy_stmt.c b/src/box/vy_stmt.c index a4b7975b..bcf3dd11 100644 --- a/src/box/vy_stmt.c +++ b/src/box/vy_stmt.c @@ -45,6 +45,14 @@ #include "xrow.h" #include "fiber.h" +/** + * Statement metadata keys. + */ +enum vy_stmt_meta_key { + /** Statement flags. */ + VY_STMT_FLAGS = 0x01, +}; + static struct tuple * vy_tuple_new(struct tuple_format *format, const char *data, const char *end) { @@ -112,6 +120,7 @@ vy_stmt_alloc(struct tuple_format *format, uint32_t bsize) tuple->data_offset = sizeof(struct vy_stmt) + meta_size;; vy_stmt_set_lsn(tuple, 0); vy_stmt_set_type(tuple, 0); + vy_stmt_set_flags(tuple, 0); return tuple; } @@ -485,6 +494,56 @@ vy_stmt_extract_key_raw(const char *data, const char *data_end, return key; } +/** + * Encode the given statement meta data in a request. + * Returns 0 on success, -1 on memory allocation error. + */ +static int +vy_stmt_meta_encode(const struct tuple *stmt, struct request *request) +{ + if (vy_stmt_flags(stmt) == 0) + return 0; /* nothing to encode */ + + size_t len = mp_sizeof_map(1) * 2 * mp_sizeof_uint(UINT64_MAX); + char *buf = region_alloc(&fiber()->gc, len); + if (buf == NULL) + return -1; + char *pos = buf; + pos = mp_encode_map(pos, 1); + pos = mp_encode_uint(pos, VY_STMT_FLAGS); + pos = mp_encode_uint(pos, vy_stmt_flags(stmt)); + assert(pos <= buf + len); + + request->tuple_meta = buf; + request->tuple_meta_end = pos; + return 0; +} + +/** + * Decode statement meta data from a request. + */ +static void +vy_stmt_meta_decode(struct request *request, struct tuple *stmt) +{ + const char *data = request->tuple_meta; + if (data == NULL) + return; /* nothing to decode */ + + uint32_t size = mp_decode_map(&data); + for (uint32_t i = 0; i < size; i++) { + uint64_t key = mp_decode_uint(&data); + switch (key) { + case VY_STMT_FLAGS: { + uint64_t flags = mp_decode_uint(&data); + vy_stmt_set_flags(stmt, flags); + break; + } + default: + mp_next(&data); /* unknown key, ignore */ + } + } +} + int vy_stmt_encode_primary(const struct tuple *value, const struct key_def *key_def, uint32_t space_id, @@ -525,6 +584,8 @@ vy_stmt_encode_primary(const struct tuple *value, default: unreachable(); } + if (vy_stmt_meta_encode(value, &request) != 0) + return -1; xrow->bodycnt = xrow_encode_dml(&request, xrow->body); if (xrow->bodycnt < 0) return -1; @@ -556,6 +617,8 @@ vy_stmt_encode_secondary(const struct tuple *value, request.key = extracted; request.key_end = extracted + size; } + if (vy_stmt_meta_encode(value, &request) != 0) + return -1; xrow->bodycnt = xrow_encode_dml(&request, xrow->body); if (xrow->bodycnt < 0) return -1; @@ -613,6 +676,7 @@ vy_stmt_decode(struct xrow_header *xrow, const struct key_def *key_def, if (stmt == NULL) return NULL; /* OOM */ + vy_stmt_meta_decode(&request, stmt); vy_stmt_set_lsn(stmt, xrow->lsn); return stmt; } diff --git a/src/box/vy_stmt.h b/src/box/vy_stmt.h index e53f98ce..bcf855dd 100644 --- a/src/box/vy_stmt.h +++ b/src/box/vy_stmt.h @@ -103,6 +103,7 @@ struct vy_stmt { struct tuple base; int64_t lsn; uint8_t type; /* IPROTO_SELECT/REPLACE/UPSERT/DELETE */ + uint8_t flags; /** * Offsets array concatenated with MessagePack fields * array. @@ -138,6 +139,20 @@ vy_stmt_set_type(struct tuple *stmt, enum iproto_type type) ((struct vy_stmt *) stmt)->type = type; } +/** Get flags of the vinyl statement. */ +static inline uint8_t +vy_stmt_flags(const struct tuple *stmt) +{ + return ((const struct vy_stmt *)stmt)->flags; +} + +/** Set flags of the vinyl statement. */ +static inline void +vy_stmt_set_flags(struct tuple *stmt, uint8_t flags) +{ + ((struct vy_stmt *)stmt)->flags = flags; +} + /** * Get upserts count of the vinyl statement. * Only for UPSERT statements allocated on lsregion. -- 2.11.0
next prev parent reply other threads:[~2018-08-17 13:34 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-08 16:48 [RFC PATCH 02/23] vinyl: always get full tuple from pk after reading from secondary index Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 00/23] vinyl: eliminate read on REPLACE/DELETE Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 01/23] vinyl: do not turn REPLACE into INSERT when processing DML request Vladimir Davydov 2018-07-10 12:15 ` Konstantin Osipov 2018-07-10 12:19 ` Vladimir Davydov 2018-07-10 18:39 ` Konstantin Osipov 2018-07-11 7:57 ` Vladimir Davydov 2018-07-11 10:25 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 03/23] vinyl: use vy_mem_iterator for point lookup Vladimir Davydov 2018-07-17 10:14 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 04/23] vinyl: make point lookup always return the latest tuple version Vladimir Davydov 2018-07-10 16:19 ` Konstantin Osipov 2018-07-10 16:43 ` Vladimir Davydov 2018-07-11 16:33 ` Vladimir Davydov 2018-07-31 19:17 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 05/23] vinyl: fold vy_replace_one and vy_replace_impl Vladimir Davydov 2018-07-31 20:28 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 06/23] vinyl: fold vy_delete_impl Vladimir Davydov 2018-07-31 20:28 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 07/23] vinyl: refactor unique check Vladimir Davydov 2018-07-31 20:28 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 08/23] vinyl: check key uniqueness before modifying tx write set Vladimir Davydov 2018-07-31 20:34 ` Konstantin Osipov 2018-08-01 10:42 ` Vladimir Davydov 2018-08-09 20:26 ` Konstantin Osipov 2018-08-10 8:26 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 09/23] vinyl: remove env argument of vy_check_is_unique_{primary,secondary} Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 10/23] vinyl: store full tuples in secondary index cache Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 11/23] xrow: allow to store flags in DML requests Vladimir Davydov 2018-07-31 20:36 ` Konstantin Osipov 2018-08-01 14:10 ` Vladimir Davydov 2018-08-17 13:34 ` Vladimir Davydov 2018-08-17 13:34 ` [PATCH 1/2] xrow: allow to store tuple metadata in request Vladimir Davydov 2018-08-17 13:34 ` Vladimir Davydov [this message] 2018-07-08 16:48 ` [RFC PATCH 12/23] vinyl: do not pass region explicitly to write iterator functions Vladimir Davydov 2018-07-17 10:16 ` Vladimir Davydov 2018-07-31 20:38 ` Konstantin Osipov 2018-08-01 14:14 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 13/23] vinyl: fix potential use-after-free in vy_read_view_merge Vladimir Davydov 2018-07-17 10:16 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 14/23] test: unit/vy_write_iterator: minor refactoring Vladimir Davydov 2018-07-17 10:17 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 15/23] vinyl: teach write iterator to return overwritten tuples Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 16/23] vinyl: allow to skip certain statements on read Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 17/23] vinyl: do not free pending tasks on shutdown Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 18/23] vinyl: store pointer to scheduler in struct vy_task Vladimir Davydov 2018-07-31 20:39 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 19/23] vinyl: rename some members of vy_scheduler and vy_task struct Vladimir Davydov 2018-07-31 20:40 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 20/23] vinyl: use cbus for communication between scheduler and worker threads Vladimir Davydov 2018-07-31 20:43 ` Konstantin Osipov 2018-08-01 14:26 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 21/23] vinyl: zap vy_scheduler::is_worker_pool_running Vladimir Davydov 2018-07-31 20:43 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 22/23] vinyl: rename vy_task::status to is_failed Vladimir Davydov 2018-07-31 20:44 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 23/23] vinyl: eliminate read on REPLACE/DELETE Vladimir Davydov 2018-07-13 10:53 ` Vladimir Davydov 2018-07-13 10:53 ` [PATCH 1/3] stailq: add stailq_insert function Vladimir Davydov 2018-07-15 7:02 ` Konstantin Osipov 2018-07-15 13:17 ` Vladimir Davydov 2018-07-15 18:40 ` Konstantin Osipov 2018-07-17 10:18 ` Vladimir Davydov 2018-07-13 10:53 ` [PATCH 2/3] vinyl: link all indexes of the same space Vladimir Davydov 2018-07-13 10:53 ` [PATCH 3/3] vinyl: generate deferred DELETEs on tx commit Vladimir Davydov
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=e8893a2fac877b1564050ab6fafb81fea7878f37.1534512655.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [PATCH 2/2] vinyl: introduce statement flags' \ /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