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 B0C986EC5E; Wed, 28 Jul 2021 23:54:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B0C986EC5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627505679; bh=+VbkOGIrUck7ndw9zIuYF4dnS/afQ6cNfE8pbtNDmto=; 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=AO7Isi8qGPWuWr3xSLwdoEKVC4+wx6XJ6WTZ1fUIl6kPv2k6zauY+HdvQZuK11RzU qR0sSMdfZiS2anl/9ic5BsyEEJ6eIn6cIPn24sgcGFT3zpejq6t7U6Uit+TQJOoq4w aCEMBjnKkFPIQxHFZKPG5GCic5uhOk4RMEISkACg= 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 dev.tarantool.org (Postfix) with ESMTPS id 1C67D6EC6F for ; Wed, 28 Jul 2021 23:51:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1C67D6EC6F Received: by smtp45.i.mail.ru with esmtpa (envelope-from ) id 1m8qWO-0000ul-Dn; Wed, 28 Jul 2021 23:51:20 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Wed, 28 Jul 2021 23:51:20 +0300 Message-Id: <551fd439d751a10c19877016805811e826d28825.1627504973.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-4EC0790: 10 X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD941C43E597735A9C34755E0A9F196FCB739C645213AB7C8E0182A05F5380850409838C470505298AB6DD3C93154E8EDB1D24B47BDA8AFC8BF78316995D3459DFD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7DB84ED444C624799EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637954B64E58FDAD6938638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D896A13570068AAB1B9E67B0EE3D88BA70117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC974A882099E279BDA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEC24E1E72F37C03A08F49F126DDB898E8D8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3CE135D2742255B35C0837EA9F3D19764C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637AD0424077D726551EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458F0AFF96BAACF4158235E5A14AD4A4A4625E192CAD1D9E79DB53CE84373687089B6335CFE95237B44 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C7BEA09003D200E0821B3FC7A2865546A1ECD6218C88B2A3C9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF795D7D556640A06E699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D340FE9920E7E3E5C620E350F9B6466F595D8C36E4FE2D700995C26129EA5B513C19F33564AFA3349F21D7E09C32AA3244CF3DF2FCB801978254C5D28BBD169329E4DBEAD0ED6C55A80729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXi4QUX63t/5tsN5a9yHKbmI X-Mailru-Sender: 3A338A78718AEC5ABE350BD77BF82E1514FB495F94FC777F5710730E026D88FE0DE3D997191AE70FA3E7B4BFDCAD2EFE027D9DD7AE851095A2E8D17B49942DB0CBEE3F9BE14373499437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 7/7] sql: remove unused MEM cast functions 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 removes functions that become unused due to changes of implicit and explicit cast rules. Part of #4470 --- src/box/sql/func.c | 2 +- src/box/sql/mem.c | 222 ---------------------------------------- src/box/sql/mem.h | 19 ---- src/box/sql/vdbe.h | 2 +- src/box/sql/vdbeaux.c | 6 +- src/box/sql/whereexpr.c | 4 +- 6 files changed, 5 insertions(+), 250 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 9a96e96ff..7dd3a4897 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -58,7 +58,7 @@ static const void * mem_as_bin(struct Mem *mem) { const char *s; - if (mem_cast_implicit(mem, FIELD_TYPE_VARBINARY) != 0 && + if (mem_cast_explicit(mem, FIELD_TYPE_VARBINARY) != 0 && mem_to_str(mem) != 0) return NULL; if (mem_get_bin(mem, &s) != 0) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 98b367054..d965d327b 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -820,58 +820,6 @@ double_to_int(struct Mem *mem) return -1; } -static inline int -double_to_int_precise(struct Mem *mem) -{ - assert(mem->type == MEM_TYPE_DOUBLE); - double d = mem->u.r; - if (d < 0 && d >= (double)INT64_MIN && (double)(int64_t)d == d) { - mem->u.i = (int64_t)d; - mem->type = MEM_TYPE_INT; - assert(mem->flags == 0); - mem->field_type = FIELD_TYPE_INTEGER; - return 0; - } - if (d >= 0 && d < (double)UINT64_MAX && (double)(uint64_t)d == d) { - mem->u.u = (uint64_t)d; - mem->type = MEM_TYPE_UINT; - assert(mem->flags == 0); - mem->field_type = FIELD_TYPE_UNSIGNED; - return 0; - } - return -1; -} - -static inline int -double_to_uint(struct Mem *mem) -{ - assert(mem->type == MEM_TYPE_DOUBLE); - double d = mem->u.r; - if (d >= 0 && d < (double)UINT64_MAX) { - mem->u.u = (uint64_t)d; - mem->type = MEM_TYPE_UINT; - assert(mem->flags == 0); - mem->field_type = FIELD_TYPE_UNSIGNED; - return 0; - } - return -1; -} - -static inline int -double_to_uint_precise(struct Mem *mem) -{ - assert(mem->type == MEM_TYPE_DOUBLE); - double d = mem->u.r; - if (d >= 0 && d < (double)UINT64_MAX && (double)(uint64_t)d == d) { - mem->u.u = (uint64_t)d; - mem->type = MEM_TYPE_UINT; - assert(mem->flags == 0); - mem->field_type = FIELD_TYPE_UNSIGNED; - return 0; - } - return -1; -} - static inline int double_to_str0(struct Mem *mem) { @@ -1025,19 +973,6 @@ mem_to_int(struct Mem *mem) return -1; } -int -mem_to_int_precise(struct Mem *mem) -{ - assert(mem->type < MEM_TYPE_INVALID); - if ((mem->type & (MEM_TYPE_INT | MEM_TYPE_UINT)) != 0) - return 0; - if (mem->type == MEM_TYPE_STR) - return str_to_int(mem); - if (mem->type == MEM_TYPE_DOUBLE) - return double_to_int_precise(mem); - return -1; -} - int mem_to_double(struct Mem *mem) { @@ -1183,163 +1118,6 @@ mem_cast_explicit(struct Mem *mem, enum field_type type) return -1; } -int -mem_cast_implicit(struct Mem *mem, enum field_type type) -{ - if (mem->type == MEM_TYPE_NULL) { - mem->field_type = type; - return 0; - } - switch (type) { - case FIELD_TYPE_UNSIGNED: - if (mem->type == MEM_TYPE_UINT) - return 0; - if (mem->type == MEM_TYPE_DOUBLE) - return double_to_uint(mem); - return -1; - case FIELD_TYPE_STRING: - if (mem->type == MEM_TYPE_STR) - return 0; - if (mem->type == MEM_TYPE_UUID) - return uuid_to_str0(mem); - return -1; - case FIELD_TYPE_DOUBLE: - if (mem->type == MEM_TYPE_DOUBLE) - return 0; - if ((mem->type & (MEM_TYPE_INT | MEM_TYPE_UINT)) != 0) - return int_to_double(mem); - return -1; - case FIELD_TYPE_INTEGER: - if ((mem->type & (MEM_TYPE_INT | MEM_TYPE_UINT)) != 0) - return 0; - if (mem->type == MEM_TYPE_DOUBLE) - return double_to_int(mem); - return -1; - case FIELD_TYPE_BOOLEAN: - if (mem->type == MEM_TYPE_BOOL) - return 0; - return -1; - case FIELD_TYPE_VARBINARY: - if ((mem->type & (MEM_TYPE_BIN | MEM_TYPE_MAP | - MEM_TYPE_ARRAY)) != 0) - return 0; - if (mem->type == MEM_TYPE_UUID) - return uuid_to_bin(mem); - return -1; - case FIELD_TYPE_NUMBER: - if (mem_is_num(mem)) - return 0; - return -1; - case FIELD_TYPE_MAP: - if (mem->type == MEM_TYPE_MAP) - return 0; - return -1; - case FIELD_TYPE_ARRAY: - if (mem->type == MEM_TYPE_ARRAY) - return 0; - return -1; - case FIELD_TYPE_SCALAR: - if ((mem->type & (MEM_TYPE_MAP | MEM_TYPE_ARRAY)) != 0) - return -1; - return 0; - case FIELD_TYPE_UUID: - if (mem->type == MEM_TYPE_UUID) - return 0; - if (mem->type == MEM_TYPE_STR) - return str_to_uuid(mem); - if (mem->type == MEM_TYPE_BIN) - return bin_to_uuid(mem); - return -1; - case FIELD_TYPE_ANY: - return 0; - default: - break; - } - return -1; -} - -int -mem_cast_implicit_old(struct Mem *mem, enum field_type type) -{ - if (mem->type == MEM_TYPE_NULL) - return 0; - switch (type) { - case FIELD_TYPE_UNSIGNED: - if (mem->type == MEM_TYPE_UINT) - return 0; - if (mem->type == MEM_TYPE_DOUBLE) - return double_to_uint_precise(mem); - if (mem->type == MEM_TYPE_STR) - return str_to_uint(mem); - return -1; - case FIELD_TYPE_STRING: - if ((mem->type & (MEM_TYPE_STR | MEM_TYPE_BIN)) != 0) - return 0; - if ((mem->type & (MEM_TYPE_INT | MEM_TYPE_UINT)) != 0) - return int_to_str0(mem); - if (mem->type == MEM_TYPE_DOUBLE) - return double_to_str0(mem); - if (mem->type == MEM_TYPE_UUID) - return uuid_to_str0(mem); - return -1; - case FIELD_TYPE_DOUBLE: - if (mem->type == MEM_TYPE_DOUBLE) - return 0; - if ((mem->type & (MEM_TYPE_INT | MEM_TYPE_UINT)) != 0) - return int_to_double(mem); - if (mem->type == MEM_TYPE_STR) - return bin_to_str(mem); - return -1; - case FIELD_TYPE_INTEGER: - if ((mem->type & (MEM_TYPE_INT | MEM_TYPE_UINT)) != 0) - return 0; - if (mem->type == MEM_TYPE_STR) - return str_to_int(mem); - if (mem->type == MEM_TYPE_DOUBLE) - return double_to_int_precise(mem); - return -1; - case FIELD_TYPE_BOOLEAN: - if (mem->type == MEM_TYPE_BOOL) - return 0; - return -1; - case FIELD_TYPE_VARBINARY: - if (mem->type == MEM_TYPE_BIN) - return 0; - if (mem->type == MEM_TYPE_UUID) - return uuid_to_bin(mem); - return -1; - case FIELD_TYPE_NUMBER: - if (mem_is_num(mem)) - return 0; - if (mem->type == MEM_TYPE_STR) - return mem_to_number(mem); - return -1; - case FIELD_TYPE_MAP: - if (mem->type == MEM_TYPE_MAP) - return 0; - return -1; - case FIELD_TYPE_ARRAY: - if (mem->type == MEM_TYPE_ARRAY) - return 0; - return -1; - case FIELD_TYPE_SCALAR: - if ((mem->type & (MEM_TYPE_MAP | MEM_TYPE_ARRAY)) != 0) - return -1; - return 0; - case FIELD_TYPE_UUID: - if (mem->type == MEM_TYPE_UUID) - return 0; - if (mem->type == MEM_TYPE_STR) - return str_to_uuid(mem); - if (mem->type == MEM_TYPE_BIN) - return bin_to_uuid(mem); - return -1; - default: - break; - } - return -1; -} - int mem_cast_implicit_number(struct Mem *mem, enum field_type type) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 5d1d7592e..de0558150 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -692,15 +692,6 @@ mem_cmp(const struct Mem *a, const struct Mem *b, int *result, int mem_to_int(struct Mem *mem); -/** - * Convert the given MEM to INTEGER. This function and the function above define - * the rules that are used to convert values of all other types to INTEGER. In - * this function, the conversion from double to integer is only possible if it - * is lossless. - */ -int -mem_to_int_precise(struct Mem *mem); - /** * Convert the given MEM to DOUBLE. This function defines the rules that are * used to convert values of all other types to DOUBLE. @@ -736,16 +727,6 @@ mem_to_str0(struct Mem *mem); int mem_cast_explicit(struct Mem *mem, enum field_type type); -/** Convert the given MEM to given type according to implicit cast rules. */ -int -mem_cast_implicit(struct Mem *mem, enum field_type type); - -/** - * Convert the given MEM to given type according to legacy implicit cast rules. - */ -int -mem_cast_implicit_old(struct Mem *mem, enum field_type type); - /** * Convert the given MEM that contains numeric value to given numeric type * according to implicit cast rules. This function cannot fail. Returns: diff --git a/src/box/sql/vdbe.h b/src/box/sql/vdbe.h index 118f1cd83..be112c72d 100644 --- a/src/box/sql/vdbe.h +++ b/src/box/sql/vdbe.h @@ -266,7 +266,7 @@ sql *sqlVdbeDb(Vdbe *); void sqlVdbeSetSql(Vdbe *, const char *z, int n); void sqlVdbeSwap(Vdbe *, Vdbe *); VdbeOp *sqlVdbeTakeOpArray(Vdbe *, int *, int *); -sql_value *sqlVdbeGetBoundValue(Vdbe *, int, u8); +sql_value *sqlVdbeGetBoundValue(Vdbe *, int); char *sqlVdbeExpandSql(Vdbe *, const char *); /** diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index 4a1fdb637..fc06e502e 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -2323,17 +2323,15 @@ sqlVdbeDb(Vdbe * v) * The returned value must be freed by the caller using sqlValueFree(). */ sql_value * -sqlVdbeGetBoundValue(Vdbe * v, int iVar, u8 aff) +sqlVdbeGetBoundValue(Vdbe * v, int iVar) { assert(iVar > 0); if (v) { Mem *pMem = &v->aVar[iVar - 1]; if (!mem_is_null(pMem)) { sql_value *pRet = sqlValueNew(v->db); - if (pRet) { + if (pRet) mem_copy(pRet, pMem); - mem_cast_implicit_old(pRet, aff); - } return pRet; } } diff --git a/src/box/sql/whereexpr.c b/src/box/sql/whereexpr.c index fe7329ea8..6849f13ec 100644 --- a/src/box/sql/whereexpr.c +++ b/src/box/sql/whereexpr.c @@ -309,9 +309,7 @@ like_optimization_is_valid(Parse *pParse, Expr *pExpr, Expr **ppPrefix, if (op == TK_VARIABLE) { Vdbe *pReprepare = pParse->pReprepare; int iCol = pRight->iColumn; - pVal = - sqlVdbeGetBoundValue(pReprepare, iCol, - FIELD_TYPE_SCALAR); + pVal = sqlVdbeGetBoundValue(pReprepare, iCol); if (pVal != NULL && mem_is_str(pVal)) { if (mem_as_str0(pVal) == NULL) return -1; -- 2.25.1