From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 30CDC42EF64 for ; Fri, 3 Jul 2020 09:33:33 +0300 (MSK) Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1jrFGO-0003jC-M0 for tarantool-patches@dev.tarantool.org; Fri, 03 Jul 2020 09:33:33 +0300 From: Aleksandr Lyapunov Date: Fri, 3 Jul 2020 09:33:15 +0300 Message-Id: <1593757997-4145-14-git-send-email-alyapunov@tarantool.org> In-Reply-To: <1593757997-4145-1-git-send-email-alyapunov@tarantool.org> References: <1593757997-4145-1-git-send-email-alyapunov@tarantool.org> Subject: [Tarantool-patches] [PATCH 13/15] tx: indexes List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org --- src/box/memtx_bitset.c | 28 ++++++++++++------- src/box/memtx_hash.c | 60 +++++++++++++++++++++++++++++++++++------ src/box/memtx_rtree.c | 27 ++++++++++++++++--- src/box/memtx_tree.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 162 insertions(+), 26 deletions(-) diff --git a/src/box/memtx_bitset.c b/src/box/memtx_bitset.c index 67eaf6f..f3ab74f 100644 --- a/src/box/memtx_bitset.c +++ b/src/box/memtx_bitset.c @@ -40,6 +40,7 @@ #include "fiber.h" #include "index.h" #include "tuple.h" +#include "txn.h" #include "memtx_engine.h" struct memtx_bitset_index { @@ -198,19 +199,26 @@ bitset_index_iterator_next(struct iterator *iterator, struct tuple **ret) assert(iterator->free == bitset_index_iterator_free); struct bitset_index_iterator *it = bitset_index_iterator(iterator); - size_t value = tt_bitset_iterator_next(&it->bitset_it); - if (value == SIZE_MAX) { - *ret = NULL; - return 0; - } - + do { + size_t value = tt_bitset_iterator_next(&it->bitset_it); + if (value == SIZE_MAX) { + *ret = NULL; + return 0; + } #ifndef OLD_GOOD_BITSET - struct memtx_bitset_index *index = - (struct memtx_bitset_index *)iterator->index; - *ret = memtx_bitset_index_value_to_tuple(index, value); + struct memtx_bitset_index *index = + (struct memtx_bitset_index *)iterator->index; + struct tuple *tuple = + memtx_bitset_index_value_to_tuple(index, value); #else /* #ifndef OLD_GOOD_BITSET */ - *ret = value_to_tuple(value); + struct tuple *tuple =value_to_tuple(value); #endif /* #ifndef OLD_GOOD_BITSET */ + uint32_t iid = iterator->index->def->iid; + struct txn *txn = in_txn(); + bool is_rw = txn != NULL; + *ret = txm_tuple_clarify(txn, tuple, iid, 0, is_rw); + } while (*ret == NULL); + return 0; } diff --git a/src/box/memtx_hash.c b/src/box/memtx_hash.c index cdd531c..b3ae60c 100644 --- a/src/box/memtx_hash.c +++ b/src/box/memtx_hash.c @@ -33,6 +33,7 @@ #include "fiber.h" #include "index.h" #include "tuple.h" +#include "txn.h" #include "memtx_engine.h" #include "space.h" #include "schema.h" /* space_cache_find() */ @@ -101,7 +102,7 @@ hash_iterator_free(struct iterator *iterator) } static int -hash_iterator_ge(struct iterator *ptr, struct tuple **ret) +hash_iterator_ge_base(struct iterator *ptr, struct tuple **ret) { assert(ptr->free == hash_iterator_free); struct hash_iterator *it = (struct hash_iterator *) ptr; @@ -113,10 +114,10 @@ hash_iterator_ge(struct iterator *ptr, struct tuple **ret) } static int -hash_iterator_gt(struct iterator *ptr, struct tuple **ret) +hash_iterator_gt_base(struct iterator *ptr, struct tuple **ret) { assert(ptr->free == hash_iterator_free); - ptr->next = hash_iterator_ge; + ptr->next = hash_iterator_ge_base; struct hash_iterator *it = (struct hash_iterator *) ptr; struct memtx_hash_index *index = (struct memtx_hash_index *)ptr->index; struct tuple **res = light_index_iterator_get_and_next(&index->hash_table, @@ -128,6 +129,31 @@ hash_iterator_gt(struct iterator *ptr, struct tuple **ret) return 0; } +#define WRAP_ITERATOR_METHOD(name) \ +static int \ +name(struct iterator *iterator, struct tuple **ret) \ +{ \ + struct txn *txn = in_txn(); \ + bool is_rw = txn != NULL; \ + uint32_t iid = iterator->index->def->iid; \ + bool first = true; \ + do { \ + int rc = first ? name##_base(iterator, ret) \ + : hash_iterator_ge_base(iterator, ret); \ + if (rc != 0 || *ret == NULL) \ + return rc; \ + first = false; \ + *ret = txm_tuple_clarify(txn, *ret, iid, 0, is_rw); \ + } while (*ret == NULL); \ + return 0; \ +} \ +struct forgot_to_add_semicolon + +WRAP_ITERATOR_METHOD(hash_iterator_ge); +WRAP_ITERATOR_METHOD(hash_iterator_gt); + +#undef WRAP_ITERATOR_METHOD + static int hash_iterator_eq_next(MAYBE_UNUSED struct iterator *it, struct tuple **ret) { @@ -136,12 +162,25 @@ hash_iterator_eq_next(MAYBE_UNUSED struct iterator *it, struct tuple **ret) } static int -hash_iterator_eq(struct iterator *it, struct tuple **ret) +hash_iterator_eq(struct iterator *ptr, struct tuple **ret) { - it->next = hash_iterator_eq_next; - return hash_iterator_ge(it, ret); + ptr->next = hash_iterator_eq_next; + assert(ptr->free == hash_iterator_free); + struct hash_iterator *it = (struct hash_iterator *) ptr; + struct memtx_hash_index *index = (struct memtx_hash_index *)ptr->index; + struct tuple **res = light_index_iterator_get_and_next(&index->hash_table, + &it->iterator); + if (res == NULL) { + *ret = NULL; + return 0; + } + struct txn *txn = in_txn(); + bool is_rw = txn != NULL; + *ret = txm_tuple_clarify(txn, *res, ptr->index->def->iid, 0, is_rw); + return 0; } + /* }}} */ /* {{{ MemtxHash -- implementation of all hashes. **********************/ @@ -282,8 +321,13 @@ memtx_hash_index_get(struct index *base, const char *key, *result = NULL; uint32_t h = key_hash(key, base->def->key_def); uint32_t k = light_index_find_key(&index->hash_table, h, key); - if (k != light_index_end) - *result = light_index_get(&index->hash_table, k); + if (k != light_index_end) { + struct tuple *tuple = light_index_get(&index->hash_table, k); + uint32_t iid = base->def->iid; + struct txn *txn = in_txn(); + bool is_rw = txn != NULL; + *result = txm_tuple_clarify(txn, tuple, iid, 0, is_rw); + } return 0; } diff --git a/src/box/memtx_rtree.c b/src/box/memtx_rtree.c index 612fcb2..992a422 100644 --- a/src/box/memtx_rtree.c +++ b/src/box/memtx_rtree.c @@ -40,6 +40,7 @@ #include "trivia/util.h" #include "tuple.h" +#include "txn.h" #include "space.h" #include "memtx_engine.h" @@ -148,7 +149,15 @@ static int index_rtree_iterator_next(struct iterator *i, struct tuple **ret) { struct index_rtree_iterator *itr = (struct index_rtree_iterator *)i; - *ret = (struct tuple *)rtree_iterator_next(&itr->impl); + do { + *ret = (struct tuple *) rtree_iterator_next(&itr->impl); + if (*ret == NULL) + break; + uint32_t iid = i->index->def->iid; + struct txn *txn = in_txn(); + bool is_rw = txn != NULL; + *ret = txm_tuple_clarify(txn, *ret, iid, 0, is_rw); + } while (*ret == NULL); return 0; } @@ -213,8 +222,20 @@ memtx_rtree_index_get(struct index *base, const char *key, unreachable(); *result = NULL; - if (rtree_search(&index->tree, &rect, SOP_OVERLAPS, &iterator)) - *result = (struct tuple *)rtree_iterator_next(&iterator); + if (!rtree_search(&index->tree, &rect, SOP_OVERLAPS, &iterator)) { + rtree_iterator_destroy(&iterator); + return 0; + } + do { + struct tuple *tuple = (struct tuple *) + rtree_iterator_next(&iterator); + if (tuple == NULL) + break; + uint32_t iid = base->def->iid; + struct txn *txn = in_txn(); + bool is_rw = txn != NULL; + *result = txm_tuple_clarify(txn, tuple, iid, 0, is_rw); + } while (*result == NULL); rtree_iterator_destroy(&iterator); return 0; } diff --git a/src/box/memtx_tree.c b/src/box/memtx_tree.c index 76ff3fc..b77c85c 100644 --- a/src/box/memtx_tree.c +++ b/src/box/memtx_tree.c @@ -37,6 +37,7 @@ #include "fiber.h" #include "key_list.h" #include "tuple.h" +#include "txn.h" #include #include @@ -175,7 +176,7 @@ tree_iterator_dummie(struct iterator *iterator, struct tuple **ret) } static int -tree_iterator_next(struct iterator *iterator, struct tuple **ret) +tree_iterator_next_base(struct iterator *iterator, struct tuple **ret) { struct memtx_tree_index *index = (struct memtx_tree_index *)iterator->index; @@ -205,7 +206,7 @@ tree_iterator_next(struct iterator *iterator, struct tuple **ret) } static int -tree_iterator_prev(struct iterator *iterator, struct tuple **ret) +tree_iterator_prev_base(struct iterator *iterator, struct tuple **ret) { struct memtx_tree_index *index = (struct memtx_tree_index *)iterator->index; @@ -234,7 +235,7 @@ tree_iterator_prev(struct iterator *iterator, struct tuple **ret) } static int -tree_iterator_next_equal(struct iterator *iterator, struct tuple **ret) +tree_iterator_next_equal_base(struct iterator *iterator, struct tuple **ret) { struct memtx_tree_index *index = (struct memtx_tree_index *)iterator->index; @@ -270,7 +271,7 @@ tree_iterator_next_equal(struct iterator *iterator, struct tuple **ret) } static int -tree_iterator_prev_equal(struct iterator *iterator, struct tuple **ret) +tree_iterator_prev_equal_base(struct iterator *iterator, struct tuple **ret) { struct memtx_tree_index *index = (struct memtx_tree_index *)iterator->index; @@ -304,6 +305,45 @@ tree_iterator_prev_equal(struct iterator *iterator, struct tuple **ret) return 0; } +#define WRAP_ITERATOR_METHOD(name) \ +static int \ +name(struct iterator *iterator, struct tuple **ret) \ +{ \ + struct memtx_tree *tree = \ + &((struct memtx_tree_index *)iterator->index)->tree; \ + struct tree_iterator *it = tree_iterator(iterator); \ + struct memtx_tree_iterator *ti = &it->tree_iterator; \ + uint32_t iid = iterator->index->def->iid; \ + bool is_multikey = iterator->index->def->key_def->is_multikey; \ + struct txn *txn = in_txn(); \ + bool is_rw = txn != NULL; \ + do { \ + int rc = name##_base(iterator, ret); \ + if (rc != 0 || *ret == NULL) \ + return rc; \ + uint32_t mk_index = 0; \ + if (is_multikey) { \ + struct memtx_tree_data *check = \ + memtx_tree_iterator_get_elem(tree, ti); \ + assert(check != NULL); \ + mk_index = check->hint; \ + } \ + *ret = txm_tuple_clarify(txn, *ret, iid, mk_index, is_rw); \ + } while (*ret == NULL); \ + tuple_unref(it->current.tuple); \ + it->current.tuple = *ret; \ + tuple_ref(it->current.tuple); \ + return 0; \ +} \ +struct forgot_to_add_semicolon + +WRAP_ITERATOR_METHOD(tree_iterator_next); +WRAP_ITERATOR_METHOD(tree_iterator_prev); +WRAP_ITERATOR_METHOD(tree_iterator_next_equal); +WRAP_ITERATOR_METHOD(tree_iterator_prev_equal); + +#undef WRAP_ITERATOR_METHOD + static void tree_iterator_set_next_method(struct tree_iterator *it) { @@ -388,6 +428,21 @@ tree_iterator_start(struct iterator *iterator, struct tuple **ret) tuple_ref(*ret); it->current = *res; tree_iterator_set_next_method(it); + + uint32_t iid = iterator->index->def->iid; + bool is_multikey = iterator->index->def->key_def->is_multikey; + struct txn *txn = in_txn(); + bool is_rw = txn != NULL; + uint32_t mk_index = is_multikey ? res->hint : 0; + *ret = txm_tuple_clarify(txn, *ret, iid, mk_index, is_rw); + if (*ret == NULL) { + return iterator->next(iterator, ret); + } else { + tuple_unref(it->current.tuple); + it->current.tuple = *ret; + tuple_ref(it->current.tuple); + } + return 0; } @@ -539,7 +594,15 @@ memtx_tree_index_get(struct index *base, const char *key, key_data.part_count = part_count; key_data.hint = key_hint(key, part_count, cmp_def); struct memtx_tree_data *res = memtx_tree_find(&index->tree, &key_data); - *result = res != NULL ? res->tuple : NULL; + if (res == NULL) { + *result = NULL; + return 0; + } + struct txn *txn = in_txn(); + bool is_rw = txn != NULL; + uint32_t mk_index = base->def->key_def->is_multikey ? res->hint : 0; + *result = txm_tuple_clarify(txn, res->tuple, base->def->iid, + mk_index, is_rw); return 0; } -- 2.7.4