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 BCBF829474
	for <tarantool-patches@freelists.org>; Sun,  2 Sep 2018 19:52:26 -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 Fejc604oEOb4 for <tarantool-patches@freelists.org>;
	Sun,  2 Sep 2018 19:52:26 -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 7B70A26340
	for <tarantool-patches@freelists.org>; Sun,  2 Sep 2018 19:52:26 -0400 (EDT)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: [tarantool-patches] Re: [PATCH 6/7] sql: don't add system spaces to
 Table hash
From: "n.pettik" <korablev@tarantool.org>
In-Reply-To: <d895d72d-e7c0-f7a3-b194-496fa8233b23@tarantool.org>
Date: Mon, 3 Sep 2018 02:52:23 +0300
Content-Transfer-Encoding: quoted-printable
Message-Id: <A4032E04-EC59-4752-970C-8C405AD376F6@tarantool.org>
References: <cover.1535063199.git.korablev@tarantool.org>
 <b449ef840392ee36d16eacfa184bd81052708cda.1535064700.git.korablev@tarantool.org>
 <d895d72d-e7c0-f7a3-b194-496fa8233b23@tarantool.org>
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
Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>


> Thanks for the patch! See my review fixes on the branch and
> below:
>=20
> commit 882627479793ae3958cec7274cc3e353395aea40
> Author: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
> Date:   Tue Aug 28 21:28:49 2018 -0300
>=20
>    Review fixes
>=20
> diff --git a/src/box/sql/prepare.c b/src/box/sql/prepare.c
> index a59e70dd0..0dfdf251f 100644
> --- a/src/box/sql/prepare.c
> +++ b/src/box/sql/prepare.c
> @@ -133,26 +133,14 @@ sql_init_callback(struct init_data *init, const =
char *name,
> extern int
> sqlite3InitDatabase(sqlite3 * db)
> {
> -	int rc;
> -	struct init_data init;
> -
> 	assert(db->pSchema !=3D NULL);
> -
> -	memset(&init, 0, sizeof(init));
> -	init.db =3D db;
> -	/* Read the schema information out of the schema tables
> -	 */
> 	assert(db->init.busy);
> -	{
> -		rc =3D init.rc;
> -		if (rc =3D=3D SQLITE_OK)
> -			sql_analysis_load(db);
> -	}
> +	sql_analysis_load(db);
> 	if (db->mallocFailed) {
> -		rc =3D SQLITE_NOMEM_BKPT;
> 		sqlite3ResetAllSchemasOfConnection(db);
> +		return SQLITE_NOMEM_BKPT;
> 	}
> -	return rc;
> +	return SQLITE_OK;
> }

I disregard this diff since in the next patch (sql: finish DD =
integration) I completely
remove this function at all.

>  diff --git a/src/box/sql/tarantoolInt.h b/src/box/sql/tarantoolInt.h
> index 9334de52d..8622cd19f 100644
> --- a/src/box/sql/tarantoolInt.h
> +++ b/src/box/sql/tarantoolInt.h
> @@ -10,10 +10,6 @@
>  struct fkey_def;
> -/* Insert or replace operation types - necessary for vdbe */
> -#define TARANTOOL_INDEX_INSERT 1
> -#define TARANTOOL_INDEX_REPLACE 2
> -
> /* Misc */
> const char *tarantoolErrorMessage();

This diff I am going to apply (nevertheless Idk how it relates).