Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adding view rename case to replication server handlers (#4299)

This commit is contained in:
Simon 2018-01-16 09:19:57 +01:00 committed by Michael Hackstein
parent 43edad2537
commit ab0578320a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/MMFiles/MMFilesWalAccess.cpp
View File

@ -342,6 +342,7 @@ struct MMFilesWalAccessContext : WalAccessContext {
case TRI_DF_MARKER_VPACK_CREATE_INDEX: case TRI_DF_MARKER_VPACK_CREATE_INDEX:
case TRI_DF_MARKER_VPACK_CREATE_VIEW: case TRI_DF_MARKER_VPACK_CREATE_VIEW:
case TRI_DF_MARKER_VPACK_RENAME_COLLECTION: 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_COLLECTION:
case TRI_DF_MARKER_VPACK_CHANGE_VIEW: case TRI_DF_MARKER_VPACK_CHANGE_VIEW:
case TRI_DF_MARKER_VPACK_DROP_INDEX: case TRI_DF_MARKER_VPACK_DROP_INDEX:
@ -362,9 +363,9 @@ struct MMFilesWalAccessContext : WalAccessContext {
} }
default: { default: {
TRI_ASSERT(false);
LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "got invalid marker of type " LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "got invalid marker of type "
<< static_cast<int>(type); << static_cast<int>(type);
TRI_ASSERT(false);
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
} }
} }

3
arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
View File

@ -201,7 +201,8 @@ class WALParser : public rocksdb::WriteBatch::Handler {
} }
case RocksDBLogType::ViewCreate: case RocksDBLogType::ViewCreate:
case RocksDBLogType::ViewDrop: case RocksDBLogType::ViewDrop:
case RocksDBLogType::ViewChange: { case RocksDBLogType::ViewChange:
case RocksDBLogType::ViewRename: {
resetTransientState(); // finish ongoing trx resetTransientState(); // finish ongoing trx
// TODO // TODO
break; break;

3
arangod/RocksDBEngine/RocksDBWalAccess.cpp
View File

@ -206,8 +206,9 @@ class MyWALParser : public rocksdb::WriteBatch::Handler,
break; break;
} }
case RocksDBLogType::ViewCreate: case RocksDBLogType::ViewCreate:
case RocksDBLogType::ViewDrop:
case RocksDBLogType::ViewChange: case RocksDBLogType::ViewChange:
case RocksDBLogType::ViewDrop: { case RocksDBLogType::ViewRename: {
resetTransientState(); // finish ongoing trx resetTransientState(); // finish ongoing trx
// TODO // TODO
break; break;