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 25A0E226CE for ; Wed, 27 Jun 2018 12:00:01 -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 IFyewNFvx97k for ; Wed, 27 Jun 2018 12:00:01 -0400 (EDT) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 D8BD6226C8 for ; Wed, 27 Jun 2018 12:00:00 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v1 1/2] sql: introduce pragma sql_default_engine References: <869f48ed-cf99-7e0a-f89b-8431dee2f72c@tarantool.org> <485804b9-8659-17a1-aaa9-cebc1d0e2893@tarantool.org> <9085644e-030f-b1bc-6928-4819bc5ffed7@tarantool.org> From: Kirill Shcherbatov Message-ID: Date: Wed, 27 Jun 2018 18:59:59 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 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 Cc: Vladislav Shpilevoy > Hello. Thanks for the fixes! Thank you for review, > Please, put _strs here as extern and declare it in schema_def.c > like it is done for other enum + _strs pairs (enum + extern strs in > a header and declaration in source). diff --git a/src/box/schema_def.c b/src/box/schema_def.c index 97c074a..cbfad47 100644 --- a/src/box/schema_def.c +++ b/src/box/schema_def.c @@ -30,6 +30,11 @@ */ #include "schema_def.h" +const char *sql_storage_engine_strs[] = { + [SQL_STORAGE_ENGINE_MEMTX] = "memtx", + [SQL_STORAGE_ENGINE_VINYL] = "vinyl", +}; + static const char *object_type_strs[] = { /* [SC_UKNNOWN] = */ "unknown", /* [SC_UNIVERSE] = */ "universe", diff --git a/src/box/schema_def.h b/src/box/schema_def.h index e6a7206..5ab4bb0 100644 --- a/src/box/schema_def.h +++ b/src/box/schema_def.h @@ -250,6 +250,8 @@ enum sql_storage_engine { sql_storage_engine_MAX = 2 }; +extern const char *sql_storage_engine_strs[]; > On the branch I got these errors: This is non-related problem of trigger's branch (that is my HEAD). believe, I've already fixed it there. Rebased.