Re: [tarantool-patches] Re: [PATCH 2/2] net.box: fetch '_vcollation' sysview into the module

[Roman Khabibov <roman.habibov@tarantool.org>]

> On Jun 5, 2019, at 8:28 PM, Vladimir Davydov <vdavydov.dev@gmail.com> wrote:
> 
> On Wed, Jun 05, 2019 at 08:08:39PM +0300, Roman Khabibov wrote:
>> 
>>> On Jun 4, 2019, at 7:36 PM, Vladimir Davydov <vdavydov.dev@gmail.com> wrote:
>>> 
>>> On Thu, May 30, 2019 at 03:36:03PM +0300, Roman Khabibov wrote:
>>>> Fetch "_vcollation" sysview to show collation name instead collation id.
>>>> 
>>>> Closes #3941
>>>> ---
>>>> src/box/lua/net_box.lua  | 24 ++++++++++++++++++------
>>>> test/box/net.box.result  |  2 +-
>>>> test/box/stat_net.result |  4 ++--
>>>> 3 files changed, 21 insertions(+), 9 deletions(-)
>>> 
>>> This one looks good to me, but you probably need to write a doc bot
>>> request.
>>> 
>> What should I write in this request? I understood, that you meant
>> info about _vcollation existance.
> 
> Yep, something like this I suppose:
> 
>  https://www.tarantool.io/en/doc/2.1/book/box/box_space/#box-space-vspace
> 
> BTW we miss _vsequence documentation. Should be added as well.

commit 2faf236c6b45b308ad86fd60f4250fc7af33996d
Author: Roman Khabibov <roman.habibov@tarantool.org>
Date:   Thu May 16 13:15:25 2019 +0300

    net.box: fetch '_vcollation' sysview into the module
    
    Fetch "_vcollation" sysview to show collation name instead collation id.
    
    Closes #3941

diff --git a/src/box/lua/net_box.lua b/src/box/lua/net_box.lua
index 0cfb5075d..251ad407a 100644
--- a/src/box/lua/net_box.lua
+++ b/src/box/lua/net_box.lua
@@ -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
@@ -735,11 +736,16 @@ 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
@@ -747,7 +753,7 @@ local function create_transport(host, port, user, password, callback,
             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]
@@ -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
@@ -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]
@@ -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
diff --git a/test/box/net.box.result b/test/box/net.box.result
index d02fed7a3..9c516fff5 100644
--- a/test/box/net.box.result
+++ b/test/box/net.box.result
@@ -2339,14 +2339,14 @@ connected_cnt
 ...
 disconnected_cnt
 ---
-- 1
+- 2
 ...
 conn:close()
 ---
 ...
 disconnected_cnt
 ---
-- 2
+- 3
 ...
 test_run:cmd('stop server connecter')
 ---
@@ -2910,7 +2910,7 @@ c.space.test.index.sk.parts
 ---
 - - type: string
     is_nullable: false
-    collation_id: 277
+    collation: test
     fieldno: 1
 ...
 c:close()
diff --git a/test/box/stat_net.result b/test/box/stat_net.result
index 92f6d581f..9eeada7ec 100644
--- a/test/box/stat_net.result
+++ b/test/box/stat_net.result
@@ -85,7 +85,7 @@ box.stat.net.CONNECTIONS.total
 ...
 box.stat.net.REQUESTS.total
 ---
-- 13
+- 17
 ...
 box.stat.net.CONNECTIONS.current
 ---
@@ -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()