From 45091c1f81ea07e1d6631958f16b191f3190e126 Mon Sep 17 00:00:00 2001
From: Alexandr Lyapunov <aleks@tarantool.org>
Date: Tue, 12 Sep 2017 17:49:44 +0300
Subject: [PATCH] Introduce collation space and collation cache

Add a new space that contains collation definitions for future
index collation and more.

Add a collation cache for fast retrieving a collation object by
its name.

Needed for #2649
---
 src/box/CMakeLists.txt             |   7 +-
 src/box/alter.cc                   | 182 +++++++++++++++++++
 src/box/alter.h                    |   1 +
 src/box/bootstrap.snap             | Bin 1387 -> 1472 bytes
 src/box/coll_cache.c               | 101 +++++++++++
 src/box/coll_cache.h               |  77 ++++++++
 src/box/coll_def.c                 |  45 +++++
 src/box/coll_def.h                 |   3 +
 src/box/errcode.h                  |   1 +
 src/box/lua/schema.lua             |  60 +++++++
 src/box/lua/space.cc               |   2 +
 src/box/lua/upgrade.lua            |  28 ++-
 src/box/schema.cc                  |   5 +
 src/box/schema_def.c               |   1 +
 src/box/schema_def.h               |  14 ++
 src/box/tuple.c                    |   6 +
 src/trivia/util.h                  |   1 +
 test/app-tap/tarantoolctl.test.lua |   4 +-
 test/box-py/bootstrap.result       |   7 +
 test/box/access.result             |  40 +++++
 test/box/access.test.lua           |  14 ++
 test/box/access_misc.result        |   4 +
 test/box/access_sysview.result     |  12 +-
 test/box/alter.result              |   2 +
 test/box/ddl.result                | 273 +++++++++++++++++++++++++++++
 test/box/ddl.test.lua              |  83 +++++++++
 test/box/misc.result               |   1 +
 test/wal_off/alter.result          |   2 +-
 test/xlog/upgrade.result           |  12 ++
 test/xlog/upgrade.test.lua         |   1 +
 30 files changed, 974 insertions(+), 15 deletions(-)
 create mode 100644 src/box/coll_cache.c
 create mode 100644 src/box/coll_cache.h

diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt
index 6c7ac2b2f1..08d5e37411 100644
--- a/src/box/CMakeLists.txt
+++ b/src/box/CMakeLists.txt
@@ -37,10 +37,13 @@ add_library(tuple STATIC
     tuple_compare.cc
     tuple_hash.cc
     key_def.cc
+    coll_def.c
+    coll.c
+    coll_cache.c
     field_def.c
     opt_def.c
 )
-target_link_libraries(tuple box_error core ${MSGPUCK_LIBRARIES} misc bit)
+target_link_libraries(tuple box_error core ${MSGPUCK_LIBRARIES} ${ICU_LIBRARIES} misc bit)
 
 add_library(xlog STATIC xlog.c)
 target_link_libraries(xlog core box_error crc32 ${ZSTD_LIBRARIES})
@@ -86,8 +89,6 @@ add_library(box STATIC
     sequence.c
     func.c
     func_def.c
-    coll_def.c
-    coll.c
     alter.cc
     schema.cc
     schema_def.c
diff --git a/src/box/alter.cc b/src/box/alter.cc
index 4f30624f2d..f62fe1a99a 100644
--- a/src/box/alter.cc
+++ b/src/box/alter.cc
@@ -34,6 +34,7 @@
 #include "space.h"
 #include "memtx_index.h"
 #include "func.h"
+#include "coll_cache.h"
 #include "txn.h"
 #include "tuple.h"
 #include "fiber.h" /* for gc_pool */
@@ -2043,6 +2044,183 @@ on_replace_dd_func(struct trigger * /* trigger */, void *event)
 	}
 }
 
+/** Create a collation definition from tuple. */
+void
+coll_def_new_from_tuple(const struct tuple *tuple, struct coll_def *def)
+{
+	memset(def, 0, sizeof(*def));
+	uint32_t name_len, locale_len, type_len;
+	def->id = tuple_field_u32_xc(tuple, BOX_COLLATION_FIELD_ID);
+	def->name = tuple_field_str_xc(tuple, BOX_COLLATION_FIELD_NAME, &name_len);
+	def->name_len = name_len;
+	uint32_t owner_id = tuple_field_u32_xc(tuple, BOX_COLLATION_FIELD_UID);
+	const char *type = tuple_field_str_xc(tuple, BOX_COLLATION_FIELD_TYPE,
+					      &type_len);
+	def->type = STRN2ENUM(coll_type, type, type_len);
+	if (def->type == coll_type_MAX)
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "unknown collation type");
+	def->locale = tuple_field_str_xc(tuple, BOX_COLLATION_FIELD_LOCALE,
+					 &locale_len);
+	def->locale_len = locale_len;
+	const char *options =
+		tuple_field_with_type_xc(tuple, BOX_COLLATION_FIELD_OPTIONS,
+					 MP_MAP);
+
+	if (name_len > BOX_NAME_MAX)
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "collation name is too long");
+	if (locale_len > BOX_NAME_MAX)
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "collation locale is too long");
+
+	assert(def->type == COLL_TYPE_ICU); /* no more defined now */
+	if (opts_decode(&def->icu, coll_icu_opts_reg, &options,
+			ER_WRONG_COLLATION_OPTIONS,
+			BOX_COLLATION_FIELD_OPTIONS, NULL) != 0)
+		diag_raise();
+
+	if (def->icu.french_collation == coll_icu_on_off_MAX) {
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "ICU wrong french_collation option setting, "
+				  "expected ON | OFF");
+	}
+
+	if (def->icu.alternate_handling == coll_icu_alternate_handling_MAX) {
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "ICU wrong alternate_handling option setting, "
+				  "expected NON_IGNORABLE | SHIFTED");
+	}
+
+	if (def->icu.case_first == coll_icu_case_first_MAX) {
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "ICU wrong case_first option setting, "
+				  "expected OFF | UPPER_FIRST | LOWER_FIRST");
+	}
+
+	if (def->icu.case_level == coll_icu_on_off_MAX) {
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "ICU wrong case_level option setting, "
+				  "expected ON | OFF");
+	}
+
+	if (def->icu.normalization_mode == coll_icu_on_off_MAX) {
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "ICU wrong normalization_mode option setting, "
+				  "expected ON | OFF");
+	}
+
+	if (def->icu.strength == coll_icu_strength_MAX) {
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "ICU wrong strength option setting, "
+				  "expected PRIMARY | SECONDARY | "
+				  "TERTIARY | QUATERNARY | IDENTICAL");
+	}
+
+	if (def->icu.numeric_collation == coll_icu_on_off_MAX) {
+		tnt_raise(ClientError, ER_CANT_CREATE_COLLATION,
+			  "ICU wrong numeric_collation option setting, "
+				  "expected ON | OFF");
+	}
+
+	access_check_ddl(owner_id, SC_COLLATION);
+
+}
+
+/** Rollback change in collation space. */
+static void
+coll_cache_rollback(struct trigger *trigger, void *event)
+{
+	struct coll *old_coll = (struct coll *)trigger->data;
+	struct txn_stmt *stmt = txn_last_stmt((struct txn*) event);
+	struct tuple *new_tuple = stmt->new_tuple;
+
+	if (new_tuple != NULL) {
+		uint32_t new_id = tuple_field_u32_xc(new_tuple,
+						     BOX_COLLATION_FIELD_ID);
+		struct coll *new_coll = coll_cache_find(new_id);
+		coll_cache_delete(new_coll);
+		coll_delete(new_coll);
+	}
+
+	if (old_coll != NULL) {
+		struct coll *replaced;
+		int rc = coll_cache_replace(old_coll, &replaced);
+		assert(rc == 0 && replaced == NULL);
+		(void)rc;
+	}
+}
+
+/** Delete a collation. */
+static void
+coll_cache_delete_coll(struct trigger *trigger, void */* event */)
+{
+	struct coll *old_coll = (struct coll *)trigger->data;
+	coll_delete(old_coll);
+}
+
+/**
+ * A trigger invoked on replace in a space containing
+ * collations that a user defined.
+ */
+static void
+on_replace_dd_collation(struct trigger * /* trigger */, void *event)
+{
+	struct txn *txn = (struct txn *) event;
+	struct txn_stmt *stmt = txn_current_stmt(txn);
+	struct tuple *old_tuple = stmt->old_tuple;
+	struct tuple *new_tuple = stmt->new_tuple;
+
+	struct coll *old_coll = NULL;
+	if (old_tuple != NULL) {
+		/* TODO: Check that no index uses the collation */
+		uint32_t old_id = tuple_field_u32_xc(old_tuple,
+						     BOX_COLLATION_FIELD_ID);
+		old_coll = coll_cache_find(old_id);
+		assert(old_coll != NULL);
+		access_check_ddl(old_coll->owner_id, SC_COLLATION);
+
+		struct trigger *on_commit =
+			txn_alter_trigger_new(coll_cache_delete_coll, old_coll);
+		txn_on_commit(txn, on_commit);
+	}
+
+	if (new_tuple == NULL) {
+		/* Simple DELETE */
+		assert(old_tuple != NULL);
+		coll_cache_delete(old_coll);
+
+		struct trigger *on_rollback =
+			txn_alter_trigger_new(coll_cache_rollback, old_coll);
+		txn_on_rollback(txn, on_rollback);
+		return;
+	}
+
+	struct coll_def new_def;
+	coll_def_new_from_tuple(new_tuple, &new_def);
+	struct coll *new_coll = coll_new(&new_def);
+	if (new_coll == NULL)
+		diag_raise();
+	auto def_guard = make_scoped_guard([=] { coll_delete(new_coll); });
+
+	struct coll *replaced;
+	if (coll_cache_replace(new_coll, &replaced) != 0)
+		diag_raise();
+	if (replaced == NULL && old_coll != NULL) {
+		/*
+		 * ID of a collation was changed.
+		 * Remove collation by old ID.
+		 */
+		coll_cache_delete(old_coll);
+	}
+
+	struct trigger *on_rollback =
+		txn_alter_trigger_new(coll_cache_rollback, old_coll);
+	txn_on_rollback(txn, on_rollback);
+
+	def_guard.is_active = false;
+}
+
 /**
  * Create a privilege definition from tuple.
  */
@@ -2687,6 +2865,10 @@ struct trigger on_replace_func = {
 	RLIST_LINK_INITIALIZER, on_replace_dd_func, NULL, NULL
 };
 
+struct trigger on_replace_collation = {
+	RLIST_LINK_INITIALIZER, on_replace_dd_collation, NULL, NULL
+};
+
 struct trigger on_replace_priv = {
 	RLIST_LINK_INITIALIZER, on_replace_dd_priv, NULL, NULL
 };
diff --git a/src/box/alter.h b/src/box/alter.h
index 4236487936..fb5f65a68a 100644
--- a/src/box/alter.h
+++ b/src/box/alter.h
@@ -38,6 +38,7 @@ extern struct trigger on_replace_truncate;
 extern struct trigger on_replace_schema;
 extern struct trigger on_replace_user;
 extern struct trigger on_replace_func;
+extern struct trigger on_replace_collation;
 extern struct trigger on_replace_priv;
 extern struct trigger on_replace_cluster;
 extern struct trigger on_replace_sequence;
diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap
index a8098ed560e3aace1126cf15c73c36f80d4287ad..4877919ffcfb8e5e08fd9d6bd22b12a63b9dd4a9 100644
GIT binary patch
delta 1465
zcmV;q1xEVo3cw4H8GkV~H7#dkF=RM1H#rJPZgX^DZewLSATeTOFf%q`V=XZ<GC3_Y
zIAmfiVqs-CEjTq|H#ah7WHU4~VhUD6Y;R+0Iv{&7Iv_B83JTS_3%bn(L;%ig29<E7
z0000004TLD{QywiDFDX$%}MZ-RLsCL@C+>SH1g>Q*Vq$jB!88~VyytWb9j*u3`Qg}
zm4=jrg4s>JB#FQ_NqG=Y6<Fou2qWu_voH7=sQ^G06W}FhD5aDFxd5*K!T|d<O;~=f
zS()qc_T?ToIy%h#f?$X}A2cPv+nBxUY8p%D-FfXrSf}0K;FvYt^{(=|zJ<AGqbRgT
z2loMB>m*_Ox_|N(ZLQAIzdOI#l(^@En%Fu?96V-}STUpjg*fZcHg&iZYwIKfoKPKR
zzW-&*v2~J5XwR3un(L}jTPKM^q3|U=%!+jCMjbAxMlttaMlkrIMlmK+%**M1ElT!x
zK7!a5<51|FNKkHUC>&XmGbWKSVp8W#UP(Izvi*E4p?}yq$yOh)Y(F2pl9CeSU_Gv0
zUX6+n*gDCvKhME>TzMr89nj$n>?@Xerc?8u&R&hO6tH!YBY0nBtl!TALRSdbI!S#W
z3_}%&Vc)_Rmwn&P%bKgRYqp>DU1yv4ozr&cA8$POcBsk#n$Ir|<F=P)qaXoy?^|Bi
z4p%kS1%Fp%*JFsi5B$91(V3;crsMGyxmTl~6I&-KUe}CwF{FVPhhR;F^+G6>aUl^m
zDkFpp5HlZW%0mi;>QEg}F|k_hU}pDX>m+R~M|UcjN~IEs#DU~O8i_WDG>9^UM4^za
zlf(&O;4Z{C3oI=$mI^I?TPqY)I29I^2_Ole6@QRQt)B=qhC_sYAbdcSer%m&%7Yoh
zDe~iutjC(o|L(MjLVI*L76;$=yI()c<M{_qjv!P<16wB<>lf>BcW;Nzq}V#iG3MQ9
zioq*y5w*b9Nj~er{K{M0@jCt*s*vYD?D}q&?UlC}s?*EqTbVj^P{DMg?yqX3`ns19
z%70`kjqr^*kv>(aMG1{@DH!xc%DSjCEl?~<Golro3JOYL>m+Lm?I}^1P#xxu^|-p#
z6ShwBWIo^j%6hzYCTyLgNu5;2btP~H#os*Cl6WxOG@L=zDAs6|aU>a?UEeJ!P1!oh
z5Uf>8gmF-Y1q!So292kIz33#71<k)&uYVz>+u|efw(yS4em>GV|B+SFDdR{ZY@MXc
zj21H*u5@<U&qo)Rnot#i3#idxWTpgW00032Pyhi2M=8f{1`?pKI0~dN3Sk%qWC$<@
z4j2Id!GVx~2%r`Kw7_j{dJVvffk+IRO4BH6(Rf(EG_inw6$z7vmJCa0;zxzUkALw!
zsAb5v8W}iPEewQes7d>UI^2&QAp{hi;^l1QL0)lrG7d^FJHDXetbj~D#*VGWR?Z`{
ziuO9RUL-^p22rH`-FBE+%cpT1#1-S{F;TgCq_c@bCp+;GiHjBJg*4O>^a7d^E4qzd
z{{d=<hO&YbLOO_O^yq|rp*zKd(SH~;+#m=K6{{ua1vI4<<bj$>thw06vfo=;ISPIs
zAid~KYH-jA#eGzyto!_3e8qHrEwOExdJ`;xjHVBkWpvXw6I+y!KZ@BN<hFe*L(?Av
zvR$KDCP57{2tj-aIGx5&4FDy=uqW3rIo$+vL*oCWun*4k_UsEaXGW4=8h<XnCiBOz
zaD;fbk4Po@QRvR?2vYnIsm>^d#5?A+(W7TNwoy1-nH2``h{G;qXbueDlRGb%_G22r
zw(5z|0nQhU+#nYN7vLj|&cP*vn`Rz<q7ddVAUj2Gn$cUS#$@0ZdC5sK;m^tU$j%nO
zoOHrG$+D~T9|@0XJF*Hy)G}l*F*CV`vbe%v>Ycux)#@7IzndHrJ+#z7t$&N_*doYb
Tnb;9@`HE6c5(Yj8)ex=il@+2+

delta 1379
zcmV-p1)Tc83+oDy8Gku7EoU-jHZfykGiC}&ZgX^DZewLSAU0z+WjSLuWG!JiHa0CZ
zFfwK>I5aRZEiyDPVK+E9G%-14GzwNjY;R+0Iv{&}3JTS_3%bn&^8n8BKVr?L00000
z04TLD{Qyu^Cje%*!b$Lyn*hwfb9%BB^{zZIM)LbDj6p4cOn)lD0frTe5l)M}Q#n#H
z4<`|N+LC}gLqnVeMOXT6TSB}=&&e&h1u!FcD&WbIp_EbztpKM0xBz?Ovt!l{QzB;N
za1{nqXV+u+c_{F6ibrRae%O9Z6P~Eos?7DMgUUW^c>IS&?!l_c$+fg>y^Wk_Vf|9+
zygP@z*y=AE7k>^~(^=0tG3!?!_hL1r_VCD5?zOZGfKqjs`F=8Xb1f~K)E-p!YA_2{
zuchTFrbOz#7;TG*;Y1w_iW7bJBhmkcMckiGC0yEEl<e<(1izS>rBq6fq}U)?GD86q
zF^P<k6H9FZ<ID7PswsucTkH~COUqY1n901w9j||1<9`(L{D)oRt%{L(i{4o|1UUQo
zxE;8bma9Huoc(<C&Z-%>`Sh3~Jy;DDxR#b<e}41nG3A{VL|{iYU}N#@V))8AJ8B-K
zvj?j!0<NXyk02(^j!_<v%7St&Ej4~H3{T+K`qhWOvv1t_S%Y<E<?L5|*EuGB=dT|6
z#~aVRoqxI#faWvFTRcX3vHAgk1J}}0Muv-=8m4r9+0Vz9mzwY-q*j~^)ag_%Mrnq0
zEiJ3*DpE}`rcvjigXuPt2+VRC<vLtT%WLZ3UN+IjVcVc-&_Wt0lp%y6bOGc7vT!Xe
zU7!kCW@ard6wH<hD~?wzEGsK35>_I7J|C421b=I~ir5F$bP=fzuBD|)18Ta8{CFel
z5tieB_g8CUR^DQarqrGtSqlTycf4P}%H#P5kB%TU#)4~UX?FbSad&U0&M3H+mI0&h
zwh_mbur`7bZQ6(vrC_v?h(zkJ2u1q3FMT8zCDqJKEb0o=RbgjRbSSnHAro1NYiU_O
zwSVW7IjK6#{nKMg$C|FCB?^7MpUisHsTC*VNL)+H6H6;j#*NTn?)b}~_?xF*5f6s@
z^=0rhim+-!TuVzFI<rvttQEwyv=pIAt;7}wWm=^8Ho&0qG_4n16I;+cxgv*bc*R8`
zUVS?`_Ve-8`H!lzQk+ct5P<fm(O^VM4S&o400Kc001!i&8BzfffWR;e#4rk>00v|L
z4B{FG03stHK@p%@Ff<sF>IJ327z{!jhy!sPIVZ<3=s5f9*zl1fei!|4w=<q%b5UM&
zBB(WOsNN>m6knQPcK}6#c*9y-f{jJMtLSVxnFy_g1zGXdUbY=uk7EQROgzf#(0}$q
z(^yblW?3m;MwY|-Wggdn9JEm<QdCVz@W9a+@iFt{1nOqo2oFX=>rg(Nh|yvqx?=r8
zQUEoO!oURr8a+;Mj0RI|RSTP?HHq+;S6~q$2nDbK90Vm~o4bFmEPj^%_&e+42v|@c
z3COjctZn~qos5<JbCh}oECJc3qknTWYUi7BS}4hVWV}6OY{s#S*dKO08WC{4gWPc0
z9E`4i5}3utaC;~CVbkW9F*(}=M<j7<64gUz*-H0?nDIuM-&&L~liBesj`nZr5n*=b
zC{N%%ii#hTsE39jK_5D8V9_w$YaCo$a)1+Hb3v#dkeWrd=YA#GGJIxc6kIk$olJtq
zCZe(qW4QJ#K#s7@=Q;*AC!YRM0OSzMLB4xu^qOX2GVqkVB@Eqi;$p-`8c1}i#Th=R
lrvm7h{bvmqQkdG5dv+B?p^i~uM~dcaWj#q4wGPz~t?dmld5-`9

diff --git a/src/box/coll_cache.c b/src/box/coll_cache.c
new file mode 100644
index 0000000000..137f5d717c
--- /dev/null
+++ b/src/box/coll_cache.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ *    copyright notice, this list of conditions and the
+ *    following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include "coll_cache.h"
+#include "diag.h"
+#include "assoc.h"
+
+/** mhash table (id -> collation) */
+static struct mh_i32ptr_t *coll_cache_id = NULL;
+
+/** Create global hash tables if necessary. */
+int
+coll_cache_init()
+{
+	coll_cache_id = mh_i32ptr_new();
+	if (coll_cache_id == NULL) {
+		diag_set(OutOfMemory, sizeof(*coll_cache_id), "malloc",
+			 "coll_cache");
+		return -1;
+	}
+	return 0;
+}
+
+/** Delete global hash tables. */
+void
+coll_cache_destroy()
+{
+	mh_i32ptr_delete(coll_cache_id);
+}
+
+/**
+ * Insert or replace a collation into collation cache.
+ * @param coll - collation to insert/replace.
+ * @return - NULL if inserted, replaced collation if replaced.
+ */
+int
+coll_cache_replace(struct coll *coll, struct coll **replaced)
+{
+	const struct mh_i32ptr_node_t node = {coll->id, coll};
+	struct mh_i32ptr_node_t repl_node = {0, NULL};
+	struct mh_i32ptr_node_t *prepl_node = &repl_node;
+	if (mh_i32ptr_put(coll_cache_id, &node, &prepl_node, NULL) ==
+	    mh_end(coll_cache_id)) {
+		diag_set(OutOfMemory, sizeof(node), "malloc", "coll_cache");
+		return -1;
+	}
+	*replaced = repl_node.val;
+	return 0;
+}
+
+/**
+ * Delete a collation from collation cache.
+ * @param coll - collation to delete.
+ */
+void
+coll_cache_delete(const struct coll *coll)
+{
+	mh_int_t i = mh_i32ptr_find(coll_cache_id, coll->id, NULL);
+	if (i == mh_end(coll_cache_id))
+		return;
+	mh_i32ptr_del(coll_cache_id, i, NULL);
+}
+
+/**
+ * Find a collation object by its id.
+ */
+struct coll *
+coll_cache_find(uint32_t id)
+{
+	mh_int_t pos = mh_i32ptr_find(coll_cache_id, id, NULL);
+	if (pos == mh_end(coll_cache_id))
+		return NULL;
+	return mh_i32ptr_node(coll_cache_id, pos)->val;
+}
diff --git a/src/box/coll_cache.h b/src/box/coll_cache.h
new file mode 100644
index 0000000000..b982ec2850
--- /dev/null
+++ b/src/box/coll_cache.h
@@ -0,0 +1,77 @@
+#ifndef TARANTOOL_BOX_COLL_CACHE_H_INCLUDED
+#define TARANTOOL_BOX_COLL_CACHE_H_INCLUDED
+/*
+ * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ *    copyright notice, this list of conditions and the
+ *    following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "coll.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* defined(__cplusplus) */
+
+/**
+ * Create global hash tables.
+ * @return - 0 on success, -1 on memory error.
+ */
+int
+coll_cache_init();
+
+/** Delete global hash tables. */
+void
+coll_cache_destroy();
+
+/**
+ * Insert or replace a collation into collation cache.
+ * @param coll - collation to insert/replace.
+ * @param replaced - collation that was replaced.
+ * @return - 0 on success, -1 on memory error.
+ */
+int
+coll_cache_replace(struct coll *coll, struct coll **replaced);
+
+/**
+ * Delete a collation from collation cache.
+ * @param coll - collation to delete.
+ */
+void
+coll_cache_delete(const struct coll *coll);
+
+/**
+ * Find a collation object by its id.
+ */
+struct coll *
+coll_cache_find(uint32_t id);
+
+#if defined(__cplusplus)
+} /* extern "C" */
+#endif /* defined(__cplusplus) */
+
+#endif /* TARANTOOL_BOX_COLL_CACHE_H_INCLUDED */
diff --git a/src/box/coll_def.c b/src/box/coll_def.c
index 1a469b70d5..f849845b3a 100644
--- a/src/box/coll_def.c
+++ b/src/box/coll_def.c
@@ -63,3 +63,48 @@ const char *coll_icu_strength_strs[] = {
 	"IDENTICAL"
 };
 
+static int64_t
+icu_on_off_from_str(const char *str, uint32_t len)
+{
+	return strnindex(coll_icu_on_off_strs + 1, str, len,
+			 coll_icu_on_off_MAX - 1) + 1;
+}
+
+static int64_t
+icu_alternate_handling_from_str(const char *str, uint32_t len)
+{
+	return strnindex(coll_icu_alternate_handling_strs + 1, str, len,
+			 coll_icu_alternate_handling_MAX - 1) + 1;
+}
+
+static int64_t
+icu_case_first_from_str(const char *str, uint32_t len)
+{
+	return strnindex(coll_icu_case_first_strs + 1, str, len,
+			 coll_icu_case_first_MAX - 1) + 1;
+}
+
+static int64_t
+icu_strength_from_str(const char *str, uint32_t len)
+{
+	return strnindex(coll_icu_strength_strs + 1, str, len,
+			 coll_icu_strength_MAX - 1) + 1;
+}
+
+const struct opt_def coll_icu_opts_reg[] = {
+	OPT_DEF_ENUM("french_collation", coll_icu_on_off, struct coll_icu_def,
+		     french_collation, icu_on_off_from_str),
+	OPT_DEF_ENUM("alternate_handling", coll_icu_alternate_handling, struct coll_icu_def,
+		     alternate_handling, icu_alternate_handling_from_str),
+	OPT_DEF_ENUM("case_first", coll_icu_case_first, struct coll_icu_def,
+		     case_first, icu_case_first_from_str),
+	OPT_DEF_ENUM("case_level", coll_icu_on_off, struct coll_icu_def,
+		     case_level, icu_on_off_from_str),
+	OPT_DEF_ENUM("normalization_mode", coll_icu_on_off, struct coll_icu_def,
+		     normalization_mode, icu_on_off_from_str),
+	OPT_DEF_ENUM("strength", coll_icu_strength, struct coll_icu_def,
+		     strength, icu_strength_from_str),
+	OPT_DEF_ENUM("numeric_collation", coll_icu_on_off, struct coll_icu_def,
+		     numeric_collation, icu_on_off_from_str),
+	OPT_END,
+};
diff --git a/src/box/coll_def.h b/src/box/coll_def.h
index f62e794033..7a1027a1e1 100644
--- a/src/box/coll_def.h
+++ b/src/box/coll_def.h
@@ -33,6 +33,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include "opt_def.h"
 
 #if defined(__cplusplus)
 extern "C" {
@@ -128,6 +129,8 @@ struct coll_def {
 	struct coll_icu_def icu;
 };
 
+extern const struct opt_def coll_icu_opts_reg[];
+
 #if defined(__cplusplus)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
diff --git a/src/box/errcode.h b/src/box/errcode.h
index aaaa9127c5..bca4cbd0c7 100644
--- a/src/box/errcode.h
+++ b/src/box/errcode.h
@@ -203,6 +203,7 @@ struct errcode_record {
 	/*148 */_(ER_SEQUENCE_ACCESS_DENIED,	"%s access is denied for user '%s' to sequence '%s'") \
 	/*149 */_(ER_SPACE_FIELD_IS_DUPLICATE,	"Space field '%s' is duplicate") \
 	/*150 */_(ER_CANT_CREATE_COLLATION,	"Failed to initialize collation: %s.") \
+	/*151 */_(ER_WRONG_COLLATION_OPTIONS,	"Wrong collation options (field %u): %s") \
 
 /*
  * !IMPORTANT! Please follow instructions at start of the file
diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua
index 1ee6b0dc5c..73b82a2e4d 100644
--- a/src/box/lua/schema.lua
+++ b/src/box/lua/schema.lua
@@ -1611,6 +1611,66 @@ end
 
 box.schema.func.reload = internal.func_reload
 
+box.internal.collation = {}
+box.internal.collation.create = function(name, coll_type, locale, opts)
+    opts = opts or setmap{}
+    if type(name) ~= 'string' then
+        box.error(box.error.ILLEGAL_PARAMS,
+        "name (first arg) must be a string")
+    end
+    if type(coll_type) ~= 'string' then
+        box.error(box.error.ILLEGAL_PARAMS,
+        "type (second arg) must be a string")
+    end
+    if type(locale) ~= 'string' then
+        box.error(box.error.ILLEGAL_PARAMS,
+        "locale (third arg) must be a string")
+    end
+    if type(opts) ~= 'table' then
+        box.error(box.error.ILLEGAL_PARAMS,
+        "options (fourth arg) must be a table or nil")
+    end
+    local lua_opts = {if_not_exists = opts.if_not_exists }
+    check_param_table(lua_opts, {if_not_exists = 'boolean'})
+    opts.if_not_exists = nil
+    opts = setmap(opts)
+
+    local _coll = box.space[box.schema.COLLATION_ID]
+    if lua_opts.if_not_exists then
+        local coll = _coll.index.name:get{name}
+        if coll then
+            return
+        end
+    end
+    _coll:auto_increment{name, session.uid(), coll_type, locale, opts}
+end
+
+box.internal.collation.drop = function(name, opts)
+    opts = opts or {}
+    check_param_table(opts, { if_exists = 'boolean' })
+
+    local _coll = box.space[box.schema.COLLATION_ID]
+    if opts.if_exists then
+        local coll = _coll.index.name:get{name}
+        if not coll then
+            return
+        end
+    end
+    _coll.index.name:delete{name}
+end
+
+box.internal.collation.exists = function(name)
+    local _coll = box.space[box.schema.COLLATION_ID]
+    local coll = _coll.index.name:get{name}
+    return not not coll
+end
+
+box.internal.collation.id_by_name = function(name)
+    local _coll = box.space[box.schema.COLLATION_ID]
+    local coll = _coll.index.name:get{name}
+    return coll[1]
+end
+
 box.schema.user = {}
 
 box.schema.user.password = function(password)
diff --git a/src/box/lua/space.cc b/src/box/lua/space.cc
index 94a88c7e58..3da7934b94 100644
--- a/src/box/lua/space.cc
+++ b/src/box/lua/space.cc
@@ -351,6 +351,8 @@ box_lua_space_init(struct lua_State *L)
 	lua_setfield(L, -2, "VUSER_ID");
 	lua_pushnumber(L, BOX_FUNC_ID);
 	lua_setfield(L, -2, "FUNC_ID");
+	lua_pushnumber(L, BOX_COLLATION_ID);
+	lua_setfield(L, -2, "COLLATION_ID");
 	lua_pushnumber(L, BOX_VFUNC_ID);
 	lua_setfield(L, -2, "VFUNC_ID");
 	lua_pushnumber(L, BOX_PRIV_ID);
diff --git a/src/box/lua/upgrade.lua b/src/box/lua/upgrade.lua
index 537e282c84..ae382eda9c 100644
--- a/src/box/lua/upgrade.lua
+++ b/src/box/lua/upgrade.lua
@@ -837,8 +837,6 @@ end
 
 --------------------------------------------------------------------------------
 -- Tarantool 1.7.6
---------------------------------------------------------------------------------
-
 local function create_sequence_space()
     local _space = box.space[box.schema.SPACE_ID]
     local _index = box.space[box.schema.INDEX_ID]
@@ -882,8 +880,32 @@ local function create_sequence_space()
     _index:insert{_space_sequence.id, 1, 'sequence', 'tree', {unique = false}, {{1, 'unsigned'}}}
 end
 
+local function create_collation_space()
+    local _collation = box.space[box.schema.COLLATION_ID]
+
+    log.info("create space _collation")
+    box.space._space:insert{_collation.id, ADMIN, '_collation', 'memtx', 0, setmap({}),
+        { { name = 'id', type = 'unsigned' }, { name = 'name', type = 'string' },
+          { name = 'owner', type = 'unsigned' }, { name = 'type', type = 'string' },
+          { name = 'locale', type = 'string' }, { name = 'opts', type = 'map' } } }
+
+    log.info("create index primary on _collation")
+    box.space._index:insert{_collation.id, 0, 'primary', 'tree', {unique = true}, {{0, 'unsigned'}}}
+
+    log.info("create index name on _collation")
+    box.space._index:insert{_collation.id, 1, 'name', 'tree', {unique = true}, {{1, 'string'}}}
+
+    log.info("create predefined collations")
+    box.space._collation:replace{0, "unicode", ADMIN, "ICU", "", setmap{}}
+    box.space._collation:replace{1, "unicode_s1", ADMIN, "ICU", "", {strength='primary'}}
+
+    local _priv = box.space[box.schema.PRIV_ID]
+    _priv:insert{ADMIN, PUBLIC, 'space', _collation.id, 2}
+end
+
 local function upgrade_to_1_7_6()
     create_sequence_space()
+    create_collation_space()
     -- Trigger space format checking by updating version in _schema.
 end
 
@@ -912,7 +934,7 @@ local function upgrade(options)
         {version = mkversion(1, 7, 1), func = upgrade_to_1_7_1, auto = false},
         {version = mkversion(1, 7, 2), func = upgrade_to_1_7_2, auto = false},
         {version = mkversion(1, 7, 5), func = upgrade_to_1_7_5, auto = true},
-        {version = mkversion(1, 7, 6), func = upgrade_to_1_7_6, auto = false}
+        {version = mkversion(1, 7, 6), func = upgrade_to_1_7_6, auto = false},
     }
 
     for _, handler in ipairs(handlers) do
diff --git a/src/box/schema.cc b/src/box/schema.cc
index 71f3621678..ff8ce0dc9c 100644
--- a/src/box/schema.cc
+++ b/src/box/schema.cc
@@ -279,6 +279,11 @@ schema_init()
 	/* _space - home for all spaces. */
 	key_def_set_part(key_def, 0 /* part no */, 0 /* field no */,
 			 FIELD_TYPE_UNSIGNED);
+
+	/* _collation - collation description. */
+	sc_space_new(BOX_COLLATION_ID, "_collation", key_def,
+		     &on_replace_collation, NULL);
+
 	sc_space_new(BOX_SPACE_ID, "_space", key_def,
 		     &alter_space_on_replace_space, &on_stmt_begin_space);
 
diff --git a/src/box/schema_def.c b/src/box/schema_def.c
index ad3d6832fb..492c593dba 100644
--- a/src/box/schema_def.c
+++ b/src/box/schema_def.c
@@ -40,6 +40,7 @@ static const char *object_type_strs[] = {
 	/* [SC_USER]            = */ "user",
 	/* [SC_ROLE]            = */ "role",
 	/* [SC_SEQUENCE]        = */ "sequence",
+	/* [SC_COLLATION]       = */ "collation",
 };
 
 enum schema_object_type
diff --git a/src/box/schema_def.h b/src/box/schema_def.h
index b97c81c7de..528b8c4c2c 100644
--- a/src/box/schema_def.h
+++ b/src/box/schema_def.h
@@ -68,6 +68,8 @@ enum {
 	BOX_SYSTEM_ID_MIN = 256,
 	/** Space id of _schema. */
 	BOX_SCHEMA_ID = 272,
+	/** Space id of _collation. */
+	BOX_COLLATION_ID = 276,
 	/** Space id of _space. */
 	BOX_SPACE_ID = 280,
 	/** Space id of _vspace view. */
@@ -155,6 +157,16 @@ enum {
 	BOX_FUNC_FIELD_LANGUAGE = 4,
 };
 
+/** _collation fields. */
+enum {
+	BOX_COLLATION_FIELD_ID = 0,
+	BOX_COLLATION_FIELD_NAME = 1,
+	BOX_COLLATION_FIELD_UID = 2,
+	BOX_COLLATION_FIELD_TYPE = 3,
+	BOX_COLLATION_FIELD_LOCALE = 4,
+	BOX_COLLATION_FIELD_OPTIONS = 5,
+};
+
 /** _schema fields. */
 enum {
 	BOX_SCHEMA_FIELD_KEY = 0,
@@ -213,6 +225,8 @@ enum schema_object_type {
 	SC_USER = 4,
 	SC_ROLE = 5,
 	SC_SEQUENCE = 6,
+	SC_COLLATION = 7,
+	schema_object_type_MAX = 8
 };
 
 enum schema_object_type
diff --git a/src/box/tuple.c b/src/box/tuple.c
index 98ce12dd92..0455469043 100644
--- a/src/box/tuple.c
+++ b/src/box/tuple.c
@@ -38,6 +38,7 @@
 #include "small/small.h"
 
 #include "tuple_update.h"
+#include "coll_cache.h"
 
 static struct mempool tuple_iterator_pool;
 static struct small_alloc runtime_alloc;
@@ -402,6 +403,9 @@ tuple_init(field_name_hash_f hash)
 
 	box_tuple_last = NULL;
 
+	if (coll_cache_init() != 0)
+		return -1;
+
 	return 0;
 }
 
@@ -451,6 +455,8 @@ tuple_free(void)
 	small_alloc_destroy(&runtime_alloc);
 
 	tuple_format_free();
+
+	coll_cache_destroy();
 }
 
 box_tuple_format_t *
diff --git a/src/trivia/util.h b/src/trivia/util.h
index beaa4ad1dc..08b89f9beb 100644
--- a/src/trivia/util.h
+++ b/src/trivia/util.h
@@ -92,6 +92,7 @@ extern "C" {
 	const char *enum_name##_strs[(unsigned) enum_name##_MAX + 1] = {enum_members(ENUM_STRS_MEMBER) 0}
 #endif
 #define STR2ENUM(enum_name, str) ((enum enum_name) strindex(enum_name##_strs, str, enum_name##_MAX))
+#define STRN2ENUM(enum_name, str, len) ((enum enum_name) strnindex(enum_name##_strs, str, len, enum_name##_MAX))
 
 uint32_t
 strindex(const char **haystack, const char *needle, uint32_t hmax);
diff --git a/test/app-tap/tarantoolctl.test.lua b/test/app-tap/tarantoolctl.test.lua
index 38945ec5ba..d757530129 100755
--- a/test/app-tap/tarantoolctl.test.lua
+++ b/test/app-tap/tarantoolctl.test.lua
@@ -338,8 +338,8 @@ do
             check_ctlcat_xlog(test_i, dir, "--from=3 --to=6 --format=json --show-system --replica 1", "\n", 3)
             check_ctlcat_xlog(test_i, dir, "--from=3 --to=6 --format=json --show-system --replica 1 --replica 2", "\n", 3)
             check_ctlcat_xlog(test_i, dir, "--from=3 --to=6 --format=json --show-system --replica 2", "\n", 0)
-            check_ctlcat_snap(test_i, dir, "--space=280", "---\n", 16)
-            check_ctlcat_snap(test_i, dir, "--space=288", "---\n", 38)
+            check_ctlcat_snap(test_i, dir, "--space=280", "---\n", 17)
+            check_ctlcat_snap(test_i, dir, "--space=288", "---\n", 40)
         end)
     end)
 
diff --git a/test/box-py/bootstrap.result b/test/box-py/bootstrap.result
index 0994b084db..d5fa6579fb 100644
--- a/test/box-py/bootstrap.result
+++ b/test/box-py/bootstrap.result
@@ -14,6 +14,10 @@ box.space._cluster:select{}
 box.space._space:select{}
 ---
 - - [272, 1, '_schema', 'memtx', 0, {}, [{'type': 'string', 'name': 'key'}]]
+  - [276, 1, '_collation', 'memtx', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {
+        'name': 'name', 'type': 'string'}, {'name': 'owner', 'type': 'unsigned'},
+      {'name': 'type', 'type': 'string'}, {'name': 'locale', 'type': 'string'}, {
+        'name': 'opts', 'type': 'map'}]]
   - [280, 1, '_space', 'memtx', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {'name': 'owner',
         'type': 'unsigned'}, {'name': 'name', 'type': 'string'}, {'name': 'engine',
         'type': 'string'}, {'name': 'field_count', 'type': 'unsigned'}, {'name': 'flags',
@@ -63,6 +67,8 @@ box.space._space:select{}
 box.space._index:select{}
 ---
 - - [272, 0, 'primary', 'tree', {'unique': true}, [[0, 'string']]]
+  - [276, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
+  - [276, 1, 'name', 'tree', {'unique': true}, [[1, 'string']]]
   - [280, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
   - [280, 1, 'owner', 'tree', {'unique': false}, [[1, 'unsigned']]]
   - [280, 2, 'name', 'tree', {'unique': true}, [[2, 'string']]]
@@ -119,6 +125,7 @@ box.space._priv:select{}
 - - [1, 0, 'role', 2, 4]
   - [1, 1, 'universe', 0, 7]
   - [1, 2, 'function', 1, 4]
+  - [1, 2, 'space', 276, 2]
   - [1, 2, 'space', 281, 1]
   - [1, 2, 'space', 289, 1]
   - [1, 2, 'space', 297, 1]
diff --git a/test/box/access.result b/test/box/access.result
index 8337bf1cd5..d1bef1d7f3 100644
--- a/test/box/access.result
+++ b/test/box/access.result
@@ -780,3 +780,43 @@ c:_request("select", nil, 4294967295, box.index.EQ, 0, 0, 0xFFFFFFFF, {})
 c:close()
 ---
 ...
+session = box.session
+---
+...
+box.schema.user.create('test')
+---
+...
+box.schema.user.grant('test', 'read,write', 'universe')
+---
+...
+session.su('test')
+---
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU')
+---
+...
+session.su('admin')
+---
+...
+box.internal.collation.drop('test') -- success
+---
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU')
+---
+...
+session.su('test')
+---
+...
+box.internal.collation.drop('test') -- fail
+---
+- error: Create, drop or alter access on collation is denied for user 'test'
+...
+session.su('admin')
+---
+...
+box.internal.collation.drop('test') -- success
+---
+...
+box.schema.user.drop('test')
+---
+...
diff --git a/test/box/access.test.lua b/test/box/access.test.lua
index cde4e0f9aa..761bb89041 100644
--- a/test/box/access.test.lua
+++ b/test/box/access.test.lua
@@ -303,3 +303,17 @@ c:_request("select", nil, 1, box.index.EQ, 0, 0, 0xFFFFFFFF, {})
 c:_request("select", nil, 65537, box.index.EQ, 0, 0, 0xFFFFFFFF, {})
 c:_request("select", nil, 4294967295, box.index.EQ, 0, 0, 0xFFFFFFFF, {})
 c:close()
+
+session = box.session
+box.schema.user.create('test')
+box.schema.user.grant('test', 'read,write', 'universe')
+session.su('test')
+box.internal.collation.create('test', 'ICU', 'ru_RU')
+session.su('admin')
+box.internal.collation.drop('test') -- success
+box.internal.collation.create('test', 'ICU', 'ru_RU')
+session.su('test')
+box.internal.collation.drop('test') -- fail
+session.su('admin')
+box.internal.collation.drop('test') -- success
+box.schema.user.drop('test')
diff --git a/test/box/access_misc.result b/test/box/access_misc.result
index 2c585b0655..d190c0e41c 100644
--- a/test/box/access_misc.result
+++ b/test/box/access_misc.result
@@ -623,6 +623,10 @@ box.space._user:select()
 box.space._space:select()
 ---
 - - [272, 1, '_schema', 'memtx', 0, {}, [{'type': 'string', 'name': 'key'}]]
+  - [276, 1, '_collation', 'memtx', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {
+        'name': 'name', 'type': 'string'}, {'name': 'owner', 'type': 'unsigned'},
+      {'name': 'type', 'type': 'string'}, {'name': 'locale', 'type': 'string'}, {
+        'name': 'opts', 'type': 'map'}]]
   - [280, 1, '_space', 'memtx', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {'name': 'owner',
         'type': 'unsigned'}, {'name': 'name', 'type': 'string'}, {'name': 'engine',
         'type': 'string'}, {'name': 'field_count', 'type': 'unsigned'}, {'name': 'flags',
diff --git a/test/box/access_sysview.result b/test/box/access_sysview.result
index 99ab3b954c..ca6e649b57 100644
--- a/test/box/access_sysview.result
+++ b/test/box/access_sysview.result
@@ -138,11 +138,11 @@ box.session.su('guest')
 ...
 #box.space._vspace:select{}
 ---
-- 6
+- 7
 ...
 #box.space._vindex:select{}
 ---
-- 15
+- 17
 ...
 box.session.su('admin')
 ---
@@ -230,11 +230,11 @@ box.session.su('guest')
 ...
 #box.space._vspace:select{}
 ---
-- 17
+- 18
 ...
 #box.space._vindex:select{}
 ---
-- 39
+- 41
 ...
 #box.space._vuser:select{}
 ---
@@ -242,7 +242,7 @@ box.session.su('guest')
 ...
 #box.space._vpriv:select{}
 ---
-- 12
+- 13
 ...
 #box.space._vfunc:select{}
 ---
@@ -262,7 +262,7 @@ box.session.su('guest')
 ...
 #box.space._vindex:select{}
 ---
-- 39
+- 41
 ...
 #box.space._vuser:select{}
 ---
diff --git a/test/box/alter.result b/test/box/alter.result
index d4050fa059..583937b115 100644
--- a/test/box/alter.result
+++ b/test/box/alter.result
@@ -182,6 +182,8 @@ box.space._vspace.index.owner:alter{parts = {2, 'unsigned'}}
 _index:select{}
 ---
 - - [272, 0, 'primary', 'tree', {'unique': true}, [[0, 'string']]]
+  - [276, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
+  - [276, 1, 'name', 'tree', {'unique': true}, [[1, 'string']]]
   - [280, 0, 'primary', 'tree', 1, 1, 0, 'unsigned']
   - [280, 1, 'owner', 'tree', {'unique': false}, [{'field': 1, 'type': 'unsigned'}]]
   - [280, 2, 'name', 'tree', {'unique': true}, [[2, 'string']]]
diff --git a/test/box/ddl.result b/test/box/ddl.result
index ed29097bc2..1d9665bcf9 100644
--- a/test/box/ddl.result
+++ b/test/box/ddl.result
@@ -203,3 +203,276 @@ for i = 1, 2 do fiber.create(function() fiber.yield() space:format(format) ch:pu
 space:drop()
 ---
 ...
+-- collation
+function setmap(table) return setmetatable(table, { __serialize = 'map' }) end
+---
+...
+box.internal.collation.create('test')
+---
+- error: Illegal parameters, type (second arg) must be a string
+...
+box.internal.collation.create('test', 'ICU')
+---
+- error: Illegal parameters, locale (third arg) must be a string
+...
+box.internal.collation.create(42, 'ICU', 'ru_RU')
+---
+- error: Illegal parameters, name (first arg) must be a string
+...
+box.internal.collation.create('test', 42, 'ru_RU')
+---
+- error: Illegal parameters, type (second arg) must be a string
+...
+box.internal.collation.create('test', 'ICU', 42)
+---
+- error: Illegal parameters, locale (third arg) must be a string
+...
+box.internal.collation.create('test', 'nothing', 'ru_RU')
+---
+- error: 'Failed to initialize collation: unknown collation type.'
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', setmap{}) --ok
+---
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU')
+---
+- error: Duplicate key exists in unique index 'name' in space '_collation'
+...
+box.internal.collation.drop('test')
+---
+...
+box.internal.collation.drop('nothing') -- allowed
+---
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', 42)
+---
+- error: Illegal parameters, options (fourth arg) must be a table or nil
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', 'options')
+---
+- error: Illegal parameters, options (fourth arg) must be a table or nil
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', {ping='pong'})
+---
+- error: 'Wrong collation options (field 5): unexpected option ''ping'''
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', {french_collation='german'})
+---
+- error: 'Failed to initialize collation: ICU wrong french_collation option setting,
+    expected ON | OFF.'
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', {french_collation='on'}) --ok
+---
+...
+box.internal.collation.drop('test') --ok
+---
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', {strength='supervillian'})
+---
+- error: 'Failed to initialize collation: ICU wrong strength option setting, expected
+    PRIMARY | SECONDARY | TERTIARY | QUATERNARY | IDENTICAL.'
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', {strength=42})
+---
+- error: 'Wrong collation options (field 5): ''strength'' must be enum'
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', {strength=2}) --ok
+---
+- error: 'Wrong collation options (field 5): ''strength'' must be enum'
+...
+box.internal.collation.drop('test') --ok
+---
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU', {strength='primary'}) --ok
+---
+...
+box.internal.collation.drop('test') --ok
+---
+...
+box.internal.collation.create('test', 'ICU', 'ru_RU')
+---
+...
+box.internal.collation.exists('test')
+---
+- true
+...
+test_run:cmd('restart server default')
+function setmap(table) return setmetatable(table, { __serialize = 'map' }) end
+---
+...
+box.internal.collation.exists('test')
+---
+- true
+...
+box.internal.collation.drop('test')
+---
+...
+box.space._collation:auto_increment{'test'}
+---
+- error: Tuple field count 2 is less than required by a defined index (expected 6)
+...
+box.space._collation:auto_increment{'test', 0, 'ICU'}
+---
+- error: Tuple field count 4 is less than required by a defined index (expected 6)
+...
+box.space._collation:auto_increment{'test', 'ADMIN', 'ICU', 'ru_RU'}
+---
+- error: Tuple field count 5 is less than required by a defined index (expected 6)
+...
+box.space._collation:auto_increment{42, 0, 'ICU', 'ru_RU'}
+---
+- error: Tuple field count 5 is less than required by a defined index (expected 6)
+...
+box.space._collation:auto_increment{'test', 0, 42, 'ru_RU'}
+---
+- error: Tuple field count 5 is less than required by a defined index (expected 6)
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 42}
+---
+- error: Tuple field count 5 is less than required by a defined index (expected 6)
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', setmap{}} --ok
+---
+- [2, 'test', 0, 'ICU', 'ru_RU', {}]
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', setmap{}}
+---
+- error: Duplicate key exists in unique index 'name' in space '_collation'
+...
+box.space._collation.index.name:delete{'test'} -- ok
+---
+- [2, 'test', 0, 'ICU', 'ru_RU', {}]
+...
+box.space._collation.index.name:delete{'nothing'} -- allowed
+---
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', 42}
+---
+- error: 'Tuple field 6 type does not match one required by operation: expected map'
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', 'options'}
+---
+- error: 'Tuple field 6 type does not match one required by operation: expected map'
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', {ping='pong'}}
+---
+- error: 'Wrong collation options (field 5): unexpected option ''ping'''
+...
+opts = {normalization_mode='NORMAL'}
+---
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+---
+- error: 'Failed to initialize collation: ICU wrong normalization_mode option setting,
+    expected ON | OFF.'
+...
+opts.normalization_mode = 'OFF'
+---
+...
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} -- ok
+---
+...
+_ = box.space._collation.index.name:delete{'test'} -- ok
+---
+...
+opts.numeric_collation = 'PERL'
+---
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+---
+- error: 'Failed to initialize collation: ICU wrong numeric_collation option setting,
+    expected ON | OFF.'
+...
+opts.numeric_collation = 'ON'
+---
+...
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} --ok
+---
+...
+_ = box.space._collation.index.name:delete{'test'} -- ok
+---
+...
+opts.alternate_handling1 = 'ON'
+---
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+---
+- error: 'Wrong collation options (field 5): unexpected option ''alternate_handling1'''
+...
+opts.alternate_handling1 = nil
+---
+...
+opts.alternate_handling = 'ON'
+---
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+---
+- error: 'Failed to initialize collation: ICU wrong alternate_handling option setting,
+    expected NON_IGNORABLE | SHIFTED.'
+...
+opts.alternate_handling = 'SHIFTED'
+---
+...
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} --ok
+---
+...
+_ = box.space._collation.index.name:delete{'test'} -- ok
+---
+...
+opts.case_first = 'ON'
+---
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+---
+- error: 'Failed to initialize collation: ICU wrong case_first option setting, expected
+    OFF | UPPER_FIRST | LOWER_FIRST.'
+...
+opts.case_first = 'OFF'
+---
+...
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} --ok
+---
+...
+_ = box.space._collation.index.name:delete{'test'} -- ok
+---
+...
+opts.case_level = 'UPPER'
+---
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+---
+- error: 'Failed to initialize collation: ICU wrong case_level option setting, expected
+    ON | OFF.'
+...
+opts.case_level = 'DEFAULT'
+---
+...
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} --ok
+---
+- error: 'Failed to initialize collation: ICU wrong case_level option setting, expected
+    ON | OFF.'
+...
+_ = box.space._collation.index.name:delete{'test'} -- ok
+---
+...
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', setmap{}}
+---
+- [2, 'test', 0, 'ICU', 'ru_RU', {}]
+...
+box.space._collation:select{}
+---
+- - [0, 'unicode', 1, 'ICU', '', {}]
+  - [1, 'unicode_s1', 1, 'ICU', '', {'strength': 'primary'}]
+  - [2, 'test', 0, 'ICU', 'ru_RU', {}]
+...
+test_run:cmd('restart server default')
+box.space._collation:select{}
+---
+- - [0, 'unicode', 1, 'ICU', '', {}]
+  - [1, 'unicode_s1', 1, 'ICU', '', {'strength': 'primary'}]
+  - [2, 'test', 0, 'ICU', 'ru_RU', {}]
+...
+box.space._collation.index.name:delete{'test'}
+---
+- [2, 'test', 0, 'ICU', 'ru_RU', {}]
+...
diff --git a/test/box/ddl.test.lua b/test/box/ddl.test.lua
index 3d6ad008d9..34b71193c0 100644
--- a/test/box/ddl.test.lua
+++ b/test/box/ddl.test.lua
@@ -101,3 +101,86 @@ for i = 1, 2 do fiber.create(function() fiber.yield() space:format(format) ch:pu
 {ch:get(), ch:get(), ch:get()}
 
 space:drop()
+
+-- collation
+function setmap(table) return setmetatable(table, { __serialize = 'map' }) end
+
+box.internal.collation.create('test')
+box.internal.collation.create('test', 'ICU')
+box.internal.collation.create(42, 'ICU', 'ru_RU')
+box.internal.collation.create('test', 42, 'ru_RU')
+box.internal.collation.create('test', 'ICU', 42)
+box.internal.collation.create('test', 'nothing', 'ru_RU')
+box.internal.collation.create('test', 'ICU', 'ru_RU', setmap{}) --ok
+box.internal.collation.create('test', 'ICU', 'ru_RU')
+box.internal.collation.drop('test')
+box.internal.collation.drop('nothing') -- allowed
+box.internal.collation.create('test', 'ICU', 'ru_RU', 42)
+box.internal.collation.create('test', 'ICU', 'ru_RU', 'options')
+box.internal.collation.create('test', 'ICU', 'ru_RU', {ping='pong'})
+box.internal.collation.create('test', 'ICU', 'ru_RU', {french_collation='german'})
+box.internal.collation.create('test', 'ICU', 'ru_RU', {french_collation='on'}) --ok
+box.internal.collation.drop('test') --ok
+box.internal.collation.create('test', 'ICU', 'ru_RU', {strength='supervillian'})
+box.internal.collation.create('test', 'ICU', 'ru_RU', {strength=42})
+box.internal.collation.create('test', 'ICU', 'ru_RU', {strength=2}) --ok
+box.internal.collation.drop('test') --ok
+box.internal.collation.create('test', 'ICU', 'ru_RU', {strength='primary'}) --ok
+box.internal.collation.drop('test') --ok
+
+box.internal.collation.create('test', 'ICU', 'ru_RU')
+box.internal.collation.exists('test')
+
+test_run:cmd('restart server default')
+function setmap(table) return setmetatable(table, { __serialize = 'map' }) end
+
+box.internal.collation.exists('test')
+box.internal.collation.drop('test')
+
+box.space._collation:auto_increment{'test'}
+box.space._collation:auto_increment{'test', 0, 'ICU'}
+box.space._collation:auto_increment{'test', 'ADMIN', 'ICU', 'ru_RU'}
+box.space._collation:auto_increment{42, 0, 'ICU', 'ru_RU'}
+box.space._collation:auto_increment{'test', 0, 42, 'ru_RU'}
+box.space._collation:auto_increment{'test', 0, 'ICU', 42}
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', setmap{}} --ok
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', setmap{}}
+box.space._collation.index.name:delete{'test'} -- ok
+box.space._collation.index.name:delete{'nothing'} -- allowed
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', 42}
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', 'options'}
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', {ping='pong'}}
+opts = {normalization_mode='NORMAL'}
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+opts.normalization_mode = 'OFF'
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} -- ok
+_ = box.space._collation.index.name:delete{'test'} -- ok
+opts.numeric_collation = 'PERL'
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+opts.numeric_collation = 'ON'
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} --ok
+_ = box.space._collation.index.name:delete{'test'} -- ok
+opts.alternate_handling1 = 'ON'
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+opts.alternate_handling1 = nil
+opts.alternate_handling = 'ON'
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+opts.alternate_handling = 'SHIFTED'
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} --ok
+_ = box.space._collation.index.name:delete{'test'} -- ok
+opts.case_first = 'ON'
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+opts.case_first = 'OFF'
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} --ok
+_ = box.space._collation.index.name:delete{'test'} -- ok
+opts.case_level = 'UPPER'
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts}
+opts.case_level = 'DEFAULT'
+_ = box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', opts} --ok
+_ = box.space._collation.index.name:delete{'test'} -- ok
+
+box.space._collation:auto_increment{'test', 0, 'ICU', 'ru_RU', setmap{}}
+box.space._collation:select{}
+test_run:cmd('restart server default')
+box.space._collation:select{}
+box.space._collation.index.name:delete{'test'}
diff --git a/test/box/misc.result b/test/box/misc.result
index f332fc156c..14c4c16f54 100644
--- a/test/box/misc.result
+++ b/test/box/misc.result
@@ -312,6 +312,7 @@ t;
   - 'box.error.FIELD_TYPE : 23'
   - 'box.error.WRONG_SPACE_FORMAT : 141'
   - 'box.error.UNKNOWN_UPDATE_OP : 28'
+  - 'box.error.WRONG_COLLATION_OPTIONS : 151'
   - 'box.error.CURSOR_NO_TRANSACTION : 80'
   - 'box.error.TUPLE_REF_OVERFLOW : 86'
   - 'box.error.ALTER_SEQUENCE : 143'
diff --git a/test/wal_off/alter.result b/test/wal_off/alter.result
index 7ac001ec0b..c48294b3c8 100644
--- a/test/wal_off/alter.result
+++ b/test/wal_off/alter.result
@@ -28,7 +28,7 @@ end;
 ...
 #spaces;
 ---
-- 65517
+- 65515
 ...
 -- cleanup
 for k, v in pairs(spaces) do
diff --git a/test/xlog/upgrade.result b/test/xlog/upgrade.result
index dd08961bc9..d1cc579111 100644
--- a/test/xlog/upgrade.result
+++ b/test/xlog/upgrade.result
@@ -41,6 +41,10 @@ box.space._schema:select()
 box.space._space:select()
 ---
 - - [272, 1, '_schema', 'memtx', 0, {}, [{'type': 'string', 'name': 'key'}]]
+  - [276, 1, '_collation', 'memtx', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {
+        'name': 'name', 'type': 'string'}, {'name': 'owner', 'type': 'unsigned'},
+      {'name': 'type', 'type': 'string'}, {'name': 'locale', 'type': 'string'}, {
+        'name': 'opts', 'type': 'map'}]]
   - [280, 1, '_space', 'memtx', 0, {}, [{'name': 'id', 'type': 'unsigned'}, {'name': 'owner',
         'type': 'unsigned'}, {'name': 'name', 'type': 'string'}, {'name': 'engine',
         'type': 'string'}, {'name': 'field_count', 'type': 'unsigned'}, {'name': 'flags',
@@ -93,6 +97,8 @@ box.space._space:select()
 box.space._index:select()
 ---
 - - [272, 0, 'primary', 'tree', {'unique': true}, [[0, 'string']]]
+  - [276, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
+  - [276, 1, 'name', 'tree', {'unique': true}, [[1, 'string']]]
   - [280, 0, 'primary', 'tree', {'unique': true}, [[0, 'unsigned']]]
   - [280, 1, 'owner', 'tree', {'unique': false}, [[1, 'unsigned']]]
   - [280, 2, 'name', 'tree', {'unique': true}, [[2, 'string']]]
@@ -152,12 +158,18 @@ box.space._func:select()
   - [2, 4, 'somefunc', 1, 'LUA']
   - [3, 1, 'someotherfunc', 0, 'LUA']
 ...
+box.space._collation:select()
+---
+- - [0, 'unicode', 1, 'ICU', '', {}]
+  - [1, 'unicode_s1', 1, 'ICU', '', {'strength': 'primary'}]
+...
 box.space._priv:select()
 ---
 - - [1, 0, 'role', 2, 4]
   - [1, 1, 'universe', 0, 7]
   - [1, 2, 'function', 1, 4]
   - [1, 2, 'function', 2, 4]
+  - [1, 2, 'space', 276, 2]
   - [1, 2, 'space', 281, 1]
   - [1, 2, 'space', 289, 1]
   - [1, 2, 'space', 297, 1]
diff --git a/test/xlog/upgrade.test.lua b/test/xlog/upgrade.test.lua
index c89e2cc0f7..0be2d34e95 100644
--- a/test/xlog/upgrade.test.lua
+++ b/test/xlog/upgrade.test.lua
@@ -25,6 +25,7 @@ box.space._space:select()
 box.space._index:select()
 box.space._user:select()
 box.space._func:select()
+box.space._collation:select()
 box.space._priv:select()
 
 box.space._vspace ~= nil
-- 
GitLab