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 431FB6EC5D; Fri, 9 Apr 2021 21:13:44 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 431FB6EC5D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1617992024; bh=T1hZkMEJmS7re1qrH3mv9JwNsMYzQZUwF9ZTL2Q1bF4=; 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=UrU4UPtKJxjKBY/Jxgg3knT92XEj0+bfZA1YBQTjnc7b4LOCTAffahRt+hROV0Qmt FrcN7COoEkH1AdtFdNSORh5w2SpnBs5XwOb8wRyzKu/lNSNFJPC8ALoLQtQmEWvdAK MrkxS6YLQz5L6ftG2vIY+3gaQT+5t4bErLif9yWU= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 C68316F3C7 for ; Fri, 9 Apr 2021 21:11:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C68316F3C7 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lUvbf-0004MZ-WD; Fri, 09 Apr 2021 21:11:48 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 9 Apr 2021 21:11:47 +0300 Message-Id: <93900f797e7e000af0efe5a1df1f7162f2f56db1.1617984948.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480EBD5CA77A668ECB87DA2124B0A8E6609182A05F538085040CE00131CCCAA7B32B796E39B5B356EE4957229D26FEF6620A609357885493C55 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7EBC3E7439A970C64EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006376AEB812070489DF38638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2F46C0DD464D607B9CB90C933489DA6BE07164437C8F97EC6D2E47CDBA5A96583C09775C1D3CA48CF776A0366D588B3C3117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE7ECE82AE7387CF2AD9FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735C6EABA9B74D0DA47B5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CD0035DD76F8A8A4F1D7DD33E8CF680692C3DDC2FA1620AC99C2B6934AE262D3EE7EAB7254005DCED114C52B35DBB74F4E7EAB7254005DCEDA5DF9383870C0FED1E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0D18C7F408F36097E8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D348F9E8EBB462314879B095E62F8C23E02928479FD4F031CCDF0B2B11B02171CC2A16775E113DC52B91D7E09C32AA3244C6A1A65E0F203F5C5E1620DEA3EEFE612725D5B54B2FE4575FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyO2lHpuZu4RLi4NcDN5OCg== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638229BA8CAEB733C3352E96BE6EE6AE0392083D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v5 25/52] sql: introduce mem_set_uint() 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" Thank you for the review! My answers and new patch below. On 30.03.2021 02:04, Vladislav Shpilevoy wrote: > Thanks for the patch! > >> diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c >> index 13a587aba..f7a1a9b8a 100644 >> --- a/src/box/sql/mem.c >> +++ b/src/box/sql/mem.c >> @@ -1765,7 +1774,7 @@ mem_convert_to_unsigned(struct Mem *mem) >> double d = mem->u.r; >> if (d < 0.0 || d >= (double)UINT64_MAX) >> return -1; >> - mem_set_u64(mem, (uint64_t) d); >> + mem_set_unsigned(mem, (uint64_t) d); > > Whitespace after unary operator. Fixed. New patch: commit 93900f797e7e000af0efe5a1df1f7162f2f56db1 Author: Mergen Imeev Date: Mon Mar 15 12:38:26 2021 +0300 sql: introduce mem_set_uint() This patch introduces mem_set_uint(). This function clears MEM and sets it to given unsigned value. Part of #5818 diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 075000218..d79d471bc 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -282,6 +282,15 @@ mem_set_int(struct Mem *mem, int64_t value, bool is_neg) mem->field_type = FIELD_TYPE_INTEGER; } +void +mem_set_uint(struct Mem *mem, uint64_t value) +{ + mem_clear(mem); + mem->u.u = value; + mem->flags = MEM_UInt; + mem->field_type = FIELD_TYPE_UNSIGNED; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -1953,15 +1962,6 @@ mem_set_ptr(struct Mem *mem, void *ptr) mem->u.p = ptr; } -void -mem_set_u64(struct Mem *mem, uint64_t value) -{ - mem_clear(mem); - mem->u.u = value; - MemSetTypeFlag(mem, MEM_UInt); - mem->field_type = FIELD_TYPE_UNSIGNED; -} - void mem_set_double(struct Mem *mem, double value) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 788f3c89f..8bc058d3b 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -170,6 +170,10 @@ mem_set_null(struct Mem *mem); void mem_set_int(struct Mem *mem, int64_t value, bool is_neg); +/** Clear MEM and set it to UNSIGNED. */ +void +mem_set_uint(struct Mem *mem, uint64_t value); + /** * Copy content of MEM from one MEM to another. In case source MEM contains * string or binary and allocation type is not STATIC, this value is copied to @@ -451,10 +455,6 @@ mem_set_bool(struct Mem *mem, bool value); void mem_set_ptr(struct Mem *mem, void *ptr); -/** Set unsigned value and MEM_UInt flag. */ -void -mem_set_u64(struct Mem *mem, uint64_t value); - /** Set double value and MEM_Real flag. */ void mem_set_double(struct Mem *mem, double value); diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 0a3de8ac9..eb997fa3d 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -609,7 +609,7 @@ case OP_Gosub: { /* jump */ pIn1 = &aMem[pOp->p1]; assert(VdbeMemDynamic(pIn1)==0); memAboutToChange(p, pIn1); - mem_set_u64(pIn1, pOp - aOp); + mem_set_uint(pIn1, pOp - aOp); REGISTER_TRACE(p, pOp->p1, pIn1); /* Most jump operations do a goto to this spot in order to update @@ -650,7 +650,7 @@ case OP_InitCoroutine: { /* jump */ assert(pOp->p3>0 && pOp->p3nOp); pOut = &aMem[pOp->p1]; assert(!VdbeMemDynamic(pOut)); - mem_set_u64(pOut, pOp->p3 - 1); + mem_set_uint(pOut, pOp->p3 - 1); if (pOp->p2) goto jump_to_p2; break; } @@ -693,7 +693,7 @@ case OP_Yield: { /* in1, jump */ pIn1 = &aMem[pOp->p1]; assert(VdbeMemDynamic(pIn1)==0); int pcDest = (int)pIn1->u.u; - mem_set_u64(pIn1, pOp - aOp); + mem_set_uint(pIn1, pOp - aOp); REGISTER_TRACE(p, pOp->p1, pIn1); pOp = &aOp[pcDest]; break; @@ -2233,7 +2233,7 @@ case OP_Count: { /* out2 */ nEntry = tarantoolsqlEphemeralCount(pCrsr); } pOut = vdbe_prepare_null_out(p, pOp->p2); - mem_set_u64(pOut, nEntry); + mem_set_uint(pOut, nEntry); break; } @@ -3011,7 +3011,7 @@ case OP_Sequence: { /* out2 */ assert(p->apCsr[pOp->p1]!=0); pOut = vdbe_prepare_null_out(p, pOp->p2); int64_t seq_val = p->apCsr[pOp->p1]->seqCount++; - mem_set_u64(pOut, seq_val); + mem_set_uint(pOut, seq_val); break; } @@ -3027,7 +3027,7 @@ case OP_NextSequenceId: { uint64_t id = 0; tarantoolSqlNextSeqId(&id); id++; - mem_set_u64(pOut, id); + mem_set_uint(pOut, id); break; } @@ -3057,7 +3057,7 @@ case OP_NextIdEphemeral: { goto abort_due_to_error; } pOut = vdbe_prepare_null_out(p, pOp->p2); - mem_set_u64(pOut, rowid); + mem_set_uint(pOut, rowid); break; } @@ -4324,7 +4324,7 @@ case OP_OffsetLimit: { /* in1, out2, in3 */ "values should not result in integer overflow"); goto abort_due_to_error; } - mem_set_u64(pOut, x); + mem_set_uint(pOut, x); break; } @@ -4580,10 +4580,10 @@ case OP_Init: { /* jump */ case OP_IncMaxid: { assert(pOp->p1 > 0); pOut = vdbe_prepare_null_out(p, pOp->p1); - - if (tarantoolsqlIncrementMaxid(&pOut->u.u) != 0) + uint64_t u; + if (tarantoolsqlIncrementMaxid(&u) != 0) goto abort_due_to_error; - pOut->flags = MEM_UInt; + mem_set_uint(pOut, u); break; } diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 737477285..6c08e772d 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -183,7 +183,7 @@ sql_result_double(sql_context * pCtx, double rVal) void sql_result_uint(sql_context *ctx, uint64_t u_val) { - mem_set_u64(ctx->pOut, u_val); + mem_set_uint(ctx->pOut, u_val); } void @@ -851,7 +851,7 @@ sql_bind_uint64(struct sql_stmt *stmt, int i, uint64_t value) if (vdbeUnbind(p, i) != 0) return -1; int rc = sql_bind_type(p, i, "integer"); - mem_set_u64(&p->aVar[i - 1], value); + mem_set_uint(&p->aVar[i - 1], value); return rc; } diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index 8e50d47bf..ae55e4c29 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -1291,7 +1291,7 @@ sqlVdbeList(Vdbe * p) } if (p->explain == 1) { assert(i >= 0); - mem_set_u64(pMem, i); + mem_set_uint(pMem, i); pMem++;