From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tarantool-patches-bounce@freelists.org>
Received: from localhost (localhost [127.0.0.1])
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 9710D264C5
	for <tarantool-patches@freelists.org>; Wed, 18 Jul 2018 03:25:42 -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 TUZsaPFDGSfR for <tarantool-patches@freelists.org>;
	Wed, 18 Jul 2018 03:25:42 -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 DF6CD243AA
	for <tarantool-patches@freelists.org>; Wed, 18 Jul 2018 03:25:41 -0400 (EDT)
Subject: [tarantool-patches] Re: [PATCH v1 4/4] sql: get rid of Column
 structure
References: <4f4e7934d0eac2f295adadb1e5572f8ff4dbf752.1531743627.git.kshcherbatov@tarantool.org>
 <f15cd256469abc6d840a7e0b94f31b8f44366217.1531743627.git.kshcherbatov@tarantool.org>
 <69de35d4-3e7d-6f9f-8181-05b06c577e6b@tarantool.org>
 <9b1796b0-744a-4cc2-1011-9e6a091a6e90@tarantool.org>
 <5a90417c-f742-7a07-dc3d-a3a0646ec05f@tarantool.org>
 <5c05ec08-b32b-0ddb-f87e-25d86145ea9f@tarantool.org>
 <64852e2e-a07a-e86c-ad93-c17c6f55a0aa@tarantool.org>
From: Kirill Shcherbatov <kshcherbatov@tarantool.org>
Message-ID: <55a87410-6db0-f51f-722a-6e9cb8795341@tarantool.org>
Date: Wed, 18 Jul 2018 10:25:38 +0300
MIME-Version: 1.0
In-Reply-To: <64852e2e-a07a-e86c-ad93-c17c6f55a0aa@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: <mailto:ecartis@freelists.org?Subject=help>
List-unsubscribe: <tarantool-patches-request@freelists.org?Subject=unsubscribe>
List-software: Ecartis version 1.0.0
List-Id: tarantool-patches <tarantool-patches.freelists.org>
List-subscribe: <tarantool-patches-request@freelists.org?Subject=subscribe>
List-owner: <mailto:>
List-post: <mailto:tarantool-patches@freelists.org>
List-archive: <http://www.freelists.org/archives/tarantool-patches>
To: tarantool-patches@freelists.org, Vladislav Shpilevoy <v.shpilevoy@tarantool.org>

> 1. Please, rebase on the latest 2.0 and use pk->def + key_def_find.
-       if (index_has_column(pk, pNew->def->field_count - 1)) {
+       assert(pk != NULL);
+       struct key_def *pk_key_def = pk->def->key_def;
+       if (key_def_find(pk_key_def, pNew->def->field_count - 1) != NULL) {

> 2. As I said verbally, you should not add this redundant scan of primary
> index columns. You already have the primary index scan in
> convertToWithoutRowidTable, that is called few lines above.
> 
> When you merge this scan into convertToWithoutRowidTable, you can
> inline the rest of the function into EndTable and remove it together
> with index_has_column.
I can't understand your suggestion. 
convertToWithoutRowidTable iterates by index field;
but this check is a about field with ON CONFLICT REPLACE could be only a part
of index. We iterate over all fields.

I've get rid off index_has_column. 

                if (field->nullable_action == ON_CONFLICT_ACTION_REPLACE &&
-                   !index_has_column(pk, i))
+                   (pk == NULL || key_def_find(pk->def->key_def, i) == NULL))


-bool
-index_has_column(struct Index *index, uint32_t  column_idx)
etc.