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 80A652486E for ; Mon, 15 Jul 2019 11:16:22 -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 ai7f8ZqPm1B9 for ; Mon, 15 Jul 2019 11:16:22 -0400 (EDT) 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 turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 391F024868 for ; Mon, 15 Jul 2019 11:16:22 -0400 (EDT) From: imeevma@tarantool.org Subject: [tarantool-patches] [PATCH v3 0/3] sql: clean-up in case constraint creation failed Date: Mon, 15 Jul 2019 18:16:19 +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: v.shpilevoy@tarantool.org Cc: korablev@tarantool.org, tarantool-patches@freelists.org This patch makes VDBE run destructors before halting in case constraint creation failed. This is done using new opcode OP_SetDiag, which allows to set an error and do a jump without halting VDBE. https://github.com/tarantool/tarantool/issues/4183 https://github.com/tarantool/tarantool/tree/imeevma/gh-4183-clean-up-when-constraint-creation-failed Changes in v2: 1) Opcode OP_Error was renamed to OP_SetDiag 2) Now OP_SetDiag is used for diag_set() for all VDBE errors. This functionality has been removed from OP_Halt. 3) Fixed error with broken destructors for constraints. Changes in v3: 1) Removed unnecessary changes. 2) Fixed commit-messages. 3) Now OP_Halt won't be added after OP_SetDiag in case clean-up needed. Mergen Imeev (3): sql: add OP_SetDiag opcode in VDBE sql: clean-up in case constraint creation failed sql: use common registers instead of temp. for constraints data src/box/sql/build.c | 117 ++++++++++++++++++++++++++++---------------- src/box/sql/expr.c | 6 ++- src/box/sql/fk_constraint.c | 3 +- src/box/sql/insert.c | 11 +++-- src/box/sql/select.c | 14 ++++-- src/box/sql/sqlInt.h | 2 +- src/box/sql/trigger.c | 6 ++- src/box/sql/vdbe.c | 31 +++++++----- test/sql/checks.result | 3 +- test/sql/checks.test.lua | 2 +- test/sql/clear.result | 50 +++++++++++++++++++ test/sql/clear.test.lua | 23 +++++++++ 12 files changed, 196 insertions(+), 72 deletions(-) -- 2.7.4