Tarantool development patches archive
 help / color / mirror / Atom feed
From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: sergepetrenko@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v1 1/1] schema: remove assert on wrong insert into _priv
Date: Mon, 16 Aug 2021 19:13:34 +0300	[thread overview]
Message-ID: <d29920e7cf65ec2fdf07302d6238adac741ba03a.1629130295.git.imeevma@gmail.com> (raw)

Prior to this patch, an assertion was throwed if a tuple with an
incorrect id was inserted into the _priv system space. This bug
appeared only in the debug build.

Closes #6295
---
https://github.com/tarantool/tarantool/issues/6295
https://github.com/tarantool/tarantool/tree/imeevma/gh-6295-assert-on-insert-with-wrong-id

 src/box/schema.cc                             |  1 -
 .../gh-6295-assert-on-wrong-id.test.lua       | 34 +++++++++++++++++++
 test/box-tap/suite.ini                        |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100755 test/box-tap/gh-6295-assert-on-wrong-id.test.lua

diff --git a/src/box/schema.cc b/src/box/schema.cc
index 1970871cc..ac19a2b1e 100644
--- a/src/box/schema.cc
+++ b/src/box/schema.cc
@@ -730,7 +730,6 @@ schema_find_name(enum schema_object_type type, uint32_t object_id)
 	default:
 		break;
 	}
-	assert(false);
 	return "(nil)";
 }
 
diff --git a/test/box-tap/gh-6295-assert-on-wrong-id.test.lua b/test/box-tap/gh-6295-assert-on-wrong-id.test.lua
new file mode 100755
index 000000000..e4822f395
--- /dev/null
+++ b/test/box-tap/gh-6295-assert-on-wrong-id.test.lua
@@ -0,0 +1,34 @@
+#!/usr/bin/env tarantool
+
+local tap = require('tap')
+local test = tap.test('gh-6295-assert-on-wrong-id')
+
+test:plan(5)
+
+local ok, res
+
+box.cfg{}
+
+-- Should be an error, not an assertion.
+local _priv = box.space._priv
+local errmsg = "Function '1000000' does not exist"
+ok, res = pcall(_priv.replace, _priv, {1, 2, 'function', 1000000, box.priv.A})
+test:is_deeply({ok, tostring(res)}, {false, errmsg}, "Function exists")
+
+errmsg = "Sequence '1000000' does not exist"
+ok, res = pcall(_priv.replace, _priv, {1, 2, 'sequence', 1000000, box.priv.A})
+test:is_deeply({ok, tostring(res)}, {false, errmsg}, "Sequence exists")
+
+errmsg = "Space '1000000' does not exist"
+ok, res = pcall(_priv.replace, _priv, {1, 2, 'space', 1000000, box.priv.A})
+test:is_deeply({ok, tostring(res)}, {false, errmsg}, "Space exists")
+
+errmsg = "User '1000000' is not found"
+ok, res = pcall(_priv.replace, _priv, {1, 2, 'user', 1000000, box.priv.A})
+test:is_deeply({ok, tostring(res)}, {false, errmsg}, "User exists")
+
+errmsg = "Role '1000000' is not found"
+ok, res = pcall(_priv.replace, _priv, {1, 2, 'role', 1000000, box.priv.A})
+test:is_deeply({ok, tostring(res)}, {false, errmsg}, "Role exists")
+
+os.exit(test:check() and 0 or 1)
diff --git a/test/box-tap/suite.ini b/test/box-tap/suite.ini
index b09d7db4f..fd55d5d24 100644
--- a/test/box-tap/suite.ini
+++ b/test/box-tap/suite.ini
@@ -3,7 +3,7 @@ core = app
 description = Database tests with #! using TAP
 is_parallel = True
 use_unix_sockets_iproto = True
-release_disabled = errinj_set_with_enviroment_vars.test.lua
+release_disabled = errinj_set_with_enviroment_vars.test.lua, gh-6295-assert-on-wrong-id.test.lua
 config = suite.cfg
 fragile = {
     "retries": 10,
-- 
2.25.1


             reply	other threads:[~2021-08-16 16:13 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-16 16:13 Mergen Imeev via Tarantool-patches [this message]
2021-08-17 12:32 ` Serge Petrenko via Tarantool-patches
2021-09-03  6:59   ` Mergen Imeev via Tarantool-patches
2021-09-06  8:05     ` Serge Petrenko via Tarantool-patches
2021-09-06  8:11 Mergen Imeev via Tarantool-patches
2021-09-07 21:59 ` Vladislav Shpilevoy via Tarantool-patches
2021-09-09 11:07   ` Mergen Imeev via Tarantool-patches
2021-09-27  6:41     ` Mergen Imeev via Tarantool-patches
2021-09-27 22:33       ` Vladislav Shpilevoy via Tarantool-patches
2021-09-29  6:32         ` Mergen Imeev via Tarantool-patches
2021-09-30 22:46           ` Vladislav Shpilevoy via Tarantool-patches
2021-10-05 12:13 ` Kirill Yukhin via Tarantool-patches

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=d29920e7cf65ec2fdf07302d6238adac741ba03a.1629130295.git.imeevma@gmail.com \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=imeevma@tarantool.org \
    --cc=sergepetrenko@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v1 1/1] schema: remove assert on wrong insert into _priv' \
    /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