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 EE64C21091 for ; Wed, 18 Jul 2018 16:13:02 -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 ZvyhEnopeJPe for ; Wed, 18 Jul 2018 16:13:02 -0400 (EDT) Received: from smtp51.i.mail.ru (smtp51.i.mail.ru [94.100.177.111]) (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 A86D620FBA for ; Wed, 18 Jul 2018 16:13:02 -0400 (EDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: [tarantool-patches] Re: [PATCH v1 3/3] sql: get rid of Column structure From: "n.pettik" In-Reply-To: <72990d0ecbba60f0551c254eb33a3282b645cd5d.1531932662.git.kshcherbatov@tarantool.org> Date: Wed, 18 Jul 2018 23:13:00 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: <4A0B514A-C0DA-406F-BD14-B1F11D4357EF@tarantool.org> References: <72990d0ecbba60f0551c254eb33a3282b645cd5d.1531932662.git.kshcherbatov@tarantool.org> 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: Kirill Shcherbatov Again: why did this patch trapped in patch-set? All three patches seem = to be independent. > On 18 Jul 2018, at 19:52, Kirill Shcherbatov = wrote: >=20 > Get rid of is_primkey in Column structure as it become Typo: =E2=80=98becomes=E2=80=99. > redundant. Moved the last member coll with collation pointer > to field_def structure. Why do you need to move collation ptr to field_def? It already features = collation id, so you can always get pointer to it by simple lookup. It would make = sense if it was utilised everywhere. But I see assignment only in = sqlite3SelectAddColumnTypeAndCollation() and no real usages..Lets remove it at all. > @@ -1692,22 +1680,9 @@ sqlite3EndTable(Parse * pParse, /* Parse = context */ > } > } >=20 > - /* Set default on_nullable action if required. */ > - struct field_def *field =3D p->def->fields; > - for (uint32_t i =3D 0; i < p->def->field_count; ++i, ++field) { > - if (field->nullable_action =3D=3D = on_conflict_action_MAX) { > - field->nullable_action =3D = ON_CONFLICT_ACTION_NONE; > - field->is_nullable =3D true; > - } > - } > - > - if (check_on_conflict_replace_entries(p)) { > - sqlite3ErrorMsg(pParse, > - "only PRIMARY KEY constraint can " > - "have ON CONFLICT REPLACE clause " > - "- %s", p->def->name); Here you are simply fixing changes made in first patch, so mb it is = better to move them to first patch?