From afe4007db21634c67ed208d2e8de694da599a1c7 Mon Sep 17 00:00:00 2001
From: Chris Sosnin <k.sosnin@tarantool.org>
Date: Thu, 20 Feb 2020 14:01:04 +0300
Subject: [PATCH] sequence: return correct error on using dropped sequence
This code is called from C, so it shouldn't throw.
Closes #4753
Reviewed-by: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Reviewed-by: Nikita Pettik <korablev@tarantool.org>
---
src/box/schema.cc | 2 +-
test/box/sequence.result | 17 +++++++++++++++++
test/box/sequence.test.lua | 8 ++++++++
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/box/schema.cc b/src/box/schema.cc
index fab7544f24..456eef429d 100644
--- a/src/box/schema.cc
+++ b/src/box/schema.cc
@@ -646,7 +646,7 @@ sequence_cache_find(uint32_t id)
{
struct sequence *seq = sequence_by_id(id);
if (seq == NULL)
- tnt_raise(ClientError, ER_NO_SUCH_SEQUENCE, int2str(id));
+ diag_set(ClientError, ER_NO_SUCH_SEQUENCE, int2str(id));
return seq;
}
diff --git a/test/box/sequence.result b/test/box/sequence.result
index 0a6cfee2c4..32a094d6f2 100644
--- a/test/box/sequence.result
+++ b/test/box/sequence.result
@@ -2102,6 +2102,23 @@ s:drop()
---
...
--
+-- gh-4753: accessing dropped sequence should yield correct error
+--
+s = box.schema.sequence.create('s')
+---
+...
+s:drop()
+---
+...
+s:next()
+---
+- error: Sequence '1' does not exist
+...
+s:reset()
+---
+- error: Sequence '1' does not exist
+...
+--
-- Check that altering parts of a primary index with a sequence
-- attached requires sequence update. Renaming fields does not.
--
diff --git a/test/box/sequence.test.lua b/test/box/sequence.test.lua
index 8e00571e50..d8a212fab0 100644
--- a/test/box/sequence.test.lua
+++ b/test/box/sequence.test.lua
@@ -710,6 +710,14 @@ s.index.pk:alter{sequence = {field = 'x.a.b[1]'}}
s:replace{{a = {b = {box.NULL}}}} -- ok
s:drop()
+--
+-- gh-4753: accessing dropped sequence should yield correct error
+--
+s = box.schema.sequence.create('s')
+s:drop()
+s:next()
+s:reset()
+
--
-- Check that altering parts of a primary index with a sequence
-- attached requires sequence update. Renaming fields does not.
--
GitLab