tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't inherit TotalOrdering for RecordAccessor

Browse Source 
Summary:
RecordAccessor doesn't implement `operator<`, so it doesn't make sense
to have it inherit TotalOrdering.

Reviewers: mferencevic, msantl, vkasljevic

Reviewed By: vkasljevic

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1866
This commit is contained in:
Teon Banek 2019-02-14 16:34:54 +01:00
parent ed75e45541
commit 5af47c6df5
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/storage/distributed/record_accessor.hpp
View File

@ -9,7 +9,6 @@
#include "storage/common/types/types.hpp"
#include "storage/distributed/address.hpp"
#include "storage/distributed/gid.hpp"
#include "utils/total_ordering.hpp"
namespace database {
class GraphDbAccessor;
@ -26,7 +25,7 @@ struct StateDelta;
* @tparam TRecord Type of record (MVCC Version) of the accessor.
*/
template <typename TRecord>
class RecordAccessor : public utils::TotalOrdering<RecordAccessor<TRecord>> {
class RecordAccessor {
public:
using AddressT = storage::Address<mvcc::VersionList<TRecord>>;
@ -71,6 +70,10 @@ class RecordAccessor : public utils::TotalOrdering<RecordAccessor<TRecord>> {
bool operator==(const RecordAccessor &other) const;
bool operator!=(const RecordAccessor &other) const {
return !(*this == other);
}
/** Returns a GraphDB accessor of this record accessor. */
database::GraphDbAccessor &db_accessor() const;

7
src/storage/single_node/record_accessor.hpp
View File

@ -8,7 +8,6 @@
#include "storage/common/types/property_value_store.hpp"
#include "storage/common/types/types.hpp"
#include "storage/single_node/gid.hpp"
#include "utils/total_ordering.hpp"
namespace database {
class GraphDbAccessor;
@ -25,7 +24,7 @@ struct StateDelta;
* @tparam TRecord Type of record (MVCC Version) of the accessor.
*/
template <typename TRecord>
class RecordAccessor : public utils::TotalOrdering<RecordAccessor<TRecord>> {
class RecordAccessor {
protected:
/**
* The database::GraphDbAccessor is friend to this accessor so it can
@ -69,6 +68,10 @@ class RecordAccessor : public utils::TotalOrdering<RecordAccessor<TRecord>> {
bool operator==(const RecordAccessor &other) const;
bool operator!=(const RecordAccessor &other) const {
return !(*this == other);
}
/** Returns a GraphDB accessor of this record accessor. */
database::GraphDbAccessor &db_accessor() const;

7
src/storage/single_node_ha/record_accessor.hpp
View File

@ -8,7 +8,6 @@
#include "storage/common/types/property_value_store.hpp"
#include "storage/common/types/types.hpp"
#include "storage/single_node_ha/gid.hpp"
#include "utils/total_ordering.hpp"
namespace database {
class GraphDbAccessor;
@ -25,7 +24,7 @@ struct StateDelta;
* @tparam TRecord Type of record (MVCC Version) of the accessor.
*/
template <typename TRecord>
class RecordAccessor : public utils::TotalOrdering<RecordAccessor<TRecord>> {
class RecordAccessor {
protected:
/**
* The database::GraphDbAccessor is friend to this accessor so it can
@ -69,6 +68,10 @@ class RecordAccessor : public utils::TotalOrdering<RecordAccessor<TRecord>> {
bool operator==(const RecordAccessor &other) const;
bool operator!=(const RecordAccessor &other) const {
return !(*this == other);
}
/** Returns a GraphDB accessor of this record accessor. */
database::GraphDbAccessor &db_accessor() const;