From: Kirill Shcherbatov <kshcherbatov@tarantool.org> To: tarantool-patches@freelists.org Cc: vdavydov.dev@gmail.com, Kirill Shcherbatov <kshcherbatov@tarantool.org> Subject: [PATCH v5 03/12] box: introduce tuple_field_go_to_path Date: Mon, 29 Oct 2018 09:56:35 +0300 [thread overview] Message-ID: <9fe671bec3e9eab2f27bf547a058d0c291183fb4.1540795996.git.kshcherbatov@tarantool.org> (raw) In-Reply-To: <cover.1540795996.git.kshcherbatov@tarantool.org> In-Reply-To: <cover.1540795996.git.kshcherbatov@tarantool.org> The new tuple_field_go_to_path routine is used in function tuple_field_raw_by_path to retrieve data by JSON path from field. We need this routine exported in future to access data by JSON path specified in key_part. Need for #1012 --- src/box/tuple_format.c | 59 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/src/box/tuple_format.c b/src/box/tuple_format.c index c19ff39..6f76158 100644 --- a/src/box/tuple_format.c +++ b/src/box/tuple_format.c @@ -552,6 +552,41 @@ tuple_field_go_to_key(const char **field, const char *key, int len) return -1; } +/** + * Retrieve msgpack data by JSON path. + * @param data Pointer to msgpack with data. + * @param path The path to process. + * @param path_len The length of the @path. + * @retval 0 On success. + * @retval >0 On path parsing error, invalid character position. + */ +static int +tuple_field_go_to_path(const char **data, const char *path, uint32_t path_len) +{ + int rc; + struct json_path_parser parser; + struct json_path_node node; + json_path_parser_create(&parser, path, path_len); + while ((rc = json_path_next(&parser, &node)) == 0) { + switch (node.type) { + case JSON_PATH_NUM: + rc = tuple_field_go_to_index(data, node.num); + break; + case JSON_PATH_STR: + rc = tuple_field_go_to_key(data, node.str, node.len); + break; + default: + assert(node.type == JSON_PATH_END); + return 0; + } + if (rc != 0) { + *data = NULL; + return 0; + } + } + return rc; +} + int tuple_field_raw_by_path(struct tuple_format *format, const char *tuple, const uint32_t *field_map, const char *path, @@ -615,23 +650,13 @@ tuple_field_raw_by_path(struct tuple_format *format, const char *tuple, *field = NULL; return 0; } - while ((rc = json_path_next(&parser, &node)) == 0) { - switch(node.type) { - case JSON_PATH_NUM: - rc = tuple_field_go_to_index(field, node.num); - break; - case JSON_PATH_STR: - rc = tuple_field_go_to_key(field, node.str, node.len); - break; - default: - assert(node.type == JSON_PATH_END); - return 0; - } - if (rc != 0) { - *field = NULL; - return 0; - } - } + rc = tuple_field_go_to_path(field, path + parser.offset, + path_len - parser.offset); + if (rc == 0) + return 0; + /* Setup absolute error position. */ + rc += parser.offset; + error: assert(rc > 0); diag_set(ClientError, ER_ILLEGAL_PARAMS, -- 2.7.4
next prev parent reply other threads:[~2018-10-29 6:56 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-29 6:56 [PATCH v5 00/12] box: indexes by JSON path Kirill Shcherbatov 2018-10-29 6:56 ` [PATCH v5 01/12] box: refactor key_def_find routine Kirill Shcherbatov 2018-11-19 17:48 ` Vladimir Davydov 2018-10-29 6:56 ` [PATCH v5 10/12] box: tune tuple_field_raw_by_path for indexed data Kirill Shcherbatov 2018-10-29 6:56 ` [PATCH v5 11/12] box: introduce offset slot cache in key_part Kirill Shcherbatov 2018-11-01 13:32 ` [tarantool-patches] " Konstantin Osipov 2018-11-06 12:15 ` [tarantool-patches] " Kirill Shcherbatov 2018-10-29 6:56 ` [PATCH v5 12/12] box: specify indexes in user-friendly form Kirill Shcherbatov 2018-11-01 13:34 ` [tarantool-patches] " Konstantin Osipov 2018-11-01 14:18 ` Konstantin Osipov 2018-11-06 12:15 ` [tarantool-patches] " Kirill Shcherbatov 2018-10-29 6:56 ` [PATCH v5 02/12] box: introduce key_def_parts_are_sequential Kirill Shcherbatov 2018-11-01 14:23 ` [tarantool-patches] " Konstantin Osipov 2018-11-06 12:14 ` [tarantool-patches] " Kirill Shcherbatov 2018-11-19 17:48 ` Vladimir Davydov 2018-10-29 6:56 ` Kirill Shcherbatov [this message] 2018-11-19 17:48 ` [PATCH v5 03/12] box: introduce tuple_field_go_to_path Vladimir Davydov 2018-10-29 6:56 ` [PATCH v5 04/12] box: introduce tuple_format_add_key_part Kirill Shcherbatov 2018-11-01 14:38 ` [tarantool-patches] " Konstantin Osipov 2018-11-06 12:15 ` [tarantool-patches] " Kirill Shcherbatov 2018-11-19 17:50 ` Vladimir Davydov 2018-10-29 6:56 ` [PATCH v5 05/12] lib: implement JSON tree class for json library Kirill Shcherbatov 2018-11-01 15:08 ` [tarantool-patches] " Konstantin Osipov 2018-11-06 12:15 ` [tarantool-patches] " Kirill Shcherbatov 2018-11-19 17:53 ` Vladimir Davydov 2018-11-20 16:43 ` Vladimir Davydov 2018-11-21 10:37 ` [tarantool-patches] " Kirill Shcherbatov 2018-11-26 10:50 ` Kirill Shcherbatov 2018-10-29 6:56 ` [PATCH v5 06/12] box: manage format fields with JSON tree class Kirill Shcherbatov 2018-10-29 6:56 ` [PATCH v5 07/12] lib: introduce json_path_normalize routine Kirill Shcherbatov 2018-11-01 15:22 ` [tarantool-patches] " Konstantin Osipov 2018-11-01 15:27 ` [tarantool-patches] " Kirill Shcherbatov 2018-11-20 15:13 ` Vladimir Davydov 2018-11-26 10:50 ` Kirill Shcherbatov 2018-11-20 15:14 ` Vladimir Davydov 2018-10-29 6:56 ` [PATCH v5 08/12] box: introduce JSON indexes Kirill Shcherbatov 2018-11-20 16:52 ` Vladimir Davydov 2018-11-26 10:50 ` [tarantool-patches] " Kirill Shcherbatov 2018-10-29 6:56 ` [tarantool-patches] [PATCH v5 09/12] box: introduce has_json_paths flag in templates Kirill Shcherbatov
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=9fe671bec3e9eab2f27bf547a058d0c291183fb4.1540795996.git.kshcherbatov@tarantool.org \ --to=kshcherbatov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [PATCH v5 03/12] box: introduce tuple_field_go_to_path' \ /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