From 7a0d06b67b491db847eb692a809488ff34cbab5c Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Tue, 31 Mar 2015 22:17:09 +0300
Subject: [PATCH] sophia-integration: review fixes
---
src/box/engine.cc | 2 +-
src/box/engine.h | 2 +-
src/box/memtx_engine.cc | 2 +-
src/box/memtx_engine.h | 2 +-
src/box/memtx_tree.cc | 2 --
src/box/sophia_engine.cc | 6 +++++-
src/box/sophia_engine.h | 2 +-
7 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/box/engine.cc b/src/box/engine.cc
index 6d33829c74..3c28f1fa77 100644
--- a/src/box/engine.cc
+++ b/src/box/engine.cc
@@ -108,7 +108,7 @@ engine_begin_join()
/* recover engine snapshot */
Engine *engine;
engine_foreach(engine) {
- engine->begin_join();
+ engine->beginJoin();
}
}
diff --git a/src/box/engine.h b/src/box/engine.h
index bde48b53d2..e82abc2cd5 100644
--- a/src/box/engine.h
+++ b/src/box/engine.h
@@ -139,7 +139,7 @@ class Engine: public Object {
/**
* Notify engine about a JOIN start (slave-side)
*/
- virtual void begin_join() = 0;
+ virtual void beginJoin() = 0;
/**
* Begin a two-phase snapshot creation in this
* engine (snapshot is a memtx idea of a checkpoint).
diff --git a/src/box/memtx_engine.cc b/src/box/memtx_engine.cc
index a813260dd7..7c13a9ef58 100644
--- a/src/box/memtx_engine.cc
+++ b/src/box/memtx_engine.cc
@@ -240,7 +240,7 @@ MemtxEngine::rollback(struct txn *txn)
}
void
-MemtxEngine::begin_join()
+MemtxEngine::beginJoin()
{
}
diff --git a/src/box/memtx_engine.h b/src/box/memtx_engine.h
index 9d4cd04231..5aa2c2da94 100644
--- a/src/box/memtx_engine.h
+++ b/src/box/memtx_engine.h
@@ -37,7 +37,7 @@ struct MemtxEngine: public Engine {
virtual void dropIndex(Index *index);
virtual void keydefCheck(struct space *space, struct key_def *key_def);
virtual void rollback(struct txn*);
- virtual void begin_join();
+ virtual void beginJoin();
virtual void begin_recover_snapshot(int64_t lsn);
virtual void end_recover_snapshot();
virtual void end_recovery();
diff --git a/src/box/memtx_tree.cc b/src/box/memtx_tree.cc
index 95734edece..528c156e08 100644
--- a/src/box/memtx_tree.cc
+++ b/src/box/memtx_tree.cc
@@ -26,8 +26,6 @@
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include "evio.h"
-#include "replication.h"
#include "memtx_tree.h"
#include "tuple.h"
#include "space.h"
diff --git a/src/box/sophia_engine.cc b/src/box/sophia_engine.cc
index 96ded2c911..2d56e7c152 100644
--- a/src/box/sophia_engine.cc
+++ b/src/box/sophia_engine.cc
@@ -178,6 +178,10 @@ sophia_send_row(Relay *relay, uint32_t space_id, char *tuple,
relay_send(relay, &row);
}
+/**
+ * Relay all data that should be present in the snapshot
+ * to the replica.
+ */
void
SophiaEngine::join(Relay *relay)
{
@@ -388,7 +392,7 @@ SophiaEngine::rollback(struct txn *txn)
}
void
-SophiaEngine::begin_join()
+SophiaEngine::beginJoin()
{
/* put engine to recovery-complete state to
* correctly support join */
diff --git a/src/box/sophia_engine.h b/src/box/sophia_engine.h
index b5ae7ea76c..f48abf228a 100644
--- a/src/box/sophia_engine.h
+++ b/src/box/sophia_engine.h
@@ -40,7 +40,7 @@ struct SophiaEngine: public Engine {
virtual void begin(struct txn*, struct space*);
virtual void commit(struct txn*);
virtual void rollback(struct txn*);
- virtual void begin_join();
+ virtual void beginJoin();
virtual void begin_recover_snapshot(int64_t);
virtual void end_recover_snapshot();
virtual void end_recovery();
--
GitLab