From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp5.mail.ru (smtp5.mail.ru [94.100.179.24]) (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 A890F42EF61 for ; Thu, 11 Jun 2020 15:54:17 +0300 (MSK) From: imeevma@tarantool.org Date: Thu, 11 Jun 2020 15:54:16 +0300 Message-Id: <699e6db0bed7c6af887c0cc0e5c861fbc5b2952b.1591878044.git.imeevma@gmail.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v2 6/7] sql: remove OP_ApplyType List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: v.shpilevoy@tarantool.org, tsafin@tarantool.org, tarantool-patches@dev.tarantool.org Thank you for the review! My answer, diff and new patch below. On 10.06.2020 01:29, Vladislav Shpilevoy wrote: > Thanks for the patch! > >> diff --git a/src/box/sql/wherecode.c b/src/box/sql/wherecode.c >> index 1d7c76670..1ec9f4ed7 100644 >> --- a/src/box/sql/wherecode.c >> +++ b/src/box/sql/wherecode.c >> @@ -571,7 +571,7 @@ codeEqualityTerm(Parse * pParse, /* The parsing context */ >> * >> * Before returning, @types is set to point to a buffer containing a >> * copy of the column types array of the index allocated using >> - * sqlDbMalloc(). This array is passed to OP_ApplyType to provide >> + * sqlDbMalloc(). This array is passed to OP_CheckType to provide > > @types parameter does not exist anymore. I guess it was removed in > one of the previous commits, and the comment should be updated there > too. > Fixed. >> * correct implicit conversions. >> */ >> static int Diff: diff --git a/src/box/sql/wherecode.c b/src/box/sql/wherecode.c index 1ec9f4ed7..2459054ff 100644 --- a/src/box/sql/wherecode.c +++ b/src/box/sql/wherecode.c @@ -568,11 +568,6 @@ codeEqualityTerm(Parse * pParse, /* The parsing context */ * key value of the loop. If one or more IN operators appear, then * this routine allocates an additional nEq memory cells for internal * use. - * - * Before returning, @types is set to point to a buffer containing a - * copy of the column types array of the index allocated using - * sqlDbMalloc(). This array is passed to OP_CheckType to provide - * correct implicit conversions. */ static int codeAllEqualityTerms(Parse * pParse, /* Parsing context */ New patch: >From 699e6db0bed7c6af887c0cc0e5c861fbc5b2952b Mon Sep 17 00:00:00 2001 From: Mergen Imeev Date: Thu, 28 May 2020 13:03:37 +0300 Subject: [PATCH] sql: remove OP_ApplyType Opcode OP_ApplyType is not needed now, so it should be removed. Follow-up #4230 diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index a92c9f60f..e22ed98cf 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -2834,35 +2834,6 @@ case OP_Fetch: { break; } -/* Opcode: ApplyType P1 P2 * P4 * - * Synopsis: type(r[P1@P2]) - * - * Apply types to a range of P2 registers starting with P1. - * - * P4 is a string that is P2 characters long. The nth character of the - * string indicates the column type that should be used for the nth - * memory cell in the range. - */ -case OP_ApplyType: { - enum field_type *types = pOp->p4.types; - assert(types != NULL); - assert(types[pOp->p2] == field_type_MAX); - pIn1 = &aMem[pOp->p1]; - enum field_type type; - while((type = *(types++)) != field_type_MAX) { - assert(pIn1 <= &p->aMem[(p->nMem+1 - p->nCursor)]); - assert(memIsValid(pIn1)); - if (mem_apply_type(pIn1, type) != 0) { - diag_set(ClientError, ER_SQL_TYPE_MISMATCH, - sql_value_to_diag_str(pIn1), - field_type_strs[type]); - goto abort_due_to_error; - } - pIn1++; - } - break; -} - /* Opcode: CheckType P1 P2 * P4 * * Synopsis: type(r[P1@P2]) * diff --git a/src/box/sql/wherecode.c b/src/box/sql/wherecode.c index 1d7c76670..2459054ff 100644 --- a/src/box/sql/wherecode.c +++ b/src/box/sql/wherecode.c @@ -568,11 +568,6 @@ codeEqualityTerm(Parse * pParse, /* The parsing context */ * key value of the loop. If one or more IN operators appear, then * this routine allocates an additional nEq memory cells for internal * use. - * - * Before returning, @types is set to point to a buffer containing a - * copy of the column types array of the index allocated using - * sqlDbMalloc(). This array is passed to OP_ApplyType to provide - * correct implicit conversions. */ static int codeAllEqualityTerms(Parse * pParse, /* Parsing context */