diff --git a/src/box/box.cc b/src/box/box.cc index fb145d773a30e05e0ee742da753e4baf14c101e6..7d0d3343c0a825d12867677f7ccf53ab1dfe5368 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -996,15 +996,6 @@ box_sequence_next(uint32_t seq_id, int64_t *result) *result = value; return 0; } -int -box_sequence_get(uint32_t seq_id, int64_t *result) -{ - struct sequence *seq = sequence_cache_find(seq_id); - if (seq == NULL) - return -1; - return sequence_get(seq, result); -} - int box_sequence_set(uint32_t seq_id, int64_t value) { diff --git a/src/box/box.h b/src/box/box.h index 460ac7fad8d56cec1a272dab44496518c63f6ba8..9fe7fef9baf8bebea67a6ea6c0be2887042926d8 100644 --- a/src/box/box.h +++ b/src/box/box.h @@ -326,18 +326,6 @@ box_truncate(uint32_t space_id); API_EXPORT int box_sequence_next(uint32_t seq_id, int64_t *result); -/** - * Get the last value returned by a sequence. - * - * \param seq_id sequence identifier - * \paramp[out] result pointer to a variable where the last sequence - * value will be stored on success - * \retval -1 on error (check box_error_last()) - * \retval 0 on success - */ -API_EXPORT int -box_sequence_get(uint32_t seq_id, int64_t *result); - /** * Set a sequence value. * diff --git a/src/box/errcode.h b/src/box/errcode.h index ae67b5277fa6e3a64bda4c3bcf68d37373d83af1..243dbbddeeb76e4cac5bc82bbea650841485bb4f 100644 --- a/src/box/errcode.h +++ b/src/box/errcode.h @@ -200,7 +200,6 @@ struct errcode_record { /*145 */_(ER_NO_SUCH_SEQUENCE, "Sequence '%s' does not exist") \ /*146 */_(ER_SEQUENCE_EXISTS, "Sequence '%s' already exists") \ /*147 */_(ER_SEQUENCE_OVERFLOW, "Sequence '%s' has overflowed") \ - /*148 */_(ER_SEQUENCE_NOT_STARTED, "Sequence '%s' is not started") \ /* * !IMPORTANT! Please follow instructions at start of the file diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua index 8fb898dea4302fa2a6a33f688567d3f662fac5df..f79266c8e883fd60290b0a9d2f91e7d15cc70833 100644 --- a/src/box/lua/schema.lua +++ b/src/box/lua/schema.lua @@ -1198,10 +1198,6 @@ sequence_mt.next = function(self) return internal.sequence.next(self.id) end -sequence_mt.get = function(self) - return internal.sequence.get(self.id) -end - sequence_mt.set = function(self, value) return internal.sequence.set(self.id, value) end diff --git a/src/box/lua/sequence.c b/src/box/lua/sequence.c index 63d3471773e745de2966a7d7827552b944f41aa2..9cf359010d29674087d742258b22234953c8f28e 100644 --- a/src/box/lua/sequence.c +++ b/src/box/lua/sequence.c @@ -49,17 +49,6 @@ lbox_sequence_next(struct lua_State *L) return 1; } -static int -lbox_sequence_get(struct lua_State *L) -{ - uint32_t seq_id = luaL_checkinteger(L, 1); - int64_t result; - if (box_sequence_get(seq_id, &result) != 0) - luaT_error(L); - luaL_pushint64(L, result); - return 1; -} - static int lbox_sequence_set(struct lua_State *L) { @@ -108,7 +97,6 @@ box_lua_sequence_init(struct lua_State *L) { static const struct luaL_Reg sequence_internal_lib[] = { {"next", lbox_sequence_next}, - {"get", lbox_sequence_get}, {"set", lbox_sequence_set}, {"reset", lbox_sequence_reset}, {"on_alter", lbox_sequence_on_alter}, diff --git a/src/box/sequence.c b/src/box/sequence.c index b43bb9217c85f72b36af684403ff9e75a82bd8fa..7a1fb658fc61908d6b5d59a88bd2870ff0b61177 100644 --- a/src/box/sequence.c +++ b/src/box/sequence.c @@ -82,14 +82,3 @@ sequence_next(struct sequence *seq, int64_t *result) value = def->step > 0 ? def->min : def->max; goto done; } - -int -sequence_get(struct sequence *seq, int64_t *result) -{ - if (!seq->is_started) { - diag_set(ClientError, ER_SEQUENCE_NOT_STARTED, seq->def->name); - return -1; - } - *result = seq->value; - return 0; -} diff --git a/src/box/sequence.h b/src/box/sequence.h index 6ea016265a22e1ff3a5789b17bcafcfaf4df0626..9087d465fa40f5a1bfd5d6d6803f1c87c173b10f 100644 --- a/src/box/sequence.h +++ b/src/box/sequence.h @@ -111,16 +111,6 @@ sequence_set(struct sequence *seq, int64_t value) int sequence_next(struct sequence *seq, int64_t *result); -/** - * Get the last value returned by a sequence. - * - * Return 0 and assign the last sequence value to @result - * if the sequence was started. If it was not, return -1 - * and raise ER_SEQUENCE_NOT_STARTED error. - */ -int -sequence_get(struct sequence *seq, int64_t *result); - #if defined(__cplusplus) } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/test/box/misc.result b/test/box/misc.result index f904fa43a2528326afc9e8b76ff1bf9cd0007d0b..57df68acc84eead284ba69f0f061b75a20e55e4e 100644 --- a/test/box/misc.result +++ b/test/box/misc.result @@ -382,7 +382,6 @@ t; - 'box.error.NO_SUCH_ENGINE : 57' - 'box.error.COMMIT_IN_SUB_STMT : 122' - 'box.error.injection : table: <address> - - 'box.error.SEQUENCE_NOT_STARTED : 148' - 'box.error.LAST_DROP : 15' - 'box.error.SEQUENCE_OVERFLOW : 147' - 'box.error.DECOMPRESSION : 124' diff --git a/test/box/sequence.result b/test/box/sequence.result index a3e91282ade6187414510f835df2abd0ddf65ffe..cd5dd471bd06d58b9e8cc1f8cead3a2cdb185c5b 100644 --- a/test/box/sequence.result +++ b/test/box/sequence.result @@ -188,18 +188,10 @@ sq.step, sq.min, sq.max, sq.start, sq.cycle - 1 - false ... -sq:get() -- error ---- -- error: Sequence 'test' is not started -... sq:next() -- 1 --- - 1 ... -sq:get() -- 1 ---- -- 1 -... sq:next() -- 2 --- - 2 @@ -207,10 +199,6 @@ sq:next() -- 2 sq:set(100) --- ... -sq:get() -- 100 ---- -- 100 -... sq:next() -- 101 --- - 101 @@ -222,10 +210,6 @@ sq:next() -- 102 sq:reset() --- ... -sq:get() -- error ---- -- error: Sequence 'test' is not started -... sq:next() -- 1 --- - 1 @@ -249,18 +233,10 @@ sq.step, sq.min, sq.max, sq.start, sq.cycle - -1 - false ... -sq:get() -- error ---- -- error: Sequence 'test' is not started -... sq:next() -- -1 --- - -1 ... -sq:get() -- -1 ---- -- -1 -... sq:next() -- -2 --- - -2 @@ -268,10 +244,6 @@ sq:next() -- -2 sq:set(-100) --- ... -sq:get() -- -100 ---- -- -100 -... sq:next() -- -101 --- - -101 @@ -283,10 +255,6 @@ sq:next() -- -102 sq:reset() --- ... -sq:get() -- error ---- -- error: Sequence 'test' is not started -... sq:next() -- -1 --- - -1 diff --git a/test/box/sequence.test.lua b/test/box/sequence.test.lua index ca1412f4b0f812a41e38aa76b866b687769ed3a0..ef49bd0e5758555a1f6236c7d4ff62eaa8f7d6b5 100644 --- a/test/box/sequence.test.lua +++ b/test/box/sequence.test.lua @@ -58,16 +58,12 @@ box.sequence.test == nil -- Default ascending sequence. sq = box.schema.sequence.create('test') sq.step, sq.min, sq.max, sq.start, sq.cycle -sq:get() -- error sq:next() -- 1 -sq:get() -- 1 sq:next() -- 2 sq:set(100) -sq:get() -- 100 sq:next() -- 101 sq:next() -- 102 sq:reset() -sq:get() -- error sq:next() -- 1 sq:next() -- 2 sq:drop() @@ -75,16 +71,12 @@ sq:drop() -- Default descending sequence. sq = box.schema.sequence.create('test', {step = -1}) sq.step, sq.min, sq.max, sq.start, sq.cycle -sq:get() -- error sq:next() -- -1 -sq:get() -- -1 sq:next() -- -2 sq:set(-100) -sq:get() -- -100 sq:next() -- -101 sq:next() -- -102 sq:reset() -sq:get() -- error sq:next() -- -1 sq:next() -- -2 sq:drop()