From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@dev.tarantool.org, gorcunov@gmail.com, sergepetrenko@tarantool.org, korablev@tarantool.org Subject: [Tarantool-patches] [PATCH 5/5] msgpuck: activate MP_EXT custom serializers Date: Tue, 12 May 2020 01:45:52 +0200 [thread overview] Message-ID: <9dd79b8d7c37a9ff60e4c7abcde81c5cf5b4e5f6.1589240704.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1589240704.git.v.shpilevoy@tarantool.org> Msgpuck functions mp_snprint() and mp_fprint() now support customizable MP_EXT serializer. This patch makes them able to correctly serialize all tarantool's MP_EXT extensions: MP_DECIMAL, MP_UUID, MP_ERROR. Closes #4719 --- src/box/CMakeLists.txt | 1 + src/box/box.cc | 2 ++ src/box/msgpack.c | 78 ++++++++++++++++++++++++++++++++++++++++++ src/box/msgpack.h | 41 ++++++++++++++++++++++ 4 files changed, 122 insertions(+) create mode 100644 src/box/msgpack.c create mode 100644 src/box/msgpack.h diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt index c931ecdfe..16a729590 100644 --- a/src/box/CMakeLists.txt +++ b/src/box/CMakeLists.txt @@ -71,6 +71,7 @@ add_library(xlog STATIC xlog.c) target_link_libraries(xlog core box_error crc32 ${ZSTD_LIBRARIES}) add_library(box STATIC + msgpack.c iproto.cc error.cc xrow_io.cc diff --git a/src/box/box.cc b/src/box/box.cc index ae0907e0f..d95a47cc9 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -76,6 +76,7 @@ #include "func.h" #include "sequence.h" #include "sql_stmt_cache.h" +#include "msgpack.h" static char status[64] = "unknown"; @@ -2355,6 +2356,7 @@ on_wal_checkpoint_threshold(void) void box_init(void) { + msgpack_init(); fiber_cond_create(&ro_cond); user_cache_init(); diff --git a/src/box/msgpack.c b/src/box/msgpack.c new file mode 100644 index 000000000..37bb3920c --- /dev/null +++ b/src/box/msgpack.c @@ -0,0 +1,78 @@ +/* + * Copyright 2020, Tarantool AUTHORS, please see AUTHORS file. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#include "msgpack.h" +#include "msgpuck/msgpuck.h" + +#include "mp_extension_types.h" +#include "mp_decimal.h" +#include "uuid/mp_uuid.h" +#include "mp_error.h" + +static int +msgpack_fprint_ext(FILE *file, const char **data, int depth) +{ + int8_t type; + uint32_t len = mp_decode_extl(data, &type); + switch(type) { + case MP_DECIMAL: + return mp_fprint_decimal(file, data, len); + case MP_UUID: + return mp_fprint_uuid(file, data, len); + case MP_ERROR: + return mp_fprint_error(file, data, depth); + default: + return fprintf(file, "undefined"); + } +} + +static int +msgpack_snprint_ext(char *buf, int size, const char **data, int depth) +{ + int8_t type; + uint32_t len = mp_decode_extl(data, &type); + switch(type) { + case MP_DECIMAL: + return mp_snprint_decimal(buf, size, data, len); + case MP_UUID: + return mp_snprint_uuid(buf, size, data, len); + case MP_ERROR: + return mp_snprint_error(buf, size, data, depth); + default: + return snprintf(buf, size, "undefined"); + } +} + +void +msgpack_init(void) +{ + mp_fprint_ext = msgpack_fprint_ext; + mp_snprint_ext = msgpack_snprint_ext; +} diff --git a/src/box/msgpack.h b/src/box/msgpack.h new file mode 100644 index 000000000..a7ccc7f90 --- /dev/null +++ b/src/box/msgpack.h @@ -0,0 +1,41 @@ +#pragma once +/* + * Copyright 2020, Tarantool AUTHORS, please see AUTHORS file. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#if defined(__cplusplus) +extern "C" { +#endif /* defined(__cplusplus) */ + +void +msgpack_init(void); + +#if defined(__cplusplus) +} +#endif /* defined(__cplusplus) */ -- 2.21.1 (Apple Git-122.3)
next prev parent reply other threads:[~2020-05-11 23:46 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-11 23:45 [Tarantool-patches] [PATCH 0/5] mp_snprint() and mp_fprint() for decimal, uuid, error Vladislav Shpilevoy 2020-05-11 23:45 ` [Tarantool-patches] [PATCH 1/5] msgpuck: bump version to enable extension printer Vladislav Shpilevoy 2020-05-12 17:34 ` Cyrill Gorcunov 2020-05-11 23:45 ` [Tarantool-patches] [PATCH 2/5] decimal: provide MP_DECIMAL extension serializer Vladislav Shpilevoy 2020-05-12 15:13 ` Cyrill Gorcunov 2020-05-12 20:30 ` Vladislav Shpilevoy 2020-05-12 20:56 ` Cyrill Gorcunov 2020-05-12 17:35 ` Cyrill Gorcunov 2020-05-11 23:45 ` [Tarantool-patches] [PATCH 3/5] uuid: provide MP_UUID " Vladislav Shpilevoy 2020-05-12 17:36 ` Cyrill Gorcunov 2020-05-11 23:45 ` [Tarantool-patches] [PATCH 4/5] error: provide MP_ERROR " Vladislav Shpilevoy 2020-05-12 17:52 ` Cyrill Gorcunov 2020-05-12 20:38 ` Vladislav Shpilevoy 2020-05-12 21:27 ` Cyrill Gorcunov 2020-05-18 15:24 ` Serge Petrenko 2020-05-13 12:31 ` Nikita Pettik 2020-05-13 22:10 ` Vladislav Shpilevoy 2020-05-14 2:32 ` Nikita Pettik 2020-05-14 21:28 ` Vladislav Shpilevoy 2020-05-19 13:21 ` Nikita Pettik 2020-05-20 21:57 ` Vladislav Shpilevoy 2020-05-19 11:51 ` Alexander Turenko 2020-05-19 20:48 ` Vladislav Shpilevoy 2020-05-11 23:45 ` Vladislav Shpilevoy [this message] 2020-05-12 17:52 ` [Tarantool-patches] [PATCH 5/5] msgpuck: activate MP_EXT custom serializers Cyrill Gorcunov 2020-05-13 21:06 ` Nikita Pettik 2020-05-13 21:48 ` Vladislav Shpilevoy 2020-05-14 2:24 ` Nikita Pettik 2020-05-14 21:27 ` Vladislav Shpilevoy 2020-05-19 12:11 ` Alexander Turenko 2020-05-19 20:48 ` Vladislav Shpilevoy 2020-05-19 13:23 ` Nikita Pettik 2020-05-18 15:25 ` [Tarantool-patches] [PATCH 0/5] mp_snprint() and mp_fprint() for decimal, uuid, error Serge Petrenko 2020-05-21 18:25 ` Alexander Turenko
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=9dd79b8d7c37a9ff60e4c7abcde81c5cf5b4e5f6.1589240704.git.v.shpilevoy@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=korablev@tarantool.org \ --cc=sergepetrenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 5/5] msgpuck: activate MP_EXT custom serializers' \ /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