From: Chris Sosnin <k.sosnin@tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH] sql: fix assertion fail when selecting from _vfunc Date: Fri, 10 Jan 2020 10:40:51 +0300 [thread overview] Message-ID: <20200110074051.67668-1-k.sosnin@tarantool.org> (raw) This patch already has LGTM from Vlad. However, I moved changes to the 2.3.2 upgrade, as long as the patch was no longer valid. The assertion mentioned #4666 fails because it was forgotten to update _vfunc format along with _func in 2.2.1. This leads to bad allocation of vdbe cursor and setting wrong memory to 0. Closes #4666 --- branch: https://github.com/tarantool/tarantool/tree/ksosnin/gh-4666-select-from-vfunc issue: https://github.com/tarantool/tarantool/issues/4666 src/box/bootstrap.snap | Bin 5976 -> 5978 bytes src/box/lua/upgrade.lua | 15 +++++++++++++++ test/box-py/bootstrap.result | 11 +++++++++-- test/sql/engine.cfg | 1 + test/sql/gh-4666-sql-select-from-vfunc.result | 11 +++++++++++ .../gh-4666-sql-select-from-vfunc.test.lua | 4 ++++ 6 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 test/sql/gh-4666-sql-select-from-vfunc.result create mode 100644 test/sql/gh-4666-sql-select-from-vfunc.test.lua diff --git a/src/box/lua/upgrade.lua b/src/box/lua/upgrade.lua index c69b6b543..4a7316ac0 100644 --- a/src/box/lua/upgrade.lua +++ b/src/box/lua/upgrade.lua @@ -970,6 +970,20 @@ local function upgrade_to_2_3_1() create_session_settings_space() end +-------------------------------------------------------------------------------- +-- Tarantool 2.3.2 +-------------------------------------------------------------------------------- + +local function update_vfunc_format() + local _func = box.space[box.schema.FUNC_ID] + local _vfunc = box.space[box.schema.VFUNC_ID] + _vfunc:format(_func:format()) +end + +local function upgrade_to_2_3_2() + update_vfunc_format() +end + -------------------------------------------------------------------------------- local function get_version() @@ -1006,6 +1020,7 @@ local function upgrade(options) {version = mkversion(2, 2, 1), func = upgrade_to_2_2_1, auto = true}, {version = mkversion(2, 3, 0), func = upgrade_to_2_3_0, auto = true}, {version = mkversion(2, 3, 1), func = upgrade_to_2_3_1, auto = true}, + {version = mkversion(2, 3, 2), func = upgrade_to_2_3_2, auto = true}, } for _, handler in ipairs(handlers) do diff --git a/test/box-py/bootstrap.result b/test/box-py/bootstrap.result index 0876e77a6..1e7c40ce7 100644 --- a/test/box-py/bootstrap.result +++ b/test/box-py/bootstrap.result @@ -4,7 +4,7 @@ box.internal.bootstrap() box.space._schema:select{} --- - - ['max_id', 511] - - ['version', 2, 3, 1] + - ['version', 2, 3, 2] ... box.space._cluster:select{} --- @@ -63,7 +63,14 @@ box.space._space:select{} 'type': 'string'}, {'name': 'last_altered', 'type': 'string'}]] - [297, 1, '_vfunc', 'sysview', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {'name': 'owner', 'type': 'unsigned'}, {'name': 'name', 'type': 'string'}, {'name': 'setuid', - 'type': 'unsigned'}]] + 'type': 'unsigned'}, {'name': 'language', 'type': 'string'}, {'name': 'body', + 'type': 'string'}, {'name': 'routine_type', 'type': 'string'}, {'name': 'param_list', + 'type': 'array'}, {'name': 'returns', 'type': 'string'}, {'name': 'aggregate', + 'type': 'string'}, {'name': 'sql_data_access', 'type': 'string'}, {'name': 'is_deterministic', + 'type': 'boolean'}, {'name': 'is_sandboxed', 'type': 'boolean'}, {'name': 'is_null_call', + 'type': 'boolean'}, {'name': 'exports', 'type': 'array'}, {'name': 'opts', + 'type': 'map'}, {'name': 'comment', 'type': 'string'}, {'name': 'created', + 'type': 'string'}, {'name': 'last_altered', 'type': 'string'}]] - [304, 1, '_user', 'memtx', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {'name': 'owner', 'type': 'unsigned'}, {'name': 'name', 'type': 'string'}, {'name': 'type', 'type': 'string'}, {'name': 'auth', 'type': 'map'}]] diff --git a/test/sql/engine.cfg b/test/sql/engine.cfg index 1e9f08c6a..22ea90043 100644 --- a/test/sql/engine.cfg +++ b/test/sql/engine.cfg @@ -2,6 +2,7 @@ "vinyl-opts.test.lua" : { "vinyl": {"engine": "vinyl"} }, + "gh-4666-sql-select-from-vfunc.test.lua": { }, "bind.test.lua": { "remote": {"remote": "true"}, "local": {"remote": "false"} diff --git a/test/sql/gh-4666-sql-select-from-vfunc.result b/test/sql/gh-4666-sql-select-from-vfunc.result new file mode 100644 index 000000000..d57c66867 --- /dev/null +++ b/test/sql/gh-4666-sql-select-from-vfunc.result @@ -0,0 +1,11 @@ +-- +-- Make sure assertion does not fail. +-- +box.execute([[select "id" from "_vfunc" where "id" = 1;]]) +--- +- metadata: + - name: id + type: unsigned + rows: + - [1] +... diff --git a/test/sql/gh-4666-sql-select-from-vfunc.test.lua b/test/sql/gh-4666-sql-select-from-vfunc.test.lua new file mode 100644 index 000000000..fa296e1e1 --- /dev/null +++ b/test/sql/gh-4666-sql-select-from-vfunc.test.lua @@ -0,0 +1,4 @@ +-- +-- Make sure assertion does not fail. +-- +box.execute([[select "id" from "_vfunc" where "id" = 1;]]) -- 2.21.0 (Apple Git-122.2)
next reply other threads:[~2020-01-10 7:40 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-10 7:40 Chris Sosnin [this message] 2020-01-15 17:29 ` Nikita Pettik 2020-01-16 8:10 ` Chris Sosnin -- strict thread matches above, loose matches on Subject: below -- 2019-12-17 10:26 Chris Sosnin 2019-12-20 21:10 ` Vladislav Shpilevoy 2019-12-21 18:57 ` Chris Sosnin 2019-12-22 15:00 ` Vladislav Shpilevoy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200110074051.67668-1-k.sosnin@tarantool.org \ --to=k.sosnin@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH] sql: fix assertion fail when selecting from _vfunc' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox