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 2B8B16BD3C; Tue, 23 Mar 2021 12:47:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2B8B16BD3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616492839; bh=PQcXrNhUJkYFdfqFm2/8XxyFoLtLQ3yJXu7JuquI0pw=; 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=MJcr38at2jSh+0jOmPIf99xg9IepqcZbRe2P1/KveiAtM2W4NLs2vjyWNyevopW2k rg6sT/WYjdPrxsDDf7szqD2bzWKgBfyhrVu+O4OHOZMNQ3BMK5ENgO2hbq1IbMQHeK wgiZOn142QxUlFKFKh1BP19SG1S0TUyA/FZ3vjVk= Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43]) (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 21C9668F4F for ; Tue, 23 Mar 2021 12:35:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 21C9668F4F Received: by smtp63.i.mail.ru with esmtpa (envelope-from ) id 1lOdS2-00029h-9G; Tue, 23 Mar 2021 12:35:50 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 23 Mar 2021 12:35:49 +0300 Message-Id: <5878a78644e78681690c8404677fbd069776059c.1616491731.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: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD95D6E7CC48CB1F5F1DDD90A25A8FA528D0BFD61B598B81272182A05F53808504000D79DADC6AA671D322B4B8DA6AAEABDDEF5D4267664004EA76B58903077887C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7FC60B152D67C945BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637575FD8E213AF258FEA1F7E6F0F101C67CDEEF6D7F21E0D1D174C73DBBBFC7664D54267400E4E38EC5EB81B1A652B077917F26F57608BDAFF389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C091DAD9F922AA71188941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B692B0BE0DA6BB795DCC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C224967DACB3AE4B8FF8576E601842F6C81A12EF20D2F80756B5F7E9C4E3C761E06A776E601842F6C81A127C277FBC8AE2E8B3098C2772C747DBC3AA81AA40904B5D9DBF02ECDB25306B2201CA6A4E26CD07C3BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B091A620F70A64A45A99449624AB7ADAF3735872C767BF85DA29E625A9149C048EE3F735096452955E39E834CA16AA0C2CC4AD6D5ED66289B524E70A05D1297E1BB35872C767BF85DA227C277FBC8AE2E8B9602DEF5AA9A74B275ECD9A6C639B01B4E70A05D1297E1BBC6867C52282FAC85D9B7C4F32B44FF57C2F2A386D11C4599BD9CCCA9EDD067B1EDA766A37F9254B7 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C686AF563A045C75E007E65B26FDE3D356DECD472FF943E939C2B6934AE262D3EE7EAB7254005DCED114C52B35DBB74F4E7EAB7254005DCEDA5DF9383870C0FED1E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0D18C7F408F36097E8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C53592357E805773859926D01D6D400042873FD673E7E0AFA9B1660BDBA1205F61CAF97CA4BB76411D7E09C32AA3244C228293F22B668D59C07D2B1CEC76941730363D8B7DA7DD44FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojWJZv20R+6UjgEGV9tuY5+Q== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306ED0853F2A19CB4F652322B4B8DA6AAEABD5AB84C59671071105105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 25/53] sql: introduce mem_set_unsigned() 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 introduces mem_set_unsigned(). Function mem_set_unsigned() clears MEM and sets it to given unsigned value. Part of #5818 --- src/box/sql/func.c | 4 ++-- src/box/sql/mem.c | 24 ++++++++++++------------ src/box/sql/mem.h | 7 +++---- src/box/sql/vdbe.c | 22 +++++++++++----------- src/box/sql/vdbeapi.c | 4 ++-- src/box/sql/vdbeaux.c | 2 +- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 8f7550f30..d524c3d1e 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -281,7 +281,7 @@ port_lua_get_vdbemem(struct port *base, uint32_t *size) mem_set_integer(&val[i], field.ival, true); break; case MP_UINT: - mem_set_u64(&val[i], field.ival); + mem_set_unsigned(&val[i], field.ival); break; case MP_STR: if (sqlVdbeMemSetStr(&val[i], field.sval.data, @@ -352,7 +352,7 @@ port_c_get_vdbemem(struct port *base, uint32_t *size) mem_set_integer(&val[i], mp_decode_int(&data), true); break; case MP_UINT: - mem_set_u64(&val[i], mp_decode_uint(&data)); + mem_set_unsigned(&val[i], mp_decode_uint(&data)); break; case MP_STR: str = mp_decode_str(&data, &len); 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 @@ -272,6 +272,15 @@ mem_set_integer(struct Mem *mem, int64_t value, bool is_neg) mem->field_type = FIELD_TYPE_INTEGER; } +void +mem_set_unsigned(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) { @@ -1449,7 +1458,7 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type) return 0; } if (d >= (double)INT64_MAX && d < (double)UINT64_MAX) { - mem_set_u64(pMem, d); + mem_set_unsigned(pMem, d); return 0; } return -1; @@ -1646,7 +1655,7 @@ mem_apply_type(struct Mem *record, enum field_type type) 1) > 0) return 0; if ((double)(uint64_t)d == d) - mem_set_u64(record, (uint64_t)d); + mem_set_unsigned(record, (uint64_t)d); } else { if (double_compare_nint64(d, INT64_MIN, 1) < 0) return 0; @@ -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); return 0; } @@ -1907,15 +1916,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 0fd902274..8090fb9a0 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -173,6 +173,9 @@ mem_set_null(struct Mem *mem); void mem_set_integer(struct Mem *mem, int64_t value, bool is_neg); +void +mem_set_unsigned(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 @@ -416,10 +419,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 92845d66d..dd196d299 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -577,7 +577,7 @@ case OP_Gosub: { /* jump */ pIn1 = &aMem[pOp->p1]; assert(VdbeMemDynamic(pIn1)==0); memAboutToChange(p, pIn1); - mem_set_u64(pIn1, pOp - aOp); + mem_set_unsigned(pIn1, pOp - aOp); REGISTER_TRACE(p, pOp->p1, pIn1); /* Most jump operations do a goto to this spot in order to update @@ -618,7 +618,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_unsigned(pOut, pOp->p3 - 1); if (pOp->p2) goto jump_to_p2; break; } @@ -661,7 +661,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_unsigned(pIn1, pOp - aOp); REGISTER_TRACE(p, pOp->p1, pIn1); pOp = &aOp[pcDest]; break; @@ -2142,7 +2142,7 @@ case OP_Count: { /* out2 */ nEntry = tarantoolsqlEphemeralCount(pCrsr); } pOut = vdbe_prepare_null_out(p, pOp->p2); - mem_set_u64(pOut, nEntry); + mem_set_unsigned(pOut, nEntry); break; } @@ -2920,7 +2920,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_unsigned(pOut, seq_val); break; } @@ -2936,7 +2936,7 @@ case OP_NextSequenceId: { uint64_t id = 0; tarantoolSqlNextSeqId(&id); id++; - mem_set_u64(pOut, id); + mem_set_unsigned(pOut, id); break; } @@ -2966,7 +2966,7 @@ case OP_NextIdEphemeral: { goto abort_due_to_error; } pOut = vdbe_prepare_null_out(p, pOp->p2); - mem_set_u64(pOut, rowid); + mem_set_unsigned(pOut, rowid); break; } @@ -4234,7 +4234,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_unsigned(pOut, x); break; } @@ -4490,10 +4490,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_unsigned(pOut, u); break; } diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index b0f1f202f..0f41db21d 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_unsigned(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_unsigned(&p->aVar[i - 1], value); return rc; } diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index 3d1f094b8..c4cf1109f 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_unsigned(pMem, i); pMem++; -- 2.25.1