Skip to content

Commit

Permalink
net.box: fetch '_vcollation' sysview into the module
Browse files Browse the repository at this point in the history
Fetch "_vcollation" sysview to show collation name instead collation id.

Closes #3941
  • Loading branch information
romanhabibov committed May 30, 2019
1 parent 5eab44d commit 8580960
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 9 deletions.
24 changes: 18 additions & 6 deletions src/box/lua/net_box.lua
Expand Up @@ -31,6 +31,7 @@ local decode_greeting = internal.decode_greeting
local TIMEOUT_INFINITY = 500 * 365 * 86400
local VSPACE_ID = 281
local VINDEX_ID = 289
local VCOLLATION_ID = 277
local DEFAULT_CONNECT_TIMEOUT = 10

local IPROTO_STATUS_KEY = 0x00
Expand Down Expand Up @@ -735,19 +736,24 @@ local function create_transport(host, port, user, password, callback,
end
local select1_id = new_request_id()
local select2_id = new_request_id()
local select3_id = new_request_id()
local response = {}
-- fetch everything from space _vspace, 2 = ITER_ALL
encode_select(send_buf, select1_id, VSPACE_ID, 0, 2, 0, 0xFFFFFFFF, nil)
-- fetch everything from space _vindex, 2 = ITER_ALL
encode_select(send_buf, select2_id, VINDEX_ID, 0, 2, 0, 0xFFFFFFFF, nil)
-- fetch everything from space _vcollation, 2 = ITER_ALL
encode_select(send_buf, select3_id, VCOLLATION_ID, 0, 2, 0, 0xFFFFFFFF,
nil)

schema_version = nil -- any schema_version will do provided that
-- it is consistent across responses
repeat
local err, hdr, body_rpos, body_end = send_and_recv_iproto()
if err then return error_sm(err, hdr) end
dispatch_response_iproto(hdr, body_rpos, body_end)
local id = hdr[IPROTO_SYNC_KEY]
if id == select1_id or id == select2_id then
if id == select1_id or id == select2_id or id == select3_id then
-- response to a schema query we've submitted
local status = hdr[IPROTO_STATUS_KEY]
local response_schema_version = hdr[IPROTO_SCHEMA_VERSION_KEY]
Expand All @@ -766,9 +772,10 @@ local function create_transport(host, port, user, password, callback,
body, body_end = decode(body_rpos)
response[id] = body[IPROTO_DATA_KEY]
end
until response[select1_id] and response[select2_id]
callback('did_fetch_schema', schema_version,
response[select1_id], response[select2_id])
until response[select1_id] and response[select2_id] and
response[select3_id]
callback('did_fetch_schema', schema_version, response[select1_id],
response[select2_id],response[select3_id])
set_state('active')
return iproto_sm(schema_version)
end
Expand Down Expand Up @@ -1190,7 +1197,8 @@ function remote_methods:timeout(timeout)
return self
end

function remote_methods:_install_schema(schema_version, spaces, indices)
function remote_methods:_install_schema(schema_version, spaces, indices,
collations)
local sl, space_mt, index_mt = {}, self._space_mt, self._index_mt
for _, space in pairs(spaces) do
local name = space[3]
Expand Down Expand Up @@ -1258,11 +1266,15 @@ function remote_methods:_install_schema(schema_version, spaces, indices)
local pkcollationid = index[PARTS][k].collation
local pktype = index[PARTS][k][2] or index[PARTS][k].type
local pkfield = index[PARTS][k][1] or index[PARTS][k].field
local pkcollation = nil
if pkcollationid ~= nil then
pkcollation = collations[pkcollationid + 1][2]
end

local pk = {
type = pktype,
fieldno = pkfield + 1,
collation_id = pkcollationid,
collation = pkcollation,
is_nullable = pknullable
}
idx.parts[k] = pk
Expand Down
2 changes: 1 addition & 1 deletion test/box/net.box.result
Expand Up @@ -2910,7 +2910,7 @@ c.space.test.index.sk.parts
---
- - type: string
is_nullable: false
collation_id: 277
collation: test
fieldno: 1
...
c:close()
Expand Down
4 changes: 2 additions & 2 deletions test/box/stat_net.result
Expand Up @@ -85,7 +85,7 @@ box.stat.net.CONNECTIONS.total
...
box.stat.net.REQUESTS.total
---
- 13
- 17
...
box.stat.net.CONNECTIONS.current
---
Expand Down Expand Up @@ -151,7 +151,7 @@ test_run:wait_cond(function() return box.stat.net.REQUESTS.current == 0 end, WAI
...
box.stat.net.REQUESTS.total
---
- 15
- 19
...
-- reset
box.stat.reset()
Expand Down

0 comments on commit 8580960

Please sign in to comment.