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 88C406EC40; Wed, 18 Aug 2021 17:37:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 88C406EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1629297447; bh=Ok6ZmGSlU0kMRwemXWLwUc0DUAMHpz5C63FpIL5lVR8=; 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=eim8tsnNwWfUqQqifu++DlumJHnikbHp4ZjaYG6kJOyK1WLzRLUhCR1eCAdSVrsoc VLOrzmCDGpSnOYlCRyewcHG15h+oOFbpxfTd5seH3Qbrt+m7YlNrTCFCF5oNiW3PC6 H9UMmqlX8IjDB+qzbX+hdeXNyg+nn69Grh4+6Fis= 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 D52F96EC45 for ; Wed, 18 Aug 2021 17:35:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D52F96EC45 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mGMen-00030B-V2; Wed, 18 Aug 2021 17:35:06 +0300 To: vdavydov@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Wed, 18 Aug 2021 17:35:05 +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: 4F1203BC0FB41BD92087353F0EC44DD972FF4A7D76DB5E242D14FEF1BD8BF4AC182A05F538085040DED853BA484EA2C3ADE07A53EA1E4CBBFB67D14D53D1211A091677541D0C00F8 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE789AB142E4AADF4FCEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637A8691684BB8CCFB18638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D824C84B1DB140A848FACE1C59FE9BAEA7117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6B1CFA6D474D4A6A4089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CF160826E4E1956AE3EB5AC2701DC382082DA26FCAA05C6D09C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFCE66FDB1904541E0699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3435BBF0AC4E3A921C19CDBDCEC51E2FB70572684D39292A97B296513CF2E9E4C1D21935F646D204491D7E09C32AA3244C4F1B1060D071FCD514C68F7D616908FF97FE24653F78E668729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojuRQ/H5n28tq6uP+TNkRNLA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D62DF05172A7A902CFAEFA9E5FF8F1A2A83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 5/5] sql: encapsulate SQL built-in functions opcodes 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 encapsulates opcodes for SQL built-in functions, which allows us to modify the structure of SQL built-in functions and add an ApplyType opcode if necessary. Part of #6105 --- src/box/sql/expr.c | 8 +++----- src/box/sql/func.c | 23 +++++++++++++++++++++++ src/box/sql/select.c | 12 ++++-------- src/box/sql/sqlInt.h | 8 ++++++++ 4 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c index 0544539d2..bf3ee359b 100644 --- a/src/box/sql/expr.c +++ b/src/box/sql/expr.c @@ -4165,14 +4165,12 @@ sqlExprCodeTarget(Parse * pParse, Expr * pExpr, int target) sqlVdbeAddOp4(v, OP_CollSeq, 0, 0, 0, (char *)coll, P4_COLLSEQ); } - struct func *func = sql_func_find(pExpr); - if (func == NULL) { + if (sql_emit_func_call(v, pExpr, OP_BuiltinFunction0, + constMask, r1, target, + nFarg) != 0) { pParse->is_aborted = true; break; } - sqlVdbeAddOp4(v, OP_BuiltinFunction0, constMask, r1, - target, (char *)func, P4_FUNC); - sqlVdbeChangeP5(v, (u8) nFarg); if (nFarg && constMask == 0) { sqlReleaseTempRange(pParse, r1, nFarg); } diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 29235ed62..5b42fa767 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -2877,3 +2877,26 @@ sql_func_result(struct Expr *expr) } return field_type_MAX; } + +int +sql_emit_func_call(struct Vdbe *vdbe, struct Expr *expr, int op, int mask, + int r1, int r2, uint8_t argc) +{ + struct func *func = sql_func_find(expr); + if (func == NULL) + return -1; + sqlVdbeAddOp4(vdbe, op, mask, r1, r2, (char *)func, P4_FUNC); + sqlVdbeChangeP5(vdbe, argc); + return 0; +} + +int +sql_emit_func_finalize(struct Vdbe *vdbe, struct Expr *expr, int reg, + uint8_t argc) +{ + struct func *func = sql_func_find(expr); + if (func == NULL) + return -1; + sqlVdbeAddOp4(vdbe, OP_AggFinal, reg, argc, 0, (char *)func, P4_FUNC); + return 0; +} diff --git a/src/box/sql/select.c b/src/box/sql/select.c index 2f8a7a031..87f2012f1 100644 --- a/src/box/sql/select.c +++ b/src/box/sql/select.c @@ -5572,10 +5572,8 @@ finalizeAggFunctions(Parse * pParse, AggInfo * pAggInfo) for (i = 0, pF = pAggInfo->aFunc; i < pAggInfo->nFunc; i++, pF++) { ExprList *pList = pF->pExpr->x.pList; assert(!ExprHasProperty(pF->pExpr, EP_xIsSelect)); - sqlVdbeAddOp2(v, OP_AggFinal, pF->iMem, - pList ? pList->nExpr : 0); - struct func *func = sql_func_find(pF->pExpr); - sqlVdbeAppendP4(v, func, P4_FUNC); + sql_emit_func_finalize(v, pF->pExpr, pF->iMem, + pList ? pList->nExpr : 0); } } @@ -5634,10 +5632,8 @@ updateAccumulator(Parse * pParse, AggInfo * pAggInfo) sqlVdbeAddOp4(v, OP_CollSeq, regHit, 0, 0, (char *)coll, P4_COLLSEQ); } - sqlVdbeAddOp3(v, OP_AggStep0, 0, regAgg, pF->iMem); - struct func *func = sql_func_find(pF->pExpr); - sqlVdbeAppendP4(v, func, P4_FUNC); - sqlVdbeChangeP5(v, (u8) nArg); + sql_emit_func_call(v, pF->pExpr, OP_AggStep0, 0, regAgg, + pF->iMem, nArg); sql_expr_type_cache_change(pParse, regAgg, nArg); sqlReleaseTempRange(pParse, regAgg, nArg); if (addrNext) { diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 01701e271..5966f841f 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -4410,6 +4410,14 @@ sql_func_flags(uint8_t id); enum field_type sql_func_result(struct Expr *expr); +int +sql_emit_func_call(struct Vdbe *vdbe, struct Expr *expr, int op, int mask, + int r1, int r2, uint8_t argc); + +int +sql_emit_func_finalize(struct Vdbe *vdbe, struct Expr *expr, int reg, + uint8_t argc); + /** * Generate VDBE code to halt execution with correct error if * the object with specified key is already present (or doesn't -- 2.25.1