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 E39752AAFA for ; Fri, 24 Aug 2018 17:04:00 -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 QGQ3vEHnvg16 for ; Fri, 24 Aug 2018 17:04:00 -0400 (EDT) Received: from smtp5.mail.ru (smtp5.mail.ru [94.100.179.24]) (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 1A3AC2AAED for ; Fri, 24 Aug 2018 17:04:00 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH 10/10] sql: move autoincrement field number to server References: <893c37395b2536af932aac033f6c54718720b63f.1534001739.git.korablev@tarantool.org> <685EC40E-4A7E-4A5A-8BAD-A597ADC67E67@tarantool.org> From: Vladislav Shpilevoy Message-ID: Date: Sat, 25 Aug 2018 00:03:57 +0300 MIME-Version: 1.0 In-Reply-To: <685EC40E-4A7E-4A5A-8BAD-A597ADC67E67@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed 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: "n.pettik" , tarantool-patches@freelists.org Thanks for the patch! On 21/08/2018 19:31, n.pettik wrote: > >> On 13 Aug 2018, at 23:24, Vladislav Shpilevoy wrote: >> >> Are you sure it is the only way to pass autoinc fieldno? And that it can >> not be dropped and calculated from other fields without significant problems? >> >> Now this flag looks very ugly inside _space tuples. >> >> I think, autoinc is rather primary index option than the space, and that it >> can be detected via checking >> >> pk->part_count == 1 and space->sequence != NULL >> >> then pk->parts[0].fieldno is autoinc field. It is not? > > Okay, it seems to be possible. Check this out: > > sql: remove autoincrement field number from Table > > During INSERT SQL statement execution we may need to know field which > stores INTEGER AUTOINCREMENT PRIMARY KEY. Since we are going to get rid > of struct Table, lets remove this member from struct Table. Instead, it > can be calculated using struct space: if PK consists from one part and > sequence not NULL - table features autoincrement. > > Part of #3561 > I have done some review fixes, but the patch crashes with them, and I do not understand why. Could you please investigate? Assertion is 100% repeatable on analyze9.test: Assertion failed: (0), function vdbe_emit_constraint_checks, file /Users/v.shpilevoy/Work/Repositories/tarantool/src/box/sql/insert.c, line 916. Right after test case 4.9. The diff: =================================================== diff --git a/src/box/sql/insert.c b/src/box/sql/insert.c index 56ddb10eb..4cc33e830 100644 --- a/src/box/sql/insert.c +++ b/src/box/sql/insert.c @@ -858,12 +858,12 @@ vdbe_emit_constraint_checks(struct Parse *parse_context, struct Table *tab, struct sqlite3 *db = parse_context->db; struct Vdbe *v = sqlite3GetVdbe(parse_context); assert(v != NULL); - struct space_def *def = tab->def; - /* Insertion into VIEW is prohibited. */ - assert(!def->opts.is_view); bool is_update = upd_cols != NULL; struct space *space = space_by_id(tab->def->id); assert(space != NULL); + struct space_def *def = space->def; + /* Insertion into VIEW is prohibited. */ + assert(!def->opts.is_view); uint32_t autoinc_fieldno = sql_space_autoinc_fieldno(space); /* Test all NOT NULL constraints. */ for (uint32_t i = 0; i < def->field_count; i++) { @@ -882,7 +882,7 @@ vdbe_emit_constraint_checks(struct Parse *parse_context, struct Table *tab, /* ABORT is a default error action. */ if (on_conflict_nullable == ON_CONFLICT_ACTION_DEFAULT) on_conflict_nullable = ON_CONFLICT_ACTION_ABORT; - struct Expr *dflt = space_column_default_expr(tab->def->id, i); + struct Expr *dflt = def->fields[i].default_value_expr; if (on_conflict_nullable == ON_CONFLICT_ACTION_REPLACE && dflt == NULL) on_conflict_nullable = ON_CONFLICT_ACTION_ABORT; @@ -923,7 +923,7 @@ vdbe_emit_constraint_checks(struct Parse *parse_context, struct Table *tab, if (on_conflict == ON_CONFLICT_ACTION_DEFAULT) on_conflict = ON_CONFLICT_ACTION_ABORT; /* Test all CHECK constraints. */ - struct ExprList *checks = space_checks_expr_list(tab->def->id); + struct ExprList *checks = def->opts.checks; enum on_conflict_action on_conflict_check = on_conflict; if (on_conflict == ON_CONFLICT_ACTION_REPLACE) on_conflict_check = ON_CONFLICT_ACTION_ABORT;