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 1ACBE711B5; Tue, 26 Oct 2021 13:36:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1ACBE711B5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1635244570; bh=Fy5YkXX8/SKHHRAse+6YLkK/06R0Crx2qLTOXTwfKsE=; 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=ruu7J3bcA9jd0hatVteI7Nv+frSqvACWaLLZ096fjJeXd4EHENnRvc2sbkTXhPyPv +px/wYORIddojpKrU4faXK5Gn/32Q0O7xy8INdIzmfP1i8I8kge3VaYwTdet86NeWt j+Gbn5lZ5svtkZAR6eh8QVSPYoCsYQNIetak6b2w= 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 2ACCD711B5 for ; Tue, 26 Oct 2021 13:34:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2ACCD711B5 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mfJmU-0000b2-B4; Tue, 26 Oct 2021 13:34:10 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 26 Oct 2021 13:34:10 +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: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D1D35DBD2D15487E4274513AD34F4DF9D3103CEBF61746E9182A05F538085040A6FAF1B6AF0310F00B0C2984144A64E942406F1B762F7A79201C1F585742A791 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7AE0F15972A9DD0A8EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063744E972A96E850310EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F28519FF344A8C80B152CD81020F8F602DCC7F00164DA146DAFE8445B8C89999728AA50765F790063783E00425F71A4181389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8A9FF340AA05FB58CF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B953A8A48A05D51F175ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C2749EEF4D85F8CCA47984C4863707C71F733D1532C5AF8ED9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF166FC1BB2721D293DC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34B5900AD87B4159A456C46C0EEEE037959D3AEDB8CA24479D44556B38D30FE11637BA98221B184A5B1D7E09C32AA3244CC4C52DD5ACD60614906E517C502863FC7101BF96129E4011729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojNvH0qP3qm71kTNVIeDD4aw== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D0952C3E660936DCDD6C1AA4EA44C121F83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 04/16] sql: remove AggStep0 and OP_BuiltinFunction0 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 moves the initialization of sql_context out of the VDBE. This allows us to remove the opcodes OP_BuiltinFunction0 and OP_AggStep0, which work in a rather strange way. Moreover, due to the changes these opcodes make to the VDBEs, it is possible that the estimated size of the VDBE may change during execution of VDBE, which could lead to various problems. Needed for #4145 --- src/box/sql/expr.c | 12 +++++-- src/box/sql/select.c | 33 ++++++++++++++++-- src/box/sql/sqlInt.h | 6 ++++ src/box/sql/vdbe.c | 81 ++----------------------------------------- src/box/sql/vdbeaux.c | 12 ++----- 5 files changed, 51 insertions(+), 93 deletions(-) diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c index 3b5df5292..6446ef091 100644 --- a/src/box/sql/expr.c +++ b/src/box/sql/expr.c @@ -4107,9 +4107,15 @@ sqlExprCodeTarget(Parse * pParse, Expr * pExpr, int target) (char *)coll, P4_COLLSEQ); } if (func->def->language == FUNC_LANGUAGE_SQL_BUILTIN) { - sqlVdbeAddOp4(v, OP_BuiltinFunction0, nFarg, - r1, target, (char *)func, - P4_FUNC); + struct sql_context *ctx = + sql_context_new(v, func, nFarg); + if (ctx == NULL) { + pParse->is_aborted = true; + return -1; + } + sqlVdbeAddOp4(v, OP_BuiltinFunction, nFarg, + r1, target, (char *)ctx, + P4_FUNCCTX); } else { sqlVdbeAddOp4(v, OP_FunctionByName, nFarg, r1, target, diff --git a/src/box/sql/select.c b/src/box/sql/select.c index 92e40aef6..5b57f57a3 100644 --- a/src/box/sql/select.c +++ b/src/box/sql/select.c @@ -5639,8 +5639,13 @@ updateAccumulator(Parse * pParse, AggInfo * pAggInfo) sqlVdbeAddOp4(v, OP_CollSeq, regHit, 0, 0, (char *)coll, P4_COLLSEQ); } - sqlVdbeAddOp3(v, OP_AggStep0, nArg, regAgg, pF->iMem); - sqlVdbeAppendP4(v, pF->func, P4_FUNC); + struct sql_context *ctx = sql_context_new(v, pF->func, nArg); + if (ctx == NULL) { + pParse->is_aborted = true; + return; + } + sqlVdbeAddOp3(v, OP_AggStep, nArg, regAgg, pF->iMem); + sqlVdbeAppendP4(v, ctx, P4_FUNCCTX); sql_expr_type_cache_change(pParse, regAgg, nArg); sqlReleaseTempRange(pParse, regAgg, nArg); if (addrNext) { @@ -6744,3 +6749,27 @@ sql_expr_extract_select(struct Parse *parser, struct Select *select) parser->parsed_ast.expr = sqlExprDup(parser->db, expr_list->a->pExpr, 0); } + +struct sql_context * +sql_context_new(struct Vdbe *vdbe, struct func *func, uint32_t argc) +{ + uint32_t size = sizeof(struct sql_context); + if (argc > 1) + size += (argc - 1) * sizeof(struct Mem *); + struct sql_context *ctx = sqlDbMallocRawNN(sql_get(), size); + if (ctx == NULL) + return NULL; + ctx->pOut = NULL; + ctx->func = func; + ctx->is_aborted = false; + ctx->skipFlag = 0; + ctx->pVdbe = vdbe; + ctx->iOp = 0; + return ctx; +} + +void +sql_context_delete(struct sql_context *ctx) +{ + sqlDbFree(sql_get(), ctx); +} diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index eac6bcec8..b944b357b 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -4127,6 +4127,12 @@ char *sqlStrAccumFinish(StrAccum *); void sqlStrAccumReset(StrAccum *); void sqlSelectDestInit(SelectDest *, int, int, int); +struct sql_context * +sql_context_new(struct Vdbe *vdbe, struct func *func, uint32_t argc); + +void +sql_context_delete(struct sql_context *ctx); + /* * Create an expression to load @a column from datasource * @a src_idx in @a src_list. diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index af97b0499..11e418e53 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1182,16 +1182,6 @@ case OP_CollSeq: { break; } -/* Opcode: BuiltinFunction0 P1 P2 P3 P4 * - * Synopsis: r[P3]=func(r[P2@P1]) - * - * Invoke a user function (P4 is a pointer to a FuncDef object that - * defines the function) with P1 arguments taken from register P2 and - * successors. The result of the function is stored in register P3. - * Register P3 must not be one of the function inputs. - * - * See also: BuiltinFunction, AggStep, AggFinal - */ /* Opcode: BuiltinFunction P1 P2 P3 P4 * * Synopsis: r[P3]=func(r[P2@P1]) * @@ -1200,37 +1190,8 @@ case OP_CollSeq: { * from register P2 and successors. The result of the function is stored * in register P3. Register P3 must not be one of the function inputs. * - * SQL functions are initially coded as OP_BuiltinFunction0 with - * P4 pointing to a FuncDef object. But on first evaluation, - * the P4 operand is automatically converted into an sql_context - * object and the operation changed to this OP_BuiltinFunction - * opcode. In this way, the initialization of the sql_context - * object occurs only once, rather than once for each evaluation - * of the function. - * - * See also: BuiltinFunction0, AggStep, AggFinal + * See also: AggStep, AggFinal */ -case OP_BuiltinFunction0: { - int n; - sql_context *pCtx; - - assert(pOp->p4type == P4_FUNC); - n = pOp->p1; - assert(pOp->p3>0 && pOp->p3<=(p->nMem+1 - p->nCursor)); - assert(n==0 || (pOp->p2>0 && pOp->p2+n<=(p->nMem+1 - p->nCursor)+1)); - assert(pOp->p3p2 || pOp->p3>=pOp->p2+n); - pCtx = sqlDbMallocRawNN(db, sizeof(*pCtx) + (n-1)*sizeof(sql_value*)); - if (pCtx==0) goto no_mem; - pCtx->pOut = 0; - pCtx->func = pOp->p4.func; - pCtx->iOp = (int)(pOp - aOp); - pCtx->pVdbe = p; - pOp->p4type = P4_FUNCCTX; - pOp->p4.pCtx = pCtx; - pOp->opcode = OP_BuiltinFunction; - /* Fall through into OP_BuiltinFunction */ - FALLTHROUGH; -} case OP_BuiltinFunction: { int i; int argc = pOp->p1; @@ -1238,6 +1199,7 @@ case OP_BuiltinFunction: { assert(pOp->p4type==P4_FUNCCTX); pCtx = pOp->p4.pCtx; + pCtx->iOp = (int)(pOp - aOp); /* If this function is inside of a trigger, the register array in aMem[] * might change from one evaluation to the next. The next block of code @@ -4170,17 +4132,6 @@ case OP_DecrJumpZero: { /* jump, in1 */ } -/* Opcode: AggStep0 P1 P2 P3 P4 * - * Synopsis: accum=r[P3] step(r[P2@P1]) - * - * Execute the step function for an aggregate. The - * function has P1 arguments. P4 is a pointer to the FuncDef - * structure that specifies the function. Register P3 is the - * accumulator. - * - * The P1 arguments are taken from register P2 and its - * successors. - */ /* Opcode: AggStep P1 P2 P3 P4 * * Synopsis: accum=r[P3] step(r[P2@P1]) * @@ -4191,34 +4142,7 @@ case OP_DecrJumpZero: { /* jump, in1 */ * * The P1 arguments are taken from register P2 and its * successors. - * - * This opcode is initially coded as OP_AggStep0. On first evaluation, - * the FuncDef stored in P4 is converted into an sql_context and - * the opcode is changed. In this way, the initialization of the - * sql_context only happens once, instead of on each call to the - * step function. */ -case OP_AggStep0: { - int n; - sql_context *pCtx; - - assert(pOp->p4type == P4_FUNC); - n = pOp->p5; - assert(pOp->p3>0 && pOp->p3<=(p->nMem+1 - p->nCursor)); - assert(n==0 || (pOp->p2>0 && pOp->p2+n<=(p->nMem+1 - p->nCursor)+1)); - assert(pOp->p3p2 || pOp->p3>=pOp->p2+n); - pCtx = sqlDbMallocRawNN(db, sizeof(*pCtx) + (n-1)*sizeof(sql_value*)); - if (pCtx==0) goto no_mem; - pCtx->pMem = 0; - pCtx->func = pOp->p4.func; - pCtx->iOp = (int)(pOp - aOp); - pCtx->pVdbe = p; - pOp->p4type = P4_FUNCCTX; - pOp->p4.pCtx = pCtx; - pOp->opcode = OP_AggStep; - /* Fall through into OP_AggStep */ - FALLTHROUGH; -} case OP_AggStep: { int i; int argc = pOp->p1; @@ -4228,6 +4152,7 @@ case OP_AggStep: { assert(pOp->p4type==P4_FUNCCTX); pCtx = pOp->p4.pCtx; + pCtx->iOp = (int)(pOp - aOp); pMem = &aMem[pOp->p3]; /* If this function is inside of a trigger, the register array in aMem[] diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index 8148ed8b0..4c2bd11ba 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -590,19 +590,13 @@ sqlVdbeJumpHere(Vdbe * p, int addr) static void vdbeFreeOpArray(sql *, Op *, int); -static SQL_NOINLINE void -freeP4FuncCtx(sql * db, sql_context * p) -{ - sqlDbFree(db, p); -} - static void freeP4(sql * db, int p4type, void *p4) { assert(db); switch (p4type) { case P4_FUNCCTX:{ - freeP4FuncCtx(db, (sql_context *) p4); + sql_context_delete(p4); break; } case P4_REAL: @@ -1068,14 +1062,12 @@ displayP4(Op * pOp, char *zTemp, int nTemp) func->def->param_count); break; } -#if defined(SQL_DEBUG) || defined(VDBE_PROFILE) case P4_FUNCCTX:{ - struct func *func = pOp->p4.func; + struct func *func = pOp->p4.pCtx->func; sqlXPrintf(&x, "%s(%d)", func->def->name, func->def->param_count); break; } -#endif case P4_BOOL: sqlXPrintf(&x, "%d", pOp->p4.b); break; -- 2.25.1