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 767D7711B6; Tue, 26 Oct 2021 13:41:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 767D7711B6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1635244908; bh=yHpdye+Yyut1knqgMaAazgW/NSmx05RQljvr8EiKz/Q=; 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=lzw1osXhbWTtLk3Gp9Zyokb+4Qn35YNwEQcxPuB2d94R2gMjMQdbUyqu61e26wheV 0q6XzbP6jIC+ogEK30sPjL78WtrXXwoPPwIZNdMNDTIkVxsxMw5VrYvakWPNBh8/8k E3m53Hq9j3o59rACz/5p6jAAxC2YgdYgdoy33Qvc= 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 15BB47120C for ; Tue, 26 Oct 2021 13:34:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 15BB47120C Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mfJmo-0000qL-Tf; Tue, 26 Oct 2021 13:34:31 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 26 Oct 2021 13:34:30 +0300 Message-Id: <0db17fbc9dc167d757807dd5175dbf114923f618.1635244212.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: 4F1203BC0FB41BD9D1D35DBD2D15487E6FBC665C70D7247AB4BFB4F26BF422ED182A05F538085040C9A21B5495EC9757A7329CFB48A16F18EACDBE05D88A6EE055436759808D3B43 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7FCFCB92DA8654BB0EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006371777B963B59186248638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F7EA74D11F762D509CBC9AF8B7094F9A117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC47272755C61AA17BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520B1593CA6EC85F86D618001F51B5FD3F9D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C2749EEF4D85F8CCA152FCF46235C4D7369E4A9291344D91D9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF691691B2CB2A81D8699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C1D376EF32BB0896AE13890C3C4F794F89093559D58A6813A8241EB8EDC85982CE2996550BFD6EF81D7E09C32AA3244C7C3ABB0EF0B9F119C668D75E0DD5D2C71DD47778AE04E04D729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojNvH0qP3qm71ViVvDzH5axg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D0C90F0A201FE5ABEC628F69CF035126183D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B 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 | 11 ++--------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 917ff458c..dc629aee3 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) { @@ -1863,15 +1847,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 52a63949a..242f910db 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) { @@ -242,7 +235,7 @@ static inline bool mem_is_trivial(const struct Mem *mem) { return mem->szMalloc == 0 && (mem->flags & MEM_Dyn) == 0 && - (mem->type & (MEM_TYPE_FRAME | MEM_TYPE_AGG)) == 0; + mem->type != MEM_TYPE_FRAME; } static inline bool @@ -955,7 +948,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