From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id CB1292C6B1 for ; Fri, 12 Apr 2019 08:34:17 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iZSohpvrbmXl for ; Fri, 12 Apr 2019 08:34:17 -0400 (EDT) Received: from smtp16.mail.ru (smtp16.mail.ru [94.100.176.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 82A232C6B0 for ; Fri, 12 Apr 2019 08:34:17 -0400 (EDT) From: imeevma@tarantool.org Subject: [tarantool-patches] [PATCH v1 0/3] sql: make SQL_TARANTOOL_ERROR the only errcode of OP_Halt Date: Fri, 12 Apr 2019 15:34:15 +0300 Message-Id: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: korablev@tarantool.org Cc: tarantool-patches@freelists.org Currently there are two ways to set an error in SQL - through OP_Halt and through abort_due_to_error. After this patch, all errors set via OP_Halt will be set using diag_set(). https://github.com/tarantool/tarantool/issues/4074 https://github.com/tarantool/tarantool/tree/imeevma/gh-4074-diag_set-in-op_halt Mergen Imeev (3): sql: remove mayAbort field from struct Parse sql: rework diag_set() in OP_Halt sql: make SQL_TARANTOOL_ERROR the only errcode of OP_Halt src/box/sql/build.c | 57 +----------------- src/box/sql/expr.c | 9 ++- src/box/sql/fk_constraint.c | 42 +------------ src/box/sql/insert.c | 31 +++++----- src/box/sql/select.c | 17 +++--- src/box/sql/sqlInt.h | 3 - src/box/sql/trigger.c | 12 ++-- src/box/sql/vdbe.c | 24 ++------ src/box/sql/vdbe.h | 3 - src/box/sql/vdbeaux.c | 127 ---------------------------------------- test/sql-tap/e_select1.test.lua | 4 +- test/sql-tap/limit.test.lua | 26 ++++---- test/sql-tap/select4.test.lua | 4 +- test/sql/iproto.result | 18 ++++-- 14 files changed, 68 insertions(+), 309 deletions(-) -- 2.7.4