From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 54C1244184E for ; Wed, 25 Mar 2020 04:43:14 +0300 (MSK) From: Nikita Pettik Date: Wed, 25 Mar 2020 04:43:03 +0300 Message-Id: <025887cafb6ed752962ec238db670ec2f46c0a86.1585097339.git.korablev@tarantool.org> In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v2 07/10] box: use stacked diagnostic area for functional indexes List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: v.shpilevoy@tarantool.org Since we've introduced stacked diagnostic in previous commit, let's use it in the code implementing functional indexes. Part of #1148 --- src/box/key_list.c | 12 ++++---- src/box/lua/call.c | 4 +-- test/engine/func_index.result | 52 +++++++++++++++++++++++++++++---- test/engine/func_index.test.lua | 8 +++++ 4 files changed, 62 insertions(+), 14 deletions(-) diff --git a/src/box/key_list.c b/src/box/key_list.c index 81eb501a5..a766ce0ec 100644 --- a/src/box/key_list.c +++ b/src/box/key_list.c @@ -63,9 +63,9 @@ key_list_iterator_create(struct key_list_iterator *it, struct tuple *tuple, if (rc != 0) { /* Can't evaluate function. */ struct space *space = space_by_id(index_def->space_id); - diag_set(ClientError, ER_FUNC_INDEX_FUNC, index_def->name, + diag_add(ClientError, ER_FUNC_INDEX_FUNC, index_def->name, space != NULL ? space_name(space) : "", - diag_last_error(diag_get())->errmsg); + "can't evaluate function"); return -1; } uint32_t key_data_sz; @@ -74,9 +74,9 @@ key_list_iterator_create(struct key_list_iterator *it, struct tuple *tuple, if (key_data == NULL) { struct space *space = space_by_id(index_def->space_id); /* Can't get a result returned by function . */ - diag_set(ClientError, ER_FUNC_INDEX_FUNC, index_def->name, + diag_add(ClientError, ER_FUNC_INDEX_FUNC, index_def->name, space != NULL ? space_name(space) : "", - diag_last_error(diag_get())->errmsg); + "can't get a value returned by function"); return -1; } @@ -170,9 +170,9 @@ key_list_iterator_next(struct key_list_iterator *it, const char **value) * The key doesn't follow functional index key * definition. */ - diag_set(ClientError, ER_FUNC_INDEX_FORMAT, it->index_def->name, + diag_add(ClientError, ER_FUNC_INDEX_FORMAT, it->index_def->name, space ? space_name(space) : "", - diag_last_error(diag_get())->errmsg); + "key does not follow functional index definition"); return -1; } diff --git a/src/box/lua/call.c b/src/box/lua/call.c index 92575374d..5d3579eff 100644 --- a/src/box/lua/call.c +++ b/src/box/lua/call.c @@ -687,9 +687,9 @@ func_persistent_lua_load(struct func_lua *func) if (func->base.def->is_sandboxed) { if (prepare_lua_sandbox(tarantool_L, default_sandbox_exports, nelem(default_sandbox_exports)) != 0) { - diag_set(ClientError, ER_LOAD_FUNCTION, + diag_add(ClientError, ER_LOAD_FUNCTION, func->base.def->name, - diag_last_error(diag_get())->errmsg); + "can't prepare a Lua sandbox"); goto end; } } else { diff --git a/test/engine/func_index.result b/test/engine/func_index.result index 159158f1c..8f92fcf11 100644 --- a/test/engine/func_index.result +++ b/test/engine/func_index.result @@ -5,6 +5,10 @@ test_run = require('test_run').new() engine = test_run:get_cfg('engine') | --- | ... +test_run:cmd("push filter \"file: .*\" to \"file: \"") + | --- + | - true + | ... -- -- gh-1260: Func index. @@ -158,8 +162,7 @@ idx = s:create_index('idx', {func = box.func.invalidreturn1.id, parts = {{1, 'un s:insert({1}) | --- | - error: 'Key format doesn''t match one defined in functional index ''idx'' of space - | ''withdata'': Supplied key type of part 0 does not match index part type: expected - | unsigned' + | ''withdata'': key does not follow functional index definition' | ... idx:drop() | --- @@ -197,8 +200,7 @@ idx = s:create_index('idx', {func = box.func.invalidreturn3.id, parts = {{1, 'un s:insert({1}) | --- | - error: 'Key format doesn''t match one defined in functional index ''idx'' of space - | ''withdata'': Supplied key type of part 0 does not match index part type: expected - | unsigned' + | ''withdata'': key does not follow functional index definition' | ... idx:drop() | --- @@ -217,8 +219,7 @@ idx = s:create_index('idx', {func = box.func.invalidreturn4.id, parts = {{1, 'un s:insert({1}) | --- | - error: 'Key format doesn''t match one defined in functional index ''idx'' of space - | ''withdata'': Supplied key type of part 0 does not match index part type: expected - | unsigned' + | ''withdata'': key does not follow functional index definition' | ... idx:drop() | --- @@ -261,6 +262,45 @@ box.schema.func.create('runtimeerror', {body = lua_code, is_deterministic = true idx = s:create_index('idx', {func = box.func.runtimeerror.id, parts = {{1, 'string'}}}) | --- | ... +s:insert({1}) + | --- + | - error: 'Failed to build a key for functional index ''idx'' of space ''withdata'': + | can''t evaluate function' + | ... +e = box.error.last() + | --- + | ... +e:unpack() + | --- + | - code: 198 + | trace: + | - file: + | line: 68 + | type: ClientError + | message: 'Failed to build a key for functional index ''idx'' of space ''withdata'': + | can''t evaluate function' + | prev: '[string "return function(tuple) local ..."]:1: attempt to + | call global ''require'' (a nil value)' + | ... +e = e.prev + | --- + | ... +e:unpack() + | --- + | - type: LuajitError + | message: '[string "return function(tuple) local ..."]:1: attempt + | to call global ''require'' (a nil value)' + | trace: + | - file: + | line: 1028 + | ... +e = e.prev + | --- + | ... +e == nil + | --- + | - true + | ... idx:drop() | --- | ... diff --git a/test/engine/func_index.test.lua b/test/engine/func_index.test.lua index c3c3a7029..0e4043260 100644 --- a/test/engine/func_index.test.lua +++ b/test/engine/func_index.test.lua @@ -1,5 +1,6 @@ test_run = require('test_run').new() engine = test_run:get_cfg('engine') +test_run:cmd("push filter \"file: .*\" to \"file: \"") -- -- gh-1260: Func index. @@ -98,6 +99,13 @@ lua_code = [[function(tuple) test_run:cmd("setopt delimiter ''"); box.schema.func.create('runtimeerror', {body = lua_code, is_deterministic = true, is_sandboxed = true}) idx = s:create_index('idx', {func = box.func.runtimeerror.id, parts = {{1, 'string'}}}) +s:insert({1}) +e = box.error.last() +e:unpack() +e = e.prev +e:unpack() +e = e.prev +e == nil idx:drop() -- Remove old persistent functions -- 2.17.1