From: Nikita Pettik <korablev@tarantool.org> To: Maria Khaydich <maria.khaydich@tarantool.org> Cc: tarantool-patches <tarantool-patches@dev.tarantool.org>, Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH] box: sql prepare and execute statistics should be reflected in box.stat() Date: Tue, 11 Feb 2020 02:06:01 +0300 [thread overview] Message-ID: <20200210230601.GB99436@tarantool.org> (raw) In-Reply-To: <1581359737.397395198@f221.i.mail.ru> On 10 Feb 21:35, Maria Khaydich wrote: > > diff --git a/src/box/execute.c b/src/box/execute.c > index dc8dce81c..e775055b4 100644 > --- a/src/box/execute.c > +++ b/src/box/execute.c > @@ -48,6 +48,7 @@ > #include "box/lua/execute.h" > #include "box/sql_stmt_cache.h" > #include "session.h" > +#include "rmean.h" > > const char *sql_info_key_strs[] = { > "row_count", > @@ -608,6 +609,7 @@ sql_prepare(const char *sql, int len, struct port *port) > { > uint32_t stmt_id = sql_stmt_calculate_id(sql, len); > struct sql_stmt *stmt = sql_stmt_cache_find(stmt_id); > + rmean_collect(rmean_box, IPROTO_PREPARE, 1); > if (stmt == NULL) { > if (sql_stmt_compile(sql, len, NULL, &stmt, NULL) != 0) > return -1; > @@ -669,6 +671,7 @@ static inline int > sql_execute(struct sql_stmt *stmt, struct port *port, struct region *region) > { > int rc, column_count = sql_column_count(stmt); > + rmean_collect(rmean_box, IPROTO_EXECUTE, 1); > if (column_count > 0) { > /* Either ROW or DONE or ERROR. */ > while ((rc = sql_step(stmt)) == SQL_ROW) { > @@ -732,6 +735,7 @@ sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind, > if (sql_stmt_compile(sql, len, NULL, &stmt, NULL) != 0) > return -1; > assert(stmt != NULL); > + rmean_collect(rmean_box, IPROTO_PREPARE, 1); prepare_and_execute() is supposed to handle IPROTO_EXECUTE request. > enum sql_serialization_format format = sql_column_count(stmt) > 0 ? > DQL_EXECUTE : DML_EXECUTE; > port_sql_create(port, stmt, format, true); > diff --git a/test/box-tap/cfg.test.lua b/test/box-tap/cfg.test.lua > index d529447bb..d367aab07 100755 > --- a/test/box-tap/cfg.test.lua > +++ b/test/box-tap/cfg.test.lua box-tap/cfg.test is unlikely to be proper place for this test. Look at sql/ suite (for instance, sql/iproto.test.lua).
next prev parent reply other threads:[~2020-02-10 23:06 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-10 18:35 Maria Khaydich 2020-02-10 23:06 ` Nikita Pettik [this message] 2020-02-13 21:44 ` Vladislav Shpilevoy 2020-02-19 16:37 ` Maria Khaydich 2020-02-19 17:16 ` Nikita Pettik 2020-02-25 11:08 ` Maria Khaydich 2020-02-25 13:02 ` Nikita Pettik 2020-02-25 20:29 ` Vladislav Shpilevoy 2020-02-26 15:50 ` Maria Khaydich 2020-02-27 0:08 ` Vladislav Shpilevoy 2020-02-27 13:21 ` Nikita Pettik 2020-03-03 16:42 ` Maria Khaydich 2020-03-03 22:39 ` Vladislav Shpilevoy 2020-03-06 11:34 ` Maria Khaydich 2020-03-06 14:32 ` Nikita Pettik 2020-03-06 15:09 ` Nikita Pettik 2020-03-04 13:47 ` Nikita Pettik 2020-02-25 22:26 ` Kirill Yukhin 2020-02-25 23:30 ` Nikita Pettik
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=20200210230601.GB99436@tarantool.org \ --to=korablev@tarantool.org \ --cc=maria.khaydich@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH] box: sql prepare and execute statistics should be reflected in box.stat()' \ /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