[tarantool-patches] [PATCH 0/3] Merge struct sql_txn into struct txn/savepoint

[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