From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98]) (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 25FC0469719 for ; Sat, 3 Oct 2020 16:28:54 +0300 (MSK) From: Nikita Pettik Date: Sat, 3 Oct 2020 16:28:49 +0300 Message-Id: Subject: [Tarantool-patches] [PATCH v3 0/2] vinyl: rework upsert operation List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: v.shpilevoy@tarantool.org Issues: https://github.com/tarantool/tarantool/issues/1622 https://github.com/tarantool/tarantool/issues/5105 https://github.com/tarantool/tarantool/issues/5092 https://github.com/tarantool/tarantool/issues/5107 Branch: https://github.com/tarantool/tarantool/tree/np/gh-5107-dont-squash-ops @ChangeLog: - Rework upsert operation in vinyl so that now (gh-5107): - if upsert can't be applied it is skipped and corresponding error is logged (gh-1622); - upserts now follow associative property: result of several upserts doesn't depend on the order of their application (gh-5105); - upserts referring to -1 fieldno are handled correctly now (gh-5087). - there's no more upserts squash procedure: upserts referring to the same field with arithmetic operations are not merged into one operation since resulting upsert might not be applied - as a result both upserts would be ignored (meanwhile only one should be). Changes in v3: - Removed upsert squashing procedure; - Added two additional test covering overflow error during upsert application; - Fixed NULL dereference bug in vy_apply_upsert_on_terminal_stmt(). Nikita Pettik (2): vinyl: rework upsert operation vinyl: remove squash procedures from source code src/box/vinyl.c | 2 +- src/box/vy_stmt.c | 28 +- src/box/vy_stmt.h | 5 +- src/box/vy_upsert.c | 302 +++++++++++--------- src/box/xrow_update.c | 144 ---------- src/box/xrow_update.h | 14 - test/unit/vy_iterators_helper.c | 2 +- test/vinyl/upsert.result | 473 ++++++++++++++++++++++++++++++++ test/vinyl/upsert.test.lua | 194 +++++++++++++ 9 files changed, 867 insertions(+), 297 deletions(-) -- 2.17.1