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 9D5DD6F853; Wed, 17 Nov 2021 17:41:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9D5DD6F853 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1637160086; bh=+Kr4+m2R13QInsiPspBrxq/MD4RDtYHbX50VjrvjM8M=; 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=IqJfLQ5zosJ+YBUfq+A9jgVF2gLJprgkpgANGKeVslyQ6BbeXVXCczPfzkypXvEBQ uGCiGTysyRs523s0XShC5d2X0xwNpYtdilsGMndnqA+wBgdHv06dUZIjFs/8svjchP HmY/oQN5gbi3C5v5ppFcopcHOdx+f2M9P/hbSS5Y= 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 48BEE6F853 for ; Wed, 17 Nov 2021 17:41:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 48BEE6F853 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mnM7R-0000P1-L5; Wed, 17 Nov 2021 17:41:02 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Wed, 17 Nov 2021 17:41:01 +0300 Message-Id: <1005f2a866e943ce95c940af4fb73e55d32a2bba.1637159909.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: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD927BBD05C2915ABC3F5F793E7CCBBEEA633125E1C7D4BB9B8182A05F5380850404C228DA9ACA6FE27EF359353403AE8A397D3EAC348EE697ACC1F9057496A12518BA3FA8A6DED434E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73B63FF91F9FB27ABEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F907CB39E8CA2E228638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8BFE0BA2371B2697845F59289CF3E303D117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCEC1C9C6CFAD2A0F5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735204B6963042765DA4BCB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B505675500C0AB9B5D63AE281781B59BD766 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C83792D63EF07D36BA7E8DDBB0FD41A128B9119AEED26FD7E9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF505D71D783575ABE699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34411AA3F52B5778B683BBB7B824F9587361DAB4F4363DE4ECFD7C16DE671F791C10716130C7E1B0CD1D7E09C32AA3244C41BA885336C16B192C38FEF393D3E4DE05AB220A9D022EBC729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj81eoY04PbonBdOUH4ud2Lg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D8CFC653A3F023382B36490C3EC51BC7883D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B 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 aaed522ef..356b2c7be 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -2971,7 +2971,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) { @@ -3023,7 +3023,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, @@ -3120,7 +3120,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 c983534d5..c1a18fd3a 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -836,12 +836,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