From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) (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 DEC584696F5 for ; Thu, 28 May 2020 17:17:40 +0300 (MSK) From: Mergen Imeev Date: Thu, 28 May 2020 17:17:40 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 6/6] 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 Opcode OP_ApplyType is not needed now, so it should be removed. Follow-up #4230 --- src/box/sql/expr.c | 30 ------------------------------ src/box/sql/sqlInt.h | 13 ------------- src/box/sql/vdbe.c | 29 ----------------------------- src/box/sql/wherecode.c | 2 +- 4 files changed, 1 insertion(+), 73 deletions(-) diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c index 8ec685cd9..55db089cc 100644 --- a/src/box/sql/expr.c +++ b/src/box/sql/expr.c @@ -2246,36 +2246,6 @@ sqlExprCanBeNull(const Expr * p) } } -bool -sql_expr_needs_no_type_change(const struct Expr *p, enum field_type type) -{ - u8 op; - if (type == FIELD_TYPE_SCALAR) - return true; - while (p->op == TK_UPLUS || p->op == TK_UMINUS) { - p = p->pLeft; - } - op = p->op; - if (op == TK_REGISTER) - op = p->op2; - switch (op) { - case TK_INTEGER: - return type == FIELD_TYPE_INTEGER; - case TK_FLOAT: - return type == FIELD_TYPE_DOUBLE; - case TK_STRING: - return type == FIELD_TYPE_STRING; - case TK_BLOB: - return type == FIELD_TYPE_VARBINARY; - case TK_COLUMN: - /* p cannot be part of a CHECK constraint. */ - assert(p->iTable >= 0); - return p->iColumn < 0 && sql_type_is_numeric(type); - default: - return false; - } -} - /* * pX is the RHS of an IN operator. If pX is a SELECT statement * that can be simplified to a direct table access, then return diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 37283e506..8314e7176 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -3229,19 +3229,6 @@ int sqlExprIsTableConstant(Expr *, int); int sqlExprIsInteger(Expr *, int *); int sqlExprCanBeNull(const Expr *); -/** - * Return TRUE if the given expression is a constant which would - * be unchanged by OP_ApplyType with the type given in the second - * argument. - * - * This routine is used to determine if the OP_ApplyType operation - * can be omitted. When in doubt return FALSE. A false negative - * is harmless. A false positive, however, can result in the wrong - * answer. - */ -bool -sql_expr_needs_no_type_change(const struct Expr *expr, enum field_type type); - /** * This routine generates VDBE code that causes a single row of a * single table to be deleted. Both the original table entry and diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 021e09d1e..1fea86098 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -2811,35 +2811,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..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 * correct implicit conversions. */ static int -- 2.25.1