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 077D56EC40; Sat, 25 Sep 2021 14:13:58 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 077D56EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1632568438; bh=aZiBcHj4qMzwSsdLdwuv60ud93wgy9NrfVJBYhI7mG0=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=OcO5H2BfW31nEsp4r9RI9rNaIfWPfAinvq5fguE8T85U2PqcAcfFRXzHSHTN/GrIy tVgLa9lTwhvNv5jzg9RyIuc/aFpwB8lj1qOT6rTY7KhaW6zljvafenLSK8Ha36LZAF WRBDp9h2bubErWc19KTPbQnQpiOYJZyifrFnoffM= 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 978606EC40 for ; Sat, 25 Sep 2021 14:13:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 978606EC40 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mU5cx-00065G-Qb; Sat, 25 Sep 2021 14:13:56 +0300 Date: Sat, 25 Sep 2021 14:13:54 +0300 To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org Message-ID: <20210925111354.GC290467@tarantool.org> References: <15a8d09b-75db-f250-1377-7be990388f7d@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <15a8d09b-75db-f250-1377-7be990388f7d@tarantool.org> X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD96A58C36AA2E99649E150573C3DCDB299A56307BC7D0E2EC5182A05F5380850409F73E456B52306F0315A0E7136CFD555FEE2239566A2C8515E755154D1E17406 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7DF2546A43F668C04EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637CC84CAE328DCD2648638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F83F95578BA61CB5F6ABCAD1188EBDCB117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A52CBE287469375DDF65554677027D9A6CED54393973126EBCD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75BFC02AB3DF06BA5A410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34F1257DC9690AEBA108825F663B812A1C642B653CABC22777A17F664AB24CC63F3AE87A7916B0A3781D7E09C32AA3244CCBC6B9C0398158158F980F1C9632AECE5A1673A01BA68E40729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojqHUEAOTxd4hgyojvS43Z5w== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D05E9490026973197C7CE987BF9651C8683D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 06/15] sql: remove sql_vdbemem_finalize() 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: Mergen Imeev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thank you for the review! My answers, diff and new patch below. On 23.09.2021 01:47, Vladislav Shpilevoy wrote: > Thanks for the fixes! > >>>> diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c >>>> index 12dc9126b..dfab86c50 100644 >>>> --- a/src/box/sql/vdbe.c >>>> +++ b/src/box/sql/vdbe.c >>>> @@ -4204,16 +4204,32 @@ case OP_AggStep: { >>>> * the step function was not previously called. >>>> */ >>>> case OP_AggFinal: { >>>> - Mem *pMem; >>>> assert(pOp->p1>0 && pOp->p1<=(p->nMem+1 - p->nCursor)); >>>> - pMem = &aMem[pOp->p1]; >>>> - assert(mem_is_null(pMem) || mem_is_agg(pMem)); >>>> - if (sql_vdbemem_finalize(pMem, pOp->p4.func) != 0) >>>> + struct func_sql_builtin *func = (struct func_sql_builtin *)pOp->p4.func; >>>> + struct Mem *pIn1 = &aMem[pOp->p1]; >>>> + assert(mem_is_null(pIn1) || mem_is_agg(pIn1)); >>>> + >>>> + struct sql_context ctx; >>>> + memset(&ctx, 0, sizeof(ctx)); >>>> + struct Mem t; >>> >>> Please, use mem_create(). Also for the context I would propose to add >>> sql_context_create(). So as not to touch internals of the struct here >>> directly. >>> >> I suggest to leave it as it is for now, since I plan to completely drop >> struct sql_context from finalize functions in a few patches in this patch-set. >> What do you think? > > mem_create() would be just -3 and +1 line in the patch. I suggest to > use it. Previously memset was tolerated because it was done in mem.c, > where it is allowed to touch Mem internals directly. > Fixed. On Thu, Sep 23, 2021 at 12:47:45AM +0200, Vladislav Shpilevoy wrote: > Thanks for the fixes! > > > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > > index a9011fc63..fb304d868 100644 > > --- a/src/box/sql/mem.c > > +++ b/src/box/sql/mem.c > > @@ -217,11 +217,7 @@ mem_create(struct Mem *mem) > > static inline void > > mem_clear(struct Mem *mem) > > { > > - if ((mem->type & (MEM_TYPE_AGG | MEM_TYPE_FRAME)) != 0 || > > - (mem->flags & MEM_Dyn) != 0) { > > - if (mem->type == MEM_TYPE_AGG) > > - sql_vdbemem_finalize(mem, mem->u.func); > > - assert(mem->type != MEM_TYPE_AGG); > > + if ((mem->type & MEM_TYPE_FRAME) != 0 || (mem->flags & MEM_Dyn) != 0) { > > It is a single type now, you can use type == MEM_TYPE_FRAME. Also a few lines > below you again check both the conditions: > > if ((mem->flags & MEM_Dyn) != 0) { > ... > } else if (mem->type == MEM_TYPE_FRAME) { > ... > } > > The 'else' don't need to check type == FRAME. It is true > anyway if this was true: > > if ((mem->type & MEM_TYPE_FRAME) != 0 || (mem->flags & MEM_Dyn) != 0) > > and "(mem->flags & MEM_Dyn) != 0" wasn't. Fixed. In addition, I believe that by the end of the refactoring of all the SQL built-in functions, we will drop MEM_Dyn as it is mostly, if not only, used in functions. Diff: diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index bb26da60a..e59935672 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -217,11 +217,11 @@ mem_create(struct Mem *mem) static inline void mem_clear(struct Mem *mem) { - if ((mem->type & MEM_TYPE_FRAME) != 0 || (mem->flags & MEM_Dyn) != 0) { + if (mem->type == MEM_TYPE_FRAME || (mem->flags & MEM_Dyn) != 0) { if ((mem->flags & MEM_Dyn) != 0) { assert(mem->xDel != SQL_DYNAMIC && mem->xDel != NULL); mem->xDel((void *)mem->z); - } else if (mem->type == MEM_TYPE_FRAME) { + } else { struct VdbeFrame *frame = mem->u.pFrame; frame->pParent = frame->v->pDelFrame; frame->v->pDelFrame = frame; diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index dfab86c50..b101fc6c2 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -4212,10 +4212,7 @@ case OP_AggFinal: { struct sql_context ctx; memset(&ctx, 0, sizeof(ctx)); struct Mem t; - memset(&t, 0, sizeof(t)); - t.type = MEM_TYPE_NULL; - assert(t.flags == 0); - t.db = pIn1->db; + mem_create(&t); ctx.pOut = &t; ctx.pMem = pIn1; ctx.func = pOp->p4.func; New patch: commit d30d6b78e5c9486fdc1986e74e6340e11a960f7f Author: Mergen Imeev Date: Thu Sep 9 17:19:03 2021 +0300 sql: remove sql_vdbemem_finalize() We don't need this function, since it is easier to call finalizers directly. This patch also allows us to make further simplifications. Needed for #4145 diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index f64cbe10a..e59935672 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -217,15 +217,11 @@ mem_create(struct Mem *mem) static inline void mem_clear(struct Mem *mem) { - if ((mem->type & (MEM_TYPE_AGG | MEM_TYPE_FRAME)) != 0 || - (mem->flags & MEM_Dyn) != 0) { - if (mem->type == MEM_TYPE_AGG) - sql_vdbemem_finalize(mem, mem->u.func); - assert(mem->type != MEM_TYPE_AGG); + if (mem->type == MEM_TYPE_FRAME || (mem->flags & MEM_Dyn) != 0) { if ((mem->flags & MEM_Dyn) != 0) { assert(mem->xDel != SQL_DYNAMIC && mem->xDel != NULL); mem->xDel((void *)mem->z); - } else if (mem->type == MEM_TYPE_FRAME) { + } else { struct VdbeFrame *frame = mem->u.pFrame; frame->pParent = frame->v->pDelFrame; frame->v->pDelFrame = frame; @@ -3067,31 +3063,6 @@ sqlVdbeMemTooBig(Mem * p) return 0; } -int -sql_vdbemem_finalize(struct Mem *mem, struct func *func) -{ - assert(func != NULL); - assert(func->def->language == FUNC_LANGUAGE_SQL_BUILTIN); - assert(func->def->aggregate == FUNC_AGGREGATE_GROUP); - assert(mem->type == MEM_TYPE_NULL || func == mem->u.func); - sql_context ctx; - memset(&ctx, 0, sizeof(ctx)); - Mem t; - memset(&t, 0, sizeof(t)); - t.type = MEM_TYPE_NULL; - assert(t.flags == 0); - t.db = mem->db; - ctx.pOut = &t; - ctx.pMem = mem; - ctx.func = func; - ((struct func_sql_builtin *)func)->finalize(&ctx); - assert((mem->flags & MEM_Dyn) == 0); - if (mem->szMalloc > 0) - sqlDbFree(mem->db, mem->zMalloc); - memcpy(mem, &t, sizeof(t)); - return ctx.is_aborted ? -1 : 0; -} - int sqlVdbeRecordCompareMsgpack(const void *key1, struct UnpackedRecord *key2) diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 54a1e931b..c0993e573 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -969,18 +969,6 @@ int sqlVdbeMemTooBig(Mem *); #define VdbeMemDynamic(X) (((X)->flags & MEM_Dyn) != 0 ||\ ((X)->type & (MEM_TYPE_AGG | MEM_TYPE_FRAME)) != 0) -/** MEM manipulate functions. */ - -/** - * Memory cell mem contains the context of an aggregate function. - * This routine calls the finalize method for that function. The - * result of the aggregate is stored back into mem. - * - * Returns -1 if the finalizer reports an error. 0 otherwise. - */ -int -sql_vdbemem_finalize(struct Mem *mem, struct func *func); - /** * Perform comparison of two tuples: unpacked (key1) and packed (key2) * diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 12dc9126b..b101fc6c2 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -4204,16 +4204,29 @@ case OP_AggStep: { * the step function was not previously called. */ case OP_AggFinal: { - Mem *pMem; assert(pOp->p1>0 && pOp->p1<=(p->nMem+1 - p->nCursor)); - pMem = &aMem[pOp->p1]; - assert(mem_is_null(pMem) || mem_is_agg(pMem)); - if (sql_vdbemem_finalize(pMem, pOp->p4.func) != 0) + struct func_sql_builtin *func = (struct func_sql_builtin *)pOp->p4.func; + struct Mem *pIn1 = &aMem[pOp->p1]; + assert(mem_is_null(pIn1) || mem_is_agg(pIn1)); + + struct sql_context ctx; + memset(&ctx, 0, sizeof(ctx)); + struct Mem t; + mem_create(&t); + ctx.pOut = &t; + ctx.pMem = pIn1; + ctx.func = pOp->p4.func; + func->finalize(&ctx); + assert((pIn1->flags & MEM_Dyn) == 0); + if (pIn1->szMalloc > 0) + sqlDbFree(pIn1->db, pIn1->zMalloc); + memcpy(pIn1, &t, sizeof(t)); + + if (ctx.is_aborted) goto abort_due_to_error; - UPDATE_MAX_BLOBSIZE(pMem); - if (sqlVdbeMemTooBig(pMem)) { + UPDATE_MAX_BLOBSIZE(pIn1); + if (sqlVdbeMemTooBig(pIn1) != 0) goto too_big; - } break; }