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 6D6466EC61; Fri, 9 Apr 2021 23:55:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6D6466EC61 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618001743; bh=cucyeWpwBQFuNuFGPhGc+pReVDWH7u5RkVD1hpm5RGw=; 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=NJCx7rkXR2upQqmKnHI77E44QjmPdaM0WNa3qljjz3/21xmHQfihlWBKSNBpQRT+Y 5Nds+g+unsqs/GLYmhaRiCABzUoZ9jU7TgB5EMV+E5wda1w6NW4Cho8poMhdZpoaOH vFv77g8q64JLcjBoShAqC6eT3y6uTqWwZFD3kQBI= 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 0CB056C185 for ; Fri, 9 Apr 2021 23:53:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0CB056C185 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lUy8Q-0006qX-7k; Fri, 09 Apr 2021 23:53:46 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 9 Apr 2021 23:53:46 +0300 Message-Id: <921ae5a9b533bd897100dc2e7923347638719b13.1618000037.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480EBD5CA77A668ECB87DA2124B0A8E6609182A05F538085040BB9165BFBED746FBD0D451CDE715C5041A688FF6DA65821AEA03ECBB7DC9BF6C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70186A8DAAA7CBDB1EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B323FE155BC226618638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B211341B8DC43437BA20B80088DC2D8B42C247B71DA8F7637ED2E47CDBA5A96583C09775C1D3CA48CF17B107DEF921CE79117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE767883B903EA3BAEA9FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735E4A630A5B664A4FFC4224003CC83647689D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C9783113105DDC94723787B139F1DD504E1C03 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CD0035DD76F8A8A4F83C9088D2E74E3876AD2C464500B67089C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D95739AEDB3821B4A27A2D1F0E69B60B3647B8BEBA65CDCEAE3C23270C018965A970F0FCA0A0A45F1D7E09C32AA3244C3ED7F993048E44B870ADCDF59225D117259227199D06760AFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojqcJA+pXcDulG5/EfYIojaQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822F0FB47A5F865FEA3F52262E9B849CC5183D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v5 45/52] sql: introduce mem_get_int() 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" Thank you for the review! My answers and new patch below. On 30.03.2021 02:08, Vladislav Shpilevoy wrote: > Thanks for the patch! > >> diff --git a/src/box/sql/func.c b/src/box/sql/func.c >> index b644c39d8..0fa0f6ac7 100644 >> --- a/src/box/sql/func.c >> +++ b/src/box/sql/func.c >> @@ -1532,10 +1543,11 @@ hexFunc(sql_context * context, int argc, sql_value ** argv) >> static void >> zeroblobFunc(sql_context * context, int argc, sql_value ** argv) >> { >> - i64 n; >> + int64_t n; >> assert(argc == 1); >> UNUSED_PARAMETER(argc); >> - n = sql_value_int64(argv[0]); >> + bool unused; >> + mem_get_integer(argv[0], &n, &unused); > > The flag is never used anywhere except one assertion where you can > check the integer value instead. I think you can drop this out > parameter. In future we could add mem_get_int_with_sign() or something > like that if necessary. I think the problem here mostly because most of built-in functions and bitwise operations cannot work with our INTEGER. They can only work with int64. I believe, if we fix this problem, there will be no problems with having this flag. New patch: commit 921ae5a9b533bd897100dc2e7923347638719b13 Author: Mergen Imeev Date: Wed Mar 17 13:20:37 2021 +0300 sql: introduce mem_get_int() This patch introduces mem_get_int() function. This function is used to receive integer value from MEM. If value of MEM is not integer, it is converted to integer if possible. MEM is not changed. Part of #5818 diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 0282aec74..701e77d49 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -205,7 +205,9 @@ absFunc(sql_context * context, int argc, sql_value ** argv) break; } case MP_INT: { - int64_t value = sql_value_int64(argv[0]); + bool unused; + int64_t value; + mem_get_int(argv[0], &value, &unused); assert(value < 0); sql_result_uint(context, -value); break; @@ -421,7 +423,7 @@ substrFunc(sql_context * context, int argc, sql_value ** argv) const unsigned char *z2; int len; int p0type; - i64 p1, p2; + int64_t p1, p2; int negP2 = 0; if (argc != 2 && argc != 3) { @@ -433,7 +435,8 @@ substrFunc(sql_context * context, int argc, sql_value ** argv) if (mem_is_null(argv[1]) || (argc == 3 && mem_is_null(argv[2]))) return; p0type = sql_value_type(argv[0]); - p1 = sql_value_int(argv[1]); + bool unused; + mem_get_int(argv[1], &p1, &unused); if (p0type == MP_BIN) { len = sql_value_bytes(argv[0]); z = sql_value_blob(argv[0]); @@ -449,7 +452,7 @@ substrFunc(sql_context * context, int argc, sql_value ** argv) len = sql_utf8_char_count(z, sql_value_bytes(argv[0])); } if (argc == 3) { - p2 = sql_value_int(argv[2]); + mem_get_int(argv[2], &p2, &unused); if (p2 < 0) { p2 = -p2; negP2 = 1; @@ -520,7 +523,7 @@ substrFunc(sql_context * context, int argc, sql_value ** argv) static void roundFunc(sql_context * context, int argc, sql_value ** argv) { - int n = 0; + int64_t n = 0; double r; if (argc != 1 && argc != 2) { diag_set(ClientError, ER_FUNC_WRONG_ARG_COUNT, "ROUND", @@ -531,7 +534,8 @@ roundFunc(sql_context * context, int argc, sql_value ** argv) if (argc == 2) { if (mem_is_null(argv[1])) return; - n = sql_value_int(argv[1]); + bool unused; + mem_get_int(argv[1], &n, &unused); if (n < 0) n = 0; } @@ -674,7 +678,7 @@ randomFunc(sql_context * context, int NotUsed, sql_value ** NotUsed2) static void randomBlob(sql_context * context, int argc, sql_value ** argv) { - int n; + int64_t n; unsigned char *p; assert(argc == 1); UNUSED_PARAMETER(argc); @@ -684,7 +688,8 @@ randomBlob(sql_context * context, int argc, sql_value ** argv) context->is_aborted = true; return; } - n = sql_value_int(argv[0]); + bool unused; + mem_get_int(argv[0], &n, &unused); if (n < 1) return; p = contextMalloc(context, n); @@ -1225,10 +1230,11 @@ hexFunc(sql_context * context, int argc, sql_value ** argv) static void zeroblobFunc(sql_context * context, int argc, sql_value ** argv) { - i64 n; + int64_t n; assert(argc == 1); UNUSED_PARAMETER(argc); - n = sql_value_int64(argv[0]); + bool unused; + mem_get_int(argv[0], &n, &unused); if (n < 0) n = 0; if (sql_result_zeroblob64(context, n) != 0) { @@ -1472,9 +1478,9 @@ trim_func_two_args(struct sql_context *context, sql_value *arg1, int input_str_sz = sql_value_bytes(arg2); if (sql_value_type(arg1) == MP_INT || sql_value_type(arg1) == MP_UINT) { uint8_t len_one = 1; - trim_procedure(context, sql_value_int(arg1), - (const unsigned char *) " ", &len_one, 1, - input_str, input_str_sz); + uint64_t n = sql_value_uint64(arg1); + trim_procedure(context, n, (const unsigned char *) " ", + &len_one, 1, input_str, input_str_sz); } else if ((trim_set = sql_value_text(arg1)) != NULL) { int trim_set_sz = sql_value_bytes(arg1); uint8_t *char_len; @@ -1512,7 +1518,8 @@ trim_func_three_args(struct sql_context *context, sql_value *arg1, &char_len); if (char_cnt == -1) return; - trim_procedure(context, sql_value_int(arg1), trim_set, char_len, + uint64_t n = sql_value_uint64(arg1); + trim_procedure(context, n, trim_set, char_len, char_cnt, input_str, input_str_sz); sql_free(char_len); } @@ -1651,7 +1658,9 @@ sum_step(struct sql_context *context, int argc, sql_value **argv) } p->cnt++; if (type == MP_INT || type == MP_UINT) { - int64_t v = sql_value_int64(argv[0]); + bool unused; + int64_t v; + mem_get_int(argv[0], &v, &unused); if (type == MP_INT) p->rSum += v; else diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 64c183411..259bb7d2c 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -1231,6 +1231,38 @@ mem_cast_implicit_old(struct Mem *mem, enum field_type type) return -1; } +int +mem_get_int(const struct Mem *mem, int64_t *i, bool *is_neg) +{ + if ((mem->flags & MEM_Int) != 0) { + *i = mem->u.i; + *is_neg = true; + return 0; + } + if ((mem->flags & MEM_UInt) != 0) { + *i = mem->u.i; + *is_neg = false; + return 0; + } + if ((mem->flags & (MEM_Str | MEM_Blob)) != 0) + return sql_atoi64(mem->z, i, is_neg, mem->n); + if ((mem->flags & MEM_Real) != 0) { + double d = mem->u.r; + if (d < 0 && d >= (double)INT64_MIN) { + *i = (int64_t)d; + *is_neg = true; + return 0; + } + if (d >= 0 && d < (double)UINT64_MAX) { + *i = (int64_t)(uint64_t)d; + *is_neg = false; + return 0; + } + return -1; + } + return -1; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -1593,12 +1625,12 @@ bitwise_prepare(const struct Mem *left, const struct Mem *right, int64_t *a, int64_t *b) { bool unused; - if (sqlVdbeIntValue(left, a, &unused) != 0) { + if (mem_get_int(left, a, &unused) != 0) { diag_set(ClientError, ER_SQL_TYPE_MISMATCH, mem_str(left), "integer"); return -1; } - if (sqlVdbeIntValue(right, b, &unused) != 0) { + if (mem_get_int(right, b, &unused) != 0) { diag_set(ClientError, ER_SQL_TYPE_MISMATCH, mem_str(right), "integer"); return -1; @@ -1687,7 +1719,7 @@ mem_bit_not(const struct Mem *mem, struct Mem *result) return 0; int64_t i; bool unused; - if (sqlVdbeIntValue(mem, &i, &unused) != 0) { + if (mem_get_int(mem, &i, &unused) != 0) { diag_set(ClientError, ER_SQL_TYPE_MISMATCH, mem_str(mem), "integer"); return -1; @@ -1932,35 +1964,6 @@ valueToText(sql_value * pVal) return pVal->z; } -/* - * Convert a 64-bit IEEE double into a 64-bit signed integer. - * If the double is out of range of a 64-bit signed integer then - * return the closest available 64-bit signed integer. - */ -static int -doubleToInt64(double r, int64_t *i) -{ - /* - * Many compilers we encounter do not define constants for the - * minimum and maximum 64-bit integers, or they define them - * inconsistently. And many do not understand the "LL" notation. - * So we define our own static constants here using nothing - * larger than a 32-bit integer constant. - */ - static const int64_t maxInt = LARGEST_INT64; - static const int64_t minInt = SMALLEST_INT64; - if (r <= (double)minInt) { - *i = minInt; - return -1; - } else if (r >= (double)maxInt) { - *i = maxInt; - return -1; - } else { - *i = (int64_t) r; - return *i != r; - } -} - /* * It is already known that pMem contains an unterminated string. * Add the zero terminator. @@ -2434,42 +2437,6 @@ mem_value_bool(const struct Mem *mem, bool *b) return -1; } -/* - * Return some kind of integer value which is the best we can do - * at representing the value that *pMem describes as an integer. - * If pMem is an integer, then the value is exact. If pMem is - * a floating-point then the value returned is the integer part. - * If pMem is a string or blob, then we make an attempt to convert - * it into an integer and return that. If pMem represents an - * an SQL-NULL value, return 0. - * - * If pMem represents a string value, its encoding might be changed. - */ -int -sqlVdbeIntValue(const struct Mem *pMem, int64_t *i, bool *is_neg) -{ - int flags; - assert(EIGHT_BYTE_ALIGNMENT(pMem)); - flags = pMem->flags; - if (flags & MEM_Int) { - *i = pMem->u.i; - *is_neg = true; - return 0; - } else if (flags & MEM_UInt) { - *i = pMem->u.u; - *is_neg = false; - return 0; - } else if (flags & MEM_Real) { - *is_neg = pMem->u.r < 0; - return doubleToInt64(pMem->u.r, i); - } else if (flags & (MEM_Str)) { - assert(pMem->z || pMem->n == 0); - if (sql_atoi64(pMem->z, i, is_neg, pMem->n) == 0) - return 0; - } - 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 @@ -2540,30 +2507,12 @@ sql_value_boolean(sql_value *val) return b; } -int -sql_value_int(sql_value * pVal) -{ - int64_t i = 0; - bool is_neg; - sqlVdbeIntValue((Mem *) pVal, &i, &is_neg); - return (int)i; -} - -sql_int64 -sql_value_int64(sql_value * pVal) -{ - int64_t i = 0; - bool unused; - sqlVdbeIntValue((Mem *) pVal, &i, &unused); - return i; -} - uint64_t sql_value_uint64(sql_value *val) { int64_t i = 0; bool is_neg; - sqlVdbeIntValue((struct Mem *) val, &i, &is_neg); + mem_get_int((struct Mem *) val, &i, &is_neg); assert(!is_neg); return i; } diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index dbd58e1a5..2b5385c55 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -536,6 +536,14 @@ mem_cast_implicit(struct Mem *mem, enum field_type type); int mem_cast_implicit_old(struct Mem *mem, enum field_type type); +/** + * Return value for MEM of INTEGER type. For MEM of all other types convert + * value of the MEM to INTEGER if possible and return converted value. Original + * MEM is not changed. + */ +int +mem_get_int(const struct Mem *mem, int64_t *i, bool *is_neg); + /** * Simple type to str convertor. It is used to simplify * error reporting. @@ -590,7 +598,6 @@ releaseMemArray(Mem * p, int N); int mem_value_bool(const struct Mem *mem, bool *b); -int sqlVdbeIntValue(const struct Mem *, int64_t *, bool *is_neg); int sqlVdbeRealValue(struct Mem *, double *); const void * sql_value_blob(struct Mem *); @@ -604,12 +611,6 @@ sql_value_double(struct Mem *); bool sql_value_boolean(struct Mem *val); -int -sql_value_int(struct Mem *); - -sql_int64 -sql_value_int64(struct Mem *); - uint64_t sql_value_uint64(struct Mem *val); diff --git a/src/box/sql/printf.c b/src/box/sql/printf.c index cf32ba3f3..09da39e81 100644 --- a/src/box/sql/printf.c +++ b/src/box/sql/printf.c @@ -144,7 +144,10 @@ getIntArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0; - return sql_value_int64(p->apArg[p->nUsed++]); + int64_t i; + bool unused; + mem_get_int(p->apArg[p->nUsed++], &i, &unused); + return (sql_int64)i; } static double diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 7a026d21b..0af247ebf 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -445,15 +445,9 @@ sql_column_bytes16(sql_stmt *, int iCol); double sql_column_double(sql_stmt *, int iCol); -int -sql_column_int(sql_stmt *, int iCol); - bool sql_column_boolean(struct sql_stmt *stmt, int column); -sql_int64 -sql_column_int64(sql_stmt *, int iCol); - uint64_t sql_column_uint64(struct sql_stmt *stmt, int column); diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index c2d4b8b8a..40404a3b7 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -490,24 +490,12 @@ sql_column_double(sql_stmt * pStmt, int i) return sql_value_double(columnMem(pStmt, i)); } -int -sql_column_int(sql_stmt * pStmt, int i) -{ - return sql_value_int(columnMem(pStmt, i)); -} - bool sql_column_boolean(struct sql_stmt *stmt, int i) { return sql_value_boolean(columnMem(stmt, i)); } -sql_int64 -sql_column_int64(sql_stmt * pStmt, int i) -{ - return sql_value_int64(columnMem(pStmt, i)); -} - uint64_t sql_column_uint64(sql_stmt * pStmt, int i) {