[tarantool-patches] Re: [PATCH] sql: remove useless pragmas
n.pettik
korablev at tarantool.org
Mon Feb 11 01:54:36 MSK 2019
> On 8 Feb 2019, at 19:46, Stanislav Zudin <szudin at tarantool.org> wrote:
>
> On 08.02.2019 17:03, n.pettik wrote:
>>
>>
>>> On 8 Feb 2019, at 13:17, Stanislav Zudin <szudin at tarantool.org <mailto:szudin at tarantool.org>> wrote:
>>>
>>> On 06.02.2019 16:21, n.pettik wrote:
>>>>
>>>>> On 6 Feb 2019, at 15:18, Stanislav Zudin <szudin at tarantool.org <mailto:szudin at tarantool.org>> wrote:
>>>>>
>>>>> The pragmas "query_only" and "read_uncommitted" didn't affect anything and were removed.
>>>> Nit: please, fit commit message into 72 symbols.
>>> Mea culpa
>>>>
>>>> What about “busy_timeout”? 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?
>>
>> No, it doesn’t. You can remove it in a separate patch.
>
> Below you'll find a commit with removed pragma busy_timeout:
>
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.
>
> Closes #3733
> ---
> Branch: https://github.com/tarantool/tarantool/tree/stanztt/gh-3733-obsolete-pragmas
> Issue: https://github.com/tarantool/tarantool/issues/3733
>
> 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(-)
>
> 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.
More information about the Tarantool-patches
mailing list