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 8EAB16EC57; Fri, 15 Oct 2021 01:46:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8EAB16EC57 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1634251572; bh=FpzmdVkZrnKlzAWriQpy8Yqcg1zkpysOlme3ulYNTe4=; 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=n926dnf/tPWAJ1LAu0D25h6ygyBqcAT2tiAusWjr4VfE/pHFOqE3fs6kaPLN+qx7H cG4kECGpNfLQ0l5Ts+tLCdg/QzgxgYD06xFpsoI1TErVv5mL+5qIuuQO4MIj2YjpUX p6dar6ZLKne6pgLtoMwBDUyRrKeTtnemjG8DS17g= 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 1816B6EC57 for ; Fri, 15 Oct 2021 01:46:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1816B6EC57 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mb9UI-0000yW-8Z; Fri, 15 Oct 2021 01:46:10 +0300 Message-ID: Date: Fri, 15 Oct 2021 00:46:09 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <86bc99060c5e4a37a4ee5df2c1b98cd8f77e4765.1633713433.git.imeevma@gmail.com> Content-Language: en-US In-Reply-To: <86bc99060c5e4a37a4ee5df2c1b98cd8f77e4765.1633713433.git.imeevma@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9AE9EF867AE584ADAD02C1BB74825E2CA4EFE654DC9C42E7D182A05F5380850401BC94462542C21506188F98414141241E9C152E865B79C07E760D8FFE6BA95AD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73B44982FA5E78411EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373D332FFE8BBF4EB58638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D893CB596F6A46DC6F1801BB0EF671F807117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B50580647984BABFFB5221EA12B1BDCB57F7 X-C1DE0DAB: 0D63561A33F958A594D9DB0EEEABA00C5F7CE6D970F6E27BE0F781FA34EBA702D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7557E988E9157162368E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349FD10E01B3CDC9E2BF56158BBCDAA9B559B95C69950DC625D1698EF3B7A5356AB280468B7AA805C81D7E09C32AA3244C600E537D7C716AE5FC4699EA4F084BD763871F383B54D9B3729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojZCle+NCKLXGa+pqOPqqICw== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DB5B901CDEA3669A1ED230621CB9344FB3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v1 19/21] sql: remove MEM_Dyn flag 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" Thanks for the patch! > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 895003580..a001ac8c5 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -2689,15 +2623,12 @@ sqlVdbeMemPrettyPrint(Mem *pMem, char *zBuf) > if (pMem->type == MEM_TYPE_BIN) { > int i; > char c; > - if (f & MEM_Dyn) { > - c = 'z'; > - assert((f & (MEM_Static|MEM_Ephem))==0); > - } else if (f & MEM_Static) { > + if (f & MEM_Static) { 1. != 0. > c = 't'; > - assert((f & (MEM_Dyn|MEM_Ephem))==0); > + assert((f & MEM_Ephem) == 0); > } else if (f & MEM_Ephem) { > c = 'e'; > - assert((f & (MEM_Static|MEM_Dyn))==0); > + assert((f & MEM_Static) == 0); > } else { > c = 's'; > } > @@ -2721,15 +2652,12 @@ sqlVdbeMemPrettyPrint(Mem *pMem, char *zBuf) > } else if (pMem->type == MEM_TYPE_STR) { > int j, k; > zBuf[0] = ' '; > - if (f & MEM_Dyn) { > - zBuf[1] = 'z'; > - assert((f & (MEM_Static|MEM_Ephem))==0); > - } else if (f & MEM_Static) { > + if (f & MEM_Static) { 2. != 0. > zBuf[1] = 't'; > - assert((f & (MEM_Dyn|MEM_Ephem))==0); > + assert((f & MEM_Ephem)==0); > } else if (f & MEM_Ephem) { > zBuf[1] = 'e'; > - assert((f & (MEM_Static|MEM_Dyn))==0); > + assert((f & MEM_Static)==0); 3. Spaces around == here and above.