From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@freelists.org, imeevma@tarantool.org Subject: [tarantool-patches] Re: [PATCH v1 20/28] sql: remove SQL_NOMEM errcode Date: Fri, 14 Jun 2019 00:24:49 +0200 [thread overview] Message-ID: <1868555d-d6d3-ebec-0e56-b23a1f9df958@tarantool.org> (raw) In-Reply-To: <10d40ffa969dcc9a3f49fd0b4dbecefe9d7fdbc7.1560174553.git.imeevma@gmail.com> Thanks for the patch! Consider my review fixes below and on the branch in a separate commit. ====================================================== diff --git a/src/box/sql/fault.c b/src/box/sql/fault.c index 0e0978d20..544515a4b 100644 --- a/src/box/sql/fault.c +++ b/src/box/sql/fault.c @@ -37,7 +37,7 @@ * and returns 0). * * Most malloc failures are non-benign. After they occur, sql - * abandons the current operation and returns an -1 + * abandons the current operation and returns an error * to the user. However, sometimes a fault is not necessarily * fatal. For example, if a malloc fails while resizing a hash table, this * is completely recoverable simply by not carrying out the resize. The diff --git a/src/box/sql/main.c b/src/box/sql/main.c index 34fd8c876..2d39323fa 100644 --- a/src/box/sql/main.c +++ b/src/box/sql/main.c @@ -494,7 +494,7 @@ sql_init_db(sql **out_db) { sql *db; - if (sql_initialize()) + if (sql_initialize() != 0) return -1; /* Allocate the sql data structure */ diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 32f8b43e9..f5268d40f 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -689,43 +689,37 @@ sql_column_blob(sql_stmt * pStmt, int i) int sql_column_bytes(sql_stmt * pStmt, int i) { - int val = sql_value_bytes(columnMem(pStmt, i)); - return val; + return sql_value_bytes(columnMem(pStmt, i)); } double sql_column_double(sql_stmt * pStmt, int i) { - double val = sql_value_double(columnMem(pStmt, i)); - return val; + return sql_value_double(columnMem(pStmt, i)); } int sql_column_int(sql_stmt * pStmt, int i) { - int val = sql_value_int(columnMem(pStmt, i)); - return val; + return sql_value_int(columnMem(pStmt, i)); } bool sql_column_boolean(struct sql_stmt *stmt, int i) { - bool val = sql_value_boolean(columnMem(stmt, i)); - return val; + return sql_value_boolean(columnMem(stmt, i)); } sql_int64 sql_column_int64(sql_stmt * pStmt, int i) { - sql_int64 val = sql_value_int64(columnMem(pStmt, i)); - return val; + return sql_value_int64(columnMem(pStmt, i)); } const unsigned char * sql_column_text(sql_stmt * pStmt, int i) { - const unsigned char *val = sql_value_text(columnMem(pStmt, i)); - return val; + return sql_value_text(columnMem(pStmt, i)); } sql_value * @@ -742,8 +736,7 @@ sql_column_value(sql_stmt * pStmt, int i) enum mp_type sql_column_type(sql_stmt * pStmt, int i) { - enum mp_type type = sql_value_type(columnMem(pStmt, i)); - return type; + return sql_value_type(columnMem(pStmt, i)); } enum sql_subtype
next prev parent reply other threads:[~2019-06-13 22:24 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-10 13:56 [tarantool-patches] [PATCH v1 00/28] sql: Remove SQL error system imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 01/28] sql: remove field zErrMsg from struct Vdbe imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 02/28] sql: remove field pErr from struct sql imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 03/28] sql: remove field errCode " imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 04/28] sql: remove sqlError() and remove sqlErrorWithMsg() imeevma 2019-06-13 22:25 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:45 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 05/28] sql: remove unused functions of SQL error system imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 06/28] sql: disable lookaside system imeevma 2019-06-13 22:25 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:47 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 07/28] sql: remove SQL_OK error/status code imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:52 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 08/28] sql: remove SQL_PERM, SQL_WARNING, SQL_ABORT errcodes imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 09/28] sql: remove SQL_CANTOPEN errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 10/28] sql: remove SQL_NOTFOUND error/status code imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 11/28] sql: remove SQL_LOCKED errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 12/28] sql: remove SQL_FULL errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 13/28] sql: remove SQL_MISUSE errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 14/28] sql: remove SQL_RANGE errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 15/28] sql: remove SQL_SCHEMA errcode imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:55 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 16/28] sql: remove SQL_TOOBIG errcode imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 9:57 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 17/28] sql: remove SQL_BUSY errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 18/28] sql: remove SQL_CONSTRAINT errcode imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 10:00 ` Mergen Imeev 2019-06-18 20:40 ` Vladislav Shpilevoy 2019-06-19 8:02 ` Mergen Imeev 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 19/28] sql: remove SQL_ERROR errcode imeevma 2019-06-10 13:56 ` [tarantool-patches] [PATCH v1 20/28] sql: remove SQL_NOMEM errcode imeevma 2019-06-13 22:24 ` Vladislav Shpilevoy [this message] 2019-06-15 10:01 ` [tarantool-patches] " Mergen Imeev 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 21/28] sql: remove SQL_IOERR errcode imeevma 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 22/28] sql: remove SQL_TARANTOOL_ERROR errcode imeevma 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 23/28] sql: remove field errMask from struct sql imeevma 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 24/28] sql: replace rc by is_aborted in struct VDBE imeevma 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 25/28] sql: remove sql_log() imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 10:02 ` Mergen Imeev 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 26/28] sql: cleanup of legacy memory management system imeevma 2019-06-13 22:24 ` [tarantool-patches] " Vladislav Shpilevoy 2019-06-15 10:04 ` Mergen Imeev 2019-06-18 20:40 ` Vladislav Shpilevoy 2019-06-19 8:04 ` Mergen Imeev 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 27/28] sql: make function return void instead of int imeevma 2019-06-10 13:57 ` [tarantool-patches] [PATCH v1 28/28] sql: remove function sqlApiExit() imeevma 2019-06-11 10:00 ` [tarantool-patches] Re: [PATCH v1 00/28] sql: Remove SQL error system Imeev Mergen 2019-06-13 22:24 ` Vladislav Shpilevoy 2019-06-15 10:08 ` Mergen Imeev 2019-06-19 19:11 ` Vladislav Shpilevoy 2019-06-20 16:08 ` Kirill Yukhin
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=1868555d-d6d3-ebec-0e56-b23a1f9df958@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=imeevma@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='[tarantool-patches] Re: [PATCH v1 20/28] sql: remove SQL_NOMEM errcode' \ /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