From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vdavydov.dev@gmail.com>
Date: Thu, 28 Feb 2019 18:46:30 +0300
From: Vladimir Davydov <vdavydov.dev@gmail.com>
Subject: Re: [tarantool-patches] Re: [PATCH v2] Feature request for a new
 collation
Message-ID: <20190228154630.4rai63lw6ovqqwxl@esperanza>
References: <20190226104042.28149-1-szudin@tarantool.org>
 <20190226135217.a4ptsoxgkk35b7m2@esperanza>
 <230d10ab-6b3c-f5c0-853c-d48624a8cf4f@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <230d10ab-6b3c-f5c0-853c-d48624a8cf4f@tarantool.org>
To: Stanislav Zudin <szudin@tarantool.org>
Cc: tarantool-patches@freelists.org
List-ID: <tarantool-patches.dev.tarantool.org>

On Thu, Feb 28, 2019 at 03:14:51PM +0300, Stanislav Zudin wrote:
> > I looked through Kostja's discussion with Mr. Gulutzan and I didn't
> > see that they had come to an agreement to name this new collation
> > unicode_s2. Please solicit their approval on the name.
> Renamed to unicode_ru_s2.

Kostja doesn't like the name. Please find his discussion with
Mr. Gulutzan in the mailing list, come up with a better one,
and solicit his approval.

>=20
> The updated patch is below:
>=20
> Branch: https://github.com/tarantool/tarantool/tree/stanztt/gh-4007-new-d=
efault-collation-2.1
> Issue: https://github.com/tarantool/tarantool/issues/4007
>=20
> =A0src/box/bootstrap.snap=A0=A0=A0=A0=A0=A0=A0=A0=A0 | Bin 1831 -> 1867 b=
ytes
> =A0src/box/lua/upgrade.lua=A0=A0=A0=A0=A0=A0=A0=A0 |=A0=A0 7 +-
> =A0test/box/ddl.result=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 |=A0 14 ++--
> =A0test/box/net.box.result=A0=A0=A0=A0=A0=A0=A0=A0 |=A0=A0 2 +-
> =A0test/sql-tap/collation.test.lua |=A0=A0 7 +-
> =A0test/sql/collation.result=A0=A0=A0=A0=A0=A0 | 111 ++++++++++++++++++++=
++++++++++++
> =A0test/sql/collation.test.lua=A0=A0=A0=A0 |=A0 41 ++++++++++++
> =A07 files changed, 171 insertions(+), 11 deletions(-)

Tests still fail on Travis CI:

https://travis-ci.org/tarantool/tarantool/builds/499767531?utm_source=3Dgit=
hub_status&utm_medium=3Dnotification

[016] box-py/bootstrap.test.py                                        [ fai=
l ]
[016]=20
[016] Test failed! Result content mismatch:
[016] --- box-py/bootstrap.result	Thu Feb 28 12:11:15 2019
[016] +++ box-py/bootstrap.reject	Thu Feb 28 12:18:54 2019
[016] @@ -4,7 +4,7 @@
[016]  box.space._schema:select{}
[016]  ---
[016]  - - ['max_id', 511]
[016] -  - ['version', 2, 1, 0]
[016] +  - ['version', 2, 1, 2]
[016]  ...
[016]  box.space._cluster:select{}
[016]  ---

> diff --git a/src/box/lua/upgrade.lua b/src/box/lua/upgrade.lua
> index 70cfb4f2e..09af2e20d 100644
> --- a/src/box/lua/upgrade.lua
> +++ b/src/box/lua/upgrade.lua
> @@ -614,6 +614,10 @@ local function upgrade_to_2_1_0()
> =A0=A0=A0=A0 upgrade_priv_to_2_1_0()
> =A0end
>=20
> +local function upgrade_to_2_1_2()
> +=A0=A0=A0 box.space._collation:replace{4, "unicode_ru_s2", ADMIN, "ICU",=
 "ru_RU",
> {strength=3D'secondary'}}
> +end
> +
> =A0local function get_version()
> =A0=A0=A0=A0 local version =3D box.space._schema:get{'version'}
> =A0=A0=A0=A0 if version =3D=3D nil then
> @@ -641,7 +645,8 @@ local function upgrade(options)
> =A0=A0=A0=A0=A0=A0=A0=A0 {version =3D mkversion(1, 7, 7), func =3D upgrad=
e_to_1_7_7, auto =3D
> true},
> =A0=A0=A0=A0=A0=A0=A0=A0 {version =3D mkversion(1, 10, 0), func =3D upgra=
de_to_1_10_0, auto =3D
> true},
> =A0=A0=A0=A0=A0=A0=A0=A0 {version =3D mkversion(1, 10, 2), func =3D upgra=
de_to_1_10_2, auto =3D
> true},
> -=A0=A0=A0=A0=A0=A0=A0 {version =3D mkversion(2, 1, 0), func =3D upgrade_=
to_2_1_0, auto =3D
> true}
> +=A0=A0=A0=A0=A0=A0=A0 {version =3D mkversion(2, 1, 0), func =3D upgrade_=
to_2_1_0, auto =3D
> true},
> +=A0=A0=A0=A0=A0=A0=A0 {version =3D mkversion(2, 1, 2), func =3D upgrade_=
to_2_1_2, auto =3D
> true}

The patch is mangled. Please fix your MUA so as it doesn't mangle plain
text emails.