From: Ivan Koptelov <ivan.koptelov@tarantool.org> To: tarantool-patches@freelists.org, korablev@tarantool.org Cc: Ivan Koptelov <ivan.koptelov@tarantool.org> Subject: [tarantool-patches] [PATCH 1/2] sql: make aggregate functions types more strict Date: Fri, 5 Apr 2019 17:57:43 +0300 [thread overview] Message-ID: <ed6e1d0dfbd3eb56fb3224889cfc4dc395739aae.1554475881.git.ivan.koptelov@tarantool.org> (raw) In-Reply-To: <cover.1554475881.git.ivan.koptelov@tarantool.org> Let's firstly fix code-style. --- src/box/sql/func.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index b86a95d9a..b1bfc886e 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -1585,23 +1585,22 @@ countFinalize(sql_context * context) * Routines to implement min() and max() aggregate functions. */ static void -minmaxStep(sql_context * context, int NotUsed, sql_value ** argv) +minmaxStep(sql_context *context, int not_used, sql_value **argv) { - Mem *pArg = (Mem *) argv[0]; - Mem *pBest; - UNUSED_PARAMETER(NotUsed); + UNUSED_PARAMETER(not_used); + sql_value *arg = argv[0]; + sql_value *best = sql_aggregate_context(context, sizeof(*best)); - pBest = (Mem *) sql_aggregate_context(context, sizeof(*pBest)); - if (!pBest) + if (best == NULL) return; if (sql_value_type(argv[0]) == SQL_NULL) { - if (pBest->flags) + if (best->flags != 0) sqlSkipAccumulatorLoad(context); - } else if (pBest->flags) { + } else if (best->flags != 0) { int max; int cmp; - struct coll *pColl = sqlGetFuncCollSeq(context); + struct coll *coll = sqlGetFuncCollSeq(context); /* This step function is used for both the min() and max() aggregates, * the only difference between the two being that the sense of the * comparison is inverted. For the max() aggregate, the @@ -1611,15 +1610,15 @@ minmaxStep(sql_context * context, int NotUsed, sql_value ** argv) * aggregate, or 0 for min(). */ max = sql_user_data(context) != 0; - cmp = sqlMemCompare(pBest, pArg, pColl); - if ((max && cmp < 0) || (!max && cmp > 0)) { - sqlVdbeMemCopy(pBest, pArg); + cmp = sqlMemCompare(best, arg, coll); + if ((max != 0 && cmp < 0) || (max == 0 && cmp > 0)) { + sqlVdbeMemCopy(best, arg); } else { sqlSkipAccumulatorLoad(context); } } else { - pBest->db = sql_context_db_handle(context); - sqlVdbeMemCopy(pBest, pArg); + best->db = sql_context_db_handle(context); + sqlVdbeMemCopy(best, arg); } } @@ -1628,8 +1627,8 @@ minMaxFinalize(sql_context * context) { sql_value *pRes; pRes = (sql_value *) sql_aggregate_context(context, 0); - if (pRes) { - if (pRes->flags) { + if (pRes != NULL) { + if (pRes->flags != 0) { sql_result_value(context, pRes); } sqlVdbeMemRelease(pRes); -- 2.20.1
next prev parent reply other threads:[~2019-04-05 14:57 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-05 14:57 [tarantool-patches] [PATCH 0/2] " Ivan Koptelov 2019-04-05 14:57 ` Ivan Koptelov [this message] 2019-04-09 14:52 ` [tarantool-patches] Re: [PATCH 1/2] " n.pettik 2019-04-05 14:57 ` [tarantool-patches] [PATCH 2/2] " Ivan Koptelov 2019-04-05 19:48 ` [tarantool-patches] " Konstantin Osipov 2019-04-17 12:50 ` i.koptelov 2019-04-17 13:19 ` n.pettik 2019-04-09 14:52 ` n.pettik 2019-04-23 15:38 ` i.koptelov 2019-04-24 17:37 ` n.pettik 2019-05-06 13:24 ` i.koptelov
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=ed6e1d0dfbd3eb56fb3224889cfc4dc395739aae.1554475881.git.ivan.koptelov@tarantool.org \ --to=ivan.koptelov@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH 1/2] sql: make aggregate functions types more strict' \ /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