[tarantool-patches] [PATCH v1 0/9] sql: set errors in VDBE using diag_set()

imeevma at tarantool.org imeevma at tarantool.org
Tue May 28 14:39:27 MSK 2019


The main purpose of this patch-set is to replace the SQL error
system with the Tarantool error system.

https://github.com/tarantool/tarantool/issues/4074
https://github.com/tarantool/tarantool/tree/imeevma/gh-4074-diag_set-in-vdbe

Mergen Imeev (9):
  sql: remove mayAbort field from struct Parse
  sql: remove error codes SQL_TARANTOOL_*_FAIL
  sql: remove error ER_SQL
  sql: rework diag_set() in OP_Halt
  sql: make SQL_TARANTOOL_ERROR the only errcode of OP_Halt
  sql: remove error SQL_INTERRUPT
  sql: remove error SQL_MISMATCH
  sql: use diag_set() to set an error in SQL functions
  sql: set errors in VDBE using diag_set()

 src/box/alter.cc                                   |   4 +-
 src/box/errcode.h                                  |   2 +-
 src/box/execute.c                                  |  23 +-
 src/box/lua/lua_sql.c                              |  13 +-
 src/box/sql.c                                      |  37 +-
 src/box/sql/analyze.c                              |   6 +-
 src/box/sql/build.c                                |  59 +--
 src/box/sql/date.c                                 |   8 +-
 src/box/sql/delete.c                               |   4 +-
 src/box/sql/expr.c                                 |   9 +-
 src/box/sql/fk_constraint.c                        |  42 +-
 src/box/sql/func.c                                 | 102 +++--
 src/box/sql/insert.c                               |  31 +-
 src/box/sql/main.c                                 |   5 -
 src/box/sql/malloc.c                               |   4 -
 src/box/sql/resolve.c                              |   2 +-
 src/box/sql/select.c                               |  13 +-
 src/box/sql/sqlInt.h                               |  32 --
 src/box/sql/tarantoolInt.h                         |   5 +-
 src/box/sql/tokenize.c                             |   3 -
 src/box/sql/trigger.c                              |  18 +-
 src/box/sql/vdbe.c                                 | 431 ++++++---------------
 src/box/sql/vdbe.h                                 |   3 -
 src/box/sql/vdbeInt.h                              |  38 +-
 src/box/sql/vdbeapi.c                              | 170 +-------
 src/box/sql/vdbeaux.c                              | 234 +----------
 src/box/sql/vdbemem.c                              |  15 +-
 test/box/misc.result                               |   1 -
 test/sql-tap/autoinc.test.lua                      |   4 +-
 test/sql-tap/e_select1.test.lua                    |   4 +-
 test/sql-tap/func.test.lua                         |   2 +-
 test/sql-tap/gh-2931-savepoints.test.lua           |   6 +-
 .../gh-3307-xfer-optimization-issue.test.lua       |  10 +-
 test/sql-tap/gh2259-in-stmt-trans.test.lua         |   8 +-
 test/sql-tap/gh2964-abort.test.lua                 |   2 +-
 test/sql-tap/intpkey.test.lua                      |   2 +-
 test/sql-tap/limit.test.lua                        |  26 +-
 test/sql-tap/misc1.test.lua                        |   2 +-
 test/sql-tap/select3.test.lua                      |   2 +-
 test/sql-tap/select4.test.lua                      |   8 +-
 test/sql-tap/select5.test.lua                      |  10 +-
 test/sql-tap/subselect.test.lua                    |   6 +-
 test/sql-tap/table.test.lua                        |   8 +-
 test/sql-tap/tkt-4a03edc4c8.test.lua               |   2 +-
 test/sql-tap/tkt1473.test.lua                      |  36 +-
 test/sql-tap/trigger1.test.lua                     |   6 +-
 test/sql-tap/unique.test.lua                       |  10 +-
 test/sql/collation.result                          |  18 +-
 test/sql/delete.result                             |   7 +-
 test/sql/errinj.result                             |   6 +-
 test/sql/foreign-keys.result                       |   3 +-
 test/sql/insert-unique.result                      |   6 +-
 test/sql/iproto.result                             |  21 +-
 test/sql/on-conflict.result                        |   4 +-
 test/sql/persistency.result                        |   6 +-
 test/sql/savepoints.result                         |   2 +-
 test/sql/transition.result                         |   6 +-
 test/sql/triggers.result                           |  21 +-
 test/sql/types.result                              |   9 +-
 59 files changed, 420 insertions(+), 1157 deletions(-)

-- 
2.7.4





More information about the Tarantool-patches mailing list