From: Vladimir Davydov <vdavydov.dev@gmail.com> To: Kirill Shcherbatov <kshcherbatov@tarantool.org> Cc: tarantool-patches@freelists.org, Kostya Osipov <kostja@tarantool.org> Subject: Re: [tarantool-patches] Re: [PATCH v5 2/9] lib: implement JSON tree class for json library Date: Wed, 5 Dec 2018 12:07:40 +0300 [thread overview] Message-ID: <20181205090740.lyt6ikf7wmivavqb@esperanza> (raw) In-Reply-To: <38c62fa1-190d-181f-621b-8185847055f7@tarantool.org> On Wed, Dec 05, 2018 at 11:37:06AM +0300, Kirill Shcherbatov wrote: > Hi! Thank you for review. > > >>> BTW, json array start indexing from 0, not 1 AFAIK. Starting indexing > >>> from 1 looks weird to me. > > > > You left this comment from my previous review unattended. > > In fact, it is not so; we use [token.num - 1] to retrieve field. > Let's better describe it in comment: > /** > * Array of child records. Indexes in this array > * match [token.num-1] index for JSON_TOKEN_NUM type > * and are allocated sequentially for JSON_TOKEN_STR child > * tokens. > */ > struct json_token **children; This is weird: AFAIU json_lexer may return token.num equal to 0. What happens if we try to insert such a token into a tree? I think we should insert a token at children[token.num], not [toekn.num-1]. > > > As I've already told you, should be > > Needed for #1012 > > > #ifndef/endif shouldn't be indented. > > > I'd prefer to change this to something simpler, like > > > > assert(token->child_count == 0); > > > > but now I realize that child_count isn't actually the number of > > children, as I thought, but the max id of ever existed child. > > This is confusing. We need to do something about it. > > > > What about? > > > > /** > > * Allocation size of the children array. > > */ > > int children_capacity; > > /** > > * Max occupied index in the children array. > > */ > > int max_child_idx; > > > > and update max_child_idx on json_tree_del() as well > > > You pass token** to mh_json_find instead of token*. I haven't noticed > > that before, but turns out that > > > >> +#define mh_key_t struct json_token ** > > > > This looks weird. Why not > > > > #define mh_key_t struct json_token * > > Ok > > >> + return entry != NULL ? *entry : NULL; > > > > AFAIU entry can't be NULL here. > > assert(entry != NULL); > return *entry; > > >> +#define json_tree_foreach_entry_safe(root, node, type, member, tmp) \ > >> + for ((node) = json_tree_postorder_next_entry((root), NULL, \ > >> + type, member); \ > >> + &(node)->member != (root) && \ > >> + ((tmp) = json_tree_postorder_next_entry((root), \ > > > > Extra space. > > Ok These 'Ok'-s only clutter the email. If you agree with all my other comments. You can simply write "Agreed with everything else" and don't quote my comments. Also, please don't re-push and re-send the patch until we've agreed on all points. In this particular case the question about whether we should start indexing from 0 or 1 remains. > > =============================================== > > New JSON tree class would store JSON paths for tuple fields > for registered non-plain indexes. It is a hierarchical data > structure that organize JSON nodes produced by parser. > Class provides API to lookup node by path and iterate over the > tree. > JSON Indexes patch require such functionality to make lookup > for tuple_fields by path, make initialization of field map and > build vynyl_stmt msgpack for secondary index via JSON tree > iteration. > > Needed for #1012 > --- > src/lib/json/CMakeLists.txt | 1 + > src/lib/json/json.c | 257 ++++++++++++++++++++++++++++++++ > src/lib/json/json.h | 287 +++++++++++++++++++++++++++++++++++- > test/unit/json_path.c | 237 ++++++++++++++++++++++++++++- > test/unit/json_path.result | 60 +++++++- > 5 files changed, 839 insertions(+), 3 deletions(-)
next prev parent reply other threads:[~2018-12-05 9:07 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-26 10:49 [PATCH v5 0/9] box: indexes by JSON path Kirill Shcherbatov 2018-11-26 10:49 ` [PATCH v5 1/9] box: refactor json_path_parser class Kirill Shcherbatov 2018-11-26 12:53 ` [tarantool-patches] " Kirill Shcherbatov 2018-11-29 15:39 ` Vladimir Davydov 2018-11-26 10:49 ` [PATCH v5 2/9] lib: implement JSON tree class for json library Kirill Shcherbatov 2018-11-26 12:53 ` [tarantool-patches] " Kirill Shcherbatov 2018-11-29 17:38 ` Vladimir Davydov 2018-11-29 17:50 ` Vladimir Davydov 2018-12-04 15:22 ` Vladimir Davydov 2018-12-04 15:47 ` [tarantool-patches] " Kirill Shcherbatov 2018-12-04 17:54 ` Vladimir Davydov 2018-12-05 8:37 ` Kirill Shcherbatov 2018-12-05 9:07 ` Vladimir Davydov [this message] 2018-12-05 9:52 ` Vladimir Davydov 2018-12-06 7:56 ` Kirill Shcherbatov 2018-12-06 7:56 ` [tarantool-patches] Re: [PATCH v5 2/9] lib: make index_base support for json_lexer Kirill Shcherbatov 2018-11-26 10:49 ` [PATCH v5 3/9] box: manage format fields with JSON tree class Kirill Shcherbatov 2018-11-29 19:07 ` Vladimir Davydov 2018-12-04 15:47 ` [tarantool-patches] " Kirill Shcherbatov 2018-12-04 16:09 ` Vladimir Davydov 2018-12-04 16:32 ` Kirill Shcherbatov 2018-12-05 8:37 ` Kirill Shcherbatov 2018-12-06 7:56 ` Kirill Shcherbatov 2018-12-06 8:06 ` Vladimir Davydov 2018-11-26 10:49 ` [PATCH v5 4/9] lib: introduce json_path_cmp routine Kirill Shcherbatov 2018-11-30 10:46 ` Vladimir Davydov 2018-12-03 17:37 ` [tarantool-patches] " Konstantin Osipov 2018-12-03 18:48 ` Vladimir Davydov 2018-12-03 20:14 ` Konstantin Osipov 2018-12-06 7:56 ` [tarantool-patches] Re: [PATCH v5 4/9] lib: introduce json_path_cmp, json_path_validate Kirill Shcherbatov 2018-11-26 10:49 ` [tarantool-patches] [PATCH v5 5/9] box: introduce JSON indexes Kirill Shcherbatov 2018-11-30 21:28 ` Vladimir Davydov 2018-12-01 16:49 ` Vladimir Davydov 2018-11-26 10:49 ` [PATCH v5 6/9] box: introduce has_json_paths flag in templates Kirill Shcherbatov 2018-11-26 10:49 ` [PATCH v5 7/9] box: tune tuple_field_raw_by_path for indexed data Kirill Shcherbatov 2018-12-01 17:20 ` Vladimir Davydov 2018-11-26 10:49 ` [PATCH v5 8/9] box: introduce offset slot cache in key_part Kirill Shcherbatov 2018-12-03 21:04 ` Vladimir Davydov 2018-12-04 15:51 ` Vladimir Davydov 2018-11-26 10:49 ` [PATCH v5 9/9] box: specify indexes in user-friendly form Kirill Shcherbatov 2018-12-04 12:22 ` Vladimir Davydov
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=20181205090740.lyt6ikf7wmivavqb@esperanza \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=kshcherbatov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] Re: [PATCH v5 2/9] lib: implement JSON tree class for json library' \ /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