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 767856FC8B; Fri, 1 Oct 2021 15:56:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 767856FC8B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633092964; bh=LkEeFsmBUzZ/0Rf0Xivv3HiH51/tucz/I6gz0f6LHK0=; 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=hpjRdkYqLpfgmP3nVOTRAqJK1W56FaB4E4HT6m6lVhxg9r6kvtTvkT3qBjsjURAGe U1kXYPHjqt/lsLPs3vn2V/G9mtGh0BolJ3Clcc5//zzsXMkvLIadrhGTc8i+d6+Bo4 pJm2jv3RDZr9cF5VfodN2OxgRZy/rZOg35oJZzeI= 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 EB0907414F for ; Fri, 1 Oct 2021 15:48:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EB0907414F Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mWHyF-00041P-Do; Fri, 01 Oct 2021 15:48:59 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 1 Oct 2021 15:48:59 +0300 Message-Id: <637613e5d6ea5630c7896e3cd0f9746320c0ea31.1633092363.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: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD96A58C36AA2E99649BF631F26B0465AFD0E15652C7D51B98D182A05F538085040FFF38F4927B1907ABD488706E69EA77CA1B5B270F5B72DD8251D961AF690A1A2 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE742D9BD90C58D50E0EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B3D52627AD81B52CEA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F2446175BCED696335DEA0E4F9E8728C1ACC7F00164DA146DAFE8445B8C89999728AA50765F79006377C70927E34808485389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8A7DFDF579AB090EFF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8BDC0F6C5B2EEF3D0C75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBBB17C150BCA6793544957DA502C60C331B26FD719DCC0709C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF783E2B6F79C23BED699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34A2EC120135420F90E2E4BC4F1AEACC7F770CD20F735640059F3BDD65900774507884EAC0086BE03B1D7E09C32AA3244C7A45F3A929F2A5FCE5266F197FDDB50AC3B3ADDA61883BB5729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojJNmX3owDPmExXDdc2zOE/A== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DDC5AA354E3AFE064EE17E3B6EC87BC7883D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 15/16] 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 853f9efe9..ec25bc565 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -592,22 +592,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) { @@ -1859,15 +1843,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 7d5a750f5..7f7382961 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, }; /* @@ -185,12 +184,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) { @@ -947,7 +940,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