From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id AC22E2661B for ; Wed, 7 Aug 2019 11:13:21 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id odEFPcBY-x0A for ; Wed, 7 Aug 2019 11:13:21 -0400 (EDT) Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id DCCD121557 for ; Wed, 7 Aug 2019 11:13:20 -0400 (EDT) From: Nikita Pettik Subject: [tarantool-patches] [PATCH 0/3] Merge struct sql_txn into struct txn/savepoint Date: Wed, 7 Aug 2019 18:13:11 +0300 Message-Id: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org Cc: v.shpilevoy@tarantool.org, Nikita Pettik Branch: https://github.com/tarantool/tarantool/tree/np/move-sql-structs-from-txn As a one of final steps of merging SQL and NoSQL codebases, it is required to squash struct sql_txn and struct txn/struct txn_savepoint. struct sql_txn was needed to operate on named savepoints. Hence, it contains name of savepoint and a link to next savepoint. This patch-set adds optional name of savepoint to struct txn_savepoint and orginizes txn_savepoints into list. Head of list is held in stuct txn. Iterating over list allows to find savepoint by its name. Finally, after this procedure is completed, we can remove struct sql_txn and struct Savepoint. Nikita Pettik (3): txn: move fk_deferred_count from psql_txn to txn txn: merge struct sql_txn into struct txn sql: use struct txn_savepoint as anonymous savepoint src/box/sql/sqlInt.h | 13 -------- src/box/sql/vdbe.c | 58 ++++++++++------------------------ src/box/sql/vdbe.h | 9 ------ src/box/sql/vdbeInt.h | 6 ++-- src/box/sql/vdbeaux.c | 66 ++------------------------------------- src/box/txn.c | 86 ++++++++++++++++++++++++++++++++++++++------------- src/box/txn.h | 32 ++++++++++++------- 7 files changed, 106 insertions(+), 164 deletions(-) -- 2.15.1