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 EDD0E26DCC
	for <tarantool-patches@freelists.org>; Tue, 12 Feb 2019 12:05:56 -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 2XWXZn-amcKC for <tarantool-patches@freelists.org>;
	Tue, 12 Feb 2019 12:05:56 -0500 (EST)
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 A9BF82713F
	for <tarantool-patches@freelists.org>; Tue, 12 Feb 2019 12:05:56 -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 v4 2/2] sql: remove busy handler
From: "n.pettik" <korablev@tarantool.org>
In-Reply-To: <20190212073151.27230-2-szudin@tarantool.org>
Date: Tue, 12 Feb 2019 20:05:55 +0300
Content-Transfer-Encoding: quoted-printable
Message-Id: <6210D946-7927-47A2-8598-E6F9B8309641@tarantool.org>
References: <20190212073151.27230-1-szudin@tarantool.org>
 <20190212073151.27230-2-szudin@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: szudin@tarantool.org

> -	 *
> -	 * Call sqlite3_busy_timeout(db, N).  Return the current
> -	 * timeout value * if one is set.  If no busy handler
> -	 * or a different busy handler is set * then 0 is
> -	 * returned.  Setting the busy_timeout to 0 or negative *
> -	 * disables the timeout.
> -	 */
> -	/* case PragTyp_BUSY_TIMEOUT */
> 	default:{
> -			assert(pPragma->ePragTyp =3D=3D =
PragTyp_BUSY_TIMEOUT);
> -			if (zRight) {
> -				sqlite3_busy_timeout(db, =
sqlite3Atoi(zRight));
> -			}
> -			returnSingleInt(v, db->busyTimeout);
> -			break;
> +		/* We shouldn't get here. */
> +		diag_set(ClientError, ER_UNKNOWN);
> +		pParse->rc =3D SQL_TARANTOOL_ERROR;
> +		pParse->nErr++;
> +		goto pragma_out;

If we really can=E2=80=99t reach here under no circumstances
(which seems to be true - pragmaLocate checks this) then
it=E2=80=99s better to place unreachable(); assert. Fix this please.