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 5CC1F26824 for ; Fri, 15 Jun 2018 12:21:43 -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 Nldh1T5IARMK for ; Fri, 15 Jun 2018 12:21:43 -0400 (EDT) Received: from smtp43.i.mail.ru (smtp43.i.mail.ru [94.100.177.103]) (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 EC87426723 for ; Fri, 15 Jun 2018 12:21:42 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v3 10/10] sql: VDBE tests for trigger existence References: <2dc4c354dc72123c3447831a6ac48038eaf95f48.1528997527.git.kshcherbatov@tarantool.org> <05ff2cb5-d224-7b04-5aa8-d7d57b7c0031@tarantool.org> From: Kirill Shcherbatov Message-ID: Date: Fri, 15 Jun 2018 19:21:41 +0300 MIME-Version: 1.0 In-Reply-To: <05ff2cb5-d224-7b04-5aa8-d7d57b7c0031@tarantool.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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: tarantool-patches@freelists.org Cc: "v.shpilevoy@tarantool.org" > Unfortunately we have the problem with error objects creating. ClientError in > the constructor increments error counter in statistics visible to user. So this > still not happened error affects the public API. We need to find another way. > > I think, we may assume that this way of error setting will be used for > ClientErrors only. Indeed, OOM is set explicitly in the place where emerged. Other > errors are not used in VDBE. The only hindrance is that ClientErrors have > different argument count. But I have found function box_error_set() in error.h. > It is a public API to set ClientError with any message. > > So lets return to the previous implementation, but instead of passing > (error code; code arguments) lets pass (error code; the full error message) and > use box_error_set() instead of direct diag_set(ClientError, ...). > > To repeat the same error message format as from the code you can use diff --git a/src/box/sql/build.c b/src/box/sql/build.c index 0edbda1..8db9231 100644 --- a/src/box/sql/build.c +++ b/src/box/sql/build.c @@ -4145,4 +4145,51 @@ sqlite3WithDelete(sqlite3 * db, With * pWith) sqlite3DbFree(db, pWith); } } + +int +parser_emit_execution_halt_on_exists(struct Parse *parser, int space_id, + int index_id, const char *name_src, + int tarantool_error_code, + const char *error_src, bool no_error) +{ + struct Vdbe *v = sqlite3GetVdbe(parser); + assert(v != NULL); + + struct sqlite3 *db = parser->db; + char *name = NULL; + char *error = NULL; + name = sqlite3DbStrDup(db, name_src); + if (name != NULL) + error = sqlite3DbStrDup(db, error_src); + if (name == NULL || error == NULL) { + size_t size = + (name != NULL ? strlen(error_src) : + strlen(name_src)) + 1; + const char *var_name = name != NULL ? "error" : "name"; + diag_set(OutOfMemory, size, "sqlite3DbStrDup", var_name); + sqlite3DbFree(db, name); + sqlite3DbFree(db, error); + return -1; + } + + int cursor = parser->nTab++; + int entity_id = + SQLITE_PAGENO_FROM_SPACEID_AND_INDEXID(space_id, index_id); + emit_open_cursor(parser, cursor, entity_id); + + int name_reg = parser->nMem++; + int label = sqlite3VdbeAddOp4(v, OP_String8, 0, name_reg, 0, name, + P4_DYNAMIC); + sqlite3VdbeAddOp4Int(v, OP_NoConflict, cursor, label + 3, name_reg, 1); + if (no_error) { + sqlite3VdbeAddOp0(v, OP_Halt); + } else { + error = sqlite3DbStrDup(db, error); + sqlite3VdbeAddOp4(v, OP_Halt, SQL_TARANTOOL_ERROR, + ON_CONFLICT_ACTION_FAIL, 0, error, P4_DYNAMIC); + sqlite3VdbeChangeP5(v, tarantool_error_code); + } + sqlite3VdbeAddOp1(v, OP_Close, cursor); + return 0; +} #endif /* !defined(SQLITE_OMIT_CTE) */ diff --git a/src/box/sql/main.c b/src/box/sql/main.c index 0acf7bc..e1de815 100644 --- a/src/box/sql/main.c +++ b/src/box/sql/main.c @@ -1454,10 +1454,14 @@ sqlite3_errmsg(sqlite3 * db) z = sqlite3ErrStr(SQLITE_NOMEM_BKPT); } else { testcase(db->pErr == 0); - z = (char *)sqlite3_value_text(db->pErr); assert(!db->mallocFailed); - if (z == 0) { - z = sqlite3ErrStr(db->errCode); + if (db->errCode != SQL_TARANTOOL_ERROR) { + assert(!db->mallocFailed); + z = (char *)sqlite3_value_text(db->pErr); + if (z == NULL) + z = sqlite3ErrStr(db->errCode); + } else { + z = diag_last_error(diag_get())->errmsg; } } return z; diff --git a/src/box/sql/sqliteInt.h b/src/box/sql/sqliteInt.h index 7f1a201..fc6b858 100644 --- a/src/box/sql/sqliteInt.h +++ b/src/box/sql/sqliteInt.h @@ -4594,4 +4594,28 @@ extern int sqlite3InitDatabase(sqlite3 * db); enum on_conflict_action table_column_nullable_action(struct Table *tab, uint32_t column); +/** + * Generate VDBE code to halt execution with correct error if + * the object with specified name is already present in + * specified space. + * The function does not begin to hold the passed error pointer + * to memory. + * + * @param parser Parsing context. + * @param space_id Space to lookup identifier. + * @param index_id Index identifier containing string primary key. + * @param name Of object to test existence. + * @param tarantool_error_code to set on halt. + * @param error string to notify on halt. + * @param no_error Do not raise error flag. + * + * @retval -1 on memory allocation error. + * @retval 0 on success. + */ +int +parser_emit_execution_halt_on_exists(struct Parse *parser, int space_id, + int index_id, const char *name, + int tarantool_error_code, + const char *error, bool no_error); + #endif /* SQLITEINT_H */ diff --git a/src/box/sql/trigger.c b/src/box/sql/trigger.c index ec420ea..eadef53 100644 --- a/src/box/sql/trigger.c +++ b/src/box/sql/trigger.c @@ -122,18 +122,6 @@ sqlite3BeginTrigger(Parse * pParse, /* The parse context of the CREATE TRIGGER s if (sqlite3CheckIdentifierName(pParse, zName) != SQLITE_OK) goto trigger_cleanup; - if (!pParse->parse_only && - sqlite3HashFind(&db->pSchema->trigHash, zName) != NULL) { - if (!noErr) { - diag_set(ClientError, ER_TRIGGER_EXISTS, zName); - pParse->rc = SQL_TARANTOOL_ERROR; - pParse->nErr++; - } else { - assert(!db->init.busy); - } - goto trigger_cleanup; - } - const char *table_name = pTableName->a[0].zName; uint32_t space_id; if (schema_find_id(BOX_SPACE_ID, 2, table_name, strlen(table_name), @@ -184,6 +172,20 @@ sqlite3BeginTrigger(Parse * pParse, /* The parse context of the CREATE TRIGGER s pParse->nErr++; goto trigger_cleanup; } + if (!pParse->parse_only) { + char error[DIAG_ERRMSG_MAX]; + snprintf(error, DIAG_ERRMSG_MAX, + tnt_errcode_desc(ER_TRIGGER_EXISTS), zName); + if (parser_emit_execution_halt_on_exists(pParse, BOX_TRIGGER_ID, + 0, zName, + ER_TRIGGER_EXISTS, + error, + (noErr != 0)) != 0) { + pParse->rc = SQL_TARANTOOL_ERROR; + pParse->nErr++; + goto trigger_cleanup; + } + } /* * INSTEAD OF triggers can only appear on views and BEFORE triggers diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index c035ffe..5f88e67 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -960,7 +960,9 @@ case OP_HaltIfNull: { /* in3 */ * * If P4 is not null then it is an error message string. * - * P5 is a value between 0 and 4, inclusive, that modifies the P4 string. + * If P1 is SQL_TARANTOOL_ERROR then P5 is a ClientError code and + * P4 is error message to set. Else P5 is a value between 0 and 4, + * inclusive, that modifies the P4 string. * * 0: (no change) * 1: NOT NULL contraint failed: P4 @@ -968,8 +970,8 @@ case OP_HaltIfNull: { /* in3 */ * 3: CHECK constraint failed: P4 * 4: FOREIGN KEY constraint failed: P4 * - * If P5 is not zero and P4 is NULL, then everything after the ":" is - * omitted. + * If P5 is not zero and P4 is NULL, then everything after the + * ":" is omitted. * * There is an implied "Halt 0 0 0" instruction inserted at the very end of * every program. So a jump past the last instruction of the program @@ -1005,9 +1007,11 @@ case OP_Halt: { p->rc = pOp->p1; p->errorAction = (u8)pOp->p2; p->pc = pcx; - assert(pOp->p5<=4); if (p->rc) { - if (pOp->p5) { + if (p->rc == SQL_TARANTOOL_ERROR) { + assert(pOp->p4.z != NULL); + box_error_set(__FILE__, __LINE__, pOp->p5, pOp->p4.z); + } else if (pOp->p5 != 0) { static const char * const azType[] = { "NOT NULL", "UNIQUE", "CHECK", "FOREIGN KEY" }; testcase( pOp->p5==1); @@ -1029,7 +1033,10 @@ case OP_Halt: { p->rc = SQLITE_BUSY; } else { assert(rc==SQLITE_OK || (p->rc&0xff)==SQLITE_CONSTRAINT); - rc = p->rc ? SQLITE_ERROR : SQLITE_DONE; + if (p->rc != SQL_TARANTOOL_ERROR) + rc = (p->rc != SQLITE_OK) ? SQLITE_ERROR : SQLITE_DONE; + else + rc = SQL_TARANTOOL_ERROR; } goto vdbe_return; } diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index d35338a..0aa5c4a 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -598,8 +598,9 @@ sqlite3Step(Vdbe * p) * contains the value that would be returned if sqlite3_finalize() * were called on statement p. */ - assert(rc == SQLITE_ROW || rc == SQLITE_DONE || rc == SQLITE_ERROR - || (rc & 0xff) == SQLITE_BUSY || rc == SQLITE_MISUSE); + assert(rc == SQLITE_ROW || rc == SQLITE_DONE || rc == SQLITE_ERROR || + (rc & 0xff) == SQLITE_BUSY || rc == SQLITE_MISUSE || + rc == SQL_TARANTOOL_ERROR); if (p->isPrepareV2 && rc != SQLITE_ROW && rc != SQLITE_DONE) { /* If this statement was prepared using sqlite3_prepare_v2(), and an * error has occurred, then return the error code in p->rc to the