interim
This commit is contained in:
parent
bebb29f541
commit
8665a8bf08
19
Makefile
19
Makefile
|
@ -1,6 +1,11 @@
|
|||
CXXFLAGS:=-std=gnu++11 -Wall -O2 -MMD -MP -ggdb -pthread
|
||||
|
||||
#LIBS=-Llmdb-0.9.21/libraries/liblmdb/
|
||||
#INCLUDES=-Ilmdb-0.9.21/libraries/liblmdb/
|
||||
|
||||
CXXFLAGS:=-std=gnu++11 -Wall -O2 -MMD -MP -ggdb -pthread $(INCLUDES)
|
||||
CFLAGS:= -Wall -O2 -MMD -MP -ggdb
|
||||
|
||||
|
||||
PROGRAMS = lmdb-test
|
||||
|
||||
all: $(PROGRAMS)
|
||||
|
@ -11,14 +16,6 @@ clean:
|
|||
-include *.d
|
||||
|
||||
|
||||
lmdb-test: lmdb-test.o
|
||||
g++ -std=gnu++11 $^ -o $@ -pthread -llmdb
|
||||
lmdb-test: lmdb-test.o lmdb-safe.o
|
||||
g++ -std=gnu++11 $^ -o $@ -pthread $(LIBS) -llmdb
|
||||
|
||||
h2o-simple: h2o-simple.o h2o-pp.o ext/simplesocket/comboaddress.o
|
||||
g++ -std=gnu++17 $^ -o $@ -pthread -lh2o-evloop -lssl -lcrypto -lz
|
||||
|
||||
h2o-real: h2o-real.o h2o-pp.o ext/simplesocket/comboaddress.o
|
||||
g++ -std=gnu++17 $^ -o $@ -pthread -lh2o-evloop -lssl -lcrypto -lz
|
||||
|
||||
h2o-stream: h2o-stream.o h2o-pp.o ext/simplesocket/comboaddress.o
|
||||
g++ -std=gnu++17 $^ -o $@ -pthread -lh2o-evloop -lsqlite3 -lssl -lcrypto -lz
|
||||
|
|
|
@ -0,0 +1,44 @@
|
|||
#include "lmdb-safe.hh"
|
||||
|
||||
MDBDbi MDBEnv::openDB(const char* dbname, int flags)
|
||||
{
|
||||
unsigned int envflags;
|
||||
mdb_env_get_flags(d_env, &envflags);
|
||||
|
||||
if(!(envflags & MDB_RDONLY)) {
|
||||
auto rwt = getRWTransaction();
|
||||
MDBDbi ret = rwt.openDB(dbname, flags);
|
||||
rwt.commit();
|
||||
return ret;
|
||||
}
|
||||
|
||||
auto rwt = getROTransaction();
|
||||
return rwt.openDB(dbname, flags);
|
||||
}
|
||||
|
||||
MDBRWCursor MDBRWTransaction::getCursor(const MDBDbi& dbi)
|
||||
{
|
||||
return MDBRWCursor(this, dbi);
|
||||
}
|
||||
|
||||
MDBROTransaction MDBEnv::getROTransaction()
|
||||
{
|
||||
return MDBROTransaction(this);
|
||||
}
|
||||
MDBRWTransaction MDBEnv::getRWTransaction()
|
||||
{
|
||||
return MDBRWTransaction(this);
|
||||
}
|
||||
|
||||
|
||||
void MDBRWTransaction::closeCursors()
|
||||
{
|
||||
for(auto& c : d_cursors)
|
||||
c->close();
|
||||
d_cursors.clear();
|
||||
}
|
||||
|
||||
MDBROCursor MDBROTransaction::getCursor(const MDBDbi& dbi)
|
||||
{
|
||||
return MDBROCursor(this, dbi);
|
||||
}
|
|
@ -0,0 +1,407 @@
|
|||
#include <lmdb.h>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <set>
|
||||
|
||||
using namespace std;
|
||||
|
||||
/* open issues:
|
||||
*
|
||||
* - opening a DBI is still exceptionally painful to get right, especially in a
|
||||
* multi-threaded world
|
||||
* - we're not yet protecting you against opening a file twice
|
||||
* - we are not yet protecting you correctly against opening multiple transactions in 1 thread
|
||||
* - error reporting is bad
|
||||
* - missing convenience functions (string_view, string)
|
||||
*/
|
||||
|
||||
/*
|
||||
The error strategy. Anything that "should never happen" turns into an exception. But things like 'duplicate entry' or 'no such key' are for you to deal with.
|
||||
*/
|
||||
|
||||
/*
|
||||
Thread safety: we are as safe as lmdb. You can talk to MDBEnv from as many threads as you want
|
||||
*/
|
||||
|
||||
class MDBDbi
|
||||
{
|
||||
public:
|
||||
|
||||
explicit MDBDbi(MDB_env* env, MDB_txn* txn, const char* dbname, int flags)
|
||||
: d_env(env), d_txn(txn)
|
||||
{
|
||||
|
||||
// A transaction that uses this function must finish (either commit or abort) before any other transaction in the process may use this function.
|
||||
|
||||
int rc = mdb_dbi_open(txn, dbname, flags, &d_dbi);
|
||||
if(rc)
|
||||
throw std::runtime_error("Unable to open database: "+string(mdb_strerror(rc)));
|
||||
|
||||
// Database names are keys in the unnamed database, and may be read but not written.
|
||||
|
||||
}
|
||||
|
||||
MDBDbi(MDBDbi&& rhs)
|
||||
{
|
||||
d_dbi = rhs.d_dbi;
|
||||
d_env = rhs.d_env;
|
||||
d_txn = rhs.d_txn;
|
||||
rhs.d_env = 0;
|
||||
rhs.d_txn = 0;
|
||||
}
|
||||
|
||||
~MDBDbi()
|
||||
{
|
||||
if(d_env)
|
||||
mdb_dbi_close(d_env, d_dbi);
|
||||
}
|
||||
|
||||
operator const MDB_dbi&() const
|
||||
{
|
||||
return d_dbi;
|
||||
}
|
||||
|
||||
MDB_dbi d_dbi;
|
||||
MDB_env* d_env;
|
||||
MDB_txn* d_txn;
|
||||
};
|
||||
|
||||
class MDBRWTransaction;
|
||||
class MDBROTransaction;
|
||||
|
||||
class MDBEnv
|
||||
{
|
||||
public:
|
||||
MDBEnv(const char* fname, int mode, int flags)
|
||||
{
|
||||
mdb_env_create(&d_env); // there is no close
|
||||
if(mdb_env_set_mapsize(d_env, 4096*2000000ULL))
|
||||
throw std::runtime_error("setting map size");
|
||||
|
||||
/*
|
||||
Various other options may also need to be set before opening the handle, e.g. mdb_env_set_mapsize(), mdb_env_set_maxreaders(), mdb_env_set_maxdbs(),
|
||||
*/
|
||||
|
||||
mdb_env_set_maxdbs(d_env, 128);
|
||||
|
||||
// TODO: check if fname is open somewhere already (under lock)
|
||||
|
||||
// we need MDB_NOTLS since we rely on its semantics
|
||||
if(mdb_env_open(d_env, fname, mode, flags | MDB_NOTLS)) {
|
||||
// If this function fails, mdb_env_close() must be called to discard the MDB_env handle.
|
||||
mdb_env_close(d_env);
|
||||
throw std::runtime_error("Unable to open database");
|
||||
}
|
||||
}
|
||||
|
||||
~MDBEnv()
|
||||
{
|
||||
// Only a single thread may call this function. All transactions, databases, and cursors must already be closed before calling this function
|
||||
mdb_env_close(d_env);
|
||||
// but, elsewhere, docs say database handles do not need to be closed?
|
||||
}
|
||||
|
||||
MDBDbi openDB(const char* dbname, int flags);
|
||||
|
||||
MDBRWTransaction getRWTransaction();
|
||||
MDBROTransaction getROTransaction();
|
||||
|
||||
operator MDB_env*& ()
|
||||
{
|
||||
return d_env;
|
||||
}
|
||||
MDB_env* d_env;
|
||||
bool d_transactionOut{false};
|
||||
|
||||
};
|
||||
|
||||
class MDBROCursor;
|
||||
|
||||
class MDBROTransaction
|
||||
{
|
||||
public:
|
||||
explicit MDBROTransaction(MDBEnv* parent, int flags=0) : d_parent(parent)
|
||||
{
|
||||
if(d_parent->d_transactionOut)
|
||||
throw std::runtime_error("Duplicate transaction");
|
||||
|
||||
/*
|
||||
A transaction and its cursors must only be used by a single thread, and a thread may only have a single transaction at a time. If MDB_NOTLS is in use, this does not apply to read-only transactions. */
|
||||
|
||||
if(mdb_txn_begin(d_parent->d_env, 0, MDB_RDONLY | flags, &d_txn))
|
||||
throw std::runtime_error("Unable to start RO transaction");
|
||||
}
|
||||
|
||||
MDBROTransaction(MDBROTransaction&& rhs)
|
||||
{
|
||||
d_parent = rhs.d_parent;
|
||||
d_txn = rhs.d_txn;
|
||||
rhs.d_parent = 0;
|
||||
rhs.d_txn = 0;
|
||||
}
|
||||
|
||||
void reset()
|
||||
{
|
||||
// this does not free cursors
|
||||
mdb_txn_reset(d_txn);
|
||||
d_parent->d_transactionOut=false;
|
||||
}
|
||||
|
||||
void renew()
|
||||
{
|
||||
if(d_parent->d_transactionOut)
|
||||
throw std::runtime_error("Duplicate transaction");
|
||||
d_parent->d_transactionOut=1;
|
||||
if(mdb_txn_renew(d_txn))
|
||||
throw std::runtime_error("Renewing transaction");
|
||||
}
|
||||
|
||||
|
||||
int get(MDB_dbi dbi, const MDB_val& key, MDB_val& val)
|
||||
{
|
||||
return mdb_get(d_txn, dbi, (MDB_val*)&key, &val);
|
||||
}
|
||||
|
||||
// this is something you can do, readonly
|
||||
MDBDbi openDB(const char* dbname, int flags)
|
||||
{
|
||||
return MDBDbi(d_parent->d_env, d_txn, dbname, flags);
|
||||
}
|
||||
|
||||
MDBROCursor getCursor(const MDBDbi&);
|
||||
|
||||
|
||||
~MDBROTransaction()
|
||||
{
|
||||
if(d_txn) {
|
||||
d_parent->d_transactionOut=false;
|
||||
mdb_txn_abort(d_txn);
|
||||
}
|
||||
}
|
||||
|
||||
operator MDB_txn*&()
|
||||
{
|
||||
return d_txn;
|
||||
}
|
||||
|
||||
MDBEnv* d_parent;
|
||||
MDB_txn* d_txn;
|
||||
};
|
||||
|
||||
/*
|
||||
A cursor in a read-only transaction must be closed explicitly, before or after its transaction ends. It can be reused with mdb_cursor_renew() before finally closing it.
|
||||
|
||||
"If the parent transaction commits, the cursor must not be used again."
|
||||
*/
|
||||
|
||||
class MDBROCursor
|
||||
{
|
||||
public:
|
||||
MDBROCursor(MDBROTransaction* parent, const MDB_dbi& dbi) : d_parent(parent)
|
||||
{
|
||||
int rc= mdb_cursor_open(d_parent->d_txn, dbi, &d_cursor);
|
||||
if(rc) {
|
||||
throw std::runtime_error("Error creating cursor: "+std::string(mdb_strerror(rc)));
|
||||
}
|
||||
}
|
||||
MDBROCursor(MDBROCursor&& rhs)
|
||||
{
|
||||
d_cursor = rhs.d_cursor;
|
||||
rhs.d_cursor=0;
|
||||
}
|
||||
|
||||
void close()
|
||||
{
|
||||
mdb_cursor_close(d_cursor);
|
||||
d_cursor=0;
|
||||
}
|
||||
|
||||
~MDBROCursor()
|
||||
{
|
||||
if(d_cursor)
|
||||
mdb_cursor_close(d_cursor);
|
||||
}
|
||||
|
||||
int get(MDB_val& key, MDB_val& data, MDB_cursor_op op)
|
||||
{
|
||||
return mdb_cursor_get(d_cursor, &key, &data, op);
|
||||
}
|
||||
|
||||
MDB_cursor* d_cursor;
|
||||
MDBROTransaction* d_parent;
|
||||
};
|
||||
|
||||
|
||||
|
||||
class MDBRWCursor;
|
||||
|
||||
class MDBRWTransaction
|
||||
{
|
||||
public:
|
||||
explicit MDBRWTransaction(MDBEnv* parent, int flags=0) : d_parent(parent)
|
||||
{
|
||||
if(d_parent->d_transactionOut)
|
||||
throw std::runtime_error("Duplicate transaction");
|
||||
d_parent->d_transactionOut = true;
|
||||
if(int rc=mdb_txn_begin(d_parent->d_env, 0, flags, &d_txn))
|
||||
throw std::runtime_error("Unable to start RW transaction: "+std::string(mdb_strerror(rc)));
|
||||
}
|
||||
|
||||
MDBRWTransaction(MDBRWTransaction&& rhs)
|
||||
{
|
||||
d_parent = rhs.d_parent;
|
||||
d_txn = rhs.d_txn;
|
||||
rhs.d_parent = 0;
|
||||
rhs.d_txn = 0;
|
||||
}
|
||||
|
||||
MDBRWTransaction& operator=(MDBRWTransaction&& rhs)
|
||||
{
|
||||
if(d_txn)
|
||||
abort();
|
||||
|
||||
d_parent = rhs.d_parent;
|
||||
d_txn = rhs.d_txn;
|
||||
rhs.d_parent = 0;
|
||||
rhs.d_txn = 0;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
~MDBRWTransaction()
|
||||
{
|
||||
if(d_txn) {
|
||||
d_parent->d_transactionOut=false;
|
||||
closeCursors();
|
||||
mdb_txn_abort(d_txn);
|
||||
}
|
||||
}
|
||||
void closeCursors();
|
||||
|
||||
void commit()
|
||||
{
|
||||
closeCursors();
|
||||
if(mdb_txn_commit(d_txn)) {
|
||||
throw std::runtime_error("committing");
|
||||
}
|
||||
d_parent->d_transactionOut=false;
|
||||
|
||||
d_txn=0;
|
||||
}
|
||||
|
||||
void abort()
|
||||
{
|
||||
closeCursors();
|
||||
mdb_txn_abort(d_txn);
|
||||
d_txn = 0;
|
||||
d_parent->d_transactionOut=false;
|
||||
}
|
||||
|
||||
void put(MDB_dbi dbi, const MDB_val& key, const MDB_val& val, int flags)
|
||||
{
|
||||
int rc;
|
||||
if((rc=mdb_put(d_txn, dbi, (MDB_val*)&key, (MDB_val*)&val, flags)))
|
||||
throw std::runtime_error("putting data: " + std::string(mdb_strerror(rc)));
|
||||
}
|
||||
|
||||
|
||||
int del(MDB_dbi dbi, const MDB_val& key)
|
||||
{
|
||||
int rc;
|
||||
rc=mdb_del(d_txn, dbi, (MDB_val*)&key, 0);
|
||||
if(rc && rc != MDB_NOTFOUND)
|
||||
throw std::runtime_error("deleting data: " + std::string(mdb_strerror(rc)));
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
int get(MDB_dbi dbi, const MDB_val& key, MDB_val& val)
|
||||
{
|
||||
return mdb_get(d_txn, dbi, (MDB_val*)&key, &val);
|
||||
}
|
||||
|
||||
|
||||
MDBDbi openDB(const char* dbname, int flags)
|
||||
{
|
||||
return MDBDbi(d_parent->d_env, d_txn, dbname, flags);
|
||||
}
|
||||
|
||||
MDBRWCursor getCursor(const MDBDbi&);
|
||||
|
||||
void reportCursor(MDBRWCursor* child)
|
||||
{
|
||||
d_cursors.insert(child);
|
||||
}
|
||||
void reportCursorMove(MDBRWCursor* from, MDBRWCursor* to)
|
||||
{
|
||||
d_cursors.erase(from);
|
||||
d_cursors.insert(to);
|
||||
}
|
||||
|
||||
operator MDB_txn*&()
|
||||
{
|
||||
return d_txn;
|
||||
}
|
||||
|
||||
|
||||
|
||||
std::set<MDBRWCursor*> d_cursors;
|
||||
MDBEnv* d_parent;
|
||||
MDB_txn* d_txn;
|
||||
};
|
||||
|
||||
/* "A cursor in a write-transaction can be closed before its transaction ends, and will otherwise be closed when its transaction ends"
|
||||
This is a problem for us since it may means we are closing the cursor twice, which is bad
|
||||
*/
|
||||
class MDBRWCursor
|
||||
{
|
||||
public:
|
||||
MDBRWCursor(MDBRWTransaction* parent, const MDB_dbi& dbi) : d_parent(parent)
|
||||
{
|
||||
int rc= mdb_cursor_open(d_parent->d_txn, dbi, &d_cursor);
|
||||
if(rc) {
|
||||
throw std::runtime_error("Error creating cursor: "+std::string(mdb_strerror(rc)));
|
||||
}
|
||||
d_parent->reportCursor(this);
|
||||
}
|
||||
MDBRWCursor(MDBRWCursor&& rhs)
|
||||
{
|
||||
cout<<"Got move constructed, this was: "<<(void*)&rhs<<", now: "<<(void*)this<<endl;
|
||||
d_parent = rhs.d_parent;
|
||||
d_cursor = rhs.d_cursor;
|
||||
rhs.d_cursor=0;
|
||||
d_parent->reportCursorMove(&rhs, this);
|
||||
}
|
||||
|
||||
void close()
|
||||
{
|
||||
if(d_cursor)
|
||||
mdb_cursor_close(d_cursor);
|
||||
d_cursor=0;
|
||||
}
|
||||
|
||||
~MDBRWCursor()
|
||||
{
|
||||
if(d_cursor)
|
||||
mdb_cursor_close(d_cursor);
|
||||
}
|
||||
|
||||
int get(MDB_val& key, MDB_val& data, MDB_cursor_op op)
|
||||
{
|
||||
return mdb_cursor_get(d_cursor, &key, &data, op);
|
||||
}
|
||||
|
||||
int put(MDB_val& key, MDB_val& data, int flags)
|
||||
{
|
||||
return mdb_cursor_put(d_cursor, &key, &data, flags);
|
||||
}
|
||||
|
||||
int del(MDB_val& key, int flags)
|
||||
{
|
||||
return mdb_cursor_del(d_cursor, flags);
|
||||
}
|
||||
|
||||
MDB_cursor* d_cursor;
|
||||
MDBRWTransaction* d_parent;
|
||||
};
|
||||
|
350
lmdb-test.cc
350
lmdb-test.cc
|
@ -1,348 +1,34 @@
|
|||
#include <lmdb.h>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <arpa/inet.h>
|
||||
#include <atomic>
|
||||
#include <string.h>
|
||||
#include "lmdb-safe.hh"
|
||||
#include <unistd.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
/* open issues:
|
||||
*
|
||||
* - opening a DBI is still exceptionally painful to get right, especially in a
|
||||
* multi-threaded world
|
||||
* - we're not yet protecting you against opening a file twice
|
||||
* - we are not yet protecting you correctly against opening multiple transactions in 1 thread
|
||||
* - error reporting is bad
|
||||
* - missing convenience functions (string_view, string)
|
||||
*/
|
||||
|
||||
class MDBDbi
|
||||
static void closeTest()
|
||||
{
|
||||
public:
|
||||
MDBEnv env("./database", 0, 0600);
|
||||
MDBDbi dbi = env.openDB("ahu", MDB_CREATE);
|
||||
MDBDbi main = env.openDB(0, MDB_CREATE);
|
||||
MDBDbi hyc = env.openDB("hyc", MDB_CREATE);
|
||||
|
||||
auto txn = env.getROTransaction();
|
||||
auto cursor = txn.getCursor(dbi);
|
||||
|
||||
explicit MDBDbi(MDB_env* env, MDB_txn* txn, const char* dbname, int flags)
|
||||
: d_env(env), d_txn(txn)
|
||||
{
|
||||
|
||||
// A transaction that uses this function must finish (either commit or abort) before any other transaction in the process may use this function.
|
||||
|
||||
if(mdb_dbi_open(txn, dbname, flags, &d_dbi))
|
||||
throw std::runtime_error("Unable to open database");
|
||||
|
||||
// Database names are keys in the unnamed database, and may be read but not written.
|
||||
|
||||
}
|
||||
|
||||
MDBDbi(MDBDbi&& rhs)
|
||||
{
|
||||
d_dbi = rhs.d_dbi;
|
||||
d_env = rhs.d_env;
|
||||
d_txn = rhs.d_txn;
|
||||
rhs.d_env = 0;
|
||||
rhs.d_txn = 0;
|
||||
}
|
||||
|
||||
~MDBDbi()
|
||||
{
|
||||
if(d_env)
|
||||
mdb_dbi_close(d_env, d_dbi);
|
||||
}
|
||||
|
||||
operator const MDB_dbi&() const
|
||||
{
|
||||
return d_dbi;
|
||||
}
|
||||
|
||||
MDB_dbi d_dbi;
|
||||
MDB_env* d_env;
|
||||
MDB_txn* d_txn;
|
||||
};
|
||||
|
||||
class MDBTransaction;
|
||||
class MDBROTransaction;
|
||||
|
||||
class MDBEnv
|
||||
{
|
||||
public:
|
||||
MDBEnv(const char* fname, int mode, int flags)
|
||||
{
|
||||
mdb_env_create(&d_env); // there is no close
|
||||
if(mdb_env_set_mapsize(d_env, 4096*2000000ULL))
|
||||
throw std::runtime_error("setting map size");
|
||||
|
||||
/*
|
||||
Various other options may also need to be set before opening the handle, e.g. mdb_env_set_mapsize(), mdb_env_set_maxreaders(), mdb_env_set_maxdbs(),
|
||||
*/
|
||||
|
||||
mdb_env_set_maxdbs(d_env, 128);
|
||||
|
||||
// TODO: check if fname is open somewhere already (under lock)
|
||||
|
||||
if(mdb_env_open(d_env, fname, mode, flags)) {
|
||||
// If this function fails, mdb_env_close() must be called to discard the MDB_env handle.
|
||||
mdb_env_close(d_env);
|
||||
throw std::runtime_error("Unable to open database");
|
||||
}
|
||||
}
|
||||
|
||||
~MDBEnv()
|
||||
{
|
||||
// Only a single thread may call this function. All transactions, databases, and cursors must already be closed before calling this function
|
||||
mdb_env_close(d_env);
|
||||
// but, elsewhere, docs say database handles do not need to be closed?
|
||||
}
|
||||
|
||||
|
||||
MDBTransaction getTransaction();
|
||||
MDBROTransaction getROTransaction();
|
||||
operator MDB_env*& ()
|
||||
{
|
||||
return d_env;
|
||||
}
|
||||
MDB_env* d_env;
|
||||
bool d_transactionOut{false};
|
||||
};
|
||||
|
||||
class MDBROCursor;
|
||||
|
||||
|
||||
|
||||
class MDBROTransaction
|
||||
{
|
||||
public:
|
||||
explicit MDBROTransaction(MDBEnv* parent, int flags=0) : d_parent(parent)
|
||||
{
|
||||
if(d_parent->d_transactionOut)
|
||||
throw std::runtime_error("Duplicate transaction");
|
||||
|
||||
/*
|
||||
A transaction and its cursors must only be used by a single thread, and a thread may only have a single transaction at a time. If MDB_NOTLS is in use, this does not apply to read-only transactions. */
|
||||
|
||||
if(mdb_txn_begin(d_parent->d_env, 0, MDB_RDONLY | flags, &d_txn))
|
||||
throw std::runtime_error("Unable to start RO transaction");
|
||||
}
|
||||
|
||||
MDBROTransaction(MDBROTransaction&& rhs)
|
||||
{
|
||||
d_parent = rhs.d_parent;
|
||||
d_txn = rhs.d_txn;
|
||||
rhs.d_parent = 0;
|
||||
rhs.d_txn = 0;
|
||||
}
|
||||
|
||||
void reset()
|
||||
{
|
||||
// this does not free cursors
|
||||
mdb_txn_reset(d_txn);
|
||||
d_parent->d_transactionOut=false;
|
||||
}
|
||||
|
||||
void renew()
|
||||
{
|
||||
if(d_parent->d_transactionOut)
|
||||
throw std::runtime_error("Duplicate transaction");
|
||||
d_parent->d_transactionOut=1;
|
||||
if(mdb_txn_renew(d_txn))
|
||||
throw std::runtime_error("Renewing transaction");
|
||||
}
|
||||
|
||||
|
||||
int get(MDB_dbi dbi, const MDB_val& key, MDB_val& val)
|
||||
{
|
||||
return mdb_get(d_txn, dbi, (MDB_val*)&key, &val);
|
||||
}
|
||||
|
||||
|
||||
MDBDbi openDB(const char* dbname, int flags)
|
||||
{
|
||||
return MDBDbi(d_parent->d_env, d_txn, dbname, flags);
|
||||
}
|
||||
|
||||
MDBROCursor getCursor(const MDBDbi&);
|
||||
|
||||
|
||||
~MDBROTransaction()
|
||||
{
|
||||
if(d_txn) {
|
||||
d_parent->d_transactionOut=false;
|
||||
mdb_txn_abort(d_txn);
|
||||
}
|
||||
}
|
||||
|
||||
operator MDB_txn*&()
|
||||
{
|
||||
return d_txn;
|
||||
}
|
||||
|
||||
MDBEnv* d_parent;
|
||||
MDB_txn* d_txn;
|
||||
};
|
||||
|
||||
class MDBROCursor
|
||||
{
|
||||
public:
|
||||
MDBROCursor(MDB_txn* txn, const MDB_dbi& dbi)
|
||||
{
|
||||
int rc= mdb_cursor_open(txn, dbi, &d_cursor);
|
||||
if(rc) {
|
||||
throw std::runtime_error("Error creating cursor: "+std::string(mdb_strerror(rc)));
|
||||
}
|
||||
}
|
||||
MDBROCursor(MDBROCursor&& rhs)
|
||||
{
|
||||
d_cursor = rhs.d_cursor;
|
||||
rhs.d_cursor=0;
|
||||
}
|
||||
|
||||
void close()
|
||||
{
|
||||
mdb_cursor_close(d_cursor);
|
||||
d_cursor=0;
|
||||
}
|
||||
|
||||
~MDBROCursor()
|
||||
{
|
||||
if(d_cursor)
|
||||
mdb_cursor_close(d_cursor);
|
||||
}
|
||||
|
||||
int get(MDB_val& key, MDB_val& data, MDB_cursor_op op)
|
||||
{
|
||||
return mdb_cursor_get(d_cursor, &key, &data, op);
|
||||
}
|
||||
|
||||
MDB_cursor* d_cursor;
|
||||
};
|
||||
|
||||
|
||||
MDBROCursor MDBROTransaction::getCursor(const MDBDbi& dbi)
|
||||
{
|
||||
return MDBROCursor(d_txn, dbi);
|
||||
return;
|
||||
}
|
||||
|
||||
class MDBTransaction
|
||||
{
|
||||
public:
|
||||
explicit MDBTransaction(MDBEnv* parent, int flags=0) : d_parent(parent)
|
||||
{
|
||||
if(d_parent->d_transactionOut)
|
||||
throw std::runtime_error("Duplicate transaction");
|
||||
d_parent->d_transactionOut = true;
|
||||
if(mdb_txn_begin(d_parent->d_env, 0, flags, &d_txn))
|
||||
throw std::runtime_error("Unable to start transaction");
|
||||
}
|
||||
|
||||
MDBTransaction(MDBTransaction&& rhs)
|
||||
{
|
||||
d_parent = rhs.d_parent;
|
||||
d_txn = rhs.d_txn;
|
||||
rhs.d_parent = 0;
|
||||
rhs.d_txn = 0;
|
||||
}
|
||||
|
||||
MDBTransaction& operator=(MDBTransaction&& rhs)
|
||||
{
|
||||
if(d_txn)
|
||||
abort();
|
||||
|
||||
d_parent = rhs.d_parent;
|
||||
d_txn = rhs.d_txn;
|
||||
rhs.d_parent = 0;
|
||||
rhs.d_txn = 0;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
void commit()
|
||||
{
|
||||
if(mdb_txn_commit(d_txn)) {
|
||||
throw std::runtime_error("committing");
|
||||
}
|
||||
d_parent->d_transactionOut=false;
|
||||
|
||||
d_txn=0;
|
||||
}
|
||||
|
||||
void abort()
|
||||
{
|
||||
mdb_txn_abort(d_txn);
|
||||
d_txn = 0;
|
||||
d_parent->d_transactionOut=false;
|
||||
}
|
||||
|
||||
void put(MDB_dbi dbi, const MDB_val& key, const MDB_val& val, int flags)
|
||||
{
|
||||
int rc;
|
||||
if((rc=mdb_put(d_txn, dbi, (MDB_val*)&key, (MDB_val*)&val, flags)))
|
||||
throw std::runtime_error("putting data: " + std::string(mdb_strerror(rc)));
|
||||
}
|
||||
|
||||
|
||||
int del(MDB_dbi dbi, const MDB_val& key)
|
||||
{
|
||||
int rc;
|
||||
rc=mdb_del(d_txn, dbi, (MDB_val*)&key, 0);
|
||||
if(rc && rc != MDB_NOTFOUND)
|
||||
throw std::runtime_error("deleting data: " + std::string(mdb_strerror(rc)));
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
int get(MDB_dbi dbi, const MDB_val& key, MDB_val& val)
|
||||
{
|
||||
return mdb_get(d_txn, dbi, (MDB_val*)&key, &val);
|
||||
}
|
||||
|
||||
|
||||
MDBDbi openDB(const char* dbname, int flags)
|
||||
{
|
||||
return MDBDbi(d_parent->d_env, d_txn, dbname, flags);
|
||||
}
|
||||
|
||||
|
||||
~MDBTransaction()
|
||||
{
|
||||
if(d_txn) {
|
||||
d_parent->d_transactionOut=false;
|
||||
mdb_txn_abort(d_txn);
|
||||
}
|
||||
}
|
||||
|
||||
operator MDB_txn*&()
|
||||
{
|
||||
return d_txn;
|
||||
}
|
||||
|
||||
MDBEnv* d_parent;
|
||||
MDB_txn* d_txn;
|
||||
};
|
||||
|
||||
|
||||
MDBROTransaction MDBEnv::getROTransaction()
|
||||
{
|
||||
cout << d_transactionOut << endl;
|
||||
return MDBROTransaction(this);
|
||||
}
|
||||
MDBTransaction MDBEnv::getTransaction()
|
||||
{
|
||||
cout << d_transactionOut << endl;
|
||||
return MDBTransaction(this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
closeTest();
|
||||
return 0;
|
||||
MDBEnv env("./database", 0, 0600);
|
||||
|
||||
MDB_stat stat;
|
||||
mdb_env_stat(env, &stat);
|
||||
cout << stat.ms_entries<< " entries in database"<<endl;
|
||||
|
||||
MDBTransaction txn = env.getTransaction();
|
||||
MDBDbi dbi = txn.openDB("ahu", MDB_CREATE);
|
||||
txn.commit();
|
||||
|
||||
MDBDbi dbi = env.openDB("ahu", MDB_CREATE);
|
||||
|
||||
{
|
||||
MDBROTransaction rotxn = env.getROTransaction();
|
||||
|
@ -381,8 +67,10 @@ int main(int argc, char** argv)
|
|||
|
||||
}
|
||||
|
||||
txn = env.getTransaction();
|
||||
auto txn = env.getRWTransaction();
|
||||
|
||||
auto cursor = txn.getCursor(dbi);
|
||||
|
||||
time_t start=time(0);
|
||||
ofstream delplot("plot");
|
||||
|
||||
|
@ -398,7 +86,7 @@ int main(int argc, char** argv)
|
|||
cout<<"Done deleting, committing"<<endl;
|
||||
txn.commit();
|
||||
cout<<"Done with commit"<<endl;
|
||||
txn = env.getTransaction();
|
||||
txn = env.getRWTransaction();
|
||||
|
||||
start=time(0);
|
||||
ofstream plot("plot");
|
||||
|
|
Loading…
Reference in New Issue