Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladimir Davydov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: yaroslav.dynnikov@tarantool.org
Cc: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org
Subject: [Tarantool-patches] [PATCH v2] net.box: add __serialize and __tostring methods for future objects
Date: Tue, 17 Aug 2021 11:00:50 +0300	[thread overview]
Message-ID: <38b7f8367e68ece293394d9cf88200e7929341de.1629186968.git.vdavydov@tarantool.org> (raw)
In-Reply-To: <20210817075856.xkelwdonp5kmdofs@esperanza>

__tostring always returns the type name, which is 'net.box.request'.

The output of __serialize depends on whether there are user-defined
fields attached to the future. If yes, it returns the fields in a table,
otherwise it falls back on __tostring.

Closes #6314
---
https://github.com/tarantool/tarantool/issues/6314
https://github.com/tarantool/tarantool/tree/vdavydov/netbox-future-serialize

Changes in v2:
 - Remove 'sync' from the __tostring output.
 - Remove inaccessible fields from the __serialize output.
   Return user-defined fields instead if any.

 src/box/lua/net_box.c                         | 25 ++++++++++++++
 test/box/net.box_fiber-async_gh-3107.result   | 33 +++++++++++++++++++
 test/box/net.box_fiber-async_gh-3107.test.lua | 12 +++++++
 3 files changed, 70 insertions(+)

diff --git a/src/box/lua/net_box.c b/src/box/lua/net_box.c
index 1783da607dcc..3ed464a93437 100644
--- a/src/box/lua/net_box.c
+++ b/src/box/lua/net_box.c
@@ -1432,6 +1432,29 @@ luaT_netbox_request_gc(struct lua_State *L)
 	return 0;
 }
 
+static int
+luaT_netbox_request_tostring(struct lua_State *L)
+{
+	lua_pushstring(L, netbox_request_typename);
+	return 1;
+}
+
+static int
+luaT_netbox_request_serialize(struct lua_State *L)
+{
+	struct netbox_request *request = luaT_check_netbox_request(L, 1);
+	/*
+	 * If there are user-defined fields attached to the future object,
+	 * return them, otherwise push the type name, like __tostring does.
+	 */
+	if (request->index_ref != LUA_NOREF) {
+		lua_rawgeti(L, LUA_REGISTRYINDEX, request->index_ref);
+	} else {
+		lua_pushstring(L, netbox_request_typename);
+	}
+	return 1;
+}
+
 static int
 luaT_netbox_request_index(struct lua_State *L)
 {
@@ -2107,6 +2130,8 @@ luaopen_net_box(struct lua_State *L)
 
 	static const struct luaL_Reg netbox_request_meta[] = {
 		{ "__gc",           luaT_netbox_request_gc },
+		{"__tostring",      luaT_netbox_request_tostring },
+		{"__serialize",     luaT_netbox_request_serialize },
 		{ "__index",        luaT_netbox_request_index },
 		{ "__newindex",     luaT_netbox_request_newindex },
 		{ "is_ready",       luaT_netbox_request_is_ready },
diff --git a/test/box/net.box_fiber-async_gh-3107.result b/test/box/net.box_fiber-async_gh-3107.result
index ae1c2c308092..450934cd6593 100644
--- a/test/box/net.box_fiber-async_gh-3107.result
+++ b/test/box/net.box_fiber-async_gh-3107.result
@@ -251,6 +251,39 @@ gc.data3 == nil
 ---
 - true
 ...
+--
+-- __tostring and __serialize future methods
+--
+future = c:eval('return 123', {}, {is_async = true})
+---
+...
+tostring(future)
+---
+- net.box.request
+...
+future
+---
+- net.box.request
+...
+future.abc = 123
+---
+...
+future.xyz = 'abc'
+---
+...
+tostring(future)
+---
+- net.box.request
+...
+future
+---
+- xyz: abc
+  abc: 123
+...
+future:wait_result()
+---
+- [123]
+...
 box.schema.user.revoke('guest', 'execute', 'universe')
 ---
 ...
diff --git a/test/box/net.box_fiber-async_gh-3107.test.lua b/test/box/net.box_fiber-async_gh-3107.test.lua
index b6bf35ca2fa1..f93d962ae88e 100644
--- a/test/box/net.box_fiber-async_gh-3107.test.lua
+++ b/test/box/net.box_fiber-async_gh-3107.test.lua
@@ -89,6 +89,18 @@ _ = collectgarbage('collect')
 _ = collectgarbage('collect')
 gc.data3 == nil
 
+--
+-- __tostring and __serialize future methods
+--
+future = c:eval('return 123', {}, {is_async = true})
+tostring(future)
+future
+future.abc = 123
+future.xyz = 'abc'
+tostring(future)
+future
+future:wait_result()
+
 box.schema.user.revoke('guest', 'execute', 'universe')
 
 c:close()
-- 
2.25.1


  reply	other threads:[~2021-08-17  8:00 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-13 12:58 [Tarantool-patches] [PATCH] " Vladimir Davydov via Tarantool-patches
2021-08-13 17:41 ` Yaroslav Dynnikov via Tarantool-patches
2021-08-17  7:58   ` Vladimir Davydov via Tarantool-patches
2021-08-17  8:00     ` Vladimir Davydov via Tarantool-patches [this message]
2021-08-24 22:39       ` [Tarantool-patches] [PATCH v2] " Vladislav Shpilevoy via Tarantool-patches
2021-08-25 13:35         ` Vladimir Davydov via Tarantool-patches
2021-08-25 20:08           ` Vladislav Shpilevoy via Tarantool-patches
2021-08-26 14:56           ` Yaroslav Dynnikov via Tarantool-patches
2021-08-26 15:05             ` Vladimir Davydov via Tarantool-patches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=38b7f8367e68ece293394d9cf88200e7929341de.1629186968.git.vdavydov@tarantool.org \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=v.shpilevoy@tarantool.org \
    --cc=vdavydov@tarantool.org \
    --cc=yaroslav.dynnikov@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v2] net.box: add __serialize and __tostring methods for future objects' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox