[tarantool-patches] [PATCH 0/5] SQL static types

Georgy Kirichenko georgy at tarantool.org
Sun Jul 15 23:44:45 MSK 2018


SQL static types branch
What is done:
* Internal tables are created with right definition.
* Affinity member of an Expr structure is used only as affinity.
* All sql functions are annotated with return affinity.
* A column type is required now.
  Note: some tests fail after that and should be revised because
  there may use incorrect or wrong behavior.
* Enforce space format for sql tables.
  Scalar type is used only for blob columns for all other column types
  a corresponding format is used.
  Note: many tests fail because they use inconsistent data conversions
  and should be removed or fixed

Branch:
https://github.com/tarantool/tarantool/tree/sql-static-types

Georgy Kirichenko (5):
  Specify types for internal tables
  Split on_conflict_action and affinity
  Annotate a sql function with affinity
  Column type should be defined on table creation
  Enforce space format for columns

 extra/mkkeywordhash.c                         |  22 ++-
 extra/mkopcodeh.sh                            |  30 +++-
 src/box/lua/lua_sql.c                         |  44 ++++--
 src/box/sql.c                                 |  30 ++--
 src/box/sql/analyze.c                         |   9 +-
 src/box/sql/build.c                           |  47 +++---
 src/box/sql/date.c                            |  16 +-
 src/box/sql/expr.c                            |  44 +++---
 src/box/sql/fkey.c                            |  22 +--
 src/box/sql/func.c                            | 122 +++++++--------
 src/box/sql/main.c                            |   5 +-
 src/box/sql/parse.y                           | 102 +++++++++----
 src/box/sql/resolve.c                         |   2 +-
 src/box/sql/sqliteInt.h                       |  67 ++++++---
 src/box/sql/treeview.c                        |   6 +-
 src/box/sql/util.c                            |   8 +
 src/box/sql/vdbemem.c                         |   4 +-
 src/box/sql/whereexpr.c                       |   4 +-
 test/box/sql-update-with-nested-select.result |   2 +-
 .../sql-update-with-nested-select.test.lua    |   2 +-
 test/sql-tap/aggnested.test.lua               |   4 +-
 test/sql-tap/alias.test.lua                   |   9 +-
 test/sql-tap/alter.test.lua                   |  24 +--
 test/sql-tap/analyze1.test.lua                |  10 +-
 test/sql-tap/analyze3.test.lua                |  10 +-
 test/sql-tap/analyze4.test.lua                |   4 +-
 test/sql-tap/analyze5.test.lua                |   5 +-
 test/sql-tap/analyze6.test.lua                |   2 +-
 test/sql-tap/analyze7.test.lua                |   4 +-
 test/sql-tap/analyze8.test.lua                |   2 +-
 test/sql-tap/analyze9.test.lua                |  66 ++++----
 test/sql-tap/analyzeC.test.lua                |   2 +-
 test/sql-tap/analyzeD.test.lua                |   4 +-
 test/sql-tap/analyzeE.test.lua                |   4 +-
 test/sql-tap/analyzeF.test.lua                |   8 +-
 test/sql-tap/autoinc.test.lua                 |  20 +--
 test/sql-tap/autoindex4.test.lua              |   6 +-
 test/sql-tap/boundary1.test.lua               |   2 +-
 test/sql-tap/boundary3.test.lua               |   8 +-
 test/sql-tap/cast.test.lua                    |  18 +--
 test/sql-tap/check.test.lua                   |  26 ++--
 test/sql-tap/coalesce.test.lua                |   2 +-
 test/sql-tap/collation.test.lua               |   2 +-
 test/sql-tap/colname.test.lua                 |  22 +--
 test/sql-tap/conflict3.test.lua               |  46 +++---
 test/sql-tap/count.test.lua                   |  10 +-
 test/sql-tap/cse.test.lua                     |  12 +-
 test/sql-tap/date.test.lua                    |   4 +-
 test/sql-tap/default.test.lua                 |  10 +-
 test/sql-tap/delete4.test.lua                 |  16 +-
 test/sql-tap/distinct.test.lua                |  18 +--
 test/sql-tap/distinctagg.test.lua             |   2 +-
 test/sql-tap/drop_all.test.lua                |   2 +-
 test/sql-tap/e_delete.test.lua                |  28 ++--
 test/sql-tap/e_expr.test.lua                  |  64 ++++----
 test/sql-tap/e_select1.test.lua               | 120 +++++++--------
 test/sql-tap/eqp.test.lua                     |  22 +--
 test/sql-tap/fkey1.test.lua                   |  20 +--
 test/sql-tap/fkey2.test.lua                   | 142 +++++++++---------
 test/sql-tap/fkey3.test.lua                   |  10 +-
 test/sql-tap/fkey4.test.lua                   |  68 ++++-----
 test/sql-tap/func.test.lua                    |  20 +--
 test/sql-tap/func5.test.lua                   |   8 +-
 ...2360-omit-truncate-in-transaction.test.lua |   2 +-
 test/sql-tap/gh-2723-concurrency.test.lua     |   6 +-
 .../gh-2884-forbid-rowid-syntax.test.lua      |   2 +-
 .../gh-2953-drop-table-with-FK.test.lua       |   8 +-
 test/sql-tap/gh-2996-indexed-by.test.lua      |   2 +-
 .../gh-3332-tuple-format-leak.test.lua        |   2 +-
 test/sql-tap/gh-3350-skip-scan.test.lua       |   4 +-
 .../sql-tap/gh2130-index-refer-table.test.lua |   4 +-
 test/sql-tap/hexlit.test.lua                  |   4 +-
 test/sql-tap/icu.test.lua                     |   4 +-
 test/sql-tap/identifier-characters.test.lua   |   6 +-
 test/sql-tap/identifier_case.test.lua         |   8 +-
 test/sql-tap/in1.test.lua                     |  75 +++------
 test/sql-tap/in2.test.lua                     |   2 +-
 test/sql-tap/in3.test.lua                     |  20 +--
 test/sql-tap/in4.test.lua                     |  22 +--
 test/sql-tap/in5.test.lua                     |   8 +-
 test/sql-tap/index1.test.lua                  |  72 ++++-----
 test/sql-tap/index2.test.lua                  |   4 +-
 test/sql-tap/index3.test.lua                  |   4 +-
 test/sql-tap/index4.test.lua                  |  10 +-
 test/sql-tap/index6.test.lua                  |  18 +--
 test/sql-tap/index7.test.lua                  |  10 +-
 test/sql-tap/insert1.test.lua                 |  24 +--
 test/sql-tap/insert3.test.lua                 |  22 +--
 test/sql-tap/intpkey.test.lua                 |   8 +-
 test/sql-tap/join.test.lua                    |  50 +++---
 test/sql-tap/join2.test.lua                   |   6 +-
 test/sql-tap/join3.test.lua                   |   2 +-
 test/sql-tap/join5.test.lua                   |  20 +--
 test/sql-tap/join6.test.lua                   |  18 +--
 test/sql-tap/keyword1.test.lua                |   6 +-
 test/sql-tap/like2.test.lua                   |   6 +-
 test/sql-tap/like3.test.lua                   |   4 +-
 test/sql-tap/limit.test.lua                   |  12 +-
 test/sql-tap/lua_sql.test.lua                 |  22 +--
 test/sql-tap/minmax2.test.lua                 |   6 +-
 test/sql-tap/minmax3.test.lua                 |   8 +-
 test/sql-tap/minmax4.test.lua                 |   4 +-
 test/sql-tap/misc1.test.lua                   |  44 +++---
 test/sql-tap/misc3.test.lua                   |  18 +--
 test/sql-tap/misc5.test.lua                   |  22 +--
 test/sql-tap/null.test.lua                    |  10 +-
 test/sql-tap/offset1.test.lua                 |   4 +-
 test/sql-tap/orderby1.test.lua                |   6 +-
 test/sql-tap/orderby2.test.lua                |  18 +--
 test/sql-tap/orderby4.test.lua                |   8 +-
 test/sql-tap/orderby5.test.lua                |  40 ++---
 test/sql-tap/orderby6.test.lua                |   4 +-
 test/sql-tap/orderby8.test.lua                |   2 +-
 test/sql-tap/orderby9.test.lua                |   2 +-
 test/sql-tap/printf2.test.lua                 |   2 +-
 test/sql-tap/randexpr1.test.lua               |   2 +-
 test/sql-tap/resolver01.test.lua              |  10 +-
 test/sql-tap/select1.test.lua                 |  16 +-
 test/sql-tap/select3.test.lua                 |   4 +-
 test/sql-tap/select4.test.lua                 |   8 +-
 test/sql-tap/select5.test.lua                 |  10 +-
 test/sql-tap/select6.test.lua                 |  18 +--
 test/sql-tap/select7.test.lua                 |  12 +-
 test/sql-tap/select8.test.lua                 |   2 +-
 test/sql-tap/select9.test.lua                 |  12 +-
 test/sql-tap/selectA.test.lua                 |  18 +--
 test/sql-tap/selectC.test.lua                 |  12 +-
 test/sql-tap/selectE.test.lua                 |  10 +-
 test/sql-tap/selectF.test.lua                 |   4 +-
 test/sql-tap/selectG.test.lua                 |   2 +-
 test/sql-tap/sort.test.lua                    |  32 ++--
 test/sql-tap/subquery.test.lua                |  34 ++---
 test/sql-tap/subquery2.test.lua               |  10 +-
 test/sql-tap/table.test.lua                   |  70 ++++-----
 test/sql-tap/tkt-02a8e81d44.test.lua          |   2 +-
 test/sql-tap/tkt-31338dca7e.test.lua          |  22 +--
 test/sql-tap/tkt-385a5b56b9.test.lua          |   4 +-
 test/sql-tap/tkt-38cb5df375.test.lua          |   2 +-
 test/sql-tap/tkt-3998683a16.test.lua          |   2 +-
 test/sql-tap/tkt-4a03edc4c8.test.lua          |   2 +-
 test/sql-tap/tkt-4c86b126f2.test.lua          |   2 +-
 test/sql-tap/tkt-4dd95f6943.test.lua          |  10 +-
 test/sql-tap/tkt-4ef7e3cfca.test.lua          |  22 +--
 test/sql-tap/tkt-54844eea3f.test.lua          |   2 +-
 test/sql-tap/tkt-7bbfb7d442.test.lua          |   8 +-
 test/sql-tap/tkt-80ba201079.test.lua          |  10 +-
 test/sql-tap/tkt-80e031a00f.test.lua          |  18 +--
 test/sql-tap/tkt-8c63ff0ec.test.lua           |   4 +-
 test/sql-tap/tkt-9a8b09f8e6.test.lua          |  27 ++--
 test/sql-tap/tkt-a7b7803e.test.lua            |   2 +-
 test/sql-tap/tkt-a8a0d2996a.test.lua          |   4 +-
 test/sql-tap/tkt-b1d3a2e531.test.lua          |  20 +--
 test/sql-tap/tkt-b351d95f9.test.lua           |   4 +-
 test/sql-tap/tkt-b75a9ca6b0.test.lua          |   2 +-
 test/sql-tap/tkt-ba7cbfaedc.test.lua          |   2 +-
 test/sql-tap/tkt-f973c7ac31.test.lua          |   2 +-
 test/sql-tap/tkt-fa7bf5ec.test.lua            |   2 +-
 test/sql-tap/tkt1443.test.lua                 |  14 +-
 test/sql-tap/tkt1444.test.lua                 |   2 +-
 test/sql-tap/tkt1449.test.lua                 |  78 +++++-----
 test/sql-tap/tkt1473.test.lua                 |   4 +-
 test/sql-tap/tkt1501.test.lua                 |   2 +-
 test/sql-tap/tkt1514.test.lua                 |   2 +-
 test/sql-tap/tkt1537.test.lua                 |   4 +-
 test/sql-tap/tkt2141.test.lua                 |   6 +-
 test/sql-tap/tkt2192.test.lua                 |   2 +-
 test/sql-tap/tkt2339.test.lua                 |  32 ++--
 test/sql-tap/tkt2391.test.lua                 |   2 +-
 test/sql-tap/tkt2640.test.lua                 |   6 +-
 test/sql-tap/tkt2767.test.lua                 |   2 +-
 test/sql-tap/tkt2822.test.lua                 |  29 +---
 test/sql-tap/tkt2832.test.lua                 |   6 +-
 test/sql-tap/tkt2927.test.lua                 |  10 +-
 test/sql-tap/tkt2942.test.lua                 |  10 +-
 test/sql-tap/tkt3201.test.lua                 |   4 +-
 test/sql-tap/tkt3298.test.lua                 |   4 +-
 test/sql-tap/tkt3334.test.lua                 |   2 +-
 test/sql-tap/tkt3346.test.lua                 |   8 +-
 test/sql-tap/tkt3357.test.lua                 |   4 +-
 test/sql-tap/tkt3424.test.lua                 |   2 +-
 test/sql-tap/tkt3493.test.lua                 |   2 +-
 test/sql-tap/tkt3508.test.lua                 |   2 +-
 test/sql-tap/tkt3541.test.lua                 |   2 +-
 test/sql-tap/tkt3554.test.lua                 |   2 +-
 test/sql-tap/tkt3581.test.lua                 |   4 +-
 test/sql-tap/tkt3731.test.lua                 |   4 +-
 test/sql-tap/tkt3773.test.lua                 |   4 +-
 test/sql-tap/tkt3791.test.lua                 |   2 +-
 test/sql-tap/tkt3879.test.lua                 |   6 +-
 test/sql-tap/tkt3911.test.lua                 |   6 +-
 test/sql-tap/tkt3935.test.lua                 |   4 +-
 test/sql-tap/transitive1.test.lua             |  28 ++--
 test/sql-tap/trigger1.test.lua                |  12 +-
 test/sql-tap/trigger2.test.lua                |  48 +++---
 test/sql-tap/trigger4.test.lua                |   6 +-
 test/sql-tap/trigger7.test.lua                |   4 +-
 test/sql-tap/trigger8.test.lua                |   4 +-
 test/sql-tap/trigger9.test.lua                |  14 +-
 test/sql-tap/triggerA.test.lua                |   8 +-
 test/sql-tap/triggerB.test.lua                |  20 +--
 test/sql-tap/triggerC.test.lua                |  64 ++++----
 test/sql-tap/triggerD.test.lua                |  20 +--
 test/sql-tap/triggerE.test.lua                |   6 +-
 test/sql-tap/types.test.lua                   |  12 +-
 test/sql-tap/types2.test.lua                  |   8 +-
 test/sql-tap/unique.test.lua                  |  24 +--
 test/sql-tap/update.test.lua                  |  18 +--
 test/sql-tap/view.test.lua                    |  30 ++--
 test/sql-tap/where2.test.lua                  |  10 +-
 test/sql-tap/where3.test.lua                  |  50 +++---
 test/sql-tap/where4.test.lua                  |  22 +--
 test/sql-tap/where5.test.lua                  |   2 +-
 test/sql-tap/where6.test.lua                  |   6 +-
 test/sql-tap/where7.test.lua                  |   6 +-
 test/sql-tap/whereA.test.lua                  |   4 +-
 test/sql-tap/whereB.test.lua                  |  49 +++---
 test/sql-tap/whereC.test.lua                  |   2 +-
 test/sql-tap/whereD.test.lua                  |  16 +-
 test/sql-tap/whereF.test.lua                  |  14 +-
 test/sql-tap/whereG.test.lua                  |  16 +-
 test/sql-tap/whereI.test.lua                  |   8 +-
 test/sql-tap/whereK.test.lua                  |   2 +-
 test/sql-tap/with1.test.lua                   |  22 +--
 test/sql-tap/with2.test.lua                   |  18 +--
 test/sql/check-clear-ephemeral.result         |   2 +-
 test/sql/check-clear-ephemeral.test.lua       |   2 +-
 test/sql/clear.result                         |   2 +-
 test/sql/clear.test.lua                       |   2 +-
 test/sql/delete-multiple-idx.result           |   2 +-
 test/sql/delete-multiple-idx.test.lua         |   2 +-
 test/sql/delete.result                        |   2 +-
 test/sql/delete.test.lua                      |   2 +-
 test/sql/drop-index.result                    |   2 +-
 test/sql/drop-index.test.lua                  |   2 +-
 test/sql/drop-table.result                    |   2 +-
 test/sql/drop-table.test.lua                  |   2 +-
 test/sql/errinj.result                        |   2 +-
 test/sql/errinj.test.lua                      |   2 +-
 test/sql/gh-2929-primary-key.result           |  10 +-
 test/sql/gh-2929-primary-key.test.lua         |  10 +-
 test/sql/gh-3199-no-mem-leaks.result          |  14 +-
 test/sql/gh-3199-no-mem-leaks.test.lua        |   6 +-
 .../gh2141-delete-trigger-drop-table.result   |   2 +-
 .../gh2141-delete-trigger-drop-table.test.lua |   2 +-
 test/sql/gh2251-multiple-update.result        |   4 +-
 test/sql/gh2251-multiple-update.test.lua      |   4 +-
 ...808-inline-unique-persistency-check.result |   2 +-
 ...8-inline-unique-persistency-check.test.lua |   2 +-
 test/sql/insert-unique.result                 |   2 +-
 test/sql/insert-unique.test.lua               |   2 +-
 test/sql/iproto.result                        |   8 +-
 test/sql/iproto.test.lua                      |   8 +-
 test/sql/max-on-index.result                  |   2 +-
 test/sql/max-on-index.test.lua                |   2 +-
 test/sql/misc.result                          |   2 +-
 test/sql/misc.test.lua                        |   2 +-
 test/sql/persistency.result                   |  11 +-
 test/sql/persistency.test.lua                 |   6 +-
 test/sql/select-null.result                   |   2 +-
 test/sql/select-null.test.lua                 |   2 +-
 test/sql/sql-statN-index-drop.result          |   8 +-
 test/sql/sql-statN-index-drop.test.lua        |   8 +-
 test/sql/transition.result                    |  13 +-
 test/sql/transition.test.lua                  |  11 +-
 test/sql/triggers.result                      |   2 +-
 test/sql/triggers.test.lua                    |   2 +-
 test/sql/update-with-nested-select.result     |   2 +-
 test/sql/update-with-nested-select.test.lua   |   2 +-
 test/sql/view.result                          |   2 +-
 test/sql/view.test.lua                        |   2 +-
 270 files changed, 1854 insertions(+), 1807 deletions(-)

-- 
2.18.0





More information about the Tarantool-patches mailing list