* [PATCH 1/2] schema: add "_vcollation" sysview
2019-03-22 0:27 [PATCH 0/2] add '_vcollation' sysview and fetch it in net.box Roman Khabibov
@ 2019-03-22 0:27 ` Roman Khabibov
2019-03-22 0:27 ` [PATCH 2/2] net.box: fetch '_vcollation' sysview into the module Roman Khabibov
2019-03-22 8:33 ` [PATCH 0/2] add '_vcollation' sysview and fetch it in net.box Vladimir Davydov
2 siblings, 0 replies; 5+ messages in thread
From: Roman Khabibov @ 2019-03-22 0:27 UTC (permalink / raw)
To: tarantool-patches; +Cc: vdavydov.dev
Add "_vcollation" sysview to read it from net.box. This
sysview is always readable, exept when the user doesn't have
"public" role.
Needed for #3941
---
src/box/bootstrap.snap | Bin 1831 -> 1873 bytes
src/box/lua/space.cc | 2 +
src/box/lua/upgrade.lua | 25 +++++++-
src/box/schema.h | 4 ++
src/box/schema_def.h | 2 +
src/box/sysview.c | 14 +++++
test/app-tap/tarantoolctl.test.lua | 4 +-
test/box-py/bootstrap.result | 13 +++-
test/box/access_misc.result | 4 ++
test/box/access_sysview.result | 96 ++++++++++++++++++++++++++---
test/box/access_sysview.test.lua | 30 +++++++++
test/box/alter.result | 6 +-
12 files changed, 187 insertions(+), 13 deletions(-)
diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap
index 0bb446fb6903ac3ef630c419b909f7db3df0372a..c2f1ab54cf523d856f6ec3c093de38f3433f91cc 100644
GIT binary patch
delta 1869
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
H5UuSBuApZB
delta 1827
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
R9JX=Dom4Gm<qp*lt?dSjU0DDC
diff --git a/src/box/lua/space.cc b/src/box/lua/space.cc
index 7aa0b6661..cd8eb2471 100644
--- a/src/box/lua/space.cc
+++ b/src/box/lua/space.cc
@@ -546,6 +546,8 @@ box_lua_space_init(struct lua_State *L)
lua_setfield(L, -2, "FUNC_ID");
lua_pushnumber(L, BOX_COLLATION_ID);
lua_setfield(L, -2, "COLLATION_ID");
+ lua_pushnumber(L, BOX_VCOLLATION_ID);
+ lua_setfield(L, -2, "VCOLLATION_ID");
lua_pushnumber(L, BOX_VFUNC_ID);
lua_setfield(L, -2, "VFUNC_ID");
lua_pushnumber(L, BOX_PRIV_ID);
diff --git a/src/box/lua/upgrade.lua b/src/box/lua/upgrade.lua
index 70cfb4f2e..16cc2a982 100644
--- a/src/box/lua/upgrade.lua
+++ b/src/box/lua/upgrade.lua
@@ -636,12 +636,35 @@ local function upgrade(options)
return
end
+local function create_vcollation_space()
+ local _collation = box.space._collation
+ local format = _collation:format()
+ create_sysview(box.schema.COLLATION_ID, box.schema.VCOLLATION_ID)
+ box.space[box.schema.VCOLLATION_ID]:format(format)
+end
+
+local function upgrade_to_2_1_2()
+ local _collation = box.space._collation
+ local _index = box.space._index
+
+ -- System space format usually is in order "id, owner, name...".
+ -- The fields "name", "owner" are swapped in "_collation" format,
+ -- due to the field "owner" was added after the "_collation" creation.
+ box.space._index:delete{276, 1}
+ log.info("update index name on _collation")
+ box.space._index:insert{_collation.id, 2, 'name', 'tree', {unique = true}, {{1, 'string'}}}
+ log.info("update index owner on _collation")
+ box.space._index:insert{_collation.id, 1, 'owner', 'tree', {unique = false}, {{2, 'unsigned'}}}
+ create_vcollation_space()
+end
+
local handlers = {
{version = mkversion(1, 7, 6), func = upgrade_to_1_7_6, auto = true},
{version = mkversion(1, 7, 7), func = upgrade_to_1_7_7, auto = true},
{version = mkversion(1, 10, 0), func = upgrade_to_1_10_0, auto = true},
{version = mkversion(1, 10, 2), func = upgrade_to_1_10_2, auto = true},
- {version = mkversion(2, 1, 0), func = upgrade_to_2_1_0, auto = true}
+ {version = mkversion(2, 1, 0), func = upgrade_to_2_1_0, auto = true},
+ {version = mkversion(2, 1, 2), func = upgrade_to_2_1_2, auto = true}
}
for _, handler in ipairs(handlers) do
diff --git a/src/box/schema.h b/src/box/schema.h
index f3df08b48..223dd9943 100644
--- a/src/box/schema.h
+++ b/src/box/schema.h
@@ -256,6 +256,7 @@ struct entity_access {
struct access user[BOX_USER_MAX];
struct access role[BOX_USER_MAX];
struct access sequence[BOX_USER_MAX];
+ struct access collation[BOX_USER_MAX];
};
/** A single instance of the global entities. */
@@ -281,6 +282,9 @@ entity_access_get(enum schema_object_type type)
case SC_SEQUENCE:
case SC_ENTITY_SEQUENCE:
return entity_access.sequence;
+ case SC_COLLATION:
+ case SC_ENTITY_COLLATION:
+ return entity_access.collation;
default:
return NULL;
}
diff --git a/src/box/schema_def.h b/src/box/schema_def.h
index a760ecc3f..412e34092 100644
--- a/src/box/schema_def.h
+++ b/src/box/schema_def.h
@@ -72,6 +72,8 @@ enum {
BOX_SCHEMA_ID = 272,
/** Space id of _collation. */
BOX_COLLATION_ID = 276,
+ /** Space id of _vcollation. */
+ BOX_VCOLLATION_ID = 277,
/** Space id of _space. */
BOX_SPACE_ID = 280,
/** Space id of _vspace view. */
diff --git a/src/box/sysview.c b/src/box/sysview.c
index 63b669d07..4bf402cbd 100644
--- a/src/box/sysview.c
+++ b/src/box/sysview.c
@@ -402,6 +402,15 @@ vsequence_filter(struct space *source, struct tuple *tuple)
((PRIV_WRDA | PRIV_X) & effective);
}
+static bool
+vcollation_filter(struct space *source, struct tuple *tuple)
+{
+ (void) source;
+ (void) tuple;
+
+ return true;
+}
+
static struct index *
sysview_space_create_index(struct space *space, struct index_def *def)
{
@@ -428,6 +437,11 @@ sysview_space_create_index(struct space *space, struct index_def *def)
source_index_id = def->iid;
filter = vspace_filter;
break;
+ case BOX_VCOLLATION_ID:
+ source_space_id = BOX_COLLATION_ID;
+ source_index_id = def->iid;
+ filter = vcollation_filter;
+ break;
case BOX_VUSER_ID:
source_space_id = BOX_USER_ID;
source_index_id = def->iid;
diff --git a/test/app-tap/tarantoolctl.test.lua b/test/app-tap/tarantoolctl.test.lua
index db046e03f..55484d0a8 100755
--- a/test/app-tap/tarantoolctl.test.lua
+++ b/test/app-tap/tarantoolctl.test.lua
@@ -388,8 +388,8 @@ do
check_ctlcat_xlog(test_i, dir, "--from=3 --to=6 --format=json --show-system --replica 1", "\n", 3)
check_ctlcat_xlog(test_i, dir, "--from=3 --to=6 --format=json --show-system --replica 1 --replica 2", "\n", 3)
check_ctlcat_xlog(test_i, dir, "--from=3 --to=6 --format=json --show-system --replica 2", "\n", 0)
- check_ctlcat_snap(test_i, dir, "--space=280", "---\n", 23)
- check_ctlcat_snap(test_i, dir, "--space=288", "---\n", 49)
+ check_ctlcat_snap(test_i, dir, "--space=280", "---\n", 24)
+ check_ctlcat_snap(test_i, dir, "--space=288", "---\n", 53)
end)
end)
diff --git a/test/box-py/bootstrap.result b/test/box-py/bootstrap.result
index 3e4394557..91dfd7929 100644
--- a/test/box-py/bootstrap.result
+++ b/test/box-py/bootstrap.result
@@ -4,7 +4,7 @@ box.internal.bootstrap()
box.space._schema:select{}
---
- - ['max_id', 511]
- - ['version', 2, 1, 0]
+ - ['version', 2, 1, 2]
...
box.space._cluster:select{}
---
@@ -21,6 +21,10 @@ box.space._space:select{}
'name': 'name', 'type': 'string'}, {'name': 'owner', 'type': 'unsigned'},
{'name': 'type', 'type': 'string'}, {'name': 'locale', 'type': 'string'}, {
'name': 'opts', 'type': 'map'}]]
+ - [277, 1, '_vcollation', 'sysview', 0, {}, [{'name': 'id', 'type': 'unsigned'},
+ {'name': 'name', 'type': 'string'}, {'name': 'owner', 'type': 'unsigned'}, {
+ 'name': 'type', 'type': 'string'}, {'name': 'locale', 'type': 'string'}, {
+ 'name': 'opts', 'type': 'map'}]]
- [280, 1, '_space', 'memtx', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {'name': 'owner',
'type': 'unsigned'}, {'name': 'name', 'type': 'string'}, {'name': 'engine',
'type': 'string'}, {'name': 'field_count', 'type': 'unsigned'}, {'name': 'flags',
@@ -88,7 +92,11 @@ box.space._index:select{}
---
- - [272, 0, 'primary', 'tree', {'unique': true}, [[0, 'string']]]
- [276, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
- - [276, 1, 'name', 'tree', {'unique': true}, [[1, 'string']]]
+ - [276, 1, 'owner', 'tree', {'unique': false}, [[2, 'unsigned']]]
+ - [276, 2, 'name', 'tree', {'unique': true}, [[1, 'string']]]
+ - [277, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
+ - [277, 1, 'owner', 'tree', {'unique': false}, [[2, 'unsigned']]]
+ - [277, 2, 'name', 'tree', {'unique': true}, [[1, 'string']]]
- [280, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
- [280, 1, 'owner', 'tree', {'unique': false}, [[1, 'unsigned']]]
- [280, 2, 'name', 'tree', {'unique': true}, [[2, 'string']]]
@@ -158,6 +166,7 @@ box.space._priv:select{}
- [1, 1, 'universe', 0, 4294967295]
- [1, 2, 'function', 1, 4]
- [1, 2, 'space', 276, 2]
+ - [1, 2, 'space', 277, 1]
- [1, 2, 'space', 281, 1]
- [1, 2, 'space', 286, 1]
- [1, 2, 'space', 289, 1]
diff --git a/test/box/access_misc.result b/test/box/access_misc.result
index 4ffeb386a..e15075fff 100644
--- a/test/box/access_misc.result
+++ b/test/box/access_misc.result
@@ -761,6 +761,10 @@ box.space._space:select()
'name': 'name', 'type': 'string'}, {'name': 'owner', 'type': 'unsigned'},
{'name': 'type', 'type': 'string'}, {'name': 'locale', 'type': 'string'}, {
'name': 'opts', 'type': 'map'}]]
+ - [277, 1, '_vcollation', 'sysview', 0, {}, [{'name': 'id', 'type': 'unsigned'},
+ {'name': 'name', 'type': 'string'}, {'name': 'owner', 'type': 'unsigned'}, {
+ 'name': 'type', 'type': 'string'}, {'name': 'locale', 'type': 'string'}, {
+ 'name': 'opts', 'type': 'map'}]]
- [280, 1, '_space', 'memtx', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {'name': 'owner',
'type': 'unsigned'}, {'name': 'name', 'type': 'string'}, {'name': 'engine',
'type': 'string'}, {'name': 'field_count', 'type': 'unsigned'}, {'name': 'flags',
diff --git a/test/box/access_sysview.result b/test/box/access_sysview.result
index fd8b14248..b65ac4352 100644
--- a/test/box/access_sysview.result
+++ b/test/box/access_sysview.result
@@ -74,6 +74,10 @@ session.su('guest')
---
- true
...
+#box.space._vspace.index[2]:select('_vcollation') ~= 0
+---
+- true
+...
#box.space._vindex:select(box.space._vspace.id) > 0
---
- true
@@ -94,6 +98,10 @@ session.su('guest')
---
- true
...
+#box.space._vindex:select(box.space._vcollation.id) > 0
+---
+- true
+...
box.session.su('admin')
---
...
@@ -127,6 +135,10 @@ box.session.su('guest')
---
- error: Read access to space '_vsequence' is denied for user 'guest'
...
+#box.space._vcollation:select{}
+---
+- error: Read access to space '_vcollation' is denied for user 'guest'
+...
box.session.su('admin')
---
...
@@ -138,11 +150,15 @@ box.session.su('guest')
...
#box.space._vspace:select{}
---
-- 8
+- 9
...
#box.space._vindex:select{}
---
-- 20
+- 24
+...
+#box.space._vcollation:select{}
+---
+- 4
...
box.session.su('admin')
---
@@ -230,11 +246,11 @@ box.session.su('guest')
...
#box.space._vspace:select{}
---
-- 24
+- 25
...
#box.space._vindex:select{}
---
-- 50
+- 54
...
#box.space._vuser:select{}
---
@@ -242,12 +258,16 @@ box.session.su('guest')
...
#box.space._vpriv:select{}
---
-- 15
+- 16
...
#box.space._vfunc:select{}
---
- 1
...
+#box.space._vcollation:select{}
+---
+- 4
+...
box.session.su('admin')
---
...
@@ -262,7 +282,7 @@ box.session.su('guest')
...
#box.space._vindex:select{}
---
-- 50
+- 54
...
#box.space._vuser:select{}
---
@@ -270,7 +290,7 @@ box.session.su('guest')
...
#box.space._vpriv:select{}
---
-- 15
+- 16
...
#box.space._vfunc:select{}
---
@@ -280,6 +300,10 @@ box.session.su('guest')
---
- 0
...
+#box.space._vcollation:select{}
+---
+- 4
+...
box.session.su('admin')
---
...
@@ -631,6 +655,64 @@ seq:drop()
---
...
--
+-- _vcollation
+--
+box.session.su('admin')
+---
+...
+box.internal.collation.create('test', 'ICU', 'ru-RU')
+---
+...
+-- Only admin can create collation.
+coll_cnt = #box.space._collation:select{}
+---
+...
+box.schema.user.grant("guest", "read, write, alter, execute", "space", "_collation")
+---
+...
+box.session.su("guest")
+---
+...
+box.internal.collation.create('guest0', 'ICU', 'ru-RU')
+---
+- error: Create access to collation 'guest0' is denied for user 'guest'
+...
+box.space._vcollation:select{}
+---
+- - [0, 'none', 1, 'BINARY', '', {}]
+ - [1, 'unicode', 1, 'ICU', '', {}]
+ - [2, 'unicode_ci', 1, 'ICU', '', {'strength': 'primary'}]
+ - [3, 'binary', 1, 'BINARY', '', {}]
+ - [4, 'test', 1, 'ICU', 'ru-RU', {}]
+...
+#box.space._vcollation:select{} == coll_cnt
+---
+- true
+...
+box.session.su('admin')
+---
+...
+-- _vcollation is readable anyway.
+box.schema.user.revoke("guest", "read", "space", "_collation")
+---
+...
+box.session.su("guest")
+---
+...
+#box.space._vcollation:select{}
+---
+- 5
+...
+session.su('admin')
+---
+...
+box.internal.collation.drop('test')
+---
+...
+box.internal.collation.drop('guest0')
+---
+...
+--
-- view:alter() tests
--
box.space._vspace.index[1]:alter({parts = { 2, 'string' }})
diff --git a/test/box/access_sysview.test.lua b/test/box/access_sysview.test.lua
index 4cc5611a6..287b7bbbe 100644
--- a/test/box/access_sysview.test.lua
+++ b/test/box/access_sysview.test.lua
@@ -31,12 +31,14 @@ session.su('guest')
#box.space._vspace.index[2]:select('_vuser') ~= 0
#box.space._vspace.index[2]:select('_vfunc') ~= 0
#box.space._vspace.index[2]:select('_vpriv') ~= 0
+#box.space._vspace.index[2]:select('_vcollation') ~= 0
#box.space._vindex:select(box.space._vspace.id) > 0
#box.space._vindex:select(box.space._vindex.id) > 0
#box.space._vindex:select(box.space._vuser.id) > 0
#box.space._vindex:select(box.space._vfunc.id) > 0
#box.space._vindex:select(box.space._vpriv.id) > 0
+#box.space._vindex:select(box.space._vcollation.id) > 0
box.session.su('admin')
box.schema.user.revoke('guest', 'public')
@@ -48,6 +50,7 @@ box.session.su('guest')
#box.space._vpriv:select{}
#box.space._vfunc:select{}
#box.space._vsequence:select{}
+#box.space._vcollation:select{}
box.session.su('admin')
box.schema.user.grant('guest', 'public')
@@ -55,6 +58,7 @@ box.session.su('guest')
#box.space._vspace:select{}
#box.space._vindex:select{}
+#box.space._vcollation:select{}
box.session.su('admin')
s = box.schema.space.create('test')
@@ -96,6 +100,7 @@ box.session.su('guest')
#box.space._vuser:select{}
#box.space._vpriv:select{}
#box.space._vfunc:select{}
+#box.space._vcollation:select{}
box.session.su('admin')
box.schema.user.revoke('guest', 'read', 'universe')
@@ -107,6 +112,7 @@ box.session.su('guest')
#box.space._vpriv:select{}
#box.space._vfunc:select{}
#box.space._vsequence:select{}
+#box.space._vcollation:select{}
box.session.su('admin')
box.schema.user.revoke('guest', 'write', 'universe')
@@ -264,6 +270,30 @@ box.session.su("guest")
session.su('admin')
seq:drop()
+--
+-- _vcollation
+--
+
+box.session.su('admin')
+box.internal.collation.create('test', 'ICU', 'ru-RU')
+
+-- Only admin can create collation.
+coll_cnt = #box.space._collation:select{}
+box.schema.user.grant("guest", "read, write, alter, execute", "space", "_collation")
+box.session.su("guest")
+box.internal.collation.create('guest0', 'ICU', 'ru-RU')
+box.space._vcollation:select{}
+#box.space._vcollation:select{} == coll_cnt
+box.session.su('admin')
+
+-- _vcollation is readable anyway.
+box.schema.user.revoke("guest", "read", "space", "_collation")
+box.session.su("guest")
+#box.space._vcollation:select{}
+session.su('admin')
+box.internal.collation.drop('test')
+box.internal.collation.drop('guest0')
+
--
-- view:alter() tests
--
diff --git a/test/box/alter.result b/test/box/alter.result
index 9a1086e0c..bbd4e41f2 100644
--- a/test/box/alter.result
+++ b/test/box/alter.result
@@ -183,7 +183,11 @@ _index:select{}
---
- - [272, 0, 'primary', 'tree', {'unique': true}, [[0, 'string']]]
- [276, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
- - [276, 1, 'name', 'tree', {'unique': true}, [[1, 'string']]]
+ - [276, 1, 'owner', 'tree', {'unique': false}, [[2, 'unsigned']]]
+ - [276, 2, 'name', 'tree', {'unique': true}, [[1, 'string']]]
+ - [277, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
+ - [277, 1, 'owner', 'tree', {'unique': false}, [[2, 'unsigned']]]
+ - [277, 2, 'name', 'tree', {'unique': true}, [[1, 'string']]]
- [280, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
- [280, 1, 'owner', 'tree', {'unique': false}, [[1, 'unsigned']]]
- [280, 2, 'name', 'tree', {'unique': true}, [[2, 'string']]]
--
2.17.2 (Apple Git-113)
^ permalink raw reply [flat|nested] 5+ messages in thread