diff --git a/src/box/field_def.c b/src/box/field_def.c
index 53c2b60beaa6de080f8800b296bc0ce32b6f6bd0..e4aee76fe9cb7ea4c39de5fe3469476363c2c329 100644
--- a/src/box/field_def.c
+++ b/src/box/field_def.c
@@ -40,7 +40,6 @@ const char *field_type_strs[] = {
/* [FIELD_TYPE_NUMBER] = */ "number",
/* [FIELD_TYPE_INTEGER] = */ "integer",
/* [FIELD_TYPE_SCALAR] = */ "scalar",
- /* [FIELD_TYPE_MAP] = */ "map",
};
enum field_type
diff --git a/src/box/field_def.h b/src/box/field_def.h
index f2cd57e12584102d714beb6aa495741cfd8b2105..756676f56f2a786d495d6eefa945fdda191d39b4 100644
--- a/src/box/field_def.h
+++ b/src/box/field_def.h
@@ -50,7 +50,6 @@ enum field_type {
FIELD_TYPE_NUMBER,
FIELD_TYPE_INTEGER,
FIELD_TYPE_SCALAR,
- FIELD_TYPE_MAP,
field_type_MAX
};
diff --git a/src/box/tuple.h b/src/box/tuple.h
index 693d853022871f43b67a7e90c7f3e2ac4c683291..b6ccde8b78ac685f095e340da82cd18b94b2b729 100644
--- a/src/box/tuple.h
+++ b/src/box/tuple.h
@@ -651,7 +651,8 @@ tuple_field_with_type(const struct tuple *tuple, uint32_t fieldno,
{
const char *field = tuple_field(tuple, fieldno);
if (field == NULL) {
- diag_set(ClientError, ER_NO_SUCH_FIELD, fieldno);
+ diag_set(ClientError, ER_NO_SUCH_FIELD,
+ fieldno + TUPLE_INDEX_BASE);
return NULL;
}
if (mp_typeof(*field) != type) {
diff --git a/test/box/access.result b/test/box/access.result
index f22b2e1b1b6b5a936ba52e7d618283b7670e5853..5fc84b9ca735a111a06d68ff5b05b454ed3067cc 100644
--- a/test/box/access.result
+++ b/test/box/access.result
@@ -516,7 +516,7 @@ box.space._priv:select{id}
-- -----------------------------------------------------------
box.space._user:insert{10, 1, 'name'}
---
-- error: Field 3 was not found in the tuple
+- error: Field 4 was not found in the tuple
...
box.space._user:insert{10, 1, 'name', 'strange-object-type'}
---
diff --git a/test/box/access_misc.result b/test/box/access_misc.result
index 3e086fa6f735266fc7301c051c80053580ef894f..8efda12cf9f4964234c77d1ba8b025b213f54779 100644
--- a/test/box/access_misc.result
+++ b/test/box/access_misc.result
@@ -1,6 +1,12 @@
session = box.session
---
...
+utils = require('utils')
+---
+...
+EMPTY_MAP = utils.setmap({})
+---
+...
--
-- Check a double create space
--
@@ -343,12 +349,12 @@ box.space._user:select(1)
---
- error: Read access is denied for user 'testuser' to space '_user'
...
-uid = box.space._user:insert{maxuid+1, session.uid(), 'someone', 'user'}[1]
+uid = box.space._user:insert{maxuid+1, session.uid(), 'someone', 'user', EMPTY_MAP}[1]
---
...
box.space._user:delete(uid)
---
-- [5, 4, 'someone', 'user']
+- [5, 4, 'someone', 'user', {}]
...
session.su('admin')
---
diff --git a/test/box/access_misc.test.lua b/test/box/access_misc.test.lua
index 5fde9a98ac07db196a83068159a2dca1e4332336..a667e2885af7295cf1a4556884bbf437108ff945 100644
--- a/test/box/access_misc.test.lua
+++ b/test/box/access_misc.test.lua
@@ -1,4 +1,7 @@
session = box.session
+utils = require('utils')
+EMPTY_MAP = utils.setmap({})
+
--
-- Check a double create space
--
@@ -141,7 +144,7 @@ session.su('testuser')
testuser_uid = session.uid()
box.space._user:delete(2)
box.space._user:select(1)
-uid = box.space._user:insert{maxuid+1, session.uid(), 'someone', 'user'}[1]
+uid = box.space._user:insert{maxuid+1, session.uid(), 'someone', 'user', EMPTY_MAP}[1]
box.space._user:delete(uid)
session.su('admin')
diff --git a/test/box/alter.result b/test/box/alter.result
index 6bebfc468e9554edc6f2cb4d38146adf9942503a..b1e1ce5c41073cf18beb1b8310f02f98ab46ecb3 100644
--- a/test/box/alter.result
+++ b/test/box/alter.result
@@ -17,46 +17,52 @@ test_run:cmd("push filter ', .lsn.: [0-9]+' to ''")
---
- true
...
+utils = require('utils')
+---
+...
+EMPTY_MAP = utils.setmap({})
+---
+...
--
-- Test insertion into a system space - verify that
-- mandatory fields are required.
--
-_space:insert{_space.id, ADMIN, 'test', 5 }
+_space:insert{_space.id, ADMIN, 'test', 'memtx', 0, EMPTY_MAP, {}}
---
- error: Duplicate key exists in unique index 'primary' in space '_space'
...
--
-- Bad space id
--
-_space:insert{'hello', 'world', 'test'}
+_space:insert{'hello', 'world', 'test', 'memtx', 0, EMPTY_MAP, {}}
---
- error: 'Tuple field 1 type does not match one required by operation: expected unsigned'
...
--
-- Can't create a space which has wrong field count - field_count must be NUM
--
-_space:insert{_space.id, ADMIN, 'test', 'world'}
+_space:insert{_space.id, ADMIN, 'test', 'world', 0, EMPTY_MAP, {}}
---
- error: Duplicate key exists in unique index 'primary' in space '_space'
...
--
-- There is already a tuple for the system space
--
-_space:insert{_space.id, ADMIN, '_space', 'memtx', 0}
+_space:insert{_space.id, ADMIN, '_space', 'memtx', 0, EMPTY_MAP, {}}
---
- error: Duplicate key exists in unique index 'primary' in space '_space'
...
-_space:replace{_space.id, ADMIN, '_space', 'memtx', 0}
+_space:replace{_space.id, ADMIN, '_space', 'memtx', 0, EMPTY_MAP, {}}
---
-- [280, 1, '_space', 'memtx', 0]
+- [280, 1, '_space', 'memtx', 0, {}, []]
...
-_space:insert{_index.id, ADMIN, '_index', 'memtx', 0}
+_space:insert{_index.id, ADMIN, '_index', 'memtx', 0, EMPTY_MAP, {}}
---
- error: Duplicate key exists in unique index 'primary' in space '_space'
...
-_space:replace{_index.id, ADMIN, '_index', 'memtx', 0}
+_space:replace{_index.id, ADMIN, '_index', 'memtx', 0, EMPTY_MAP, {}}
---
-- [288, 1, '_index', 'memtx', 0]
+- [288, 1, '_index', 'memtx', 0, {}, []]
...
--
-- Can't change properties of a space
@@ -239,12 +245,18 @@ box.snapshot()
- ok
...
test_run:cmd("restart server default with cleanup=1")
+utils = require('utils')
+---
+...
+EMPTY_MAP = utils.setmap({})
+---
+...
ADMIN = 1
---
...
-box.space['_space']:insert{1000, ADMIN, 'test', 'memtx', 0}
+box.space['_space']:insert{1000, ADMIN, 'test', 'memtx', 0, EMPTY_MAP, {}}
---
-- [1000, 1, 'test', 'memtx', 0]
+- [1000, 1, 'test', 'memtx', 0, {}, []]
...
box.space[1000].id
---
@@ -252,7 +264,7 @@ box.space[1000].id
...
box.space['_space']:delete{1000}
---
-- [1000, 1, 'test', 'memtx', 0]
+- [1000, 1, 'test', 'memtx', 0, {}, []]
...
box.space[1000]
---
diff --git a/test/box/alter.test.lua b/test/box/alter.test.lua
index af0f468bb69404e5c8a1daeac8935b5cadcd1c3d..de4eac2469661f9941ac344efe15aa9e393ea3e4 100644
--- a/test/box/alter.test.lua
+++ b/test/box/alter.test.lua
@@ -4,26 +4,29 @@ ADMIN = 1
env = require('test_run')
test_run = env.new()
test_run:cmd("push filter ', .lsn.: [0-9]+' to ''")
+utils = require('utils')
+EMPTY_MAP = utils.setmap({})
+
--
-- Test insertion into a system space - verify that
-- mandatory fields are required.
--
-_space:insert{_space.id, ADMIN, 'test', 5 }
+_space:insert{_space.id, ADMIN, 'test', 'memtx', 0, EMPTY_MAP, {}}
--
-- Bad space id
--
-_space:insert{'hello', 'world', 'test'}
+_space:insert{'hello', 'world', 'test', 'memtx', 0, EMPTY_MAP, {}}
--
-- Can't create a space which has wrong field count - field_count must be NUM
--
-_space:insert{_space.id, ADMIN, 'test', 'world'}
+_space:insert{_space.id, ADMIN, 'test', 'world', 0, EMPTY_MAP, {}}
--
-- There is already a tuple for the system space
--
-_space:insert{_space.id, ADMIN, '_space', 'memtx', 0}
-_space:replace{_space.id, ADMIN, '_space', 'memtx', 0}
-_space:insert{_index.id, ADMIN, '_index', 'memtx', 0}
-_space:replace{_index.id, ADMIN, '_index', 'memtx', 0}
+_space:insert{_space.id, ADMIN, '_space', 'memtx', 0, EMPTY_MAP, {}}
+_space:replace{_space.id, ADMIN, '_space', 'memtx', 0, EMPTY_MAP, {}}
+_space:insert{_index.id, ADMIN, '_index', 'memtx', 0, EMPTY_MAP, {}}
+_space:replace{_index.id, ADMIN, '_index', 'memtx', 0, EMPTY_MAP, {}}
--
-- Can't change properties of a space
--
@@ -77,8 +80,10 @@ _index:run_triggers(false)
_space:run_triggers(false)
box.snapshot()
test_run:cmd("restart server default with cleanup=1")
+utils = require('utils')
+EMPTY_MAP = utils.setmap({})
ADMIN = 1
-box.space['_space']:insert{1000, ADMIN, 'test', 'memtx', 0}
+box.space['_space']:insert{1000, ADMIN, 'test', 'memtx', 0, EMPTY_MAP, {}}
box.space[1000].id
box.space['_space']:delete{1000}
box.space[1000]
diff --git a/test/box/net.box.result b/test/box/net.box.result
index a0d0264523b6de6f103a2fbd0a5391e1dd7f61fe..7b4d706dac56af6d9f085d7e9fd3f10eabb0b16d 100644
--- a/test/box/net.box.result
+++ b/test/box/net.box.result
@@ -1755,7 +1755,7 @@ test_run:cmd("clear filter")
--
-- gh-2402 net.box doesn't support space:format()
--
-space = box.schema.space.create('test', {format={{name="id", type="number"}}})
+space = box.schema.space.create('test', {format={{name="id", type="unsigned"}}})
---
...
space ~= nil
@@ -1790,7 +1790,7 @@ format[1].name == "id"
---
- true
...
-format[1].type == "number"
+format[1].type == "unsigned"
---
- true
...
@@ -1807,7 +1807,7 @@ space:drop()
--
-- Check that it's possible to get connection object form net.box space
--
-space = box.schema.space.create('test', {format={{name="id", type="number"}}})
+space = box.schema.space.create('test', {format={{name="id", type="unsigned"}}})
---
...
space ~= nil
diff --git a/test/box/net.box.test.lua b/test/box/net.box.test.lua
index e87637aa64350e5557f0fa3bd657167daf546434..ae1b05c6288ba79c7b7ccb87161633aef660633c 100644
--- a/test/box/net.box.test.lua
+++ b/test/box/net.box.test.lua
@@ -707,7 +707,7 @@ test_run:cmd("clear filter")
-- gh-2402 net.box doesn't support space:format()
--
-space = box.schema.space.create('test', {format={{name="id", type="number"}}})
+space = box.schema.space.create('test', {format={{name="id", type="unsigned"}}})
space ~= nil
_ = box.space.test:create_index('primary')
box.schema.user.grant('guest','read,write,execute','space', 'test')
@@ -721,7 +721,7 @@ format = c.space.test:format()
format[1] ~= nil
format[1].name == "id"
-format[1].type == "number"
+format[1].type == "unsigned"
c.space.test:format({})
@@ -732,7 +732,7 @@ space:drop()
-- Check that it's possible to get connection object form net.box space
--
-space = box.schema.space.create('test', {format={{name="id", type="number"}}})
+space = box.schema.space.create('test', {format={{name="id", type="unsigned"}}})
space ~= nil
_ = box.space.test:create_index('primary')
box.schema.user.grant('guest','read,write,execute','space', 'test')