From ab0578320a6ffe15bebf7c80bf20ab7590ca2014 Mon Sep 17 00:00:00 2001
From: Simon <simon@graetzer.org>
Date: Tue, 16 Jan 2018 09:19:57 +0100
Subject: [PATCH] Adding view rename case to replication server handlers
 (#4299)

---
 arangod/MMFiles/MMFilesWalAccess.cpp                | 3 ++-
 arangod/RocksDBEngine/RocksDBReplicationTailing.cpp | 3 ++-
 arangod/RocksDBEngine/RocksDBWalAccess.cpp          | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arangod/MMFiles/MMFilesWalAccess.cpp b/arangod/MMFiles/MMFilesWalAccess.cpp
index a5c4ae1acd..80ed78fa6a 100644
--- a/arangod/MMFiles/MMFilesWalAccess.cpp
+++ b/arangod/MMFiles/MMFilesWalAccess.cpp
@@ -342,6 +342,7 @@ struct MMFilesWalAccessContext : WalAccessContext {
       case TRI_DF_MARKER_VPACK_CREATE_INDEX:
       case TRI_DF_MARKER_VPACK_CREATE_VIEW:
       case TRI_DF_MARKER_VPACK_RENAME_COLLECTION:
+      case TRI_DF_MARKER_VPACK_RENAME_VIEW:
       case TRI_DF_MARKER_VPACK_CHANGE_COLLECTION:
       case TRI_DF_MARKER_VPACK_CHANGE_VIEW:
       case TRI_DF_MARKER_VPACK_DROP_INDEX:
@@ -362,9 +363,9 @@ struct MMFilesWalAccessContext : WalAccessContext {
       }
 
       default: {
-        TRI_ASSERT(false);
         LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "got invalid marker of type "
                                                 << static_cast<int>(type);
+        TRI_ASSERT(false);
         return TRI_ERROR_INTERNAL;
       }
     }
diff --git a/arangod/RocksDBEngine/RocksDBReplicationTailing.cpp b/arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
index 0bd8d9736b..3e155def92 100644
--- a/arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
+++ b/arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
@@ -201,7 +201,8 @@ class WALParser : public rocksdb::WriteBatch::Handler {
       }
       case RocksDBLogType::ViewCreate:
       case RocksDBLogType::ViewDrop:
-      case RocksDBLogType::ViewChange: {
+      case RocksDBLogType::ViewChange:
+      case RocksDBLogType::ViewRename: {
         resetTransientState(); // finish ongoing trx
         // TODO
         break;
diff --git a/arangod/RocksDBEngine/RocksDBWalAccess.cpp b/arangod/RocksDBEngine/RocksDBWalAccess.cpp
index 30d8774bfd..3e50ff12fb 100644
--- a/arangod/RocksDBEngine/RocksDBWalAccess.cpp
+++ b/arangod/RocksDBEngine/RocksDBWalAccess.cpp
@@ -206,8 +206,9 @@ class MyWALParser : public rocksdb::WriteBatch::Handler,
         break;
       }
       case RocksDBLogType::ViewCreate:
+      case RocksDBLogType::ViewDrop:
       case RocksDBLogType::ViewChange:
-      case RocksDBLogType::ViewDrop: {
+      case RocksDBLogType::ViewRename: {
         resetTransientState(); // finish ongoing trx
         // TODO
         break;