[tarantool-patches] Re: [PATCH v2 3/5] Merge box_error, stat and collations into core library
Vladislav Shpilevoy
v.shpilevoy at tarantool.org
Fri May 11 00:06:31 MSK 2018
Hello. Thanks for review!
On 08/05/2018 16:18, Konstantin Osipov wrote:
> * Vladislav Shpilevoy <v.shpilevoy at tarantool.org> [18/04/29 01:47]:
>> The goal is to expose collations into Lua with no dependencies on
>> box library. But collations merge into core requires box_error
>> and stat libraries too.
>
> Please remove coll_cache dependency on box_error and stat, rather
> than move box_error/box_stat over. If you need nice errors in box
> for operations with collation cache, you can add wrappers in the
> box (or you can raise errors defined in src/ as is already the
> case for socket and I/O errors).
Fixed on the branch.
>
>> ---
>> cmake/module.cmake | 4 ++--
>> src/CMakeLists.txt | 14 ++++++++++----
>> src/box/CMakeLists.txt | 18 +++++-------------
>> 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 => }/coll.c | 0
>> src/{box => }/coll.h | 0
>> src/{box => }/coll_cache.c | 0
>> src/{box => }/coll_cache.h | 0
>> src/{box => }/coll_def.c | 0
>> src/{box => }/coll_def.h | 0
>> src/{box => }/errcode.c | 0
>> src/{box => }/errcode.h | 0
>> src/{box => }/error.cc | 0
>> src/{box => }/error.h | 0
>> src/main.cc | 2 +-
>> src/{box => }/opt_def.c | 0
>> src/{box => }/opt_def.h | 0
>> test/unit/CMakeLists.txt | 8 ++++----
>> test/unit/coll.cpp | 3 +--
>> 23 files changed, 28 insertions(+), 31 deletions(-)
>> rename src/{box => }/coll.c (100%)
>> rename src/{box => }/coll.h (100%)
>> rename src/{box => }/coll_cache.c (100%)
>> rename src/{box => }/coll_cache.h (100%)
>> rename src/{box => }/coll_def.c (100%)
>> rename src/{box => }/coll_def.h (100%)
>> rename src/{box => }/errcode.c (100%)
>> rename src/{box => }/errcode.h (100%)
>> rename src/{box => }/error.cc (100%)
>> rename src/{box => }/error.h (100%)
>> rename src/{box => }/opt_def.c (100%)
>> rename src/{box => }/opt_def.h (100%)
>>
More information about the Tarantool-patches
mailing list