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 5572F741FA; Fri, 6 Aug 2021 09:45:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5572F741FA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628232339; bh=rtQ3DWjZOOqhSOUPhA4zVSwJx/2/BABB1U2xiwfFp0A=; 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=NXsDTn6r1R9vCDly92Y/1B/iIlQKxxEpCJgEjwZ1Don6I3istpqXxbt7gblqFRpEG UIUwIdE/m/Oh8df6ck5yjFfCrKtlMbi9JVza9FqcW8YYFjwNdSTWaZBiox+UoAg8Nk ro/d6qNgGPenJYDIKkLF4NYseOnxwNf1S/8SecHE= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [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 24A4C741FA for ; Fri, 6 Aug 2021 09:42:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 24A4C741FA Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mBtZB-00008Y-8I; Fri, 06 Aug 2021 09:42:49 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 6 Aug 2021 09:42:48 +0300 Message-Id: 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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD9D5AC6413C25DCF08CC98B8FCC5CD86F3182A05F5380850406B32C5D9993323A5B98053B180DCCF5C611B17455F2692081A24CCA0F946831E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78E8764B5BC580342EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F356C90F3414EBBD8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8DADC8D2DD5B0AB047A268E2CE1489A48117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAE9A1BBD95851C5BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6300D3B61E77C8D3B089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C30CE973C7F71088DA1930E675D94DAA1EBDA629B341665C29C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF3033054805BDE987699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D340E23B77EA1807817DC747D5CDE80CFD53918F88B14187870DE88B6FED832BB7142299607702F0A771D7E09C32AA3244C9DE50AD4AD361F34A540ACF2C7DB008181560E2432555DBB729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojFhlvmGwdUwS8SccE2ONjOg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D2ACD23633571E0838A3783C1DFE5BBDA83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 6/6] 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. Closes #4470 --- src/box/sql/mem.c | 82 ----------------------------------------- src/box/sql/mem.h | 6 --- src/box/sql/vdbe.h | 2 +- src/box/sql/vdbeaux.c | 6 +-- src/box/sql/whereexpr.c | 4 +- 5 files changed, 4 insertions(+), 96 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index e654cac41..d1ef92a86 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -1293,88 +1293,6 @@ mem_cast_implicit(struct Mem *mem, enum field_type type) 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 4f61cbab0..9681fc736 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -740,12 +740,6 @@ mem_cast_explicit(struct Mem *mem, enum field_type type); 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); - /** * Cast MEM with numeric value to given numeric type. Doesn't fail. The return * value is < 0 if the original value is less than the result, > 0 if the 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..61be7b489 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(struct 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 != NULL) 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