Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: Chris Sosnin <k.sosnin@tarantool.org>,
	tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH] sql: fix assertion fail when selecting from _vfunc
Date: Fri, 20 Dec 2019 22:10:35 +0100	[thread overview]
Message-ID: <cc88c612-477f-cc13-05ce-b97e7c93887a@tarantool.org> (raw)
In-Reply-To: <20191217102643.27040-1-k.sosnin@tarantool.org>

Hi! Thanks for the patch!

See my review fixes below and on the branch in a separate
commit. Please, review them. If the fixes are ok, then squash
with your commit, and it will LGTM. Otherwise lets discuss.

===============================================================

commit 29230b80b7e80101ed9d47f1ddf63ce6deaafbbd
Author: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Date:   Fri Dec 20 22:05:15 2019 +0100

    Review fixes

diff --git a/test/sql/engine.cfg b/test/sql/engine.cfg
index 284c42082..5e8199ad8 100644
--- a/test/sql/engine.cfg
+++ b/test/sql/engine.cfg
@@ -5,6 +5,7 @@
     "sql-debug.test.lua": {
         "memtx": {"engine": "memtx"}
     },
+    "gh-4666-sql-select-from-vfunc.test.lua": { },
===============================================================

By that setting I tell test-run that no matter which other
rules that file matches, it should run only once, without any
settings. I did it to overwrite the '*' rule below.

===============================================================
     "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
index 16876e740..13262113e 100644
--- a/test/sql/gh-4666-sql-select-from-vfunc.result
+++ b/test/sql/gh-4666-sql-select-from-vfunc.result
@@ -1,14 +1,6 @@
-test_run = require('test_run').new()
----
-...
-engine = test_run:get_cfg('engine')
----
-...
-box.execute('pragma sql_default_engine=\''..engine..'\'')
----
-- row_count: 0
-...
===============================================================

Since we do not create any spaces here, engine does not matter.
So I dropped it. After drop of the engine, test_run appeared to
be unused, so I dropped it too.

===============================================================
--- Make sure assertion does not fail
+--
+-- Make sure assertion does not fail.
+--
 box.execute([[select count(*)&0 from "_vfunc";]])
 ---
 - metadata:
diff --git a/test/sql/gh-4666-sql-select-from-vfunc.test.lua b/test/sql/gh-4666-sql-select-from-vfunc.test.lua
index be227d119..cca30abe5 100644
--- a/test/sql/gh-4666-sql-select-from-vfunc.test.lua
+++ b/test/sql/gh-4666-sql-select-from-vfunc.test.lua
@@ -1,7 +1,4 @@
-test_run = require('test_run').new()
-engine = test_run:get_cfg('engine')
-box.execute('pragma sql_default_engine=\''..engine..'\'')
-
--- Make sure assertion does not fail
-
+--
+-- Make sure assertion does not fail.
+--
 box.execute([[select count(*)&0 from "_vfunc";]])

  reply	other threads:[~2019-12-20 21:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-17 10:26 Chris Sosnin
2019-12-20 21:10 ` Vladislav Shpilevoy [this message]
2019-12-21 18:57   ` Chris Sosnin
2019-12-22 15:00     ` Vladislav Shpilevoy
2020-01-10  7:40 Chris Sosnin
2020-01-15 17:29 ` Nikita Pettik
2020-01-16  8:10   ` Chris Sosnin

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=cc88c612-477f-cc13-05ce-b97e7c93887a@tarantool.org \
    --to=v.shpilevoy@tarantool.org \
    --cc=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