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 5ACDD6EC40; Tue, 21 Sep 2021 14:06:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5ACDD6EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1632222372; bh=Kp93JHCj31CA1uicMGAq/H2slCjuiMOmoaQ7UreEwSo=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=s97szUz47G8XrsM836NHyHDc5FJwzqsuaDO/AkWLGuQ5n8NL2nnKlBNjtV0x4RiNm HOFyYXhVqAPjE9PMbSoBdkCNrDQ5vFnKLcqPZC4SIsmdxoYRG0EnaPY6UnK2d5/AAO aXJmzcW4PnWf9Y+Z1BeFVOF2SiY4OJRDHt7XXgGk= 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 84DB06F3E3 for ; Tue, 21 Sep 2021 13:59:35 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 84DB06F3E3 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mSdUs-0001Gg-Ur; Tue, 21 Sep 2021 13:59:35 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 21 Sep 2021 13:59:34 +0300 Message-Id: <43ae9e1cd2b53ef544e855608ed0a3edbd79c2f9.1632220375.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD91AE02D33A9C88A2F6A36F53BB3AD52253F2DCAAB31849A6F00894C459B0CD1B9E7A59488BC060405885C49735BF8E033994D8960CDEEF0A8CC29A3283896A6B0 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73B44982FA5E78411EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637670E1B164B70895C8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D83D31C3775A5D6BA417A5447DB4C439C0117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCC908CD1B87A134A2A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520B1593CA6EC85F86DBDFBBEFFF4125B51D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CB382FA991BF7A44CAD3907A41AC2011488D0DDAA4BAD2A6E9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742F36E2E0160E5C5538A5251AA20633D2658C12E6D310A6D536F8235414F7F731CDC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3454E98140CCACB5B317DD38B33229FD9FFDF471C173DED66A97E3EE70EF23AEB98B7C72368652D50B1D7E09C32AA3244C55879101DB5E9F677004834E3C2B528C3A76366E8A9DE7CA729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnvI84oHUDXBTNVWLfynv3Q== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D53A649857FCD5F53E36670359E34412183D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 14/15] sql: remove MEM_TYPE_AGG 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: Mergen Imeev via Tarantool-patches Reply-To: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch removed MEM_TYPE_AGG, which is no longer used due to recent changes. Part of #4145 --- src/box/sql/mem.c | 25 ------------------------- src/box/sql/mem.h | 9 +-------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index fb304d868..51c580d1b 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -605,22 +605,6 @@ mem_set_frame(struct Mem *mem, struct VdbeFrame *frame) mem->u.pFrame = frame; } -int -mem_set_agg(struct Mem *mem, struct func *func, int size) -{ - mem_clear(mem); - if (size <= 0) - return 0; - if (sqlVdbeMemGrow(mem, size, 0) != 0) - return -1; - memset(mem->z, 0, size); - mem->n = size; - mem->type = MEM_TYPE_AGG; - assert(mem->flags == 0); - mem->u.func = func; - return 0; -} - void mem_set_null_clear(struct Mem *mem) { @@ -1884,15 +1868,6 @@ mem_len(const struct Mem *mem, uint32_t *len) return 0; } -int -mem_get_agg(const struct Mem *mem, void **accum) -{ - if (mem->type != MEM_TYPE_AGG) - return -1; - *accum = mem->z; - return 0; -} - int mem_copy(struct Mem *to, const struct Mem *from) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index c0993e573..9395f3224 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -54,7 +54,6 @@ enum mem_type { MEM_TYPE_INVALID = 1 << 11, MEM_TYPE_FRAME = 1 << 12, MEM_TYPE_PTR = 1 << 13, - MEM_TYPE_AGG = 1 << 14, }; /* @@ -187,12 +186,6 @@ mem_is_array(const struct Mem *mem) return mem->type == MEM_TYPE_ARRAY; } -static inline bool -mem_is_agg(const struct Mem *mem) -{ - return mem->type == MEM_TYPE_AGG; -} - static inline bool mem_is_bytes(const struct Mem *mem) { @@ -967,7 +960,7 @@ int sqlVdbeMemTooBig(Mem *); * that needs to be deallocated to avoid a leak. */ #define VdbeMemDynamic(X) (((X)->flags & MEM_Dyn) != 0 ||\ - ((X)->type & (MEM_TYPE_AGG | MEM_TYPE_FRAME)) != 0) + ((X)->type & MEM_TYPE_FRAME) != 0) /** * Perform comparison of two tuples: unpacked (key1) and packed (key2) -- 2.25.1