From 77d3fe12ac0433afa8af7f618dfcb8d19eba6678 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 3 Jun 2016 17:36:04 +0200 Subject: [PATCH] removed checks for obsolete collections --- arangod/VocBase/collection.h | 12 ------------ arangod/VocBase/replication-common.cpp | 4 +--- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/arangod/VocBase/collection.h b/arangod/VocBase/collection.h index c9ba519053..097e533661 100644 --- a/arangod/VocBase/collection.h +++ b/arangod/VocBase/collection.h @@ -69,18 +69,6 @@ class Slice; #define TRI_COL_VERSION TRI_COL_VERSION_20 -//////////////////////////////////////////////////////////////////////////////// -/// @brief predefined system collection name for transactions -//////////////////////////////////////////////////////////////////////////////// - -#define TRI_COL_NAME_TRANSACTION "_trx" - -//////////////////////////////////////////////////////////////////////////////// -/// @brief predefined system collection name for replication -//////////////////////////////////////////////////////////////////////////////// - -#define TRI_COL_NAME_REPLICATION "_replication" - //////////////////////////////////////////////////////////////////////////////// /// @brief predefined collection name for users //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/VocBase/replication-common.cpp b/arangod/VocBase/replication-common.cpp index 5a77029fcf..ab504d8645 100644 --- a/arangod/VocBase/replication-common.cpp +++ b/arangod/VocBase/replication-common.cpp @@ -73,9 +73,7 @@ bool TRI_ExcludeCollectionReplication(char const* name, bool includeSystem) { return true; } - if (TRI_EqualString(name, TRI_COL_NAME_REPLICATION) || - TRI_EqualString(name, TRI_COL_NAME_TRANSACTION) || - TRI_IsPrefixString(name, TRI_COL_NAME_STATISTICS) || + if (TRI_IsPrefixString(name, TRI_COL_NAME_STATISTICS) || TRI_EqualString(name, "_apps") || TRI_EqualString(name, "_configuration") || TRI_EqualString(name, "_cluster_kickstarter_plans") ||