[Tarantool-patches] [PATCH v5 25/52] sql: introduce mem_set_uint()

[Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org>]

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 <imeevma@gmail.com>
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->p3<p->nOp);
 	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++;