Tarantool development patches archive
 help / color / mirror / Atom feed
From: Kirill Shcherbatov <kshcherbatov@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH v1 1/2] sql: introduce pragma sql_default_engine
Date: Wed, 27 Jun 2018 18:59:59 +0300	[thread overview]
Message-ID: <ac677999-5a62-cc34-c7d6-8d71ca692460@tarantool.org> (raw)
In-Reply-To: <f4a07e3a-adc4-9971-97cd-021f071bf494@tarantool.org>

> 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.

  reply	other threads:[~2018-06-27 16:00 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-20 17:06 [tarantool-patches] [PATCH v1 0/2] sql: default engine pragma Kirill Shcherbatov
2018-06-20 17:06 ` [tarantool-patches] [PATCH v1 1/2] sql: introduce pragma sql_default_engine Kirill Shcherbatov
2018-06-22 20:04   ` [tarantool-patches] " Vladislav Shpilevoy
2018-06-26 12:22     ` Kirill Shcherbatov
2018-06-26 13:34       ` Vladislav Shpilevoy
2018-06-26 17:09         ` Kirill Shcherbatov
2018-06-27 12:32           ` Vladislav Shpilevoy
2018-06-27 15:59             ` Kirill Shcherbatov [this message]
2018-06-20 17:06 ` [tarantool-patches] [PATCH v1 2/2] sql: enable multi-engine tests for SQL Kirill Shcherbatov
2018-06-22 20:04   ` [tarantool-patches] " Vladislav Shpilevoy
2018-06-26 12:22     ` Kirill Shcherbatov
2018-06-26 13:34       ` Vladislav Shpilevoy
2018-06-26 17:09         ` Kirill Shcherbatov
2018-06-26 12:23 ` [tarantool-patches] [PATCH v1 2/3] sql: fix SQL Count for vinyl engine Kirill Shcherbatov
2018-06-28 15:35 ` [tarantool-patches] Re: [PATCH v1 0/2] sql: default engine pragma Vladislav Shpilevoy
2018-06-28 16:00   ` n.pettik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ac677999-5a62-cc34-c7d6-8d71ca692460@tarantool.org \
    --to=kshcherbatov@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='[tarantool-patches] Re: [PATCH v1 1/2] sql: introduce pragma sql_default_engine' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox