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 34C606ECE3; Tue, 30 Nov 2021 11:43:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 34C606ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1638261835; bh=eAXvZqBWzl05TNfrLbYSo1xHZ7sUNyXregzKX5dyxcA=; 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=G+zwCdwGSARGhtvZzxK9HhrWZIvj3ftzHULW1DOGb9KHPNhYwZQFWZl9OrjdArPQm lL7H7vmagnSTkVDiem8LRHzzagOvikWHZTyJz6GN1S44ljkD4ElooqYsjKH4+0s7FW cJRWmWA8dGxrDE8GLASSGR4feRjAAIy9hu69bZ1E= 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 906886ECF4 for ; Tue, 30 Nov 2021 11:43:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 906886ECF4 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mryjT-00034i-Ud; Tue, 30 Nov 2021 11:43:24 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 30 Nov 2021 11:43:23 +0300 Message-Id: <1c3025d016aa54c423096ea52bbd21a3c785dc82.1638261621.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: 4F1203BC0FB41BD979319CBFD1B938ABAEBC773AEAF7F379C56DF3C0E73A9ED1182A05F5380850404B175E7C6D35D036A7729CEF655B3C537D3DF65E295604F7DD0080376757A92E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE75981906264755323EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006376F978168E59B07A5EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F27A9BB50795349691A244F742080A3BA2CC7F00164DA146DAFE8445B8C89999728AA50765F7900637E5FAC37A846F0F679FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3F7ED4D6813B5CA04117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637B8F435DEDE9E76EBEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C1D2CF3A4F35D4FE546B536E6B2368F8C2726B132BDFF867A9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF6EFF71F1B3C06F72699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D346B1FF97F6D0959A23166B67BDE085CFE5FCB019119333E1FC7ADD0756AA9DA4C7322498A93596E931D7E09C32AA3244CD8ADDD42E5FD949E66C38C4B6D15C31CD9ADFF0C0BDB8D1F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojNjnaLwLelXg5LEfG3CZCTA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DC4F0A2436342CDE770AAD9AB180FAE9383D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 1/3] sql: change mpstream_encode_vdbe_mem() signature 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 changes the signature of mpstream_encode_vdbe_mem(), so it now follows the general rule that applies to most functions in mem.c. --- src/box/sql/mem.c | 6 +++--- src/box/sql/mem.h | 7 ++++--- src/box/sql/vdbe.c | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 530bde615..303c3a1a3 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -2999,7 +2999,7 @@ mem_from_mp(struct Mem *mem, const char *buf, uint32_t *len) } void -mpstream_encode_vdbe_mem(struct mpstream *stream, struct Mem *var) +mem_to_mpstream(const struct Mem *var, struct mpstream *stream) { assert(memIsValid(var)); switch (var->type) { @@ -3051,7 +3051,7 @@ sql_vdbe_mem_encode_tuple(struct Mem *fields, uint32_t field_count, set_encode_error, &is_error); mpstream_encode_array(&stream, field_count); for (struct Mem *field = fields; field < fields + field_count; field++) - mpstream_encode_vdbe_mem(&stream, field); + mem_to_mpstream(field, &stream); mpstream_flush(&stream); if (is_error) { diag_set(OutOfMemory, stream.pos - stream.buf, @@ -3148,7 +3148,7 @@ port_vdbemem_get_msgpack(struct port *base, uint32_t *size) set_encode_error, &is_error); mpstream_encode_array(&stream, port->mem_count); for (uint32_t i = 0; i < port->mem_count && !is_error; i++) - mpstream_encode_vdbe_mem(&stream, (struct Mem *)port->mem + i); + mem_to_mpstream((struct Mem *)port->mem + i, &stream); mpstream_flush(&stream); *size = region_used(region) - region_svp; if (is_error) diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index e59f8ea44..ea9ef709d 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -853,12 +853,13 @@ int mem_from_mp(struct Mem *mem, const char *buf, uint32_t *len); /** - * Perform encoding memory variable to stream. + * Perform encoding of MEM to stream. + * + * @param var MEM to encode to stream. * @param stream Initialized mpstream encoder object. - * @param var Vdbe memory variable to encode with stream. */ void -mpstream_encode_vdbe_mem(struct mpstream *stream, struct Mem *var); +mem_to_mpstream(const struct Mem *var, struct mpstream *stream); /** * Perform encoding field_count Vdbe memory fields on region as diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 0c4e38557..3892cc102 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -3497,7 +3497,7 @@ case OP_Update: { mpstream_encode_array(&stream, 3); mpstream_encode_strn(&stream, "=", 1); mpstream_encode_uint(&stream, field_idx); - mpstream_encode_vdbe_mem(&stream, new_tuple + field_idx); + mem_to_mpstream(new_tuple + field_idx, &stream); } mpstream_flush(&stream); if (is_error) { -- 2.25.1