From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [PATCH 1/2] xrow: allow to store tuple metadata in request Date: Fri, 17 Aug 2018 16:34:53 +0300 [thread overview] Message-ID: <594733e6fae641440341e299ed2766996948dc76.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> This patch set allows to store msgpack map with arbitrary keys inside a request. In particular, this is needed to store vinyl statement flags in run files. Needed for #2129 --- src/box/iproto_constants.c | 3 ++- src/box/iproto_constants.h | 3 ++- src/box/xrow.c | 13 ++++++++++++- src/box/xrow.h | 3 +++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/box/iproto_constants.c b/src/box/iproto_constants.c index e35738b4..a8d15cb1 100644 --- a/src/box/iproto_constants.c +++ b/src/box/iproto_constants.c @@ -87,6 +87,7 @@ const unsigned char iproto_key_type[IPROTO_KEY_MAX] = /* 0x27 */ MP_STR, /* IPROTO_EXPR */ /* 0x28 */ MP_ARRAY, /* IPROTO_OPS */ /* 0x29 */ MP_MAP, /* IPROTO_BALLOT */ + /* 0x2a */ MP_MAP, /* IPROTO_TUPLE_META */ /* }}} */ }; @@ -168,7 +169,7 @@ const char *iproto_key_strs[IPROTO_KEY_MAX] = { "expression", /* 0x27 */ "operations", /* 0x28 */ "ballot", /* 0x29 */ - NULL, /* 0x2a */ + "tuple meta", /* 0x2a */ NULL, /* 0x2b */ NULL, /* 0x2c */ NULL, /* 0x2d */ diff --git a/src/box/iproto_constants.h b/src/box/iproto_constants.h index f282a0b2..404f97a2 100644 --- a/src/box/iproto_constants.h +++ b/src/box/iproto_constants.h @@ -78,6 +78,7 @@ enum iproto_key { IPROTO_EXPR = 0x27, /* EVAL */ IPROTO_OPS = 0x28, /* UPSERT but not UPDATE ops, because of legacy */ IPROTO_BALLOT = 0x29, + IPROTO_TUPLE_META = 0x2a, /* Leave a gap between request keys and response keys */ IPROTO_DATA = 0x30, IPROTO_ERROR = 0x31, @@ -96,7 +97,7 @@ enum iproto_ballot_key { bit(LSN) | bit(SCHEMA_VERSION)) #define IPROTO_DML_BODY_BMAP (bit(SPACE_ID) | bit(INDEX_ID) | bit(LIMIT) |\ bit(OFFSET) | bit(ITERATOR) | bit(INDEX_BASE) |\ - bit(KEY) | bit(TUPLE) | bit(OPS)) + bit(KEY) | bit(TUPLE) | bit(OPS) | bit(TUPLE_META)) static inline bool xrow_header_has_key(const char *pos, const char *end) diff --git a/src/box/xrow.c b/src/box/xrow.c index 269a6e68..7a35d0db 100644 --- a/src/box/xrow.c +++ b/src/box/xrow.c @@ -532,6 +532,10 @@ error: request->ops = value; request->ops_end = data; break; + case IPROTO_TUPLE_META: + request->tuple_meta = value; + request->tuple_meta_end = data; + break; default: break; } @@ -585,7 +589,8 @@ xrow_encode_dml(const struct request *request, struct iovec *iov) const int MAP_LEN_MAX = 40; uint32_t key_len = request->key_end - request->key; uint32_t ops_len = request->ops_end - request->ops; - uint32_t len = MAP_LEN_MAX + key_len + ops_len; + uint32_t tuple_meta_len = request->tuple_meta_end - request->tuple_meta; + uint32_t len = MAP_LEN_MAX + key_len + ops_len + tuple_meta_len; char *begin = (char *) region_alloc(&fiber()->gc, len); if (begin == NULL) { diag_set(OutOfMemory, len, "region_alloc", "begin"); @@ -620,6 +625,12 @@ xrow_encode_dml(const struct request *request, struct iovec *iov) pos += ops_len; map_size++; } + if (request->tuple_meta) { + pos = mp_encode_uint(pos, IPROTO_TUPLE_META); + memcpy(pos, request->tuple_meta, tuple_meta_len); + pos += tuple_meta_len; + map_size++; + } if (request->tuple) { pos = mp_encode_uint(pos, IPROTO_TUPLE); iov[iovcnt].iov_base = (void *) request->tuple; diff --git a/src/box/xrow.h b/src/box/xrow.h index 9887382c..47216705 100644 --- a/src/box/xrow.h +++ b/src/box/xrow.h @@ -127,6 +127,9 @@ struct request { /** Upsert operations. */ const char *ops; const char *ops_end; + /** Tuple metadata. */ + const char *tuple_meta; + const char *tuple_meta_end; /** Base field offset for UPDATE/UPSERT, e.g. 0 for C and 1 for Lua. */ int index_base; }; -- 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 ` Vladimir Davydov [this message] 2018-08-17 13:34 ` [PATCH 2/2] vinyl: introduce statement flags Vladimir Davydov 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=594733e6fae641440341e299ed2766996948dc76.1534512655.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [PATCH 1/2] xrow: allow to store tuple metadata in request' \ /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