From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 681B12226F for ; Sat, 28 Apr 2018 18:45:18 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bwkgYeoqbpvf for ; Sat, 28 Apr 2018 18:45:18 -0400 (EDT) Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [217.69.128.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id B3FC32223B for ; Sat, 28 Apr 2018 18:45:17 -0400 (EDT) From: Vladislav Shpilevoy Subject: [tarantool-patches] [PATCH v2 0/5] Expose ICU into Lua Date: Sun, 29 Apr 2018 01:45:08 +0300 Message-Id: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: alexander.turenko@tarantool.org Branch: http://github.com/tarantool/tarantool/tree/gh-3290-lua-icu Issue: https://github.com/tarantool/tarantool/issues/3290 Issue: https://github.com/tarantool/tarantool/issues/3385 Issue: https://github.com/tarantool/tarantool/issues/3081 Lua can not work with unicode - in Lua it is enterpreted as a binary. On such string built-in upper/lower functions, '#' (length) and comparison operators do not work. But Tarantool links with ICU and has comparators with collations, that can solve the problems. But there is another issue - string methods must be available before box.cfg, so the ICU and collations must be built out of main 'box' static library. To do this the collation related files are moved from 'box' into 'core' library. A second issue is that when box.cfg is called, it inserts built-in collations into _collation space, and these insertions can conflict with built-in collations, created before box.cfg. Delete from _collation can break the collations cache as well. The patchset solves this by checking collations deletions and insertions, and if they tries to operate on built-in collations, then they are ignored - a user sees changes in _collation, but the cache is unchanged. Vladislav Shpilevoy (5): alter: fix assertion in collations alter Move struct on_access_denied_ctx into error.h Merge box_error, stat and collations into core library Always store built-in collations in the cache lua: introduce utf8 built-in globaly visible module cmake/module.cmake | 4 +- src/CMakeLists.txt | 17 +- src/box/CMakeLists.txt | 18 +- src/box/alter.cc | 129 +++++++------ src/box/lua/call.c | 2 +- src/box/lua/error.cc | 2 +- src/box/lua/net_box.c | 2 +- src/box/lua/tuple.c | 2 +- src/box/lua/xlog.c | 2 +- src/box/schema.h | 12 -- src/{box => }/coll.c | 0 src/{box => }/coll.h | 0 src/{box => }/coll_cache.c | 34 ++++ src/{box => }/coll_cache.h | 0 src/{box => }/coll_def.c | 7 + src/{box => }/coll_def.h | 13 ++ src/{box => }/errcode.c | 0 src/{box => }/errcode.h | 0 src/{box => }/error.cc | 1 - src/{box => }/error.h | 12 ++ src/lua/init.c | 3 + src/lua/utf8.c | 451 +++++++++++++++++++++++++++++++++++++++++++ src/lua/utf8.h | 42 ++++ src/main.cc | 2 +- src/{box => }/opt_def.c | 0 src/{box => }/opt_def.h | 0 test/app-tap/string.test.lua | 160 ++++++++++++++- test/box/ddl.result | 25 +++ test/box/ddl.test.lua | 11 ++ test/unit/CMakeLists.txt | 8 +- test/unit/coll.cpp | 3 +- 31 files changed, 862 insertions(+), 100 deletions(-) rename src/{box => }/coll.c (100%) rename src/{box => }/coll.h (100%) rename src/{box => }/coll_cache.c (75%) rename src/{box => }/coll_cache.h (100%) rename src/{box => }/coll_def.c (96%) rename src/{box => }/coll_def.h (94%) rename src/{box => }/errcode.c (100%) rename src/{box => }/errcode.h (100%) rename src/{box => }/error.cc (99%) rename src/{box => }/error.h (95%) create mode 100644 src/lua/utf8.c create mode 100644 src/lua/utf8.h rename src/{box => }/opt_def.c (100%) rename src/{box => }/opt_def.h (100%) -- 2.15.1 (Apple Git-101)