MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-07-01 08:18:20 +02:00
Code Issues Releases Wiki Activity

ircd::db: Rename txn to iov.

Browse source
This commit is contained in:
Jason Volk 2017-09-18 20:43:32 -07:00
parent fb026f58a7
commit c50461c4c6
3 changed files with 77 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/db.h
View file

@ -122,7 +122,7 @@ enum class ircd::db::pos
#include "db/row.h"
#include "db/index.h"
#include "db/json.h"
#include "db/txn.h"
#include "db/iov.h"
#include "db/where.h"
#include "db/cursor.h"

50
include/ircd/db/txn.h → include/ircd/db/iov.h
View file

@ -21,27 +21,27 @@
*/
#pragma once
#define HAVE_IRCD_DB_TXN_H
#define HAVE_IRCD_DB_IOV_H
namespace ircd::db
{
struct txn;
struct iov;
bool until(const txn &, const std::function<bool (const delta &)> &);
void for_each(const txn &, const std::function<void (const delta &)> &);
std::string debug(const txn &);
bool until(const iov &, const std::function<bool (const delta &)> &);
void for_each(const iov &, const std::function<void (const delta &)> &);
std::string debug(const iov &);
}
class ircd::db::txn
class ircd::db::iov
{
database *d {nullptr};
std::unique_ptr<rocksdb::WriteBatch> wb;
public:
struct opts;
struct checkpoint;
struct append;
struct handler;
struct checkpoint;
explicit operator const rocksdb::WriteBatch &() const;
explicit operator const database &() const;
@ -67,31 +67,31 @@ class ircd::db::txn
// clear
void clear();
txn() = default;
txn(database &);
txn(database &, const opts &);
~txn() noexcept;
iov() = default;
iov(database &);
iov(database &, const opts &);
~iov() noexcept;
};
struct ircd::db::txn::checkpoint
struct ircd::db::iov::append
{
txn &t;
append(iov &, database &, const delta &);
append(iov &, column &, const column::delta &);
append(iov &, const cell::delta &);
append(iov &, const row::delta &);
append(iov &, const delta &);
append(iov &, const string_view &key, const json::iov &);
};
checkpoint(txn &);
struct ircd::db::iov::checkpoint
{
iov &t;
checkpoint(iov &);
~checkpoint() noexcept;
};
struct ircd::db::txn::append
{
append(txn &, database &, const delta &);
append(txn &, column &, const column::delta &);
append(txn &, const cell::delta &);
append(txn &, const row::delta &);
append(txn &, const delta &);
append(txn &, const string_view &key, const json::iov &);
};
struct ircd::db::txn::opts
struct ircd::db::iov::opts
{
size_t reserve_bytes = 0;
size_t max_bytes = 0;

102
ircd/db.cc
View file

@ -1295,10 +1295,10 @@ ircd::db::database::events::OnColumnFamilyHandleDeletionStarted(rocksdb::ColumnF
///////////////////////////////////////////////////////////////////////////////
//
// db/txn.h
// db/iov.h
//
struct ircd::db::txn::handler
struct ircd::db::iov::handler
:rocksdb::WriteBatch::Handler
{
using Status = rocksdb::Status;
@ -1331,14 +1331,14 @@ struct ircd::db::txn::handler
};
std::string
ircd::db::debug(const txn &t)
ircd::db::debug(const iov &t)
{
const rocksdb::WriteBatch &wb(t);
return db::debug(wb);
}
void
ircd::db::for_each(const txn &t,
ircd::db::for_each(const iov &t,
const std::function<void (const delta &)> &closure)
{
const auto re{[&closure]
@ -1350,17 +1350,17 @@ ircd::db::for_each(const txn &t,
const database &d(t);
const rocksdb::WriteBatch &wb{t};
txn::handler h{d, re};
iov::handler h{d, re};
wb.Iterate(&h);
}
bool
ircd::db::until(const txn &t,
ircd::db::until(const iov &t,
const std::function<bool (const delta &)> &closure)
{
const database &d(t);
const rocksdb::WriteBatch &wb{t};
txn::handler h{d, closure};
iov::handler h{d, closure};
wb.Iterate(&h);
return h._continue;
}
@ -1370,7 +1370,7 @@ ircd::db::until(const txn &t,
///
rocksdb::Status
ircd::db::txn::handler::PutCF(const uint32_t cfid,
ircd::db::iov::handler::PutCF(const uint32_t cfid,
const Slice &key,
const Slice &val)
noexcept
@ -1379,7 +1379,7 @@ noexcept
}
rocksdb::Status
ircd::db::txn::handler::DeleteCF(const uint32_t cfid,
ircd::db::iov::handler::DeleteCF(const uint32_t cfid,
const Slice &key)
noexcept
{
@ -1387,7 +1387,7 @@ noexcept
}
rocksdb::Status
ircd::db::txn::handler::DeleteRangeCF(const uint32_t cfid,
ircd::db::iov::handler::DeleteRangeCF(const uint32_t cfid,
const Slice &begin,
const Slice &end)
noexcept
@ -1396,7 +1396,7 @@ noexcept
}
rocksdb::Status
ircd::db::txn::handler::SingleDeleteCF(const uint32_t cfid,
ircd::db::iov::handler::SingleDeleteCF(const uint32_t cfid,
const Slice &key)
noexcept
{
@ -1404,7 +1404,7 @@ noexcept
}
rocksdb::Status
ircd::db::txn::handler::MergeCF(const uint32_t cfid,
ircd::db::iov::handler::MergeCF(const uint32_t cfid,
const Slice &key,
const Slice &value)
noexcept
@ -1413,35 +1413,35 @@ noexcept
}
rocksdb::Status
ircd::db::txn::handler::MarkBeginPrepare()
ircd::db::iov::handler::MarkBeginPrepare()
noexcept
{
return Status::OK();
}
rocksdb::Status
ircd::db::txn::handler::MarkEndPrepare(const Slice &xid)
ircd::db::iov::handler::MarkEndPrepare(const Slice &xid)
noexcept
{
return Status::OK();
}
rocksdb::Status
ircd::db::txn::handler::MarkCommit(const Slice &xid)
ircd::db::iov::handler::MarkCommit(const Slice &xid)
noexcept
{
return Status::OK();
}
rocksdb::Status
ircd::db::txn::handler::MarkRollback(const Slice &xid)
ircd::db::iov::handler::MarkRollback(const Slice &xid)
noexcept
{
return Status::OK();
}
rocksdb::Status
ircd::db::txn::handler::callback(const uint32_t &cfid,
ircd::db::iov::handler::callback(const uint32_t &cfid,
const op &op,
const Slice &a,
const Slice &b)
@ -1461,12 +1461,12 @@ noexcept try
catch(const std::exception &e)
{
_continue = false;
log::critical("txn::handler: cfid[%u]: %s", cfid, e.what());
log::critical("iov::handler: cfid[%u]: %s", cfid, e.what());
std::terminate();
}
rocksdb::Status
ircd::db::txn::handler::callback(const delta &delta)
ircd::db::iov::handler::callback(const delta &delta)
noexcept try
{
_continue = cb(delta);
@ -1479,22 +1479,22 @@ catch(const std::exception &e)
}
bool
ircd::db::txn::handler::Continue()
ircd::db::iov::handler::Continue()
noexcept
{
return _continue;
}
//
// txn
// iov
//
ircd::db::txn::txn(database &d)
:txn{d, {}}
ircd::db::iov::iov(database &d)
:iov{d, {}}
{
}
ircd::db::txn::txn(database &d,
ircd::db::iov::iov(database &d,
const opts &opts)
:d{&d}
,wb
@ -1504,20 +1504,20 @@ ircd::db::txn::txn(database &d,
{
}
ircd::db::txn::~txn()
ircd::db::iov::~iov()
noexcept
{
}
void
ircd::db::txn::operator()(const sopts &opts)
ircd::db::iov::operator()(const sopts &opts)
{
assert(bool(d));
operator()(*d, opts);
}
void
ircd::db::txn::operator()(database &d,
ircd::db::iov::operator()(database &d,
const sopts &opts)
{
assert(bool(wb));
@ -1525,14 +1525,14 @@ ircd::db::txn::operator()(database &d,
}
void
ircd::db::txn::clear()
ircd::db::iov::clear()
{
assert(bool(wb));
wb->Clear();
}
size_t
ircd::db::txn::size()
ircd::db::iov::size()
const
{
assert(bool(wb));
@ -1540,7 +1540,7 @@ const
}
size_t
ircd::db::txn::bytes()
ircd::db::iov::bytes()
const
{
assert(bool(wb));
@ -1548,7 +1548,7 @@ const
}
bool
ircd::db::txn::has(const op &op)
ircd::db::iov::has(const op &op)
const
{
assert(bool(wb));
@ -1566,7 +1566,7 @@ const
}
bool
ircd::db::txn::has(const op &op,
ircd::db::iov::has(const op &op,
const string_view &col)
const
{
@ -1579,7 +1579,7 @@ const
}
bool
ircd::db::txn::has(const op &op,
ircd::db::iov::has(const op &op,
const string_view &col,
const string_view &key)
const
@ -1594,20 +1594,20 @@ const
}
ircd::db::delta
ircd::db::txn::at(const op &op,
ircd::db::iov::at(const op &op,
const string_view &col)
const
{
const auto ret(get(op, col));
if(unlikely(!std::get<2>(ret)))
throw not_found("db::txn::at(%s, %s): no matching delta in transaction",
throw not_found("db::iov::at(%s, %s): no matching delta in transaction",
reflect(op),
col);
return ret;
}
ircd::db::delta
ircd::db::txn::get(const op &op,
ircd::db::iov::get(const op &op,
const string_view &col)
const
{
@ -1628,14 +1628,14 @@ const
}
ircd::string_view
ircd::db::txn::at(const op &op,
ircd::db::iov::at(const op &op,
const string_view &col,
const string_view &key)
const
{
const auto ret(get(op, col, key));
if(unlikely(!ret))
throw not_found("db::txn::at(%s, %s, %s): no matching delta in transaction",
throw not_found("db::iov::at(%s, %s, %s): no matching delta in transaction",
reflect(op),
col,
key);
@ -1643,7 +1643,7 @@ const
}
ircd::string_view
ircd::db::txn::get(const op &op,
ircd::db::iov::get(const op &op,
const string_view &col,
const string_view &key)
const
@ -1665,21 +1665,21 @@ const
return ret;
}
ircd::db::txn::operator
ircd::db::iov::operator
ircd::db::database &()
{
assert(bool(d));
return *d;
}
ircd::db::txn::operator
ircd::db::iov::operator
rocksdb::WriteBatch &()
{
assert(bool(wb));
return *wb;
}
ircd::db::txn::operator
ircd::db::iov::operator
const ircd::db::database &()
const
{
@ -1687,7 +1687,7 @@ const
return *d;
}
ircd::db::txn::operator
ircd::db::iov::operator
const rocksdb::WriteBatch &()
const
{
@ -1699,14 +1699,14 @@ const
// Checkpoint
//
ircd::db::txn::checkpoint::checkpoint(txn &t)
ircd::db::iov::checkpoint::checkpoint(iov &t)
:t{t}
{
assert(bool(t.wb));
t.wb->SetSavePoint();
}
ircd::db::txn::checkpoint::~checkpoint()
ircd::db::iov::checkpoint::~checkpoint()
noexcept
{
if(likely(!std::uncaught_exception()))
@ -1715,7 +1715,7 @@ noexcept
throw_on_error { t.wb->RollbackToSavePoint() };
}
ircd::db::txn::append::append(txn &t,
ircd::db::iov::append::append(iov &t,
const string_view &key,
const json::iov &iov)
{
@ -1734,33 +1734,33 @@ ircd::db::txn::append::append(txn &t,
});
}
ircd::db::txn::append::append(txn &t,
ircd::db::iov::append::append(iov &t,
const delta &delta)
{
assert(bool(t.d));
append(t, *t.d, delta);
}
ircd::db::txn::append::append(txn &t,
ircd::db::iov::append::append(iov &t,
const row::delta &delta)
{
assert(0);
}
ircd::db::txn::append::append(txn &t,
ircd::db::iov::append::append(iov &t,
const cell::delta &delta)
{
db::append(*t.wb, delta);
}
ircd::db::txn::append::append(txn &t,
ircd::db::iov::append::append(iov &t,
column &c,
const column::delta &delta)
{
db::append(*t.wb, c, delta);
}
ircd::db::txn::append::append(txn &t,
ircd::db::iov::append::append(iov &t,
database &d,
const delta &delta)
{