From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [94.100.177.105]) (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 3199D469719 for ; Wed, 21 Oct 2020 13:23:45 +0300 (MSK) From: Aleksandr Lyapunov Date: Wed, 21 Oct 2020 13:23:30 +0300 Message-Id: <1603275812-32375-1-git-send-email-alyapunov@tarantool.org> Subject: [Tarantool-patches] [PATCH v2 0/2] Make tree hint optional List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org, Nikita Pettik , Ilya Kosarev Add an option that disables hints in tree indexes. https://github.com/tarantool/tarantool/issues/4927 https://github.com/tarantool/tarantool/tree/alyapunov/gh-4927-optional-hints v2 changes: * int template parameter was replaced by bool. * fix compilation error, just a couple of casts added: @@ -542,7 +542,7 @@ tree_iterator_start(struct iterator *iterator, struct tuple **ret) struct txn *txn = in_txn(); struct space *space = space_by_id(iterator->space_id); bool is_rw = txn != NULL; - uint32_t mk_index = is_multikey ? res->hint : 0; + uint32_t mk_index = is_multikey ? (uint32_t)res->hint : 0; *ret = memtx_tx_tuple_clarify(txn, space, *ret, iid, mk_index, is_rw); if (*ret == NULL) { return iterator->next(iterator, ret); @@ -734,13 +734,14 @@ memtx_tree_index_get(struct index *base, const char *key, struct txn *txn = in_txn(); struct space *space = space_by_id(base->def->space_id); bool is_rw = txn != NULL; - uint32_t mk_index = base->def->key_def->is_multikey ? res->hint : 0; + bool is_multikey = base->def->key_def->is_multikey; + uint32_t mk_index = is_multikey ? (uint32_t)res->hint : 0; *result = memtx_tx_tuple_clarify(txn, space, res->tuple, base->def->iid, mk_index, is_rw); return 0; } Aleksandr Lyapunov (1): memtx: make tuple compare hints optional Ilya Kosarev (1): memtx: move memtx_tree.c to memtx_tree.cc src/box/CMakeLists.txt | 2 +- src/box/index_def.c | 2 + src/box/index_def.h | 6 + src/box/lua/schema.lua | 53 ++ src/box/lua/space.cc | 7 + src/box/memtx_engine.c | 2 + src/box/memtx_tree.c | 1523 ------------------------------- src/box/memtx_tree.cc | 1726 +++++++++++++++++++++++++++++++++++ src/lib/salad/bps_tree.h | 19 + test/box/alter.result | 103 ++- test/box/alter.test.lua | 34 + test/box/errinj.result | 3 +- test/box/tree_pk.result | 314 +++++++ test/box/tree_pk.test.lua | 115 +++ test/box/tree_pk_multipart.result | 153 ++++ test/box/tree_pk_multipart.test.lua | 64 ++ 16 files changed, 2598 insertions(+), 1528 deletions(-) delete mode 100644 src/box/memtx_tree.c create mode 100644 src/box/memtx_tree.cc -- 2.7.4