Tarantool development patches archive
 help / color / mirror / Atom feed
From: "n.pettik" <korablev@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Kirill Yukhin <kyukhin@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH 2/2] sql: take sql field in index_opts_cmp
Date: Tue, 21 Aug 2018 13:26:44 +0300	[thread overview]
Message-ID: <07122CA6-A039-4D71-B535-718AD11B7171@tarantool.org> (raw)
In-Reply-To: <2fc838acfd7806a467bbe416ab0edeedf2efd71d.1534783275.git.kyukhin@tarantool.org>


> diff --git a/src/box/index_def.h b/src/box/index_def.h
> index 48a7820..8960e3d 100644
> --- a/src/box/index_def.h
> +++ b/src/box/index_def.h
> @@ -212,6 +212,14 @@ index_opts_cmp(const struct index_opts *o1, const struct index_opts *o2)
> 		return o1->run_size_ratio < o2->run_size_ratio ? -1 : 1;
> 	if (o1->bloom_fpr != o2->bloom_fpr)
> 		return o1->bloom_fpr < o2->bloom_fpr ? -1 : 1;
> +

Nitpicking: don’t put extra new line: it breaks whole function look.

> +	if ((o1->sql == NULL) != (o2->sql == NULL))
> +		return 1;
> +	if ((o1->sql != NULL) && (o2->sql != NULL)) {

Nitpicking: after previous check o1->sql and o2->sql are both NULL or not.
So I guess only one check is enough: if (o1->sql != NULL).

> +		int rc = strcmp(o1->sql, o2->sql);
> +		if (rc != 0)
> +			return rc;

Why not simply return strcmp()?

> +	}
> 	return 0;
> }
> 
> diff --git a/test/sql/gh-3613-idx-alter-update-2.test.lua b/test/sql/gh-3613-idx-alter-update-2.test.lua
> new file mode 100644
> index 0000000..e2beb7a
> --- /dev/null
> +++ b/test/sql/gh-3613-idx-alter-update-2.test.lua

Can you merge this test file with previous one?
I strongly dislike the fact that such simple tests are put in
separate files. Even though we already have sql-tap/alter.test.lua.

> @@ -0,0 +1,16 @@
> +test_run = require('test_run').new()
> +engine = test_run:get_cfg('engine')
> +box.sql.execute('pragma sql_default_engine=\''..engine..'\'')
> +
> +box.sql.execute('CREATE TABLE t (s1 INT PRIMARY KEY)')
> +box.sql.execute('CREATE INDEX i ON t (s1)')
> +box.sql.execute('ALTER TABLE t RENAME TO j3')
> +
> +-- After gh-3613 fix, bug in cmp_def was discovered.
> +-- Comparison didn't take .opts.sql into account.
> +test_run:cmd('restart server default')
> +
> +box.sql.execute('DROP INDEX i ON j3')
> +
> +-- Cleanup
> +box.sql.execute('DROP TABLE j3')
> -- 
> 2.16.2
> 
> 

  reply	other threads:[~2018-08-21 10:26 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-20 16:49 [tarantool-patches] [PATCH 0/2] sql: update inexes after table rename Kirill Yukhin
2018-08-20 16:49 ` [tarantool-patches] [PATCH 1/2] sql: after table rename properly update indexes Kirill Yukhin
2018-08-21 10:26   ` [tarantool-patches] " n.pettik
2018-08-21 12:20     ` Kirill Yukhin
2018-08-21 20:38       ` n.pettik
2018-08-22  6:39         ` Kirill Yukhin
2018-08-20 16:49 ` [tarantool-patches] [PATCH 2/2] sql: take sql field in index_opts_cmp Kirill Yukhin
2018-08-21 10:26   ` n.pettik [this message]
2018-08-21 12:30     ` [tarantool-patches] " Kirill Yukhin
2018-08-21 20:41       ` n.pettik
2018-08-22  6:47 ` [tarantool-patches] Re: [PATCH 0/2] sql: update inexes after table rename 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=07122CA6-A039-4D71-B535-718AD11B7171@tarantool.org \
    --to=korablev@tarantool.org \
    --cc=kyukhin@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='[tarantool-patches] Re: [PATCH 2/2] sql: take sql field in index_opts_cmp' \
    /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