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 0595830C43 for ; Thu, 13 Jun 2019 18:24: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 AC2QJVeL2KS2 for ; Thu, 13 Jun 2019 18:24:33 -0400 (EDT) Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [94.100.177.105]) (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 AF80730C46 for ; Thu, 13 Jun 2019 18:24:33 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v1 20/28] sql: remove SQL_NOMEM errcode References: <10d40ffa969dcc9a3f49fd0b4dbecefe9d7fdbc7.1560174553.git.imeevma@gmail.com> From: Vladislav Shpilevoy Message-ID: <1868555d-d6d3-ebec-0e56-b23a1f9df958@tarantool.org> Date: Fri, 14 Jun 2019 00:24:49 +0200 MIME-Version: 1.0 In-Reply-To: <10d40ffa969dcc9a3f49fd0b4dbecefe9d7fdbc7.1560174553.git.imeevma@gmail.com> 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, imeevma@tarantool.org 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