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 85A9B6ECDB; Thu, 9 Dec 2021 03:31:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 85A9B6ECDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1639009901; bh=sG9uK/yi+DKZHiIR9QpC0lLJ8s5A0M18Pa1d4+he3l8=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=K62iEuB6c5uX1nckjU9WdgMlHVHVqR4bCrosm8TpWt5SUoHqK0B8kk2kL/1CyQGqH +Kx8HrR3LFv6sO6Qobe48Sql4CbQiMCi7YtKyAomob4zfda2ePQuA3lZsndcECV2eC UVy/2FuhbtvSWqFa3P2kl6WCSKFBvkWUkDExnzSQ= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (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 08BBF6ECC0 for ; Thu, 9 Dec 2021 03:31:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 08BBF6ECC0 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mv7LT-0002jb-7t; Thu, 09 Dec 2021 03:31:35 +0300 Message-ID: Date: Thu, 9 Dec 2021 01:31:34 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Content-Language: en-US To: Mergen Imeev Cc: tarantool-patches@dev.tarantool.org References: <20211125083336.GA56448@tarantool.org> <819eff36-2d59-3328-e442-10703dbbda99@tarantool.org> <20211202083253.GA8207@tarantool.org> In-Reply-To: <20211202083253.GA8207@tarantool.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD99F281DB1F96F126D9C1D842AD902915DE151DB5A2A30BD9000894C459B0CD1B96E2F8CE2650DC7E5FE26758448992FBADC5E47865CB5854670620434C0A4BCCF X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7800ADC36C757FFF6EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637D0C488966F20D4908638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8DE723E8EF146C0A29EB2CF640AE6FA53117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3A703B70628EAD7BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5BE71AABFC178177CDFE5AB436EAB52FB922789862B4BFE55D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7506FE1F977233B9BB410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D343D50AEDB859DBAD9C8077644695EE67EE31280A304F93E88E82DCD1FCD248C4673689632B5DCA6271D7E09C32AA3244C37FD57126F0613442A7524D9C7150F1DBBA718C7E6A9E042729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioja3eBVivI1t1QEK2W/uOQIQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DC31C963D7B9F1B0E2D0E2B3AEA765FBB3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E25FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v1 1/2] sql: properly check bind variable names 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the fixes! >>>>> diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c >>>>> index eb169aeb8..74a98c550 100644 >>>>> --- a/src/box/sql/expr.c >>>>> +++ b/src/box/sql/expr.c >>>>> @@ -1314,6 +1314,52 @@ sqlExprAssignVarNumber(Parse * pParse, Expr * pExpr, u32 n) >>>>> } >>>>> } >>>>> >>>>> +struct Expr * >>>>> +expr_variable(struct Parse *parse, struct Token *spec, struct Token *id) >>>> >>>> 1. You might want to call it expr_new_variable(). Or sql_expr_new_variable(). >>>> To be consistent with our naming policy for constructors allocating memory >>>> and for consistency with with sql_expr_new_column(), sql_expr_new(), >>>> sql_expr_new_dequoted(), sql_expr_new_named(), sql_expr_new_anon(). >>>> >>> Thank you! I renamed it to expr_new_variable(). I believe we should drop 'sql_' >>> prefix for functions that only accessible in SQL. >> >> It would work for static functions. But if a function is visible in other >> modules as a symbol, then you would get a conflict during linking if we >> ever introduce another 'struct expr' somewhere. Even if they do not interest >> anywhere in the code. However I don't mind leaving it as is. It can be fixed >> later if ever needed. >> > I agree. However, I think we need to rework all the places where BOX uses > internal SQL functions and structures. In this case, the struct expr should > never be available in the BOX, so there should be no conflicts. It is a misunderstanding. It does not matter if you use a function in box or not. If it is not static and is defined in 2 places - you will get a conflict during link stage. Try to add a function with the same name to any file in sql and to any file in box. Something like void link_test123(void) { printf("in link test\n"); } (in a .cc file you would need to add 'extern "C"' for it). It will raise an error during build. I added it to expr.c and to box.cc (with 'extern "C"'): duplicate symbol '_link_test123' in: ../../src/box/libbox.a(box.cc.o) ../../src/box/libbox.a(expr.c.o) ld: 1 duplicate symbol for architecture x86_64 It means if we ever have another expr, there will be a conflict. Does not matter if they intersect in code. We will get a compile error even on the struct name duplicate I think. But not sure. See 2 comments below. > diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c > index eb169aeb8..e832984c3 100644 > --- a/src/box/sql/expr.c > +++ b/src/box/sql/expr.c > @@ -1314,6 +1314,52 @@ sqlExprAssignVarNumber(Parse * pParse, Expr * pExpr, u32 n) > } > } > > +struct Expr * > +expr_new_variable(struct Parse *parse, const struct Token *spec, > + const struct Token *id) > +{ > + assert(spec != NULL && spec->n == 1); > + uint32_t len = 1; > + if (parse->parse_only) { > + diag_set(ClientError, ER_SQL_PARSER_GENERIC_WITH_POS, > + parse->line_count, parse->line_pos, > + "bindings are not allowed in DDL"); > + parse->is_aborted = true; > + return NULL; > + } > + if (id != NULL) { > + assert(spec->z[0] != '?'); > + if (id->z - spec->z != 1) { > + diag_set(ClientError, ER_SQL_UNKNOWN_TOKEN, > + parse->line_count, spec->z - parse->zTail + 1, > + spec->n, spec->z); > + parse->is_aborted = true; > + return NULL; > + } > + if (spec->z[0] == '#' && sqlIsdigit(id->z[0])) { > + diag_set(ClientError, ER_SQL_SYNTAX_NEAR_TOKEN, > + parse->line_count, spec->n, spec->z); > + parse->is_aborted = true; > + return NULL; > + } > + len += id->n; > + } > + struct Expr *expr = sql_expr_new_empty(parse->db, TK_VARIABLE, len + 1); > + expr->type = FIELD_TYPE_BOOLEAN; 1. It will crash in case allocation fails and expr == NULL. Although maybe it is not important if we plan to add panic() on malloc failure in SQL. The same way as it already works in xmalloc(). > + expr->flags = EP_Leaf; > + expr->iAgg = -1; 2. iAgg -1 is already set in sql_expr_new_empty(). nHeight too. And then the assert about SQL_MAX_EXPR_DEPTH > 0 is not needed either.