[PATCH 0/3] Merger
Alexander Turenko
alexander.turenko at tarantool.org
Tue Dec 18 15:16:56 MSK 2018
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
More information about the Tarantool-patches
mailing list