[tarantool-patches] Re: [PATCH v2] Feature request for a new collation
Vladimir Davydov
vdavydov.dev at gmail.com
Thu Feb 28 18:46:30 MSK 2019
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.
>
> The updated patch is below:
>
> Branch: https://github.com/tarantool/tarantool/tree/stanztt/gh-4007-new-default-collation-2.1
> Issue: https://github.com/tarantool/tarantool/issues/4007
>
> src/box/bootstrap.snap | Bin 1831 -> 1867 bytes
> src/box/lua/upgrade.lua | 7 +-
> test/box/ddl.result | 14 ++--
> test/box/net.box.result | 2 +-
> test/sql-tap/collation.test.lua | 7 +-
> test/sql/collation.result | 111 ++++++++++++++++++++++++++++++++
> test/sql/collation.test.lua | 41 ++++++++++++
> 7 files changed, 171 insertions(+), 11 deletions(-)
Tests still fail on Travis CI:
https://travis-ci.org/tarantool/tarantool/builds/499767531?utm_source=github_status&utm_medium=notification
[016] box-py/bootstrap.test.py [ fail ]
[016]
[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()
> upgrade_priv_to_2_1_0()
> end
>
> +local function upgrade_to_2_1_2()
> + box.space._collation:replace{4, "unicode_ru_s2", ADMIN, "ICU", "ru_RU",
> {strength='secondary'}}
> +end
> +
> local function get_version()
> local version = box.space._schema:get{'version'}
> if version == nil then
> @@ -641,7 +645,8 @@ local function upgrade(options)
> {version = mkversion(1, 7, 7), func = upgrade_to_1_7_7, auto =
> true},
> {version = mkversion(1, 10, 0), func = upgrade_to_1_10_0, auto =
> true},
> {version = mkversion(1, 10, 2), func = upgrade_to_1_10_2, auto =
> true},
> - {version = mkversion(2, 1, 0), func = upgrade_to_2_1_0, auto =
> true}
> + {version = mkversion(2, 1, 0), func = upgrade_to_2_1_0, auto =
> true},
> + {version = mkversion(2, 1, 2), func = upgrade_to_2_1_2, auto =
> true}
The patch is mangled. Please fix your MUA so as it doesn't mangle plain
text emails.
More information about the Tarantool-patches
mailing list