Tarantool development patches archive
 help / color / mirror / Atom feed
From: Alexander Turenko <alexander.turenko@tarantool.org>
To: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: tarantool-patches@freelists.org
Subject: Re: [PATCH 0/3] Merger
Date: Tue, 18 Dec 2018 15:16:56 +0300	[thread overview]
Message-ID: <20181218121656.x4he26zghwlxsajx@tkn_work_nb> (raw)
In-Reply-To: <cover.1544989900.git.alexander.turenko@tarantool.org>

Added fixup:

diff --git a/src/lua/merger.c b/src/lua/merger.c
index 8caf8d47f..433859b0b 100644
--- a/src/lua/merger.c
+++ b/src/lua/merger.c
@@ -1352,9 +1352,12 @@ lbox_merger_select(struct lua_State *L)
 	lua_settop(L, 0); /* Pop merger, sources, [opts]. */
 
 	if (it->obuf == NULL) {
-		return create_result_table(L, merger, it);
+		create_result_table(L, merger, it);
+		merger_iterator_delete(L, it);
+		return 1;
 	} else {
 		encode_result_buffer(L, merger, it);
+		merger_iterator_delete(L, it);
 		return 0;
 	}
 }

WBR, Alexander Turenko.

On Sun, Dec 16, 2018 at 11:17:23PM +0300, Alexander Turenko wrote:
> https://github.com/tarantool/tarantool/issues/3276
> On top of 2.1: https://github.com/tarantool/tarantool/tree/Totktonada/gh-3276-on-board-merger
> On top of 1.10: https://github.com/tarantool/tarantool/tree/Totktonada/gh-3276-on-board-merger-1.10

  parent reply	other threads:[~2018-12-18 12:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-16 20:17 Alexander Turenko
2018-12-16 20:17 ` [PATCH 1/3] Add luaT_iscallable with support of cdata metatype Alexander Turenko
2018-12-26 18:35   ` Vladimir Davydov
2018-12-28  1:46     ` Alexander Turenko
2018-12-28  8:00       ` Vladimir Davydov
2018-12-16 20:17 ` [PATCH 2/3] Add module to ease using Lua iterators from C Alexander Turenko
2018-12-26 18:45   ` Vladimir Davydov
2018-12-31  6:43     ` Alexander Turenko
2018-12-16 20:17 ` [PATCH 3/3] Add merger for tuple streams Alexander Turenko
2018-12-26 20:11   ` Vladimir Davydov
2019-01-09 21:36     ` Alexander Turenko
2018-12-18 12:16 ` Alexander Turenko [this message]
2019-03-22 14:24 ` [tarantool-patches] [PATCH 0/3] lua: add key_def lua module Kirill Shcherbatov
2019-03-22 16:20   ` Alexander Turenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181218121656.x4he26zghwlxsajx@tkn_work_nb \
    --to=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --cc=vdavydov.dev@gmail.com \
    --subject='Re: [PATCH 0/3] Merger' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox