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 AA4D323A99 for ; Thu, 10 May 2018 17:06:34 -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 SF2FCWTn0WeC for ; Thu, 10 May 2018 17:06:34 -0400 (EDT) Received: from smtp18.mail.ru (smtp18.mail.ru [94.100.176.155]) (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 22B03235ED for ; Thu, 10 May 2018 17:06:33 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v2 3/5] Merge box_error, stat and collations into core library References: <25b2b52bc741e5c6587a144e000860ef900edab2.1524955403.git.v.shpilevoy@tarantool.org> <20180508131850.GA13694@atlas> From: Vladislav Shpilevoy Message-ID: <06b2258c-acd8-bb88-251b-9331d58dc09f@tarantool.org> Date: Fri, 11 May 2018 00:06:31 +0300 MIME-Version: 1.0 In-Reply-To: <20180508131850.GA13694@atlas> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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, Konstantin Osipov Cc: alexander.turenko@tarantool.org Hello. Thanks for review! On 08/05/2018 16:18, Konstantin Osipov wrote: > * Vladislav Shpilevoy [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%) >>