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

Make some members private in CommitLog

Browse Source 
Reviewers: buda, florijan

Reviewed By: buda, florijan

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D544
This commit is contained in:
Mislav Bradac 2017-07-12 14:26:01 +02:00
parent aac5205802
commit 5c810b6579
3 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/database/graph_db_accessor.hpp
View File

@ -278,7 +278,7 @@ class GraphDbAccessor {
auto wait_transaction = db_.tx_engine.Begin();
for (auto id : wait_transaction->snapshot()) {
if (id == transaction_->id_) continue;
while (wait_transaction->engine_.clog().fetch_info(id).is_active())
while (wait_transaction->engine_.clog().is_active(id))
// TODO reconsider this constant, currently rule-of-thumb chosen
std::this_thread::sleep_for(std::chrono::microseconds(100));
}

4
src/mvcc/record.hpp
View File

@ -230,10 +230,10 @@ class Record : public Version<T> {
if (!hint_bits.is_unknown()) return hint_bits.is_committed();
// if hints are not set consult the commit log
auto info = engine.clog().fetch_info(id);
auto is_commited = engine.clog().is_committed(id);
// committed
if (info.is_committed()) return hints.set_committed(), true;
if (is_commited) return hints.set_committed(), true;
// we can't set_aborted hints because of a race-condition that
// can occurr when tx.exp gets changed by some transaction.

48
src/transactions/commit_log.hpp
View File

@ -5,33 +5,15 @@
namespace tx {
// This class is lock free. There is no need to acquire any lock when accessing
// this class and this class doesn't acquire any lock on method calls.
class CommitLog {
public:
struct Info {
enum Status {
ACTIVE = 0, // 00
COMMITTED = 1, // 01
ABORTED = 2, // 10
};
bool is_active() const { return flags == ACTIVE; }
bool is_committed() const { return flags & COMMITTED; }
bool is_aborted() const { return flags & ABORTED; }
operator uint8_t() const { return flags; }
uint8_t flags;
};
CommitLog() = default;
CommitLog(CommitLog &) = delete;
CommitLog(const CommitLog &) = delete;
CommitLog(CommitLog &&) = delete;
CommitLog operator=(CommitLog) = delete;
Info fetch_info(transaction_id_t id) const { return Info{log.at(2 * id, 2)}; }
CommitLog &operator=(const CommitLog &) = delete;
CommitLog &operator=(CommitLog &&) = delete;
bool is_active(transaction_id_t id) const {
return fetch_info(id).is_active();
@ -50,6 +32,26 @@ class CommitLog {
void set_aborted(transaction_id_t id) { log.set(2 * id + 1); }
private:
struct Info {
enum Status {
ACTIVE = 0, // 00
COMMITTED = 1, // 01
ABORTED = 2, // 10
};
bool is_active() const { return flags == ACTIVE; }
bool is_committed() const { return flags & COMMITTED; }
bool is_aborted() const { return flags & ABORTED; }
operator uint8_t() const { return flags; }
uint8_t flags;
};
Info fetch_info(transaction_id_t id) const { return Info{log.at(2 * id, 2)}; }
// TODO: Searching the log will take more and more time the more and more
// transactoins are done. This could be awerted if DynamicBitset is changed
// to point to largest chunk instead of the smallest.