From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Kirill Shcherbatov Subject: [PATCH v4 03/14] box: introduce tuple_field_by_relative_path Date: Thu, 11 Oct 2018 10:58:48 +0300 Message-Id: <6d8609a936d992246e7dd7756151dc07eb92dea5.1539244271.git.kshcherbatov@tarantool.org> In-Reply-To: References: In-Reply-To: References: To: tarantool-patches@freelists.org Cc: vdavydov.dev@gmail.com, Kirill Shcherbatov List-ID: The new tuple_field_by_relative_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. Part of #1012. --- src/box/tuple_format.c | 60 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/src/box/tuple_format.c b/src/box/tuple_format.c index b385c0d..5679cad 100644 --- a/src/box/tuple_format.c +++ b/src/box/tuple_format.c @@ -541,6 +541,42 @@ tuple_field_go_to_key(const char **field, const char *key, int len) return -1; } +/** + * Retrieve field data by JSON path. + * @param field 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 inline int +tuple_field_by_relative_path(const char **field, 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(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; + } + } + return rc; +} + int tuple_field_raw_by_path(struct tuple_format *format, const char *tuple, const uint32_t *field_map, const char *path, @@ -604,23 +640,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_by_relative_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