From 13e994c9de10503ba888856f0151f05fb46a7f43 Mon Sep 17 00:00:00 2001 From: Dmitry Simonenko <pmwkaa@gmail.com> Date: Thu, 29 Aug 2013 15:15:25 +0400 Subject: [PATCH] lua-plus-dict: fix assert on space to lua export while calling by dostring() from init.lua, remove space declaration from a configs --- src/box/box_lua_space.cc | 3 --- test/box/bug726778.cfg | 7 ------- test/box/tarantool.cfg | 9 --------- test/box/tarantool_bug750658.cfg | 9 --------- 4 files changed, 28 deletions(-) diff --git a/src/box/box_lua_space.cc b/src/box/box_lua_space.cc index 182866b6fb..c71c23a33f 100644 --- a/src/box/box_lua_space.cc +++ b/src/box/box_lua_space.cc @@ -146,7 +146,6 @@ box_lua_space_new(struct lua_State *L, struct space *space) lua_rawseti(L, -2, space_id(space)); lua_pop(L, 2); /* box, space */ - assert(lua_gettop(L) == 0); } /** Delete a given space in Lua */ @@ -159,6 +158,4 @@ box_lua_space_delete(struct lua_State *L, uint32_t id) lua_pushnil(L); lua_rawseti(L, -2, id); lua_pop(L, 2); /* box, space */ - - assert(lua_gettop(L) == 0); } diff --git a/test/box/bug726778.cfg b/test/box/bug726778.cfg index 93238ec8c9..5ea11f4fae 100644 --- a/test/box/bug726778.cfg +++ b/test/box/bug726778.cfg @@ -16,10 +16,3 @@ secondary_port = 33014 admin_port = 33015 rows_per_wal = 50 - -space[0].enabled = 1 -space[0].index[0].type = "HASH" -space[0].index[0].unique = 1 -space[0].index[0].key_field[0].fieldno = 0 -space[0].index[0].key_field[0].type = "NUM" - diff --git a/test/box/tarantool.cfg b/test/box/tarantool.cfg index 69674c64b7..6e2b9f030b 100644 --- a/test/box/tarantool.cfg +++ b/test/box/tarantool.cfg @@ -34,12 +34,3 @@ admin_port = 33015 # When the limit is reached, Tarantool closes # the WAL and starts a new one. rows_per_wal = 50 - -# Define a simple space with 1 HASH-based -# primary key. -space[0].enabled = 1 -space[0].index[0].type = "HASH" -space[0].index[0].unique = 1 -space[0].index[0].key_field[0].fieldno = 0 -space[0].index[0].key_field[0].type = "NUM" - diff --git a/test/box/tarantool_bug750658.cfg b/test/box/tarantool_bug750658.cfg index 13a2c47be6..9f1b2d1e44 100644 --- a/test/box/tarantool_bug750658.cfg +++ b/test/box/tarantool_bug750658.cfg @@ -29,12 +29,3 @@ admin_port = 33015 # When the limit is reached, Tarantool closes # the WAL and starts a new one. rows_per_wal = 50 - -# Define a simple space with 1 HASH-based -# primary key. -space[0].enabled = 1 -space[0].index[0].type = "HASH" -space[0].index[0].unique = 1 -space[0].index[0].key_field[0].fieldno = 0 -space[0].index[0].key_field[0].type = "NUM" - -- GitLab