Tarantool development patches archive
 help / color / mirror / Atom feed
From: "n.pettik" <korablev@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Alexander Turenko <alexander.turenko@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH] sql: make SQL_BIND optional in an iproto request
Date: Tue, 26 Mar 2019 17:51:35 +0300	[thread overview]
Message-ID: <416B71F5-C59B-4C35-9C4B-818BB1F766CE@tarantool.org> (raw)
In-Reply-To: <a2250e2cf15939d26978d460165265a3919167a7.1553552843.git.alexander.turenko@tarantool.org>

Patch is OK as obvious. A few nits below. You could skip them though.

> diff --git a/src/box/iproto.cc b/src/box/iproto.cc
> index 3b0ba6234..3c054338b 100644
> --- a/src/box/iproto.cc
> +++ b/src/box/iproto.cc
> @@ -1622,8 +1622,8 @@ tx_process_sql(struct cmsg *m)
> 	struct iproto_msg *msg = tx_accept_msg(m);
> 	struct obuf *out;
> 	struct sql_response response;
> -	struct sql_bind *bind;
> -	int bind_count;
> +	struct sql_bind *bind = NULL;
> +	int bind_count = 0;
> 	const char *sql;
> 	uint32_t len;
> 
> @@ -1633,7 +1633,8 @@ tx_process_sql(struct cmsg *m)
> 		goto error;
> 	assert(msg->header.type == IPROTO_EXECUTE);
> 	tx_inject_delay();
> -	bind_count = sql_bind_list_decode(msg->sql.bind, &bind);
> +	if (msg->sql.bind != NULL)
> +		bind_count = sql_bind_list_decode(msg->sql.bind, &bind);

You may apply this diff (that’s matter of taste):

diff --git a/src/box/iproto.cc b/src/box/iproto.cc
index 3c054338b..8934b7488 100644
--- a/src/box/iproto.cc
+++ b/src/box/iproto.cc
@@ -1633,10 +1633,11 @@ tx_process_sql(struct cmsg *m)
                goto error;
        assert(msg->header.type == IPROTO_EXECUTE);
        tx_inject_delay();
-       if (msg->sql.bind != NULL)
+       if (msg->sql.bind != NULL) {
                bind_count = sql_bind_list_decode(msg->sql.bind, &bind);
-       if (bind_count < 0)
-               goto error;
+               if (bind_count < 0)
+                       goto error;
+       }
        sql = msg->sql.sql_text;
        sql = mp_decode_str(&sql, &len);
        if (sql_prepare_and_execute(sql, len, bind, bind_count, &response,

> diff --git a/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua b/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua
> new file mode 100755
> index 000000000..55804768c
> --- /dev/null
> +++ b/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua

Mb it’s better to move it to sql/iproto.test.lua ?

  reply	other threads:[~2019-03-26 14:51 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-25 23:20 [tarantool-patches] " Alexander Turenko
2019-03-26 14:51 ` n.pettik [this message]
2019-03-26 16:16   ` [tarantool-patches] " Alexander Turenko
2019-03-27  6:59 ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=416B71F5-C59B-4C35-9C4B-818BB1F766CE@tarantool.org \
    --to=korablev@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='[tarantool-patches] Re: [PATCH] sql: make SQL_BIND optional in an iproto request' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox