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 9DE28268FF for ; Sun, 10 Feb 2019 17:54:40 -0500 (EST) 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 6jgT8L4K-bRm for ; Sun, 10 Feb 2019 17:54:40 -0500 (EST) Received: from smtp50.i.mail.ru (smtp50.i.mail.ru [94.100.177.110]) (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 F328C25C5F for ; Sun, 10 Feb 2019 17:54:39 -0500 (EST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: [tarantool-patches] Re: [PATCH] sql: remove useless pragmas From: "n.pettik" In-Reply-To: <2498e858-96b4-cd47-5ee7-2c1996d6b11d@tarantool.org> Date: Mon, 11 Feb 2019 01:54:36 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20190206121822.9534-1-szudin@tarantool.org> <2498e858-96b4-cd47-5ee7-2c1996d6b11d@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: szudin@tarantool.org > On 8 Feb 2019, at 19:46, Stanislav Zudin wrote: >=20 > On 08.02.2019 17:03, n.pettik wrote: >>=20 >>=20 >>> On 8 Feb 2019, at 13:17, Stanislav Zudin > wrote: >>>=20 >>> On 06.02.2019 16:21, n.pettik wrote: >>>>=20 >>>>> On 6 Feb 2019, at 15:18, Stanislav Zudin > wrote: >>>>>=20 >>>>> The pragmas "query_only" and "read_uncommitted" didn't affect = anything and were removed. >>>> Nit: please, fit commit message into 72 symbols. >>> Mea culpa >>>>=20 >>>> What about =E2=80=9Cbusy_timeout=E2=80=9D? As I see from code it is = also useless. >>>> It may require to delete some code more code. >>> It calls sqlite_busy_handler. Does this feature work? >>=20 >> No, it doesn=E2=80=99t. You can remove it in a separate patch. >=20 > Below you'll find a commit with removed pragma busy_timeout: >=20 Please, fix commit message subject. I checked out your branch and it turned out to be the same as in previous commit. > The pragma "busy_timeout" is removed. > SQLite's busyHandler functionality and functions sqlite3_sleep(), > sqlite3OsSleep() were not used and were removed either. >=20 > Closes #3733 > --- > Branch: = https://github.com/tarantool/tarantool/tree/stanztt/gh-3733-obsolete-pragm= as > Issue: https://github.com/tarantool/tarantool/issues/3733 >=20 > src/box/sql/main.c | 76 = ----------------------------------------- > src/box/sql/os.c | 6 ---- > src/box/sql/os.h | 1 - > src/box/sql/os_unix.c | 18 ---------- > src/box/sql/pragma.c | 23 ++++--------- > src/box/sql/pragma.h | 8 ----- > src/box/sql/sqliteInt.h | 6 ---- > src/box/sql/vdbe.c | 1 - > 8 files changed, 6 insertions(+), 133 deletions(-) >=20 > diff --git a/src/box/sql/main.c b/src/box/sql/main.c > index 8574d6464..5555cb48e 100644 > --- a/src/box/sql/main.c > +++ b/src/box/sql/main.c > @@ -640,43 +640,6 @@ sqlite3ErrStr(int rc) > return zErr; > } It seems that remains of busy_handle still exist in source = (sqliteInt.h): Macros SQLITE_FCNTL_BUSYHANDLER; struct BusyHandler itself; A couple of mentions in comments. Please remove them as well.