From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp17.mail.ru (smtp17.mail.ru [94.100.176.154]) (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 B2B95469719 for ; Tue, 17 Nov 2020 11:14:38 +0300 (MSK) References: From: Serge Petrenko Message-ID: <75d353c1-3e92-52c7-4434-358c5319a493@tarantool.org> Date: Tue, 17 Nov 2020 11:14:37 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit Content-Language: en-GB Subject: Re: [Tarantool-patches] [PATCH 01/12] raft: move sources to raftlib.h/.c List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy , tarantool-patches@dev.tarantool.org, gorcunov@gmail.com Hi! Thanks for the patch! LGTM. 17.11.2020 03:02, Vladislav Shpilevoy пишет: > The commit renames raft.h and raft.c to raftlib.h and raftlib.c. > This is done to prepare to Raft split into src/box/ and > src/lib/raft. > > The commit is not atomic, the build won't work here. Because if > raft is renamed to raftlib, and in the same commit new raft.c and > raft.h are added, git thinks the original file was changed, and > ruins all the git history. > > By splitting move of raft to raftlib and introduction of box/raft > into 2 commits the git history is saved. > > Part of #5303 > --- > src/box/CMakeLists.txt | 1 + > src/box/{raft.c => raftlib.c} | 0 > src/box/{raft.h => raftlib.h} | 0 > 3 files changed, 1 insertion(+) > rename src/box/{raft.c => raftlib.c} (100%) > rename src/box/{raft.h => raftlib.h} (100%) > > diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt > index d1667796a..fcf779379 100644 > --- a/src/box/CMakeLists.txt > +++ b/src/box/CMakeLists.txt > @@ -169,6 +169,7 @@ add_library(box STATIC > port.c > txn.c > txn_limbo.c > + raftlib.c > raft.c > box.cc > gc.c > diff --git a/src/box/raft.c b/src/box/raftlib.c > similarity index 100% > rename from src/box/raft.c > rename to src/box/raftlib.c > diff --git a/src/box/raft.h b/src/box/raftlib.h > similarity index 100% > rename from src/box/raft.h > rename to src/box/raftlib.h -- Serge Petrenko