From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Vladimir Davydov Subject: [PATCH v2 3/7] vinyl: rename tree_mem_key to vy_mem_tree_key Date: Sat, 6 Apr 2019 23:01:50 +0300 Message-Id: <2a030096f8f20da9355e93f2119d421c0fd981e9.1554580275.git.vdavydov.dev@gmail.com> In-Reply-To: References: In-Reply-To: References: To: tarantool-patches@freelists.org List-ID: For aesthetic purposes. No functional changes. --- src/box/vinyl.c | 2 +- src/box/vy_mem.c | 6 +++--- src/box/vy_mem.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/box/vinyl.c b/src/box/vinyl.c index b8f94b26..2029e112 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -3540,7 +3540,7 @@ vy_squash_process(struct vy_squash *squash) * vy_lsm_commit_upsert(). */ struct vy_mem *mem = lsm->mem; - struct tree_mem_key tree_key = { + struct vy_mem_tree_key tree_key = { .stmt = result, .lsn = vy_stmt_lsn(result), }; diff --git a/src/box/vy_mem.c b/src/box/vy_mem.c index d6d8dce2..dc1401ad 100644 --- a/src/box/vy_mem.c +++ b/src/box/vy_mem.c @@ -134,7 +134,7 @@ vy_mem_delete(struct vy_mem *index) struct tuple * vy_mem_older_lsn(struct vy_mem *mem, struct tuple *stmt) { - struct tree_mem_key tree_key; + struct vy_mem_tree_key tree_key; tree_key.stmt = stmt; tree_key.lsn = vy_stmt_lsn(stmt) - 1; bool exact = false; @@ -354,7 +354,7 @@ vy_mem_iterator_find_lsn(struct vy_mem_iterator *itr) * is going to take long. So instead we look it up - it's * pretty cheap anyway. */ - struct tree_mem_key tree_key; + struct vy_mem_tree_key tree_key; tree_key.stmt = itr->curr_stmt; tree_key.lsn = (**itr->read_view).vlsn; itr->curr_pos = vy_mem_tree_lower_bound(&itr->mem->tree, @@ -398,7 +398,7 @@ vy_mem_iterator_seek(struct vy_mem_iterator *itr, struct tuple *last_key) } bool exact; - struct tree_mem_key tree_key; + struct vy_mem_tree_key tree_key; tree_key.stmt = key; /* (lsn == INT64_MAX - 1) means that lsn is ignored in comparison */ tree_key.lsn = INT64_MAX - 1; diff --git a/src/box/vy_mem.h b/src/box/vy_mem.h index a68b8dc9..ba9e76ab 100644 --- a/src/box/vy_mem.h +++ b/src/box/vy_mem.h @@ -78,7 +78,7 @@ vy_mem_env_destroy(struct vy_mem_env *env); /** @cond false */ -struct tree_mem_key { +struct vy_mem_tree_key { struct tuple *stmt; int64_t lsn; }; @@ -101,7 +101,7 @@ vy_mem_tree_cmp(struct tuple *a, struct tuple *b, * Internal. Extracted to speed up BPS tree. */ static int -vy_mem_tree_cmp_key(struct tuple *a, struct tree_mem_key *key, +vy_mem_tree_cmp_key(struct tuple *a, struct vy_mem_tree_key *key, struct key_def *cmp_def) { int res = vy_stmt_compare(a, key->stmt, cmp_def); @@ -122,7 +122,7 @@ vy_mem_tree_cmp_key(struct tuple *a, struct tree_mem_key *key, #define BPS_TREE_COMPARE(a, b, cmp_def) vy_mem_tree_cmp(a, b, cmp_def) #define BPS_TREE_COMPARE_KEY(a, b, cmp_def) vy_mem_tree_cmp_key(a, b, cmp_def) #define bps_tree_elem_t struct tuple * -#define bps_tree_key_t struct tree_mem_key * +#define bps_tree_key_t struct vy_mem_tree_key * #define bps_tree_arg_t struct key_def * #define BPS_TREE_NO_DEBUG -- 2.11.0