From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 865AE445330 for ; Wed, 8 Jul 2020 18:14:40 +0300 (MSK) From: Aleksandr Lyapunov Date: Wed, 8 Jul 2020 18:14:23 +0300 Message-Id: <1594221263-6228-17-git-send-email-alyapunov@tarantool.org> In-Reply-To: <1594221263-6228-1-git-send-email-alyapunov@tarantool.org> References: <1594221263-6228-1-git-send-email-alyapunov@tarantool.org> Subject: [Tarantool-patches] [PATCH 16/16] tx: use new tx manager in memtx List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: v.shpilevoy@tarantool.org --- src/box/memtx_engine.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- src/box/memtx_space.c | 12 ++++++++++++ src/box/txn.c | 3 +++ 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/src/box/memtx_engine.c b/src/box/memtx_engine.c index dfd6fce..b5c5f03 100644 --- a/src/box/memtx_engine.c +++ b/src/box/memtx_engine.c @@ -339,6 +339,35 @@ memtx_engine_begin(struct engine *engine, struct txn *txn) return 0; } +static int +memtx_engine_prepare(struct engine *engine, struct txn *txn) +{ + (void)engine; + struct txn_stmt *stmt; + stailq_foreach_entry(stmt, &txn->stmts, next) { + if (stmt->add_story != NULL || stmt->del_story != NULL) + txm_history_prepare_stmt(stmt); + } + return 0; +} + +static void +memtx_engine_commit(struct engine *engine, struct txn *txn) +{ + (void)engine; + struct txn_stmt *stmt; + stailq_foreach_entry(stmt, &txn->stmts, next) { + if (stmt->add_story != NULL || stmt->del_story != NULL) + { + ssize_t bsize = txm_history_release_stmt(stmt); + assert(stmt->space->engine == engine); + struct memtx_space *mspace = + (struct memtx_space *)stmt->space; + mspace->bsize += bsize; + } + } +} + static void memtx_engine_rollback_statement(struct engine *engine, struct txn *txn, struct txn_stmt *stmt) @@ -348,13 +377,17 @@ memtx_engine_rollback_statement(struct engine *engine, struct txn *txn, if (stmt->old_tuple == NULL && stmt->new_tuple == NULL) return; struct space *space = stmt->space; - struct memtx_space *memtx_space = (struct memtx_space *)space; + struct memtx_space* memtx_space = (struct memtx_space*) space; uint32_t index_count; /* Only roll back the changes if they were made. */ if (stmt->engine_savepoint == NULL) return; + if (memtx_space->replace == memtx_space_replace_all_keys && + (stmt->add_story != NULL || stmt->del_story != NULL)) + return txm_history_unlink_stmt(stmt); + if (memtx_space->replace == memtx_space_replace_all_keys) index_count = space->index_count; else if (memtx_space->replace == memtx_space_replace_primary_key) @@ -362,12 +395,14 @@ memtx_engine_rollback_statement(struct engine *engine, struct txn *txn, else panic("transaction rolled back during snapshot recovery"); - for (uint32_t i = 0; i < index_count; i++) { - struct tuple *unused; - struct index *index = space->index[i]; + for (uint32_t i = 0; i < index_count; i++) + { + struct tuple* unused; + struct index* index = space->index[i]; /* Rollback must not fail. */ if (index_replace(index, stmt->new_tuple, stmt->old_tuple, - DUP_INSERT, &unused) != 0) { + DUP_INSERT, &unused) != 0) + { diag_log(); unreachable(); panic("failed to rollback change"); @@ -914,8 +949,8 @@ static const struct engine_vtab memtx_engine_vtab = { /* .complete_join = */ memtx_engine_complete_join, /* .begin = */ memtx_engine_begin, /* .begin_statement = */ generic_engine_begin_statement, - /* .prepare = */ generic_engine_prepare, - /* .commit = */ generic_engine_commit, + /* .prepare = */ memtx_engine_prepare, + /* .commit = */ memtx_engine_commit, /* .rollback_statement = */ memtx_engine_rollback_statement, /* .rollback = */ generic_engine_rollback, /* .switch_to_ro = */ generic_engine_switch_to_ro, diff --git a/src/box/memtx_space.c b/src/box/memtx_space.c index 5820c40..28552a9 100644 --- a/src/box/memtx_space.c +++ b/src/box/memtx_space.c @@ -260,6 +260,18 @@ memtx_space_replace_all_keys(struct space *space, struct tuple *old_tuple, if (pk == NULL) return -1; assert(pk->def->opts.is_unique); + + struct txn *txn = in_txn(); + struct txn_stmt *stmt = txn == NULL ? NULL : txn_current_stmt(txn); + if (stmt != NULL) { + return txm_history_link_stmt(txn_current_stmt(txn), + old_tuple, new_tuple, mode, + result); + } else { + /** Ephemeral space */ + assert(space->def->id == 0); + } + /* * If old_tuple is not NULL, the index has to * find and delete it, or return an error. diff --git a/src/box/txn.c b/src/box/txn.c index 7724637..ed3a994 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -171,6 +171,9 @@ txn_stmt_new(struct region *region) static inline void txn_stmt_destroy(struct txn_stmt *stmt) { + if (stmt->add_story != NULL || stmt->del_story != NULL) + txm_history_unlink_stmt(stmt); + if (stmt->old_tuple != NULL) tuple_unref(stmt->old_tuple); if (stmt->new_tuple != NULL) -- 2.7.4