Skip to content
Snippets Groups Projects
Unverified Commit 8b5657aa authored by Vladislav Shpilevoy's avatar Vladislav Shpilevoy Committed by Alexander Turenko
Browse files

msgpuck: activate MP_EXT custom serializers


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

Reviewed-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Reviewed-by: default avatarSerge Petrenko <sergepetrenko@tarantool.org>
Reviewed-by: default avatarNikita Pettik <korablev@tarantool.org>
Reviewed-by: default avatarAlexander Turenko <alexander.turenko@tarantool.org>
parent 1104179c
No related branches found
No related tags found
No related merge requests found
...@@ -71,6 +71,7 @@ add_library(xlog STATIC xlog.c) ...@@ -71,6 +71,7 @@ add_library(xlog STATIC xlog.c)
target_link_libraries(xlog core box_error crc32 ${ZSTD_LIBRARIES}) target_link_libraries(xlog core box_error crc32 ${ZSTD_LIBRARIES})
add_library(box STATIC add_library(box STATIC
msgpack.c
iproto.cc iproto.cc
xrow_io.cc xrow_io.cc
tuple_convert.c tuple_convert.c
......
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
#include "func.h" #include "func.h"
#include "sequence.h" #include "sequence.h"
#include "sql_stmt_cache.h" #include "sql_stmt_cache.h"
#include "msgpack.h"
static char status[64] = "unknown"; static char status[64] = "unknown";
...@@ -2346,6 +2347,7 @@ on_wal_checkpoint_threshold(void) ...@@ -2346,6 +2347,7 @@ on_wal_checkpoint_threshold(void)
void void
box_init(void) box_init(void)
{ {
msgpack_init();
fiber_cond_create(&ro_cond); fiber_cond_create(&ro_cond);
user_cache_init(); user_cache_init();
......
/*
* 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)
{
const char **orig = data;
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 mp_fprint_ext_default(file, orig, depth);
}
}
static int
msgpack_snprint_ext(char *buf, int size, const char **data, int depth)
{
const char **orig = data;
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 mp_snprint_ext_default(buf, size, orig, depth);
}
}
void
msgpack_init(void)
{
mp_fprint_ext = msgpack_fprint_ext;
mp_snprint_ext = msgpack_snprint_ext;
}
#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) */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment