From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: "n.pettik" <korablev@tarantool.org>, tarantool-patches@freelists.org Subject: [tarantool-patches] Re: [PATCH 2/6] sql: separate VDBE memory holding positive and negative ints Date: Mon, 1 Jul 2019 23:53:07 +0200 [thread overview] Message-ID: <09e60c9d-8a1e-38d8-a474-cfcbc586f9f4@tarantool.org> (raw) In-Reply-To: <FF6FA731-9F47-4223-A264-66690C8ED766@tarantool.org> Thanks for the fixes! Consider new ones below, and on the branch in a separate commit. ===================================================== diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 83c0e90f1..2be42faf2 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -260,7 +260,7 @@ allocateCursor( int mem_apply_numeric_type(struct Mem *record) { - if ((record->flags & (MEM_Str | MEM_Int | MEM_Real | MEM_UInt)) != MEM_Str) + if ((record->flags & MEM_Str) == 0) return -1; int64_t integer_value; bool is_neg; @@ -936,7 +936,7 @@ case OP_Return: { /* in1 */ case OP_InitCoroutine: { /* jump */ assert(pOp->p1>0 && pOp->p1<=(p->nMem+1 - p->nCursor)); assert(pOp->p2>=0 && pOp->p2<p->nOp); - assert(pOp->p3>=0 && pOp->p3<p->nOp); + assert(pOp->p3>0 && pOp->p3<p->nOp); pOut = &aMem[pOp->p1]; assert(!VdbeMemDynamic(pOut)); mem_set_u64(pOut, pOp->p3 - 1); @@ -1061,10 +1061,12 @@ case OP_Halt: { */ case OP_Integer: { /* out2 */ pOut = out2Prerelease(p, pOp); - if (pOp->p1 < 0) + if (pOp->p1 < 0) { pOut->u.i = pOp->p1; - else + assert((pOut->flags & MEM_Int) != 0); + } else { mem_set_u64(pOut, pOp->p1); + } break; } @@ -3307,8 +3309,7 @@ case OP_SeekGT: { /* jump, in3 */ * the seek, so convert it. */ pIn3 = &aMem[reg_ipk]; - if ((pIn3->flags & (MEM_Int | MEM_UInt | MEM_Real | - MEM_Str)) == MEM_Str) + if ((pIn3->flags & MEM_Str) != 0) mem_apply_numeric_type(pIn3); int64_t i; if ((pIn3->flags & MEM_Int) == MEM_Int) { @@ -4921,9 +4922,8 @@ case OP_OffsetLimit: { /* in1, out2, in3 */ case OP_IfNotZero: { /* jump, in1 */ pIn1 = &aMem[pOp->p1]; assert((pIn1->flags & MEM_UInt) != 0); - VdbeBranchTaken(pIn1->u.u<0, 2); - if (pIn1->u.u) { - if (pIn1->u.u > 0) pIn1->u.u--; + if (pIn1->u.u > 0) { + pIn1->u.u--; goto jump_to_p2; } break; @@ -4938,8 +4938,8 @@ case OP_IfNotZero: { /* jump, in1 */ case OP_DecrJumpZero: { /* jump, in1 */ pIn1 = &aMem[pOp->p1]; assert((pIn1->flags & MEM_UInt) != 0); - if (pIn1->u.i>SMALLEST_INT64) pIn1->u.u--; - VdbeBranchTaken(pIn1->u.i==0, 2); + if (pIn1->u.u > 0) + pIn1->u.u--; if (pIn1->u.u == 0) goto jump_to_p2; break; }
next prev parent reply other threads:[~2019-07-01 21:52 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-07 15:37 [tarantool-patches] [PATCH 0/6] Introduce UNSIGNED type in SQL Nikita Pettik 2019-06-07 15:37 ` [tarantool-patches] [PATCH 1/6] sql: refactor sql_atoi64() Nikita Pettik 2019-06-11 21:11 ` [tarantool-patches] " Vladislav Shpilevoy 2019-07-01 14:20 ` n.pettik 2019-07-01 21:53 ` Vladislav Shpilevoy 2019-07-05 16:32 ` n.pettik 2019-06-07 15:37 ` [tarantool-patches] [PATCH 2/6] sql: separate VDBE memory holding positive and negative ints Nikita Pettik 2019-06-11 21:11 ` [tarantool-patches] " Vladislav Shpilevoy 2019-07-01 14:21 ` n.pettik 2019-07-01 21:53 ` Vladislav Shpilevoy [this message] 2019-07-05 16:33 ` n.pettik 2019-06-07 15:37 ` [tarantool-patches] [PATCH 3/6] sql: refactor arithmetic operations to support unsigned ints Nikita Pettik 2019-06-11 21:11 ` [tarantool-patches] " Vladislav Shpilevoy 2019-07-01 14:21 ` n.pettik 2019-07-01 21:53 ` Vladislav Shpilevoy 2019-07-05 16:36 ` n.pettik 2019-07-10 22:49 ` Vladislav Shpilevoy 2019-07-17 12:24 ` n.pettik 2019-06-07 15:37 ` [tarantool-patches] [PATCH 4/6] sql: make built-in functions operate on unsigned values Nikita Pettik 2019-06-11 21:11 ` [tarantool-patches] " Vladislav Shpilevoy 2019-07-01 14:21 ` n.pettik 2019-07-01 21:53 ` Vladislav Shpilevoy 2019-07-05 16:36 ` n.pettik 2019-07-10 22:49 ` Vladislav Shpilevoy 2019-07-17 0:53 ` n.pettik 2019-06-07 15:37 ` [tarantool-patches] [PATCH 5/6] sql: introduce extended range for INTEGER type Nikita Pettik 2019-06-11 21:11 ` [tarantool-patches] " Vladislav Shpilevoy 2019-07-01 14:21 ` n.pettik 2019-07-01 21:53 ` Vladislav Shpilevoy 2019-07-24 15:59 ` Konstantin Osipov 2019-07-24 16:54 ` n.pettik 2019-07-24 17:09 ` Konstantin Osipov 2019-06-07 15:37 ` [tarantool-patches] [PATCH 6/6] sql: allow to specify UNSIGNED column type Nikita Pettik 2019-07-01 21:53 ` [tarantool-patches] " Vladislav Shpilevoy 2019-07-05 16:36 ` n.pettik 2019-07-10 22:49 ` Vladislav Shpilevoy 2019-07-11 21:25 ` Vladislav Shpilevoy 2019-07-17 0:53 ` n.pettik 2019-07-18 20:18 ` Vladislav Shpilevoy 2019-07-18 20:56 ` n.pettik 2019-07-18 21:08 ` Vladislav Shpilevoy 2019-07-18 21:13 ` Vladislav Shpilevoy 2019-07-22 10:20 ` n.pettik 2019-07-22 19:17 ` Vladislav Shpilevoy 2019-07-22 10:20 ` n.pettik 2019-07-17 0:54 ` n.pettik 2019-07-18 20:18 ` Vladislav Shpilevoy 2019-08-06 19:36 ` n.pettik 2019-07-24 13:01 ` [tarantool-patches] Re: [PATCH 0/6] Introduce UNSIGNED type in SQL Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=09e60c9d-8a1e-38d8-a474-cfcbc586f9f4@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='[tarantool-patches] Re: [PATCH 2/6] sql: separate VDBE memory holding positive and negative ints' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox