diff --git a/src/box/request.c b/src/box/request.c index 9d3287f97299fa02d939fed463a9af3f07247663..041a8d5487dc6ff33697fc0ce07ee03160f71bb8 100644 --- a/src/box/request.c +++ b/src/box/request.c @@ -163,7 +163,8 @@ request_handle_sequence(struct request *request, struct space *space) const char *data = request->tuple; const char *data_end = request->tuple_end; int len = mp_decode_array(&data); - int fieldno = pk->def->key_def->parts[space->sequence_part].fieldno; + struct key_part *part = &pk->def->key_def->parts[space->sequence_part]; + int fieldno = part->fieldno; if (unlikely(len < fieldno + 1)) return 0; @@ -174,6 +175,13 @@ request_handle_sequence(struct request *request, struct space *space) } while (--fieldno > 0); } + if (part->path != NULL) { + tuple_go_to_path(&key, part->path, part->path_len, + MULTIKEY_NONE); + if (key == NULL) + return 0; /* field not found */ + } + int64_t value; if (mp_typeof(*key) == MP_NIL) { /* diff --git a/test/box/sequence.result b/test/box/sequence.result index 8a7c349cff72de3993c3dd1aa4989c5fcfc3d4e2..3cac4dc9a08eb8aa7c617b8e3bf97f53c5eb729c 100644 --- a/test/box/sequence.result +++ b/test/box/sequence.result @@ -2033,3 +2033,35 @@ s:insert{'d', box.NULL, 1001} s:drop() --- ... +-- +-- gh-4210: using sequence with a json path key part. +-- +s = box.schema.space.create('test') +--- +... +_ = s:create_index('pk', {parts = {{'[1].a.b[1]', 'unsigned'}}, sequence = true}) +--- +... +s:replace{} -- error +--- +- error: Tuple field [1]["a"]["b"][1] required by space format is missing +... +s:replace{{c = {}}} -- error +--- +- error: Tuple field [1]["a"]["b"][1] required by space format is missing +... +s:replace{{a = {c = {}}}} -- error +--- +- error: Tuple field [1]["a"]["b"][1] required by space format is missing +... +s:replace{{a = {b = {}}}} -- error +--- +- error: Tuple field [1]["a"]["b"][1] required by space format is missing +... +s:replace{{a = {b = {box.NULL}}}} -- ok +--- +- [{'a': {'b': [1]}}] +... +s:drop() +--- +... diff --git a/test/box/sequence.test.lua b/test/box/sequence.test.lua index d931a94e29c8eaccfbff401cc72c2a0910844751..c39f1d4125edb85cf520dc9e6828de829b4c3cec 100644 --- a/test/box/sequence.test.lua +++ b/test/box/sequence.test.lua @@ -685,3 +685,15 @@ s.index.pk.sequence_id == sequence_id s:insert{'d', 1000, 1000} s:insert{'d', box.NULL, 1001} s:drop() + +-- +-- gh-4210: using sequence with a json path key part. +-- +s = box.schema.space.create('test') +_ = s:create_index('pk', {parts = {{'[1].a.b[1]', 'unsigned'}}, sequence = true}) +s:replace{} -- error +s:replace{{c = {}}} -- error +s:replace{{a = {c = {}}}} -- error +s:replace{{a = {b = {}}}} -- error +s:replace{{a = {b = {box.NULL}}}} -- ok +s:drop()