From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp46.i.mail.ru (smtp46.i.mail.ru [94.100.177.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 7BE6545C320 for ; Tue, 12 May 2020 02:46:00 +0300 (MSK) From: Vladislav Shpilevoy Date: Tue, 12 May 2020 01:45:52 +0200 Message-Id: <9dd79b8d7c37a9ff60e4c7abcde81c5cf5b4e5f6.1589240704.git.v.shpilevoy@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 5/5] msgpuck: activate MP_EXT custom serializers List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org, gorcunov@gmail.com, sergepetrenko@tarantool.org, korablev@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 ``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 + * 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 ``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 + * 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)