From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 423086BD04; Sat, 10 Apr 2021 00:08:53 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 423086BD04 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618002533; bh=q7Ugl2BjFT9/DpohT1RMmzEDbT7gTooZkQqY9dYoBiI=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=CRFrn0yjxphEo8ipJHzSsM8PJkdtRmKtEHopdm94dG+LrdjmwQxmiG3fosSGm6XwO tMLUTTJXqdfsEP8FxEY6VT1Vt+ybzG7cfG/Rsyrd0zQcfhI1NV9uHlJAQY7j17w78B SxxGehPk475JwuEE+N59vi3382EKrElLxTDV5Ews= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 2BB396FFA3 for ; Sat, 10 Apr 2021 00:08:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2BB396FFA3 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lUyMW-0003nF-Cf; Sat, 10 Apr 2021 00:08:20 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Sat, 10 Apr 2021 00:08:20 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480D608FE24BC85426BB1B55F651FED8C70182A05F53808504059A1D0520323A711EAEC0C8916D146C4ED44218AE81387A69AB3ECB6A70D5427 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE797F4D2EDC29AFAF7EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B28E90C11C329EF18638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B259B54CCA5A01DA87DCF67E6126091DF011D9A310A4A5EBA7D2E47CDBA5A96583C09775C1D3CA48CFE478A468B35FE767117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE73AFA331E307B52169FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735C6EABA9B74D0DA47B5C8C57E37DE458BEDA766A37F9254B7 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831E46709FC235F5DF6285D1CF7EB47FA2E X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CD0035DD76F8A8A4F4017CA4E575310B5560286AB0EB49DDD9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3433E9BC74ABA5769FB7AD7ED54AABDA2C6EBD66E75DA370F6B1B2F414F56795E898104FCB3016CF311D7E09C32AA3244C967E0ACDF3D9F937DC89F9E02901BE3E1DD47778AE04E04DFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojqcJA+pXcDulPoHmAnp0Zqw== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638227246186403A47EB4182876BEE0E87F8383D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v5 47/52] sql: introduce mem_get_double() X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mergen Imeev via Tarantool-patches Reply-To: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch introduces mem_get_double(). This function is used to receive double value from MEM. If value of MEM is not double, it is converted to double if possible. MEM is not changed. Part of #5818 --- src/box/sql/func.c | 17 +++++++------ src/box/sql/mem.c | 57 +++++++++++++++++-------------------------- src/box/sql/mem.h | 12 ++++++--- src/box/sql/printf.c | 4 ++- src/box/sql/sqlInt.h | 3 --- src/box/sql/vdbeapi.c | 6 ----- 6 files changed, 44 insertions(+), 55 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index f2254fb29..aeab06e2a 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -229,12 +229,13 @@ absFunc(sql_context * context, int argc, sql_value ** argv) return; } default:{ - /* Because sql_value_double() returns 0.0 if the argument is not - * something that can be converted into a number, we have: - * IMP: R-01992-00519 Abs(X) returns 0.0 if X is a string or blob + /* + * Abs(X) returns 0.0 if X is a string or blob * that cannot be converted to a numeric value. */ - double rVal = sql_value_double(argv[0]); + double rVal; + if (mem_get_double(argv[0], &rVal) != 0) + rVal = 0; if (rVal < 0) rVal = -rVal; sql_result_double(context, rVal); @@ -549,7 +550,7 @@ roundFunc(sql_context * context, int argc, sql_value ** argv) context->is_aborted = true; return; } - r = sql_value_double(argv[0]); + mem_get_double(argv[0], &r); /* If Y==0 and X will fit in a 64-bit int, * handle the rounding directly, * otherwise use printf. @@ -1056,7 +1057,7 @@ quoteFunc(sql_context * context, int argc, sql_value ** argv) case MP_DOUBLE:{ double r1, r2; char zBuf[50]; - r1 = sql_value_double(argv[0]); + mem_get_double(argv[0], &r1); sql_snprintf(sizeof(zBuf), zBuf, "%!.15g", r1); sqlAtoF(zBuf, &r2, 20); if (r1 != r2) { @@ -1675,7 +1676,9 @@ sum_step(struct sql_context *context, int argc, sql_value **argv) p->overflow = 1; } } else { - p->rSum += sql_value_double(argv[0]); + double d; + mem_get_double(argv[0], &d); + p->rSum += d; p->approx = 1; } } diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 136da9d5d..930c44bec 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -1290,6 +1290,29 @@ mem_get_uint(const struct Mem *mem, uint64_t *u) return -1; } +int +mem_get_double(const struct Mem *mem, double *d) +{ + if ((mem->flags & MEM_Real) != 0) { + *d = mem->u.r; + return 0; + } + if ((mem->flags & MEM_Int) != 0) { + *d = (double)mem->u.i; + return 0; + } + if ((mem->flags & MEM_UInt) != 0) { + *d = (double)mem->u.u; + return 0; + } + if ((mem->flags & MEM_Str) != 0) { + if (sqlAtoF(mem->z, d, mem->n) == 0) + return -1; + return 0; + } + return -1; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -2464,32 +2487,6 @@ mem_value_bool(const struct Mem *mem, bool *b) return -1; } -/* - * Return the best representation of pMem that we can get into a - * double. If pMem is already a double or an integer, return its - * value. If it is a string or blob, try to convert it to a double. - * If it is a NULL, return 0.0. - */ -int -sqlVdbeRealValue(Mem * pMem, double *v) -{ - assert(EIGHT_BYTE_ALIGNMENT(pMem)); - if (pMem->flags & MEM_Real) { - *v = pMem->u.r; - return 0; - } else if (pMem->flags & MEM_Int) { - *v = (double)pMem->u.i; - return 0; - } else if ((pMem->flags & MEM_UInt) != 0) { - *v = (double)pMem->u.u; - return 0; - } else if (pMem->flags & MEM_Str) { - if (sqlAtoF(pMem->z, v, pMem->n)) - return 0; - } - return -1; -} - /**************************** sql_value_ ****************************** * The following routines extract information from a Mem or sql_value * structure. @@ -2516,14 +2513,6 @@ sql_value_bytes(sql_value * pVal) return sqlValueBytes(pVal); } -double -sql_value_double(sql_value * pVal) -{ - double v = 0.0; - sqlVdbeRealValue((Mem *) pVal, &v); - return v; -} - bool sql_value_boolean(sql_value *val) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 87aee0e9b..34b0b3f13 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -552,6 +552,14 @@ mem_get_int(const struct Mem *mem, int64_t *i, bool *is_neg); int mem_get_uint(const struct Mem *mem, uint64_t *u); +/** + * Return value for MEM of DOUBLE type. For MEM of all other types convert + * value of the MEM to DOUBLE if possible and return converted value. Original + * MEM is not changed. + */ +int +mem_get_double(const struct Mem *mem, double *d); + /** * Simple type to str convertor. It is used to simplify * error reporting. @@ -606,16 +614,12 @@ releaseMemArray(Mem * p, int N); int mem_value_bool(const struct Mem *mem, bool *b); -int sqlVdbeRealValue(struct Mem *, double *); const void * sql_value_blob(struct Mem *); int sql_value_bytes(struct Mem *); -double -sql_value_double(struct Mem *); - bool sql_value_boolean(struct Mem *val); diff --git a/src/box/sql/printf.c b/src/box/sql/printf.c index 09da39e81..605478820 100644 --- a/src/box/sql/printf.c +++ b/src/box/sql/printf.c @@ -155,7 +155,9 @@ getDoubleArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0.0; - return sql_value_double(p->apArg[p->nUsed++]); + double d; + mem_get_double(p->apArg[p->nUsed++], &d); + return d; } static char * diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 6ead9b261..3f6fa1722 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -442,9 +442,6 @@ sql_column_bytes(sql_stmt *, int iCol); int sql_column_bytes16(sql_stmt *, int iCol); -double -sql_column_double(sql_stmt *, int iCol); - bool sql_column_boolean(struct sql_stmt *stmt, int column); diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 85bbbc420..b1a9aed6e 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -484,12 +484,6 @@ sql_column_bytes(sql_stmt * pStmt, int i) return sql_value_bytes(columnMem(pStmt, i)); } -double -sql_column_double(sql_stmt * pStmt, int i) -{ - return sql_value_double(columnMem(pStmt, i)); -} - bool sql_column_boolean(struct sql_stmt *stmt, int i) { -- 2.25.1